mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-07 14:50:15 +00:00
Code Issues Projects Releases Wiki Activity

Change Colors To Decimal (#260)

Browse source 
* fix colliderinit typo

* convert as many colors i can find to decimal

* fix GPACK_RGBA5551, merge fhgFire

* fix remaining colors

* remove unwanted file

* alpha as 1
This commit is contained in:
fig02 2020-07-16 21:37:53 -04:00 • committed by GitHub
parent bc14f6d93e
commit 24ab14f748
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
71 changed files with 771 additions and 743 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
View file

@ -34,8 +34,8 @@ Vec3f sUnusedVec1 = { 0.0f, 0.5f, 0.0f };
Vec3f sUnusedVec2 = { 0.0f, 0.5f, 0.0f };
Color_RGB8 sUnusedColors[] = {
{ 0xFF, 0xFF, 0x64 },
{ 0xFF, 0xFF, 0x32 },
{ 255, 255, 100 },
{ 255, 255, 50 },
};
Vec3f D_80865B70 = { 0.0f, 0.0f, 0.0f };

14
src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
View file

@ -50,7 +50,7 @@ void ArrowFire_Init(Actor* thisx, GlobalContext* globalCtx) {
this->unk_158 = 1.0f;
ArrowFire_SetupAction(&this->actor, ArrowFire_Charge);
Actor_SetScale(this, 0.01f);
this->alpha = 0xA0;
this->alpha = 160;
this->timer = 0;
this->unk_15C = 0.0f;
}
@ -84,7 +84,7 @@ void ArrowFire_Charge(ArrowFire* this, GlobalContext* globalCtx) {
this->unkPos = this->actor.posRot.pos;
this->radius = 10;
ArrowFire_SetupAction(this, ArrowFire_Fly);
this->alpha = 0xFF;
this->alpha = 255;
}
}
@ -170,9 +170,9 @@ void ArrowFire_Fly(ArrowFire* this, GlobalContext* globalCtx) {
Audio_PlayActorSound2(&this->actor, NA_SE_IT_EXPLOSION_FRAME);
ArrowFire_SetupAction(this, ArrowFire_Hit);
this->timer = 32;
this->alpha = 0xFF;
this->alpha = 255;
} else if (arrow->timer < 34) {
if (this->alpha < 0x23) {
if (this->alpha < 35) {
Actor_Kill(&this->actor);
} else {
this->alpha -= 0x19;
@ -218,7 +218,7 @@ void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx) {
// Draw red effect over the screen when arrow hits
if (this->unk_15C > 0) {
gfxCtx->polyXlu.p = func_800937C0(gfxCtx->polyXlu.p);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, (s32)(40.0f * this->unk_15C) & 0xFF, 0x00, 0x00,
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, (s32)(40.0f * this->unk_15C) & 0xFF, 0, 0,
(s32)(150.0f * this->unk_15C) & 0xFF);
gDPSetAlphaDither(gfxCtx->polyXlu.p++, G_AD_DISABLE);
gDPSetColorDither(gfxCtx->polyXlu.p++, G_CD_DISABLE);
@ -227,8 +227,8 @@ void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx) {
// Draw fire on the arrow
func_80093D84(globalCtx->state.gfxCtx);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0xFF, 0xC8, 0x00, this->alpha);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0xFF, 0x00, 0x00, 0x80);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 255, 200, 0, this->alpha);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 255, 0, 0, 128);
Matrix_RotateRPY(0x4000, 0x0, 0x0, MTXMODE_APPLY);
if (this->timer != 0) {
Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_APPLY);

12
src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
View file

@ -51,7 +51,7 @@ void ArrowIce_Init(Actor* thisx, GlobalContext* globalCtx) {
this->unk_160 = 1.0f;
ArrowIce_SetupAction(this, ArrowIce_Charge);
Actor_SetScale(&this->actor, 0.01f);
this->alpha = 0x64;
this->alpha = 100;
this->timer = 0;
this->unk_164 = 0.0f;
}
@ -85,7 +85,7 @@ void ArrowIce_Charge(ArrowIce* this, GlobalContext* globalCtx) {
this->unkPos = this->actor.posRot.pos;
this->radius = 10;
ArrowIce_SetupAction(this, ArrowIce_Fly);
this->alpha = 0xFF;
this->alpha = 255;
}
}
@ -171,9 +171,9 @@ void ArrowIce_Fly(ArrowIce* this, GlobalContext* globalCtx) {
Audio_PlayActorSound2(&this->actor, NA_SE_IT_EXPLOSION_ICE);
ArrowIce_SetupAction(this, ArrowIce_Hit);
this->timer = 32;
this->alpha = 0xFF;
this->alpha = 255;
} else if (arrow->timer < 34) {
if (this->alpha < 0x23) {
if (this->alpha < 35) {
Actor_Kill(&this->actor);
} else {
this->alpha -= 0x19;
@ -228,8 +228,8 @@ void ArrowIce_Draw(Actor* thisx, GlobalContext* globalCtx) {
// Draw ice on the arrow
func_80093D84(globalCtx->state.gfxCtx);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0xAA, 0xFF, 0xFF, this->alpha);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0xFF, 0x80);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 170, 255, 255, this->alpha);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0, 0, 255, 128);
Matrix_RotateRPY(0x4000, 0x0, 0x0, MTXMODE_APPLY);
if (this->timer != 0) {
Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_APPLY);

12
src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
View file

@ -51,7 +51,7 @@ void ArrowLight_Init(Actor* thisx, GlobalContext* globalCtx) {
this->unk_160 = 1.0f;
ArrowLight_SetupAction(this, ArrowLight_Charge);
Actor_SetScale(&this->actor, 0.01f);
this->alpha = 0x82;
this->alpha = 130;
this->timer = 0;
this->unk_164 = 0.0f;
}
@ -85,7 +85,7 @@ void ArrowLight_Charge(ArrowLight* this, GlobalContext* globalCtx) {
this->unkPos = this->actor.posRot.pos;
this->radius = 10;
ArrowLight_SetupAction(this, ArrowLight_Fly);
this->alpha = 0xFF;
this->alpha = 255;
}
}
@ -171,9 +171,9 @@ void ArrowLight_Fly(ArrowLight* this, GlobalContext* globalCtx) {
Audio_PlayActorSound2(&this->actor, NA_SE_IT_EXPLOSION_LIGHT);
ArrowLight_SetupAction(this, ArrowLight_Hit);
this->timer = 32;
this->alpha = 0xFF;
this->alpha = 255;
} else if (arrow->timer < 34) {
if (this->alpha < 0x23) {
if (this->alpha < 35) {
Actor_Kill(&this->actor);
} else {
this->alpha -= 0x19;
@ -228,8 +228,8 @@ void ArrowLight_Draw(Actor* thisx, GlobalContext* globalCtx) {
// Draw light on the arrow
func_80093D84(globalCtx->state.gfxCtx);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0xFF, 0xFF, 0xAA, this->alpha);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0xFF, 0xFF, 0x00, 0x80);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 255, 255, 170, this->alpha);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 255, 255, 0, 128);
Matrix_RotateRPY(0x4000, 0x0, 0x0, MTXMODE_APPLY);
if (this->timer != 0) {
Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_APPLY);

