github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-20 13:23:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Phantom Ganon not disintegrating (#1579)

Browse source
This commit is contained in:
Rozelette 2022-09-25 11:18:06 -05:00 • committed by GitHub
commit 5a0b854c5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libultraship/libultraship/Window.cpp
View file

@ -199,8 +199,8 @@ extern "C" {
if (res != nullptr) if (res != nullptr)
{ {
if (index < res->imageDataSize) if ((index * 2) < res->imageDataSize)
res->imageData[index] = value; ((s16*)res->imageData)[index] = value;
else else
{ {
// Dangit Morita // Dangit Morita

34
soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
View file

@ -208,56 +208,41 @@ static InitChainEntry sInitChain[] = {
static Vec3f sAudioVec = { 0.0f, 0.0f, 50.0f }; static Vec3f sAudioVec = { 0.0f, 0.0f, 50.0f };
// OTRTODO: This code appears to cause the game to gradually crash...
// Might be an OoB write. For now it's disabled.
void BossGanondrof_ClearPixels8x8(s16* texture, u8* mask, s16 index) void BossGanondrof_ClearPixels8x8(s16* texture, u8* mask, s16 index)
{ {
//texture = ResourceMgr_LoadTexByName(texture);
if (mask[index]) { if (mask[index]) {
//texture[index / 4] = 0;
ResourceMgr_WriteTexS16ByName(texture, index / 4, 0); ResourceMgr_WriteTexS16ByName(texture, index / 4, 0);
} }
} }
void BossGanondrof_ClearPixels16x8(s16* texture, u8* mask, s16 index) { void BossGanondrof_ClearPixels16x8(s16* texture, u8* mask, s16 index) {
//texture = ResourceMgr_LoadTexByName(texture);
if (mask[index]) { if (mask[index]) {
//texture[index / 2] = 0;
ResourceMgr_WriteTexS16ByName(texture, index / 2, 0); ResourceMgr_WriteTexS16ByName(texture, index / 2, 0);
} }
} }
void BossGanondrof_ClearPixels16x16(s16* texture, u8* mask, s16 index, s16 bpp) { void BossGanondrof_ClearPixels16x16(s16* texture, u8* mask, s16 index, s16 bpp) {
//texture = ResourceMgr_LoadTexByName(texture);
if (mask[index]) { if (mask[index]) {
//texture[index] = 0;
ResourceMgr_WriteTexS16ByName(texture, index, 0); ResourceMgr_WriteTexS16ByName(texture, index, 0);
} }
} }
void BossGanondrof_ClearPixels32x16(s16* texture, u8* mask, s16 index) { void BossGanondrof_ClearPixels32x16(s16* texture, u8* mask, s16 index) {
//texture = ResourceMgr_LoadTexByName(texture);
if (mask[index]) { if (mask[index]) {
s16 i = (index & 0xF) + ((index & 0xF0) << 1); s16 i = (index & 0xF) + ((index & 0xF0) << 1);
ResourceMgr_WriteTexS16ByName(texture, i + 0x10, 0); ResourceMgr_WriteTexS16ByName(texture, i + 0x10, 0);
ResourceMgr_WriteTexS16ByName(texture, i, 0); ResourceMgr_WriteTexS16ByName(texture, i, 0);
//texture[i + 0x10] = 0;
//texture[i] = 0;
} }
} }
void BossGanondrof_ClearPixels16x32(s16* texture, u8* mask, s16 index) { void BossGanondrof_ClearPixels16x32(s16* texture, u8* mask, s16 index) {
//texture = ResourceMgr_LoadTexByName(texture);
if (mask[index]) { if (mask[index]) {
s16 i = ((index & 0xF) * 2) + ((index & 0xF0) * 2); s16 i = ((index & 0xF) * 2) + ((index & 0xF0) * 2);
ResourceMgr_WriteTexS16ByName(texture, i + 1, 0); ResourceMgr_WriteTexS16ByName(texture, i + 1, 0);
ResourceMgr_WriteTexS16ByName(texture, i, 0); ResourceMgr_WriteTexS16ByName(texture, i, 0);
//texture[i + 1] = 0;
//texture[i] = 0;
} }
} }
@ -1524,6 +1509,25 @@ void BossGanondrof_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnfHG* horse; EnfHG* horse;
OPEN_DISPS(globalCtx->state.gfxCtx); OPEN_DISPS(globalCtx->state.gfxCtx);
if (this->work[GND_BODY_DECAY_FLAG]) {
for (int i = 0; i < 5; i++) {
gSPInvalidateTexCache(POLY_OPA_DISP++, sLimbTex_rgba16_8x8[i]);
gSPInvalidateTexCache(POLY_OPA_DISP++, sLimbTex_rgba16_16x8[i]);
}
for (int i = 0; i < ARRAY_COUNT(sLimbTex_rgba16_16x16); i++) {
gSPInvalidateTexCache(POLY_OPA_DISP++, sLimbTex_rgba16_16x16[i]);
}
for (int i = 0; i < ARRAY_COUNT(sLimbTex_rgba16_16x32); i++) {
gSPInvalidateTexCache(POLY_OPA_DISP++, sLimbTex_rgba16_16x32[i]);
}
gSPInvalidateTexCache(POLY_OPA_DISP++, gPhantomGanonLimbTex_00B380);
gSPInvalidateTexCache(POLY_OPA_DISP++, gPhantomGanonEyeTex);
for (int i = 0; i < ARRAY_COUNT(sMouthTex_ci8_16x16); i++) {
gSPInvalidateTexCache(POLY_OPA_DISP++, sMouthTex_ci8_16x16[i]);
}
}
osSyncPrintf("MOVE P = %x\n", this->actor.update); osSyncPrintf("MOVE P = %x\n", this->actor.update);
osSyncPrintf("STOP TIMER = %d ==============\n", this->actor.freezeTimer); osSyncPrintf("STOP TIMER = %d ==============\n", this->actor.freezeTimer);
horse = (EnfHG*)this->actor.child; horse = (EnfHG*)this->actor.child;