1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 14:31:17 +00:00

Match more ntsc-1.2 overlay draw functions (#2061)

* Match more overlay draw functions

* Review
This commit is contained in:
cadmic 2024-08-20 13:22:05 -07:00 committed by GitHub
parent ec70295357
commit 3e516f48f3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 73 additions and 85 deletions

View file

@ -472,7 +472,7 @@ void MirRay_Draw(Actor* thisx, PlayState* play) {
Player* player = GET_PLAYER(play);
s32 i;
MirRayShieldReflection reflection[6];
s32 temp;
s32 pad;
this->reflectIntensity = 0.0f;
if ((D_80B8E670 == 0) && !this->unLit && Player_HasMirrorShieldSetToDraw(play)) {
@ -485,7 +485,7 @@ void MirRay_Draw(Actor* thisx, PlayState* play) {
Matrix_Scale(1.0f, 1.0f, this->reflectIntensity * 5.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, MATRIX_NEW(play->state.gfxCtx, "../z_mir_ray.c", 972),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 150, (s16)(temp = this->reflectIntensity * 100.0f));
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 150, (s32)(this->reflectIntensity * 100.0f) & 0xFF);
gSPDisplayList(POLY_XLU_DISP++, gShieldBeamGlowDL);
MirRay_SetupReflectionPolys(this, play, reflection);
MirRay_RemoveSimilarReflections(reflection);