summaryrefslogtreecommitdiff
path: root/src/boot
diff options
context:
space:
mode:
authorDerek Hensley <hensley.derek58@gmail.com>2024-07-28 10:04:09 -0700
committerGitHub <noreply@github.com>2024-07-28 13:04:09 -0400
commit43cac345667dee5568434c1cd54f432322dde1a1 (patch)
tree76f94ace368fab01c0371a137f302ca3f8b1781b /src/boot
parentd0cf4fbcead28f728828ae92792afba9ce1cd8ad (diff)
Misc Cleanup (#1665)
* prefix in-function static data in z_scene_proc with s prefix in-function static data in z_eff_blure with s prefix in-function static data in Graph_TaskSet00 with s prefix in-function static data in Fault_SetOptions with s * Use uintptr_t in main * hardware_regs.ld * Remove some unessary blob comments * object_link_child_TLUT_00DA80 * object_kz texture and tlut * initialize typos
Diffstat (limited to 'src/boot')
-rw-r--r--src/boot/fault.c12
-rw-r--r--src/boot/libc64/__osMalloc.c2
-rw-r--r--src/boot/libc64/malloc.c2
3 files changed, 8 insertions, 8 deletions
diff --git a/src/boot/fault.c b/src/boot/fault.c
index 31c181342..bf7b8a98b 100644
--- a/src/boot/fault.c
+++ b/src/boot/fault.c
@@ -924,7 +924,7 @@ void Fault_ProcessClients(void) {
}
void Fault_SetOptions(void) {
- static u32 faultCustomOptions;
+ static u32 sFaultCustomOptions;
Input* input3 = &sFaultInstance->inputs[3];
s32 pad;
uintptr_t pc;
@@ -932,18 +932,18 @@ void Fault_SetOptions(void) {
uintptr_t sp;
if (CHECK_BTN_ALL(input3->press.button, BTN_RESET)) {
- faultCustomOptions = !faultCustomOptions;
+ sFaultCustomOptions = !sFaultCustomOptions;
}
- if (faultCustomOptions) {
+ if (sFaultCustomOptions) {
pc = gGraphThread.context.pc;
ra = gGraphThread.context.ra;
sp = gGraphThread.context.sp;
if (CHECK_BTN_ALL(input3->cur.button, BTN_R)) {
- static u32 faultCopyToLog;
+ static u32 sFaultCopyToLog;
- faultCopyToLog = !faultCopyToLog;
- FaultDrawer_SetOsSyncPrintfEnabled(faultCopyToLog);
+ sFaultCopyToLog = !sFaultCopyToLog;
+ FaultDrawer_SetOsSyncPrintfEnabled(sFaultCopyToLog);
}
if (CHECK_BTN_ALL(input3->cur.button, BTN_A)) {
osSyncPrintf("GRAPH PC=%08x RA=%08x STACK=%08x\n", pc, ra, sp);
diff --git a/src/boot/libc64/__osMalloc.c b/src/boot/libc64/__osMalloc.c
index 3272603e1..0cd35afff 100644
--- a/src/boot/libc64/__osMalloc.c
+++ b/src/boot/libc64/__osMalloc.c
@@ -123,7 +123,7 @@ void __osMallocCleanup(Arena* arena) {
* @param arena The Arena to check.
* @return u8 `true` if the \p arena has been initialized. `false` otherwise.
*/
-u8 __osMallocIsInitalized(Arena* arena) {
+u8 __osMallocIsInitialized(Arena* arena) {
return arena->isInit;
}
diff --git a/src/boot/libc64/malloc.c b/src/boot/libc64/malloc.c
index 510a3d05b..8e49b7a35 100644
--- a/src/boot/libc64/malloc.c
+++ b/src/boot/libc64/malloc.c
@@ -46,5 +46,5 @@ void MallocCleanup(void) {
}
s32 MallocIsInitialized(void) {
- return __osMallocIsInitalized(&malloc_arena);
+ return __osMallocIsInitialized(&malloc_arena);
}