mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 14:31:17 +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

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

@ -243,20 +243,20 @@ void EnFr_Init(Actor* thisx, PlayState* play) {
this->actionFunc = EnFr_Idle;
} else {
if ((this->actor.params >= 6) || (this->actor.params < 0)) {
osSyncPrintf(VT_COL(RED, WHITE));
PRINTF(VT_COL(RED, WHITE));
// "The argument is wrong!!"
osSyncPrintf("%s[%d] : 引数が間違っている！！(%d)\n", "../z_en_fr.c", 370, this->actor.params);
osSyncPrintf(VT_RST);
PRINTF("%s[%d] : 引数が間違っている！！(%d)\n", "../z_en_fr.c", 370, this->actor.params);
PRINTF(VT_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);
osSyncPrintf(VT_COL(RED, WHITE));
PRINTF(VT_COL(RED, WHITE));
// "There is no bank!!"
osSyncPrintf("%s[%d] : バンクが無いよ！！\n", "../z_en_fr.c", 380);
osSyncPrintf(VT_RST);
PRINTF("%s[%d] : バンクが無いよ！！\n", "../z_en_fr.c", 380);
PRINTF(VT_RST);
ASSERT(0, "0", "../z_en_fr.c", 382);
}
}
@ -985,10 +985,10 @@ void EnFr_Deactivate(EnFr* this, PlayState* play) {
for (frogIndex = 0; frogIndex < ARRAY_COUNT(sEnFrPointers.frogs); frogIndex++) {
frogLoop1 = sEnFrPointers.frogs[frogIndex];
if (frogLoop1 == NULL) {
osSyncPrintf(VT_COL(RED, WHITE));
PRINTF(VT_COL(RED, WHITE));
// "There are no frogs!?"
osSyncPrintf("%s[%d]カエルがいない！？\n", "../z_en_fr.c", 1604);
osSyncPrintf(VT_RST);
PRINTF("%s[%d]カエルがいない！？\n", "../z_en_fr.c", 1604);
PRINTF(VT_RST);
return;
} else if (frogLoop1->isDeactivating != true) {
return;
@ -998,10 +998,10 @@ void EnFr_Deactivate(EnFr* this, PlayState* play) {
for (frogIndex = 0; frogIndex < ARRAY_COUNT(sEnFrPointers.frogs); frogIndex++) {
frogLoop2 = sEnFrPointers.frogs[frogIndex];
if (frogLoop2 == NULL) {
osSyncPrintf(VT_COL(RED, WHITE));
PRINTF(VT_COL(RED, WHITE));
// "There are no frogs!?"
osSyncPrintf("%s[%d]カエルがいない！？\n", "../z_en_fr.c", 1618);
osSyncPrintf(VT_RST);
PRINTF("%s[%d]カエルがいない！？\n", "../z_en_fr.c", 1618);
PRINTF(VT_RST);
return;
}
frogLoop2->isDeactivating = false;

2
src/overlays/actors/ovl_En_Fr/z_en_fr.h
View file

@ -47,7 +47,7 @@ typedef struct EnFr {
/* 0x0379 */ u8 isJumpingUp; // Conditional for jumping up from the log back onto the log
/* 0x037A */ u8 isBelowWaterSurfaceCurrent; // Used for diving effects
/* 0x037B */ u8 isBelowWaterSurfacePrevious;
/* 0x037C */ u8 isDeactivating; // Related to debugging (osSyncPrintf)
/* 0x037C */ u8 isDeactivating; // Related to debugging (PRINTF)
/* 0x037D */ u8 isActive; // Each Frog grows when their specific song is played.
/* 0x037E */ u8 growingScaleIndex; // Target Scale Level 0-3 while growing (3 highest smooth)
/* 0x037F */ u8 isGrowing; // While growing, the frog will switch between its larger size and its original size every frame