Game-Decompilation/sf64
1
0
Fork 0
mirror of https://github.com/sonicdcer/sf64.git synced 2024-11-30 08:21:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:sonicdcer/sf64

Browse Source
This commit is contained in:
Alejandro Javier Asenjo Nitti 2024-05-17 20:21:08 -03:00
commit 4317e2cd54
56 changed files with 2072 additions and 1158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/settings.json vendored
View File

@ -145,7 +145,8 @@
"semaphore": "c",
"bgm.h": "c",
"*.tcc": "c",
"object_ram.h": "c"
"object_ram.h": "c",
"sf64dma.h": "c"
},
"C_Cpp_Runner.msvcBatchPath": ""
}

34
include/gfx.h
View File

@ -128,23 +128,23 @@ s32 Animation_GetFrameCount(Animation *animationSegment);
void Animation_FindBoundingBox(Gfx* dList, s32 len, Vec3f *min, Vec3f *max, s32 *vtxFound, s32 *vtxCount, Vtx* *vtxList);
void Animation_GetDListBoundingBox(Gfx *dList, s32 len, Vec3f *min, Vec3f *max);
void Animation_GetSkeletonBoundingBox(Limb** skeletonSegment, Animation *animationSegment, s32 frame, Vec3f *min, Vec3f* max);
void TextureRect_4bCI(Gfx **gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_4bCI_Flip(Gfx **gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_4bCI_MirX(Gfx **gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_4bCI_MirY(Gfx **gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_8bCI(Gfx **gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_16bRGBA(Gfx **gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_16bRGBA_MirX(Gfx **gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_8bIA(Gfx **gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_8bIA_FilpMirX(Gfx **gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_8bIA_FilpMirY(Gfx **gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_8bIA_MirX(Gfx **gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_8bIA_MirY(Gfx **gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_16bIA(Gfx **gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_16bIA_MirX(Gfx **gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_16bIA_MirY(Gfx **gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_16bIA_MirXY(Gfx **gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_32bRGBA(Gfx **gfxPtr, u32* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_CI4(Gfx **gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_CI4_Flip(Gfx **gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_CI4_MirX(Gfx **gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_CI4_MirY(Gfx **gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_CI8(Gfx **gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_RGBA16(Gfx **gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_RGBA16_MirX(Gfx **gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_IA8(Gfx **gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_IA8_FlipMirX(Gfx **gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_IA8_FlipMirY(Gfx **gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_IA8_MirX(Gfx **gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_IA8_MirY(Gfx **gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_IA16(Gfx **gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_IA16_MirX(Gfx **gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_IA16_MirY(Gfx **gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_IA16_MirXY(Gfx **gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void TextureRect_RGBA32(Gfx **gfxPtr, u32* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
void Graphics_FillRectangle(Gfx **gfxPtr, s32 ulx, s32 uly, s32 lrx, s32 lry, u8 r, u8 g, u8 b, u8 a);
u16* Graphics_SetupTextureRender(Gfx **gfxPtr, u8 width, u8 height);
void Graphics_DisplayHUDNumber(s32 xPos, s32 yPos, s32 number);

4
include/sf64dma.h
View File

@ -72,6 +72,8 @@ typedef struct {
/* 0x4 */ void* end;
} SegmentOffset; // size = 0x8
#define SEGMENT_SIZE(segment) ((ptrdiff_t) ((uintptr_t) (segment).end - (uintptr_t) (segment).start))
typedef struct {
/* 0x00 */ SegmentOffset rom;
/* 0x08 */ SegmentOffset bss;
@ -87,7 +89,7 @@ typedef struct {
typedef struct {
/* 0x0 */ void* vRomAddress;
/* 0x4 */ SegmentOffset pRom;
/* 0xC */ s32 compFlag;
/* 0xC */ bool compFlag;
} DmaEntry; // size = 0x10;
extern DmaEntry gDmaTable[]; // 178A70

2
include/sys.h
View File

@ -32,7 +32,7 @@ void Lib_FillScreen(u8 setFill);
void Memory_FreeAll(void);
void* Memory_Allocate(s32);
OSPiHandle * func_8001EE60(void);
OSPiHandle * osDriveRomInit(void);
void RdRam_CheckIPL3(void);
void Mio0_Decompress(void* header, u8* dst);
s32 vsprintf(char* dst, const char* fmt, va_list args);

75
linker_scripts/jp/rev0/symbol_addrs.txt
View File

@ -376,10 +376,12 @@ func_8001EE14 = 0x8001EE14;
func_8001EE6C = 0x8001EE6C;
func_8001EEE0 = 0x8001EEE0;
func_8001EF1C = 0x8001EF1C;
func_8001EF40 = 0x8001EF40;
func_8001EF50 = 0x8001EF50;
func_8001EFF0 = 0x8001EFF0;
osDriveRomInit = 0x8001EF40;
Mio0_Decompress = 0x8001EF50;
RdRam_CheckIPL3 = 0x8001EFF0;
altIPL3Start = 0x8001F0A0;
func_8001FAC0 = 0x8001FAC0;
func_8001FAE4 = 0x8001FAE4;
func_8001FB34 = 0x8001FB34;
@ -1892,37 +1894,38 @@ D_800C6F24 = 0x800C6F24;
D_800C6F28 = 0x800C6F28;
D_800C6F2C = 0x800C6F2C;
D_800C6F3C = 0x800C6F3C;
D_800C6F50 = 0x800C6F50;
D_800C6F54 = 0x800C6F54;
D_800C6FEC = 0x800C6FEC;
D_800C737C = 0x800C737C;
D_800C7414 = 0x800C7414;
D_800C74AC = 0x800C74AC;
D_800C7544 = 0x800C7544;
D_800C75DC = 0x800C75DC;
D_800C7674 = 0x800C7674;
D_800C77A4 = 0x800C77A4;
D_800C7B34 = 0x800C7B34;
D_800C7C64 = 0x800C7C64;
D_800C7CFC = 0x800C7CFC;
D_800C7D94 = 0x800C7D94;
D_800C7E2C = 0x800C7E2C;
D_800C7F5C = 0x800C7F5C;
D_800C7FF4 = 0x800C7FF4;
D_800C808C = 0x800C808C;
D_800C8124 = 0x800C8124;
D_800C81BC = 0x800C81BC;
D_800C8254 = 0x800C8254;
D_800C82EC = 0x800C82EC;
D_800C841C = 0x800C841C;
D_800C84B4 = 0x800C84B4;
D_800C854C = 0x800C854C;
D_800C85E4 = 0x800C85E4;
D_800C8714 = 0x800C8714;
D_800C87AC = 0x800C87AC;
D_800C8974 = 0x800C8974;
D_800C8978 = 0x800C8978;
D_800C8994 = 0x800C8994;
// fox_load data
sFillTimer = 0x800C6F50;
sNoOvl_Logo = 0x800C6F54;
sOvlending_Ending = 0x800C6FEC;
sOvlmenu_Title = 0x800C737C;
sOvlmenu_Option = 0x800C7414;
sOvlmenu_Map = 0x800C74AC;
sOvlmenu_GameOver = 0x800C7544;
sOvli1_Corneria = 0x800C75DC;
sOvli2_Meteo = 0x800C7674;
sOvli5_Titania = 0x800C77A4;
sOvli2_SectorX = 0x800C7B34;
sOvli4_SectorZ = 0x800C7C64;
sOvli3_Aquas = 0x800C7CFC;
sOvli3_Area6 = 0x800C7D94;
sOvli4_Fortuna = 0x800C7E2C;
sOvli3_Unk4 = 0x800C7F5C;
sOvli6_SectorY = 0x800C7FF4;
sOvli3_Solar = 0x800C808C;
sOvli3_Zoness = 0x800C8124;
sOvli1_Venom1 = 0x800C81BC;
sOvli6_Andross = 0x800C8254;
sOvli6_Venom2 = 0x800C82EC;
sOvli2_Setup20 = 0x800C841C;
sOvli4_Bolse = 0x800C84B4;
sOvli4_Katina = 0x800C854C;
sOvli5_Macbeth = 0x800C85E4;
sOvli1_Training = 0x800C8714;
sOvli2_Versus = 0x800C87AC;
sCurrentScene = 0x800C8974;//size:0x98
D_800C8A10 = 0x800C8A10;
D_800C8A2C = 0x800C8A2C;
D_800C8A48 = 0x800C8A48;
@ -4124,8 +4127,7 @@ D_8017E10F = 0x8017E10F;
D_8017E110 = 0x8017E110;
D_8017E111 = 0x8017E111;
D_8017E112 = 0x8017E112;
D_8017E210 = 0x8017E210;
D_8017E218 = 0x8017E218;
gDmaTable = 0x8017E210; //size:0x590
func_i1_8017E7A0 = 0x8017E7A0; //segment:ovl_i1
func_i1_8017E7B0 = 0x8017E7B0; //segment:ovl_i1
@ -7279,3 +7281,4 @@ gTextureRenderBuffer = 0x80387800; //size:0x7880 segment:buffers defined:true
gFillBuffer = 0x8038F080; //size:0x780 segment:buffers defined:true
gFrameBuffers = 0x8038F800; //size:0x70800 segment:buffers defined:true
D_8038F300 = 0x8038F300; //ignore:true

7
linker_scripts/jp/rev0/symbol_addrs_fix.txt
View File

@ -75,7 +75,14 @@ D_ending_8018DC28 = 0x8018DC28; // force_migration:True segment:ovl_ending // i
// hidden vars
D_800C5118 = 0x800C5118;
D_800DB5D4 = 0x800DB5D4;
sOvlUnused_Unk = 0x800C88DC;
D_i5_801B1E6C = 0x801B1E6C; // segment:ovl_i5
// that stupid thing where i6 sets a value in ending
D_i6_8018DD90 = 0x8018DD90; //ignore:true segment:ovl_i6
// dma symbols
dma_table_ROM_START = 0xE93C0;
audio_seq_ROM_START = 0xE9950;
audio_bank_ROM_START = 0x124920;
audio_table_ROM_START = 0x143A40;

5
linker_scripts/jp/rev0/undefined_syms.ld
View File

@ -1,8 +1,3 @@
D_E93C0 = 0xE93C0;
D_E9950 = 0xE9950;
D_124920 = 0x124920;
D_143A40 = 0x143A40;
D_1000170 = 0x1000170;
D_1001090 = 0x1001090;
D_1001FB0 = 0x1001FB0;

34
linker_scripts/us/rev1/symbol_addrs_engine.txt
View File

@ -20,23 +20,23 @@ Math_SmoothStepToF = 0x8009BC2C;
Math_SmoothStepToAngle = 0x8009BD38;
Math_SmoothStepToVec3fArray = 0x8009BEEC;
Math_PursueVec3f = 0x8009C124;
TextureRect_4bCI = 0x8009C320;
TextureRect_4bCI_Flip = 0x8009C674;
TextureRect_4bCI_MirX = 0x8009C9C8;
TextureRect_4bCI_MirY = 0x8009CD3C;
TextureRect_8bCI = 0x8009D0BC;
TextureRect_16bRGBA = 0x8009D418;
TextureRect_16bRGBA_MirX = 0x8009D6CC;
TextureRect_8bIA = 0x8009D994;
TextureRect_8bIA_FilpMirX = 0x8009DC4C;
TextureRect_8bIA_FilpMirY = 0x8009DF14;
TextureRect_8bIA_MirX = 0x8009E1E8;
TextureRect_8bIA_MirY = 0x8009E4B0;
TextureRect_16bIA = 0x8009E784;
TextureRect_16bIA_MirX = 0x8009EA38;
TextureRect_16bIA_MirY = 0x8009ED04;
TextureRect_16bIA_MirXY = 0x8009EFDC;
TextureRect_32bRGBA = 0x8009F2C0;
TextureRect_CI4 = 0x8009C320;
TextureRect_CI4_Flip = 0x8009C674;
TextureRect_CI4_MirX = 0x8009C9C8;
TextureRect_CI4_MirY = 0x8009CD3C;
TextureRect_CI8 = 0x8009D0BC;
TextureRect_RGBA16 = 0x8009D418;
TextureRect_RGBA16_MirX = 0x8009D6CC;
TextureRect_IA8 = 0x8009D994;
TextureRect_IA8_FlipMirX = 0x8009DC4C;
TextureRect_IA8_FlipMirY = 0x8009DF14;
TextureRect_IA8_MirX = 0x8009E1E8;
TextureRect_IA8_MirY = 0x8009E4B0;
TextureRect_IA16 = 0x8009E784;
TextureRect_IA16_MirX = 0x8009EA38;
TextureRect_IA16_MirY = 0x8009ED04;
TextureRect_IA16_MirXY = 0x8009EFDC;
TextureRect_RGBA32 = 0x8009F2C0;
Graphics_FillRectangle = 0x8009F574;
Math_Vec3fFromAngles = 0x8009F6CC;
Math_RadToDeg = 0x8009F768;

4
src/1FA60.c
View File

@ -1,4 +0,0 @@
#include "sys.h"
OSPiHandle* func_8001EE60(void) {
}

2
src/audio/audio_load.c
View File

@ -672,7 +672,7 @@ s32 AudioLoad_Dma(OSIoMesg* mesg, u32 priority, s32 direction, u32 devAddr, void
handle = osCartRomInit();
break;
case MEDIUM_DISK_DRIVE:
handle = func_8001EE60();
handle = osDriveRomInit();
break;
default:
return 0;

4
src/driverominit.c Normal file
View File

@ -0,0 +1,4 @@
#include "sys.h"
OSPiHandle* osDriveRomInit(void) {
}

12
src/engine/fox_360.c
View File

@ -2135,7 +2135,7 @@ void ActorAllRange_DrawShield(Actor* this) {
Matrix_Scale(gGfxMatrix, sp24, sp24 * 0.5f, sp24, MTXF_APPLY);
Matrix_RotateY(gGfxMatrix, gGameFrameCount * 3.0f * M_DTOR, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x29);
RCP_SetupDL(&gMasterDisp, SETUPDL_41);
if (gCurrentLevel == LEVEL_KATINA) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 128, 255, 255, sp20);
} else if (gCurrentLevel == LEVEL_BOLSE) {
@ -2165,7 +2165,7 @@ void ActorAllRange_DrawBarrelRoll(Actor* this) {
}
Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 2.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, alpha);
gDPSetEnvColor(gMasterDisp++, 0, 0, 160, alpha);
gSPDisplayList(gMasterDisp++, D_101DC10);
@ -2177,16 +2177,16 @@ bool ActorAllRange_MissileOverrideLimbDraw(s32 limbIndex, Gfx** dList, Vec3f* po
Actor* this = thisx;
if ((this->timer_0C6 % 2) != 0) {
RCP_SetupDL(&gMasterDisp, 0x22);
RCP_SetupDL(&gMasterDisp, SETUPDL_34);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 128, 128, 255);
} else {
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
}
if ((limbIndex == 1) || (limbIndex == 3)) {
rot->z += gGameFrameCount * 3.0f;
}
if ((limbIndex == 1) || (limbIndex == 2)) {
RCP_SetupDL(&gMasterDisp, 0x22);
RCP_SetupDL(&gMasterDisp, SETUPDL_34);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, (s32) gSzMissileR, (s32) gSzMissileG, (s32) gSzMissileB, 255);
}
return false;
@ -2209,7 +2209,7 @@ void ActorAllRange_Draw(ActorAllRange* this) {
Matrix_SetGfxMtx(&gMasterDisp);
}
if ((this->timer_0C6 % 2) == 0) {
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
gSPFogPosition(gMasterDisp++, gFogNear, 1005);
}
switch (this->aiType) {

18
src/engine/fox_beam.c
View File

@ -1259,7 +1259,7 @@ void PlayerShot_DrawShot(PlayerShot* shot) {
break;
case PLAYERSHOT_BOMB:
if (shot->unk_5C == 0) {
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
gSPDisplayList(gMasterDisp++, D_10231A0);
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
@ -1273,7 +1273,7 @@ void PlayerShot_DrawShot(PlayerShot* shot) {
} else {
Matrix_Scale(gGfxMatrix, 1.2f, 1.2f, 1.2f, MTXF_APPLY);
}
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
if (gVersusMode) {
switch (shot->sourceId) {
@ -1329,7 +1329,7 @@ void PlayerShot_DrawShot(PlayerShot* shot) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
gDPSetEnvColor(gMasterDisp++, D_800C9C00[shot->sourceId], D_800C9C04[shot->sourceId],
D_800C9C08[shot->sourceId], 255);
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
if (gLaserStrength[shot->sourceId] != LASERS_SINGLE) {
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 48.0f * M_DTOR, MTXF_APPLY);
Matrix_Push(&gGfxMatrix);
@ -1377,7 +1377,7 @@ void PlayerShot_DrawShot(PlayerShot* shot) {
case PLAYERSHOT_7:
Matrix_Scale(gGfxMatrix, shot->scale, shot->scale, shot->scale, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
gDPSetEnvColor(gMasterDisp++, D_800C9C00[shot->sourceId], D_800C9C04[shot->sourceId],
D_800C9C08[shot->sourceId], 255);
@ -1399,14 +1399,14 @@ void PlayerShot_DrawShot(PlayerShot* shot) {
Matrix_RotateY(gGfxMatrix, M_PI, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
if (gCurrentLevel == LEVEL_AQUAS) {
RCP_SetupDL(&gMasterDisp, 0x3C);
RCP_SetupDL(&gMasterDisp, SETUPDL_60);
gSPDisplayList(gMasterDisp++, D_AQ_600DB80);
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, shot->obj.pos.x, gGroundHeight, shot->obj.pos.z + gPathProgress,
MTXF_APPLY);
Matrix_Scale(gGfxMatrix, shot->vec_2C.x, shot->vec_2C.y, shot->vec_2C.z, MTXF_APPLY);
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 32, 32, 0, shot->unk_58);
gDPSetEnvColor(gMasterDisp++, 32, 16, 16, shot->unk_58);
Matrix_SetGfxMtx(&gMasterDisp);
@ -1423,7 +1423,7 @@ void PlayerShot_DrawShot(PlayerShot* shot) {
Matrix_RotateX(gGfxMatrix, gPlayer[gPlayerNum].camPitch, MTXF_APPLY);
Matrix_Push(&gGfxMatrix);
Matrix_Scale(gGfxMatrix, 20.0f, 20.0f, 20.0f, MTXF_APPLY);
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
if (gVersusMode) {
switch (shot->sourceId) {
@ -1458,7 +1458,7 @@ void PlayerShot_DrawShot(PlayerShot* shot) {
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_1024AC0);
} else {
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
gSPDisplayList(gMasterDisp++, D_10231A0);
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
@ -1471,7 +1471,7 @@ void PlayerShot_DrawShot(PlayerShot* shot) {
} else {
Matrix_Scale(gGfxMatrix, 1.5f, 1.5f, 1.5f, MTXF_APPLY);
}
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 0, 255);
gDPSetEnvColor(gMasterDisp++, 255, 128, 128, 255);
Matrix_SetGfxMtx(&gMasterDisp);

12
src/engine/fox_bg.c
View File

@ -267,7 +267,7 @@ void Background_DrawBackdrop(void) {
}
switch (levelType) {
case LEVELTYPE_PLANET:
RCP_SetupDL(&gMasterDisp, 0x11);
RCP_SetupDL(&gMasterDisp, SETUPDL_17);
switch (levelId) {
case LEVEL_FORTUNA:
case LEVEL_KATINA:
@ -360,7 +360,7 @@ void Background_DrawBackdrop(void) {
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_VE2_600F670);
} else if ((gDrawBackdrop == 3) || (gDrawBackdrop == 4)) {
RCP_SetupDL(&gMasterDisp, 0x3E);
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
if (gDrawBackdrop == 4) {
if ((gGameFrameCount & 8) == 0) {
Math_SmoothStepToF(&gAndrossUnkBrightness, 0.0f, 1.0f, 30.0f, 0);
@ -386,7 +386,7 @@ void Background_DrawBackdrop(void) {
gSPDisplayList(gMasterDisp++, D_VE2_60038E0);
} else {
fake_label: // fake
RCP_SetupDL(&gMasterDisp, 0x3E);
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
if (gDrawBackdrop == 5) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 64);
} else {
@ -1003,7 +1003,7 @@ void Background_DrawGround(void) {
}
break;
case LEVEL_AQUAS:
RCP_SetupDL(&gMasterDisp, 0x14);
RCP_SetupDL(&gMasterDisp, SETUPDL_20);
sp1C0 = D_AQ_600AB10;
gSPFogPosition(gMasterDisp++, gFogNear, gFogFar);
if ((D_bg_8015F964 == 0) && ((gAqDrawMode == 0) || (gAqDrawMode == 2))) {
@ -1038,9 +1038,9 @@ void Background_DrawGround(void) {
gDPSetupTile(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, temp_fv0, temp_s0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD);
if (gAqDrawMode != 0) {
RCP_SetupDL(&gMasterDisp, 0x2F);
RCP_SetupDL(&gMasterDisp, SETUPDL_47);
} else {
RCP_SetupDL(&gMasterDisp, 0x25);
RCP_SetupDL(&gMasterDisp, SETUPDL_37);
}
if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_LEVEL_INTRO) && (gPlayer[0].csState < 2)) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);

6
src/engine/fox_demo.c
View File

@ -2514,7 +2514,7 @@ void ActorCutscene_Draw(Actor* actor) {
switch (actor->animFrame) {
case 1000:
RCP_SetupDL(&gMasterDisp, 0x2D);
RCP_SetupDL(&gMasterDisp, SETUPDL_45);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, actor->unk_046);
gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_40018A0);
@ -2589,7 +2589,7 @@ void ActorCutscene_Draw(Actor* actor) {
Display_SetSecondLight(&actor->obj.pos);
if (actor->unk_046 != 0) {
RCP_SetupDL(&gMasterDisp, 0x37);
RCP_SetupDL(&gMasterDisp, SETUPDL_55);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
Rand_SetSeed(1, 29000, 9876);
@ -2650,7 +2650,7 @@ void ActorCutscene_Draw(Actor* actor) {
Matrix_Push(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
switch ((gGameFrameCount >> 3) % 4U) {
case 0:

44
src/engine/fox_display.c
View File

@ -58,7 +58,7 @@ void Display_DrawHelpAlert(void) {
if ((sp5C.z < 0.0f) && (sp5C.z > -12000.0f) && (fabsf(sp5C.x) < fabsf(sp5C.z * 0.4f))) {
sp7C = 1;
}
RCP_SetupDL(&gMasterDisp, 0xC);
RCP_SetupDL(&gMasterDisp, SETUPDL_12);
switch (gTeamHelpActor->aiType) {
case AI360_PEPPY:
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 30, 0, 255);
@ -107,7 +107,7 @@ void Display_DrawHelpAlert(void) {
}
switch (sp7C) {
case 0:
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 0, 255);
if (sp78 < 0.0f) {
Graphics_DisplaySmallText(43 - 19, 106, 1.0f, 1.0f, "HELP!!");
@ -116,7 +116,7 @@ void Display_DrawHelpAlert(void) {
}
break;
case 1:
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 0, 255);
Graphics_DisplaySmallText(43 - 19, 106, 1.0f, 1.0f, "HELP!!");
Graphics_DisplaySmallText(SCREEN_WIDTH - 43 - 19, 106, 1.0f, 1.0f, "HELP!!");
@ -336,7 +336,7 @@ void func_display_80052B80(Player* player) {
} else {
Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 0.5f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
gDPSetEnvColor(gMasterDisp++, 0, 255, 0, 255);
gSPDisplayList(gMasterDisp++, D_1024AC0);
@ -356,7 +356,7 @@ void func_display_80052D48(Player* player) {
} else {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 192);
gDPSetEnvColor(gMasterDisp++, 255, 0, 0, 192);
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
}
sp2C = player->unk_16C;
if (sp2C > 0.2f) {
@ -418,7 +418,7 @@ bool func_display_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot,
WingInfo* wings = (WingInfo*) wingData;
if ((D_display_800CA22C != 0) && (gPlayer[0].unk_200 == 0)) {
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
func_display_8005314C();
}
switch (limbIndex) {
@ -430,7 +430,7 @@ bool func_display_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot,
*gfxPtr = D_arwing_3015120;
}
if ((D_display_800CA22C != 0) && ((gRightWingFlashTimer[0] % 2) != 0)) {
RCP_SetupDL(&gMasterDisp, 0x22);
RCP_SetupDL(&gMasterDisp, SETUPDL_34);
func_display_8005314C();
if (gRightWingFlashTimer[0] > 1000) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 32, 32, 255, 255);
@ -445,7 +445,7 @@ bool func_display_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot,
*gfxPtr = NULL;
}
if ((D_display_800CA22C != 0) && ((gRightWingFlashTimer[0] % 2) != 0)) {
RCP_SetupDL(&gMasterDisp, 0x22);
RCP_SetupDL(&gMasterDisp, SETUPDL_34);
func_display_8005314C();
if (gRightWingFlashTimer[0] > 1000) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 32, 32, 255, 255);
@ -462,7 +462,7 @@ bool func_display_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot,
*gfxPtr = D_arwing_3014BF0;
}
if ((D_display_800CA22C != 0) && ((gLeftWingFlashTimer[0] % 2) != 0)) {
RCP_SetupDL(&gMasterDisp, 0x22);
RCP_SetupDL(&gMasterDisp, SETUPDL_34);
func_display_8005314C();
if (gLeftWingFlashTimer[0] > 1000) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 32, 32, 255, 255);
@ -477,7 +477,7 @@ bool func_display_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot,
*gfxPtr = NULL;
}
if ((D_display_800CA22C != 0) && ((gLeftWingFlashTimer[0] % 2) != 0)) {
RCP_SetupDL(&gMasterDisp, 0x22);
RCP_SetupDL(&gMasterDisp, SETUPDL_34);
func_display_8005314C();
if (gLeftWingFlashTimer[0] > 1000) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 32, 32, 255, 255);
@ -664,7 +664,7 @@ void func_display_80053F7C(Player* player) {
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, translate->x, translate->y, translate->z, MTXF_APPLY);
if (gChargeTimers[player->num] >= 20) {
RCP_SetupDL(&gMasterDisp, 0x3F);
RCP_SetupDL(&gMasterDisp, SETUPDL_63);
if (i == 1) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
gDPSetEnvColor(gMasterDisp++, 255, 0, 0, 255);
@ -708,7 +708,7 @@ void func_display_80054280(Player* player, s32 arg1) {
void func_display_80054300(Player* player) {
Math_SmoothStepToF(&sPlayerShadowing, player->shadowing, 1.0f, 10.0f, 0.0f);
RCP_SetupDL(&gMasterDisp, 0x42);
RCP_SetupDL(&gMasterDisp, SETUPDL_66);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, (s32) sPlayerShadowing);
if (player->groundPos.y > 30.0f) {
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
@ -732,7 +732,7 @@ void func_display_80054300(Player* player) {
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 20.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
if (gCurrentLevel == LEVEL_MACBETH) {
RCP_SetupDL(&gMasterDisp, 0x41);
RCP_SetupDL(&gMasterDisp, SETUPDL_65);
}
if (!gVersusMode) {
gSPDisplayList(gMasterDisp++, D_landmaster_3008100);
@ -757,7 +757,7 @@ void func_display_80054300(Player* player) {
}
void Play_DrawEngineGlow(s32 levelType) {
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
switch (levelType) {
@ -838,7 +838,7 @@ void func_display_80054914(Player* player) {
Matrix_RotateX(gGfxMatrix, M_PI, MTXF_APPLY);
}
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, player->barrelRollAlpha);
gDPSetEnvColor(gMasterDisp++, 0, 0, 160, player->barrelRollAlpha);
gSPDisplayList(gMasterDisp++, D_101DC10);
@ -853,7 +853,7 @@ void func_display_80054CA4(Player* player) {
Matrix_Translate(gGfxMatrix, 0.0f, -5.0f, 10.0f, MTXF_APPLY);
Matrix_Scale(gGfxMatrix, 2.5f, 1.6f, 2.5f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x44);
RCP_SetupDL(&gMasterDisp, SETUPDL_68);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 255, 255, (s32) gShieldAlpha[player->num]);
gDPSetEnvColor(gMasterDisp++, 255, 0, 255, (s32) gShieldAlpha[player->num]);
gSPDisplayList(gMasterDisp++, D_101CD70);
@ -874,7 +874,7 @@ void func_display_80054E80(Player* player) {
f32 sp80;
if (gChargeTimers[player->num] > 10) {
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
Matrix_Copy(gCalcMatrix, &D_display_80161418[player->num]);
if (player->alternateView && (gLevelMode == LEVELMODE_ON_RAILS)) {
Matrix_MultVec3f(gCalcMatrix, &spB8, &sp94);
@ -891,7 +891,7 @@ void func_display_80054E80(Player* player) {
} else {
Matrix_Scale(gGfxMatrix, 10.0f, 10.0f, 10.0f, MTXF_APPLY);
}
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 128);
if (gVersusMode) {
switch (player->num) {
@ -933,7 +933,7 @@ void func_display_80054E80(Player* player) {
}
if (gMuzzleFlashScale[player->num] > 0.1f) {
Matrix_Push(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
Matrix_Copy(gCalcMatrix, &D_display_80161418[player->num]);
laserStrength = gLaserStrength[player->num];
if (player->wings.unk_14 > -8.0f) {
@ -991,7 +991,7 @@ void func_display_80055788(Player* player) {
f32 sp54;
if (gChargeTimers[player->num] > 10) {
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
Matrix_Push(&gGfxMatrix);
sp54 = gChargeTimers[player->num] / 20.0f;
Matrix_Translate(gGfxMatrix, D_display_80161548[player->num].x, D_display_80161548[player->num].y,
@ -999,7 +999,7 @@ void func_display_80055788(Player* player) {
Matrix_Scale(gGfxMatrix, sp54, sp54, 1.0f, MTXF_APPLY);
Matrix_Push(&gGfxMatrix);
Matrix_Scale(gGfxMatrix, 10.0f, 10.0f, 10.0f, MTXF_APPLY);
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 128);
if (gVersusMode) {
switch (player->num) {
@ -1443,7 +1443,7 @@ void func_display_80057504(void) {
Matrix_Scale(gGfxMatrix, var_fs0 * 1.5f, var_fs0 * 1.5f, 1.0f, MTXF_APPLY);
Matrix_RotateZ(gGfxMatrix, D_display_801615A8[i] * M_DTOR, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
gDPSetEnvColor(gMasterDisp++, 255, 0, 0, 255);
gSPDisplayList(gMasterDisp++, D_1024F60);

68
src/engine/fox_edisplay.c
View File

@ -51,7 +51,7 @@ void Graphics_SetScaleMtx(f32 scale) {
}
void Sprite168_Draw(Sprite168* this) {
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 60);
RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
}
@ -276,26 +276,26 @@ void ActorDebris_Draw(ActorDebris* this) {
case 0:
break;
case 1:
RCP_SetupDL(&gMasterDisp, 0x3D);
RCP_SetupDL(&gMasterDisp, SETUPDL_61);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
break;
case 2:
RCP_SetupDL(&gMasterDisp, 0x39);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
break;
case 3:
RCP_SetupDL(&gMasterDisp, 0x21);
RCP_SetupDL(&gMasterDisp, SETUPDL_33);
break;
}
if (gCurrentLevel != LEVEL_SOLAR) {
gSPDisplayList(gMasterDisp++, D_TI_801B769C[this->unk_046]);
} else {
if (gBosses[0].fwork[3] < 4800.0f) {
RCP_SetupDL(&gMasterDisp, 0x1E);
RCP_SetupDL(&gMasterDisp, SETUPDL_30);
gDPSetFogColor(gMasterDisp++, 64, 32, 32, gFogAlpha);
gSPFogPosition(gMasterDisp++, gFogNear, gFogFar);
} else {
RCP_SetupDL(&gMasterDisp, 0x1E);
RCP_SetupDL(&gMasterDisp, SETUPDL_30);
gDPSetFogColor(gMasterDisp++, 16, 16, 16, gFogAlpha);
gSPFogPosition(gMasterDisp++, gFogNear, gFogFar);
}
@ -324,7 +324,7 @@ void ActorDebris_Draw(ActorDebris* this) {
break;
case 46:
if ((this->unk_048 == 2) || (this->unk_048 == 3) || (this->unk_048 == 4)) {
RCP_SetupDL(&gMasterDisp, 0x21);
RCP_SetupDL(&gMasterDisp, SETUPDL_33);
}
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_TI_801B7584[this->unk_048]);
@ -343,10 +343,10 @@ void ActorDebris_Draw(ActorDebris* this) {
case 50:
Graphics_SetScaleMtx(0.7f);
if (this->iwork[1] == 1) {
RCP_SetupDL(&gMasterDisp, 0x1E);
RCP_SetupDL(&gMasterDisp, SETUPDL_30);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
} else if (this->iwork[1] == 2) {
RCP_SetupDL(&gMasterDisp, 0x1E);
RCP_SetupDL(&gMasterDisp, SETUPDL_30);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
Graphics_SetScaleMtx(0.7f);
}
@ -365,7 +365,7 @@ void ActorDebris_Draw(ActorDebris* this) {
break;
}
if (this->iwork[1] != 0) {
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
Graphics_SetScaleMtx(0.7f);
}
break;
@ -391,7 +391,7 @@ void ActorDebris_Draw(ActorDebris* this) {
break;
case 56:
Graphics_SetScaleMtx(this->scale);
RCP_SetupDL(&gMasterDisp, 0x29);
RCP_SetupDL(&gMasterDisp, SETUPDL_41);
Matrix_SetGfxMtx(&gMasterDisp);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 191, 255, 223, 255);
gSPDisplayList(gMasterDisp++, D_edisplay_800CFC64[this->unk_048]);
@ -633,7 +633,7 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_102A8A0);
}
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
break;
case OBJ_ACTOR_CUTSCENE:
case OBJ_ACTOR_TEAM_BOSS:
@ -646,7 +646,7 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
gSPDisplayList(gMasterDisp++, D_102A010);
break;
case EVID_81:
RCP_SetupDL(&gMasterDisp, 0x30);
RCP_SetupDL(&gMasterDisp, SETUPDL_48);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255);
gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 255);
temp_fv0 = gActors[index].fwork[15] * 3.0f;
@ -672,7 +672,7 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
break;
case OBJ_BOSS_KA:
if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_STANDBY) {
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 200);
}
Matrix_RotateX(gGfxMatrix, M_PI / 2, MTXF_APPLY);
@ -710,7 +710,7 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
break;
case OBJ_ACTOR_230:
RCP_SetupDL_48();
RCP_SetupDL(&gMasterDisp, 0x45);
RCP_SetupDL(&gMasterDisp, SETUPDL_69);
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255);
gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 0);
@ -722,7 +722,7 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
gSPDisplayList(gMasterDisp++, D_1024AC0);
break;
case OBJ_ACTOR_229:
RCP_SetupDL(&gMasterDisp, 0x44);
RCP_SetupDL(&gMasterDisp, SETUPDL_68);
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255);
gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 0);
@ -736,7 +736,7 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
gSPDisplayList(gMasterDisp++, D_1024AC0);
break;
case OBJ_ACTOR_231:
RCP_SetupDL(&gMasterDisp, 0x45);
RCP_SetupDL(&gMasterDisp, SETUPDL_69);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255);
gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 0);
Matrix_RotateX(gGfxMatrix, gActors[index].fwork[1], MTXF_APPLY);
@ -766,7 +766,7 @@ void ItemCheckpoint_Draw(ItemCheckpoint* this) {
if (((gGameFrameCount & 0x18) != 0) && (this->state == 0)) {
Matrix_Push(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 0, 255);
Matrix_Scale(gGfxMatrix, 3.2f, 3.2f, 3.2f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
@ -775,7 +775,7 @@ void ItemCheckpoint_Draw(ItemCheckpoint* this) {
gDPSetTextureFilter(gMasterDisp++, G_TF_BILERP);
Matrix_Pop(&gGfxMatrix);
}
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
gSPTexture(gMasterDisp++, 2000, 2000, 0, G_TX_RENDERTILE, G_ON);
gSPSetGeometryMode(gMasterDisp++, G_TEXTURE_GEN);
Matrix_RotateZ(gGfxMatrix, this->unk_58 * M_DTOR, MTXF_APPLY);
@ -793,7 +793,7 @@ void ItemCheckpoint_Draw(ItemCheckpoint* this) {
}
void ItemSilverRing_Draw(ItemSilverRing* this) {
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
gSPTexture(gMasterDisp++, 3000, 0, 0, G_TX_RENDERTILE, G_ON);
gSPSetGeometryMode(gMasterDisp++, G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR);
Graphics_SetScaleMtx(this->width);
@ -802,7 +802,7 @@ void ItemSilverRing_Draw(ItemSilverRing* this) {
}
void ItemSilverStar_Draw(ItemSilverStar* this) {
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
gSPTexture(gMasterDisp++, 3000, 0, 0, G_TX_RENDERTILE, G_ON);
gSPSetGeometryMode(gMasterDisp++, G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR);
Graphics_SetScaleMtx(this->width);
@ -811,7 +811,7 @@ void ItemSilverStar_Draw(ItemSilverStar* this) {
}
void ItemGoldRing_Draw(ItemGoldRing* this) {
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
gSPTexture(gMasterDisp++, 1900, 1700, 0, G_TX_RENDERTILE, G_ON);
gSPSetGeometryMode(gMasterDisp++, G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR);
Graphics_SetScaleMtx(this->width);
@ -825,12 +825,12 @@ void ItemBomb_Draw(ItemBomb* this) {
gSPDisplayList(gMasterDisp++, D_blue_marine_3005980);
} else {
Graphics_SetScaleMtx(this->width * 0.1f);
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
gSPTexture(gMasterDisp++, 2000, 2000, 0, G_TX_RENDERTILE, G_ON);
gSPSetGeometryMode(gMasterDisp++, G_TEXTURE_GEN);
gSPDisplayList(gMasterDisp++, D_10231A0);
gSPClearGeometryMode(gMasterDisp++, G_TEXTURE_GEN);
RCP_SetupDL(&gMasterDisp, 0x1B);
RCP_SetupDL(&gMasterDisp, SETUPDL_27);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
gSPDisplayList(gMasterDisp++, D_1022E80);
}
@ -838,12 +838,12 @@ void ItemBomb_Draw(ItemBomb* this) {
void ItemLasers_Draw(ItemLasers* this) {
Graphics_SetScaleMtx(this->width * 0.1f);
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
gSPTexture(gMasterDisp++, 2000, 2000, 0, G_TX_RENDERTILE, G_ON);
gSPSetGeometryMode(gMasterDisp++, G_TEXTURE_GEN);
gSPDisplayList(gMasterDisp++, D_1019820);
gSPClearGeometryMode(gMasterDisp++, G_TEXTURE_GEN);
RCP_SetupDL(&gMasterDisp, 0x1B);
RCP_SetupDL(&gMasterDisp, SETUPDL_27);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
gSPDisplayList(gMasterDisp++, D_101A8E0);
}
@ -856,7 +856,7 @@ void ItemMeteoWarp_Draw(ItemMeteoWarp* this) {
180.0f) /
M_PI;
if (this->state != 0) {
RCP_SetupDL(&gMasterDisp, 0x29);
RCP_SetupDL(&gMasterDisp, SETUPDL_41);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, this->unk_44);
} else {
RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
@ -1315,7 +1315,7 @@ void ActorAllRange_DrawShadow(Actor* actor) {
}
void Object_DrawShadow(s32 index, Object* obj) {
RCP_SetupDL(&gMasterDisp, 0x42);
RCP_SetupDL(&gMasterDisp, SETUPDL_66);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 180);
if (obj->id == OBJ_ACTOR_ALLRANGE) {
ActorAllRange_DrawShadow(&gActors[index]);
@ -1668,7 +1668,7 @@ void Object_DrawAll(s32 arg0) {
for (i = 0, item = gItems; i < ARRAY_COUNT(gItems); i++, item++) {
if (item->obj.status >= OBJ_ACTIVE) {
Matrix_Push(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
Object_SetCullDirection(arg0);
Item_Draw(item, arg0);
Matrix_Pop(&gGfxMatrix);
@ -1683,7 +1683,7 @@ void Effect_DrawAll(s32 arg0) {
Boss* boss;
Effect* effect;
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
for (i = 0, effect = gEffects; i < ARRAY_COUNT(gEffects); i++, effect++) {
if (effect->obj.status >= OBJ_ACTIVE) {
if (effect->info.unk_14 == 1) {
@ -1768,10 +1768,10 @@ void TexturedLine_Draw(void) {
s32 i;
if (gCurrentLevel == LEVEL_MACBETH) {
RCP_SetupDL(&gMasterDisp, 0x21);
RCP_SetupDL(&gMasterDisp, SETUPDL_33);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
} else if ((gCurrentLevel == LEVEL_AQUAS) || (gCurrentLevel == LEVEL_VENOM_ANDROSS)) {
RCP_SetupDL(&gMasterDisp, 0x29);
RCP_SetupDL(&gMasterDisp, SETUPDL_41);
} else {
RCP_SetupDL_14();
}
@ -1823,9 +1823,9 @@ void TexturedLine_DrawPath(s32 index) {
TexturedLine* texLine = &gTexturedLines[index];
if (texLine->prim.a == 255) {
RCP_SetupDL(&gMasterDisp, 5);
RCP_SetupDL(&gMasterDisp, SETUPDL_5);
} else {
RCP_SetupDL(&gMasterDisp, 0xE);
RCP_SetupDL(&gMasterDisp, SETUPDL_14);
}
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, texLine->prim.r, texLine->prim.g, texLine->prim.b, texLine->prim.a);
Matrix_Push(&gGfxMatrix);

130
src/engine/fox_effect.c
View File

@ -133,7 +133,7 @@ void BonusText_DrawAll(void) {
BonusText* bonus;
s32 i;
RCP_SetupDL(&gMasterDisp, 0x3E);
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
for (i = 0, bonus = gBonusText; i < ARRAY_COUNT(gBonusText); i++, bonus++) {
@ -210,7 +210,7 @@ void func_effect_80077A7C(Effect* effect) {
Matrix_Translate(gGfxMatrix, 0.0f, 20.0f, 0.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_ZO_6024220);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
void func_effect_80077B78(Effect* effect) {
@ -221,9 +221,9 @@ void func_effect_80077B84(Effect* effect) {
if ((effect->scale1 == 71.0f) ||
((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_LEVEL_COMPLETE) && (gCurrentLevel == LEVEL_CORNERIA))) {
RCP_SetupDL(&gMasterDisp, 0x26);
RCP_SetupDL(&gMasterDisp, SETUPDL_38);
} else {
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
}
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_44);
@ -250,7 +250,7 @@ void func_effect_80077B84(Effect* effect) {
break;
case 6:
if (gCurrentLevel == LEVEL_BOLSE) {
RCP_SetupDL(&gMasterDisp, 0x26);
RCP_SetupDL(&gMasterDisp, SETUPDL_38);
}
switch ((effect->index + gGameFrameCount) % 4U) {
case 0:
@ -286,17 +286,17 @@ void func_effect_80077B84(Effect* effect) {
}
gSPDisplayList(gMasterDisp++, D_1024AC0);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
void func_effect_80078038(Effect* effect) {
Graphics_SetScaleMtx(effect->scale2);
RCP_SetupDL_49();
RCP_SetupDL(&gMasterDisp, 0x26);
RCP_SetupDL(&gMasterDisp, SETUPDL_38);
gDPSetPrimColor(gMasterDisp++, 0, 0, 64, 192, 255, effect->unk_44);
gDPSetEnvColor(gMasterDisp++, 0, 0, 0, effect->unk_44);
gSPDisplayList(gMasterDisp++, D_1024AC0);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
// Possibly the little sparks of electricity that come off the arwing and landmaster when low on health
@ -381,12 +381,12 @@ void func_effect_800784B4(Effect* effect) {
}
void func_effect_80078550(Effect* effect) {
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
Graphics_SetScaleMtx(effect->scale2);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_4A);
gDPSetEnvColor(gMasterDisp++, 101, 138, 153, 255);
gSPDisplayList(gMasterDisp++, D_blue_marine_3000660);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
void func_effect_80078604(Effect* effect) {
@ -406,7 +406,7 @@ void func_effect_8007868C(Effect* effect) {
}
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_1029780);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
void func_effect_8007879C(Effect* effect) {
@ -416,7 +416,7 @@ void func_effect_8007879C(Effect* effect) {
Matrix_RotateX(gGfxMatrix, M_PI / 2, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_1029780);
RCP_SetupDL(&gMasterDisp, 0x40);
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 };
@ -433,14 +433,14 @@ void func_effect_800788B0(Effect* effect) {
break;
case LEVEL_AQUAS:
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
temp_ft3 = Math_ModF(effect->index, 4.0f);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) effect->scale1);
tmp = temp_ft3 * 4.0f;
gDPSetEnvColor(gMasterDisp++, D_800D173C[tmp + 0], D_800D173C[tmp + 1], D_800D173C[tmp + 2], 255);
Graphics_SetScaleMtx(effect->scale2);
gSPDisplayList(gMasterDisp++, D_1024AC0);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
break;
}
}
@ -463,7 +463,7 @@ void func_effect_80078AEC(Effect* effect) {
void func_effect_80078B8C(Effect* effect) {
RCP_SetupDL_21();
gSPDisplayList(gMasterDisp++, D_101ABD0);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
void func_effect_80078BE0(Effect* effect) {
@ -548,15 +548,15 @@ void func_effect_80078EBC(Effect* effect) {
void func_effect_80078F78(Effect* effect) {
if (effect->state != 0) {
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
} else {
RCP_SetupDL(&gMasterDisp, 0x3F);
RCP_SetupDL(&gMasterDisp, SETUPDL_63);
}
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(gMasterDisp++, 255, 255, 0, 255);
Graphics_SetScaleMtx(effect->scale2 * effect->scale1);
gSPDisplayList(gMasterDisp++, D_101C2E0);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
void func_effect_8007905C(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, u8 arg5) {
@ -716,7 +716,7 @@ void func_effect_800798F0(Effect* effect) {
Display_SetSecondLight(&effect->obj.pos);
}
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
if (gCurrentLevel == LEVEL_KATINA) {
gSPFogPosition(gMasterDisp++, gFogNear, 1005);
@ -736,13 +736,13 @@ void func_effect_800798F0(Effect* effect) {
break;
case 2:
RCP_SetupDL(&gMasterDisp, 0x39);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
if ((effect->index % 2) != 0) {
gSPDisplayList(gMasterDisp++, D_MA_601A7A0);
} else {
gSPDisplayList(gMasterDisp++, D_MA_60223C0);
}
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
break;
case 7:
@ -764,7 +764,7 @@ void func_effect_800798F0(Effect* effect) {
break;
case 10:
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(gMasterDisp++, 255, 80, 0, 255);
Graphics_SetScaleMtx(effect->scale1);
@ -825,7 +825,7 @@ void func_effect_800798F0(Effect* effect) {
case LEVEL_AQUAS:
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x3C);
RCP_SetupDL(&gMasterDisp, SETUPDL_60);
gSPDisplayList(gMasterDisp++, D_AQ_600A220);
break;
@ -855,16 +855,16 @@ void func_effect_800798F0(Effect* effect) {
break;
}
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x39);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_1021E20);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
break;
}
break;
}
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
if (gCurrentLevel == LEVEL_KATINA) {
gSPFogPosition(gMasterDisp++, gFogNear, gFogFar);
@ -1045,14 +1045,14 @@ void func_effect_8007A994(Effect* effect) {
static Gfx* D_800D178C[] = { D_TI_6003440, D_TI_60034E0, D_TI_6003580, D_TI_6003620, D_TI_60036C0, D_TI_6003760 };
void func_effect_8007AA60(Effect* effect) {
RCP_SetupDL(&gMasterDisp, 0x44);
RCP_SetupDL(&gMasterDisp, SETUPDL_68);
gDPSetPrimColor(gMasterDisp++, 0, 0, 31, 10, 00, effect->unk_44);
gDPSetEnvColor(gMasterDisp++, 141, 73, 5, 0);
Matrix_Scale(gGfxMatrix, effect->scale2, effect->scale2, 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_800D178C[effect->unk_4C]);
effect->unk_4C = effect->unk_48;
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
void func_effect_8007AB50(Effect* effect) {
@ -1403,7 +1403,7 @@ void func_effect_8007B960(Effect* effect) {
void func_effect_8007B9DC(Effect* effect) {
//! DEBUG: Hold Z on controller 4 to set up a display list.
if (gControllerHold[3].button & Z_TRIG) {
RCP_SetupDL(&gMasterDisp, 4);
RCP_SetupDL(&gMasterDisp, SETUPDL_4);
}
Graphics_SetScaleMtx(effect->scale2);
@ -1420,7 +1420,7 @@ void func_effect_8007B9DC(Effect* effect) {
}
//! DEBUG: Hold Z on controller 4 to set up a display list.
if (gControllerHold[3].button & Z_TRIG) {
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
}
@ -2166,7 +2166,7 @@ void func_effect_8007DAE4(Effect* effect) {
Graphics_SetScaleMtx(effect->scale2);
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
gSPDisplayList(gMasterDisp++, D_CO_6004900);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
void func_effect_8007DB70(Effect* effect) {
@ -2226,7 +2226,7 @@ void func_effect_8007DED4(Effect* effect) {
Graphics_SetScaleMtx(effect->scale2);
RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_4008CE0);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
break;
case 1:
@ -2235,7 +2235,7 @@ void func_effect_8007DED4(Effect* effect) {
RCP_SetupDL_40();
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_4008F70);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
break;
}
}
@ -3050,7 +3050,7 @@ void func_effect_8008040C(Effect* effect) {
void func_effect_8008092C(Effect* effect) {
switch (effect->unk_44) {
case 0:
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
gDPSetEnvColor(gMasterDisp++, 255, 0, 0, 255);
Matrix_Scale(gGfxMatrix, 4.0f, 2.0f, 4.0f, MTXF_APPLY);
@ -3059,7 +3059,7 @@ void func_effect_8008092C(Effect* effect) {
break;
case 1:
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
gDPSetEnvColor(gMasterDisp++, 255, 0, 0, 255);
Matrix_RotateZ(gGfxMatrix, 30.0f * M_DTOR, MTXF_APPLY);
@ -3148,7 +3148,7 @@ void func_effect_80080D04(Effect* effect) {
}
gSPDisplayList(gMasterDisp++, effect->unk_74);
if (effect->unk_44 != 64) {
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
break;
@ -3174,60 +3174,60 @@ void func_effect_80080D04(Effect* effect) {
}
if (effect->unk_44 != 64) {
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
break;
case 10:
RCP_SetupDL(&gMasterDisp, 0x41);
RCP_SetupDL(&gMasterDisp, SETUPDL_65);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_48);
Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, effect->scale2, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_TI_A000000);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
break;
case 11:
RCP_SetupDL(&gMasterDisp, 0x44);
RCP_SetupDL(&gMasterDisp, SETUPDL_68);
Graphics_SetScaleMtx(effect->scale2);
gDPSetPrimColor(gMasterDisp++, 0, 0, 120, 60, 0, effect->unk_44);
gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 0);
gSPDisplayList(gMasterDisp++, D_1023750);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
break;
case 12:
Graphics_SetScaleMtx(effect->scale2);
RCP_SetupDL(&gMasterDisp, 0x17);
RCP_SetupDL(&gMasterDisp, SETUPDL_23);
gSPDisplayList(gMasterDisp++, D_VE1_9013C20);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
break;
case 13:
Graphics_SetScaleMtx(effect->scale2);
RCP_SetupDL(&gMasterDisp, 0x44);
RCP_SetupDL(&gMasterDisp, SETUPDL_68);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_44);
gDPSetEnvColor(gMasterDisp++, 36, 45, 28, 0);
gSPDisplayList(gMasterDisp++, D_1023750);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
break;
case 14:
Graphics_SetScaleMtx(effect->scale2);
RCP_SetupDL(&gMasterDisp, 0x44);
RCP_SetupDL(&gMasterDisp, SETUPDL_68);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_44);
gDPSetEnvColor(gMasterDisp++, 255, 255, 255, 0);
gSPDisplayList(gMasterDisp++, D_1023750);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
break;
case 15:
Graphics_SetScaleMtx(effect->scale2);
RCP_SetupDL(&gMasterDisp, 0x44);
RCP_SetupDL(&gMasterDisp, SETUPDL_68);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_4A);
gDPSetEnvColor(gMasterDisp++, 36, 45, 28, 0);
gSPDisplayList(gMasterDisp++, D_1023750);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
break;
case 16:
@ -3283,7 +3283,7 @@ void func_effect_80080D04(Effect* effect) {
break;
case 18:
RCP_SetupDL(&gMasterDisp, 0x30);
RCP_SetupDL(&gMasterDisp, SETUPDL_48);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 190, 255);
gDPSetEnvColor(gMasterDisp++, 239, 15, 0, 255);
Graphics_SetScaleMtx(effect->scale2);
@ -3858,7 +3858,7 @@ void func_effect_80082F78(Effect* effect) {
switch (effect->state) {
case 0:
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
Matrix_Scale(gGfxMatrix, 0.7f, 0.7f, 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
@ -3867,14 +3867,14 @@ void func_effect_80082F78(Effect* effect) {
break;
case 1:
RCP_SetupDL(&gMasterDisp, 0x29);
RCP_SetupDL(&gMasterDisp, SETUPDL_41);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
Graphics_SetScaleMtx(effect->scale2);
gSPDisplayList(gMasterDisp++, D_101C2E0);
break;
case 2:
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
Matrix_Scale(gGfxMatrix, effect->scale2, effect->scale2, effect->scale2, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
@ -3889,7 +3889,7 @@ void func_effect_80082F78(Effect* effect) {
case 4:
Graphics_SetScaleMtx(effect->scale2);
RCP_SetupDL(&gMasterDisp, 0x44);
RCP_SetupDL(&gMasterDisp, SETUPDL_68);
gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 0, 0, effect->unk_4A);
gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 0);
gSPDisplayList(gMasterDisp++, D_1023750);
@ -3898,7 +3898,7 @@ void func_effect_80082F78(Effect* effect) {
case 5:
case 7:
Graphics_SetScaleMtx(effect->scale2);
RCP_SetupDL(&gMasterDisp, 0x3C);
RCP_SetupDL(&gMasterDisp, SETUPDL_60);
if (gCurrentLevel == LEVEL_AQUAS) {
gSPDisplayList(gMasterDisp++, D_AQ_600A220);
}
@ -3912,13 +3912,13 @@ void func_effect_80082F78(Effect* effect) {
if (gCurrentLevel == LEVEL_ZONESS) {
Graphics_SetScaleMtx(effect->scale2);
}
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 255, 0, effect->unk_4A);
gSPDisplayList(gMasterDisp++, D_1023750);
break;
case 8:
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
Matrix_Scale(gGfxMatrix, effect->scale2, effect->scale2, effect->scale2, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
@ -3927,7 +3927,7 @@ void func_effect_80082F78(Effect* effect) {
break;
case 9:
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
Matrix_Scale(gGfxMatrix, effect->scale2, effect->scale2, effect->scale2, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->scale1);
@ -3939,7 +3939,7 @@ void func_effect_80082F78(Effect* effect) {
if (gPlayState != PLAY_PAUSE) {
Texture_Scroll(D_A6_6012840, 16, 16, 0);
}
RCP_SetupDL(&gMasterDisp, 0x35);
RCP_SetupDL(&gMasterDisp, SETUPDL_53);
Matrix_Scale(gGfxMatrix, effect->unk_60.x, effect->unk_60.y, effect->unk_60.z, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
@ -3947,7 +3947,7 @@ void func_effect_80082F78(Effect* effect) {
break;
case 11:
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0, 0, 111, 111, 111, (s32) effect->scale1);
gDPSetEnvColor(gMasterDisp++, 255, 255, 255, 255);
Graphics_SetScaleMtx(effect->scale2);
@ -3959,7 +3959,7 @@ void func_effect_80082F78(Effect* effect) {
break;
}
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
void func_effect_800836C0(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 scale) {
@ -4056,7 +4056,7 @@ void func_effect_80083B8C(Effect* effect) {
Matrix_Scale(gGfxMatrix, effect->unk_60.x, effect->scale2 * effect->unk_60.y, effect->scale2, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_ZO_601BAD0);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
void func_effect_80083C70(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 arg7,
@ -4190,19 +4190,19 @@ void func_effect_80084194(Effect* effect) {
s32 tmp;
if (gCurrentLevel != LEVEL_AQUAS) {
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
Matrix_Scale(gGfxMatrix, effect->scale2, effect->scale2, effect->scale2, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
tmp = effect->unk_44 * 4;
gDPSetEnvColor(gMasterDisp++, D_800D18F0[tmp + 0], D_800D18F0[tmp + 1], D_800D18F0[tmp + 2], 255);
} else {
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
Matrix_Scale(gGfxMatrix, effect->scale2, effect->scale2, effect->scale2, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_800D1950[effect->unk_44]);
gDPSetEnvColor(gMasterDisp++, 255, 0, 0, 255);
}
gSPDisplayList(gMasterDisp++, D_1024AC0);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}

22
src/engine/fox_enmy2.c
View File

@ -3812,7 +3812,7 @@ bool ActorEvent_OverrideLimbDraw2(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f*
Matrix_SetGfxMtx(&gMasterDisp);
if (*dList != NULL) {
RCP_SetupDL(&gMasterDisp, 0x22);
RCP_SetupDL(&gMasterDisp, SETUPDL_34);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, var_s1, var_s1, 255);
gSPDisplayList(gMasterDisp++, *dList);
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
@ -3842,9 +3842,9 @@ bool ActorEvent_OverrideLimbDraw3(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f*
}
s32 Scenery111_Draw(Scenery_111* this) {
RCP_SetupDL(&gMasterDisp, 0x3C);
RCP_SetupDL(&gMasterDisp, SETUPDL_60);
gSPDisplayList(gMasterDisp++, D_SY_601AD70);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
return 0;
}
@ -3886,9 +3886,9 @@ void ActorEvent_Draw(ActorEvent* this) {
} else if ((this->eventType == EVID_82) || (this->eventType == EVID_90) ||
((this->eventType == EVID_6) && (gCurrentLevel == LEVEL_SOLAR))) {
if ((this->timer_0C6 % 2) == 0) {
RCP_SetupDL(&gMasterDisp, 0x39);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
} else {
RCP_SetupDL(&gMasterDisp, 0x3D);
RCP_SetupDL(&gMasterDisp, SETUPDL_61);
}
}
@ -3898,7 +3898,7 @@ void ActorEvent_Draw(ActorEvent* this) {
case EVID_94:
case EVID_95:
case EVID_96:
RCP_SetupDL(&gMasterDisp, 0x22);
RCP_SetupDL(&gMasterDisp, SETUPDL_34);
gDPSetTextureFilter(gMasterDisp++, G_TF_POINT);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, (s32) this->fwork[15], (s32) this->fwork[16],
(s32) this->fwork[17], 255);
@ -4024,7 +4024,7 @@ void ActorEvent_Draw(ActorEvent* this) {
RAND_FLOAT_CENTERED(200.0f) + this->obj.pos.z,
RAND_FLOAT(1.5f) + 2.5f);
}
RCP_SetupDL(&gMasterDisp, 0x39);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_SX_6001950);
} else {
@ -4090,7 +4090,7 @@ void ActorEvent_Draw(ActorEvent* this) {
case EVID_METEO_PYRAMID_SHIP:
gSPDisplayList(gMasterDisp++, D_ME_6008AA0);
RCP_SetupDL(&gMasterDisp, 0x35);
RCP_SetupDL(&gMasterDisp, SETUPDL_53);
gSPDisplayList(gMasterDisp++, D_ME_6009E30);
break;
@ -4143,13 +4143,13 @@ void ActorEvent_Draw(ActorEvent* this) {
break;
case EVID_AQ_STARFISH:
RCP_SetupDL(&gMasterDisp, 0x16);
RCP_SetupDL(&gMasterDisp, SETUPDL_22);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, this->unk_046, this->unk_046, this->unk_046, 255);
gSPDisplayList(gMasterDisp++, D_AQ_6008970);
break;
case EVID_89:
RCP_SetupDL(&gMasterDisp, 0x15);
RCP_SetupDL(&gMasterDisp, SETUPDL_21);
gSPDisplayList(gMasterDisp++, D_AQ_6000E10);
break;
@ -4159,7 +4159,7 @@ void ActorEvent_Draw(ActorEvent* this) {
break;
case EVID_SX_WARP_ENMY:
RCP_SetupDL(&gMasterDisp, 0x23);
RCP_SetupDL(&gMasterDisp, SETUPDL_35);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 143);
gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 0);
gSPDisplayList(gMasterDisp++, D_WZ_7000000);

24
src/engine/fox_game.c
View File

@ -366,13 +366,13 @@ void Game_Update(void) {
}
break;
case GSTATE_SHOW_LOGO:
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
TextureRect_8bIA(&gMasterDisp, &gNintendoLogo[128 * 16 * 0], 128, 16, 100.0f, 86.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, &gNintendoLogo[128 * 16 * 1], 128, 16, 100.0f, 102.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, &gNintendoLogo[128 * 16 * 2], 128, 16, 100.0f, 118.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, &gNintendoLogo[128 * 16 * 3], 128, 16, 100.0f, 134.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, &gNintendoLogo[128 * 16 * 4], 128, 10, 100.0f, 150.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 0], 128, 16, 100.0f, 86.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 1], 128, 16, 100.0f, 102.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 2], 128, 16, 100.0f, 118.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 3], 128, 16, 100.0f, 134.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 4], 128, 10, 100.0f, 150.0f, 1.0f, 1.0f);
gGameState++;
break;
case GSTATE_CHECK_SAVE:
@ -389,13 +389,13 @@ void Game_Update(void) {
Timer_CreateTask(MSEC_TO_CYCLES(1000), Timer_Increment, (s32*) &gGameState, 1);
/* fallthrough */
case GSTATE_LOGO_WAIT:
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
TextureRect_8bIA(&gMasterDisp, &gNintendoLogo[128 * 16 * 0], 128, 16, 100.0f, 86.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, &gNintendoLogo[128 * 16 * 1], 128, 16, 100.0f, 102.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, &gNintendoLogo[128 * 16 * 2], 128, 16, 100.0f, 118.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, &gNintendoLogo[128 * 16 * 3], 128, 16, 100.0f, 134.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, &gNintendoLogo[128 * 16 * 4], 128, 10, 100.0f, 150.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 0], 128, 16, 100.0f, 86.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 1], 128, 16, 100.0f, 102.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 2], 128, 16, 100.0f, 118.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 3], 128, 16, 100.0f, 134.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 4], 128, 10, 100.0f, 150.0f, 1.0f, 1.0f);
break;
case GSTATE_START:
gGameState = GSTATE_INIT;

322
src/engine/fox_hud.c
View File

@ -139,7 +139,7 @@ void func_hud_80084930(f32 arg0, f32 arg1, s32 arg2) {
s32 var_v0;
s32 i;
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
player = gPlayer;
@ -157,14 +157,14 @@ void func_hud_80084930(f32 arg0, f32 arg1, s32 arg2) {
break;
}
TextureRect_4bCI(&gMasterDisp, D_800D1A58[var_t0], D_800D1A64[var_t0], 16, 16, arg0, arg1 - 2.0f, 1.0f, 1.0f);
TextureRect_4bCI(&gMasterDisp, D_1011ED0, D_1011F08, 16, 7, arg0 + 16.0f, arg1 + 7.0f, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_800D1A58[var_t0], D_800D1A64[var_t0], 16, 16, arg0, arg1 - 2.0f, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_1011ED0, D_1011F08, 16, 7, arg0 + 16.0f, arg1 + 7.0f, 1.0f, 1.0f);
if (arg2 >= 0) {
arg0 += 11.0f;
arg1 -= 1.0f;
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
var_v0 = 10;
@ -194,7 +194,7 @@ void func_hud_80084B94(s32 arg0) {
{ -191.0f, -129.0f, -600.0f },
};
RCP_SetupDL(&gMasterDisp, 0x24);
RCP_SetupDL(&gMasterDisp, SETUPDL_36);
if (arg0 == 0) {
for (i = 1; i < 4; i++) {
if (((gTeamShields[i] != 0) || (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_LEVEL_COMPLETE)) &&
@ -237,39 +237,39 @@ void func_hud_80084E78(Gfx** gfxP, u8* texture, u16* palette, u32 tWidth, u32 tH
}
void func_hud_800853A4(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
TextureRect_8bCI(&gMasterDisp, D_1013170, D_1013570, 24, 17, xPos, yPos, xScale, yScale);
TextureRect_CI8(&gMasterDisp, D_1013170, D_1013570, 24, 17, xPos, yPos, xScale, yScale);
}
void func_hud_80085404(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
TextureRect_4bCI(&gMasterDisp, D_1011280, D_10116A0, 48, 44, xPos, yPos, xScale, yScale);
TextureRect_CI4(&gMasterDisp, D_1011280, D_10116A0, 48, 44, xPos, yPos, xScale, yScale);
}
void func_hud_80085464(f32 arg0, f32 arg1) {
TextureRect_4bCI(&gMasterDisp, D_1011AC0, D_1011B90, 16, 26, arg0, arg1, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_1011AC0, D_1011B90, 16, 26, arg0, arg1, 1.0f, 1.0f);
}
void func_hud_800854BC(f32 arg0, f32 arg1) {
TextureRect_4bCI(&gMasterDisp, D_1011BB0, D_1011C80, 16, 26, arg0, arg1, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_1011BB0, D_1011C80, 16, 26, arg0, arg1, 1.0f, 1.0f);
}
void func_hud_80085514(f32 arg0, f32 arg1) {
TextureRect_4bCI(&gMasterDisp, D_1011CA0, D_1011D70, 16, 26, arg0, arg1, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_1011CA0, D_1011D70, 16, 26, arg0, arg1, 1.0f, 1.0f);
}
void func_hud_8008556C(f32 arg0, f32 arg1) {
TextureRect_4bCI(&gMasterDisp, D_1011D90, D_1011E60, 16, 26, arg0, arg1, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_1011D90, D_1011E60, 16, 26, arg0, arg1, 1.0f, 1.0f);
}
void func_hud_800855C4(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
TextureRect_8bIA_MirX(&gMasterDisp, D_1002280, 8, 12, arg0, arg1, arg2, arg3);
TextureRect_IA8_MirX(&gMasterDisp, D_1002280, 8, 12, arg0, arg1, arg2, arg3);
}
void func_hud_80085618(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
TextureRect_8bIA(&gMasterDisp, D_1002280, 8, 12, arg0, arg1, arg2, arg3);
TextureRect_IA8(&gMasterDisp, D_1002280, 8, 12, arg0, arg1, arg2, arg3);
}
void func_hud_8008566C(f32 x, f32 y, f32 arg2, f32 arg3) {
TextureRect_8bIA(&gMasterDisp, D_10030D0, 8, 12, x, y, arg2, arg3);
TextureRect_IA8(&gMasterDisp, D_10030D0, 8, 12, x, y, arg2, arg3);
}
void func_hud_800856C0(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) {
@ -278,25 +278,25 @@ void func_hud_800856C0(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) {
void func_hud_80085740(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
if (gVersusMode) {
TextureRect_8bIA(&gMasterDisp, D_versus_3000B20, 32, 5, arg0, arg1, arg2, arg3);
TextureRect_IA8(&gMasterDisp, D_versus_3000B20, 32, 5, arg0, arg1, arg2, arg3);
} else {
TextureRect_8bIA(&gMasterDisp, D_1000E80, 48, 9, arg0, arg1, arg2, arg3);
TextureRect_IA8(&gMasterDisp, D_1000E80, 48, 9, arg0, arg1, arg2, arg3);
}
}
void func_hud_800857DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
if (gVersusMode) {
TextureRect_8bCI(&gMasterDisp, D_versus_300D3C0, D_versus_300D408, 24, 3, arg0, arg1, arg2, arg3);
TextureRect_CI8(&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);
TextureRect_CI8(&gMasterDisp, D_10128C0, D_1012988, 40, 5, arg0, arg1, arg2, arg3);
}
}
void func_hud_80085890(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
if (gVersusMode) {
TextureRect_8bCI(&gMasterDisp, D_versus_300D350, D_versus_300D398, 24, 3, arg0, arg1, arg2, arg3);
TextureRect_CI8(&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);
TextureRect_CI8(&gMasterDisp, D_10127D0, D_1012898, 40, 5, arg0, arg1, arg2, arg3);
}
}
@ -352,7 +352,7 @@ void func_hud_80085944(void) {
for (i = 0; i < 3; i++) {
switch (D_80161860[i + 1]) {
case 0:
RCP_SetupDL(&gMasterDisp, 0x3E);
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
Matrix_Push(&gGfxMatrix);
x = D_800D1AC4[i + 1];
@ -382,7 +382,7 @@ void func_hud_80085944(void) {
D_801618B0[i + 2] -= 0.15f;
}
RCP_SetupDL(&gMasterDisp, 0x3E);
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
Matrix_Push(&gGfxMatrix);
@ -397,9 +397,9 @@ void func_hud_80085944(void) {
if (D_80161900[i] < 7) {
if (D_80161860[i + 1] == 2) {
RCP_SetupDL(&gMasterDisp, 0x3E);
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
} else {
RCP_SetupDL(&gMasterDisp, 0x24);
RCP_SetupDL(&gMasterDisp, SETUPDL_36);
}
Matrix_Push(&gGfxMatrix);
@ -456,7 +456,7 @@ void func_hud_80086110(f32 arg0, f32 arg1, s32 arg2) {
f32 temp = 0.82f;
s32 pad;
RCP_SetupDL(&gMasterDisp, 0x4B);
RCP_SetupDL(&gMasterDisp, SETUPDL_75);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
if (arg2 != 0) {
@ -465,7 +465,7 @@ void func_hud_80086110(f32 arg0, f32 arg1, s32 arg2) {
if ((arg2 <= 0) && (arg2 != -2) &&
((gPlayState == PLAY_PAUSE) || (gShowLevelClearStatusScreen == 1) || (gLevelStartStatusScreenTimer != 0))) {
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
if ((arg2 == 0) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_LEVEL_COMPLETE)) {
Graphics_DisplaySmallText(arg0 + (8.0f * temp) + 4.0f, arg1 + 2.0f, 1.0f, 1.0f, " OK ");
@ -474,7 +474,7 @@ void func_hud_80086110(f32 arg0, f32 arg1, s32 arg2) {
}
}
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
func_hud_80085618(arg0, arg1, temp, 1.0f);
func_hud_800855C4(arg0 + (7.0f * temp) + (temp * 6.0f) * 8.0f, arg1, 1.0f, 1.0f);
@ -580,12 +580,12 @@ void func_hud_80086444(void) {
}
if (i != 9) {
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
for (j = 0; j < 19; j++) {
TextureRect_8bIA(&gMasterDisp, D_800D1C9C[i] + (D_800D1CA4[i] * j), D_800D1CA4[i], 1, D_800D1CB4[i],
D_800D1CBC[i] + j - 28.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_800D1C9C[i] + (D_800D1CA4[i] * j), D_800D1CA4[i], 1, D_800D1CB4[i],
D_800D1CBC[i] + j - 28.0f, 1.0f, 1.0f);
}
}
}
@ -652,21 +652,21 @@ void func_hud_80086664(f32 x, f32 y) {
break;
}
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
if ((j != 14) && (j != 15)) {
TextureRect_8bIA(&gMasterDisp, aTextMissionNo, 112, 19, x0 - 12.0f, y0 + 4.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, aTextMissionNo, 112, 19, x0 - 12.0f, y0 + 4.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_800D1AEC[j].unk_00, D_800D1AEC[j].width, D_800D1AEC[j].height, x1 + 28.0f,
y1 + 4.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_800D1AEC[j].unk_00, D_800D1AEC[j].width, D_800D1AEC[j].height, x1 + 28.0f,
y1 + 4.0f, 1.0f, 1.0f);
} else {
func_hud_80086444();
}
for (i = 0; i < D_800D1AEC[j].unk_14; i++) {
TextureRect_8bIA(&gMasterDisp, D_800D1AEC[j].unk_0C + (D_800D1AEC[j].unk_10 * i), D_800D1AEC[j].unk_10, 1, x2,
y2 + i, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_800D1AEC[j].unk_0C + (D_800D1AEC[j].unk_10 * i), D_800D1AEC[j].unk_10, 1, x2,
y2 + i, 1.0f, 1.0f);
}
if ((gSavedObjectLoadIndex == 0) && (gAllRangeCheckpoint == 0) && (gCurrentLevel != LEVEL_VENOM_ANDROSS) &&
@ -702,20 +702,20 @@ void func_hud_800869A0(f32 arg0, f32 arg1, s32 k, f32 arg3, s32 arg4, s32 arg5)
for (i /= 10; i != 1; i /= 10) {
j = k / i;
if ((j != 0) || (var_s2 == true)) {
TextureRect_8bIA(&gMasterDisp, D_800D1CD4[j], 16, 15, arg0, arg1, arg3, arg3);
TextureRect_IA8(&gMasterDisp, D_800D1CD4[j], 16, 15, arg0, arg1, arg3, arg3);
arg0 += 13.0f * arg3;
k %= i;
var_s2 = true;
}
}
TextureRect_8bIA(&gMasterDisp, D_800D1CD4[k], 16, 15, arg0, arg1, arg3, arg3);
TextureRect_IA8(&gMasterDisp, D_800D1CD4[k], 16, 15, arg0, arg1, arg3, arg3);
}
void func_hud_80086C08(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 60, 60, 128, 96);
gDPSetAlphaDither(gMasterDisp++, G_AD_DISABLE);
TextureRect_8bCI(&gMasterDisp, D_1013170, D_1013570, 24, 17, xPos, yPos, xScale, yScale);
TextureRect_CI8(&gMasterDisp, D_1013170, D_1013570, 24, 17, xPos, yPos, xScale, yScale);
}
void HUD_DrawLevelStartStatusScreen(void) {
@ -854,7 +854,7 @@ void HUD_DrawLevelClearScreen(void) {
j = func_hud_800863C8();
if (temp != 0) {
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
x = 98.0f;
y = 64.0f;
@ -864,44 +864,44 @@ void HUD_DrawLevelClearScreen(void) {
case 1:
if (boolTemp) {
for (i = 0; i < 11; i++) {
TextureRect_8bIA(&gMasterDisp, aTextPLISHED + (136 * 2 * i), 136, 2, x + 50.0f, y + 50.0f + (2 * i),
1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, aTextPLISHED + (136 * 2 * i), 136, 2, x + 50.0f, y + 50.0f + (2 * i),
1.0f, 1.0f);
}
TextureRect_8bIA(&gMasterDisp, aTextPLISHED + (136 * 2 * i), 136, 1, x + 50.0f, y + 50.0f + (2 * i),
1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, aTextPLISHED + (136 * 2 * i), 136, 1, x + 50.0f, y + 50.0f + (2 * i),
1.0f, 1.0f);
} else {
for (i = 0; i < 10; i++) {
TextureRect_8bIA(&gMasterDisp, aTextLETE + (80 * 2 * i), 80, 2, x + 66.0f, y + 50.0f + (2 * i),
1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, aTextLETE + (80 * 2 * i), 80, 2, x + 66.0f, y + 50.0f + (2 * i), 1.0f,
1.0f);
}
TextureRect_8bIA(&gMasterDisp, aTextLETE + (80 * 2 * i), 80, 1, x + 66.0f, y + 50.0f + (2 * i), 1.0f,
1.0f);
TextureRect_IA8(&gMasterDisp, aTextLETE + (80 * 2 * i), 80, 1, x + 66.0f, y + 50.0f + (2 * i), 1.0f,
1.0f);
}
case 2:
if (boolTemp) {
for (i = 0; i < 11; i++) {
TextureRect_8bIA(&gMasterDisp, aTextACCOM + (120 * 2 * i), 120, 2, x - 62.0f, y + 50.0f + (2 * i),
1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, aTextACCOM + (120 * 2 * i), 120, 2, x - 62.0f, y + 50.0f + (2 * i),
1.0f, 1.0f);
}
TextureRect_8bIA(&gMasterDisp, aTextACCOM + (120 * 2 * i), 120, 1, x - 62.0f, y + 50.0f + (2 * i), 1.0f,
1.0f);
TextureRect_IA8(&gMasterDisp, aTextACCOM + (120 * 2 * i), 120, 1, x - 62.0f, y + 50.0f + (2 * i), 1.0f,
1.0f);
} else {
for (i = 0; i < 11; i++) {
TextureRect_8bIA(&gMasterDisp, aTextCOMP + (96 * 2 * i), 96, 2, x - 22.0f, y + 50.0f + (2 * i),
1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, aTextCOMP + (96 * 2 * i), 96, 2, x - 22.0f, y + 50.0f + (2 * i), 1.0f,
1.0f);
}
TextureRect_8bIA(&gMasterDisp, aTextCOMP + (96 * 2 * i), 96, 1, x - 22.0f, y + 50.0f + (2 * i), 1.0f,
1.0f);
TextureRect_IA8(&gMasterDisp, aTextCOMP + (96 * 2 * i), 96, 1, x - 22.0f, y + 50.0f + (2 * i), 1.0f,
1.0f);
}
case 3:
TextureRect_8bIA(&gMasterDisp, aTextMISSION, 128, 23, x, y + 25.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, aTextMISSION, 128, 23, x, y + 25.0f, 1.0f, 1.0f);
case 4:
TextureRect_8bIA(&gMasterDisp, aTextMissionNo, 112, 19, x, y, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_800D1AEC[j].unk_00, D_800D1AEC[j].width, D_800D1AEC[j].height, x + 112.0f,
y, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, aTextMissionNo, 112, 19, x, y, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_800D1AEC[j].unk_00, D_800D1AEC[j].width, D_800D1AEC[j].height, x + 112.0f,
y, 1.0f, 1.0f);
case 5:
func_hud_80086C08(30.0f + D_800D1CFC, 60.0f, 10.97f, 4.78f);
@ -926,7 +926,7 @@ void func_hud_80087530(f32 x, f32 y, s32 number) {
s32 i;
s32 form;
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
form = FORM_ARWING;
@ -968,8 +968,8 @@ void func_hud_80087530(f32 x, f32 y, s32 number) {
}
x2 += (2 - i) * 4;
TextureRect_4bCI(&gMasterDisp, D_800D1D00[form], D_800D1D0C[form], 16, 16, x0, y0, 1.0f, 1.0f);
TextureRect_4bCI(&gMasterDisp, D_1011ED0, D_1011F08, 16, 7, x1, y1, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_800D1D00[form], D_800D1D0C[form], 16, 16, x0, y0, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_1011ED0, D_1011F08, 16, 7, x1, y1, 1.0f, 1.0f);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
Graphics_DisplayHUDNumber(x2, y2, number);
@ -1010,11 +1010,11 @@ void func_hud_80087788(void) {
func_hud_80086C08(x[j][0] - 6.0f, y[j][1] - 1.0f, 2.4f, 0.7f);
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_8bIA(&gMasterDisp, D_800D1D28[j], D_800D1D34[j], D_800D1D40[j], x[j][1], y[j][1], 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_800D1D28[j], D_800D1D34[j], D_800D1D40[j], x[j][1], y[j][1], 1.0f, 1.0f);
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
shield = gTeamShields[3 - j];
if (shield <= 0) {
@ -1024,11 +1024,11 @@ void func_hud_80087788(void) {
}
for (i = 0; i < 2; i++) {
TextureRect_16bRGBA(&gMasterDisp, D_800D1D18[j + 1] + (44 * 20 * i), 44, 20, x[j][0],
y[j][0] + (f32) (20 * i), 1.0f, 1.0f);
TextureRect_RGBA16(&gMasterDisp, D_800D1D18[j + 1] + (44 * 20 * i), 44, 20, x[j][0],
y[j][0] + (f32) (20 * i), 1.0f, 1.0f);
}
TextureRect_16bRGBA(&gMasterDisp, D_800D1D18[j + 1] + (44 * 20 * 2), 44, 4, x[j][0], y[j][0] + 40.0f, 1.0f,
1.0f);
TextureRect_RGBA16(&gMasterDisp, D_800D1D18[j + 1] + (44 * 20 * 2), 44, 4, x[j][0], y[j][0] + 40.0f, 1.0f,
1.0f);
func_hud_80086110(x[j][2], y[j][2], shield);
}
@ -1226,17 +1226,17 @@ void HUD_DrawLevelClearStatusScreen(void) {
}
x4 += (4 - i) * 8;
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 90, 160, 200, 255);
func_hud_800869A0(24.0f, 30.0f + 3.0f, D_801617C0[5], 1.0f, 0, 999);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_8bIA(&gMasterDisp, aTextEnemiesDown, 64, 25, x0, y0 + 4.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, aTextEnemiesDown, 64, 25, x0, y0 + 4.0f, 1.0f, 1.0f);
func_hud_800869A0(x1, y1 + 12.0f, D_801617C0[1], 1.0f, 1, 999);
TextureRect_8bIA(&gMasterDisp, aTextAccumTotal, 128, 10, x3, y3, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, aTextAccumTotal, 128, 10, x3, y3, 1.0f, 1.0f);
func_hud_800869A0(x4 + 4.0f, y4 + 3.0f, D_801617C0[2], 1.00f, 1, 9999);
@ -1244,10 +1244,10 @@ void HUD_DrawLevelClearStatusScreen(void) {
func_hud_80087530(232.0f, 90.0f, D_801617C0[3]);
}
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_8bIA(&gMasterDisp, aTextStatusOfTeam, 120, 12, x6 - 8.0f, y6 + 10.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, aTextStatusOfTeam, 120, 12, x6 - 8.0f, y6 + 10.0f, 1.0f, 1.0f);
func_hud_80087788();
func_hud_80084B94(0);
@ -1367,7 +1367,7 @@ void func_hud_80088784(s32 arg0) {
if (arg0 != 0) {
arg0--;
RCP_SetupDL(&gMasterDisp, 0x24);
RCP_SetupDL(&gMasterDisp, SETUPDL_36);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_800D1DC8[arg0]);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 3.9f, -3.3f, -100.0f, MTXF_NEW);
@ -1637,17 +1637,17 @@ void func_hud_80088970(void) {
break;
}
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
for (i = 0; i < D_800D1AEC[j].unk_14; i++) {
TextureRect_8bIA(&gMasterDisp, D_800D1AEC[j].unk_0C + (D_800D1AEC[j].unk_10 * i),
D_800D1AEC[j].unk_10, 1, x2, y2 + i, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_800D1AEC[j].unk_0C + (D_800D1AEC[j].unk_10 * i),
D_800D1AEC[j].unk_10, 1, x2, y2 + i, 1.0f, 1.0f);
}
func_hud_80086C08(x1 - 10.0f, y0 - 4.0f, 4.7f, 2.8f);
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
if (D_80161810[1] == 0) {
temp = (D_80161838[0] % 20);
@ -1662,7 +1662,7 @@ void func_hud_80088970(void) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 64, 64, 64, 255);
}
TextureRect_8bIA(&gMasterDisp, D_1000000, 64, 10, x0 - 12.0f, y0, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_1000000, 64, 10, x0 - 12.0f, y0, 1.0f, 1.0f);
if (D_80161810[1] == 1) {
temp = (D_80161838[0] % 20);
@ -1678,12 +1678,12 @@ void func_hud_80088970(void) {
}
if (gCurrentLevel == LEVEL_TRAINING) {
TextureRect_8bIA(&gMasterDisp, D_TR_6000000, 96, 12, x1, y1, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_TR_6000000, 96, 12, x1, y1, 1.0f, 1.0f);
} else {
if (gLifeCount[gPlayerNum]) {
TextureRect_8bIA(&gMasterDisp, D_1000280, 96, 10, x1, y1, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_1000280, 96, 10, x1, y1, 1.0f, 1.0f);
} else {
TextureRect_8bIA(&gMasterDisp, D_1000640, 96, 22, x1, y1, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_1000640, 96, 22, x1, y1, 1.0f, 1.0f);
}
}
@ -1708,7 +1708,7 @@ void func_hud_80088970(void) {
}
void func_hud_80089670(void) {
RCP_SetupDL(&gMasterDisp, 0x3E);
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
Matrix_Scale(gGfxMatrix, 18.64f, 21.04f, 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
@ -1716,7 +1716,7 @@ void func_hud_80089670(void) {
}
void func_hud_80089710(void) {
RCP_SetupDL(&gMasterDisp, 0x3E);
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
Matrix_Scale(gGfxMatrix, 11.0f, 11.0f, 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
@ -1724,7 +1724,7 @@ void func_hud_80089710(void) {
}
void func_hud_800897B0(void) {
RCP_SetupDL(&gMasterDisp, 0x3E);
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
Matrix_Scale(gGfxMatrix, 130.0f, 130.0f, 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
@ -1732,7 +1732,7 @@ void func_hud_800897B0(void) {
}
void func_hud_80089850(void) {
RCP_SetupDL(&gMasterDisp, 0x3E);
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 0, 0, 255);
Matrix_Scale(gGfxMatrix, 125.0f, 125.0f, 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
@ -1740,7 +1740,7 @@ void func_hud_80089850(void) {
}
void func_hud_800898F0(void) {
RCP_SetupDL(&gMasterDisp, 1);
RCP_SetupDL(&gMasterDisp, SETUPDL_1);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 208, 80, 255);
Matrix_Scale(gGfxMatrix, 30.0f, 30.0f, 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
@ -1765,7 +1765,7 @@ void func_hud_80089994(s32 arg0) {
var_fv2 = 54.0f;
}
RCP_SetupDL(&gMasterDisp, 0x3E);
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetPrimColor(gMasterDisp++, 0, 0, D_800D1E14[arg0][0], D_800D1E14[arg0][1], D_800D1E14[arg0][2],
D_800D1E14[arg0][3]);
Matrix_Scale(gGfxMatrix, var_fv1, var_fv2, 1.0f, MTXF_APPLY);
@ -1774,7 +1774,7 @@ void func_hud_80089994(s32 arg0) {
}
void func_hud_80089AF4(void) {
RCP_SetupDL(&gMasterDisp, 0x3E);
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 0, 0, 255);
Matrix_Scale(gGfxMatrix, 54.0f, 54.0f, 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
@ -1782,7 +1782,7 @@ void func_hud_80089AF4(void) {
}
void func_hud_80089B94(void) {
RCP_SetupDL(&gMasterDisp, 0x3E);
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 92, 92, 255);
Matrix_Scale(gGfxMatrix, 54.0f, 54.0f, 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
@ -1792,7 +1792,7 @@ void func_hud_80089B94(void) {
void func_hud_80089C38(void) {
s32 alpha;
RCP_SetupDL(&gMasterDisp, 0xC);
RCP_SetupDL(&gMasterDisp, SETUPDL_12);
alpha = gGameFrameCount % 21;
@ -1810,7 +1810,7 @@ void func_hud_80089C38(void) {
void func_hud_80089D28(void) {
s32 gb;
RCP_SetupDL(&gMasterDisp, 1);
RCP_SetupDL(&gMasterDisp, SETUPDL_1);
gb = gGameFrameCount % 21;
@ -1935,7 +1935,7 @@ void func_hud_8008A07C(f32 x, f32 y) {
yScale1 = 1.70f;
}
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 60, 60, 255, 170);
func_hud_800853A4(xPos + 1.0f, yPos + 1.0f, xScale, yScale);
@ -2084,20 +2084,20 @@ s32 func_hud_8008A4DC(void) {
((gCurrentLevel == LEVEL_SECTOR_Z) || (gCurrentLevel == LEVEL_FORTUNA) || (gCurrentLevel == LEVEL_VENOM_2) ||
(gCurrentLevel == LEVEL_BOLSE) || (gCurrentLevel == LEVEL_SECTOR_Y) || (gCurrentLevel == LEVEL_KATINA))) {
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 128, 128, 128, 255);
switch (gCurrentLevel) {
case LEVEL_SECTOR_Z:
TextureRect_8bIA(&gMasterDisp, D_SZ_60012D0, 16, 9, 251.0f + D_800D1E10, 181.0f, 1.00f, 1.00f);
TextureRect_IA8(&gMasterDisp, D_SZ_60012D0, 16, 9, 251.0f + D_800D1E10, 181.0f, 1.00f, 1.00f);
break;
case LEVEL_FORTUNA:
TextureRect_8bIA(&gMasterDisp, D_FO_6001260, 16, 16, 251.0f + D_800D1E10, 178.0f, 1.00f, 1.00f);
TextureRect_IA8(&gMasterDisp, D_FO_6001260, 16, 16, 251.0f + D_800D1E10, 178.0f, 1.00f, 1.00f);
break;
case LEVEL_BOLSE:
TextureRect_8bIA(&gMasterDisp, D_BO_6000C80, 16, 16, 251.0f + D_800D1E10, 178.0f, 1.00f, 1.00f);
TextureRect_IA8(&gMasterDisp, D_BO_6000C80, 16, 16, 251.0f + D_800D1E10, 178.0f, 1.00f, 1.00f);
break;
case LEVEL_SECTOR_Y:
@ -2108,16 +2108,16 @@ s32 func_hud_8008A4DC(void) {
if ((y < 150.0f) || (y > 206.0f)) {
break;
}
TextureRect_8bIA(&gMasterDisp, D_SY_6000840, 64, 64, 250.0f + D_800D1E10, temp, 0.25f, 0.25f);
TextureRect_IA8(&gMasterDisp, D_SY_6000840, 64, 64, 250.0f + D_800D1E10, temp, 0.25f, 0.25f);
}
break;
case LEVEL_KATINA:
TextureRect_8bIA(&gMasterDisp, D_KA_6001260, 8, 8, 254.0f + D_800D1E10, 182.0f, 1.00f, 1.00f);
TextureRect_IA8(&gMasterDisp, D_KA_6001260, 8, 8, 254.0f + D_800D1E10, 182.0f, 1.00f, 1.00f);
break;
case LEVEL_VENOM_2:
TextureRect_8bIA(&gMasterDisp, D_VE2_6002890, 16, 16, 251.0f + D_800D1E10, 178.0f, 1.00f, 1.00f);
TextureRect_IA8(&gMasterDisp, D_VE2_6002890, 16, 16, 251.0f + D_800D1E10, 178.0f, 1.00f, 1.00f);
break;
}
}
@ -2192,7 +2192,7 @@ s32 func_hud_8008AC54(s32 arg0) {
void func_hud_8008AD94(void) {
if (gGameState == GSTATE_PLAY) {
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
switch ((s32) gRadioMsgRadioId) {
@ -2283,7 +2283,7 @@ void func_hud_8008B1B0(void) {
f32 temp = 142.0f;
f32 temp2 = 18.0f;
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
switch (D_80161790 / 2) {
@ -2377,10 +2377,10 @@ void func_hud_8008B2F0(void) {
}
void func_hud_8008B5B0(f32 x, f32 y) {
RCP_SetupDL(&gMasterDisp, 0x4B);
RCP_SetupDL(&gMasterDisp, SETUPDL_75);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
func_hud_800856C0(x + 8.0f, y + 2.0f, D_801617A8, 1.0f, D_801617AC);
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, D_800D1EB4, D_800D1EB8, D_800D1EBC, 255);
func_hud_80085618(x, y, 1.0f, 1.0f);
func_hud_800855C4(x + 7.0f + (D_801617A8 * 6.0f * 8.0f), y, 1.0f, 1.0f);
@ -2559,7 +2559,7 @@ void func_hud_8008BAE4(void) {
}
if ((D_80161788 != 0) || (D_8016178C != 0)) {
RCP_SetupDL(&gMasterDisp, 0xC);
RCP_SetupDL(&gMasterDisp, SETUPDL_12);
gDPSetPrimColor(gMasterDisp++, 0, 0, r, g, b, alpha);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, -53.9f, -38.5f, -139.4f, MTXF_APPLY);
@ -2702,14 +2702,14 @@ void HUD_DisplaySmallNumber(f32 xPos, f32 yPos, f32 scale, s32 number) {
for (i = 10; i != 1; i /= 10) {
if ((xPos > 0.0f) && (yPos > 0.0f)) {
TextureRect_8bIA(&gMasterDisp, sSmallNumberTex[number / i], 16, 8, xPos, yPos, scale, scale);
TextureRect_IA8(&gMasterDisp, sSmallNumberTex[number / i], 16, 8, xPos, yPos, scale, scale);
}
xPos += 9.0f * scale;
number %= i;
}
if ((xPos > 0.0f) && (yPos > 0.0f)) {
TextureRect_8bIA(&gMasterDisp, sSmallNumberTex[number / i], 16, 8, xPos, yPos, scale, scale);
TextureRect_IA8(&gMasterDisp, sSmallNumberTex[number / i], 16, 8, xPos, yPos, scale, scale);
}
}
@ -2723,10 +2723,10 @@ void func_hud_8008C5C8(f32 arg0, f32 arg1, f32 arg2, s32 arg3) {
s32 i;
for (i = 0; i < 2; i++) {
TextureRect_16bRGBA(&gMasterDisp, D_800D1EE8[arg3] + (44 * 20 * i), 44, 20, arg0, (20 * i * arg2) + arg1, arg2,
arg2);
TextureRect_RGBA16(&gMasterDisp, D_800D1EE8[arg3] + (44 * 20 * i), 44, 20, arg0, (20 * i * arg2) + arg1, arg2,
arg2);
}
TextureRect_16bRGBA(&gMasterDisp, D_800D1EE8[arg3] + 44 * 20 * 2, 44, 4, arg0, (40.0f * arg2) + arg1, arg2, arg2);
TextureRect_RGBA16(&gMasterDisp, D_800D1EE8[arg3] + 44 * 20 * 2, 44, 4, arg0, (40.0f * arg2) + arg1, arg2, arg2);
}
void func_hud_8008C6F4(s32 idx, s32 arg1) {
@ -2761,7 +2761,7 @@ void func_hud_8008C6F4(s32 idx, s32 arg1) {
Matrix_Scale(gGfxMatrix, 0.026f, 0.026f, 0.026f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x3E);
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 150);
gSPDisplayList(gMasterDisp++, D_1024990);
@ -2802,7 +2802,7 @@ s32 HUD_dummy_8008CB8C(void) {
}
void func_hud_8008CB98(f32 arg0, f32 arg1, f32 arg2) {
TextureRect_8bIA(&gMasterDisp, D_versus_30013E0, 8, 8, arg0, arg1, arg2, arg2);
TextureRect_IA8(&gMasterDisp, D_versus_30013E0, 8, 8, arg0, arg1, arg2, arg2);
}
void func_hud_8008CBE4(void) {
@ -2861,7 +2861,7 @@ void func_hud_8008CBE4(void) {
j = gVsKills[gPlayerNum][i];
RCP_SetupDL(&gMasterDisp, 0x4D);
RCP_SetupDL(&gMasterDisp, SETUPDL_77);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(gMasterDisp++, D_800D2098[j], D_800D20A8[j], D_800D20B8[j], 0);
@ -2876,11 +2876,11 @@ void func_hud_8008CFB8(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
s32 i;
for (i = 0; i < 3; i++) {
TextureRect_8bIA(&gMasterDisp, D_versus_3000BC0 + 2 * ((80 * 8 * i) / 2), 80, 8, arg0, (8 * i * arg3) + arg1,
arg2, arg3);
TextureRect_IA8(&gMasterDisp, D_versus_3000BC0 + 2 * ((80 * 8 * i) / 2), 80, 8, arg0, (8 * i * arg3) + arg1,
arg2, arg3);
}
TextureRect_8bIA(&gMasterDisp, D_versus_3000BC0 + 2 * ((80 * 8 * i) / 2), 80, 2, arg0, (8 * i * arg3) + arg1, arg2,
arg3);
TextureRect_IA8(&gMasterDisp, D_versus_3000BC0 + 2 * ((80 * 8 * i) / 2), 80, 2, arg0, (8 * i * arg3) + arg1, arg2,
arg3);
}
void func_hud_8008D0DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) {
@ -2890,14 +2890,14 @@ void func_hud_8008D0DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) {
}
void func_hud_8008D1F0(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
TextureRect_4bCI(&gMasterDisp, D_10116B0, D_1011730, 16, 16, arg0, arg1, arg2, arg3);
TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, arg0, arg1, arg2, arg3);
}
void func_hud_8008D250(void) {
f32 D_800D20C8[] = { 113.0f, 273.0f, 113.0f, 273.0f };
f32 D_800D20D8[] = { 79.0f, 79.0f, 199.0f, 199.0f };
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
func_hud_8008C5C8(D_800D20C8[gPlayerNum], D_800D20D8[gPlayerNum], 0.54f, gPlayerNum);
}
@ -2907,12 +2907,12 @@ void func_hud_8008D31C(void) {
f32 D_800D20F8[] = { 78.0f, 78.0f, 198.0f, 198.0f };
Math_SmoothStepToF(&D_800D19E0[gPlayerNum], gPlayer[gPlayerNum].shields * (1.0f / 255.0f), 0.3f, 10.0f, 0.01f);
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
func_hud_8008D0DC(D_800D20E8[gPlayerNum] + 3.0f, D_800D20F8[gPlayerNum] + 18.0f, 1.0f, 1.0f,
D_800D19E0[gPlayerNum]);
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
@ -2962,7 +2962,7 @@ void func_hud_8008D4F0(f32 arg0, f32 arg1) {
temp_t9 = D_800D19AC[var_v1];
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, temp_t9, temp_t9, temp_t9, 255);
@ -2972,7 +2972,7 @@ void func_hud_8008D4F0(f32 arg0, f32 arg1) {
if (temp_fs0 > 0.01f) {
func_hud_800857DC(D_800D2108[var_v1] + temp + 1.0f, D_800D211C[var_v1] + sp60, temp_fs0, 1.0f);
}
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
func_hud_80085740(D_800D2108[var_v1], D_800D211C[var_v1], 1.0f, 1.0f);
}
@ -2984,7 +2984,7 @@ void func_hud_8008D7F4(void) {
s32 D_800D2160[] = { 242, 30, 179, 30 };
s32 D_800D2170[] = { 12, 0, 67, 255 };
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, D_800D2150[gPlayerNum], D_800D2160[gPlayerNum], D_800D2170[gPlayerNum], 255);
Graphics_DisplayHUDNumber(D_800D2130[gPlayerNum], D_800D2140[gPlayerNum], gPlayerNum + 1);
}
@ -3046,7 +3046,7 @@ void func_hud_8008DC34(void) {
void func_hud_8008DCB0(f32 arg0, f32 arg1, s32 arg2, s32 arg3, s32 arg4) {
RCP_SetupDL_78();
gDPSetPrimColor(gMasterDisp++, 0, 0, arg2, arg3, arg4, D_hud_80161708);
TextureRect_4bCI(&gMasterDisp, D_1011ED0, D_1011F08, 16, 7, arg0, arg1, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_1011ED0, D_1011F08, 16, 7, arg0, arg1, 1.0f, 1.0f);
}
void func_hud_8008DD78(f32 arg0, f32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) {
@ -3086,24 +3086,24 @@ void HUD_DrawBossHealth(void) {
temp4 = sp3C + 6.0f;
temp5 = temp1 + 10.0f;
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_4bCI(&gMasterDisp, D_1011A40, D_1011AB0, 32, 7, temp2, temp3, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_1011A40, D_1011AB0, 32, 7, temp2, temp3, 1.0f, 1.0f);
RCP_SetupDL(&gMasterDisp, 0x4C);
TextureRect_8bIA(&gMasterDisp, D_1002040, 40, 12, sp3C, temp1, 1.0f, 1.0f);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
TextureRect_IA8(&gMasterDisp, D_1002040, 40, 12, sp3C, temp1, 1.0f, 1.0f);
if (sp3C >= 25.0f) {
Math_SmoothStepToF(&D_801616C4, 0.88f, 0.3f, 0.2f, 0.1f);
}
if ((D_801616C4 >= 0.1f) && (sp3C >= 25.0f)) {
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_8bCI(&gMasterDisp, D_10129C0, D_1013090, 16, 109, temp4, temp5, 1.0f, D_801616C4);
TextureRect_CI8(&gMasterDisp, D_10129C0, D_1013090, 16, 109, temp4, temp5, 1.0f, D_801616C4);
}
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 0, 0, 255);
if (D_801616BC > 0.0f) {
@ -3123,7 +3123,7 @@ void HUD_DrawBossHealth(void) {
temp6 = sp3C + 8.0f;
temp7 = 101.0f - ((2200.0f / 69.0f) * D_801616C8) + temp1;
if (D_801616C8 > 0.0f) {
TextureRect_16bRGBA(&gMasterDisp, D_Tex_800D99F8, 32, 32, temp6, temp7, 0.2f, D_801616C8);
TextureRect_RGBA16(&gMasterDisp, D_Tex_800D99F8, 32, 32, temp6, temp7, 0.2f, D_801616C8);
}
}
} else {
@ -3154,7 +3154,7 @@ void HUD_DisplayCountdown(f32 xPos, f32 yPos, s32* countdown, f32 scale) {
if ((i % 2) != 0) {
RCP_SetupDL_78();
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_4bCI(&gMasterDisp, D_1011E80, D_1011EC0, 16, 8, (var_fs0 * scale) + xPos, yPos, scale, scale);
TextureRect_CI4(&gMasterDisp, D_1011E80, D_1011EC0, 16, 8, (var_fs0 * scale) + xPos, yPos, scale, scale);
} else {
RCP_SetupDL_76();
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
@ -3298,7 +3298,7 @@ void func_hud_8008E620(f32 arg0, f32 arg1) {
b = 200;
}
}
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, r, g, b, 255);
func_hud_80094D20(arg0, arg1);
}
@ -3443,21 +3443,21 @@ void func_hud_8008EA14(f32 x, f32 y) {
switch (sp68) {
case 0:
if (D_800D19F4 >= 5) {
TextureRect_4bCI(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x, y, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x, y, 1.0f, 1.0f);
func_hud_8008DCB0(x + 14.0f, y + 2.0f, D_8016177C, D_80161780, D_80161784);
func_hud_8008DD78(x + 29.0f, y + 1.0f, D_800D19F4, D_8016177C, D_80161780, D_80161784);
} else {
for (i = (D_800D19F4 - 1); i >= 0; i--) {
TextureRect_4bCI(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + (30.0f - (i * 10)), y, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + (30.0f - (i * 10)), y, 1.0f, 1.0f);
}
}
break;
case 1:
TextureRect_4bCI(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + (D_800D19F0 * 3.0f), y, 1.0f, 1.0f);
TextureRect_4bCI(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + (D_800D19F0 * 2.0f), y, 1.0f, 1.0f);
TextureRect_4bCI(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + (D_800D19F0 * 1.0f), y, 1.0f, 1.0f);
TextureRect_4bCI(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + (D_800D19F0 * 0.0f), y, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + (D_800D19F0 * 3.0f), y, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + (D_800D19F0 * 2.0f), y, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + (D_800D19F0 * 1.0f), y, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + (D_800D19F0 * 0.0f), y, 1.0f, 1.0f);
break;
case 2:
@ -3467,39 +3467,35 @@ void func_hud_8008EA14(f32 x, f32 y) {
} else {
temp = D_800D19F0;
}
TextureRect_4bCI(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + (30.0f - (i * 10)) + temp, y, 1.0f,
1.0f);
TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + (30.0f - (i * 10)) + temp, y, 1.0f,
1.0f);
}
break;
case 3:
for (i = (D_800D19F4 - 2); i >= 0; i--) {
TextureRect_4bCI(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + (30.0f - (i * 10)), y, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + (30.0f - (i * 10)), y, 1.0f, 1.0f);
}
TextureRect_4bCI(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + 50.0f - D_800D19F0, y, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + 50.0f - D_800D19F0, y, 1.0f, 1.0f);
break;
case 4:
TextureRect_4bCI(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + 30.0f - (D_800D19F0 * 3.0f), y, 1.0f,
1.0f);
TextureRect_4bCI(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + 20.0f - (D_800D19F0 * 2.0f), y, 1.0f,
1.0f);
TextureRect_4bCI(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + 10.0f - (D_800D19F0 * 1.0f), y, 1.0f,
1.0f);
TextureRect_4bCI(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x, y, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + 30.0f - (D_800D19F0 * 3.0f), y, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + 20.0f - (D_800D19F0 * 2.0f), y, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + 10.0f - (D_800D19F0 * 1.0f), y, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x, y, 1.0f, 1.0f);
break;
case 5:
func_hud_8008DCB0(x + D_800D19F0, y + 2.0f, D_8016177C, D_80161780, D_80161784);
func_hud_8008DD78(x + 15.0f + D_800D19F0, y + 1.0f, D_800D19F4, D_8016177C, D_80161780, D_80161784);
TextureRect_4bCI(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x, y, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x, y, 1.0f, 1.0f);
break;
case 6:
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_4bCI(&gMasterDisp, D_blue_marine_3000090, D_blue_marine_3000120, 32, 9, x + 1.0f, y, 1.0f,
1.0f);
TextureRect_CI4(&gMasterDisp, D_blue_marine_3000090, D_blue_marine_3000120, 32, 9, x + 1.0f, y, 1.0f, 1.0f);
break;
}
}
@ -5370,7 +5366,7 @@ void func_hud_80094954(Effect* effect) {
void func_hud_80094BBC(Effect* effect) {
if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_LEVEL_INTRO) && (gCurrentLevel == LEVEL_AQUAS) &&
(gPlayer[0].csState < 2)) {
RCP_SetupDL(&gMasterDisp, 0x44);
RCP_SetupDL(&gMasterDisp, SETUPDL_68);
gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 21, 34, effect->unk_4A);
gDPSetEnvColor(gMasterDisp++, 255, 255, 251, 0);
Graphics_SetScaleMtx(effect->scale2);
@ -5457,13 +5453,13 @@ void func_hud_80094D20(f32 x, f32 y) {
}
if (xScale != 0.0f) {
TextureRect_8bIA(&gMasterDisp, D_800D24DC[temp], 16, 15, x1, y1, xScale, 1.0f);
TextureRect_IA8(&gMasterDisp, D_800D24DC[temp], 16, 15, x1, y1, xScale, 1.0f);
}
boolTemp = true;
}
if (!boolTemp && (xScale != 0.0f)) {
TextureRect_8bIA(&gMasterDisp, D_800D24DC[0], 16, 15, x1, y1, xScale, 1.0f);
TextureRect_IA8(&gMasterDisp, D_800D24DC[0], 16, 15, x1, y1, xScale, 1.0f);
}
x += 13.0f;
@ -5508,7 +5504,7 @@ void func_hud_80094D20(f32 x, f32 y) {
}
if (xScale != 0.0f) {
TextureRect_8bIA(&gMasterDisp, D_800D24DC[temp3], 16, 15, x1, y1, xScale, 1.0f);
TextureRect_IA8(&gMasterDisp, D_800D24DC[temp3], 16, 15, x1, y1, xScale, 1.0f);
}
if ((gHitCount != gDisplayedHitCount) && (D_hud_80161720[0] == 0.0f) && (D_hud_80161720[1] == 0.0f) &&

2
src/engine/fox_load.c
View File

@ -1,8 +1,6 @@
#include "global.h"
#include "sf64dma.h"
#define SEGMENT_SIZE(segment) ((ptrdiff_t) ((uintptr_t) (segment).end - (uintptr_t) (segment).start))
u8 sFillTimer = 3;
#include "fox_load_inits.c"

36
src/engine/fox_radio.c
View File

@ -428,22 +428,22 @@ void func_radio_800BAAE8(void) {
if (mirror) {
for (i = 0, j = 0; i < 2; i++, j += 44 * 20) {
TextureRect_16bRGBA_MirX(&gMasterDisp, &radioPortraitTex[j], 44, 20, gRadioPortraitPosX,
gRadioPortraitPosY + 20.0f + sp38 + (i * 20.0f * gRadioPortraitScaleY), 1.0f,
gRadioPortraitScaleY);
TextureRect_RGBA16_MirX(&gMasterDisp, &radioPortraitTex[j], 44, 20, gRadioPortraitPosX,
gRadioPortraitPosY + 20.0f + sp38 + (i * 20.0f * gRadioPortraitScaleY), 1.0f,
gRadioPortraitScaleY);
}
TextureRect_16bRGBA_MirX(&gMasterDisp, &radioPortraitTex[44 * 20 * 2], 44, 4, gRadioPortraitPosX,
gRadioPortraitPosY + 20.0f + sp38 + (40.0f * gRadioPortraitScaleY), 1.0f,
gRadioPortraitScaleY);
TextureRect_RGBA16_MirX(&gMasterDisp, &radioPortraitTex[44 * 20 * 2], 44, 4, gRadioPortraitPosX,
gRadioPortraitPosY + 20.0f + sp38 + (40.0f * gRadioPortraitScaleY), 1.0f,
gRadioPortraitScaleY);
} else {
for (i = 0, j = 0; i < 2; i++, j += 44 * 20) {
TextureRect_16bRGBA(&gMasterDisp, &radioPortraitTex[j], 44, 20, gRadioPortraitPosX,
gRadioPortraitPosY + 20.0f + sp38 + (i * 20.0f * gRadioPortraitScaleY), 1.0f,
gRadioPortraitScaleY);
TextureRect_RGBA16(&gMasterDisp, &radioPortraitTex[j], 44, 20, gRadioPortraitPosX,
gRadioPortraitPosY + 20.0f + sp38 + (i * 20.0f * gRadioPortraitScaleY), 1.0f,
gRadioPortraitScaleY);
}
TextureRect_16bRGBA(&gMasterDisp, &radioPortraitTex[44 * 20 * 2], 44, 4, gRadioPortraitPosX,
gRadioPortraitPosY + 20.0f + sp38 + (40.0f * gRadioPortraitScaleY), 1.0f,
gRadioPortraitScaleY);
TextureRect_RGBA16(&gMasterDisp, &radioPortraitTex[44 * 20 * 2], 44, 4, gRadioPortraitPosX,
gRadioPortraitPosY + 20.0f + sp38 + (40.0f * gRadioPortraitScaleY), 1.0f,
gRadioPortraitScaleY);
}
}
}
@ -466,7 +466,7 @@ void func_radio_800BB388(void) {
sp30 = temp_fa0 * D_800D4A78;
RCP_SetupDL(&gMasterDisp, 0x55);
RCP_SetupDL(&gMasterDisp, SETUPDL_85);
switch (gGameState) {
case GSTATE_TITLE:
@ -487,12 +487,12 @@ void func_radio_800BB388(void) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 60, 60, 255, 170);
}
TextureRect_8bCI(&gMasterDisp, texture, palette, 32, 32, gRadioTextBoxPosX, gRadioTextBoxPosY + 16.0f + sp30,
gRadioTextBoxScaleX, gRadioTextBoxScaleY);
TextureRect_CI8(&gMasterDisp, texture, palette, 32, 32, gRadioTextBoxPosX, gRadioTextBoxPosY + 16.0f + sp30,
gRadioTextBoxScaleX, gRadioTextBoxScaleY);
}
if (gRadioTextBoxScaleY == 1.3f) {
RCP_SetupDL(&gMasterDisp, 0x55);
RCP_SetupDL(&gMasterDisp, SETUPDL_85);
gMsgCharIsPrinting =
Message_DisplayText(&gMasterDisp, gRadioMsg, gRadioPrintPosX, gRadioPrintPosY, gRadioMsgCharIndex);
}
@ -709,7 +709,7 @@ void Radio_Draw(void) {
if ((gTeamShields[idx] <= 0) && (gGameFrameCount & 4) && (gTeamShields[idx] != -2) &&
(gCurrentRadioPortrait != RCID_STATIC) && (gCurrentRadioPortrait != RCID_STATIC + 1) &&
(gCurrentRadioPortrait != RCID_1000)) {
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 0, 255);
Graphics_DisplaySmallText(31, 167, 1.0f, 1.0f, "DOWN");
func_hud_80084B94(1);
@ -758,7 +758,7 @@ void Radio_Draw(void) {
if ((gActors[idx].obj.status != OBJ_ACTIVE) && (gGameFrameCount & 4) &&
(gPlayer[0].state_1C8 == PLAYERSTATE_1C8_ACTIVE) && (gCurrentRadioPortrait != RCID_STATIC) &&
(gCurrentRadioPortrait != RCID_STATIC + 1) && (gCurrentRadioPortrait != RCID_1000)) {
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 0, 255);
Graphics_DisplaySmallText(31, 167, 1.0f, 1.0f, "DOWN");
}

82
src/engine/fox_std_lib.c
View File

@ -538,8 +538,8 @@ s32 Math_PursueVec3f(Vec3f* pos, Vec3f* target, Vec3f* rot, f32 stepSize, f32 sc
return (VEC3F_MAG(&diff)) < dist;
}
void TextureRect_4bCI(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
f32 yScale) {
void TextureRect_CI4(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
f32 yScale) {
gDPLoadTLUT_pal16((*gfxPtr)++, 0, palette);
gDPLoadTextureBlock_4b((*gfxPtr)++, texture, G_IM_FMT_CI, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
@ -548,8 +548,8 @@ void TextureRect_4bCI(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32 he
(s32) (1.0f / yScale * 1024.0f));
}
void TextureRect_4bCI_Flip(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos,
f32 xScale, f32 yScale) {
void TextureRect_CI4_Flip(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos,
f32 xScale, f32 yScale) {
gDPLoadTLUT_pal16((*gfxPtr)++, 0, palette);
gDPLoadTextureBlock_4b((*gfxPtr)++, texture, G_IM_FMT_CI, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
@ -558,8 +558,8 @@ void TextureRect_4bCI_Flip(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u
G_TX_RENDERTILE, 0, 0, (s32) (1.0f / xScale * 1024.0f), (s32) (1.0f / yScale * 1024.0f));
}
void TextureRect_4bCI_MirX(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos,
f32 xScale, f32 yScale) {
void TextureRect_CI4_MirX(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos,
f32 xScale, f32 yScale) {
gDPLoadTLUT_pal16((*gfxPtr)++, 0, palette);
gDPLoadTextureBlock_4b((*gfxPtr)++, texture, G_IM_FMT_CI, width, height, 0, G_TX_MIRROR | G_TX_WRAP,
G_TX_MIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
@ -568,8 +568,8 @@ void TextureRect_4bCI_MirX(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u
(u16) (s32) (-1.0f / xScale * 1024.0f), (s32) (1.0f / yScale * 1024.0f));
}
void TextureRect_4bCI_MirY(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos,
f32 xScale, f32 yScale) {
void TextureRect_CI4_MirY(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos,
f32 xScale, f32 yScale) {
gDPLoadTLUT_pal16((*gfxPtr)++, 0, palette);
gDPLoadTextureBlock_4b((*gfxPtr)++, texture, G_IM_FMT_CI, width, height, 0, G_TX_MIRROR | G_TX_WRAP,
G_TX_MIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
@ -578,8 +578,8 @@ void TextureRect_4bCI_MirY(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u
(s32) (1.0f / xScale * 1024.0f), (u16) (s32) (-1.0f / yScale * 1024.0f));
}
void TextureRect_8bCI(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
f32 yScale) {
void TextureRect_CI8(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
f32 yScale) {
gDPLoadTLUT_pal256((*gfxPtr)++, palette);
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_CI, G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
@ -588,8 +588,7 @@ void TextureRect_8bCI(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32 he
(s32) (1.0f / yScale * 1024.0f));
}
void TextureRect_16bRGBA(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
f32 yScale) {
void TextureRect_RGBA16(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
@ -597,8 +596,8 @@ void TextureRect_16bRGBA(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32
(s32) (1.0f / yScale * 1024.0f));
}
void TextureRect_16bRGBA_MirX(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
f32 yScale) {
void TextureRect_RGBA16_MirX(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
f32 yScale) {
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
@ -606,7 +605,7 @@ void TextureRect_16bRGBA_MirX(Gfx** gfxPtr, u16* texture, u32 width, u32 height,
(u16) (s32) (-1.0f / xScale * 1024.0f), (s32) (1.0f / yScale * 1024.0f));
}
void TextureRect_8bIA(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
void TextureRect_IA8(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
@ -614,8 +613,8 @@ void TextureRect_8bIA(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32 xPos
(s32) (1.0f / yScale * 1024.0f));
}
void TextureRect_8bIA_FilpMirX(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
f32 yScale) {
void TextureRect_IA8_FlipMirX(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
f32 yScale) {
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangleFlip((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f),
@ -624,8 +623,8 @@ void TextureRect_8bIA_FilpMirX(Gfx** gfxPtr, u8* texture, u32 width, u32 height,
(s32) (1.0f / xScale * 1024.0f));
}
void TextureRect_8bIA_FilpMirY(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
f32 yScale) {
void TextureRect_IA8_FlipMirY(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
f32 yScale) {
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangleFlip((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f),
@ -634,8 +633,8 @@ void TextureRect_8bIA_FilpMirY(Gfx** gfxPtr, u8* texture, u32 width, u32 height,
(u16) (s32) (-1.0f / xScale * 1024.0f));
}
void TextureRect_8bIA_MirX(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
f32 yScale) {
void TextureRect_IA8_MirX(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
f32 yScale) {
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
@ -643,8 +642,8 @@ void TextureRect_8bIA_MirX(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32
(u16) (s32) (-1.0f / xScale * 1024.0f), (s32) (1.0f / yScale * 1024.0f));
}
void TextureRect_8bIA_MirY(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
f32 yScale) {
void TextureRect_IA8_MirY(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
f32 yScale) {
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
@ -652,7 +651,7 @@ void TextureRect_8bIA_MirY(Gfx** gfxPtr, u8* texture, u32 width, u32 height, f32
(s32) (1.0f / xScale * 1024.0f), (u16) (s32) (-1.0f / yScale * 1024.0f));
}
void TextureRect_16bIA(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
void TextureRect_IA16(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_16b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
@ -660,8 +659,8 @@ void TextureRect_16bIA(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xP
(s32) (1.0f / yScale * 1024.0f));
}
void TextureRect_16bIA_MirX(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
f32 yScale) {
void TextureRect_IA16_MirX(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
f32 yScale) {
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_16b, width, height, 0, G_TX_MIRROR | G_TX_WRAP,
G_TX_MIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
@ -669,8 +668,8 @@ void TextureRect_16bIA_MirX(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f
(u16) (s32) (-1.0f / xScale * 1024.0f), (s32) (1.0f / yScale * 1024.0f));
}
void TextureRect_16bIA_MirY(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
f32 yScale) {
void TextureRect_IA16_MirY(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
f32 yScale) {
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_16b, width, height, 0, G_TX_MIRROR | G_TX_WRAP,
G_TX_MIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
@ -678,8 +677,8 @@ void TextureRect_16bIA_MirY(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f
(s32) (1.0f / xScale * 1024.0f), (u16) (s32) (-1.0f / yScale * 1024.0f));
}
void TextureRect_16bIA_MirXY(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
f32 yScale) {
void TextureRect_IA16_MirXY(Gfx** gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
f32 yScale) {
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_IA, G_IM_SIZ_16b, width, height, 0, G_TX_MIRROR | G_TX_WRAP,
G_TX_MIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
@ -687,8 +686,7 @@ void TextureRect_16bIA_MirXY(Gfx** gfxPtr, u16* texture, u32 width, u32 height,
(u16) (s32) (-1.0f / xScale * 1024.0f), (u16) (s32) (-1.0f / yScale * 1024.0f));
}
void TextureRect_32bRGBA(Gfx** gfxPtr, u32* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
f32 yScale) {
void TextureRect_RGBA32(Gfx** gfxPtr, u32* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
gDPLoadTextureBlock((*gfxPtr)++, texture, G_IM_FMT_RGBA, G_IM_SIZ_32b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle((*gfxPtr)++, (s32) (xPos * 4.0f), (s32) (yPos * 4.0f), (s32) ((xPos + width * xScale) * 4.0f),
@ -783,15 +781,15 @@ void Graphics_DisplayHUDNumber(s32 xPos, s32 yPos, s32 number) {
place = 1000000;
for (place = 1000000; place != 1; place /= 10) {
if ((number / place != 0) || (startNumber == true)) {
TextureRect_4bCI(&gMasterDisp, hudNumberTex[number / place], hudNumberPal[number / place], 16, 8, xPos,
yPos, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, hudNumberTex[number / place], hudNumberPal[number / place], 16, 8, xPos, yPos,
1.0f, 1.0f);
startNumber = true;
xPos += 9;
number %= place;
}
}
TextureRect_4bCI(&gMasterDisp, hudNumberTex[number / place], hudNumberPal[number / place], 16, 8, xPos, yPos, 1.0f,
1.0f);
TextureRect_CI4(&gMasterDisp, hudNumberTex[number / place], hudNumberPal[number / place], 16, 8, xPos, yPos, 1.0f,
1.0f);
}
u8* sSmallNumberTex[] = { aSmallText_0, aSmallText_1, aSmallText_2, aSmallText_3, aSmallText_4,
@ -805,13 +803,13 @@ void Graphics_DisplaySmallNumber(s32 xPos, s32 yPos, s32 number) {
place = 1000000;
for (place = 1000000; place != 1; place /= 10) {
if ((number / place != 0) || (startNumber == true)) {
TextureRect_8bIA(&gMasterDisp, sSmallNumberTex[number / place], 16, 8, xPos, yPos, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, sSmallNumberTex[number / place], 16, 8, xPos, yPos, 1.0f, 1.0f);
startNumber = true;
xPos += 9;
number %= place;
}
}
TextureRect_8bIA(&gMasterDisp, sSmallNumberTex[number / place], 16, 8, xPos, yPos, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, sSmallNumberTex[number / place], 16, 8, xPos, yPos, 1.0f, 1.0f);
}
char sSmallChars[] = " ABCDEFGHIJKLMNOPQRSTUVWXYZ!:-.0123456789";
@ -963,7 +961,7 @@ void Graphics_DisplayLargeText(s32 xPos, s32 yPos, f32 xScale, f32 yScale, char*
if ((text[0] == 'W') || (text[0] == 'X')) {
width = 32;
}
TextureRect_8bIA(&gMasterDisp, sLargeCharTex[charIndex], width, 15, xPosCurrent, yPos, xScale, yScale);
TextureRect_IA8(&gMasterDisp, sLargeCharTex[charIndex], width, 15, xPosCurrent, yPos, xScale, yScale);
}
startPrint = true;
xPosCurrent += (sLargeCharWidths[charIndex] * xScale) + 2.0f;
@ -1104,13 +1102,13 @@ void Graphics_DisplayLargeNumber(s32 xPos, s32 yPos, s32 number) {
place = 1000000;
for (place = 1000000; place != 1; place /= 10) {
if ((number / place != 0) || (startNumber == true)) {
TextureRect_8bIA(&gMasterDisp, sLargeNumberTex[number / place], 16, 15, xPos, yPos, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, sLargeNumberTex[number / place], 16, 15, xPos, yPos, 1.0f, 1.0f);
startNumber = true;
xPos += 13;
number %= place;
}
}
TextureRect_8bIA(&gMasterDisp, sLargeNumberTex[number / place], 16, 15, xPos, yPos, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, sLargeNumberTex[number / place], 16, 15, xPos, yPos, 1.0f, 1.0f);
}
void Graphics_DisplaySmallText(s32 xPos, s32 yPos, f32 xScale, f32 yScale, char* text) {
@ -1129,7 +1127,7 @@ void Graphics_DisplaySmallText(s32 xPos, s32 yPos, f32 xScale, f32 yScale, char*
if (var_t0 > 30) {
width = 16;
}
TextureRect_8bIA(&gMasterDisp, sSmallCharTex[var_t0], width, 8, xPosCurrent, yPos, xScale, yScale);
TextureRect_IA8(&gMasterDisp, sSmallCharTex[var_t0], width, 8, xPosCurrent, yPos, xScale, yScale);
if (1) {}
}
switch (text[0]) {

151
src/engine/fox_versus.c
View File

@ -81,19 +81,19 @@ void func_versus_800BC760(void) {
}
void func_versus_800BC88C(f32 xPos, f32 yPos, f32 scale) {
TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7003830, 64, 17, xPos, yPos, scale, scale);
TextureRect_IA8(&gMasterDisp, D_VS_MENU_7003830, 64, 17, xPos, yPos, scale, scale);
}
void func_versus_800BC8D8(f32 xPos, f32 yPos, f32 scale) {
s32 i;
for (i = 0; i < 2; i++) {
TextureRect_8bCI(&gMasterDisp, D_versus_300A470 + (152 * 8 * i), D_versus_300B218, 152, 8, xPos,
yPos + (8 * i * scale), scale, scale);
TextureRect_CI8(&gMasterDisp, D_versus_300A470 + (152 * 8 * i), D_versus_300B218, 152, 8, xPos,
yPos + (8 * i * scale), scale, scale);
}
TextureRect_8bCI(&gMasterDisp, D_versus_300A470 + (152 * 8 * i), D_versus_300B218, 152, 7, xPos,
yPos + (8 * i * scale), scale, scale);
TextureRect_CI8(&gMasterDisp, D_versus_300A470 + (152 * 8 * i), D_versus_300B218, 152, 7, xPos,
yPos + (8 * i * scale), scale, scale);
}
void func_versus_800BC9DC(f32 xPos, f32 yPos, f32 scale, s32 yScale) {
@ -103,8 +103,8 @@ void func_versus_800BC9DC(f32 xPos, f32 yPos, f32 scale, s32 yScale) {
s32 i;
for (i = 0; i < 5; i++) {
TextureRect_8bCI(&gMasterDisp, D_800D4ABC[yScale] + (D_800D4AB0[yScale] * 8 * i), D_800D4AA4[yScale],
D_800D4AB0[yScale], 8, xPos, yPos + (8 * i * scale), scale, scale);
TextureRect_CI8(&gMasterDisp, D_800D4ABC[yScale] + (D_800D4AB0[yScale] * 8 * i), D_800D4AA4[yScale],
D_800D4AB0[yScale], 8, xPos, yPos + (8 * i * scale), scale, scale);
}
}
@ -112,11 +112,11 @@ void func_versus_800BCB44(f32 xPos, f32 yPos, f32 scale) {
s32 i;
for (i = 0; i < 2; i++) {
TextureRect_8bCI(&gMasterDisp, D_versus_3006C60 + (96 * 8 * i), D_versus_3007500, 96, 8, xPos,
yPos + (8 * i * scale), scale, scale);
TextureRect_CI8(&gMasterDisp, D_versus_3006C60 + (96 * 8 * i), D_versus_3007500, 96, 8, xPos,
yPos + (8 * i * scale), scale, scale);
}
TextureRect_8bCI(&gMasterDisp, D_versus_3006C60 + (96 * 8 * i), D_versus_3007500, 96, 7, xPos,
yPos + (8 * i * scale), scale, scale);
TextureRect_CI8(&gMasterDisp, D_versus_3006C60 + (96 * 8 * i), D_versus_3007500, 96, 7, xPos,
yPos + (8 * i * scale), scale, scale);
}
void func_versus_800BCC48(f32 xPos, f32 yPos, f32 xScale, f32 yScale, s32 arg4) {
@ -126,19 +126,19 @@ void func_versus_800BCC48(f32 xPos, f32 yPos, f32 xScale, f32 yScale, s32 arg4)
s32 i;
for (i = 0; i < 3; i++) {
TextureRect_8bCI(&gMasterDisp, D_800D4AD8[arg4] + (D_800D4AE8[arg4] * 8 * i), D_800D4AC8[arg4],
D_800D4AE8[arg4], 8, xPos, yPos + (8 * i * yScale), xScale, yScale);
TextureRect_CI8(&gMasterDisp, D_800D4AD8[arg4] + (D_800D4AE8[arg4] * 8 * i), D_800D4AC8[arg4], D_800D4AE8[arg4],
8, xPos, yPos + (8 * i * yScale), xScale, yScale);
}
TextureRect_8bCI(&gMasterDisp, D_800D4AD8[arg4] + (D_800D4AE8[arg4] * 8 * i), D_800D4AC8[arg4], D_800D4AE8[arg4], 1,
xPos, yPos + (8 * i * yScale), xScale, yScale);
TextureRect_CI8(&gMasterDisp, D_800D4AD8[arg4] + (D_800D4AE8[arg4] * 8 * i), D_800D4AC8[arg4], D_800D4AE8[arg4], 1,
xPos, yPos + (8 * i * yScale), xScale, yScale);
}
void func_versus_800BCE24(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
s32 i;
for (i = 0; i < 6; i++) {
TextureRect_8bCI(&gMasterDisp, D_versus_3001420 + (256 * 7 * i), D_versus_3003E20, 256, 7, xPos,
yPos + (7 * i * yScale), xScale, yScale);
TextureRect_CI8(&gMasterDisp, D_versus_3001420 + (256 * 7 * i), D_versus_3003E20, 256, 7, xPos,
yPos + (7 * i * yScale), xScale, yScale);
}
}
@ -146,66 +146,66 @@ void func_versus_800BCEF8(f32 xPos, f32 yPos, f32 scale) {
s32 i;
for (i = 0; i < 12; i++) {
TextureRect_8bCI(&gMasterDisp, D_versus_3004010 + (136 * 2 * i), D_versus_3004D58, 136, 2, xPos,
yPos + (2 * i * scale), scale, scale);
TextureRect_CI8(&gMasterDisp, D_versus_3004010 + (136 * 2 * i), D_versus_3004D58, 136, 2, xPos,
yPos + (2 * i * scale), scale, scale);
}
TextureRect_8bCI(&gMasterDisp, D_versus_3004010 + (136 * 2 * i), D_versus_3004D58, 136, 1, xPos,
yPos + (2 * i * scale), scale, scale);
TextureRect_CI8(&gMasterDisp, D_versus_3004010 + (136 * 2 * i), D_versus_3004D58, 136, 1, xPos,
yPos + (2 * i * scale), scale, scale);
}
void func_versus_800BCFFC(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
TextureRect_8bCI(&gMasterDisp, D_1013170, D_1013570, 24, 17, xPos, yPos, xScale, yScale);
TextureRect_CI8(&gMasterDisp, D_1013170, D_1013570, 24, 17, xPos, yPos, xScale, yScale);
}
void func_versus_800BD05C(f32 xPos, f32 yPos, f32 scale) {
TextureRect_4bCI(&gMasterDisp, D_versus_30003A0, D_versus_30004E0, 64, 10, xPos, yPos, scale, scale);
TextureRect_CI4(&gMasterDisp, D_versus_30003A0, D_versus_30004E0, 64, 10, xPos, yPos, scale, scale);
}
void func_versus_800BD0B4(f32 xPos, f32 yPos, f32 scale) {
TextureRect_4bCI(&gMasterDisp, D_versus_3000510, D_versus_30006A0, 80, 10, xPos, yPos, scale, scale);
TextureRect_CI4(&gMasterDisp, D_versus_3000510, D_versus_30006A0, 80, 10, xPos, yPos, scale, scale);
}
void func_versus_800BD10C(f32 xPos, f32 yPos, f32 scale) {
TextureRect_4bCI(&gMasterDisp, D_versus_30006D0, D_versus_3000810, 64, 10, xPos, yPos, scale, scale);
TextureRect_CI4(&gMasterDisp, D_versus_30006D0, D_versus_3000810, 64, 10, xPos, yPos, scale, scale);
}
void func_versus_800BD164(f32 xPos, f32 yPos) {
TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7003C70, 16, 16, xPos, yPos, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_VS_MENU_7003C70, 16, 16, xPos, yPos, 1.0f, 1.0f);
}
void func_versus_800BD1B0(f32 xPos, f32 yPos) {
TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7003F10, 16, 16, xPos, yPos, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_VS_MENU_7003F10, 16, 16, xPos, yPos, 1.0f, 1.0f);
}
void func_versus_800BD1FC(f32 xPos, f32 yPos) {
TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7003E10, 16, 16, xPos, yPos, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_VS_MENU_7003E10, 16, 16, xPos, yPos, 1.0f, 1.0f);
}
void func_versus_800BD248(f32 xPos, f32 yPos) {
TextureRect_8bCI(&gMasterDisp, D_VS_MENU_7004050, D_VS_MENU_7004150, 16, 16, xPos, yPos, 1.0f, 1.0f);
TextureRect_CI8(&gMasterDisp, D_VS_MENU_7004050, D_VS_MENU_7004150, 16, 16, xPos, yPos, 1.0f, 1.0f);
}
void func_versus_800BD2A0(f32 xPos, f32 yPos) {
TextureRect_8bCI(&gMasterDisp, D_VS_MENU_70041F0, D_VS_MENU_70042F0, 16, 16, xPos, yPos, 1.0f, 1.0f);
TextureRect_CI8(&gMasterDisp, D_VS_MENU_70041F0, D_VS_MENU_70042F0, 16, 16, xPos, yPos, 1.0f, 1.0f);
}
void func_versus_800BD2F8(f32 xPos, f32 yPos) {
TextureRect_8bCI(&gMasterDisp, D_VS_MENU_7004360, D_VS_MENU_7004460, 16, 16, xPos, yPos, 1.0f, 1.0f);
TextureRect_CI8(&gMasterDisp, D_VS_MENU_7004360, D_VS_MENU_7004460, 16, 16, xPos, yPos, 1.0f, 1.0f);
}
void func_versus_800BD350(f32 xPos, f32 yPos) {
TextureRect_8bCI(&gMasterDisp, D_VS_MENU_70044D0, D_VS_MENU_7004990, 64, 19, xPos, yPos, 1.0f, 1.0f);
TextureRect_CI8(&gMasterDisp, D_VS_MENU_70044D0, D_VS_MENU_7004990, 64, 19, xPos, yPos, 1.0f, 1.0f);
}
void func_versus_800BD3A8(f32 xPos, f32 yPos) {
s32 i;
for (i = 0; i < 8; i++) {
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_CI4(&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_MENU_70118E0 + ((80 * 8 * i) / 2), D_VS_MENU_70123F8, 80, 7, xPos,
yPos + (i * 8), 1.0f, 1.0f);
TextureRect_CI4(&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_versus_800BD4D4(f32 xPos, f32 yPos, s32 arg2) {
@ -220,21 +220,21 @@ void func_versus_800BD4D4(f32 xPos, f32 yPos, s32 arg2) {
for (i /= 10; i != 1; i /= 10) {
j = arg2 / i;
if (j || (var_s2 == true)) {
TextureRect_8bIA(&gMasterDisp, D_800D4AF8[j / i], 16, 8, xPos, yPos, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_800D4AF8[j / i], 16, 8, xPos, yPos, 1.0f, 1.0f);
xPos += 9.0f;
arg2 %= i;
var_s2 = true;
}
}
TextureRect_8bIA(&gMasterDisp, D_800D4AF8[arg2 / i], 16, 8, xPos, yPos, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_800D4AF8[arg2 / i], 16, 8, xPos, yPos, 1.0f, 1.0f);
}
void func_versus_800BD720(f32 xPos, f32 yPos) {
TextureRect_8bIA(&gMasterDisp, D_versus_30013E0, 8, 8, xPos, yPos, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_versus_30013E0, 8, 8, xPos, yPos, 1.0f, 1.0f);
}
void func_versus_800BD76C(f32 xPos, f32 yPos) {
TextureRect_4bCI(&gMasterDisp, D_versus_30001E0, D_versus_3000380, 64, 13, xPos, yPos, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_versus_30001E0, D_versus_3000380, 64, 13, xPos, yPos, 1.0f, 1.0f);
}
void func_versus_800BD7C4(f32 xPos, f32 yPos, s32 arg2) {
@ -244,23 +244,23 @@ void func_versus_800BD7C4(f32 xPos, f32 yPos, s32 arg2) {
for (i = 10; i != 1; i /= 10) {
if (xPos > 0 && (yPos > 0)) {
TextureRect_8bIA(&gMasterDisp, D_800D4B20[arg2 / i], 16, 8, xPos, yPos, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_800D4B20[arg2 / i], 16, 8, xPos, yPos, 1.0f, 1.0f);
}
xPos += 9.0f;
arg2 %= i;
}
if ((xPos > 0) && (yPos > 0)) {
TextureRect_8bIA(&gMasterDisp, D_800D4B20[arg2 / i], 16, 8, xPos, yPos, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_800D4B20[arg2 / i], 16, 8, xPos, yPos, 1.0f, 1.0f);
}
}
void func_versus_800BD9FC(f32 xPos, f32 yPos) {
TextureRect_4bCI(&gMasterDisp, D_1011E80, D_1011EC0, 16, 8, xPos, yPos, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_1011E80, D_1011EC0, 16, 8, xPos, yPos, 1.0f, 1.0f);
}
void func_versus_800BDA54(f32 xPos, f32 yPos) {
TextureRect_8bIA(&gMasterDisp, aSmallText_L, 8, 8, xPos, yPos, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, aSmallText_L, 8, 8, xPos, yPos, 1.0f, 1.0f);
}
void func_versus_800BDAA0(f32 xPos, f32 yPos, s32 arg2, s32 arg3, s32 arg4) {
@ -279,18 +279,15 @@ void func_versus_800BDAA0(f32 xPos, f32 yPos, s32 arg2, s32 arg3, s32 arg4) {
temp1 = arg2 / i;
temp2 = arg3 / i;
if (temp1 == temp2) {
TextureRect_8bIA(&gMasterDisp, D_800D4B48[temp1], 16, 15, xPos, yPos, 0.7f, 0.7f);
TextureRect_IA8(&gMasterDisp, D_800D4B48[temp1], 16, 15, xPos, yPos, 0.7f, 0.7f);
} else {
if (temp3 > y3) {
TextureRect_8bIA(&gMasterDisp, D_800D4B48[temp2] + (16 * arg4), 16, 15 - arg4, xPos, yPos, 0.7f, 0.7f);
TextureRect_8bIA(&gMasterDisp, D_800D4B48[temp1], 16, arg4, xPos, yPos + (15 - arg4) * 0.7f, 0.7f,
0.7f);
TextureRect_IA8(&gMasterDisp, D_800D4B48[temp2] + (16 * arg4), 16, 15 - arg4, xPos, yPos, 0.7f, 0.7f);
TextureRect_IA8(&gMasterDisp, D_800D4B48[temp1], 16, arg4, xPos, yPos + (15 - arg4) * 0.7f, 0.7f, 0.7f);
}
if (temp3 < y3) {
TextureRect_8bIA(&gMasterDisp, D_800D4B48[temp2], 16, 15 - arg4, xPos, yPos + (arg4 * 0.7f), 0.7f,
0.7f);
TextureRect_8bIA(&gMasterDisp, D_800D4B48[temp1] + (16 * (15 - arg4)), 16, arg4, xPos, yPos, 0.7f,
0.7f);
TextureRect_IA8(&gMasterDisp, D_800D4B48[temp2], 16, 15 - arg4, xPos, yPos + (arg4 * 0.7f), 0.7f, 0.7f);
TextureRect_IA8(&gMasterDisp, D_800D4B48[temp1] + (16 * (15 - arg4)), 16, arg4, xPos, yPos, 0.7f, 0.7f);
}
}
xPos += 13.0f * 0.7f;
@ -317,7 +314,7 @@ void func_versus_800BDE44(void) {
202.0f,
};
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
for (i = 0; i < 4; i++) {
@ -393,10 +390,10 @@ s32 func_versus_800BE300(f32 xPos, f32 yPos, s32* arg2) {
f32 y;
s32 temp;
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 0, 0, 255);
TextureRect_8bCI(&gMasterDisp, D_1013170, D_1013570, 24, 17, 120.0f, 115.0f, 3.33f, 0.53f);
TextureRect_CI8(&gMasterDisp, D_1013170, D_1013570, 24, 17, 120.0f, 115.0f, 3.33f, 0.53f);
xTemp = 0.0f;
@ -413,10 +410,10 @@ s32 func_versus_800BE300(f32 xPos, f32 yPos, s32* arg2) {
}
if ((i % 2) == 1) {
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
func_versus_800BD9FC(x + xTemp, y);
} else {
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
func_versus_800BD7C4(x + xTemp, y, temp);
xTemp += 9.0f;
@ -505,37 +502,37 @@ void func_versus_800BE924(s32 index) {
f32 D_800D4B90[] = { 40.0f, 200.0f, 40.0f, 200.0f };
f32 D_800D4BA0[] = { 20.0f, 20.0f, 140.0f, 140.0f };
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
func_versus_800BD3A8(D_800D4B90[index] + 0.0f, D_800D4BA0[index] + 10.0f);
func_versus_800BD350(D_800D4B90[index] + 5.0f, D_800D4BA0[index] + 0.0f);
if (sUnlockLandmaster && sUnlockOnFoot) {
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
func_versus_800BD248(D_800D4B90[index] + 15.0f, D_800D4BA0[index] + 22.0f);
func_versus_800BD2A0(D_800D4B90[index] + 15.0f, D_800D4BA0[index] + 40.0f);
func_versus_800BD2F8(D_800D4B90[index] + 15.0f, D_800D4BA0[index] + 58.0f);
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
func_versus_800BD164(D_800D4B90[index] + 43.0f, D_800D4BA0[index] + 22.0f);
func_versus_800BD1B0(D_800D4B90[index] + 43.0f, D_800D4BA0[index] + 40.0f);
func_versus_800BD1FC(D_800D4B90[index] + 43.0f, D_800D4BA0[index] + 58.0f);
}
if (sUnlockLandmaster && !sUnlockOnFoot) {
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
func_versus_800BD248(D_800D4B90[index] + 15.0f, D_800D4BA0[index] + 29.0f);
func_versus_800BD2A0(D_800D4B90[index] + 15.0f, D_800D4BA0[index] + 51.0f);
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
func_versus_800BD164(D_800D4B90[index] + 43.0f, D_800D4BA0[index] + 29.0f);
func_versus_800BD1B0(D_800D4B90[index] + 43.0f, D_800D4BA0[index] + 51.0f);
}
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
func_versus_800BD4D4(D_800D4B90[index] + 32.0f, D_800D4BA0[index] + 84.0f, (D_801787F8[index] / 30) + 1);
}
@ -543,13 +540,13 @@ void func_versus_800BECA8(s32 index) {
f32 D_800D4BB0[] = { 40.0f, 200.0f, 40.0f, 200.0f };
f32 D_800D4BC0[] = { 40.0f, 40.0f, 160.0f, 160.0f };
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 30, 0, 255);
func_versus_800BC88C(D_800D4BB0[index], D_800D4BC0[index], 1.0f);
}
void func_versus_800BED78(void) {
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
func_versus_800BC8D8(84.0f, 108.0f, 1.0f);
}
@ -616,7 +613,7 @@ s32 func_versus_800BEFE4(void) {
f32 D_800D4BF0[] = { 12.0f, 0.0f, 0.0f };
s32 i;
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
for (i = 0; i < 4; i++) {
@ -732,7 +729,7 @@ s32 func_versus_800BF59C(void) {
s32 colorGB;
for (i = 0; i < 4; i++) {
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
if (D_80178850[i] == 0) {
continue;
@ -761,7 +758,7 @@ void func_versus_800BF750(void) {
s32 D_800D4C5C[] = { 12, 0, 67, 255 };
s32 temp;
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
for (i = 0; i < 4; i++) {
if (gPlayer[i].state_1C8 != PLAYERSTATE_1C8_ACTIVE) {
@ -1068,11 +1065,11 @@ s32 func_versus_800C04DC(f32 xPos, f32 scale, s32 arg2) {
x = 118.0f;
y = 110.0f;
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 0, 0, 200);
func_versus_800BCFFC(98.0f, 100.0f, 5.2f, 2.98f);
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
Graphics_DisplaySmallText(x, y, 1.0f, 1.0f, "TOTAL");
@ -1082,11 +1079,11 @@ s32 func_versus_800C04DC(f32 xPos, f32 scale, s32 arg2) {
func_hud_800869A0(x + 18.0f, y + 16.0f, D_800D4A94, 1.0f, 0, 9999);
} else {
if (arg2 < 4) {
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
func_versus_800BCC48(xPos, 100.0f, scale, 1.0f, arg2);
} else {
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
func_versus_800BCE24(xPos, 104.0f, scale, 1.0f);
}
@ -1096,7 +1093,7 @@ s32 func_versus_800C04DC(f32 xPos, f32 scale, s32 arg2) {
}
s32 func_versus_800C075C(void) {
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
func_versus_800BCEF8(94.0f, 126.0f, 1.0f);
return 0;
@ -1151,7 +1148,7 @@ bool func_versus_800C08D0(void) {
}
void func_versus_800C0970(f32 yScale1, f32 yScale2) {
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 0, 0, 255);
func_versus_800BCFFC(98.0f, 72.0f, 5.19f, yScale1);
func_versus_800BCFFC(98.0f, 152.0f, 5.19f, yScale2);
@ -1191,7 +1188,7 @@ s32 func_versus_800C0B0C(void) {
s32 i;
s32 colorGB[3];
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
for (i = 0; i < 3; i++) {
if (i == D_801787A4) {
@ -1293,7 +1290,7 @@ s32 func_versus_800C0E78(void) {
for (i = 0; i < 4; i++) {
if (gControllerPlugged[i] == true) {
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
Graphics_DisplaySmallText(D_800D4C90[i], D_800D4CA4[i], 1.0f, 1.0f, D_800D4C80[i]);
@ -1330,7 +1327,7 @@ s32 func_versus_800C1138(s32 max, s32 arg1) {
s32 j;
for (i = 0; i < max; i++) {
RCP_SetupDL(&gMasterDisp, 0x4D);
RCP_SetupDL(&gMasterDisp, SETUPDL_77);
j = gVsKills[arg1][i];
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(gMasterDisp++, D_800D4CD8[j], D_800D4CE8[j], D_800D4CF8[j], 0);

2
src/mods/fpscounter.c
View File

@ -38,7 +38,7 @@ static void Play_RenderFps(void) {
}
/* Draw */
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
Graphics_DisplaySmallText(FPS_COUNTER_X_POS, FPS_COUNTER_Y_POS, 1.0f, 1.0f, "FPS:");
Graphics_DisplaySmallNumber(FPS_COUNTER_X_POS + 35, FPS_COUNTER_Y_POS, gFPS);

2
src/mods/levelselect.c
View File

@ -93,7 +93,7 @@ void Map_LevelSelect(void) {
/* Draw */
if ((sCurrentPlanetId >= 0) && (sCurrentPlanetId < PLANET_MAX)) {
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
Graphics_DisplaySmallText(20, 200, 1.0f, 1.0f, "PLANET:");

2
src/mods/object_ram.c
View File

@ -366,7 +366,7 @@ void ObjectRam_Update(void) {
// break;
}
}
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
// Graphics_DisplaySmallText(20, 50, 1.0f, 1.0f, omStr[editMode]);
for (i = 0; i < ARRAY_COUNT(oRamEntries); i++) {

2
src/mods/sfxjukebox.c
View File

@ -118,7 +118,7 @@ void Option_ExpertSoundUpdate(void) {
/* Draw */
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
Graphics_DisplaySmallText(20, 50, 1.0f, 1.0f, "SFX ID:");

2
src/mods/sfxjukebox2.c
View File

@ -197,7 +197,7 @@ void Jukebox_Update(void) {
/* Draw */
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
Graphics_Printf("SFX ID: %08X", sfx);

40
src/overlays/ovl_ending/fox_end1.c
View File

@ -75,20 +75,20 @@ void Ending_80187520(s32 arg0) {
s32 i;
s32 j;
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
switch (arg0) {
case 0:
for (j = 0, i = 0; i < 67; j += 316 * 4, i++) {
TextureRect_16bRGBA(&gMasterDisp, gEndingAwardBack + j, 316, 4, 0.0f, 4 * i, 1.0f, 1.0f);
TextureRect_RGBA16(&gMasterDisp, gEndingAwardBack + j, 316, 4, 0.0f, 4 * i, 1.0f, 1.0f);
}
TextureRect_16bRGBA(&gMasterDisp, gEndingAwardBack + j, 316, 3, 0.0f, 4 * i, 1.0f, 1.0f);
TextureRect_RGBA16(&gMasterDisp, gEndingAwardBack + j, 316, 3, 0.0f, 4 * i, 1.0f, 1.0f);
break;
case 1:
for (j = 0, i = 0; i < 60; j += 316 * 4, i++) {
TextureRect_16bRGBA(&gMasterDisp, gEndingAwardFront + j, 316, 4, 0.0f, 4 * i, 1.0f, 1.0f);
TextureRect_RGBA16(&gMasterDisp, gEndingAwardFront + j, 316, 4, 0.0f, 4 * i, 1.0f, 1.0f);
}
break;
}
@ -99,7 +99,7 @@ void Ending_801876A4(void) {
for (i = 0; i < 4; i++) {
Matrix_Push(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x3E);
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 240);
Matrix_Translate(gGfxMatrix, D_ending_80196D08[i].pos.x, D_ending_80196D08[i].pos.y, D_ending_80196D08[i].pos.z,
MTXF_APPLY);
@ -424,21 +424,21 @@ void Ending_801886F4(void) {
return;
}
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
switch ((D_ending_80196F90 % 8) / 2) {
case 3:
TextureRect_4bCI(&gMasterDisp, D_END_70110E0, D_END_70111B0, 16, 26, temp + 31.0f, 18.0f, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_END_70110E0, D_END_70111B0, 16, 26, temp + 31.0f, 18.0f, 1.0f, 1.0f);
/* fallthrough */
case 2:
TextureRect_4bCI(&gMasterDisp, D_END_7010FF0, D_END_70110C0, 16, 26, temp + 24.0f, 18.0f, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_END_7010FF0, D_END_70110C0, 16, 26, temp + 24.0f, 18.0f, 1.0f, 1.0f);
/* fallthrough */
case 1:
TextureRect_4bCI(&gMasterDisp, D_END_7010F00, D_END_7010FD0, 16, 26, temp + 18.0f, 18.0f, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_END_7010F00, D_END_7010FD0, 16, 26, temp + 18.0f, 18.0f, 1.0f, 1.0f);
/* fallthrough */
case 0:
TextureRect_4bCI(&gMasterDisp, D_END_7010E10, D_END_7010EE0, 16, 26, temp, 18.0f, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_END_7010E10, D_END_7010EE0, 16, 26, temp, 18.0f, 1.0f, 1.0f);
}
}
@ -1733,14 +1733,14 @@ void Ending_8018C21C(void) {
if (gCsFrameCount < 780) {
Matrix_Push(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x11);
RCP_SetupDL(&gMasterDisp, SETUPDL_17);
Matrix_Translate(gGfxMatrix, 0.0f, -1200.0f, -6000.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_END_700C8B0);
Matrix_Pop(&gGfxMatrix);
} else {
Matrix_Push(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x11);
RCP_SetupDL(&gMasterDisp, SETUPDL_17);
Matrix_Translate(gGfxMatrix, -2000.0f, -3000.0f, 3000.0f, MTXF_APPLY);
Matrix_RotateY(gGfxMatrix, 110.0f * M_DTOR, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
@ -1756,7 +1756,7 @@ void Ending_8018C21C(void) {
switch (gActors[i].obj.id) {
case 0:
if (gActors[i].state == 0) {
RCP_SetupDL(&gMasterDisp, 0x17);
RCP_SetupDL(&gMasterDisp, SETUPDL_23);
Matrix_Translate(gGfxMatrix, gActors[i].obj.pos.x, gActors[i].obj.pos.y, gActors[i].obj.pos.z,
MTXF_APPLY);
Matrix_Scale(gGfxMatrix, gActors[i].scale, gActors[i].scale, gActors[i].scale, MTXF_APPLY);
@ -1773,7 +1773,7 @@ void Ending_8018C21C(void) {
gSPDisplayList(gMasterDisp++, D_GREAT_FOX_E003AB0);
}
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 64);
gDPSetEnvColor(gMasterDisp++, 255, 255, 0, 64);
@ -1797,7 +1797,7 @@ void Ending_8018C21C(void) {
Matrix_Pop(&gGfxMatrix);
}
} else {
RCP_SetupDL(&gMasterDisp, 0x17);
RCP_SetupDL(&gMasterDisp, SETUPDL_23);
Matrix_Translate(gGfxMatrix, gActors[i].obj.pos.x, gActors[i].obj.pos.y, gActors[i].obj.pos.z,
MTXF_APPLY);
Matrix_Scale(gGfxMatrix, gActors[i].scale, gActors[i].scale, gActors[i].scale, MTXF_APPLY);
@ -1810,7 +1810,7 @@ void Ending_8018C21C(void) {
break;
case 1:
RCP_SetupDL(&gMasterDisp, 0x17);
RCP_SetupDL(&gMasterDisp, SETUPDL_23);
Matrix_Translate(gGfxMatrix, gActors[i].obj.pos.x, gActors[i].obj.pos.y, gActors[i].obj.pos.z,
MTXF_APPLY);
Matrix_Scale(gGfxMatrix, gActors[i].scale, gActors[i].scale, gActors[i].scale, MTXF_APPLY);
@ -1822,7 +1822,7 @@ void Ending_8018C21C(void) {
break;
case 2:
RCP_SetupDL(&gMasterDisp, 0x17);
RCP_SetupDL(&gMasterDisp, SETUPDL_23);
Matrix_Translate(gGfxMatrix, gActors[i].obj.pos.x, gActors[i].obj.pos.y, gActors[i].obj.pos.z,
MTXF_APPLY);
Matrix_Scale(gGfxMatrix, gActors[i].scale, gActors[i].scale, gActors[i].scale, MTXF_APPLY);
@ -1834,7 +1834,7 @@ void Ending_8018C21C(void) {
break;
case 3:
RCP_SetupDL(&gMasterDisp, 0x17);
RCP_SetupDL(&gMasterDisp, SETUPDL_23);
Matrix_Translate(gGfxMatrix, gActors[i].obj.pos.x, gActors[i].obj.pos.y, gActors[i].obj.pos.z,
MTXF_APPLY);
Matrix_Scale(gGfxMatrix, gActors[i].scale, gActors[i].scale, gActors[i].scale, MTXF_APPLY);
@ -1844,7 +1844,7 @@ void Ending_8018C21C(void) {
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_D00B880);
Matrix_Push(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 64);
gDPSetEnvColor(gMasterDisp++, 0, 255, 0, 64);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -66.0f, MTXF_APPLY);
@ -1854,7 +1854,7 @@ void Ending_8018C21C(void) {
gSPDisplayList(gMasterDisp++, D_END_7010970);
Matrix_Pop(&gGfxMatrix);
spE4 = gActors[i].fwork[1];
RCP_SetupDL(&gMasterDisp, 0x29);
RCP_SetupDL(&gMasterDisp, SETUPDL_41);
switch (gActors[i].unk_046) {
case 0:

56
src/overlays/ovl_ending/fox_end2.c
View File

@ -34,31 +34,31 @@ void Ending_8018CE20(u32 arg0) {
if ((D_ending_80192E74[i].unk_11 == 0) || (gVenomHardClear == 1)) {
if (D_ending_80192E74[i].unk_10 == 1) {
xPos = (SCREEN_WIDTH - Graphics_GetLargeTextWidth(D_ending_80192E74[i].unk_00)) / 2;
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetTextureFilter(gMasterDisp++, G_TF_POINT);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, alpha);
Graphics_DisplayLargeText(xPos, D_ending_80192E74[i].unk_0E, 1.0f, 1.0f,
D_ending_80192E74[i].unk_00);
} else if (D_ending_80192E74[i].unk_10 == 2) {
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetTextureFilter(gMasterDisp++, G_TF_POINT);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, alpha);
TextureRect_8bIA(&gMasterDisp, D_ending_80192E74[i].unk_00 + 192 * 5 * 0, 192, 5, 64.0f, 105.0f,
1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_ending_80192E74[i].unk_00 + 192 * 5 * 1, 192, 5, 64.0f, 110.0f,
1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_ending_80192E74[i].unk_00 + 192 * 5 * 2, 192, 5, 64.0f, 115.0f,
1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_ending_80192E74[i].unk_00 + 192 * 5 * 3, 192, 5, 64.0f, 120.0f,
1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_ending_80192E74[i].unk_00 + 192 * 5 * 4, 192, 5, 64.0f, 125.0f,
1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_ending_80192E74[i].unk_00 + 192 * 5 * 5, 192, 5, 64.0f, 130.0f,
1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_ending_80192E74[i].unk_00 + 192 * 5 * 0, 192, 5, 64.0f, 105.0f,
1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_ending_80192E74[i].unk_00 + 192 * 5 * 1, 192, 5, 64.0f, 110.0f,
1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_ending_80192E74[i].unk_00 + 192 * 5 * 2, 192, 5, 64.0f, 115.0f,
1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_ending_80192E74[i].unk_00 + 192 * 5 * 3, 192, 5, 64.0f, 120.0f,
1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_ending_80192E74[i].unk_00 + 192 * 5 * 4, 192, 5, 64.0f, 125.0f,
1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_ending_80192E74[i].unk_00 + 192 * 5 * 5, 192, 5, 64.0f, 130.0f,
1.0f, 1.0f);
} else {
xPos = (320 - Graphics_GetSmallTextWidth(D_ending_80192E74[i].unk_00)) / 2;
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetTextureFilter(gMasterDisp++, G_TF_POINT);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 155, 155, alpha);
Graphics_DisplaySmallText(xPos, D_ending_80192E74[i].unk_0E, 1.0f, 1.0f,
@ -151,16 +151,16 @@ void Ending_8018D638(u32 arg0, AssetInfo* asset) {
gFillScreenAlpha = gFillScreenAlphaTarget = alpha;
gFillScreenAlphaStep = 0;
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
if (gExpertMode != 0) {
for (i = 0; i < 240; i += 4) {
if (gVenomHardClear == 0) {
TextureRect_16bRGBA(&gMasterDisp, gEndingNormalReward + 316 * i, 316, 4, 0.0f, i, 1.0f, 1.0f);
TextureRect_RGBA16(&gMasterDisp, gEndingNormalReward + 316 * i, 316, 4, 0.0f, i, 1.0f, 1.0f);
} else {
TextureRect_16bRGBA(&gMasterDisp, gEndingExpertReward + 316 * i, 316, 4, 0.0f, i, 1.0f, 1.0f);
TextureRect_RGBA16(&gMasterDisp, gEndingExpertReward + 316 * i, 316, 4, 0.0f, i, 1.0f, 1.0f);
}
}
} else {
@ -183,10 +183,10 @@ void Ending_8018D814(u32 arg0, AssetInfo* asset) {
gDPSetPrimColor(gMasterDisp++, 0, 0, asset->prim.r, asset->prim.g, asset->prim.b, alpha);
TextureRect_8bIA(&gMasterDisp, sLargeText_1997_1, 16, 15, asset->unk_18.x, asset->unk_18.y, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, sLargeText_1997_9, 16, 15, asset->unk_18.x + 16.0f * 1, asset->unk_18.y, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, sLargeText_1997_9, 16, 15, asset->unk_18.x + 16.0f * 2, asset->unk_18.y, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, sLargeText_1997_7, 16, 15, asset->unk_18.x + 16.0f * 3, asset->unk_18.y, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, sLargeText_1997_1, 16, 15, asset->unk_18.x, asset->unk_18.y, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, sLargeText_1997_9, 16, 15, asset->unk_18.x + 16.0f * 1, asset->unk_18.y, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, sLargeText_1997_9, 16, 15, asset->unk_18.x + 16.0f * 2, asset->unk_18.y, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, sLargeText_1997_7, 16, 15, asset->unk_18.x + 16.0f * 3, asset->unk_18.y, 1.0f, 1.0f);
}
void Ending_8018DA0C(u32 arg0, AssetInfo* asset) {
@ -312,9 +312,9 @@ void Ending_8018E1B8(u32 arg0, AssetInfo* asset) {
f32 temp;
if ((asset->unk_18.z + (arg0 - asset->unk_0C) * asset->unk_3C.z) < D_ending_801985D0.z) {
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
} else {
RCP_SetupDL(&gMasterDisp, 0x3F);
RCP_SetupDL(&gMasterDisp, SETUPDL_63);
}
gSPFogPosition(gMasterDisp++, asset->fogNear, asset->fogFar);
@ -371,9 +371,9 @@ void Ending_8018E7B8(u32 arg0, AssetInfo* asset) {
f32 temp;
if ((asset->unk_18.z + (arg0 - asset->unk_0C) * asset->unk_3C.z) < D_ending_801985D0.z) {
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
} else {
RCP_SetupDL(&gMasterDisp, 0x3F);
RCP_SetupDL(&gMasterDisp, SETUPDL_63);
}
gSPFogPosition(gMasterDisp++, asset->fogNear, asset->fogFar);
@ -556,7 +556,7 @@ void Ending_8018F64C(u32 arg0, AssetInfo* asset) {
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_D009A40);
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, MTXF_APPLY);
Matrix_Scale(gGfxMatrix, 0.8f + (arg0 % 3) * 0.01f, 0.3f + (arg0 % 3) * 0.01f, 0.8f + (arg0 % 3) * 0.01f,
@ -623,7 +623,7 @@ void Ending_8018FC60(u32 arg0, AssetInfo* asset) {
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_D00B880);
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -50.0f, MTXF_APPLY);
Matrix_Scale(gGfxMatrix, 0.5f + (arg0 % 3) * 0.01f, 0.3f + (arg0 % 3) * 0.01f, 0.5f + (arg0 % 3) * 0.01f,

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

@ -9,7 +9,7 @@
void Training_801988E0(void) {
if (gRingPassCount != 0) {
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
func_hud_800869A0(250.0f, 50.0f, gRingPassCount, 1.0f, 0, 999);
}

22
src/overlays/ovl_i1/fox_ve1.c
View File

@ -891,20 +891,20 @@ bool Venom1_801937F4(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* t
if (!(D_i1_8019B838[D_i1_8019A748[i].index].unk_7C & 1)) {
if (D_i1_8019B838[D_i1_8019A748[i].index].unk_00 > 0) {
if ((D_i1_8019B838[D_i1_8019A748[i].index].unk_02[2] & 2) == 2) {
RCP_SetupDL(&gMasterDisp, 0x1E);
RCP_SetupDL(&gMasterDisp, SETUPDL_30);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
if (*dList != NULL) {
gSPDisplayList(gMasterDisp++, *dList);
}
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
} else if (i == 15) {
RCP_SetupDL(&gMasterDisp, 0x1E);
RCP_SetupDL(&gMasterDisp, SETUPDL_30);
blue = 255 - (s32) this->fwork[16];
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, blue, blue, 255);
if (*dList != NULL) {
gSPDisplayList(gMasterDisp++, *dList);
}
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
} else {
if (*dList != NULL) {
gSPDisplayList(gMasterDisp++, *dList);
@ -916,7 +916,7 @@ bool Venom1_801937F4(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* t
green = D_i1_8019B838[D_i1_8019A748[i].index].unk_6C;
red = D_i1_8019B838[D_i1_8019A748[i].index].unk_64;
if (*dList != NULL) {
RCP_SetupDL(&gMasterDisp, 0x1F);
RCP_SetupDL(&gMasterDisp, SETUPDL_31);
if (blue > 128) {
blue = 128;
}
@ -929,18 +929,18 @@ bool Venom1_801937F4(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* t
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, red, green, blue, 255);
gDPSetEnvColor(gMasterDisp++, 255, 255, 255, 0);
gSPDisplayList(gMasterDisp++, D_i1_8019A748[i].dList);
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
}
} else {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
gSPDisplayList(gMasterDisp++, D_i1_8019A748[i].dList);
}
} else {
RCP_SetupDL(&gMasterDisp, 0x22);
RCP_SetupDL(&gMasterDisp, SETUPDL_34);
lum = D_i1_8019AD68[(s32) this->fwork[8]];
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, lum, lum, lum, 255);
gSPDisplayList(gMasterDisp++, D_i1_8019A748[i].dList);
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
}
}
override = true;
@ -1040,7 +1040,7 @@ void Venom1_80193D64(s32 limbIndex, Vec3f* rot, void* thisx) {
}
break;
}
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
var_s6 = D_i1_8019A820;
var_s7 = D_i1_8019B838;
@ -1068,7 +1068,7 @@ void Venom1_80193D64(s32 limbIndex, Vec3f* rot, void* thisx) {
}
}
}
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
}
#ifdef NON_MATCHING
@ -2320,7 +2320,7 @@ void Venom1_Boss_Update(Boss* boss);
#endif
void Venom1_80198310(Boss* boss) {
RCP_SetupDL(&gMasterDisp, 0x41);
RCP_SetupDL(&gMasterDisp, SETUPDL_65);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255);
gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 0);
Matrix_Translate(gGfxMatrix, 0.0f, -5.0f + gCameraShakeY, 0.0f, MTXF_APPLY);

8
src/overlays/ovl_i2/fox_sx.c
View File

@ -166,7 +166,7 @@ void SectorX_8018F884(Actor* actor) {
case -1:
actor->obj.rot.y = RAD_TO_DEG(-gPlayer[gPlayerNum].camYaw);
actor->obj.rot.x = RAD_TO_DEG(gPlayer[gPlayerNum].camPitch);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
gDPSetPrimColor(gMasterDisp++, 0, 0, 220, 70, 30, 255);
Matrix_Scale(gGfxMatrix, 70.0f, 70.0f, 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
@ -1154,9 +1154,9 @@ bool SectorX_80192AF0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
}
if ((boss->timer_05C % 2) == 0) {
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
} else {
RCP_SetupDL(&gMasterDisp, 0x1B);
RCP_SetupDL(&gMasterDisp, SETUPDL_27);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 0, 0, 255);
}
@ -1188,7 +1188,7 @@ bool SectorX_80192AF0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, *dList);
if (boss->swork[4] == 0) {
RCP_SetupDL(&gMasterDisp, 0x29);
RCP_SetupDL(&gMasterDisp, SETUPDL_41);
if (((gGameFrameCount % 2) == 0)) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
} else {

20
src/overlays/ovl_i3/fox_a6.c
View File

@ -1765,12 +1765,12 @@ void Area6_8018BCD4(Vec3f* arg0, f32 arg1, f32 arg2, Vec3f* arg3, s32 arg4, f32
Vec3f sp90 = { 0.0f, 0.0f, 0.0f };
if (D_i3_801C22F0.unk_24 != 0.0f) {
RCP_SetupDL(&gMasterDisp, 0x17);
RCP_SetupDL(&gMasterDisp, SETUPDL_23);
if (D_i3_801C22F0.unk_24 != 255.0f) {
RCP_SetupDL(&gMasterDisp, 0x47);
RCP_SetupDL(&gMasterDisp, SETUPDL_71);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, (s32) D_i3_801C22F0.unk_24);
} else if (arg4 != 0) {
RCP_SetupDL(&gMasterDisp, 0x1B);
RCP_SetupDL(&gMasterDisp, SETUPDL_27);
if (arg7 < 18.0f) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 255, 255);
} else {
@ -1853,14 +1853,14 @@ void Area6_8018C0D0(f32* arg0, f32 arg1, Vec3f* arg2, f32 arg3, s32 arg4) {
Matrix_Scale(gCalcMatrix, var_fs3, var_fs3, 1.0f, MTXF_APPLY);
Matrix_Mult(gGfxMatrix, gCalcMatrix, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, (s32) D_i3_801C22F0.r[arg4], (s32) D_i3_801C22F0.g[arg4],
(s32) D_i3_801C22F0.b[arg4], 255);
gDPSetEnvColor(gMasterDisp++, 255, 0, 0, 255);
gSPDisplayList(gMasterDisp++, D_1024AC0);
Matrix_MultVec3f(gCalcMatrix, &spB0, arg2);
} else {
RCP_SetupDL(&gMasterDisp, 0x2F);
RCP_SetupDL(&gMasterDisp, SETUPDL_47);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 64, 64, 192);
Matrix_Translate(gCalcMatrix, 0.0f, -60.0f, 0.0f, MTXF_APPLY);
Matrix_Scale(gCalcMatrix, 2.0f, 3.0f, 1.0f, MTXF_APPLY);
@ -1888,7 +1888,7 @@ void Area6_Boss_Draw(Boss* bossA6) {
s32 j;
if (bossA6->state == 0) {
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, (s32) D_i3_801C22F0.unk_24);
gDPSetEnvColor(gMasterDisp++, 255, 255, 0, 255);
Matrix_Scale(gGfxMatrix, 10.0f, 10.0f, 10.0f, MTXF_APPLY);
@ -1899,7 +1899,7 @@ void Area6_Boss_Draw(Boss* bossA6) {
Animation_GetFrameData(&D_A6_6018994, 0, jointTable);
if (D_i3_801C22F0.unk_24 != 255.0f) {
RCP_SetupDL(&gMasterDisp, 0x47);
RCP_SetupDL(&gMasterDisp, SETUPDL_71);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, (s32) D_i3_801C22F0.unk_24);
spAC.x = 0.0f;
@ -1919,7 +1919,7 @@ void Area6_Boss_Draw(Boss* bossA6) {
Matrix_RotateZ(gGfxMatrix, -(f32) gGameFrameCount * 10.0f * M_DTOR, MTXF_APPLY);
Matrix_Scale(gGfxMatrix, bossA6->fwork[A6_FWK_34], bossA6->fwork[A6_FWK_35], 1.0f, MTXF_APPLY);
} else {
RCP_SetupDL(&gMasterDisp, 0x1B);
RCP_SetupDL(&gMasterDisp, SETUPDL_27);
if (bossA6->timer_05C & 1) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
} else {
@ -2069,7 +2069,7 @@ void Area6_Boss_Draw(Boss* bossA6) {
}
}
Matrix_Push(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x47);
RCP_SetupDL(&gMasterDisp, SETUPDL_71);
Matrix_Translate(gGfxMatrix, 0.0f, 2.0f, 70.0f, MTXF_APPLY);
Matrix_Scale(gGfxMatrix, 1.7f, 1.7f, 1.7f, MTXF_APPLY);
@ -2084,7 +2084,7 @@ void Area6_Boss_Draw(Boss* bossA6) {
gSPDisplayList(gMasterDisp++, D_A6_601B2B0);
Matrix_Pop(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x47);
RCP_SetupDL(&gMasterDisp, SETUPDL_71);
if (D_i3_801C22F0.unk_24 != 255.0f) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, bossA6->swork[A6_SWK_22], bossA6->swork[A6_SWK_23],
bossA6->swork[A6_SWK_24], (s32) D_i3_801C22F0.unk_28[-1]);

76
src/overlays/ovl_i3/fox_aq.c
View File

@ -651,7 +651,7 @@ void Aquas_801AA20C(void) {
if (gPlayer[0].unk_234 != 0) {
Matrix_Push(&gGfxMatrix);
Math_SmoothStepToF(&D_i3_801C41B8[5], 3.0f, 1.0f, 4.0f, 0.0001f);
RCP_SetupDL(&gMasterDisp, 0x3D);
RCP_SetupDL(&gMasterDisp, SETUPDL_61);
if (D_i3_801C4190[3] == 0) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
@ -1807,16 +1807,16 @@ void Aquas_801ADF7C(f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot,
if (index < 2) {
if (!flag) {
RCP_SetupDL(&gMasterDisp, 0x39);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
} else {
RCP_SetupDL(&gMasterDisp, 0x3D);
RCP_SetupDL(&gMasterDisp, SETUPDL_61);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
} else {
if (!flag) {
RCP_SetupDL(&gMasterDisp, 0x39);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
} else {
RCP_SetupDL(&gMasterDisp, 0x3D);
RCP_SetupDL(&gMasterDisp, SETUPDL_61);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
}
@ -2081,13 +2081,13 @@ void Aquas_801AEB44(Actor* actor) {
MTXF_APPLY);
if (actor->state != 0) {
RCP_SetupDL(&gMasterDisp, 0x20);
RCP_SetupDL(&gMasterDisp, SETUPDL_32);
} else if (gBosses[0].swork[AQ_SWK_0] == 1) {
RCP_SetupDL(&gMasterDisp, 4);
RCP_SetupDL(&gMasterDisp, SETUPDL_4);
} else if ((actor->timer_0C6 % 2) == 0) {
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
} else {
RCP_SetupDL(&gMasterDisp, 0x16);
RCP_SetupDL(&gMasterDisp, SETUPDL_22);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
@ -2410,9 +2410,9 @@ void Aquas_801B099C(Actor* actor) {
Matrix_SetGfxMtx(&gMasterDisp);
if ((actor->timer_0C6 % 2) == 0) {
RCP_SetupDL(&gMasterDisp, 0x39);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
} else {
RCP_SetupDL(&gMasterDisp, 0x3D);
RCP_SetupDL(&gMasterDisp, SETUPDL_61);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
@ -2507,7 +2507,7 @@ void Aquas_801B0B60(Actor* actor) {
void Aquas_801B0EC0(Actor* actor) {
if (actor->timer_0BC == 0) {
Graphics_SetScaleMtx(0.8f);
RCP_SetupDL(&gMasterDisp, 0x3D);
RCP_SetupDL(&gMasterDisp, SETUPDL_61);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, actor->iwork[1], actor->iwork[2], actor->iwork[3], 255);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_AQ_6024A50);
@ -3431,13 +3431,13 @@ bool Aquas_801B42AC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* th
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
if ((D_i3_801C42A0[0] != 255) && (limbIndex != 27)) {
RCP_SetupDL(&gMasterDisp, 0x3A);
RCP_SetupDL(&gMasterDisp, SETUPDL_58);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, D_i3_801C42A0[0]);
} else if ((sBossAQlimbTimers[limbIndex] % 2) == 0) {
RCP_SetupDL(&gMasterDisp, 0x39);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
} else {
sp50 = true;
RCP_SetupDL(&gMasterDisp, 0x3D);
RCP_SetupDL(&gMasterDisp, SETUPDL_61);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
@ -3450,7 +3450,7 @@ bool Aquas_801B42AC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* th
break;
case AQ_LIMB_5:
RCP_SetupDL(&gMasterDisp, 0x3D);
RCP_SetupDL(&gMasterDisp, SETUPDL_61);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, gBosses[0].swork[AQ_SWK_14], gBosses[0].swork[AQ_SWK_15],
gBosses[0].swork[AQ_SWK_16], 255);
rot->x = D_i3_801C4308[14];
@ -3500,7 +3500,7 @@ bool Aquas_801B42AC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* th
sp54 = D_i3_801C4308[68];
if (sp50) {
RCP_SetupDL(&gMasterDisp, 0x3D);
RCP_SetupDL(&gMasterDisp, SETUPDL_61);
if (gBosses[0].health != 0) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
} else {
@ -3692,12 +3692,12 @@ bool Aquas_801B4DDC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* th
Actor* this = (Actor*) thisx;
if ((this->timer_0C6 % 2) == 0) {
RCP_SetupDL(&gMasterDisp, 0x39);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
if ((limbIndex > 0) && (limbIndex < 5)) {
RCP_SetupDL(&gMasterDisp, 0x3C);
RCP_SetupDL(&gMasterDisp, SETUPDL_60);
}
} else {
RCP_SetupDL(&gMasterDisp, 0x3D);
RCP_SetupDL(&gMasterDisp, SETUPDL_61);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
return false;
@ -3937,15 +3937,15 @@ bool Aquas_801B5C18(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* th
Actor* this = (Actor*) thisx;
if ((this->timer_0C6 % 2) == 0) {
RCP_SetupDL(&gMasterDisp, 0x39);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
} else if ((limbIndex < 7) || (limbIndex >= 9)) {
RCP_SetupDL(&gMasterDisp, 0x3D);
RCP_SetupDL(&gMasterDisp, SETUPDL_61);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
switch (limbIndex) {
case 7:
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, (s32) this->fwork[4]);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
sp6C = this->fwork[1];
@ -3953,7 +3953,7 @@ bool Aquas_801B5C18(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* th
sp64 = this->fwork[3];
break;
case 8:
RCP_SetupDL(&gMasterDisp, 0x3D);
RCP_SetupDL(&gMasterDisp, SETUPDL_61);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, (s32) this->fwork[4]);
break;
}
@ -4063,7 +4063,7 @@ void Aquas_801B619C(Actor* actor) {
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, actor->fwork[8], actor->fwork[9], actor->fwork[10], MTXF_APPLY);
Matrix_Scale(gGfxMatrix, actor->fwork[5], actor->fwork[6], actor->fwork[7], MTXF_APPLY);
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, (s32) actor->iwork[12]);
gDPSetEnvColor(gMasterDisp++, 127, 127, 0, (s32) actor->iwork[12]);
Matrix_SetGfxMtx(&gMasterDisp);
@ -4509,9 +4509,9 @@ void Aquas_801B7754(s32 limbIndex, Vec3f* rot, void* thisx) {
void Aquas_801B7A24(Actor* actor) {
Vec3f sp30[30];
RCP_SetupDL(&gMasterDisp, 0x39);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
if ((actor->timer_0C6 % 2) != 0) {
RCP_SetupDL(&gMasterDisp, 0x3D);
RCP_SetupDL(&gMasterDisp, SETUPDL_61);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
Animation_GetFrameData(&D_AQ_60260EC, actor->animFrame, sp30);
@ -4847,14 +4847,14 @@ void Aquas_801B7C78(Actor* actor) {
bool Aquas_801B8C50(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) {
Actor* this = thisx;
RCP_SetupDL(&gMasterDisp, 0x3A);
RCP_SetupDL(&gMasterDisp, SETUPDL_58);
if ((this->timer_0C6 % 2) != 0) {
RCP_SetupDL(&gMasterDisp, 0x22);
RCP_SetupDL(&gMasterDisp, SETUPDL_34);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
if ((this->timer_0C6 == 0) && ((this->fwork[6] <= 254.0f) || (this->state >= 4))) {
RCP_SetupDL(&gMasterDisp, 0x22);
RCP_SetupDL(&gMasterDisp, SETUPDL_34);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, (s32) this->fwork[4], (s32) this->fwork[5], (s32) this->fwork[6],
255);
}
@ -5234,12 +5234,12 @@ void Aquas_801B9DB0(s32 limbIndex, Vec3f* rot, void* thisx) {
void Aquas_801BA108(Actor* actor) {
Vec3f sp40[30];
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
if ((actor->timer_0C6 % 2) != 0) {
RCP_SetupDL(&gMasterDisp, 0x1E);
RCP_SetupDL(&gMasterDisp, SETUPDL_30);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
} else if (actor->state == 2) {
RCP_SetupDL(&gMasterDisp, 0x1E);
RCP_SetupDL(&gMasterDisp, SETUPDL_30);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 95, 31, 255);
}
@ -5941,7 +5941,7 @@ bool Aquas_801BC530(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* th
f32 sp4C = 0.0f;
Actor* this = (Actor*) thisx;
RCP_SetupDL(&gMasterDisp, 0x29);
RCP_SetupDL(&gMasterDisp, SETUPDL_41);
if ((this->timer_0C6 % 2) == 0) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 191, 255, 223, (s32) this->fwork[1]);
@ -6204,7 +6204,7 @@ void Aquas_801BD264(Actor* actor) {
Vec3f sp40[30];
if (actor->state != 0) {
RCP_SetupDL(&gMasterDisp, 0x37);
RCP_SetupDL(&gMasterDisp, SETUPDL_55);
switch (actor->iwork[0]) {
case 0:
if (actor->state != 0) {
@ -6520,7 +6520,7 @@ void Aquas_801BE034(Actor* actor) {
}
void Aquas_801BE0F0(Actor* actor) {
RCP_SetupDL(&gMasterDisp, 0x3D);
RCP_SetupDL(&gMasterDisp, SETUPDL_61);
Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 0.5f, MTXF_APPLY);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 255, 255, 255);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
@ -6668,13 +6668,13 @@ void Aquas_801BE3F8(Actor* actor) {
// OBJ_ACTOR_270 draw
void Aquas_801BEB1C(Actor* actor) {
Graphics_SetScaleMtx(3.0f);
RCP_SetupDL(&gMasterDisp, 0x38);
RCP_SetupDL(&gMasterDisp, SETUPDL_56);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 143, 143, 255);
Animation_GetFrameData(&D_AQ_602201C, actor->animFrame, actor->vwork);
Animation_DrawSkeleton(1, D_AQ_60220E8, actor->vwork, NULL, NULL, &actor->index, &gIdentityMatrix);
if (actor->health != 0) {
RCP_SetupDL(&gMasterDisp, 0x37);
RCP_SetupDL(&gMasterDisp, SETUPDL_55);
Matrix_Scale(gGfxMatrix, actor->fwork[0], actor->fwork[1], actor->fwork[2], MTXF_APPLY);
Matrix_Translate(gGfxMatrix, 0.0f, -8.0f, 51.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);

8
src/overlays/ovl_i3/fox_so.c
View File

@ -513,7 +513,7 @@ void Solar_8019F7AC(Actor* actor) {
case OBJ_ACTOR_276:
if (((gGameFrameCount % 2) == 0)) {
RCP_SetupDL(&gMasterDisp, 0x29);
RCP_SetupDL(&gMasterDisp, SETUPDL_41);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 0, 255);
}
gSPDisplayList(gMasterDisp++, D_SO_6017090);
@ -526,7 +526,7 @@ void Solar_8019F7AC(Actor* actor) {
Matrix_Pop(&gGfxMatrix);
Graphics_SetScaleMtx(actor->scale * 3.5f);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 128, 128, 160);
gSPDisplayList(gMasterDisp++, D_i3_801BF92C[actor->animFrame]);
}
@ -923,10 +923,10 @@ void Solar_801A0AF0(Effect* effect) {
case 5:
case 6:
case 7:
RCP_SetupDL(&gMasterDisp, 0x35);
RCP_SetupDL(&gMasterDisp, SETUPDL_53);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 128, 128, effect->unk_44);
gSPDisplayList(gMasterDisp++, D_i3_801BF92C[effect->unk_4C]);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
break;
}
}

6
src/overlays/ovl_i3/fox_zo.c
View File

@ -3300,7 +3300,7 @@ void Zoness_8019969C(Actor* actor) {
}
void Zoness_8019983C(Actor* actor) {
RCP_SetupDL(&gMasterDisp, 70);
RCP_SetupDL(&gMasterDisp, SETUPDL_70);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
Matrix_Scale(gGfxMatrix, 2.6f, 2.6f, 2.6f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
@ -3727,7 +3727,7 @@ void Zoness_8019ACCC(Actor* actor) {
Matrix_RotateX(gGfxMatrix, actor->obj.rot.x * M_DTOR, MTXF_APPLY);
Matrix_Scale(gGfxMatrix, 2.6f, 2.6f, 2.6f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 70);
RCP_SetupDL(&gMasterDisp, SETUPDL_70);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
gSPDisplayList(gMasterDisp++, D_ZO_6004380);
Matrix_RotateY(gGfxMatrix, sZoFwork[ZO_BSF_19] * M_DTOR, MTXF_APPLY);
@ -4300,7 +4300,7 @@ void Zoness_8019CE58(Actor* actor) {
Gfx* temp_v0_8;
Gfx* temp_v0_9;
RCP_SetupDL(&gMasterDisp, 72);
RCP_SetupDL(&gMasterDisp, SETUPDL_72);
if (actor->iwork[0] != 0) {
Matrix_Translate(gGfxMatrix, 0.0f, actor->fwork[0], 0.0f, MTXF_APPLY);
Matrix_RotateZ(gGfxMatrix, (actor->fwork[4] + actor->obj.rot.z) * M_DTOR, MTXF_APPLY);

22
src/overlays/ovl_i4/fox_bo.c
View File

@ -753,9 +753,9 @@ void Bolse_8018D7F0(Actor* actor) {
bool Bolse_8018D874(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* this) {
Actor* actor = (Actor*) this;
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
if (((limbIndex == 1) || (limbIndex == 2)) && ((actor->timer_0C6 % 2) != 0)) {
RCP_SetupDL(&gMasterDisp, 0x29);
RCP_SetupDL(&gMasterDisp, SETUPDL_41);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 64, 64, 255);
}
if (((limbIndex == 1) || (limbIndex == 2)) && ((actor->health >= 100) || (gAllRangeCheckpoint != 0))) {
@ -1002,7 +1002,7 @@ void Bolse_8018E870(Boss* boss) {
continue;
}
Matrix_Push(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, alpha);
gDPSetEnvColor(gMasterDisp++, 255, 56, 56, alpha);
Matrix_Translate(gGfxMatrix, D_i4_801A0488[i].unk_0C, D_i4_801A0488[i].unk_10, D_i4_801A0488[i].unk_14,
@ -1838,13 +1838,13 @@ void Bolse_80191180(Effect* effect) {
break;
case 1:
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_44);
gDPSetEnvColor(gMasterDisp++, 0, 128, 255, effect->unk_44);
Matrix_Scale(gGfxMatrix, effect->scale2, effect->scale2, effect->scale2, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_1024AC0);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
break;
}
}
@ -1969,7 +1969,7 @@ void Bolse_801912FC(Boss* boss) {
bool Bolse_801918E4(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* this) {
Boss* boss = (Boss*) this;
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
switch (limbIndex) {
case 1:
@ -1980,7 +1980,7 @@ bool Bolse_801918E4(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* th
case 6:
case 7:
case 8:
RCP_SetupDL(&gMasterDisp, 0x29);
RCP_SetupDL(&gMasterDisp, SETUPDL_41);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, (s32) D_i4_8019EEC0, 255);
if (boss->swork[limbIndex - 1] <= 0) {
*dList = NULL;
@ -1996,7 +1996,7 @@ bool Bolse_801918E4(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* th
case 15:
case 16:
if ((boss->swork[3 + limbIndex] % 2) != 0) {
RCP_SetupDL(&gMasterDisp, 0x29);
RCP_SetupDL(&gMasterDisp, SETUPDL_41);
if (boss->swork[3 + limbIndex] > 1000) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 64, 64, 255, 255);
} else {
@ -2093,7 +2093,7 @@ void Bolse_80191DB0(Boss* boss) {
if (((gGameFrameCount % 2) == 0)) {
alpha *= 1.7f;
}
RCP_SetupDL(&gMasterDisp, 0x29);
RCP_SetupDL(&gMasterDisp, SETUPDL_41);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, alpha);
Matrix_Scale(gGfxMatrix, 1.2f, 0.55f, 1.2f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
@ -2185,14 +2185,14 @@ void Bolse_DrawDynamicGround(void) {
gSPFogPosition(gMasterDisp++, gFogNear, gFogFar);
if (gBosses[1].obj.status == OBJ_ACTIVE) {
RCP_SetupDL(&gMasterDisp, 0x22);
RCP_SetupDL(&gMasterDisp, SETUPDL_34);
if ((gGameFrameCount % 2) != 0) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 128, 160, 255);
} else {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 192, 224, 255);
}
} else {
RCP_SetupDL(&gMasterDisp, 0x21);
RCP_SetupDL(&gMasterDisp, SETUPDL_33);
}
Matrix_Push(&gGfxMatrix);

38
src/overlays/ovl_i4/fox_ka.c
View File

@ -264,7 +264,7 @@ void Katina_LaserEnergyParticlesUpdate(Effect358* this) {
}
void Katina_LaserEnergyParticlesDraw(Effect358* this) {
RCP_SetupDL(&gMasterDisp, 67);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0, 0, 48, 48, 255, this->unk_44);
gDPSetEnvColor(gMasterDisp++, 0, 0, 0, this->unk_44);
@ -274,7 +274,7 @@ void Katina_LaserEnergyParticlesDraw(Effect358* this) {
gSPDisplayList(gMasterDisp++, D_1024AC0);
RCP_SetupDL(&gMasterDisp, 64);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
// Explosion/Fire effect with smoke.
@ -600,7 +600,7 @@ void Katina_Base_Draw(Frontlinebase* this) {
if (this->state == KA_BOSS_BASE_IDLE) {
gSPDisplayList(gMasterDisp++, aKaFLBaseDL);
} else {
RCP_SetupDL(&gMasterDisp, 57);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, aKaFLBaseDestroyedDL);
}
@ -1551,7 +1551,7 @@ void Katina_BossUpdate(Saucerer* this) {
bool Katina_BossOverrideLimbDraw(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) {
Saucerer* boss = (Saucerer*) data;
RCP_SetupDL(&gMasterDisp, 29);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
gDPSetPrimColor(gMasterDisp++, 0, 0, 40, 40, 255, 255);
switch (limbIndex) {
@ -1559,11 +1559,11 @@ bool Katina_BossOverrideLimbDraw(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f*
rot->y += boss->fwork[BOSS_HATCH_1_ANGLE];
if ((boss->swork[BOSS_HATCH_1_FLASH_TIMER] % 2) != 0) {
RCP_SetupDL(&gMasterDisp, 30);
RCP_SetupDL(&gMasterDisp, SETUPDL_30);
}
if (boss->swork[BOSS_HATCH_1_HP] <= 0) {
RCP_SetupDL(&gMasterDisp, 57);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
*dList = aKaDestroyedHatchDL;
}
@ -1573,11 +1573,11 @@ bool Katina_BossOverrideLimbDraw(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f*
rot->y += boss->fwork[BOSS_HATCH_2_ANGLE];
if ((boss->swork[BOSS_HATCH_2_FLASH_TIMER] % 2) != 0) {
RCP_SetupDL(&gMasterDisp, 30);
RCP_SetupDL(&gMasterDisp, SETUPDL_30);
}
if (boss->swork[BOSS_HATCH_2_HP] <= 0) {
RCP_SetupDL(&gMasterDisp, 57);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
*dList = aDestroyedHatch2DL;
}
@ -1587,11 +1587,11 @@ bool Katina_BossOverrideLimbDraw(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f*
rot->y += boss->fwork[BOSS_HATCH_3_ANGLE];
if ((boss->swork[BOSS_HATCH_3_FLASH_TIMER] % 2) != 0) {
RCP_SetupDL(&gMasterDisp, 30);
RCP_SetupDL(&gMasterDisp, SETUPDL_30);
}
if (boss->swork[BOSS_HATCH_3_HP] <= 0) {
RCP_SetupDL(&gMasterDisp, 57);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
*dList = aDestroyedHatch3DL;
}
@ -1601,11 +1601,11 @@ bool Katina_BossOverrideLimbDraw(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f*
rot->y -= boss->fwork[BOSS_HATCH_4_ANGLE];
if ((boss->swork[BOSS_HATCH_4_FLASH_TIMER] % 2) != 0) {
RCP_SetupDL(&gMasterDisp, 30);
RCP_SetupDL(&gMasterDisp, SETUPDL_30);
}
if (boss->swork[BOSS_HATCH_4_HP] <= 0) {
RCP_SetupDL(&gMasterDisp, 57);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
*dList = aDestroyedHatch4DL;
}
@ -1615,11 +1615,11 @@ bool Katina_BossOverrideLimbDraw(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f*
pos->x -= boss->fwork[BOSS_CORE_LEVEL];
if ((boss->swork[BOSS_CORE_FLASH_TIMER] % 2) != 0) {
RCP_SetupDL(&gMasterDisp, 30);
RCP_SetupDL(&gMasterDisp, SETUPDL_30);
}
if (boss->swork[BOSS_CORE_HP] <= 0) {
RCP_SetupDL(&gMasterDisp, 57);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
*dList = aDestroyedCoreDL;
}
@ -1627,7 +1627,7 @@ bool Katina_BossOverrideLimbDraw(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f*
case 10:
if (boss->health < 0) {
RCP_SetupDL(&gMasterDisp, 57);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
*dList = aKaDestroyedSaucererDL;
}
@ -1654,7 +1654,7 @@ void Katina_BossDraw(Saucerer* this) {
gSPFogPosition(gMasterDisp++, gFogNear, gFogFar);
if (this->fwork[BOSS_LASER_LIGHT_SCALE] > 0.0f) {
RCP_SetupDL(&gMasterDisp, 67);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
Matrix_Push(&gGfxMatrix);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(gMasterDisp++, 0, 255, 255, 255);
@ -1680,7 +1680,7 @@ void Katina_BossDraw(Saucerer* this) {
}
if (this->fwork[BOSS_LASER_LENGTH] > 0.0f) {
RCP_SetupDL(&gMasterDisp, 41);
RCP_SetupDL(&gMasterDisp, SETUPDL_41);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 128);
Matrix_RotateX(gGfxMatrix, M_PI, MTXF_APPLY);
Matrix_Scale(gGfxMatrix, 0.3f, this->fwork[BOSS_LASER_LENGTH], 0.3f, MTXF_APPLY);
@ -2628,10 +2628,10 @@ void Katina_EnemyDraw(ActorAllRange* this) {
}
if (this->iwork[KA_ACTOR_LOW_POLY]) {
RCP_SetupDL(&gMasterDisp, 34);
RCP_SetupDL(&gMasterDisp, SETUPDL_34);
gDPSetPrimColor(gMasterDisp++, 0, 0, 80, 64, 64, 255);
} else {
RCP_SetupDL(&gMasterDisp, 29);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
}
if ((this->timer_0C6 % 2) == 0) {

2
src/overlays/ovl_i4/fox_sz.c
View File

@ -1700,7 +1700,7 @@ void SectorZ_8019E234(Actor* actor) {
void SectorZ_8019E3A8(Actor* actor) {
gSPDisplayList(gMasterDisp++, D_SZ_6001A10);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
RCP_SetupDL(&gMasterDisp, 0x39);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
gSPDisplayList(gMasterDisp++, D_SZ_60045E0);
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
}

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

@ -2005,7 +2005,7 @@ void Macbeth_801A0E2C(s32 limbIndex, Vec3f* rot, void* data) {
bool Macbeth_801A0EB8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) {
Actor* actor = (Actor*) data;
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
gSPClearGeometryMode(gMasterDisp++, G_TEXTURE_GEN);
if ((limbIndex == 3) || (limbIndex == 6) || (limbIndex == 9)) {
gSPTexture(gMasterDisp++, 3000, 3000, 0, G_TX_RENDERTILE, G_ON);
@ -2021,10 +2021,10 @@ bool Macbeth_801A0EB8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
}
rot->x += actor->fwork[2];
if (limbIndex == 5) {
RCP_SetupDL(&gMasterDisp, 0x22);
RCP_SetupDL(&gMasterDisp, SETUPDL_34);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, D_i5_801BE368[20], D_i5_801BE368[21], D_i5_801BE368[22], 255);
gSPDisplayList(gMasterDisp++, D_MA_6010470);
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
}
}
switch (limbIndex) {
@ -2144,10 +2144,10 @@ void Macbeth_801A12C4(Actor* actor) {
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_MA_6004440);
} else {
RCP_SetupDL(&gMasterDisp, 0x39);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_MA_6022200);
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
}
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
}
@ -2156,7 +2156,7 @@ void Macbeth_801A12C4(Actor* actor) {
if (actor->iwork[13] < 2) {
Matrix_Translate(gGfxMatrix, 0.0f, -5.0f, 0.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x39);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
if ((actor->iwork[7] % 2) != 0) {
RCP_SetupDL_27();
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
@ -2165,7 +2165,7 @@ void Macbeth_801A12C4(Actor* actor) {
actor->iwork[7]--;
}
gSPDisplayList(gMasterDisp++, D_MA_6024670);
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
}
break;
case OBJ_ACTOR_208:
@ -2204,7 +2204,7 @@ void Macbeth_801A12C4(Actor* actor) {
}
Animation_DrawSkeleton(1, D_MA_601042C, spD0, Macbeth_801A0EB8, Macbeth_801A1268, actor, &gIdentityMatrix);
if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_LEVEL_COMPLETE) {
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
gSPClearGeometryMode(gMasterDisp++, G_TEXTURE_GEN);
gSPDisplayList(gMasterDisp++, D_MA_6003370);
}
@ -2231,7 +2231,7 @@ void Macbeth_801A12C4(Actor* actor) {
Matrix_RotateX(gGfxMatrix, actor->fwork[28] * M_DTOR, MTXF_APPLY);
Matrix_Scale(gGfxMatrix, actor->scale, actor->scale, actor->scale, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
if ((gPlayer[0].trueZpos - actor->obj.pos.z) > 3000.0f) {
gSPDisplayList(gMasterDisp++, D_MA_6027D40);
} else if (actor->vel.z > -2.0f) {
@ -2259,10 +2259,10 @@ void Macbeth_801A12C4(Actor* actor) {
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_MA_6004440);
} else {
RCP_SetupDL(&gMasterDisp, 0x39);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_MA_6022200);
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
}
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
Matrix_Pop(&gGfxMatrix);
@ -2284,10 +2284,10 @@ void Macbeth_801A12C4(Actor* actor) {
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_MA_6004440);
} else {
RCP_SetupDL(&gMasterDisp, 0x39);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_MA_6022200);
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
}
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
Matrix_Pop(&gGfxMatrix);
@ -2298,7 +2298,7 @@ void Macbeth_801A12C4(Actor* actor) {
void Macbeth_801A23AC(Scenery* scenery) {
Vec3f sp78[50];
RCP_SetupDL(&gMasterDisp, 0x39);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
switch (scenery->obj.id) {
case OBJ_SCENERY_94:
case OBJ_SCENERY_97:
@ -2329,7 +2329,7 @@ void Macbeth_801A23AC(Scenery* scenery) {
gSPDisplayList(gMasterDisp++, D_MA_6030750);
break;
case OBJ_SCENERY_105:
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
gSPDisplayList(gMasterDisp++, D_MA_602D380);
break;
case OBJ_SCENERY_104:
@ -2357,7 +2357,7 @@ void Macbeth_801A23AC(Scenery* scenery) {
Matrix_Scale(gGfxMatrix, scenery->vel.z, scenery->vel.z / 2, scenery->vel.z, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_1024AC0);
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
Matrix_Pop(&gGfxMatrix);
} else if (scenery->state == 2) {
Matrix_Push(&gGfxMatrix);
@ -2370,7 +2370,7 @@ void Macbeth_801A23AC(Scenery* scenery) {
Matrix_Scale(gGfxMatrix, scenery->vel.z, scenery->vel.z / 2, scenery->vel.z, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_1024AC0);
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
Matrix_Pop(&gGfxMatrix);
}
if (D_MA_801BE2F0[5] != 0) {
@ -2395,23 +2395,23 @@ void Macbeth_801A23AC(Scenery* scenery) {
gSPDisplayList(gMasterDisp++, D_MA_6001180);
break;
}
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
}
void Macbeth_801A2A78(Scenery* scenery) {
RCP_SetupDL(&gMasterDisp, 0x39);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_MA_60253E0);
gSPDisplayList(gMasterDisp++, D_MA_601C000);
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
}
void Macbeth_801A2B24(Scenery* scenery) {
if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_LEVEL_COMPLETE) {
Object_Kill(&scenery->obj, scenery->sfxSource);
}
RCP_SetupDL(&gMasterDisp, 0x39);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
switch (scenery->obj.id) {
case OBJ_SCENERY_77:
gSPDisplayList(gMasterDisp++, D_MA_60066A0);
@ -2456,7 +2456,7 @@ void Macbeth_801A2B24(Scenery* scenery) {
gSPDisplayList(gMasterDisp++, D_MA_6009C50);
break;
}
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
}
void Macbeth_801A2DD8(Scenery* scenery) {
@ -2524,7 +2524,7 @@ void Macbeth_801A30B8(s32 limbIndex, Vec3f* rot, void* data) {
void Macbeth_801A3240(Scenery* scenery) {
Vec3f sp38[50];
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
Animation_GetFrameData(&D_MA_600C4D0, 0, sp38);
Animation_DrawSkeleton(1, D_MA_600C65C, sp38, NULL, Macbeth_801A30B8, scenery, &gIdentityMatrix);
@ -2832,10 +2832,10 @@ void Macbeth_801A3E98(Actor* actor) {
bool Macbeth_801A41B0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) {
Actor* actor = (Actor*) data;
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
gDPSetTextureFilter(gMasterDisp++, G_TF_BILERP);
if (limbIndex == 2) {
RCP_SetupDL(&gMasterDisp, 0x22);
RCP_SetupDL(&gMasterDisp, SETUPDL_34);
gDPSetTextureFilter(gMasterDisp++, G_TF_POINT);
if (actor->state >= 2) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, actor->fwork[0], actor->fwork[4], 255);
@ -2854,14 +2854,14 @@ void Macbeth_801A43BC(Actor* actor) {
Animation_GetFrameData(&D_MA_602FEB4, 0, sp50);
Animation_DrawSkeleton(1, D_MA_602FFA0, sp50, Macbeth_801A41B0, NULL, actor, &gIdentityMatrix);
Matrix_Pop(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, actor->fwork[2] + 204.0f, 0.0f, MTXF_APPLY);
Matrix_RotateY(gGfxMatrix, actor->fwork[1] * M_DTOR, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_MA_602FFC0);
Matrix_Pop(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x22);
RCP_SetupDL(&gMasterDisp, SETUPDL_34);
gDPSetTextureFilter(gMasterDisp++, G_TF_POINT);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, actor->fwork[0], 0, 0, 255);
Matrix_Push(&gGfxMatrix);
@ -3085,13 +3085,13 @@ void Macbeth_801A4B24(Actor* actor) {
bool Macbeth_801A5124(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) {
Actor* actor = (Actor*) data;
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
gDPSetTextureFilter(gMasterDisp++, G_TF_BILERP);
if ((limbIndex == 9) || (limbIndex == 10)) {
RCP_SetupDL(&gMasterDisp, 0x39);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
}
if ((limbIndex > 0) && (limbIndex < 9)) {
RCP_SetupDL(&gMasterDisp, 0x22);
RCP_SetupDL(&gMasterDisp, SETUPDL_34);
gDPSetTextureFilter(gMasterDisp++, G_TF_POINT);
if (D_i5_801BE308[limbIndex - 1] != 0) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, actor->fwork[0], actor->fwork[4], 255);
@ -3131,7 +3131,7 @@ void Macbeth_801A54E8(Actor* actor) {
Animation_GetFrameData(&D_MA_602F098, 0, sp28);
Animation_DrawSkeleton(1, D_MA_602F264, sp28, Macbeth_801A5124, NULL, actor, &gIdentityMatrix);
Matrix_Pop(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
}
s32 Macbeth_801A55D4(s32 arg0, Vec3f* arg1, Vec3f* arg2, s32 arg3) {
@ -3221,9 +3221,9 @@ void Macbeth_801A57D0(Effect* effect) {
}
void Macbeth_801A5AF0(Effect* effect) {
RCP_SetupDL(&gMasterDisp, 0x3C);
RCP_SetupDL(&gMasterDisp, SETUPDL_60);
gSPDisplayList(gMasterDisp++, D_MA_601A840);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
void Macbeth_801A5B4C(Effect* effect) {
@ -3261,12 +3261,12 @@ void Macbeth_801A5B4C(Effect* effect) {
}
void Macbeth_801A5D68(Effect* effect) {
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 112, 255, 243, effect->unk_44);
gDPSetEnvColor(gMasterDisp++, 255, 255, 255, effect->unk_44);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_MA_6012A60);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
void Macbeth_801A5E2C(Actor* actor) {
@ -3371,13 +3371,13 @@ void Macbeth_801A6144(Actor* actor) {
}
void Macbeth_801A6540(Actor* actor) {
RCP_SetupDL(&gMasterDisp, 0x39);
RCP_SetupDL(&gMasterDisp, SETUPDL_57);
if ((actor->timer_0C6 % 2) != 0) {
RCP_SetupDL(&gMasterDisp, 0x3A);
RCP_SetupDL(&gMasterDisp, SETUPDL_58);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
gSPDisplayList(gMasterDisp++, D_MA_60257B0);
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
}
void Macbeth_801A65E0(Scenery* scenery) {
@ -3395,11 +3395,11 @@ void Macbeth_801A6608(Scenery* scenery) {
scenery->vel.x = 255.0f;
}
}
RCP_SetupDL(&gMasterDisp, 0x22);
RCP_SetupDL(&gMasterDisp, SETUPDL_34);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, scenery->vel.x, 0, 0, 255);
}
gSPDisplayList(gMasterDisp++, D_MA_6010700);
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
gSPDisplayList(gMasterDisp++, D_MA_601F270);
}
@ -4706,7 +4706,7 @@ bool Macbeth_801ABC14(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
Actor* actor = (Actor*) data;
s16 sp62;
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
gSPClearGeometryMode(gMasterDisp++, G_TEXTURE_GEN);
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
switch (limbIndex) {
@ -4743,7 +4743,7 @@ bool Macbeth_801ABC14(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
gSPSetGeometryMode(gMasterDisp++, G_TEXTURE_GEN);
break;
case 8:
RCP_SetupDL(&gMasterDisp, 0x22);
RCP_SetupDL(&gMasterDisp, SETUPDL_34);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, D_i5_801BE368[20], D_i5_801BE368[21], D_i5_801BE368[22], 255);
break;
case 2:
@ -4784,7 +4784,7 @@ bool Macbeth_801ABC14(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
switch (limbIndex) {
case 14:
if ((actor->iwork[7] % 2) != 0) {
RCP_SetupDL(&gMasterDisp, 0x1C);
RCP_SetupDL(&gMasterDisp, SETUPDL_28);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
if (D_i5_801BE320[9] <= 0) {
@ -4799,7 +4799,7 @@ bool Macbeth_801ABC14(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
case 19:
case 20:
if ((actor->iwork[8] % 2) != 0) {
RCP_SetupDL(&gMasterDisp, 0x1C);
RCP_SetupDL(&gMasterDisp, SETUPDL_28);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
if (D_i5_801BE320[10] <= 0) {
@ -4811,7 +4811,7 @@ bool Macbeth_801ABC14(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
}
if ((actor->iwork[9] % 2) != 0) {
RCP_SetupDL(&gMasterDisp, 0x1C);
RCP_SetupDL(&gMasterDisp, SETUPDL_28);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
return false;
@ -4890,7 +4890,7 @@ void Macbeth_801AC438(Actor* actor) {
}
bool Macbeth_801AC5AC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) {
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
gSPClearGeometryMode(gMasterDisp++, G_TEXTURE_GEN);
if ((limbIndex == 1) || (limbIndex == 3)) {
gSPTexture(gMasterDisp++, 3000, 3000, 0, G_TX_RENDERTILE, G_ON);
@ -5262,7 +5262,7 @@ void Macbeth_801ADAC8(Actor* actor) {
Graphics_SetScaleMtx(actor->scale);
RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_4008CE0);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
break;
case 1:
Matrix_Scale(gGfxMatrix, actor->fwork[0], actor->scale, 2.5f, MTXF_APPLY);
@ -5270,7 +5270,7 @@ void Macbeth_801ADAC8(Actor* actor) {
RCP_SetupDL_40();
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_4008F70);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
break;
}
}
@ -5410,18 +5410,18 @@ void Macbeth_801AE2C0(Actor* actor) {
if (actor->state < 2) {
Graphics_SetScaleMtx(actor->scale);
if (actor->iwork[0] >= 128) {
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, actor->iwork[0]);
gDPSetEnvColor(gMasterDisp++, 255, 48, 0, actor->iwork[0]);
Matrix_Scale(gGfxMatrix, 1.0f, actor->fwork[2], 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_MA_6013060);
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
Matrix_Scale(gGfxMatrix, 1.0f, actor->fwork[2], 1.0f, MTXF_APPLY);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 53, 53, 53, 255 - actor->iwork[0]);
gDPSetEnvColor(gMasterDisp++, 0, 0, 0, actor->iwork[0]);
} else {
RCP_SetupDL(&gMasterDisp, 0x17);
RCP_SetupDL(&gMasterDisp, SETUPDL_23);
if ((actor->iwork[7] % 2) != 0) {
RCP_SetupDL_27();
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
@ -5558,7 +5558,7 @@ void Macbeth_801AE87C(Effect* effect) {
}
void Macbeth_801AEAA0(Effect* effect) {
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
if (effect->scale2 >= 3.0f) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, effect->unk_44);
gDPSetEnvColor(gMasterDisp++, 255, 0, 0, effect->unk_44);
@ -5569,7 +5569,7 @@ void Macbeth_801AEAA0(Effect* effect) {
Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 0.5f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_1024AC0);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
void Macbeth_801AEC04(Actor* actor) {
@ -5635,7 +5635,7 @@ void Macbeth_801AEEFC(Actor* actor) {
Matrix_Scale(gGfxMatrix, actor->fwork[0], actor->fwork[2], 1.0f, MTXF_APPLY);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, -10.0f, 0.0f, MTXF_APPLY);
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 111, 175, 64, actor->fwork[1]);
gDPSetEnvColor(gMasterDisp++, 255, 255, 208, actor->fwork[1]);
Matrix_SetGfxMtx(&gMasterDisp);

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

@ -433,7 +433,7 @@ void Titania_8018A1C0(Actor* actor) {
Matrix_SetGfxMtx(&gMasterDisp);
if (actor->health != 0) {
gSPDisplayList(gMasterDisp++, D_TI1_700B9C0);
RCP_SetupDL(&gMasterDisp, 0x21);
RCP_SetupDL(&gMasterDisp, SETUPDL_33);
gSPDisplayList(gMasterDisp++, D_TI1_700C980);
}
}
@ -725,9 +725,9 @@ bool Titania_8018AFF0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
Matrix_RotateX(gCalcMatrix, rot->x * M_DTOR, MTXF_APPLY);
Matrix_Mult(gGfxMatrix, gCalcMatrix, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x21);
RCP_SetupDL(&gMasterDisp, SETUPDL_33);
gSPDisplayList(gMasterDisp++, *dList);
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
return true;
} else {
return false;
@ -1048,12 +1048,12 @@ Gfx* D_TI_801B7608[10] = {
void Titania_8018BE84(Actor* actor) {
s32 index;
RCP_SetupDL(&gMasterDisp, 0x1E);
RCP_SetupDL(&gMasterDisp, SETUPDL_30);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
Matrix_Scale(gGfxMatrix, 1.5f, 1.5f, 1.5f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_TI1_7009D60);
RCP_SetupDL(&gMasterDisp, 0x22);
RCP_SetupDL(&gMasterDisp, SETUPDL_34);
index = actor->iwork[0];
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, D_i5_801B75E4[0][index], D_i5_801B75E4[1][index],
D_i5_801B75E4[2][index], 255);
@ -1120,10 +1120,10 @@ bool Titania_8018C134(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
Matrix_Mult(gGfxMatrix, gCalcMatrix, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
if ((limbIndex == 13) && (actor->iwork[5] & 2) && (actor->iwork[6] == 0)) {
RCP_SetupDL(&gMasterDisp, 0x1E);
RCP_SetupDL(&gMasterDisp, SETUPDL_30);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
gSPDisplayList(gMasterDisp++, *dList);
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
} else {
gSPDisplayList(gMasterDisp++, *dList);
}
@ -1690,7 +1690,7 @@ void Titania_8018E2D8(Actor* actor) {
f32 sp34;
if ((actor->iwork[6] % 2) != 0) {
RCP_SetupDL(&gMasterDisp, 0x1F);
RCP_SetupDL(&gMasterDisp, SETUPDL_31);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 127, 0, 0, 255);
gDPSetEnvColor(gMasterDisp++, 255, 255, 255, 255);
}
@ -1978,10 +1978,10 @@ void Titania_8018EF14(Actor* actor) {
gSPDisplayList(gMasterDisp++, D_TI1_7008930);
if ((actor->timer_0C6 % 2) == 0) {
RCP_SetupDL(&gMasterDisp, 0x22);
RCP_SetupDL(&gMasterDisp, SETUPDL_34);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 220, 220, 220, 255);
} else {
RCP_SetupDL(&gMasterDisp, 0x16);
RCP_SetupDL(&gMasterDisp, SETUPDL_22);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255);
}
gSPDisplayList(gMasterDisp++, D_TI1_7009510);
@ -2263,7 +2263,7 @@ bool Titania_8018FC70(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
case 2:
case 3:
case 7:
RCP_SetupDL(&gMasterDisp, 0x1E);
RCP_SetupDL(&gMasterDisp, SETUPDL_30);
if ((D_i5_801BBEF0[30] % 2) != 0) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
} else {
@ -2277,7 +2277,7 @@ bool Titania_8018FC70(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
case 9:
case 10:
case 11:
RCP_SetupDL(&gMasterDisp, 0x3D);
RCP_SetupDL(&gMasterDisp, SETUPDL_61);
if ((D_i5_801BBEF0[30] % 2) != 0) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
} else {
@ -2287,7 +2287,7 @@ bool Titania_8018FC70(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
if (*dList != NULL) {
gSPDisplayList(gMasterDisp++, *dList);
}
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
break;
}
return true;
@ -2510,11 +2510,11 @@ void Titania_8019002C(s32 limbIndex, Vec3f* rot, void* data) {
Matrix_RotateY(gGfxMatrix, -sp64.y * M_DTOR, MTXF_APPLY);
Matrix_Scale(gGfxMatrix, D_i5_801BBEF4[74], D_i5_801BBEF4[74], 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x48);
RCP_SetupDL(&gMasterDisp, SETUPDL_72);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
gDPSetEnvColor(gMasterDisp++, 255, 0, 0, 255);
gSPDisplayList(gMasterDisp++, D_1024AC0);
RCP_SetupDL(&gMasterDisp, 0x1E);
RCP_SetupDL(&gMasterDisp, SETUPDL_30);
Matrix_Pop(&gGfxMatrix);
Matrix_MultVec3f(gCalcMatrix, &D_i5_801B8D3C, (Vec3f*) &boss->fwork[29]);
}
@ -2555,7 +2555,7 @@ bool Titania_801903A0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
switch (limbIndex) {
case 1:
case 2:
RCP_SetupDL(&gMasterDisp, 0x1E);
RCP_SetupDL(&gMasterDisp, SETUPDL_30);
if ((sp20 % 2) != 0) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
} else {
@ -2569,7 +2569,7 @@ bool Titania_801903A0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
case 4:
case 5:
case 6:
RCP_SetupDL(&gMasterDisp, 0x3D);
RCP_SetupDL(&gMasterDisp, SETUPDL_61);
if ((sp20 % 2) != 0) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
} else {
@ -2579,7 +2579,7 @@ bool Titania_801903A0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
if (*dList != NULL) {
gSPDisplayList(gMasterDisp++, *dList);
}
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
break;
}
return true;
@ -2879,15 +2879,15 @@ bool Titania_80190A08(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
case 0:
break;
case 1:
RCP_SetupDL(&gMasterDisp, 0x3D);
RCP_SetupDL(&gMasterDisp, SETUPDL_61);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
break;
case 2:
RCP_SetupDL(&gMasterDisp, 0x3A);
RCP_SetupDL(&gMasterDisp, SETUPDL_58);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
break;
case 3:
RCP_SetupDL(&gMasterDisp, 0x22);
RCP_SetupDL(&gMasterDisp, SETUPDL_34);
break;
}
if ((boss->swork[22] & 1) ||
@ -2899,7 +2899,7 @@ bool Titania_80190A08(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
gSPDisplayList(gMasterDisp++, *dList);
}
if (D_i5_801B7770[i][1] > 0) {
RCP_SetupDL(&gMasterDisp, 0x1E);
RCP_SetupDL(&gMasterDisp, SETUPDL_30);
} else {
gDPPipeSync(gMasterDisp++);
}
@ -3024,11 +3024,11 @@ void Titania_80191AE8(s32 limbIndex, Vec3f* rot, void* data) {
Matrix_RotateY(gGfxMatrix, -sp78.y * M_DTOR, MTXF_APPLY);
Matrix_Scale(gGfxMatrix, D_i5_801BBEF4[74], D_i5_801BBEF4[74], 1.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x48);
RCP_SetupDL(&gMasterDisp, SETUPDL_72);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
gDPSetEnvColor(gMasterDisp++, 255, 0, 0, 255);
gSPDisplayList(gMasterDisp++, D_1024AC0);
RCP_SetupDL(&gMasterDisp, 0x1E);
RCP_SetupDL(&gMasterDisp, SETUPDL_30);
Matrix_Pop(&gGfxMatrix);
Matrix_MultVec3f(gCalcMatrix, &D_i5_801B8D3C, (Vec3f*) &boss->fwork[29]);
break;
@ -4949,7 +4949,7 @@ void Titania_Boss_Draw(Boss* boss) {
s32 temp;
Matrix_Push(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x1E);
RCP_SetupDL(&gMasterDisp, SETUPDL_30);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
switch (boss->state) {
@ -4996,7 +4996,7 @@ void Titania_Boss_Draw(Boss* boss) {
switch (boss->state) {
case 6:
Matrix_Push(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x45);
RCP_SetupDL(&gMasterDisp, SETUPDL_69);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255);
gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 0);
Matrix_RotateX(gGfxMatrix, -M_PI / 2, MTXF_APPLY);
@ -5013,7 +5013,7 @@ void Titania_Boss_Draw(Boss* boss) {
case 12:
case 13:
Matrix_Push(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x45);
RCP_SetupDL(&gMasterDisp, SETUPDL_69);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255);
gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 0);
Matrix_RotateX(gGfxMatrix, -M_PI / 2, MTXF_APPLY);
@ -5051,7 +5051,7 @@ void Titania_Boss_Draw(Boss* boss) {
if (D_i5_801BBEF0[7] != 0) {
Matrix_Push(&gGfxMatrix);
sp120 = D_i5_801BBEF0[7] * 16.0f;
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
Matrix_RotateX(gGfxMatrix, M_PI / 2, MTXF_APPLY);
Matrix_Push(&gGfxMatrix);
Matrix_Scale(gGfxMatrix, sp120, 1.0f, sp120, MTXF_APPLY);
@ -5078,7 +5078,7 @@ void Titania_Boss_Draw(Boss* boss) {
Matrix_Scale(gGfxMatrix, D_i5_801B8D5C[temp], D_i5_801B8D5C[temp], D_i5_801B8D5C[temp + 25],
MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 178);
gDPSetEnvColor(gMasterDisp++, 0, 128, 60, 0);
gSPDisplayList(gMasterDisp++, D_TI2_7005300);
@ -5092,7 +5092,7 @@ void Titania_Boss_Draw(Boss* boss) {
MTXF_APPLY);
Matrix_Scale(gGfxMatrix, 4.0f, 4.0f, 4.0f, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, (s32) ((D_i5_801BBEF0[17] * 89.0f) / 3.0f));
gDPSetEnvColor(gMasterDisp++, 0, 128, 60, 0);
gSPDisplayList(gMasterDisp++, D_TI2_7005300);
@ -5109,7 +5109,7 @@ void Titania_Boss_Draw(Boss* boss) {
Matrix_Push(&gGfxMatrix);
Matrix_Scale(gGfxMatrix, half * sp120, half * sp120, temp_fs2, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x48);
RCP_SetupDL(&gMasterDisp, SETUPDL_72);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 178);
gDPSetEnvColor(gMasterDisp++, 0, 128, 60, 0);
gSPDisplayList(gMasterDisp++, D_TI_8000D90);

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

@ -337,7 +337,7 @@ void Andross_80188528(Actor* actor) {
}
void Andross_80188660(Actor* actor) {
RCP_SetupDL(&gMasterDisp, 0x3D);
RCP_SetupDL(&gMasterDisp, SETUPDL_61);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
Matrix_RotateZ(gGfxMatrix, actor->rot_0F4.z * M_DTOR, MTXF_APPLY);
Matrix_Scale(gGfxMatrix, 1.1f, 0.9f, 1.0f, MTXF_APPLY);
@ -1145,13 +1145,13 @@ bool Andross_8018B47C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
if (boss->fwork[21] >= 254.0f) {
if (limbIndex == 2) {
RCP_SetupDL(&gMasterDisp, 0x16);
RCP_SetupDL(&gMasterDisp, SETUPDL_22);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, (s32) boss->fwork[25], 255, 255, 255);
} else {
RCP_SetupDL(&gMasterDisp, 0x17);
RCP_SetupDL(&gMasterDisp, SETUPDL_23);
}
} else {
RCP_SetupDL(&gMasterDisp, 0x33);
RCP_SetupDL(&gMasterDisp, SETUPDL_51);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, (s32) boss->fwork[21]);
}
if ((limbIndex == 2) && (boss->swork[6] != 0)) {
@ -1179,7 +1179,7 @@ bool Andross_8018B47C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
}
Matrix_SetGfxMtx(&gMasterDisp);
if (((boss->swork[3] % 2) != 0) && (boss->fwork[21] >= 254.0f)) {
RCP_SetupDL(&gMasterDisp, 0x1B);
RCP_SetupDL(&gMasterDisp, SETUPDL_27);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
@ -1208,10 +1208,10 @@ void Andross_8018B8C0(Boss* boss) {
Matrix_Scale(gGfxMatrix, boss->scale, boss->scale, boss->scale, MTXF_APPLY);
Animation_DrawSkeleton(0, D_VE2_600C0A4, boss->vwork, Andross_8018B47C, NULL, boss, &gIdentityMatrix);
if (boss->fwork[21] >= 254) {
RCP_SetupDL(&gMasterDisp, 0x36);
RCP_SetupDL(&gMasterDisp, SETUPDL_54);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 64, 64, 255);
} else {
RCP_SetupDL(&gMasterDisp, 0x46);
RCP_SetupDL(&gMasterDisp, SETUPDL_70);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 64, 64, (s32) boss->fwork[21]);
}
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
@ -1539,13 +1539,13 @@ void Andross_8018CF98(Effect* effect) {
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_BG_PLANET_2010A30);
} else {
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
if (effect->unk_4C < 8) {
Matrix_Scale(gGfxMatrix, effect->scale2, effect->scale2, effect->scale2, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
}
gSPDisplayList(gMasterDisp++, D_i6_801A6790[effect->unk_4C]);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
}
@ -2822,27 +2822,27 @@ bool Andross_801917F0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
if (boss->state < 2) {
*dList = NULL;
} else {
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
gSPTexture(gMasterDisp++, 6600, 6600, 0, G_TX_RENDERTILE, G_ON);
gSPSetGeometryMode(gMasterDisp++, G_TEXTURE_GEN);
if (((limbIndex >= 23) && (limbIndex <= 32)) || (limbIndex == 50)) {
if (boss->swork[5] < 0) {
*dList = NULL;
} else if ((boss->swork[3] % 2) != 0) {
RCP_SetupDL(&gMasterDisp, 0x1B);
RCP_SetupDL(&gMasterDisp, SETUPDL_27);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
} else if (boss->swork[4] < 0) {
*dList = NULL;
} else if ((boss->swork[2] % 2) != 0) {
RCP_SetupDL(&gMasterDisp, 0x1B);
RCP_SetupDL(&gMasterDisp, SETUPDL_27);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
}
} else if ((boss->timer_05C % 2) == 0) {
RCP_SetupDL(&gMasterDisp, 0x1D);
RCP_SetupDL(&gMasterDisp, SETUPDL_29);
} else {
RCP_SetupDL(&gMasterDisp, 0x1B);
RCP_SetupDL(&gMasterDisp, SETUPDL_27);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
@ -2859,12 +2859,12 @@ bool Andross_801917F0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
rot->z -= boss->vwork[4].x;
rot->y -= boss->vwork[4].y;
if ((boss->swork[0] % 2) != 0) {
RCP_SetupDL(&gMasterDisp, 0x1B);
RCP_SetupDL(&gMasterDisp, SETUPDL_27);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
if (boss->swork[11] != 0) {
*dList = D_ANDROSS_C0043D0;
RCP_SetupDL(&gMasterDisp, 0x15);
RCP_SetupDL(&gMasterDisp, SETUPDL_21);
}
scale = boss->fwork[17];
break;
@ -2872,12 +2872,12 @@ bool Andross_801917F0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
rot->z -= boss->vwork[5].x;
rot->y -= boss->vwork[5].y;
if ((boss->swork[1] % 2) != 0) {
RCP_SetupDL(&gMasterDisp, 0x1B);
RCP_SetupDL(&gMasterDisp, SETUPDL_27);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
if (boss->swork[12] != 0) {
*dList = D_ANDROSS_C015740;
RCP_SetupDL(&gMasterDisp, 0x15);
RCP_SetupDL(&gMasterDisp, SETUPDL_21);
}
scale = boss->fwork[17];
break;
@ -2957,7 +2957,7 @@ bool Andross_801917F0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
Matrix_Mult(gGfxMatrix, gCalcMatrix, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, *dList);
RCP_SetupDL(&gMasterDisp, 0x29);
RCP_SetupDL(&gMasterDisp, SETUPDL_41);
switch (gGameFrameCount % 4U) {
case 0:
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
@ -2996,7 +2996,7 @@ bool Andross_801917F0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
Matrix_Mult(gGfxMatrix, gCalcMatrix, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, *dList);
RCP_SetupDL(&gMasterDisp, 0x29);
RCP_SetupDL(&gMasterDisp, SETUPDL_41);
switch (gGameFrameCount % 4U) {
case 0:
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
@ -3144,7 +3144,7 @@ void Andross_801928C8(Boss* boss) {
MTXF_APPLY);
if (boss->fwork[21] > 0.05f) {
Matrix_Push(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 192);
gDPSetEnvColor(gMasterDisp++, 255, 0, 128, 192);
Matrix_Scale(gGfxMatrix, boss->fwork[21] * 7.0f, boss->fwork[21] * 7.0f, boss->fwork[21] * 7.0f,
@ -3159,7 +3159,7 @@ void Andross_801928C8(Boss* boss) {
Matrix_Scale(gGfxMatrix, boss->fwork[20] * 10.0f, boss->fwork[20] * 10.0f, boss->fwork[20] * 10.0f,
MTXF_APPLY);
Matrix_RotateZ(gGfxMatrix, boss->fwork[19] * M_DTOR, MTXF_APPLY);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
if ((gGameFrameCount % 2) != 0) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 128);
} else {
@ -3274,7 +3274,7 @@ void Andross_80193244(Actor* actor) {
Matrix_Scale(gGfxMatrix, scale, scale, scale, MTXF_APPLY);
Matrix_RotateX(gGfxMatrix, M_PI / 2, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, alpha);
gDPSetEnvColor(gMasterDisp++, 255, 128, 128, alpha);
gSPDisplayList(gMasterDisp++, D_1024AC0);

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

@ -47,7 +47,7 @@ void SectorY_80197B30(Actor* actor, s32 timer) {
void SectorY_80197C64(Effect* effect) {
RCP_SetupDL_21();
gSPDisplayList(gMasterDisp++, D_SY_6014A40);
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
void SectorY_80197CB8(Scenery* scenery) {

177
src/overlays/ovl_menu/fox_map.c
View File

@ -2166,38 +2166,38 @@ void Map_801A0D14(void) {
Map_801A116C();
RCP_SetupDL(&gMasterDisp, 0x51);
RCP_SetupDL(&gMasterDisp, SETUPDL_81);
gDPSetPrimColor(gMasterDisp++, 0, 0, 180, 180, 180, 255);
Message_DisplayScrollingText(&gMasterDisp, gMsg_ID_1, D_menu_801CD9DC, D_menu_801CD9E0, 218, 70,
Message_GetCharCount(gMsg_ID_1));
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_8bIA(&gMasterDisp, D_MAP_6019030, 8, 16, 0.0f, D_menu_801B694C, 40.0f, 1.66f);
TextureRect_8bIA_MirY(&gMasterDisp, D_MAP_6019030, 8, 16, 0.0f, D_menu_801B6950, 40.0f, 1.68f);
TextureRect_IA8(&gMasterDisp, D_MAP_6019030, 8, 16, 0.0f, D_menu_801B694C, 40.0f, 1.66f);
TextureRect_IA8_MirY(&gMasterDisp, D_MAP_6019030, 8, 16, 0.0f, D_menu_801B6950, 40.0f, 1.68f);
Background_DrawPartialStarfield(71, 118);
Background_DrawPartialStarfield(205, 239);
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_menu_801CD9E8);
for (i = 0; i < 13; i++) {
TextureRect_16bRGBA(&gMasterDisp, D_menu_801B6954[D_menu_801CD9F0] + (96 * 4 * i), 96, 4, 109.0f,
24.0f + (4.0f * i), 1.0f, 1.0f);
TextureRect_RGBA16(&gMasterDisp, D_menu_801B6954[D_menu_801CD9F0] + (96 * 4 * i), 96, 4, 109.0f,
24.0f + (4.0f * i), 1.0f, 1.0f);
}
if ((D_menu_801CD9E4 != 0) && (D_menu_801CD9F0 + 1 < 7)) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_menu_801CD9E4);
for (i = 0; i < 13; i++) {
TextureRect_16bRGBA(&gMasterDisp, D_menu_801B6954[D_menu_801CD9F0 + 1] + (96 * 4 * i), 96, 4, 109.0f,
24.0f + (i * 4.0f), 1.0f, 1.0f);
TextureRect_RGBA16(&gMasterDisp, D_menu_801B6954[D_menu_801CD9F0 + 1] + (96 * 4 * i), 96, 4, 109.0f,
24.0f + (i * 4.0f), 1.0f, 1.0f);
}
if (D_menu_801CD9E4 == 255) {
@ -2239,10 +2239,10 @@ void Map_801A116C(void) {
colB = 0;
}
RCP_SetupDL(&gMasterDisp, 0x2E);
RCP_SetupDL(&gMasterDisp, SETUPDL_46);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_menu_801CD9E8);
} else {
RCP_SetupDL(&gMasterDisp, 0x17);
RCP_SetupDL(&gMasterDisp, SETUPDL_23);
}
if ((D_menu_801CD948 < 2) || (D_menu_801CD9E8 != 0)) {
@ -2374,14 +2374,14 @@ void Map_801A1528(void) {
void Map_801A19A8(void) {
s32 i;
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) D_menu_801CEA9C);
for (i = 0; i < 4; i++) {
TextureRect_8bIA(&gMasterDisp, D_MAP_600D590 + (168 * 4 * i), 168, 4, 72.0f, 104.0f + (4.0f * i), 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_MAP_600D590 + (168 * 4 * i), 168, 4, 72.0f, 104.0f + (4.0f * i), 1.0f, 1.0f);
}
TextureRect_8bIA(&gMasterDisp, D_MAP_600D590 + (168 * 4 * 4), 168, 3, 72.0f, 104.0f + 16.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_MAP_600D590 + (168 * 4 * 4), 168, 3, 72.0f, 104.0f + 16.0f, 1.0f, 1.0f);
}
void Map_801A1AE8(void) {
@ -3409,7 +3409,7 @@ void Map_801A4650(void) {
Lights_SetOneLight(&gMasterDisp, 0, 0, 127, 28, 58, 105, 65, 70, 48);
RCP_SetupDL(&gMasterDisp, 0x17);
RCP_SetupDL(&gMasterDisp, SETUPDL_23);
gSPTexture(gMasterDisp++, 2500, 200, 0, G_TX_RENDERTILE, G_ON);
gSPSetGeometryMode(gMasterDisp++, G_TEXTURE_GEN);
@ -3828,11 +3828,11 @@ void Map_801A5834(void) {
texture = D_MAP_6000000;
}
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 60, 60, 255, 170);
TextureRect_8bIA(&gMasterDisp, D_MAP_601B4B0, 24, 17, x, y, 4.6f, D_menu_801B6A6C[var_t0]);
TextureRect_IA8(&gMasterDisp, D_MAP_601B4B0, 24, 17, x, y, 4.6f, D_menu_801B6A6C[var_t0]);
mask = 0xFFFFFFFF;
if (D_menu_801CF000[colorIndex] != 0) {
@ -3841,9 +3841,9 @@ void Map_801A5834(void) {
}
if (gGameFrameCount & mask) { // can't be != 0?
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, r[colorIndex], g[colorIndex], b[colorIndex], 255);
TextureRect_8bIA(&gMasterDisp, D_MAP_6000840, 96, 22, x + 11.0f, y + 3.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_MAP_6000840, 96, 22, x + 11.0f, y + 3.0f, 1.0f, 1.0f);
}
z = 24.0f;
colorIndex++;
@ -3857,7 +3857,7 @@ void Map_801A5834(void) {
if (gGameFrameCount & mask) { // can't be != 0?
gDPSetPrimColor(gMasterDisp++, 0, 0, r[colorIndex], g[colorIndex], b[colorIndex], 255);
TextureRect_8bIA(&gMasterDisp, D_MAP_60018C0, 96, 10, x + 10.0f, y + z + 8.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_MAP_60018C0, 96, 10, x + 10.0f, y + z + 8.0f, 1.0f, 1.0f);
}
z += 18.0f;
colorIndex++;
@ -3871,7 +3871,7 @@ void Map_801A5834(void) {
if ((gGameFrameCount & mask) != 0) {
gDPSetPrimColor(gMasterDisp++, 0, 0, r[colorIndex], g[colorIndex], b[colorIndex], 255);
TextureRect_8bIA(&gMasterDisp, texture, 96, 22, x + 9.0f, y + z + 5.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, texture, 96, 22, x + 9.0f, y + z + 5.0f, 1.0f, 1.0f);
}
}
@ -3913,7 +3913,7 @@ void Map_801A5C90(void) {
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x35);
RCP_SetupDL(&gMasterDisp, SETUPDL_53);
Matrix_Push(&gGfxMatrix);
@ -4565,9 +4565,9 @@ void Map_801A7230(PlanetId planetId) {
case PL_ANIM_STATIC:
if (((D_menu_801CD944 == 3) || (planetId == sCurrentPlanetId) || (planetId == sNextPlanetId)) &&
D_menu_801CD944 != 1 && D_menu_801CD944 != 7) {
RCP_SetupDL(&gMasterDisp, 0x35);
RCP_SetupDL(&gMasterDisp, SETUPDL_53);
} else {
RCP_SetupDL(&gMasterDisp, 0x29);
RCP_SetupDL(&gMasterDisp, SETUPDL_41);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, sPlanets[planetId].alpha);
}
break;
@ -4575,22 +4575,22 @@ void Map_801A7230(PlanetId planetId) {
case PL_ANIM_ROTATE_Y:
if (((D_menu_801CD944 == 3) || (planetId == sCurrentPlanetId) || (planetId == sNextPlanetId)) &&
D_menu_801CD944 != 1 && D_menu_801CD944 != 7) {
RCP_SetupDL(&gMasterDisp, 0x17);
RCP_SetupDL(&gMasterDisp, SETUPDL_23);
} else {
RCP_SetupDL(&gMasterDisp, 0x2E);
RCP_SetupDL(&gMasterDisp, SETUPDL_46);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, sPlanets[planetId].alpha);
}
break;
case PL_ANIM_BILLBOARD:
case PL_ANIM_SPIN:
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, sPlanets[planetId].alpha);
break;
case PL_ANIM_ROTATE_Z:
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0, 0, 240, 0, 0, sPlanets[planetId].alpha);
gDPSetEnvColor(gMasterDisp++, 31, 0, 0, 0);
@ -4617,7 +4617,7 @@ void Map_801A74F4(PlanetId planetId) {
alpha = 128;
}
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, alpha);
gDPSetEnvColor(gMasterDisp++, 31, 0, 0, 0);
@ -4648,7 +4648,7 @@ void Map_801A7684(PlanetId planetId) {
r = g = b = 64;
}
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
gDPSetPrimColor(gMasterDisp++, 0, 0, r, g, b, sPlanets[planetId].alpha);
@ -4662,7 +4662,7 @@ void Map_801A7684(PlanetId planetId) {
}
void Map_801A77B0(PlanetId planetId) {
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, sPlanets[planetId].alpha);
@ -4685,7 +4685,7 @@ void Map_801A77B0(PlanetId planetId) {
}
void Map_801A791C(PlanetId planetId) {
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 175, 175, sPlanets[planetId].alpha);
gDPSetEnvColor(gMasterDisp++, 73, 31, 15, 0);
@ -4707,7 +4707,7 @@ void Map_801A791C(PlanetId planetId) {
}
void Map_801A7A84(PlanetId planetId) {
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 175, 175, sPlanets[planetId].alpha);
gDPSetEnvColor(gMasterDisp++, 73, 31, 15, 0);
@ -4733,7 +4733,7 @@ void Map_801A7BEC(f32* zAngle, f32 next, f32 scale) {
alpha = 128;
}
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0, 0, 63, 95, 30, alpha);
gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 0);
@ -4798,7 +4798,7 @@ void Map_801A7F1C(PlanetId planetId) {
}
if (alpha != 0) {
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, alpha);
gDPSetEnvColor(gMasterDisp++, 80, 80, 0, 0);
@ -4839,7 +4839,7 @@ void Map_801A809C(PlanetId planetId) {
if (D_menu_801CD98C == 1) {
switch (D_menu_801CD990) {
case 0:
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, alpha);
gDPSetEnvColor(gMasterDisp++, 80, 80, 0, 0);
@ -4870,7 +4870,7 @@ void Map_801A809C(PlanetId planetId) {
Math_SmoothStepToF(&D_menu_801CD99C, 150.0f, 0.09f, 100.0f, 0.1f);
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_menu_801CD994);
gDPSetEnvColor(gMasterDisp++, 80, 80, 0, 0);
@ -4899,7 +4899,7 @@ void Map_801A809C(PlanetId planetId) {
D_menu_801CD994 = 0;
}
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
gDPSetTextureFilter(gMasterDisp++, G_TF_POINT);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_menu_801CD998);
@ -4937,7 +4937,7 @@ void Map_801A809C(PlanetId planetId) {
break;
}
} else {
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
gDPSetTextureFilter(gMasterDisp++, G_TF_POINT);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, alpha);
@ -4960,7 +4960,7 @@ void Map_801A809C(PlanetId planetId) {
void Map_801A8738(void) {
if (D_menu_801CEB34 >= 0) {
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetEnvColor(gMasterDisp++, 255, 0, 0, 0);
@ -5031,7 +5031,7 @@ void Map_801A89BC(PlanetId planetId, s32 arg1) {
temp2 = 5;
}
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetEnvColor(gMasterDisp++, 255, 0, 0, 0);
@ -5106,7 +5106,7 @@ void Map_801A8F40(void) {
if (D_menu_801CD97C != 0) {
Lights_SetOneLight(&gMasterDisp, 0, 0, 127, 80, 80, 60, 50, 50, 50);
RCP_SetupDL(&gMasterDisp, 0x17);
RCP_SetupDL(&gMasterDisp, SETUPDL_23);
temp = Math_SmoothStepToF(&D_menu_801CEAA8, D_menu_801CEAB0, 0.1f, 100.0f, 1.0f);
@ -5180,9 +5180,9 @@ void Map_801A9224(void) {
}
if ((D_menu_801CD944 == 3) || ((sCurrentPlanetId == PLANET_METEO) && (D_menu_801CD944 != 7))) {
RCP_SetupDL(&gMasterDisp, 0x35);
RCP_SetupDL(&gMasterDisp, SETUPDL_53);
} else {
RCP_SetupDL(&gMasterDisp, 0x40);
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, sPlanets[PLANET_METEO].alpha);
}
@ -5232,9 +5232,9 @@ void Map_801A9448(void) {
}
if ((D_menu_801CD944 == 3) || (sCurrentPlanetId == PLANET_AREA_6)) {
RCP_SetupDL(&gMasterDisp, 0x17);
RCP_SetupDL(&gMasterDisp, SETUPDL_23);
} else {
RCP_SetupDL(&gMasterDisp, 0x2E);
RCP_SetupDL(&gMasterDisp, SETUPDL_46);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, sPlanets[PLANET_AREA_6].alpha);
}
@ -5301,14 +5301,13 @@ void Map_801A9910(void) {
s32 i;
s32 var_s0 = D_menu_801B6A84[sCurrentPlanetId];
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) D_menu_801CEA6C);
for (i = 0; i < D_menu_801AF834[var_s0].height; i++) {
TextureRect_8bIA(&gMasterDisp, D_menu_801AF834[var_s0].texture + (D_menu_801AF834[var_s0].width * i),
D_menu_801AF834[var_s0].width, 1, D_menu_801AF834[var_s0].xPos, 20.0f + (1.0f * i), 1.0f,
1.0f);
TextureRect_IA8(&gMasterDisp, D_menu_801AF834[var_s0].texture + (D_menu_801AF834[var_s0].width * i),
D_menu_801AF834[var_s0].width, 1, D_menu_801AF834[var_s0].xPos, 20.0f + (1.0f * i), 1.0f, 1.0f);
}
Math_SmoothStepToF(&D_menu_801CEA6C, 255.0f, D_menu_801CEA70, 10.0f, 1.0f);
@ -5395,7 +5394,7 @@ void Map_801A9A8C(void) {
break;
}
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
#if MODS_LEVEL_SELECT == 1
@ -5404,17 +5403,17 @@ void Map_801A9A8C(void) {
}
#endif
TextureRect_8bIA(&gMasterDisp, aTextMissionNo, 112, 19, D_menu_801B6AC0[0], D_menu_801B6AC8[0], 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, missionNoTex, 16, 15, D_menu_801B6AC0[1], D_menu_801B6AC8[1], 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, aTextMissionNo, 112, 19, D_menu_801B6AC0[0], D_menu_801B6AC8[0], 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, missionNoTex, 16, 15, D_menu_801B6AC0[1], D_menu_801B6AC8[1], 1.0f, 1.0f);
for (i = 0; i < D_menu_801AF834[sp58].height; i++) {
TextureRect_8bIA(&gMasterDisp, D_menu_801AF834[sp58].texture + (D_menu_801AF834[sp58].width * i),
D_menu_801AF834[sp58].width, 1, D_menu_801AF834[sp58].xPos, 94.0f + (1.0f * i), 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_menu_801AF834[sp58].texture + (D_menu_801AF834[sp58].width * i),
D_menu_801AF834[sp58].width, 1, D_menu_801AF834[sp58].xPos, 94.0f + (1.0f * i), 1.0f, 1.0f);
}
for (i = 0; i < D_menu_801AF914[sp58].height; i++) {
TextureRect_8bIA(&gMasterDisp, D_menu_801AF914[sp58].texture + (D_menu_801AF914[sp58].width * i),
D_menu_801AF914[sp58].width, 1, D_menu_801AF914[sp58].xPos, 140.0f + (1.0f * i), 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_menu_801AF914[sp58].texture + (D_menu_801AF914[sp58].width * i),
D_menu_801AF914[sp58].width, 1, D_menu_801AF914[sp58].xPos, 140.0f + (1.0f * i), 1.0f, 1.0f);
}
}
@ -5446,7 +5445,7 @@ void Map_801A9DE8(void) {
}
void Map_801A9EE4(void) {
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
@ -5512,7 +5511,7 @@ void Map_801AA1CC(s32 arg0) {
PlanetId* ptr = &gMissionPlanet[0];
for (x = 0.0f, i = 0; i < 7; i++, x += 24.0f + x2, ptr++) {
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
if (i < 6) {
r = g = b = 255;
@ -5541,10 +5540,10 @@ void Map_801AA1CC(s32 arg0) {
} else {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
}
TextureRect_16bRGBA(&gMasterDisp, D_MAP_60447A0, 8, 8, 28.0f + x + 24.0f, y + 11.0f, 2.0f, 0.2f);
TextureRect_RGBA16(&gMasterDisp, D_MAP_60447A0, 8, 8, 28.0f + x + 24.0f, y + 11.0f, 2.0f, 0.2f);
}
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_16bRGBA(&gMasterDisp, D_MAP_6047550, 24, 24, 28.0f + x, y, 1.0f, 1.0f);
TextureRect_RGBA16(&gMasterDisp, D_MAP_6047550, 24, 24, 28.0f + x, y, 1.0f, 1.0f);
}
}
@ -5559,7 +5558,7 @@ void Map_801AA434(s32 arg0, f32 x, f32 y, s32 idx) {
static s32 D_menu_801B6AE8[] = { 30, 179, 30 };
static s32 D_menu_801B6AF4[] = { 0, 67, 255 };
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
Graphics_DisplaySmallText(x + 12.0f - Graphics_GetSmallTextWidth(sPlanetNames[idx]) * 0.5f, y - 8.0f, 1.0f, 1.0f,
@ -5580,7 +5579,7 @@ void Map_801AA434(s32 arg0, f32 x, f32 y, s32 idx) {
x2 = 0.0f;
for (i = 0; i < 3; i++, x2 += 9.0f) {
if ((gMissionTeamStatus[arg0] & mask)) {
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, D_menu_801B6ADC[i], D_menu_801B6AE8[i], D_menu_801B6AF4[i], 255);
Graphics_DisplaySmallText((s32) x + x2 - 1.0f, (s32) y + 24.0f + 8.0f + 2.0f, 1.0f, 1.0f,
D_menu_801B6AD0[i]);
@ -5600,7 +5599,7 @@ void Map_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) {
switch (planetId) {
case PLANET_SOLAR:
if ((gGameFrameCount & mask) != 0) {
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0, 0, 240, 0, 0, 255);
gDPSetEnvColor(gMasterDisp++, 31, 0, 0, 0);
@ -5627,7 +5626,7 @@ void Map_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) {
case PLANET_METEO:
if ((gGameFrameCount & mask) != 0) {
RCP_SetupDL(&gMasterDisp, 0x3E);
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
@ -5654,7 +5653,7 @@ void Map_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) {
case PLANET_SECTOR_Y:
case PLANET_SECTOR_Z:
if ((gGameFrameCount & mask) != 0) {
RCP_SetupDL(&gMasterDisp, 0x3E);
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 144);
@ -5674,7 +5673,7 @@ void Map_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) {
case PLANET_BOLSE:
if ((gGameFrameCount & mask) != 0) {
RCP_SetupDL(&gMasterDisp, 0x17);
RCP_SetupDL(&gMasterDisp, SETUPDL_23);
Lights_SetOneLight(&gMasterDisp, 0, 0, 100, 50, 50, 40, 100, 100, 100);
@ -5696,7 +5695,7 @@ void Map_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) {
case PLANET_AREA_6:
if ((gGameFrameCount & mask) != 0) {
RCP_SetupDL(&gMasterDisp, 0x17);
RCP_SetupDL(&gMasterDisp, SETUPDL_23);
Lights_SetOneLight(&gMasterDisp, 0, 0, 100, 50, 50, 40, 100, 100, 100);
@ -5718,7 +5717,7 @@ void Map_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) {
default:
if ((gGameFrameCount & mask) != 0) {
RCP_SetupDL(&gMasterDisp, 0x3E);
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
@ -5761,7 +5760,7 @@ void Map_801AB17C(f32 x, f32 y, f32 z) {
static f32 xPos = 4.4f;
static f32 yPos = 1.0f;
RCP_SetupDL(&gMasterDisp, 0x35);
RCP_SetupDL(&gMasterDisp, SETUPDL_53);
gDPSetTextureFilter(gMasterDisp++, G_TF_POINT);
Matrix_Push(&gGfxMatrix);
@ -5958,19 +5957,19 @@ void Map_801AB978(s32 arg0) {
case 20:
case 21:
if (D_menu_801CEA74 != 0) {
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_menu_801CEA74);
xPos = 205.0f;
yPos = 77.0f;
for (i = 0; i < 12; i++) {
TextureRect_16bRGBA(&gMasterDisp, D_MAP_6044820 + (92 * 4 * i), 92, 4, xPos, yPos + (i * 4.0f),
1.0f, 1.0f);
TextureRect_RGBA16(&gMasterDisp, D_MAP_6044820 + (92 * 4 * i), 92, 4, xPos, yPos + (i * 4.0f), 1.0f,
1.0f);
}
TextureRect_16bRGBA(&gMasterDisp, D_MAP_6044820 + (92 * 4 * 12), 92, 3, xPos, yPos + 48.0f, 1.0f, 1.0f);
TextureRect_RGBA16(&gMasterDisp, D_MAP_6044820 + (92 * 4 * 12), 92, 3, xPos, yPos + 48.0f, 1.0f, 1.0f);
if (arg0 == 21) {
TextureRect_16bRGBA(&gMasterDisp, D_MAP_6046CD0, 32, 34, xPos + 47.0, yPos, 1.0f, 1.0f);
TextureRect_RGBA16(&gMasterDisp, D_MAP_6046CD0, 32, 34, xPos + 47.0, yPos, 1.0f, 1.0f);
}
for (i = 0; i < 3; i++) {
@ -5985,7 +5984,7 @@ void Map_801AB978(s32 arg0) {
break;
case 0:
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
if ((gGameFrameCount & 0x10) != 0) {
Graphics_DisplaySmallText(D_menu_801B6B0C[i], 131 + 28, 1.0f, 1.0f, "OK !");
@ -5998,10 +5997,10 @@ void Map_801AB978(s32 arg0) {
break;
}
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, sp90[i]);
TextureRect_16bRGBA(&gMasterDisp, D_menu_801B6B18[i], 28, 28, D_menu_801B6B0C[i], 131.0f, 1.0f,
1.0f);
TextureRect_RGBA16(&gMasterDisp, D_menu_801B6B18[i], 28, 28, D_menu_801B6B0C[i], 131.0f, 1.0f,
1.0f);
if ((gSavedTeamShields[3 - i] < 0) && (gSavedTeamShields[3 - i] != -2)) {
Map_801ABCDC(i, D_menu_801CEA74);
@ -6020,7 +6019,7 @@ void Map_801ABCDC(s32 arg0, s32 alpha) {
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x29);
RCP_SetupDL(&gMasterDisp, SETUPDL_41);
gDPSetTextureFilter(gMasterDisp++, G_TF_POINT);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, alpha);
@ -6057,7 +6056,7 @@ void Map_801ABF1C(void) {
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x15);
RCP_SetupDL(&gMasterDisp, SETUPDL_21);
Matrix_Push(&gGfxMatrix);
{
@ -6078,7 +6077,7 @@ void Map_801ABF1C(void) {
}
Matrix_Pop(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0, 0, 32, 32, 255, D_menu_801CEA98);
gDPSetEnvColor(gMasterDisp++, 207, 207, 255, 0);
@ -6208,9 +6207,9 @@ void Map_801AC530(s32 index) {
src.z = 0.0f;
if (D_menu_801CEEA8 == 255) {
RCP_SetupDL(&gMasterDisp, 0x17);
RCP_SetupDL(&gMasterDisp, SETUPDL_23);
} else {
RCP_SetupDL(&gMasterDisp, 0x2E);
RCP_SetupDL(&gMasterDisp, SETUPDL_46);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_menu_801CEEA8);
}
@ -6270,7 +6269,7 @@ void Map_801AC80C(PathType pathType) {
b = 0;
}
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 80, D_menu_801CEEAC);
gDPSetEnvColor(gMasterDisp++, r, g, b, 0);
@ -6708,17 +6707,17 @@ void Map_801AD718(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* arg5,
}
void Map_801AD7EC(s32 xPos, s32 yPos, s32 number) {
RCP_SetupDL(&gMasterDisp, 0x55);
RCP_SetupDL(&gMasterDisp, SETUPDL_85);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_4bCI(&gMasterDisp, D_MAP_601DC10, D_MAP_601DC90, 16, 16, xPos, yPos, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_MAP_601DC10, D_MAP_601DC90, 16, 16, xPos, yPos, 1.0f, 1.0f);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
TextureRect_4bCI(&gMasterDisp, D_MAP_601DCA0, D_MAP_601DCD8, 16, 7, xPos + 18.0f, yPos + 9.0f, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_MAP_601DCA0, D_MAP_601DCD8, 16, 7, xPos + 18.0f, yPos + 9.0f, 1.0f, 1.0f);
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);

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

@ -1454,14 +1454,14 @@ void Option_SoundDraw(void) {
Option_801952B4();
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_16bRGBA(&gMasterDisp, D_MAP_60447A0, 8, 8, D_menu_801AEFA8[0], D_menu_801AEFD4[0], D_menu_801AF000,
0.2f);
TextureRect_RGBA16(&gMasterDisp, D_MAP_60447A0, 8, 8, D_menu_801AEFA8[0], D_menu_801AEFD4[0], D_menu_801AF000,
0.2f);
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_8bIA(&gMasterDisp, D_OPT_8005CD0, 112, 13, D_menu_801AEFA8[1], D_menu_801AEFD4[1], 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_8005CD0, 112, 13, D_menu_801AEFA8[1], D_menu_801AEFD4[1], 1.0f, 1.0f);
for (i = 0; i < 4; i++) {
if (D_menu_801B9288 == i) {
@ -1473,43 +1473,43 @@ void Option_SoundDraw(void) {
colorGB = D_menu_801B9270[0];
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255);
TextureRect_8bIA(&gMasterDisp, D_OPT_8006280, 48, 13, D_menu_801AEFA8[2], D_menu_801AEFD4[2], 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_8006280, 48, 13, D_menu_801AEFA8[2], D_menu_801AEFD4[2], 1.0f, 1.0f);
colorGB = D_menu_801B9270[1];
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255);
TextureRect_8bIA(&gMasterDisp, D_OPT_80064F0, 88, 14, D_menu_801AEFA8[3], D_menu_801AEFD4[3], 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_80064F0, 88, 14, D_menu_801AEFA8[3], D_menu_801AEFD4[3], 1.0f, 1.0f);
colorGB = D_menu_801B9270[2];
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255);
TextureRect_8bIA(&gMasterDisp, D_OPT_80069C0, 56, 15, D_menu_801AEFA8[4], D_menu_801AEFD4[4], 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_80069C0, 56, 15, D_menu_801AEFA8[4], D_menu_801AEFD4[4], 1.0f, 1.0f);
colorGB = D_menu_801B9270[3];
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255);
TextureRect_8bIA(&gMasterDisp, D_OPT_8006D10, 24, 13, D_menu_801AEFA8[5], D_menu_801AEFD4[5], 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_8006D10, 24, 13, D_menu_801AEFA8[5], D_menu_801AEFD4[5], 1.0f, 1.0f);
if (D_menu_801B9288 == 0) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_8bIA_MirX(&gMasterDisp, D_OPT_800E130, 8, 8, D_menu_801AEFA8[6], D_menu_801AEFD4[6], 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_OPT_800E130, 8, 8, D_menu_801AEFA8[7], D_menu_801AEFD4[7], 1.0f, 1.0f);
TextureRect_IA8_MirX(&gMasterDisp, D_OPT_800E130, 8, 8, D_menu_801AEFA8[6], D_menu_801AEFD4[6], 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_800E130, 8, 8, D_menu_801AEFA8[7], D_menu_801AEFD4[7], 1.0f, 1.0f);
}
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
switch (gOptionSoundMode) {
case OPTIONSOUND_STEREO:
TextureRect_8bIA(&gMasterDisp, D_OPT_800CD90, 56, 13, D_menu_801AEFA8[8], D_menu_801AEFD4[8], 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_800CD90, 56, 13, D_menu_801AEFA8[8], D_menu_801AEFD4[8], 1.0f, 1.0f);
break;
case OPTIONSOUND_MONO:
TextureRect_8bIA(&gMasterDisp, D_OPT_80076E0, 56, 14, D_menu_801AEFA8[9], D_menu_801AEFD4[9], 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_80076E0, 56, 14, D_menu_801AEFA8[9], D_menu_801AEFD4[9], 1.0f, 1.0f);
break;
case OPTIONSOUND_HEADSET:
TextureRect_8bIA(&gMasterDisp, D_OPT_8007210, 88, 14, D_menu_801AEFA8[10], D_menu_801AEFD4[10], 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_8007210, 88, 14, D_menu_801AEFA8[10], D_menu_801AEFD4[10], 1.0f, 1.0f);
break;
}
TextureRect_8bIA(&gMasterDisp, D_OPT_8006E50, 96, 10, 166.0f, 213.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_8006E50, 96, 10, 166.0f, 213.0f, 1.0f, 1.0f);
for (i = 0; i < 3; i++) {
Option_DrawCardLabel(D_menu_801AEAA0[i]);
@ -1722,16 +1722,16 @@ void Option_ExpertSoundDraw(void) {
if (!showJukebox) {
#endif
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_8bIA(&gMasterDisp, D_OPT_80079F0, 128, 14, 49.0f, 81.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_80079F0, 128, 14, 49.0f, 81.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_menu_801AECF8[D_menu_801B931C / 10], 16, 15, 230.0f, 82.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_menu_801AECF8[D_menu_801B931C / 10], 16, 15, 230.0f, 82.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_menu_801AECF8[D_menu_801B931C % 10], 16, 15, 244.0f, 82.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_menu_801AECF8[D_menu_801B931C % 10], 16, 15, 244.0f, 82.0f, 1.0f, 1.0f);
#if MODS_SFX_JUKEBOX == 1
}
@ -1739,13 +1739,13 @@ void Option_ExpertSoundDraw(void) {
Option_8019B7D4();
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 50, 50, 200, 255);
for (i = 0; i < 4; i++) {
TextureRect_16bRGBA(&gMasterDisp, D_MAP_60447A0, 8, 8, D_menu_801AF014[i], D_menu_801AF024[i],
D_menu_801AF034[i], D_menu_801AF044[i]);
TextureRect_RGBA16(&gMasterDisp, D_MAP_60447A0, 8, 8, D_menu_801AF014[i], D_menu_801AF024[i],
D_menu_801AF034[i], D_menu_801AF044[i]);
}
if (D_menu_801B9320 != 0) {
@ -1771,7 +1771,7 @@ void Option_ExpertSoundDraw(void) {
Lib_InitOrtho(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 5);
RCP_SetupDL(&gMasterDisp, SETUPDL_5);
Matrix_Push(&gGfxMatrix);
Matrix_LookAt(gGfxMatrix, 0.0f, 0.0f, 100.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, MTXF_APPLY);
@ -1946,20 +1946,20 @@ void Option_DataDraw(void) {
Option_DrawMenuLabel();
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
for (i = 0; i < 2; i++) {
TextureRect_8bIA(&gMasterDisp, D_OPT_80084B0 + (176 * 4 * i), 176, 4, D_menu_801AF094[0],
D_menu_801AF0AC[0] + (4.0f * i), 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_80084B0 + (176 * 4 * i), 176, 4, D_menu_801AF094[0],
D_menu_801AF0AC[0] + (4.0f * i), 1.0f, 1.0f);
}
TextureRect_8bIA(&gMasterDisp, D_OPT_80084B0 + 176 * 4 * 2, 176, 5, D_menu_801AF094[0], D_menu_801AF0AC[0] + 8.0f,
1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_80084B0 + 176 * 4 * 2, 176, 5, D_menu_801AF094[0], D_menu_801AF0AC[0] + 8.0f,
1.0f, 1.0f);
if (D_menu_801B91CC < 2) {
TextureRect_8bIA_MirX(&gMasterDisp, D_OPT_800E130, 8, 8, D_menu_801AF084[D_menu_801B91C0], 140.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_OPT_800E130, 8, 8, D_menu_801AF08C[D_menu_801B91C0], 140.0f, 1.0f, 1.0f);
TextureRect_IA8_MirX(&gMasterDisp, D_OPT_800E130, 8, 8, D_menu_801AF084[D_menu_801B91C0], 140.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_800E130, 8, 8, D_menu_801AF08C[D_menu_801B91C0], 140.0f, 1.0f, 1.0f);
Option_8019C824(&D_menu_801AED20[D_menu_801B91C0]);
D_menu_801AED20[!D_menu_801B91C0] = 255.0f;
@ -1977,13 +1977,13 @@ void Option_DataDraw(void) {
if ((gGameFrameCount & sp74[1]) != 0) {
sp7C[1] = D_menu_801AED20[1];
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, sp7C[1], sp7C[1], 255);
TextureRect_8bIA(&gMasterDisp, D_OPT_8009980, 32, 12, D_menu_801AF094[1], D_menu_801AF0AC[1], 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_8009980, 32, 12, D_menu_801AF094[1], D_menu_801AF0AC[1], 1.0f, 1.0f);
}
if ((gGameFrameCount & sp74[0]) != 0) {
sp7C[0] = D_menu_801AED20[0];
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, sp7C[0], sp7C[0], 255);
TextureRect_8bIA(&gMasterDisp, D_OPT_8009B00, 40, 12, D_menu_801AF094[2], D_menu_801AF0AC[2], 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_8009B00, 40, 12, D_menu_801AF094[2], D_menu_801AF0AC[2], 1.0f, 1.0f);
}
}
@ -1992,11 +1992,11 @@ void Option_DataDraw(void) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
for (i = 0; i < 9; i++) {
TextureRect_8bIA(&gMasterDisp, D_OPT_8008DA0 + (160 * 2 * i), 160, 2, D_menu_801AF094[3],
D_menu_801AF0AC[3] + (2.0f * i), 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_8008DA0 + (160 * 2 * i), 160, 2, D_menu_801AF094[3],
D_menu_801AF0AC[3] + (2.0f * i), 1.0f, 1.0f);
}
TextureRect_8bIA(&gMasterDisp, D_OPT_8008DA0 + 160 * 2 * 9, 160, 1, D_menu_801AF094[3],
D_menu_801AF0AC[3] + 18.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_8008DA0 + 160 * 2 * 9, 160, 1, D_menu_801AF094[3],
D_menu_801AF0AC[3] + 18.0f, 1.0f, 1.0f);
break;
case 1:
@ -2004,19 +2004,19 @@ void Option_DataDraw(void) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
for (i = 0; i < 20; i++) {
TextureRect_8bIA(&gMasterDisp, D_OPT_8009CE0 + (160 * 2 * i), 160, 2, D_menu_801AF094[4],
D_menu_801AF0AC[4] + (2.0f * i), 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_8009CE0 + (160 * 2 * i), 160, 2, D_menu_801AF094[4],
D_menu_801AF0AC[4] + (2.0f * i), 1.0f, 1.0f);
}
TextureRect_8bIA(&gMasterDisp, D_OPT_8009CE0 + 160 * 2 * 20, 160, 1, D_menu_801AF094[4],
D_menu_801AF0AC[4] + 40.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_8009CE0 + 160 * 2 * 20, 160, 1, D_menu_801AF094[4],
D_menu_801AF0AC[4] + 40.0f, 1.0f, 1.0f);
break;
case 3:
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 32, 32, 255);
TextureRect_8bIA(&gMasterDisp, D_OPT_800B680, 144, 28, D_menu_801AF094[5], D_menu_801AF0AC[5], 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_OPT_800B680 + 4032, 144, 13, D_menu_801AF094[5],
D_menu_801AF0AC[5] + 28.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_800B680, 144, 28, D_menu_801AF094[5], D_menu_801AF0AC[5], 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_800B680 + 4032, 144, 13, D_menu_801AF094[5], D_menu_801AF0AC[5] + 28.0f,
1.0f, 1.0f);
break;
}
@ -2143,13 +2143,13 @@ void Option_RankingMenuDraw(void) {
Option_8019752C();
} else {
Title_80187E28();
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
Option_8019C824(&D_menu_801B93F0);
temp_t0 = D_menu_801B93F0;
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, temp_t0, temp_t0, 255);
TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7004010, 8, 8, 70.0f, (D_menu_801B93E4 * 17.0f) + 55.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_VS_MENU_7004010, 8, 8, 70.0f, (D_menu_801B93E4 * 17.0f) + 55.0f, 1.0f, 1.0f);
}
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
Graphics_DisplaySmallText(242, 215, 1.0f, 1.0f, "PUSH A");
}
@ -2182,16 +2182,16 @@ void Option_8019752C(void) {
Option_80197914();
Matrix_Pop(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_8bIA(&gMasterDisp, D_OPT_800D170, 8, 16, 0.0f, D_menu_801AF0F8[0], 40.0f, 1.5f);
TextureRect_8bIA_MirY(&gMasterDisp, D_OPT_800D170, 8, 16, 0.0f, D_menu_801AF0F8[1], 40.0f, 1.5f);
TextureRect_IA8(&gMasterDisp, D_OPT_800D170, 8, 16, 0.0f, D_menu_801AF0F8[0], 40.0f, 1.5f);
TextureRect_IA8_MirY(&gMasterDisp, D_OPT_800D170, 8, 16, 0.0f, D_menu_801AF0F8[1], 40.0f, 1.5f);
Background_DrawPartialStarfield(0, 70);
Background_DrawPartialStarfield(170, 239);
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
if (D_menu_801B91D4 >= 114.0f) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 32, 32, 32, 255);
@ -2201,7 +2201,7 @@ void Option_8019752C(void) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, temp_a0, temp_a0, 255);
}
TextureRect_8bIA(&gMasterDisp, D_OPT_800D070, 16, 16, 150.0f, 44.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_800D070, 16, 16, 150.0f, 44.0f, 1.0f, 1.0f);
if (D_menu_801B91D4 <= -1055.0f) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 32, 32, 32, 255);
@ -2211,7 +2211,7 @@ void Option_8019752C(void) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, temp_a0, temp_a0, 255);
}
TextureRect_8bIA_MirY(&gMasterDisp, D_OPT_800D070, 16, 16, 150.0f, 200.0f, 1.0f, 1.0f);
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 } };
@ -2222,7 +2222,7 @@ void Option_80197914(void) {
Vec3f* vec2;
s32 i;
RCP_SetupDL(&gMasterDisp, 0);
RCP_SetupDL(&gMasterDisp, SETUPDL_0);
for (i = 0, vec1 = D_menu_801AF100, vec2 = D_menu_801AF118; i < 2; i++, vec1++, vec2++) {
Matrix_Push(&gGfxMatrix);
@ -2235,38 +2235,36 @@ void Option_80197914(void) {
}
void Option_80197A3C(s32 arg0, s32 arg1, s32 arg2) {
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
if (arg0 != 9) {
TextureRect_8bIA(&gMasterDisp, D_menu_801AECF8[arg0 + 1], 16, 15, arg1, arg2 - 25.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_menu_801AECF8[arg0 + 1], 16, 15, arg1, arg2 - 25.0f, 1.0f, 1.0f);
} else {
TextureRect_8bIA(&gMasterDisp, aLargeText_1, 16, 15, arg1 - 14.0f, arg2 - 25.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, aLargeText_0, 16, 15, arg1, arg2 - 25.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, aLargeText_1, 16, 15, arg1 - 14.0f, arg2 - 25.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, aLargeText_0, 16, 15, arg1, arg2 - 25.0f, 1.0f, 1.0f);
}
RCP_SetupDL(&gMasterDisp, 0x55);
RCP_SetupDL(&gMasterDisp, SETUPDL_85);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
switch (arg0) {
case 0:
TextureRect_4bCI(&gMasterDisp, D_OPT_8003A70, D_OPT_8003AB8, 16, 9, arg1 + 17.0f, arg2 - 19.0f, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_OPT_8003A70, D_OPT_8003AB8, 16, 9, arg1 + 17.0f, arg2 - 19.0f, 1.0f, 1.0f);
break;
case 1:
TextureRect_4bCI(&gMasterDisp, D_OPT_80038E0, D_OPT_8003930, 16, 10, arg1 + 17.0f, arg2 - 19.0f, 1.0f,
1.0f);
TextureRect_CI4(&gMasterDisp, D_OPT_80038E0, D_OPT_8003930, 16, 10, arg1 + 17.0f, arg2 - 19.0f, 1.0f, 1.0f);
break;
case 2:
TextureRect_4bCI(&gMasterDisp, D_OPT_8003950, D_OPT_80039A8, 16, 11, arg1 + 17.0f, arg2 - 20.0f, 1.0f,
1.0f);
TextureRect_CI4(&gMasterDisp, D_OPT_8003950, D_OPT_80039A8, 16, 11, arg1 + 17.0f, arg2 - 20.0f, 1.0f, 1.0f);
break;
default:
TextureRect_4bCI(&gMasterDisp, D_OPT_8003AE0, D_OPT_8003B28, 16, 9, arg1 + 17.0f, arg2 - 19.0f, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_OPT_8003AE0, D_OPT_8003B28, 16, 9, arg1 + 17.0f, arg2 - 19.0f, 1.0f, 1.0f);
break;
}
}
@ -2274,7 +2272,7 @@ void Option_80197A3C(s32 arg0, s32 arg1, s32 arg2) {
void Option_80197D30(s32 arg0, s32 arg1, s32 arg2) {
char temp[4];
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
@ -2287,9 +2285,9 @@ void Option_80197D30(s32 arg0, s32 arg1, s32 arg2) {
}
void Option_80197DE4(s32 arg0, s32 arg1, s32 arg2) {
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 60, 60, 255, 170);
TextureRect_8bIA(&gMasterDisp, D_MAP_601B4B0, 24, 17, arg1, arg2, 3.17f, 1.05f);
TextureRect_IA8(&gMasterDisp, D_MAP_601B4B0, 24, 17, arg1, arg2, 3.17f, 1.05f);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
Graphics_DisplaySmallText(arg1, arg2, 1.0f, 1.0f, "TOTAL HITS");
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
@ -2301,7 +2299,7 @@ void Option_80197F74(s32 arg0, s32 arg1, s32 arg2) {
f32 temp_fs1;
s32 i;
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
for (temp_fs1 = 0.0f, i = 0; i < 3; i++, temp_fs1 += 12.0f) {
gDPSetPrimColor(gMasterDisp++, 0, 0, D_menu_801AF0D0[i], D_menu_801AF0DC[i], D_menu_801AF0E8[i], 255);
@ -2341,7 +2339,7 @@ void Option_801982B0(s32 arg0, s32 arg1, f32 arg2, f32 arg3, s32 arg4) {
PlanetId end;
if ((arg3 > 30.0f) && (arg3 < 200.0f)) {
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
if (arg1 < 6) {
b = 255;
g = 255;
@ -2376,10 +2374,10 @@ void Option_801982B0(s32 arg0, s32 arg1, f32 arg2, f32 arg3, s32 arg4) {
}
}
gDPSetPrimColor(gMasterDisp++, 0, 0, r, g, b, 255);
TextureRect_16bRGBA(&gMasterDisp, D_MAP_60447A0, 8, 8, arg2 + 24.0f, arg3 + 11.0f, 2.0f, 0.2f);
TextureRect_RGBA16(&gMasterDisp, D_MAP_60447A0, 8, 8, arg2 + 24.0f, arg3 + 11.0f, 2.0f, 0.2f);
}
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_16bRGBA(&gMasterDisp, D_MAP_6047550, 24, 24, arg2, arg3, 1.0f, 1.0f);
TextureRect_RGBA16(&gMasterDisp, D_MAP_6047550, 24, 24, arg2, arg3, 1.0f, 1.0f);
}
}
@ -2387,7 +2385,7 @@ void Option_801984D0(s32 arg0, s32 arg1, f32 arg2, f32 arg3) {
s32 sp1C;
if ((arg3 > 22.0f) && (arg3 < 162.0f)) {
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
sp1C = (gSaveFile.save.data.unk_5E[arg0][arg1].unk_C & 1) << 8;
sp1C |= gSaveFile.save.data.unk_5E[arg0][arg1].unk_0;
@ -2401,7 +2399,7 @@ void Option_80198608(s32 arg0, s32 arg1, f32 arg2, f32 arg3) {
s32 i;
if ((arg3 > 12.0f) && (arg3 < 154.0f)) {
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
sp90[0] = gSaveFile.save.data.unk_5E[arg0][arg1].unk_D & 1;
sp90[1] = gSaveFile.save.data.unk_5E[arg0][arg1].unk_F & 1;
@ -2426,7 +2424,7 @@ void Option_8019882C(s32 arg0, s32 arg1, f32 arg2, f32 arg3) {
if ((arg3 > 58.0f) && (arg3 < 197.0f)) {
temp = gSaveFile.save.data.unk_5E[arg0][arg1].unk_8 & 0xF;
sp20 = D_menu_801AEEAC[temp];
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
temp2 = Graphics_GetSmallTextWidth(sp20) / 2.0f;
Graphics_DisplaySmallText(arg2 + 12.0f - temp2, arg3 - 8.0f, 1.0f, 1.0f, sp20);
@ -2456,7 +2454,7 @@ void Option_8019896C(s32 arg0, f32 y, s32 arg2) {
switch (planet) {
case SAVE_SLOT_SOLAR:
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0, 0, 240, 0, 0, 255);
gDPSetEnvColor(gMasterDisp++, 31, 0, 0, 0);
@ -2477,7 +2475,7 @@ void Option_8019896C(s32 arg0, f32 y, s32 arg2) {
break;
case PLANET_METEO:
RCP_SetupDL(&gMasterDisp, 0x3E);
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
@ -2499,7 +2497,7 @@ void Option_8019896C(s32 arg0, f32 y, s32 arg2) {
case PLANET_SECTOR_X:
case PLANET_SECTOR_Y:
case PLANET_SECTOR_Z:
RCP_SetupDL(&gMasterDisp, 0x3E);
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 144);
@ -2514,7 +2512,7 @@ void Option_8019896C(s32 arg0, f32 y, s32 arg2) {
break;
case PLANET_BOLSE:
RCP_SetupDL(&gMasterDisp, 0x17);
RCP_SetupDL(&gMasterDisp, SETUPDL_23);
Lights_SetOneLight(&gMasterDisp, 0, 0, 100, 100, 100, 70, 100, 100, 100);
Matrix_Push(&gGfxMatrix);
@ -2529,7 +2527,7 @@ void Option_8019896C(s32 arg0, f32 y, s32 arg2) {
break;
case PLANET_AREA_6:
RCP_SetupDL(&gMasterDisp, 0x17);
RCP_SetupDL(&gMasterDisp, SETUPDL_23);
Lights_SetOneLight(&gMasterDisp, 0, 0, 100, 100, 100, 70, 100, 100, 100);
Matrix_Push(&gGfxMatrix);
@ -2544,7 +2542,7 @@ void Option_8019896C(s32 arg0, f32 y, s32 arg2) {
break;
default:
RCP_SetupDL(&gMasterDisp, 0x3E);
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
@ -2593,7 +2591,7 @@ static f32 D_menu_801AF140 = 11.0f;
static f32 D_menu_801AF144 = 2.7f;
void Option_80199198(f32 arg0, f32 arg1, f32 arg2) {
RCP_SetupDL(&gMasterDisp, 0x35);
RCP_SetupDL(&gMasterDisp, SETUPDL_53);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, arg0 - D_menu_801AF140, arg1 + D_menu_801AF144, arg2, MTXF_APPLY);
Matrix_Scale(gGfxMatrix, D_menu_801AF13C, D_menu_801AF13C, D_menu_801AF13C, MTXF_APPLY);
@ -2785,25 +2783,25 @@ void Option_80199820(s32 arg0) {
static s32 D_menu_801AF23C[4] = { 242, 30, 255, 30 };
static s32 D_menu_801AF24C[4] = { 12, 0, 67, 255 };
RCP_SetupDL(&gMasterDisp, 0x55);
RCP_SetupDL(&gMasterDisp, SETUPDL_85);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
for (i = 0; i < 4; i++) {
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_CI4(&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_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);
TextureRect_CI4(&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);
TextureRect_8bCI(&gMasterDisp, D_menu_801AF1EC[arg0], D_menu_801AF1FC[arg0], D_menu_801AF168[arg0],
D_menu_801AF178[arg0], D_menu_801AF148[arg0] + D_menu_801AF188[arg0],
D_menu_801AF158[arg0] + D_menu_801AF198, 1.0f, 1.0f);
TextureRect_CI8(&gMasterDisp, D_menu_801AF1EC[arg0], D_menu_801AF1FC[arg0], D_menu_801AF168[arg0],
D_menu_801AF178[arg0], D_menu_801AF148[arg0] + D_menu_801AF188[arg0],
D_menu_801AF158[arg0] + D_menu_801AF198, 1.0f, 1.0f);
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
var_v0 = 0xFFFFFFFF;
if (D_menu_801B9348[arg0] != 0) {
@ -2816,37 +2814,37 @@ void Option_80199820(s32 arg0) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255);
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);
TextureRect_IA8(&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);
TextureRect_8bIA(&gMasterDisp, D_menu_801AF1E0[D_menu_801AED3C[arg0]], 40, 12,
D_menu_801AF148[arg0] + D_menu_801AF1C4, D_menu_801AF158[arg0] + D_menu_801AF1C8, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_menu_801AF1E0[D_menu_801AED3C[arg0]], 40, 12,
D_menu_801AF148[arg0] + D_menu_801AF1C4, D_menu_801AF158[arg0] + D_menu_801AF1C8, 1.0f, 1.0f);
}
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_8bIA_MirX(&gMasterDisp, D_OPT_800E130, 8, 8, D_menu_801AF148[arg0] + D_menu_801AF1D4,
D_menu_801AF158[arg0] + D_menu_801AF1DC, 1.0f, 1.0f);
TextureRect_IA8_MirX(&gMasterDisp, D_OPT_800E130, 8, 8, D_menu_801AF148[arg0] + D_menu_801AF1D4,
D_menu_801AF158[arg0] + D_menu_801AF1DC, 1.0f, 1.0f);
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_IA8(&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_MENU_7000F10, 40, 7, D_menu_801AF148[arg0] + D_menu_801AF1CC,
D_menu_801AF158[arg0] + D_menu_801AF1D0, 1.0f, 1.0f);
TextureRect_IA8(&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);
for (i = 0; i < 2; i++) {
TextureRect_16bRGBA(&gMasterDisp, D_menu_801AF20C[arg0] + (44 * 20 * i), 44, 20,
D_menu_801AF148[arg0] + D_menu_801AF1B4,
D_menu_801AF158[arg0] + D_menu_801AF1B8 + (i * 20.0f * 0.7f), 0.7f, 0.7f);
TextureRect_RGBA16(&gMasterDisp, D_menu_801AF20C[arg0] + (44 * 20 * i), 44, 20,
D_menu_801AF148[arg0] + D_menu_801AF1B4,
D_menu_801AF158[arg0] + D_menu_801AF1B8 + (i * 20.0f * 0.7f), 0.7f, 0.7f);
}
TextureRect_16bRGBA(&gMasterDisp, D_menu_801AF20C[arg0] + 44 * 20 * 2, 44, 4,
D_menu_801AF148[arg0] + D_menu_801AF1B4, D_menu_801AF158[arg0] + D_menu_801AF1B8 + 28.0f, 0.7f,
0.7f);
TextureRect_RGBA16(&gMasterDisp, D_menu_801AF20C[arg0] + 44 * 20 * 2, 44, 4,
D_menu_801AF148[arg0] + D_menu_801AF1B4, D_menu_801AF158[arg0] + D_menu_801AF1B8 + 28.0f, 0.7f,
0.7f);
var_a2 = 24;
if (arg0 == 0) {
@ -2855,8 +2853,8 @@ void Option_80199820(s32 arg0) {
gDPSetPrimColor(gMasterDisp++, 0, 0, D_menu_801AF22C[arg0], D_menu_801AF23C[arg0], D_menu_801AF24C[arg0], 255);
TextureRect_8bIA(&gMasterDisp, D_menu_801AF21C[arg0], var_a2, 13, D_menu_801AF148[arg0] + D_menu_801AF19C[arg0],
D_menu_801AF158[arg0] + D_menu_801AF1AC, D_menu_801AF1B0, D_menu_801AF1B0);
TextureRect_IA8(&gMasterDisp, D_menu_801AF21C[arg0], var_a2, 13, D_menu_801AF148[arg0] + D_menu_801AF19C[arg0],
D_menu_801AF158[arg0] + D_menu_801AF1AC, D_menu_801AF1B0, D_menu_801AF1B0);
}
void Option_80199EA8(void) {
@ -2867,8 +2865,8 @@ void Option_80199EA8(void) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
for (i = 0; i < 3; i++) {
TextureRect_16bRGBA(&gMasterDisp, D_VS_MENU_700E9A0 + (144 * 14 * i), 144, 14, 87.0f, 84 + (i * 14.0f), 1.0f,
1.0f);
TextureRect_RGBA16(&gMasterDisp, D_VS_MENU_700E9A0 + (144 * 14 * i), 144, 14, 87.0f, 84 + (i * 14.0f), 1.0f,
1.0f);
}
}
@ -3185,11 +3183,11 @@ void Option_8019AB30(void) {
s32 sp44 = gVsPointsToWin;
s32 var_v0;
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 60, 60, 255, 190);
TextureRect_8bIA(&gMasterDisp, D_MAP_601B4B0, 24, 17, 94.0f, 43.0f, 5.0f, 1.1f);
TextureRect_IA8(&gMasterDisp, D_MAP_601B4B0, 24, 17, 94.0f, 43.0f, 5.0f, 1.1f);
if (D_menu_801B912C == 0) {
Option_8019B6D8(97.0f, 50.0f, 107.0f, 255, 255, 255);
@ -3212,15 +3210,15 @@ void Option_8019AB30(void) {
}
if ((gGameFrameCount & var_v0) != 0) {
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255);
TextureRect_8bIA(&gMasterDisp, D_menu_801AECF8[sp44], 16, 15, 109.0f, 45.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_menu_801AECF8[sp44], 16, 15, 109.0f, 45.0f, 1.0f, 1.0f);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255);
TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7001DF0, 80, 10, 122.0f, 49.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_VS_MENU_7001DF0, 80, 10, 122.0f, 49.0f, 1.0f, 1.0f);
}
}
@ -3237,11 +3235,11 @@ void Option_8019AD84(void) {
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);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 60, 60, 255, 190);
TextureRect_8bIA(&gMasterDisp, D_MAP_601B4B0, 24, 17, 93.0f, 42.0f, 5.1f, 1.1f);
TextureRect_IA8(&gMasterDisp, D_MAP_601B4B0, 24, 17, 93.0f, 42.0f, 5.1f, 1.1f);
if (D_menu_801B912C == 0) {
D_menu_801B9324 = 97.0f;
@ -3267,16 +3265,16 @@ void Option_8019AD84(void) {
}
if ((gGameFrameCount & var_v0) != 0) {
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255);
TextureRect_8bIA(&gMasterDisp, sTimeTrialMinuteTextures[D_menu_801B9340], 40, 15,
D_menu_801AF25C[D_menu_801B9340 + 1], D_menu_801AF274[D_menu_801B9340 + 1], 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, sTimeTrialMinuteTextures[D_menu_801B9340], 40, 15,
D_menu_801AF25C[D_menu_801B9340 + 1], D_menu_801AF274[D_menu_801B9340 + 1], 1.0f, 1.0f);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255);
TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7002110, 80, 12, D_menu_801AF25C[0], D_menu_801AF274[0], 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_VS_MENU_7002110, 80, 12, D_menu_801AF25C[0], D_menu_801AF274[0], 1.0f, 1.0f);
}
}
@ -3294,7 +3292,7 @@ void Option_8019AFFC(void) {
D_menu_801B93C8 = 88.0f;
D_menu_801B93CC = 114.0f;
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
Option_8019B6D8(D_menu_801B93C0, D_menu_801B93C8, D_menu_801B93CC, 255, 255, 255);
Option_8019C824(&D_menu_801B9370);
@ -3315,11 +3313,11 @@ void Option_8019AFFC(void) {
}
if ((gGameFrameCount & var_v0) != 0) {
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255);
TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7001270, 112, 12, D_menu_801AF2A0, D_menu_801AF2A4, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_VS_MENU_7001270, 112, 12, D_menu_801AF2A0, D_menu_801AF2A4, 1.0f, 1.0f);
}
if (D_menu_801B93D0 == 30) {
@ -3349,21 +3347,21 @@ void Option_8019B1F8(void) {
sp8C[i] = 32;
}
RCP_SetupDL(&gMasterDisp, 0x55);
RCP_SetupDL(&gMasterDisp, SETUPDL_85);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, sp8C[i]);
TextureRect_8bCI(&gMasterDisp, D_menu_801AF2C4[i], D_menu_801AF2CC[i], 48, 38, xPos, D_menu_801AF2AC, 1.0f,
1.0f);
TextureRect_CI8(&gMasterDisp, D_menu_801AF2C4[i], D_menu_801AF2CC[i], 48, 38, xPos, D_menu_801AF2AC, 1.0f,
1.0f);
width = 48;
if (i == 1) {
width = 56;
}
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, sp8C[i]);
TextureRect_8bIA(&gMasterDisp, D_menu_801AF2BC[i], width, 10, D_menu_801AF2B4[i], D_menu_801AF2AC + 40.0f, 1.0f,
1.0f);
TextureRect_IA8(&gMasterDisp, D_menu_801AF2BC[i], width, 10, D_menu_801AF2B4[i], D_menu_801AF2AC + 40.0f, 1.0f,
1.0f);
}
}
@ -3395,19 +3393,19 @@ void Option_8019B3DC(void) {
sp8C[i] = 32;
}
RCP_SetupDL(&gMasterDisp, 0x55);
RCP_SetupDL(&gMasterDisp, SETUPDL_85);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, sp8C[i]);
TextureRect_8bCI(&gMasterDisp, D_menu_801AF2F0[i], D_menu_801AF2F8[i], 48, 38, xPos, D_menu_801AF2D8, 1.0f,
1.0f);
TextureRect_CI8(&gMasterDisp, D_menu_801AF2F0[i], D_menu_801AF2F8[i], 48, 38, xPos, D_menu_801AF2D8, 1.0f,
1.0f);
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, sp8C[i]);
TextureRect_8bIA(&gMasterDisp, D_menu_801AF2E8[i], 56, 10, D_menu_801AF2E0[i], D_menu_801AF2D8 + 40.0f, 1.0f,
1.0f);
TextureRect_IA8(&gMasterDisp, D_menu_801AF2E8[i], 56, 10, D_menu_801AF2E0[i], D_menu_801AF2D8 + 40.0f, 1.0f,
1.0f);
}
}
@ -3431,24 +3429,24 @@ void Option_8019B5AC(void) {
}
if ((gGameFrameCount & var_v0) != 0) {
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255);
TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7003650, 40, 12, 143.0f, 210.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_VS_MENU_7003650, 40, 12, 143.0f, 210.0f, 1.0f, 1.0f);
}
}
void Option_8019B6D8(f32 xPos, f32 yPos, f32 offset, s32 r, s32 g, s32 b) {
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, r, g, b, 255);
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);
TextureRect_IA8_MirX(&gMasterDisp, D_VS_MENU_7004010, 8, 8, xPos, yPos, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_VS_MENU_7004010, 8, 8, xPos + offset, yPos, 1.0f, 1.0f);
}
void Option_8019B7D4(void) {
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_8bIA(&gMasterDisp, D_OPT_80080F0, 96, 10, 62.0f, 213.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_OPT_8006E50, 96, 10, 166.0f, 213.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_80080F0, 96, 10, 62.0f, 213.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_8006E50, 96, 10, 166.0f, 213.0f, 1.0f, 1.0f);
}
void Option_8019B8A0(s32 arg0) {
@ -3473,7 +3471,7 @@ void Option_DrawMenuLabel(void) {
}
void Option_DrawMenuCard(MenuContext_38 arg0) {
RCP_SetupDL(&gMasterDisp, 0x11);
RCP_SetupDL(&gMasterDisp, SETUPDL_17);
Lib_InitOrtho(&gMasterDisp);
@ -3577,7 +3575,7 @@ void Option_8019BF34(void) {
}
void Option_8019C04C(void) {
RCP_SetupDL(&gMasterDisp, 0x24);
RCP_SetupDL(&gMasterDisp, SETUPDL_36);
Lib_InitOrtho(&gMasterDisp);
@ -3599,31 +3597,31 @@ void Option_DrawCardLabel(OptionTexture arg0) {
if (!(arg0.unk_20 <= 0.0f) && !(arg0.unk_24 <= 0.0f)) {
switch (arg0.unk_00) {
case 1:
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, arg0.unk_28, arg0.unk_2C, arg0.unk_30, arg0.unk_34);
TextureRect_4bCI(&gMasterDisp, arg0.unk_08, arg0.unk_0C, arg0.unk_10, arg0.unk_14, arg0.unk_18,
arg0.unk_1C, arg0.unk_20, arg0.unk_24);
TextureRect_CI4(&gMasterDisp, arg0.unk_08, arg0.unk_0C, arg0.unk_10, arg0.unk_14, arg0.unk_18,
arg0.unk_1C, arg0.unk_20, arg0.unk_24);
break;
case 2:
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, arg0.unk_28, arg0.unk_2C, arg0.unk_30, arg0.unk_34);
TextureRect_8bCI(&gMasterDisp, arg0.unk_08, arg0.unk_0C, arg0.unk_10, arg0.unk_14, arg0.unk_18,
arg0.unk_1C, arg0.unk_20, arg0.unk_24);
TextureRect_CI8(&gMasterDisp, arg0.unk_08, arg0.unk_0C, arg0.unk_10, arg0.unk_14, arg0.unk_18,
arg0.unk_1C, arg0.unk_20, arg0.unk_24);
break;
case 0:
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, arg0.unk_28, arg0.unk_2C, arg0.unk_30, arg0.unk_34);
TextureRect_8bIA(&gMasterDisp, arg0.unk_08, arg0.unk_10, arg0.unk_14, arg0.unk_18, arg0.unk_1C,
arg0.unk_20, arg0.unk_24);
TextureRect_IA8(&gMasterDisp, arg0.unk_08, arg0.unk_10, arg0.unk_14, arg0.unk_18, arg0.unk_1C,
arg0.unk_20, arg0.unk_24);
break;
case 3:
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, arg0.unk_28, arg0.unk_2C, arg0.unk_30, arg0.unk_34);
TextureRect_16bRGBA(&gMasterDisp, arg0.unk_08, arg0.unk_10, arg0.unk_14, arg0.unk_18, arg0.unk_1C,
arg0.unk_20, arg0.unk_24);
TextureRect_RGBA16(&gMasterDisp, arg0.unk_08, arg0.unk_10, arg0.unk_14, arg0.unk_18, arg0.unk_1C,
arg0.unk_20, arg0.unk_24);
break;
}
}
@ -4048,7 +4046,7 @@ void Option_8019D118(void) {
static f32 D_menu_801AF30C[6] = { 51.0f, 138.0f, 118.0f, 166.0f, 138.0f, 267.0f };
static f32 D_menu_801AF324[6] = { 29.0f, 49.0f, 145.0f, 155.0f, 87.0f, 127.0f };
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
if (gLastGameState == GSTATE_ENDING) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
@ -4066,13 +4064,13 @@ void Option_8019D118(void) {
if (D_menu_801B9138 == 1) {
if ((gGameFrameCount & 0x10) != 0) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
TextureRect_8bIA(&gMasterDisp, aTextEnd, 32, 8, D_menu_801AF30C[5], D_menu_801AF324[5], 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, aTextEnd, 32, 8, D_menu_801AF30C[5], D_menu_801AF324[5], 1.0f, 1.0f);
}
}
Option_80197A3C(D_menu_801B9094, D_menu_801AF30C[4], D_menu_801AF324[4]);
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
@ -4251,7 +4249,7 @@ void Option_8019DB20(s32 character, f32 x, f32 y, f32 z, f32 scale, f32 xAngle,
return;
}
RCP_SetupDL(&gMasterDisp, 0x17);
RCP_SetupDL(&gMasterDisp, SETUPDL_23);
gSPTexture(gMasterDisp++, 2500, 200, 0, G_TX_RENDERTILE, G_ON);
gSPSetGeometryMode(gMasterDisp++, G_TEXTURE_GEN);
@ -4411,39 +4409,39 @@ void Option_InvoiceDraw(void) {
Graphics_FillRectangle(&gMasterDisp, 25, 18, SCREEN_WIDTH - 25, SCREEN_HEIGHT - 18, 255, 255, 255, 255);
RCP_SetupDL(&gMasterDisp, 0x4E);
RCP_SetupDL(&gMasterDisp, SETUPDL_78);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_4bCI(&gMasterDisp, D_OPT_8000000, D_OPT_8000680, 128, 16, D_menu_801AF3D0[0], D_menu_801AF3F0[0], 1.0f,
1.0f);
TextureRect_CI4(&gMasterDisp, D_OPT_8000000, D_OPT_8000680, 128, 16, D_menu_801AF3D0[0], D_menu_801AF3F0[0], 1.0f,
1.0f);
TextureRect_4bCI(&gMasterDisp, D_OPT_8000000 + 128 * 16 / 2, D_OPT_8000680, 128, 10, D_menu_801AF3D0[0],
D_menu_801AF3F0[0] + 16.0f, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_OPT_8000000 + 128 * 16 / 2, D_OPT_8000680, 128, 10, D_menu_801AF3D0[0],
D_menu_801AF3F0[0] + 16.0f, 1.0f, 1.0f);
for (i = 0; i < 2; i++) {
TextureRect_4bCI(&gMasterDisp, D_OPT_80006A0 + (256 * 16 * i) / 2, D_OPT_80017A0, 256, 16, D_menu_801AF3D0[1],
D_menu_801AF3F0[1] + (16 * i), 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_OPT_80006A0 + (256 * 16 * i) / 2, D_OPT_80017A0, 256, 16, D_menu_801AF3D0[1],
D_menu_801AF3F0[1] + (16 * i), 1.0f, 1.0f);
}
TextureRect_4bCI(&gMasterDisp, D_OPT_80006A0 + 256 * 32 / 2, D_OPT_80017A0, 256, 2, D_menu_801AF3D0[1],
D_menu_801AF3F0[1] + 32.0f, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_OPT_80006A0 + 256 * 32 / 2, D_OPT_80017A0, 256, 2, D_menu_801AF3D0[1],
D_menu_801AF3F0[1] + 32.0f, 1.0f, 1.0f);
for (i = 0; i < 4; i++) {
TextureRect_4bCI(&gMasterDisp, D_OPT_80017C0 + (256 * 16 * i) / 2, D_OPT_80038C0, 256, 16, D_menu_801AF3D0[2],
D_menu_801AF3F0[2] + (16 * i), 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_OPT_80017C0 + (256 * 16 * i) / 2, D_OPT_80038C0, 256, 16, D_menu_801AF3D0[2],
D_menu_801AF3F0[2] + (16 * i), 1.0f, 1.0f);
}
TextureRect_4bCI(&gMasterDisp, D_OPT_80017C0 + 256 * 16 * 4 / 2, D_OPT_80038C0, 256, 2, D_menu_801AF3D0[2],
D_menu_801AF3F0[2] + 64.0f, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, D_OPT_80017C0 + 256 * 16 * 4 / 2, D_OPT_80038C0, 256, 2, D_menu_801AF3D0[2],
D_menu_801AF3F0[2] + 64.0f, 1.0f, 1.0f);
RCP_SetupDL(&gMasterDisp, 0x4C);
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
for (i = 0; i < 30; i++) {
TextureRect_16bRGBA(&gMasterDisp, D_OPT_800E170 + (188 * 2 * i), 188, 2, D_menu_801AF3D0[3],
D_menu_801AF3F0[3] + (2.0f * i), 1.0f, 1.0f);
TextureRect_RGBA16(&gMasterDisp, D_OPT_800E170 + (188 * 2 * i), 188, 2, D_menu_801AF3D0[3],
D_menu_801AF3F0[3] + (2.0f * i), 1.0f, 1.0f);
}
gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 0, 0, 255);
@ -4459,8 +4457,8 @@ void Option_InvoiceDraw(void) {
if (D_menu_801B9090) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 120, 0, 0, 192);
for (i = 0; i < 3; i++) {
TextureRect_8bIA(&gMasterDisp, D_OPT_800D1F0 + (80 * 16 * i), 80, 16, D_menu_801AF3D0[5],
D_menu_801AF3F0[5] + (16.0f * i), 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, D_OPT_800D1F0 + (80 * 16 * i), 80, 16, D_menu_801AF3D0[5],
D_menu_801AF3F0[5] + (16.0f * i), 1.0f, 1.0f);
}
}

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

@ -399,7 +399,7 @@ void Title_80187CA8(void) {
s32 temp = 20;
s32 temp2 = 36;
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
@ -407,14 +407,14 @@ void Title_80187CA8(void) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_8bIA(&gMasterDisp, aSmallText_6, 16, 8, 148.0f, temp, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, aSmallText_4, 16, 8, 164, temp, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, aSmallText_6, 16, 8, 148.0f, temp, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, aSmallText_4, 16, 8, 164, temp, 1.0f, 1.0f);
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_8bIA(&gMasterDisp, &aTextKanjiCOMPLETE[48 * 6], 16, 2, 36, 32, 15.2f, 1.0f);
TextureRect_IA8(&gMasterDisp, &aTextKanjiCOMPLETE[48 * 6], 16, 2, 36, 32, 15.2f, 1.0f);
Title_80187E28();
}
@ -422,7 +422,7 @@ void Title_80187E28(void) {
s32 temp;
s32 i;
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
@ -2238,7 +2238,7 @@ void Title_8018D2B8(s32 arg0) {
Lights_SetOneLight(&gMasterDisp, D_menu_801B82E0, D_menu_801B82E4, D_menu_801B82E8, gLight1R, gLight1G, gLight1B,
gAmbientR, gAmbientG, gAmbientB);
RCP_SetupDL(&gMasterDisp, 0x17);
RCP_SetupDL(&gMasterDisp, SETUPDL_23);
Matrix_Push(&gGfxMatrix);
@ -2291,7 +2291,7 @@ void Title_8018D510(s32 arg0) {
f32 var_fa0;
f32 temp;
RCP_SetupDL(&gMasterDisp, 0x43);
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
if (D_menu_801B84E8[arg0].unk_40 == 1) {
@ -2378,7 +2378,7 @@ void Title_8018D80C(s32 arg0) {
temp = sqrtf(SQ(gCsCamEyeZ - D_menu_801B84E8[arg0].unk_00.z) + SQ(gCsCamEyeX - D_menu_801B84E8[arg0].unk_00.x));
sp70 = Math_Atan2F(gCsCamEyeY - D_menu_801B84E8[arg0].unk_00.y, temp);
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
gDPSetPrimColor(gMasterDisp++, 0, 0, 253, 253, 255, 255);
gDPSetEnvColor(gMasterDisp++, 251, 251, 255, 255);
@ -2430,7 +2430,7 @@ void Title_8018DF0C(f32 arg0) {
f32 sp30;
Title_80191798(&sp34, &sp30);
RCP_SetupDL(&gMasterDisp, 0x35);
RCP_SetupDL(&gMasterDisp, SETUPDL_53);
if (arg0 != 0.0f) {
D_menu_801B8688.pos.z = gCsCamEyeZ - arg0;
@ -2463,7 +2463,7 @@ void Title_8018E058(void) {
Matrix_Scale(gGfxMatrix, D_menu_801B8658.scale, D_menu_801B8658.scale, D_menu_801B8658.scale, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x17);
RCP_SetupDL(&gMasterDisp, SETUPDL_23);
gGreatFoxIntact = true;
@ -2521,7 +2521,7 @@ void Title_8018E200(void) {
}
}
RCP_SetupDL(&gMasterDisp, 0x31);
RCP_SetupDL(&gMasterDisp, SETUPDL_49);
for (i = 0; i < D_menu_801B7C98; i++) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 200, 200, D_menu_801B7CC8[i]);
@ -2614,7 +2614,7 @@ void Title_8018EA78(s32 arg0) {
sp44 = D_menu_801B8350[arg0].unk_58 % Animation_GetFrameCount(D_menu_801ADA00[arg0].unk_4);
RCP_SetupDL(&gMasterDisp, 0x17);
RCP_SetupDL(&gMasterDisp, SETUPDL_23);
Lights_SetOneLight(&gMasterDisp, D_menu_801B82E0, D_menu_801B82E4, D_menu_801B82E8, gLight1R, gLight1G, gLight1B,
gAmbientR, gAmbientG, gAmbientB);
@ -2815,17 +2815,17 @@ void Title_8018F438(void) {
void Title_8018F680(void) {
s32 i;
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
for (i = 0; i < 30; i++) {
TextureRect_16bRGBA(&gMasterDisp, gTitleStarfoxLogo + (236 * 2 * i), 236, 2, D_menu_801B9054,
D_menu_801B9058 + (i * 2.0f), 1.0f, 1.0f);
TextureRect_RGBA16(&gMasterDisp, gTitleStarfoxLogo + (236 * 2 * i), 236, 2, D_menu_801B9054,
D_menu_801B9058 + (i * 2.0f), 1.0f, 1.0f);
}
}
void Title_8018F77C(void) {
RCP_SetupDL(&gMasterDisp, 0x35);
RCP_SetupDL(&gMasterDisp, SETUPDL_53);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, D_menu_801B905C, D_menu_801B9060, D_menu_801B9064, MTXF_APPLY);
Matrix_Scale(gGfxMatrix, D_menu_801B9068, D_menu_801B906C, 1.0f, MTXF_APPLY);
@ -2836,9 +2836,9 @@ void Title_8018F77C(void) {
}
void Title_8018F85C(void) {
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_8bIA(&gMasterDisp, gTitleCopyrightSymbol, 16, 16, 234.0f, 20.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, gTitleCopyrightSymbol, 16, 16, 234.0f, 20.0f, 1.0f, 1.0f);
}
void Title_8018F8E4(void) {
@ -2863,29 +2863,29 @@ void Title_8018F8E4(void) {
}
if (gMainController < 0) {
RCP_SetupDL(&gMasterDisp, 0x55);
RCP_SetupDL(&gMasterDisp, SETUPDL_85);
gDPSetPrimColor(gMasterDisp++, 0, 0, 60, 60, 255, 200);
TextureRect_8bCI(&gMasterDisp, D_TITLE_601D750, D_TITLE_601DB50, 32, 32, D_menu_801AE464, D_menu_801AE468,
D_menu_801AE46C, D_menu_801AE470);
RCP_SetupDL(&gMasterDisp, 0x53);
TextureRect_CI8(&gMasterDisp, D_TITLE_601D750, D_TITLE_601DB50, 32, 32, D_menu_801AE464, D_menu_801AE468,
D_menu_801AE46C, D_menu_801AE470);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, (s32) D_menu_801B7BC8, (s32) D_menu_801B7BC8, 255);
for (i = 0; i < 6; i++) {
TextureRect_8bIA(&gMasterDisp, gTitleNoController + (176 * 4 * i), 176, 4, D_menu_801AE474,
D_menu_801AE478 + (i * 4.0f), 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, gTitleNoController + (176 * 4 * i), 176, 4, D_menu_801AE474,
D_menu_801AE478 + (i * 4.0f), 1.0f, 1.0f);
}
} else {
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, (s32) D_menu_801B7BC8, (s32) D_menu_801B7BC8, 255);
for (i = 0; i < 2; i++) {
TextureRect_8bIA(&gMasterDisp, gTitlePressStart + (120 * 6 * i), 120, 6, 101.0f, temp2 + (i * 6.0f),
1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, gTitlePressStart + (120 * 6 * i), 120, 6, 101.0f, temp2 + (i * 6.0f),
1.0f, 1.0f);
}
TextureRect_8bIA(&gMasterDisp, gTitlePressStart + 120 * 6 * 2, 120, 1, 101.0f, temp2 + 12, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, gTitlePressStart + 120 * 6 * 2, 120, 1, 101.0f, temp2 + 12, 1.0f, 1.0f);
}
}
}
@ -2893,12 +2893,12 @@ void Title_8018F8E4(void) {
void Title_8018FC14(void) {
s32 i;
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
for (i = 0; i < 2; i++) {
TextureRect_8bIA(&gMasterDisp, gTitleNintendoCopyright + (120 * 6 * i), 120, 6, 102.0f, 209.0f + (i * 6.0f),
1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, gTitleNintendoCopyright + (120 * 6 * i), 120, 6, 102.0f, 209.0f + (i * 6.0f),
1.0f, 1.0f);
}
}
@ -2914,33 +2914,33 @@ void Title_8018FD08(void) {
temp_fs2 = D_menu_801AE47C[D_menu_801B8340];
temp = 210.0f;
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
switch (D_menu_801B8340) {
case 0:
TextureRect_8bIA(&gMasterDisp, gTitleSlippyCard, 144, 13, temp_fs2, temp, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, gTitleSlippyCard, 144, 13, temp_fs2, temp, 1.0f, 1.0f);
break;
case 1:
TextureRect_8bIA(&gMasterDisp, gTitlePeppyCard, 120, 13, temp_fs2, temp, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, gTitlePeppyCard, 120, 13, temp_fs2, temp, 1.0f, 1.0f);
break;
case 2:
for (i = 0; i < 3; i++) {
TextureRect_8bIA(&gMasterDisp, gTitleFalcoCard + (176 * 4 * i), 176, 4, temp_fs2, temp + (i * 4), 1.0f,
1.0f);
TextureRect_IA8(&gMasterDisp, gTitleFalcoCard + (176 * 4 * i), 176, 4, temp_fs2, temp + (i * 4), 1.0f,
1.0f);
}
TextureRect_8bIA(&gMasterDisp, gTitleFalcoCard + 176 * 4 * 3, 176, 1, temp_fs2, temp + 12.0f, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, gTitleFalcoCard + 176 * 4 * 3, 176, 1, temp_fs2, temp + 12.0f, 1.0f, 1.0f);
break;
case 3:
for (i = 0; i < 3; i++) {
TextureRect_8bIA(&gMasterDisp, gTitleFoxCard + (176 * 4 * i), 176, 4, temp_fs2, temp + (i * 4), 1.0f,
1.0f);
TextureRect_IA8(&gMasterDisp, gTitleFoxCard + (176 * 4 * i), 176, 4, temp_fs2, temp + (i * 4), 1.0f,
1.0f);
}
TextureRect_8bIA(&gMasterDisp, gTitleFoxCard + 176 * 4 * 3, 176, 1, temp_fs2, temp + 12, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, gTitleFoxCard + 176 * 4 * 3, 176, 1, temp_fs2, temp + 12, 1.0f, 1.0f);
break;
}
}
@ -2976,14 +2976,14 @@ void Title_8018FF74(void) {
D_menu_801B7BD0 -= 2;
}
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetAlphaDither(gMasterDisp++, G_AD_NOISE);
gDPSetColorDither(gMasterDisp++, G_CD_NOISE);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_menu_801B7BD0);
TextureRect_16bRGBA(&gMasterDisp, gTitleSunBeam, 32, 32, D_menu_801B9080, D_menu_801B9084, D_menu_801B7BB0,
D_menu_801B7BB4);
TextureRect_RGBA16(&gMasterDisp, gTitleSunBeam, 32, 32, D_menu_801B9080, D_menu_801B9084, D_menu_801B7BB0,
D_menu_801B7BB4);
D_menu_801B9080 += 1.66f;
}
@ -3018,7 +3018,7 @@ void Title_80190144(void) {
}
if (gFillScreenAlpha > 0) {
RCP_SetupDL(&gMasterDisp, 0x3E);
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetAlphaDither(gMasterDisp++, G_AD_NOISE);
gDPSetColorDither(gMasterDisp++, G_CD_NOISE);
@ -3049,7 +3049,7 @@ void Title_801903B8(void) {
f32 temp;
s32 i;
RCP_SetupDL(&gMasterDisp, 0x3E);
RCP_SetupDL(&gMasterDisp, SETUPDL_62);
gDPSetAlphaDither(gMasterDisp++, G_AD_NOISE);
gDPSetColorDither(gMasterDisp++, G_CD_NOISE);
@ -3096,24 +3096,24 @@ void Title_801906A0(void) {
switch (D_menu_801B7BD4) {
case 0:
RCP_SetupDL(&gMasterDisp, 0x55);
RCP_SetupDL(&gMasterDisp, SETUPDL_85);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) D_menu_801B7BDC);
TextureRect_4bCI(&gMasterDisp, gTextIntroStarfox, gTextIntroStarfoxPalette, 256, 13, 90.0f, 110.0f, 1.0f,
1.0f);
TextureRect_CI4(&gMasterDisp, gTextIntroStarfox, gTextIntroStarfoxPalette, 256, 13, 90.0f, 110.0f, 1.0f,
1.0f);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) D_menu_801B7BE0);
TextureRect_4bCI(&gMasterDisp, gTextIntroIn, gTextIntroInPalette, 32, 13, 150.0f, 110.0f, 1.0f, 1.0f);
TextureRect_CI4(&gMasterDisp, gTextIntroIn, gTextIntroInPalette, 32, 13, 150.0f, 110.0f, 1.0f, 1.0f);
break;
case 1:
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) D_menu_801B7BDC);
for (i = 0; i < 5; i++) {
TextureRect_16bRGBA(&gMasterDisp, gTitleNintendo64Logo + (128 * 16 * i), 128, 16, D_menu_801B9070,
D_menu_801B9074 + (16 * i * D_menu_801B907C), D_menu_801B9078, D_menu_801B907C);
TextureRect_RGBA16(&gMasterDisp, gTitleNintendo64Logo + (128 * 16 * i), 128, 16, D_menu_801B9070,
D_menu_801B9074 + (16 * i * D_menu_801B907C), D_menu_801B9078, D_menu_801B907C);
}
TextureRect_16bRGBA(&gMasterDisp, gTitleNintendo64Logo + (128 * 16 * 5), 128, 8, D_menu_801B9070,
(80.0f * D_menu_801B907C) + D_menu_801B9074, D_menu_801B9078, D_menu_801B907C);
TextureRect_RGBA16(&gMasterDisp, gTitleNintendo64Logo + (128 * 16 * 5), 128, 8, D_menu_801B9070,
(80.0f * D_menu_801B907C) + D_menu_801B9074, D_menu_801B9078, D_menu_801B907C);
case -1:
break;
@ -3123,7 +3123,7 @@ void Title_801906A0(void) {
void Title_80190950(void) {
Lights_SetOneLight(&gMasterDisp, D_menu_801B82E0, D_menu_801B82E4, D_menu_801B82E8, 0, 0, 0, gAmbientR, gAmbientG,
gAmbientB);
RCP_SetupDL(&gMasterDisp, 0x17);
RCP_SetupDL(&gMasterDisp, SETUPDL_23);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, D_menu_801B9048, D_menu_801B904C, MTXF_APPLY);
@ -3149,7 +3149,7 @@ void Title_80190A98(void) {
void Title_80190B30(s32 arg0) {
Lights_SetOneLight(&gMasterDisp, D_menu_801B82E0, D_menu_801B82E4, D_menu_801B82E8, gLight1R, gLight1G, gLight1B,
gAmbientR, gAmbientG, gAmbientB);
RCP_SetupDL(&gMasterDisp, 0x17);
RCP_SetupDL(&gMasterDisp, SETUPDL_23);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, D_menu_801B84E8[arg0].unk_00.x, -12.8f, D_menu_801B9044, MTXF_APPLY);
@ -3173,21 +3173,21 @@ void Title_80190C9C(void) {
break;
case 1:
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_8bIA(&gMasterDisp, gTitleGreatFoxCard, 144, 28, D_menu_801AE55C, D_menu_801AE560, 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, gTitleGreatFoxCard, 144, 28, D_menu_801AE55C, D_menu_801AE560, 1.0f, 1.0f);
break;
case 2:
RCP_SetupDL(&gMasterDisp, 0x53);
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
for (i = 0; i < 4; i++) {
TextureRect_8bIA(&gMasterDisp, gTitleArwingCard + (112 * 6 * i), 112, 6, D_menu_801AE564,
D_menu_801AE568 + (6.0f * i), 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, gTitleArwingCard + (112 * 6 * i), 112, 6, D_menu_801AE564,
D_menu_801AE568 + (6.0f * i), 1.0f, 1.0f);
}
TextureRect_8bIA(&gMasterDisp, gTitleArwingCard + (112 * 6 * 4), 112, 2, D_menu_801AE564,
D_menu_801AE568 + (6.0f * 4), 1.0f, 1.0f);
TextureRect_IA8(&gMasterDisp, gTitleArwingCard + (112 * 6 * 4), 112, 2, D_menu_801AE564,
D_menu_801AE568 + (6.0f * 4), 1.0f, 1.0f);
}
}

3
srcjp/1FA60.c
View File

@ -1,3 +0,0 @@
#include "common.h"
#pragma GLOBAL_ASM("asm/jp/rev0/nonmatchings/1FA60/func_8001EF40.s")

86
srcjp/dmatable.c Normal file
View File

@ -0,0 +1,86 @@
#include "sf64dma.h"
#define DMA_ENTRY(file) \
{ file##_ROM_START, { file##_ROM_START, file##_ROM_END }, false }
#define DMA_ENTRY_NONE \
{ NULL, { NULL, NULL }, false }
DmaEntry gDmaTable[89] = {
{ SEGMENT_ROM_START(makerom), { SEGMENT_ROM_START(makerom), SEGMENT_ROM_END(makerom) }, false },
{ SEGMENT_ROM_START(main), { SEGMENT_ROM_START(main), SEGMENT_ROM_END(main) }, false },
{ SEGMENT_ROM_START(dma_table), { SEGMENT_ROM_START(dma_table), SEGMENT_ROM_END(dma_table) }, false },
{ SEGMENT_ROM_START(audio_seq), { SEGMENT_ROM_START(audio_seq), SEGMENT_ROM_END(audio_seq) }, false },
{ SEGMENT_ROM_START(audio_bank), { SEGMENT_ROM_START(audio_bank), SEGMENT_ROM_END(audio_bank) }, false },
{ SEGMENT_ROM_START(audio_table), { SEGMENT_ROM_START(audio_table), SEGMENT_ROM_END(audio_table) }, false },
{ SEGMENT_ROM_START(ast_common), { SEGMENT_ROM_START(ast_common), SEGMENT_ROM_END(ast_common) }, false },
{ SEGMENT_ROM_START(ast_bg_space), { SEGMENT_ROM_START(ast_bg_space), SEGMENT_ROM_END(ast_bg_space) }, false },
{ SEGMENT_ROM_START(ast_bg_planet), { SEGMENT_ROM_START(ast_bg_planet), SEGMENT_ROM_END(ast_bg_planet) }, false },
{ SEGMENT_ROM_START(ast_arwing), { SEGMENT_ROM_START(ast_arwing), SEGMENT_ROM_END(ast_arwing) }, false },
{ SEGMENT_ROM_START(ast_landmaster),
{ SEGMENT_ROM_START(ast_landmaster), SEGMENT_ROM_END(ast_landmaster) },
false },
{ SEGMENT_ROM_START(ast_blue_marine),
{ SEGMENT_ROM_START(ast_blue_marine), SEGMENT_ROM_END(ast_blue_marine) },
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 },
{ SEGMENT_ROM_START(ast_enmy_space),
{ SEGMENT_ROM_START(ast_enmy_space), SEGMENT_ROM_END(ast_enmy_space) },
false },
{ SEGMENT_ROM_START(ast_great_fox), { SEGMENT_ROM_START(ast_great_fox), SEGMENT_ROM_END(ast_great_fox) }, false },
{ SEGMENT_ROM_START(ast_star_wolf), { SEGMENT_ROM_START(ast_star_wolf), SEGMENT_ROM_END(ast_star_wolf) }, false },
{ SEGMENT_ROM_START(ast_allies), { SEGMENT_ROM_START(ast_allies), SEGMENT_ROM_END(ast_allies) }, false },
{ SEGMENT_ROM_START(ast_corneria), { SEGMENT_ROM_START(ast_corneria), SEGMENT_ROM_END(ast_corneria) }, false },
{ SEGMENT_ROM_START(ast_meteo), { SEGMENT_ROM_START(ast_meteo), SEGMENT_ROM_END(ast_meteo) }, false },
{ SEGMENT_ROM_START(ast_titania), { SEGMENT_ROM_START(ast_titania), SEGMENT_ROM_END(ast_titania) }, false },
{ SEGMENT_ROM_START(ast_7_ti_2), { SEGMENT_ROM_START(ast_7_ti_2), SEGMENT_ROM_END(ast_7_ti_2) }, false },
{ SEGMENT_ROM_START(ast_8_ti), { SEGMENT_ROM_START(ast_8_ti), SEGMENT_ROM_END(ast_8_ti) }, false },
{ SEGMENT_ROM_START(ast_9_ti), { SEGMENT_ROM_START(ast_9_ti), SEGMENT_ROM_END(ast_9_ti) }, false },
{ SEGMENT_ROM_START(ast_A_ti), { SEGMENT_ROM_START(ast_A_ti), SEGMENT_ROM_END(ast_A_ti) }, false },
{ SEGMENT_ROM_START(ast_7_ti_1), { SEGMENT_ROM_START(ast_7_ti_1), SEGMENT_ROM_END(ast_7_ti_1) }, false },
{ SEGMENT_ROM_START(ast_sector_x), { SEGMENT_ROM_START(ast_sector_x), SEGMENT_ROM_END(ast_sector_x) }, false },
{ SEGMENT_ROM_START(ast_sector_z), { SEGMENT_ROM_START(ast_sector_z), SEGMENT_ROM_END(ast_sector_z) }, false },
{ SEGMENT_ROM_START(ast_aquas), { SEGMENT_ROM_START(ast_aquas), SEGMENT_ROM_END(ast_aquas) }, false },
{ SEGMENT_ROM_START(ast_area_6), { SEGMENT_ROM_START(ast_area_6), SEGMENT_ROM_END(ast_area_6) }, false },
{ SEGMENT_ROM_START(ast_venom_1), { SEGMENT_ROM_START(ast_venom_1), SEGMENT_ROM_END(ast_venom_1) }, false },
{ SEGMENT_ROM_START(ast_venom_2), { SEGMENT_ROM_START(ast_venom_2), SEGMENT_ROM_END(ast_venom_2) }, false },
{ SEGMENT_ROM_START(ast_ve1_boss), { SEGMENT_ROM_START(ast_ve1_boss), SEGMENT_ROM_END(ast_ve1_boss) }, false },
{ SEGMENT_ROM_START(ast_bolse), { SEGMENT_ROM_START(ast_bolse), SEGMENT_ROM_END(ast_bolse) }, false },
{ SEGMENT_ROM_START(ast_fortuna), { SEGMENT_ROM_START(ast_fortuna), SEGMENT_ROM_END(ast_fortuna) }, false },
{ SEGMENT_ROM_START(ast_sector_y), { SEGMENT_ROM_START(ast_sector_y), SEGMENT_ROM_END(ast_sector_y) }, false },
{ SEGMENT_ROM_START(ast_solar), { SEGMENT_ROM_START(ast_solar), SEGMENT_ROM_END(ast_solar) }, false },
{ SEGMENT_ROM_START(ast_zoness), { SEGMENT_ROM_START(ast_zoness), SEGMENT_ROM_END(ast_zoness) }, false },
{ SEGMENT_ROM_START(ast_katina), { SEGMENT_ROM_START(ast_katina), SEGMENT_ROM_END(ast_katina) }, false },
{ SEGMENT_ROM_START(ast_macbeth), { SEGMENT_ROM_START(ast_macbeth), SEGMENT_ROM_END(ast_macbeth) }, false },
{ SEGMENT_ROM_START(ast_warp_zone), { SEGMENT_ROM_START(ast_warp_zone), SEGMENT_ROM_END(ast_warp_zone) }, false },
{ 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_vs_menu), { SEGMENT_ROM_START(ast_vs_menu), SEGMENT_ROM_END(ast_vs_menu) }, false },
{ SEGMENT_ROM_START(ast_text), { SEGMENT_ROM_START(ast_text), SEGMENT_ROM_END(ast_text) }, 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 },
{ SEGMENT_ROM_START(ast_logo), { SEGMENT_ROM_START(ast_logo), SEGMENT_ROM_END(ast_logo) }, false },
{ SEGMENT_ROM_START(ast_ending), { SEGMENT_ROM_START(ast_ending), SEGMENT_ROM_END(ast_ending) }, false },
{ SEGMENT_ROM_START(ast_ending_award_front),
{ SEGMENT_ROM_START(ast_ending_award_front), SEGMENT_ROM_END(ast_ending_award_front) },
false },
{ SEGMENT_ROM_START(ast_ending_award_back),
{ SEGMENT_ROM_START(ast_ending_award_back), SEGMENT_ROM_END(ast_ending_award_back) },
false },
{ SEGMENT_ROM_START(ast_ending_expert),
{ SEGMENT_ROM_START(ast_ending_expert), SEGMENT_ROM_END(ast_ending_expert) },
false },
{ SEGMENT_ROM_START(ast_training), { SEGMENT_ROM_START(ast_training), SEGMENT_ROM_END(ast_training) }, false },
{ SEGMENT_ROM_START(ovl_i1), { SEGMENT_ROM_START(ovl_i1), SEGMENT_ROM_END(ovl_i1) }, false },
{ SEGMENT_ROM_START(ovl_i2), { SEGMENT_ROM_START(ovl_i2), SEGMENT_ROM_END(ovl_i2) }, false },
{ SEGMENT_ROM_START(ovl_i3), { SEGMENT_ROM_START(ovl_i3), SEGMENT_ROM_END(ovl_i3) }, false },
{ SEGMENT_ROM_START(ovl_i4), { SEGMENT_ROM_START(ovl_i4), SEGMENT_ROM_END(ovl_i4) }, false },
{ SEGMENT_ROM_START(ovl_i5), { SEGMENT_ROM_START(ovl_i5), SEGMENT_ROM_END(ovl_i5) }, false },
{ SEGMENT_ROM_START(ovl_i6), { SEGMENT_ROM_START(ovl_i6), SEGMENT_ROM_END(ovl_i6) }, false },
{ SEGMENT_ROM_START(ovl_menu), { SEGMENT_ROM_START(ovl_menu), SEGMENT_ROM_END(ovl_menu) }, false },
{ SEGMENT_ROM_START(ovl_ending), { SEGMENT_ROM_START(ovl_ending), SEGMENT_ROM_END(ovl_ending) }, false },
{ SEGMENT_ROM_START(ovl_unused), { SEGMENT_ROM_START(ovl_unused), SEGMENT_ROM_END(ovl_unused) }, false },
};

4
srcjp/driverominit.c Normal file
View File

@ -0,0 +1,4 @@
#include "sys.h"
OSPiHandle* osDriveRomInit(void) {
}

25
srcjp/engine/fox_load.c
View File

@ -1,4 +1,27 @@
#include "common.h"
#include "sf64dma.h"
u8 sFillTimer = 3;
#include "fox_load_inits.c"
Scene sCurrentScene = {
NO_OVERLAY,
{ /* 0x1 */ NO_SEGMENT,
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ NO_SEGMENT,
/* 0x4 */ NO_SEGMENT,
/* 0x5 */ NO_SEGMENT,
/* 0x6 */ NO_SEGMENT,
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT },
};
#pragma GLOBAL_ASM("asm/jp/rev0/nonmatchings/engine/fox_load/func_800559D0.s")

810
srcjp/engine/fox_load_inits.c Normal file
View File

@ -0,0 +1,810 @@
#include "sf64dma.h"
#define NO_SEGMENT \
{ NULL, NULL }
#define OVERLAY_OFFSETS(file) \
{ \
{ SEGMENT_ROM_START(file), SEGMENT_ROM_END(file) }, { SEGMENT_BSS_START(file), SEGMENT_BSS_END(file) }, \
{ SEGMENT_TEXT_START(file), SEGMENT_TEXT_END(file) }, { \
SEGMENT_DATA_START(file), SEGMENT_RODATA_END(file) \
} \
}
#define NO_OVERLAY \
{ \
{ NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { \
NULL, NULL \
} \
}
#define ROM_SEGMENT(file) \
{ SEGMENT_ROM_START(file), SEGMENT_ROM_END(file) }
Scene sNoOvl_Logo[1] = {
{ NO_OVERLAY,
{ /* 0x1 */ NO_SEGMENT,
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ NO_SEGMENT,
/* 0x4 */ NO_SEGMENT,
/* 0x5 */ NO_SEGMENT,
/* 0x6 */ NO_SEGMENT,
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
/* 0xF */ ROM_SEGMENT(ast_logo) } },
};
Scene sOvlending_Ending[6] = {
{ OVERLAY_OFFSETS(ovl_ending),
{ /* 0x1 */ NO_SEGMENT,
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ NO_SEGMENT,
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ NO_SEGMENT,
/* 0x7 */ ROM_SEGMENT(ast_ending),
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ ROM_SEGMENT(ast_allies),
/* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
{ OVERLAY_OFFSETS(ovl_ending),
{ /* 0x1 */ NO_SEGMENT,
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ NO_SEGMENT,
/* 0x4 */ NO_SEGMENT,
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_title),
/* 0x7 */ ROM_SEGMENT(ast_ending),
/* 0x8 */ ROM_SEGMENT(ast_ending_award_front),
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
{ OVERLAY_OFFSETS(ovl_ending),
{ /* 0x1 */ NO_SEGMENT,
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ NO_SEGMENT,
/* 0x4 */ NO_SEGMENT,
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_title),
/* 0x7 */ ROM_SEGMENT(ast_ending),
/* 0x8 */ ROM_SEGMENT(ast_ending_award_back),
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
{ OVERLAY_OFFSETS(ovl_ending),
{ /* 0x1 */ NO_SEGMENT,
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ NO_SEGMENT,
/* 0x4 */ NO_SEGMENT,
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_title),
/* 0x7 */ ROM_SEGMENT(ast_ending),
/* 0x8 */ ROM_SEGMENT(ast_ending_expert),
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
{ OVERLAY_OFFSETS(ovl_ending),
{ /* 0x1 */ NO_SEGMENT,
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ NO_SEGMENT,
/* 0x4 */ NO_SEGMENT,
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_title),
/* 0x7 */ ROM_SEGMENT(ast_ending),
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
{ OVERLAY_OFFSETS(ovl_ending),
{ /* 0x1 */ NO_SEGMENT,
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ NO_SEGMENT,
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ NO_SEGMENT,
/* 0x7 */ ROM_SEGMENT(ast_ending),
/* 0x8 */ ROM_SEGMENT(ast_ending_expert),
/* 0x9 */ ROM_SEGMENT(ast_font_3d),
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
};
Scene sOvlmenu_Title[1] = {
{ OVERLAY_OFFSETS(ovl_menu),
{ /* 0x1 */ NO_SEGMENT,
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ NO_SEGMENT,
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_title),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
};
Scene sOvlmenu_Option[1] = {
{ OVERLAY_OFFSETS(ovl_menu),
{ /* 0x1 */ NO_SEGMENT,
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ NO_SEGMENT,
/* 0x4 */ NO_SEGMENT,
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_map),
/* 0x7 */ ROM_SEGMENT(ast_vs_menu),
/* 0x8 */ ROM_SEGMENT(ast_option),
/* 0x9 */ ROM_SEGMENT(ast_font_3d),
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
};
Scene sOvlmenu_Map[1] = {
{ OVERLAY_OFFSETS(ovl_menu),
{ /* 0x1 */ NO_SEGMENT,
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ NO_SEGMENT,
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_map),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ ROM_SEGMENT(ast_font_3d),
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
};
Scene sOvlmenu_GameOver[1] = {
{ OVERLAY_OFFSETS(ovl_menu),
{ /* 0x1 */ NO_SEGMENT,
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ NO_SEGMENT,
/* 0x4 */ NO_SEGMENT,
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ NO_SEGMENT,
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ ROM_SEGMENT(ast_andross),
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
};
Scene sOvli1_Corneria[1] = {
{ OVERLAY_OFFSETS(ovl_i1),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_corneria),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
};
Scene sOvli2_Meteo[2] = {
{ OVERLAY_OFFSETS(ovl_i2),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_space),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_space),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_meteo),
/* 0x7 */ ROM_SEGMENT(ast_warp_zone),
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
{ OVERLAY_OFFSETS(ovl_i2),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_space),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_space),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_meteo),
/* 0x7 */ ROM_SEGMENT(ast_warp_zone),
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
};
Scene sOvli5_Titania[6] = {
{ OVERLAY_OFFSETS(ovl_i5),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_landmaster),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_titania),
/* 0x7 */ ROM_SEGMENT(ast_7_ti_1),
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
{ OVERLAY_OFFSETS(ovl_i5),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_landmaster),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_titania),
/* 0x7 */ ROM_SEGMENT(ast_7_ti_2),
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
{ OVERLAY_OFFSETS(ovl_i5),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_landmaster),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_titania),
/* 0x7 */ ROM_SEGMENT(ast_7_ti_2),
/* 0x8 */ ROM_SEGMENT(ast_8_ti),
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
{ OVERLAY_OFFSETS(ovl_i5),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_landmaster),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_titania),
/* 0x7 */ ROM_SEGMENT(ast_7_ti_2),
/* 0x8 */ ROM_SEGMENT(ast_8_ti),
/* 0x9 */ ROM_SEGMENT(ast_9_ti),
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
{ OVERLAY_OFFSETS(ovl_i5),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_landmaster),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_titania),
/* 0x7 */ ROM_SEGMENT(ast_7_ti_2),
/* 0x8 */ ROM_SEGMENT(ast_8_ti),
/* 0x9 */ ROM_SEGMENT(ast_9_ti),
/* 0xA */ ROM_SEGMENT(ast_A_ti),
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
{ OVERLAY_OFFSETS(ovl_i5),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_landmaster),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_titania),
/* 0x7 */ ROM_SEGMENT(ast_7_ti_2),
/* 0x8 */ ROM_SEGMENT(ast_8_ti),
/* 0x9 */ ROM_SEGMENT(ast_9_ti),
/* 0xA */ ROM_SEGMENT(ast_A_ti),
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
};
Scene sOvli2_SectorX[2] = {
{ OVERLAY_OFFSETS(ovl_i2),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_space),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_space),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_sector_x),
/* 0x7 */ ROM_SEGMENT(ast_warp_zone),
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ ROM_SEGMENT(ast_allies),
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
{ OVERLAY_OFFSETS(ovl_i2),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_space),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_space),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_sector_x),
/* 0x7 */ ROM_SEGMENT(ast_warp_zone),
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ ROM_SEGMENT(ast_allies),
/* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
};
Scene sOvli4_SectorZ[1] = {
{ OVERLAY_OFFSETS(ovl_i4),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_space),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_space),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_sector_z),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ ROM_SEGMENT(ast_allies),
/* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
};
Scene sOvli3_Aquas[1] = {
{ OVERLAY_OFFSETS(ovl_i3),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_blue_marine),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_aquas),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
};
Scene sOvli3_Area6[1] = {
{ OVERLAY_OFFSETS(ovl_i3),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_space),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_space),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_area_6),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
};
Scene sOvli4_Fortuna[2] = {
{ OVERLAY_OFFSETS(ovl_i4),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_fortuna),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
/* 0xF */ ROM_SEGMENT(ast_star_wolf) } },
{ OVERLAY_OFFSETS(ovl_i4),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_fortuna),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
};
Scene sOvli3_Unk4[1] = {
{ OVERLAY_OFFSETS(ovl_i3),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_space),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_space),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_area_6),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
};
Scene sOvli6_SectorY[1] = {
{ OVERLAY_OFFSETS(ovl_i6),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_space),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_space),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_sector_y),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
};
Scene sOvli3_Solar[1] = {
{ OVERLAY_OFFSETS(ovl_i3),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_solar),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ ROM_SEGMENT(ast_allies),
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
};
Scene sOvli3_Zoness[1] = {
{ OVERLAY_OFFSETS(ovl_i3),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_zoness),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ ROM_SEGMENT(ast_allies),
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
};
Scene sOvli1_Venom1[1] = {
{ OVERLAY_OFFSETS(ovl_i1),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_venom_1),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ ROM_SEGMENT(ast_ve1_boss),
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ ROM_SEGMENT(ast_allies),
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
};
Scene sOvli6_Andross[1] = {
{ OVERLAY_OFFSETS(ovl_i6),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ NO_SEGMENT,
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_venom_2),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ ROM_SEGMENT(ast_andross),
/* 0xD */ ROM_SEGMENT(ast_allies),
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
};
Scene sOvli6_Venom2[2] = {
{ OVERLAY_OFFSETS(ovl_i6),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_venom_2),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
/* 0xF */ ROM_SEGMENT(ast_star_wolf) } },
{ OVERLAY_OFFSETS(ovl_i6),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_venom_2),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
};
Scene sOvli2_Setup20[1] = {
{ OVERLAY_OFFSETS(ovl_i2),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_ve1_boss),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
};
Scene sOvli4_Bolse[1] = {
{ OVERLAY_OFFSETS(ovl_i4),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_space),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_space),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_bolse),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
/* 0xF */ ROM_SEGMENT(ast_star_wolf) } },
};
Scene sOvli4_Katina[1] = {
{ OVERLAY_OFFSETS(ovl_i4),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_katina),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ ROM_SEGMENT(ast_allies),
/* 0xE */ NO_SEGMENT,
/* 0xF */ ROM_SEGMENT(ast_star_wolf) } },
};
Scene sOvli5_Macbeth[2] = {
{ OVERLAY_OFFSETS(ovl_i5),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_landmaster),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_macbeth),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ ROM_SEGMENT(ast_allies),
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
{ OVERLAY_OFFSETS(ovl_i5),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_landmaster),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_macbeth),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ ROM_SEGMENT(ast_great_fox),
/* 0xF */ NO_SEGMENT } },
};
Scene sOvli1_Training[1] = {
{ OVERLAY_OFFSETS(ovl_i1),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_arwing),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ ROM_SEGMENT(ast_training),
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
/* 0xF */ ROM_SEGMENT(ast_star_wolf) } },
};
Scene sOvli2_Versus[2] = {
{ OVERLAY_OFFSETS(ovl_i2),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_versus),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ NO_SEGMENT,
/* 0x7 */ ROM_SEGMENT(ast_vs_menu),
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
{ OVERLAY_OFFSETS(ovl_i2),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_space),
/* 0x3 */ ROM_SEGMENT(ast_versus),
/* 0x4 */ ROM_SEGMENT(ast_enmy_space),
/* 0x5 */ ROM_SEGMENT(ast_text),
/* 0x6 */ NO_SEGMENT,
/* 0x7 */ ROM_SEGMENT(ast_vs_menu),
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
};
Scene sOvlUnused_Unk[1] = {
{ OVERLAY_OFFSETS(ovl_unused),
{ /* 0x1 */ NO_SEGMENT,
/* 0x2 */ NO_SEGMENT,
/* 0x3 */ NO_SEGMENT,
/* 0x4 */ NO_SEGMENT,
/* 0x5 */ NO_SEGMENT,
/* 0x6 */ NO_SEGMENT,
/* 0x7 */ NO_SEGMENT,
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
/* 0xB */ NO_SEGMENT,
/* 0xC */ NO_SEGMENT,
/* 0xD */ NO_SEGMENT,
/* 0xE */ NO_SEGMENT,
/* 0xF */ NO_SEGMENT } },
};

6
yamls/jp/rev0/main.yaml
View File

@ -36,7 +36,7 @@
- [0x14BC0, c, audio/audio_seqplayer]
- [0x17770, c, audio/audio_general]
- [0x1EC30, c, audio/audio_thread]
- [0x1FB40, c, 1FA60]
- [0x1FB40, c, driverominit]
- [0x1FB50, hasm, mio0]
- [0x1FBF0, hasm, rdramcheck]
- [0x1FCA0, textbin, alt_ipl3]
@ -208,7 +208,7 @@
- [0xC76A0, data, engine/fox_tank]
- [0xC7700, data, engine/fox_demo]
- [0xC79C0, data, engine/fox_display]
- [0xC7B50, data, engine/fox_load]
- [0xC7B50, .data, engine/fox_load]
- [0xC9610, data, engine/fox_edata]
- [0xCD110, data, engine/fox_edisplay]
- [0xCD540, data, engine/fox_enmy]
@ -306,7 +306,7 @@
vram: 0x8017E210
follows_vram: main
subsegments:
- [0xE93C0, data, dmatable]
- [0xE93C0, .data, dmatable]
- name: buffers
exclusive_ram_id: buffer

2
yamls/us/rev1/main.yaml
View File

@ -38,7 +38,7 @@
- [0x17650, c, audio/audio_general]
- [0x1EB50, c, audio/audio_thread]
- [0x1FA60, c, 1FA60] # May be blanked out osDriveRomInit
- [0x1FA60, c, driverominit]
- [0x1FA70, hasm, mio0]
- [0x1FB10, hasm, rdramcheck]
- [0x1FBC0, textbin, alt_ipl3]