mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-12 09:50:50 +00:00
Code Issues Projects Releases Wiki Activity

[iQue] Create/update macros for printing debug strings (#2398)

Browse source
This commit is contained in:
cadmic 2025-01-08 07:33:49 -08:00 • committed by GitHub
parent a3c3c38fea
commit f329507f97
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
65 changed files with 328 additions and 303 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c
View file

@ -89,9 +89,9 @@ void BgGanonOtyuka_Destroy(Actor* thisx, PlayState* play2) {
DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId);
PRINTF(VT_FGCOL(GREEN));
PRINTF_COLOR_GREEN();
PRINTF("WHY !!!!!!!!!!!!!!!!\n");
PRINTF(VT_RST);
PRINTF_RST();
}
void BgGanonOtyuka_WaitToFall(BgGanonOtyuka* this, PlayState* play) {

4
src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c
View file

@ -92,12 +92,12 @@ void BgJyaBombiwa_Init(Actor* thisx, PlayState* play) {
BgJyaBombiwa* this = (BgJyaBombiwa*)thisx;
if (PARAMS_GET_U(this->dyna.actor.params, 0, 6) != 0x29) {
PRINTF(VT_COL(YELLOW, BLACK));
PRINTF_COLOR_WARNING();
// "Warning: Switch Number changed (%s %d)(SW %d)"
PRINTF("Ｗａｒｎｉｎｇ : Switch Number が変更された(%s %d)(SW %d)\n", "../z_bg_jya_bombiwa.c", 218,
PARAMS_GET_U(this->dyna.actor.params, 0, 6));
PRINTF(VT_RST);
PRINTF_RST();
}
BgJyaBombiwa_SetupDynaPoly(this, play, &gBombiwaCol, 0);
BgJyaBombiwa_InitCollider(this, play);

4
src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c
View file

@ -140,10 +140,10 @@ void BgJyaCobra_SpawnRay(BgJyaCobra* this, PlayState* play) {
#if DEBUG_FEATURES
if (this->dyna.actor.child == NULL) {
PRINTF(VT_FGCOL(RED));
PRINTF_COLOR_RED();
// "Ｅｒｒｏｒ : Mir Ray occurrence failure"
PRINTF("Ｅｒｒｏｒ : Mir Ray 発生失敗 (%s %d)\n", "../z_bg_jya_cobra.c", 270);
PRINTF(VT_RST);
PRINTF_RST();
}
#endif
}

4
src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c
View file

@ -125,10 +125,10 @@ void BgJyaZurerukabe_Init(Actor* thisx, PlayState* play) {
}
if (i == ARRAY_COUNT(D_8089B9F0)) {
PRINTF(VT_COL(RED, WHITE));
PRINTF_COLOR_ERROR();
PRINTF("home pos が変更されたみたい(%s %d)(arg_data 0x%04x)\n", "../z_bg_jya_zurerukabe.c", 299,
this->dyna.actor.params);
PRINTF(VT_RST);
PRINTF_RST();
}
this->unk_16E = D_8089B9F8[this->unk_168];

4
src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c
View file

@ -155,9 +155,9 @@ void BgSpot18Basket_Init(Actor* thisx, PlayState* play) {
this->dyna.actor.shape.rot.y + 0x1555, this->dyna.actor.shape.rot.z, -1);
if (this->dyna.actor.child == NULL) {
PRINTF(VT_FGCOL(RED));
PRINTF_COLOR_RED();
PRINTF("Ｅｒｒｏｒ : 変化壷蓋発生失敗(%s %d)\n", "../z_bg_spot18_basket.c", 351);
PRINTF(VT_RST);
PRINTF_RST();
Actor_Kill(&this->dyna.actor);
}
}

4
src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c
View file

@ -877,10 +877,10 @@ void BossFd2_CollisionCheck(BossFd2* this, PlayState* play) {
}
if (((s8)bossFd->actor.colChkInfo.health > 2) || canKill) {
bossFd->actor.colChkInfo.health -= damage;
PRINTF(VT_FGCOL(GREEN));
PRINTF_COLOR_GREEN();
PRINTF("damage %d\n", damage);
}
PRINTF(VT_RST);
PRINTF_RST();
PRINTF("hp %d\n", bossFd->actor.colChkInfo.health);
if ((s8)bossFd->actor.colChkInfo.health <= 0) {

4
src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
View file

@ -1747,7 +1747,7 @@ void BossMo_CoreCollisionCheck(BossMo* this, PlayState* play) {
s16 i;
Player* player = GET_PLAYER(play);
PRINTF(VT_FGCOL(YELLOW));
PRINTF_COLOR_YELLOW();
PRINTF("Core_Damage_check START\n");
if (this->coreCollider.base.atFlags & AT_HIT) {
this->coreCollider.base.atFlags &= ~AT_HIT;
@ -1843,7 +1843,7 @@ void BossMo_CoreCollisionCheck(BossMo* this, PlayState* play) {
}
// "end !!"
PRINTF("Core_Damage_check 終わり ！！\n");
PRINTF(VT_RST);
PRINTF_RST();
}
void BossMo_Core(BossMo* this, PlayState* play) {

4
src/overlays/actors/ovl_En_Fish/z_en_fish.c
View file

@ -384,10 +384,10 @@ void EnFish_Dropped_Fall(EnFish* this, PlayState* play) {
EnFish_Dropped_SetupSwimAway(this);
} else if ((this->timer <= 0) && (this->actor.params == FISH_DROPPED) &&
(this->actor.floorHeight < BGCHECK_Y_MIN + 10.0f)) {
PRINTF(VT_COL(YELLOW, BLACK));
PRINTF_COLOR_WARNING();
// "BG missing? Running Actor_delete"
PRINTF("BG 抜け？ Actor_delete します(%s %d)\n", "../z_en_sakana.c", 822);
PRINTF(VT_RST);
PRINTF_RST();
Actor_Kill(&this->actor);
}
}

16
src/overlays/actors/ovl_En_Fr/z_en_fr.c
View file

@ -245,20 +245,20 @@ void EnFr_Init(Actor* thisx, PlayState* play) {
this->actionFunc = EnFr_Idle;
} else {
if ((this->actor.params >= 6) || (this->actor.params < 0)) {
PRINTF(VT_COL(RED, WHITE));
PRINTF_COLOR_ERROR();
// "The argument is wrong!!"
PRINTF("%s[%d] : 引数が間違っている！！(%d)\n", "../z_en_fr.c", 370, this->actor.params);
PRINTF(VT_RST);
PRINTF_RST();
ASSERT(0, "0", "../z_en_fr.c", 372);
}
this->requiredObjectSlot = Object_GetSlot(&play->objectCtx, OBJECT_GAMEPLAY_FIELD_KEEP);
if (this->requiredObjectSlot < 0) {
Actor_Kill(&this->actor);
PRINTF(VT_COL(RED, WHITE));
PRINTF_COLOR_ERROR();
// "There is no bank!!"
PRINTF("%s[%d] : バンクが無いよ！！\n", "../z_en_fr.c", 380);
PRINTF(VT_RST);
PRINTF_RST();
ASSERT(0, "0", "../z_en_fr.c", 382);
}
}
@ -980,10 +980,10 @@ void EnFr_Deactivate(EnFr* this, PlayState* play) {
EnFr* frog = sEnFrPointers.frogs[frogIndex];
if (frog == NULL) {
PRINTF(VT_COL(RED, WHITE));
PRINTF_COLOR_ERROR();
// "There are no frogs!?"
PRINTF("%s[%d]カエルがいない！？\n", "../z_en_fr.c", 1604);
PRINTF(VT_RST);
PRINTF_RST();
return;
} else if (frog->isDeactivating != true) {
return;
@ -994,10 +994,10 @@ void EnFr_Deactivate(EnFr* this, PlayState* play) {
EnFr* frog = sEnFrPointers.frogs[frogIndex];
if (frog == NULL) {
PRINTF(VT_COL(RED, WHITE));
PRINTF_COLOR_ERROR();
// "There are no frogs!?"
PRINTF("%s[%d]カエルがいない！？\n", "../z_en_fr.c", 1618);
PRINTF(VT_RST);
PRINTF_RST();
return;
}
frog->isDeactivating = false;

8
src/overlays/actors/ovl_En_GirlA/z_en_girla.c
View file

@ -382,9 +382,9 @@ void EnGirlA_InitItem(EnGirlA* this, PlayState* play) {
if ((params >= SI_MAX) && (params < 0)) {
Actor_Kill(&this->actor);
PRINTF(VT_COL(RED, WHITE));
PRINTF_COLOR_ERROR();
PRINTF("引数がおかしいよ(arg_data=%d)！！\n", this->actor.params);
PRINTF(VT_RST);
PRINTF_RST();
ASSERT(0, "0", "../z_en_girlA.c", 1421);
return;
}
@ -393,9 +393,9 @@ void EnGirlA_InitItem(EnGirlA* this, PlayState* play) {
if (this->requiredObjectSlot < 0) {
Actor_Kill(&this->actor);
PRINTF(VT_COL(RED, WHITE));
PRINTF_COLOR_ERROR();
PRINTF("バンクが無いよ！！(%s)\n", sShopItemDescriptions[params]);
PRINTF(VT_RST);
PRINTF_RST();
ASSERT(0, "0", "../z_en_girlA.c", 1434);
return;
}

4
src/overlays/actors/ovl_En_Gm/z_en_gm.c
View file

@ -73,10 +73,10 @@ void EnGm_Init(Actor* thisx, PlayState* play) {
this->gmObjectSlot = Object_GetSlot(&play->objectCtx, OBJECT_GM);
if (this->gmObjectSlot < 0) {
PRINTF(VT_COL(RED, WHITE));
PRINTF_COLOR_ERROR();
// "There is no model bank! !! (Medi Goron)"
PRINTF("モデル バンクが無いよ！！（中ゴロン）\n");
PRINTF(VT_RST);
PRINTF_RST();
ASSERT(0, "0", "../z_en_gm.c", 145);
}

4
src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
View file

@ -610,9 +610,9 @@ void EnGoroiwa_Roll(EnGoroiwa* this, PlayState* play) {
}
}
Actor_SetPlayerKnockbackLarge(play, &this->actor, 2.0f, this->actor.yawTowardsPlayer, 0.0f, 0);
PRINTF(VT_FGCOL(CYAN));
PRINTF_COLOR_CYAN();
PRINTF("Player ぶっ飛ばし\n"); // "Player knocked down"
PRINTF(VT_RST);
PRINTF_RST();
onHitSetupFuncs[PARAMS_GET_U(this->actor.params, 10, 1)](this);
Player_PlaySfx(GET_PLAYER(play), NA_SE_PL_BODY_HIT);
if ((this->actor.home.rot.z & 1) == 1) {

4
src/overlays/actors/ovl_En_Guest/z_en_guest.c
View file

@ -57,10 +57,10 @@ void EnGuest_Init(Actor* thisx, PlayState* play) {
} else {
this->osAnimeObjectSlot = Object_GetSlot(&play->objectCtx, OBJECT_OS_ANIME);
if (this->osAnimeObjectSlot < 0) {
PRINTF(VT_COL(RED, WHITE));
PRINTF_COLOR_ERROR();
// "No such bank!!"
PRINTF("%s[%d] : バンクが無いよ！！\n", "../z_en_guest.c", 129);
PRINTF(VT_RST);
PRINTF_RST();
ASSERT(0, "0", "../z_en_guest.c", 132);
}
}

8
src/overlays/actors/ovl_En_Insect/z_en_insect.c
View file

@ -578,10 +578,10 @@ void EnInsect_Dropped(EnInsect* this, PlayState* play) {
distanceSq = Math3D_Vec3fDistSq(&this->actor.world.pos, &this->soilActor->actor.world.pos);
} else {
if (this->insectFlags & INSECT_FLAG_FOUND_SOIL) {
PRINTF(VT_COL(YELLOW, BLACK));
PRINTF_COLOR_WARNING();
// "warning: target Actor is NULL"
PRINTF("warning:目標 Actor が NULL (%s %d)\n", "../z_en_mushi.c", 1046);
PRINTF(VT_RST);
PRINTF_RST();
}
distanceSq = 40.0f;
}
@ -706,10 +706,10 @@ void EnInsect_Dropped(EnInsect* this, PlayState* play) {
} else if ((type == INSECT_TYPE_FIRST_DROPPED || type == INSECT_TYPE_EXTRA_DROPPED) &&
(this->insectFlags & INSECT_FLAG_0) && this->lifeTimer <= 0 && this->actionTimer <= 0 &&
this->actor.floorHeight < BGCHECK_Y_MIN + 10.0f) {
PRINTF(VT_COL(YELLOW, BLACK));
PRINTF_COLOR_WARNING();
// "BG missing? To do Actor_delete"
PRINTF("BG 抜け？ Actor_delete します(%s %d)\n", "../z_en_mushi.c", 1197);
PRINTF(VT_RST);
PRINTF_RST();
Actor_Kill(&this->actor);
}
}

4
src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
View file

@ -125,10 +125,10 @@ s32 EnIshi_SnapToFloor(EnIshi* this, PlayState* play, f32 arg2) {
Math_Vec3f_Copy(&this->actor.home.pos, &this->actor.world.pos);
return true;
} else {
PRINTF(VT_COL(YELLOW, BLACK));
PRINTF_COLOR_WARNING();
// "Failure attaching to ground"
PRINTF("地面に付着失敗(%s %d)\n", "../z_en_ishi.c", 388);
PRINTF(VT_RST);
PRINTF_RST();
return false;
}
}

6
src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
View file

@ -463,7 +463,7 @@ void EnKanban_Update(Actor* thisx, PlayState* play2) {
this->actor.bgCheckFlags = tempBgFlags;
this->actor.depthInWater = tempDepthInWater;
PRINTF(VT_RST);
PRINTF_RST();
if (1) {
u8 onGround = (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND);
@ -727,9 +727,9 @@ void EnKanban_Update(Actor* thisx, PlayState* play2) {
bomb = bomb->next;
}
}
PRINTF(VT_FGCOL(GREEN));
PRINTF_COLOR_GREEN();
PRINTF("OCARINA_MODE %d\n", play->msgCtx.ocarinaMode);
PRINTF(VT_RST);
PRINTF_RST();
switch (this->ocarinaFlag) {
case 0:
if (play->msgCtx.ocarinaMode == OCARINA_MODE_01) {

4
src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
View file

@ -115,10 +115,10 @@ s32 EnKusa_SnapToFloor(EnKusa* this, PlayState* play, f32 yOffset) {
Math_Vec3f_Copy(&this->actor.home.pos, &this->actor.world.pos);
return true;
} else {
PRINTF(VT_COL(YELLOW, BLACK));
PRINTF_COLOR_WARNING();
// "Failure attaching to ground"
PRINTF("地面に付着失敗(%s %d)\n", "../z_en_kusa.c", 323);
PRINTF(VT_RST);
PRINTF_RST();
return false;
}
}

16
src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
View file

@ -593,9 +593,9 @@ void EnOssan_Init(Actor* thisx, PlayState* play) {
//! @bug This check will always evaluate to false, it should be || not &&
if (this->actor.params > OSSAN_TYPE_MASK && this->actor.params < OSSAN_TYPE_KOKIRI) {
Actor_Kill(&this->actor);
PRINTF(VT_COL(RED, WHITE));
PRINTF_COLOR_ERROR();
PRINTF("引数がおかしいよ(arg_data=%d)！！\n", this->actor.params);
PRINTF(VT_RST);
PRINTF_RST();
ASSERT(0, "0", "../z_en_oB1.c", 1246);
return;
}
@ -622,18 +622,18 @@ void EnOssan_Init(Actor* thisx, PlayState* play) {
if (this->objectSlot1 < 0) {
Actor_Kill(&this->actor);
PRINTF(VT_COL(RED, WHITE));
PRINTF_COLOR_ERROR();
PRINTF("バンクが無いよ！！(%s)\n", sShopkeeperPrintName[this->actor.params]);
PRINTF(VT_RST);
PRINTF_RST();
ASSERT(0, "0", "../z_en_oB1.c", 1284);
return;
}
if (EnOssan_TryGetObjBankIndices(this, play, objectIds) == 0) {
Actor_Kill(&this->actor);
PRINTF(VT_COL(RED, WHITE));
PRINTF_COLOR_ERROR();
PRINTF("予備バンクが無いよ！！(%s)\n", sShopkeeperPrintName[this->actor.params]);
PRINTF(VT_RST);
PRINTF_RST();
ASSERT(0, "0", "../z_en_oB1.c", 1295);
return;
}
@ -2127,10 +2127,10 @@ void EnOssan_InitActionFunc(EnOssan* this, PlayState* play) {
this->shelves = (EnTana*)Actor_Find(&play->actorCtx, ACTOR_EN_TANA, ACTORCAT_PROP);
if (this->shelves == NULL) {
PRINTF(VT_COL(RED, WHITE));
PRINTF_COLOR_ERROR();
// "Warning!! There are no shelves!!"
PRINTF("★★★ 警告！！ 棚がないよ！！ ★★★\n");
PRINTF(VT_RST);
PRINTF_RST();
return;
}

12
src/overlays/actors/ovl_En_Owl/z_en_owl.c
View file

@ -220,11 +220,11 @@ void EnOwl_Init(Actor* thisx, PlayState* play) {
break;
default:
// Outside kokiri forest
PRINTF(VT_FGCOL(CYAN));
PRINTF_COLOR_CYAN();
PRINTF("no = %d \n", owlType);
PRINTF(T("未完成のフクロウ未完成のフクロウ未完成のフクロウ\n",
"Unfinished owl unfinished owl unfinished owl\n"));
PRINTF(VT_RST);
PRINTF_RST();
this->actionFlags |= 2;
this->unk_3EE = 0x20;
this->actionFunc = EnOwl_WaitOutsideKokiri;
@ -927,14 +927,14 @@ void func_80ACC00C(EnOwl* this, PlayState* play) {
if (this->actor.xzDistToPlayer < 50.0f) {
if (!Play_InCsMode(play)) {
owlType = PARAMS_GET_S(this->actor.params, 6, 6);
PRINTF(VT_FGCOL(CYAN));
PRINTF_COLOR_CYAN();
PRINTF(T("%dのフクロウ\n", "%d owl\n"), owlType);
PRINTF(VT_RST);
PRINTF_RST();
switch (owlType) {
case 7:
PRINTF(VT_FGCOL(CYAN));
PRINTF_COLOR_CYAN();
PRINTF(T("SPOT 06 の デモがはしった\n", "Demo of SPOT 06 has been completed\n"));
PRINTF(VT_RST);
PRINTF_RST();
play->csCtx.script = SEGMENTED_TO_VIRTUAL(gLakeHyliaOwlCs);
this->actor.draw = NULL;
break;

10
src/overlays/actors/ovl_Fishing/z_fishing.c
View file

@ -5172,11 +5172,11 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
#if DEBUG_FEATURES
if (0) {
// Strings existing only in rodata
PRINTF(VT_FGCOL(GREEN));
PRINTF(VT_FGCOL(YELLOW));
PRINTF_COLOR_GREEN();
PRINTF_COLOR_YELLOW();
PRINTF("plays %x\n");
PRINTF("ys %x\n");
PRINTF(VT_RST);
PRINTF_RST();
}
#endif
@ -5676,9 +5676,9 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
sREG(14) = 0;
#endif
PRINTF(VT_FGCOL(GREEN));
PRINTF_COLOR_GREEN();
PRINTF("zelda_time %x\n", ((void)0, gSaveContext.save.dayTime));
PRINTF(VT_RST);
PRINTF_RST();
if (sStormChanceTimer >= 2) {
sStormChanceTimer--;

12
src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c
View file

@ -472,18 +472,18 @@ void ObjBean_Init(Actor* thisx, PlayState* play) {
if (Flags_GetSwitch(play, PARAMS_GET_U(this->dyna.actor.params, 0, 6)) || (DEBUG_FEATURES && mREG(1) == 1)) {
path = PARAMS_GET_U(this->dyna.actor.params, 8, 5);
if (path == 0x1F) {
PRINTF(VT_COL(RED, WHITE));
PRINTF_COLOR_ERROR();
// "No path data?"
PRINTF("パスデータが無い？(%s %d)(arg_data %xH)\n", "../z_obj_bean.c", 909, this->dyna.actor.params);
PRINTF(VT_RST);
PRINTF_RST();
Actor_Kill(&this->dyna.actor);
return;
}
if (play->pathList[path].count < 3) {
PRINTF(VT_COL(RED, WHITE));
PRINTF_COLOR_ERROR();
// "Incorrect number of path data"
PRINTF("パスデータ数が不正(%s %d)(arg_data %xH)\n", "../z_obj_bean.c", 921, this->dyna.actor.params);
PRINTF(VT_RST);
PRINTF_RST();
Actor_Kill(&this->dyna.actor);
return;
}
@ -888,10 +888,10 @@ void ObjBean_Update(Actor* thisx, PlayState* play) {
this->dyna.actor.shape.shadowScale = this->dyna.actor.scale.x * 88.0f;
if (ObjBean_CheckForHorseTrample(this, play)) {
PRINTF(VT_FGCOL(CYAN));
PRINTF_COLOR_CYAN();
// "Horse and bean tree lift collision"
PRINTF("馬と豆の木リフト衝突！！！\n");
PRINTF(VT_RST);
PRINTF_RST();
ObjBean_Break(this, play);
DynaPoly_DisableCollision(play, &play->colCtx.dyna, this->dyna.bgId);
func_80B908EC(this);

4
src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c
View file

@ -188,10 +188,10 @@ void ObjLightswitch_Init(Actor* thisx, PlayState* play) {
if (Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_OBJ_OSHIHIKI, this->actor.home.pos.x,
this->actor.home.pos.y, this->actor.home.pos.z, 0, this->actor.home.rot.y, 0,
(0xFF << 8) | PUSHBLOCK_SMALL_START_ON) == NULL) {
PRINTF(VT_COL(RED, WHITE));
PRINTF_COLOR_ERROR();
// "Push-pull block occurrence failure"
PRINTF("押引ブロック発生失敗(%s %d)(arg_data 0x%04x)\n", "../z_obj_lightswitch.c", 452, this->actor.params);
PRINTF(VT_RST);
PRINTF_RST();
removeSelf = true;
}
}

8
src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c
View file

@ -32,15 +32,15 @@ void ObjMakekinsuta_Init(Actor* thisx, PlayState* play) {
ObjMakekinsuta* this = (ObjMakekinsuta*)thisx;
if (PARAMS_GET_NOSHIFT(this->actor.params, 13, 2) == 0x4000) {
PRINTF(VT_FGCOL(BLUE));
PRINTF_COLOR_BLUE();
// "Gold Star Enemy(arg_data %x)"
PRINTF("金スタ発生敵(arg_data %x)\n", this->actor.params);
PRINTF(VT_RST);
PRINTF_RST();
} else {
PRINTF(VT_COL(YELLOW, BLACK));
PRINTF_COLOR_WARNING();
// "Invalid Argument (arg_data %x)(%s %d)"
PRINTF("引数不正 (arg_data %x)(%s %d)\n", this->actor.params, "../z_obj_makekinsuta.c", 119);
PRINTF(VT_RST);
PRINTF_RST();
}
this->actionFunc = func_80B98320;
}

4
src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c
View file

@ -72,9 +72,9 @@ void ObjMakeoshihiki_Init(Actor* thisx, PlayState* play) {
if (Actor_SpawnAsChild(&play->actorCtx, thisx, play, ACTOR_OBJ_OSHIHIKI, spawnPos->x, spawnPos->y, spawnPos->z, 0,
block->rotY, 0, ((block->color << 6) & 0xC0) | (block->type & 0xF) | 0xFF00) == NULL) {
// "Push-pull block failure"
PRINTF(VT_COL(RED, WHITE));
PRINTF_COLOR_ERROR();
PRINTF("Ｅｒｒｏｒ : 押し引きブロック発生失敗(%s %d)\n", "../z_obj_makeoshihiki.c", 194);
PRINTF(VT_RST);
PRINTF_RST();
Actor_Kill(thisx);
return;
}

4
src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c
View file

@ -322,9 +322,9 @@ void ObjSwitch_Init(Actor* thisx, PlayState* play) {
this->dyna.actor.colChkInfo.mass = MASS_IMMOVABLE;
if (OBJSWITCH_FROZEN(&this->dyna.actor) && (ObjSwitch_SpawnIce(this, play) == NULL)) {
PRINTF(VT_FGCOL(RED));
PRINTF_COLOR_RED();
PRINTF("Error : 氷発生失敗 (%s %d)\n", "../z_obj_switch.c", 732);
PRINTF(VT_RST);
PRINTF_RST();
this->dyna.actor.params &= ~OBJSWITCH_FROZEN_FLAG;
}

4
src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c
View file

@ -264,9 +264,9 @@ void func_80BA24F8(ObjWarp2block* this, PlayState* play) {
this->unk_174++;
if (this->unk_174 > 60) {
PRINTF(VT_COL(RED, WHITE));
PRINTF_COLOR_ERROR();
PRINTF("Error : 時のブロック(ワープ２)が対でセットされていません(%s %d)\n", "../z_obj_warp2block.c", 505);
PRINTF(VT_RST);
PRINTF_RST();
Actor_Kill(&this->dyna.actor);
}
}

8
src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c
View file

@ -85,17 +85,17 @@ void OceffSpot_End(OceffSpot* this, PlayState* play) {
if (play->msgCtx.ocarinaAction != OCARINA_ACTION_CHECK_NOWARP_DONE ||
play->msgCtx.ocarinaMode != OCARINA_MODE_08) {
gSaveContext.sunsSongState = SUNSSONG_START;
PRINTF(VT_FGCOL(YELLOW));
PRINTF_COLOR_YELLOW();
// "Sun's Song Flag"
PRINTF("z_oceff_spot 太陽の歌フラグ\n");
PRINTF(VT_RST);
PRINTF_RST();
}
} else {
play->msgCtx.ocarinaMode = OCARINA_MODE_04;
PRINTF(VT_FGCOL(YELLOW));
PRINTF_COLOR_YELLOW();
// "Ocarina End"
PRINTF("z_oceff_spot オカリナ終了\n");
PRINTF(VT_RST);
PRINTF_RST();
}
}
}

4
src/overlays/gamestates/ovl_file_choose/z_file_choose.c
View file

@ -1908,10 +1908,10 @@ void FileSelect_LoadGame(GameState* thisx) {
// capacity and `magicFillTarget`
gSaveContext.save.info.playerData.magicLevel = gSaveContext.save.info.playerData.magic = 0;
PRINTF(VT_FGCOL(GREEN));
PRINTF_COLOR_GREEN();
PRINTF("Z_MAGIC_NOW_NOW=%d MAGIC_NOW=%d\n", ((void)0, gSaveContext.magicFillTarget),
gSaveContext.save.info.playerData.magic);
PRINTF(VT_RST);
PRINTF_RST();
gSaveContext.save.info.playerData.naviTimer = 0;

4
src/overlays/gamestates/ovl_file_choose/z_file_nameset.c
View file

@ -1347,13 +1347,13 @@ void FileSelect_UpdateOptionsMenu(GameState* thisx) {
#endif
PRINTF("ＳＡＶＥ");
Sram_WriteSramHeader(sramCtx);
PRINTF(VT_FGCOL(YELLOW));
PRINTF_COLOR_YELLOW();
PRINTF("sram->read_buff[2] = J_N = %x\n", sramCtx->readBuff[2]);
PRINTF("sram->read_buff[2] = J_N = %x\n", &sramCtx->readBuff[2]);
PRINTF("Na_SetSoundOutputMode = %d\n", gSaveContext.audioSetting);
PRINTF("Na_SetSoundOutputMode = %d\n", gSaveContext.audioSetting);
PRINTF("Na_SetSoundOutputMode = %d\n", gSaveContext.audioSetting);
PRINTF(VT_RST);
PRINTF_RST();
func_800F6700(gSaveContext.audioSetting);
PRINTF("終了\n");
return;

4
src/overlays/gamestates/ovl_select/z_select.c
View file

@ -20,9 +20,9 @@ void MapSelect_LoadTitle(MapSelectState* this) {
}
void MapSelect_LoadGame(MapSelectState* this, s32 entranceIndex) {
PRINTF(VT_FGCOL(BLUE));
PRINTF_COLOR_BLUE();
PRINTF("\n\n\nＦＩＬＥ＿ＮＯ＝%x\n\n\n", gSaveContext.fileNum);
PRINTF(VT_RST);
PRINTF_RST();
if (gSaveContext.fileNum == 0xFF) {
Sram_InitDebugSave();
// Set the fill target to be the saved magic amount

12
src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c
View file

@ -1877,10 +1877,10 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
#if DEBUG_FEATURES
if (pauseCtx->pageIndex == PAUSE_MAP) {
if (YREG(7) != 0) {
PRINTF(VT_FGCOL(YELLOW));
PRINTF_COLOR_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);
PRINTF_RST();
YREG(7) = 0;
SET_GS_FLAGS(D_8082AE30[pauseCtx->cursorPoint[PAUSE_WORLD_MAP]],
@ -4554,7 +4554,7 @@ void KaleidoScope_Update(PlayState* play) {
gSaveContext.healthAccumulator = 0;
gSaveContext.magicState = MAGIC_STATE_IDLE;
gSaveContext.prevMagicState = MAGIC_STATE_IDLE;
PRINTF(VT_FGCOL(YELLOW));
PRINTF_COLOR_YELLOW();
PRINTF("MAGIC_NOW=%d ", gSaveContext.save.info.playerData.magic);
PRINTF("Z_MAGIC_NOW_NOW=%d → ", gSaveContext.magicFillTarget);
gSaveContext.magicCapacity = 0;
@ -4565,7 +4565,7 @@ void KaleidoScope_Update(PlayState* play) {
gSaveContext.save.info.playerData.magicLevel = gSaveContext.save.info.playerData.magic = 0;
PRINTF("MAGIC_NOW=%d ", gSaveContext.save.info.playerData.magic);
PRINTF("Z_MAGIC_NOW_NOW=%d\n", gSaveContext.magicFillTarget);
PRINTF(VT_RST);
PRINTF_RST();
} else {
play->state.running = false;
SET_NEXT_GAMESTATE(&play->state, TitleSetup_Init, TitleSetupState);
@ -4636,13 +4636,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;
PRINTF(VT_FGCOL(YELLOW));
PRINTF_COLOR_YELLOW();
PRINTF("i=%d LAST_TIME_TYPE=%d\n", i, gSaveContext.prevHudVisibilityMode);
gSaveContext.hudVisibilityMode = HUD_VISIBILITY_NO_CHANGE;
Interface_ChangeHudVisibilityMode(gSaveContext.prevHudVisibilityMode);
player->talkActor = NULL;
Player_SetEquipmentData(play, player);
PRINTF(VT_RST);
PRINTF_RST();
break;
}
}