mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-01-16 21:46:58 +00:00
Code Issues Projects Releases Wiki Activity

Rename to color

Browse source
This commit is contained in:
Sirius902 2020-11-14 21:50:05 -08:00
parent cc515959db
commit 5610e489c0
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c
View file

@ -177,12 +177,12 @@ void func_80875A0C(BgGanonOtyuka* this, GlobalContext* globalCtx) {
this->unk_168 = 20; this->unk_168 = 20;
this->unk_16E = 1; this->unk_16E = 1;
this->unk_16D = 0; this->unk_16D = 0;
this->primR = 255.0f; this->primColorR = 255.0f;
this->primG = 255.0f; this->primColorG = 255.0f;
this->primB = 255.0f; this->primColorB = 255.0f;
this->envR = 255.0f; this->envColorR = 255.0f;
this->envG = 255.0f; this->envColorG = 255.0f;
this->envB = 0.0f; this->envColorB = 0.0f;
} }
} }
#else #else
@ -295,8 +295,9 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, platform->unk_16D * 4, 0, 32, 64, 1, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, platform->unk_16D * 4, 0, 32, 64, 1,
platform->unk_16D * 4, 0, 32, 64)); platform->unk_16D * 4, 0, 32, 64));
gDPPipeSync(POLY_XLU_DISP++); gDPPipeSync(POLY_XLU_DISP++);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, platform->primR, platform->primG, platform->primB, 0); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, platform->primColorR, platform->primColorG, platform->primColorB,
gDPSetEnvColor(POLY_XLU_DISP++, platform->envR, platform->envG, platform->envB, 128); 0);
gDPSetEnvColor(POLY_XLU_DISP++, platform->envColorR, platform->envColorG, platform->envColorB, 128);
Matrix_Translate(platform->dyna.actor.posRot.pos.x, 0.0f, platform->dyna.actor.posRot.pos.z, Matrix_Translate(platform->dyna.actor.posRot.pos.x, 0.0f, platform->dyna.actor.posRot.pos.z,
MTXMODE_NEW); MTXMODE_NEW);

12
src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h
View file

@ -19,12 +19,12 @@ typedef struct BgGanonOtyuka {
/* 0x016E */ u8 unk_16E; /* 0x016E */ u8 unk_16E;
/* 0x016F */ char unk_16F[0x01]; /* 0x016F */ char unk_16F[0x01];
/* 0x0170 */ f32 yScale; /* 0x0170 */ f32 yScale;
/* 0x0174 */ f32 primR; /* 0x0174 */ f32 primColorR;
/* 0x0178 */ f32 primG; /* 0x0178 */ f32 primColorG;
/* 0x017C */ f32 primB; /* 0x017C */ f32 primColorB;
/* 0x0180 */ f32 envR; /* 0x0180 */ f32 envColorR;
/* 0x0184 */ f32 envG; /* 0x0184 */ f32 envColorG;
/* 0x0188 */ f32 envB; /* 0x0188 */ f32 envColorB;
} BgGanonOtyuka; // size = 0x018C } BgGanonOtyuka; // size = 0x018C
extern const ActorInit Bg_Ganon_Otyuka_InitVars; extern const ActorInit Bg_Ganon_Otyuka_InitVars;