2
src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c
View file

@ -487,7 +487,7 @@ void BgHakaTrap_Draw(Actor* thisx, GlobalContext* globalCtx) {
static Gfx* sDLists[5] = {
0x06007610, 0x06009860, 0x06007EF0, 0x06008A20, 0x060072C0,
};
static Color_RGBA8 D_8088103C = { 0 };
static Color_RGBA8 D_8088103C = { 0, 0, 0, 0 };
BgHakaTrap* this = THIS;
s32 pad;
Vec3f sp2C;

4
src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c
View file

@ -201,8 +201,8 @@ void BgHidanFirewall_Draw(Actor* thisx, GlobalContext* globalCtx) {
gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0x14);
gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_80886D04[this->unk_150]));
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0x01, 0xFF, 0xFF, 0x00, 0x96);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0xFF, 0x00, 0x00, 0xFF);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0x01, 255, 255, 0, 150);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 255, 0, 0, 255);
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_firewall.c", 458),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfxCtx->polyXlu.p++, D_0600DA80);

64
src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c
View file

@ -72,38 +72,38 @@ void func_808AAD3C(GlobalContext* globalCtx, Vec3f* vec, u32 arg2) {
effect.gravity = -1.0f;
effect.uDiv = arg2;
effect.vDiv = arg2;
effect.colorStart[0].r = 0x00;
effect.colorStart[0].g = 0x00;
effect.colorStart[0].b = 0x00;
effect.colorStart[0].a = 0xFF;
effect.colorStart[1].r = 0x00;
effect.colorStart[1].g = 0x00;
effect.colorStart[1].b = 0x00;
effect.colorStart[1].a = 0xFF;
effect.colorStart[2].r = 0x00;
effect.colorStart[2].g = 0x00;
effect.colorStart[2].b = 0x00;
effect.colorStart[2].a = 0xFF;
effect.colorStart[3].r = 0x00;
effect.colorStart[3].g = 0x00;
effect.colorStart[3].b = 0x00;
effect.colorStart[3].a = 0xFF;
effect.colorEnd[0].r = 0x00;
effect.colorEnd[0].g = 0x00;
effect.colorEnd[0].b = 0x00;
effect.colorEnd[0].a = 0x00;
effect.colorEnd[1].r = 0x00;
effect.colorEnd[1].g = 0x00;
effect.colorEnd[1].b = 0x00;
effect.colorEnd[1].a = 0x00;
effect.colorEnd[2].r = 0x00;
effect.colorEnd[2].g = 0x00;
effect.colorEnd[2].b = 0x00;
effect.colorEnd[2].a = 0x00;
effect.colorEnd[3].r = 0x00;
effect.colorEnd[3].g = 0x00;
effect.colorEnd[3].b = 0x00;
effect.colorEnd[3].a = 0x00;
effect.colorStart[0].r = 0;
effect.colorStart[0].g = 0;
effect.colorStart[0].b = 0;
effect.colorStart[0].a = 255;
effect.colorStart[1].r = 0;
effect.colorStart[1].g = 0;
effect.colorStart[1].b = 0;
effect.colorStart[1].a = 255;
effect.colorStart[2].r = 0;
effect.colorStart[2].g = 0;
effect.colorStart[2].b = 0;
effect.colorStart[2].a = 255;
effect.colorStart[3].r = 0;
effect.colorStart[3].g = 0;
effect.colorStart[3].b = 0;
effect.colorStart[3].a = 255;
effect.colorEnd[0].r = 0;
effect.colorEnd[0].g = 0;
effect.colorEnd[0].b = 0;
effect.colorEnd[0].a = 0;
effect.colorEnd[1].r = 0;
effect.colorEnd[1].g = 0;
effect.colorEnd[1].b = 0;
effect.colorEnd[1].a = 0;
effect.colorEnd[2].r = 0;
effect.colorEnd[2].g = 0;
effect.colorEnd[2].b = 0;
effect.colorEnd[2].a = 0;
effect.colorEnd[3].r = 0;
effect.colorEnd[3].g = 0;
effect.colorEnd[3].b = 0;
effect.colorEnd[3].a = 0;
effect.timer = 0;
effect.duration = 32;

16
src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c
View file

@ -51,7 +51,7 @@ void BgSpot16Doughnut_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->actor, sInitChain);
Actor_SetScale(&this->actor, 0.1f);
this->fireFlag = 0;
this->envColorAlpha = 0xFF;
this->envColorAlpha = 255;
params = this->actor.params;
if (params == 1 || params == 2 || params == 3 || params == 4) {
Actor_SetScale(&this->actor, sScales[this->actor.params] * 1.0e-4f);
@ -91,10 +91,10 @@ void BgSpot16Doughnut_Update(Actor* thisx, GlobalContext* globalCtx) {
if (!(this->fireFlag & 1)) {
this->actor.shape.rot.y -= 0x20;
if (this->envColorAlpha < 0xFF) {
if (this->envColorAlpha < 255) {
this->envColorAlpha += 5;
} else {
this->envColorAlpha = 0xFF;
this->envColorAlpha = 255;
}
} else if (globalCtx->csCtx.state != 0 && globalCtx->csCtx.npcActions[2] != NULL &&
globalCtx->csCtx.npcActions[2]->action == 2) {
@ -137,11 +137,11 @@ void BgSpot16Doughnut_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPSegment(
gfxCtx->polyXlu.p++, 0x08,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * (-1), 0, 16, 32, 1, scroll, scroll * (-2), 16, 32));
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0xFF, 0x00, 0x00, this->envColorAlpha);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 255, 0, 0, this->envColorAlpha);
gSPDisplayList(gfxCtx->polyXlu.p++, D_06000660);
} else {
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0xFF, 0xFF, 0xFF, this->envColorAlpha);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 255, 255, 255, this->envColorAlpha);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 255, 255, 255, 255);
gSPDisplayList(gfxCtx->polyXlu.p++, D_06000FC0);
}
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 238);
@ -158,8 +158,8 @@ void BgSpot16Doughnut_DrawExpanding(Actor* thisx, GlobalContext* globalCtx) {
func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 248),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0xFF, 0xFF, 0xFF, this->envColorAlpha);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 255, 255, 255, this->envColorAlpha);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 255, 255, 255, 255);
gSPDisplayList(gfxCtx->polyXlu.p++, D_06000FC0);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 256);
}

