mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-05 07:24:34 +00:00
Code Issues Projects Releases Wiki Activity

boss_ganon (Ganondorf) OK (#1037)

Browse source 
* data migrated and OK

* some functions ported

* everything ported and updated

* merge message

* plenty of functions matched

* remove unwanted file

* 5 more, progress on update

* update matched

* fix proto

* fix

* func_808E06FC

* asm

* 2 left

* 1 more

* last function inital decomp

* Dbg MQ OK

* docs progress

* revert limb stuff

* some more docs

* docs progress

* more docs

* done with docs for now i think

* revert unwanted change

* some symbols

* anime2

* format

* small changes

* some more changes

* merge master and fix matrices

* reviews 1 and 2

* remove continue

* review 3 and 4

* un-name bodyPartsPos for now
This commit is contained in:
fig02 2021-12-02 17:31:39 -05:00 • committed by GitHub
parent 8ff1f242fa
commit 4390dd74b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
85 changed files with 5160 additions and 17288 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/code/ucode_disas.c
View file

@ -1210,7 +1210,9 @@ void UCodeDisas_Disassemble(UCodeDisas* this, GfxMod* ptr) {
}
} break;
default: { DISAS_LOG("AnyDisplayList(),"); } break;
default: {
DISAS_LOG("AnyDisplayList(),");
} break;
}
} break;
@ -1335,7 +1337,9 @@ void UCodeDisas_Disassemble(UCodeDisas* this, GfxMod* ptr) {
DISAS_LOG("gsSPObjRenderMode(0x%08x),", dma.addr);
} break;
default: { DISAS_LOG("AnyDisplayList(),"); } break;
default: {
DISAS_LOG("AnyDisplayList(),");
} break;
}
}
}

36
src/code/z_kankyo.c
View file

@ -196,10 +196,10 @@ f32 D_8011FDD4 = 0.0f;
u8 gCustomLensFlareOn;
Vec3f gCustomLensFlarePos;
s16 D_8015FD04;
s16 D_8015FD06;
f32 D_8015FD08;
s16 D_8015FD0C;
s16 gLensFlareUnused;
s16 gLensFlareScale;
f32 gLensFlareColorIntensity;
s16 gLensFlareScreenFillAlpha;
LightningBolt sLightningBolts[3];
LightningStrike gLightningStrike;
s16 sLightningFlashAlpha;
@ -894,9 +894,9 @@ void Environment_Update(GlobalContext* globalCtx, EnvironmentContext* envCtx, Li
if (((((void)0, gSaveContext.sceneSetupIndex) >= 5 || gTimeIncrement != 0) &&
((void)0, gSaveContext.dayTime) > gSaveContext.skyboxTime) ||
(((void)0, gSaveContext.dayTime) < 0xAAB || gTimeIncrement < 0)) {
gSaveContext.skyboxTime = ((void)0, gSaveContext.dayTime);
}
time = gSaveContext.dayTime;
if (time > 0xC000 || time < 0x4555) {
@ -1353,7 +1353,8 @@ void Environment_DrawSunLensFlare(GlobalContext* globalCtx, EnvironmentContext*
f32 sLensFlareScales[] = { 23.0f, 12.0f, 7.0f, 5.0f, 3.0f, 10.0f, 6.0f, 2.0f, 3.0f, 1.0f };
void Environment_DrawLensFlare(GlobalContext* globalCtx, EnvironmentContext* envCtx, View* view,
GraphicsContext* gfxCtx, Vec3f pos, s32 unused, s16 arg6, f32 arg7, s16 arg8, u8 arg9) {
GraphicsContext* gfxCtx, Vec3f pos, s32 unused, s16 scale, f32 colorIntensity,
s16 screenFillAlpha, u8 arg9) {
s16 i;
f32 tempX;
f32 tempY;
@ -1377,7 +1378,7 @@ void Environment_DrawLensFlare(GlobalContext* globalCtx, EnvironmentContext* env
f32 unk88Target;
u32 isOffScreen = false;
f32 alpha;
f32 scale;
f32 adjScale;
Vec3f screenPos;
f32 fogInfluence;
f32 temp;
@ -1465,17 +1466,17 @@ void Environment_DrawLensFlare(GlobalContext* globalCtx, EnvironmentContext* env
}
Matrix_Translate(-posDirX * i * dist, -posDirY * i * dist, -posDirZ * i * dist, MTXMODE_APPLY);
scale = sLensFlareScales[i] * cosAngle;
adjScale = sLensFlareScales[i] * cosAngle;
if (arg9) {
scale *= 0.001 * (arg6 + 630.0f * temp);
adjScale *= 0.001 * (scale + 630.0f * temp);
} else {
scale *= 0.0001f * arg6 * (2.0f * dist);
adjScale *= 0.0001f * scale * (2.0f * dist);
}
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
Matrix_Scale(adjScale, adjScale, adjScale, MTXMODE_APPLY);
alpha = arg7 / 10.0f;
alpha = colorIntensity / 10.0f;
alpha = CLAMP_MAX(alpha, 1.0f);
alpha = alpha * lensFlareAlphas[i];
alpha = CLAMP_MIN(alpha, 0.0f);
@ -1518,13 +1519,13 @@ void Environment_DrawLensFlare(GlobalContext* globalCtx, EnvironmentContext* env
alphaScale = cosAngle - (1.5f - cosAngle);
if (arg8) {
if (screenFillAlpha != 0) {
if (alphaScale > 0.0f) {
POLY_XLU_DISP = func_800937C0(POLY_XLU_DISP);
alpha = arg7 / 10.0f;
alpha = colorIntensity / 10.0f;
alpha = CLAMP_MAX(alpha, 1.0f);
alpha = alpha * arg8;
alpha = alpha * screenFillAlpha;
alpha = CLAMP_MIN(alpha, 0.0f);
fogInfluence = (996 - globalCtx->lightCtx.fogNear) / 50.0f;
@ -1542,7 +1543,7 @@ void Environment_DrawLensFlare(GlobalContext* globalCtx, EnvironmentContext* env
Math_SmoothStepToF(&envCtx->unk_84, 0.0f, 0.5f, 50.0f, 0.1f);
}
temp = arg7 / 120.0f;
temp = colorIntensity / 120.0f;
temp = CLAMP_MIN(temp, 0.0f);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, (u8)(temp * 75.0f) + 180, (u8)(temp * 155.0f) + 100,
@ -2051,7 +2052,8 @@ void Environment_DrawCustomLensFlare(GlobalContext* globalCtx) {
pos.z = gCustomLensFlarePos.z;
Environment_DrawLensFlare(globalCtx, &globalCtx->envCtx, &globalCtx->view, globalCtx->state.gfxCtx, pos,
D_8015FD04, D_8015FD06, D_8015FD08, D_8015FD0C, 0);
gLensFlareUnused, gLensFlareScale, gLensFlareColorIntensity,
gLensFlareScreenFillAlpha, 0);
}
}

6
src/code/z_scene_table.c
View file

@ -1119,9 +1119,9 @@ void func_80099BD8(GlobalContext* globalCtx) {
gCustomLensFlarePos.x = -20.0f;
gCustomLensFlarePos.y = 1220.0f;
gCustomLensFlarePos.z = -684.0f;
D_8015FD06 = 10;
D_8015FD08 = 8.0f;
D_8015FD0C = 200;
gLensFlareScale = 10;
gLensFlareColorIntensity = 8.0f;
gLensFlareScreenFillAlpha = 200;
}
}