diff --git a/assets/xml/objects/object_fu_kaiten.xml b/assets/xml/objects/object_fu_kaiten.xml index ad277bb261..d87c789127 100644 --- a/assets/xml/objects/object_fu_kaiten.xml +++ b/assets/xml/objects/object_fu_kaiten.xml @@ -12,7 +12,6 @@ - diff --git a/assets/xml/objects/object_horse_link_child.xml b/assets/xml/objects/object_horse_link_child.xml index 535ea1d866..505c3271a7 100644 --- a/assets/xml/objects/object_horse_link_child.xml +++ b/assets/xml/objects/object_horse_link_child.xml @@ -35,8 +35,6 @@ - - diff --git a/assets/xml/objects/object_kz.xml b/assets/xml/objects/object_kz.xml index 6295d7b1d2..275a2791ef 100644 --- a/assets/xml/objects/object_kz.xml +++ b/assets/xml/objects/object_kz.xml @@ -33,8 +33,8 @@ - - + + diff --git a/assets/xml/objects/object_link_child.xml b/assets/xml/objects/object_link_child.xml index dd045c1d80..7d353d9edf 100644 --- a/assets/xml/objects/object_link_child.xml +++ b/assets/xml/objects/object_link_child.xml @@ -54,7 +54,7 @@ - + diff --git a/assets/xml/objects/object_zl1.xml b/assets/xml/objects/object_zl1.xml index ed7fbf987f..1bd15193a0 100644 --- a/assets/xml/objects/object_zl1.xml +++ b/assets/xml/objects/object_zl1.xml @@ -42,7 +42,6 @@ - diff --git a/assets/xml/objects/object_zod.xml b/assets/xml/objects/object_zod.xml index a926e6ef91..0a999d8852 100644 --- a/assets/xml/objects/object_zod.xml +++ b/assets/xml/objects/object_zod.xml @@ -30,8 +30,6 @@ - - diff --git a/include/libc64/os_malloc.h b/include/libc64/os_malloc.h index 3bbb5c2739..78cbc233f3 100644 --- a/include/libc64/os_malloc.h +++ b/include/libc64/os_malloc.h @@ -23,7 +23,7 @@ typedef struct Arena { void __osMallocInit(Arena* arena, void* heap, size_t size); void __osMallocCleanup(Arena* arena); -u8 __osMallocIsInitalized(Arena* arena); +u8 __osMallocIsInitialized(Arena* arena); void* __osMalloc(Arena* arena, size_t size); void* __osMallocR(Arena* arena, size_t size); void __osFree(Arena* arena, void* ptr); diff --git a/include/variables.h b/include/variables.h index b3905423b0..13f36e4ffa 100644 --- a/include/variables.h +++ b/include/variables.h @@ -43,7 +43,7 @@ extern s16 gInvalidAdpcmCodeBook[]; extern f32 gHeadsetPanVolume[]; extern f32 gStereoPanVolume[]; extern f32 gDefaultPanVolume[]; -extern s32 gAudioCtxInitalized; +extern s32 gAudioCtxInitialized; extern STACK(aspMainStack, 0x400); extern u8 gAudioSpecId; diff --git a/linker_scripts/hardware_regs.ld b/linker_scripts/hardware_regs.ld new file mode 100644 index 0000000000..785711579c --- /dev/null +++ b/linker_scripts/hardware_regs.ld @@ -0,0 +1,120 @@ +// libultra OS symbols + +D_80000000 = 0x80000000; // __osExceptionPreamble +D_80000004 = 0x80000004; // __osExceptionPreamble +D_80000008 = 0x80000008; // __osExceptionPreamble +D_8000000C = 0x8000000C; // __osExceptionPreamble +D_80000010 = 0x80000010; // +D_80000020 = 0x80000020; // + +osTvType = 0x80000300; +osRomType = 0x80000304; +osRomBase = 0x80000308; +osResetType = 0x8000030C; +osCicId = 0x80000310; +osVersion = 0x80000314; +osMemSize = 0x80000318; +osAppNMIBuffer = 0x8000031C; + +/// OS hardware registers + +// Signal Processor Registers + +D_A4040000 = 0xA4040000; // SP_MEM_ADDR_REG +D_A4040004 = 0xA4040004; // SP_DRAM_ADDR_REG +D_A4040008 = 0xA4040008; // SP_RD_LEN_REG +D_A404000C = 0xA404000C; // SP_WR_LEN_REG +D_A4040010 = 0xA4040010; // SP_STATUS_REG +D_A4040014 = 0xA4040014; // SP_DMA_FULL_REG +D_A4040018 = 0xA4040018; // SP_DMA_BUSY_REG +D_A404001C = 0xA404001C; // SP_SEMAPHORE_REG + +D_A4080000 = 0xA4080000; // SP PC + +// Display Processor Command Registers / Rasterizer Interface + +D_A4100000 = 0xA4100000; // DPC_START_REG +D_A4100004 = 0xA4100004; // DPC_END_REG +D_A4100008 = 0xA4100008; // DPC_CURRENT_REG +D_A410000C = 0xA410000C; // DPC_STATUS_REG +D_A4100010 = 0xA4100010; // DPC_CLOCK_REG +D_A4100014 = 0xA4100014; // DPC_BUFBUSY_REG +D_A4100018 = 0xA4100018; // DPC_PIPEBUSY_REG +D_A410001C = 0xA410001C; // DPC_TMEM_REG + +// Display Processor Span Registers + +D_A4200000 = 0xA4200000; // DPS_TBIST_REG / DP_TMEM_BIST +D_A4200004 = 0xA4200004; // DPS_TEST_MODE_REG +D_A4200008 = 0xA4200008; // DPS_BUFTEST_ADDR_REG +D_A420000C = 0xA420000C; // DPS_BUFTEST_DATA_REG + +// MIPS Interface Registers + +D_A4300000 = 0xA4300000; // MI_MODE_REG / MI_INIT_MODE_REG +D_A4300004 = 0xA4300004; // MI_VERSION_REG +D_A4300008 = 0xA4300008; // MI_INTR_REG +D_A430000C = 0xA430000C; // MI_INTR_MASK_REG + +// Video Interface Registers + +D_A4400000 = 0xA4400000; // VI_STATUS_REG / VI_CONTROL_REG +D_A4400004 = 0xA4400004; // VI_DRAM_ADDR_REG / VI_ORIGIN_REG +D_A4400008 = 0xA4400008; // VI_WIDTH_REG +D_A440000C = 0xA440000C; // VI_INTR_REG +D_A4400010 = 0xA4400010; // VI_CURRENT_REG +D_A4400014 = 0xA4400014; // VI_BURST_REG / VI_TIMING_REG +D_A4400018 = 0xA4400018; // VI_V_SYNC_REG +D_A440001C = 0xA440001C; // VI_H_SYNC_REG +D_A4400020 = 0xA4400020; // VI_LEAP_REG +D_A4400024 = 0xA4400024; // VI_H_START_REG +D_A4400028 = 0xA4400028; // VI_V_START_REG +D_A440002C = 0xA440002C; // VI_V_BURST_REG +D_A4400030 = 0xA4400030; // VI_X_SCALE_REG +D_A4400034 = 0xA4400034; // VI_Y_SCALE_REG + +// Audio Interface Registers + +D_A4500000 = 0xA4500000; // AI_DRAM_ADDR_REG +D_A4500004 = 0xA4500004; // AI_LEN_REG +D_A4500008 = 0xA4500008; // AI_CONTROL_REG +D_A450000C = 0xA450000C; // AI_STATUS_REG +D_A4500010 = 0xA4500010; // AI_DACRATE_REG +D_A4500014 = 0xA4500014; // AI_BITRATE_REG + +// Peripheral/Parallel Interface Registers + +D_A4600000 = 0xA4600000; // PI_DRAM_ADDR_REG +D_A4600004 = 0xA4600004; // PI_CART_ADDR_REG +D_A4600008 = 0xA4600008; // PI_RD_LEN_REG +D_A460000C = 0xA460000C; // PI_WR_LEN_REG +D_A4600010 = 0xA4600010; // PI_STATUS_REG +D_A4600014 = 0xA4600014; // PI_BSD_DOM1_LAT_REG // PI dom1 latency +D_A4600018 = 0xA4600018; // PI_BSD_DOM1_PWD_REG // PI dom1 pulse width +D_A460001C = 0xA460001C; // PI_BSD_DOM1_PGS_REG // PI dom1 page size +D_A4600020 = 0xA4600020; // PI_BSD_DOM1_RLS_REG // PI dom1 release +D_A4600024 = 0xA4600024; // PI_BSD_DOM2_LAT_REG // PI dom2 latency +D_A4600028 = 0xA4600028; // PI_BSD_DOM2_LWD_REG // PI dom2 pulse width +D_A460002C = 0xA460002C; // PI_BSD_DOM2_PGS_REG // PI dom2 page size +D_A4600030 = 0xA4600030; // PI_BSD_DOM2_RLS_REG // PI dom2 release + +// RDRAM Interface Registers + +D_A4700000 = 0xA4700000; // RI_MODE_REG +D_A4700004 = 0xA4700004; // RI_CONFIG_REG +D_A4700008 = 0xA4700008; // RI_CURRENT_LOAD_REG +D_A470000C = 0xA470000C; // RI_SELECT_REG +D_A4700010 = 0xA4700010; // RI_REFRESH_REG +D_A4700014 = 0xA4700014; // RI_LATENCY_REG +D_A4700018 = 0xA4700018; // RI_RERROR_REG +D_A470001C = 0xA470001C; // RI_WERROR_REG + +// Serial Interface Registers + +D_A4800000 = 0xA4800000; // SI_DRAM_ADDR_REG +D_A4800004 = 0xA4800004; // SI_PIF_ADDR_RD64B_REG +D_A4800008 = 0xA4800008; // reserved +D_A480000C = 0xA480000C; // reserved +D_A4800010 = 0xA4800010; // SI_PIF_ADDR_WR64B_REG +D_A4800014 = 0xA4800014; // reserved +D_A4800018 = 0xA4800018; // SI_STATUS_REG diff --git a/linker_scripts/undefined_syms.ld b/linker_scripts/undefined_syms.ld index 7e741f31b6..a08487f81f 100644 --- a/linker_scripts/undefined_syms.ld +++ b/linker_scripts/undefined_syms.ld @@ -1,127 +1,3 @@ -// libultra OS symbols - -D_80000000 = 0x80000000; // __osExceptionPreamble -D_80000004 = 0x80000004; // __osExceptionPreamble -D_80000008 = 0x80000008; // __osExceptionPreamble -D_8000000C = 0x8000000C; // __osExceptionPreamble -D_80000010 = 0x80000010; // -D_80000020 = 0x80000020; // - -osTvType = 0x80000300; -osRomType = 0x80000304; -osRomBase = 0x80000308; -osResetType = 0x8000030C; -osCicId = 0x80000310; -osVersion = 0x80000314; -osMemSize = 0x80000318; -osAppNMIBuffer = 0x8000031C; - -/// OS hardware registers - -// Signal Processor Registers - -D_A4040000 = 0xA4040000; // SP_MEM_ADDR_REG -D_A4040004 = 0xA4040004; // SP_DRAM_ADDR_REG -D_A4040008 = 0xA4040008; // SP_RD_LEN_REG -D_A404000C = 0xA404000C; // SP_WR_LEN_REG -D_A4040010 = 0xA4040010; // SP_STATUS_REG -D_A4040014 = 0xA4040014; // SP_DMA_FULL_REG -D_A4040018 = 0xA4040018; // SP_DMA_BUSY_REG -D_A404001C = 0xA404001C; // SP_SEMAPHORE_REG - -D_A4080000 = 0xA4080000; // SP PC - -// Display Processor Command Registers / Rasterizer Interface - -D_A4100000 = 0xA4100000; // DPC_START_REG -D_A4100004 = 0xA4100004; // DPC_END_REG -D_A4100008 = 0xA4100008; // DPC_CURRENT_REG -D_A410000C = 0xA410000C; // DPC_STATUS_REG -D_A4100010 = 0xA4100010; // DPC_CLOCK_REG -D_A4100014 = 0xA4100014; // DPC_BUFBUSY_REG -D_A4100018 = 0xA4100018; // DPC_PIPEBUSY_REG -D_A410001C = 0xA410001C; // DPC_TMEM_REG - -// Display Processor Span Registers - -D_A4200000 = 0xA4200000; // DPS_TBIST_REG / DP_TMEM_BIST -D_A4200004 = 0xA4200004; // DPS_TEST_MODE_REG -D_A4200008 = 0xA4200008; // DPS_BUFTEST_ADDR_REG -D_A420000C = 0xA420000C; // DPS_BUFTEST_DATA_REG - -// MIPS Interface Registers - -D_A4300000 = 0xA4300000; // MI_MODE_REG / MI_INIT_MODE_REG -D_A4300004 = 0xA4300004; // MI_VERSION_REG -D_A4300008 = 0xA4300008; // MI_INTR_REG -D_A430000C = 0xA430000C; // MI_INTR_MASK_REG - -// Video Interface Registers - -D_A4400000 = 0xA4400000; // VI_STATUS_REG / VI_CONTROL_REG -D_A4400004 = 0xA4400004; // VI_DRAM_ADDR_REG / VI_ORIGIN_REG -D_A4400008 = 0xA4400008; // VI_WIDTH_REG -D_A440000C = 0xA440000C; // VI_INTR_REG -D_A4400010 = 0xA4400010; // VI_CURRENT_REG -D_A4400014 = 0xA4400014; // VI_BURST_REG / VI_TIMING_REG -D_A4400018 = 0xA4400018; // VI_V_SYNC_REG -D_A440001C = 0xA440001C; // VI_H_SYNC_REG -D_A4400020 = 0xA4400020; // VI_LEAP_REG -D_A4400024 = 0xA4400024; // VI_H_START_REG -D_A4400028 = 0xA4400028; // VI_V_START_REG -D_A440002C = 0xA440002C; // VI_V_BURST_REG -D_A4400030 = 0xA4400030; // VI_X_SCALE_REG -D_A4400034 = 0xA4400034; // VI_Y_SCALE_REG - -// Audio Interface Registers - -D_A4500000 = 0xA4500000; // AI_DRAM_ADDR_REG -D_A4500004 = 0xA4500004; // AI_LEN_REG -D_A4500008 = 0xA4500008; // AI_CONTROL_REG -D_A450000C = 0xA450000C; // AI_STATUS_REG -D_A4500010 = 0xA4500010; // AI_DACRATE_REG -D_A4500014 = 0xA4500014; // AI_BITRATE_REG - -// Peripheral/Parallel Interface Registers - -D_A4600000 = 0xA4600000; // PI_DRAM_ADDR_REG -D_A4600004 = 0xA4600004; // PI_CART_ADDR_REG -D_A4600005 = 0xA4600005; -D_A4600006 = 0xA4600006; -D_A4600007 = 0xA4600007; -D_A4600008 = 0xA4600008; // PI_RD_LEN_REG -D_A460000C = 0xA460000C; // PI_WR_LEN_REG -D_A4600010 = 0xA4600010; // PI_STATUS_REG -D_A4600014 = 0xA4600014; // PI_BSD_DOM1_LAT_REG // PI dom1 latency -D_A4600018 = 0xA4600018; // PI_BSD_DOM1_PWD_REG // PI dom1 pulse width -D_A460001C = 0xA460001C; // PI_BSD_DOM1_PGS_REG // PI dom1 page size -D_A4600020 = 0xA4600020; // PI_BSD_DOM1_RLS_REG // PI dom1 release -D_A4600024 = 0xA4600024; // PI_BSD_DOM2_LAT_REG // PI dom2 latency -D_A4600028 = 0xA4600028; // PI_BSD_DOM2_LWD_REG // PI dom2 pulse width -D_A460002C = 0xA460002C; // PI_BSD_DOM2_PGS_REG // PI dom2 page size -D_A4600030 = 0xA4600030; // PI_BSD_DOM2_RLS_REG // PI dom2 release - -// RDRAM Interface Registers - -D_A4700000 = 0xA4700000; // RI_MODE_REG -D_A4700004 = 0xA4700004; // RI_CONFIG_REG -D_A4700008 = 0xA4700008; // RI_CURRENT_LOAD_REG -D_A470000C = 0xA470000C; // RI_SELECT_REG -D_A4700010 = 0xA4700010; // RI_REFRESH_REG -D_A4700014 = 0xA4700014; // RI_LATENCY_REG -D_A4700018 = 0xA4700018; // RI_RERROR_REG -D_A470001C = 0xA470001C; // RI_WERROR_REG - -// Serial Interface Registers - -D_A4800000 = 0xA4800000; // SI_DRAM_ADDR_REG -D_A4800004 = 0xA4800004; // SI_PIF_ADDR_RD64B_REG -D_A4800008 = 0xA4800008; // reserved -D_A480000C = 0xA480000C; // reserved -D_A4800010 = 0xA4800010; // SI_PIF_ADDR_WR64B_REG -D_A4800014 = 0xA4800014; // reserved -D_A4800018 = 0xA4800018; // SI_STATUS_REG - // sys_cfb buffers gFramebufferHiRes1 = gLoBuffer; diff --git a/src/audio/lib/heap.c b/src/audio/lib/heap.c index 0d11acfed0..aed3c0f9c2 100644 --- a/src/audio/lib/heap.c +++ b/src/audio/lib/heap.c @@ -1071,7 +1071,7 @@ void AudioHeap_Init(void) { AudioHeap_InitSampleCaches(spec->persistentSampleCacheSize, spec->temporarySampleCacheSize); AudioLoad_InitSampleDmaBuffers(gAudioCtx.numNotes); - // Initalize Loads + // Initialize Loads gAudioCtx.preloadSampleStackTop = 0; AudioLoad_InitSlowLoads(); AudioLoad_InitScriptLoads(); diff --git a/src/audio/lib/load.c b/src/audio/lib/load.c index 3d6dacbd90..cd399f23ff 100644 --- a/src/audio/lib/load.c +++ b/src/audio/lib/load.c @@ -94,7 +94,7 @@ s32 D_801FD1E0; DmaHandler sDmaHandler = osEPiStartDma; void* sUnusedHandler = NULL; -s32 gAudioCtxInitalized = false; +s32 gAudioCtxInitialized = false; void AudioLoad_DecreaseSampleDmaTtls(void) { u32 i; @@ -1330,7 +1330,7 @@ void AudioLoad_Init(void* heap, size_t heapSize) { } AudioHeap_InitPool(&gAudioCtx.permanentPool, addr, gAudioHeapInitSizes.permanentPoolSize); - gAudioCtxInitalized = true; + gAudioCtxInitialized = true; osSendMesg(gAudioCtx.taskStartQueueP, (void*)gAudioCtx.totalTaskCount, OS_MESG_NOBLOCK); } diff --git a/src/audio/lib/thread.c b/src/audio/lib/thread.c index 13c3f07577..c1c232d827 100644 --- a/src/audio/lib/thread.c +++ b/src/audio/lib/thread.c @@ -581,7 +581,7 @@ s32 AudioThread_ResetAudioHeap(s32 specId) { void AudioThread_PreNMIInternal(void) { gAudioCtx.resetTimer = 1; - if (gAudioCtxInitalized) { + if (gAudioCtxInitialized) { AudioThread_ResetAudioHeap(0); gAudioCtx.resetStatus = 0; } diff --git a/src/boot/fault.c b/src/boot/fault.c index 31c181342c..bf7b8a98b1 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 3272603e13..0cd35afffc 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 510a3d05b2..8e49b7a358 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); } diff --git a/src/code/graph.c b/src/code/graph.c index 191ea1960c..2be2d9de8f 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -138,8 +138,8 @@ void Graph_Destroy(GraphicsContext* gfxCtx) { * If it does not signal completion in that time, retry or trigger a crash. */ void Graph_TaskSet00(GraphicsContext* gfxCtx, GameState* gameState) { - static s32 retryCount = 10; - static s32 cfbIdx = 0; + static s32 sRetryCount = 10; + static s32 sCfbIndex = 0; OSTask_t* task = &gfxCtx->task.list.t; OSScTask* scTask = &gfxCtx->task; OSTimer timer; @@ -153,8 +153,8 @@ retry: if (msg == (OSMesg)666) { osSyncPrintf("GRAPH SP TIMEOUT\n"); - if (retryCount >= 0) { - retryCount--; + if (sRetryCount >= 0) { + sRetryCount--; Sched_SendGfxCancelMsg(&gScheduler); goto retry; } else { @@ -200,8 +200,8 @@ retry: { s32 pad; } - cfb = &sGraphCfbInfos[cfbIdx]; - cfbIdx = (cfbIdx + 1) % ARRAY_COUNT(sGraphCfbInfos); + cfb = &sGraphCfbInfos[sCfbIndex]; + sCfbIndex = (sCfbIndex + 1) % ARRAY_COUNT(sGraphCfbInfos); cfb->framebuffer = gfxCtx->curFrameBuffer; cfb->swapBuffer = gfxCtx->curFrameBuffer; diff --git a/src/code/main.c b/src/code/main.c index 7b896c7b8f..f45a1dfb20 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -42,8 +42,8 @@ s32 gScreenHeight = SCREEN_HEIGHT; size_t gSystemHeapSize = 0; void Main(void* arg) { - intptr_t fb; - intptr_t sysHeap; + uintptr_t fb; + uintptr_t sysHeap; s32 exit; s16* msg; @@ -55,7 +55,7 @@ void Main(void* arg) { Check_RegionIsSupported(); Check_ExpansionPak(); - sysHeap = (intptr_t)SEGMENT_START(system_heap); + sysHeap = (uintptr_t)SEGMENT_START(system_heap); fb = FRAMEBUFFERS_START_ADDR; gSystemHeapSize = fb - sysHeap; SystemHeap_Init((void*)sysHeap, gSystemHeapSize); diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c index c9fc940b7e..3aa6e40500 100644 --- a/src/code/z_eff_blure.c +++ b/src/code/z_eff_blure.c @@ -390,7 +390,7 @@ void EffectBlure_SetupSmooth(EffectBlure* this, GraphicsContext* gfxCtx) { void EffectBlure_DrawElemNoInterpolation(EffectBlure* this, EffectBlureElement* elem, s32 index, GraphicsContext* gfxCtx) { - static Vtx_t baseVtx = VTX_T(0, 0, 0, 0, 0, 255, 255, 255, 255); + static Vtx_t sBaseVtx = VTX_T(0, 0, 0, 0, 0, 255, 255, 255, 255); Vtx* vtx; Vec3s sp8C; Vec3s sp84; @@ -408,10 +408,10 @@ void EffectBlure_DrawElemNoInterpolation(EffectBlure* this, EffectBlureElement* vtx = GRAPH_ALLOC(gfxCtx, 4 * sizeof(Vtx)); if (vtx == NULL) { } else { - vtx[0].v = baseVtx; - vtx[1].v = baseVtx; - vtx[2].v = baseVtx; - vtx[3].v = baseVtx; + vtx[0].v = sBaseVtx; + vtx[1].v = sBaseVtx; + vtx[2].v = sBaseVtx; + vtx[3].v = sBaseVtx; ratio = (f32)elem->timer / (f32)this->elemDuration; EffectBlure_GetComputedValues(this, index, ratio, &sp8C, &sp84, &sp7C, &sp78); @@ -480,7 +480,7 @@ void EffectBlure_DrawElemNoInterpolation(EffectBlure* this, EffectBlureElement* void EffectBlure_DrawElemHermiteInterpolation(EffectBlure* this, EffectBlureElement* elem, s32 index, GraphicsContext* gfxCtx) { - static Vtx_t baseVtx = VTX_T(0, 0, 0, 0, 0, 255, 255, 255, 255); + static Vtx_t sBaseVtx = VTX_T(0, 0, 0, 0, 0, 255, 255, 255, 255); Vtx* vtx; Vec3s sp1EC; Vec3s sp1E4; @@ -568,8 +568,8 @@ void EffectBlure_DrawElemHermiteInterpolation(EffectBlure* this, EffectBlureElem Color_RGBA8_Copy(&sp148, &sp1A4); Color_RGBA8_Copy(&sp144, &sp1A0); - vtx[0].v = baseVtx; - vtx[1].v = baseVtx; + vtx[0].v = sBaseVtx; + vtx[1].v = sBaseVtx; vtx[0].v.ob[0] = Math_FNearbyIntF(sp158.x); vtx[0].v.ob[1] = Math_FNearbyIntF(sp158.y); @@ -613,8 +613,8 @@ void EffectBlure_DrawElemHermiteInterpolation(EffectBlure* this, EffectBlureElem Math_Vec3f_Diff(&spE0, &sp138, &sp14C); Math_Vec3f_Scale(&sp14C, 10.0f); - vtx[j1].v = baseVtx; - vtx[j2].v = baseVtx; + vtx[j1].v = sBaseVtx; + vtx[j2].v = sBaseVtx; vtx[j1].v.ob[0] = Math_FNearbyIntF(sp158.x); vtx[j1].v.ob[1] = Math_FNearbyIntF(sp158.y); diff --git a/src/code/z_malloc.c b/src/code/z_malloc.c index f54d8f5166..815af19431 100644 --- a/src/code/z_malloc.c +++ b/src/code/z_malloc.c @@ -54,5 +54,5 @@ void ZeldaArena_Cleanup(void) { } u8 ZeldaArena_IsInitialized(void) { - return __osMallocIsInitalized(&sZeldaArena); + return __osMallocIsInitialized(&sZeldaArena); } diff --git a/src/code/z_scene_proc.c b/src/code/z_scene_proc.c index b4597a5c29..a592268aa7 100644 --- a/src/code/z_scene_proc.c +++ b/src/code/z_scene_proc.c @@ -23,7 +23,7 @@ static Gfx sSceneDrawDefaultDL[] = { * Executes the current scene draw config handler. */ void Scene_Draw(PlayState* play) { - static void (*sceneDrawConfigHandlers[])(PlayState*) = { + static void (*sSceneDrawConfigHandlers[])(PlayState*) = { Scene_DrawConfigDefault, Scene_DrawConfigMatAnim, Scene_DrawConfigDoNothing, @@ -34,7 +34,7 @@ void Scene_Draw(PlayState* play) { Scene_DrawConfigMatAnimManualStep, }; - sceneDrawConfigHandlers[play->sceneConfig](play); + sSceneDrawConfigHandlers[play->sceneConfig](play); } /** @@ -386,7 +386,7 @@ void AnimatedMat_DrawTexCycle(PlayState* play, s32 segment, void* params) { * There are six different animated material types, which should be set in the provided `AnimatedMaterial`. */ void AnimatedMat_DrawMain(PlayState* play, AnimatedMaterial* matAnim, f32 alphaRatio, u32 step, u32 flags) { - static void (*matAnimDrawHandlers[])(PlayState*, s32 segment, void* params) = { + static void (*sMatAnimDrawHandlers[])(PlayState*, s32 segment, void* params) = { AnimatedMat_DrawTexScroll, AnimatedMat_DrawTwoTexScroll, AnimatedMat_DrawColor, AnimatedMat_DrawColorLerp, AnimatedMat_DrawColorNonLinearInterp, AnimatedMat_DrawTexCycle, }; @@ -401,7 +401,7 @@ void AnimatedMat_DrawMain(PlayState* play, AnimatedMaterial* matAnim, f32 alphaR do { segment = matAnim->segment; segmentAbs = ABS_ALT(segment) + 7; - matAnimDrawHandlers[matAnim->type](play, segmentAbs, Lib_SegmentedToVirtual(matAnim->params)); + sMatAnimDrawHandlers[matAnim->type](play, segmentAbs, Lib_SegmentedToVirtual(matAnim->params)); matAnim++; } while (segment >= 0); } @@ -573,14 +573,14 @@ void Scene_DrawConfigDoNothing(PlayState* play) { * Stores a displaylist in the provided segment ID that sets a render mode from the index provided. */ void Scene_SetRenderModeXlu(PlayState* play, s32 index, u32 flags) { - static Gfx renderModeSetNoneDL[] = { + static Gfx sRenderModeSetNoneDL[] = { gsSPEndDisplayList(), // These instructions will never get executed gsSPEndDisplayList(), gsSPEndDisplayList(), gsSPEndDisplayList(), }; - static Gfx renderModeSetXluSingleCycleDL[] = { + static Gfx sRenderModeSetXluSingleCycleDL[] = { gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1), G_RM_AA_ZB_XLU_SURF2), @@ -591,7 +591,7 @@ void Scene_SetRenderModeXlu(PlayState* play, s32 index, u32 flags) { G_RM_AA_ZB_XLU_SURF2), gsSPEndDisplayList(), }; - static Gfx renderModeSetXluTwoCycleDL[] = { + static Gfx sRenderModeSetXluTwoCycleDL[] = { gsDPSetRenderMode(AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1), AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | FORCE_BL | @@ -604,12 +604,12 @@ void Scene_SetRenderModeXlu(PlayState* play, s32 index, u32 flags) { GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), gsSPEndDisplayList(), }; - static Gfx* dLists[] = { - renderModeSetNoneDL, - renderModeSetXluSingleCycleDL, - renderModeSetXluTwoCycleDL, + static Gfx* sDLists[] = { + sRenderModeSetNoneDL, + sRenderModeSetXluSingleCycleDL, + sRenderModeSetXluTwoCycleDL, }; - Gfx* dList = dLists[index]; + Gfx* dList = sDLists[index]; OPEN_DISPS(play->state.gfxCtx); @@ -629,19 +629,19 @@ void Scene_SetRenderModeXlu(PlayState* play, s32 index, u32 flags) { * from the index provided. */ void Scene_SetCullFlag(PlayState* play, s32 index, u32 flags) { - static Gfx setBackCullDL[] = { + static Gfx sSetBackCullDL[] = { gsSPSetGeometryMode(G_CULL_BACK), gsSPEndDisplayList(), }; - static Gfx setFrontCullDL[] = { + static Gfx sSetFrontCullDL[] = { gsSPSetGeometryMode(G_CULL_FRONT), gsSPEndDisplayList(), }; - static Gfx* dLists[] = { - setBackCullDL, - setFrontCullDL, + static Gfx* sDLists[] = { + sSetBackCullDL, + sSetFrontCullDL, }; - Gfx* dList = dLists[index]; + Gfx* dList = sDLists[index]; OPEN_DISPS(play->state.gfxCtx); @@ -703,7 +703,7 @@ void Scene_DrawConfigMatAnimManualStep(PlayState* play) { * activated. */ void Scene_DrawConfigGreatBayTemple(PlayState* play) { - static Gfx greatBayTempleColorSetDL[] = { + static Gfx sGreatBayTempleColorSetDL[] = { gsDPSetPrimColor(0, 255, 255, 255, 255, 255), gsSPEndDisplayList(), }; @@ -728,7 +728,7 @@ void Scene_DrawConfigGreatBayTemple(PlayState* play) { for (gfx = gfxHead, i = 0; i < 9; i++, gfx += 2) { lodFrac = 0; - bcopy(greatBayTempleColorSetDL, gfx, sizeof(greatBayTempleColorSetDL)); + bcopy(sGreatBayTempleColorSetDL, gfx, sizeof(sGreatBayTempleColorSetDL)); switch (i) { case 0: diff --git a/src/overlays/actors/ovl_En_Baba/z_en_baba.c b/src/overlays/actors/ovl_En_Baba/z_en_baba.c index 85ddf8bb77..f1eebeaa56 100644 --- a/src/overlays/actors/ovl_En_Baba/z_en_baba.c +++ b/src/overlays/actors/ovl_En_Baba/z_en_baba.c @@ -142,7 +142,7 @@ static TrackOptionsSet sTrackOptions = { }; s32 EnBaba_FindBombShopkeeper(EnBaba* this, PlayState* play) { - //! The bomb shopkeeper is an EnSob1, but initalizes itself with id `ACTOR_EN_OSSAN` + //! The bomb shopkeeper is an EnSob1, but initializes itself with id `ACTOR_EN_OSSAN` //! Note if there are other `EnOssan` actors, it may find that instance instead //! in which case `EnSob1` struct acceses would be incorrect this->bombShopkeeper = (EnSob1*)SubS_FindActor(play, &this->bombShopkeeper->actor, ACTORCAT_NPC, ACTOR_EN_OSSAN); diff --git a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c index d54802f827..878b4c8856 100644 --- a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c +++ b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c @@ -1842,12 +1842,12 @@ void EnBigslime_SetupFreeze(EnBigslime* this) { targetVtx->n.a = 0; } - // Initalizes frozen effect alpha near bottom of sphere by increasing levels of alpha + // Initializes frozen effect alpha near bottom of sphere by increasing levels of alpha for (i = 0; i < 20; i++) { sBigslimeTargetVtx[i + 138].n.a = 10 * i; } - // Initalizes/seeds frozen effect alpha in bottom 4 nodes in vtx sphere to highest level of alpha + // Initializes/seeds frozen effect alpha in bottom 4 nodes in vtx sphere to highest level of alpha for (i = 0; i < 4; i++) { sBigslimeTargetVtx[i + 158].n.a = 200; } diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt index b771953c82..8310790486 100644 --- a/tools/disasm/functions.txt +++ b/tools/disasm/functions.txt @@ -224,7 +224,7 @@ 0x8008720C:("__osMallocInit",), 0x8008725C:("__osMallocAddHeap",), 0x800872FC:("__osMallocCleanup",), - 0x8008731C:("__osMallocIsInitalized",), + 0x8008731C:("__osMallocIsInitialized",), 0x80087324:("__osMalloc",), 0x80087408:("__osMallocR",), 0x800874EC:("__osFree",), diff --git a/tools/disasm/variables.txt b/tools/disasm/variables.txt index efdf65ef2c..e47402dc44 100644 --- a/tools/disasm/variables.txt +++ b/tools/disasm/variables.txt @@ -314,8 +314,8 @@ 0x8009BE38:("sRomInfoFaultClient","FaultClient","",0x10), 0x8009BE50:("sFaultInstance","FaultMgr*","",0x4), 0x8009BE54:("sFaultTimeTotal","f32","",0x4), - 0x8009BE58:("faultCustomOptions","u32","",0x4), - 0x8009BE5C:("faultCopyToLog","u32","",0x4), + 0x8009BE58:("sFaultCustomOptions","u32","",0x4), + 0x8009BE5C:("sFaultCopyToLog","u32","",0x4), 0x8009BE60:("sFaultStack","u8","[1536]",0x600), 0x8009C460:("sFaultStackInfo","StackEntry","",0x1C), 0x8009C480:("gFaultMgr","FaultMgr","",0x848), @@ -2148,7 +2148,7 @@ 0x801D5FD4:("D_801D5FD4","UNK_TYPE1","",0x1), 0x801D5FE0:("D_801D5FE0","UNK_PTR","",0x4), 0x801D5FE4:("D_801D5FE4","UNK_TYPE1","",0x1), - 0x801D5FE8:("gAudioCtxInitalized","UNK_TYPE4","",0x4), + 0x801D5FE8:("gAudioCtxInitialized","UNK_TYPE4","",0x4), 0x801D5FEC:("D_801D5FEC","UNK_TYPE4","",0x4), 0x801D5FF0:("sWaitingAudioTask","UNK_TYPE4","",0x4), 0x801D5FF4:("sMaxWriteReadDiff","UNK_TYPE4","",0x4), diff --git a/tools/sizes/boot_functions.csv b/tools/sizes/boot_functions.csv index 07494101b5..ac67c6687a 100644 --- a/tools/sizes/boot_functions.csv +++ b/tools/sizes/boot_functions.csv @@ -221,7 +221,7 @@ asm/non_matchings/boot/__osMalloc/ArenaImpl_GetLastBlock.s,ArenaImpl_GetLastBloc asm/non_matchings/boot/__osMalloc/__osMallocInit.s,__osMallocInit,0x8008720C,0x14 asm/non_matchings/boot/__osMalloc/__osMallocAddHeap.s,__osMallocAddHeap,0x8008725C,0x28 asm/non_matchings/boot/__osMalloc/__osMallocCleanup.s,__osMallocCleanup,0x800872FC,0x8 -asm/non_matchings/boot/__osMalloc/__osMallocIsInitalized.s,__osMallocIsInitalized,0x8008731C,0x2 +asm/non_matchings/boot/__osMalloc/__osMallocIsInitialized.s,__osMallocIsInitialized,0x8008731C,0x2 asm/non_matchings/boot/__osMalloc/__osMalloc.s,__osMalloc,0x80087324,0x39 asm/non_matchings/boot/__osMalloc/__osMallocR.s,__osMallocR,0x80087408,0x39 asm/non_matchings/boot/__osMalloc/__osFree.s,__osFree,0x800874EC,0x3E