izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix cross and circle for island jumping minigames (#274)

Browse Source
This commit is contained in:
Archez
2024-05-22 09:05:03 -05:00
committed by Garrett Cox
parent 448237c606
commit 0f0bca2a74
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mm/2s2h/Enhancements/GfxPatcher/AuthenticGfxPatches.cpp
+10 -8
View File
@@ -4,6 +4,7 @@ extern "C" {
#include <libultraship/libultra.h>
#include "objects/object_uch/object_uch.h"
#include "overlays/ovl_En_Syateki_Okuta/ovl_En_Syateki_Okuta.h"
#include "overlays/ovl_Obj_Jgame_Light/ovl_Obj_Jgame_Light.h"
void ResourceMgr_PatchGfxByName(const char* path, const char* patchName, int index, Gfx instruction);
void ResourceMgr_UnpatchGfxByName(const char* path, const char* patchName);
@@ -19,11 +20,12 @@ void PatchAlienEyeBeams() {
PRIMITIVE_ALPHA, PRIMITIVE, COMBINED, 0, TEXEL0, 0));
}
void PatchShootingGalleryOctorokSymbols() {
// The X and O displayed in the shooting gallery when hit are incorrectly set to FMT_I instead of FMT_IA,
void PatchMiniGameCrossAndCircleSymbols() {
// The X and O displayed in mini-games are incorrectly set to FMT_I instead of FMT_IA,
// Fast3D throws an assert and does nothing as FMT_I with SIZ_16 is not a valid texture type.
// Patching all the relevant instructions to use FMT_IA matching the exported texture
const char* dLists[] = { gShootingGalleryOctorokCrossDL, gShootingGalleryOctorokCircleDL };
const char* dLists[] = { gShootingGalleryOctorokCrossDL, gShootingGalleryOctorokCircleDL,
gObjJgameLightIncorrectDL, gObjJgameLightCorrectDL };
for (auto& dl : dLists) {
Gfx* instructions = ResourceMgr_LoadGfxByName(dl);
@@ -31,21 +33,21 @@ void PatchShootingGalleryOctorokSymbols() {
// Use a mask to unset and set the new format while preserving the rest of the instruction
const uintptr_t mask = UINTPTR_MAX ^ (_SHIFTL(7, 21, 3));
Gfx in3 = instructions[3]; // G_SETTIMG_OTR_HAS
Gfx in3 = instructions[3]; // G_SETTIMG_OTR_HASH
in3.words.w0 = (in3.words.w0 & mask) | _SHIFTL(G_IM_FMT_IA, 21, 3);
Gfx in5 = instructions[5]; // G_SETTILE
in5.words.w0 = (in5.words.w0 & mask) | _SHIFTL(G_IM_FMT_IA, 21, 3);
Gfx in9 = instructions[9]; // G_SETTILE
in9.words.w0 = (in9.words.w0 & mask) | _SHIFTL(G_IM_FMT_IA, 21, 3);
ResourceMgr_PatchGfxByName(dl, "ShootingGalleryHitFix_3", 3, in3);
ResourceMgr_PatchGfxByName(dl, "ShootingGalleryHitFix_5", 5, in5);
ResourceMgr_PatchGfxByName(dl, "ShootingGalleryHitFix_9", 9, in9);
ResourceMgr_PatchGfxByName(dl, "SymbolFormatFix_3", 3, in3);
ResourceMgr_PatchGfxByName(dl, "SymbolFormatFix_5", 5, in5);
ResourceMgr_PatchGfxByName(dl, "SymbolFormatFix_9", 9, in9);
}
}
// Applies required patches for authentic bugs to allow the game to play and render properly
void GfxPatcher_ApplyNecessaryAuthenticPatches() {
PatchAlienEyeBeams();
PatchShootingGalleryOctorokSymbols();
PatchMiniGameCrossAndCircleSymbols();
}