diff options
| author | cadmic <cadmic24@gmail.com> | 2024-01-12 07:38:13 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-12 10:38:13 -0500 |
| commit | 324db1d57830dcb2a45720445ac5d7904a6f5c6a (patch) | |
| tree | 082de71ba2d4b8457be64e79bd2c37de99bd0ae2 /src/code/z_parameter.c | |
| parent | 6eb3bf401cf768a81788e2aa90cb2cafbcd8d763 (diff) | |
Replace most osSyncPrintf calls with PRINTF macro (#1598)
* Replace most osSyncPrintf calls with PRINTF macro
* DEBUG -> OOT_DEBUG
Diffstat (limited to 'src/code/z_parameter.c')
| -rw-r--r-- | src/code/z_parameter.c | 183 |
1 files changed, 90 insertions, 93 deletions
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 9db54bc97..023ff064f 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -166,8 +166,7 @@ static Gfx sSetupDL_80125A60[] = { // original name: "alpha_change" void Interface_ChangeHudVisibilityMode(u16 hudVisibilityMode) { if (hudVisibilityMode != gSaveContext.hudVisibilityMode) { - osSyncPrintf("ALPHAーTYPE=%d LAST_TIME_TYPE=%d\n", hudVisibilityMode, - gSaveContext.prevHudVisibilityMode); + PRINTF("ALPHAーTYPE=%d LAST_TIME_TYPE=%d\n", hudVisibilityMode, gSaveContext.prevHudVisibilityMode); gSaveContext.hudVisibilityMode = gSaveContext.nextHudVisibilityMode = hudVisibilityMode; gSaveContext.hudVisibilityModeTimer = 1; } @@ -272,7 +271,7 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { case HUD_VISIBILITY_NOTHING: case HUD_VISIBILITY_NOTHING_ALT: case HUD_VISIBILITY_B: - osSyncPrintf("a_alpha=%d, c_alpha=%d → ", interfaceCtx->aAlpha, interfaceCtx->cLeftAlpha); + PRINTF("a_alpha=%d, c_alpha=%d → ", interfaceCtx->aAlpha, interfaceCtx->cLeftAlpha); if (gSaveContext.nextHudVisibilityMode == HUD_VISIBILITY_B) { if (interfaceCtx->bAlpha != 255) { @@ -312,7 +311,7 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { interfaceCtx->minimapAlpha = dimmingAlpha; } - osSyncPrintf("a_alpha=%d, c_alpha=%d\n", interfaceCtx->aAlpha, interfaceCtx->cLeftAlpha); + PRINTF("a_alpha=%d, c_alpha=%d\n", interfaceCtx->aAlpha, interfaceCtx->cLeftAlpha); break; @@ -996,7 +995,7 @@ void func_80083108(PlayState* play) { } gSaveContext.buttonStatus[i] = BTN_DISABLED; - osSyncPrintf("***(i=%d)*** ", i); + PRINTF("***(i=%d)*** ", i); } } } else if (interfaceCtx->restrictions.farores == 0) { @@ -1088,9 +1087,9 @@ void func_80083108(PlayState* play) { gSaveContext.hudVisibilityMode = HUD_VISIBILITY_NO_CHANGE; if ((play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF)) { Interface_ChangeHudVisibilityMode(HUD_VISIBILITY_ALL); - osSyncPrintf("???????? alpha_change( 50 ); ?????\n"); + PRINTF("???????? alpha_change( 50 ); ?????\n"); } else { - osSyncPrintf("game_play->fade_direction || game_play->fbdemo_wipe_modem"); + PRINTF("game_play->fade_direction || game_play->fbdemo_wipe_modem"); } } } @@ -1110,7 +1109,7 @@ void Interface_SetSceneRestrictions(PlayState* play) { i = 0; // "Data settings related to button display scene_data_ID=%d\n" - osSyncPrintf("ボタン表示関係データ設定 scene_data_ID=%d\n", play->sceneId); + PRINTF("ボタン表示関係データ設定 scene_data_ID=%d\n", play->sceneId); do { sceneId = (u8)play->sceneId; @@ -1128,19 +1127,19 @@ void Interface_SetSceneRestrictions(PlayState* play) { interfaceCtx->restrictions.dinsNayrus = (sRestrictionFlags[i].flags3 & 0x0C) >> 2; interfaceCtx->restrictions.all = (sRestrictionFlags[i].flags3 & 0x03) >> 0; - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("parameter->button_status = %x,%x,%x\n", sRestrictionFlags[i].flags1, - sRestrictionFlags[i].flags2, sRestrictionFlags[i].flags3); - osSyncPrintf("h_gage=%d, b_button=%d, a_button=%d, c_bottle=%d\n", interfaceCtx->restrictions.hGauge, - interfaceCtx->restrictions.bButton, interfaceCtx->restrictions.aButton, - interfaceCtx->restrictions.bottles); - osSyncPrintf("c_warasibe=%d, c_hook=%d, c_ocarina=%d, c_warp=%d\n", interfaceCtx->restrictions.tradeItems, - interfaceCtx->restrictions.hookshot, interfaceCtx->restrictions.ocarina, - interfaceCtx->restrictions.warpSongs); - osSyncPrintf("c_sunmoon=%d, m_wind=%d, m_magic=%d, another=%d\n", interfaceCtx->restrictions.sunsSong, - interfaceCtx->restrictions.farores, interfaceCtx->restrictions.dinsNayrus, - interfaceCtx->restrictions.all); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("parameter->button_status = %x,%x,%x\n", sRestrictionFlags[i].flags1, sRestrictionFlags[i].flags2, + sRestrictionFlags[i].flags3); + PRINTF("h_gage=%d, b_button=%d, a_button=%d, c_bottle=%d\n", interfaceCtx->restrictions.hGauge, + interfaceCtx->restrictions.bButton, interfaceCtx->restrictions.aButton, + interfaceCtx->restrictions.bottles); + PRINTF("c_warasibe=%d, c_hook=%d, c_ocarina=%d, c_warp=%d\n", interfaceCtx->restrictions.tradeItems, + interfaceCtx->restrictions.hookshot, interfaceCtx->restrictions.ocarina, + interfaceCtx->restrictions.warpSongs); + PRINTF("c_sunmoon=%d, m_wind=%d, m_magic=%d, another=%d\n", interfaceCtx->restrictions.sunsSong, + interfaceCtx->restrictions.farores, interfaceCtx->restrictions.dinsNayrus, + interfaceCtx->restrictions.all); + PRINTF(VT_RST); return; } i++; @@ -1225,7 +1224,7 @@ void Inventory_SwapAgeEquipment(void) { (gSaveContext.save.info.equips.buttonItems[i] <= ITEM_BOTTLE_POE)) || ((gSaveContext.save.info.equips.buttonItems[i] >= ITEM_WEIRD_EGG) && (gSaveContext.save.info.equips.buttonItems[i] <= ITEM_CLAIM_CHECK))) { - osSyncPrintf("Register_Item_Pt(%d)=%d\n", i, gSaveContext.save.info.equips.cButtonSlots[i - 1]); + PRINTF("Register_Item_Pt(%d)=%d\n", i, gSaveContext.save.info.equips.cButtonSlots[i - 1]); gSaveContext.save.info.equips.buttonItems[i] = gSaveContext.save.info.inventory.items[gSaveContext.save.info.equips.cButtonSlots[i - 1]]; } @@ -1259,7 +1258,7 @@ void Inventory_SwapAgeEquipment(void) { (gSaveContext.save.info.equips.buttonItems[i] <= ITEM_BOTTLE_POE)) || ((gSaveContext.save.info.equips.buttonItems[i] >= ITEM_WEIRD_EGG) && (gSaveContext.save.info.equips.buttonItems[i] <= ITEM_CLAIM_CHECK))) { - osSyncPrintf("Register_Item_Pt(%d)=%d\n", i, gSaveContext.save.info.equips.cButtonSlots[i - 1]); + PRINTF("Register_Item_Pt(%d)=%d\n", i, gSaveContext.save.info.equips.cButtonSlots[i - 1]); gSaveContext.save.info.equips.buttonItems[i] = gSaveContext.save.info.inventory.items[gSaveContext.save.info.equips.cButtonSlots[i - 1]]; } @@ -1369,16 +1368,16 @@ u8 Item_Give(PlayState* play, u8 item) { slot = SLOT(sExtraItemBases[item - ITEM_DEKU_STICKS_5]); } - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("item_get_setting=%d pt=%d z=%x\n", item, slot, gSaveContext.save.info.inventory.items[slot]); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("item_get_setting=%d pt=%d z=%x\n", item, slot, gSaveContext.save.info.inventory.items[slot]); + PRINTF(VT_RST); if ((item >= ITEM_MEDALLION_FOREST) && (item <= ITEM_MEDALLION_LIGHT)) { gSaveContext.save.info.inventory.questItems |= gBitFlags[item - ITEM_MEDALLION_FOREST + QUEST_MEDALLION_FOREST]; - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("封印 = %x\n", gSaveContext.save.info.inventory.questItems); // "Seals = %x" - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("封印 = %x\n", gSaveContext.save.info.inventory.questItems); // "Seals = %x" + PRINTF(VT_RST); if (item == ITEM_MEDALLION_WATER) { func_8006D0AC(play); @@ -1388,39 +1387,39 @@ u8 Item_Give(PlayState* play, u8 item) { } else if ((item >= ITEM_SONG_MINUET) && (item <= ITEM_SONG_STORMS)) { gSaveContext.save.info.inventory.questItems |= gBitFlags[item - ITEM_SONG_MINUET + QUEST_SONG_MINUET]; - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("楽譜 = %x\n", gSaveContext.save.info.inventory.questItems); // "Musical scores = %x" + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("楽譜 = %x\n", gSaveContext.save.info.inventory.questItems); // "Musical scores = %x" // "Musical scores = %x (%x) (%x)" - osSyncPrintf("楽譜 = %x (%x) (%x)\n", gSaveContext.save.info.inventory.questItems, - gBitFlags[item - ITEM_SONG_MINUET + QUEST_SONG_MINUET], gBitFlags[item - ITEM_SONG_MINUET]); - osSyncPrintf(VT_RST); + PRINTF("楽譜 = %x (%x) (%x)\n", gSaveContext.save.info.inventory.questItems, + gBitFlags[item - ITEM_SONG_MINUET + QUEST_SONG_MINUET], gBitFlags[item - ITEM_SONG_MINUET]); + PRINTF(VT_RST); return ITEM_NONE; } else if ((item >= ITEM_KOKIRI_EMERALD) && (item <= ITEM_ZORA_SAPPHIRE)) { gSaveContext.save.info.inventory.questItems |= gBitFlags[item - ITEM_KOKIRI_EMERALD + QUEST_KOKIRI_EMERALD]; - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("精霊石 = %x\n", gSaveContext.save.info.inventory.questItems); // "Spiritual Stones = %x" - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("精霊石 = %x\n", gSaveContext.save.info.inventory.questItems); // "Spiritual Stones = %x" + PRINTF(VT_RST); return ITEM_NONE; } else if ((item == ITEM_STONE_OF_AGONY) || (item == ITEM_GERUDOS_CARD)) { gSaveContext.save.info.inventory.questItems |= gBitFlags[item - ITEM_STONE_OF_AGONY + QUEST_STONE_OF_AGONY]; - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("アイテム = %x\n", gSaveContext.save.info.inventory.questItems); // "Items = %x" - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("アイテム = %x\n", gSaveContext.save.info.inventory.questItems); // "Items = %x" + PRINTF(VT_RST); return ITEM_NONE; } else if (item == ITEM_SKULL_TOKEN) { gSaveContext.save.info.inventory.questItems |= gBitFlags[item - ITEM_SKULL_TOKEN + QUEST_SKULL_TOKEN]; gSaveContext.save.info.inventory.gsTokens++; - osSyncPrintf(VT_FGCOL(YELLOW)); + PRINTF(VT_FGCOL(YELLOW)); // "N Coins = %x(%d)" - osSyncPrintf("Nコイン = %x(%d)\n", gSaveContext.save.info.inventory.questItems, - gSaveContext.save.info.inventory.gsTokens); - osSyncPrintf(VT_RST); + PRINTF("Nコイン = %x(%d)\n", gSaveContext.save.info.inventory.questItems, + gSaveContext.save.info.inventory.gsTokens); + PRINTF(VT_RST); return ITEM_NONE; } else if ((item >= ITEM_SWORD_KOKIRI) && (item <= ITEM_SWORD_BIGGORON)) { @@ -1610,8 +1609,8 @@ u8 Item_Give(PlayState* play, u8 item) { Inventory_ChangeUpgrade(UPG_DEKU_NUTS, 1); AMMO(ITEM_DEKU_NUT) += sAmmoRefillCounts[item - ITEM_DEKU_NUTS_5]; // "Deku Nuts %d(%d)=%d BS_count=%d" - osSyncPrintf("デクの実 %d(%d)=%d BS_count=%d\n", item, ITEM_DEKU_NUTS_5, item - ITEM_DEKU_NUTS_5, - sAmmoRefillCounts[item - ITEM_DEKU_NUTS_5]); + PRINTF("デクの実 %d(%d)=%d BS_count=%d\n", item, ITEM_DEKU_NUTS_5, item - ITEM_DEKU_NUTS_5, + sAmmoRefillCounts[item - ITEM_DEKU_NUTS_5]); } else { AMMO(ITEM_DEKU_NUT) += sAmmoRefillCounts[item - ITEM_DEKU_NUTS_5]; if (AMMO(ITEM_DEKU_NUT) > CUR_CAPACITY(UPG_DEKU_NUTS)) { @@ -1621,7 +1620,7 @@ u8 Item_Give(PlayState* play, u8 item) { item = ITEM_DEKU_NUT; } else if (item == ITEM_BOMB) { // "Bomb Bomb Bomb Bomb Bomb Bomb Bomb" - osSyncPrintf(" 爆弾 爆弾 爆弾 爆弾 爆弾 爆弾 爆弾 \n"); + PRINTF(" 爆弾 爆弾 爆弾 爆弾 爆弾 爆弾 爆弾 \n"); if ((AMMO(ITEM_BOMB) += 1) > CUR_CAPACITY(UPG_BOMB_BAG)) { AMMO(ITEM_BOMB) = CUR_CAPACITY(UPG_BOMB_BAG); } @@ -1662,7 +1661,7 @@ u8 Item_Give(PlayState* play, u8 item) { AMMO(ITEM_BOW) = CUR_CAPACITY(UPG_QUIVER); } - osSyncPrintf("%d本 Item_MaxGet=%d\n", AMMO(ITEM_BOW), CUR_CAPACITY(UPG_QUIVER)); + PRINTF("%d本 Item_MaxGet=%d\n", AMMO(ITEM_BOW), CUR_CAPACITY(UPG_QUIVER)); return ITEM_BOW; } else if (item == ITEM_SLINGSHOT) { @@ -1726,7 +1725,7 @@ u8 Item_Give(PlayState* play, u8 item) { gSaveContext.save.info.playerData.health += 0x10; return ITEM_NONE; } else if (item == ITEM_RECOVERY_HEART) { - osSyncPrintf("回復ハート回復ハート回復ハート\n"); // "Recovery Heart" + PRINTF("回復ハート回復ハート回復ハート\n"); // "Recovery Heart" Health_ChangeBy(play, 0x10); return item; } else if (item == ITEM_MAGIC_JAR_SMALL) { @@ -1785,10 +1784,9 @@ u8 Item_Give(PlayState* play, u8 item) { for (i = 0; i < 4; i++) { if (gSaveContext.save.info.inventory.items[temp + i] == ITEM_BOTTLE_EMPTY) { // "Item_Pt(1)=%d Item_Pt(2)=%d Item_Pt(3)=%d Empty Bottle=%d Content=%d" - osSyncPrintf("Item_Pt(1)=%d Item_Pt(2)=%d Item_Pt(3)=%d 空瓶=%d 中味=%d\n", - gSaveContext.save.info.equips.cButtonSlots[0], - gSaveContext.save.info.equips.cButtonSlots[1], - gSaveContext.save.info.equips.cButtonSlots[2], temp + i, item); + PRINTF("Item_Pt(1)=%d Item_Pt(2)=%d Item_Pt(3)=%d 空瓶=%d 中味=%d\n", + gSaveContext.save.info.equips.cButtonSlots[0], gSaveContext.save.info.equips.cButtonSlots[1], + gSaveContext.save.info.equips.cButtonSlots[2], temp + i, item); if ((temp + i) == gSaveContext.save.info.equips.cButtonSlots[0]) { gSaveContext.save.info.equips.buttonItems[1] = item; @@ -1842,7 +1840,7 @@ u8 Item_Give(PlayState* play, u8 item) { } temp = gSaveContext.save.info.inventory.items[slot]; - osSyncPrintf("Item_Register(%d)=%d %d\n", slot, item, temp); + PRINTF("Item_Register(%d)=%d %d\n", slot, item, temp); INV_CONTENT(item) = item; return temp; @@ -1857,9 +1855,9 @@ u8 Item_CheckObtainability(u8 item) { slot = SLOT(sExtraItemBases[item - ITEM_DEKU_STICKS_5]); } - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("item_get_non_setting=%d pt=%d z=%x\n", item, slot, gSaveContext.save.info.inventory.items[slot]); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("item_get_non_setting=%d pt=%d z=%x\n", item, slot, gSaveContext.save.info.inventory.items[slot]); + PRINTF(VT_RST); if ((item >= ITEM_MEDALLION_FOREST) && (item <= ITEM_MEDALLION_LIGHT)) { return ITEM_NONE; @@ -1937,7 +1935,7 @@ u8 Item_CheckObtainability(u8 item) { return ITEM_RECOVERY_HEART; } else if ((item == ITEM_MAGIC_JAR_SMALL) || (item == ITEM_MAGIC_JAR_BIG)) { // "Magic Pot Get_Inf_Table( 25, 0x0100)=%d" - osSyncPrintf("魔法の壷 Get_Inf_Table( 25, 0x0100)=%d\n", GET_INFTABLE(INFTABLE_198)); + PRINTF("魔法の壷 Get_Inf_Table( 25, 0x0100)=%d\n", GET_INFTABLE(INFTABLE_198)); if (!GET_INFTABLE(INFTABLE_198)) { return ITEM_NONE; } else { @@ -1984,7 +1982,7 @@ void Inventory_DeleteItem(u16 item, u16 invSlot) { gSaveContext.save.info.inventory.items[invSlot] = ITEM_NONE; - osSyncPrintf("\nItem_Register(%d)\n", invSlot, gSaveContext.save.info.inventory.items[invSlot]); + PRINTF("\nItem_Register(%d)\n", invSlot, gSaveContext.save.info.inventory.items[invSlot]); for (i = 1; i < 4; i++) { if (gSaveContext.save.info.equips.buttonItems[i] == item) { @@ -2000,7 +1998,7 @@ s32 Inventory_ReplaceItem(PlayState* play, u16 oldItem, u16 newItem) { for (i = 0; i < ARRAY_COUNT(gSaveContext.save.info.inventory.items); i++) { if (gSaveContext.save.info.inventory.items[i] == oldItem) { gSaveContext.save.info.inventory.items[i] = newItem; - osSyncPrintf("アイテム消去(%d)\n", i); // "Item Purge (%d)" + PRINTF("アイテム消去(%d)\n", i); // "Item Purge (%d)" for (i = 1; i < 4; i++) { if (gSaveContext.save.info.equips.buttonItems[i] == oldItem) { gSaveContext.save.info.equips.buttonItems[i] = newItem; @@ -2048,9 +2046,9 @@ s32 Inventory_HasSpecificBottle(u8 bottleItem) { } void Inventory_UpdateBottleItem(PlayState* play, u8 item, u8 button) { - osSyncPrintf("item_no=%x, c_no=%x, Pt=%x Item_Register=%x\n", item, button, - gSaveContext.save.info.equips.cButtonSlots[button - 1], - gSaveContext.save.info.inventory.items[gSaveContext.save.info.equips.cButtonSlots[button - 1]]); + PRINTF("item_no=%x, c_no=%x, Pt=%x Item_Register=%x\n", item, button, + gSaveContext.save.info.equips.cButtonSlots[button - 1], + gSaveContext.save.info.inventory.items[gSaveContext.save.info.equips.cButtonSlots[button - 1]]); // Special case to only empty half of a Lon Lon Milk Bottle if ((gSaveContext.save.info.inventory.items[gSaveContext.save.info.equips.cButtonSlots[button - 1]] == @@ -2084,7 +2082,7 @@ s32 Inventory_ConsumeFairy(PlayState* play) { break; } } - osSyncPrintf("妖精使用=%d\n", bottleSlot); // "Fairy Usage=%d" + PRINTF("妖精使用=%d\n", bottleSlot); // "Fairy Usage=%d" gSaveContext.save.info.inventory.items[bottleSlot + i] = ITEM_BOTTLE_EMPTY; return true; } @@ -2199,15 +2197,15 @@ s32 Health_ChangeBy(PlayState* play, s16 amount) { u16 healthLevel; // "***** Fluctuation=%d (now=%d, max=%d) ***" - osSyncPrintf("***** 増減=%d (now=%d, max=%d) ***", amount, gSaveContext.save.info.playerData.health, - gSaveContext.save.info.playerData.healthCapacity); + PRINTF("***** 増減=%d (now=%d, max=%d) ***", amount, gSaveContext.save.info.playerData.health, + gSaveContext.save.info.playerData.healthCapacity); // clang-format off if (amount > 0) { Audio_PlaySfxGeneral(NA_SE_SY_HP_RECOVER, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } else if (gSaveContext.save.info.playerData.isDoubleDefenseAcquired && (amount < 0)) { amount >>= 1; - osSyncPrintf("ハート減少半分!!=%d\n", amount); // "Heart decrease halved!!=%d" + PRINTF("ハート減少半分!!=%d\n", amount); // "Heart decrease halved!!=%d" } // clang-format on @@ -2231,7 +2229,7 @@ s32 Health_ChangeBy(PlayState* play, s16 amount) { } // "Life=%d *** %d ******" - osSyncPrintf(" ライフ=%d *** %d ******\n", gSaveContext.save.info.playerData.health, healthLevel); + PRINTF(" ライフ=%d *** %d ******\n", gSaveContext.save.info.playerData.health, healthLevel); if (gSaveContext.save.info.playerData.health <= 0) { gSaveContext.save.info.playerData.health = 0; @@ -2251,7 +2249,7 @@ void Rupees_ChangeBy(s16 rupeeChange) { void Inventory_ChangeAmmo(s16 item, s16 ammoChange) { // "Item = (%d) Amount = (%d + %d)" - osSyncPrintf("アイテム = (%d) 数 = (%d + %d) ", item, AMMO(item), ammoChange); + PRINTF("アイテム = (%d) 数 = (%d + %d) ", item, AMMO(item), ammoChange); if (item == ITEM_DEKU_STICK) { AMMO(ITEM_DEKU_STICK) += ammoChange; @@ -2305,7 +2303,7 @@ void Inventory_ChangeAmmo(s16 item, s16 ammoChange) { AMMO(ITEM_MAGIC_BEAN) += ammoChange; } - osSyncPrintf("合計 = (%d)\n", AMMO(item)); // "Total = (%d)" + PRINTF("合計 = (%d)\n", AMMO(item)); // "Total = (%d)" } void Magic_Fill(PlayState* play) { @@ -2482,8 +2480,7 @@ void Magic_Update(PlayState* play) { } // "Storage MAGIC_NOW=%d (%d)" - osSyncPrintf("蓄電 MAGIC_NOW=%d (%d)\n", gSaveContext.save.info.playerData.magic, - gSaveContext.magicFillTarget); + PRINTF("蓄電 MAGIC_NOW=%d (%d)\n", gSaveContext.save.info.playerData.magic, gSaveContext.magicFillTarget); if (gSaveContext.save.info.playerData.magic >= gSaveContext.magicFillTarget) { gSaveContext.save.info.playerData.magic = gSaveContext.magicFillTarget; @@ -3504,7 +3501,7 @@ void Interface_Draw(PlayState* play) { gSaveContext.eventInf[EVENTINF_HORSES_INDEX] &= (u16) ~(EVENTINF_HORSES_STATE_MASK | EVENTINF_HORSES_HORSETYPE_MASK | EVENTINF_HORSES_05_MASK | EVENTINF_HORSES_06_MASK | EVENTINF_HORSES_0F_MASK); - osSyncPrintf("EVENT_INF=%x\n", gSaveContext.eventInf[EVENTINF_HORSES_INDEX]); + PRINTF("EVENT_INF=%x\n", gSaveContext.eventInf[EVENTINF_HORSES_INDEX]); play->nextEntranceIndex = spoilingItemEntrances[svar1]; INV_CONTENT(gSpoilingItemReverts[svar1]) = gSpoilingItemReverts[svar1]; @@ -3753,9 +3750,9 @@ void Interface_Draw(PlayState* play) { case SUBTIMER_STATE_DOWN_MOVE: case SUBTIMER_STATE_UP_MOVE: - osSyncPrintf("event_xp[1]=%d, event_yp[1]=%d TOTAL_EVENT_TM=%d\n", - ((void)0, gSaveContext.timerX[TIMER_ID_SUB]), - ((void)0, gSaveContext.timerY[TIMER_ID_SUB]), gSaveContext.subTimerSeconds); + PRINTF("event_xp[1]=%d, event_yp[1]=%d TOTAL_EVENT_TM=%d\n", + ((void)0, gSaveContext.timerX[TIMER_ID_SUB]), + ((void)0, gSaveContext.timerY[TIMER_ID_SUB]), gSaveContext.subTimerSeconds); svar1 = (gSaveContext.timerX[TIMER_ID_SUB] - 26) / sSubTimerStateTimer; gSaveContext.timerX[TIMER_ID_SUB] -= svar1; if (gSaveContext.save.info.playerData.healthCapacity > 0xA0) { @@ -3802,7 +3799,7 @@ void Interface_Draw(PlayState* play) { sSubTimerNextSecondTimer = 20; if (gSaveContext.subTimerState == SUBTIMER_STATE_DOWN_TICK) { gSaveContext.subTimerSeconds--; - osSyncPrintf("TOTAL_EVENT_TM=%d\n", gSaveContext.subTimerSeconds); + PRINTF("TOTAL_EVENT_TM=%d\n", gSaveContext.subTimerSeconds); if (gSaveContext.subTimerSeconds <= 0) { // Out of time @@ -3965,13 +3962,13 @@ void Interface_Update(PlayState* play) { if (CHECK_BTN_ALL(debugInput->press.button, BTN_DLEFT)) { gSaveContext.language = LANGUAGE_ENG; - osSyncPrintf("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language); + PRINTF("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language); } else if (CHECK_BTN_ALL(debugInput->press.button, BTN_DUP)) { gSaveContext.language = LANGUAGE_GER; - osSyncPrintf("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language); + PRINTF("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language); } else if (CHECK_BTN_ALL(debugInput->press.button, BTN_DRIGHT)) { gSaveContext.language = LANGUAGE_FRA; - osSyncPrintf("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language); + PRINTF("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language); } if (!IS_PAUSED(&play->pauseCtx)) { @@ -4025,7 +4022,7 @@ void Interface_Update(PlayState* play) { risingAlpha = 255; } - osSyncPrintf("case 50 : alpha=%d alpha1=%d\n", dimmingAlpha, risingAlpha); + PRINTF("case 50 : alpha=%d alpha1=%d\n", dimmingAlpha, risingAlpha); Interface_RaiseButtonAlphas(play, risingAlpha); @@ -4100,13 +4097,13 @@ void Interface_Update(PlayState* play) { &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } - osSyncPrintf("now_life=%d max_life=%d\n", gSaveContext.save.info.playerData.health, - gSaveContext.save.info.playerData.healthCapacity); + PRINTF("now_life=%d max_life=%d\n", gSaveContext.save.info.playerData.health, + gSaveContext.save.info.playerData.healthCapacity); if (gSaveContext.save.info.playerData.health >= gSaveContext.save.info.playerData.healthCapacity) { gSaveContext.save.info.playerData.health = gSaveContext.save.info.playerData.healthCapacity; - osSyncPrintf("S_Private.now_life=%d S_Private.max_life=%d\n", gSaveContext.save.info.playerData.health, - gSaveContext.save.info.playerData.healthCapacity); + PRINTF("S_Private.now_life=%d S_Private.max_life=%d\n", gSaveContext.save.info.playerData.health, + gSaveContext.save.info.playerData.healthCapacity); gSaveContext.healthAccumulator = 0; } } @@ -4141,7 +4138,7 @@ void Interface_Update(PlayState* play) { &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } else { // "Rupee Amount MAX = %d" - osSyncPrintf("ルピー数MAX = %d\n", CUR_CAPACITY(UPG_WALLET)); + PRINTF("ルピー数MAX = %d\n", CUR_CAPACITY(UPG_WALLET)); gSaveContext.save.info.playerData.rupees = CUR_CAPACITY(UPG_WALLET); gSaveContext.rupeeAccumulator = 0; } @@ -4220,13 +4217,13 @@ void Interface_Update(PlayState* play) { if (gSaveContext.save.info.playerData.isMagicAcquired && (gSaveContext.save.info.playerData.magicLevel == 0)) { gSaveContext.save.info.playerData.magicLevel = gSaveContext.save.info.playerData.isDoubleMagicAcquired + 1; gSaveContext.magicState = MAGIC_STATE_STEP_CAPACITY; - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("魔法スター─────ト!!!!!!!!!\n"); // "Magic Start!!!!!!!!!" - osSyncPrintf("MAGIC_MAX=%d\n", gSaveContext.save.info.playerData.magicLevel); - osSyncPrintf("MAGIC_NOW=%d\n", gSaveContext.save.info.playerData.magic); - osSyncPrintf("Z_MAGIC_NOW_NOW=%d\n", gSaveContext.magicFillTarget); - osSyncPrintf("Z_MAGIC_NOW_MAX=%d\n", gSaveContext.magicCapacity); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("魔法スター─────ト!!!!!!!!!\n"); // "Magic Start!!!!!!!!!" + PRINTF("MAGIC_MAX=%d\n", gSaveContext.save.info.playerData.magicLevel); + PRINTF("MAGIC_NOW=%d\n", gSaveContext.save.info.playerData.magic); + PRINTF("Z_MAGIC_NOW_NOW=%d\n", gSaveContext.magicFillTarget); + PRINTF("Z_MAGIC_NOW_MAX=%d\n", gSaveContext.magicCapacity); + PRINTF(VT_RST); } Magic_Update(play); |