6
src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c
View file

@ -225,7 +225,7 @@ void BgTreemouth_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgTreemouth_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
u16 alpha = 0x1F4;
u16 alpha = 500;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[4];
@ -234,7 +234,7 @@ void BgTreemouth_Draw(Actor* thisx, GlobalContext* globalCtx) {
if ((gSaveContext.sceneSetupIndex < 4) || LINK_IS_ADULT) {
if (gSaveContext.eventChkInf[0] & 0x80) {
alpha = 0x866;
alpha = 2150;
}
} else { // neeeded to match
}
@ -243,7 +243,7 @@ void BgTreemouth_Draw(Actor* thisx, GlobalContext* globalCtx) {
alpha = (globalCtx->unk_11D30[0] + 0x1F4);
}
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, alpha * 0.1f);
gDPSetEnvColor(gfxCtx->polyOpa.p++, 128, 128, 128, alpha * 0.1f);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_treemouth.c", 932),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfxCtx->polyOpa.p++, &D_060009D0);

30
src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
View file

@ -125,7 +125,7 @@ void func_8098E51C(DemoSa* this, s16 arg1) {
void func_8098E530(DemoSa* this) {
this->action = 7;
this->drawConfig = 0;
this->unk_1A4 = 0;
this->alpha = 0;
this->unk_1A8 = 0;
this->actor.shape.unk_14 = 0;
this->unk_1A0 = 0.0f;
@ -379,7 +379,7 @@ void func_8098EEA8(DemoSa* this, GlobalContext* globalCtx) {
if (func_8098E654(this, globalCtx, 4, 4)) {
this->action = 8;
this->drawConfig = 2;
this->unk_1A4 = 0;
this->alpha = 0;
this->actor.shape.unk_14 = 0;
this->unk_1A0 = 0.0f;
func_8098EE08();
@ -387,7 +387,7 @@ void func_8098EEA8(DemoSa* this, GlobalContext* globalCtx) {
}
void func_8098EEFC(DemoSa* this, GlobalContext* globalCtx) {
s32 alpha = 0xFF;
s32 alpha = 255;
f32* unk_1A0 = &this->unk_1A0;
if (func_8098E654(this, globalCtx, 4, 4)) {
@ -396,7 +396,7 @@ void func_8098EEFC(DemoSa* this, GlobalContext* globalCtx) {
this->action = 9;
this->drawConfig = 1;
*unk_1A0 = kREG(5) + 10.0f;
this->unk_1A4 = alpha;
this->alpha = alpha;
this->actor.shape.unk_14 = alpha;
return;
}
@ -406,12 +406,12 @@ void func_8098EEFC(DemoSa* this, GlobalContext* globalCtx) {
this->action = 7;
this->drawConfig = 0;
*unk_1A0 = 0.0f;
this->unk_1A4 = 0;
this->alpha = 0;
this->actor.shape.unk_14 = 0;
return;
}
}
this->actor.shape.unk_14 = this->unk_1A4 = (*unk_1A0 / (kREG(5) + 10.0f)) * 255.0f;
this->actor.shape.unk_14 = this->alpha = (*unk_1A0 / (kREG(5) + 10.0f)) * 255.0f;
}
void func_8098F050(DemoSa* this, GlobalContext* globalCtx) {
@ -419,7 +419,7 @@ void func_8098F050(DemoSa* this, GlobalContext* globalCtx) {
this->action = 8;
this->drawConfig = 2;
this->unk_1A0 = kREG(5) + 10.0f;
this->unk_1A4 = 0xFF;
this->alpha = 255;
if (this->unk_1A8 == 0) {
func_8098EE28(this, globalCtx);
this->unk_1A8 = 1;
@ -466,7 +466,7 @@ void func_8098F1C0(DemoSa* this, GlobalContext* globalCtx) {
gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sp78));
gSPSegment(gfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(sp78));
gSPSegment(gfxCtx->polyXlu.p++, 0x0A, SEGMENTED_TO_VIRTUAL(sp6C));
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0x00, this->unk_1A4);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0, 0, 0, this->alpha);
gSPSegment(gfxCtx->polyXlu.p++, 0x0C, D_80116280);
gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount,
@ -494,7 +494,7 @@ void func_8098F420(DemoSa* this, GlobalContext* globalCtx) {
}
void func_8098F480(DemoSa* this) {
s32 alpha = 0xFF;
s32 alpha = 255;
f32* unk_1A0 = &this->unk_1A0;
f32 temp_f0;
@ -502,9 +502,9 @@ void func_8098F480(DemoSa* this) {
temp_f0 = kREG(17) + 10.0f;
if (temp_f0 <= *unk_1A0) {
this->actor.shape.unk_14 = this->unk_1A4 = alpha;
this->actor.shape.unk_14 = this->alpha = alpha;
} else {
this->actor.shape.unk_14 = this->unk_1A4 = (*unk_1A0 / temp_f0) * 255.0f;
this->actor.shape.unk_14 = this->alpha = (*unk_1A0 / temp_f0) * 255.0f;
}
}
@ -614,7 +614,7 @@ void func_8098F83C(DemoSa* this, GlobalContext* globalCtx) {
}
void func_8098F8F8(DemoSa* this) {
s32 alpha = 0xFF;
s32 alpha = 255;
f32* unk_1A0 = &this->unk_1A0;
f32 temp_f0;
@ -622,9 +622,9 @@ void func_8098F8F8(DemoSa* this) {
temp_f0 = kREG(17) + 10.0f;
if (temp_f0 <= *unk_1A0) {
this->actor.shape.unk_14 = this->unk_1A4 = alpha;
this->actor.shape.unk_14 = this->alpha = alpha;
} else {
this->actor.shape.unk_14 = this->unk_1A4 = (*unk_1A0 / temp_f0) * 255.0f;
this->actor.shape.unk_14 = this->alpha = (*unk_1A0 / temp_f0) * 255.0f;
}
}
@ -805,7 +805,7 @@ void func_8098FEB4(DemoSa* this, GlobalContext* globalCtx) {
gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(sp70));
gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(sp70));
gSPSegment(gfxCtx->polyOpa.p++, 0x0A, SEGMENTED_TO_VIRTUAL(sp64));
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x00, 0x00, 0x00, 0xFF);
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0, 0, 0, 255);
gSPSegment(gfxCtx->polyOpa.p++, 0x0C, &D_80116280[2]);
SkelAnime_DrawSV(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount,

2
src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h
View file

@ -18,7 +18,7 @@ typedef struct DemoSa {
/* 0x0198 */ s32 action;
/* 0x019C */ s32 drawConfig;
/* 0x01A0 */ f32 unk_1A0;
/* 0x01A4 */ s32 unk_1A4;
/* 0x01A4 */ s32 alpha;
/* 0x01A8 */ s32 unk_1A8;
/* 0x01AC */ s32 unk_1AC;
/* 0x01B0 */ s32 unk_1B0;

2
src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h
View file

@ -9,7 +9,7 @@ struct DoorWarp1;
typedef struct DoorWarp1 {
/* 0x0000 */ Actor actor;
/* 0x014C */ char unk_14C[0x5C];
/* 0x01A8 */ f32 unk_1A8;
/* 0x01A8 */ f32 alpha;
/* 0x01AC */ char unk_1AC[0x40];
/* 0x01EC */ s32 unk_1EC;
} DoorWarp1; // size = 0x01F0

4
src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c
View file

@ -140,14 +140,14 @@ void func_809C2324(GlobalContext* globalCtx, Gfx* dList, s32 alpha) {
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_blkobj.c", 322);
if (alpha == 0xFF) {
if (alpha == 255) {
segment = D_809C2590;
} else {
segment = D_809C25A0;
}
gSPSegment(gfxCtx->polyXlu.p++, 0x08, segment);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0x00, alpha);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0, 0, 0, alpha);
gSPDisplayList(gfxCtx->polyXlu.p++, dList);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_blkobj.c", 330);

32
src/overlays/actors/ovl_En_Boom/z_en_boom.c
View file

@ -54,25 +54,25 @@ void EnBoom_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->actor, sInitChain);
trail.p1StartColor.r = 0xFF;
trail.p1StartColor.g = 0xFF;
trail.p1StartColor.b = 0x64;
trail.p1StartColor.a = 0xFF;
trail.p1StartColor.r = 255;
trail.p1StartColor.g = 255;
trail.p1StartColor.b = 100;
trail.p1StartColor.a = 255;
trail.p2StartColor.r = 0xFF;
trail.p2StartColor.g = 0xFF;
trail.p2StartColor.b = 0x64;
trail.p2StartColor.a = 0x40;
trail.p2StartColor.r = 255;
trail.p2StartColor.g = 255;
trail.p2StartColor.b = 100;
trail.p2StartColor.a = 64;
trail.p1EndColor.r = 0xFF;
trail.p1EndColor.g = 0xFF;
trail.p1EndColor.b = 0x64;
trail.p1EndColor.a = 0x00;
trail.p1EndColor.r = 255;
trail.p1EndColor.g = 255;
trail.p1EndColor.b = 100;
trail.p1EndColor.a = 0;
trail.p2EndColor.r = 0xFF;
trail.p2EndColor.g = 0xFF;
trail.p2EndColor.b = 0x64;
trail.p2EndColor.a = 0x00;
trail.p2EndColor.r = 255;
trail.p2EndColor.g = 255;
trail.p2EndColor.b = 100;
trail.p2EndColor.a = 0;
trail.elemDuration = 8;
trail.unkFlag = 0;

2
src/overlays/actors/ovl_En_Dog/z_en_dog.c
View file

@ -450,7 +450,7 @@ void EnDog_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
void EnDog_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnDog* this = THIS;
Color_RGBA8 colors[] = { { 0xFF, 0xFF, 0xC8, 0x00 }, { 0x96, 0x64, 0x32, 0x00 } };
Color_RGBA8 colors[] = { { 255, 255, 200, 0 }, { 150, 100, 50, 0 } };
GraphicsContext* gfxCtx;
Gfx* dispRefs[4];

21
src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c
View file

@ -217,8 +217,8 @@ void func_80A0F6F8(EnFhgFire* this, GlobalContext* globalCtx) {
for (i = 0; i < 8; i++) {
Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_FHG_FIRE,
this->actor.posRot.pos.x, this->actor.posRot.pos.y,
this->actor.posRot.pos.z, 0, (i * 8192) + randY, 0x4000, i + 0x64);
this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0,
(i * 8192) + randY, 0x4000, i + 0x64);
}
for (i = 0; i < 8; i++) {
@ -472,8 +472,8 @@ void EnFhgFire_Draw(Actor* thisx, GlobalContext* globalCtx) {
Graph_OpenDisps(dispRefs, gfxCtx, "../z_en_fhg_fire.c", 1723);
if (thisx->params == 0x24) {
func_80093D84(globalCtx->state.gfxCtx);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 0xFF, 0xFF, 0xFF, (s32)this->unk_160 & 0xFF);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0xA5, 0xFF, 0x4B, 0x00);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 255, 255, 255, (s32)this->unk_160 & 0xFF);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 165, 255, 75, 0);
gDPPipeSync(gfxCtx->polyXlu.p++);
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1745),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@ -486,9 +486,9 @@ void EnFhgFire_Draw(Actor* thisx, GlobalContext* globalCtx) {
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 0xFF, 0xFF, 0xFF, (s32)this->unk_160 & 0xFF);
if (this->fireMode > 0) {
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0xFF, 0xFF, 0x00);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0, 255, 255, 0);
} else {
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0xA5, 0xFF, 0x4B, 0x00);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 165, 255, 75, 0);
}
gDPPipeSync(gfxCtx->polyXlu.p++);
@ -500,9 +500,8 @@ void EnFhgFire_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(gfxCtx->polyXlu.p++, D_06012160);
} else if ((thisx->params == 0x27) || (thisx->params == 0x28) || (thisx->params == 0x29)) {
func_80093D84(globalCtx->state.gfxCtx);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 0, 0, 0,
((u32)this->unk_188 & 0xFF)); // sic u32
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x5A, 0x32, 0x5F, (s32)(this->unk_188 * 0.5f));
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 0, 0, 0, ((u32)this->unk_188 & 0xFF));
gDPSetEnvColor(gfxCtx->polyXlu.p++, 90, 50, 95, (s32)(this->unk_188 * 0.5f));
gDPPipeSync(gfxCtx->polyXlu.p++);
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1833),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@ -517,8 +516,8 @@ void EnFhgFire_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Translate(0.0f, -100.0f, 0.0f, 1);
func_80093D84(globalCtx->state.gfxCtx);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 0xFF, 0xFF, 0xFF, (s32)this->unk_160 & 0xFF);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0xFF, 0x1E, 0x00, 0xFF);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 255, 255, 255, (s32)this->unk_160 & 0xFF);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 255, 30, 0, 255);
gDPPipeSync(gfxCtx->polyXlu.p++);
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1892),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);

