github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-21 05:43:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Resources] Cleanup old hacks and rename (#2546)

Browse source
This commit is contained in:
David Chavez 2023-02-27 02:55:40 +01:00 • committed by GitHub
commit 2cb4a6ee7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

5
soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
View file

@ -118,10 +118,7 @@ void func_808C12C4(u8* arg1, s16 arg2) {
}
void func_808C1554(void* arg0, void* floorTex, s32 arg2, f32 arg3) {
// Entering the King Dodongo boss battle was crashing when using only an mq otr
// because it was trying to load a texture from a non-mq path
// HACK: GetResourceDataByName doesn't account for mq vs non-mq paths, LoadTexOrDListByName does.
arg0 = ResourceMgr_LoadTexOrDListByName(arg0);
arg0 = GetResourceDataByNameHandlingMQ(arg0);
floorTex = GetResourceDataByName(floorTex, false);
u16* temp_s3 = SEGMENTED_TO_VIRTUAL(arg0);

6
soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
View file

@ -1210,10 +1210,8 @@ void BossGanon_SetupTowerCutscene(BossGanon* this, PlayState* play) {
void BossGanon_ShatterWindows(u8 windowShatterState) {
s16 i;
// Temporary solution: using LoadTexOrDList to ensure we actually have the texture available
// based on mq/nonmq. This will be handled properly with LUS 1.0
u8* tex1 = ResourceMgr_LoadTexOrDListByName(SEGMENTED_TO_VIRTUAL(ganon_boss_sceneTex_006C18));
u8* tex2 = ResourceMgr_LoadTexOrDListByName(SEGMENTED_TO_VIRTUAL(ganon_boss_sceneTex_007418));
u8* tex1 = GetResourceDataByNameHandlingMQ(SEGMENTED_TO_VIRTUAL(ganon_boss_sceneTex_006C18));
u8* tex2 = GetResourceDataByNameHandlingMQ(SEGMENTED_TO_VIRTUAL(ganon_boss_sceneTex_007418));
u8* templateTex = GetResourceDataByName(SEGMENTED_TO_VIRTUAL(gGanondorfWindowShatterTemplateTex), false);
for (i = 0; i < 2048; i++) {