mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-17 23:15:11 -05:00
Code Issues Projects Releases Wiki Activity

kaleido stuffs

Browse Source
This commit is contained in:
Baoulettes 2022-06-26 23:17:28 +02:00
parent e6c3c71649
commit a9b1695ed5
7 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
View File

@ -76,7 +76,7 @@ void KaleidoScope_DrawQuestStatus(GlobalContext* globalCtx, GraphicsContext* gfx
s16 sp208[3]; s16 sp208[3];
bool dpad = CVar_GetS32("gDpadPauseName", 0); bool dpad = CVar_GetS32("gDpadPauseName", 0);
OPEN_DISPS(gfxCtx, "../z_kaleido_collect.c", 248); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
if ((!pauseCtx->unk_1E4 || (pauseCtx->unk_1E4 == 5) || (pauseCtx->unk_1E4 == 8)) && if ((!pauseCtx->unk_1E4 || (pauseCtx->unk_1E4 == 5) || (pauseCtx->unk_1E4 == 8)) &&
(pauseCtx->pageIndex == PAUSE_QUEST)) { (pauseCtx->pageIndex == PAUSE_QUEST)) {
@ -694,7 +694,7 @@ void KaleidoScope_DrawQuestStatus(GlobalContext* globalCtx, GraphicsContext* gfx
} }
} }
CLOSE_DISPS(gfxCtx, "../z_kaleido_collect.c", 863); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
s32 KaleidoScope_UpdateQuestStatusPoint(PauseContext* pauseCtx, s32 point) { s32 KaleidoScope_UpdateQuestStatusPoint(PauseContext* pauseCtx, s32 point) {

8
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c
View File

@ -82,7 +82,7 @@ void KaleidoScope_DrawDebugEditorText(Gfx** gfxp) {
extern const char* digitTextures[]; extern const char* digitTextures[];
void KaleidoScope_DrawDigit(GlobalContext* globalCtx, s32 digit, s32 rectLeft, s32 rectTop) { void KaleidoScope_DrawDigit(GlobalContext* globalCtx, s32 digit, s32 rectLeft, s32 rectTop) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_kaleido_debug.c", 208); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
gDPLoadTextureBlock(POLY_KAL_DISP++, digitTextures[digit], G_IM_FMT_I, G_IM_SIZ_8b, 8, 16, 0, gDPLoadTextureBlock(POLY_KAL_DISP++, digitTextures[digit], G_IM_FMT_I, G_IM_SIZ_8b, 8, 16, 0,
G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
@ -90,7 +90,7 @@ void KaleidoScope_DrawDigit(GlobalContext* globalCtx, s32 digit, s32 rectLeft, s
gSPTextureRectangle(POLY_KAL_DISP++, rectLeft << 2, rectTop << 2, (rectLeft + 8) << 2, (rectTop + 16) << 2, gSPTextureRectangle(POLY_KAL_DISP++, rectLeft << 2, rectTop << 2, (rectLeft + 8) << 2, (rectTop + 16) << 2,
G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_kaleido_debug.c", 220); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void KaleidoScope_DrawDebugEditor(GlobalContext* globalCtx) { void KaleidoScope_DrawDebugEditor(GlobalContext* globalCtx) {
@ -110,7 +110,7 @@ void KaleidoScope_DrawDebugEditor(GlobalContext* globalCtx) {
s16 y; s16 y;
s32 dBtnInput = input->cur.button & (BTN_DUP | BTN_DDOWN | BTN_DLEFT | BTN_DRIGHT); s32 dBtnInput = input->cur.button & (BTN_DUP | BTN_DDOWN | BTN_DLEFT | BTN_DRIGHT);
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_kaleido_debug.c", 402); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
pauseCtx->stickRelX = input->rel.stick_x; pauseCtx->stickRelX = input->rel.stick_x;
pauseCtx->stickRelY = input->rel.stick_y; pauseCtx->stickRelY = input->rel.stick_y;
@ -650,5 +650,5 @@ void KaleidoScope_DrawDebugEditor(GlobalContext* globalCtx) {
pauseCtx->debugState = 0; pauseCtx->debugState = 0;
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_kaleido_debug.c", 861); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

8
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
View File

@ -27,7 +27,7 @@ void KaleidoScope_DrawEquipmentImage(GlobalContext* globalCtx, void* source, u32
s32 pad; s32 pad;
s32 i; s32 i;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_kaleido_equipment.c", 68); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
gDPPipeSync(POLY_KAL_DISP++); gDPPipeSync(POLY_KAL_DISP++);
gDPSetCombineMode(POLY_KAL_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); gDPSetCombineMode(POLY_KAL_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
@ -86,7 +86,7 @@ void KaleidoScope_DrawEquipmentImage(GlobalContext* globalCtx, void* source, u32
vtxIndex += 4; vtxIndex += 4;
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_kaleido_equipment.c", 122); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
Vec3s link_kaleido_rot = { 0, 32300, 0 }; // Default rotation link face us. Vec3s link_kaleido_rot = { 0, 32300, 0 }; // Default rotation link face us.
@ -166,7 +166,7 @@ void KaleidoScope_DrawEquipment(GlobalContext* globalCtx) {
s16 oldCursorPoint; s16 oldCursorPoint;
bool dpad = CVar_GetS32("gDpadPauseName", 0); bool dpad = CVar_GetS32("gDpadPauseName", 0);
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_kaleido_equipment.c", 219); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
gDPPipeSync(POLY_KAL_DISP++); gDPPipeSync(POLY_KAL_DISP++);
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, ZREG(39), ZREG(40), ZREG(41), pauseCtx->alpha); gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, ZREG(39), ZREG(40), ZREG(41), pauseCtx->alpha);
@ -682,5 +682,5 @@ void KaleidoScope_DrawEquipment(GlobalContext* globalCtx) {
if (gUpgradeMasks[0]) {} if (gUpgradeMasks[0]) {}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_kaleido_equipment.c", 609); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

8
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
View File

@ -20,7 +20,7 @@ void KaleidoScope_DrawAmmoCount(PauseContext* pauseCtx, GraphicsContext* gfxCtx,
s16 ammo; s16 ammo;
s16 i; s16 i;
OPEN_DISPS(gfxCtx, "../z_kaleido_item.c", 69); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
ammo = AMMO(item); ammo = AMMO(item);
@ -67,7 +67,7 @@ void KaleidoScope_DrawAmmoCount(PauseContext* pauseCtx, GraphicsContext* gfxCtx,
gSP1Quadrangle(POLY_KAL_DISP++, 0, 2, 3, 1, 0); gSP1Quadrangle(POLY_KAL_DISP++, 0, 2, 3, 1, 0);
CLOSE_DISPS(gfxCtx, "../z_kaleido_item.c", 116); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
void KaleidoScope_SetCursorVtx(PauseContext* pauseCtx, u16 index, Vtx* vtx) { void KaleidoScope_SetCursorVtx(PauseContext* pauseCtx, u16 index, Vtx* vtx) {
@ -98,7 +98,7 @@ void KaleidoScope_DrawItemSelect(GlobalContext* globalCtx) {
s16 moveCursorResult; s16 moveCursorResult;
bool dpad = CVar_GetS32("gDpadPauseName", 0); bool dpad = CVar_GetS32("gDpadPauseName", 0);
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_kaleido_item.c", 234); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_800949A8(globalCtx->state.gfxCtx); func_800949A8(globalCtx->state.gfxCtx);
@ -465,7 +465,7 @@ void KaleidoScope_DrawItemSelect(GlobalContext* globalCtx) {
} }
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_kaleido_item.c", 516); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void KaleidoScope_SetupItemEquip(GlobalContext* globalCtx, u16 item, u16 slot, s16 animX, s16 animY) { void KaleidoScope_SetupItemEquip(GlobalContext* globalCtx, u16 item, u16 slot, s16 animX, s16 animY) {

8
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c
View File

@ -54,7 +54,7 @@ void KaleidoScope_DrawDungeonMap(GlobalContext* globalCtx, GraphicsContext* gfxC
u16 rgba16; u16 rgba16;
bool dpad = CVar_GetS32("gDpadPauseName", 0); bool dpad = CVar_GetS32("gDpadPauseName", 0);
OPEN_DISPS(gfxCtx, "../z_kaleido_map_PAL.c", 123); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
if ((pauseCtx->state == 6) && (pauseCtx->unk_1E4 == 0) && (pauseCtx->pageIndex == PAUSE_MAP)) { if ((pauseCtx->state == 6) && (pauseCtx->unk_1E4 == 0) && (pauseCtx->pageIndex == PAUSE_MAP)) {
pauseCtx->cursorColorSet = 0; pauseCtx->cursorColorSet = 0;
@ -358,7 +358,7 @@ void KaleidoScope_DrawDungeonMap(GlobalContext* globalCtx, GraphicsContext* gfxC
gDPPipeSync(POLY_KAL_DISP++); gDPPipeSync(POLY_KAL_DISP++);
gDPSetTextureFilter(POLY_KAL_DISP++, G_TF_BILERP); gDPSetTextureFilter(POLY_KAL_DISP++, G_TF_BILERP);
CLOSE_DISPS(gfxCtx, "../z_kaleido_map_PAL.c", 388); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
void KaleidoScope_DrawWorldMap(GlobalContext* globalCtx, GraphicsContext* gfxCtx) { void KaleidoScope_DrawWorldMap(GlobalContext* globalCtx, GraphicsContext* gfxCtx) {
@ -421,7 +421,7 @@ void KaleidoScope_DrawWorldMap(GlobalContext* globalCtx, GraphicsContext* gfxCtx
s16 stepB; s16 stepB;
bool dpad = CVar_GetS32("gDpadPauseName", 0); bool dpad = CVar_GetS32("gDpadPauseName", 0);
OPEN_DISPS(gfxCtx, "../z_kaleido_map_PAL.c", 556); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
if ((pauseCtx->state == 6) && (pauseCtx->unk_1E4 == 0) && (pauseCtx->pageIndex == PAUSE_MAP)) { if ((pauseCtx->state == 6) && (pauseCtx->unk_1E4 == 0) && (pauseCtx->pageIndex == PAUSE_MAP)) {
pauseCtx->cursorColorSet = 0; pauseCtx->cursorColorSet = 0;
@ -741,5 +741,5 @@ void KaleidoScope_DrawWorldMap(GlobalContext* globalCtx, GraphicsContext* gfxCtx
gDPPipeSync(POLY_KAL_DISP++); gDPPipeSync(POLY_KAL_DISP++);
CLOSE_DISPS(gfxCtx, "../z_kaleido_map_PAL.c", 874); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }

70
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
View File

@ -853,14 +853,14 @@ void KaleidoScope_MoveCursorToSpecialPos(GlobalContext* globalCtx, u16 specialPo
} }
void KaleidoScope_DrawQuadTextureRGBA32(GraphicsContext* gfxCtx, void* texture, u16 width, u16 height, u16 point) { void KaleidoScope_DrawQuadTextureRGBA32(GraphicsContext* gfxCtx, void* texture, u16 width, u16 height, u16 point) {
OPEN_DISPS(gfxCtx, "../z_kaleido_scope_PAL.c", 748); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
gDPLoadTextureBlock(POLY_KAL_DISP++, texture, G_IM_FMT_RGBA, G_IM_SIZ_32b, width, height, 0, gDPLoadTextureBlock(POLY_KAL_DISP++, texture, G_IM_FMT_RGBA, G_IM_SIZ_32b, width, height, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
G_TX_NOLOD); G_TX_NOLOD);
gSP1Quadrangle(POLY_KAL_DISP++, point, point + 2, point + 3, point + 1, 0); gSP1Quadrangle(POLY_KAL_DISP++, point, point + 2, point + 3, point + 1, 0);
CLOSE_DISPS(gfxCtx, "../z_kaleido_scope_PAL.c", 758); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
void KaleidoScope_SetDefaultCursor(GlobalContext* globalCtx) { void KaleidoScope_SetDefaultCursor(GlobalContext* globalCtx) {
@ -981,7 +981,7 @@ void KaleidoScope_DrawCursor(GlobalContext* globalCtx, u16 pageIndex) {
PauseContext* pauseCtx = &globalCtx->pauseCtx; PauseContext* pauseCtx = &globalCtx->pauseCtx;
u16 temp; u16 temp;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_kaleido_scope_PAL.c", 955); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
temp = pauseCtx->unk_1E4; temp = pauseCtx->unk_1E4;
@ -1036,7 +1036,7 @@ void KaleidoScope_DrawCursor(GlobalContext* globalCtx, u16 pageIndex) {
gDPSetEnvColor(POLY_KAL_DISP++, 0, 0, 0, 255); gDPSetEnvColor(POLY_KAL_DISP++, 0, 0, 0, 255);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_kaleido_scope_PAL.c", 985); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
Gfx* KaleidoScope_DrawPageSections(Gfx* gfx, Vtx* vertices, void** textures) { Gfx* KaleidoScope_DrawPageSections(Gfx* gfx, Vtx* vertices, void** textures) {
@ -1131,7 +1131,7 @@ void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) {
s16 stepB; s16 stepB;
FrameInterpolation_RecordOpenChild(NULL, pauseCtx->state + pauseCtx->pageIndex * 100); FrameInterpolation_RecordOpenChild(NULL, pauseCtx->state + pauseCtx->pageIndex * 100);
OPEN_DISPS(gfxCtx, "../z_kaleido_scope_PAL.c", 1100); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
if ((pauseCtx->state < 8) || (pauseCtx->state > 0x11)) { if ((pauseCtx->state < 8) || (pauseCtx->state > 0x11)) {
if (pauseCtx->state != 7) { if (pauseCtx->state != 7) {
@ -1273,7 +1273,7 @@ void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) {
Matrix_Scale(0.78f, 0.78f, 0.78f, MTXMODE_APPLY); Matrix_Scale(0.78f, 0.78f, 0.78f, MTXMODE_APPLY);
Matrix_RotateX(-pauseCtx->unk_1F4 / 100.0f, MTXMODE_APPLY); Matrix_RotateX(-pauseCtx->unk_1F4 / 100.0f, MTXMODE_APPLY);
gSPMatrix(POLY_KAL_DISP++, Matrix_NewMtx(gfxCtx, "../z_kaleido_scope_PAL.c", 1173), gSPMatrix(POLY_KAL_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
POLY_KAL_DISP = KaleidoScope_DrawPageSections(POLY_KAL_DISP, pauseCtx->itemPageVtx, POLY_KAL_DISP = KaleidoScope_DrawPageSections(POLY_KAL_DISP, pauseCtx->itemPageVtx,
@ -1291,7 +1291,7 @@ void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) {
Matrix_RotateZ(pauseCtx->unk_1F8 / 100.0f, MTXMODE_APPLY); Matrix_RotateZ(pauseCtx->unk_1F8 / 100.0f, MTXMODE_APPLY);
Matrix_RotateY(1.57f, MTXMODE_APPLY); Matrix_RotateY(1.57f, MTXMODE_APPLY);
gSPMatrix(POLY_KAL_DISP++, Matrix_NewMtx(gfxCtx, "../z_kaleido_scope_PAL.c", 1196), gSPMatrix(POLY_KAL_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
POLY_KAL_DISP = KaleidoScope_DrawPageSections(POLY_KAL_DISP, pauseCtx->equipPageVtx, POLY_KAL_DISP = KaleidoScope_DrawPageSections(POLY_KAL_DISP, pauseCtx->equipPageVtx,
@ -1310,7 +1310,7 @@ void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) {
Matrix_RotateX(pauseCtx->unk_200 / 100.0f, MTXMODE_APPLY); Matrix_RotateX(pauseCtx->unk_200 / 100.0f, MTXMODE_APPLY);
Matrix_RotateY(3.14f, MTXMODE_APPLY); Matrix_RotateY(3.14f, MTXMODE_APPLY);
gSPMatrix(POLY_KAL_DISP++, Matrix_NewMtx(gfxCtx, "../z_kaleido_scope_PAL.c", 1220), gSPMatrix(POLY_KAL_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
POLY_KAL_DISP = KaleidoScope_DrawPageSections(POLY_KAL_DISP, pauseCtx->questPageVtx, POLY_KAL_DISP = KaleidoScope_DrawPageSections(POLY_KAL_DISP, pauseCtx->questPageVtx,
@ -1329,7 +1329,7 @@ void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) {
Matrix_RotateZ(-pauseCtx->unk_1FC / 100.0f, MTXMODE_APPLY); Matrix_RotateZ(-pauseCtx->unk_1FC / 100.0f, MTXMODE_APPLY);
Matrix_RotateY(-1.57f, MTXMODE_APPLY); Matrix_RotateY(-1.57f, MTXMODE_APPLY);
gSPMatrix(POLY_KAL_DISP++, Matrix_NewMtx(gfxCtx, "../z_kaleido_scope_PAL.c", 1243), gSPMatrix(POLY_KAL_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
POLY_KAL_DISP = POLY_KAL_DISP =
@ -1358,7 +1358,7 @@ void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) {
Matrix_Scale(0.78f, 0.78f, 0.78f, MTXMODE_APPLY); Matrix_Scale(0.78f, 0.78f, 0.78f, MTXMODE_APPLY);
Matrix_RotateX(-pauseCtx->unk_1F4 / 100.0f, MTXMODE_APPLY); Matrix_RotateX(-pauseCtx->unk_1F4 / 100.0f, MTXMODE_APPLY);
gSPMatrix(POLY_KAL_DISP++, Matrix_NewMtx(gfxCtx, "../z_kaleido_scope_PAL.c", 1281), gSPMatrix(POLY_KAL_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
POLY_KAL_DISP = KaleidoScope_DrawPageSections(POLY_KAL_DISP, pauseCtx->itemPageVtx, POLY_KAL_DISP = KaleidoScope_DrawPageSections(POLY_KAL_DISP, pauseCtx->itemPageVtx,
@ -1373,7 +1373,7 @@ void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) {
Matrix_RotateZ(-pauseCtx->unk_1FC / 100.0f, MTXMODE_APPLY); Matrix_RotateZ(-pauseCtx->unk_1FC / 100.0f, MTXMODE_APPLY);
Matrix_RotateY(-1.57f, MTXMODE_APPLY); Matrix_RotateY(-1.57f, MTXMODE_APPLY);
gSPMatrix(POLY_KAL_DISP++, Matrix_NewMtx(gfxCtx, "../z_kaleido_scope_PAL.c", 1303), gSPMatrix(POLY_KAL_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
POLY_KAL_DISP = POLY_KAL_DISP =
@ -1405,7 +1405,7 @@ void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) {
Matrix_RotateX(pauseCtx->unk_200 / 100.0f, MTXMODE_APPLY); Matrix_RotateX(pauseCtx->unk_200 / 100.0f, MTXMODE_APPLY);
Matrix_RotateY(3.14f, MTXMODE_APPLY); Matrix_RotateY(3.14f, MTXMODE_APPLY);
gSPMatrix(POLY_KAL_DISP++, Matrix_NewMtx(gfxCtx, "../z_kaleido_scope_PAL.c", 1343), gSPMatrix(POLY_KAL_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
POLY_KAL_DISP = KaleidoScope_DrawPageSections(POLY_KAL_DISP, pauseCtx->questPageVtx, POLY_KAL_DISP = KaleidoScope_DrawPageSections(POLY_KAL_DISP, pauseCtx->questPageVtx,
@ -1424,7 +1424,7 @@ void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) {
Matrix_RotateZ(pauseCtx->unk_1F8 / 100.0f, MTXMODE_APPLY); Matrix_RotateZ(pauseCtx->unk_1F8 / 100.0f, MTXMODE_APPLY);
Matrix_RotateY(1.57f, MTXMODE_APPLY); Matrix_RotateY(1.57f, MTXMODE_APPLY);
gSPMatrix(POLY_KAL_DISP++, Matrix_NewMtx(gfxCtx, "../z_kaleido_scope_PAL.c", 1367), gSPMatrix(POLY_KAL_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
POLY_KAL_DISP = KaleidoScope_DrawPageSections(POLY_KAL_DISP, pauseCtx->equipPageVtx, POLY_KAL_DISP = KaleidoScope_DrawPageSections(POLY_KAL_DISP, pauseCtx->equipPageVtx,
@ -1475,7 +1475,7 @@ void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) {
Matrix_RotateY(1.57f, MTXMODE_APPLY); Matrix_RotateY(1.57f, MTXMODE_APPLY);
} }
gSPMatrix(POLY_KAL_DISP++, Matrix_NewMtx(gfxCtx, "../z_kaleido_scope_PAL.c", 1424), gSPMatrix(POLY_KAL_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if ((pauseCtx->state >= 8) && (pauseCtx->state <= 0x11)) { if ((pauseCtx->state >= 8) && (pauseCtx->state <= 0x11)) {
@ -1553,7 +1553,7 @@ void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) {
} }
} }
CLOSE_DISPS(gfxCtx, "../z_kaleido_scope_PAL.c", 1577); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
FrameInterpolation_RecordCloseChild(); FrameInterpolation_RecordCloseChild();
} }
@ -1617,7 +1617,7 @@ void KaleidoScope_DrawInfoPanel(GlobalContext* globalCtx) {
s16 i; s16 i;
s16 j; s16 j;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_kaleido_scope_PAL.c", 1676); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
stepR = ABS(D_808321A0 - D_8082ADF0[D_8082AE04][0]) / D_8082AE00; stepR = ABS(D_808321A0 - D_8082ADF0[D_8082AE04][0]) / D_8082AE00;
stepG = ABS(D_808321A2 - D_8082ADF0[D_8082AE04][1]) / D_8082AE00; stepG = ABS(D_808321A2 - D_8082ADF0[D_8082AE04][1]) / D_8082AE00;
@ -1745,7 +1745,7 @@ void KaleidoScope_DrawInfoPanel(GlobalContext* globalCtx) {
Matrix_Translate(0.0f, 0.0f, -144.0f, MTXMODE_NEW); Matrix_Translate(0.0f, 0.0f, -144.0f, MTXMODE_NEW);
Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY); Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_KAL_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_kaleido_scope_PAL.c", 1755), gSPMatrix(POLY_KAL_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 90, 100, 130, 255); gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 90, 100, 130, 255);
@ -2050,7 +2050,7 @@ void KaleidoScope_DrawInfoPanel(GlobalContext* globalCtx) {
} }
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_kaleido_scope_PAL.c", 2032); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void KaleidoScope_UpdateNamePanel(GlobalContext* globalCtx) { void KaleidoScope_UpdateNamePanel(GlobalContext* globalCtx) {
@ -2938,7 +2938,7 @@ void KaleidoScope_InitVertices(GlobalContext* globalCtx, GraphicsContext* gfxCtx
void KaleidoScope_DrawGameOver(GlobalContext* globalCtx) { void KaleidoScope_DrawGameOver(GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
OPEN_DISPS(gfxCtx, "../z_kaleido_scope_PAL.c", 3122); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
func_800944C4(gfxCtx); func_800944C4(gfxCtx);
@ -2977,7 +2977,7 @@ void KaleidoScope_DrawGameOver(GlobalContext* globalCtx) {
gSPTextureRectangle(POLY_KAL_DISP++, (VREG(87) + 128) << 2, VREG(88) << 2, (VREG(87) + 192) << 2, gSPTextureRectangle(POLY_KAL_DISP++, (VREG(87) + 128) << 2, VREG(88) << 2, (VREG(87) + 192) << 2,
(VREG(88) + 32) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); (VREG(88) + 32) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
CLOSE_DISPS(gfxCtx, "../z_kaleido_scope_PAL.c", 3169); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
void KaleidoScope_Draw(GlobalContext* globalCtx) { void KaleidoScope_Draw(GlobalContext* globalCtx) {
@ -2985,7 +2985,7 @@ void KaleidoScope_Draw(GlobalContext* globalCtx) {
PauseContext* pauseCtx = &globalCtx->pauseCtx; PauseContext* pauseCtx = &globalCtx->pauseCtx;
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_kaleido_scope_PAL.c", 3188); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
pauseCtx->stickRelX = input->rel.stick_x; pauseCtx->stickRelX = input->rel.stick_x;
pauseCtx->stickRelY = input->rel.stick_y; pauseCtx->stickRelY = input->rel.stick_y;
@ -3027,7 +3027,7 @@ void KaleidoScope_Draw(GlobalContext* globalCtx) {
func_800AAA50(&globalCtx->view, 15); func_800AAA50(&globalCtx->view, 15);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_kaleido_scope_PAL.c", 3254); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
uint32_t _bswap32(uint32_t a) uint32_t _bswap32(uint32_t a)
@ -3277,7 +3277,7 @@ void KaleidoScope_Update(GlobalContext* globalCtx)
size0 = (uintptr_t)_icon_item_staticSegmentRomEnd - (uintptr_t)_icon_item_staticSegmentRomStart; size0 = (uintptr_t)_icon_item_staticSegmentRomEnd - (uintptr_t)_icon_item_staticSegmentRomStart;
osSyncPrintf("icon_item size0=%x\n", size0); osSyncPrintf("icon_item size0=%x\n", size0);
DmaMgr_SendRequest1(pauseCtx->iconItemSegment, (uintptr_t)_icon_item_staticSegmentRomStart, size0, DmaMgr_SendRequest1(pauseCtx->iconItemSegment, (uintptr_t)_icon_item_staticSegmentRomStart, size0,
"../z_kaleido_scope_PAL.c", 3662); __FILE__, __LINE__);
gSegments[8] = VIRTUAL_TO_PHYSICAL(pauseCtx->iconItemSegment); gSegments[8] = VIRTUAL_TO_PHYSICAL(pauseCtx->iconItemSegment);
@ -3287,7 +3287,7 @@ void KaleidoScope_Update(GlobalContext* globalCtx)
//size = (uintptr_t)_icon_item_24_staticSegmentRomEnd - (uintptr_t)_icon_item_24_staticSegmentRomStart; //size = (uintptr_t)_icon_item_24_staticSegmentRomEnd - (uintptr_t)_icon_item_24_staticSegmentRomStart;
//osSyncPrintf("icon_item24 size=%x\n", size); //osSyncPrintf("icon_item24 size=%x\n", size);
//DmaMgr_SendRequest1(pauseCtx->iconItem24Segment, (uintptr_t)_icon_item_24_staticSegmentRomStart, size, //DmaMgr_SendRequest1(pauseCtx->iconItem24Segment, (uintptr_t)_icon_item_24_staticSegmentRomStart, size,
//"../z_kaleido_scope_PAL.c", 3675); //__FILE__, __LINE__);
//pauseCtx->iconItemAltSegment = (void*)(((uintptr_t)pauseCtx->iconItem24Segment + size + 0xF) & ~0xF); //pauseCtx->iconItemAltSegment = (void*)(((uintptr_t)pauseCtx->iconItem24Segment + size + 0xF) & ~0xF);
#endif #endif
@ -3316,7 +3316,7 @@ void KaleidoScope_Update(GlobalContext* globalCtx)
//size2 = (uintptr_t)_icon_item_dungeon_staticSegmentRomEnd - (uintptr_t)_icon_item_dungeon_staticSegmentRomStart; //size2 = (uintptr_t)_icon_item_dungeon_staticSegmentRomEnd - (uintptr_t)_icon_item_dungeon_staticSegmentRomStart;
//osSyncPrintf("icon_item_dungeon dungeon-size2=%x\n", size2); //osSyncPrintf("icon_item_dungeon dungeon-size2=%x\n", size2);
//DmaMgr_SendRequest1(pauseCtx->iconItemAltSegment, (uintptr_t)_icon_item_dungeon_staticSegmentRomStart, //DmaMgr_SendRequest1(pauseCtx->iconItemAltSegment, (uintptr_t)_icon_item_dungeon_staticSegmentRomStart,
//size2, "../z_kaleido_scope_PAL.c", 3712); //size2, __FILE__, __LINE__);
#endif #endif
interfaceCtx->mapPalette[28] = 6; interfaceCtx->mapPalette[28] = 6;
@ -3330,7 +3330,7 @@ void KaleidoScope_Update(GlobalContext* globalCtx)
//size2 = (uintptr_t)_icon_item_field_staticSegmentRomEnd - (uintptr_t)_icon_item_field_staticSegmentRomStart; //size2 = (uintptr_t)_icon_item_field_staticSegmentRomEnd - (uintptr_t)_icon_item_field_staticSegmentRomStart;
//osSyncPrintf("icon_item_field field-size2=%x\n", size2); //osSyncPrintf("icon_item_field field-size2=%x\n", size2);
//DmaMgr_SendRequest1(pauseCtx->iconItemAltSegment, (uintptr_t)_icon_item_field_staticSegmentRomStart, //DmaMgr_SendRequest1(pauseCtx->iconItemAltSegment, (uintptr_t)_icon_item_field_staticSegmentRomStart,
//size2, "../z_kaleido_scope_PAL.c", 3726); //size2, __FILE__, __LINE__);
#endif #endif
break; break;
} }
@ -3343,17 +3343,17 @@ void KaleidoScope_Update(GlobalContext* globalCtx)
//size = (uintptr_t)_icon_item_nes_staticSegmentRomEnd - (uintptr_t)_icon_item_nes_staticSegmentRomStart; //size = (uintptr_t)_icon_item_nes_staticSegmentRomEnd - (uintptr_t)_icon_item_nes_staticSegmentRomStart;
//osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size); //osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size);
//DmaMgr_SendRequest1(pauseCtx->iconItemLangSegment, _icon_item_nes_staticSegmentRomStart, size, //DmaMgr_SendRequest1(pauseCtx->iconItemLangSegment, _icon_item_nes_staticSegmentRomStart, size,
//"../z_kaleido_scope_PAL.c", 3739); //__FILE__, __LINE__);
} else if (gSaveContext.language == LANGUAGE_GER) { } else if (gSaveContext.language == LANGUAGE_GER) {
//size = (uintptr_t)_icon_item_ger_staticSegmentRomEnd - (uintptr_t)_icon_item_ger_staticSegmentRomStart; //size = (uintptr_t)_icon_item_ger_staticSegmentRomEnd - (uintptr_t)_icon_item_ger_staticSegmentRomStart;
//osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size); //osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size);
//DmaMgr_SendRequest1(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_ger_staticSegmentRomStart, size, //DmaMgr_SendRequest1(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_ger_staticSegmentRomStart, size,
//"../z_kaleido_scope_PAL.c", 3746); //__FILE__, __LINE__);
} else { } else {
//size = (uintptr_t)_icon_item_fra_staticSegmentRomEnd - (uintptr_t)_icon_item_fra_staticSegmentRomStart; //size = (uintptr_t)_icon_item_fra_staticSegmentRomEnd - (uintptr_t)_icon_item_fra_staticSegmentRomStart;
//osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size); //osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size);
//DmaMgr_SendRequest1(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_fra_staticSegmentRomStart, size, //DmaMgr_SendRequest1(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_fra_staticSegmentRomStart, size,
//"../z_kaleido_scope_PAL.c", 3753); //__FILE__, __LINE__);
} }
#endif #endif
@ -3892,19 +3892,19 @@ void KaleidoScope_Update(GlobalContext* globalCtx)
size0 = (uintptr_t)_icon_item_staticSegmentRomEnd - (uintptr_t)_icon_item_staticSegmentRomStart; size0 = (uintptr_t)_icon_item_staticSegmentRomEnd - (uintptr_t)_icon_item_staticSegmentRomStart;
osSyncPrintf("icon_item size0=%x\n", size0); osSyncPrintf("icon_item size0=%x\n", size0);
DmaMgr_SendRequest1(pauseCtx->iconItemSegment, (uintptr_t)_icon_item_staticSegmentRomStart, size0, DmaMgr_SendRequest1(pauseCtx->iconItemSegment, (uintptr_t)_icon_item_staticSegmentRomStart, size0,
"../z_kaleido_scope_PAL.c", 4356); __FILE__, __LINE__);
pauseCtx->iconItem24Segment = (void*)(((uintptr_t)pauseCtx->iconItemSegment + size0 + 0xF) & ~0xF); pauseCtx->iconItem24Segment = (void*)(((uintptr_t)pauseCtx->iconItemSegment + size0 + 0xF) & ~0xF);
//size = (uintptr_t)_icon_item_24_staticSegmentRomEnd - (uintptr_t)_icon_item_24_staticSegmentRomStart; //size = (uintptr_t)_icon_item_24_staticSegmentRomEnd - (uintptr_t)_icon_item_24_staticSegmentRomStart;
osSyncPrintf("icon_item24 size=%x\n", size); osSyncPrintf("icon_item24 size=%x\n", size);
//DmaMgr_SendRequest1(pauseCtx->iconItem24Segment, (uintptr_t)_icon_item_24_staticSegmentRomStart, size, //DmaMgr_SendRequest1(pauseCtx->iconItem24Segment, (uintptr_t)_icon_item_24_staticSegmentRomStart, size,
//"../z_kaleido_scope_PAL.c", 4363); //__FILE__, __LINE__);
pauseCtx->iconItemAltSegment = (void*)(((uintptr_t)pauseCtx->iconItem24Segment + size + 0xF) & ~0xF); pauseCtx->iconItemAltSegment = (void*)(((uintptr_t)pauseCtx->iconItem24Segment + size + 0xF) & ~0xF);
//size2 = (uintptr_t)_icon_item_gameover_staticSegmentRomEnd - (uintptr_t)_icon_item_gameover_staticSegmentRomStart; //size2 = (uintptr_t)_icon_item_gameover_staticSegmentRomEnd - (uintptr_t)_icon_item_gameover_staticSegmentRomStart;
//osSyncPrintf("icon_item_dungeon gameover-size2=%x\n", size2); //osSyncPrintf("icon_item_dungeon gameover-size2=%x\n", size2);
//DmaMgr_SendRequest1(pauseCtx->iconItemAltSegment, (uintptr_t)_icon_item_gameover_staticSegmentRomStart, size2, //DmaMgr_SendRequest1(pauseCtx->iconItemAltSegment, (uintptr_t)_icon_item_gameover_staticSegmentRomStart, size2,
//"../z_kaleido_scope_PAL.c", 4370); //__FILE__, __LINE__);
pauseCtx->iconItemLangSegment = (void*)(((uintptr_t)pauseCtx->iconItemAltSegment + size2 + 0xF) & ~0xF); pauseCtx->iconItemLangSegment = (void*)(((uintptr_t)pauseCtx->iconItemAltSegment + size2 + 0xF) & ~0xF);
@ -3913,17 +3913,17 @@ void KaleidoScope_Update(GlobalContext* globalCtx)
size = (uintptr_t)_icon_item_nes_staticSegmentRomEnd - (uintptr_t)_icon_item_nes_staticSegmentRomStart; size = (uintptr_t)_icon_item_nes_staticSegmentRomEnd - (uintptr_t)_icon_item_nes_staticSegmentRomStart;
osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size); osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size);
DmaMgr_SendRequest1(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_nes_staticSegmentRomStart, size, DmaMgr_SendRequest1(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_nes_staticSegmentRomStart, size,
"../z_kaleido_scope_PAL.c", 4379); __FILE__, __LINE__);
} else if (gSaveContext.language == LANGUAGE_GER) { } else if (gSaveContext.language == LANGUAGE_GER) {
size = (uintptr_t)_icon_item_ger_staticSegmentRomEnd - (uintptr_t)_icon_item_ger_staticSegmentRomStart; size = (uintptr_t)_icon_item_ger_staticSegmentRomEnd - (uintptr_t)_icon_item_ger_staticSegmentRomStart;
osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size); osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size);
DmaMgr_SendRequest1(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_ger_staticSegmentRomStart, size, DmaMgr_SendRequest1(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_ger_staticSegmentRomStart, size,
"../z_kaleido_scope_PAL.c", 4386); __FILE__, __LINE__);
} else { } else {
size = (uintptr_t)_icon_item_fra_staticSegmentRomEnd - (uintptr_t)_icon_item_fra_staticSegmentRomStart; size = (uintptr_t)_icon_item_fra_staticSegmentRomEnd - (uintptr_t)_icon_item_fra_staticSegmentRomStart;
osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size); osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size);
DmaMgr_SendRequest1(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_fra_staticSegmentRomStart, size, DmaMgr_SendRequest1(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_fra_staticSegmentRomStart, size,
"../z_kaleido_scope_PAL.c", 4393); __FILE__, __LINE__);
} }
*/ */
#endif #endif

6
soh/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c
View File

@ -53,7 +53,7 @@ void PauseMapMark_DrawForDungeon(GlobalContext* globalCtx) {
mapMarkData = &gLoadedPauseMarkDataTable[R_MAP_TEX_INDEX >> 1][i]; mapMarkData = &gLoadedPauseMarkDataTable[R_MAP_TEX_INDEX >> 1][i];
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_lmap_mark.c", 182); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
while (true) { while (true) {
if (mapMarkData->markType == PAUSE_MAP_MARK_NONE) { if (mapMarkData->markType == PAUSE_MAP_MARK_NONE) {
@ -129,7 +129,7 @@ void PauseMapMark_DrawForDungeon(GlobalContext* globalCtx) {
Matrix_Push(); Matrix_Push();
Matrix_Translate(GREG(92) + markPoint->x, GREG(93) + markPoint->y, 0.0f, MTXMODE_APPLY); Matrix_Translate(GREG(92) + markPoint->x, GREG(93) + markPoint->y, 0.0f, MTXMODE_APPLY);
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
gSPMatrix(POLY_KAL_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_lmap_mark.c", 272), gSPMatrix(POLY_KAL_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
Matrix_Pop(); Matrix_Pop();
@ -144,7 +144,7 @@ void PauseMapMark_DrawForDungeon(GlobalContext* globalCtx) {
Matrix_Pop(); Matrix_Pop();
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_lmap_mark.c", 286); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void PauseMapMark_Draw(GlobalContext* globalCtx) { void PauseMapMark_Draw(GlobalContext* globalCtx) {