8
src/overlays/actors/ovl_En_Floormas/z_en_floormas.c
View file

@ -96,10 +96,10 @@ static Vec3f sDustPos = {
};
static Color_RGBA8 sMergeColor = {
0x00,
0xFF,
0x00,
0x00,
0,
255,
0,
0,
};
// display lists

4
src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c
View file

@ -69,7 +69,7 @@ Gfx* func_80A280BC(GraphicsContext* gfxCtx, BossGanon* dorf) {
do {
if (1) {}
} while (0);
gDPSetEnvColor(displayListHead++, 0x19, 0x14, 0x00, dorf->organFadeTimer);
gDPSetEnvColor(displayListHead++, 25, 20, 0, dorf->organFadeTimer);
gDPSetRenderMode(displayListHead++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2);
gSPEndDisplayList(displayListHead);
return displayList;
@ -86,7 +86,7 @@ Gfx* func_80A28148(GraphicsContext* gfxCtx, BossGanon* dorf) {
do {
if (1) {}
} while (0);
gDPSetEnvColor(displayListHead++, 0x00, 0x00, 0x00, dorf->organFadeTimer);
gDPSetEnvColor(displayListHead++, 0, 0, 0, dorf->organFadeTimer);
gDPSetRenderMode(displayListHead++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2);
gSPEndDisplayList(displayListHead);
return displayList;

2
src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c
View file

@ -236,7 +236,7 @@ s32 EnHeishi3_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dL
void EnHeishi3_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnHeishi3* this = THIS;
func_80093D18(globalCtx->state.gfxCtx);
SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, EnHeishi3_OverrideLimbDraw, NULL,
&this->actor);

6
src/overlays/actors/ovl_En_Md/z_en_md.c
View file

@ -576,7 +576,7 @@ void func_80AAB5A4(EnMd* this, GlobalContext* globalCtx) {
this->alpha = func_80034DD4(this, globalCtx, this->alpha, temp);
this->actor.shape.unk_14 = this->alpha;
} else {
this->alpha = 0xFF;
this->alpha = 255;
this->actor.shape.unk_14 = this->alpha;
}
}
@ -600,7 +600,7 @@ void EnMd_Init(Actor* thisx, GlobalContext* globalCtx) {
func_80034EC0(&this->skelAnime, sAnimations, 0);
Actor_SetScale(&this->actor, 0.01f);
this->actor.unk_1F = 6;
this->alpha = 0xFF;
this->alpha = 255;
Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ELF, this->actor.posRot.pos.x,
this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 3);
@ -812,7 +812,7 @@ void EnMd_Draw(Actor* thisx, GlobalContext* globalCtx) {
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_md.c", 1280);
if (this->alpha == 0xFF) {
if (this->alpha == 255) {
gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(sEyesSegments[this->eyeIdx]));
func_80034BA0(globalCtx, &this->skelAnime, EnMd_OverrideLimbDraw, EnMd_PostLimbDraw, &this->actor, this->alpha);
} else if (this->alpha != 0) {

4
src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
View file

@ -2367,7 +2367,7 @@ void func_80AF0400(EnRu1* this, GlobalContext* globalCtx) {
gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr1));
gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr1));
gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr2));
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x00, 0x00, 0x00, 0xFF);
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0, 0, 0, 255);
gSPSegment(gfxCtx->polyOpa.p++, 0x0C, &D_80116280[2]);
gfxCtx->polyOpa.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount,
@ -2392,7 +2392,7 @@ void func_80AF05D4(EnRu1* this, GlobalContext* globalCtx) {
gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr1));
gSPSegment(gfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr1));
gSPSegment(gfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr2));
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0x00, this->unk_2A8);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0, 0, 0, this->unk_2A8);
gSPSegment(gfxCtx->polyXlu.p++, 0x0C, &D_80116280[0]);
gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount,

