izzy/Starship
0
0
Fork 0
mirror of https://github.com/izzy2lost/Starship.git synced 2026-07-05 15:19:42 -07:00
Code Issues 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
parent 8045b688ac 2c98d106a1
commit 4317e2cd54
56 changed files with 2072 additions and 1158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vscode/settings.json
Vendored
+2 -1
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": ""
}
include/gfx.h
+17 -17
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);
include/sf64dma.h
+3 -1
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
include/sys.h
+1 -1
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);
linker_scripts/jp/rev0/symbol_addrs.txt
+39 -36
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
linker_scripts/jp/rev0/symbol_addrs_fix.txt
+7
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;
linker_scripts/jp/rev0/undefined_syms.ld
-5
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;
linker_scripts/us/rev1/symbol_addrs_engine.txt
+17 -17
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;
src/1FA60.c
-4
View File
@@ -1,4 +0,0 @@
#include "sys.h"
OSPiHandle* func_8001EE60(void) {
}
src/audio/audio_load.c
+1 -1
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;
src/driverominit.c
+4
View File
@@ -0,0 +1,4 @@
#include "sys.h"
OSPiHandle* osDriveRomInit(void) {
}
src/engine/fox_360.c
+6 -6
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) {
src/engine/fox_beam.c
+9 -9
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);
src/engine/fox_bg.c
+6 -6
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);
src/engine/fox_demo.c
+3 -3
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:
src/engine/fox_display.c
+22 -22
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);
src/engine/fox_edisplay.c
+34 -34
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);
src/engine/fox_effect.c
+65 -65
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);
}
src/engine/fox_enmy2.c
+11 -11
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);
src/engine/fox_game.c
+12 -12
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;

Some files were not shown because too many files have changed in this diff Show More