mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-14 19:10:25 +00:00
Replace most osSyncPrintf calls with PRINTF macro (#1598)
* Replace most osSyncPrintf calls with PRINTF macro * DEBUG -> OOT_DEBUG
This commit is contained in:
cadmic
GitHub
parent
6eb3bf401c
commit
324db1d578
297 changed files with 2642 additions and 2679 deletions
|
|
@ -148,19 +148,18 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
|
|||
if (CHECK_QUEST_ITEM(pauseCtx->cursorPoint[PAUSE_QUEST])) {
|
||||
if (pauseCtx->cursorPoint[PAUSE_QUEST] < 6) {
|
||||
cursorItem = ITEM_MEDALLION_FOREST + pauseCtx->cursorPoint[PAUSE_QUEST];
|
||||
osSyncPrintf("000 ccc=%d\n", cursorItem);
|
||||
PRINTF("000 ccc=%d\n", cursorItem);
|
||||
} else if (pauseCtx->cursorPoint[PAUSE_QUEST] < 0x12) {
|
||||
cursorItem = ITEM_SCALE_GOLDEN + pauseCtx->cursorPoint[PAUSE_QUEST];
|
||||
osSyncPrintf("111 ccc=%d\n", cursorItem);
|
||||
PRINTF("111 ccc=%d\n", cursorItem);
|
||||
} else {
|
||||
cursorItem = ITEM_SONG_MINUET + pauseCtx->cursorPoint[PAUSE_QUEST];
|
||||
osSyncPrintf("222 ccc=%d (%d, %d, %d)\n", cursorItem, pauseCtx->cursorPoint[PAUSE_QUEST],
|
||||
0x12, 0x6C);
|
||||
PRINTF("222 ccc=%d (%d, %d, %d)\n", cursorItem, pauseCtx->cursorPoint[PAUSE_QUEST], 0x12,
|
||||
0x6C);
|
||||
}
|
||||
} else {
|
||||
cursorItem = PAUSE_ITEM_NONE;
|
||||
osSyncPrintf("999 ccc=%d (%d, %d)\n", PAUSE_ITEM_NONE, pauseCtx->cursorPoint[PAUSE_QUEST],
|
||||
0x18);
|
||||
PRINTF("999 ccc=%d (%d, %d)\n", PAUSE_ITEM_NONE, pauseCtx->cursorPoint[PAUSE_QUEST], 0x18);
|
||||
}
|
||||
} else {
|
||||
if ((gSaveContext.save.info.inventory.questItems & 0xF0000000) != 0) {
|
||||
|
|
@ -168,8 +167,8 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
|
|||
} else {
|
||||
cursorItem = PAUSE_ITEM_NONE;
|
||||
}
|
||||
osSyncPrintf("888 ccc=%d (%d, %d, %x)\n", cursorItem, pauseCtx->cursorPoint[PAUSE_QUEST],
|
||||
ITEM_HEART_CONTAINER, gSaveContext.save.info.inventory.questItems & 0xF0000000);
|
||||
PRINTF("888 ccc=%d (%d, %d, %x)\n", cursorItem, pauseCtx->cursorPoint[PAUSE_QUEST],
|
||||
ITEM_HEART_CONTAINER, gSaveContext.save.info.inventory.questItems & 0xF0000000);
|
||||
}
|
||||
|
||||
sp216 = pauseCtx->cursorPoint[PAUSE_QUEST];
|
||||
|
|
|
|||
|
|
@ -533,7 +533,7 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) {
|
|||
}
|
||||
} else {
|
||||
j = sSlotItems[i];
|
||||
osSyncPrintf("i=%d j=%d\n", i, j);
|
||||
PRINTF("i=%d j=%d\n", i, j);
|
||||
if (gSaveContext.save.info.inventory.items[i] == ITEM_NONE) {
|
||||
gSaveContext.save.info.inventory.items[i] = j;
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -407,7 +407,7 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
|
|||
} else {
|
||||
cursorItem = ITEM_QUIVER_30 + sUpgradeItemOffsets[pauseCtx->cursorY[PAUSE_EQUIP]] +
|
||||
CUR_UPG_VALUE(pauseCtx->cursorY[PAUSE_EQUIP]) - 1;
|
||||
osSyncPrintf("H_arrowcase_1 + non_equip_item_table = %d\n", cursorItem);
|
||||
PRINTF("H_arrowcase_1 + non_equip_item_table = %d\n", cursorItem);
|
||||
}
|
||||
} else {
|
||||
if ((pauseCtx->cursorY[PAUSE_EQUIP] == 0) && (CUR_UPG_VALUE(UPG_QUIVER) == 0)) {
|
||||
|
|
@ -415,12 +415,12 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
|
|||
} else {
|
||||
cursorItem = ITEM_QUIVER_30 + sUpgradeItemOffsets[pauseCtx->cursorY[PAUSE_EQUIP]] +
|
||||
CUR_UPG_VALUE(pauseCtx->cursorY[PAUSE_EQUIP]) - 1;
|
||||
osSyncPrintf("大人 H_arrowcase_1 + non_equip_item_table = %d\n", cursorItem);
|
||||
PRINTF("大人 H_arrowcase_1 + non_equip_item_table = %d\n", cursorItem);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
cursorItem = ITEM_SWORD_KOKIRI + sEquipmentItemOffsets[pauseCtx->cursorPoint[PAUSE_EQUIP]];
|
||||
osSyncPrintf("ccc=%d\n", cursorItem);
|
||||
PRINTF("ccc=%d\n", cursorItem);
|
||||
|
||||
if (pauseCtx->cursorSpecialPos == 0) {
|
||||
pauseCtx->cursorColorSet = 8;
|
||||
|
|
@ -440,7 +440,7 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
|
|||
pauseCtx->cursorItem[PAUSE_EQUIP] = cursorItem;
|
||||
pauseCtx->cursorSlot[PAUSE_EQUIP] = cursorSlot;
|
||||
|
||||
osSyncPrintf("kscope->select_name[Display_Equipment] = %d\n", pauseCtx->cursorItem[PAUSE_EQUIP]);
|
||||
PRINTF("kscope->select_name[Display_Equipment] = %d\n", pauseCtx->cursorItem[PAUSE_EQUIP]);
|
||||
|
||||
if (!CHECK_AGE_REQ_EQUIP(pauseCtx->cursorY[PAUSE_EQUIP], pauseCtx->cursorX[PAUSE_EQUIP])) {
|
||||
pauseCtx->nameColorSet = 1;
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ void KaleidoScope_DrawItemSelect(PlayState* play) {
|
|||
cursorX = pauseCtx->cursorX[PAUSE_ITEM];
|
||||
cursorY = pauseCtx->cursorY[PAUSE_ITEM];
|
||||
|
||||
osSyncPrintf("now=%d ccc=%d\n", cursorPoint, cursorItem);
|
||||
PRINTF("now=%d ccc=%d\n", cursorPoint, cursorItem);
|
||||
|
||||
// Seems necessary to match
|
||||
if (pauseCtx->cursorX[PAUSE_ITEM]) {}
|
||||
|
|
@ -203,9 +203,9 @@ void KaleidoScope_DrawItemSelect(PlayState* play) {
|
|||
cursorItem = gSaveContext.save.info.inventory.items[pauseCtx->cursorPoint[PAUSE_ITEM]];
|
||||
}
|
||||
|
||||
osSyncPrintf("【Ｘ cursor=%d(%) (cur_xpt=%d)(ok_fg=%d)(ccc=%d)(key_angle=%d)】 ",
|
||||
pauseCtx->cursorPoint[PAUSE_ITEM], pauseCtx->cursorX[PAUSE_ITEM], moveCursorResult,
|
||||
cursorItem, pauseCtx->cursorSpecialPos);
|
||||
PRINTF("【Ｘ cursor=%d(%) (cur_xpt=%d)(ok_fg=%d)(ccc=%d)(key_angle=%d)】 ",
|
||||
pauseCtx->cursorPoint[PAUSE_ITEM], pauseCtx->cursorX[PAUSE_ITEM], moveCursorResult, cursorItem,
|
||||
pauseCtx->cursorSpecialPos);
|
||||
}
|
||||
} else if (pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_LEFT) {
|
||||
if (pauseCtx->stickAdjX > 30) {
|
||||
|
|
@ -322,9 +322,8 @@ void KaleidoScope_DrawItemSelect(PlayState* play) {
|
|||
}
|
||||
|
||||
cursorPoint = PAUSE_ITEM;
|
||||
osSyncPrintf("【Ｙ cursor=%d(%) (cur_ypt=%d)(ok_fg=%d)(ccc=%d)】 ",
|
||||
pauseCtx->cursorPoint[cursorPoint], pauseCtx->cursorY[PAUSE_ITEM], moveCursorResult,
|
||||
cursorItem);
|
||||
PRINTF("【Ｙ cursor=%d(%) (cur_ypt=%d)(ok_fg=%d)(ccc=%d)】 ", pauseCtx->cursorPoint[cursorPoint],
|
||||
pauseCtx->cursorY[PAUSE_ITEM], moveCursorResult, cursorItem);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -588,7 +587,7 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
|
|||
return;
|
||||
}
|
||||
|
||||
osSyncPrintf("\n＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝\n");
|
||||
PRINTF("\n＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝\n");
|
||||
|
||||
if (pauseCtx->equipTargetCBtn == 0) {
|
||||
|
||||
|
|
@ -655,21 +654,19 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
|
|||
gSaveContext.save.info.equips.cButtonSlots[0] = pauseCtx->equipTargetSlot;
|
||||
Interface_LoadItemIcon1(play, 1);
|
||||
|
||||
osSyncPrintf("Ｃ左sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem,
|
||||
gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2],
|
||||
gSaveContext.save.info.equips.buttonItems[3]);
|
||||
osSyncPrintf("Ｃ左sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot,
|
||||
gSaveContext.save.info.equips.cButtonSlots[0],
|
||||
gSaveContext.save.info.equips.cButtonSlots[1],
|
||||
gSaveContext.save.info.equips.cButtonSlots[2]);
|
||||
PRINTF("Ｃ左sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem,
|
||||
gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2],
|
||||
gSaveContext.save.info.equips.buttonItems[3]);
|
||||
PRINTF("Ｃ左sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot,
|
||||
gSaveContext.save.info.equips.cButtonSlots[0], gSaveContext.save.info.equips.cButtonSlots[1],
|
||||
gSaveContext.save.info.equips.cButtonSlots[2]);
|
||||
} else if (pauseCtx->equipTargetCBtn == 1) {
|
||||
osSyncPrintf("Ｃ下sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem,
|
||||
gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2],
|
||||
gSaveContext.save.info.equips.buttonItems[3]);
|
||||
osSyncPrintf("Ｃ下sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot,
|
||||
gSaveContext.save.info.equips.cButtonSlots[0],
|
||||
gSaveContext.save.info.equips.cButtonSlots[1],
|
||||
gSaveContext.save.info.equips.cButtonSlots[2]);
|
||||
PRINTF("Ｃ下sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem,
|
||||
gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2],
|
||||
gSaveContext.save.info.equips.buttonItems[3]);
|
||||
PRINTF("Ｃ下sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot,
|
||||
gSaveContext.save.info.equips.cButtonSlots[0], gSaveContext.save.info.equips.cButtonSlots[1],
|
||||
gSaveContext.save.info.equips.cButtonSlots[2]);
|
||||
|
||||
if (pauseCtx->equipTargetSlot == gSaveContext.save.info.equips.cButtonSlots[0]) {
|
||||
if (gSaveContext.save.info.equips.buttonItems[2] != ITEM_NONE) {
|
||||
|
|
@ -732,21 +729,19 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
|
|||
gSaveContext.save.info.equips.cButtonSlots[1] = pauseCtx->equipTargetSlot;
|
||||
Interface_LoadItemIcon1(play, 2);
|
||||
|
||||
osSyncPrintf("Ｃ下sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem,
|
||||
gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2],
|
||||
gSaveContext.save.info.equips.buttonItems[3]);
|
||||
osSyncPrintf("Ｃ下sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot,
|
||||
gSaveContext.save.info.equips.cButtonSlots[0],
|
||||
gSaveContext.save.info.equips.cButtonSlots[1],
|
||||
gSaveContext.save.info.equips.cButtonSlots[2]);
|
||||
PRINTF("Ｃ下sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem,
|
||||
gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2],
|
||||
gSaveContext.save.info.equips.buttonItems[3]);
|
||||
PRINTF("Ｃ下sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot,
|
||||
gSaveContext.save.info.equips.cButtonSlots[0], gSaveContext.save.info.equips.cButtonSlots[1],
|
||||
gSaveContext.save.info.equips.cButtonSlots[2]);
|
||||
} else {
|
||||
osSyncPrintf("Ｃ右sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem,
|
||||
gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2],
|
||||
gSaveContext.save.info.equips.buttonItems[3]);
|
||||
osSyncPrintf("Ｃ右sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot,
|
||||
gSaveContext.save.info.equips.cButtonSlots[0],
|
||||
gSaveContext.save.info.equips.cButtonSlots[1],
|
||||
gSaveContext.save.info.equips.cButtonSlots[2]);
|
||||
PRINTF("Ｃ右sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem,
|
||||
gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2],
|
||||
gSaveContext.save.info.equips.buttonItems[3]);
|
||||
PRINTF("Ｃ右sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot,
|
||||
gSaveContext.save.info.equips.cButtonSlots[0], gSaveContext.save.info.equips.cButtonSlots[1],
|
||||
gSaveContext.save.info.equips.cButtonSlots[2]);
|
||||
|
||||
if (pauseCtx->equipTargetSlot == gSaveContext.save.info.equips.cButtonSlots[0]) {
|
||||
if (gSaveContext.save.info.equips.buttonItems[3] != ITEM_NONE) {
|
||||
|
|
@ -809,13 +804,12 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
|
|||
gSaveContext.save.info.equips.cButtonSlots[2] = pauseCtx->equipTargetSlot;
|
||||
Interface_LoadItemIcon1(play, 3);
|
||||
|
||||
osSyncPrintf("Ｃ右sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem,
|
||||
gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2],
|
||||
gSaveContext.save.info.equips.buttonItems[3]);
|
||||
osSyncPrintf("Ｃ右sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot,
|
||||
gSaveContext.save.info.equips.cButtonSlots[0],
|
||||
gSaveContext.save.info.equips.cButtonSlots[1],
|
||||
gSaveContext.save.info.equips.cButtonSlots[2]);
|
||||
PRINTF("Ｃ右sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem,
|
||||
gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2],
|
||||
gSaveContext.save.info.equips.buttonItems[3]);
|
||||
PRINTF("Ｃ右sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot,
|
||||
gSaveContext.save.info.equips.cButtonSlots[0], gSaveContext.save.info.equips.cButtonSlots[1],
|
||||
gSaveContext.save.info.equips.cButtonSlots[2]);
|
||||
}
|
||||
|
||||
pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE;
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ void KaleidoScope_DrawDungeonMap(PlayState* play, GraphicsContext* gfxCtx) {
|
|||
} else {
|
||||
pauseCtx->cursorX[PAUSE_MAP] = 0;
|
||||
pauseCtx->cursorPoint[PAUSE_MAP] = pauseCtx->dungeonMapSlot;
|
||||
osSyncPrintf("kscope->cursor_point=%d\n", pauseCtx->cursorPoint[PAUSE_MAP]);
|
||||
PRINTF("kscope->cursor_point=%d\n", pauseCtx->cursorPoint[PAUSE_MAP]);
|
||||
R_MAP_TEX_INDEX =
|
||||
R_MAP_TEX_INDEX_BASE +
|
||||
gMapData->floorTexIndexOffset[gSaveContext.mapIndex][pauseCtx->cursorPoint[PAUSE_MAP] - 3];
|
||||
|
|
@ -174,7 +174,7 @@ void KaleidoScope_DrawDungeonMap(PlayState* play, GraphicsContext* gfxCtx) {
|
|||
pauseCtx->cursorSlot[PAUSE_MAP] = pauseCtx->cursorPoint[PAUSE_MAP];
|
||||
}
|
||||
|
||||
osSyncPrintf("kscope->cursor_point====%d\n", pauseCtx->cursorPoint[PAUSE_MAP]);
|
||||
PRINTF("kscope->cursor_point====%d\n", pauseCtx->cursorPoint[PAUSE_MAP]);
|
||||
j = 72 + (pauseCtx->cursorSlot[PAUSE_MAP] * 4);
|
||||
KaleidoScope_SetCursorVtx(pauseCtx, j, pauseCtx->mapPageVtx);
|
||||
Audio_PlaySfxGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
|
||||
|
|
|
|||
|
|
@ -511,7 +511,7 @@ void KaleidoScope_SwitchPage(PauseContext* pauseCtx, u8 pt) {
|
|||
gSaveContext.buttonStatus[3] = D_8082AB6C[pauseCtx->pageIndex + pt][3];
|
||||
gSaveContext.buttonStatus[4] = D_8082AB6C[pauseCtx->pageIndex + pt][4];
|
||||
|
||||
osSyncPrintf("kscope->kscp_pos+pt = %d\n", pauseCtx->pageIndex + pt);
|
||||
PRINTF("kscope->kscp_pos+pt = %d\n", pauseCtx->pageIndex + pt);
|
||||
|
||||
gSaveContext.hudVisibilityMode = HUD_VISIBILITY_NO_CHANGE;
|
||||
Interface_ChangeHudVisibilityMode(HUD_VISIBILITY_ALL);
|
||||
|
|
@ -1281,10 +1281,10 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
|
|||
|
||||
if (pauseCtx->pageIndex == PAUSE_MAP) {
|
||||
if (YREG(7) != 0) {
|
||||
osSyncPrintf(VT_FGCOL(YELLOW));
|
||||
osSyncPrintf("キンスタ数(%d) Get_KIN_STA=%x (%x) (%x)\n", YREG(6), GET_GS_FLAGS(YREG(6)),
|
||||
gAreaGsFlags[YREG(6)], gSaveContext.save.info.gsFlags[YREG(6) >> 2]);
|
||||
osSyncPrintf(VT_RST);
|
||||
PRINTF(VT_FGCOL(YELLOW));
|
||||
PRINTF("キンスタ数(%d) Get_KIN_STA=%x (%x) (%x)\n", YREG(6), GET_GS_FLAGS(YREG(6)),
|
||||
gAreaGsFlags[YREG(6)], gSaveContext.save.info.gsFlags[YREG(6) >> 2]);
|
||||
PRINTF(VT_RST);
|
||||
|
||||
YREG(7) = 0;
|
||||
SET_GS_FLAGS(D_8082AE30[pauseCtx->cursorPoint[PAUSE_WORLD_MAP]],
|
||||
|
|
@ -1494,7 +1494,7 @@ void KaleidoScope_UpdateNamePanel(PlayState* play) {
|
|||
(uintptr_t)_map_name_staticSegmentRomStart + (sp2A * MAP_NAME_TEX1_SIZE),
|
||||
MAP_NAME_TEX1_SIZE, "../z_kaleido_scope_PAL.c", 2093);
|
||||
} else {
|
||||
osSyncPrintf("zoom_name=%d\n", pauseCtx->namedItem);
|
||||
PRINTF("zoom_name=%d\n", pauseCtx->namedItem);
|
||||
|
||||
if (gSaveContext.language) { // != LANGUAGE_ENG
|
||||
sp2A += 123;
|
||||
|
|
@ -1503,7 +1503,7 @@ void KaleidoScope_UpdateNamePanel(PlayState* play) {
|
|||
sp2A += 123;
|
||||
}
|
||||
|
||||
osSyncPrintf("J_N=%d point=%d\n", gSaveContext.language, sp2A);
|
||||
PRINTF("J_N=%d point=%d\n", gSaveContext.language, sp2A);
|
||||
|
||||
DMA_REQUEST_SYNC(pauseCtx->nameSegment,
|
||||
(uintptr_t)_item_name_staticSegmentRomStart + (sp2A * ITEM_NAME_TEX_SIZE),
|
||||
|
|
@ -2597,7 +2597,7 @@ void KaleidoScope_UpdateDungeonMap(PlayState* play) {
|
|||
PauseContext* pauseCtx = &play->pauseCtx;
|
||||
InterfaceContext* interfaceCtx = &play->interfaceCtx;
|
||||
|
||||
osSyncPrintf("ＭＡＰ ＤＭＡ = %d\n", play->interfaceCtx.mapPaletteIndex);
|
||||
PRINTF("ＭＡＰ ＤＭＡ = %d\n", play->interfaceCtx.mapPaletteIndex);
|
||||
|
||||
KaleidoScope_LoadDungeonMap(play);
|
||||
Map_SetFloorPalettesData(play, pauseCtx->dungeonMapSlot - 3);
|
||||
|
|
@ -2678,12 +2678,12 @@ void KaleidoScope_Update(PlayState* play) {
|
|||
pauseCtx->playerSegment = (void*)(((uintptr_t)play->objectCtx.spaceStart + 0x30) & ~0x3F);
|
||||
|
||||
size1 = Player_InitPauseDrawData(play, pauseCtx->playerSegment, &pauseCtx->playerSkelAnime);
|
||||
osSyncPrintf("プレイヤー size1＝%x\n", size1);
|
||||
PRINTF("プレイヤー size1＝%x\n", size1);
|
||||
|
||||
pauseCtx->iconItemSegment = (void*)ALIGN16((uintptr_t)pauseCtx->playerSegment + size1);
|
||||
|
||||
size0 = (uintptr_t)_icon_item_staticSegmentRomEnd - (uintptr_t)_icon_item_staticSegmentRomStart;
|
||||
osSyncPrintf("icon_item size0=%x\n", size0);
|
||||
PRINTF("icon_item size0=%x\n", size0);
|
||||
DMA_REQUEST_SYNC(pauseCtx->iconItemSegment, (uintptr_t)_icon_item_staticSegmentRomStart, size0,
|
||||
"../z_kaleido_scope_PAL.c", 3662);
|
||||
|
||||
|
|
@ -2699,7 +2699,7 @@ void KaleidoScope_Update(PlayState* play) {
|
|||
pauseCtx->iconItem24Segment = (void*)ALIGN16((uintptr_t)pauseCtx->iconItemSegment + size0);
|
||||
|
||||
size = (uintptr_t)_icon_item_24_staticSegmentRomEnd - (uintptr_t)_icon_item_24_staticSegmentRomStart;
|
||||
osSyncPrintf("icon_item24 size=%x\n", size);
|
||||
PRINTF("icon_item24 size=%x\n", size);
|
||||
DMA_REQUEST_SYNC(pauseCtx->iconItem24Segment, (uintptr_t)_icon_item_24_staticSegmentRomStart, size,
|
||||
"../z_kaleido_scope_PAL.c", 3675);
|
||||
|
||||
|
|
@ -2727,7 +2727,7 @@ void KaleidoScope_Update(PlayState* play) {
|
|||
sInDungeonScene = true;
|
||||
size2 = (uintptr_t)_icon_item_dungeon_staticSegmentRomEnd -
|
||||
(uintptr_t)_icon_item_dungeon_staticSegmentRomStart;
|
||||
osSyncPrintf("icon_item_dungeon dungeon-size2=%x\n", size2);
|
||||
PRINTF("icon_item_dungeon dungeon-size2=%x\n", size2);
|
||||
DMA_REQUEST_SYNC(pauseCtx->iconItemAltSegment, (uintptr_t)_icon_item_dungeon_staticSegmentRomStart,
|
||||
size2, "../z_kaleido_scope_PAL.c", 3712);
|
||||
|
||||
|
|
@ -2740,7 +2740,7 @@ void KaleidoScope_Update(PlayState* play) {
|
|||
sInDungeonScene = false;
|
||||
size2 = (uintptr_t)_icon_item_field_staticSegmentRomEnd -
|
||||
(uintptr_t)_icon_item_field_staticSegmentRomStart;
|
||||
osSyncPrintf("icon_item_field field-size2=%x\n", size2);
|
||||
PRINTF("icon_item_field field-size2=%x\n", size2);
|
||||
DMA_REQUEST_SYNC(pauseCtx->iconItemAltSegment, (uintptr_t)_icon_item_field_staticSegmentRomStart,
|
||||
size2, "../z_kaleido_scope_PAL.c", 3726);
|
||||
break;
|
||||
|
|
@ -2750,27 +2750,27 @@ void KaleidoScope_Update(PlayState* play) {
|
|||
|
||||
if (gSaveContext.language == LANGUAGE_ENG) {
|
||||
size = (uintptr_t)_icon_item_nes_staticSegmentRomEnd - (uintptr_t)_icon_item_nes_staticSegmentRomStart;
|
||||
osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size);
|
||||
PRINTF("icon_item_dungeon dungeon-size=%x\n", size);
|
||||
DMA_REQUEST_SYNC(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_nes_staticSegmentRomStart, size,
|
||||
"../z_kaleido_scope_PAL.c", 3739);
|
||||
} else if (gSaveContext.language == LANGUAGE_GER) {
|
||||
size = (uintptr_t)_icon_item_ger_staticSegmentRomEnd - (uintptr_t)_icon_item_ger_staticSegmentRomStart;
|
||||
osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size);
|
||||
PRINTF("icon_item_dungeon dungeon-size=%x\n", size);
|
||||
DMA_REQUEST_SYNC(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_ger_staticSegmentRomStart, size,
|
||||
"../z_kaleido_scope_PAL.c", 3746);
|
||||
} else {
|
||||
size = (uintptr_t)_icon_item_fra_staticSegmentRomEnd - (uintptr_t)_icon_item_fra_staticSegmentRomStart;
|
||||
osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size);
|
||||
PRINTF("icon_item_dungeon dungeon-size=%x\n", size);
|
||||
DMA_REQUEST_SYNC(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_fra_staticSegmentRomStart, size,
|
||||
"../z_kaleido_scope_PAL.c", 3753);
|
||||
}
|
||||
|
||||
pauseCtx->nameSegment = (void*)ALIGN16((uintptr_t)pauseCtx->iconItemLangSegment + size);
|
||||
|
||||
osSyncPrintf("サイズ＝%x\n", size2 + size1 + size0 + size);
|
||||
osSyncPrintf("item_name I_N_PT=%x\n", 0x800);
|
||||
PRINTF("サイズ＝%x\n", size2 + size1 + size0 + size);
|
||||
PRINTF("item_name I_N_PT=%x\n", 0x800);
|
||||
Interface_SetDoAction(play, DO_ACTION_DECIDE);
|
||||
osSyncPrintf("サイズ＝%x\n", size2 + size1 + size0 + size + 0x800);
|
||||
PRINTF("サイズ＝%x\n", size2 + size1 + size0 + size + 0x800);
|
||||
|
||||
if (((void)0, gSaveContext.worldMapArea) < 22) {
|
||||
if (gSaveContext.language == LANGUAGE_ENG) {
|
||||
|
|
@ -3304,20 +3304,20 @@ void KaleidoScope_Update(PlayState* play) {
|
|||
//! @bug messed up alignment, should match `ALIGN64`
|
||||
pauseCtx->iconItemSegment = (void*)(((uintptr_t)play->objectCtx.spaceStart + 0x30) & ~0x3F);
|
||||
size0 = (uintptr_t)_icon_item_staticSegmentRomEnd - (uintptr_t)_icon_item_staticSegmentRomStart;
|
||||
osSyncPrintf("icon_item size0=%x\n", size0);
|
||||
PRINTF("icon_item size0=%x\n", size0);
|
||||
DMA_REQUEST_SYNC(pauseCtx->iconItemSegment, (uintptr_t)_icon_item_staticSegmentRomStart, size0,
|
||||
"../z_kaleido_scope_PAL.c", 4356);
|
||||
|
||||
pauseCtx->iconItem24Segment = (void*)ALIGN16((uintptr_t)pauseCtx->iconItemSegment + size0);
|
||||
size = (uintptr_t)_icon_item_24_staticSegmentRomEnd - (uintptr_t)_icon_item_24_staticSegmentRomStart;
|
||||
osSyncPrintf("icon_item24 size=%x\n", size);
|
||||
PRINTF("icon_item24 size=%x\n", size);
|
||||
DMA_REQUEST_SYNC(pauseCtx->iconItem24Segment, (uintptr_t)_icon_item_24_staticSegmentRomStart, size,
|
||||
"../z_kaleido_scope_PAL.c", 4363);
|
||||
|
||||
pauseCtx->iconItemAltSegment = (void*)ALIGN16((uintptr_t)pauseCtx->iconItem24Segment + size);
|
||||
size2 = (uintptr_t)_icon_item_gameover_staticSegmentRomEnd -
|
||||
(uintptr_t)_icon_item_gameover_staticSegmentRomStart;
|
||||
osSyncPrintf("icon_item_dungeon gameover-size2=%x\n", size2);
|
||||
PRINTF("icon_item_dungeon gameover-size2=%x\n", size2);
|
||||
DMA_REQUEST_SYNC(pauseCtx->iconItemAltSegment, (uintptr_t)_icon_item_gameover_staticSegmentRomStart, size2,
|
||||
"../z_kaleido_scope_PAL.c", 4370);
|
||||
|
||||
|
|
@ -3325,17 +3325,17 @@ void KaleidoScope_Update(PlayState* play) {
|
|||
|
||||
if (gSaveContext.language == LANGUAGE_ENG) {
|
||||
size = (uintptr_t)_icon_item_nes_staticSegmentRomEnd - (uintptr_t)_icon_item_nes_staticSegmentRomStart;
|
||||
osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size);
|
||||
PRINTF("icon_item_dungeon dungeon-size=%x\n", size);
|
||||
DMA_REQUEST_SYNC(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_nes_staticSegmentRomStart, size,
|
||||
"../z_kaleido_scope_PAL.c", 4379);
|
||||
} else if (gSaveContext.language == LANGUAGE_GER) {
|
||||
size = (uintptr_t)_icon_item_ger_staticSegmentRomEnd - (uintptr_t)_icon_item_ger_staticSegmentRomStart;
|
||||
osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size);
|
||||
PRINTF("icon_item_dungeon dungeon-size=%x\n", size);
|
||||
DMA_REQUEST_SYNC(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_ger_staticSegmentRomStart, size,
|
||||
"../z_kaleido_scope_PAL.c", 4386);
|
||||
} else {
|
||||
size = (uintptr_t)_icon_item_fra_staticSegmentRomEnd - (uintptr_t)_icon_item_fra_staticSegmentRomStart;
|
||||
osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size);
|
||||
PRINTF("icon_item_dungeon dungeon-size=%x\n", size);
|
||||
DMA_REQUEST_SYNC(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_fra_staticSegmentRomStart, size,
|
||||
"../z_kaleido_scope_PAL.c", 4393);
|
||||
}
|
||||
|
|
@ -3443,7 +3443,7 @@ void KaleidoScope_Update(PlayState* play) {
|
|||
gSaveContext.save.info.playerData.deaths = 999;
|
||||
}
|
||||
}
|
||||
osSyncPrintf("kscope->angle_s = %f\n", pauseCtx->unk_204);
|
||||
PRINTF("kscope->angle_s = %f\n", pauseCtx->unk_204);
|
||||
break;
|
||||
|
||||
case PAUSE_STATE_14:
|
||||
|
|
@ -3569,18 +3569,18 @@ void KaleidoScope_Update(PlayState* play) {
|
|||
gSaveContext.healthAccumulator = 0;
|
||||
gSaveContext.magicState = MAGIC_STATE_IDLE;
|
||||
gSaveContext.prevMagicState = MAGIC_STATE_IDLE;
|
||||
osSyncPrintf(VT_FGCOL(YELLOW));
|
||||
osSyncPrintf("MAGIC_NOW=%d ", gSaveContext.save.info.playerData.magic);
|
||||
osSyncPrintf("Z_MAGIC_NOW_NOW=%d → ", gSaveContext.magicFillTarget);
|
||||
PRINTF(VT_FGCOL(YELLOW));
|
||||
PRINTF("MAGIC_NOW=%d ", gSaveContext.save.info.playerData.magic);
|
||||
PRINTF("Z_MAGIC_NOW_NOW=%d → ", gSaveContext.magicFillTarget);
|
||||
gSaveContext.magicCapacity = 0;
|
||||
// Set the fill target to be the magic amount before game over
|
||||
gSaveContext.magicFillTarget = gSaveContext.save.info.playerData.magic;
|
||||
// Set `magicLevel` and `magic` to 0 so `magicCapacity` then `magic` grows from nothing
|
||||
// to respectively the full capacity and `magicFillTarget`
|
||||
gSaveContext.save.info.playerData.magicLevel = gSaveContext.save.info.playerData.magic = 0;
|
||||
osSyncPrintf("MAGIC_NOW=%d ", gSaveContext.save.info.playerData.magic);
|
||||
osSyncPrintf("Z_MAGIC_NOW_NOW=%d\n", gSaveContext.magicFillTarget);
|
||||
osSyncPrintf(VT_RST);
|
||||
PRINTF("MAGIC_NOW=%d ", gSaveContext.save.info.playerData.magic);
|
||||
PRINTF("Z_MAGIC_NOW_NOW=%d\n", gSaveContext.magicFillTarget);
|
||||
PRINTF(VT_RST);
|
||||
} else {
|
||||
play->state.running = false;
|
||||
SET_NEXT_GAMESTATE(&play->state, TitleSetup_Init, TitleSetupState);
|
||||
|
|
@ -3650,13 +3650,13 @@ void KaleidoScope_Update(PlayState* play) {
|
|||
gSaveContext.buttonStatus[3] = D_808321A8[3];
|
||||
gSaveContext.buttonStatus[4] = D_808321A8[4];
|
||||
interfaceCtx->unk_1FA = interfaceCtx->unk_1FC = 0;
|
||||
osSyncPrintf(VT_FGCOL(YELLOW));
|
||||
osSyncPrintf("i=%d LAST_TIME_TYPE=%d\n", i, gSaveContext.prevHudVisibilityMode);
|
||||
PRINTF(VT_FGCOL(YELLOW));
|
||||
PRINTF("i=%d LAST_TIME_TYPE=%d\n", i, gSaveContext.prevHudVisibilityMode);
|
||||
gSaveContext.hudVisibilityMode = HUD_VISIBILITY_NO_CHANGE;
|
||||
Interface_ChangeHudVisibilityMode(gSaveContext.prevHudVisibilityMode);
|
||||
player->targetActor = NULL;
|
||||
Player_SetEquipmentData(play, player);
|
||||
osSyncPrintf(VT_RST);
|
||||
PRINTF(VT_RST);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue