mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-10 19:13:42 +00:00
Code Issues Projects Releases Wiki Activity

Improve manual formatting inside clang-format off blocks

Browse source
This commit is contained in:
Dragorn421 2022-04-09 12:34:50 +02:00
parent 541def8f29
commit c9f00c68c3
No known key found for this signature in database
GPG key ID: 8ACAE4BA399BD6B0
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/code/ucode_disas.c
View file

@ -224,7 +224,8 @@ void UCodeDisas_ParseRenderMode(UCodeDisas* this, u32 mode) {
// clang-format off // clang-format off
if (this->enableLog == 0) {} else { osSyncPrintf("\nGBL_c1(%s, %s, %s, %s)|", if (this->enableLog == 0) {} else { osSyncPrintf("\nGBL_c1(%s, %s, %s, %s)|",
D_8012DDDC[0][a >> 12 & 3], D_8012DDDC[1][a >> 8 & 3], D_8012DDDC[2][a >> 4 & 3], D_8012DDDC[3][a >> 0 & 3]); } D_8012DDDC[0][a >> 12 & 3], D_8012DDDC[1][a >> 8 & 3], D_8012DDDC[2][a >> 4 & 3], D_8012DDDC[3][a >> 0 & 3]);
}
// clang-format on // clang-format on
if (this->enableLog) { if (this->enableLog) {

8
src/code/z_message_PAL.c
View file

@ -739,7 +739,9 @@ u16 Message_DrawItemIcon(GlobalContext* globalCtx, u16 itemId, Gfx** p, u16 i) {
MessageContext* msgCtx = &globalCtx->msgCtx; MessageContext* msgCtx = &globalCtx->msgCtx;
// clang-format off // clang-format off
if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) { Audio_PlaySoundGeneral(0, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) { Audio_PlaySoundGeneral(0, &D_801333D4, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
}
// clang-format on // clang-format on
gDPPipeSync(gfx++); gDPPipeSync(gfx++);
@ -986,7 +988,9 @@ void Message_DrawText(GlobalContext* globalCtx, Gfx** gfxP) {
break; break;
case MESSAGE_BACKGROUND: case MESSAGE_BACKGROUND:
// clang-format off // clang-format off
if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) { Audio_PlaySoundGeneral(0, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) { Audio_PlaySoundGeneral(0, &D_801333D4, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
}
// clang-format on // clang-format on
gDPPipeSync(gfx++); gDPPipeSync(gfx++);
gDPSetCombineMode(gfx++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); gDPSetCombineMode(gfx++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);

3
src/code/z_parameter.c
View file

@ -2087,7 +2087,8 @@ void Interface_SetNaviCall(GlobalContext* globalCtx, u16 naviCallState) {
(globalCtx->csCtx.state == CS_STATE_IDLE)) { (globalCtx->csCtx.state == CS_STATE_IDLE)) {
// clang-format off // clang-format off
if (naviCallState == 0x1E) { Audio_PlaySoundGeneral(NA_SE_VO_NAVY_CALL, &D_801333D4, 4, if (naviCallState == 0x1E) { Audio_PlaySoundGeneral(NA_SE_VO_NAVY_CALL, &D_801333D4, 4,
&D_801333E0, &D_801333E0, &D_801333E8); } &D_801333E0, &D_801333E0, &D_801333E8);
}
// clang-format on // clang-format on
if (naviCallState == 0x1D) { if (naviCallState == 0x1D) {

3
src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
View file

@ -288,7 +288,8 @@ void DemoEffect_Init(Actor* thisx, GlobalContext* globalCtx2) {
this->primXluColor[1] = 255; this->primXluColor[1] = 255;
this->primXluColor[2] = 255; this->primXluColor[2] = 255;
// clang-format off // clang-format off
this->envXluColor[0] = 200; this->envXluColor[1] = 50; this->envXluColor[2] = 255; // Sameline prevents reordering // Sameline prevents reordering
this->envXluColor[0] = 200; this->envXluColor[1] = 50; this->envXluColor[2] = 255;
// clang-format on // clang-format on
break; break;