mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 22:41:14 +00:00
Code Issues Projects Releases Wiki Activity

Replace most osSyncPrintf calls with PRINTF macro (#1598)

Browse source 
* Replace most osSyncPrintf calls with PRINTF macro

* DEBUG -> OOT_DEBUG
This commit is contained in:
cadmic 2024-01-12 07:38:13 -08:00 • committed by GitHub
parent 6eb3bf401c
commit 324db1d578
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
297 changed files with 2642 additions and 2679 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1735,8 +1735,8 @@ void BossMo_CoreCollisionCheck(BossMo* this, PlayState* play) {
s16 i;
Player* player = GET_PLAYER(play);
osSyncPrintf(VT_FGCOL(YELLOW));
osSyncPrintf("Core_Damage_check START\n");
PRINTF(VT_FGCOL(YELLOW));
PRINTF("Core_Damage_check START\n");
if (this->coreCollider.base.atFlags & AT_HIT) {
this->coreCollider.base.atFlags &= ~AT_HIT;
if (this->work[MO_TENT_ACTION_STATE] == MO_CORE_UNDERWATER) {
@ -1747,19 +1747,19 @@ void BossMo_CoreCollisionCheck(BossMo* this, PlayState* play) {
if (this->coreCollider.base.acFlags & AC_HIT) {
ColliderElement* acHitElem = this->coreCollider.elem.acHitElem;
// "hit!!"
osSyncPrintf("Core_Damage_check 当り！！\n");
PRINTF("Core_Damage_check 当り！！\n");
this->coreCollider.base.acFlags &= ~AC_HIT;
if ((acHitElem->toucher.dmgFlags & DMG_MAGIC_FIRE) && (this->work[MO_TENT_ACTION_STATE] == MO_CORE_ATTACK)) {
this->work[MO_TENT_ACTION_STATE] = MO_CORE_RETREAT;
}
// "hit 2 !!"
osSyncPrintf("Core_Damage_check 当り 2 ！！\n");
PRINTF("Core_Damage_check 当り 2 ！！\n");
if ((this->work[MO_TENT_ACTION_STATE] != MO_CORE_UNDERWATER) && (this->work[MO_TENT_INVINC_TIMER] == 0)) {
u8 damage = CollisionCheck_GetSwordDamage(acHitElem->toucher.dmgFlags);
if ((damage != 0) && (this->work[MO_TENT_ACTION_STATE] < MO_CORE_ATTACK)) {
// "sword hit !!"
osSyncPrintf("Core_Damage_check 剣 当り！！\n");
PRINTF("Core_Damage_check 剣 当り！！\n");
this->work[MO_TENT_ACTION_STATE] = MO_CORE_STUNNED;
this->timers[0] = 25;
@ -1829,8 +1829,8 @@ void BossMo_CoreCollisionCheck(BossMo* this, PlayState* play) {
}
}
// "end !!"
osSyncPrintf("Core_Damage_check 終わり ！！\n");
osSyncPrintf(VT_RST);
PRINTF("Core_Damage_check 終わり ！！\n");
PRINTF(VT_RST);
}
void BossMo_Core(BossMo* this, PlayState* play) {
@ -2212,7 +2212,7 @@ void BossMo_UpdateCore(Actor* thisx, PlayState* play) {
s16 i;
Player* player = GET_PLAYER(play);
osSyncPrintf("CORE mode = <%d>\n", this->work[MO_TENT_ACTION_STATE]);
PRINTF("CORE mode = <%d>\n", this->work[MO_TENT_ACTION_STATE]);
if (sMorphaTent2 == NULL) {
MO_WATER_LEVEL(play) = sMorphaTent1->waterLevelMod + (s16)this->waterLevel;
} else {
@ -2272,7 +2272,7 @@ void BossMo_UpdateTent(Actor* thisx, PlayState* play) {
SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &this->tentPos[40], &this->tentTipPos,
&this->actor.projectedW);
osSyncPrintf("MO : Move mode = <%d>\n", this->work[MO_TENT_ACTION_STATE]);
PRINTF("MO : Move mode = <%d>\n", this->work[MO_TENT_ACTION_STATE]);
Math_ApproachS(&player->actor.shape.rot.x, 0, 5, 0x3E8);
Math_ApproachS(&player->actor.shape.rot.z, 0, 5, 0x3E8);
this->work[MO_TENT_VAR_TIMER]++;