mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-09-04 19:21:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Support for new ucode loading patterns (#4038)

Browse Source
This commit is contained in:
Archez
2024-04-04 12:26:14 -04:00
committed by GitHub
parent 86c6013888
commit fd7dfd8b6f
4 changed files with 80 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c
+8 -9
View File
@@ -7,6 +7,8 @@
#include "textures/icon_item_dungeon_static/icon_item_dungeon_static.h"
#include "textures/icon_item_nes_static/icon_item_nes_static.h"
#include "public/bridge/gfxbridge.h"
void KaleidoScope_DrawDungeonMap(PlayState* play, GraphicsContext* gfxCtx) {
static void* dungeonItemTexs[] = {
gQuestIconDungeonBossKeyTex,
@@ -592,19 +594,16 @@ void KaleidoScope_DrawWorldMap(PlayState* play, GraphicsContext* gfxCtx) {
gSP1Quadrangle(POLY_KAL_DISP++, j, j + 2, j + 3, j + 1, 0);
} else if (HREG(15) == 1) {
Gfx* sp1CC = POLY_KAL_DISP;
void* mapImage = gWorldMapImageTex;
Gfx* gfx = POLY_KAL_DISP;
// gSPLoadUcodeL(sp1CC++, rspS2DEX)?
//gSPLoadUcodeEx(sp1CC++, OS_K0_TO_PHYSICAL(D_80113070), OS_K0_TO_PHYSICAL(D_801579A0), 0x800);
gSPLoadUcodeL(gfx++, ucode_s2dex);
func_8009638C(&sp1CC, mapImage, gWorldMapImageTLUT, 216, 128, G_IM_FMT_CI, G_IM_SIZ_8b, 0x8000, 256,
HREG(13) / 100.0f, HREG(14) / 100.0f);
Room_DrawBackground2D(&gfx, gWorldMapImageTex, gWorldMapImageTLUT, 216, 128, G_IM_FMT_CI, G_IM_SIZ_8b,
G_TT_RGBA16, 256, HREG(13) / 100.0f, HREG(14) / 100.0f);
// gSPLoadUcode(sp1CC++, SysUcode_GetUCode(), SysUcode_GetUCodeData())?
gSPLoadUcodeEx(sp1CC++, SysUcode_GetUCode(), SysUcode_GetUCodeData(), 0x800);
gSPLoadUcode(gfx++, SysUcode_GetUCode());
POLY_KAL_DISP = sp1CC;
POLY_KAL_DISP = gfx;
}
if (HREG(15) == 2) {