26
src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
View file

@ -145,7 +145,7 @@ s32 func_80AF26A0(EnRu2* this) {
void func_80AF26AC(EnRu2* this) {
this->action = 7;
this->drawConfig = 0;
this->unk_2B4 = 0;
this->alpha = 0;
this->unk_2B8 = 0;
this->actor.shape.unk_14 = 0;
this->unk_2B0 = 0.0f;
@ -399,7 +399,7 @@ void func_80AF2F04(EnRu2* this, GlobalContext* globalCtx) {
if (func_80AF27D0(this, globalCtx, 4, 3)) {
this->action = 8;
this->drawConfig = 2;
this->unk_2B4 = 0;
this->alpha = 0;
this->actor.shape.unk_14 = 0;
this->unk_2B0 = 0.0f;
func_80AF2E64();
@ -408,7 +408,7 @@ void func_80AF2F04(EnRu2* this, GlobalContext* globalCtx) {
void func_80AF2F58(EnRu2* this, GlobalContext* globalCtx) {
f32* unk_2B0 = &this->unk_2B0;
s32 something;
s32 alpha;
if (func_80AF27D0(this, globalCtx, 4, 3)) {
*unk_2B0 += 1.0f;
@ -416,7 +416,7 @@ void func_80AF2F58(EnRu2* this, GlobalContext* globalCtx) {
this->action = 9;
this->drawConfig = 1;
*unk_2B0 = kREG(5) + 10.0f;
this->unk_2B4 = 0xFF;
this->alpha = 255;
this->actor.shape.unk_14 = 0xFF;
return;
}
@ -426,14 +426,14 @@ void func_80AF2F58(EnRu2* this, GlobalContext* globalCtx) {
this->action = 7;
this->drawConfig = 0;
*unk_2B0 = 0.0f;
this->unk_2B4 = 0;
this->alpha = 0;
this->actor.shape.unk_14 = 0;
return;
}
}
something = (*unk_2B0 / (kREG(5) + 10.0f)) * 255.0f;
this->unk_2B4 = something;
this->actor.shape.unk_14 = something;
alpha = (*unk_2B0 / (kREG(5) + 10.0f)) * 255.0f;
this->alpha = alpha;
this->actor.shape.unk_14 = alpha;
}
void func_80AF30AC(EnRu2* this, GlobalContext* globalCtx) {
@ -441,7 +441,7 @@ void func_80AF30AC(EnRu2* this, GlobalContext* globalCtx) {
this->action = 8;
this->drawConfig = 2;
this->unk_2B0 = kREG(5) + 10.0f;
this->unk_2B4 = 0xFF;
this->alpha = 255;
if (this->unk_2B8 == 0) {
func_80AF2E84(this, globalCtx);
this->unk_2B8 = 1;
@ -484,7 +484,7 @@ void func_80AF321C(EnRu2* this, GlobalContext* globalCtx) {
gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr));
gSPSegment(gfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr));
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0x00, this->unk_2B4);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0, 0, 0, this->alpha);
gSPSegment(gfxCtx->polyXlu.p++, 0x0C, &D_80116280[0]);
gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount,
@ -509,11 +509,11 @@ void func_80AF33E0(EnRu2* this) {
temp_f0 = kREG(17) + 10.0f;
if (temp_f0 <= *unk_2B0) {
this->unk_2B4 = 0xFF;
this->alpha = 255;
this->actor.shape.unk_14 = 0xFF;
} else {
temp_f18 = (*unk_2B0 / temp_f0) * 255.0f;
this->unk_2B4 = temp_f18;
this->alpha = temp_f18;
this->actor.shape.unk_14 = temp_f18;
}
}
@ -810,7 +810,7 @@ void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) {
gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr));
gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr));
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x00, 0x00, 0x00, 0xFF);
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0, 0, 0, 255);
gSPSegment(gfxCtx->polyOpa.p++, 0x0C, &D_80116280[2]);
SkelAnime_DrawSV(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, NULL, NULL,

2
src/overlays/actors/ovl_En_Ru2/z_en_ru2.h
View file

@ -19,7 +19,7 @@ typedef struct EnRu2 {
/* 0x02A8 */ s32 action;
/* 0x02AC */ s32 drawConfig;
/* 0x02B0 */ f32 unk_2B0;
/* 0x02B4 */ u32 unk_2B4;
/* 0x02B4 */ u32 alpha;
/* 0x02B8 */ s32 unk_2B8;
/* 0x02BC */ s32 unk_2BC;
/* 0x02C0 */ u16 unk_2C0;

4
src/overlays/actors/ovl_En_Tk/z_en_tk.c
View file

@ -133,12 +133,12 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) {
if (gfxSetup == 0) {
gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0);
gSPDisplayList(gfxCtx->polyXlu.p++, D_0600BC90);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x64, 0x3C, 0x14, 0x00);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 100, 60, 20, 0);
gfxSetup = 1;
}
alpha = eff->timeLeft * (255.f / eff->timeTotal);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 0xAA, 0x82, 0x5A, alpha);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 170, 130, 90, alpha);
gDPPipeSync(gfxCtx->polyXlu.p++);
Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW);

