diff options
| author | Random <28494085+Random06457@users.noreply.github.com> | 2020-04-08 18:45:50 +0200 |
|---|---|---|
| committer | Random <28494085+Random06457@users.noreply.github.com> | 2020-04-08 18:45:50 +0200 |
| commit | 0c0c15018f684357795ffa7032c77f9a18190229 (patch) | |
| tree | 27de6235ba2fb0ef40bb8bb5cf074daace8d6b63 /src/code | |
| parent | d0cf6e153b4f47f04f73656a1534314208b2f596 (diff) | |
Run format.sh
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/graph.c | 2 | ||||
| -rw-r--r-- | src/code/printutils.c | 6 | ||||
| -rw-r--r-- | src/code/sleep.c | 15 | ||||
| -rw-r--r-- | src/code/z_demo.c | 9 |
4 files changed, 12 insertions, 20 deletions
diff --git a/src/code/graph.c b/src/code/graph.c index fb3d80e06..cd7f5fe2b 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -263,7 +263,7 @@ u32 sGraphCfbInfoIdx = 0; // Very close to matching, stack usage #ifdef NON_MATCHING void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { - u32 problem; // 0xC4 -> 0xD4 + u32 problem; // 0xC4 -> 0xD4 Gfx* dispRefs[5]; // 0xB0 -> 0xC0 Gfx* dispRefs2[9]; // 0x8C -> 0x9C Gfx* dispRefs3[9]; // 0x68 -> 0x78 diff --git a/src/code/printutils.c b/src/code/printutils.c index e1e70f076..7cd00f71c 100644 --- a/src/code/printutils.c +++ b/src/code/printutils.c @@ -1,12 +1,10 @@ #include <global.h> -void PrintUtils_VPrintf(char** arg0, const char* fmt, va_list args) -{ +void PrintUtils_VPrintf(char** arg0, const char* fmt, va_list args) { _Printf(*arg0, arg0, fmt, args); } -void PrintUtils_Printf(void* arg0, const char* fmt, ...) -{ +void PrintUtils_Printf(void* arg0, const char* fmt, ...) { va_list args; va_start(args, fmt); diff --git a/src/code/sleep.c b/src/code/sleep.c index f83ccc070..901fd3520 100644 --- a/src/code/sleep.c +++ b/src/code/sleep.c @@ -1,7 +1,6 @@ #include <global.h> -void Sleep_Cycles(OSTime cycles) -{ +void Sleep_Cycles(OSTime cycles) { OSMesgQueue mq; OSMesg msg; OSTimer timer; @@ -11,23 +10,19 @@ void Sleep_Cycles(OSTime cycles) osRecvMesg(&mq, NULL, OS_MESG_BLOCK); } -void Sleep_Nsec(u32 nsec) -{ +void Sleep_Nsec(u32 nsec) { Sleep_Cycles(OS_NSEC_TO_CYCLES(nsec)); } -void Sleep_Usec(u32 usec) -{ +void Sleep_Usec(u32 usec) { Sleep_Cycles(OS_USEC_TO_CYCLES(usec)); } // originally "msleep" -void Sleep_Msec(u32 ms) -{ +void Sleep_Msec(u32 ms) { Sleep_Cycles((ms * OS_CPU_COUNTER) / 1000ull); } -void Sleep_Sec(u32 sec) -{ +void Sleep_Sec(u32 sec) { Sleep_Cycles((sec * OS_CPU_COUNTER)); } diff --git a/src/code/z_demo.c b/src/code/z_demo.c index f43eb59f0..be6505dcd 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -99,15 +99,14 @@ void func_80064558(GlobalContext* globalCtx, CutsceneContext* csCtx) { void func_800645A0(GlobalContext* globalCtx, CutsceneContext* csCtx) { Input* pad1 = &globalCtx->state.input[0]; - if (!~(pad1->padPressed | ~L_JPAD) && (csCtx->state == CS_STATE_IDLE) && - (gSaveContext.scene_setup_index >= 4)) { + if (!~(pad1->padPressed | ~L_JPAD) && (csCtx->state == CS_STATE_IDLE) && (gSaveContext.scene_setup_index >= 4)) { D_8015FCC8 = 0; gSaveContext.cutscene_index = 0xFFFD; gSaveContext.cutscene_trigger = 1; } - if (!~(pad1->padPressed | ~U_JPAD) && (csCtx->state == CS_STATE_IDLE) && - (gSaveContext.scene_setup_index >= 4) && (D_8011D394 == 0)) { + if (!~(pad1->padPressed | ~U_JPAD) && (csCtx->state == CS_STATE_IDLE) && (gSaveContext.scene_setup_index >= 4) && + (D_8011D394 == 0)) { D_8015FCC8 = 1; gSaveContext.cutscene_index = 0xFFFD; gSaveContext.cutscene_trigger = 1; @@ -431,7 +430,7 @@ void func_80065134(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdDayTim if (csCtx->frames == cmd->startFrame) { temp1 = (cmd->hour * 60.0f) / 0.021972656f; temp2 = (cmd->minute + 1) / 0.021972656f; - + gSaveContext.day_time = temp1 + temp2; gSaveContext.environment_time = temp1 + temp2; } |
