[Resources] Clean up old hacks and rename #2546
Conversation
| @@ -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)); | |||
There was a problem hiding this comment.
We already know we're loading textures, this method was used because there was no other method handling the paths (or they didn't know about it)
| // 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); |
There was a problem hiding this comment.
We already know we're loading textures, this method was used because there was no other method handling the paths (or they didn't know about it)
| u8* tex1 = GetResourceDataByNameHandlingMQ(SEGMENTED_TO_VIRTUAL(ganon_boss_sceneTex_006C18)); | ||
| u8* tex2 = GetResourceDataByNameHandlingMQ(SEGMENTED_TO_VIRTUAL(ganon_boss_sceneTex_007418)); |
There was a problem hiding this comment.
just kind of thinking out loud in comments here, we know this works because since these are textures, they were always going into the final else in ResourceMgr_LoadTexOrDListByName
directly calling GetResourceDataByNameHandlingMQ makes sense here
| // 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); |
There was a problem hiding this comment.
assuming every time this is called arg0 is referring to a texture, and never a dlist or array, then this is not changing behavior
it appears to only ever be called by BossDodongo_Update, and arg0 is gDodongosCavernBossLavaFloorTex, so this makes sense
| extern "C" char* GetResourceDataByNameHandlingMQ(const char* path) { | ||
| auto res = GetResourceByNameHandlingMQ(path); |
There was a problem hiding this comment.
got a little worried for a second before i noticed these didn't have the same name
GetResourceByNameHandlingMQ
vs
GetResourceDataByNameHandlingMQ
this makes sense
| // Handle mq vs nonmq for cutscenes due to scene/ paths | ||
| auto res = ResourceMgr_LoadResource(path); | ||
|
|
||
| if (res == nullptr) { | ||
| return nullptr; | ||
| } | ||
|
|
||
| return (s32*)res->GetPointer(); | ||
| return (s32*)GetResourceDataByNameHandlingMQ(path); |
There was a problem hiding this comment.
everything here is now happening in GetResourceDataByNameHandlingMQ, this makes sense
null
Build Artifacts