2
src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
View file

@ -569,7 +569,7 @@ void EnWallmas_DrawXlu(EnWallmas* this, GlobalContext* globalCtx) {
// clang-format on
func_80094044(globalCtx->state.gfxCtx);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 0x00, 0x00, 0x00, 0xFF);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 0, 0, 0, 255);
func_80038A28(this->actor.floorPoly, this->actor.posRot.pos.x, this->actor.groundY, this->actor.posRot.pos.z, &mf);
Matrix_Mult(&mf, MTXMODE_NEW);

20
src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c
View file

@ -248,16 +248,16 @@ CutsceneData D_80B4C5D0[] = {
// clang-format on
u32 D_80B4D5C0[] = {
0xC3DC0000, 0x42EA0000, 0x00000000, 0xC3F50000, 0x42F00000, 0x00000000, 0x0000002D, 0xC3F20000, 0x42F40000,
0xC1E80000, 0xC3F00000, 0x42E80000, 0x41900000, 0x00000050, 0xC3CE8000, 0x43080000, 0xC2900000, 0xC3C98000,
0x430D0000, 0xC2B20000, 0x00000019, 0xC3E30000, 0x42F00000, 0x00000000, 0xC3D90000, 0x42F20000, 0x00000000,
0x00000014, 0xC3E30000, 0x42F00000, 0x00000000, 0xC3D70000, 0x42CE0000, 0xC2140000, 0x00000014, 0xC3E30000,
0x42D20000, 0x42480000, 0xC3E28000, 0x42D20000, 0x42840000, 0x0000003C, 0xC3FA8000, 0x42F40000, 0x00000000,
0xC3E08000, 0x42EE0000, 0x00000000, 0x0000002D, 0xC3E70000, 0x42F20000, 0x00000000, 0xC3D18000, 0x42FA0000,
0x00000000, 0x00000014, 0xC409C000, 0x42EE0000, 0x40E00000, 0xC412C000, 0x42E60000, 0x41600000, 0x00000014,
0xC3F48000, 0x43010000, 0x00000000, 0xC3EB0000, 0x43000000, 0x00000000, 0x00000028, 0xC4034000, 0x42FC0000,
0x00000000, 0xC3FE8000, 0x42FC0000, 0x00000000, 0x0000000A, 0xC3F58000, 0x42F00000, 0xC0E00000, 0xC3FE8000,
0x42E60000, 0xC0E00000, 0x0000004B, 0xC3F28000, 0x42F00000, 0xC2280000, 0xC3F20000, 0x42F00000, 0x41200000,
0xC3DC0000, 0x42EA0000, 0x00000000, 0xC3F50000, 0x42F00000, 0x00000000, 0x0000002D, 0xC3F20000, 0x42F40000,
0xC1E80000, 0xC3F00000, 0x42E80000, 0x41900000, 0x00000050, 0xC3CE8000, 0x43080000, 0xC2900000, 0xC3C98000,
0x430D0000, 0xC2B20000, 0x00000019, 0xC3E30000, 0x42F00000, 0x00000000, 0xC3D90000, 0x42F20000, 0x00000000,
0x00000014, 0xC3E30000, 0x42F00000, 0x00000000, 0xC3D70000, 0x42CE0000, 0xC2140000, 0x00000014, 0xC3E30000,
0x42D20000, 0x42480000, 0xC3E28000, 0x42D20000, 0x42840000, 0x0000003C, 0xC3FA8000, 0x42F40000, 0x00000000,
0xC3E08000, 0x42EE0000, 0x00000000, 0x0000002D, 0xC3E70000, 0x42F20000, 0x00000000, 0xC3D18000, 0x42FA0000,
0x00000000, 0x00000014, 0xC409C000, 0x42EE0000, 0x40E00000, 0xC412C000, 0x42E60000, 0x41600000, 0x00000014,
0xC3F48000, 0x43010000, 0x00000000, 0xC3EB0000, 0x43000000, 0x00000000, 0x00000028, 0xC4034000, 0x42FC0000,
0x00000000, 0xC3FE8000, 0x42FC0000, 0x00000000, 0x0000000A, 0xC3F58000, 0x42F00000, 0xC0E00000, 0xC3FE8000,
0x42E60000, 0xC0E00000, 0x0000004B, 0xC3F28000, 0x42F00000, 0xC2280000, 0xC3F20000, 0x42F00000, 0x41200000,
0x0000002D,
};
u32 D_80B4D72C[] = {

16
src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
View file

@ -602,7 +602,7 @@ void EnZl2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
Matrix_RotateRPY(-0x5DE7, -0x53E9, 0x3333, MTXMODE_APPLY);
Matrix_Scale(1.2f, 1.2f, 1.2f, MTXMODE_APPLY);
gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_zl2.c", 1253),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList((*gfx)++, &D_0600BAE8);
}
Matrix_Pull();
@ -755,9 +755,9 @@ void func_80B500E0(EnZl2* this, GlobalContext* globalCtx) {
}
}
void func_80B501C4(EnZl2* this, s32 arg1) {
void func_80B501C4(EnZl2* this, s32 alpha) {
if (this->actor.attachedB != NULL) {
((DoorWarp1*)this->actor.attachedB)->unk_1A8 = arg1;
((DoorWarp1*)this->actor.attachedB)->alpha = alpha;
}
}
@ -765,9 +765,9 @@ void func_80B501E8(EnZl2* this, GlobalContext* globalCtx) {
CsCmdActorAction* npcAction = EnZl2_GetNpcAction(globalCtx, 0);
if (npcAction != NULL) {
this->actor.shape.unk_14 = this->unk_1A8 =
this->actor.shape.unk_14 = this->alpha =
(1.0f - func_8006F93C(npcAction->endFrame, npcAction->startFrame, globalCtx->csCtx.frames)) * 255.0f;
func_80B501C4(this, this->unk_1A8);
func_80B501C4(this, this->alpha);
}
}
@ -948,7 +948,7 @@ void func_80B50970(EnZl2* this, GlobalContext* globalCtx) {
void func_80B50980(EnZl2* this, GlobalContext* globalCtx) {
this->action = 23;
this->drawConfig = 2;
this->unk_1A8 = 0xFF;
this->alpha = 255;
}
void func_80B509A0(EnZl2* this, GlobalContext* globalCtx) {
@ -1696,7 +1696,7 @@ void func_80B523C8(EnZl2* this, GlobalContext* globalCtx) {
gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(sp74));
gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(sp70));
gSPSegment(gfxCtx->polyOpa.p++, 0x0A, SEGMENTED_TO_VIRTUAL(sp64));
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x00, 0x00, 0x00, 0xFF);
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0, 0, 0, 255);
gSPSegment(gfxCtx->polyOpa.p++, 0x0B, &D_80116280[2]);
gfxCtx->polyOpa.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount,
@ -1720,7 +1720,7 @@ void func_80B525D4(EnZl2* this, GlobalContext* globalCtx) {
gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sp78));
gSPSegment(gfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(sp78));
gSPSegment(gfxCtx->polyXlu.p++, 0x0A, SEGMENTED_TO_VIRTUAL(sp6C));
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0x00, this->unk_1A8);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0, 0, 0, this->alpha);
gSPSegment(gfxCtx->polyXlu.p++, 0x0B, &D_80116280[0]);
gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount,

2
src/overlays/actors/ovl_En_Zl2/z_en_zl2.h
View file

@ -23,7 +23,7 @@ typedef struct EnZl2 {
/* 0x019C */ s32 action;
/* 0x01A0 */ s32 drawConfig;
/* 0x01A4 */ char unk_1A4[0x4];
/* 0x01A8 */ s32 unk_1A8;
/* 0x01A8 */ s32 alpha;
/* 0x01AC */ s16 unk_1AC[0x18]; // ???
/* 0x01DC */ s16 unk_1DC[0x18]; // ???
/* 0x020C */ s16 unk_20C[0x18]; // ???

2
src/overlays/actors/ovl_End_Title/z_end_title.c
View file

@ -91,7 +91,7 @@ void EndTitle_Draw(Actor* thisx, GlobalContext* globalCtx) {
}
gfxCtx->overlay.p = func_80093F34(gfxCtx->overlay.p);
gDPSetTextureLUT(gfxCtx->overlay.p++, G_TT_NONE);
gDPSetEnvColor(gfxCtx->overlay.p++, 0xFF, 0x78, 0x1E, 0x00);
gDPSetEnvColor(gfxCtx->overlay.p++, 255, 120, 30, 0);
gDPSetRenderMode(gfxCtx->overlay.p++, G_RM_PASS, G_RM_XLU_SURF2);
gSPClearGeometryMode(gfxCtx->overlay.p++, G_TEXTURE_ENABLE | G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR);

8
src/overlays/actors/ovl_Magic_Wind/z_magic_wind_gfx.c
View file

@ -272,8 +272,8 @@ Gfx sInnerCylinderDList[] = {
ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0),
gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_SURF2),
gsSPClearGeometryMode(G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR),
gsDPSetPrimColor(0, 0x80, 0xFF, 0xFF, 0xAA, 0xFF),
gsDPSetEnvColor(0x96, 0xFF, 0x00, 0x00),
gsDPSetPrimColor(0, 0x80, 255, 255, 170, 255),
gsDPSetEnvColor(150, 255, 0, 0),
gsSPDisplayList(0x08000000),
gsSPVertex(&sCylinderVtx[0], 18, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),
@ -299,8 +299,8 @@ Gfx sOuterCylinderDList[] = {
ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0),
gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_SURF2),
gsSPClearGeometryMode(G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR),
gsDPSetPrimColor(0, 0x80, 0xFF, 0xFF, 0xAA, 0xFF),
gsDPSetEnvColor(0x00, 0x96, 0x00, 0x00),
gsDPSetPrimColor(0, 0x80, 255, 255, 170, 255),
gsDPSetEnvColor(0, 150, 0, 0),
gsSPDisplayList(0x09000000),
gsSPVertex(&sCylinderVtx[18], 18, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0),

4
src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot_gfx.c
View file

@ -65,8 +65,8 @@ static Gfx sTextureDL[] = {
GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1),
G_RM_AA_ZB_XLU_SURF2),
gsSPClearGeometryMode(G_TEXTURE_ENABLE | G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR),
gsDPSetPrimColor(0x00, 0x00, 0xFF, 0xFF, 0xAA, 0xFF),
gsDPSetEnvColor(0xC8, 0xFF, 0x00, 0x80),
gsDPSetPrimColor(0x00, 0x00, 255, 255, 170, 255),
gsDPSetEnvColor(200, 255, 0, 128),
gsSPEndDisplayList(),
};

4
src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c
View file

@ -163,8 +163,8 @@ void OceffStorm_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_80093D84(globalCtx->state.gfxCtx);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0xFF, 0xFF, 0xC8, 0xFF);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x96, 0x96, 0x00, 0x80);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 255, 255, 200, 255);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 150, 150, 0, 128);
gDPSetAlphaDither(gfxCtx->polyXlu.p++, G_AD_NOISE);
gDPSetColorDither(gfxCtx->polyXlu.p++, G_CD_NOISE);

2
src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm_gfx.c
View file

@ -125,7 +125,7 @@ static Gfx sTextureDL[] = {
gsDPSetTextureLUT(G_TT_NONE),
gsDPSetRenderMode(IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1),
G_RM_CLD_SURF2),
gsDPSetEnvColor(0x32, 0x32, 0x00, 0x00),
gsDPSetEnvColor(50, 50, 0, 0),
gsSPClearGeometryMode(G_TEXTURE_ENABLE | G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR),
gsDPSetCombineLERP(TEXEL1, TEXEL0, PRIM_LOD_FRAC, TEXEL0, TEXEL1, TEXEL0, PRIM_LOD_FRAC, TEXEL0, PRIMITIVE,
ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0),

8
src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c
View file

@ -114,11 +114,11 @@ void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (this->actor.params) {
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0xAA, 0xFF, 0xFF, 0xFF);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x96, 0xFF, 0x80);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 170, 255, 255, 255);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0, 150, 255, 128);
} else {
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0xFF, 0xFF, 0xC8, 0xFF);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 100, 0x00, 0xFF, 0x80);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 255, 255, 200, 255);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 100, 0, 255, 128);
}
gSPDisplayList(gfxCtx->polyXlu.p++, sTextureDL);

6
src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c
View file

@ -84,7 +84,7 @@ void OceffWipe2_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (this->counter >= 80) {
alpha = 12 * (100 - this->counter);
} else {
alpha = 0xFF;
alpha = 255;
}
vtxPtr[1].v.cn[3] = vtxPtr[3].v.cn[3] = vtxPtr[5].v.cn[3] = vtxPtr[7].v.cn[3] = vtxPtr[9].v.cn[3] =
@ -104,8 +104,8 @@ void OceffWipe2_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_wipe2.c", 400),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0xFF, 0xFF, 0xAA, 0xFF);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0xFF, 0x64, 0x00, 0x80);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 255, 255, 170, 255);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 255, 100, 0, 128);
gSPDisplayList(gfxCtx->polyXlu.p++, sTextureDL);
gSPDisplayList(gfxCtx->polyXlu.p++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 6, scroll * (-6), 64, 64,
1, scroll * (-6), 0, 64, 64));

6
src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c
View file

@ -86,7 +86,7 @@ void OceffWipe3_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (this->counter >= 80) {
alpha = 12 * (100 - this->counter);
} else {
alpha = 0xFF;
alpha = 255;
}
vtxPtr[1].v.cn[3] = vtxPtr[3].v.cn[3] = vtxPtr[5].v.cn[3] = vtxPtr[7].v.cn[3] = vtxPtr[9].v.cn[3] =
@ -106,8 +106,8 @@ void OceffWipe3_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_wipe3.c", 353),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0xFF, 0xFF, 0xAA, 0xFF);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x64, 0xC8, 0x00, 0x80);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 255, 255, 170, 255);
gDPSetEnvColor(gfxCtx->polyXlu.p++, 100, 200, 0, 128);
gSPDisplayList(gfxCtx->polyXlu.p++, sTextureDL);
gSPDisplayList(gfxCtx->polyXlu.p++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 12, scroll * (-12), 64,
64, 1, scroll * 8, scroll * (-8), 64, 64));

2
src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c
View file

@ -80,7 +80,7 @@ void OceffWipe4_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (this->counter >= 30) {
alpha = 12 * (50 - this->counter);
} else {
alpha = 0xFF;
alpha = 255;
}
vtxPtr[1].v.cn[3] = vtxPtr[3].v.cn[3] = vtxPtr[5].v.cn[3] = vtxPtr[7].v.cn[3] = vtxPtr[9].v.cn[3] =

6
src/overlays/gamestates/ovl_title/z_title.c
View file

@ -21,10 +21,10 @@ void Title_PrintBuildInfo(Gfx** gfxp) {
printer = alloca(sizeof(GfxPrint));
GfxPrint_Init(printer);
GfxPrint_Open(printer, g);
GfxPrint_SetColor(printer, 0xFF, 0x9B, 0xFF, 0xFF);
GfxPrint_SetColor(printer, 255, 155, 255, 255);
GfxPrint_SetPos(printer, 9, 21);
GfxPrint_Printf(printer, "NOT MARIO CLUB VERSION");
GfxPrint_SetColor(printer, 0xFF, 0xFF, 0xFF, 0xFF);
GfxPrint_SetColor(printer, 255, 255, 255, 255);
GfxPrint_SetPos(printer, 7, 23);
GfxPrint_Printf(printer, "[Creator:%s]", gBuildTeam);
GfxPrint_SetPos(printer, 7, 24);
@ -180,7 +180,7 @@ void Title_Init(TitleContext* this) {
func_800A9CD4(&this->state, &this->sram);
this->ult = 0;
this->unk_1D4 = 0x14;
this->coverAlpha = 0xFF;
this->coverAlpha = 255;
this->addAlpha = -3;
this->visibleDuration = 0x3C;
}