diff --git a/format.sh b/format.sh index 9967cc6f5d..c705e9affe 100755 --- a/format.sh +++ b/format.sh @@ -9,7 +9,7 @@ shopt -s globstar if (( $# > 0 )); then echo "Formatting file(s) $*" echo "Running clang-format..." - clang-format ${FORMAT_OPTS} "$@" + clang-format-11 ${FORMAT_OPTS} "$@" echo "Running clang-tidy..." clang-tidy ${TIDY_OPTS} "$@" -- ${COMPILER_OPTS} &> /dev/null echo "Adding missing final new lines..." @@ -20,7 +20,7 @@ fi echo "Formatting C files. This will take a bit" echo "Running clang-format..." -clang-format ${FORMAT_OPTS} src/**/*.c +clang-format-11 ${FORMAT_OPTS} src/**/*.c echo "Running clang-tidy..." clang-tidy ${TIDY_OPTS} src/**/*.c -- ${COMPILER_OPTS} &> /dev/null echo "Adding missing final new lines..." diff --git a/src/boot_O2/__osMalloc.c b/src/boot_O2/__osMalloc.c index 0a418a2d94..8286a545e2 100644 --- a/src/boot_O2/__osMalloc.c +++ b/src/boot_O2/__osMalloc.c @@ -82,7 +82,6 @@ void __osMallocAddBlock(Arena* arena, void* start, s32 size) { } } - void __osMallocCleanup(Arena* arena) { bzero(arena, sizeof(*arena)); } @@ -97,11 +96,11 @@ void* __osMalloc(Arena* arena, u32 size) { void* alloc; u32 blockSize; alloc = NULL; - + size = ALIGN16(size); ArenaImpl_Lock(arena); iter = arena->head; - + while (iter != NULL) { if (iter->isFree && iter->size >= size) { ArenaNode* next; @@ -134,7 +133,6 @@ void* __osMalloc(Arena* arena, u32 size) { return alloc; } - void* __osMallocR(Arena* arena, u32 size) { ArenaNode* iter; ArenaNode* newNode; diff --git a/src/boot_O2/gfxprint.c b/src/boot_O2/gfxprint.c index 2d4331bb90..bcb9ee31aa 100644 --- a/src/boot_O2/gfxprint.c +++ b/src/boot_O2/gfxprint.c @@ -99,15 +99,12 @@ void GfxPrint_PrintCharImpl(GfxPrint* this, u8 c) { gSPTextureRectangle(this->dlist++, this->posX + 4, this->posY + 4, this->posX + 4 + 32, this->posY + 4 + 32, (c & 3) << 1, (u16)(c & 4) * 64, (u16)(c >> 3) * 256, 1024, 1024); - gDPSetPrimColorMod(this->dlist++, 0, 0, this->color.rgba); - } - + } gSPTextureRectangle(this->dlist++, this->posX, this->posY, this->posX + 32, this->posY + 32, (u16)(tile & 7), (u16)(c & 4) * 64, (u16)(c >> 3) * 256, 1024, 1024); - this->posX += 32; } @@ -133,7 +130,7 @@ void GfxPrint_PrintString(GfxPrint* this, const char* str) { } } -GfxPrint* GfxPrint_Callback(GfxPrint* this, const char* str, size_t size) { +GfxPrint* GfxPrint_Callback(GfxPrint* this, const char* str, size_t size) { GfxPrint_PrintStringWithSize(this, str, sizeof(char), size); return this; } @@ -142,7 +139,7 @@ void GfxPrint_Init(GfxPrint* this) { this->flag &= ~GFXPRINT_OPEN; this->callback = GfxPrint_Callback; - + this->dlist = NULL; this->posX = 0; this->posY = 0; @@ -156,7 +153,6 @@ void GfxPrint_Init(GfxPrint* this) { } void GfxPrint_Destroy(GfxPrint* this) { - } void GfxPrint_Open(GfxPrint* this, Gfx* dlist) { @@ -164,7 +160,7 @@ void GfxPrint_Open(GfxPrint* this, Gfx* dlist) { this->flag |= GFXPRINT_OPEN; this->dlist = dlist; GfxPrint_InitDlist(this); - } + } } Gfx* GfxPrint_Close(GfxPrint* this) { diff --git a/src/boot_O2/loadfragment2.c b/src/boot_O2/loadfragment2.c index ba382dbd0a..5f44c34c40 100644 --- a/src/boot_O2/loadfragment2.c +++ b/src/boot_O2/loadfragment2.c @@ -4,9 +4,10 @@ UNK_TYPE4 D_80096C30 = 2; #ifdef NON_MATCHING -// This needs lots of work. Mostly regalloc and getting the address of D_80096C30 placed in s5 at the beginning of the function +// This needs lots of work. Mostly regalloc and getting the address of D_80096C30 placed in s5 at the beginning of the +// function void Load2_Relocate(u32 allocatedVRamAddr, OverlayBlockSizes* overlayInfo, u32 vRamStart) { - s32 sectionLocations [4]; + s32 sectionLocations[4]; u32* regReferences[32]; u32 regValues[32]; u32 i; @@ -24,34 +25,36 @@ void Load2_Relocate(u32 allocatedVRamAddr, OverlayBlockSizes* overlayInfo, u32 v for (i = 0, relocationIndex = 0; i < overlayInfo->amountOfRelocations; relocationIndex++) { relocation = overlayInfo->relocations[relocationIndex]; i++; - inst = (u32 *)(sectionLocations[relocation >> 0x1e] + (relocation & 0xffffff)); + inst = (u32*)(sectionLocations[relocation >> 0x1e] + (relocation & 0xffffff)); switch (relocation & 0x3f000000) { - case 0x2000000: - if ((*inst & 0xf000000) == 0) { - *inst = (*inst - vRamStart) + allocatedVRamAddr; - } else { - if (D_80096C30 > 2); - } - break; - case 0x4000000: - *inst = (*inst & 0xfc000000) | - (((((*inst & 0x3ffffff) << 2 | 0x80000000) - vRamStart) + allocatedVRamAddr & 0xfffffff) >> 2); - break; - case 0x5000000: - regReferences[*inst >> 0x10 & 0x1f] = inst; - regValues[*inst >> 0x10 & 0x1f] = *inst; - break; - case 0x6000000: - lastInst = regReferences[*inst >> 0x15 & 0x1f]; - signedOffset = (s16)*inst; - if ((signedOffset + *lastInst * 0x10000 & 0xf000000) == 0) { - relocatedAddress = ((signedOffset + regValues[*inst >> 0x15 & 0x1f] * 0x10000) - vRamStart) + allocatedVRamAddr; - *lastInst = (((relocatedAddress >> 0x10) & 0xFFFF) + ((relocatedAddress & 0x8000)? 1 : 0)) | - (*lastInst & 0xffff0000); - *inst = *inst & 0xffff0000 | relocatedAddress & 0xffff; - } - break; + case 0x2000000: + if ((*inst & 0xf000000) == 0) { + *inst = (*inst - vRamStart) + allocatedVRamAddr; + } else { + if (D_80096C30 > 2) + ; + } + break; + case 0x4000000: + *inst = (*inst & 0xfc000000) | + (((((*inst & 0x3ffffff) << 2 | 0x80000000) - vRamStart) + allocatedVRamAddr & 0xfffffff) >> 2); + break; + case 0x5000000: + regReferences[*inst >> 0x10 & 0x1f] = inst; + regValues[*inst >> 0x10 & 0x1f] = *inst; + break; + case 0x6000000: + lastInst = regReferences[*inst >> 0x15 & 0x1f]; + signedOffset = (s16)*inst; + if ((signedOffset + *lastInst * 0x10000 & 0xf000000) == 0) { + relocatedAddress = + ((signedOffset + regValues[*inst >> 0x15 & 0x1f] * 0x10000) - vRamStart) + allocatedVRamAddr; + *lastInst = (((relocatedAddress >> 0x10) & 0xFFFF) + ((relocatedAddress & 0x8000) ? 1 : 0)) | + (*lastInst & 0xffff0000); + *inst = *inst & 0xffff0000 | relocatedAddress & 0xffff; + } + break; } } } @@ -70,14 +73,18 @@ s32 Load2_LoadOverlay(u32 vRomStart, u32 vRomEnd, u32 vRamStart, u32 vRamEnd, u3 size = vRomEnd - vRomStart; - if(1); + if (1) { + ; + } DmaMgr_SendRequest0(allocatedVRamAddr, vRomStart, size); end = (void*)(allocatedVRamAddr + size); overlayInfo = (OverlayBlockSizes*)((int)end - *(int*)((int)end + -4)); - if(1); + if (1) { + ; + } Load2_Relocate(allocatedVRamAddr, overlayInfo, vRamStart); diff --git a/src/boot_O2/mtxuty-cvt.c b/src/boot_O2/mtxuty-cvt.c index 78be5e3b5a..f34c1e5185 100644 --- a/src/boot_O2/mtxuty-cvt.c +++ b/src/boot_O2/mtxuty-cvt.c @@ -15,5 +15,5 @@ void MtxConv_F2L(MatrixInternal* m1, MtxF* m2) { } void MtxConv_L2F(MtxF* m1, MatrixInternal* m2) { - guMtxL2F(m1, (Mtx *)m2); + guMtxL2F(m1, (Mtx*)m2); } diff --git a/src/boot_O2/padutils.c b/src/boot_O2/padutils.c index ea51b3dc15..cdd789f1bc 100644 --- a/src/boot_O2/padutils.c +++ b/src/boot_O2/padutils.c @@ -92,4 +92,3 @@ void PadUtils_UpdateRelXY(Input* input) { PadUtils_SetRelXY(input, relX, relY); } - diff --git a/src/boot_O2/stackcheck.c b/src/boot_O2/stackcheck.c index 142f824a75..7079eff8e7 100644 --- a/src/boot_O2/stackcheck.c +++ b/src/boot_O2/stackcheck.c @@ -4,7 +4,8 @@ StackEntry* sStackInfoListStart = NULL; StackEntry* sStackInfoListEnd = NULL; -void StackCheck_Init(StackEntry* entry, void* stackTop, void* stackBottom, u32 initValue, s32 minSpace, const char* name) { +void StackCheck_Init(StackEntry* entry, void* stackTop, void* stackBottom, u32 initValue, s32 minSpace, + const char* name) { StackEntry* iter; u32* addr; @@ -99,7 +100,7 @@ u32 StackCheck_CheckAll() { u32 ret = 0; StackEntry* iter = sStackInfoListStart; - while(iter) { + while (iter) { u32 state = StackCheck_GetState(iter); if (state) { ret = 1; diff --git a/src/boot_O2_g3/CIC6105.c b/src/boot_O2_g3/CIC6105.c index bc0e49d831..deef70b8c8 100644 --- a/src/boot_O2_g3/CIC6105.c +++ b/src/boot_O2_g3/CIC6105.c @@ -1,9 +1,11 @@ #include #include -void CIC6105_Nop80081820(void) {} +void CIC6105_Nop80081820(void) { +} -void CIC6105_Nop80081828(void) {} +void CIC6105_Nop80081828(void) { +} void CIC6105_PrintRomInfo(void) { FaultDrawer_DrawText(80, 200, "SP_STATUS %08x", (UNK_PTR)(*(u32*)0xA4040010)); diff --git a/src/boot_O2_g3/boot_0x80081920.c b/src/boot_O2_g3/boot_0x80081920.c index b4e1661bfc..fe438905a9 100644 --- a/src/boot_O2_g3/boot_0x80081920.c +++ b/src/boot_O2_g3/boot_0x80081920.c @@ -3,6 +3,9 @@ // This file contains print functions that are used by fault.c, so they are placed in the fault module -void Fault_Nop80081920(UNK_TYPE4 param_1, ...) {} -void Fault_Log(char* str, ...) {} -void Fault_Nop80081958(UNK_TYPE4 param_1, ...) {} +void Fault_Nop80081920(UNK_TYPE4 param_1, ...) { +} +void Fault_Log(char* str, ...) { +} +void Fault_Nop80081958(UNK_TYPE4 param_1, ...) { +} diff --git a/src/boot_O2_g3/boot_0x800968B0.c b/src/boot_O2_g3/boot_0x800968B0.c index 7afea4ac5c..43a217e91d 100644 --- a/src/boot_O2_g3/boot_0x800968B0.c +++ b/src/boot_O2_g3/boot_0x800968B0.c @@ -11,7 +11,7 @@ s32 func_800968B0(const char* str1, const char* str2) { currentCharStr1 = *str1++; currentCharStr2 = *str2++; if (currentCharStr1 != currentCharStr2) { - return currentCharStr1 - currentCharStr2; + return currentCharStr1 - currentCharStr2; } } while (currentCharStr1); diff --git a/src/boot_O2_g3/boot_main.c b/src/boot_O2_g3/boot_main.c index 2a7d69f98b..258c9e346f 100644 --- a/src/boot_O2_g3/boot_main.c +++ b/src/boot_O2_g3/boot_main.c @@ -9,6 +9,7 @@ void bootproc(void) { osUnmapTLBAll(); gCartHandle = osCartRomInit(); StackCheck_Init(&sIdleThreadInfo, sIdleThreadStack, sIdleThreadStack + sizeof(sIdleThreadStack), 0, 256, "idle"); - osCreateThread(&sIdleThread, Z_THREAD_ID_IDLE, Idle_ThreadEntry, NULL, sIdleThreadStack + sizeof(sIdleThreadStack), Z_PRIORITY_IDLE); + osCreateThread(&sIdleThread, Z_THREAD_ID_IDLE, Idle_ThreadEntry, NULL, sIdleThreadStack + sizeof(sIdleThreadStack), + Z_PRIORITY_IDLE); osStartThread(&sIdleThread); } diff --git a/src/boot_O2_g3/idle.c b/src/boot_O2_g3/idle.c index e4acb7b556..051f7b3367 100644 --- a/src/boot_O2_g3/idle.c +++ b/src/boot_O2_g3/idle.c @@ -52,7 +52,8 @@ void Idle_InitCodeAndMemory(void) { oldSize = sDmaMgrDmaBuffSize; sDmaMgrDmaBuffSize = 0; - DmaMgr_SendRequestImpl(&dmaReq, (u32)&code_text_start, (u32)_codeSegmentRomStart, (u32)_codeSegmentRomEnd - (u32)_codeSegmentRomStart, 0, &queue, 0); + DmaMgr_SendRequestImpl(&dmaReq, (u32)&code_text_start, (u32)_codeSegmentRomStart, + (u32)_codeSegmentRomEnd - (u32)_codeSegmentRomStart, 0, &queue, 0); Idle_InitScreen(); Idle_InitMemory(); osRecvMesg(&queue, NULL, 1); @@ -82,19 +83,19 @@ void Idle_InitVideo(void) { gViConfigYScale = 1.0; switch (osTvType) { - case 1: - D_8009B290 = 2; - gViConfigMode = osViModeNtscLan1; - break; - case 2: - D_8009B290 = 30; - gViConfigMode = osViModeMpalLan1; - break; - case 0: - D_8009B290 = 44; - gViConfigMode = osViModeFpalLan1; - gViConfigYScale = 0.833f; - break; + case 1: + D_8009B290 = 2; + gViConfigMode = osViModeNtscLan1; + break; + case 2: + D_8009B290 = 30; + gViConfigMode = osViModeMpalLan1; + break; + case 0: + D_8009B290 = 44; + gViConfigMode = osViModeFpalLan1; + gViConfigYScale = 0.833f; + break; } D_80096B20 = 1; @@ -104,9 +105,12 @@ void Idle_ThreadEntry(void* arg) { Idle_InitVideo(); osCreatePiManager(150, &gPiMgrCmdQ, sPiMgrCmdBuff, ARRAY_COUNT(sPiMgrCmdBuff)); StackCheck_Init(&sMainStackInfo, sMainStack, sMainStack + sizeof(sMainStack), 0, 1024, "main"); - osCreateThread(&gMainThread, Z_THREAD_ID_MAIN, Main_ThreadEntry, arg, sMainStack + sizeof(sMainStack), Z_PRIORITY_MAIN); + osCreateThread(&gMainThread, Z_THREAD_ID_MAIN, Main_ThreadEntry, arg, sMainStack + sizeof(sMainStack), + Z_PRIORITY_MAIN); osStartThread(&gMainThread); osSetThreadPri(NULL, 0); - for(;;); + for (;;) { + ; + } } diff --git a/src/boot_O2_g3/irqmgr.c b/src/boot_O2_g3/irqmgr.c index 143a8a0f2e..766533fb39 100644 --- a/src/boot_O2_g3/irqmgr.c +++ b/src/boot_O2_g3/irqmgr.c @@ -2,9 +2,9 @@ #include // TODO move out -#define OS_CLOCK_RATE 62500000LL -#define OS_CPU_COUNTER (OS_CLOCK_RATE*3/4) -#define OS_USEC_TO_CYCLES(n) (((u64)(n)*(OS_CPU_COUNTER/15625LL))/(1000000LL/15625LL)) +#define OS_CLOCK_RATE 62500000LL +#define OS_CPU_COUNTER (OS_CLOCK_RATE * 3 / 4) +#define OS_USEC_TO_CYCLES(n) (((u64)(n) * (OS_CPU_COUNTER / 15625LL)) / (1000000LL / 15625LL)) vs32 gIrqMgrResetStatus = 0; volatile OSTime sIrqMgrResetTime = 0; @@ -122,7 +122,7 @@ void IrqMgr_HandleRetrace(IrqMgr* irqmgr) { } sIrqMgrRetraceCount += 1; - IrqMgr_SendMesgForClient(irqmgr,irqmgr); + IrqMgr_SendMesgForClient(irqmgr, irqmgr); } void IrqMgr_ThreadEntry(IrqMgr* irqmgr) { @@ -132,25 +132,27 @@ void IrqMgr_ThreadEntry(IrqMgr* irqmgr) { interrupt = 0; stop = 0; while (stop == 0) { - if (stop); + if (stop) { + ; + } osRecvMesg(&irqmgr->irqQueue, (OSMesg*)&interrupt, 1); switch (interrupt) { - case 0x29A: - IrqMgr_HandleRetrace(irqmgr); - break; - case 0x29D: - IrqMgr_HandlePreNMI(irqmgr); - break; - case 0x29F: - IrqMgr_HandlePRENMI450(irqmgr); - break; - case 0x2A0: - IrqMgr_HandlePRENMI480(irqmgr); - break; - case 0x2A1: - IrqMgr_HandlePRENMI500(irqmgr); - break; + case 0x29A: + IrqMgr_HandleRetrace(irqmgr); + break; + case 0x29D: + IrqMgr_HandlePreNMI(irqmgr); + break; + case 0x29F: + IrqMgr_HandlePRENMI450(irqmgr); + break; + case 0x2A0: + IrqMgr_HandlePRENMI480(irqmgr); + break; + case 0x2A1: + IrqMgr_HandlePRENMI500(irqmgr); + break; } } } @@ -163,7 +165,7 @@ void IrqMgr_Init(IrqMgr* irqmgr, void* stack, OSPri pri, u8 retraceCount) { irqmgr->prenmiStage = 0; irqmgr->lastPrenmiTime = 0; - osCreateMesgQueue(&irqmgr->irqQueue,(OSMesg *)irqmgr->irqBuffer,8); + osCreateMesgQueue(&irqmgr->irqQueue, (OSMesg*)irqmgr->irqBuffer, 8); osSetEventMesg(0xE, &irqmgr->irqQueue, (OSMesg)0x29D); osViSetEvent(&irqmgr->irqQueue, (OSMesg)0x29A, retraceCount); diff --git a/src/boot_O2_g3/viconfig.c b/src/boot_O2_g3/viconfig.c index 64f3d4ec9b..307981a769 100644 --- a/src/boot_O2_g3/viconfig.c +++ b/src/boot_O2_g3/viconfig.c @@ -4,16 +4,16 @@ void ViConfig_UpdateVi(u32 mode) { if (mode != 0) { switch (osTvType) { - case 2: - osViSetMode(&osViModeMpalLan1); - break; - case 0: - osViSetMode(&osViModePalLan1); - break; - case 1: + case 2: + osViSetMode(&osViModeMpalLan1); + break; + case 0: + osViSetMode(&osViModePalLan1); + break; + case 1: default: - osViSetMode(&osViModeNtscLan1); - break; + osViSetMode(&osViModeNtscLan1); + break; } if (gViConfigFeatures != 0) { @@ -46,7 +46,6 @@ void ViConfig_UpdateVi(u32 mode) { gViConfigUseDefault = mode; } - void ViConfig_UpdateBlack(void) { if (gViConfigUseDefault != 0) { osViBlack(1); diff --git a/src/boot_O2_g3/yaz0.c b/src/boot_O2_g3/yaz0.c index e583a086f5..311b9d761f 100644 --- a/src/boot_O2_g3/yaz0.c +++ b/src/boot_O2_g3/yaz0.c @@ -60,9 +60,9 @@ void* Yaz0_NextDMA(void* curSrcPos) { typedef struct { /* 0x00 */ u32 magic; // Yaz0 /* 0x04 */ u32 decSize; - /* 0x08 */ u32 compInfoOffset; // only used in mio0 + /* 0x08 */ u32 compInfoOffset; // only used in mio0 /* 0x0C */ u32 uncompDataOffset; // only used in mio0 -} Yaz0Header; // size = 0x10 +} Yaz0Header; // size = 0x10 #define YAZ0_MAGIC 0x59617A30 // "Yaz0" diff --git a/src/boot_O2_g3/z_std_dma.c b/src/boot_O2_g3/z_std_dma.c index f293eaf694..0fe9508dfc 100644 --- a/src/boot_O2_g3/z_std_dma.c +++ b/src/boot_O2_g3/z_std_dma.c @@ -21,7 +21,9 @@ s32 DmaMgr_DMARomToRam(u32 rom, void* ram, u32 size) { ioMsg.dramAddr = ram; ioMsg.size = buffSize; ret = osEPiStartDma(gCartHandle, &ioMsg, 0); - if (ret) goto END; + if (ret) { + goto END; + } osRecvMesg(&queue, NULL, 1); size -= buffSize; @@ -35,7 +37,9 @@ s32 DmaMgr_DMARomToRam(u32 rom, void* ram, u32 size) { ioMsg.dramAddr = ram; ioMsg.size = (u32)size; ret = osEPiStartDma(gCartHandle, &ioMsg, 0); - if (ret) goto END; + if (ret) { + goto END; + } osRecvMesg(&queue, NULL, 1); @@ -53,8 +57,12 @@ DmaEntry* DmaMgr_FindDmaEntry(u32 vrom) { DmaEntry* curr; for (curr = dmadata; curr->vromEnd != 0; curr++) { - if (vrom < curr->vromStart) continue; - if (vrom >= curr->vromEnd) continue; + if (vrom < curr->vromStart) { + continue; + } + if (vrom >= curr->vromEnd) { + continue; + } return curr; } @@ -84,7 +92,7 @@ s32 DmaMgr_FindDmaIndex(u32 vrom) { DmaEntry* entry = DmaMgr_FindDmaEntry(vrom); if (entry != NULL) { - return entry - dmadata; + return entry - dmadata; } return -1; @@ -149,17 +157,17 @@ void DmaMgr_ThreadEntry(void* a0) { break; } - req = (DmaRequest *)msg; + req = (DmaRequest*)msg; DmaMgr_ProcessMsg(req); if (req->notifyQueue) { osSendMesg(req->notifyQueue, req->notifyMsg, OS_MESG_NOBLOCK); } - } } -s32 DmaMgr_SendRequestImpl(DmaRequest* request, void* vramStart, u32 vromStart, u32 size, UNK_TYPE4 unused, OSMesgQueue* queue, OSMesg msg) { +s32 DmaMgr_SendRequestImpl(DmaRequest* request, void* vramStart, u32 vromStart, u32 size, UNK_TYPE4 unused, + OSMesgQueue* queue, OSMesg msg) { if (gIrqMgrResetStatus >= 2) { return -2; } @@ -177,22 +185,22 @@ s32 DmaMgr_SendRequestImpl(DmaRequest* request, void* vramStart, u32 vromStart, } s32 DmaMgr_SendRequest0(void* vramStart, u32 vromStart, u32 size) { - DmaRequest req; + DmaRequest req; OSMesgQueue queue; OSMesg msg[1]; - s32 ret; + s32 ret; osCreateMesgQueue(&queue, msg, ARRAY_COUNT(msg)); - ret = DmaMgr_SendRequestImpl(&req, vramStart, vromStart, size, 0, &queue, NULL); + ret = DmaMgr_SendRequestImpl(&req, vramStart, vromStart, size, 0, &queue, NULL); - if (ret == -1) { - return ret; - } else { - osRecvMesg(&queue, NULL, OS_MESG_BLOCK); - } + if (ret == -1) { + return ret; + } else { + osRecvMesg(&queue, NULL, OS_MESG_BLOCK); + } - return 0; + return 0; } const char dmamgrThreadName[] = "dmamgr"; @@ -200,19 +208,22 @@ const char dmamgrThreadName[] = "dmamgr"; #ifdef NON_MATCHING // TODO missing a useless move initializing v0, and some reorderings void DmaMgr_Start() { - DmaEntry* iter; - u32 idx; + DmaEntry* iter; + u32 idx; - DmaMgr_DMARomToRam((u32)_dmadataSegmentRomStart, dmadata, (u32)(_dmadataSegmentRomEnd - _dmadataSegmentRomStart)); + DmaMgr_DMARomToRam((u32)_dmadataSegmentRomStart, dmadata, (u32)(_dmadataSegmentRomEnd - _dmadataSegmentRomStart)); - for (iter = dmadata, idx = 0; iter->vromEnd != 0; iter++, idx++); + for (iter = dmadata, idx = 0; iter->vromEnd != 0; iter++, idx++) { + ; + } - numDmaEntries = idx; + numDmaEntries = idx; - osCreateMesgQueue(&sDmaMgrMsgQueue, sDmaMgrMsgs, ARRAY_COUNT(sDmaMgrMsgs)); - StackCheck_Init(&sDmaMgrStackInfo, sDmaMgrStack, sDmaMgrStack + sizeof(sDmaMgrStack), 0, 256, dmamgrThreadName); - osCreateThread(&sDmaMgrThread, Z_THREAD_ID_DMAMGR, DmaMgr_ThreadEntry, NULL, sDmaMgrStack + sizeof(sDmaMgrStack), Z_PRIORITY_DMAMGR); - osStartThread(&sDmaMgrThread); + osCreateMesgQueue(&sDmaMgrMsgQueue, sDmaMgrMsgs, ARRAY_COUNT(sDmaMgrMsgs)); + StackCheck_Init(&sDmaMgrStackInfo, sDmaMgrStack, sDmaMgrStack + sizeof(sDmaMgrStack), 0, 256, dmamgrThreadName); + osCreateThread(&sDmaMgrThread, Z_THREAD_ID_DMAMGR, DmaMgr_ThreadEntry, NULL, sDmaMgrStack + sizeof(sDmaMgrStack), + Z_PRIORITY_DMAMGR); + osStartThread(&sDmaMgrThread); } #else #pragma GLOBAL_ASM("./asm/non_matchings/boot/z_std_dma/DmaMgr_Start.asm") diff --git a/src/boot_O2_g3_trapuv/fault.c b/src/boot_O2_g3_trapuv/fault.c index ba1922cc9a..e3061a8cf1 100644 --- a/src/boot_O2_g3_trapuv/fault.c +++ b/src/boot_O2_g3_trapuv/fault.c @@ -742,17 +742,17 @@ void Fault_SetOptionsFromController3(void) { graphRA = graphOSThread.context.ra; graphSP = graphOSThread.context.sp; if (CHECK_BTN_ALL(input3->press.button, BTN_R)) { - faultCopyToLog = !faultCopyToLog; - FaultDrawer_SetOsSyncPrintfEnabled(faultCopyToLog); + faultCopyToLog = !faultCopyToLog; + FaultDrawer_SetOsSyncPrintfEnabled(faultCopyToLog); } if (CHECK_BTN_ALL(input3->press.button, BTN_A)) { - Fault_Log(D_80098A44, graphPC, graphRA, graphSP); + Fault_Log(D_80098A44, graphPC, graphRA, graphSP); } if (CHECK_BTN_ALL(input3->press.button, BTN_B)) { - FaultDrawer_SetDrawerFB(osViGetNextFramebuffer(), 0x140, 0xF0); - Fault_DrawRec(0, 0xD7, 0x140, 9, 1); - FaultDrawer_SetCharPad(-2, 0); - FaultDrawer_DrawText(0x20, 0xD8, D_80098A68, graphPC, graphRA, graphSP); + FaultDrawer_SetDrawerFB(osViGetNextFramebuffer(), 0x140, 0xF0); + Fault_DrawRec(0, 0xD7, 0x140, 9, 1); + FaultDrawer_SetCharPad(-2, 0); + FaultDrawer_DrawText(0x20, 0xD8, D_80098A68, graphPC, graphRA, graphSP); } } } diff --git a/src/boot_O2_g3_trapuv/fault_drawer.c b/src/boot_O2_g3_trapuv/fault_drawer.c index 9364ca5091..5a69f61875 100644 --- a/src/boot_O2_g3_trapuv/fault_drawer.c +++ b/src/boot_O2_g3_trapuv/fault_drawer.c @@ -19,7 +19,8 @@ FaultDrawer sFaultDrawerDefault = { 8, // charH 0, // charWPad 0, // charHPad - { // printColors + { + // printColors GPACK_RGBA5551(0, 0, 0, 1), GPACK_RGBA5551(255, 0, 0, 1), GPACK_RGBA5551(0, 255, 0, 1), @@ -40,7 +41,6 @@ void FaultDrawer_SetOsSyncPrintfEnabled(u32 enabled) { sFaultDrawContext->osSyncPrintfEnabled = enabled; } - void FaultDrawer_DrawRecImpl(s32 xStart, s32 yStart, s32 xEnd, s32 yEnd, u16 color) { u16* fb; s32 x, y; @@ -110,7 +110,7 @@ void FaultDrawer_SetBackColor(u16 color) { } void FaultDrawer_SetFontColor(u16 color) { - FaultDrawer_SetForeColor(color | 1); //force alpha to be set + FaultDrawer_SetForeColor(color | 1); // force alpha to be set } void FaultDrawer_SetCharPad(s8 padW, s8 padH) { @@ -120,7 +120,9 @@ void FaultDrawer_SetCharPad(s8 padW, s8 padH) { void FaultDrawer_SetCursor(s32 x, s32 y) { if (sFaultDrawContext->osSyncPrintfEnabled) { - Fault_Log(D_80099064, (y - sFaultDrawContext->yStart) / (sFaultDrawContext->charH + sFaultDrawContext->charHPad), (x - sFaultDrawContext->xStart) / (sFaultDrawContext->charW + sFaultDrawContext->charWPad)); + Fault_Log(D_80099064, + (y - sFaultDrawContext->yStart) / (sFaultDrawContext->charH + sFaultDrawContext->charHPad), + (x - sFaultDrawContext->xStart) / (sFaultDrawContext->charW + sFaultDrawContext->charWPad)); } sFaultDrawContext->cursorX = x; sFaultDrawContext->cursorY = y; @@ -131,13 +133,14 @@ void FaultDrawer_FillScreen() { Fault_Log(D_80099070); } - FaultDrawer_DrawRecImpl(sFaultDrawContext->xStart, sFaultDrawContext->yStart, sFaultDrawContext->xEnd, sFaultDrawContext->yEnd, sFaultDrawContext->backColor | 1); + FaultDrawer_DrawRecImpl(sFaultDrawContext->xStart, sFaultDrawContext->yStart, sFaultDrawContext->xEnd, + sFaultDrawContext->yEnd, sFaultDrawContext->backColor | 1); FaultDrawer_SetCursor(sFaultDrawContext->xStart, sFaultDrawContext->yStart); } #pragma GLOBAL_ASM("./asm/non_matchings/boot/fault_drawer/FaultDrawer_FormatStringFunc.asm") -void FaultDrawer_VPrintf(char* str, char* args) { //va_list +void FaultDrawer_VPrintf(char* str, char* args) { // va_list _Printf((printf_func)FaultDrawer_FormatStringFunc, sFaultDrawContext, str, args); } @@ -162,7 +165,7 @@ void FaultDrawer_SetDrawerFB(void* fb, u16 w, u16 h) { sFaultDrawContext->h = h; } -void FaultDrawer_SetInputCallback(void(*callback)()) { +void FaultDrawer_SetInputCallback(void (*callback)()) { sFaultDrawContext->inputCallback = callback; } @@ -171,4 +174,3 @@ void FaultDrawer_Init() { bcopy(&sFaultDrawerDefault, sFaultDrawContext, sizeof(FaultDrawer)); sFaultDrawContext->fb = (u16*)((osMemSize | 0x80000000) - 0x25800); } - diff --git a/src/code/code_0x800A5AC0.c b/src/code/code_0x800A5AC0.c index bb2934a7cf..ddbbd50d75 100644 --- a/src/code/code_0x800A5AC0.c +++ b/src/code/code_0x800A5AC0.c @@ -27,7 +27,7 @@ void EnAObj_Update1(ActorEnAObj* this, GlobalContext* ctxt) { this->update = (ActorFunc)EnAObj_Update2; } else { v0 = this->base.yawTowardsPlayer - this->base.shape.rot.y; - v1 = (v0 < 0)? -v0 : v0; + v1 = (v0 < 0) ? -v0 : v0; if ((v1 < 10240) || ((this->base.params == 1) && (v1 > 22528))) { func_800B863C((Actor*)this, ctxt); } diff --git a/src/code/code_0x800AF710.c b/src/code/code_0x800AF710.c index b7d9c50f1e..d160b86d08 100644 --- a/src/code/code_0x800AF710.c +++ b/src/code/code_0x800AF710.c @@ -128,51 +128,51 @@ void Effect_Add(GlobalContext* ctxt, s32* index, s32 type, u8 param_4, u8 param_ if (func_8016A01C(ctxt) != 1) { slotFound = 0; switch (type) { - case 0: - for (i = 0; i < 3; i++) { - if (sEffTable.sparks[i].base.active == 0) { - slotFound = 1; - *index = i; - params = &sEffTable.sparks[i].params; - common = &sEffTable.sparks[i].base; - break; + case 0: + for (i = 0; i < 3; i++) { + if (sEffTable.sparks[i].base.active == 0) { + slotFound = 1; + *index = i; + params = &sEffTable.sparks[i].params; + common = &sEffTable.sparks[i].base; + break; + } } - } - break; - case 1: - case 2: - for (i = 0; i < 25; i++) { - if (sEffTable.blures[i].base.active == 0) { - slotFound = 1; - *index = i + 3; - params = &sEffTable.blures[i].params; - common = &sEffTable.blures[i].base; - break; + break; + case 1: + case 2: + for (i = 0; i < 25; i++) { + if (sEffTable.blures[i].base.active == 0) { + slotFound = 1; + *index = i + 3; + params = &sEffTable.blures[i].params; + common = &sEffTable.blures[i].base; + break; + } } - } - break; - case 3: - for (i = 0; i < 3; i++) { - if (sEffTable.shieldParticles[i].base.active == 0) { - slotFound = 1; - *index = i + 28; - params = &sEffTable.shieldParticles[i].params; - common = &sEffTable.shieldParticles[i].base; - break; + break; + case 3: + for (i = 0; i < 3; i++) { + if (sEffTable.shieldParticles[i].base.active == 0) { + slotFound = 1; + *index = i + 28; + params = &sEffTable.shieldParticles[i].params; + common = &sEffTable.shieldParticles[i].base; + break; + } } - } - break; - case 4: - for (i = 0; i < 15; i++) { - if (sEffTable.tireMarks[i].base.active == 0) { - slotFound = 1; - *index = i + 31; - params = &sEffTable.tireMarks[i].params; - common = &sEffTable.tireMarks[i].base; - break; + break; + case 4: + for (i = 0; i < 15; i++) { + if (sEffTable.tireMarks[i].base.active == 0) { + slotFound = 1; + *index = i + 31; + params = &sEffTable.tireMarks[i].params; + common = &sEffTable.tireMarks[i].base; + break; + } } - } - break; + break; } if (slotFound) { @@ -264,28 +264,28 @@ void Effect_Destroy(GlobalContext* ctxt, s32 index) { } if (index < 3) { - sEffTable.sparks[index].base.active = 0 ; + sEffTable.sparks[index].base.active = 0; sEffInfoTable[0].destroy(&sEffTable.sparks[index].params); return; } index -= 3; if (index < 25) { - sEffTable.blures[index].base.active = 0 ; + sEffTable.blures[index].base.active = 0; sEffInfoTable[1].destroy(&sEffTable.blures[index].params); return; } index -= 25; if (index < 3) { - sEffTable.shieldParticles[index].base.active = 0 ; + sEffTable.shieldParticles[index].base.active = 0; sEffInfoTable[3].destroy(&sEffTable.shieldParticles[index].params); return; } index -= 3; if (index < 15) { - sEffTable.tireMarks[index].base.active = 0 ; + sEffTable.tireMarks[index].base.active = 0; sEffInfoTable[4].destroy(&sEffTable.tireMarks[index].params); return; } @@ -314,4 +314,3 @@ void Effect_DestroyAll(GlobalContext* ctxt) { sEffInfoTable[4].destroy(&sEffTable.tireMarks[i].params); } } - diff --git a/src/code/code_0x800CAAD0.c b/src/code/code_0x800CAAD0.c index edd623ca56..a21e3885ac 100644 --- a/src/code/code_0x800CAAD0.c +++ b/src/code/code_0x800CAAD0.c @@ -12,31 +12,27 @@ void BgCheck2_UpdateActorPosition(CollisionContext* bgCtxt, s32 index, Actor* ac Vec3f newPos; Vec3f posWithInv; - if (BgCheck_IsActorMeshIndexValid(index) == 0) return; + if (BgCheck_IsActorMeshIndexValid(index) == 0) { + return; + } - SkinMatrix_SetScaleRotateYRPTranslate(&prevMatrix, - bgCtxt->dyna.bgActors[index].prevTransform.scale.x, - bgCtxt->dyna.bgActors[index].prevTransform.scale.y, - bgCtxt->dyna.bgActors[index].prevTransform.scale.z, - bgCtxt->dyna.bgActors[index].prevTransform.rot.x, - bgCtxt->dyna.bgActors[index].prevTransform.rot.y, - bgCtxt->dyna.bgActors[index].prevTransform.rot.z, - bgCtxt->dyna.bgActors[index].prevTransform.pos.x, - bgCtxt->dyna.bgActors[index].prevTransform.pos.y, - bgCtxt->dyna.bgActors[index].prevTransform.pos.z); + SkinMatrix_SetScaleRotateYRPTranslate( + &prevMatrix, bgCtxt->dyna.bgActors[index].prevTransform.scale.x, + bgCtxt->dyna.bgActors[index].prevTransform.scale.y, bgCtxt->dyna.bgActors[index].prevTransform.scale.z, + bgCtxt->dyna.bgActors[index].prevTransform.rot.x, bgCtxt->dyna.bgActors[index].prevTransform.rot.y, + bgCtxt->dyna.bgActors[index].prevTransform.rot.z, bgCtxt->dyna.bgActors[index].prevTransform.pos.x, + bgCtxt->dyna.bgActors[index].prevTransform.pos.y, bgCtxt->dyna.bgActors[index].prevTransform.pos.z); - if (SkinMatrix_Invert(&prevMatrix, &prevMatrixInv) == 2) return; + if (SkinMatrix_Invert(&prevMatrix, &prevMatrixInv) == 2) { + return; + } - SkinMatrix_SetScaleRotateYRPTranslate(&currMatrix, - bgCtxt->dyna.bgActors[index].curTransform.scale.x, - bgCtxt->dyna.bgActors[index].curTransform.scale.y, - bgCtxt->dyna.bgActors[index].curTransform.scale.z, - bgCtxt->dyna.bgActors[index].curTransform.rot.x, - bgCtxt->dyna.bgActors[index].curTransform.rot.y, - bgCtxt->dyna.bgActors[index].curTransform.rot.z, - bgCtxt->dyna.bgActors[index].curTransform.pos.x, - bgCtxt->dyna.bgActors[index].curTransform.pos.y, - bgCtxt->dyna.bgActors[index].curTransform.pos.z); + SkinMatrix_SetScaleRotateYRPTranslate( + &currMatrix, bgCtxt->dyna.bgActors[index].curTransform.scale.x, + bgCtxt->dyna.bgActors[index].curTransform.scale.y, bgCtxt->dyna.bgActors[index].curTransform.scale.z, + bgCtxt->dyna.bgActors[index].curTransform.rot.x, bgCtxt->dyna.bgActors[index].curTransform.rot.y, + bgCtxt->dyna.bgActors[index].curTransform.rot.z, bgCtxt->dyna.bgActors[index].curTransform.pos.x, + bgCtxt->dyna.bgActors[index].curTransform.pos.y, bgCtxt->dyna.bgActors[index].curTransform.pos.z); SkinMatrix_Vec3fMtxFMultXYZ(&prevMatrixInv, &actor->world.pos, &posWithInv); SkinMatrix_Vec3fMtxFMultXYZ(&currMatrix, &posWithInv, &newPos); @@ -47,7 +43,9 @@ void BgCheck2_UpdateActorPosition(CollisionContext* bgCtxt, s32 index, Actor* ac void BgCheck2_UpdateActorYRotation(CollisionContext* bgCtxt, s32 index, Actor* actor) { s16 angleChange; - if (BgCheck_IsActorMeshIndexValid(index) == 0) return; + if (BgCheck_IsActorMeshIndexValid(index) == 0) { + return; + } angleChange = bgCtxt->dyna.bgActors[index].curTransform.rot.y - bgCtxt->dyna.bgActors[index].prevTransform.rot.y; @@ -60,11 +58,13 @@ void BgCheck2_UpdateActorYRotation(CollisionContext* bgCtxt, s32 index, Actor* a } void BgCheck2_AttachToMesh(CollisionContext* bgCtxt, Actor* actor, s32 index) { - DynaPolyActor *meshActor; + DynaPolyActor* meshActor; - if (BgCheck_IsActorMeshIndexValid(index) == 0) return; + if (BgCheck_IsActorMeshIndexValid(index) == 0) { + return; + } - meshActor = BgCheck_GetActorOfMesh(bgCtxt,index); + meshActor = BgCheck_GetActorOfMesh(bgCtxt, index); if (meshActor != NULL) { func_800CAE88(meshActor); @@ -79,26 +79,31 @@ void BgCheck2_AttachToMesh(CollisionContext* bgCtxt, Actor* actor, s32 index) { u32 BgCheck2_UpdateActorAttachedToMesh(CollisionContext* bgCtxt, s32 index, Actor* actor) { u32 wasUpdated = 0; - DynaPolyActor *meshActor; + DynaPolyActor* meshActor; - if (BgCheck_IsActorMeshIndexValid(index) == 0) return 0; + if (BgCheck_IsActorMeshIndexValid(index) == 0) { + return 0; + } - if (((bgCtxt->dyna.bgActorFlags[index] & 2) != 0) || ((bgCtxt->dyna.bgActorFlags[index] & 1) == 0)) return 0; + if (((bgCtxt->dyna.bgActorFlags[index] & 2) != 0) || ((bgCtxt->dyna.bgActorFlags[index] & 1) == 0)) { + return 0; + } - meshActor = BgCheck_GetActorOfMesh(bgCtxt,index); + meshActor = BgCheck_GetActorOfMesh(bgCtxt, index); - if (meshActor == NULL) return 0; + if (meshActor == NULL) { + return 0; + } if ((meshActor->unk154 & 1) != 0) { - BgCheck2_UpdateActorPosition(bgCtxt,index,actor); + BgCheck2_UpdateActorPosition(bgCtxt, index, actor); wasUpdated = 1; } if ((meshActor->unk154 & 2) != 0) { - BgCheck2_UpdateActorYRotation(bgCtxt,index,actor); + BgCheck2_UpdateActorYRotation(bgCtxt, index, actor); wasUpdated = 1; } return wasUpdated; } - diff --git a/src/code/code_0x800CAE10.c b/src/code/code_0x800CAE10.c index 7db9f6396e..37c338ef36 100644 --- a/src/code/code_0x800CAE10.c +++ b/src/code/code_0x800CAE10.c @@ -33,7 +33,7 @@ void func_800CAEB0(CollisionContext* bgCtxt, s32 index) { DynaPolyActor* actor; actor = BgCheck_GetActorOfMesh(bgCtxt, index); - if (actor != (DynaPolyActor *)0x0) { + if (actor != (DynaPolyActor*)0x0) { func_800CAE9C(actor); } } @@ -46,7 +46,7 @@ void func_800CAEF4(CollisionContext* bgCtxt, s32 index) { DynaPolyActor* actor; actor = BgCheck_GetActorOfMesh(bgCtxt, index); - if (actor != (DynaPolyActor *)0x0) { + if (actor != (DynaPolyActor*)0x0) { func_800CAEE0(actor); } } diff --git a/src/code/code_0x800E8EA0.c b/src/code/code_0x800E8EA0.c index 403bdb2265..3c55a043cb 100644 --- a/src/code/code_0x800E8EA0.c +++ b/src/code/code_0x800E8EA0.c @@ -10,20 +10,22 @@ s32 nop_800E8ED0(UNK_TYPE4 param_1) { return 0; } -void nop_800E8EE0(UNK_TYPE4 param_1) {} +void nop_800E8EE0(UNK_TYPE4 param_1) { +} s32 nop_800E8EEC(UNK_TYPE4 param_1) { return 0; } -void nop_800E8EFC(UNK_TYPE4 param_1) {} +void nop_800E8EFC(UNK_TYPE4 param_1) { +} s32 func_800E8F08(Vec3s* param_1, Vec3s* param_2) { - Math_SmoothStepToS(¶m_1->y, 0, 6, 6200, 100); - Math_SmoothStepToS(¶m_1->x, 0, 6, 6200, 100); - Math_SmoothStepToS(¶m_2->y, 0, 6, 6200, 100); - Math_SmoothStepToS(¶m_2->x, 0, 6, 6200, 100); - return 1; + Math_SmoothStepToS(¶m_1->y, 0, 6, 6200, 100); + Math_SmoothStepToS(¶m_1->x, 0, 6, 6200, 100); + Math_SmoothStepToS(¶m_2->y, 0, 6, 6200, 100); + Math_SmoothStepToS(¶m_2->x, 0, 6, 6200, 100); + return 1; } s32 func_800E8FA4(Actor* actor, Vec3f* param_2, Vec3s* param_3, Vec3s* param_4) { @@ -31,30 +33,30 @@ s32 func_800E8FA4(Actor* actor, Vec3f* param_2, Vec3s* param_3, Vec3s* param_4) s16 targetYaw; s16 yawDiffFromTarget; - targetPitch = Math_Vec3f_Pitch(&actor->focus.pos,param_2); - targetYaw = Math_Vec3f_Yaw(&actor->focus.pos,param_2) - actor->world.rot.y; + targetPitch = Math_Vec3f_Pitch(&actor->focus.pos, param_2); + targetYaw = Math_Vec3f_Yaw(&actor->focus.pos, param_2) - actor->world.rot.y; Math_SmoothStepToS(¶m_3->x, targetPitch, 6, 2000, 1); - param_3->x = (param_3->x < -6000)? -6000 : ((6000 < param_3->x)? 6000 : param_3->x); + param_3->x = (param_3->x < -6000) ? -6000 : ((6000 < param_3->x) ? 6000 : param_3->x); yawDiffFromTarget = Math_SmoothStepToS(¶m_3->y, targetYaw, 6, 2000, 1); - param_3->y = (param_3->y < -8000)? -8000 : ((8000 < param_3->y)? 8000 : param_3->y); + param_3->y = (param_3->y < -8000) ? -8000 : ((8000 < param_3->y) ? 8000 : param_3->y); if (yawDiffFromTarget != 0) { - if ((param_3->y < 0? -param_3->y : param_3->y) < 8000) { + if ((param_3->y < 0 ? -param_3->y : param_3->y) < 8000) { return 0; } } Math_SmoothStepToS(¶m_4->y, targetYaw - param_3->y, 4, 2000, 1); - param_4->y = (param_4->y < -12000)? -12000 : ((12000 < param_4->y)? 12000 : param_4->y); + param_4->y = (param_4->y < -12000) ? -12000 : ((12000 < param_4->y) ? 12000 : param_4->y); return 1; } s32 func_800E9138(GlobalContext* ctxt, Actor* actor, Vec3s* param_3, Vec3s* param_4, f32 param_5) { s16 sVar3; - Actor *player; + Actor* player; Vec3f local_14; player = (ctxt->actorCtx).actorList[2].first; @@ -64,8 +66,8 @@ s32 func_800E9138(GlobalContext* ctxt, Actor* actor, Vec3s* param_3, Vec3s* para if (((ctxt->csCtx).state == 0) && (D_801D0D50 == 0)) { sVar3 = actor->yawTowardsPlayer - actor->shape.rot.y; // TODO is this shifting because of a missing cast? - if (0x42ff < (sVar3 < 0? ((-sVar3 << 0x10) >> 0x10) : ((sVar3 << 0x10) >> 0x10))) { - func_800E8F08(param_3,param_4); + if (0x42ff < (sVar3 < 0 ? ((-sVar3 << 0x10) >> 0x10) : ((sVar3 << 0x10) >> 0x10))) { + func_800E8F08(param_3, param_4); return 0; } } @@ -76,13 +78,13 @@ s32 func_800E9138(GlobalContext* ctxt, Actor* actor, Vec3s* param_3, Vec3s* para local_14 = player->focus.pos; } - func_800E8FA4(actor,&local_14,param_3,param_4); + func_800E8FA4(actor, &local_14, param_3, param_4); return 1; } s32 func_800E9250(GlobalContext* ctxt, Actor* actor, Vec3s* param_3, Vec3s* param_4, Vec3f param_5) { s16 sVar3; - Actor *player; + Actor* player; Vec3f local_14; player = (ctxt->actorCtx).actorList[2].first; @@ -91,8 +93,8 @@ s32 func_800E9250(GlobalContext* ctxt, Actor* actor, Vec3s* param_3, Vec3s* para if (((ctxt->csCtx).state == 0) && (D_801D0D50 == 0)) { sVar3 = actor->yawTowardsPlayer - actor->shape.rot.y; // TODO is this shifting because of a missing cast? - if (0x42ff < (sVar3 < 0? ((-sVar3 << 0x10) >> 0x10) : ((sVar3 << 0x10) >> 0x10))) { - func_800E8F08(param_3,param_4); + if (0x42ff < (sVar3 < 0 ? ((-sVar3 << 0x10) >> 0x10) : ((sVar3 << 0x10) >> 0x10))) { + func_800E8F08(param_3, param_4); return 0; } } @@ -103,8 +105,7 @@ s32 func_800E9250(GlobalContext* ctxt, Actor* actor, Vec3s* param_3, Vec3s* para local_14 = player->focus.pos; } - func_800E8FA4(actor,&local_14,param_3,param_4); + func_800E8FA4(actor, &local_14, param_3, param_4); return 1; } - diff --git a/src/code/code_0x80183070.c b/src/code/code_0x80183070.c index 72f0ab9cbf..00934cd604 100644 --- a/src/code/code_0x80183070.c +++ b/src/code/code_0x80183070.c @@ -2,5 +2,7 @@ #include void func_80183070(void) { - for(;;) func_80087A6C(1000); + for (;;) { + func_80087A6C(1000); + } } diff --git a/src/code/game.c b/src/code/game.c index 5f1013a687..8b97cef830 100644 --- a/src/code/game.c +++ b/src/code/game.c @@ -11,13 +11,13 @@ u32 D_801D1514[3] = { 0 }; void Game_UpdateFramerateVariables(s32 divisor) { gFramerateDivisor = divisor; - gFramerateDivisorF = (f32) divisor; - gFramerateDivisorHalf = (f32) (divisor * 0.5f); - gFramerateDivisorThird = (f32) (divisor / 3.0f); + gFramerateDivisorF = (f32)divisor; + gFramerateDivisorHalf = (f32)(divisor * 0.5f); + gFramerateDivisorThird = (f32)(divisor / 3.0f); } -void Game_SetFramerateDivisor(GameState *gameState, s32 divisor) { - R_UPDATE_RATE = (s16) divisor; +void Game_SetFramerateDivisor(GameState* gameState, s32 divisor) { + R_UPDATE_RATE = (s16)divisor; gameState->framerateDivisor = divisor; Game_UpdateFramerateVariables(divisor); } @@ -63,11 +63,11 @@ void GameState_SetFBFilter(Gfx** gfx, u32 arg1) { *gfx = _gfx; } -void Game_Nop80173534(GameState *ctxt) { +void Game_Nop80173534(GameState* ctxt) { ; } -void GameState_Draw(GameState *ctxt, GraphicsContext *gCtxt) { +void GameState_Draw(GameState* ctxt, GraphicsContext* gCtxt) { Gfx* nextDisplayList; Gfx* _polyOpa; // Unused vars impact regalloc @@ -79,7 +79,7 @@ void GameState_Draw(GameState *ctxt, GraphicsContext *gCtxt) { gSPDisplayList(gCtxt->overlay.p++, nextDisplayList); if (R_FB_FILTER_TYPE && R_FB_FILTER_ENV_COLOR(3) == 0) { - GameState_SetFBFilter(&nextDisplayList, (u32) gCtxt->zbuffer); + GameState_SetFBFilter(&nextDisplayList, (u32)gCtxt->zbuffer); } if (R_ENABLE_ARENA_DBG < 0) { @@ -99,7 +99,7 @@ lblUnk:; // Label prevents reordering, if(1) around the above block don't seem t } } -void Game_ResetSegments(GraphicsContext *gCtxt) { +void Game_ResetSegments(GraphicsContext* gCtxt) { gSPSegment(gCtxt->polyOpa.p++, 0, 0); gSPSegment(gCtxt->polyOpa.p++, 0xF, gCtxt->framebuffer); gSPSegment(gCtxt->polyXlu.p++, 0, 0); @@ -108,7 +108,7 @@ void Game_ResetSegments(GraphicsContext *gCtxt) { gSPSegment(gCtxt->overlay.p++, 0xF, gCtxt->framebuffer); } -void func_801736DC(GraphicsContext *gCtxt) { +void func_801736DC(GraphicsContext* gCtxt) { Gfx* nextDisplayList; Gfx* _polyOpa; @@ -120,11 +120,11 @@ void func_801736DC(GraphicsContext *gCtxt) { gCtxt->polyOpa.p = nextDisplayList; } -void Game_UpdateInput(GameState *ctxt) { +void Game_UpdateInput(GameState* ctxt) { Padmgr_GetInput(ctxt->input, 1); } -void Game_Update(GameState *ctxt) { +void Game_Update(GameState* ctxt) { GraphicsContext* _gCtx; _gCtx = ctxt->gfxCtx; @@ -138,14 +138,14 @@ void Game_Update(GameState *ctxt) { } } -void Game_IncrementFrameCount(GameState *ctxt) { +void Game_IncrementFrameCount(GameState* ctxt) { Game_Nop80173534(ctxt); ctxt->frames++; } -void Game_InitHeap(GameState *ctxt, u32 size) { - GameState *_ctx; - void *buf; +void Game_InitHeap(GameState* ctxt, u32 size) { + GameState* _ctx; + void* buf; _ctx = ctxt; buf = Gamealloc_Alloc(&_ctx->alloc, size); @@ -159,14 +159,13 @@ void Game_InitHeap(GameState *ctxt, u32 size) { assert_fail("../game.c", 0x40B); } -void Game_ResizeHeap(GameState *ctxt, u32 size) -{ - GameAlloc *alloc; - void *buf; +void Game_ResizeHeap(GameState* ctxt, u32 size) { + GameAlloc* alloc; + void* buf; u32 systemMaxFree; u32 bytesFree; u32 bytesAllocated; - void *heapStart; + void* heapStart; heapStart = ctxt->heap.bufp; alloc = &ctxt->alloc; @@ -174,23 +173,19 @@ void Game_ResizeHeap(GameState *ctxt, u32 size) Gamealloc_Free(alloc, heapStart); StartHeap_AnalyzeArena(&systemMaxFree, &bytesFree, &bytesAllocated); size = ((systemMaxFree - (sizeof(ArenaNode))) < size) ? (0) : (size); - if (!size) - { + if (!size) { size = systemMaxFree - (sizeof(ArenaNode)); } - if (buf = Gamealloc_Alloc(alloc, size)) - { + if (buf = Gamealloc_Alloc(alloc, size)) { THA_Ct(&ctxt->heap, buf, size); - } - else - { + } else { THA_Ct(&ctxt->heap, 0, 0); assert_fail("../game.c", 0x432); } } -void Game_StateInit(GameState *ctxt, GameStateFunc gameStateInit, GraphicsContext *gCtxt) { +void Game_StateInit(GameState* ctxt, GameStateFunc gameStateInit, GraphicsContext* gCtxt) { ctxt->gfxCtx = gCtxt; ctxt->frames = 0U; ctxt->main = NULL; @@ -220,7 +215,7 @@ lblUnk:; osSendMesg(&ctxt->gfxCtx->unk5C, NULL, 1); } -void Game_StateFini(GameState *ctxt) { +void Game_StateFini(GameState* ctxt) { func_80172BC0(); func_8019E014(); osRecvMesg(&ctxt->gfxCtx->unk5C, 0, 1); @@ -239,23 +234,23 @@ void Game_StateFini(GameState *ctxt) { Gamealloc_FreeAll(&ctxt->alloc); } -GameStateFunc Game_GetNextStateInit(GameState *ctxt) { +GameStateFunc Game_GetNextStateInit(GameState* ctxt) { return ctxt->nextGameStateInit; } -u32 Game_GetNextStateSize(GameState *ctxt) { +u32 Game_GetNextStateSize(GameState* ctxt) { return ctxt->nextGameStateSize; } -u32 Game_GetShouldContinue(GameState *ctxt) { +u32 Game_GetShouldContinue(GameState* ctxt) { return ctxt->running; } -s32 Game_GetHeapFreeSize(GameState *ctxt) { +s32 Game_GetHeapFreeSize(GameState* ctxt) { return THA_GetSize(&ctxt->heap); } -s32 func_80173B48(GameState *ctxt) { +s32 func_80173B48(GameState* ctxt) { s32 result; result = OS_CYCLES_TO_NSEC(ctxt->framerateDivisor * sIrqMgrRetraceTime) - OS_CYCLES_TO_NSEC(D_801FBAF0); return result; diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c index 8a02487dd0..d626da4554 100644 --- a/src/code/sys_matrix.c +++ b/src/code/sys_matrix.c @@ -2,7 +2,7 @@ #include void Matrix_Init(GameState* state) { - sMatrixStack = (MtxF *)THA_AllocEndAlign16(&state->heap, 0x500); + sMatrixStack = (MtxF*)THA_AllocEndAlign16(&state->heap, 0x500); sCurrentMatrix = sMatrixStack; } @@ -11,7 +11,6 @@ void Matrix_Push(void) { sCurrentMatrix++; Matrix_MtxFCopy(sCurrentMatrix, prev); - } void Matrix_Pop(void) { diff --git a/src/code/sys_slowly.c b/src/code/sys_slowly.c index 60baad68c7..d26eb1dd33 100644 --- a/src/code/sys_slowly.c +++ b/src/code/sys_slowly.c @@ -1,22 +1,22 @@ #include #include -#define SLOWLY_STATUS_DONE (1 << 0) +#define SLOWLY_STATUS_DONE (1 << 0) #define SLOWLY_STATUS_STARTED (1 << 1) void Slowly_Main(SlowlyTask* slowly) { slowly->status |= SLOWLY_STATUS_STARTED; switch (slowly->callbackArgCount) { - case SLOWLY_CALLBACK_NO_ARGS: - slowly->callback0(); - break; - case SLOWLY_CALLBACK_ONE_ARG: - slowly->callback1(slowly->callbackArg0); - break; - case SLOWLY_CALLBACK_TWO_ARGS: - slowly->callback2(slowly->callbackArg0, slowly->callbackArg1); - break; + case SLOWLY_CALLBACK_NO_ARGS: + slowly->callback0(); + break; + case SLOWLY_CALLBACK_ONE_ARG: + slowly->callback1(slowly->callbackArg0); + break; + case SLOWLY_CALLBACK_TWO_ARGS: + slowly->callback2(slowly->callbackArg0, slowly->callbackArg1); + break; } slowly->status |= SLOWLY_STATUS_DONE; diff --git a/src/code/title_setup.c b/src/code/title_setup.c index b828491e9f..0b60712199 100644 --- a/src/code/title_setup.c +++ b/src/code/title_setup.c @@ -45,22 +45,23 @@ void TitleSetup_GameStateResetContext(void) { YREG(43) = 0xB1; } -void TitleSetup_InitImpl(GameState *gameState) { +void TitleSetup_InitImpl(GameState* gameState) { func_80185908(); func_800E9360(); TitleSetup_GameStateResetContext(); gameState->running = 0; -setNextGamestate:; // This label is probably a leftover of a debug ifdef, it's essential to not have gameState->running reordered! +setNextGamestate + :; // This label is probably a leftover of a debug ifdef, it's essential to not have gameState->running reordered! SET_NEXT_GAMESTATE(gameState, Title_Init, TitleContext); } -void TitleSetup_Destroy(GameState *gameState) { +void TitleSetup_Destroy(GameState* gameState) { ; } -void TitleSetup_Init(GameState *gameState) { +void TitleSetup_Init(GameState* gameState) { gameState->destroy = &TitleSetup_Destroy; TitleSetup_InitImpl(gameState); } diff --git a/src/code/z_actor.c b/src/code/z_actor.c index c09fc7d6bf..1049911a97 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1,11 +1,11 @@ #include #include -//From OOT +// From OOT #define ABS(x) ((x) < 0 ? -(x) : (x)) #define DECR(x) ((x) == 0 ? 0 : ((x) -= 1)) -void Actor_PrintLists(ActorContext *actorCtx) { +void Actor_PrintLists(ActorContext* actorCtx) { ActorListEntry* actorList = &actorCtx->actorList[0]; Actor* actor; s32 i; @@ -13,7 +13,7 @@ void Actor_PrintLists(ActorContext *actorCtx) { FaultDrawer_SetCharPad(-2, 0); FaultDrawer_Printf(D_801DC9D0, gMaxActorId); FaultDrawer_Printf(D_801DC9D8); - + for (i = 0; i < ARRAY_COUNT(actorCtx->actorList); i++) { actor = actorList[i].first; @@ -21,7 +21,6 @@ void Actor_PrintLists(ActorContext *actorCtx) { FaultDrawer_Printf(D_801DC9F8, i, actor, actor->id, actor->category, D_801DCA10); actor = actor->next; } - } } @@ -40,10 +39,9 @@ void ActorShadow_Draw(Actor* actor, Lights* lights, GlobalContext* globalCtx, Gf if (dy >= -50.0f && dy < 500.0f) { f32 shadowScale; MtxF mtx; - + OPEN_DISPS(globalCtx->state.gfxCtx); - POLY_OPA_DISP = Gfx_CallSetupDL(POLY_OPA_DISP, 0x2C); gDPSetCombineLERP(POLY_OPA_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED, 0, 0, 0, @@ -66,12 +64,11 @@ void ActorShadow_Draw(Actor* actor, Lights* lights, GlobalContext* globalCtx, Gf Matrix_RotateY((f32)actor->shape.rot.y * (M_PI / 32768), MTXMODE_APPLY); } - shadowScale = 1.0f - (dy * D_801DCA14); + shadowScale = 1.0f - (dy * D_801DCA14); shadowScale *= actor->shape.shadowScale; Matrix_Scale(shadowScale * actor->scale.x, 1.0f, shadowScale * actor->scale.z, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), - G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, dlist); CLOSE_DISPS(globalCtx->state.gfxCtx); @@ -129,8 +126,7 @@ void func_800B40E0(GlobalContext* globalCtx, Light* light, MtxF* arg2, s32 arg3, Matrix_RotateY(sp58, MTXMODE_APPLY); Matrix_Scale(arg5, 1.0f, arg5 * arg6, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), - G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, D_04075B30); CLOSE_DISPS(globalCtx->state.gfxCtx); @@ -178,7 +174,7 @@ u32 Flags_GetSwitch(GlobalContext* ctxt, s32 flag) { return 0; } -void Actor_SetSwitchFlag(GlobalContext* ctxt, s32 flag){ +void Actor_SetSwitchFlag(GlobalContext* ctxt, s32 flag) { if (flag >= 0 && flag < 0x80) { ctxt->actorCtx.switchFlags[(flag & -0x20) >> 5] |= 1 << (flag & 0x1F); } @@ -250,7 +246,8 @@ void Actor_TitleCardContextInit(GlobalContext* ctxt, TitleCardContext* titleCtxt titleCtxt->alpha = 0; } -void Actor_TitleCardCreate(GlobalContext* ctxt, TitleCardContext* titleCtxt, u32 texture, s16 param_4, s16 param_5, u8 param_6, u8 param_7) { +void Actor_TitleCardCreate(GlobalContext* ctxt, TitleCardContext* titleCtxt, u32 texture, s16 param_4, s16 param_5, + u8 param_6, u8 param_7) { titleCtxt->texture = texture; titleCtxt->unk4 = param_4; titleCtxt->unk6 = param_5; @@ -404,7 +401,7 @@ void Actor_SetVelocityAndMoveYRotationAndGravity(Actor* actor) { } void Actor_SetVelocityXYRotation(Actor* actor) { - f32 velX = Math_CosS(actor->world.rot.x) * actor->speedXZ; + f32 velX = Math_CosS(actor->world.rot.x) * actor->speedXZ; actor->velocity.x = Math_SinS(actor->world.rot.y) * velX; actor->velocity.y = Math_SinS(actor->world.rot.x) * actor->speedXZ; actor->velocity.z = Math_CosS(actor->world.rot.y) * velX; @@ -416,7 +413,7 @@ void Actor_SetVelocityAndMoveXYRotation(Actor* actor) { } void Actor_SetVelocityXYRotationReverse(Actor* actor) { - f32 velX = Math_CosS(-actor->world.rot.x) * actor->speedXZ; + f32 velX = Math_CosS(-actor->world.rot.x) * actor->speedXZ; actor->velocity.x = Math_SinS(actor->world.rot.y) * velX; actor->velocity.y = Math_SinS(-actor->world.rot.x) * actor->speedXZ; actor->velocity.z = Math_CosS(actor->world.rot.y) * velX; @@ -740,9 +737,9 @@ void Actor_FreeOverlay(ActorOverlay* entry) { if (entry->nbLoaded == 0) { ramAddr = entry->loadedRamAddr; if (ramAddr != NULL) { - //Bit 1 - always loaded + // Bit 1 - always loaded if ((entry->allocType & 2) == 0) { - //Bit 0 - don't alloc memory + // Bit 0 - don't alloc memory if ((entry->allocType & 1) != 0) { entry->loadedRamAddr = NULL; } else { diff --git a/src/code/z_actor_dlftbls.c b/src/code/z_actor_dlftbls.c index 88274f5151..12971cdb19 100644 --- a/src/code/z_actor_dlftbls.c +++ b/src/code/z_actor_dlftbls.c @@ -2,10 +2,10 @@ #include #include "initvars.h" -#define ACTOR_OVERLAY(name, allocType) \ - { \ - (u32)_ovl_##name##SegmentRomStart, (u32)_ovl_##name##SegmentRomEnd, _ovl_##name##SegmentStart, \ - _ovl_##name##SegmentEnd, NULL, &name##_InitVars, NULL, allocType, 0 \ +#define ACTOR_OVERLAY(name, allocType) \ + { \ + (u32) _ovl_##name##SegmentRomStart, (u32)_ovl_##name##SegmentRomEnd, _ovl_##name##SegmentStart, \ + _ovl_##name##SegmentEnd, NULL, &name##_InitVars, NULL, allocType, 0 \ } #define ACTOR_OVERLAY_INTERNAL(name, allocType) \ diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index b1ff443874..3e72440e50 100644 --- a/src/code/z_bgcheck.c +++ b/src/code/z_bgcheck.c @@ -431,4 +431,3 @@ f32 func_800C411C(CollisionContext* bgCtxt, CollisionPoly* arg1, s32* arg2, Acto #pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CA9D0.asm") #pragma GLOBAL_ASM("./asm/non_matchings/code/z_bgcheck/func_800CAA14.asm") - diff --git a/src/code/z_collision_btltbls.c b/src/code/z_collision_btltbls.c index daa93e5673..4bc9708925 100644 --- a/src/code/z_collision_btltbls.c +++ b/src/code/z_collision_btltbls.c @@ -55,7 +55,7 @@ DamageTable sDamageTablePresets[] = { * is out of range. */ DamageTable* DamageTable_Get(s32 index) { - if (index < 0 || index > ARRAY_COUNT(sDamageTablePresets)-1) { + if (index < 0 || index > ARRAY_COUNT(sDamageTablePresets) - 1) { return NULL; } diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index f3fd2acd74..0d5d8cdec3 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -329,8 +329,8 @@ s32 Collider_SetJntSphToActor(GlobalContext* ctxt, ColliderJntSph* collider, Col return 0; } - for (destElem = collider->elements, srcElem = src->elements; - destElem < &collider->elements[collider->count]; destElem++, srcElem++) { + for (destElem = collider->elements, srcElem = src->elements; destElem < &collider->elements[collider->count]; + destElem++, srcElem++) { Collider_InitJntSphElement(ctxt, destElem); Collider_SetJntSphElement(ctxt, destElem, srcElem); } diff --git a/src/code/z_eff_footmark.c b/src/code/z_eff_footmark.c index 3b906c3713..60d3b54b17 100644 --- a/src/code/z_eff_footmark.c +++ b/src/code/z_eff_footmark.c @@ -17,7 +17,8 @@ void EffFootmark_Init(GlobalContext* ctxt) { } } -void EffFootmark_Add(GlobalContext* ctxt, MtxF* displayMatrix, Actor* actor, u8 id, Vec3f* location, u16 size, u8 red, u8 green, u8 blue, u16 alpha, u16 alphaChange, u16 fadeoutDelay) { +void EffFootmark_Add(GlobalContext* ctxt, MtxF* displayMatrix, Actor* actor, u8 id, Vec3f* location, u16 size, u8 red, + u8 green, u8 blue, u16 alpha, u16 alphaChange, u16 fadeoutDelay) { s32 i; EffFootmark* footmark; EffFootmark* destination = NULL; @@ -52,7 +53,7 @@ void EffFootmark_Add(GlobalContext* ctxt, MtxF* displayMatrix, Actor* actor, u8 if (destination == NULL) { destination = oldest; } - Matrix_MtxFCopy(&destination->displayMatrix,displayMatrix); + Matrix_MtxFCopy(&destination->displayMatrix, displayMatrix); destination->actor = actor; destination->location.x = location->x; destination->location.y = location->y; @@ -98,7 +99,7 @@ void EffFootmark_Update(GlobalContext* ctxt) { void EffFootmark_Draw(GlobalContext* ctxt) { EffFootmark* footmark; s32 i; - GraphicsContext *gfxCtx = ctxt->state.gfxCtx; + GraphicsContext* gfxCtx = ctxt->state.gfxCtx; func_8012C448(ctxt->state.gfxCtx); @@ -111,10 +112,10 @@ void EffFootmark_Draw(GlobalContext* ctxt) { gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(ctxt->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD); - gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, footmark->red, footmark->green, footmark->blue, footmark->alpha >> 8); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, footmark->red, footmark->green, footmark->blue, + footmark->alpha >> 8); gSPDisplayList(gfxCtx->polyXlu.p++, D_801BC288); } } } - diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c index 05dc808cb7..802ac59f2d 100644 --- a/src/code/z_effect_soft_sprite.c +++ b/src/code/z_effect_soft_sprite.c @@ -112,7 +112,9 @@ s32 EffectSS_FindFreeSpace(u32 priority, u32* tableEntry) { i = 0; } - if (i == EffectSS2Info.searchIndex) break; + if (i == EffectSS2Info.searchIndex) { + break; + } } if (ret == 1) { @@ -137,7 +139,6 @@ s32 EffectSS_FindFreeSpace(u32 priority, u32* tableEntry) { return ret; } } - } *tableEntry = i; @@ -183,7 +184,8 @@ void EffectSs_Spawn(GlobalContext* ctxt, s32 type, s32 priority, void* initData) return; } - load_and_relocate_overlay(entry->vromStart, entry->vromEnd, entry->vramStart, entry->vramEnd, entry->loadedRamAddr); + load_and_relocate_overlay(entry->vromStart, entry->vromEnd, entry->vramStart, entry->vramEnd, + entry->loadedRamAddr); } // XXX this should use a0, but it doesn't @@ -262,13 +264,9 @@ void EffectSS_DrawAllParticles(GlobalContext* ctxt) { for (i = 0; i < EffectSS2Info.size; i++) { if (EffectSS2Info.data_table[i].life > -1) { - if (EffectSS2Info.data_table[i].pos.x > 32000 || - EffectSS2Info.data_table[i].pos.x < -32000 || - EffectSS2Info.data_table[i].pos.y > 32000 || - EffectSS2Info.data_table[i].pos.y < -32000 || - EffectSS2Info.data_table[i].pos.z > 32000 || - EffectSS2Info.data_table[i].pos.z < -32000 - ) { + if (EffectSS2Info.data_table[i].pos.x > 32000 || EffectSS2Info.data_table[i].pos.x < -32000 || + EffectSS2Info.data_table[i].pos.y > 32000 || EffectSS2Info.data_table[i].pos.y < -32000 || + EffectSS2Info.data_table[i].pos.z > 32000 || EffectSS2Info.data_table[i].pos.z < -32000) { EffectSS_Delete(&EffectSS2Info.data_table[i]); } else { EffectSS_DrawParticle(ctxt, i); diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c index e300b914ca..471eb0749d 100644 --- a/src/code/z_effect_soft_sprite_old_init.c +++ b/src/code/z_effect_soft_sprite_old_init.c @@ -343,7 +343,6 @@ void EffectSsGSpk_SpawnFuse(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, EffectSsGSpk_SpawnSmall(globalCtx, actor, pos, velocity, accel, &primColor, &envColor); } - extern Color_RGBA8 D_801AE3D8; extern Color_RGBA8 D_801AE3DC; @@ -782,7 +781,8 @@ void EffectSsIcePiece_SpawnBurst(GlobalContext* globalCtx, Vec3f* refPos, f32 sc // EffectSsEnIce Spawn Functions -void EffectSsEnIce_SpawnFlyingVec3f(GlobalContext* globalCtx, Actor* actor, Vec3f * pos, Color_RGBA8 * prim, Color_RGBA8 * env, f32 scale) { +void EffectSsEnIce_SpawnFlyingVec3f(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, Color_RGBA8* prim, + Color_RGBA8* env, f32 scale) { EffectSsEnIceInitParams initParams; @@ -936,8 +936,8 @@ void EffectSsExtra_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, } // EffectSsDeadDb Spawn Functions -void EffectSsDeadDb_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* prim, Color_RGBA8* env, - s16 scale, s16 scaleStep, s32 unk) { +void EffectSsDeadDb_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* prim, + Color_RGBA8* env, s16 scale, s16 scaleStep, s32 unk) { EffectSsDeadDbInitParams initParams; Math_Vec3f_Copy(&initParams.pos, pos); @@ -960,13 +960,15 @@ void EffectSsDeadDb_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, extern Color_RGBA8 D_801AE48C; extern Color_RGBA8 D_801AE490[4]; -void func_800B3030(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep, s32 colorIndex) { +void func_800B3030(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep, + s32 colorIndex) { EffectSsDeadDb_Spawn(globalCtx, pos, velocity, accel, &D_801AE48C, &D_801AE490[colorIndex], scale, scaleStep, 9); } // EffectSsDeadDd Spawn Functions -void EffectSsDeadDd_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* prim, Color_RGBA8* env, s16 scale, s16 scaleStep, s16 alphaStep, s32 life) { +void EffectSsDeadDd_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* prim, + Color_RGBA8* env, s16 scale, s16 scaleStep, s16 alphaStep, s32 life) { EffectSsDeadDdInitParams initParams; Math_Vec3f_Copy(&initParams.pos, pos); diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 053d86ade7..cc01297142 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -30,13 +30,16 @@ ActorInit En_Item00_InitVars = { ColliderCylinderInit enItem00CylinderInit = { { COLTYPE_NONE, AT_NONE, AC_ON | AT_TYPE_PLAYER, OC1_NONE, OC2_NONE, COLSHAPE_CYLINDER }, - { ELEMTYPE_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000010, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE }, + { ELEMTYPE_UNK0, + { 0x00000000, 0x00, 0x00 }, + { 0x00000010, 0x00, 0x00 }, + TOUCH_NONE | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_NONE }, { 10, 30, 0, { 0, 0, 0 } }, }; -InitChainEntry enItem00InitVars[1] = { - ICHAIN_F32(targetArrowOffset, 2000, ICHAIN_STOP) -}; +InitChainEntry enItem00InitVars[1] = { ICHAIN_F32(targetArrowOffset, 2000, ICHAIN_STOP) }; void EnItem00_SetObject(EnItem00* this, GlobalContext* globalCtx, f32* shadowOffset, f32* shadowScale) { Actor_SetObjectSegment(globalCtx, &this->actor); @@ -79,89 +82,89 @@ void EnItem00_Init(Actor* thisx, GlobalContext* globalCtx) { this->unk150 = 1; switch (this->actor.params) { - case ITEM00_RUPEE_GREEN: - case ITEM00_RUPEE_BLUE: - case ITEM00_RUPEE_RED: - Actor_SetScale(&this->actor, 0.015f); - this->unk154 = 0.015f; - shadowOffset = 750.0f; - break; - case ITEM00_SMALL_KEY: - this->unk150 = 0; - Actor_SetScale(&this->actor, 0.03f); - this->unk154 = 0.03f; - shadowOffset = 350.0f; - break; - case ITEM00_HEART_PIECE: - case ITEM00_HEART_CONTAINER: - this->unk150 = 0; - Actor_SetScale(&this->actor, 0.02f); - this->unk154 = 0.02f; - shadowOffset = 650.0f; - if (this->actor.params == ITEM00_HEART_CONTAINER) { - sp30 = -1; - } - break; - case ITEM00_HEART: - this->actor.home.rot.z = randPlusMinusPoint5Scaled(65535.0f); - shadowOffset = 430.0f; - Actor_SetScale(&this->actor, 0.02f); - this->unk154 = 0.02f; - break; - case ITEM00_ARROWS_10: - case ITEM00_ARROWS_30: - case ITEM00_ARROWS_40: - case ITEM00_ARROWS_50: - Actor_SetScale(&this->actor, 0.035f); - this->unk154 = 0.035f; - shadowOffset = 250.0f; - break; - case ITEM00_BOMBS_A: - case ITEM00_BOMBS_B: - case ITEM00_NUTS_1: - case ITEM00_STICK: - case ITEM00_MAGIC_SMALL: - case ITEM00_NUTS_10: - case ITEM00_BOMBS_0: - Actor_SetScale(&this->actor, 0.03f); - this->unk154 = 0.03f; - shadowOffset = 320.0f; - break; - case ITEM00_MAGIC_LARGE: - Actor_SetScale(&this->actor, 0.044999998f); - this->unk154 = 0.044999998f; - shadowOffset = 320.0f; - break; - case ITEM00_RUPEE_ORANGE: - Actor_SetScale(&this->actor, 0.044999998f); - this->unk154 = 0.044999998f; - shadowOffset = 750.0f; - break; - case ITEM00_RUPEE_PURPLE: - Actor_SetScale(&this->actor, 0.03f); - this->unk154 = 0.03f; - shadowOffset = 750.0f; - break; - case ITEM00_FLEXIBLE: - case ITEM00_BIG_FAIRY: - shadowOffset = 500.0f; - Actor_SetScale(&this->actor, 0.01f); - this->unk154 = 0.01f; - break; - case ITEM00_SHIELD_HERO: - this->actor.objBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_GI_SHIELD_2); - EnItem00_SetObject(this, globalCtx, &shadowOffset, &shadowScale); - break; - case ITEM00_MAP: - this->actor.objBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_GI_MAP); - EnItem00_SetObject(this, globalCtx, &shadowOffset, &shadowScale); - break; - case ITEM00_COMPASS: - this->actor.objBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_GI_COMPASS); - EnItem00_SetObject(this, globalCtx, &shadowOffset, &shadowScale); - break; - default: - break; + case ITEM00_RUPEE_GREEN: + case ITEM00_RUPEE_BLUE: + case ITEM00_RUPEE_RED: + Actor_SetScale(&this->actor, 0.015f); + this->unk154 = 0.015f; + shadowOffset = 750.0f; + break; + case ITEM00_SMALL_KEY: + this->unk150 = 0; + Actor_SetScale(&this->actor, 0.03f); + this->unk154 = 0.03f; + shadowOffset = 350.0f; + break; + case ITEM00_HEART_PIECE: + case ITEM00_HEART_CONTAINER: + this->unk150 = 0; + Actor_SetScale(&this->actor, 0.02f); + this->unk154 = 0.02f; + shadowOffset = 650.0f; + if (this->actor.params == ITEM00_HEART_CONTAINER) { + sp30 = -1; + } + break; + case ITEM00_HEART: + this->actor.home.rot.z = randPlusMinusPoint5Scaled(65535.0f); + shadowOffset = 430.0f; + Actor_SetScale(&this->actor, 0.02f); + this->unk154 = 0.02f; + break; + case ITEM00_ARROWS_10: + case ITEM00_ARROWS_30: + case ITEM00_ARROWS_40: + case ITEM00_ARROWS_50: + Actor_SetScale(&this->actor, 0.035f); + this->unk154 = 0.035f; + shadowOffset = 250.0f; + break; + case ITEM00_BOMBS_A: + case ITEM00_BOMBS_B: + case ITEM00_NUTS_1: + case ITEM00_STICK: + case ITEM00_MAGIC_SMALL: + case ITEM00_NUTS_10: + case ITEM00_BOMBS_0: + Actor_SetScale(&this->actor, 0.03f); + this->unk154 = 0.03f; + shadowOffset = 320.0f; + break; + case ITEM00_MAGIC_LARGE: + Actor_SetScale(&this->actor, 0.044999998f); + this->unk154 = 0.044999998f; + shadowOffset = 320.0f; + break; + case ITEM00_RUPEE_ORANGE: + Actor_SetScale(&this->actor, 0.044999998f); + this->unk154 = 0.044999998f; + shadowOffset = 750.0f; + break; + case ITEM00_RUPEE_PURPLE: + Actor_SetScale(&this->actor, 0.03f); + this->unk154 = 0.03f; + shadowOffset = 750.0f; + break; + case ITEM00_FLEXIBLE: + case ITEM00_BIG_FAIRY: + shadowOffset = 500.0f; + Actor_SetScale(&this->actor, 0.01f); + this->unk154 = 0.01f; + break; + case ITEM00_SHIELD_HERO: + this->actor.objBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_GI_SHIELD_2); + EnItem00_SetObject(this, globalCtx, &shadowOffset, &shadowScale); + break; + case ITEM00_MAP: + this->actor.objBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_GI_MAP); + EnItem00_SetObject(this, globalCtx, &shadowOffset, &shadowScale); + break; + case ITEM00_COMPASS: + this->actor.objBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_GI_COMPASS); + EnItem00_SetObject(this, globalCtx, &shadowOffset, &shadowScale); + break; + default: + break; } this->unk14E = 0; @@ -189,61 +192,61 @@ void EnItem00_Init(Actor* thisx, GlobalContext* globalCtx) { this->actor.gravity = 0.0f; switch (this->actor.params) { - case ITEM00_RUPEE_GREEN: - Item_Give(globalCtx, ITEM_RUPEE_GREEN); - break; - case ITEM00_RUPEE_BLUE: - Item_Give(globalCtx, ITEM_RUPEE_BLUE); - break; - case ITEM00_RUPEE_RED: - Item_Give(globalCtx, ITEM_RUPEE_RED); - break; - case ITEM00_RUPEE_PURPLE: - Item_Give(globalCtx, ITEM_RUPEE_PURPLE); - break; - case ITEM00_RUPEE_ORANGE: - Item_Give(globalCtx, ITEM_RUPEE_ORANGE); - break; - case ITEM00_HEART: - Item_Give(globalCtx, ITEM_HEART); - break; - case ITEM00_FLEXIBLE: - case ITEM00_BIG_FAIRY: - func_80115908(globalCtx, 0x70); - break; - case ITEM00_BOMBS_A: - case ITEM00_BOMBS_B: - Item_Give(globalCtx, ITEM_BOMBS_5); - break; - case ITEM00_ARROWS_10: - Item_Give(globalCtx, ITEM_ARROWS_10); - break; - case ITEM00_ARROWS_30: - Item_Give(globalCtx, ITEM_ARROWS_30); - break; - case ITEM00_ARROWS_40: - Item_Give(globalCtx, ITEM_ARROWS_40); - break; - case ITEM00_ARROWS_50: - Item_Give(globalCtx, ITEM_ARROWS_50); - break; - case ITEM00_MAGIC_LARGE: - Item_Give(globalCtx, ITEM_MAGIC_LARGE); - break; - case ITEM00_MAGIC_SMALL: - Item_Give(globalCtx, ITEM_MAGIC_SMALL); - break; - case ITEM00_SMALL_KEY: - Item_Give(globalCtx, ITEM_KEY_SMALL); - break; - case ITEM00_NUTS_1: - getItemId = GI_NUTS_1; - break; - case ITEM00_NUTS_10: - getItemId = GI_NUTS_10; - break; - default: - break; + case ITEM00_RUPEE_GREEN: + Item_Give(globalCtx, ITEM_RUPEE_GREEN); + break; + case ITEM00_RUPEE_BLUE: + Item_Give(globalCtx, ITEM_RUPEE_BLUE); + break; + case ITEM00_RUPEE_RED: + Item_Give(globalCtx, ITEM_RUPEE_RED); + break; + case ITEM00_RUPEE_PURPLE: + Item_Give(globalCtx, ITEM_RUPEE_PURPLE); + break; + case ITEM00_RUPEE_ORANGE: + Item_Give(globalCtx, ITEM_RUPEE_ORANGE); + break; + case ITEM00_HEART: + Item_Give(globalCtx, ITEM_HEART); + break; + case ITEM00_FLEXIBLE: + case ITEM00_BIG_FAIRY: + func_80115908(globalCtx, 0x70); + break; + case ITEM00_BOMBS_A: + case ITEM00_BOMBS_B: + Item_Give(globalCtx, ITEM_BOMBS_5); + break; + case ITEM00_ARROWS_10: + Item_Give(globalCtx, ITEM_ARROWS_10); + break; + case ITEM00_ARROWS_30: + Item_Give(globalCtx, ITEM_ARROWS_30); + break; + case ITEM00_ARROWS_40: + Item_Give(globalCtx, ITEM_ARROWS_40); + break; + case ITEM00_ARROWS_50: + Item_Give(globalCtx, ITEM_ARROWS_50); + break; + case ITEM00_MAGIC_LARGE: + Item_Give(globalCtx, ITEM_MAGIC_LARGE); + break; + case ITEM00_MAGIC_SMALL: + Item_Give(globalCtx, ITEM_MAGIC_SMALL); + break; + case ITEM00_SMALL_KEY: + Item_Give(globalCtx, ITEM_KEY_SMALL); + break; + case ITEM00_NUTS_1: + getItemId = GI_NUTS_1; + break; + case ITEM00_NUTS_10: + getItemId = GI_NUTS_10; + break; + default: + break; } if ((getItemId != GI_NONE) && (Actor_HasParent(&this->actor, globalCtx) == 0)) { @@ -271,9 +274,11 @@ void EnItem00_WaitForHeartObject(EnItem00* this, GlobalContext* globalCtx) { } void func_800A640C(EnItem00* this, GlobalContext* ctxt) { - if ((this->actor.params <= ITEM00_RUPEE_RED) || ((this->actor.params == ITEM00_HEART) && (this->unk152 < 0)) || (this->actor.params == ITEM00_HEART_PIECE) || (this->actor.params == ITEM00_HEART_CONTAINER)) { + if ((this->actor.params <= ITEM00_RUPEE_RED) || ((this->actor.params == ITEM00_HEART) && (this->unk152 < 0)) || + (this->actor.params == ITEM00_HEART_PIECE) || (this->actor.params == ITEM00_HEART_CONTAINER)) { this->actor.shape.rot.y = this->actor.shape.rot.y + 960; - } else if ((this->actor.params >= ITEM00_SHIELD_HERO) && (this->actor.params != ITEM00_NUTS_10) && (this->actor.params < ITEM00_BOMBS_0)) { + } else if ((this->actor.params >= ITEM00_SHIELD_HERO) && (this->actor.params != ITEM00_NUTS_10) && + (this->actor.params < ITEM00_BOMBS_0)) { if (this->unk152 == -1) { if (!Math_SmoothStepToS(&this->actor.shape.rot.x, this->actor.world.rot.x - 0x4000, 2, 3000, 1500)) { this->unk152 = -2; @@ -295,13 +300,15 @@ void func_800A640C(EnItem00* this, GlobalContext* ctxt) { Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 0.5f, 0.0f); if (this->unk14C == 0) { - if ((this->actor.params != ITEM00_SMALL_KEY) && (this->actor.params != ITEM00_HEART_PIECE) && (this->actor.params != ITEM00_HEART_CONTAINER)) { + if ((this->actor.params != ITEM00_SMALL_KEY) && (this->actor.params != ITEM00_HEART_PIECE) && + (this->actor.params != ITEM00_HEART_CONTAINER)) { this->unk14C = -1; } } if (this->unk152 == 0) { - if ((this->actor.params != ITEM00_SMALL_KEY) && (this->actor.params != ITEM00_HEART_PIECE) && (this->actor.params != ITEM00_HEART_CONTAINER)) { + if ((this->actor.params != ITEM00_SMALL_KEY) && (this->actor.params != ITEM00_HEART_PIECE) && + (this->actor.params != ITEM00_HEART_CONTAINER)) { Actor_MarkForDeath(&this->actor); } } @@ -355,14 +362,17 @@ void func_800A6780(EnItem00* this, GlobalContext* globalCtx) { this->actor.velocity.y = -1.5f; } this->actor.home.rot.z += (s16)((this->actor.velocity.y + 3.0f) * 1000.0f); - this->actor.world.pos.x += (Math_CosS(this->actor.yawTowardsPlayer) * (-3.0f * Math_CosS(this->actor.home.rot.z))); - this->actor.world.pos.z += (Math_SinS(this->actor.yawTowardsPlayer) * (-3.0f * Math_CosS(this->actor.home.rot.z))); + this->actor.world.pos.x += + (Math_CosS(this->actor.yawTowardsPlayer) * (-3.0f * Math_CosS(this->actor.home.rot.z))); + this->actor.world.pos.z += + (Math_SinS(this->actor.yawTowardsPlayer) * (-3.0f * Math_CosS(this->actor.home.rot.z))); } } if (this->actor.params <= ITEM00_RUPEE_RED) { this->actor.shape.rot.y += 960; - } else if ((this->actor.params >= ITEM00_SHIELD_HERO) && (this->actor.params != ITEM00_NUTS_10) && (this->actor.params != ITEM00_BOMBS_0)) { + } else if ((this->actor.params >= ITEM00_SHIELD_HERO) && (this->actor.params != ITEM00_NUTS_10) && + (this->actor.params != ITEM00_BOMBS_0)) { this->actor.world.rot.x -= 700; this->actor.shape.rot.y += 400; this->actor.shape.rot.x = this->actor.world.rot.x - 0x4000; @@ -460,7 +470,8 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) { Collision_CylinderMoveToActor(&this->actor, &this->collider); Collision_AddAC(globalCtx, &globalCtx->colCheckCtx, &this->collider.base); - if ((this->actor.params == ITEM00_SHIELD_HERO) || (this->actor.params == ITEM00_MAP) || (this->actor.params == ITEM00_COMPASS)) { + if ((this->actor.params == ITEM00_SHIELD_HERO) || (this->actor.params == ITEM00_MAP) || + (this->actor.params == ITEM00_COMPASS)) { this->actor.shape.yOffset = fabsf(Math_CosS(this->actor.shape.rot.x) * 37.0f); } @@ -468,8 +479,10 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) { return; } - if (!((sp38 != 0) && (this->actor.xzDistToPlayer <= 60.0f) && (this->actor.yDistToPlayer >= -100.0f) && (this->actor.yDistToPlayer <= 100.0f)) && - !((sp38 == 0) && (this->actor.xzDistToPlayer <= 30.0f) && (this->actor.yDistToPlayer >= -50.0f) && (this->actor.yDistToPlayer <= 50.0f))) { + if (!((sp38 != 0) && (this->actor.xzDistToPlayer <= 60.0f) && (this->actor.yDistToPlayer >= -100.0f) && + (this->actor.yDistToPlayer <= 100.0f)) && + !((sp38 == 0) && (this->actor.xzDistToPlayer <= 30.0f) && (this->actor.yDistToPlayer >= -50.0f) && + (this->actor.yDistToPlayer <= 50.0f))) { if (!Actor_HasParent(&this->actor, globalCtx)) { return; } @@ -480,84 +493,84 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) { } switch (this->actor.params) { - case ITEM00_RUPEE_GREEN: - this->unk1A4 = 1; - Item_Give(globalCtx, ITEM_RUPEE_GREEN); - break; - case ITEM00_RUPEE_BLUE: - this->unk1A4 = 1; - Item_Give(globalCtx, ITEM_RUPEE_BLUE); - break; - case ITEM00_RUPEE_RED: - this->unk1A4 = 1; - Item_Give(globalCtx, ITEM_RUPEE_RED); - break; - case ITEM00_RUPEE_PURPLE: - this->unk1A4 = 1; - Item_Give(globalCtx, ITEM_RUPEE_PURPLE); - break; - case ITEM00_RUPEE_ORANGE: - this->unk1A4 = 1; - Item_Give(globalCtx, ITEM_RUPEE_ORANGE); - break; - case ITEM00_STICK: - getItemId = GI_STICKS_1; - break; - case ITEM00_NUTS_1: - getItemId = GI_NUTS_1; - break; - case ITEM00_NUTS_10: - getItemId = GI_NUTS_10; - break; - case ITEM00_HEART: - Item_Give(globalCtx, ITEM_HEART); - break; - case ITEM00_FLEXIBLE: - case ITEM00_BIG_FAIRY: - func_80115908(globalCtx, 0x70); - break; - case ITEM00_BOMBS_A: - case ITEM00_BOMBS_B: - Item_Give(globalCtx, ITEM_BOMBS_5); - break; - case ITEM00_ARROWS_10: - Item_Give(globalCtx, ITEM_ARROWS_10); - break; - case ITEM00_ARROWS_30: - Item_Give(globalCtx, ITEM_ARROWS_30); - break; - case ITEM00_ARROWS_40: - Item_Give(globalCtx, ITEM_ARROWS_40); - break; - case ITEM00_ARROWS_50: - Item_Give(globalCtx, ITEM_ARROWS_50); - break; - case ITEM00_SMALL_KEY: - getItemId = GI_KEY_SMALL; - break; - case ITEM00_HEART_PIECE: - getItemId = GI_HEART_PIECE; - break; - case ITEM00_HEART_CONTAINER: - getItemId = GI_HEART_CONTAINER; - break; - case ITEM00_MAGIC_LARGE: - Item_Give(globalCtx, ITEM_MAGIC_LARGE); - break; - case ITEM00_MAGIC_SMALL: - Item_Give(globalCtx, ITEM_MAGIC_SMALL); - break; - case ITEM00_SHIELD_HERO: - getItemId = GI_SHIELD_HERO; - break; - case ITEM00_MAP: - getItemId = GI_MAP; - break; - case ITEM00_COMPASS: - getItemId = GI_COMPASS; - break; - default: - break; + case ITEM00_RUPEE_GREEN: + this->unk1A4 = 1; + Item_Give(globalCtx, ITEM_RUPEE_GREEN); + break; + case ITEM00_RUPEE_BLUE: + this->unk1A4 = 1; + Item_Give(globalCtx, ITEM_RUPEE_BLUE); + break; + case ITEM00_RUPEE_RED: + this->unk1A4 = 1; + Item_Give(globalCtx, ITEM_RUPEE_RED); + break; + case ITEM00_RUPEE_PURPLE: + this->unk1A4 = 1; + Item_Give(globalCtx, ITEM_RUPEE_PURPLE); + break; + case ITEM00_RUPEE_ORANGE: + this->unk1A4 = 1; + Item_Give(globalCtx, ITEM_RUPEE_ORANGE); + break; + case ITEM00_STICK: + getItemId = GI_STICKS_1; + break; + case ITEM00_NUTS_1: + getItemId = GI_NUTS_1; + break; + case ITEM00_NUTS_10: + getItemId = GI_NUTS_10; + break; + case ITEM00_HEART: + Item_Give(globalCtx, ITEM_HEART); + break; + case ITEM00_FLEXIBLE: + case ITEM00_BIG_FAIRY: + func_80115908(globalCtx, 0x70); + break; + case ITEM00_BOMBS_A: + case ITEM00_BOMBS_B: + Item_Give(globalCtx, ITEM_BOMBS_5); + break; + case ITEM00_ARROWS_10: + Item_Give(globalCtx, ITEM_ARROWS_10); + break; + case ITEM00_ARROWS_30: + Item_Give(globalCtx, ITEM_ARROWS_30); + break; + case ITEM00_ARROWS_40: + Item_Give(globalCtx, ITEM_ARROWS_40); + break; + case ITEM00_ARROWS_50: + Item_Give(globalCtx, ITEM_ARROWS_50); + break; + case ITEM00_SMALL_KEY: + getItemId = GI_KEY_SMALL; + break; + case ITEM00_HEART_PIECE: + getItemId = GI_HEART_PIECE; + break; + case ITEM00_HEART_CONTAINER: + getItemId = GI_HEART_CONTAINER; + break; + case ITEM00_MAGIC_LARGE: + Item_Give(globalCtx, ITEM_MAGIC_LARGE); + break; + case ITEM00_MAGIC_SMALL: + Item_Give(globalCtx, ITEM_MAGIC_SMALL); + break; + case ITEM00_SHIELD_HERO: + getItemId = GI_SHIELD_HERO; + break; + case ITEM00_MAP: + getItemId = GI_MAP; + break; + case ITEM00_COMPASS: + getItemId = GI_COMPASS; + break; + default: + break; } if (getItemId != GI_NONE) { @@ -567,19 +580,19 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) { } switch (this->actor.params) { - case ITEM00_HEART_PIECE: - case ITEM00_HEART_CONTAINER: - case ITEM00_SMALL_KEY: - case ITEM00_SHIELD_HERO: - case ITEM00_MAP: - case ITEM00_COMPASS: - if (Actor_HasParent(&this->actor, globalCtx)) { - Actor_SetCollectibleFlag(globalCtx, this->collectibleFlag); - Actor_MarkForDeath(&this->actor); - } - return; - default: - break; + case ITEM00_HEART_PIECE: + case ITEM00_HEART_CONTAINER: + case ITEM00_SMALL_KEY: + case ITEM00_SHIELD_HERO: + case ITEM00_MAP: + case ITEM00_COMPASS: + if (Actor_HasParent(&this->actor, globalCtx)) { + Actor_SetCollectibleFlag(globalCtx, this->collectibleFlag); + Actor_MarkForDeath(&this->actor); + } + return; + default: + break; } if ((this->actor.params <= ITEM00_RUPEE_RED) || (this->actor.params == ITEM00_RUPEE_ORANGE)) { @@ -623,63 +636,63 @@ void EnItem00_Draw(Actor* thisx, GlobalContext* globalCtx) { if (!(this->unk14E & this->unk150)) { switch (this->actor.params) { - case ITEM00_RUPEE_GREEN: - case ITEM00_RUPEE_BLUE: - case ITEM00_RUPEE_RED: - case ITEM00_RUPEE_ORANGE: - case ITEM00_RUPEE_PURPLE: - EnItem00_DrawRupee(this, globalCtx); - break; - case ITEM00_HEART_PIECE: - EnItem00_DrawHeartPiece(this, globalCtx); - break; - case ITEM00_HEART_CONTAINER: - EnItem00_DrawHeartContainer(this, globalCtx); - break; - case ITEM00_HEART: - if (this->unk152 < 0) { - if (this->unk152 == -1) { - s8 bankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_GI_HEART); - if (Object_IsLoaded(&globalCtx->objectCtx, bankIndex)) { - this->actor.objBankIndex = bankIndex; - Actor_SetObjectSegment(globalCtx, &this->actor); - this->unk152 = -2; - } - } else { - Matrix_Scale(16.0f, 16.0f, 16.0f, 1); - GetItem_Draw(globalCtx, 8); - } + case ITEM00_RUPEE_GREEN: + case ITEM00_RUPEE_BLUE: + case ITEM00_RUPEE_RED: + case ITEM00_RUPEE_ORANGE: + case ITEM00_RUPEE_PURPLE: + EnItem00_DrawRupee(this, globalCtx); + break; + case ITEM00_HEART_PIECE: + EnItem00_DrawHeartPiece(this, globalCtx); + break; + case ITEM00_HEART_CONTAINER: + EnItem00_DrawHeartContainer(this, globalCtx); + break; + case ITEM00_HEART: + if (this->unk152 < 0) { + if (this->unk152 == -1) { + s8 bankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_GI_HEART); + if (Object_IsLoaded(&globalCtx->objectCtx, bankIndex)) { + this->actor.objBankIndex = bankIndex; + Actor_SetObjectSegment(globalCtx, &this->actor); + this->unk152 = -2; + } + } else { + Matrix_Scale(16.0f, 16.0f, 16.0f, 1); + GetItem_Draw(globalCtx, 8); + } + break; + } + case ITEM00_BOMBS_A: + case ITEM00_ARROWS_10: + case ITEM00_ARROWS_30: + case ITEM00_ARROWS_40: + case ITEM00_ARROWS_50: + case ITEM00_BOMBS_B: + case ITEM00_NUTS_1: + case ITEM00_STICK: + case ITEM00_MAGIC_LARGE: + case ITEM00_MAGIC_SMALL: + case ITEM00_SMALL_KEY: + case ITEM00_NUTS_10: + case ITEM00_BOMBS_0: + EnItem00_DrawSprite(this, globalCtx); + break; + case ITEM00_SHIELD_HERO: + GetItem_Draw(globalCtx, GID_SHIELD_HERO); + break; + case ITEM00_MAP: + GetItem_Draw(globalCtx, GID_DUNGEON_MAP); + break; + case ITEM00_COMPASS: + GetItem_Draw(globalCtx, GID_COMPASS); + case ITEM00_MASK: + case ITEM00_FLEXIBLE: + case ITEM00_3_HEARTS: + case ITEM00_NOTHING: + case ITEM00_BIG_FAIRY: break; - } - case ITEM00_BOMBS_A: - case ITEM00_ARROWS_10: - case ITEM00_ARROWS_30: - case ITEM00_ARROWS_40: - case ITEM00_ARROWS_50: - case ITEM00_BOMBS_B: - case ITEM00_NUTS_1: - case ITEM00_STICK: - case ITEM00_MAGIC_LARGE: - case ITEM00_MAGIC_SMALL: - case ITEM00_SMALL_KEY: - case ITEM00_NUTS_10: - case ITEM00_BOMBS_0: - EnItem00_DrawSprite(this, globalCtx); - break; - case ITEM00_SHIELD_HERO: - GetItem_Draw(globalCtx, GID_SHIELD_HERO); - break; - case ITEM00_MAP: - GetItem_Draw(globalCtx, GID_DUNGEON_MAP); - break; - case ITEM00_COMPASS: - GetItem_Draw(globalCtx, GID_COMPASS); - case ITEM00_MASK: - case ITEM00_FLEXIBLE: - case ITEM00_3_HEARTS: - case ITEM00_NOTHING: - case ITEM00_BIG_FAIRY: - break; } } } @@ -728,7 +741,7 @@ UNK_PTR D_801ADF44[12] = { &D_040617C0, // Magic (Large) &D_0405FFC0, // Magic (Small) NULL, - &D_0405F7C0 // Small Key + &D_0405F7C0 // Small Key }; void EnItem00_DrawSprite(EnItem00* this, GlobalContext* globalCtx) { @@ -800,8 +813,11 @@ void EnItem00_DrawHeartPiece(EnItem00* this, GlobalContext* globalCtx) { s16 func_800A7650(s16 dropId) { s16 maxLife; - if ((((dropId == ITEM00_BOMBS_A) || (dropId == ITEM00_BOMBS_0) || (dropId == ITEM00_BOMBS_B)) && (gSaveContext.perm.inv.items[D_801C207E] == 0xFF)) || - (((dropId == ITEM00_ARROWS_10) || (dropId == ITEM00_ARROWS_30) || (dropId == ITEM00_ARROWS_40) || (dropId == ITEM00_ARROWS_50)) && (gSaveContext.perm.inv.items[D_801C2079] == 0xFF)) || + if ((((dropId == ITEM00_BOMBS_A) || (dropId == ITEM00_BOMBS_0) || (dropId == ITEM00_BOMBS_B)) && + (gSaveContext.perm.inv.items[D_801C207E] == 0xFF)) || + (((dropId == ITEM00_ARROWS_10) || (dropId == ITEM00_ARROWS_30) || (dropId == ITEM00_ARROWS_40) || + (dropId == ITEM00_ARROWS_50)) && + (gSaveContext.perm.inv.items[D_801C2079] == 0xFF)) || (((dropId == ITEM00_MAGIC_LARGE) || (dropId == ITEM00_MAGIC_SMALL)) && (gSaveContext.perm.unk24.unk14 == 0))) { return ITEM00_NO_DROP; } @@ -846,16 +862,20 @@ EnItem00* Item_DropCollectible(GlobalContext* globalCtx, Vec3f* spawnPos, u32 pa } else if (paramFF == ITEM00_MUSHROOM_CLOUD) { param7F00 >>= 8; if (!Actor_GetCollectibleFlag(globalCtx, param7F00)) { - Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_OBJ_KINOKO, spawnPos->x, spawnPos->y, spawnPos->z, 0, 0, 0, param7F00); + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_OBJ_KINOKO, spawnPos->x, spawnPos->y, spawnPos->z, 0, 0, + 0, param7F00); } } else if (((paramFF == ITEM00_FLEXIBLE) || ((params & 0xFF) == ITEM00_BIG_FAIRY)) && (param10000 == 0)) { if ((params & 0xFF) == ITEM00_FLEXIBLE) { - spawnedActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, spawnPos->x, spawnPos->y + 40.0f, spawnPos->z, 0, 0, 0, ((((param7F00 >> 8) & 0x7F) << 9) & 0xFE00) | 0x102); + spawnedActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, spawnPos->x, spawnPos->y + 40.0f, + spawnPos->z, 0, 0, 0, ((((param7F00 >> 8) & 0x7F) << 9) & 0xFE00) | 0x102); if (!Actor_GetCollectibleFlag(globalCtx, (param7F00 >> 8) & 0x7F)) { func_800F0568(globalCtx, spawnPos, 0x28, 0x28E7); } } else { - spawnedActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELFORG, spawnPos->x, spawnPos->y + 40.0f, spawnPos->z, 0, 0, 0, ((((param7F00 >> 8) & 0x7F) & 0x7F) << 9) | 7); + spawnedActor = + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELFORG, spawnPos->x, spawnPos->y + 40.0f, + spawnPos->z, 0, 0, 0, ((((param7F00 >> 8) & 0x7F) & 0x7F) << 9) | 7); if (param20000 == 0) { if (!Actor_GetCollectibleFlag(globalCtx, (param7F00 >> 8) & 0x7F)) { func_800F0568(globalCtx, spawnPos, 0x28, 0x28E7); @@ -867,7 +887,8 @@ EnItem00* Item_DropCollectible(GlobalContext* globalCtx, Vec3f* spawnPos, u32 pa params = func_800A7650(params & 0xFF); } if (params != ITEM00_NO_DROP) { - spawnedActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ITEM00, spawnPos->x, spawnPos->y, spawnPos->z, 0, 0, 0, params | param8000 | param7F00); + spawnedActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ITEM00, spawnPos->x, spawnPos->y, + spawnPos->z, 0, 0, 0, params | param8000 | param7F00); if ((spawnedActor != NULL) && (param8000 == 0)) { if (param10000 == 0) { spawnedActor->actor.velocity.y = 8.0f; @@ -880,7 +901,9 @@ EnItem00* Item_DropCollectible(GlobalContext* globalCtx, Vec3f* spawnPos, u32 pa Actor_SetScale(spawnedActor, 0.0f); spawnedActor->actionFunc = func_800A6780; spawnedActor->unk152 = 0xDC; - if ((spawnedActor->actor.params != ITEM00_SMALL_KEY) && (spawnedActor->actor.params != ITEM00_HEART_PIECE) && (spawnedActor->actor.params != ITEM00_HEART_CONTAINER)) { + if ((spawnedActor->actor.params != ITEM00_SMALL_KEY) && + (spawnedActor->actor.params != ITEM00_HEART_PIECE) && + (spawnedActor->actor.params != ITEM00_HEART_CONTAINER)) { spawnedActor->actor.room = -1; } spawnedActor->actor.flags |= 0x0010; @@ -914,9 +937,12 @@ Actor* Item_DropCollectible2(GlobalContext* globalCtx, Vec3f* spawnPos, u32 para if (((params == ITEM00_FLEXIBLE) || (params == ITEM00_BIG_FAIRY)) && (param10000 == 0)) { if (params == ITEM00_FLEXIBLE) { - spawnedActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, spawnPos->x, spawnPos->y + 40.0f, spawnPos->z, 0, 0, 0, ((((param7F00 >> 8) & 0x7F) << 9) & 0xFE00) | 0x102); + spawnedActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, spawnPos->x, spawnPos->y + 40.0f, + spawnPos->z, 0, 0, 0, ((((param7F00 >> 8) & 0x7F) << 9) & 0xFE00) | 0x102); } else { - spawnedActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELFORG, spawnPos->x, spawnPos->y + 40.0f, spawnPos->z, 0, 0, 0, ((((param7F00 >> 8) & 0x7F) & 0x7F) << 9) | 7); + spawnedActor = + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELFORG, spawnPos->x, spawnPos->y + 40.0f, + spawnPos->z, 0, 0, 0, ((((param7F00 >> 8) & 0x7F) & 0x7F) << 9) | 7); } if (Actor_GetCollectibleFlag(globalCtx, (param7F00 >> 8) & 0x7F) == 0) { func_800F0568(globalCtx, spawnPos, 0x28, 0x28E7); @@ -924,7 +950,8 @@ Actor* Item_DropCollectible2(GlobalContext* globalCtx, Vec3f* spawnPos, u32 para } else { params = func_800A7650(params); if (params != ITEM00_NO_DROP) { - spawnedActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ITEM00, spawnPos->x, spawnPos->y, spawnPos->z, 0, 0, 0, params | param8000 | param7F00); + spawnedActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ITEM00, spawnPos->x, spawnPos->y, + spawnPos->z, 0, 0, 0, params | param8000 | param7F00); if (spawnedActor != NULL) { if (param8000 == 0) { spawnedActor->velocity.y = 0.0f; @@ -948,43 +975,79 @@ Actor* Item_DropCollectible2(GlobalContext* globalCtx, Vec3f* spawnPos, u32 para #endif u8 sDropTable[DROP_TABLE_SIZE * DROP_TABLE_NUMBER] = { - ITEM00_RUPEE_GREEN, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_MASK, ITEM00_MASK, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_BOMBS_A, ITEM00_MAGIC_SMALL, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_HEART, ITEM00_FLEXIBLE, - ITEM00_RUPEE_GREEN, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_MASK, ITEM00_MASK, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_MAGIC_SMALL, ITEM00_NO_DROP, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_FLEXIBLE, - ITEM00_RUPEE_GREEN, ITEM00_RUPEE_GREEN, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_MASK, ITEM00_MASK, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_BOMBS_A, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_LARGE, ITEM00_HEART, ITEM00_HEART, ITEM00_FLEXIBLE, - ITEM00_RUPEE_GREEN, ITEM00_NO_DROP, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, ITEM00_NO_DROP, ITEM00_MASK, ITEM00_MASK, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_BOMBS_A, ITEM00_MAGIC_SMALL, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_HEART, ITEM00_HEART, ITEM00_FLEXIBLE, - ITEM00_MASK, ITEM00_MASK, ITEM00_MASK, ITEM00_MASK, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, - ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, - ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_FLEXIBLE, - ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, - ITEM00_RUPEE_GREEN, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, - ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, ITEM00_RUPEE_RED, ITEM00_RUPEE_RED, ITEM00_RUPEE_RED, ITEM00_RUPEE_RED, ITEM00_RUPEE_RED, ITEM00_RUPEE_RED, - ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_30, ITEM00_ARROWS_30, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_LARGE, - ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_BOMBS_A, ITEM00_BOMBS_A, ITEM00_BOMBS_A, ITEM00_BOMBS_A, ITEM00_BOMBS_A, ITEM00_BOMBS_A, ITEM00_BOMBS_A, ITEM00_BOMBS_A, ITEM00_BOMBS_A, - ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_LARGE, - ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_LARGE, - ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NUTS_1, ITEM00_NUTS_1, ITEM00_NO_DROP, ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_STICK, ITEM00_STICK, ITEM00_NO_DROP, ITEM00_HEART, ITEM00_HEART, ITEM00_FLEXIBLE, - ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, ITEM00_NO_DROP, ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_30, ITEM00_BOMBS_A, ITEM00_NO_DROP, ITEM00_STICK, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, ITEM00_HEART, ITEM00_HEART, ITEM00_FLEXIBLE, - ITEM00_RUPEE_GREEN, ITEM00_HEART, ITEM00_HEART, ITEM00_MAGIC_SMALL, ITEM00_MASK, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, + ITEM00_RUPEE_GREEN, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_NO_DROP, ITEM00_NO_DROP, + ITEM00_MASK, ITEM00_MASK, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_BOMBS_A, + ITEM00_MAGIC_SMALL, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_HEART, + ITEM00_FLEXIBLE, ITEM00_RUPEE_GREEN, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, + ITEM00_NO_DROP, ITEM00_MASK, ITEM00_MASK, ITEM00_NO_DROP, ITEM00_NO_DROP, + ITEM00_NO_DROP, ITEM00_MAGIC_SMALL, ITEM00_NO_DROP, ITEM00_HEART, ITEM00_HEART, + ITEM00_HEART, ITEM00_FLEXIBLE, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_GREEN, ITEM00_NO_DROP, + ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_MASK, ITEM00_MASK, ITEM00_NO_DROP, + ITEM00_NO_DROP, ITEM00_BOMBS_A, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_LARGE, + ITEM00_HEART, ITEM00_HEART, ITEM00_FLEXIBLE, ITEM00_RUPEE_GREEN, ITEM00_NO_DROP, + ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, ITEM00_NO_DROP, ITEM00_MASK, ITEM00_MASK, + ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_BOMBS_A, ITEM00_MAGIC_SMALL, ITEM00_NO_DROP, + ITEM00_NO_DROP, ITEM00_HEART, ITEM00_HEART, ITEM00_FLEXIBLE, ITEM00_MASK, + ITEM00_MASK, ITEM00_MASK, ITEM00_MASK, ITEM00_NO_DROP, ITEM00_NO_DROP, + ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, + ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, + ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, + ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, + ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, + ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, + ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, + ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, + ITEM00_HEART, ITEM00_FLEXIBLE, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, + ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, + ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, + ITEM00_HEART, ITEM00_HEART, ITEM00_HEART, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_GREEN, + ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_NO_DROP, ITEM00_NO_DROP, + ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, + ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_RUPEE_BLUE, + ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, + ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, ITEM00_RUPEE_RED, + ITEM00_RUPEE_RED, ITEM00_RUPEE_RED, ITEM00_RUPEE_RED, ITEM00_RUPEE_RED, ITEM00_RUPEE_RED, + ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_10, + ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_10, + ITEM00_ARROWS_30, ITEM00_ARROWS_30, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, + ITEM00_MAGIC_LARGE, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, + ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_BOMBS_A, ITEM00_BOMBS_A, + ITEM00_BOMBS_A, ITEM00_BOMBS_A, ITEM00_BOMBS_A, ITEM00_BOMBS_A, ITEM00_BOMBS_A, + ITEM00_BOMBS_A, ITEM00_BOMBS_A, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, + ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, + ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, + ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_LARGE, + ITEM00_MAGIC_LARGE, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_LARGE, ITEM00_MAGIC_LARGE, ITEM00_NO_DROP, + ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NUTS_1, ITEM00_NUTS_1, + ITEM00_NO_DROP, ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_STICK, + ITEM00_STICK, ITEM00_NO_DROP, ITEM00_HEART, ITEM00_HEART, ITEM00_FLEXIBLE, + ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, ITEM00_NO_DROP, + ITEM00_ARROWS_10, ITEM00_ARROWS_10, ITEM00_ARROWS_30, ITEM00_BOMBS_A, ITEM00_NO_DROP, + ITEM00_STICK, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, ITEM00_HEART, ITEM00_HEART, + ITEM00_FLEXIBLE, ITEM00_RUPEE_GREEN, ITEM00_HEART, ITEM00_HEART, ITEM00_MAGIC_SMALL, + ITEM00_MASK, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, + ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_NO_DROP, + ITEM00_NO_DROP, ITEM00_NO_DROP, }; u8 sDropTableAmounts[DROP_TABLE_SIZE * DROP_TABLE_NUMBER] = { - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x01, - 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x01, 0x03, 0x03, + 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, }; #ifdef NON_MATCHING @@ -1029,7 +1092,7 @@ void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3 } else if ((fromActor->dropFlag & 2) != 0) { dropId = ITEM00_HEART; params = 0x10; - } else if ((fromActor->dropFlag & 0x20) != 0) { + } else if ((fromActor->dropFlag & 0x20) != 0) { dropId = ITEM00_RUPEE_PURPLE; } dropQuantity = 1; @@ -1038,7 +1101,8 @@ void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3 if (dropId == ITEM00_FLEXIBLE) { if (gSaveContext.perm.unk24.currentLife < 0x11) { - Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, spawnPos->x, spawnPos->y + 40.0f, spawnPos->z, 0, 0, 0, 2); + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, spawnPos->x, spawnPos->y + 40.0f, + spawnPos->z, 0, 0, 0, 2); func_800F0568(globalCtx, spawnPos, 0x28, 0x28E7); return; } @@ -1051,11 +1115,12 @@ void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3 params = 0x10; dropId = ITEM00_HEART; dropQuantity = 1; - } else if ((gSaveContext.perm.unk24.unk14 != 0) && (gSaveContext.perm.unk24.currentMagic == 0)) { + } else if ((gSaveContext.perm.unk24.unk14 != 0) && (gSaveContext.perm.unk24.currentMagic == 0)) { params = 0xD0; dropId = ITEM00_MAGIC_LARGE; dropQuantity = 1; - } else if ((gSaveContext.perm.unk24.unk14 != 0) && ((gSaveContext.perm.unk24.unk14 >> 1) >= gSaveContext.perm.unk24.currentMagic)) { + } else if ((gSaveContext.perm.unk24.unk14 != 0) && + ((gSaveContext.perm.unk24.unk14 >> 1) >= gSaveContext.perm.unk24.currentMagic)) { params = 0xD0; dropId = ITEM00_MAGIC_LARGE; dropQuantity = 1; @@ -1067,7 +1132,7 @@ void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3 params = 0xB0; dropId = ITEM00_BOMBS_A; dropQuantity = 1; - } else if (gSaveContext.perm.unk24.unk16 < 11) { + } else if (gSaveContext.perm.unk24.unk14 < 11) { params = 0xA0; dropId = ITEM00_RUPEE_RED; dropQuantity = 1; @@ -1079,7 +1144,8 @@ void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3 if (param8000 == 0) { dropId = func_800A7650(dropId); if (dropId != ITEM00_NO_DROP) { - spawnedActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ITEM00, spawnPos->x, spawnPos->y, spawnPos->z, 0, 0, 0, dropId); + spawnedActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ITEM00, spawnPos->x, + spawnPos->y, spawnPos->z, 0, 0, 0, dropId); if ((spawnedActor != 0) && (dropId != ITEM00_NO_DROP)) { spawnedActor->actor.velocity.y = 8.0f; spawnedActor->actor.speedXZ = 2.0f; @@ -1088,7 +1154,9 @@ void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3 Actor_SetScale(spawnedActor, 0.0f); spawnedActor->actionFunc = func_800A6780; spawnedActor->actor.flags = spawnedActor->actor.flags | 0x10; - if ((spawnedActor->actor.params != ITEM00_SMALL_KEY) && (spawnedActor->actor.params != ITEM00_HEART_PIECE) && (spawnedActor->actor.params != ITEM00_HEART_CONTAINER)) { + if ((spawnedActor->actor.params != ITEM00_SMALL_KEY) && + (spawnedActor->actor.params != ITEM00_HEART_PIECE) && + (spawnedActor->actor.params != ITEM00_HEART_CONTAINER)) { spawnedActor->actor.room = -1; } spawnedActor->unk152 = 220; @@ -1107,40 +1175,14 @@ void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3 #pragma GLOBAL_ASM("./asm/non_matchings/code/z_en_item00/Item_DropCollectibleRandom.asm") #endif -s32 D_801AE194[32] = { - ITEM00_NO_DROP, - ITEM00_RUPEE_GREEN, - ITEM00_RUPEE_BLUE, - ITEM00_NO_DROP, - ITEM00_RUPEE_RED, - ITEM00_RUPEE_PURPLE, - ITEM00_NO_DROP, - ITEM00_RUPEE_ORANGE, - ITEM00_COMPASS, - ITEM00_MUSHROOM_CLOUD, - ITEM00_HEART, - ITEM00_3_HEARTS, - ITEM00_HEART_PIECE, - ITEM00_HEART_CONTAINER, - ITEM00_MAGIC_SMALL, - ITEM00_MAGIC_LARGE, - ITEM00_FLEXIBLE, - ITEM00_BIG_FAIRY, - ITEM00_NO_DROP, - ITEM00_NUTS_10, - ITEM00_NO_DROP, - ITEM00_BOMBS_A, - ITEM00_NO_DROP, - ITEM00_NO_DROP, - ITEM00_NO_DROP, - ITEM00_STICK, - ITEM00_NO_DROP, - ITEM00_NO_DROP, - ITEM00_NO_DROP, - ITEM00_NO_DROP, - ITEM00_ARROWS_10, - ITEM00_ARROWS_30 -}; +s32 D_801AE194[32] = { ITEM00_NO_DROP, ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_NO_DROP, + ITEM00_RUPEE_RED, ITEM00_RUPEE_PURPLE, ITEM00_NO_DROP, ITEM00_RUPEE_ORANGE, + ITEM00_COMPASS, ITEM00_MUSHROOM_CLOUD, ITEM00_HEART, ITEM00_3_HEARTS, + ITEM00_HEART_PIECE, ITEM00_HEART_CONTAINER, ITEM00_MAGIC_SMALL, ITEM00_MAGIC_LARGE, + ITEM00_FLEXIBLE, ITEM00_BIG_FAIRY, ITEM00_NO_DROP, ITEM00_NUTS_10, + ITEM00_NO_DROP, ITEM00_BOMBS_A, ITEM00_NO_DROP, ITEM00_NO_DROP, + ITEM00_NO_DROP, ITEM00_STICK, ITEM00_NO_DROP, ITEM00_NO_DROP, + ITEM00_NO_DROP, ITEM00_NO_DROP, ITEM00_ARROWS_10, ITEM00_ARROWS_30 }; s32 func_800A8150(s32 index) { if ((index < 0) || (index >= ARRAY_COUNT(D_801AE194))) { diff --git a/src/code/z_kanfont.c b/src/code/z_kanfont.c index f09b71d2ce..edeb27a851 100644 --- a/src/code/z_kanfont.c +++ b/src/code/z_kanfont.c @@ -1,13 +1,13 @@ #include #include -void Kanfont_Nop800F4F40(GlobalContext* ctxt, UNK_TYPE param_2, UNK_TYPE param_3) {} +void Kanfont_Nop800F4F40(GlobalContext* ctxt, UNK_TYPE param_2, UNK_TYPE param_3) { +} void Kanfont_LoadAsciiChar(GlobalContext* ctxt, u8 character, s32 iParm3) { // UB to convert pointer to u32 DmaMgr_SendRequest0((void*)((u32)&ctxt->msgCtx.font.unk0[(ctxt->msgCtx).unk11EF0] + iParm3), - (u32)_nes_font_staticSegmentRomStart + character * 0x80 - 0x1000, - 0x80); + (u32)_nes_font_staticSegmentRomStart + character * 0x80 - 0x1000, 0x80); } void Kanfont_LoadMessageBoxEnd(Font* font, u16 type) { @@ -28,7 +28,9 @@ void Kanfont_LoadOrderedFont(Font* font) { } // UB to convert pointer to u32 DmaMgr_SendRequest0(writeLocation, (u32)_nes_font_staticSegmentRomStart + loadOffset, 0x80); - if (kanfontOrdering[codePointIndex] == 140) break; + if (kanfontOrdering[codePointIndex] == 140) { + break; + } codePointIndex++; } } diff --git a/src/code/z_lib.c b/src/code/z_lib.c index 1d67449e65..ba532b08ee 100644 --- a/src/code/z_lib.c +++ b/src/code/z_lib.c @@ -568,15 +568,15 @@ void Math_ApproachF(f32* pValue, f32 target, f32 scale, f32 maxStep) { } void Math_ApproachZeroF(f32* pValue, f32 scale, f32 maxStep) { - f32 f0 = *pValue * scale; + f32 f0 = *pValue * scale; - if (maxStep < f0) { - f0 = maxStep; - } else if (f0 < -maxStep) { - f0 = -maxStep; - } + if (maxStep < f0) { + f0 = maxStep; + } else if (f0 < -maxStep) { + f0 = -maxStep; + } - *pValue = *pValue - f0; + *pValue = *pValue - f0; } s32 Math_SmoothStepToS(s16* pValue, s16 target, s16 scale, s16 step, s16 minStep) { @@ -695,7 +695,8 @@ f32 Math_Vec3f_StepTo(Vec3f* start, Vec3f* target, f32 speed) { return f0; } -void Lib_Nop801004FC(void) {} +void Lib_Nop801004FC(void) { +} void* Lib_SegmentedToVirtual(void* ptr) { return SEGMENTED_TO_VIRTUAL(ptr); diff --git a/src/code/z_lights.c b/src/code/z_lights.c index 37ade80e37..da3b79ae23 100644 --- a/src/code/z_lights.c +++ b/src/code/z_lights.c @@ -132,10 +132,8 @@ void Lights_BindPoint(Lights* lights, LightParams* params, GlobalContext* global posF.x = params->point.x; posF.y = params->point.y; posF.z = params->point.z; - SkinMatrix_Vec3fMtxFMultXYZ(&globalCtx->unk187B0,&posF,&adjustedPos); - if ((adjustedPos.z > -radiusF) && - (600 + radiusF > adjustedPos.z) && - (400 > fabsf(adjustedPos.x) - radiusF) && + SkinMatrix_Vec3fMtxFMultXYZ(&globalCtx->unk187B0, &posF, &adjustedPos); + if ((adjustedPos.z > -radiusF) && (600 + radiusF > adjustedPos.z) && (400 > fabsf(adjustedPos.x) - radiusF) && (400 > fabsf(adjustedPos.y) - radiusF)) { light = Lights_FindSlot(lights); if (light != NULL) { @@ -190,7 +188,8 @@ void Lights_BindDirectional(Lights* lights, LightParams* params, void* unused) { */ void Lights_BindAll(Lights* lights, LightNode* listHead, Vec3f* refPos, GlobalContext* globalCtx) { static LightsPosBindFunc posBindFuncs[] = { Lights_BindPoint, Lights_BindDirectional, Lights_BindPoint }; - static LightsBindFunc dirBindFuncs[] = { Lights_BindPointWithReference, Lights_BindDirectional, Lights_BindPointWithReference }; + static LightsBindFunc dirBindFuncs[] = { Lights_BindPointWithReference, Lights_BindDirectional, + Lights_BindPointWithReference }; if (listHead != NULL) { if ((refPos == NULL) && (lights->enablePosLights == 1)) { @@ -233,7 +232,9 @@ void Lights_FreeNode(LightNode* light) { if (light != NULL) { sLightsBuffer.numOccupied--; light->info = NULL; - sLightsBuffer.searchIndex = (light - sLightsBuffer.lights) / (s32)sizeof(LightNode); //! @bug Due to pointer arithmetic, the division is unnecessary + sLightsBuffer.searchIndex = + (light - sLightsBuffer.lights) / + (s32)sizeof(LightNode); //! @bug Due to pointer arithmetic, the division is unnecessary } } @@ -262,7 +263,7 @@ void func_80102544(LightContext* lightCtx, u8 a1, u8 a2, u8 a3, s16 numLights, s * Allocate a new Lights group and initilize the ambient color with that provided by LightContext */ Lights* LightContext_NewLights(LightContext* lightCtx, GraphicsContext* gfxCtx) { - return Lights_New(gfxCtx, lightCtx->ambient.r, lightCtx->ambient.g, lightCtx->ambient.b); + return Lights_New(gfxCtx, lightCtx->ambient.r, lightCtx->ambient.g, lightCtx->ambient.b); } void LightContext_InitList(GlobalContext* globalCtx, LightContext* lightCtx) { @@ -317,12 +318,13 @@ void LightContext_RemoveLight(GlobalContext* globalCtx, LightContext* lightCtx, } } -Lights* Lights_NewAndDraw(GraphicsContext* gfxCtx, u8 ambientR, u8 ambientG, u8 ambientB, u8 numLights, u8 r, u8 g, u8 b, s8 x, s8 y, s8 z) { +Lights* Lights_NewAndDraw(GraphicsContext* gfxCtx, u8 ambientR, u8 ambientG, u8 ambientB, u8 numLights, u8 r, u8 g, + u8 b, s8 x, s8 y, s8 z) { Lights* lights; s32 i; // TODO allocation should be a macro - lights = (Lights *)((int)gfxCtx->polyOpa.d - sizeof(Lights)); + lights = (Lights*)((int)gfxCtx->polyOpa.d - sizeof(Lights)); gfxCtx->polyOpa.d = (void*)lights; lights->l.a.l.col[0] = lights->l.a.l.colc[0] = ambientR; @@ -340,7 +342,7 @@ Lights* Lights_NewAndDraw(GraphicsContext* gfxCtx, u8 ambientR, u8 ambientG, u8 lights->l.l[i].l.dir[2] = z; } - Lights_Draw(lights,gfxCtx); + Lights_Draw(lights, gfxCtx); return lights; } @@ -349,7 +351,7 @@ Lights* Lights_New(GraphicsContext* gfxCtx, u8 ambientR, u8 ambientG, u8 ambient Lights* lights; // TODO allocation should be a macro - lights = (Lights *)((int)gfxCtx->polyOpa.d - sizeof(Lights)); + lights = (Lights*)((int)gfxCtx->polyOpa.d - sizeof(Lights)); gfxCtx->polyOpa.d = (void*)lights; lights->l.a.l.col[0] = ambientR; @@ -409,10 +411,11 @@ void Lights_DrawGlow(GlobalContext* globalCtx) { dl = func_8012C7FC(POLY_XLU_DISP); - gSPSetOtherMode(dl++, G_SETOTHERMODE_H, 4, 4, 0x00000080); //! This doesn't resolve to any of the macros in gdi.h + gSPSetOtherMode(dl++, G_SETOTHERMODE_H, 4, 4, + 0x00000080); //! This doesn't resolve to any of the macros in gdi.h - gDPSetCombineLERP(dl++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, - 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineLERP(dl++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, + 0); gSPDisplayList(dl++, D_04029CB0); @@ -425,9 +428,10 @@ void Lights_DrawGlow(GlobalContext* globalCtx) { gDPSetPrimColor(dl++, 0, 0, params->color[0], params->color[1], params->color[2], 50); SysMatrix_InsertTranslation(params->x, params->y, params->z, 0); - Matrix_Scale(scale,scale,scale, MTXMODE_APPLY); + Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); - gSPMatrix(dl++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(dl++, Matrix_NewMtx(globalCtx->state.gfxCtx), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(dl++, D_04029CF0); } diff --git a/src/code/z_prenmi.c b/src/code/z_prenmi.c index 53120b88db..19ba313a55 100644 --- a/src/code/z_prenmi.c +++ b/src/code/z_prenmi.c @@ -40,7 +40,8 @@ void PreNMI_Main(PreNMIContext* prenmiCtx) { prenmiCtx->state.unkA3 = 1; } -void PreNMI_Destroy(PreNMIContext* prenmiCtx) {} +void PreNMI_Destroy(PreNMIContext* prenmiCtx) { +} void PreNMI_Init(PreNMIContext* prenmiCtx) { prenmiCtx->state.main = (GameStateFunc)PreNMI_Main; diff --git a/src/code/z_rcp.c b/src/code/z_rcp.c index 5026740ed0..33d3324ca2 100644 --- a/src/code/z_rcp.c +++ b/src/code/z_rcp.c @@ -1256,8 +1256,7 @@ void func_8012CF0C(GraphicsContext* gCtxt, s32 iParm2, s32 iParm3, u8 r, u8 g, u gDPPipeSync(gfx + 1); gDPSetCycleType(gfx + 2, G_CYC_FILL); gDPSetRenderMode(gfx + 3, G_RM_NOOP, G_RM_NOOP2); - gDPSetFillColor(gfx + 4, - (GPACK_RGBA5551(0xFF, 0xFF, 0xF0, 0) << 16) | GPACK_RGBA5551(0xFF, 0xFF, 0xF0, 0)); + gDPSetFillColor(gfx + 4, (GPACK_RGBA5551(0xFF, 0xFF, 0xF0, 0) << 16) | GPACK_RGBA5551(0xFF, 0xFF, 0xF0, 0)); gSPDisplayList(gfx + 5, &D_0E0002C8); gDPSetColorImage(gfx + 6, G_IM_FMT_RGBA, G_IM_SIZ_16b, D_801FBBCC, gCtxt->zbuffer); gSPEndDisplayList(gfx + 7); @@ -1309,8 +1308,7 @@ void func_8012CF0C(GraphicsContext* gCtxt, s32 iParm2, s32 iParm3, u8 r, u8 g, u void func_8012D374(GraphicsContext* gCtxt, u8 r, u8 g, u8 b) { if ((R_PAUSE_MENU_MODE < 2) && (D_801F6D10 < 2)) { func_8012CF0C(gCtxt, 1, 1, r, g, b); - } - else { + } else { func_8012CF0C(gCtxt, 0, 0, r, g, b); } } @@ -1326,4 +1324,3 @@ void func_8012D40C(f32* param_1, f32* param_2, s16* param_3) { param_2[1] = param_1[1] / (gScreenHeight / 2); param_2[3] = param_1[3] - param_1[1]; } - diff --git a/src/code/z_room.c b/src/code/z_room.c index 0e6b1afe31..6ad89a7414 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -1,9 +1,11 @@ #include #include -void Room_nop8012D510(GlobalContext* ctxt, Room* room, UNK_PTR param_3, UNK_TYPE1 param_4) {} +void Room_nop8012D510(GlobalContext* ctxt, Room* room, UNK_PTR param_3, UNK_TYPE1 param_4) { +} -void Room_DrawType3Mesh(GlobalContext* ctxt, Room* room, u32 flags) {} +void Room_DrawType3Mesh(GlobalContext* ctxt, Room* room, u32 flags) { +} void Room_DrawType0Mesh(GlobalContext* ctxt, Room* room, u32 flags) { RoomMeshType0* mesh; @@ -53,11 +55,11 @@ void Room_DrawType0Mesh(GlobalContext* ctxt, Room* room, u32 flags) { void Room_DrawType1Mesh(GlobalContext* ctxt, Room* room, u32 flags) { RoomMeshType1* mesh = &room->mesh->type1; if (mesh->format == 1) { - func_8012DEE8(ctxt,room,flags); + func_8012DEE8(ctxt, room, flags); } else if (mesh->format == 2) { - func_8012E32C(ctxt,room,flags); + func_8012E32C(ctxt, room, flags); } else { - assert_fail(D_801DDFAC,0x3c5); + assert_fail(D_801DDFAC, 0x3c5); } } @@ -86,11 +88,13 @@ s32 Room_StartRoomTransition(GlobalContext* ctxt, RoomContext* roomCtxt, s32 ind roomCtxt->unk31 = 1; size = ctxt->roomAddrs[index].vromEnd - ctxt->roomAddrs[index].vromStart; - roomCtxt->activeRoomVram = (void*)((s32)roomCtxt->roomMemPages[roomCtxt->activeMemPage] - (size + 8) * roomCtxt->activeMemPage + 8) & 0xfffffff0; + roomCtxt->activeRoomVram = + (void*)((s32)roomCtxt->roomMemPages[roomCtxt->activeMemPage] - (size + 8) * roomCtxt->activeMemPage + 8) & + 0xfffffff0; osCreateMesgQueue(&roomCtxt->loadQueue, roomCtxt->loadMsg, 1); DmaMgr_SendRequestImpl(&roomCtxt->dmaRequest, roomCtxt->activeRoomVram, ctxt->roomAddrs[index].vromStart, size, - 0, &roomCtxt->loadQueue, NULL); + 0, &roomCtxt->loadQueue, NULL); roomCtxt->activeMemPage ^= 1; return 1; @@ -103,10 +107,8 @@ s32 Room_StartRoomTransition(GlobalContext* ctxt, RoomContext* roomCtxt, s32 ind #endif s32 Room_HandleLoadCallbacks(GlobalContext* ctxt, RoomContext* roomCtxt) { - if (roomCtxt->unk31 == 1) - { - if (!osRecvMesg(&roomCtxt->loadQueue, NULL, OS_MESG_NOBLOCK)) - { + if (roomCtxt->unk31 == 1) { + if (!osRecvMesg(&roomCtxt->loadQueue, NULL, OS_MESG_NOBLOCK)) { roomCtxt->unk31 = 0; roomCtxt->currRoom.segment = roomCtxt->activeRoomVram; // TODO: Segment number enum @@ -116,7 +118,8 @@ s32 Room_HandleLoadCallbacks(GlobalContext* ctxt, RoomContext* roomCtxt) { func_80123140(ctxt, (ActorPlayer*)ctxt->actorCtx.actorList[2].first); Actor_SpawnTransitionActors(ctxt, &ctxt->actorCtx); - if (((ctxt->sceneNum != SCENE_IKANA) || (roomCtxt->currRoom.num != 1)) && (ctxt->sceneNum != SCENE_IKNINSIDE)) { + if (((ctxt->sceneNum != SCENE_IKANA) || (roomCtxt->currRoom.num != 1)) && + (ctxt->sceneNum != SCENE_IKNINSIDE)) { ctxt->kankyoContext.unkC3 = 0xff; ctxt->kankyoContext.unkE0 = 0; } @@ -141,7 +144,7 @@ void Room_Draw(GlobalContext* ctxt, Room* room, u32 flags) { return; } -void func_8012EBF8(GlobalContext* ctxt, RoomContext* roomCtxt){ +void func_8012EBF8(GlobalContext* ctxt, RoomContext* roomCtxt) { roomCtxt->prevRoom.num = -1; roomCtxt->prevRoom.segment = NULL; func_800BA798(ctxt, &ctxt->actorCtx); diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index 85e8f3f67b..16e1f3b11f 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -847,7 +847,7 @@ Gfx* SkelAnime_DrawSV2(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* limb return gfx; } -//Function is unused. +// Function is unused. #pragma GLOBAL_ASM("./asm/non_matchings/code/z_skelanime/func_80134FFC.asm") s16 func_801353D4(GenericAnimationHeader* animationSeg) { diff --git a/src/code/z_skin_matrix.c b/src/code/z_skin_matrix.c index 94648a878c..69e6a78928 100644 --- a/src/code/z_skin_matrix.c +++ b/src/code/z_skin_matrix.c @@ -254,7 +254,7 @@ s32 SkinMatrix_Invert(MtxF* src, MtxF* dest) { if (thisCol != thisRow) { // responsible for swapping columns if zero on diagonal for (i = 0; i < 4; i++) { SWAP(f32, mfCopy.mf[i][thisCol], mfCopy.mf[i][thisRow]); - SWAP(f32, dest->mf[i][thisCol], dest->mf[i][thisRow]); + SWAP(f32, dest->mf[i][thisCol], dest->mf[i][thisRow]); } } @@ -796,7 +796,6 @@ void SkinMatrix_SetZRotation(MtxF* mf, s16 a) { mf->wy = 0.0f; mf->wz = 0.0f; - mf->zz = 1.0f; mf->ww = 1.0f; diff --git a/src/code/z_snap.c b/src/code/z_snap.c index 4e12136c7d..aa2f7439f3 100644 --- a/src/code/z_snap.c +++ b/src/code/z_snap.c @@ -25,38 +25,40 @@ s32 func_8013A240(GlobalContext* ctxt) { seen = 0; switch (ctxt->sceneNum) { - case SCENE_20SICHITAI: - if ((actor->id == ACTOR_EN_MNK) || (actor->id == ACTOR_EN_BIGOKUTA)) { - seen = 1; - } - break; - default: - seen = 0; + case SCENE_20SICHITAI: + if ((actor->id == ACTOR_EN_MNK) || (actor->id == ACTOR_EN_BIGOKUTA)) { + seen = 1; + } + break; + default: + seen = 0; } - if (actor->id); // Needed to match + if (actor->id) { + ; // Needed to match + } switch (actor->id) { - case ACTOR_EN_KAKASI: - if ((actor->params & 1) == 1) { + case ACTOR_EN_KAKASI: + if ((actor->params & 1) == 1) { + seen |= 2; + break; //! @bug break is inside conditional, meaning it falls through if it is false + } + case ACTOR_EN_ZOV: seen |= 2; - break; //! @bug break is inside conditional, meaning it falls through if it is false - } - case ACTOR_EN_ZOV: - seen |= 2; - break; - case ACTOR_EN_BAL: - seen |= 2; - break; - case ACTOR_EN_DNQ: - seen |= 2; - break; - case ACTOR_EN_GE1: - case ACTOR_EN_GE3: - case ACTOR_EN_KAIZOKU: - case ACTOR_EN_GE2: - seen |= 2; - break; + break; + case ACTOR_EN_BAL: + seen |= 2; + break; + case ACTOR_EN_DNQ: + seen |= 2; + break; + case ACTOR_EN_GE1: + case ACTOR_EN_GE3: + case ACTOR_EN_KAIZOKU: + case ACTOR_EN_GE2: + seen |= 2; + break; } if (seen != 0) { @@ -105,7 +107,8 @@ s16 func_8013A504(s16 val) { return (val >= 0) ? val : -val; } -s32 func_8013A530(GlobalContext* globalCtx, Actor* actor, s32 flag, Vec3f* pos, Vec3s* rot, f32 distanceMin, f32 distanceMax, s16 angleError) { +s32 func_8013A530(GlobalContext* globalCtx, Actor* actor, s32 flag, Vec3f* pos, Vec3s* rot, f32 distanceMin, + f32 distanceMax, s16 angleError) { Vec3f screenSpace; s16 x; s16 y; @@ -157,4 +160,3 @@ s32 func_8013A530(GlobalContext* globalCtx, Actor* actor, s32 flag, Vec3f* pos, return ret; } - diff --git a/src/code/z_view.c b/src/code/z_view.c index e970f7aec7..2b8cdd4776 100644 --- a/src/code/z_view.c +++ b/src/code/z_view.c @@ -28,7 +28,9 @@ void View_Init(View* view, GraphicsContext* gfxCtx) { view->unk164 = 0; view->flags = 1 | 2 | 4; - if (1); + if (1) { + ; + } view->scale = 1.0f; view->upDir.y = 1.0f; @@ -339,7 +341,7 @@ s32 View_RenderToPerspectiveMatrix(View* view) { } guLookAt(viewing, view->eye.x, view->eye.y, view->eye.z, view->focalPoint.x, view->focalPoint.y, view->focalPoint.z, - view->upDir.x, view->upDir.y, view->upDir.z); + view->upDir.x, view->upDir.y, view->upDir.z); view->viewing = *viewing; @@ -382,8 +384,8 @@ s32 View_RenderToOrthographicMatrix(View* view) { } view->projectionPtr = projection; - guOrtho(projection, -0.5f ,0.5f, screenWidth * -0.5f, screenWidth * 0.5f, - screenHeight * -0.5f, screenHeight * 0.5f, view->zNear); + guOrtho(projection, -0.5f, 0.5f, gScreenWidth * -0.5f, gScreenWidth * 0.5f, gScreenHeight * -0.5f, + gScreenHeight * 0.5f, view->zNear); view->projection = *projection; @@ -401,9 +403,8 @@ s32 View_RenderToOrthographicMatrix(View* view) { #pragma GLOBAL_ASM("./asm/non_matchings/code/z_view/func_8013FD74.asm") s32 func_80140024(View* view) { - guLookAt(view->viewingPtr, view->eye.x, view->eye.y, view->eye.z, - view->focalPoint.x, view->focalPoint.y, view->focalPoint.z, - view->upDir.x, view->upDir.y, view->upDir.z); + guLookAt(view->viewingPtr, view->eye.x, view->eye.y, view->eye.z, view->focalPoint.x, view->focalPoint.y, + view->focalPoint.z, view->upDir.x, view->upDir.y, view->upDir.z); view->unkE0 = *view->viewingPtr; view->viewingPtr = &view->unkE0; @@ -412,4 +413,3 @@ s32 func_80140024(View* view) { } #pragma GLOBAL_ASM("./asm/non_matchings/code/z_view/func_801400CC.asm") - diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c index 363d5ea178..cfed6f7836 100644 --- a/src/code/z_vr_box.c +++ b/src/code/z_vr_box.c @@ -158,4 +158,4 @@ void func_801434E4(GameState* state, SkyboxContext* skyboxCtx, s16 skyType) { func_80143148(skyboxCtx, 5); } } -} \ No newline at end of file +} diff --git a/src/libultra/gu/ortho.c b/src/libultra/gu/ortho.c index 31ae521ebe..9a365d81e1 100644 --- a/src/libultra/gu/ortho.c +++ b/src/libultra/gu/ortho.c @@ -19,7 +19,7 @@ void guOrthoF(float m[4][4], float l, float r, float b, float t, float n, float } } -void guOrtho(Mtx *m, float l, float r, float b, float t, float n, float f, float scale) { +void guOrtho(Mtx* m, float l, float r, float b, float t, float n, float f, float scale) { float mf[4][4]; guOrthoF(mf, l, r, b, t, n, f, scale); guMtxF2L(mf, m); diff --git a/src/libultra/gu/perspective.c b/src/libultra/gu/perspective.c index 11cfbafd7b..980dbb8925 100644 --- a/src/libultra/gu/perspective.c +++ b/src/libultra/gu/perspective.c @@ -27,7 +27,7 @@ void guPerspectiveF(float mf[4][4], u16* perspNorm, float fovy, float aspect, fl if (near + far <= 2.0) { *perspNorm = 65535; } else { - *perspNorm = (double) (1 << 17) / (near + far); + *perspNorm = (double)(1 << 17) / (near + far); if (*perspNorm <= 0) { *perspNorm = 1; } diff --git a/src/libultra/gu/rotate.c b/src/libultra/gu/rotate.c index a0594e9526..ffa82c93e6 100644 --- a/src/libultra/gu/rotate.c +++ b/src/libultra/gu/rotate.c @@ -44,7 +44,7 @@ void guRotateF(float m[4][4], float a, float x, float y, float z) { m[0][1] = ab + zs; } -void guRotate(Mtx *m, float a, float x, float y, float z) { +void guRotate(Mtx* m, float a, float x, float y, float z) { float mf[4][4]; guRotateF(mf, a, x, y, z); guMtxF2L(mf, m); diff --git a/src/libultra/gu/sinf.c b/src/libultra/gu/sinf.c index 250664373b..7cd006e575 100644 --- a/src/libultra/gu/sinf.c +++ b/src/libultra/gu/sinf.c @@ -1,25 +1,22 @@ #include -static const du P[] = { - {0x3FF00000, 0x00000000}, - {0xBFC55554, 0xBC83656D}, - {0x3F8110ED, 0x3804C2A0}, - {0xBF29F6FF, 0xEEA56814}, - {0x3EC5DBDF, 0x0E314BFE}, +static const du P[] = { + { 0x3FF00000, 0x00000000 }, { 0xBFC55554, 0xBC83656D }, { 0x3F8110ED, 0x3804C2A0 }, + { 0xBF29F6FF, 0xEEA56814 }, { 0x3EC5DBDF, 0x0E314BFE }, }; -static const du rpi = {0x3FD45F30, 0x6DC9C883}; +static const du rpi = { 0x3FD45F30, 0x6DC9C883 }; -static const du pihi = {0x400921FB, 0x50000000}; +static const du pihi = { 0x400921FB, 0x50000000 }; -static const du pilo = {0x3E6110B4, 0x611A6263}; +static const du pilo = { 0x3E6110B4, 0x611A6263 }; -static const fu zero = {0x00000000}; +static const fu zero = { 0x00000000 }; extern float __libm_qnan_f; float __sinf(float x) { - double dx; // double x + double dx; // double x double xsq; // x squared double poly; double dn; diff --git a/src/libultra/gu/visetevent.c b/src/libultra/gu/visetevent.c index 954965836e..43c5da7d93 100644 --- a/src/libultra/gu/visetevent.c +++ b/src/libultra/gu/visetevent.c @@ -1,7 +1,7 @@ #include #include -void osViSetEvent(OSMesgQueue *mq, OSMesg m, u32 retraceCount) { +void osViSetEvent(OSMesgQueue* mq, OSMesg m, u32 retraceCount) { register u32 saveMask = __osDisableInt(); __osViNext->msgq = mq; diff --git a/src/libultra/io/contquery.c b/src/libultra/io/contquery.c index 7cf9461ac0..757f8de2cc 100644 --- a/src/libultra/io/contquery.c +++ b/src/libultra/io/contquery.c @@ -1,8 +1,7 @@ #include #include -s32 osContStartQuery(OSMesgQueue* mq) -{ +s32 osContStartQuery(OSMesgQueue* mq) { s32 ret; __osSiGetAccess(); @@ -22,8 +21,7 @@ s32 osContStartQuery(OSMesgQueue* mq) return ret; } -void osContGetQuery(OSContStatus* data) -{ +void osContGetQuery(OSContStatus* data) { u8 pattern; __osContGetInitData(&pattern, data); diff --git a/src/libultra/io/contreaddata.c b/src/libultra/io/contreaddata.c index d11927e545..31d2bc2943 100644 --- a/src/libultra/io/contreaddata.c +++ b/src/libultra/io/contreaddata.c @@ -58,7 +58,7 @@ void __osPackReadData() { readformat.stick_y = -1; for (i = 0; i < __osMaxControllers; i++) { *(__OSContReadFormat*)ptr = readformat; - ptr+=sizeof(__OSContReadFormat); + ptr += sizeof(__OSContReadFormat); } *ptr = 254; } diff --git a/src/libultra/io/pimgr.c b/src/libultra/io/pimgr.c index e350923ab1..514184db2f 100644 --- a/src/libultra/io/pimgr.c +++ b/src/libultra/io/pimgr.c @@ -12,7 +12,7 @@ void osCreatePiManager(OSPri pri, OSMesgQueue* cmdQ, OSMesg* cmdBuf, s32 cmdMsgC if (!__osPiAccessQueueEnabled) { __osPiCreateAccessQueue(); } - osSetEventMesg(8, &D_8009E3D0, (OSMesg) 0x22222222); + osSetEventMesg(8, &D_8009E3D0, (OSMesg)0x22222222); oldPri = -1; myPri = osGetThreadPri(NULL); if (myPri < pri) { @@ -27,7 +27,7 @@ void osCreatePiManager(OSPri pri, OSMesgQueue* cmdQ, OSMesg* cmdBuf, s32 cmdMsgC __osPiDevMgr.acsQueue = &__osPiAccessQueue; __osPiDevMgr.dma = (s32(*)(void))osPiRawStartDma; __osPiDevMgr.unk18 = (s32(*)(void))func_800900C0; - osCreateThread(&D_8009D220, 0, __osDevMgrMain, (void *) &__osPiDevMgr, &piManagerStack[4096], pri); + osCreateThread(&D_8009D220, 0, __osDevMgrMain, (void*)&__osPiDevMgr, &piManagerStack[4096], pri); osStartThread(&D_8009D220); __osRestoreInt(savedMask); if (oldPri != -1) { diff --git a/src/libultra/io/pirawdma.c b/src/libultra/io/pirawdma.c index 0cacac84b7..a0b5516a78 100644 --- a/src/libultra/io/pirawdma.c +++ b/src/libultra/io/pirawdma.c @@ -14,14 +14,14 @@ s32 osPiRawStartDma(s32 direction, u32 devAddr, void* dramAddr, u32 size) { *(u32*)0xA4600004 = ((osRomBase | devAddr) & 0x1fffffff); switch (direction) { - case 0: - *(u32*)0xA460000C = size - 1; - break; - case 1: - *(u32*)0xA4600008 = size - 1; - break; - default: - return -1; + case 0: + *(u32*)0xA460000C = size - 1; + break; + case 1: + *(u32*)0xA4600008 = size - 1; + break; + default: + return -1; } return 0; } diff --git a/src/libultra/io/sprawdma.c b/src/libultra/io/sprawdma.c index 2f66c0b8da..7d1f902cbf 100644 --- a/src/libultra/io/sprawdma.c +++ b/src/libultra/io/sprawdma.c @@ -2,7 +2,7 @@ #include #include -s32 __osSpRawStartDma(s32 direction, u32 devAddr , void* dramAddr, u32 size) { +s32 __osSpRawStartDma(s32 direction, u32 devAddr, void* dramAddr, u32 size) { if (__osSpDeviceBusy() != 0) { return -1; } diff --git a/src/libultra/io/sptask.c b/src/libultra/io/sptask.c index f28c44071a..3ca7c47255 100644 --- a/src/libultra/io/sptask.c +++ b/src/libultra/io/sptask.c @@ -1,8 +1,7 @@ #include #include -OSTask* _VirtualToPhysicalTask(OSTask* intp) -{ +OSTask* _VirtualToPhysicalTask(OSTask* intp) { OSTask* tp = &tmp_task; bcopy((void*)intp, (void*)tp, sizeof(OSTask)); if (tp->t.ucode) { @@ -30,8 +29,7 @@ OSTask* _VirtualToPhysicalTask(OSTask* intp) return &tmp_task; } -void osSpTaskLoad(OSTask* intp) -{ +void osSpTaskLoad(OSTask* intp) { OSTask* tp; tp = _VirtualToPhysicalTask(intp); @@ -51,15 +49,24 @@ void osSpTaskLoad(OSTask* intp) __osSpSetStatus(11008); - while (__osSpSetPc(0x04001000) == -1); - while (__osSpRawStartDma(1, 0x04000FC0, (void*)tp, sizeof(OSTask)) == -1); - while (__osSpDeviceBusy()); - while (__osSpRawStartDma(1, 0x04001000, (void*)tp->t.ucode_boot, tp->t.ucode_boot_size) == -1); + while (__osSpSetPc(0x04001000) == -1) { + ; + } + while (__osSpRawStartDma(1, 0x04000FC0, (void*)tp, sizeof(OSTask)) == -1) { + ; + } + while (__osSpDeviceBusy()) { + ; + } + while (__osSpRawStartDma(1, 0x04001000, (void*)tp->t.ucode_boot, tp->t.ucode_boot_size) == -1) { + ; + } } -void osSpTaskStartGo(OSTask* tp) -{ - while (__osSpDeviceBusy()); +void osSpTaskStartGo(OSTask* tp) { + while (__osSpDeviceBusy()) { + ; + } __osSpSetStatus(293); } diff --git a/src/libultra/io/vi.c b/src/libultra/io/vi.c index f7d6871f06..21d7aee06f 100644 --- a/src/libultra/io/vi.c +++ b/src/libultra/io/vi.c @@ -21,7 +21,9 @@ void __osViInit(void) { __osViNext->state = 0x20; __osViNext->control = __osViNext->modep->comRegs.ctrl; - while (*(vu32*)0xA4400010 > 10); + while (*(vu32*)0xA4400010 > 10) { + ; + } *(vu32*)0xA4400000 = 0; __osViSwapContext(); diff --git a/src/libultra/libc/ll.c b/src/libultra/libc/ll.c index 359633ee21..6dbc884c88 100644 --- a/src/libultra/libc/ll.c +++ b/src/libultra/libc/ll.c @@ -29,7 +29,8 @@ long long __ll_mul(long long left, long long right) { return left * right; } -void __ull_divremi(unsigned long long *quotient, unsigned long long *remainder, unsigned long long dividend, unsigned short divisor) { +void __ull_divremi(unsigned long long* quotient, unsigned long long* remainder, unsigned long long dividend, + unsigned short divisor) { *quotient = dividend / divisor; *remainder = dividend % divisor; } diff --git a/src/libultra/libc/string.c b/src/libultra/libc/string.c index 2e099ac8db..9b24d9d26a 100644 --- a/src/libultra/libc/string.c +++ b/src/libultra/libc/string.c @@ -1,39 +1,38 @@ #include -unsigned char* strchr(const unsigned char* s, int c) -{ +unsigned char* strchr(const unsigned char* s, int c) { const unsigned char ch = c; - - while ( *s != ch) { + + while (*s != ch) { if (*s == '\0') { return NULL; } s++; } - + return (unsigned char*)s; } -size_t strlen(const unsigned char* s) -{ +size_t strlen(const unsigned char* s) { const unsigned char* sc = s; - - while (*sc != '\0') sc++; - + + while (*sc != '\0') { + sc++; + } + return (size_t)(sc - s); } -void* memcpy(void* s1, const void* s2, size_t n) -{ +void* memcpy(void* s1, const void* s2, size_t n) { unsigned char* su1 = (unsigned char*)s1; const unsigned char* su2 = (const unsigned char*)s2; - + while (n > 0) { *su1 = *su2; su1++; su2++; n--; } - + return s1; } diff --git a/src/libultra/os/createmesgqueue.c b/src/libultra/os/createmesgqueue.c index 960a44ecaa..fd31b45064 100644 --- a/src/libultra/os/createmesgqueue.c +++ b/src/libultra/os/createmesgqueue.c @@ -2,8 +2,8 @@ #include void osCreateMesgQueue(OSMesgQueue* mq, OSMesg* msq, s32 count) { - mq->mtqueue = (OSThread *)&__osThreadTail; - mq->fullqueue = (OSThread *)&__osThreadTail; + mq->mtqueue = (OSThread*)&__osThreadTail; + mq->fullqueue = (OSThread*)&__osThreadTail; mq->validCount = 0; mq->first = 0; mq->msgCount = count; diff --git a/src/libultra/os/destroythread.c b/src/libultra/os/destroythread.c index 32de302063..a578370852 100644 --- a/src/libultra/os/destroythread.c +++ b/src/libultra/os/destroythread.c @@ -1,8 +1,7 @@ #include #include -void osDestroyThread(OSThread* t) -{ +void osDestroyThread(OSThread* t) { register u32 saveMask; register OSThread* pred; register OSThread* succ; diff --git a/src/libultra/os/getactivequeue.c b/src/libultra/os/getactivequeue.c index d5a08be5d0..0420f1d6b9 100644 --- a/src/libultra/os/getactivequeue.c +++ b/src/libultra/os/getactivequeue.c @@ -1,6 +1,6 @@ #include #include -OSThread* __osGetActiveQueue(void){ +OSThread* __osGetActiveQueue(void) { return __osActiveQueue; } diff --git a/src/libultra/os/getmemsize.c b/src/libultra/os/getmemsize.c index 7514927b56..62a65aadbb 100644 --- a/src/libultra/os/getmemsize.c +++ b/src/libultra/os/getmemsize.c @@ -14,17 +14,16 @@ u32 osGetMemSize(void) { sp4 = *(u32*)(0xA0000000 + sp8); sp0 = *(u32*)(0xA00FFFFC + sp8); *(u32*)(0xA0000000 + sp8) = *(u32*)(0xA0000000 + sp8) ^ 0xFFFFFFFF; - spC[0x000FFFFC/4] = spC[0x000FFFFC/4] ^ 0xFFFFFFFF; + spC[0x000FFFFC / 4] = spC[0x000FFFFC / 4] ^ 0xFFFFFFFF; - if ((spC[0] != (sp4 ^ 0xFFFFFFFF)) || - (spC[0x000FFFFC/4] != (sp0 ^ 0xFFFFFFFF))) { + if ((spC[0] != (sp4 ^ 0xFFFFFFFF)) || (spC[0x000FFFFC / 4] != (sp0 ^ 0xFFFFFFFF))) { return sp8; } *spC = sp4; - spC[0x000FFFFC/4] = sp0; + spC[0x000FFFFC / 4] = sp0; sp8 = sp8 + 0x100000; - } while(sp8 < 0x800000); + } while (sp8 < 0x800000); return sp8; } diff --git a/src/libultra/os/initialize.c b/src/libultra/os/initialize.c index 3747a07d5e..2847be6f74 100644 --- a/src/libultra/os/initialize.c +++ b/src/libultra/os/initialize.c @@ -32,8 +32,12 @@ void osInitialize(void) { __osSetFpcCsr(0x01000800); __osSetWatchLo(0x04900000); - while (__osSiRawReadIo(0x1FC007FC, &pifdata) != 0); - while (__osSiRawWriteIo(0x1FC007FC, pifdata | 8) != 0); + while (__osSiRawReadIo(0x1FC007FC, &pifdata) != 0) { + ; + } + while (__osSiRawWriteIo(0x1FC007FC, pifdata | 8) != 0) { + ; + } *(__osExceptionVector*)0x80000000 = *((__osExceptionVector*)__osExceptionPreamble); *(__osExceptionVector*)0x80000080 = *((__osExceptionVector*)__osExceptionPreamble); @@ -59,8 +63,10 @@ void osInitialize(void) { osViClock = 0x02E6D354; } - if((__osGetCause() & 0x1000) != 0) { - while(1); + if ((__osGetCause() & 0x1000) != 0) { + while (1) { + ; + } } *(u32*)0xA4500008 = 1; @@ -68,4 +74,5 @@ void osInitialize(void) { *(u32*)0xA4500014 = 15; } -void func_8008A9A8(void) {} +void func_8008A9A8(void) { +} diff --git a/src/libultra/os/recvmesg.c b/src/libultra/os/recvmesg.c index 3e5784cdb5..13eb84689f 100644 --- a/src/libultra/os/recvmesg.c +++ b/src/libultra/os/recvmesg.c @@ -6,10 +6,8 @@ s32 osRecvMesg(OSMesgQueue* mq, OSMesg* msg, s32 flags) { saveMask = __osDisableInt(); - while (mq->validCount == 0) - { - if (flags == 0) - { + while (mq->validCount == 0) { + if (flags == 0) { __osRestoreInt(saveMask); return -1; } diff --git a/src/libultra/os/settimer.c b/src/libultra/os/settimer.c index bf0a0f94c4..c65997733f 100644 --- a/src/libultra/os/settimer.c +++ b/src/libultra/os/settimer.c @@ -22,7 +22,9 @@ int osSetTimer(OSTimer* t, OSTime value, OSTime interval, OSMesgQueue* mq, OSMes saveMask = __osDisableInt(); if (__osTimerList->next != __osTimerList) { - if (0); + if (0) { + ; + } spC = __osTimerList->next; sp14 = osGetCount(); sp10 = sp14 - __osTimerCounter; diff --git a/src/libultra/os/startthread.c b/src/libultra/os/startthread.c index d2df7c8d88..014e990732 100644 --- a/src/libultra/os/startthread.c +++ b/src/libultra/os/startthread.c @@ -7,20 +7,20 @@ void osStartThread(OSThread* t) { saveMask = __osDisableInt(); switch (t->state) { - case 8: - t->state = 2; - __osEnqueueThread(&__osRunQueue, t); - break; - case 1: - if ((t->queue == NULL) || (t->queue == &__osRunQueue)) { + case 8: t->state = 2; __osEnqueueThread(&__osRunQueue, t); - } else { - t->state = 8; - __osEnqueueThread(t->queue, t); - __osEnqueueThread(&__osRunQueue, __osPopThread(t->queue)); - } - break; + break; + case 1: + if ((t->queue == NULL) || (t->queue == &__osRunQueue)) { + t->state = 2; + __osEnqueueThread(&__osRunQueue, t); + } else { + t->state = 8; + __osEnqueueThread(t->queue, t); + __osEnqueueThread(&__osRunQueue, __osPopThread(t->queue)); + } + break; } if (__osRunningThread == NULL) { diff --git a/src/libultra/os/stopthread.c b/src/libultra/os/stopthread.c index 47f2e79b0b..081ecd7b7e 100644 --- a/src/libultra/os/stopthread.c +++ b/src/libultra/os/stopthread.c @@ -13,17 +13,16 @@ void osStopThread(OSThread* t) { state = t->state; } - switch (state) - { - case 4: - __osRunningThread->state = 1; - __osEnqueueAndYield(NULL); - break; - case 2: - case 8: - t->state = 1; - __osDequeueThread(t->queue, t); - break; + switch (state) { + case 4: + __osRunningThread->state = 1; + __osEnqueueAndYield(NULL); + break; + case 2: + case 8: + t->state = 1; + __osDequeueThread(t->queue, t); + break; } __osRestoreInt(saveMask); diff --git a/src/libultra/os/stoptimer.c b/src/libultra/os/stoptimer.c index ee00585c68..ee0ad39603 100644 --- a/src/libultra/os/stoptimer.c +++ b/src/libultra/os/stoptimer.c @@ -1,8 +1,7 @@ #include #include -s32 osStopTimer(OSTimer* t) -{ +s32 osStopTimer(OSTimer* t) { register u32 savedMask; OSTimer* timep; diff --git a/src/libultra/os/thread.c b/src/libultra/os/thread.c index 0d191bf7ff..e6a83b5ca9 100644 --- a/src/libultra/os/thread.c +++ b/src/libultra/os/thread.c @@ -8,8 +8,7 @@ OSThread* __osActiveQueue = (OSThread*)&__osThreadTail; OSThread* __osRunningThread = NULL; OSThread* __osFaultedThread = NULL; -void __osDequeueThread(OSThread** queue, OSThread* t) -{ +void __osDequeueThread(OSThread** queue, OSThread* t) { register OSThread* pred; register OSThread* succ; diff --git a/src/libultra/rmon/xprintf.c b/src/libultra/rmon/xprintf.c index b061f761ec..4be2e5a171 100644 --- a/src/libultra/rmon/xprintf.c +++ b/src/libultra/rmon/xprintf.c @@ -1,29 +1,29 @@ #include #include -#define ATOI(i, a) \ - for (i = 0; *a >= '0' && *a <= '9'; a++) \ - if (i < 999) \ +#define ATOI(i, a) \ + for (i = 0; *a >= '0' && *a <= '9'; a++) \ + if (i < 999) \ i = *a + i * 10 - '0'; -#define _PROUT(fmt, _size) \ - if (_size > 0) { \ - arg = (void*)pfn(arg, fmt, _size); \ - if (arg != 0) \ - x.nchar += _size; \ - else \ - return x.nchar; \ +#define _PROUT(fmt, _size) \ + if (_size > 0) { \ + arg = (void*)pfn(arg, fmt, _size); \ + if (arg != 0) \ + x.nchar += _size; \ + else \ + return x.nchar; \ } -#define _PAD(m, src, extracond) \ - if (extracond && m > 0) { \ - int i; \ - int j; \ - for (j = m; j > 0; j -= i) { \ - if ((u32) j > 32) \ - i = 32; \ - else \ - i = j; \ - _PROUT(src, i); \ - } \ +#define _PAD(m, src, extracond) \ + if (extracond && m > 0) { \ + int i; \ + int j; \ + for (j = m; j > 0; j -= i) { \ + if ((u32)j > 32) \ + i = 32; \ + else \ + i = j; \ + _PROUT(src, i); \ + } \ } #define FLAGS_SPACE 1 @@ -56,7 +56,7 @@ int _Printf(printf_func pfn, void* arg, char* fmt, va_list ap) { if (c == 0) { return x.nchar; } - fmt = (char *) ++s; + fmt = (char*)++s; x.flags = 0; // TODO the cast isn't necessary because strchr should take it in as const, but it currently doesn't for (; (t = strchr((char*)fchar, *s)) != NULL; s++) { @@ -94,23 +94,21 @@ int _Printf(printf_func pfn, void* arg, char* fmt, va_list ap) { s++; } _Putfld(&x, &ap, *s, ac); - x.width -= x.n0 + x.nz0 + x.n1 + x.nz1 - + x.n2 + x.nz2; + x.width -= x.n0 + x.nz0 + x.n1 + x.nz1 + x.n2 + x.nz2; _PAD(x.width, spaces, !(x.flags & FLAGS_MINUS)); - _PROUT((char *) ac, x.n0); + _PROUT((char*)ac, x.n0); _PAD(x.nz0, zeroes, 1); _PROUT(x.s, x.n1); _PAD(x.nz1, zeroes, 1); - _PROUT((char *) (&x.s[x.n1]), x.n2) + _PROUT((char*)(&x.s[x.n1]), x.n2) _PAD(x.nz2, zeroes, 1); _PAD(x.width, spaces, x.flags & FLAGS_MINUS); - fmt = (char *) s + 1; + fmt = (char*)s + 1; } } void _Putfld(_Pft* px, va_list* pap, unsigned char code, unsigned char* ac) { - px->n0 = px->nz0 = px->n1 = px->nz1 = px->n2 = - px->nz2 = 0; + px->n0 = px->nz0 = px->n1 = px->nz1 = px->n2 = px->nz2 = 0; switch (code) { @@ -129,7 +127,7 @@ void _Putfld(_Pft* px, va_list* pap, unsigned char code, unsigned char* ac) { } if (px->qual == 'h') { - px->v.ll = (s16) px->v.ll; + px->v.ll = (s16)px->v.ll; } if (px->v.ll < 0) { @@ -140,7 +138,7 @@ void _Putfld(_Pft* px, va_list* pap, unsigned char code, unsigned char* ac) { ac[px->n0++] = ' '; } - px->s = (char *) &ac[px->n0]; + px->s = (char*)&ac[px->n0]; _Litob(px, code); break; @@ -158,9 +156,9 @@ void _Putfld(_Pft* px, va_list* pap, unsigned char code, unsigned char* ac) { } if (px->qual == 'h') { - px->v.ll = (u16) px->v.ll; + px->v.ll = (u16)px->v.ll; } else if (px->qual == 0) { - px->v.ll = (u32) px->v.ll; + px->v.ll = (u32)px->v.ll; } if (px->flags & FLAGS_HASH) { @@ -170,7 +168,7 @@ void _Putfld(_Pft* px, va_list* pap, unsigned char code, unsigned char* ac) { ac[px->n0++] = code; } } - px->s = (char *) &ac[px->n0]; + px->s = (char*)&ac[px->n0]; _Litob(px, code); break; @@ -191,30 +189,30 @@ void _Putfld(_Pft* px, va_list* pap, unsigned char code, unsigned char* ac) { } } - px->s = (char *) &ac[px->n0]; + px->s = (char*)&ac[px->n0]; _Ldtob(px, code); break; case 'n': if (px->qual == 'h') { - *(va_arg(*pap, u16 *)) = px->nchar; + *(va_arg(*pap, u16*)) = px->nchar; } else if (px->qual == 'l') { - *va_arg(*pap, u32 *) = px->nchar; + *va_arg(*pap, u32*) = px->nchar; } else if (px->qual == 'L') { - *va_arg(*pap, u64 *) = px->nchar; + *va_arg(*pap, u64*) = px->nchar; } else { - *va_arg(*pap, u32 *) = px->nchar; + *va_arg(*pap, u32*) = px->nchar; } break; case 'p': - px->v.ll = (long) va_arg(*pap, void *); - px->s = (char *) &ac[px->n0]; + px->v.ll = (long)va_arg(*pap, void*); + px->s = (char*)&ac[px->n0]; _Litob(px, 'x'); break; case 's': - px->s = va_arg(*pap, char *); + px->s = va_arg(*pap, char*); px->n1 = strlen(px->s); if (px->prec >= 0 && px->n1 > px->prec) { px->n1 = px->prec; diff --git a/src/libultra/voice/voicegetstatus.c b/src/libultra/voice/voicegetstatus.c index 8cfd1122fa..595a04d5d9 100644 --- a/src/libultra/voice/voicegetstatus.c +++ b/src/libultra/voice/voicegetstatus.c @@ -6,7 +6,7 @@ s32 __osVoiceGetStatus(OSMesgQueue* mq, s32 port, u8* status) { __OSContRequestHeaderAligned header; s32 ret = 0; s32 i; - u8* ptr = (u8 *)&__osContPifRam; + u8* ptr = (u8*)&__osContPifRam; s32 var = 2; __osSiGetAccess(); @@ -19,8 +19,8 @@ s32 __osVoiceGetStatus(OSMesgQueue* mq, s32 port, u8* status) { ; } - *ptr++ = 1; - *ptr++ = 3; + *ptr++ = 1; + *ptr++ = 3; *ptr = CONT_CMD_REQUEST_STATUS; ptr += 4; *ptr = CONT_CMD_END; @@ -32,7 +32,7 @@ s32 __osVoiceGetStatus(OSMesgQueue* mq, s32 port, u8* status) { ret = __osSiRawStartDma(OS_READ, &__osContPifRam); osRecvMesg(mq, NULL, OS_MESG_BLOCK); - ptr = (u8 *)&__osContPifRam + port; + ptr = (u8*)&__osContPifRam + port; header = *((__OSContRequestHeaderAligned*)ptr); diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c index 0e1a520544..4786dd686b 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -21,7 +21,7 @@ const ActorInit Arms_Hook_InitVars = { (ActorFunc)ArmsHook_Init, (ActorFunc)ArmsHook_Destroy, (ActorFunc)ArmsHook_Update, - (ActorFunc)ArmsHook_Draw + (ActorFunc)ArmsHook_Draw, }; ColliderQuadInit D_808C1BC0 = { diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index 7f3a9cdadd..2bb11f0c0d 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -19,7 +19,7 @@ const ActorInit Arrow_Fire_InitVars = { (ActorFunc)ArrowFire_Init, (ActorFunc)ArrowFire_Destroy, (ActorFunc)ArrowFire_Update, - (ActorFunc)ArrowFire_Draw + (ActorFunc)ArrowFire_Draw, }; */ diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index 2ec05b6aeb..b9ddb40492 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -19,7 +19,7 @@ const ActorInit Arrow_Ice_InitVars = { (ActorFunc)ArrowIce_Init, (ActorFunc)ArrowIce_Destroy, (ActorFunc)ArrowIce_Update, - (ActorFunc)ArrowIce_Draw + (ActorFunc)ArrowIce_Draw, }; */ diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index ec5ba6be0e..4a372d9a34 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -19,7 +19,7 @@ const ActorInit Arrow_Light_InitVars = { (ActorFunc)ArrowLight_Init, (ActorFunc)ArrowLight_Destroy, (ActorFunc)ArrowLight_Update, - (ActorFunc)ArrowLight_Draw + (ActorFunc)ArrowLight_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c index 2864da5c74..567d08db64 100644 --- a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c @@ -19,7 +19,7 @@ const ActorInit Bg_Astr_Bombwall_InitVars = { (ActorFunc)BgAstrBombwall_Init, (ActorFunc)BgAstrBombwall_Destroy, (ActorFunc)BgAstrBombwall_Update, - (ActorFunc)BgAstrBombwall_Draw + (ActorFunc)BgAstrBombwall_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c index 002ddeb119..ccdc6d0395 100644 --- a/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c +++ b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c @@ -19,7 +19,7 @@ const ActorInit Bg_Botihasira_InitVars = { (ActorFunc)BgBotihasira_Init, (ActorFunc)BgBotihasira_Destroy, (ActorFunc)BgBotihasira_Update, - (ActorFunc)BgBotihasira_Draw + (ActorFunc)BgBotihasira_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c index c15bee0f6d..616f41b1b9 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c @@ -17,7 +17,7 @@ const ActorInit Bg_Breakwall_InitVars = { (ActorFunc)BgBreakwall_Init, (ActorFunc)NULL, (ActorFunc)BgBreakwall_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c index c8e888775d..da5ab5277c 100644 --- a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c +++ b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c @@ -19,7 +19,7 @@ const ActorInit Bg_Crace_Movebg_InitVars = { (ActorFunc)BgCraceMovebg_Init, (ActorFunc)BgCraceMovebg_Destroy, (ActorFunc)BgCraceMovebg_Update, - (ActorFunc)BgCraceMovebg_Draw + (ActorFunc)BgCraceMovebg_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c index 6b83d40104..8b2eb91c6d 100644 --- a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c +++ b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c @@ -27,7 +27,6 @@ void BgCtowerGear_Draw(Actor* thisx, GlobalContext* globalCtx); void BgCtowerGear_UpdateOrgan(Actor* thisx, GlobalContext* globalCtx); void BgCtowerGear_DrawOrgan(Actor* thisx, GlobalContext* globalCtx); - const ActorInit Bg_Ctower_Gear_InitVars = { ACTOR_BG_CTOWER_GEAR, ACTORCAT_PROP, @@ -37,7 +36,7 @@ const ActorInit Bg_Ctower_Gear_InitVars = { (ActorFunc)BgCtowerGear_Init, (ActorFunc)BgCtowerGear_Destroy, (ActorFunc)BgCtowerGear_Update, - (ActorFunc)BgCtowerGear_Draw + (ActorFunc)BgCtowerGear_Draw, }; extern Gfx D_06010828[]; @@ -55,16 +54,13 @@ extern Gfx D_06018118[]; extern CollisionHeader D_06018588; static Vec3f D_80AD3270[] = { - {-70.0f, -60.0f, 8.0f}, - {-60.0f, -60.0f, -9.1f}, - {-75.0f, -60.0f, -9.1f}, - {-70.0f, -60.0f, -26.2f} + { -70.0f, -60.0f, 8.0f }, { -60.0f, -60.0f, -9.1f }, { -75.0f, -60.0f, -9.1f }, { -70.0f, -60.0f, -26.2f } }; static Vec3f D_80AD32A0[] = { - {85.0f, -60.0f, 8.0f}, - {80.0f, -60.0f, -9.1f}, - {85.0f, -60.0f, -26.2f}, + { 85.0f, -60.0f, 8.0f }, + { 80.0f, -60.0f, -9.1f }, + { 85.0f, -60.0f, -26.2f }, }; static InitChainEntry sInitChain[] = { @@ -85,9 +81,9 @@ static InitChainEntry sInitChainOrgan[] = { ICHAIN_F32(uncullZoneDownward, 570, ICHAIN_STOP), }; -static Gfx* D_80AD32E8[] = {D_06010828, D_06017018, D_06018118}; +static Gfx* D_80AD32E8[] = { D_06010828, D_06017018, D_06018118 }; -void BgCtowerGear_Splash(BgCtowerGear *this, GlobalContext *GlobalContext) { +void BgCtowerGear_Splash(BgCtowerGear* this, GlobalContext* GlobalContext) { int i; s32 flags; Vec3f splashSpawnPos; @@ -102,8 +98,8 @@ void BgCtowerGear_Splash(BgCtowerGear *this, GlobalContext *GlobalContext) { Matrix_RotateY(this->dyna.actor.home.rot.y, 0); SysMatrix_InsertXRotation_s(this->dyna.actor.home.rot.x, 1); SysMatrix_InsertZRotation_s(this->dyna.actor.home.rot.z, 1); - for(i=0; i<4; i++) { - if ((u32) Rand_Next() >= 0x40000000) { + for (i = 0; i < 4; i++) { + if ((u32)Rand_Next() >= 0x40000000) { splashOffset.x = D_80AD3270[i].x - (Rand_ZeroOne() * 30.0f); splashOffset.y = D_80AD3270[i].y; splashOffset.z = D_80AD3270[i].z; @@ -111,7 +107,7 @@ void BgCtowerGear_Splash(BgCtowerGear *this, GlobalContext *GlobalContext) { splashSpawnPos.x += this->dyna.actor.world.pos.x + ((Rand_ZeroOne() * 20.0f) - 10.0f); splashSpawnPos.y += this->dyna.actor.world.pos.y; splashSpawnPos.z += this->dyna.actor.world.pos.z + ((Rand_ZeroOne() * 20.0f) - 10.0f); - EffectSsGSplash_Spawn(GlobalContext, &splashSpawnPos, NULL, NULL, 0, ((u32) Rand_Next() >> 25) + 340); + EffectSsGSplash_Spawn(GlobalContext, &splashSpawnPos, NULL, NULL, 0, ((u32)Rand_Next() >> 25) + 340); } } } @@ -120,8 +116,8 @@ void BgCtowerGear_Splash(BgCtowerGear *this, GlobalContext *GlobalContext) { Matrix_RotateY(this->dyna.actor.home.rot.y, 0); SysMatrix_InsertXRotation_s(this->dyna.actor.home.rot.x, 1); SysMatrix_InsertZRotation_s(this->dyna.actor.home.rot.z, 1); - for(i=0; i<3; i++) { - for(j=0; j<2; j++) { + for (i = 0; i < 3; i++) { + for (j = 0; j < 2; j++) { splashOffset.x = D_80AD32A0[i].x + (Rand_ZeroOne() * 10.0f); splashOffset.y = D_80AD32A0[i].y; splashOffset.z = D_80AD32A0[i].z; @@ -129,7 +125,8 @@ void BgCtowerGear_Splash(BgCtowerGear *this, GlobalContext *GlobalContext) { splashSpawnPos.x += this->dyna.actor.world.pos.x + ((Rand_ZeroOne() * 20.0f) - 10.0f); splashSpawnPos.y += this->dyna.actor.world.pos.y; splashSpawnPos.z += this->dyna.actor.world.pos.z + ((Rand_ZeroOne() * 20.0f) - 10.0f); - EffectSsGSplash_Spawn(GlobalContext, &splashSpawnPos, NULL, NULL, 0, ((u32) Rand_Next() >> 25) + 280); + EffectSsGSplash_Spawn(GlobalContext, &splashSpawnPos, NULL, NULL, 0, + ((u32)Rand_Next() >> 25) + 280); } } } @@ -137,8 +134,8 @@ void BgCtowerGear_Splash(BgCtowerGear *this, GlobalContext *GlobalContext) { } } -void BgCtowerGear_Init(Actor *thisx, GlobalContext *globalCtx) { - BgCtowerGear *this = THIS; +void BgCtowerGear_Init(Actor* thisx, GlobalContext* globalCtx) { + BgCtowerGear* this = THIS; s32 type; type = BGCTOWERGEAR_GET_TYPE(this); @@ -162,8 +159,8 @@ void BgCtowerGear_Init(Actor *thisx, GlobalContext *globalCtx) { } } -void BgCtowerGear_Destroy(Actor *thisx, GlobalContext *globalCtx) { - BgCtowerGear *this = THIS; +void BgCtowerGear_Destroy(Actor* thisx, GlobalContext* globalCtx) { + BgCtowerGear* this = THIS; s32 type; type = BGCTOWERGEAR_GET_TYPE(this); @@ -172,26 +169,24 @@ void BgCtowerGear_Destroy(Actor *thisx, GlobalContext *globalCtx) { } } -void BgCtowerGear_Update(Actor *thisx, GlobalContext *globalCtx) { - BgCtowerGear *this = THIS; +void BgCtowerGear_Update(Actor* thisx, GlobalContext* globalCtx) { + BgCtowerGear* this = THIS; s32 type; type = BGCTOWERGEAR_GET_TYPE(this); if (type == CEILING_COG) { this->dyna.actor.shape.rot.x -= 0x1F4; - } - else if (type == CENTER_COG) { + } else if (type == CENTER_COG) { this->dyna.actor.shape.rot.y += 0x1F4; func_800B9010(&this->dyna.actor, 0x2085); - } - else if (type == WATER_WHEEL) { + } else if (type == WATER_WHEEL) { this->dyna.actor.shape.rot.z -= 0x1F4; BgCtowerGear_Splash(this, globalCtx); } } -void BgCtowerGear_UpdateOrgan(Actor *thisx, GlobalContext *globalCtx) { - BgCtowerGear *this = THIS; +void BgCtowerGear_UpdateOrgan(Actor* thisx, GlobalContext* globalCtx) { + BgCtowerGear* this = THIS; if (func_800EE29C(globalCtx, 0x68)) { switch (globalCtx->csCtx.actorActions[func_800EE200(globalCtx, 0x68)]->unk0) { @@ -210,12 +205,12 @@ void BgCtowerGear_UpdateOrgan(Actor *thisx, GlobalContext *globalCtx) { } } -//Using BgCtowerGear *this = THIS causes regalloc issues -void BgCtowerGear_Draw(Actor *thisx, GlobalContext *globalCtx) { +// Using BgCtowerGear *this = THIS causes regalloc issues +void BgCtowerGear_Draw(Actor* thisx, GlobalContext* globalCtx) { func_800BDFC0(globalCtx, D_80AD32E8[BGCTOWERGEAR_GET_TYPE(thisx)]); } -void BgCtowerGear_DrawOrgan(Actor *thisx, GlobalContext *globalCtx) { +void BgCtowerGear_DrawOrgan(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx); func_8012C28C(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); diff --git a/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c index 74f29c470f..e64a9948f4 100644 --- a/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c +++ b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c @@ -19,7 +19,7 @@ const ActorInit Bg_Ctower_Rot_InitVars = { (ActorFunc)BgCtowerRot_Init, (ActorFunc)BgCtowerRot_Destroy, (ActorFunc)BgCtowerRot_Update, - (ActorFunc)BgCtowerRot_Draw + (ActorFunc)BgCtowerRot_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c index cbb5f6fb9a..78d4da4faa 100644 --- a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c +++ b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c @@ -18,7 +18,7 @@ const ActorInit Bg_Danpei_Movebg_InitVars = { (ActorFunc)BgDanpeiMovebg_Init, (ActorFunc)BgDanpeiMovebg_Destroy, (ActorFunc)BgDanpeiMovebg_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c index b0e6ad5d8c..544fe757e6 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c @@ -19,7 +19,7 @@ const ActorInit Bg_Dblue_Balance_InitVars = { (ActorFunc)BgDblueBalance_Init, (ActorFunc)BgDblueBalance_Destroy, (ActorFunc)BgDblueBalance_Update, - (ActorFunc)BgDblueBalance_Draw + (ActorFunc)BgDblueBalance_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c index af8e7a21d5..6855a8cd4d 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c @@ -19,7 +19,7 @@ const ActorInit Bg_Dblue_Elevator_InitVars = { (ActorFunc)BgDblueElevator_Init, (ActorFunc)BgDblueElevator_Destroy, (ActorFunc)BgDblueElevator_Update, - (ActorFunc)BgDblueElevator_Draw + (ActorFunc)BgDblueElevator_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c index a93d408ade..e9d2b6e75c 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c @@ -19,7 +19,7 @@ const ActorInit Bg_Dblue_Movebg_InitVars = { (ActorFunc)BgDblueMovebg_Init, (ActorFunc)BgDblueMovebg_Destroy, (ActorFunc)BgDblueMovebg_Update, - (ActorFunc)BgDblueMovebg_Draw + (ActorFunc)BgDblueMovebg_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c index fbbbcefe43..a00fd98ac1 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c @@ -19,7 +19,7 @@ const ActorInit Bg_Dblue_Waterfall_InitVars = { (ActorFunc)BgDblueWaterfall_Init, (ActorFunc)BgDblueWaterfall_Destroy, (ActorFunc)BgDblueWaterfall_Update, - (ActorFunc)BgDblueWaterfall_Draw + (ActorFunc)BgDblueWaterfall_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c index 90b4afe47a..8d5fb3b145 100644 --- a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c +++ b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c @@ -19,7 +19,7 @@ const ActorInit Bg_Dkjail_Ivy_InitVars = { (ActorFunc)BgDkjailIvy_Init, (ActorFunc)BgDkjailIvy_Destroy, (ActorFunc)BgDkjailIvy_Update, - (ActorFunc)BgDkjailIvy_Draw + (ActorFunc)BgDkjailIvy_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c index 386f032819..3ec6566088 100644 --- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c @@ -18,7 +18,7 @@ const ActorInit Bg_Dy_Yoseizo_InitVars = { (ActorFunc)BgDyYoseizo_Init, (ActorFunc)BgDyYoseizo_Destroy, (ActorFunc)BgDyYoseizo_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c index 029af75176..bfe8b41502 100644 --- a/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c +++ b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c @@ -19,7 +19,7 @@ const ActorInit Bg_F40_Block_InitVars = { (ActorFunc)BgF40Block_Init, (ActorFunc)BgF40Block_Destroy, (ActorFunc)BgF40Block_Update, - (ActorFunc)BgF40Block_Draw + (ActorFunc)BgF40Block_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c b/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c index cc7654e3fa..2f30ccfb5c 100644 --- a/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c +++ b/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c @@ -19,7 +19,7 @@ const ActorInit Bg_F40_Flift_InitVars = { (ActorFunc)BgF40Flift_Init, (ActorFunc)BgF40Flift_Destroy, (ActorFunc)BgF40Flift_Update, - (ActorFunc)BgF40Flift_Draw + (ActorFunc)BgF40Flift_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c index 1eb771e940..5bbbd6216e 100644 --- a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c +++ b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c @@ -19,7 +19,7 @@ const ActorInit Bg_F40_Switch_InitVars = { (ActorFunc)BgF40Switch_Init, (ActorFunc)BgF40Switch_Destroy, (ActorFunc)BgF40Switch_Update, - (ActorFunc)BgF40Switch_Draw + (ActorFunc)BgF40Switch_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c b/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c index 0bd6ee04dc..b2cd121760 100644 --- a/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c +++ b/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c @@ -19,7 +19,7 @@ const ActorInit Bg_F40_Swlift_InitVars = { (ActorFunc)BgF40Swlift_Init, (ActorFunc)BgF40Swlift_Destroy, (ActorFunc)BgF40Swlift_Update, - (ActorFunc)BgF40Swlift_Draw + (ActorFunc)BgF40Swlift_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c b/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c index f28fb33032..b7ff320102 100644 --- a/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c +++ b/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c @@ -18,7 +18,7 @@ const ActorInit Bg_Fire_Wall_InitVars = { (ActorFunc)BgFireWall_Init, (ActorFunc)BgFireWall_Destroy, (ActorFunc)BgFireWall_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c b/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c index a5fc85baeb..4b4fdb33df 100644 --- a/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c +++ b/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c @@ -18,7 +18,7 @@ const ActorInit Bg_Fu_Kaiten_InitVars = { (ActorFunc)BgFuKaiten_Init, (ActorFunc)BgFuKaiten_Destroy, (ActorFunc)BgFuKaiten_Update, - (ActorFunc)BgFuKaiten_Draw + (ActorFunc)BgFuKaiten_Draw, }; void BgFuKaiten_Init(Actor* thisx, GlobalContext* globalCtx) { @@ -44,8 +44,7 @@ void BgFuKaiten_Destroy(Actor* thisx, GlobalContext* globalCtx) { void BgFuKaiten_UpdateRotation(BgFuKaiten* this) { f32 f0; this->bg.actor.shape.rot.y += this->rotationSpeed; - if (this->rotationSpeed > 0) - { + if (this->rotationSpeed > 0) { f0 = this->rotationSpeed * .002f; func_8019FAD8(&this->bg.actor.projectedPos, 8310, f0); } diff --git a/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c b/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c index d340f03a11..b6f48be2bf 100644 --- a/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c +++ b/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c @@ -19,7 +19,7 @@ const ActorInit Bg_Fu_Mizu_InitVars = { (ActorFunc)BgFuMizu_Init, (ActorFunc)BgFuMizu_Destroy, (ActorFunc)BgFuMizu_Update, - (ActorFunc)BgFuMizu_Draw + (ActorFunc)BgFuMizu_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c b/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c index 6af37611ba..d333555e5f 100644 --- a/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c +++ b/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c @@ -19,7 +19,7 @@ const ActorInit Bg_Goron_Oyu_InitVars = { (ActorFunc)BgGoronOyu_Init, (ActorFunc)BgGoronOyu_Destroy, (ActorFunc)BgGoronOyu_Update, - (ActorFunc)BgGoronOyu_Draw + (ActorFunc)BgGoronOyu_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c index 316fbb7d7d..a55b31da29 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c @@ -19,7 +19,7 @@ const ActorInit Bg_Haka_Bombwall_InitVars = { (ActorFunc)BgHakaBombwall_Init, (ActorFunc)BgHakaBombwall_Destroy, (ActorFunc)BgHakaBombwall_Update, - (ActorFunc)BgHakaBombwall_Draw + (ActorFunc)BgHakaBombwall_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c b/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c index 75ae994fa5..a01a7881a8 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c +++ b/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c @@ -28,7 +28,7 @@ const ActorInit Bg_Haka_Curtain_InitVars = { (ActorFunc)BgHakaCurtain_Init, (ActorFunc)BgHakaCurtain_Destroy, (ActorFunc)BgHakaCurtain_Update, - (ActorFunc)BgHakaCurtain_Draw + (ActorFunc)BgHakaCurtain_Draw, }; static InitChainEntry D_80B6DFA0[] = { diff --git a/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c b/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c index a2de8b72d5..066bbe79df 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c +++ b/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c @@ -19,7 +19,7 @@ const ActorInit Bg_Haka_Tomb_InitVars = { (ActorFunc)BgHakaTomb_Init, (ActorFunc)BgHakaTomb_Destroy, (ActorFunc)BgHakaTomb_Update, - (ActorFunc)BgHakaTomb_Draw + (ActorFunc)BgHakaTomb_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c index a63d6145c5..eb63627fe6 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c @@ -19,7 +19,7 @@ const ActorInit Bg_Hakugin_Bombwall_InitVars = { (ActorFunc)BgHakuginBombwall_Init, (ActorFunc)BgHakuginBombwall_Destroy, (ActorFunc)BgHakuginBombwall_Update, - (ActorFunc)BgHakuginBombwall_Draw + (ActorFunc)BgHakuginBombwall_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c index 0a9d1c9d58..f0f025b577 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c @@ -19,7 +19,7 @@ const ActorInit Bg_Hakugin_Elvpole_InitVars = { (ActorFunc)BgHakuginElvpole_Init, (ActorFunc)BgHakuginElvpole_Destroy, (ActorFunc)BgHakuginElvpole_Update, - (ActorFunc)BgHakuginElvpole_Draw + (ActorFunc)BgHakuginElvpole_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c index 4b0a68a754..07afed272c 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c @@ -18,7 +18,7 @@ const ActorInit Bg_Hakugin_Post_InitVars = { (ActorFunc)BgHakuginPost_Init, (ActorFunc)BgHakuginPost_Destroy, (ActorFunc)BgHakuginPost_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c index 4479b38f62..eb061c1031 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c @@ -19,7 +19,7 @@ const ActorInit Bg_Hakugin_Switch_InitVars = { (ActorFunc)BgHakuginSwitch_Init, (ActorFunc)BgHakuginSwitch_Destroy, (ActorFunc)BgHakuginSwitch_Update, - (ActorFunc)BgHakuginSwitch_Draw + (ActorFunc)BgHakuginSwitch_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c index fbb567f368..71700d67fd 100644 --- a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c +++ b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c @@ -19,7 +19,7 @@ const ActorInit Bg_Icefloe_InitVars = { (ActorFunc)BgIcefloe_Init, (ActorFunc)BgIcefloe_Destroy, (ActorFunc)BgIcefloe_Update, - (ActorFunc)BgIcefloe_Draw + (ActorFunc)BgIcefloe_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c index 9a81eadd2a..bc0decc6d4 100644 --- a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c +++ b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c @@ -19,7 +19,7 @@ const ActorInit Bg_Icicle_InitVars = { (ActorFunc)BgIcicle_Init, (ActorFunc)BgIcicle_Destroy, (ActorFunc)BgIcicle_Update, - (ActorFunc)BgIcicle_Draw + (ActorFunc)BgIcicle_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c index 3e513d24e3..08a1c31701 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c @@ -18,7 +18,7 @@ const ActorInit Bg_Ikana_Block_InitVars = { (ActorFunc)BgIkanaBlock_Init, (ActorFunc)BgIkanaBlock_Destroy, (ActorFunc)BgIkanaBlock_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c index b089063725..a4f62910c5 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c @@ -19,7 +19,7 @@ const ActorInit Bg_Ikana_Bombwall_InitVars = { (ActorFunc)BgIkanaBombwall_Init, (ActorFunc)BgIkanaBombwall_Destroy, (ActorFunc)BgIkanaBombwall_Update, - (ActorFunc)BgIkanaBombwall_Draw + (ActorFunc)BgIkanaBombwall_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c index 212fb90d23..6fae688215 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c @@ -19,7 +19,7 @@ const ActorInit Bg_Ikana_Dharma_InitVars = { (ActorFunc)BgIkanaDharma_Init, (ActorFunc)BgIkanaDharma_Destroy, (ActorFunc)BgIkanaDharma_Update, - (ActorFunc)BgIkanaDharma_Draw + (ActorFunc)BgIkanaDharma_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c b/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c index baac62e257..0087603b81 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c @@ -19,7 +19,7 @@ const ActorInit Bg_Ikana_Mirror_InitVars = { (ActorFunc)BgIkanaMirror_Init, (ActorFunc)BgIkanaMirror_Destroy, (ActorFunc)BgIkanaMirror_Update, - (ActorFunc)BgIkanaMirror_Draw + (ActorFunc)BgIkanaMirror_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c b/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c index 627339310e..7051f0acb7 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c @@ -23,12 +23,26 @@ const ActorInit Bg_Ikana_Ray_InitVars = { (ActorFunc)BgIkanaRay_Init, (ActorFunc)BgIkanaRay_Destroy, (ActorFunc)BgIkanaRay_Update, - (ActorFunc)BgIkanaRay_Draw + (ActorFunc)BgIkanaRay_Draw, }; ColliderCylinderInit bgIkanaRayCylinderInit = { - { COLTYPE_NONE, AT_ON | AT_TYPE_OTHER, AC_NONE, OC1_NONE, OC2_NONE, COLSHAPE_CYLINDER, }, - { ELEMTYPE_UNK0, { 0x00200000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NONE, BUMP_NONE, OCELEM_ON, }, + { + COLTYPE_NONE, + AT_ON | AT_TYPE_OTHER, + AC_NONE, + OC1_NONE, + OC2_NONE, + COLSHAPE_CYLINDER, + }, + { + ELEMTYPE_UNK0, + { 0x00200000, 0x00, 0x00 }, + { 0x00000000, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NONE, + BUMP_NONE, + OCELEM_ON, + }, { 90, 420, -420, { 0, 0, 0 } }, }; diff --git a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c index c46e155632..aa222a2bb1 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c @@ -19,7 +19,7 @@ const ActorInit Bg_Ikana_Rotaryroom_InitVars = { (ActorFunc)BgIkanaRotaryroom_Init, (ActorFunc)BgIkanaRotaryroom_Destroy, (ActorFunc)BgIkanaRotaryroom_Update, - (ActorFunc)BgIkanaRotaryroom_Draw + (ActorFunc)BgIkanaRotaryroom_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c index 5bd770f55f..f1ecc2ea36 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c @@ -37,7 +37,7 @@ const ActorInit Bg_Ikana_Shutter_InitVars = { (ActorFunc)BgIkanaShutter_Init, (ActorFunc)BgIkanaShutter_Destroy, (ActorFunc)BgIkanaShutter_Update, - (ActorFunc)BgIkanaShutter_Draw + (ActorFunc)BgIkanaShutter_Draw, }; static InitChainEntry D_80BD5D10[] = { @@ -117,7 +117,7 @@ void func_80BD58F0(BgIkanaShutter* this) { void func_80BD5910(BgIkanaShutter* this, GlobalContext* globalCtx) { Math_StepToF(&this->dyna.actor.velocity.y, 4.0f, 0.5f); if (Math_SmoothStepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y + 220.0f, 0.5f, - this->dyna.actor.velocity.y, 1.0f) < 0.5f) { + this->dyna.actor.velocity.y, 1.0f) < 0.5f) { func_80BD599C(this); } } @@ -187,7 +187,7 @@ void func_80BD5BC4(BgIkanaShutter* this) { void func_80BD5BD8(BgIkanaShutter* this, GlobalContext* globalCtx) { Math_StepToF(&this->dyna.actor.velocity.y, 4.0f, 0.5f); if (Math_SmoothStepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y + -220.0f, 0.5f, - this->dyna.actor.velocity.y, 1.0f) < 0.5f) { + this->dyna.actor.velocity.y, 1.0f) < 0.5f) { BgIkanaShutter_SetupDoNothing(this); } } diff --git a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c index c00898ec61..e0261e4d60 100644 --- a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c +++ b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c @@ -19,7 +19,7 @@ const ActorInit Bg_Iknin_Susceil_InitVars = { (ActorFunc)BgIkninSusceil_Init, (ActorFunc)BgIkninSusceil_Destroy, (ActorFunc)BgIkninSusceil_Update, - (ActorFunc)BgIkninSusceil_Draw + (ActorFunc)BgIkninSusceil_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c index 756659fdf9..e3f9bb3221 100644 --- a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c +++ b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c @@ -19,7 +19,7 @@ const ActorInit Bg_Ikninside_InitVars = { (ActorFunc)BgIkninside_Init, (ActorFunc)BgIkninside_Destroy, (ActorFunc)BgIkninside_Update, - (ActorFunc)BgIkninside_Draw + (ActorFunc)BgIkninside_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c index e1a9113261..883d7a4593 100644 --- a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c +++ b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c @@ -19,7 +19,7 @@ const ActorInit Bg_Iknv_Doukutu_InitVars = { (ActorFunc)BgIknvDoukutu_Init, (ActorFunc)BgIknvDoukutu_Destroy, (ActorFunc)BgIknvDoukutu_Update, - (ActorFunc)BgIknvDoukutu_Draw + (ActorFunc)BgIknvDoukutu_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c index 9e15659a39..bfeb63fdb8 100644 --- a/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c +++ b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c @@ -19,7 +19,7 @@ const ActorInit Bg_Iknv_Obj_InitVars = { (ActorFunc)BgIknvObj_Init, (ActorFunc)BgIknvObj_Destroy, (ActorFunc)BgIknvObj_Update, - (ActorFunc)BgIknvObj_Draw + (ActorFunc)BgIknvObj_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c index 8164b91c16..e9e8030eef 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -19,7 +19,7 @@ const ActorInit Bg_Ingate_InitVars = { (ActorFunc)BgIngate_Init, (ActorFunc)BgIngate_Destroy, (ActorFunc)BgIngate_Update, - (ActorFunc)BgIngate_Draw + (ActorFunc)BgIngate_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c index 9eec3bd71a..cba6612ecf 100644 --- a/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c +++ b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c @@ -18,7 +18,7 @@ const ActorInit Bg_Inibs_Movebg_InitVars = { (ActorFunc)BgInibsMovebg_Init, (ActorFunc)BgInibsMovebg_Destroy, (ActorFunc)func_800BDFB0, - (ActorFunc)BgInibsMovebg_Draw + (ActorFunc)BgInibsMovebg_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c index 3c89d5bb58..32d14f9bc4 100644 --- a/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c +++ b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c @@ -19,7 +19,7 @@ const ActorInit Bg_Keikoku_Saku_InitVars = { (ActorFunc)BgKeikokuSaku_Init, (ActorFunc)BgKeikokuSaku_Destroy, (ActorFunc)BgKeikokuSaku_Update, - (ActorFunc)BgKeikokuSaku_Draw + (ActorFunc)BgKeikokuSaku_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c b/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c index c0271cf6de..dd5d758623 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c @@ -19,7 +19,7 @@ const ActorInit Bg_Kin2_Bombwall_InitVars = { (ActorFunc)BgKin2Bombwall_Init, (ActorFunc)BgKin2Bombwall_Destroy, (ActorFunc)BgKin2Bombwall_Update, - (ActorFunc)BgKin2Bombwall_Draw + (ActorFunc)BgKin2Bombwall_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c b/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c index 747089bbb2..95cc46d864 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c @@ -29,40 +29,76 @@ const ActorInit Bg_Kin2_Fence_InitVars = { (ActorFunc)BgKin2Fence_Init, (ActorFunc)BgKin2Fence_Destroy, (ActorFunc)BgKin2Fence_Update, - (ActorFunc)BgKin2Fence_Draw + (ActorFunc)BgKin2Fence_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[4] = { { - { ELEMTYPE_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00003820, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, }, + { + ELEMTYPE_UNK4, + { 0x00000000, 0x00, 0x00 }, + { 0x00003820, 0x00, 0x00 }, + TOUCH_NONE | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_NONE, + }, { 0, { { -2040, 1400, 350 }, 28 }, 100 }, }, { - { ELEMTYPE_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00003820, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, }, + { + ELEMTYPE_UNK4, + { 0x00000000, 0x00, 0x00 }, + { 0x00003820, 0x00, 0x00 }, + TOUCH_NONE | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_NONE, + }, { 0, { { -1140, 1400, 350 }, 28 }, 100 }, }, { - { ELEMTYPE_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00003820, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, }, + { + ELEMTYPE_UNK4, + { 0x00000000, 0x00, 0x00 }, + { 0x00003820, 0x00, 0x00 }, + TOUCH_NONE | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_NONE, + }, { 0, { { 1140, 1400, 350 }, 28 }, 100 }, }, { - { ELEMTYPE_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00003820, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, }, + { + ELEMTYPE_UNK4, + { 0x00000000, 0x00, 0x00 }, + { 0x00003820, 0x00, 0x00 }, + TOUCH_NONE | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_NONE, + }, { 0, { { 2040, 1400, 350 }, 28 }, 100 }, }, }; static ColliderJntSphInit sJntSphInit = { - { COLTYPE_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, OC2_TYPE_2, COLSHAPE_JNTSPH, }, - 4, sJntSphElementsInit, + { + COLTYPE_NONE, + AT_NONE, + AC_ON | AC_TYPE_PLAYER, + OC1_NONE, + OC2_TYPE_2, + COLSHAPE_JNTSPH, + }, + 4, + sJntSphElementsInit, }; Vec3f eyeSparkleSpawnPositions[][2] = { { { -215.0f, 139.0f, 50.0f }, { -193.0f, 139.0f, 50.0f } }, - { { -125.0f, 139.0f, 50.0f }, { -103.0f, 139.0f, 50.0f } }, + { { -125.0f, 139.0f, 50.0f }, { -103.0f, 139.0f, 50.0f } }, - { { 103.0f, 139.0f, 50.0f }, { 125.0f, 139.0f, 50.0f } }, + { { 103.0f, 139.0f, 50.0f }, { 125.0f, 139.0f, 50.0f } }, - { { 193.0f, 139.0f, 50.0f }, { 215.0f, 139.0f, 50.0f } } }; + { { 193.0f, 139.0f, 50.0f }, { 215.0f, 139.0f, 50.0f } } }; Color_RGBA8 primColor = { 0xFF, 0xFF, 0xFF, 0x00 }; Color_RGBA8 envColor = { 0x00, 128, 128, 0x00 }; diff --git a/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c b/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c index c0a88febf8..f52330323a 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c @@ -19,7 +19,7 @@ const ActorInit Bg_Kin2_Picture_InitVars = { (ActorFunc)BgKin2Picture_Init, (ActorFunc)BgKin2Picture_Destroy, (ActorFunc)BgKin2Picture_Update, - (ActorFunc)BgKin2Picture_Draw + (ActorFunc)BgKin2Picture_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c index 3e5e854a2f..1c0d8e40f4 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c @@ -19,7 +19,7 @@ const ActorInit Bg_Kin2_Shelf_InitVars = { (ActorFunc)BgKin2Shelf_Init, (ActorFunc)BgKin2Shelf_Destroy, (ActorFunc)BgKin2Shelf_Update, - (ActorFunc)BgKin2Shelf_Draw + (ActorFunc)BgKin2Shelf_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c index dc80538f8a..f77479ec07 100644 --- a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c +++ b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c @@ -19,7 +19,7 @@ const ActorInit Bg_Ladder_InitVars = { (ActorFunc)BgLadder_Init, (ActorFunc)BgLadder_Destroy, (ActorFunc)BgLadder_Update, - (ActorFunc)BgLadder_Draw + (ActorFunc)BgLadder_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c index aa57ec7bc6..2de552db6f 100644 --- a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c +++ b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c @@ -19,7 +19,7 @@ const ActorInit Bg_Last_Bwall_InitVars = { (ActorFunc)BgLastBwall_Init, (ActorFunc)BgLastBwall_Destroy, (ActorFunc)BgLastBwall_Update, - (ActorFunc)BgLastBwall_Draw + (ActorFunc)BgLastBwall_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c index 0533044ec6..2ec5e08e41 100644 --- a/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c +++ b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c @@ -17,7 +17,7 @@ const ActorInit Bg_Lbfshot_InitVars = { (ActorFunc)BgLbfshot_Init, (ActorFunc)BgLbfshot_Destroy, (ActorFunc)func_800BDFB0, - (ActorFunc)BgLbfshot_Draw + (ActorFunc)BgLbfshot_Draw, }; static InitChainEntry D_80C18200[] = { diff --git a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c index 866f7e4939..bfd5beb452 100644 --- a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c +++ b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c @@ -36,7 +36,7 @@ static InitChainEntry sInitChain[] = { }; extern CollisionHeader D_06000A20; // Lilypad collision -extern Gfx D_06000040[]; // Lilypad model +extern Gfx D_06000040[]; // Lilypad model void BgLotus_Init(Actor* thisx, GlobalContext* globalCtx) { BgLotus* this = THIS; diff --git a/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c b/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c index 0a85dee459..bb77d56402 100644 --- a/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c +++ b/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c @@ -16,7 +16,7 @@ const ActorInit Bg_Market_Step_InitVars = { (ActorFunc)BgMarketStep_Init, (ActorFunc)func_800BDFB0, (ActorFunc)func_800BDFB0, - (ActorFunc)BgMarketStep_Draw + (ActorFunc)BgMarketStep_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c b/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c index 6850833b71..bbcbdd37b6 100644 --- a/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c +++ b/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c @@ -18,7 +18,7 @@ const ActorInit Bg_Mbar_Chair_InitVars = { (ActorFunc)BgMbarChair_Init, (ActorFunc)BgMbarChair_Destroy, (ActorFunc)BgMbarChair_Update, - (ActorFunc)BgMbarChair_Draw + (ActorFunc)BgMbarChair_Draw, }; static InitChainEntry bgMbarChairInitVars[] = { diff --git a/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c index 193c61258b..4e3113f377 100644 --- a/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c +++ b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c @@ -19,7 +19,7 @@ const ActorInit Bg_Numa_Hana_InitVars = { (ActorFunc)BgNumaHana_Init, (ActorFunc)BgNumaHana_Destroy, (ActorFunc)BgNumaHana_Update, - (ActorFunc)BgNumaHana_Draw + (ActorFunc)BgNumaHana_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c index b60d65b348..7d8abd8ad3 100644 --- a/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c +++ b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c @@ -19,7 +19,7 @@ const ActorInit Bg_Open_Shutter_InitVars = { (ActorFunc)BgOpenShutter_Init, (ActorFunc)BgOpenShutter_Destroy, (ActorFunc)BgOpenShutter_Update, - (ActorFunc)BgOpenShutter_Draw + (ActorFunc)BgOpenShutter_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c b/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c index b21f1a4d2a..6ebb393815 100644 --- a/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c +++ b/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c @@ -18,7 +18,7 @@ const ActorInit Bg_Open_Spot_InitVars = { (ActorFunc)BgOpenSpot_Init, (ActorFunc)BgOpenSpot_Destroy, (ActorFunc)BgOpenSpot_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c index 492a9f5cf8..82b62e5ba9 100644 --- a/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c +++ b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c @@ -18,7 +18,7 @@ const ActorInit Bg_Sinkai_Kabe_InitVars = { (ActorFunc)BgSinkaiKabe_Init, (ActorFunc)BgSinkaiKabe_Destroy, (ActorFunc)BgSinkaiKabe_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c index 5ea7155ee0..0a65bda40e 100644 --- a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c +++ b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c @@ -19,7 +19,7 @@ const ActorInit Bg_Spdweb_InitVars = { (ActorFunc)BgSpdweb_Init, (ActorFunc)BgSpdweb_Destroy, (ActorFunc)BgSpdweb_Update, - (ActorFunc)BgSpdweb_Draw + (ActorFunc)BgSpdweb_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c b/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c index e343e83eab..0cca8bb5eb 100644 --- a/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c +++ b/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c @@ -18,7 +18,7 @@ const ActorInit Bg_Spout_Fire_InitVars = { (ActorFunc)BgSpoutFire_Init, (ActorFunc)BgSpoutFire_Destroy, (ActorFunc)BgSpoutFire_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c index b0bf6260b5..d91a1a2455 100644 --- a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c +++ b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c @@ -19,7 +19,7 @@ const ActorInit Bg_Tobira01_InitVars = { (ActorFunc)BgTobira01_Init, (ActorFunc)BgTobira01_Destroy, (ActorFunc)BgTobira01_Update, - (ActorFunc)BgTobira01_Draw + (ActorFunc)BgTobira01_Draw, }; */ diff --git a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c index c82d2d7ff9..1b75fdce20 100644 --- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c +++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c @@ -18,7 +18,7 @@ const ActorInit Bg_Umajump_InitVars = { (ActorFunc)BgUmajump_Init, (ActorFunc)BgUmajump_Destroy, (ActorFunc)BgUmajump_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Boss_01/z_boss_01.c b/src/overlays/actors/ovl_Boss_01/z_boss_01.c index 47326d55bd..09bd00ac3d 100644 --- a/src/overlays/actors/ovl_Boss_01/z_boss_01.c +++ b/src/overlays/actors/ovl_Boss_01/z_boss_01.c @@ -19,7 +19,7 @@ const ActorInit Boss_01_InitVars = { (ActorFunc)Boss01_Init, (ActorFunc)Boss01_Destroy, (ActorFunc)Boss01_Update, - (ActorFunc)Boss01_Draw + (ActorFunc)Boss01_Draw, }; */ diff --git a/src/overlays/actors/ovl_Boss_02/z_boss_02.c b/src/overlays/actors/ovl_Boss_02/z_boss_02.c index 70939bde45..834f7394c5 100644 --- a/src/overlays/actors/ovl_Boss_02/z_boss_02.c +++ b/src/overlays/actors/ovl_Boss_02/z_boss_02.c @@ -19,7 +19,7 @@ const ActorInit Boss_02_InitVars = { (ActorFunc)Boss02_Init, (ActorFunc)Boss02_Destroy, (ActorFunc)Boss02_Update, - (ActorFunc)Boss02_Draw + (ActorFunc)Boss02_Draw, }; */ diff --git a/src/overlays/actors/ovl_Boss_03/z_boss_03.c b/src/overlays/actors/ovl_Boss_03/z_boss_03.c index da3b538e98..ff2f046671 100644 --- a/src/overlays/actors/ovl_Boss_03/z_boss_03.c +++ b/src/overlays/actors/ovl_Boss_03/z_boss_03.c @@ -19,7 +19,7 @@ const ActorInit Boss_03_InitVars = { (ActorFunc)Boss03_Init, (ActorFunc)Boss03_Destroy, (ActorFunc)Boss03_Update, - (ActorFunc)Boss03_Draw + (ActorFunc)Boss03_Draw, }; */ diff --git a/src/overlays/actors/ovl_Boss_04/z_boss_04.c b/src/overlays/actors/ovl_Boss_04/z_boss_04.c index a8e15a6ead..098c76fb55 100644 --- a/src/overlays/actors/ovl_Boss_04/z_boss_04.c +++ b/src/overlays/actors/ovl_Boss_04/z_boss_04.c @@ -19,7 +19,7 @@ const ActorInit Boss_04_InitVars = { (ActorFunc)Boss04_Init, (ActorFunc)Boss04_Destroy, (ActorFunc)Boss04_Update, - (ActorFunc)Boss04_Draw + (ActorFunc)Boss04_Draw, }; */ diff --git a/src/overlays/actors/ovl_Boss_05/z_boss_05.c b/src/overlays/actors/ovl_Boss_05/z_boss_05.c index 9389dab737..01c2fb5ab3 100644 --- a/src/overlays/actors/ovl_Boss_05/z_boss_05.c +++ b/src/overlays/actors/ovl_Boss_05/z_boss_05.c @@ -19,7 +19,7 @@ const ActorInit Boss_05_InitVars = { (ActorFunc)Boss05_Init, (ActorFunc)Boss05_Destroy, (ActorFunc)Boss05_Update, - (ActorFunc)Boss05_Draw + (ActorFunc)Boss05_Draw, }; */ diff --git a/src/overlays/actors/ovl_Boss_06/z_boss_06.c b/src/overlays/actors/ovl_Boss_06/z_boss_06.c index 5084b07987..953683f073 100644 --- a/src/overlays/actors/ovl_Boss_06/z_boss_06.c +++ b/src/overlays/actors/ovl_Boss_06/z_boss_06.c @@ -19,7 +19,7 @@ const ActorInit Boss_06_InitVars = { (ActorFunc)Boss06_Init, (ActorFunc)Boss06_Destroy, (ActorFunc)Boss06_Update, - (ActorFunc)Boss06_Draw + (ActorFunc)Boss06_Draw, }; */ diff --git a/src/overlays/actors/ovl_Boss_07/z_boss_07.c b/src/overlays/actors/ovl_Boss_07/z_boss_07.c index a8f698ca70..3b8cf4da13 100644 --- a/src/overlays/actors/ovl_Boss_07/z_boss_07.c +++ b/src/overlays/actors/ovl_Boss_07/z_boss_07.c @@ -19,7 +19,7 @@ const ActorInit Boss_07_InitVars = { (ActorFunc)Boss07_Init, (ActorFunc)Boss07_Destroy, (ActorFunc)Boss07_Update, - (ActorFunc)Boss07_Draw + (ActorFunc)Boss07_Draw, }; */ diff --git a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c index e9f472d127..7282595b3e 100644 --- a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c +++ b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c @@ -19,7 +19,7 @@ const ActorInit Boss_Hakugin_InitVars = { (ActorFunc)BossHakugin_Init, (ActorFunc)BossHakugin_Destroy, (ActorFunc)BossHakugin_Update, - (ActorFunc)BossHakugin_Draw + (ActorFunc)BossHakugin_Draw, }; */ diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index 013bd9acec..a6ecb7f933 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -18,7 +18,7 @@ const ActorInit Demo_Effect_InitVars = { (ActorFunc)DemoEffect_Init, (ActorFunc)DemoEffect_Destroy, (ActorFunc)DemoEffect_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c b/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c index 1a7e7e2783..d53fa05437 100644 --- a/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c +++ b/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c @@ -18,7 +18,7 @@ const ActorInit Demo_Getitem_InitVars = { (ActorFunc)DemoGetitem_Init, (ActorFunc)DemoGetitem_Destroy, (ActorFunc)DemoGetitem_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c index 0481b4e2ef..1dda1def50 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -19,7 +19,7 @@ const ActorInit Demo_Kankyo_InitVars = { (ActorFunc)DemoKankyo_Init, (ActorFunc)DemoKankyo_Destroy, (ActorFunc)DemoKankyo_Update, - (ActorFunc)DemoKankyo_Draw + (ActorFunc)DemoKankyo_Draw, }; */ diff --git a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c index d24594d8de..e3955f9dc1 100644 --- a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c +++ b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c @@ -19,7 +19,7 @@ const ActorInit Demo_Moonend_InitVars = { (ActorFunc)DemoMoonend_Init, (ActorFunc)DemoMoonend_Destroy, (ActorFunc)DemoMoonend_Update, - (ActorFunc)DemoMoonend_Draw + (ActorFunc)DemoMoonend_Draw, }; */ diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c index 5781014cf9..d68e977e46 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c @@ -18,7 +18,7 @@ const ActorInit Demo_Shd_InitVars = { (ActorFunc)DemoShd_Init, (ActorFunc)DemoShd_Destroy, (ActorFunc)DemoShd_Update, - (ActorFunc)DemoShd_Draw + (ActorFunc)DemoShd_Draw, }; void DemoShd_Init(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c index 894b931bfd..2d946a30eb 100644 --- a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c +++ b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c @@ -19,7 +19,7 @@ const ActorInit Demo_Syoten_InitVars = { (ActorFunc)DemoSyoten_Init, (ActorFunc)DemoSyoten_Destroy, (ActorFunc)DemoSyoten_Update, - (ActorFunc)DemoSyoten_Draw + (ActorFunc)DemoSyoten_Draw, }; */ diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c index 44420a4cc9..ba5800f689 100644 --- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c +++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c @@ -19,7 +19,7 @@ const ActorInit Demo_Tre_Lgt_InitVars = { (ActorFunc)DemoTreLgt_Init, (ActorFunc)DemoTreLgt_Destroy, (ActorFunc)DemoTreLgt_Update, - (ActorFunc)DemoTreLgt_Draw + (ActorFunc)DemoTreLgt_Draw, }; */ diff --git a/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c index a267a38b49..23d6cc4088 100644 --- a/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c +++ b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c @@ -19,7 +19,7 @@ const ActorInit Dm_Ah_InitVars = { (ActorFunc)DmAh_Init, (ActorFunc)DmAh_Destroy, (ActorFunc)DmAh_Update, - (ActorFunc)DmAh_Draw + (ActorFunc)DmAh_Draw, }; */ diff --git a/src/overlays/actors/ovl_Dm_Al/z_dm_al.c b/src/overlays/actors/ovl_Dm_Al/z_dm_al.c index 4339fb3cb8..b125e556fa 100644 --- a/src/overlays/actors/ovl_Dm_Al/z_dm_al.c +++ b/src/overlays/actors/ovl_Dm_Al/z_dm_al.c @@ -19,7 +19,7 @@ const ActorInit Dm_Al_InitVars = { (ActorFunc)DmAl_Init, (ActorFunc)DmAl_Destroy, (ActorFunc)DmAl_Update, - (ActorFunc)DmAl_Draw + (ActorFunc)DmAl_Draw, }; */ diff --git a/src/overlays/actors/ovl_Dm_An/z_dm_an.c b/src/overlays/actors/ovl_Dm_An/z_dm_an.c index 8257ab03bc..5220fbf04d 100644 --- a/src/overlays/actors/ovl_Dm_An/z_dm_an.c +++ b/src/overlays/actors/ovl_Dm_An/z_dm_an.c @@ -18,7 +18,7 @@ const ActorInit Dm_An_InitVars = { (ActorFunc)DmAn_Init, (ActorFunc)DmAn_Destroy, (ActorFunc)DmAn_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c index 3d34f34307..5b30f48bd4 100644 --- a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c +++ b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c @@ -19,7 +19,7 @@ const ActorInit Dm_Bal_InitVars = { (ActorFunc)DmBal_Init, (ActorFunc)DmBal_Destroy, (ActorFunc)DmBal_Update, - (ActorFunc)DmBal_Draw + (ActorFunc)DmBal_Draw, }; */ diff --git a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c index 06556fff50..410abcafa4 100644 --- a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c +++ b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c @@ -19,7 +19,7 @@ const ActorInit Dm_Char00_InitVars = { (ActorFunc)DmChar00_Init, (ActorFunc)DmChar00_Destroy, (ActorFunc)DmChar00_Update, - (ActorFunc)DmChar00_Draw + (ActorFunc)DmChar00_Draw, }; */ diff --git a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c index 0201408392..a9c406738c 100644 --- a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c +++ b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c @@ -19,7 +19,7 @@ const ActorInit Dm_Char01_InitVars = { (ActorFunc)DmChar01_Init, (ActorFunc)DmChar01_Destroy, (ActorFunc)DmChar01_Update, - (ActorFunc)DmChar01_Draw + (ActorFunc)DmChar01_Draw, }; */ diff --git a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c index ed694e8af7..223283919c 100644 --- a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c +++ b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c @@ -19,7 +19,7 @@ const ActorInit Dm_Char02_InitVars = { (ActorFunc)DmChar02_Init, (ActorFunc)DmChar02_Destroy, (ActorFunc)DmChar02_Update, - (ActorFunc)DmChar02_Draw + (ActorFunc)DmChar02_Draw, }; */ diff --git a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c index dbc8f807ca..f9ca033fe3 100644 --- a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c +++ b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c @@ -19,7 +19,7 @@ const ActorInit Dm_Char03_InitVars = { (ActorFunc)DmChar03_Init, (ActorFunc)DmChar03_Destroy, (ActorFunc)DmChar03_Update, - (ActorFunc)DmChar03_Draw + (ActorFunc)DmChar03_Draw, }; */ diff --git a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c index 98e925826c..0591930bee 100644 --- a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c +++ b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c @@ -19,7 +19,7 @@ const ActorInit Dm_Char04_InitVars = { (ActorFunc)DmChar04_Init, (ActorFunc)DmChar04_Destroy, (ActorFunc)DmChar04_Update, - (ActorFunc)DmChar04_Draw + (ActorFunc)DmChar04_Draw, }; */ diff --git a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c index 927c5dbcfb..4d69bd6e60 100644 --- a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c +++ b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c @@ -19,7 +19,7 @@ const ActorInit Dm_Char05_InitVars = { (ActorFunc)DmChar05_Init, (ActorFunc)DmChar05_Destroy, (ActorFunc)DmChar05_Update, - (ActorFunc)DmChar05_Draw + (ActorFunc)DmChar05_Draw, }; */ diff --git a/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c b/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c index 33d00e86df..01e7363ea3 100644 --- a/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c +++ b/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c @@ -19,7 +19,7 @@ const ActorInit Dm_Char06_InitVars = { (ActorFunc)DmChar06_Init, (ActorFunc)DmChar06_Destroy, (ActorFunc)DmChar06_Update, - (ActorFunc)DmChar06_Draw + (ActorFunc)DmChar06_Draw, }; */ diff --git a/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c index 5f0f50a108..e2a754e175 100644 --- a/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c +++ b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c @@ -19,7 +19,7 @@ const ActorInit Dm_Char07_InitVars = { (ActorFunc)DmChar07_Init, (ActorFunc)DmChar07_Destroy, (ActorFunc)DmChar07_Update, - (ActorFunc)DmChar07_Draw + (ActorFunc)DmChar07_Draw, }; */ diff --git a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c index 32f76601a6..8f2bfebac9 100644 --- a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c +++ b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c @@ -19,7 +19,7 @@ const ActorInit Dm_Char08_InitVars = { (ActorFunc)DmChar08_Init, (ActorFunc)DmChar08_Destroy, (ActorFunc)DmChar08_Update, - (ActorFunc)DmChar08_Draw + (ActorFunc)DmChar08_Draw, }; */ diff --git a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c index 3032036d30..eaf2988a01 100644 --- a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c +++ b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c @@ -19,7 +19,7 @@ const ActorInit Dm_Char09_InitVars = { (ActorFunc)DmChar09_Init, (ActorFunc)DmChar09_Destroy, (ActorFunc)DmChar09_Update, - (ActorFunc)DmChar09_Draw + (ActorFunc)DmChar09_Draw, }; */ diff --git a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c index e494c06f81..987ff4b299 100644 --- a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c +++ b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c @@ -18,7 +18,7 @@ const ActorInit Dm_Gm_InitVars = { (ActorFunc)DmGm_Init, (ActorFunc)DmGm_Destroy, (ActorFunc)DmGm_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c index 0f6193e59a..c009f856be 100644 --- a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c +++ b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c @@ -19,7 +19,7 @@ const ActorInit Dm_Hina_InitVars = { (ActorFunc)DmHina_Init, (ActorFunc)DmHina_Destroy, (ActorFunc)DmHina_Update, - (ActorFunc)DmHina_Draw + (ActorFunc)DmHina_Draw, }; */ diff --git a/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c index c50c22b27c..2bb4ac2086 100644 --- a/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c +++ b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c @@ -19,7 +19,7 @@ const ActorInit Dm_Nb_InitVars = { (ActorFunc)DmNb_Init, (ActorFunc)DmNb_Destroy, (ActorFunc)DmNb_Update, - (ActorFunc)DmNb_Draw + (ActorFunc)DmNb_Draw, }; */ diff --git a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c index 9fbbaee946..83d0644372 100644 --- a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c +++ b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c @@ -19,7 +19,7 @@ const ActorInit Dm_Opstage_InitVars = { (ActorFunc)DmOpstage_Init, (ActorFunc)DmOpstage_Destroy, (ActorFunc)DmOpstage_Update, - (ActorFunc)DmOpstage_Draw + (ActorFunc)DmOpstage_Draw, }; */ diff --git a/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c b/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c index abea0ce8b1..f16238dbf0 100644 --- a/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c +++ b/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c @@ -54,7 +54,7 @@ void DmRavine_Update(Actor* thisx, GlobalContext* globalCtx) { DmRavine* this = THIS; RoomContext* roomCtx; - switch ((DmRavineState) this->state) { + switch ((DmRavineState)this->state) { case DM_RAVINE_STATE_INITIALIZED: return; case DM_RAVINE_STATE_ACTIVE: diff --git a/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c index ebd8316791..566c6f614a 100644 --- a/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c +++ b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c @@ -18,7 +18,7 @@ const ActorInit Dm_Statue_InitVars = { (ActorFunc)DmStatue_Init, (ActorFunc)DmStatue_Destroy, (ActorFunc)DmStatue_Update, - (ActorFunc)DmStatue_Draw + (ActorFunc)DmStatue_Draw, }; extern AnimatedMaterial D_06001788; diff --git a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c index 07c3500040..37a1aec954 100644 --- a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c +++ b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c @@ -19,7 +19,7 @@ const ActorInit Dm_Stk_InitVars = { (ActorFunc)DmStk_Init, (ActorFunc)DmStk_Destroy, (ActorFunc)DmStk_Update, - (ActorFunc)DmStk_Draw + (ActorFunc)DmStk_Draw, }; */ diff --git a/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c index c161bdad15..b26ae28e86 100644 --- a/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c +++ b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c @@ -18,7 +18,7 @@ const ActorInit Dm_Tag_InitVars = { (ActorFunc)DmTag_Init, (ActorFunc)DmTag_Destroy, (ActorFunc)DmTag_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c index 79fd5f9e2b..0579c1ce81 100644 --- a/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c +++ b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c @@ -19,7 +19,7 @@ const ActorInit Dm_Tsg_InitVars = { (ActorFunc)DmTsg_Init, (ActorFunc)DmTsg_Destroy, (ActorFunc)DmTsg_Update, - (ActorFunc)DmTsg_Draw + (ActorFunc)DmTsg_Draw, }; */ diff --git a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c index 8236f75b05..9e631633f6 100644 --- a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c +++ b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c @@ -19,7 +19,7 @@ const ActorInit Dm_Zl_InitVars = { (ActorFunc)DmZl_Init, (ActorFunc)DmZl_Destroy, (ActorFunc)DmZl_Update, - (ActorFunc)DmZl_Draw + (ActorFunc)DmZl_Draw, }; */ diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c index 4e91e48bf4..6bb828acbd 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -22,12 +22,26 @@ const ActorInit Door_Ana_InitVars = { (ActorFunc)DoorAna_Init, (ActorFunc)DoorAna_Destroy, (ActorFunc)DoorAna_Update, - (ActorFunc)DoorAna_Draw + (ActorFunc)DoorAna_Draw, }; -static ColliderCylinderInit sCylinderInit = { - { COLTYPE_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, OC2_NONE, COLSHAPE_CYLINDER, }, - { ELEMTYPE_UNK2, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, }, +static ColliderCylinderInit sCylinderInit = { + { + COLTYPE_NONE, + AT_NONE, + AC_ON | AC_TYPE_PLAYER, + OC1_NONE, + OC2_NONE, + COLSHAPE_CYLINDER, + }, + { + ELEMTYPE_UNK2, + { 0x00000000, 0x00, 0x00 }, + { 0x00000008, 0x00, 0x00 }, + TOUCH_NONE | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_NONE, + }, { 50, 10, 0, { 0, 0, 0 } }, }; @@ -50,7 +64,7 @@ void DoorAna_Init(Actor* thisx, GlobalContext* globalCtx) { if (grottoType == DOORANA_TYPE_HIDDEN) { Collider_InitAndSetCylinder(globalCtx, &this->bombCollider, &this->actor, &sCylinderInit); } else { - this->actor.flags |= 0x10; // always update + this->actor.flags |= 0x10; // always update } Actor_SetScale(&this->actor, 0); @@ -110,19 +124,19 @@ void DoorAna_WaitOpen(DoorAna* this, GlobalContext* globalCtx) { s32 entranceIndex; f32 yDist; - if (Math_StepToF( &this->actor.scale, 0.01f, 0.001f) != 0) { + if (Math_StepToF(&this->actor.scale, 0.01f, 0.001f) != 0) { if ((this->actor.targetMode != 0) && (globalCtx->unk18875 == 0) && (globalCtx->unk18B4A == 0) && - (player->stateFlags1 & 0x80000000) && (player->unkAE7 == 0)) { + (player->stateFlags1 & 0x80000000) && (player->unkAE7 == 0)) { if (dooranaType == DOORANA_TYPE_ADJACENT) { - // 300 uses scene exit addresses, not static DoorAna entrance addresses, + // 300 uses scene exit addresses, not static DoorAna entrance addresses, // eg. deku playground gets address in the NCT scene exit table entranceIndex = GET_DOORANA_ADJACENT_ENTRANCE(this); globalCtx->nextEntranceIndex = globalCtx->setupExitList[entranceIndex]; - lblUnk_808E03B8: ; // required to convince compiler to not use delay slot + lblUnk_808E03B8:; // required to convince compiler to not use delay slot - } else { + } else { // unused in vanilla, the highest params bits can directly index an address entranceIndex = GET_DOORANA_DIRECT_ENTRANCE(this); @@ -144,11 +158,11 @@ void DoorAna_WaitOpen(DoorAna* this, GlobalContext* globalCtx) { DoorAna_SetupAction(this, DoorAna_GrabLink); - } else { - if ((func_801690CC(globalCtx) == 0) && ((player->stateFlags1 & 0x08800000) == 0) - && (this->actor.xzDistToPlayer <= 20.0f) - && (yDist = this->actor.yDistToPlayer, (yDist >= -50.0f)) && (yDist <= 15.0f)) { - player->stateFlags1 |= 0x80000000; + } else { + if ((func_801690CC(globalCtx) == 0) && ((player->stateFlags1 & 0x08800000) == 0) && + (this->actor.xzDistToPlayer <= 20.0f) && (yDist = this->actor.yDistToPlayer, (yDist >= -50.0f)) && + (yDist <= 15.0f)) { + player->stateFlags1 |= 0x80000000; this->actor.targetMode = 1; } else { @@ -157,7 +171,7 @@ void DoorAna_WaitOpen(DoorAna* this, GlobalContext* globalCtx) { } } - Actor_SetScale( &this->actor, this->actor.scale.x); + Actor_SetScale(&this->actor, this->actor.scale.x); } void DoorAna_GrabLink(DoorAna* this, GlobalContext* globalCtx) { @@ -179,13 +193,13 @@ void DoorAna_GrabLink(DoorAna* this, GlobalContext* globalCtx) { } } -void DoorAna_Update(Actor *thisx, GlobalContext *globalCtx) { - DoorAna* this = THIS; +void DoorAna_Update(Actor* thisx, GlobalContext* globalCtx) { + DoorAna* this = THIS; this->actionFunc(this, globalCtx); this->actor.shape.rot.y = func_800DFCDC(globalCtx->cameraPtrs[globalCtx->activeCamera]) + 0x8000; } -void DoorAna_Draw(Actor *thisx, GlobalContext *globalCtx) { +void DoorAna_Draw(Actor* thisx, GlobalContext* globalCtx) { Gfx* doorAnaDL = D_05000C40; func_800BE03C(globalCtx, doorAnaDL); } diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c index 93e0f457ea..7bc56d5e41 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -18,7 +18,7 @@ const ActorInit Door_Shutter_InitVars = { (ActorFunc)DoorShutter_Init, (ActorFunc)DoorShutter_Destroy, (ActorFunc)DoorShutter_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c index 39e9b65aa4..216443acbf 100644 --- a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c +++ b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c @@ -84,7 +84,7 @@ extern Gfx D_06013EA8[]; // Parameters for each staircase, indexed with SpiralType static SpiralInfo sSpiralInfo[] = { - { { NULL, NULL }, 0, 130, 12, 50, 15 }, // SPIRAL_OVERWORLD + { { NULL, NULL }, 0, 130, 12, 50, 15 }, // SPIRAL_OVERWORLD { { D_050219E0, D_0501D980 }, 0, 130, 12, 50, 15 }, // SPIRAL_DUNGEON { { D_06004448, D_060007A8 }, 0, 130, 12, 50, 15 }, // SPIRAL_WOODFALL_TEMPLE { { D_060051B8, D_060014C8 }, 0, 130, 12, 50, 15 }, // SPIRAL_WOODFALL_TEMPLE_ALT @@ -96,13 +96,10 @@ static SpiralInfo sSpiralInfo[] = { // Defines which object bank a staircase should use, and its index to `sSpiralInfo` static SpiralObjectInfo sSpiralObjectInfo[] = { - { GAMEPLAY_KEEP, SPIRAL_OVERWORLD }, - { GAMEPLAY_DANGEON_KEEP, SPIRAL_DUNGEON }, - { OBJECT_NUMA_OBJ, SPIRAL_WOODFALL_TEMPLE }, - { OBJECT_HAKUGIN_OBJ, SPIRAL_SNOWHEAD_TEMPLE }, - { OBJECT_IKANA_OBJ, SPIRAL_STONE_TOWER }, - { OBJECT_DANPEI_OBJECT, SPIRAL_DAMPES_HOUSE }, - { OBJECT_IKNINSIDE_OBJ, SPIRAL_IKANA_CASTLE }, + { GAMEPLAY_KEEP, SPIRAL_OVERWORLD }, { GAMEPLAY_DANGEON_KEEP, SPIRAL_DUNGEON }, + { OBJECT_NUMA_OBJ, SPIRAL_WOODFALL_TEMPLE }, { OBJECT_HAKUGIN_OBJ, SPIRAL_SNOWHEAD_TEMPLE }, + { OBJECT_IKANA_OBJ, SPIRAL_STONE_TOWER }, { OBJECT_DANPEI_OBJECT, SPIRAL_DAMPES_HOUSE }, + { OBJECT_IKNINSIDE_OBJ, SPIRAL_IKANA_CASTLE }, }; /** @@ -137,18 +134,16 @@ s32 DoorSpiral_SetSpiralType(DoorSpiral* this, GlobalContext* globalCtx) { /** * Gets the object type to be used as an index to `sSpiralObjectInfo`. - * It first checks `sSpiralSceneInfo`, but if the current scene is not found it will fall back to the default spiral (overworld or dungeon). + * It first checks `sSpiralSceneInfo`, but if the current scene is not found it will fall back to the default spiral + * (overworld or dungeon). */ s32 DoorSpiral_GetObjectType(GlobalContext* globalCtx) { // Defines which object type should be used for specific scenes static SpiralSceneInfo spiralSceneInfo[] = { - { SCENE_MITURIN, SPIRAL_OBJECT_WOODFALL }, - { SCENE_HAKUGIN, SPIRAL_OBJECT_SNOWHEAD }, - { SCENE_INISIE_N, SPIRAL_OBJECT_STONE_TOWER }, - { SCENE_INISIE_R, SPIRAL_OBJECT_STONE_TOWER }, - { SCENE_DANPEI2TEST, SPIRAL_OBJECT_DAMPES_HOUSE }, - { SCENE_IKNINSIDE, SPIRAL_OBJECT_IKANA_CASTLE }, - { SCENE_CASTLE, SPIRAL_OBJECT_IKANA_CASTLE }, + { SCENE_MITURIN, SPIRAL_OBJECT_WOODFALL }, { SCENE_HAKUGIN, SPIRAL_OBJECT_SNOWHEAD }, + { SCENE_INISIE_N, SPIRAL_OBJECT_STONE_TOWER }, { SCENE_INISIE_R, SPIRAL_OBJECT_STONE_TOWER }, + { SCENE_DANPEI2TEST, SPIRAL_OBJECT_DAMPES_HOUSE }, { SCENE_IKNINSIDE, SPIRAL_OBJECT_IKANA_CASTLE }, + { SCENE_CASTLE, SPIRAL_OBJECT_IKANA_CASTLE }, }; SpiralSceneInfo* sceneInfo = spiralSceneInfo; s32 i; @@ -166,7 +161,8 @@ s32 DoorSpiral_GetObjectType(GlobalContext* globalCtx) { type = sceneInfo->objectType; } else { // Set the type based on if link is in a dungeon scene, or the overworld - type = (Object_GetIndex(&globalCtx->objectCtx, GAMEPLAY_DANGEON_KEEP) >= 0) ? SPIRAL_OBJECT_DUNGEON : SPIRAL_OBJECT_OVERWORLD; + type = (Object_GetIndex(&globalCtx->objectCtx, GAMEPLAY_DANGEON_KEEP) >= 0) ? SPIRAL_OBJECT_DUNGEON + : SPIRAL_OBJECT_OVERWORLD; } return type; diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c index 6e76901565..18f32f9fd9 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -19,7 +19,7 @@ const ActorInit Door_Warp1_InitVars = { (ActorFunc)DoorWarp1_Init, (ActorFunc)DoorWarp1_Destroy, (ActorFunc)DoorWarp1_Update, - (ActorFunc)DoorWarp1_Draw + (ActorFunc)DoorWarp1_Draw, }; */ diff --git a/src/overlays/actors/ovl_Eff_Change/z_eff_change.c b/src/overlays/actors/ovl_Eff_Change/z_eff_change.c index 6ce589054a..0843d59921 100644 --- a/src/overlays/actors/ovl_Eff_Change/z_eff_change.c +++ b/src/overlays/actors/ovl_Eff_Change/z_eff_change.c @@ -18,7 +18,7 @@ const ActorInit Eff_Change_InitVars = { (ActorFunc)EffChange_Init, (ActorFunc)EffChange_Destroy, (ActorFunc)EffChange_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c index 1533a60b74..51c6cdd762 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c @@ -19,7 +19,7 @@ const ActorInit Eff_Dust_InitVars = { (ActorFunc)EffDust_Init, (ActorFunc)EffDust_Destroy, (ActorFunc)EffDust_Update, - (ActorFunc)EffDust_Draw + (ActorFunc)EffDust_Draw, }; */ diff --git a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c index af9332ecf8..bc6dc586d1 100644 --- a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c +++ b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c @@ -18,7 +18,7 @@ const ActorInit Eff_Kamejima_Wave_InitVars = { (ActorFunc)EffKamejimaWave_Init, (ActorFunc)EffKamejimaWave_Destroy, (ActorFunc)EffKamejimaWave_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c index 2b78d16bdc..e21e1d7ef2 100644 --- a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c +++ b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c @@ -19,7 +19,7 @@ const ActorInit Eff_Lastday_InitVars = { (ActorFunc)EffLastday_Init, (ActorFunc)EffLastday_Destroy, (ActorFunc)EffLastday_Update, - (ActorFunc)EffLastday_Draw + (ActorFunc)EffLastday_Draw, }; */ diff --git a/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c index 8504bc2945..459e124713 100644 --- a/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c +++ b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c @@ -19,7 +19,7 @@ const ActorInit Eff_Stk_InitVars = { (ActorFunc)EffStk_Init, (ActorFunc)EffStk_Destroy, (ActorFunc)EffStk_Update, - (ActorFunc)EffStk_Draw + (ActorFunc)EffStk_Draw, }; */ diff --git a/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c index 96e2eab708..76e9378161 100644 --- a/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c +++ b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c @@ -19,7 +19,7 @@ const ActorInit Eff_Zoraband_InitVars = { (ActorFunc)EffZoraband_Init, (ActorFunc)EffZoraband_Destroy, (ActorFunc)EffZoraband_Update, - (ActorFunc)EffZoraband_Draw + (ActorFunc)EffZoraband_Draw, }; */ diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c index 8e5107c25d..524e3b28a4 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -18,7 +18,7 @@ const ActorInit Elf_Msg_InitVars = { (ActorFunc)ElfMsg_Init, (ActorFunc)ElfMsg_Destroy, (ActorFunc)ElfMsg_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c index 70a7964594..f9d7f8e216 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c @@ -18,7 +18,7 @@ const ActorInit Elf_Msg2_InitVars = { (ActorFunc)ElfMsg2_Init, (ActorFunc)ElfMsg2_Destroy, (ActorFunc)ElfMsg2_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c index f5b8ae75eb..2652e32bba 100644 --- a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c +++ b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c @@ -18,7 +18,7 @@ const ActorInit Elf_Msg3_InitVars = { (ActorFunc)ElfMsg3_Init, (ActorFunc)ElfMsg3_Destroy, (ActorFunc)ElfMsg3_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c index b9d9cdccef..7d0a6eab43 100644 --- a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c +++ b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c @@ -18,7 +18,7 @@ const ActorInit Elf_Msg4_InitVars = { (ActorFunc)ElfMsg4_Init, (ActorFunc)ElfMsg4_Destroy, (ActorFunc)ElfMsg4_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c index 56ef84899f..3d48fa2c3b 100644 --- a/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c +++ b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c @@ -18,7 +18,7 @@ const ActorInit Elf_Msg5_InitVars = { (ActorFunc)ElfMsg5_Init, (ActorFunc)ElfMsg5_Destroy, (ActorFunc)ElfMsg5_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c index d00ca80ca3..37241b4298 100644 --- a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c +++ b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c @@ -18,7 +18,7 @@ const ActorInit Elf_Msg6_InitVars = { (ActorFunc)ElfMsg6_Init, (ActorFunc)ElfMsg6_Destroy, (ActorFunc)ElfMsg6_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Ah/z_en_ah.c b/src/overlays/actors/ovl_En_Ah/z_en_ah.c index dbc91b08e3..4e982594d9 100644 --- a/src/overlays/actors/ovl_En_Ah/z_en_ah.c +++ b/src/overlays/actors/ovl_En_Ah/z_en_ah.c @@ -19,7 +19,7 @@ const ActorInit En_Ah_InitVars = { (ActorFunc)EnAh_Init, (ActorFunc)EnAh_Destroy, (ActorFunc)EnAh_Update, - (ActorFunc)EnAh_Draw + (ActorFunc)EnAh_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c index 8b2c3b20a4..120284d73b 100644 --- a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c +++ b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c @@ -19,7 +19,7 @@ const ActorInit En_Akindonuts_InitVars = { (ActorFunc)EnAkindonuts_Init, (ActorFunc)EnAkindonuts_Destroy, (ActorFunc)EnAkindonuts_Update, - (ActorFunc)EnAkindonuts_Draw + (ActorFunc)EnAkindonuts_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Al/z_en_al.c b/src/overlays/actors/ovl_En_Al/z_en_al.c index 6cc44e9ab4..cfbf0ffd60 100644 --- a/src/overlays/actors/ovl_En_Al/z_en_al.c +++ b/src/overlays/actors/ovl_En_Al/z_en_al.c @@ -19,7 +19,7 @@ const ActorInit En_Al_InitVars = { (ActorFunc)EnAl_Init, (ActorFunc)EnAl_Destroy, (ActorFunc)EnAl_Update, - (ActorFunc)EnAl_Draw + (ActorFunc)EnAl_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.c b/src/overlays/actors/ovl_En_Am/z_en_am.c index acda64d4e7..4409bc17cb 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -19,7 +19,7 @@ const ActorInit En_Am_InitVars = { (ActorFunc)EnAm_Init, (ActorFunc)EnAm_Destroy, (ActorFunc)EnAm_Update, - (ActorFunc)EnAm_Draw + (ActorFunc)EnAm_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_An/z_en_an.c b/src/overlays/actors/ovl_En_An/z_en_an.c index 8d706f898d..49f199316e 100644 --- a/src/overlays/actors/ovl_En_An/z_en_an.c +++ b/src/overlays/actors/ovl_En_An/z_en_an.c @@ -18,7 +18,7 @@ const ActorInit En_An_InitVars = { (ActorFunc)EnAn_Init, (ActorFunc)EnAn_Destroy, (ActorFunc)EnAn_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_And/z_en_and.c b/src/overlays/actors/ovl_En_And/z_en_and.c index 0012b1fb59..b929e556d4 100644 --- a/src/overlays/actors/ovl_En_And/z_en_and.c +++ b/src/overlays/actors/ovl_En_And/z_en_and.c @@ -19,7 +19,7 @@ const ActorInit En_And_InitVars = { (ActorFunc)EnAnd_Init, (ActorFunc)EnAnd_Destroy, (ActorFunc)EnAnd_Update, - (ActorFunc)EnAnd_Draw + (ActorFunc)EnAnd_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c index 48e8bb31e5..8f258f6d95 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -19,7 +19,7 @@ const ActorInit En_Ani_InitVars = { (ActorFunc)EnAni_Init, (ActorFunc)EnAni_Destroy, (ActorFunc)EnAni_Update, - (ActorFunc)EnAni_Draw + (ActorFunc)EnAni_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c index 833d8d5df5..170fa01e60 100644 --- a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c +++ b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c @@ -19,7 +19,7 @@ const ActorInit En_Aob_01_InitVars = { (ActorFunc)EnAob01_Init, (ActorFunc)EnAob01_Destroy, (ActorFunc)EnAob01_Update, - (ActorFunc)EnAob01_Draw + (ActorFunc)EnAob01_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c index 21cad591de..75c0818ebb 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -19,7 +19,7 @@ const ActorInit En_Arrow_InitVars = { (ActorFunc)EnArrow_Init, (ActorFunc)EnArrow_Destroy, (ActorFunc)EnArrow_Update, - (ActorFunc)EnArrow_Draw + (ActorFunc)EnArrow_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c index 84f5307d83..e013caf4ea 100644 --- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c @@ -19,7 +19,7 @@ const ActorInit En_Attack_Niw_InitVars = { (ActorFunc)EnAttackNiw_Init, (ActorFunc)EnAttackNiw_Destroy, (ActorFunc)EnAttackNiw_Update, - (ActorFunc)EnAttackNiw_Draw + (ActorFunc)EnAttackNiw_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Az/z_en_az.c b/src/overlays/actors/ovl_En_Az/z_en_az.c index 5f8a9dd21a..a8bb9958a7 100644 --- a/src/overlays/actors/ovl_En_Az/z_en_az.c +++ b/src/overlays/actors/ovl_En_Az/z_en_az.c @@ -19,7 +19,7 @@ const ActorInit En_Az_InitVars = { (ActorFunc)EnAz_Init, (ActorFunc)EnAz_Destroy, (ActorFunc)EnAz_Update, - (ActorFunc)EnAz_Draw + (ActorFunc)EnAz_Draw, }; */ 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 c8a34f93ed..f48ed134d1 100644 --- a/src/overlays/actors/ovl_En_Baba/z_en_baba.c +++ b/src/overlays/actors/ovl_En_Baba/z_en_baba.c @@ -19,7 +19,7 @@ const ActorInit En_Baba_InitVars = { (ActorFunc)EnBaba_Init, (ActorFunc)EnBaba_Destroy, (ActorFunc)EnBaba_Update, - (ActorFunc)EnBaba_Draw + (ActorFunc)EnBaba_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c index 0adad488d4..fe2f175fd3 100644 --- a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c +++ b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c @@ -18,7 +18,7 @@ const ActorInit En_Baguo_InitVars = { (ActorFunc)EnBaguo_Init, (ActorFunc)EnBaguo_Destroy, (ActorFunc)EnBaguo_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c index fbd04dcf6f..66a3e50ed6 100644 --- a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c +++ b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c @@ -19,7 +19,7 @@ const ActorInit En_Baisen_InitVars = { (ActorFunc)EnBaisen_Init, (ActorFunc)EnBaisen_Destroy, (ActorFunc)EnBaisen_Update, - (ActorFunc)EnBaisen_Draw + (ActorFunc)EnBaisen_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Bal/z_en_bal.c b/src/overlays/actors/ovl_En_Bal/z_en_bal.c index ab5a78c4e9..7312413831 100644 --- a/src/overlays/actors/ovl_En_Bal/z_en_bal.c +++ b/src/overlays/actors/ovl_En_Bal/z_en_bal.c @@ -19,7 +19,7 @@ const ActorInit En_Bal_InitVars = { (ActorFunc)EnBal_Init, (ActorFunc)EnBal_Destroy, (ActorFunc)EnBal_Update, - (ActorFunc)EnBal_Draw + (ActorFunc)EnBal_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Bat/z_en_bat.c b/src/overlays/actors/ovl_En_Bat/z_en_bat.c index df5bd8bc8e..78b0eacf5e 100644 --- a/src/overlays/actors/ovl_En_Bat/z_en_bat.c +++ b/src/overlays/actors/ovl_En_Bat/z_en_bat.c @@ -19,7 +19,7 @@ const ActorInit En_Bat_InitVars = { (ActorFunc)EnBat_Init, (ActorFunc)EnBat_Destroy, (ActorFunc)EnBat_Update, - (ActorFunc)EnBat_Draw + (ActorFunc)EnBat_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c index 45b6062eb5..c66daf7939 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -19,7 +19,7 @@ const ActorInit En_Bb_InitVars = { (ActorFunc)EnBb_Init, (ActorFunc)EnBb_Destroy, (ActorFunc)EnBb_Update, - (ActorFunc)EnBb_Draw + (ActorFunc)EnBb_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c index 393ef16330..122541832c 100644 --- a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c +++ b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c @@ -19,7 +19,7 @@ const ActorInit En_Bba_01_InitVars = { (ActorFunc)EnBba01_Init, (ActorFunc)EnBba01_Destroy, (ActorFunc)EnBba01_Update, - (ActorFunc)EnBba01_Draw + (ActorFunc)EnBba01_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c index bb0fb668e6..2eda58e072 100644 --- a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c +++ b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c @@ -19,7 +19,7 @@ const ActorInit En_Bbfall_InitVars = { (ActorFunc)EnBbfall_Init, (ActorFunc)EnBbfall_Destroy, (ActorFunc)EnBbfall_Update, - (ActorFunc)EnBbfall_Draw + (ActorFunc)EnBbfall_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Bee/z_en_bee.c b/src/overlays/actors/ovl_En_Bee/z_en_bee.c index 92ab20a9ba..ffa724597a 100644 --- a/src/overlays/actors/ovl_En_Bee/z_en_bee.c +++ b/src/overlays/actors/ovl_En_Bee/z_en_bee.c @@ -19,7 +19,7 @@ const ActorInit En_Bee_InitVars = { (ActorFunc)EnBee_Init, (ActorFunc)EnBee_Destroy, (ActorFunc)EnBee_Update, - (ActorFunc)EnBee_Draw + (ActorFunc)EnBee_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Bh/z_en_bh.c b/src/overlays/actors/ovl_En_Bh/z_en_bh.c index f4de30dbb3..ecb7a9c274 100644 --- a/src/overlays/actors/ovl_En_Bh/z_en_bh.c +++ b/src/overlays/actors/ovl_En_Bh/z_en_bh.c @@ -19,7 +19,7 @@ const ActorInit En_Bh_InitVars = { (ActorFunc)EnBh_Init, (ActorFunc)EnBh_Destroy, (ActorFunc)EnBh_Update, - (ActorFunc)EnBh_Draw + (ActorFunc)EnBh_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c index c9ea26d74e..20ed2bde1d 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -19,7 +19,7 @@ const ActorInit En_Bigokuta_InitVars = { (ActorFunc)EnBigokuta_Init, (ActorFunc)EnBigokuta_Destroy, (ActorFunc)EnBigokuta_Update, - (ActorFunc)EnBigokuta_Draw + (ActorFunc)EnBigokuta_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c index 286602dd11..9d080debc6 100644 --- a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c +++ b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c @@ -19,7 +19,7 @@ const ActorInit En_Bigpamet_InitVars = { (ActorFunc)EnBigpamet_Init, (ActorFunc)EnBigpamet_Destroy, (ActorFunc)EnBigpamet_Update, - (ActorFunc)EnBigpamet_Draw + (ActorFunc)EnBigpamet_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c index b843f633f1..7cfb2d877b 100644 --- a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c +++ b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c @@ -18,7 +18,7 @@ const ActorInit En_Bigpo_InitVars = { (ActorFunc)EnBigpo_Init, (ActorFunc)EnBigpo_Destroy, (ActorFunc)EnBigpo_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ 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 18d5ee4f7e..733e31a2ae 100644 --- a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c +++ b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c @@ -19,7 +19,7 @@ const ActorInit En_Bigslime_InitVars = { (ActorFunc)EnBigslime_Init, (ActorFunc)EnBigslime_Destroy, (ActorFunc)EnBigslime_Update, - (ActorFunc)EnBigslime_Draw + (ActorFunc)EnBigslime_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c index 21278fb6af..7cb76eebbb 100644 --- a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c +++ b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c @@ -19,7 +19,7 @@ const ActorInit En_Bji_01_InitVars = { (ActorFunc)EnBji01_Init, (ActorFunc)EnBji01_Destroy, (ActorFunc)EnBji01_Update, - (ActorFunc)EnBji01_Draw + (ActorFunc)EnBji01_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c index 8b9fb1f9ca..9d6af72084 100644 --- a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c +++ b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c @@ -19,7 +19,7 @@ const ActorInit En_Bjt_InitVars = { (ActorFunc)EnBjt_Init, (ActorFunc)EnBjt_Destroy, (ActorFunc)EnBjt_Update, - (ActorFunc)EnBjt_Draw + (ActorFunc)EnBjt_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c b/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c index 08a072ae0b..5981567e77 100644 --- a/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c +++ b/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c @@ -18,7 +18,7 @@ const ActorInit En_Boj_01_InitVars = { (ActorFunc)EnBoj01_Init, (ActorFunc)EnBoj01_Destroy, (ActorFunc)EnBoj01_Update, - (ActorFunc)EnBoj01_Draw + (ActorFunc)EnBoj01_Draw, }; void EnBoj01_Init(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c b/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c index 83a8348aa9..602a1016e6 100644 --- a/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c +++ b/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c @@ -18,7 +18,7 @@ const ActorInit En_Boj_02_InitVars = { (ActorFunc)EnBoj02_Init, (ActorFunc)EnBoj02_Destroy, (ActorFunc)EnBoj02_Update, - (ActorFunc)EnBoj02_Draw + (ActorFunc)EnBoj02_Draw, }; void EnBoj02_Init(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c b/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c index 9ef272cd82..6c5736858d 100644 --- a/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c +++ b/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c @@ -18,7 +18,7 @@ const ActorInit En_Boj_03_InitVars = { (ActorFunc)EnBoj03_Init, (ActorFunc)EnBoj03_Destroy, (ActorFunc)EnBoj03_Update, - (ActorFunc)EnBoj03_Draw + (ActorFunc)EnBoj03_Draw, }; void EnBoj03_Init(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c b/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c index 6229f78df7..1cfd102efe 100644 --- a/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c +++ b/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c @@ -18,7 +18,7 @@ const ActorInit En_Boj_04_InitVars = { (ActorFunc)EnBoj04_Init, (ActorFunc)EnBoj04_Destroy, (ActorFunc)EnBoj04_Update, - (ActorFunc)EnBoj04_Draw + (ActorFunc)EnBoj04_Draw, }; void EnBoj04_Init(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c b/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c index 488ee3be63..8513d0f954 100644 --- a/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c +++ b/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c @@ -18,7 +18,7 @@ const ActorInit En_Boj_05_InitVars = { (ActorFunc)EnBoj05_Init, (ActorFunc)EnBoj05_Destroy, (ActorFunc)EnBoj05_Update, - (ActorFunc)EnBoj05_Draw + (ActorFunc)EnBoj05_Draw, }; void EnBoj05_Init(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c index 618732a419..79c3b37dcd 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -19,7 +19,7 @@ const ActorInit En_Bom_InitVars = { (ActorFunc)EnBom_Init, (ActorFunc)EnBom_Destroy, (ActorFunc)EnBom_Update, - (ActorFunc)EnBom_Draw + (ActorFunc)EnBom_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index 0053f31794..db8d93e7bb 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -19,7 +19,7 @@ const ActorInit En_Bom_Bowl_Man_InitVars = { (ActorFunc)EnBomBowlMan_Init, (ActorFunc)EnBomBowlMan_Destroy, (ActorFunc)EnBomBowlMan_Update, - (ActorFunc)EnBomBowlMan_Draw + (ActorFunc)EnBomBowlMan_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c index 6ea02b6e0e..7a67306f3b 100644 --- a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c +++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c @@ -19,7 +19,7 @@ const ActorInit En_Bom_Chu_InitVars = { (ActorFunc)EnBomChu_Init, (ActorFunc)EnBomChu_Destroy, (ActorFunc)EnBomChu_Update, - (ActorFunc)EnBomChu_Draw + (ActorFunc)EnBomChu_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c index 5cdbb77946..f81ae5d80f 100644 --- a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c +++ b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c @@ -19,7 +19,7 @@ const ActorInit En_Bombal_InitVars = { (ActorFunc)EnBombal_Init, (ActorFunc)EnBombal_Destroy, (ActorFunc)EnBombal_Update, - (ActorFunc)EnBombal_Draw + (ActorFunc)EnBombal_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c index d7f5c0ff59..e51743ef11 100644 --- a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c +++ b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c @@ -19,7 +19,7 @@ const ActorInit En_Bombers_InitVars = { (ActorFunc)EnBombers_Init, (ActorFunc)EnBombers_Destroy, (ActorFunc)EnBombers_Update, - (ActorFunc)EnBombers_Draw + (ActorFunc)EnBombers_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c index d9f8ddb302..18fc7e6b65 100644 --- a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c +++ b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c @@ -19,7 +19,7 @@ const ActorInit En_Bombers2_InitVars = { (ActorFunc)EnBombers2_Init, (ActorFunc)EnBombers2_Destroy, (ActorFunc)EnBombers2_Update, - (ActorFunc)EnBombers2_Draw + (ActorFunc)EnBombers2_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c index 5c0ec70aea..ba5737630d 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -19,7 +19,7 @@ const ActorInit En_Bombf_InitVars = { (ActorFunc)EnBombf_Init, (ActorFunc)EnBombf_Destroy, (ActorFunc)EnBombf_Update, - (ActorFunc)EnBombf_Draw + (ActorFunc)EnBombf_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c index eb809269e3..8fff6bf050 100644 --- a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c +++ b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c @@ -19,7 +19,7 @@ const ActorInit En_Bomjima_InitVars = { (ActorFunc)EnBomjima_Init, (ActorFunc)EnBomjima_Destroy, (ActorFunc)EnBomjima_Update, - (ActorFunc)EnBomjima_Draw + (ActorFunc)EnBomjima_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c index af288f131e..67b82d3918 100644 --- a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c +++ b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c @@ -19,7 +19,7 @@ const ActorInit En_Bomjimb_InitVars = { (ActorFunc)EnBomjimb_Init, (ActorFunc)EnBomjimb_Destroy, (ActorFunc)EnBomjimb_Update, - (ActorFunc)EnBomjimb_Draw + (ActorFunc)EnBomjimb_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c index 566e786580..6ad91eb352 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -19,7 +19,7 @@ const ActorInit En_Boom_InitVars = { (ActorFunc)EnBoom_Init, (ActorFunc)EnBoom_Destroy, (ActorFunc)EnBoom_Update, - (ActorFunc)EnBoom_Draw + (ActorFunc)EnBoom_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c index 18209977d0..b2fad3f602 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -19,7 +19,7 @@ const ActorInit En_Box_InitVars = { (ActorFunc)EnBox_Init, (ActorFunc)EnBox_Destroy, (ActorFunc)EnBox_Update, - (ActorFunc)EnBox_Draw + (ActorFunc)EnBox_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c index 2a031a5a18..2ec52ae33f 100644 --- a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c +++ b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c @@ -19,7 +19,7 @@ const ActorInit En_Bsb_InitVars = { (ActorFunc)EnBsb_Init, (ActorFunc)EnBsb_Destroy, (ActorFunc)EnBsb_Update, - (ActorFunc)EnBsb_Draw + (ActorFunc)EnBsb_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Bu/z_en_bu.c b/src/overlays/actors/ovl_En_Bu/z_en_bu.c index f727da5330..ad001d6e05 100644 --- a/src/overlays/actors/ovl_En_Bu/z_en_bu.c +++ b/src/overlays/actors/ovl_En_Bu/z_en_bu.c @@ -20,7 +20,7 @@ const ActorInit En_Bu_InitVars = { (ActorFunc)EnBu_Init, (ActorFunc)EnBu_Destroy, (ActorFunc)EnBu_Update, - (ActorFunc)EnBu_Draw + (ActorFunc)EnBu_Draw, }; void EnBu_Init(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c index 79e1371831..eda9934674 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -19,7 +19,7 @@ const ActorInit En_Bubble_InitVars = { (ActorFunc)EnBubble_Init, (ActorFunc)EnBubble_Destroy, (ActorFunc)EnBubble_Update, - (ActorFunc)EnBubble_Draw + (ActorFunc)EnBubble_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/src/overlays/actors/ovl_En_Butte/z_en_butte.c index 10efd6b03d..fd358524f3 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -19,7 +19,7 @@ const ActorInit En_Butte_InitVars = { (ActorFunc)EnButte_Init, (ActorFunc)EnButte_Destroy, (ActorFunc)EnButte_Update, - (ActorFunc)EnButte_Draw + (ActorFunc)EnButte_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Cha/z_en_cha.c b/src/overlays/actors/ovl_En_Cha/z_en_cha.c index 834894e6ff..8c6ef07341 100644 --- a/src/overlays/actors/ovl_En_Cha/z_en_cha.c +++ b/src/overlays/actors/ovl_En_Cha/z_en_cha.c @@ -17,7 +17,6 @@ void EnCha_Draw(Actor* thisx, GlobalContext* globalCtx); void EnCha_Idle(EnCha* this, GlobalContext* globalCtx); - const ActorInit En_Cha_InitVars = { ACTOR_EN_CHA, ACTORCAT_PROP, @@ -27,33 +26,34 @@ const ActorInit En_Cha_InitVars = { (ActorFunc)EnCha_Init, (ActorFunc)EnCha_Destroy, (ActorFunc)EnCha_Update, - (ActorFunc)EnCha_Draw + (ActorFunc)EnCha_Draw, }; static ColliderCylinderInit sCylinderInit = { - { - COLTYPE_WOOD, - AT_NONE, - AC_ON | AC_HARD | AC_TYPE_PLAYER, - OC1_ON | OC1_TYPE_ALL, - OC2_TYPE_1, - COLSHAPE_CYLINDER, - }, - { - ELEMTYPE_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, - OCELEM_ON, }, + { + COLTYPE_WOOD, + AT_NONE, + AC_ON | AC_HARD | AC_TYPE_PLAYER, + OC1_ON | OC1_TYPE_ALL, + OC2_TYPE_1, + COLSHAPE_CYLINDER, + }, + { + ELEMTYPE_UNK0, + { 0x00000000, 0x00, 0x00 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_NONE | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, { 10, 40, 0, { 0, 0, 0 } }, }; extern UNK_TYPE4 D_06000710; extern UNK_TYPE4 D_06000958; -void EnCha_Init(Actor *thisx, GlobalContext *globalCtx) { - EnCha *this = THIS; +void EnCha_Init(Actor* thisx, GlobalContext* globalCtx) { + EnCha* this = THIS; s32 pad; Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); @@ -66,18 +66,17 @@ void EnCha_Init(Actor *thisx, GlobalContext *globalCtx) { gSaveContext.perm.weekEventReg[60] &= 0xFB; } -void EnCha_Destroy(Actor *thisx, GlobalContext *globalCtx) { - EnCha *this = THIS; +void EnCha_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnCha* this = THIS; Collider_DestroyCylinder(globalCtx, &this->collider); } -void EnCha_Ring(EnCha *this, GlobalContext *globalCtx) { +void EnCha_Ring(EnCha* this, GlobalContext* globalCtx) { EnCha_Idle(this, globalCtx); if (this->actor.cutscene == -1) { this->actionFunc = EnCha_Idle; - } - else if (ActorCutscene_GetCanPlayNext(this->actor.cutscene)) { + } else if (ActorCutscene_GetCanPlayNext(this->actor.cutscene)) { ActorCutscene_StartAndSetUnkLinkFields(this->actor.cutscene, &this->actor); this->actionFunc = EnCha_Idle; } else { @@ -85,7 +84,7 @@ void EnCha_Ring(EnCha *this, GlobalContext *globalCtx) { } } -void EnCha_Idle(EnCha *this, GlobalContext *globalCtx) { +void EnCha_Idle(EnCha* this, GlobalContext* globalCtx) { if (gSaveContext.perm.weekEventReg[60] & 4) { Audio_PlayActorSound2(&this->actor, 0x289E); gSaveContext.perm.weekEventReg[60] &= 0xFB; @@ -104,9 +103,9 @@ void EnCha_Idle(EnCha *this, GlobalContext *globalCtx) { this->actor.home.rot.z *= 0.96f; } -void EnCha_Update(Actor *thisx, GlobalContext *globalCtx) { - EnCha *this = THIS; - GlobalContext *globalCtx2 = globalCtx; +void EnCha_Update(Actor* thisx, GlobalContext* globalCtx) { + EnCha* this = THIS; + GlobalContext* globalCtx2 = globalCtx; CollisionCheck_SetOC(globalCtx, &globalCtx2->colCheckCtx, &this->collider.base); this->actionFunc(this, globalCtx); @@ -115,8 +114,8 @@ void EnCha_Update(Actor *thisx, GlobalContext *globalCtx) { } } -void EnCha_Draw(Actor *thisx, GlobalContext *globalCtx) { - EnCha *this = THIS; +void EnCha_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnCha* this = THIS; func_800BDFC0(globalCtx, &D_06000710); SysMatrix_InsertTranslation(-1094.0f, 4950.0f, 9.0f, 1); diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c index 6a4635c6ab..c17cfe4505 100644 --- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c +++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c @@ -19,7 +19,7 @@ const ActorInit En_Clear_Tag_InitVars = { (ActorFunc)EnClearTag_Init, (ActorFunc)EnClearTag_Destroy, (ActorFunc)EnClearTag_Update, - (ActorFunc)EnClearTag_Draw + (ActorFunc)EnClearTag_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c index 6b6b0b6c60..568ec0c86d 100644 --- a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c +++ b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c @@ -19,7 +19,7 @@ const ActorInit En_Cne_01_InitVars = { (ActorFunc)EnCne01_Init, (ActorFunc)EnCne01_Destroy, (ActorFunc)EnCne01_Update, - (ActorFunc)EnCne01_Draw + (ActorFunc)EnCne01_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c index c16f8b21f9..772c746c27 100644 --- a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c +++ b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c @@ -18,7 +18,7 @@ const ActorInit En_Col_Man_InitVars = { (ActorFunc)EnColMan_Init, (ActorFunc)EnColMan_Destroy, (ActorFunc)EnColMan_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c index 96ee10c891..2b3979f103 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -19,7 +19,7 @@ const ActorInit En_Cow_InitVars = { (ActorFunc)EnCow_Init, (ActorFunc)EnCow_Destroy, (ActorFunc)EnCow_Update, - (ActorFunc)EnCow_Draw + (ActorFunc)EnCow_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c index 1ff1f1931c..183c18ccef 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -19,7 +19,7 @@ const ActorInit En_Crow_InitVars = { (ActorFunc)EnCrow_Init, (ActorFunc)EnCrow_Destroy, (ActorFunc)EnCrow_Update, - (ActorFunc)EnCrow_Draw + (ActorFunc)EnCrow_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Dai/z_en_dai.c b/src/overlays/actors/ovl_En_Dai/z_en_dai.c index 1966d28b7f..582af2bc69 100644 --- a/src/overlays/actors/ovl_En_Dai/z_en_dai.c +++ b/src/overlays/actors/ovl_En_Dai/z_en_dai.c @@ -19,7 +19,7 @@ const ActorInit En_Dai_InitVars = { (ActorFunc)EnDai_Init, (ActorFunc)EnDai_Destroy, (ActorFunc)EnDai_Update, - (ActorFunc)EnDai_Draw + (ActorFunc)EnDai_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c index d60d8794ee..d466f03a9b 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -19,7 +19,7 @@ const ActorInit En_Daiku_InitVars = { (ActorFunc)EnDaiku_Init, (ActorFunc)EnDaiku_Destroy, (ActorFunc)EnDaiku_Update, - (ActorFunc)EnDaiku_Draw + (ActorFunc)EnDaiku_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c index e9e8ef81bb..87398ba705 100644 --- a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c +++ b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c @@ -19,7 +19,7 @@ const ActorInit En_Daiku2_InitVars = { (ActorFunc)EnDaiku2_Init, (ActorFunc)EnDaiku2_Destroy, (ActorFunc)EnDaiku2_Update, - (ActorFunc)EnDaiku2_Draw + (ActorFunc)EnDaiku2_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Death/z_en_death.c b/src/overlays/actors/ovl_En_Death/z_en_death.c index cc2a02936d..e9d92e8e3b 100644 --- a/src/overlays/actors/ovl_En_Death/z_en_death.c +++ b/src/overlays/actors/ovl_En_Death/z_en_death.c @@ -19,7 +19,7 @@ const ActorInit En_Death_InitVars = { (ActorFunc)EnDeath_Init, (ActorFunc)EnDeath_Destroy, (ActorFunc)EnDeath_Update, - (ActorFunc)EnDeath_Draw + (ActorFunc)EnDeath_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c index f26c729cdf..06d07c874a 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -19,7 +19,7 @@ const ActorInit En_Dekubaba_InitVars = { (ActorFunc)EnDekubaba_Init, (ActorFunc)EnDekubaba_Destroy, (ActorFunc)EnDekubaba_Update, - (ActorFunc)EnDekubaba_Draw + (ActorFunc)EnDekubaba_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c index 3ee9d924a4..9ff852aa5c 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -19,7 +19,7 @@ const ActorInit En_Dekunuts_InitVars = { (ActorFunc)EnDekunuts_Init, (ActorFunc)EnDekunuts_Destroy, (ActorFunc)EnDekunuts_Update, - (ActorFunc)EnDekunuts_Draw + (ActorFunc)EnDekunuts_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c index 3d935b34e2..a5a7038918 100644 --- a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c +++ b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c @@ -19,7 +19,7 @@ const ActorInit En_Demo_heishi_InitVars = { (ActorFunc)EnDemoheishi_Init, (ActorFunc)EnDemoheishi_Destroy, (ActorFunc)EnDemoheishi_Update, - (ActorFunc)EnDemoheishi_Draw + (ActorFunc)EnDemoheishi_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Dg/z_en_dg.c b/src/overlays/actors/ovl_En_Dg/z_en_dg.c index 56f41aa316..6dbce2f887 100644 --- a/src/overlays/actors/ovl_En_Dg/z_en_dg.c +++ b/src/overlays/actors/ovl_En_Dg/z_en_dg.c @@ -19,7 +19,7 @@ const ActorInit En_Dg_InitVars = { (ActorFunc)EnDg_Init, (ActorFunc)EnDg_Destroy, (ActorFunc)EnDg_Update, - (ActorFunc)EnDg_Draw + (ActorFunc)EnDg_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c index a34a2cfde6..96a32b7a0a 100644 --- a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c +++ b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c @@ -19,7 +19,7 @@ const ActorInit En_Dinofos_InitVars = { (ActorFunc)EnDinofos_Init, (ActorFunc)EnDinofos_Destroy, (ActorFunc)EnDinofos_Update, - (ActorFunc)EnDinofos_Draw + (ActorFunc)EnDinofos_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c index 00f85bb1b3..383f49f083 100644 --- a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c +++ b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c @@ -19,7 +19,7 @@ const ActorInit En_Dnb_InitVars = { (ActorFunc)EnDnb_Init, (ActorFunc)EnDnb_Destroy, (ActorFunc)EnDnb_Update, - (ActorFunc)EnDnb_Draw + (ActorFunc)EnDnb_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c index 3db07bcb3a..dbef805319 100644 --- a/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c +++ b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c @@ -19,7 +19,7 @@ const ActorInit En_Dnh_InitVars = { (ActorFunc)EnDnh_Init, (ActorFunc)EnDnh_Destroy, (ActorFunc)EnDnh_Update, - (ActorFunc)EnDnh_Draw + (ActorFunc)EnDnh_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c index 1bec503d04..8781783e6a 100644 --- a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c +++ b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c @@ -18,7 +18,7 @@ const ActorInit En_Dnk_InitVars = { (ActorFunc)EnDnk_Init, (ActorFunc)EnDnk_Destroy, (ActorFunc)EnDnk_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Dno/z_en_dno.c b/src/overlays/actors/ovl_En_Dno/z_en_dno.c index def9102696..233370b1b9 100644 --- a/src/overlays/actors/ovl_En_Dno/z_en_dno.c +++ b/src/overlays/actors/ovl_En_Dno/z_en_dno.c @@ -19,7 +19,7 @@ const ActorInit En_Dno_InitVars = { (ActorFunc)EnDno_Init, (ActorFunc)EnDno_Destroy, (ActorFunc)EnDno_Update, - (ActorFunc)EnDno_Draw + (ActorFunc)EnDno_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c index 6da84483cf..cd6f90e3e9 100644 --- a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c +++ b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c @@ -19,7 +19,7 @@ const ActorInit En_Dnp_InitVars = { (ActorFunc)EnDnp_Init, (ActorFunc)EnDnp_Destroy, (ActorFunc)EnDnp_Update, - (ActorFunc)EnDnp_Draw + (ActorFunc)EnDnp_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c index de3b07e3d0..0ee6d5bd3a 100644 --- a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c +++ b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c @@ -19,7 +19,7 @@ const ActorInit En_Dnq_InitVars = { (ActorFunc)EnDnq_Init, (ActorFunc)EnDnq_Destroy, (ActorFunc)EnDnq_Update, - (ActorFunc)EnDnq_Draw + (ActorFunc)EnDnq_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c index 82a8ced439..a7f8256caa 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -19,7 +19,7 @@ const ActorInit En_Dns_InitVars = { (ActorFunc)EnDns_Init, (ActorFunc)EnDns_Destroy, (ActorFunc)EnDns_Update, - (ActorFunc)EnDns_Draw + (ActorFunc)EnDns_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c index fdb050e53f..539e69d904 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -19,7 +19,7 @@ const ActorInit En_Dodongo_InitVars = { (ActorFunc)EnDodongo_Init, (ActorFunc)EnDodongo_Destroy, (ActorFunc)EnDodongo_Update, - (ActorFunc)EnDodongo_Draw + (ActorFunc)EnDodongo_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c index e5b8e62526..ec5f1fe4e8 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -19,7 +19,7 @@ const ActorInit En_Door_InitVars = { (ActorFunc)EnDoor_Init, (ActorFunc)EnDoor_Destroy, (ActorFunc)EnDoor_Update, - (ActorFunc)EnDoor_Draw + (ActorFunc)EnDoor_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c index 2ab4a2d6a7..a6f0dda2e8 100644 --- a/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c +++ b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c @@ -18,7 +18,7 @@ const ActorInit En_Door_Etc_InitVars = { (ActorFunc)EnDoorEtc_Init, (ActorFunc)EnDoorEtc_Destroy, (ActorFunc)EnDoorEtc_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c index 41a51ced53..74b39979c8 100644 --- a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c +++ b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c @@ -19,7 +19,7 @@ const ActorInit En_Dragon_InitVars = { (ActorFunc)EnDragon_Init, (ActorFunc)EnDragon_Destroy, (ActorFunc)EnDragon_Update, - (ActorFunc)EnDragon_Draw + (ActorFunc)EnDragon_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Drs/z_en_drs.c b/src/overlays/actors/ovl_En_Drs/z_en_drs.c index ddbdd6f4b1..3fcd88dc62 100644 --- a/src/overlays/actors/ovl_En_Drs/z_en_drs.c +++ b/src/overlays/actors/ovl_En_Drs/z_en_drs.c @@ -18,7 +18,7 @@ const ActorInit En_Drs_InitVars = { (ActorFunc)EnDrs_Init, (ActorFunc)EnDrs_Destroy, (ActorFunc)EnDrs_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c b/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c index 6ff43a41ea..a1660a5658 100644 --- a/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c +++ b/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c @@ -19,7 +19,7 @@ const ActorInit En_Ds2n_InitVars = { (ActorFunc)EnDs2n_Init, (ActorFunc)EnDs2n_Destroy, (ActorFunc)EnDs2n_Update, - (ActorFunc)EnDs2n_Draw + (ActorFunc)EnDs2n_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Dt/z_en_dt.c b/src/overlays/actors/ovl_En_Dt/z_en_dt.c index 5d77da3a7f..dd2feb08b9 100644 --- a/src/overlays/actors/ovl_En_Dt/z_en_dt.c +++ b/src/overlays/actors/ovl_En_Dt/z_en_dt.c @@ -19,7 +19,7 @@ const ActorInit En_Dt_InitVars = { (ActorFunc)EnDt_Init, (ActorFunc)EnDt_Destroy, (ActorFunc)EnDt_Update, - (ActorFunc)EnDt_Draw + (ActorFunc)EnDt_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c index 2006a701e7..f04733a58a 100644 --- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c +++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c @@ -116,12 +116,10 @@ void EnDyExtra_Draw(Actor* thisx, GlobalContext* globalCtx) { Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, globalCtx->state.frames * 2, 0, 0x20, 0x40, 1, globalCtx->state.frames, globalCtx->state.frames * -8, 0x10, 0x10)); gDPPipeSync(POLY_XLU_DISP++); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), - G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, D_80A61740[this->type].r, D_80A61740[this->type].g, D_80A61740[this->type].b, 255); - gDPSetEnvColor(POLY_XLU_DISP++, D_80A61754[this->type].r, D_80A61754[this->type].g, - D_80A61754[this->type].b, 128); + gDPSetEnvColor(POLY_XLU_DISP++, D_80A61754[this->type].r, D_80A61754[this->type].g, D_80A61754[this->type].b, 128); gSPDisplayList(POLY_XLU_DISP++, D_0600DEF0); CLOSE_DISPS(gfxCtx); diff --git a/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c index 89712dd2c2..7a8b8d3ace 100644 --- a/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c +++ b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c @@ -19,7 +19,7 @@ const ActorInit En_Egblock_InitVars = { (ActorFunc)EnEgblock_Init, (ActorFunc)EnEgblock_Destroy, (ActorFunc)EnEgblock_Update, - (ActorFunc)EnEgblock_Draw + (ActorFunc)EnEgblock_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Egol/z_en_egol.c b/src/overlays/actors/ovl_En_Egol/z_en_egol.c index 535f32a3ac..a3c10ade24 100644 --- a/src/overlays/actors/ovl_En_Egol/z_en_egol.c +++ b/src/overlays/actors/ovl_En_Egol/z_en_egol.c @@ -19,7 +19,7 @@ const ActorInit En_Egol_InitVars = { (ActorFunc)EnEgol_Init, (ActorFunc)EnEgol_Destroy, (ActorFunc)EnEgol_Update, - (ActorFunc)EnEgol_Draw + (ActorFunc)EnEgol_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/src/overlays/actors/ovl_En_Elf/z_en_elf.c index b381c547b7..265e3acb53 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -19,7 +19,7 @@ const ActorInit En_Elf_InitVars = { (ActorFunc)EnElf_Init, (ActorFunc)EnElf_Destroy, (ActorFunc)EnElf_Update, - (ActorFunc)EnElf_Draw + (ActorFunc)EnElf_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c index 45137e9831..90d4edb806 100644 --- a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c +++ b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c @@ -19,7 +19,7 @@ const ActorInit En_Elfbub_InitVars = { (ActorFunc)EnElfbub_Init, (ActorFunc)EnElfbub_Destroy, (ActorFunc)EnElfbub_Update, - (ActorFunc)EnElfbub_Draw + (ActorFunc)EnElfbub_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c index bd37759da4..084d5d3abd 100644 --- a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c +++ b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c @@ -18,7 +18,7 @@ const ActorInit En_Elfgrp_InitVars = { (ActorFunc)EnElfgrp_Init, (ActorFunc)EnElfgrp_Destroy, (ActorFunc)EnElfgrp_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c index cf2f8e10f7..b488c38e07 100644 --- a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c +++ b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c @@ -19,7 +19,7 @@ const ActorInit En_Elforg_InitVars = { (ActorFunc)EnElforg_Init, (ActorFunc)EnElforg_Destroy, (ActorFunc)EnElforg_Update, - (ActorFunc)EnElforg_Draw + (ActorFunc)EnElforg_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c index 3bc4a177e9..e8e7303bec 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -17,7 +17,7 @@ const ActorInit En_Encount1_InitVars = { (ActorFunc)EnEncount1_Init, (ActorFunc)NULL, (ActorFunc)EnEncount1_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c index 18a632b5c0..17fd0345f3 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -26,24 +26,39 @@ const ActorInit En_Encount2_InitVars = { (ActorFunc)EnEncount2_Init, (ActorFunc)EnEncount2_Destroy, (ActorFunc)EnEncount2_Update, - (ActorFunc)EnEncount2_Draw + (ActorFunc)EnEncount2_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { { - { ELEMTYPE_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { + ELEMTYPE_UNK0, + { 0xF7CFFFFF, 0x00, 0x00 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_NONE | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, { 1, { { 0, 0, 0 }, 0 }, 1 }, }, }; static ColliderJntSphInit sJntSphInit = { - { COLTYPE_HARD, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_JNTSPH, }, - 1, sJntSphElementsInit, + { + COLTYPE_HARD, + AT_NONE, + AC_ON | AC_TYPE_PLAYER, + OC1_ON | OC1_TYPE_ALL, + OC2_TYPE_1, + COLSHAPE_JNTSPH, + }, + 1, + sJntSphElementsInit, }; DamageTable damageTable[] = { - 0xF0, 0xF0, 0x00, 0xF0, 0xE1, 0xE1, 0x00, 0xE1, 0xF0, 0xF0, 0xF0, 0xE1, 0xE1, 0xE1, 0xF0, 0xF0, - 0xE1, 0xF0, 0xF0, 0xF0, 0x00, 0x00, 0xE1, 0xF0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, + 0xF0, 0xF0, 0x00, 0xF0, 0xE1, 0xE1, 0x00, 0xE1, 0xF0, 0xF0, 0xF0, 0xE1, 0xE1, 0xE1, 0xF0, 0xF0, + 0xE1, 0xF0, 0xF0, 0xF0, 0x00, 0x00, 0xE1, 0xF0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, }; void EnEncount2_Init(Actor* thisx, GlobalContext* globalCtx) { @@ -110,10 +125,10 @@ void EnEncount2_Popped(EnEncount2* this, GlobalContext* globalCtx) { Math_Vec3f_Copy(&curPos, &this->dynaActor.actor.world.pos); curPos.y += 60.0f; - Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_CLEAR_TAG, curPos.x, curPos.y, curPos.z, - 0xFF, 0xFF, 0xC8, 0x0001); + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_CLEAR_TAG, curPos.x, curPos.y, curPos.z, 0xFF, 0xFF, 0xC8, + 0x0001); - for(i = 0; i != 100; ++i){ + for (i = 0; i != 100; ++i) { EnEncount2_InitParticles(this, &curPos, 10); } @@ -144,7 +159,7 @@ void EnEncount2_Update(Actor* thisx, GlobalContext* globalCtx) { Actor_SetVelocityAndMoveYRotationAndGravity(&this->dynaActor.actor); EnEncount2_UpdateParticles(this, globalCtx); - if (! this->isPopped) { + if (!this->isPopped) { Collider_UpdateSpheresElement(&this->collider, 0, &this->dynaActor.actor); CollisionCheck_SetAC(globalCtx, &globalCtx->colCheckCtx, &this->collider); CollisionCheck_SetOC(globalCtx, &globalCtx->colCheckCtx, &this->collider); @@ -160,12 +175,12 @@ void EnEncount2_Draw(Actor* thisx, GlobalContext* globalCtx) { EnEncount2_DrawParticles(this, globalCtx); } -void EnEncount2_InitParticles(EnEncount2* this, Vec3f *vec, s16 fadeDelay) { +void EnEncount2_InitParticles(EnEncount2* this, Vec3f* vec, s16 fadeDelay) { s16 i; - EnEncount2Particle *sPtr = &this->particles; + EnEncount2Particle* sPtr = &this->particles; for (i = 0; i < 200; ++i) { - if ( ! sPtr->enabled) { + if (!sPtr->enabled) { sPtr->enabled = 1; sPtr->pos = *vec; sPtr->alphaFadeDelay = fadeDelay; @@ -188,9 +203,9 @@ void EnEncount2_InitParticles(EnEncount2* this, Vec3f *vec, s16 fadeDelay) { void EnEncount2_UpdateParticles(EnEncount2* this, GlobalContext* globalCtx) { s32 i; - EnEncount2Particle *sPtr = &this->particles; + EnEncount2Particle* sPtr = &this->particles; - for(i = 0 ; i < 200; i += 2) { + for (i = 0; i < 200; i += 2) { if (sPtr->enabled) { sPtr->pos.x += sPtr->vel.x; sPtr->pos.y += sPtr->vel.y; diff --git a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c index acc930d24b..43617cef17 100644 --- a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c +++ b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c @@ -19,7 +19,7 @@ const ActorInit En_Encount3_InitVars = { (ActorFunc)EnEncount3_Init, (ActorFunc)EnEncount3_Destroy, (ActorFunc)EnEncount3_Update, - (ActorFunc)EnEncount3_Draw + (ActorFunc)EnEncount3_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c index e506d99d32..b618e0cdb6 100644 --- a/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c +++ b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c @@ -18,7 +18,7 @@ const ActorInit En_Encount4_InitVars = { (ActorFunc)EnEncount4_Init, (ActorFunc)EnEncount4_Destroy, (ActorFunc)EnEncount4_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c b/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c index 326dce3157..22733be1ad 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c +++ b/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c @@ -21,7 +21,7 @@ const ActorInit En_Ending_Hero2_InitVars = { (ActorFunc)EnEndingHero2_Init, (ActorFunc)EnEndingHero2_Destroy, (ActorFunc)EnEndingHero2_Update, - (ActorFunc)EnEndingHero2_Draw + (ActorFunc)EnEndingHero2_Draw, }; extern SkeletonHeader D_06007908; diff --git a/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c b/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c index 4c451d4623..78f1ad5986 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c +++ b/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c @@ -21,7 +21,7 @@ const ActorInit En_Ending_Hero3_InitVars = { (ActorFunc)EnEndingHero3_Init, (ActorFunc)EnEndingHero3_Destroy, (ActorFunc)EnEndingHero3_Update, - (ActorFunc)EnEndingHero3_Draw + (ActorFunc)EnEndingHero3_Draw, }; extern SkeletonHeader D_06007150; diff --git a/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c b/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c index c4e1338d1f..467bb9bfc9 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c +++ b/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c @@ -21,7 +21,7 @@ const ActorInit En_Ending_Hero4_InitVars = { (ActorFunc)EnEndingHero4_Init, (ActorFunc)EnEndingHero4_Destroy, (ActorFunc)EnEndingHero4_Update, - (ActorFunc)EnEndingHero4_Draw + (ActorFunc)EnEndingHero4_Draw, }; extern SkeletonHeader D_0600D640; diff --git a/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c index b3e2c6f0ef..b5a0b88bd7 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c +++ b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c @@ -19,7 +19,7 @@ const ActorInit En_Ending_Hero6_InitVars = { (ActorFunc)EnEndingHero6_Init, (ActorFunc)EnEndingHero6_Destroy, (ActorFunc)EnEndingHero6_Update, - (ActorFunc)EnEndingHero6_Draw + (ActorFunc)EnEndingHero6_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Estone/z_en_estone.c b/src/overlays/actors/ovl_En_Estone/z_en_estone.c index 2ab8cff3a3..cb283841f8 100644 --- a/src/overlays/actors/ovl_En_Estone/z_en_estone.c +++ b/src/overlays/actors/ovl_En_Estone/z_en_estone.c @@ -19,7 +19,7 @@ const ActorInit En_Estone_InitVars = { (ActorFunc)EnEstone_Init, (ActorFunc)EnEstone_Destroy, (ActorFunc)EnEstone_Update, - (ActorFunc)EnEstone_Draw + (ActorFunc)EnEstone_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Fall/z_en_fall.c b/src/overlays/actors/ovl_En_Fall/z_en_fall.c index f139b294c0..cf9d501094 100644 --- a/src/overlays/actors/ovl_En_Fall/z_en_fall.c +++ b/src/overlays/actors/ovl_En_Fall/z_en_fall.c @@ -18,7 +18,7 @@ const ActorInit En_Fall_InitVars = { (ActorFunc)EnFall_Init, (ActorFunc)EnFall_Destroy, (ActorFunc)EnFall_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c b/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c index eeb7abe6f9..ec835b0d76 100644 --- a/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c +++ b/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c @@ -19,7 +19,7 @@ const ActorInit En_Fall2_InitVars = { (ActorFunc)EnFall2_Init, (ActorFunc)EnFall2_Destroy, (ActorFunc)EnFall2_Update, - (ActorFunc)EnFall2_Draw + (ActorFunc)EnFall2_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Famos/z_en_famos.c b/src/overlays/actors/ovl_En_Famos/z_en_famos.c index 7aba677245..eca155cbfa 100644 --- a/src/overlays/actors/ovl_En_Famos/z_en_famos.c +++ b/src/overlays/actors/ovl_En_Famos/z_en_famos.c @@ -19,7 +19,7 @@ const ActorInit En_Famos_InitVars = { (ActorFunc)EnFamos_Init, (ActorFunc)EnFamos_Destroy, (ActorFunc)EnFamos_Update, - (ActorFunc)EnFamos_Draw + (ActorFunc)EnFamos_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Fg/z_en_fg.c b/src/overlays/actors/ovl_En_Fg/z_en_fg.c index 3c19b93b95..9112339ed6 100644 --- a/src/overlays/actors/ovl_En_Fg/z_en_fg.c +++ b/src/overlays/actors/ovl_En_Fg/z_en_fg.c @@ -19,7 +19,7 @@ const ActorInit En_Fg_InitVars = { (ActorFunc)EnFg_Init, (ActorFunc)EnFg_Destroy, (ActorFunc)EnFg_Update, - (ActorFunc)EnFg_Draw + (ActorFunc)EnFg_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c index e47c3c0c98..f4fb5dff85 100644 --- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c +++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c @@ -18,7 +18,7 @@ const ActorInit En_Fire_Rock_InitVars = { (ActorFunc)EnFireRock_Init, (ActorFunc)EnFireRock_Destroy, (ActorFunc)EnFireRock_Update, - (ActorFunc)EnFireRock_Draw + (ActorFunc)EnFireRock_Draw, }; void EnFireRock_Init(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c index 18c4e6826e..7340af66d7 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -19,7 +19,7 @@ const ActorInit En_Firefly_InitVars = { (ActorFunc)EnFirefly_Init, (ActorFunc)EnFirefly_Destroy, (ActorFunc)EnFirefly_Update, - (ActorFunc)EnFirefly_Draw + (ActorFunc)EnFirefly_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c b/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c index 20921215e2..9806e5ceaf 100644 --- a/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c +++ b/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c @@ -18,7 +18,7 @@ const ActorInit En_Firefly2_InitVars = { (ActorFunc)EnFirefly2_Init, (ActorFunc)EnFirefly2_Destroy, (ActorFunc)EnFirefly2_Update, - (ActorFunc)EnFirefly2_Draw + (ActorFunc)EnFirefly2_Draw, }; void EnFirefly2_Init(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c index 493eba2d90..b71faacd75 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -19,7 +19,7 @@ const ActorInit En_Fish_InitVars = { (ActorFunc)EnFish_Init, (ActorFunc)EnFish_Destroy, (ActorFunc)EnFish_Update, - (ActorFunc)EnFish_Draw + (ActorFunc)EnFish_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c index b72a7f634b..82610e3e7e 100644 --- a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c +++ b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c @@ -19,7 +19,7 @@ const ActorInit En_Fish2_InitVars = { (ActorFunc)EnFish2_Init, (ActorFunc)EnFish2_Destroy, (ActorFunc)EnFish2_Update, - (ActorFunc)EnFish2_Draw + (ActorFunc)EnFish2_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index 40ae14c092..72c81172c5 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -19,7 +19,7 @@ const ActorInit En_Floormas_InitVars = { (ActorFunc)EnFloormas_Init, (ActorFunc)EnFloormas_Destroy, (ActorFunc)EnFloormas_Update, - (ActorFunc)EnFloormas_Draw + (ActorFunc)EnFloormas_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/src/overlays/actors/ovl_En_Fr/z_en_fr.c index 8f4bea25fa..c7fdd14d3a 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -18,7 +18,7 @@ const ActorInit En_Fr_InitVars = { (ActorFunc)EnFr_Init, (ActorFunc)EnFr_Destroy, (ActorFunc)EnFr_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c index 75a71a201a..9b2fddc809 100644 --- a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c +++ b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c @@ -19,7 +19,7 @@ const ActorInit En_Fsn_InitVars = { (ActorFunc)EnFsn_Init, (ActorFunc)EnFsn_Destroy, (ActorFunc)EnFsn_Update, - (ActorFunc)EnFsn_Draw + (ActorFunc)EnFsn_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c index dbad179fca..30e7ec541d 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -19,7 +19,7 @@ const ActorInit En_Fu_InitVars = { (ActorFunc)EnFu_Init, (ActorFunc)EnFu_Destroy, (ActorFunc)EnFu_Update, - (ActorFunc)EnFu_Draw + (ActorFunc)EnFu_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c index 4fda0b9b6e..7be5e798b7 100644 --- a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c +++ b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c @@ -19,7 +19,7 @@ const ActorInit En_Fu_Kago_InitVars = { (ActorFunc)EnFuKago_Init, (ActorFunc)EnFuKago_Destroy, (ActorFunc)EnFuKago_Update, - (ActorFunc)EnFuKago_Draw + (ActorFunc)EnFuKago_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c index bf256d6335..6151d3407d 100644 --- a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c +++ b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c @@ -19,7 +19,7 @@ const ActorInit En_Fu_Mato_InitVars = { (ActorFunc)EnFuMato_Init, (ActorFunc)EnFuMato_Destroy, (ActorFunc)EnFuMato_Update, - (ActorFunc)EnFuMato_Draw + (ActorFunc)EnFuMato_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/src/overlays/actors/ovl_En_Fz/z_en_fz.c index efbbc14700..e371bed285 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -19,7 +19,7 @@ const ActorInit En_Fz_InitVars = { (ActorFunc)EnFz_Init, (ActorFunc)EnFz_Destroy, (ActorFunc)EnFz_Update, - (ActorFunc)EnFz_Draw + (ActorFunc)EnFz_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c index b8afb9fe10..50e4069102 100644 --- a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c +++ b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c @@ -19,7 +19,7 @@ const ActorInit En_Gakufu_InitVars = { (ActorFunc)EnGakufu_Init, (ActorFunc)EnGakufu_Destroy, (ActorFunc)EnGakufu_Update, - (ActorFunc)EnGakufu_Draw + (ActorFunc)EnGakufu_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c index f69a02df3e..974985cb23 100644 --- a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c +++ b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c @@ -19,7 +19,7 @@ const ActorInit En_Gamelupy_InitVars = { (ActorFunc)EnGamelupy_Init, (ActorFunc)EnGamelupy_Destroy, (ActorFunc)EnGamelupy_Update, - (ActorFunc)EnGamelupy_Draw + (ActorFunc)EnGamelupy_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c index 828ef240da..4daee01c6e 100644 --- a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c +++ b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c @@ -19,7 +19,7 @@ const ActorInit En_Gb2_InitVars = { (ActorFunc)EnGb2_Init, (ActorFunc)EnGb2_Destroy, (ActorFunc)EnGb2_Update, - (ActorFunc)EnGb2_Draw + (ActorFunc)EnGb2_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c index 69cad4a6e9..4cb8bc36bc 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -19,7 +19,7 @@ const ActorInit En_Ge1_InitVars = { (ActorFunc)EnGe1_Init, (ActorFunc)EnGe1_Destroy, (ActorFunc)EnGe1_Update, - (ActorFunc)EnGe1_Draw + (ActorFunc)EnGe1_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c index 1a55c87ee1..2dacead0a7 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -19,7 +19,7 @@ const ActorInit En_Ge2_InitVars = { (ActorFunc)EnGe2_Init, (ActorFunc)EnGe2_Destroy, (ActorFunc)EnGe2_Update, - (ActorFunc)EnGe2_Draw + (ActorFunc)EnGe2_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c index 4abeaf88e6..e523b6b676 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -19,7 +19,7 @@ const ActorInit En_Ge3_InitVars = { (ActorFunc)EnGe3_Init, (ActorFunc)EnGe3_Destroy, (ActorFunc)EnGe3_Update, - (ActorFunc)EnGe3_Draw + (ActorFunc)EnGe3_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Geg/z_en_geg.c b/src/overlays/actors/ovl_En_Geg/z_en_geg.c index 943378a19b..c8744fbed3 100644 --- a/src/overlays/actors/ovl_En_Geg/z_en_geg.c +++ b/src/overlays/actors/ovl_En_Geg/z_en_geg.c @@ -19,7 +19,7 @@ const ActorInit En_Geg_InitVars = { (ActorFunc)EnGeg_Init, (ActorFunc)EnGeg_Destroy, (ActorFunc)EnGeg_Update, - (ActorFunc)EnGeg_Draw + (ActorFunc)EnGeg_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Gg/z_en_gg.c b/src/overlays/actors/ovl_En_Gg/z_en_gg.c index b0a5f18622..139867b4eb 100644 --- a/src/overlays/actors/ovl_En_Gg/z_en_gg.c +++ b/src/overlays/actors/ovl_En_Gg/z_en_gg.c @@ -19,7 +19,7 @@ const ActorInit En_Gg_InitVars = { (ActorFunc)EnGg_Init, (ActorFunc)EnGg_Destroy, (ActorFunc)EnGg_Update, - (ActorFunc)EnGg_Draw + (ActorFunc)EnGg_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c index 2725f9d4c7..fd5b8abb74 100644 --- a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c +++ b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c @@ -19,7 +19,7 @@ const ActorInit En_Gg2_InitVars = { (ActorFunc)EnGg2_Init, (ActorFunc)EnGg2_Destroy, (ActorFunc)EnGg2_Update, - (ActorFunc)EnGg2_Draw + (ActorFunc)EnGg2_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Giant/z_en_giant.c b/src/overlays/actors/ovl_En_Giant/z_en_giant.c index eef68a2488..562c94bf81 100644 --- a/src/overlays/actors/ovl_En_Giant/z_en_giant.c +++ b/src/overlays/actors/ovl_En_Giant/z_en_giant.c @@ -19,7 +19,7 @@ const ActorInit En_Giant_InitVars = { (ActorFunc)EnGiant_Init, (ActorFunc)EnGiant_Destroy, (ActorFunc)EnGiant_Update, - (ActorFunc)EnGiant_Draw + (ActorFunc)EnGiant_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c index b47767afbf..40d753d858 100644 --- a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c +++ b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c @@ -32,18 +32,53 @@ const ActorInit En_Ginko_Man_InitVars = { (ActorFunc)EnGinkoMan_Init, (ActorFunc)EnGinkoMan_Destroy, (ActorFunc)EnGinkoMan_Update, - (ActorFunc)EnGinkoMan_Draw + (ActorFunc)EnGinkoMan_Draw, }; ActorAnimationEntry animations[] = { - {object_ginko_floorsmacking_anim, 1.0f, 0.0f, 0.0f, 0, -4.0f,}, - {object_ginko_sitting_anim, 1.0f, 0.0f, 0.0f, 0, -4.0f,}, - {object_ginko_stamp_reach_anim, 1.0f, 0.0f, 0.0f, 2, -4.0f,}, - {object_ginko_advertising_anim, 1.0f, 0.0f, 0.0f, 0, -4.0f,}, // looking around for customers - {object_ginko_amazed_anim, 1.0f, 0.0f, 0.0f, 0, -4.0f,}, + { + object_ginko_floorsmacking_anim, + 1.0f, + 0.0f, + 0.0f, + 0, + -4.0f, + }, + { + object_ginko_sitting_anim, + 1.0f, + 0.0f, + 0.0f, + 0, + -4.0f, + }, + { + object_ginko_stamp_reach_anim, + 1.0f, + 0.0f, + 0.0f, + 2, + -4.0f, + }, + { + object_ginko_advertising_anim, + 1.0f, + 0.0f, + 0.0f, + 0, + -4.0f, + }, // looking around for customers + { + object_ginko_amazed_anim, + 1.0f, + 0.0f, + 0.0f, + 0, + -4.0f, + }, }; -void EnGinkoMan_Init(Actor *thisx, GlobalContext *globalCtx) { +void EnGinkoMan_Init(Actor* thisx, GlobalContext* globalCtx) { EnGinkoMan* this = THIS; this->actor.targetMode = 1; this->actor.uncullZoneForward = 400.0f; @@ -54,11 +89,13 @@ void EnGinkoMan_Init(Actor *thisx, GlobalContext *globalCtx) { this->stampChecked = 0; this->choiceDepositWithdrawl = GINKOMAN_CHOICE_RESET; this->serviceFee = 0; - SkelAnime_InitSV(globalCtx, &this->skelAnime, object_ginko_skeleton, object_ginko_sitting_anim, &this->limbDrawTbl, &this->transitionDrawTbl, 0x10); + SkelAnime_InitSV(globalCtx, &this->skelAnime, object_ginko_skeleton, object_ginko_sitting_anim, &this->limbDrawTbl, + &this->transitionDrawTbl, 0x10); EnGinkoMan_SetupIdle(this); } -void EnGinkoMan_Destroy(Actor *thisx, GlobalContext *globalCtx) { } +void EnGinkoMan_Destroy(Actor* thisx, GlobalContext* globalCtx) { +} void EnGinkoMan_SetupIdle(EnGinkoMan* this) { @@ -67,7 +104,7 @@ void EnGinkoMan_SetupIdle(EnGinkoMan* this) { this->actionFunc = EnGinkoMan_Idle; } -void EnGinkoMan_Idle(EnGinkoMan *this, GlobalContext *globalCtx) { +void EnGinkoMan_Idle(EnGinkoMan* this, GlobalContext* globalCtx) { s32 dYaw; s32 dYawABS; @@ -80,7 +117,7 @@ void EnGinkoMan_Idle(EnGinkoMan *this, GlobalContext *globalCtx) { this->curTextId = 0x44C; // would you like to make an account } else { func_800BDC5C(&this->skelAnime, animations, GINKO_SITTING); - if ((((s32) gSaveContext.perm.day % 5) == 3) && (gSaveContext.perm.isNight == 1)) { + if ((((s32)gSaveContext.perm.day % 5) == 3) && (gSaveContext.perm.isNight == 1)) { func_801518B0(globalCtx, 0x467, &this->actor); this->curTextId = 0x467; // "What's this? You need somethin' on a day like this? } else { @@ -99,232 +136,233 @@ void EnGinkoMan_Idle(EnGinkoMan *this, GlobalContext *globalCtx) { } #if NON_EQUIVELENT -// non-equiv: case 14 is possibly still non-equiv but def does not match, hard to tell +// non-equiv: case 14 is possibly still non-equiv but def does not match, hard to tell // if else inside of jump tables makes mips2c confused, also late rodata // action func: non-input dialogue -void EnGinkoMan_DepositDialogue(EnGinkoMan *this, GlobalContext *globalCtx) { // 80418E34 +void EnGinkoMan_DepositDialogue(EnGinkoMan* this, GlobalContext* globalCtx) { // 80418E34 u32 tempEDC; s16* previousBankValue; if (func_80147624(globalCtx) == 0) { - return; + return; } - + switch (this->curTextId - 0x44C) { - case 0: // "Hey there, little guy! Won't you deposit some Rupees? (first dialogue) - func_800BDC5C(&this->skelAnime, animations, GINKO_SITTING); - if ((gSaveContext.perm.weekEventReg[10] & 8) != 0) { + case 0: // "Hey there, little guy! Won't you deposit some Rupees? (first dialogue) + func_800BDC5C(&this->skelAnime, animations, GINKO_SITTING); + if ((gSaveContext.perm.weekEventReg[10] & 8) != 0) { + func_801518B0(globalCtx, 0x44E, &this->actor); + this->curTextId = 0x44E; //" ...So, what'll it be? Deposit Rupees Don't deposit Rupees" + } else { + func_801518B0(globalCtx, 0x44D, &this->actor); + this->curTextId = + 0x44D; // "For example, if you deposit 200 Rupees, you'll get an item that holds a lot of Rupees." + } + break; + + case 1: // "For example, if you deposit 200 Rupees, you'll get an item that holds a lot of Rupees." func_801518B0(globalCtx, 0x44E, &this->actor); this->curTextId = 0x44E; //" ...So, what'll it be? Deposit Rupees Don't deposit Rupees" - } else { - func_801518B0(globalCtx, 0x44D, &this->actor); - this->curTextId = 0x44D; // "For example, if you deposit 200 Rupees, you'll get an item that holds a lot of Rupees." - } - break; - - case 1: // "For example, if you deposit 200 Rupees, you'll get an item that holds a lot of Rupees." - func_801518B0(globalCtx, 0x44E, &this->actor); - this->curTextId = 0x44E; //" ...So, what'll it be? Deposit Rupees Don't deposit Rupees" - return; - case 3: // "...So, what'll it be? Deposit Rupees Don't deposit Rupees" - func_800BDC5C(&this->skelAnime, animations, GINKO_FLOORSMACKING); - func_801518B0(globalCtx, 0x450, &this->actor); - this->curTextId = 0x450; // "How much? How much? [rupee prompt] - return; - - case 7: // you deposited a tiny amount - case 8: // you deposited a normal amount - case 9: // you deposited a lot - if (this->newAccountFlag == 1) { - this->newAccountFlag = 0; - if (this->curTextId != 0x453) { // "That's it? That ain't nothing at all, big spender! - func_800BDC5C(&this->skelAnime, animations, GINKO_SITTING); - } - func_801518B0(globalCtx, 0x461, &this->actor); - this->curTextId = 0x461; // So, little guy, what's your name? - } else { - if (this->curTextId == 0x453) { // "That's it? That ain't nothing at all, big spender! - func_800BDC5C(&this->skelAnime, animations, GINKO_FLOORSMACKING); - } - globalCtx->msgCtx.bankRupees = gSaveContext.perm.bankRupees & 0xFFFF; - func_801518B0(globalCtx, 0x45A, &this->actor); - this->curTextId = 0x45A; // "All right, little guy, now I've got a total of [rupees] from you!" - } - break; - case 10: // "Is that so? Think about it, little guy!" - case 13: // "Heyyy! You don't have that much! - func_801518B0(globalCtx, 0x44E, &this->actor); - this->curTextId = 0x44E; //" ...So, what'll it be? Deposit Rupees Don't deposit Rupees" - return; - - case 14: // "All right, little guy, now I've got a total of [rupees] from you!" - - /***** WARNING: this case is non-equivelent ****/ - - tempEDC = gSaveContext.perm.bankRupees & 0xFFFF; - if ((tempEDC >= 200) - && (this->previousBankValue < 200) - && ((gSaveContext.perm.weekEventReg[0x3B] & 0x40) == 0)) { - //block_20: - gSaveContext.perm.weekEventReg[0x3B] = gSaveContext.perm.weekEventReg[0x3B] | 0x40; - func_801518B0(globalCtx, 0x45B, &this->actor); - this->curTextId = 0x45B; // "What's this? You've already saved up 200 Rupees!?! return; - } // bright pink arrow - - // "branch likely" when shouldn't be - if ( (tempEDC >= 1000) - && ((this->previousBankValue) < 1000) - && (gSaveContext.perm.weekEventReg[0x3B] & 0x80) == 0) { - //block_24: - gSaveContext.perm.weekEventReg[0x3B] |= 0x80; - func_801518B0(globalCtx, 0x45C, &this->actor); - this->curTextId = 0x45C; // "What's this? You've already saved up 1000 Rupees!?! + case 3: // "...So, what'll it be? Deposit Rupees Don't deposit Rupees" + func_800BDC5C(&this->skelAnime, animations, GINKO_FLOORSMACKING); + func_801518B0(globalCtx, 0x450, &this->actor); + this->curTextId = 0x450; // "How much? How much? [rupee prompt] return; - } // bright blue arrow - if (( this->previousBankValue) >= 5000) { // added back in because missing - if ((((s16) tempEDC ) < 5000) - && (( gSaveContext.perm.weekEventReg[0x3B] & 1) == 0)) { - gSaveContext.perm.weekEventReg[0x3B] |= 1; - func_801518B0(globalCtx, 0x45D, &this->actor); - this->curTextId = 0x45D; // "What's this? You've already saved up 5000 Rupees?! - return; - } else { // olive arrow - //block_28: - if (this->previousBankValue < gSaveContext.perm.bankRupees) { - //if (*previousBankValue < gSaveContext.perm.bankRupees) { + case 7: // you deposited a tiny amount + case 8: // you deposited a normal amount + case 9: // you deposited a lot + if (this->newAccountFlag == 1) { + this->newAccountFlag = 0; + if (this->curTextId != 0x453) { // "That's it? That ain't nothing at all, big spender! func_800BDC5C(&this->skelAnime, animations, GINKO_SITTING); - func_801518B0(globalCtx, 0x45E, &this->actor); - this->curTextId = 0x45E; // "...Hang on there, little guy. I can't take any more deposits. Sorry..." - return; - } else { + } + func_801518B0(globalCtx, 0x461, &this->actor); + this->curTextId = 0x461; // So, little guy, what's your name? + } else { + if (this->curTextId == 0x453) { // "That's it? That ain't nothing at all, big spender! func_800BDC5C(&this->skelAnime, animations, GINKO_FLOORSMACKING); - func_801518B0(globalCtx, 0x460, &this->actor); - this->curTextId = 0x460; // "Come back and deposit some after you save up a bunch!" + } + globalCtx->msgCtx.bankRupees = gSaveContext.perm.bankRupees & 0xFFFF; + func_801518B0(globalCtx, 0x45A, &this->actor); + this->curTextId = 0x45A; // "All right, little guy, now I've got a total of [rupees] from you!" + } + break; + case 10: // "Is that so? Think about it, little guy!" + case 13: // "Heyyy! You don't have that much! + func_801518B0(globalCtx, 0x44E, &this->actor); + this->curTextId = 0x44E; //" ...So, what'll it be? Deposit Rupees Don't deposit Rupees" + return; + + case 14: // "All right, little guy, now I've got a total of [rupees] from you!" + + /***** WARNING: this case is non-equivelent ****/ + + tempEDC = gSaveContext.perm.bankRupees & 0xFFFF; + if ((tempEDC >= 200) && (this->previousBankValue < 200) && + ((gSaveContext.perm.weekEventReg[0x3B] & 0x40) == 0)) { + // block_20: + gSaveContext.perm.weekEventReg[0x3B] = gSaveContext.perm.weekEventReg[0x3B] | 0x40; + func_801518B0(globalCtx, 0x45B, &this->actor); + this->curTextId = 0x45B; // "What's this? You've already saved up 200 Rupees!?! + return; + } // bright pink arrow + + // "branch likely" when shouldn't be + if ((tempEDC >= 1000) && ((this->previousBankValue) < 1000) && + (gSaveContext.perm.weekEventReg[0x3B] & 0x80) == 0) { + // block_24: + gSaveContext.perm.weekEventReg[0x3B] |= 0x80; + func_801518B0(globalCtx, 0x45C, &this->actor); + this->curTextId = 0x45C; // "What's this? You've already saved up 1000 Rupees!?! + return; + } // bright blue arrow + + if ((this->previousBankValue) >= 5000) { // added back in because missing + if ((((s16)tempEDC) < 5000) && ((gSaveContext.perm.weekEventReg[0x3B] & 1) == 0)) { + gSaveContext.perm.weekEventReg[0x3B] |= 1; + func_801518B0(globalCtx, 0x45D, &this->actor); + this->curTextId = 0x45D; // "What's this? You've already saved up 5000 Rupees?! return; + } else { // olive arrow + // block_28: + if (this->previousBankValue < gSaveContext.perm.bankRupees) { + // if (*previousBankValue < gSaveContext.perm.bankRupees) { + func_800BDC5C(&this->skelAnime, animations, GINKO_SITTING); + func_801518B0(globalCtx, 0x45E, &this->actor); + this->curTextId = + 0x45E; // "...Hang on there, little guy. I can't take any more deposits. Sorry..." + return; + } else { + func_800BDC5C(&this->skelAnime, animations, GINKO_FLOORSMACKING); + func_801518B0(globalCtx, 0x460, &this->actor); + this->curTextId = 0x460; // "Come back and deposit some after you save up a bunch!" + return; + } } } - } - // bright green arrow goes here - func_800BDC5C(&this->skelAnime, animations, GINKO_FLOORSMACKING); - func_801518B0(globalCtx, 0x460, &this->actor); - this->curTextId = 0x460; // "Come back and deposit some after you save up a bunch!" - break; + // bright green arrow goes here + func_800BDC5C(&this->skelAnime, animations, GINKO_FLOORSMACKING); + func_801518B0(globalCtx, 0x460, &this->actor); + this->curTextId = 0x460; // "Come back and deposit some after you save up a bunch!" + break; - case 15: // given 200 reward - case 16: // given 1000 reward - case 17: // given 5000 reward - this->stampChecked = 0; - func_801477B4(globalCtx); - EnGinkoMan_SetupBankAward(this); - EnGinkoMan_BankAward(this, globalCtx); - return; - case 21: // So, little guy, what's your name? - func_801518B0(globalCtx, 0x462, &this->actor); - this->curTextId = 0x462; // Hmm... Link is it? - return; - case 22: // Hmm.. Link is it? - func_801518B0(globalCtx, 0x463, &this->actor); - this->curTextId = 0x463; // Got it... I won't forget your deposits. Let me stamp you - return; - case 23: // Got it... I won't forget your deposits. Let me stamp you - func_801518B0(globalCtx, 0x464, &this->actor); - this->curTextId = 0x464; // Hey, relax! It doesn't leave any marks - return; - case 24: // Hey, relax! It doesn't leave any marks - //globalCtx->msgCtx.pad11F23 = 0x44; - globalCtx->msgCtx.pad11F23[0] = 0x44; - EnGinkoMan_SetupStamp(this); // stamp player - return; - case 25: // "There! Now I'll know you when I see you!" - func_800BDC5C(&this->skelAnime, animations, GINKO_FLOORSMACKING); - globalCtx->msgCtx.bankRupees = gSaveContext.perm.bankRupees & 0xFFFF; - func_801518B0(globalCtx, 0x45A, &this->actor); - this->curTextId = 0x45A; // "All right, little guy, now I've got a total of [rupees] from you!" - return; - case 26: // What's this? You need somethin'? - case 27: // "What's this? You need somethin' on a day like this? You haven't evacuated yet? - func_801518B0(globalCtx, 0x468, &this->actor); - this->curTextId = 0x468; // " Deposit Rupees Withdraw Rupees Nothing really" - return; - case 29: // "Excuse me, but let me take a look at you..." - EnGinkoMan_SetupStamp(this); // stamp player - return; - case 30: // "Ah, yes...[Link]. If I remember, you're the little guy who deposited [rupees]." - case 32: // "Ah, yes...[Link], right? If I remember, you're the little guy who deposited [rupees]." - case 50: // "Your deposits total [rupees]." - if (this->choiceDepositWithdrawl == GINKOMAN_CHOICE_DEPOSIT) { - if ((u32) (gSaveContext.perm.bankRupees & 0xFFFF) >= 0x1388) { - func_801518B0(globalCtx, 0x45F, &this->actor); - this->curTextId = 0x45F; // "Excuuuse me! But I can't take anymore deposits! - } else if (gSaveContext.perm.unk24.currentRupees == 0) { - func_801518B0(globalCtx, 0x458, &this->actor); - this->curTextId = 0x458; // "Hmm...You play mean jokes, little guy! You haven't even got a single Rupee! - } else { - func_801518B0(globalCtx, 0x479, &this->actor); - this->curTextId = 0x479; // "Well, are you gonna make a deposit?" - } - } else if ((((s32) gSaveContext.perm.day % 5) == 3) && (gSaveContext.perm.isNight == 1)) { - func_801518B0(globalCtx, 0x46D, &this->actor); - // "Look, little guy, if it's 'cause of the bad rumors going around, forget it! They're just rumors!" - this->curTextId = 0x46D; - } else { // GINKOMAN_CHOICE_WITHDRAWL - func_801518B0(globalCtx, 0x46B, &this->actor); - this->curTextId = 0x46B; // "So..." - } - this->choiceDepositWithdrawl = GINKOMAN_CHOICE_RESET; - return; - case 31: // So... - func_801518B0(globalCtx, 0x46E, &this->actor); - this->curTextId = 0x46E; // "How much do you want? [rupee prompt] - return; - case 33: // "Look, little guy, if it's 'cause of the bad rumors going around, forget it! They're just rumors!" - func_801518B0(globalCtx, 0x46B, &this->actor); - this->curTextId = 0x46B; // So... - return; - case 36: // "Is that so? Come back and deposit some after saving up a bunch!" - if (func_80147624(globalCtx) == 0) { + case 15: // given 200 reward + case 16: // given 1000 reward + case 17: // given 5000 reward + this->stampChecked = 0; + func_801477B4(globalCtx); + EnGinkoMan_SetupBankAward(this); + EnGinkoMan_BankAward(this, globalCtx); return; - } - func_801477B4(globalCtx); - this->stampChecked = 0; - EnGinkoMan_SetupIdle(this); // change to waiting for approach - return; - case 42: // "...You haven't deposited that many Rupees, so that much isn't available for withdrawal. Do the math! - func_800BDC5C(&this->skelAnime, animations, GINKO_SITTING); - case 41: // "What's this? Look, little guy, you can't hold this many rupees! You got that?" - case 48: // "Is that so? Think it over, little guy! So what are you gonna do?" - case 49: // duplicate of 48 - func_801518B0(globalCtx, 0x468, &this->actor); - this->curTextId = 0x468; // " Deposit Rupees Withdraw Rupees Nothing really" - return; - case 38: // "What's this? It's a waste to take out such a tiny bit! ...But if you say so!" - case 39: // Use it wisely... - case 40: // "Aw, you're taking out all that? If you spend it like that, it'll all be gone before you know it!" - if ((gSaveContext.perm.bankRupees & 0xFFFF) == 0) { - func_801518B0(globalCtx, 0x478, &this->actor); - // "Look, little guy, all the Rupees you deposited are gone, so you can't use that stamp anymore." - this->curTextId = 0x478; - } else { + case 21: // So, little guy, what's your name? + func_801518B0(globalCtx, 0x462, &this->actor); + this->curTextId = 0x462; // Hmm... Link is it? + return; + case 22: // Hmm.. Link is it? + func_801518B0(globalCtx, 0x463, &this->actor); + this->curTextId = 0x463; // Got it... I won't forget your deposits. Let me stamp you + return; + case 23: // Got it... I won't forget your deposits. Let me stamp you + func_801518B0(globalCtx, 0x464, &this->actor); + this->curTextId = 0x464; // Hey, relax! It doesn't leave any marks + return; + case 24: // Hey, relax! It doesn't leave any marks + // globalCtx->msgCtx.pad11F23 = 0x44; + globalCtx->msgCtx.pad11F23[0] = 0x44; + EnGinkoMan_SetupStamp(this); // stamp player + return; + case 25: // "There! Now I'll know you when I see you!" + func_800BDC5C(&this->skelAnime, animations, GINKO_FLOORSMACKING); globalCtx->msgCtx.bankRupees = gSaveContext.perm.bankRupees & 0xFFFF; func_801518B0(globalCtx, 0x45A, &this->actor); this->curTextId = 0x45A; // "All right, little guy, now I've got a total of [rupees] from you!" - } - break; - case 43: // "...You know, at this time of day there's a 4 Rupee service charge on withdrawals!" - func_801518B0(globalCtx, 0x471, &this->actor); - this->curTextId = 0x471; // "Are you really withdrawing [rupees selected]? Y/n" - this->serviceFee = globalCtx->msgCtx.unk1206C; - return; - case 45: // Well, are you gonna make a deposit? - func_801518B0(globalCtx, 0x44F, &this->actor); - this->curTextId = 0x44F; // "All right! So..." - return; - default: - break; + return; + case 26: // What's this? You need somethin'? + case 27: // "What's this? You need somethin' on a day like this? You haven't evacuated yet? + func_801518B0(globalCtx, 0x468, &this->actor); + this->curTextId = 0x468; // " Deposit Rupees Withdraw Rupees Nothing really" + return; + case 29: // "Excuse me, but let me take a look at you..." + EnGinkoMan_SetupStamp(this); // stamp player + return; + case 30: // "Ah, yes...[Link]. If I remember, you're the little guy who deposited [rupees]." + case 32: // "Ah, yes...[Link], right? If I remember, you're the little guy who deposited [rupees]." + case 50: // "Your deposits total [rupees]." + if (this->choiceDepositWithdrawl == GINKOMAN_CHOICE_DEPOSIT) { + if ((u32)(gSaveContext.perm.bankRupees & 0xFFFF) >= 0x1388) { + func_801518B0(globalCtx, 0x45F, &this->actor); + this->curTextId = 0x45F; // "Excuuuse me! But I can't take anymore deposits! + } else if (gSaveContext.perm.unk24.currentRupees == 0) { + func_801518B0(globalCtx, 0x458, &this->actor); + this->curTextId = + 0x458; // "Hmm...You play mean jokes, little guy! You haven't even got a single Rupee! + } else { + func_801518B0(globalCtx, 0x479, &this->actor); + this->curTextId = 0x479; // "Well, are you gonna make a deposit?" + } + } else if ((((s32)gSaveContext.perm.day % 5) == 3) && (gSaveContext.perm.isNight == 1)) { + func_801518B0(globalCtx, 0x46D, &this->actor); + // "Look, little guy, if it's 'cause of the bad rumors going around, forget it! They're just rumors!" + this->curTextId = 0x46D; + } else { // GINKOMAN_CHOICE_WITHDRAWL + func_801518B0(globalCtx, 0x46B, &this->actor); + this->curTextId = 0x46B; // "So..." + } + this->choiceDepositWithdrawl = GINKOMAN_CHOICE_RESET; + return; + case 31: // So... + func_801518B0(globalCtx, 0x46E, &this->actor); + this->curTextId = 0x46E; // "How much do you want? [rupee prompt] + return; + case 33: // "Look, little guy, if it's 'cause of the bad rumors going around, forget it! They're just rumors!" + func_801518B0(globalCtx, 0x46B, &this->actor); + this->curTextId = 0x46B; // So... + return; + case 36: // "Is that so? Come back and deposit some after saving up a bunch!" + if (func_80147624(globalCtx) == 0) { + return; + } + func_801477B4(globalCtx); + this->stampChecked = 0; + EnGinkoMan_SetupIdle(this); // change to waiting for approach + return; + case 42: // "...You haven't deposited that many Rupees, so that much isn't available for withdrawal. Do the + // math! + func_800BDC5C(&this->skelAnime, animations, GINKO_SITTING); + case 41: // "What's this? Look, little guy, you can't hold this many rupees! You got that?" + case 48: // "Is that so? Think it over, little guy! So what are you gonna do?" + case 49: // duplicate of 48 + func_801518B0(globalCtx, 0x468, &this->actor); + this->curTextId = 0x468; // " Deposit Rupees Withdraw Rupees Nothing really" + return; + case 38: // "What's this? It's a waste to take out such a tiny bit! ...But if you say so!" + case 39: // Use it wisely... + case 40: // "Aw, you're taking out all that? If you spend it like that, it'll all be gone before you know it!" + if ((gSaveContext.perm.bankRupees & 0xFFFF) == 0) { + func_801518B0(globalCtx, 0x478, &this->actor); + // "Look, little guy, all the Rupees you deposited are gone, so you can't use that stamp anymore." + this->curTextId = 0x478; + } else { + globalCtx->msgCtx.bankRupees = gSaveContext.perm.bankRupees & 0xFFFF; + func_801518B0(globalCtx, 0x45A, &this->actor); + this->curTextId = 0x45A; // "All right, little guy, now I've got a total of [rupees] from you!" + } + break; + case 43: // "...You know, at this time of day there's a 4 Rupee service charge on withdrawals!" + func_801518B0(globalCtx, 0x471, &this->actor); + this->curTextId = 0x471; // "Are you really withdrawing [rupees selected]? Y/n" + this->serviceFee = globalCtx->msgCtx.unk1206C; + return; + case 45: // Well, are you gonna make a deposit? + func_801518B0(globalCtx, 0x44F, &this->actor); + this->curTextId = 0x44F; // "All right! So..." + return; + default: + break; } // end switch } // */ @@ -333,163 +371,166 @@ void EnGinkoMan_DepositDialogue(EnGinkoMan *this, GlobalContext *globalCtx) { // #endif #if NON_MATCHING -// NON-MATCHING: lots of regalloc +// NON-MATCHING: lots of regalloc // ROM SHIFT: a couple redundant li 0x4806 added reason unk // actionfunc: wait for player dialogue input -void EnGinkoMan_WaitForDialogueInput(EnGinkoMan *this, GlobalContext *globalCtx) { +void EnGinkoMan_WaitForDialogueInput(EnGinkoMan* this, GlobalContext* globalCtx) { // branch likely instead of branch, fixed by adding a fake if later though // probably because its supposed to wrap around the whole switch, but couldn't match with that either if (func_80147624(globalCtx) == 0) { - return; + return; } switch (this->curTextId) { - case 0x44E: // "...So, what'll it be? - if (globalCtx->msgCtx.choiceIndex == GINKOMAN_CHOICE_YES) { - if ( (gSaveContext.perm.bankRupees & 0xFFFF) >= 0x1388) { - play_sound(0x4806);// NA_SE_SY_ERROR - func_801518B0(globalCtx, 0x45F, &this->actor); - this->curTextId = 0x45F; // bank full, cannot accept more - return; - } - else { - if (gSaveContext.perm.unk24.currentRupees > 0) { - func_8019F208(0x4806); - func_801518B0(globalCtx, 0x44F, &this->actor); - this->curTextId = 0x44F; // "All right! so..." - } else { + case 0x44E: // "...So, what'll it be? + if (globalCtx->msgCtx.choiceIndex == GINKOMAN_CHOICE_YES) { + if ((gSaveContext.perm.bankRupees & 0xFFFF) >= 0x1388) { play_sound(0x4806); // NA_SE_SY_ERROR - func_801518B0(globalCtx, 0x458, &this->actor); - this->curTextId = 0x458; // you haven't even gotten a single rup - } - return; - } - } else { // GINKOMAN_CHOICE_NO - func_8019F230(); - func_801518B0(globalCtx, 0x451, &this->actor); - this->curTextId = 0x451; // dont say that, come on, trust me! - break; - } - - case 0x452: // Really? are you really depositing rupees? - - if (globalCtx->msgCtx.choiceIndex == GINKOMAN_CHOICE_YES){ - if (gSaveContext.perm.unk24.currentRupees < globalCtx->msgCtx.bankRupeesSelected) { - play_sound(0x4806); // NA_SE_SY_ERROR - func_800BDC5C(&this->skelAnime, animations, GINKO_SITTING); - func_801518B0(globalCtx, 0x459, &this->actor); - this->curTextId = 0x459; // HEY you dont have that much - //return; - } else { - func_8019F208(0x4806); - if (globalCtx->msgCtx.bankRupeesSelected >= 100) { - func_801518B0(globalCtx, 0x455, &this->actor); - this->curTextId = 0x455; // You're really going to be give me that much? Rich little guy! - } else if (globalCtx->msgCtx.bankRupeesSelected >= 10) { - func_801518B0(globalCtx, 0x454, &this->actor); - this->curTextId = 0x454; // Seriously? that's a lot. A lot! + func_801518B0(globalCtx, 0x45F, &this->actor); + this->curTextId = 0x45F; // bank full, cannot accept more + return; } else { + if (gSaveContext.perm.unk24.currentRupees > 0) { + func_8019F208(0x4806); + func_801518B0(globalCtx, 0x44F, &this->actor); + this->curTextId = 0x44F; // "All right! so..." + } else { + play_sound(0x4806); // NA_SE_SY_ERROR + func_801518B0(globalCtx, 0x458, &this->actor); + this->curTextId = 0x458; // you haven't even gotten a single rup + } + return; + } + } else { // GINKOMAN_CHOICE_NO + func_8019F230(); + func_801518B0(globalCtx, 0x451, &this->actor); + this->curTextId = 0x451; // dont say that, come on, trust me! + break; + } + + case 0x452: // Really? are you really depositing rupees? + + if (globalCtx->msgCtx.choiceIndex == GINKOMAN_CHOICE_YES) { + if (gSaveContext.perm.unk24.currentRupees < globalCtx->msgCtx.bankRupeesSelected) { + play_sound(0x4806); // NA_SE_SY_ERROR func_800BDC5C(&this->skelAnime, animations, GINKO_SITTING); - func_801518B0(globalCtx, 0x453, &this->actor); - this->curTextId = 0x453; // That's it? That aint nothing at all + func_801518B0(globalCtx, 0x459, &this->actor); + this->curTextId = 0x459; // HEY you dont have that much + // return; + } else { + func_8019F208(0x4806); + if (globalCtx->msgCtx.bankRupeesSelected >= 100) { + func_801518B0(globalCtx, 0x455, &this->actor); + this->curTextId = 0x455; // You're really going to be give me that much? Rich little guy! + } else if (globalCtx->msgCtx.bankRupeesSelected >= 10) { + func_801518B0(globalCtx, 0x454, &this->actor); + this->curTextId = 0x454; // Seriously? that's a lot. A lot! + } else { + func_800BDC5C(&this->skelAnime, animations, GINKO_SITTING); + func_801518B0(globalCtx, 0x453, &this->actor); + this->curTextId = 0x453; // That's it? That aint nothing at all + } + if ((gSaveContext.perm.bankRupees & 0xFFFF) == 0) { + this->newAccountFlag = 1; + } + func_801159EC((s16) - (s32)globalCtx->msgCtx.bankRupeesSelected); + this->previousBankValue = gSaveContext.perm.bankRupees; + + gSaveContext.perm.bankRupees = + ((gSaveContext.perm.bankRupees & 0xFFFF) + globalCtx->msgCtx.bankRupeesSelected) | + (gSaveContext.perm.bankRupees & 0xFFFF0000); } - if ((gSaveContext.perm.bankRupees & 0xFFFF) == 0) { - this->newAccountFlag = 1; + } else { // GINKOMAN_CHOICE_NO + func_8019F230(); + func_800BDC5C(&this->skelAnime, animations, GINKO_SITTING); + if ((gSaveContext.perm.bankRupees & 0xFFFF) == 0) { // @B74 + func_801518B0(globalCtx, 0x456, &this->actor); + this->curTextId = 0x456; // Is that so? think about it + } else { + func_801518B0(globalCtx, 0x47D, &this->actor); + this->curTextId = 0x47D; // is that so? think it over } - func_801159EC((s16) -(s32) globalCtx->msgCtx.bankRupeesSelected); - this->previousBankValue = gSaveContext.perm.bankRupees; - - gSaveContext.perm.bankRupees = ((gSaveContext.perm.bankRupees & 0xFFFF) - + globalCtx->msgCtx.bankRupeesSelected) | (gSaveContext.perm.bankRupees & 0xFFFF0000); } - }else{ // GINKOMAN_CHOICE_NO - func_8019F230(); - func_800BDC5C(&this->skelAnime, animations, GINKO_SITTING); - if ((gSaveContext.perm.bankRupees & 0xFFFF) == 0) { // @B74 - func_801518B0(globalCtx, 0x456, &this->actor); - this->curTextId = 0x456; // Is that so? think about it + break; + + case 0x468: // Deposit OR withdrawl OR cancel screen // location: @C38 + // FAKE MATCH + if (globalCtx->msgCtx.choiceIndex) {} // -5000 permuter score: regalloc and branch likely swapping + + if (globalCtx->msgCtx.choiceIndex == GINKOMAN_CHOICE_CANCEL) { + func_8019F230(); + func_801518B0(globalCtx, 0x470, &this->actor); + this->curTextId = 0x470; // "Is that so? Come back and deposit some after saving up a bunch!" } else { - func_801518B0(globalCtx, 0x47D, &this->actor); - this->curTextId = 0x47D; // is that so? think it over + func_8019F208(); + this->choiceDepositWithdrawl = globalCtx->msgCtx.choiceIndex; + if (this->stampChecked == 0) { // @C94 + this->stampChecked = 1; + func_801518B0(globalCtx, 0x469, &this->actor); + this->curTextId = 0x469; // "Excuse me, but let me take a look at you..." + } else { + func_801518B0(globalCtx, 0x47E, &this->actor); + this->curTextId = 0x47E; // "Your deposits total [rupees]." + } } - } - break; + break; - case 0x468: // Deposit OR withdrawl OR cancel screen // location: @C38 - // FAKE MATCH - if (globalCtx->msgCtx.choiceIndex) {} // -5000 permuter score: regalloc and branch likely swapping + case 0x471: // Are you really withdrawling [selected rupees]? // @CDC + // 0xEDC: bankRupees + if (globalCtx->msgCtx.choiceIndex == GINKOMAN_CHOICE_YES) { + // s32 casts required for slt instead of sltu + if ((s32)((gSaveContext.perm.bankRupees & 0xFFFF)) < + ((s32)(globalCtx->msgCtx.bankRupeesSelected + this->serviceFee))) { + play_sound(0x4806); // NA_SE_SY_ERROR + func_800BDC5C(&this->skelAnime, animations, GINKO_FLOORSMACKING); // @ D30 + func_801518B0(globalCtx, 0x476, &this->actor); + this->curTextId = 0x476; // you dont have enough deposited to withdrawl + return; + } - if (globalCtx->msgCtx.choiceIndex == GINKOMAN_CHOICE_CANCEL) { - func_8019F230(); - func_801518B0(globalCtx, 0x470, &this->actor); - this->curTextId = 0x470; // "Is that so? Come back and deposit some after saving up a bunch!" - } else { - func_8019F208(); - this->choiceDepositWithdrawl = globalCtx->msgCtx.choiceIndex; - if (this->stampChecked == 0) { // @C94 - this->stampChecked = 1; - func_801518B0(globalCtx, 0x469, &this->actor); - this->curTextId = 0x469; // "Excuse me, but let me take a look at you..." - } else { - func_801518B0(globalCtx, 0x47E, &this->actor); - this->curTextId = 0x47E; // "Your deposits total [rupees]." - } - } - break; + // check if wallet is big enough + if ((D_801C1E2C[(gSaveContext.perm.inv.unk48 & D_801C1DD0) >> D_801C1E08]) < + (globalCtx->msgCtx.bankRupeesSelected + gSaveContext.perm.unk24.currentRupees)) { + play_sound(0x4806); // NA_SE_SY_ERROR + func_801518B0(globalCtx, 0x475, &this->actor); + this->curTextId = 0x475; // You can't hold that many in your wallet + return; + } + func_8019F208(0x4806); - case 0x471: // Are you really withdrawling [selected rupees]? // @CDC - // 0xEDC: bankRupees - if (globalCtx->msgCtx.choiceIndex == GINKOMAN_CHOICE_YES) { - // s32 casts required for slt instead of sltu - if ((s32)((gSaveContext.perm.bankRupees & 0xFFFF)) < ((s32)( globalCtx->msgCtx.bankRupeesSelected + this->serviceFee))) { - play_sound(0x4806); // NA_SE_SY_ERROR - func_800BDC5C(&this->skelAnime, animations, GINKO_FLOORSMACKING); // @ D30 - func_801518B0(globalCtx, 0x476, &this->actor); - this->curTextId = 0x476; // you dont have enough deposited to withdrawl + if (globalCtx->msgCtx.bankRupeesSelected >= 100) { + func_801518B0(globalCtx, 0x474, &this->actor); + this->curTextId = 0x474; // Aw, you're taking out all that? + } else if (globalCtx->msgCtx.bankRupeesSelected >= 10) { + func_801518B0(globalCtx, 0x473, &this->actor); + this->curTextId = 0x473; // use it wisely + } else { + func_801518B0(globalCtx, 0x472, &this->actor); + this->curTextId = 0x472; // It's a waste to take out such a tiny bit + } + this->previousBankValue = (s16)gSaveContext.perm.bankRupees; + gSaveContext.perm.bankRupees = + (((gSaveContext.perm.bankRupees & 0xFFFF) - globalCtx->msgCtx.bankRupeesSelected) - + this->serviceFee) | + (gSaveContext.perm.bankRupees & 0xFFFF0000); + func_801159EC((s16)globalCtx->msgCtx.bankRupeesSelected, &gSaveContext); // cast req return; - } - - // check if wallet is big enough - if ( (D_801C1E2C[ ( gSaveContext.perm.inv.unk48 & D_801C1DD0) >> D_801C1E08]) - < (globalCtx->msgCtx.bankRupeesSelected + gSaveContext.perm.unk24.currentRupees)) { - play_sound(0x4806); // NA_SE_SY_ERROR - func_801518B0(globalCtx, 0x475, &this->actor); - this->curTextId = 0x475; // You can't hold that many in your wallet - return; - } - func_8019F208(0x4806); - - if (globalCtx->msgCtx.bankRupeesSelected >= 100) { - func_801518B0(globalCtx, 0x474, &this->actor); - this->curTextId = 0x474; // Aw, you're taking out all that? - } else if (globalCtx->msgCtx.bankRupeesSelected >= 10) { - func_801518B0(globalCtx, 0x473, &this->actor); - this->curTextId = 0x473; // use it wisely } else { - func_801518B0(globalCtx, 0x472, &this->actor); - this->curTextId = 0x472; // It's a waste to take out such a tiny bit + func_8019F230(); + func_801518B0(globalCtx, 0x47C, &this->actor); + this->curTextId = 0x47C; // "Is that so? Think it over, little guy! So what are you gonna do?" } - this->previousBankValue = (s16) gSaveContext.perm.bankRupees; - gSaveContext.perm.bankRupees = (((gSaveContext.perm.bankRupees & 0xFFFF) - globalCtx->msgCtx.bankRupeesSelected) - - this->serviceFee) | (gSaveContext.perm.bankRupees & 0xFFFF0000); - func_801159EC( (s16) globalCtx->msgCtx.bankRupeesSelected, &gSaveContext); // cast req - return; - } else { - func_8019F230(); - func_801518B0(globalCtx, 0x47C, &this->actor); - this->curTextId = 0x47C; // "Is that so? Think it over, little guy! So what are you gonna do?" - } } // end switch } #else #pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Ginko_Man_0x80A644A0/EnGinkoMan_WaitForDialogueInput.asm") #endif -void EnGinkoMan_WaitForRupeeCount(EnGinkoMan *this, GlobalContext *globalCtx) { +void EnGinkoMan_WaitForRupeeCount(EnGinkoMan* this, GlobalContext* globalCtx) { if (func_80147624(globalCtx)) { - switch (this->curTextId){ + switch (this->curTextId) { case 0x450: // "How much? How much?" [rupee prompt] Set the amount with [Control Stick] and if (globalCtx->msgCtx.bankRupeesSelected == 0) { func_800BDC5C(&this->skelAnime, animations, GINKO_SITTING); @@ -522,8 +563,8 @@ void EnGinkoMan_SetupDialogue(EnGinkoMan* this) { this->actionFunc = EnGinkoMan_Dialogue; } -void EnGinkoMan_Dialogue(EnGinkoMan *this, GlobalContext *globalCtx) { - switch ( func_80152498(&globalCtx->msgCtx) ) { // get dialogue state? +void EnGinkoMan_Dialogue(EnGinkoMan* this, GlobalContext* globalCtx) { + switch (func_80152498(&globalCtx->msgCtx)) { // get dialogue state? case 2: EnGinkoMan_SetupIdle(this); break; @@ -547,8 +588,8 @@ void EnGinkoMan_Dialogue(EnGinkoMan *this, GlobalContext *globalCtx) { break; } - if ((this->skelAnime.animCurrentSeg == object_ginko_floorsmacking_anim) - && (func_801378B8(&this->skelAnime, this->skelAnime.animFrameCount) != 0)) { + if ((this->skelAnime.animCurrentSeg == object_ginko_floorsmacking_anim) && + (func_801378B8(&this->skelAnime, this->skelAnime.animFrameCount) != 0)) { Audio_PlayActorSound2(this, 0x2992); // NA_SE_EV_BANK_MAN_HAND_HIT } } @@ -557,7 +598,7 @@ void EnGinkoMan_SetupBankAward(EnGinkoMan* this) { this->actionFunc = EnGinkoMan_BankAward; } -void EnGinkoMan_BankAward(EnGinkoMan *this, GlobalContext *globalCtx) { +void EnGinkoMan_BankAward(EnGinkoMan* this, GlobalContext* globalCtx) { if (Actor_HasParent(&this->actor, globalCtx)) { // ? when would bank have a parent? this->actor.parent = NULL; @@ -565,7 +606,7 @@ void EnGinkoMan_BankAward(EnGinkoMan *this, GlobalContext *globalCtx) { } else if (this->curTextId == 0x45B) { // "Whats this, you already saved up 200?" if (((&gSaveContext)->perm.weekEventReg[10] & 8) == 0) { func_800B8A1C(&this->actor, globalCtx, - ((u32) ((s32) (&gSaveContext)->perm.inv.unk48 & D_801C1DD0) >> D_801C1E08) + 8, 500.0f, 100.0f); + ((u32)((s32)(&gSaveContext)->perm.inv.unk48 & D_801C1DD0) >> D_801C1E08) + 8, 500.0f, 100.0f); } else { func_800B8A1C(&this->actor, globalCtx, 2, 500.0f, 100.0f); } @@ -583,19 +624,20 @@ void EnGinkoMan_SetupBankAward2(EnGinkoMan* this) { this->actionFunc = EnGinkoMan_BankAward2; } -# if NON_MATCHING +#if NON_MATCHING // NON_MATCHING: minor regalloc at globalCtx into func_80152498 // separate function to handle bank rewards... if the bank has a parent actor? might be unused -void EnGinkoMan_BankAward2(EnGinkoMan* this, GlobalContext *globalCtx) { - GlobalContext* gCtx;// = globalCtx; +void EnGinkoMan_BankAward2(EnGinkoMan* this, GlobalContext* globalCtx) { + GlobalContext* gCtx; // = globalCtx; if (func_800B84D0(&this->actor, globalCtx)) { if (((gSaveContext.perm.weekEventReg[0xA] & 8) == 0) && (this->curTextId == 0x45B)) { - // "What's this? You've already saved up 200 Rupees!?! Well, little guy, here's your special gift. Take it!" + // "What's this? You've already saved up 200 Rupees!?! Well, little guy, here's your special gift. Take + // it!" gSaveContext.perm.weekEventReg[0xA] |= 8; func_801518B0(globalCtx, 0x47A, &this->actor); - if (1) { // might be fake, but it solves almost everything + if (1) { // might be fake, but it solves almost everything this->curTextId = 0x47A; // "See! Doesn't it hold more than your old one? } @@ -625,17 +667,17 @@ void EnGinkoMan_BankAward2(EnGinkoMan* this, GlobalContext *globalCtx) { void EnGinkoMan_SetupStamp(EnGinkoMan* this) { func_800BDC5C(&this->skelAnime, animations, GINKO_REACHING); - this->actionFunc = EnGinkoMan_Stamp; + this->actionFunc = EnGinkoMan_Stamp; } -void EnGinkoMan_Stamp(EnGinkoMan *this, GlobalContext *globalCtx) { +void EnGinkoMan_Stamp(EnGinkoMan* this, GlobalContext* globalCtx) { if ((this->curTextId == 0x464) // "Hey, relax! It doesn't leave any marks, and it's not gonna hurt." - && (func_801378B8(&this->skelAnime, 10.0f))) { + && (func_801378B8(&this->skelAnime, 10.0f))) { Audio_PlayActorSound2(this, 0x2993); // NA_SE_EV_HANKO "stamp" } if (func_801378B8(&this->skelAnime, this->skelAnime.animFrameCount)) { - switch(this->curTextId){ + switch (this->curTextId) { case 0x464: // "Hey, relax! It doesn't leave any marks, and it's not gonna hurt." func_800BDC5C(&this->skelAnime, animations, GINKO_SITTING); func_801518B0(globalCtx, 0x465, &this->actor); @@ -644,9 +686,9 @@ void EnGinkoMan_Stamp(EnGinkoMan *this, GlobalContext *globalCtx) { case 0x469: // "Excuse me, but let me take a look at you..." func_800BDC5C(&this->skelAnime, animations, GINKO_SITTING); - globalCtx->msgCtx.bankRupees = (gSaveContext.perm.bankRupees & 0xFFFF); + globalCtx->msgCtx.bankRupees = (gSaveContext.perm.bankRupees & 0xFFFF); // perm.day cast req for div vs divu - if ((((s32) gSaveContext.perm.day % 5) == 3) && (gSaveContext.perm.isNight == 1)) { + if ((((s32)gSaveContext.perm.day % 5) == 3) && (gSaveContext.perm.isNight == 1)) { func_801518B0(globalCtx, 0x46C, &this->actor); this->curTextId = 0x46C; // "Ah, yes...[Link], right? } else { @@ -660,7 +702,7 @@ void EnGinkoMan_Stamp(EnGinkoMan *this, GlobalContext *globalCtx) { } } -void EnGinkoMan_SwitchAnimation(EnGinkoMan *this, GlobalContext *globalCtx) { +void EnGinkoMan_SwitchAnimation(EnGinkoMan* this, GlobalContext* globalCtx) { if (this->actor.xzDistToPlayer > 160.0f) { if (this->animTimer == 0) { if (this->skelAnime.animCurrentSeg != object_ginko_amazed_anim) { @@ -677,7 +719,7 @@ void EnGinkoMan_SwitchAnimation(EnGinkoMan *this, GlobalContext *globalCtx) { DECR(this->animTimer); } -void EnGinkoMan_FacePlayer(EnGinkoMan *this, GlobalContext *globalCtx) { +void EnGinkoMan_FacePlayer(EnGinkoMan* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); if (this->skelAnime.animCurrentSeg != object_ginko_amazed_anim) { @@ -687,7 +729,7 @@ void EnGinkoMan_FacePlayer(EnGinkoMan *this, GlobalContext *globalCtx) { } } -void EnGinkoMan_Update(Actor *thisx, GlobalContext *globalCtx) { +void EnGinkoMan_Update(Actor* thisx, GlobalContext* globalCtx) { EnGinkoMan* this = THIS; this->actionFunc(this, globalCtx); @@ -696,10 +738,10 @@ void EnGinkoMan_Update(Actor *thisx, GlobalContext *globalCtx) { EnGinkoMan_FacePlayer(this, globalCtx); } -s32 EnGinkoMan_LimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* actor){ - EnGinkoMan* this = (EnGinkoMan*) actor; +s32 EnGinkoMan_LimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* actor) { + EnGinkoMan* this = (EnGinkoMan*)actor; if (limbIndex == 15) { - *dList = &object_ginko_limb15_dlist; + *dList = &object_ginko_limb15_dlist; } if (limbIndex == 15) { SysMatrix_InsertTranslation(1500.0f, 0.0f, 0.0f, 1); @@ -713,9 +755,10 @@ s32 EnGinkoMan_LimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve return 0; } -void EnGinkoMan_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* actor) {} +void EnGinkoMan_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* actor) { +} -void EnGinkoMan_Draw(Actor* thisx, GlobalContext *globalCtx) { +void EnGinkoMan_Draw(Actor* thisx, GlobalContext* globalCtx) { EnGinkoMan* this = THIS; OPEN_DISPS(globalCtx->state.gfxCtx); @@ -726,7 +769,8 @@ void EnGinkoMan_Draw(Actor* thisx, GlobalContext *globalCtx) { gSPSegment(POLY_OPA_DISP++, 0x09, Gfx_EnvColor(globalCtx->state.gfxCtx, 0x32, 0x50, 0, 0)); gDPPipeSync(POLY_OPA_DISP++); - SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, &EnGinkoMan_LimbDraw, &EnGinkoMan_PostLimbDraw, &this->actor); + SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, + &EnGinkoMan_LimbDraw, &EnGinkoMan_PostLimbDraw, &this->actor); CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c index 9cf61e3248..efb74adaad 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -18,7 +18,7 @@ const ActorInit En_GirlA_InitVars = { (ActorFunc)EnGirlA_Init, (ActorFunc)EnGirlA_Destroy, (ActorFunc)EnGirlA_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Gk/z_en_gk.c b/src/overlays/actors/ovl_En_Gk/z_en_gk.c index 9acc323559..8e1cf48075 100644 --- a/src/overlays/actors/ovl_En_Gk/z_en_gk.c +++ b/src/overlays/actors/ovl_En_Gk/z_en_gk.c @@ -19,7 +19,7 @@ const ActorInit En_Gk_InitVars = { (ActorFunc)EnGk_Init, (ActorFunc)EnGk_Destroy, (ActorFunc)EnGk_Update, - (ActorFunc)EnGk_Draw + (ActorFunc)EnGk_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c index 6260640ba3..6efea2bcf7 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -19,7 +19,7 @@ const ActorInit En_Gm_InitVars = { (ActorFunc)EnGm_Init, (ActorFunc)EnGm_Destroy, (ActorFunc)EnGm_Update, - (ActorFunc)EnGm_Draw + (ActorFunc)EnGm_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c index c2e69cb8ac..49763014a9 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -18,7 +18,7 @@ const ActorInit En_Go_InitVars = { (ActorFunc)EnGo_Init, (ActorFunc)EnGo_Destroy, (ActorFunc)EnGo_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index 2984dc9f03..1130c00b7a 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -19,7 +19,7 @@ const ActorInit En_Goroiwa_InitVars = { (ActorFunc)EnGoroiwa_Init, (ActorFunc)EnGoroiwa_Destroy, (ActorFunc)EnGoroiwa_Update, - (ActorFunc)EnGoroiwa_Draw + (ActorFunc)EnGoroiwa_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c index 26ebf15fb9..1e2b09ebef 100644 --- a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c +++ b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c @@ -19,7 +19,7 @@ const ActorInit En_Grasshopper_InitVars = { (ActorFunc)EnGrasshopper_Init, (ActorFunc)EnGrasshopper_Destroy, (ActorFunc)EnGrasshopper_Update, - (ActorFunc)EnGrasshopper_Draw + (ActorFunc)EnGrasshopper_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c index 4640ae0525..8592592d66 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -19,7 +19,7 @@ const ActorInit En_Gs_InitVars = { (ActorFunc)EnGs_Init, (ActorFunc)EnGs_Destroy, (ActorFunc)EnGs_Update, - (ActorFunc)EnGs_Draw + (ActorFunc)EnGs_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c index 22f0be0119..93309a6899 100644 --- a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c +++ b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c @@ -19,7 +19,7 @@ const ActorInit En_Guard_Nuts_InitVars = { (ActorFunc)EnGuardNuts_Init, (ActorFunc)EnGuardNuts_Destroy, (ActorFunc)EnGuardNuts_Update, - (ActorFunc)EnGuardNuts_Draw + (ActorFunc)EnGuardNuts_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c index 64203fd85b..649f0ff735 100644 --- a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c +++ b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c @@ -19,7 +19,7 @@ const ActorInit En_Guruguru_InitVars = { (ActorFunc)EnGuruguru_Init, (ActorFunc)EnGuruguru_Destroy, (ActorFunc)EnGuruguru_Update, - (ActorFunc)EnGuruguru_Draw + (ActorFunc)EnGuruguru_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c index a3fdcac50e..f8b5d1f492 100644 --- a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c +++ b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c @@ -18,7 +18,7 @@ const ActorInit En_Hakurock_InitVars = { (ActorFunc)EnHakurock_Init, (ActorFunc)EnHakurock_Destroy, (ActorFunc)EnHakurock_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c index 89f80a5319..961e35421c 100644 --- a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c +++ b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c @@ -18,7 +18,7 @@ const ActorInit En_Hanabi_InitVars = { (ActorFunc)EnHanabi_Init, (ActorFunc)EnHanabi_Destroy, (ActorFunc)EnHanabi_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.c b/src/overlays/actors/ovl_En_Hata/z_en_hata.c index 286a131db7..7b708810a4 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c @@ -19,7 +19,7 @@ const ActorInit En_Hata_InitVars = { (ActorFunc)EnHata_Init, (ActorFunc)EnHata_Destroy, (ActorFunc)EnHata_Update, - (ActorFunc)EnHata_Draw + (ActorFunc)EnHata_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c b/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c index 050ecc5680..9aa10d7d71 100644 --- a/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c +++ b/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c @@ -19,7 +19,7 @@ const ActorInit En_Heishi_InitVars = { (ActorFunc)EnHeishi_Init, (ActorFunc)EnHeishi_Destroy, (ActorFunc)EnHeishi_Update, - (ActorFunc)EnHeishi_Draw + (ActorFunc)EnHeishi_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Hg/z_en_hg.c b/src/overlays/actors/ovl_En_Hg/z_en_hg.c index a6be4d0a03..868447decc 100644 --- a/src/overlays/actors/ovl_En_Hg/z_en_hg.c +++ b/src/overlays/actors/ovl_En_Hg/z_en_hg.c @@ -19,7 +19,7 @@ const ActorInit En_Hg_InitVars = { (ActorFunc)EnHg_Init, (ActorFunc)EnHg_Destroy, (ActorFunc)EnHg_Update, - (ActorFunc)EnHg_Draw + (ActorFunc)EnHg_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c index f133a864d1..9001e19fdc 100644 --- a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c +++ b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c @@ -19,7 +19,7 @@ const ActorInit En_Hgo_InitVars = { (ActorFunc)EnHgo_Init, (ActorFunc)EnHgo_Destroy, (ActorFunc)EnHgo_Update, - (ActorFunc)EnHgo_Draw + (ActorFunc)EnHgo_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c index 8fe2bce87f..e9e92f8ba3 100644 --- a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c +++ b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c @@ -19,7 +19,7 @@ const ActorInit En_Hidden_Nuts_InitVars = { (ActorFunc)EnHiddenNuts_Init, (ActorFunc)EnHiddenNuts_Destroy, (ActorFunc)EnHiddenNuts_Update, - (ActorFunc)EnHiddenNuts_Draw + (ActorFunc)EnHiddenNuts_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c index 2f1350f36b..670f9e0d73 100644 --- a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c +++ b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c @@ -19,7 +19,7 @@ const ActorInit En_Hint_Skb_InitVars = { (ActorFunc)EnHintSkb_Init, (ActorFunc)EnHintSkb_Destroy, (ActorFunc)EnHintSkb_Update, - (ActorFunc)EnHintSkb_Draw + (ActorFunc)EnHintSkb_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c index bfa50f71a7..243fb7575f 100644 --- a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c +++ b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c @@ -18,7 +18,7 @@ const ActorInit En_Hit_Tag_InitVars = { (ActorFunc)EnHitTag_Init, (ActorFunc)EnHitTag_Destroy, (ActorFunc)EnHitTag_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/src/overlays/actors/ovl_En_Holl/z_en_holl.c index d6aecaf4a6..7eaf74b724 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -19,7 +19,7 @@ const ActorInit En_Holl_InitVars = { (ActorFunc)EnHoll_Init, (ActorFunc)EnHoll_Destroy, (ActorFunc)EnHoll_Update, - (ActorFunc)EnHoll_Draw + (ActorFunc)EnHoll_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c index 1ad212a69a..9961a00dfd 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -19,7 +19,7 @@ const ActorInit En_Honotrap_InitVars = { (ActorFunc)EnHonotrap_Init, (ActorFunc)EnHonotrap_Destroy, (ActorFunc)EnHonotrap_Update, - (ActorFunc)EnHonotrap_Draw + (ActorFunc)EnHonotrap_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index 2d6b5877b0..4bdc4da0a5 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -19,7 +19,7 @@ const ActorInit En_Horse_InitVars = { (ActorFunc)EnHorse_Init, (ActorFunc)EnHorse_Destroy, (ActorFunc)EnHorse_Update, - (ActorFunc)EnHorse_Draw + (ActorFunc)EnHorse_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c index 92c1a9f549..497db3583e 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c @@ -19,7 +19,7 @@ const ActorInit En_Horse_Game_Check_InitVars = { (ActorFunc)EnHorseGameCheck_Init, (ActorFunc)EnHorseGameCheck_Destroy, (ActorFunc)EnHorseGameCheck_Update, - (ActorFunc)EnHorseGameCheck_Draw + (ActorFunc)EnHorseGameCheck_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c index ce5d666bbe..896513c44f 100644 --- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c @@ -19,7 +19,7 @@ const ActorInit En_Horse_Link_Child_InitVars = { (ActorFunc)EnHorseLinkChild_Init, (ActorFunc)EnHorseLinkChild_Destroy, (ActorFunc)EnHorseLinkChild_Update, - (ActorFunc)EnHorseLinkChild_Draw + (ActorFunc)EnHorseLinkChild_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c index 46fe6de1de..21e7cf7eec 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -19,7 +19,7 @@ const ActorInit En_Hs_InitVars = { (ActorFunc)EnHs_Init, (ActorFunc)EnHs_Destroy, (ActorFunc)EnHs_Update, - (ActorFunc)EnHs_Draw + (ActorFunc)EnHs_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c index 4880f1f207..0cebfccd9a 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -20,7 +20,7 @@ const ActorInit En_Hs2_InitVars = { (ActorFunc)EnHs2_Init, (ActorFunc)EnHs2_Destroy, (ActorFunc)EnHs2_Update, - (ActorFunc)EnHs2_Draw + (ActorFunc)EnHs2_Draw, }; void EnHs2_Init(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Ig/z_en_ig.c b/src/overlays/actors/ovl_En_Ig/z_en_ig.c index dd34f58278..43baaa459a 100644 --- a/src/overlays/actors/ovl_En_Ig/z_en_ig.c +++ b/src/overlays/actors/ovl_En_Ig/z_en_ig.c @@ -19,7 +19,7 @@ const ActorInit En_Ig_InitVars = { (ActorFunc)EnIg_Init, (ActorFunc)EnIg_Destroy, (ActorFunc)EnIg_Update, - (ActorFunc)EnIg_Draw + (ActorFunc)EnIg_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c index d61193cdbe..23fe508ded 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -19,7 +19,7 @@ const ActorInit En_Ik_InitVars = { (ActorFunc)EnIk_Init, (ActorFunc)EnIk_Destroy, (ActorFunc)EnIk_Update, - (ActorFunc)EnIk_Draw + (ActorFunc)EnIk_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c index 7b8c9cb38e..a53bb8ab9d 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -19,7 +19,7 @@ const ActorInit En_In_InitVars = { (ActorFunc)EnIn_Init, (ActorFunc)EnIn_Destroy, (ActorFunc)EnIn_Update, - (ActorFunc)EnIn_Draw + (ActorFunc)EnIn_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index 5ae8a87ff1..ef6fc135ed 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -19,7 +19,7 @@ const ActorInit En_Insect_InitVars = { (ActorFunc)EnInsect_Init, (ActorFunc)EnInsect_Destroy, (ActorFunc)EnInsect_Update, - (ActorFunc)EnInsect_Draw + (ActorFunc)EnInsect_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c index 2ecbf4d529..fbaaf19859 100644 --- a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c +++ b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c @@ -18,7 +18,7 @@ const ActorInit En_Invadepoh_InitVars = { (ActorFunc)EnInvadepoh_Init, (ActorFunc)EnInvadepoh_Destroy, (ActorFunc)EnInvadepoh_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c index e38c09e11b..34b4283206 100644 --- a/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c +++ b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c @@ -19,7 +19,7 @@ const ActorInit En_Invadepoh_Demo_InitVars = { (ActorFunc)EnInvadepohDemo_Init, (ActorFunc)EnInvadepohDemo_Destroy, (ActorFunc)EnInvadepohDemo_Update, - (ActorFunc)EnInvadepohDemo_Draw + (ActorFunc)EnInvadepohDemo_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c index c7a7615f1e..ec54f5efc2 100644 --- a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c +++ b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c @@ -18,7 +18,7 @@ const ActorInit En_Invisible_Ruppe_InitVars = { (ActorFunc)EnInvisibleRuppe_Init, (ActorFunc)EnInvisibleRuppe_Destroy, (ActorFunc)EnInvisibleRuppe_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c index 72f2d9d34d..42c1a1f10f 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -18,7 +18,7 @@ const ActorInit En_Ishi_InitVars = { (ActorFunc)EnIshi_Init, (ActorFunc)EnIshi_Destroy, (ActorFunc)EnIshi_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Ja/z_en_ja.c b/src/overlays/actors/ovl_En_Ja/z_en_ja.c index ae87151dee..71bf534b1e 100644 --- a/src/overlays/actors/ovl_En_Ja/z_en_ja.c +++ b/src/overlays/actors/ovl_En_Ja/z_en_ja.c @@ -19,7 +19,7 @@ const ActorInit En_Ja_InitVars = { (ActorFunc)EnJa_Init, (ActorFunc)EnJa_Destroy, (ActorFunc)EnJa_Update, - (ActorFunc)EnJa_Draw + (ActorFunc)EnJa_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Jg/z_en_jg.c b/src/overlays/actors/ovl_En_Jg/z_en_jg.c index 32c8fc5195..1413eb43fb 100644 --- a/src/overlays/actors/ovl_En_Jg/z_en_jg.c +++ b/src/overlays/actors/ovl_En_Jg/z_en_jg.c @@ -19,7 +19,7 @@ const ActorInit En_Jg_InitVars = { (ActorFunc)EnJg_Init, (ActorFunc)EnJg_Destroy, (ActorFunc)EnJg_Update, - (ActorFunc)EnJg_Draw + (ActorFunc)EnJg_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c index 349f0521ab..510bb8060e 100644 --- a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c +++ b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c @@ -19,7 +19,7 @@ const ActorInit En_Jgame_Tsn_InitVars = { (ActorFunc)EnJgameTsn_Init, (ActorFunc)EnJgameTsn_Destroy, (ActorFunc)EnJgameTsn_Update, - (ActorFunc)EnJgameTsn_Draw + (ActorFunc)EnJgameTsn_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.c b/src/overlays/actors/ovl_En_Js/z_en_js.c index 43f8cf05d1..93c807e183 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -19,7 +19,7 @@ const ActorInit En_Js_InitVars = { (ActorFunc)EnJs_Init, (ActorFunc)EnJs_Destroy, (ActorFunc)EnJs_Update, - (ActorFunc)EnJs_Draw + (ActorFunc)EnJs_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Jso/z_en_jso.c b/src/overlays/actors/ovl_En_Jso/z_en_jso.c index 56bdd5793e..1934023f66 100644 --- a/src/overlays/actors/ovl_En_Jso/z_en_jso.c +++ b/src/overlays/actors/ovl_En_Jso/z_en_jso.c @@ -18,7 +18,7 @@ const ActorInit En_Jso_InitVars = { (ActorFunc)EnJso_Init, (ActorFunc)EnJso_Destroy, (ActorFunc)EnJso_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c index 9faadd04a3..66535c0c7c 100644 --- a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c +++ b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c @@ -19,7 +19,7 @@ const ActorInit En_Jso2_InitVars = { (ActorFunc)EnJso2_Init, (ActorFunc)EnJso2_Destroy, (ActorFunc)EnJso2_Update, - (ActorFunc)EnJso2_Draw + (ActorFunc)EnJso2_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c index d2d5225bf1..16b9706b66 100644 --- a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c +++ b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c @@ -18,7 +18,7 @@ const ActorInit En_Kaizoku_InitVars = { (ActorFunc)EnKaizoku_Init, (ActorFunc)EnKaizoku_Destroy, (ActorFunc)EnKaizoku_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index 90537a5844..c6066bb5e7 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -19,7 +19,7 @@ const ActorInit En_Kakasi_InitVars = { (ActorFunc)EnKakasi_Init, (ActorFunc)EnKakasi_Destroy, (ActorFunc)EnKakasi_Update, - (ActorFunc)EnKakasi_Draw + (ActorFunc)EnKakasi_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Kame/z_en_kame.c b/src/overlays/actors/ovl_En_Kame/z_en_kame.c index 61b5c38acd..88e85baa91 100644 --- a/src/overlays/actors/ovl_En_Kame/z_en_kame.c +++ b/src/overlays/actors/ovl_En_Kame/z_en_kame.c @@ -19,7 +19,7 @@ const ActorInit En_Kame_InitVars = { (ActorFunc)EnKame_Init, (ActorFunc)EnKame_Destroy, (ActorFunc)EnKame_Update, - (ActorFunc)EnKame_Draw + (ActorFunc)EnKame_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c index c23ddd1d05..3f88815475 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -19,7 +19,7 @@ const ActorInit En_Kanban_InitVars = { (ActorFunc)EnKanban_Init, (ActorFunc)EnKanban_Destroy, (ActorFunc)EnKanban_Update, - (ActorFunc)EnKanban_Draw + (ActorFunc)EnKanban_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c index f58e9a2255..8212f80678 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -19,7 +19,7 @@ const ActorInit En_Karebaba_InitVars = { (ActorFunc)EnKarebaba_Init, (ActorFunc)EnKarebaba_Destroy, (ActorFunc)EnKarebaba_Update, - (ActorFunc)EnKarebaba_Draw + (ActorFunc)EnKarebaba_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c index e8b3dfd0fd..f3f4f01d81 100644 --- a/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c +++ b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c @@ -19,7 +19,7 @@ const ActorInit En_Kbt_InitVars = { (ActorFunc)EnKbt_Init, (ActorFunc)EnKbt_Destroy, (ActorFunc)EnKbt_Update, - (ActorFunc)EnKbt_Draw + (ActorFunc)EnKbt_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c index 2b416cb5a7..e134fb999b 100644 --- a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c +++ b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c @@ -19,7 +19,7 @@ const ActorInit En_Kendo_Js_InitVars = { (ActorFunc)EnKendoJs_Init, (ActorFunc)EnKendoJs_Destroy, (ActorFunc)EnKendoJs_Update, - (ActorFunc)EnKendoJs_Draw + (ActorFunc)EnKendoJs_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c index eccaff2398..f1dadc9556 100644 --- a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c +++ b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c @@ -19,7 +19,7 @@ const ActorInit En_Kgy_InitVars = { (ActorFunc)EnKgy_Init, (ActorFunc)EnKgy_Destroy, (ActorFunc)EnKgy_Update, - (ActorFunc)EnKgy_Draw + (ActorFunc)EnKgy_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c index f1c4979ad2..abf48ed7a9 100644 --- a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c +++ b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c @@ -18,7 +18,7 @@ const ActorInit En_Kitan_InitVars = { (ActorFunc)EnKitan_Init, (ActorFunc)EnKitan_Destroy, (ActorFunc)EnKitan_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Knight/z_en_knight.c b/src/overlays/actors/ovl_En_Knight/z_en_knight.c index ed8be3a547..87b3d06b9f 100644 --- a/src/overlays/actors/ovl_En_Knight/z_en_knight.c +++ b/src/overlays/actors/ovl_En_Knight/z_en_knight.c @@ -19,7 +19,7 @@ const ActorInit En_Knight_InitVars = { (ActorFunc)EnKnight_Init, (ActorFunc)EnKnight_Destroy, (ActorFunc)EnKnight_Update, - (ActorFunc)EnKnight_Draw + (ActorFunc)EnKnight_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c index 63adb36c2d..0d0cef49ae 100644 --- a/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c +++ b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c @@ -19,7 +19,7 @@ const ActorInit En_Kujiya_InitVars = { (ActorFunc)EnKujiya_Init, (ActorFunc)EnKujiya_Destroy, (ActorFunc)EnKujiya_Update, - (ActorFunc)EnKujiya_Draw + (ActorFunc)EnKujiya_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c index 19a8e59e89..35f8c79f1b 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -18,7 +18,7 @@ const ActorInit En_Kusa_InitVars = { (ActorFunc)EnKusa_Init, (ActorFunc)EnKusa_Destroy, (ActorFunc)EnKusa_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c index 61994aa5ec..f581c78614 100644 --- a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c +++ b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c @@ -19,7 +19,7 @@ const ActorInit En_Kusa2_InitVars = { (ActorFunc)EnKusa2_Init, (ActorFunc)EnKusa2_Destroy, (ActorFunc)EnKusa2_Update, - (ActorFunc)EnKusa2_Draw + (ActorFunc)EnKusa2_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c index dad932ee92..252b5e1d1d 100644 --- a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c +++ b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c @@ -19,7 +19,7 @@ const ActorInit En_Lift_Nuts_InitVars = { (ActorFunc)EnLiftNuts_Init, (ActorFunc)EnLiftNuts_Destroy, (ActorFunc)EnLiftNuts_Update, - (ActorFunc)EnLiftNuts_Draw + (ActorFunc)EnLiftNuts_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.c b/src/overlays/actors/ovl_En_Light/z_en_light.c index 85f8b9c7f9..f1cd3dad78 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.c +++ b/src/overlays/actors/ovl_En_Light/z_en_light.c @@ -19,7 +19,7 @@ const ActorInit En_Light_InitVars = { (ActorFunc)EnLight_Init, (ActorFunc)EnLight_Destroy, (ActorFunc)EnLight_Update, - (ActorFunc)EnLight_Draw + (ActorFunc)EnLight_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c index c21e3384b0..ec40f7286f 100644 --- a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c +++ b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c @@ -19,7 +19,7 @@ const ActorInit En_Look_Nuts_InitVars = { (ActorFunc)EnLookNuts_Init, (ActorFunc)EnLookNuts_Destroy, (ActorFunc)EnLookNuts_Update, - (ActorFunc)EnLookNuts_Draw + (ActorFunc)EnLookNuts_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c index fa5457cebb..00729af22c 100644 --- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c +++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c @@ -17,30 +17,30 @@ const ActorInit En_M_Fire1_InitVars = { (ActorFunc)EnMFire1_Init, (ActorFunc)EnMFire1_Destroy, (ActorFunc)EnMFire1_Update, - NULL + (ActorFunc)NULL, }; static ColliderCylinderInit sCylinderInit = { - { - COLTYPE_NONE, - AT_ON | AT_TYPE_PLAYER, - AC_NONE, - OC1_NONE, - OC2_TYPE_PLAYER, - COLSHAPE_CYLINDER, + { + COLTYPE_NONE, + AT_ON | AT_TYPE_PLAYER, + AC_NONE, + OC1_NONE, + OC2_TYPE_PLAYER, + COLSHAPE_CYLINDER, }, - { - ELEMTYPE_UNK2, - { 0x00000001, 0x00, 0x01 }, - { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_NONE, - OCELEM_NONE, + { + ELEMTYPE_UNK2, + { 0x00000001, 0x00, 0x01 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NONE, + BUMP_NONE, + OCELEM_NONE, }, { 100, 100, 0, { 0, 0, 0 } }, }; -void EnMFire1_Init(Actor* thisx, GlobalContext *globalCtx) { +void EnMFire1_Init(Actor* thisx, GlobalContext* globalCtx) { EnMFire1* this = THIS; s32 pad; @@ -51,14 +51,13 @@ void EnMFire1_Init(Actor* thisx, GlobalContext *globalCtx) { } } -void EnMFire1_Destroy(Actor* thisx, GlobalContext *globalCtx) { +void EnMFire1_Destroy(Actor* thisx, GlobalContext* globalCtx) { EnMFire1* this = THIS; - + Collider_DestroyCylinder(globalCtx, &this->collider); } - -void EnMFire1_Update(Actor* thisx, GlobalContext *globalCtx) { +void EnMFire1_Update(Actor* thisx, GlobalContext* globalCtx) { EnMFire1* this = THIS; s32 pad; diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c index 8556018f59..d4d000088b 100644 --- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c +++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c @@ -19,7 +19,7 @@ const ActorInit En_M_Thunder_InitVars = { (ActorFunc)EnMThunder_Init, (ActorFunc)EnMThunder_Destroy, (ActorFunc)EnMThunder_Update, - (ActorFunc)EnMThunder_Draw + (ActorFunc)EnMThunder_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c index af3e455f6a..ba858292c0 100644 --- a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c +++ b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c @@ -19,7 +19,7 @@ const ActorInit En_Ma4_InitVars = { (ActorFunc)EnMa4_Init, (ActorFunc)EnMa4_Destroy, (ActorFunc)EnMa4_Update, - (ActorFunc)EnMa4_Draw + (ActorFunc)EnMa4_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c index 008c707c7a..652bba2d6c 100644 --- a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c +++ b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c @@ -19,7 +19,7 @@ const ActorInit En_Ma_Yto_InitVars = { (ActorFunc)EnMaYto_Init, (ActorFunc)EnMaYto_Destroy, (ActorFunc)EnMaYto_Update, - (ActorFunc)EnMaYto_Draw + (ActorFunc)EnMaYto_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c b/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c index e0f3d599d0..b4448f6796 100644 --- a/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c +++ b/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c @@ -19,7 +19,7 @@ const ActorInit En_Ma_Yts_InitVars = { (ActorFunc)EnMaYts_Init, (ActorFunc)EnMaYts_Destroy, (ActorFunc)EnMaYts_Update, - (ActorFunc)EnMaYts_Draw + (ActorFunc)EnMaYts_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/src/overlays/actors/ovl_En_Mag/z_en_mag.c index eb29dc7fd9..571e75aa0e 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -19,7 +19,7 @@ const ActorInit En_Mag_InitVars = { (ActorFunc)EnMag_Init, (ActorFunc)EnMag_Destroy, (ActorFunc)EnMag_Update, - (ActorFunc)EnMag_Draw + (ActorFunc)EnMag_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c index 03b054b324..796a6afb62 100644 --- a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c +++ b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c @@ -19,7 +19,7 @@ const ActorInit En_Maruta_InitVars = { (ActorFunc)EnMaruta_Init, (ActorFunc)EnMaruta_Destroy, (ActorFunc)EnMaruta_Update, - (ActorFunc)EnMaruta_Draw + (ActorFunc)EnMaruta_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c index 50f1c8e86d..8b4d3f50a8 100644 --- a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c +++ b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c @@ -18,7 +18,7 @@ const ActorInit En_Minideath_InitVars = { (ActorFunc)EnMinideath_Init, (ActorFunc)EnMinideath_Destroy, (ActorFunc)EnMinideath_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c index 12fefbe030..e4ad298a4a 100644 --- a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c +++ b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c @@ -19,7 +19,7 @@ const ActorInit En_Minifrog_InitVars = { (ActorFunc)EnMinifrog_Init, (ActorFunc)EnMinifrog_Destroy, (ActorFunc)EnMinifrog_Update, - (ActorFunc)EnMinifrog_Draw + (ActorFunc)EnMinifrog_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c index 109349a7e6..d19c26e746 100644 --- a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c +++ b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c @@ -18,7 +18,7 @@ const ActorInit En_Minislime_InitVars = { (ActorFunc)EnMinislime_Init, (ActorFunc)EnMinislime_Destroy, (ActorFunc)EnMinislime_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/src/overlays/actors/ovl_En_Mk/z_en_mk.c index 89df3f86d0..f8664c86c0 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -19,7 +19,7 @@ const ActorInit En_Mk_InitVars = { (ActorFunc)EnMk_Init, (ActorFunc)EnMk_Destroy, (ActorFunc)EnMk_Update, - (ActorFunc)EnMk_Draw + (ActorFunc)EnMk_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c index 4099155e08..9a3688d98f 100644 --- a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c +++ b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c @@ -19,7 +19,7 @@ const ActorInit En_Mkk_InitVars = { (ActorFunc)EnMkk_Init, (ActorFunc)EnMkk_Destroy, (ActorFunc)EnMkk_Update, - (ActorFunc)EnMkk_Draw + (ActorFunc)EnMkk_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.c b/src/overlays/actors/ovl_En_Mm/z_en_mm.c index 52b37b4223..f185b88731 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -19,7 +19,7 @@ const ActorInit En_Mm_InitVars = { (ActorFunc)EnMm_Init, (ActorFunc)EnMm_Destroy, (ActorFunc)EnMm_Update, - (ActorFunc)EnMm_Draw + (ActorFunc)EnMm_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c index 4befb5c590..cc70389abd 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -19,7 +19,7 @@ const ActorInit En_Mm2_InitVars = { (ActorFunc)EnMm2_Init, (ActorFunc)EnMm2_Destroy, (ActorFunc)EnMm2_Update, - (ActorFunc)EnMm2_Draw + (ActorFunc)EnMm2_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c index 21635eea92..8ab6d45f42 100644 --- a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c +++ b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c @@ -19,7 +19,7 @@ const ActorInit En_Mm3_InitVars = { (ActorFunc)EnMm3_Init, (ActorFunc)EnMm3_Destroy, (ActorFunc)EnMm3_Update, - (ActorFunc)EnMm3_Draw + (ActorFunc)EnMm3_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c index 1ceba4cb92..c4f8de74b4 100644 --- a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c +++ b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c @@ -19,7 +19,7 @@ const ActorInit En_Mnk_InitVars = { (ActorFunc)EnMnk_Init, (ActorFunc)EnMnk_Destroy, (ActorFunc)EnMnk_Update, - (ActorFunc)EnMnk_Draw + (ActorFunc)EnMnk_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c index 1c6863cf65..f68a605a14 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -19,7 +19,7 @@ const ActorInit En_Ms_InitVars = { (ActorFunc)EnMs_Init, (ActorFunc)EnMs_Destroy, (ActorFunc)EnMs_Update, - (ActorFunc)EnMs_Draw + (ActorFunc)EnMs_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c index d898f4a93e..bcd9d78aa0 100644 --- a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c +++ b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c @@ -18,7 +18,7 @@ const ActorInit En_Mt_tag_InitVars = { (ActorFunc)EnMttag_Init, (ActorFunc)EnMttag_Destroy, (ActorFunc)EnMttag_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c index f1013ec8f9..238baa6f24 100644 --- a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c +++ b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c @@ -19,7 +19,7 @@ const ActorInit En_Mushi2_InitVars = { (ActorFunc)EnMushi2_Init, (ActorFunc)EnMushi2_Destroy, (ActorFunc)EnMushi2_Update, - (ActorFunc)EnMushi2_Draw + (ActorFunc)EnMushi2_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Muto/z_en_muto.c b/src/overlays/actors/ovl_En_Muto/z_en_muto.c index ee4036e673..dc404cf9dc 100644 --- a/src/overlays/actors/ovl_En_Muto/z_en_muto.c +++ b/src/overlays/actors/ovl_En_Muto/z_en_muto.c @@ -19,7 +19,7 @@ const ActorInit En_Muto_InitVars = { (ActorFunc)EnMuto_Init, (ActorFunc)EnMuto_Destroy, (ActorFunc)EnMuto_Update, - (ActorFunc)EnMuto_Draw + (ActorFunc)EnMuto_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c index e6f00e6f95..ed37a1c4db 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -19,7 +19,7 @@ const ActorInit En_Nb_InitVars = { (ActorFunc)EnNb_Init, (ActorFunc)EnNb_Destroy, (ActorFunc)EnNb_Update, - (ActorFunc)EnNb_Draw + (ActorFunc)EnNb_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c index a8b6938ee7..23de44aa63 100644 --- a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c +++ b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c @@ -19,7 +19,7 @@ const ActorInit En_Neo_Reeba_InitVars = { (ActorFunc)EnNeoReeba_Init, (ActorFunc)EnNeoReeba_Destroy, (ActorFunc)EnNeoReeba_Update, - (ActorFunc)EnNeoReeba_Draw + (ActorFunc)EnNeoReeba_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c b/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c index 89c8b13bf7..20a3408e21 100644 --- a/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c +++ b/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c @@ -19,7 +19,7 @@ const ActorInit En_Nimotsu_InitVars = { (ActorFunc)EnNimotsu_Init, (ActorFunc)EnNimotsu_Destroy, (ActorFunc)EnNimotsu_Update, - (ActorFunc)EnNimotsu_Draw + (ActorFunc)EnNimotsu_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/src/overlays/actors/ovl_En_Niw/z_en_niw.c index 2ab1f5955b..e31863ba93 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -19,7 +19,7 @@ const ActorInit En_Niw_InitVars = { (ActorFunc)EnNiw_Init, (ActorFunc)EnNiw_Destroy, (ActorFunc)EnNiw_Update, - (ActorFunc)EnNiw_Draw + (ActorFunc)EnNiw_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c b/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c index 92efe2c7e1..8d983bf0ac 100644 --- a/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c +++ b/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c @@ -23,18 +23,32 @@ const ActorInit En_Nnh_InitVars = { (ActorFunc)EnNnh_Init, (ActorFunc)EnNnh_Destroy, (ActorFunc)EnNnh_Update, - (ActorFunc)EnNnh_Draw + (ActorFunc)EnNnh_Draw, }; ColliderCylinderInit D_80C08A00 = { - { COLTYPE_TREE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_CYLINDER, }, - { ELEMTYPE_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { + COLTYPE_TREE, + AT_NONE, + AC_ON | AC_TYPE_PLAYER, + OC1_ON | OC1_TYPE_ALL, + OC2_TYPE_1, + COLSHAPE_CYLINDER, + }, + { + ELEMTYPE_UNK1, + { 0x00000000, 0x00, 0x00 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_NONE | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, { 20, 50, 0, { 0, 0, 0 } }, }; extern Gfx D_06001510[]; -void EnNnh_Init(Actor *thisx, GlobalContext *globalCtx) { +void EnNnh_Init(Actor* thisx, GlobalContext* globalCtx) { EnNnh* this = THIS; Actor_SetScale(&this->actor, 0.01f); @@ -46,7 +60,7 @@ void EnNnh_Init(Actor *thisx, GlobalContext *globalCtx) { func_80C08828(this); } -void EnNnh_Destroy(Actor *thisx, GlobalContext *globalCtx) { +void EnNnh_Destroy(Actor* thisx, GlobalContext* globalCtx) { EnNnh* this = THIS; Collider_DestroyCylinder(globalCtx, &this->collider); @@ -75,7 +89,7 @@ void func_80C088B8(EnNnh* this, GlobalContext* globalCtx) { } } -void EnNnh_Update(Actor *thisx, GlobalContext *globalCtx) { +void EnNnh_Update(Actor* thisx, GlobalContext* globalCtx) { EnNnh* this = THIS; s32 pad; @@ -84,12 +98,11 @@ void EnNnh_Update(Actor *thisx, GlobalContext *globalCtx) { CollisionCheck_SetOC(globalCtx, &globalCtx->colCheckCtx, &this->collider.base); } -void EnNnh_Draw(Actor *thisx, GlobalContext *globalCtx) { +void EnNnh_Draw(Actor* thisx, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; s32 pad; func_8012C28C(gfxCtx); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx), - G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gfxCtx->polyOpa.p++, D_06001510); } diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c index 05baea58bc..17e661792e 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -11,7 +11,6 @@ void EnNutsball_Draw(Actor* thisx, GlobalContext* globalCtx); void EnNutsball_InitColliderParams(EnNutsball* this); - const ActorInit En_Nutsball_InitVars = { ACTOR_EN_NUTSBALL, ACTORCAT_PROP, @@ -21,32 +20,32 @@ const ActorInit En_Nutsball_InitVars = { (ActorFunc)EnNutsball_Init, (ActorFunc)EnNutsball_Destroy, (ActorFunc)EnNutsball_Update, - (ActorFunc)EnNutsball_Draw + (ActorFunc)EnNutsball_Draw, }; static ColliderCylinderInit sCylinderInit = { - { - COLTYPE_NONE, - AT_ON | AT_TYPE_ENEMY, - AC_ON | AC_TYPE_PLAYER, - OC1_ON | OC1_TYPE_ALL, - OC2_TYPE_2, - COLSHAPE_CYLINDER, + { + COLTYPE_NONE, + AT_ON | AT_TYPE_ENEMY, + AC_ON | AC_TYPE_PLAYER, + OC1_ON | OC1_TYPE_ALL, + OC2_TYPE_2, + COLSHAPE_CYLINDER, }, - { - ELEMTYPE_UNK0, - { 0xF7CFFFFF, 0x00, 0x04 }, - { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_WOOD, - BUMP_ON, - OCELEM_ON, + { + ELEMTYPE_UNK0, + { 0xF7CFFFFF, 0x00, 0x04 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_WOOD, + BUMP_ON, + OCELEM_ON, }, { 13, 13, 0, { 0, 0, 0 } }, }; -void EnNutsball_Init(Actor *thisx, GlobalContext *globalCtx) { - EnNutsball *this = THIS; - +void EnNutsball_Init(Actor* thisx, GlobalContext* globalCtx) { + EnNutsball* this = THIS; + ActorShape_Init(&this->actor.shape, 400.0f, (ActorShadowFunc)func_800B3FC0, 13.0f); Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); this->actor.shape.rot.y = 0; @@ -67,40 +66,44 @@ void EnNutsball_Init(Actor *thisx, GlobalContext *globalCtx) { } } -void EnNutsball_Destroy(Actor *thisx, GlobalContext *globalCtx) { - EnNutsball *this = THIS; +void EnNutsball_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnNutsball* this = THIS; Collider_DestroyCylinder(globalCtx, &this->collider); } -void EnNutsball_InitColliderParams(EnNutsball *this) { +void EnNutsball_InitColliderParams(EnNutsball* this) { this->collider.base.atFlags &= ~AT_TYPE_ENEMY & ~AT_BOUNCED & ~AT_HIT; this->collider.base.atFlags |= AT_TYPE_PLAYER; this->collider.info.toucher.dmgFlags = 0x400000; this->collider.info.toucher.damage = 2; } -void EnNutsball_Update(Actor *thisx, GlobalContext *globalCtx) { - EnNutsball *this = THIS; - GlobalContext *globalCtx2 = globalCtx; - - ActorPlayer *player = PLAYER; +void EnNutsball_Update(Actor* thisx, GlobalContext* globalCtx) { + EnNutsball* this = THIS; + GlobalContext* globalCtx2 = globalCtx; + + ActorPlayer* player = PLAYER; Vec3f worldPos; Vec3s worldRot; Vec3f spawnBurstPos; f32 spdXZ; u32 bgId; - CollisionPoly *poly; + CollisionPoly* poly; if (!(player->stateFlags1 & 0x300000C0)) { this->timer--; if (this->timer < 0) { this->actor.velocity.y += this->actor.gravity; - spdXZ = sqrtf((this->actor.velocity.x * this->actor.velocity.x) + (this->actor.velocity.z * this->actor.velocity.z)); + spdXZ = sqrtf((this->actor.velocity.x * this->actor.velocity.x) + + (this->actor.velocity.z * this->actor.velocity.z)); this->actor.world.rot.x = Math_FAtan2F(spdXZ, this->actor.velocity.y); } this->actor.home.rot.z += 0x2AA8; - if ((this->actor.bgCheckFlags & 8) || (this->actor.bgCheckFlags & 1) || (this->actor.bgCheckFlags & 16) || (this->collider.base.atFlags & AT_HIT) || (this->collider.base.acFlags & AC_HIT) || (this->collider.base.ocFlags1 & OC1_HIT)) { - if ((player->unk144 == 1) && (this->collider.base.atFlags & AT_HIT) && (this->collider.base.atFlags & AT_TYPE_ENEMY) && (this->collider.base.atFlags & AT_BOUNCED)) { + if ((this->actor.bgCheckFlags & 8) || (this->actor.bgCheckFlags & 1) || (this->actor.bgCheckFlags & 16) || + (this->collider.base.atFlags & AT_HIT) || (this->collider.base.acFlags & AC_HIT) || + (this->collider.base.ocFlags1 & OC1_HIT)) { + if ((player->unk144 == 1) && (this->collider.base.atFlags & AT_HIT) && + (this->collider.base.atFlags & AT_TYPE_ENEMY) && (this->collider.base.atFlags & AT_BOUNCED)) { EnNutsball_InitColliderParams(this); func_8018219C(&player->unkD04, &worldRot, 0); this->actor.world.rot.y = worldRot.y + 0x8000; @@ -109,7 +112,8 @@ void EnNutsball_Update(Actor *thisx, GlobalContext *globalCtx) { spawnBurstPos.x = this->actor.world.pos.x; spawnBurstPos.y = this->actor.world.pos.y + 4.0f; spawnBurstPos.z = this->actor.world.pos.z; - EffectSsHahen_SpawnBurst(globalCtx, &spawnBurstPos, 0x40C00000, 0, 7, 3, 15, HAHEN_OBJECT_DEFAULT, 10, NULL); + EffectSsHahen_SpawnBurst(globalCtx, &spawnBurstPos, 0x40C00000, 0, 7, 3, 15, HAHEN_OBJECT_DEFAULT, 10, + NULL); if (this->actor.params == 1) { func_800F0568(globalCtx, &this->actor.world.pos, 20, 0x28F4); } else { @@ -122,15 +126,16 @@ void EnNutsball_Update(Actor *thisx, GlobalContext *globalCtx) { Actor_MarkForDeath(&this->actor); } } - + Actor_SetVelocityAndMoveXYRotation(&this->actor); Math_Vec3f_Copy(&worldPos, &this->actor.world.pos); func_800B78B8(globalCtx, &this->actor, 10.0f, 5.0f, 10.0f, 7); - + if (this->actor.bgCheckFlags & 8) { if (func_800C9A4C(&globalCtx2->colCtx, this->actor.wallPoly, this->actor.wallBgId) & 0x30) { this->actor.bgCheckFlags &= ~8; - if (func_800C55C4(&globalCtx2->colCtx, &this->actor.prevPos, &worldPos, &this->actor.world.pos, &poly, 1, 0, 0, 1, &bgId)) { + if (func_800C55C4(&globalCtx2->colCtx, &this->actor.prevPos, &worldPos, &this->actor.world.pos, &poly, + 1, 0, 0, 1, &bgId)) { if (func_800C9A4C(&globalCtx2->colCtx, poly, bgId) & 0x30) { this->actor.world.pos.x += this->actor.velocity.x * 0.01f; this->actor.world.pos.z += this->actor.velocity.z * 0.01f; @@ -143,20 +148,20 @@ void EnNutsball_Update(Actor *thisx, GlobalContext *globalCtx) { } } Collider_UpdateCylinder(&this->actor, &this->collider); - + this->actor.flags |= 0x1000000; - + CollisionCheck_SetAT(globalCtx, &globalCtx->colCheckCtx, &this->collider.base); CollisionCheck_SetAC(globalCtx, &globalCtx->colCheckCtx, &this->collider.base); - + if (this->timer < this->timerThreshold) { CollisionCheck_SetOC(globalCtx, &globalCtx->colCheckCtx, &this->collider.base); } } } -void EnNutsball_Draw(Actor *thisx, GlobalContext *globalCtx) { - EnNutsball *this = THIS; +void EnNutsball_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnNutsball* this = THIS; OPEN_DISPS(globalCtx->state.gfxCtx) func_8012C28C(globalCtx->state.gfxCtx); diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c index bdedf3dffa..6b3d84ebea 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c @@ -19,7 +19,7 @@ const ActorInit En_Nwc_InitVars = { (ActorFunc)EnNwc_Init, (ActorFunc)EnNwc_Destroy, (ActorFunc)EnNwc_Update, - (ActorFunc)EnNwc_Draw + (ActorFunc)EnNwc_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c index 49f52efefb..2329403526 100644 --- a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c +++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c @@ -21,7 +21,7 @@ const ActorInit En_Okarina_Effect_InitVars = { (ActorFunc)EnOkarinaEffect_Init, (ActorFunc)EnOkarinaEffect_Destroy, (ActorFunc)EnOkarinaEffect_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; void EnOkarinaEffect_SetupAction(EnOkarinaEffect* this, EnOkarinaEffectActionFunc* actionFunc) { diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c index 19c40544e5..2114f40090 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c @@ -18,7 +18,7 @@ const ActorInit En_Okarina_Tag_InitVars = { (ActorFunc)EnOkarinaTag_Init, (ActorFunc)EnOkarinaTag_Destroy, (ActorFunc)EnOkarinaTag_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c index b7412aec6d..79ee8c90f2 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -19,7 +19,7 @@ const ActorInit En_Okuta_InitVars = { (ActorFunc)EnOkuta_Init, (ActorFunc)EnOkuta_Destroy, (ActorFunc)EnOkuta_Update, - (ActorFunc)EnOkuta_Draw + (ActorFunc)EnOkuta_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c b/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c index 696ce45f6d..80c6a7b234 100644 --- a/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c +++ b/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c @@ -18,7 +18,7 @@ const ActorInit En_Onpuman_InitVars = { (ActorFunc)EnOnpuman_Init, (ActorFunc)EnOnpuman_Destroy, (ActorFunc)EnOnpuman_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Osk/z_en_osk.c b/src/overlays/actors/ovl_En_Osk/z_en_osk.c index 8d7e9d0645..ff6ed587f1 100644 --- a/src/overlays/actors/ovl_En_Osk/z_en_osk.c +++ b/src/overlays/actors/ovl_En_Osk/z_en_osk.c @@ -19,7 +19,7 @@ const ActorInit En_Osk_InitVars = { (ActorFunc)EnOsk_Init, (ActorFunc)EnOsk_Destroy, (ActorFunc)EnOsk_Update, - (ActorFunc)EnOsk_Draw + (ActorFunc)EnOsk_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Osn/z_en_osn.c b/src/overlays/actors/ovl_En_Osn/z_en_osn.c index ffd902f601..6a7f17af1a 100644 --- a/src/overlays/actors/ovl_En_Osn/z_en_osn.c +++ b/src/overlays/actors/ovl_En_Osn/z_en_osn.c @@ -19,7 +19,7 @@ const ActorInit En_Osn_InitVars = { (ActorFunc)EnOsn_Init, (ActorFunc)EnOsn_Destroy, (ActorFunc)EnOsn_Update, - (ActorFunc)EnOsn_Draw + (ActorFunc)EnOsn_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index b24969e6e9..e5dbf946d3 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -18,7 +18,7 @@ const ActorInit En_Ossan_InitVars = { (ActorFunc)EnOssan_Init, (ActorFunc)EnOssan_Destroy, (ActorFunc)EnOssan_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Ot/z_en_ot.c b/src/overlays/actors/ovl_En_Ot/z_en_ot.c index 0c740bae1c..7787014f7e 100644 --- a/src/overlays/actors/ovl_En_Ot/z_en_ot.c +++ b/src/overlays/actors/ovl_En_Ot/z_en_ot.c @@ -19,7 +19,7 @@ const ActorInit En_Ot_InitVars = { (ActorFunc)EnOt_Init, (ActorFunc)EnOt_Destroy, (ActorFunc)EnOt_Update, - (ActorFunc)EnOt_Draw + (ActorFunc)EnOt_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c index 8f9b6e0fe7..79886e2fd5 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -19,7 +19,7 @@ const ActorInit En_Owl_InitVars = { (ActorFunc)EnOwl_Init, (ActorFunc)EnOwl_Destroy, (ActorFunc)EnOwl_Update, - (ActorFunc)EnOwl_Draw + (ActorFunc)EnOwl_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c index 531dc71aa7..23e4ba6602 100644 --- a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c +++ b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c @@ -19,7 +19,7 @@ const ActorInit En_Pamera_InitVars = { (ActorFunc)EnPamera_Init, (ActorFunc)EnPamera_Destroy, (ActorFunc)EnPamera_Update, - (ActorFunc)EnPamera_Draw + (ActorFunc)EnPamera_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c index a4fd05f660..68711c852a 100644 --- a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c +++ b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c @@ -19,7 +19,7 @@ const ActorInit En_Pametfrog_InitVars = { (ActorFunc)EnPametfrog_Init, (ActorFunc)EnPametfrog_Destroy, (ActorFunc)EnPametfrog_Update, - (ActorFunc)EnPametfrog_Draw + (ActorFunc)EnPametfrog_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Paper/z_en_paper.c b/src/overlays/actors/ovl_En_Paper/z_en_paper.c index 820fba233e..9f176e4bf2 100644 --- a/src/overlays/actors/ovl_En_Paper/z_en_paper.c +++ b/src/overlays/actors/ovl_En_Paper/z_en_paper.c @@ -19,7 +19,7 @@ const ActorInit En_Paper_InitVars = { (ActorFunc)EnPaper_Init, (ActorFunc)EnPaper_Destroy, (ActorFunc)EnPaper_Update, - (ActorFunc)EnPaper_Draw + (ActorFunc)EnPaper_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.c b/src/overlays/actors/ovl_En_Part/z_en_part.c index 50d3766ddd..584c9a0f73 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.c +++ b/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -19,7 +19,7 @@ const ActorInit En_Part_InitVars = { (ActorFunc)EnPart_Init, (ActorFunc)EnPart_Destroy, (ActorFunc)EnPart_Update, - (ActorFunc)EnPart_Draw + (ActorFunc)EnPart_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c index 7a937d906f..52ab7d0fd5 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -19,7 +19,7 @@ const ActorInit En_Peehat_InitVars = { (ActorFunc)EnPeehat_Init, (ActorFunc)EnPeehat_Destroy, (ActorFunc)EnPeehat_Update, - (ActorFunc)EnPeehat_Draw + (ActorFunc)EnPeehat_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Pm/z_en_pm.c b/src/overlays/actors/ovl_En_Pm/z_en_pm.c index 1d52633c77..ebf9b2d562 100644 --- a/src/overlays/actors/ovl_En_Pm/z_en_pm.c +++ b/src/overlays/actors/ovl_En_Pm/z_en_pm.c @@ -19,7 +19,7 @@ const ActorInit En_Pm_InitVars = { (ActorFunc)EnPm_Init, (ActorFunc)EnPm_Destroy, (ActorFunc)EnPm_Update, - (ActorFunc)EnPm_Draw + (ActorFunc)EnPm_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c index 0153527c2d..5d7cf8f27c 100644 --- a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c +++ b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c @@ -19,7 +19,7 @@ const ActorInit En_Po_Composer_InitVars = { (ActorFunc)EnPoComposer_Init, (ActorFunc)EnPoComposer_Destroy, (ActorFunc)EnPoComposer_Update, - (ActorFunc)EnPoComposer_Draw + (ActorFunc)EnPoComposer_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c index d5a265053f..48e9c60f7e 100644 --- a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c +++ b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c @@ -15,11 +15,12 @@ void EnPoFusen_Draw(Actor* thisx, GlobalContext* globalCtx); u16 EnPoFusen_CheckParent(EnPoFusen* this, GlobalContext* globalCtx); void EnPoFusen_InitNoFuse(EnPoFusen* this); -void EnPoFusen_InitFuse(EnPoFusen *this); -void EnPoFusen_Pop(EnPoFusen *this, GlobalContext *gCtx); +void EnPoFusen_InitFuse(EnPoFusen* this); +void EnPoFusen_Pop(EnPoFusen* this, GlobalContext* gCtx); void EnPoFusen_Idle(EnPoFusen* this, GlobalContext* gCtx); void EnPoFusen_IdleFuse(EnPoFusen* this, GlobalContext* gCtx); -s32 EnPoFusen_OverrideLimbDraw(GlobalContext* gCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, struct Actor* actor); +s32 EnPoFusen_OverrideLimbDraw(GlobalContext* gCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + struct Actor* actor); const ActorInit En_Po_Fusen_InitVars = { ACTOR_EN_PO_FUSEN, @@ -30,12 +31,26 @@ const ActorInit En_Po_Fusen_InitVars = { (ActorFunc)EnPoFusen_Init, (ActorFunc)EnPoFusen_Destroy, (ActorFunc)EnPoFusen_Update, - (ActorFunc)EnPoFusen_Draw + (ActorFunc)EnPoFusen_Draw, }; static ColliderSphereInit sSphereInit = { - { COLTYPE_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1 | OC2_UNK1, COLSHAPE_SPHERE, }, - { ELEMTYPE_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { + COLTYPE_NONE, + AT_NONE, + AC_ON | AC_TYPE_PLAYER, + OC1_ON | OC1_TYPE_ALL, + OC2_TYPE_1 | OC2_UNK1, + COLSHAPE_SPHERE, + }, + { + ELEMTYPE_UNK0, + { 0xF7CFFFFF, 0x00, 0x00 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_NONE | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, { 0, { { 0, 0, 0 }, 200 }, 100 }, }; @@ -44,7 +59,7 @@ DamageTable EnPoFusenDamageTable = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -void EnPoFusen_Init(Actor *thisx, GlobalContext *globalCtx) { +void EnPoFusen_Init(Actor* thisx, GlobalContext* globalCtx) { EnPoFusen* this = THIS; f32 heightTemp; @@ -55,9 +70,10 @@ void EnPoFusen_Init(Actor *thisx, GlobalContext *globalCtx) { Collider_InitSphere(globalCtx, &this->collider); Collider_SetSphere(globalCtx, &this->collider, &this->actor, &sSphereInit); - if (0){} + if (0) {} this->collider.dim.worldSphere.radius = 40; - SkelAnime_InitSV(globalCtx, &this->anime, &D_060024F0, &D_06000040, &this->limbDrawTbl, &this->transitionDrawTbl, 10); + SkelAnime_InitSV(globalCtx, &this->anime, &D_060024F0, &D_06000040, &this->limbDrawTbl, &this->transitionDrawTbl, + 10); ActorShape_Init(&this->actor.shape, 0.0f, func_800B3FC0, 25.0f); func_800B78B8(globalCtx, this, 0.0f, 0.0f, 0.0f, 4); @@ -88,13 +104,13 @@ void EnPoFusen_Init(Actor *thisx, GlobalContext *globalCtx) { EnPoFusen_InitNoFuse(this); } -void EnPoFusen_Destroy(Actor* thisx, GlobalContext *gCtx) { +void EnPoFusen_Destroy(Actor* thisx, GlobalContext* gCtx) { EnPoFusen* this = THIS; Collider_DestroySphere(gCtx, &this->collider); } -u16 EnPoFusen_CheckParent(EnPoFusen *this, GlobalContext *globalCtx) { - struct Actor *actorPtr; +u16 EnPoFusen_CheckParent(EnPoFusen* this, GlobalContext* globalCtx) { + struct Actor* actorPtr; actorPtr = globalCtx->actorCtx.actorList[4].first; if (GET_IS_FUSE_TYPE_PARAM(this)) { @@ -102,7 +118,7 @@ u16 EnPoFusen_CheckParent(EnPoFusen *this, GlobalContext *globalCtx) { } if (actorPtr != 0) { - do{ + do { if (actorPtr->id == ACTOR_EN_MA4) { this->actor.parent = actorPtr; return 1; @@ -114,17 +130,16 @@ u16 EnPoFusen_CheckParent(EnPoFusen *this, GlobalContext *globalCtx) { return 0; } -u16 EnPoFusen_CheckCollision(EnPoFusen *this, GlobalContext *gCtx) { - if ((u32) this->actionFunc == (u32) EnPoFusen_IdleFuse ) { - return 0; +u16 EnPoFusen_CheckCollision(EnPoFusen* this, GlobalContext* gCtx) { + if ((u32)this->actionFunc == (u32)EnPoFusen_IdleFuse) { + return 0; } this->collider.dim.worldSphere.center.x = this->actor.world.pos.x; this->collider.dim.worldSphere.center.y = (this->actor.world.pos.y + 20.0f); this->collider.dim.worldSphere.center.z = this->actor.world.pos.z; - if (((this->collider.base.acFlags & 2) != 0) - && (this->actor.colChkInfo.damageEffect == 0xF)) { + if (((this->collider.base.acFlags & 2) != 0) && (this->actor.colChkInfo.damageEffect == 0xF)) { this->collider.base.acFlags &= ~0x2; return 1; } @@ -135,12 +150,12 @@ u16 EnPoFusen_CheckCollision(EnPoFusen *this, GlobalContext *gCtx) { return 0; } -void EnPoFusen_InitNoFuse(EnPoFusen *this) { +void EnPoFusen_InitNoFuse(EnPoFusen* this) { this->actor.shape.rot.z = 0; this->actionFunc = EnPoFusen_Idle; } -void EnPoFusen_Idle(EnPoFusen *this, GlobalContext *gCtx) { +void EnPoFusen_Idle(EnPoFusen* this, GlobalContext* gCtx) { f32 shadowScaleTmp; f32 shadowAlphaTmp; f32 heightOffset; @@ -154,32 +169,32 @@ void EnPoFusen_Idle(EnPoFusen *this, GlobalContext *gCtx) { heightOffset = 50.0f * heightOffset; this->actor.shape.rot.y += this->randYRotChange; this->actor.world.pos.y += heightOffset; - this->actor.shape.rot.z = (Math_SinS(this->randBaseRotChange) * 910.0f); + this->actor.shape.rot.z = (Math_SinS(this->randBaseRotChange) * 910.0f); if ((this->randScaleChange < 0x4000) && (this->randScaleChange >= -0x3FFF)) { - Math_SmoothStepToS( &this->limb9Rot, 0x38E, 0x14, 0xBB8, 0x64); + Math_SmoothStepToS(&this->limb9Rot, 0x38E, 0x14, 0xBB8, 0x64); } else { - Math_SmoothStepToS( &this->limb9Rot, 0x71C, 0x8, 0xBB8, 0x64); + Math_SmoothStepToS(&this->limb9Rot, 0x71C, 0x8, 0xBB8, 0x64); } this->avgBaseRotation = this->limb9Rot * 3; - this->limb3Rot = (Math_SinS(this->randBaseRotChange + 0x38E3) * this->avgBaseRotation); - this->limb46Rot = (Math_SinS(this->randBaseRotChange) * this->avgBaseRotation); + this->limb3Rot = (Math_SinS(this->randBaseRotChange + 0x38E3) * this->avgBaseRotation); + this->limb46Rot = (Math_SinS(this->randBaseRotChange) * this->avgBaseRotation); this->limb57Rot = (Math_SinS(this->randBaseRotChange - 0x38E3) * this->avgBaseRotation); - this->limb8Rot = (Math_SinS(this->randBaseRotChange - 0x71C6) * this->avgBaseRotation); + this->limb8Rot = (Math_SinS(this->randBaseRotChange - 0x71C6) * this->avgBaseRotation); shadowScaleTmp = ((1.0f - Math_SinS(this->randScaleChange)) * 10.0f) + 50.0f; shadowAlphaTmp = ((1.0f - Math_SinS(this->randScaleChange)) * 75.0f) + 100.0f; this->actor.shape.shadowScale = shadowScaleTmp; - this->actor.shape.shadowAlpha = (shadowAlphaTmp > f255) ? (u8) f255 : (u8) shadowAlphaTmp; + this->actor.shape.shadowAlpha = (shadowAlphaTmp > f255) ? (u8)f255 : (u8)shadowAlphaTmp; } -void EnPoFusen_IncrementMalonPop(EnPoFusen *this) { +void EnPoFusen_IncrementMalonPop(EnPoFusen* this) { Actor* parent = this->actor.parent; EnMa4* romani; if ((parent != 0) && (parent->id == ACTOR_EN_MA4)) { - romani = (EnMa4*) parent; + romani = (EnMa4*)parent; romani->unk338++; } @@ -187,15 +202,14 @@ void EnPoFusen_IncrementMalonPop(EnPoFusen *this) { this->actionFunc = EnPoFusen_Pop; } -void EnPoFusen_Pop(EnPoFusen *this, GlobalContext *gCtx) { - Actor_Spawn(&gCtx->actorCtx, gCtx, ACTOR_EN_CLEAR_TAG, - this->actor.world.pos.x, this->actor.world.pos.y + 20.0f, this->actor.world.pos.z, - 255, 255, 200, 2); +void EnPoFusen_Pop(EnPoFusen* this, GlobalContext* gCtx) { + Actor_Spawn(&gCtx->actorCtx, gCtx, ACTOR_EN_CLEAR_TAG, this->actor.world.pos.x, this->actor.world.pos.y + 20.0f, + this->actor.world.pos.z, 255, 255, 200, 2); Audio_PlayActorSound2(&this->actor, 0x180E); // NA_SE_IT_BOMB_EXPLOSION sfx Actor_MarkForDeath(&this->actor); } -void EnPoFusen_InitFuse(EnPoFusen *this) { +void EnPoFusen_InitFuse(EnPoFusen* this) { s16 rotZ = this->actor.shape.rot.z; this->fuse = GET_FUSE_LEN_PARAM(this); this->actor.shape.rot.z = 0; @@ -203,14 +217,14 @@ void EnPoFusen_InitFuse(EnPoFusen *this) { this->actionFunc = EnPoFusen_IdleFuse; } -void EnPoFusen_IdleFuse(EnPoFusen *this, GlobalContext *gCtx) { +void EnPoFusen_IdleFuse(EnPoFusen* this, GlobalContext* gCtx) { EnPoFusen_Idle(this, gCtx); if (this->fuse-- == 0) { EnPoFusen_IncrementMalonPop(this); } } -void EnPoFusen_Update(Actor *thisx, GlobalContext *globalCtx) { +void EnPoFusen_Update(Actor* thisx, GlobalContext* globalCtx) { EnPoFusen* this = THIS; this->actionFunc(this, globalCtx); if (EnPoFusen_CheckCollision(this, globalCtx) != 0) { @@ -218,7 +232,8 @@ void EnPoFusen_Update(Actor *thisx, GlobalContext *globalCtx) { } } -s32 EnPoFusen_OverrideLimbDraw(GlobalContext *gCtx, s32 limbIndex, Gfx **dList, Vec3f *pos, Vec3s *rot, struct Actor *actor) { +s32 EnPoFusen_OverrideLimbDraw(GlobalContext* gCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + struct Actor* actor) { EnPoFusen* this = (EnPoFusen*)actor; f32 zScale; f32 yScale; @@ -231,15 +246,15 @@ s32 EnPoFusen_OverrideLimbDraw(GlobalContext *gCtx, s32 limbIndex, Gfx **dList, if (limbIndex == 2) { zScale = (Math_CosS(this->randScaleChange) * 0.0799999982119f) + 1.0f; xScale = zScale; - if (!zScale) { } + if (!zScale) {} yScale = (Math_SinS(this->randScaleChange) * 0.0799999982119f) + 1.0f; yScale = yScale * yScale; xRot = ((Math_SinS(this->randXZRotChange) * 2730.0f)); zRot = ((Math_CosS(this->randXZRotChange) * 2730.0f)); - SysMatrix_InsertRotation(xRot, 0, zRot , 1); + SysMatrix_InsertRotation(xRot, 0, zRot, 1); Matrix_Scale(xScale, yScale, zScale, 1); - SysMatrix_InsertZRotation_s( -zRot, 1); - SysMatrix_InsertXRotation_s( -xRot, 1); + SysMatrix_InsertZRotation_s(-zRot, 1); + SysMatrix_InsertXRotation_s(-xRot, 1); } else if (limbIndex == 3) { rot->y += this->limb3Rot; } else if (limbIndex == 6) { @@ -251,20 +266,21 @@ s32 EnPoFusen_OverrideLimbDraw(GlobalContext *gCtx, s32 limbIndex, Gfx **dList, } else if (limbIndex == 8) { rot->z += this->limb8Rot; } else if (limbIndex == 9) { - rot->y += (s16) (this->limb9Rot * Math_SinS(this->randBaseRotChange)); - rot->z += (s16) (this->limb9Rot * Math_CosS(this->randBaseRotChange)); + rot->y += (s16)(this->limb9Rot * Math_SinS(this->randBaseRotChange)); + rot->z += (s16)(this->limb9Rot * Math_CosS(this->randBaseRotChange)); } return 0; } -void EnPoFusen_PostLimbDraw(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { } +void EnPoFusen_PostLimbDraw(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { +} -void EnPoFusen_UnkActorDraw(s32 arg0, s32 arg1, s32 arg2) { } +void EnPoFusen_UnkActorDraw(s32 arg0, s32 arg1, s32 arg2) { +} -void EnPoFusen_Draw(Actor *thisx, GlobalContext *globalCtx) { +void EnPoFusen_Draw(Actor* thisx, GlobalContext* globalCtx) { EnPoFusen* this = THIS; func_8012C28C(globalCtx->state.gfxCtx); - func_801343C0(globalCtx, this->anime.skeleton, - this->anime.limbDrawTbl, this->anime.dListCount, - EnPoFusen_OverrideLimbDraw, EnPoFusen_PostLimbDraw, EnPoFusen_UnkActorDraw, &this->actor); + func_801343C0(globalCtx, this->anime.skeleton, this->anime.limbDrawTbl, this->anime.dListCount, + EnPoFusen_OverrideLimbDraw, EnPoFusen_PostLimbDraw, EnPoFusen_UnkActorDraw, &this->actor); } diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c index 0d665e3980..e9b006c3e4 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c @@ -19,7 +19,7 @@ const ActorInit En_Po_Sisters_InitVars = { (ActorFunc)EnPoSisters_Init, (ActorFunc)EnPoSisters_Destroy, (ActorFunc)EnPoSisters_Update, - (ActorFunc)EnPoSisters_Draw + (ActorFunc)EnPoSisters_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/src/overlays/actors/ovl_En_Poh/z_en_poh.c index 0f9921fd27..da6d3f02fc 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -19,7 +19,7 @@ const ActorInit En_Poh_InitVars = { (ActorFunc)EnPoh_Init, (ActorFunc)EnPoh_Destroy, (ActorFunc)EnPoh_Update, - (ActorFunc)EnPoh_Draw + (ActorFunc)EnPoh_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Pp/z_en_pp.c b/src/overlays/actors/ovl_En_Pp/z_en_pp.c index 2d0ec272eb..e9e801a2fd 100644 --- a/src/overlays/actors/ovl_En_Pp/z_en_pp.c +++ b/src/overlays/actors/ovl_En_Pp/z_en_pp.c @@ -19,7 +19,7 @@ const ActorInit En_Pp_InitVars = { (ActorFunc)EnPp_Init, (ActorFunc)EnPp_Destroy, (ActorFunc)EnPp_Update, - (ActorFunc)EnPp_Draw + (ActorFunc)EnPp_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Pr/z_en_pr.c b/src/overlays/actors/ovl_En_Pr/z_en_pr.c index 238540c45d..72fe527fe3 100644 --- a/src/overlays/actors/ovl_En_Pr/z_en_pr.c +++ b/src/overlays/actors/ovl_En_Pr/z_en_pr.c @@ -19,7 +19,7 @@ const ActorInit En_Pr_InitVars = { (ActorFunc)EnPr_Init, (ActorFunc)EnPr_Destroy, (ActorFunc)EnPr_Update, - (ActorFunc)EnPr_Draw + (ActorFunc)EnPr_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c index 83eaf4425a..367eac450b 100644 --- a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c +++ b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c @@ -19,7 +19,7 @@ const ActorInit En_Pr2_InitVars = { (ActorFunc)EnPr2_Init, (ActorFunc)EnPr2_Destroy, (ActorFunc)EnPr2_Update, - (ActorFunc)EnPr2_Draw + (ActorFunc)EnPr2_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Prz/z_en_prz.c b/src/overlays/actors/ovl_En_Prz/z_en_prz.c index 3957b7c662..bd81a15524 100644 --- a/src/overlays/actors/ovl_En_Prz/z_en_prz.c +++ b/src/overlays/actors/ovl_En_Prz/z_en_prz.c @@ -19,7 +19,7 @@ const ActorInit En_Prz_InitVars = { (ActorFunc)EnPrz_Init, (ActorFunc)EnPrz_Destroy, (ActorFunc)EnPrz_Update, - (ActorFunc)EnPrz_Draw + (ActorFunc)EnPrz_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Pst/z_en_pst.c b/src/overlays/actors/ovl_En_Pst/z_en_pst.c index 137903cb72..a9b2ebcd69 100644 --- a/src/overlays/actors/ovl_En_Pst/z_en_pst.c +++ b/src/overlays/actors/ovl_En_Pst/z_en_pst.c @@ -19,7 +19,7 @@ const ActorInit En_Pst_InitVars = { (ActorFunc)EnPst_Init, (ActorFunc)EnPst_Destroy, (ActorFunc)EnPst_Update, - (ActorFunc)EnPst_Draw + (ActorFunc)EnPst_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c index 71f08681f9..b1359a9f10 100644 --- a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c +++ b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c @@ -19,7 +19,7 @@ const ActorInit En_Racedog_InitVars = { (ActorFunc)EnRacedog_Init, (ActorFunc)EnRacedog_Destroy, (ActorFunc)EnRacedog_Update, - (ActorFunc)EnRacedog_Draw + (ActorFunc)EnRacedog_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Raf/z_en_raf.c b/src/overlays/actors/ovl_En_Raf/z_en_raf.c index a78703154c..7f3865079f 100644 --- a/src/overlays/actors/ovl_En_Raf/z_en_raf.c +++ b/src/overlays/actors/ovl_En_Raf/z_en_raf.c @@ -19,7 +19,7 @@ const ActorInit En_Raf_InitVars = { (ActorFunc)EnRaf_Init, (ActorFunc)EnRaf_Destroy, (ActorFunc)EnRaf_Update, - (ActorFunc)EnRaf_Draw + (ActorFunc)EnRaf_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c index a2d519a14b..33b8fa7cfe 100644 --- a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c +++ b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c @@ -19,7 +19,7 @@ const ActorInit En_Rail_Skb_InitVars = { (ActorFunc)EnRailSkb_Init, (ActorFunc)EnRailSkb_Destroy, (ActorFunc)EnRailSkb_Update, - (ActorFunc)EnRailSkb_Draw + (ActorFunc)EnRailSkb_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c index 5892609ae0..b4d2ff2de3 100644 --- a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c +++ b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c @@ -19,7 +19,7 @@ const ActorInit En_Railgibud_InitVars = { (ActorFunc)EnRailgibud_Init, (ActorFunc)EnRailgibud_Destroy, (ActorFunc)EnRailgibud_Update, - (ActorFunc)EnRailgibud_Draw + (ActorFunc)EnRailgibud_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Rat/z_en_rat.c b/src/overlays/actors/ovl_En_Rat/z_en_rat.c index 70f31d29fa..2cafda0da3 100644 --- a/src/overlays/actors/ovl_En_Rat/z_en_rat.c +++ b/src/overlays/actors/ovl_En_Rat/z_en_rat.c @@ -19,7 +19,7 @@ const ActorInit En_Rat_InitVars = { (ActorFunc)EnRat_Init, (ActorFunc)EnRat_Destroy, (ActorFunc)EnRat_Update, - (ActorFunc)EnRat_Draw + (ActorFunc)EnRat_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c index 3265b84b41..3e23dad14c 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -19,7 +19,7 @@ const ActorInit En_Rd_InitVars = { (ActorFunc)EnRd_Init, (ActorFunc)EnRd_Destroy, (ActorFunc)EnRd_Update, - (ActorFunc)EnRd_Draw + (ActorFunc)EnRd_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c index 4f029197b1..11ee0ea86e 100644 --- a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c +++ b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c @@ -19,7 +19,7 @@ const ActorInit En_Recepgirl_InitVars = { (ActorFunc)EnRecepgirl_Init, (ActorFunc)EnRecepgirl_Destroy, (ActorFunc)EnRecepgirl_Update, - (ActorFunc)EnRecepgirl_Draw + (ActorFunc)EnRecepgirl_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Rg/z_en_rg.c b/src/overlays/actors/ovl_En_Rg/z_en_rg.c index c80f9e0aba..0a542e6e26 100644 --- a/src/overlays/actors/ovl_En_Rg/z_en_rg.c +++ b/src/overlays/actors/ovl_En_Rg/z_en_rg.c @@ -19,7 +19,7 @@ const ActorInit En_Rg_InitVars = { (ActorFunc)EnRg_Init, (ActorFunc)EnRg_Destroy, (ActorFunc)EnRg_Update, - (ActorFunc)EnRg_Draw + (ActorFunc)EnRg_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c index 8323eb55b5..22f4cb9d3e 100644 --- a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c +++ b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c @@ -18,7 +18,7 @@ const ActorInit En_River_Sound_InitVars = { (ActorFunc)EnRiverSound_Init, (ActorFunc)func_800BDFB0, (ActorFunc)EnRiverSound_Update, - (ActorFunc)EnRiverSound_Draw + (ActorFunc)EnRiverSound_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/src/overlays/actors/ovl_En_Rr/z_en_rr.c index 0706bab8f9..19cb87941f 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -19,7 +19,7 @@ const ActorInit En_Rr_InitVars = { (ActorFunc)EnRr_Init, (ActorFunc)EnRr_Destroy, (ActorFunc)EnRr_Update, - (ActorFunc)EnRr_Draw + (ActorFunc)EnRr_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c index 6707b30bad..130ec1cd0f 100644 --- a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c +++ b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c @@ -28,7 +28,7 @@ extern AnimationHeader D_06009120; extern AnimationHeader D_0600788C; extern Gfx D_06005458[]; -static ActorAnimationEntry animations[] = {{ &D_0600788C, 1.0f, 0.0f, 0.0f, 0x00, 0.0f }}; +static ActorAnimationEntry animations[] = { { &D_0600788C, 1.0f, 0.0f, 0.0f, 0x00, 0.0f } }; void func_80C25D40(EnRsn* this) { func_800BDC5C(&this->skelAnime, &animations, 0); diff --git a/src/overlays/actors/ovl_En_Ru/z_en_ru.c b/src/overlays/actors/ovl_En_Ru/z_en_ru.c index 7e9d93464a..98791ccd28 100644 --- a/src/overlays/actors/ovl_En_Ru/z_en_ru.c +++ b/src/overlays/actors/ovl_En_Ru/z_en_ru.c @@ -19,7 +19,7 @@ const ActorInit En_Ru_InitVars = { (ActorFunc)EnRu_Init, (ActorFunc)EnRu_Destroy, (ActorFunc)EnRu_Update, - (ActorFunc)EnRu_Draw + (ActorFunc)EnRu_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c index 8f85c888b4..dd22cecfec 100644 --- a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c +++ b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c @@ -19,7 +19,7 @@ const ActorInit En_Ruppecrow_InitVars = { (ActorFunc)EnRuppecrow_Init, (ActorFunc)EnRuppecrow_Destroy, (ActorFunc)EnRuppecrow_Update, - (ActorFunc)EnRuppecrow_Draw + (ActorFunc)EnRuppecrow_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Rz/z_en_rz.c b/src/overlays/actors/ovl_En_Rz/z_en_rz.c index 80a1b30ef5..3a922053fe 100644 --- a/src/overlays/actors/ovl_En_Rz/z_en_rz.c +++ b/src/overlays/actors/ovl_En_Rz/z_en_rz.c @@ -19,7 +19,7 @@ const ActorInit En_Rz_InitVars = { (ActorFunc)EnRz_Init, (ActorFunc)EnRz_Destroy, (ActorFunc)EnRz_Update, - (ActorFunc)EnRz_Draw + (ActorFunc)EnRz_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c index d34e059541..0aa248ee45 100644 --- a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c +++ b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c @@ -19,7 +19,7 @@ const ActorInit En_S_Goro_InitVars = { (ActorFunc)EnSGoro_Init, (ActorFunc)EnSGoro_Destroy, (ActorFunc)EnSGoro_Update, - (ActorFunc)EnSGoro_Draw + (ActorFunc)EnSGoro_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c index 51002cc552..7e21641491 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -19,7 +19,7 @@ const ActorInit En_Sb_InitVars = { (ActorFunc)EnSb_Init, (ActorFunc)EnSb_Destroy, (ActorFunc)EnSb_Update, - (ActorFunc)EnSb_Draw + (ActorFunc)EnSb_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c index 835a312265..af27a36398 100644 --- a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c +++ b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c @@ -19,7 +19,7 @@ const ActorInit En_Sc_Ruppe_InitVars = { (ActorFunc)EnScRuppe_Init, (ActorFunc)EnScRuppe_Destroy, (ActorFunc)EnScRuppe_Update, - (ActorFunc)EnScRuppe_Draw + (ActorFunc)EnScRuppe_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c index 67a049bc70..3a2dc63fd2 100644 --- a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c +++ b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c @@ -21,7 +21,7 @@ const ActorInit En_Scopecoin_InitVars = { (ActorFunc)EnScopecoin_Init, (ActorFunc)EnScopecoin_Destroy, (ActorFunc)EnScopecoin_Update, - (ActorFunc)EnScopecoin_Draw + (ActorFunc)EnScopecoin_Draw, }; void func_80BFCFA0(EnScopecoin* this, GlobalContext* globalCtx) { @@ -77,9 +77,10 @@ void EnScopecoin_Update(Actor* thisx, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); } -static UNK_PTR D_80BFD280[] = {&D_04061FC0, &D_04061FE0, &D_04062000, &D_04062040, &D_04062020, &D_04062060, &D_04062000}; +static UNK_PTR D_80BFD280[] = { &D_04061FC0, &D_04061FE0, &D_04062000, &D_04062040, + &D_04062020, &D_04062060, &D_04062000 }; -void EnScopecoin_Draw(Actor *thisx, GlobalContext *globalCtx) { +void EnScopecoin_Draw(Actor* thisx, GlobalContext* globalCtx) { EnScopecoin* this = THIS; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; diff --git a/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c index ca21bf15e7..1e238b83bd 100644 --- a/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c +++ b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c @@ -19,7 +19,7 @@ const ActorInit En_Scopecrow_InitVars = { (ActorFunc)EnScopecrow_Init, (ActorFunc)EnScopecrow_Destroy, (ActorFunc)EnScopecrow_Update, - (ActorFunc)EnScopecrow_Draw + (ActorFunc)EnScopecrow_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c index 6f3403ca64..5aa8656cce 100644 --- a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c +++ b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c @@ -19,7 +19,7 @@ const ActorInit En_Scopenuts_InitVars = { (ActorFunc)EnScopenuts_Init, (ActorFunc)EnScopenuts_Destroy, (ActorFunc)EnScopenuts_Update, - (ActorFunc)EnScopenuts_Draw + (ActorFunc)EnScopenuts_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.c b/src/overlays/actors/ovl_En_Sda/z_en_sda.c index f2a95d2450..91045d5364 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.c +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -19,7 +19,7 @@ const ActorInit En_Sda_InitVars = { (ActorFunc)EnSda_Init, (ActorFunc)EnSda_Destroy, (ActorFunc)EnSda_Update, - (ActorFunc)EnSda_Draw + (ActorFunc)EnSda_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c index b64f5f01de..496f73075b 100644 --- a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c +++ b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c @@ -18,7 +18,7 @@ const ActorInit En_Sekihi_InitVars = { (ActorFunc)EnSekihi_Init, (ActorFunc)EnSekihi_Destroy, (ActorFunc)EnSekihi_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c index 82661928e6..25a4cfa93f 100644 --- a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c +++ b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c @@ -19,7 +19,7 @@ const ActorInit En_Sellnuts_InitVars = { (ActorFunc)EnSellnuts_Init, (ActorFunc)EnSellnuts_Destroy, (ActorFunc)EnSellnuts_Update, - (ActorFunc)EnSellnuts_Draw + (ActorFunc)EnSellnuts_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Shn/z_en_shn.c b/src/overlays/actors/ovl_En_Shn/z_en_shn.c index 5671c61e0a..3052fae558 100644 --- a/src/overlays/actors/ovl_En_Shn/z_en_shn.c +++ b/src/overlays/actors/ovl_En_Shn/z_en_shn.c @@ -19,7 +19,7 @@ const ActorInit En_Shn_InitVars = { (ActorFunc)EnShn_Init, (ActorFunc)EnShn_Destroy, (ActorFunc)EnShn_Update, - (ActorFunc)EnShn_Draw + (ActorFunc)EnShn_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.c b/src/overlays/actors/ovl_En_Si/z_en_si.c index 7cbd722abf..a4e79b0063 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.c +++ b/src/overlays/actors/ovl_En_Si/z_en_si.c @@ -19,7 +19,7 @@ const ActorInit En_Si_InitVars = { (ActorFunc)EnSi_Init, (ActorFunc)EnSi_Destroy, (ActorFunc)EnSi_Update, - (ActorFunc)EnSi_Draw + (ActorFunc)EnSi_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c index ba91b94845..49aa60a2f6 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -19,7 +19,7 @@ const ActorInit En_Skb_InitVars = { (ActorFunc)EnSkb_Init, (ActorFunc)EnSkb_Destroy, (ActorFunc)EnSkb_Update, - (ActorFunc)EnSkb_Draw + (ActorFunc)EnSkb_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Slime/z_en_slime.c b/src/overlays/actors/ovl_En_Slime/z_en_slime.c index 5252663bba..97faffe8f5 100644 --- a/src/overlays/actors/ovl_En_Slime/z_en_slime.c +++ b/src/overlays/actors/ovl_En_Slime/z_en_slime.c @@ -19,7 +19,7 @@ const ActorInit En_Slime_InitVars = { (ActorFunc)EnSlime_Init, (ActorFunc)EnSlime_Destroy, (ActorFunc)EnSlime_Update, - (ActorFunc)EnSlime_Draw + (ActorFunc)EnSlime_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c index 8e1bfc725e..593cd27cc2 100644 --- a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c +++ b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c @@ -19,7 +19,7 @@ const ActorInit En_Snowman_InitVars = { (ActorFunc)EnSnowman_Init, (ActorFunc)EnSnowman_Destroy, (ActorFunc)EnSnowman_Update, - (ActorFunc)EnSnowman_Draw + (ActorFunc)EnSnowman_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c index 51d3042cf6..d093177cc0 100644 --- a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c +++ b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c @@ -19,7 +19,7 @@ const ActorInit En_Snowwd_InitVars = { (ActorFunc)EnSnowwd_Init, (ActorFunc)EnSnowwd_Destroy, (ActorFunc)EnSnowwd_Update, - (ActorFunc)EnSnowwd_Draw + (ActorFunc)EnSnowwd_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c index 3ecaaa9dff..f2753bebe9 100644 --- a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c +++ b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c @@ -18,7 +18,7 @@ const ActorInit En_Sob1_InitVars = { (ActorFunc)EnSob1_Init, (ActorFunc)EnSob1_Destroy, (ActorFunc)EnSob1_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index a6074e4088..5ef4b7e31b 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -19,7 +19,7 @@ const ActorInit En_Ssh_InitVars = { (ActorFunc)EnSsh_Init, (ActorFunc)EnSsh_Destroy, (ActorFunc)EnSsh_Update, - (ActorFunc)EnSsh_Draw + (ActorFunc)EnSsh_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index e947e73cc2..ebb51452d2 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -18,7 +18,7 @@ const ActorInit En_St_InitVars = { (ActorFunc)EnSt_Init, (ActorFunc)EnSt_Destroy, (ActorFunc)EnSt_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/src/overlays/actors/ovl_En_Sth/z_en_sth.c index 3b7aa51069..a24af6f4b2 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -18,7 +18,7 @@ const ActorInit En_Sth_InitVars = { (ActorFunc)EnSth_Init, (ActorFunc)EnSth_Destroy, (ActorFunc)EnSth_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c index 9ae9149c4c..357a088ea2 100644 --- a/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c +++ b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c @@ -18,7 +18,7 @@ const ActorInit En_Sth2_InitVars = { (ActorFunc)EnSth2_Init, (ActorFunc)EnSth2_Destroy, (ActorFunc)EnSth2_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c index e7ba9b9d3c..407e73cbfe 100644 --- a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c +++ b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c @@ -19,7 +19,7 @@ const ActorInit En_Stone_heishi_InitVars = { (ActorFunc)EnStoneheishi_Init, (ActorFunc)EnStoneheishi_Destroy, (ActorFunc)EnStoneheishi_Update, - (ActorFunc)EnStoneheishi_Draw + (ActorFunc)EnStoneheishi_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c index dd382e6f3e..d7a1bb0578 100644 --- a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c +++ b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c @@ -19,7 +19,7 @@ const ActorInit En_Stop_heishi_InitVars = { (ActorFunc)EnStopheishi_Init, (ActorFunc)EnStopheishi_Destroy, (ActorFunc)EnStopheishi_Update, - (ActorFunc)EnStopheishi_Draw + (ActorFunc)EnStopheishi_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.c b/src/overlays/actors/ovl_En_Stream/z_en_stream.c index 34e43153bd..1fbade222b 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.c +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -19,7 +19,7 @@ const ActorInit En_Stream_InitVars = { (ActorFunc)EnStream_Init, (ActorFunc)EnStream_Destroy, (ActorFunc)EnStream_Update, - (ActorFunc)EnStream_Draw + (ActorFunc)EnStream_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c index 55bf32142e..adb5de6d24 100644 --- a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c +++ b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c @@ -19,7 +19,7 @@ const ActorInit En_Suttari_InitVars = { (ActorFunc)EnSuttari_Init, (ActorFunc)EnSuttari_Destroy, (ActorFunc)EnSuttari_Update, - (ActorFunc)EnSuttari_Draw + (ActorFunc)EnSuttari_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/src/overlays/actors/ovl_En_Sw/z_en_sw.c index 119f8adee9..2bb877d4e2 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -19,7 +19,7 @@ const ActorInit En_Sw_InitVars = { (ActorFunc)EnSw_Init, (ActorFunc)EnSw_Destroy, (ActorFunc)EnSw_Update, - (ActorFunc)EnSw_Draw + (ActorFunc)EnSw_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c index 87cab3703d..2c1745ebcc 100644 --- a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c +++ b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c @@ -19,7 +19,7 @@ const ActorInit En_Syateki_Crow_InitVars = { (ActorFunc)EnSyatekiCrow_Init, (ActorFunc)EnSyatekiCrow_Destroy, (ActorFunc)EnSyatekiCrow_Update, - (ActorFunc)EnSyatekiCrow_Draw + (ActorFunc)EnSyatekiCrow_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c index 7a9d2d75d9..1cf6c40d6f 100644 --- a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c +++ b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c @@ -19,7 +19,7 @@ const ActorInit En_Syateki_Dekunuts_InitVars = { (ActorFunc)EnSyatekiDekunuts_Init, (ActorFunc)EnSyatekiDekunuts_Destroy, (ActorFunc)EnSyatekiDekunuts_Update, - (ActorFunc)EnSyatekiDekunuts_Draw + (ActorFunc)EnSyatekiDekunuts_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c index fdfcb0559d..6650a35662 100644 --- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c @@ -19,7 +19,7 @@ const ActorInit En_Syateki_Man_InitVars = { (ActorFunc)EnSyatekiMan_Init, (ActorFunc)EnSyatekiMan_Destroy, (ActorFunc)EnSyatekiMan_Update, - (ActorFunc)EnSyatekiMan_Draw + (ActorFunc)EnSyatekiMan_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c index a853bde738..27b372ad75 100644 --- a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c +++ b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c @@ -19,7 +19,7 @@ const ActorInit En_Syateki_Okuta_InitVars = { (ActorFunc)EnSyatekiOkuta_Init, (ActorFunc)EnSyatekiOkuta_Destroy, (ActorFunc)EnSyatekiOkuta_Update, - (ActorFunc)EnSyatekiOkuta_Draw + (ActorFunc)EnSyatekiOkuta_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c index e0eefe6331..951b10239e 100644 --- a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c +++ b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c @@ -19,7 +19,7 @@ const ActorInit En_Syateki_Wf_InitVars = { (ActorFunc)EnSyatekiWf_Init, (ActorFunc)EnSyatekiWf_Destroy, (ActorFunc)EnSyatekiWf_Update, - (ActorFunc)EnSyatekiWf_Draw + (ActorFunc)EnSyatekiWf_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Tab/z_en_tab.c b/src/overlays/actors/ovl_En_Tab/z_en_tab.c index 02bf94e605..bd8e493e8f 100644 --- a/src/overlays/actors/ovl_En_Tab/z_en_tab.c +++ b/src/overlays/actors/ovl_En_Tab/z_en_tab.c @@ -19,7 +19,7 @@ const ActorInit En_Tab_InitVars = { (ActorFunc)EnTab_Init, (ActorFunc)EnTab_Destroy, (ActorFunc)EnTab_Update, - (ActorFunc)EnTab_Draw + (ActorFunc)EnTab_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c b/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c index 3ae4250996..39cd36f1b5 100644 --- a/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c +++ b/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c @@ -9,8 +9,22 @@ void EnTagObj_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnTagObj_Update(Actor* thisx, GlobalContext* globalCtx); static ColliderCylinderInit unusedColliderInit = { - { COLTYPE_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, OC2_TYPE_2, COLSHAPE_CYLINDER, }, - { ELEMTYPE_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, }, + { + COLTYPE_NONE, + AT_NONE, + AC_ON | AC_TYPE_PLAYER, + OC1_NONE, + OC2_TYPE_2, + COLSHAPE_CYLINDER, + }, + { + ELEMTYPE_UNK0, + { 0x00000000, 0x00, 0x00 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_NONE | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_NONE, + }, { 20, 30, 0, { 0, 0, 0 } }, }; @@ -23,7 +37,7 @@ const ActorInit En_Tag_Obj_InitVars = { (ActorFunc)EnTagObj_Init, (ActorFunc)EnTagObj_Destroy, (ActorFunc)EnTagObj_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; void EnTagObj_Init(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c index 7ad5231887..6dcb95dd62 100644 --- a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c +++ b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c @@ -19,7 +19,7 @@ const ActorInit En_Takaraya_InitVars = { (ActorFunc)EnTakaraya_Init, (ActorFunc)EnTakaraya_Destroy, (ActorFunc)EnTakaraya_Update, - (ActorFunc)EnTakaraya_Draw + (ActorFunc)EnTakaraya_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Talk/z_en_talk.c b/src/overlays/actors/ovl_En_Talk/z_en_talk.c index a2a012fb5f..719a8e0e05 100644 --- a/src/overlays/actors/ovl_En_Talk/z_en_talk.c +++ b/src/overlays/actors/ovl_En_Talk/z_en_talk.c @@ -18,7 +18,7 @@ const ActorInit En_Talk_InitVars = { (ActorFunc)EnTalk_Init, (ActorFunc)EnTalk_Destroy, (ActorFunc)EnTalk_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c index cde1d298ac..5e91e18672 100644 --- a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c +++ b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c @@ -19,7 +19,7 @@ const ActorInit En_Talk_Gibud_InitVars = { (ActorFunc)EnTalkGibud_Init, (ActorFunc)EnTalkGibud_Destroy, (ActorFunc)EnTalkGibud_Update, - (ActorFunc)EnTalkGibud_Draw + (ActorFunc)EnTalkGibud_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c index 8ae2dffdad..01a447bd95 100644 --- a/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c +++ b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c @@ -19,7 +19,7 @@ const ActorInit En_Tanron1_InitVars = { (ActorFunc)EnTanron1_Init, (ActorFunc)EnTanron1_Destroy, (ActorFunc)EnTanron1_Update, - (ActorFunc)EnTanron1_Draw + (ActorFunc)EnTanron1_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c index 3e958995a5..2e801ca7e4 100644 --- a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c +++ b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c @@ -19,7 +19,7 @@ const ActorInit En_Tanron2_InitVars = { (ActorFunc)EnTanron2_Init, (ActorFunc)EnTanron2_Destroy, (ActorFunc)EnTanron2_Update, - (ActorFunc)EnTanron2_Draw + (ActorFunc)EnTanron2_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c index a5cc2767c0..3e84b0952c 100644 --- a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c +++ b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c @@ -19,7 +19,7 @@ const ActorInit En_Tanron3_InitVars = { (ActorFunc)EnTanron3_Init, (ActorFunc)EnTanron3_Destroy, (ActorFunc)EnTanron3_Update, - (ActorFunc)EnTanron3_Draw + (ActorFunc)EnTanron3_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c index 49293fbef5..d20d58ed23 100644 --- a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c +++ b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c @@ -19,7 +19,7 @@ const ActorInit En_Tanron4_InitVars = { (ActorFunc)EnTanron4_Init, (ActorFunc)EnTanron4_Destroy, (ActorFunc)EnTanron4_Update, - (ActorFunc)EnTanron4_Draw + (ActorFunc)EnTanron4_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c index 61a75a672c..ee633997cb 100644 --- a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c +++ b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c @@ -19,7 +19,7 @@ const ActorInit En_Tanron5_InitVars = { (ActorFunc)EnTanron5_Init, (ActorFunc)EnTanron5_Destroy, (ActorFunc)EnTanron5_Update, - (ActorFunc)EnTanron5_Draw + (ActorFunc)EnTanron5_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.c b/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.c index bc3ce8a739..79860c923d 100644 --- a/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.c +++ b/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.c @@ -21,7 +21,7 @@ const ActorInit En_Tanron6_InitVars = { (ActorFunc)EnTanron6_Init, (ActorFunc)EnTanron6_Destroy, (ActorFunc)EnTanron6_Update, - (ActorFunc)EnTanron6_Draw + (ActorFunc)EnTanron6_Draw, }; DamageTable D_80BE6170 = { diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.c b/src/overlays/actors/ovl_En_Test/z_en_test.c index 6145bb2616..4cd1f903fa 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -19,7 +19,7 @@ const ActorInit En_Test_InitVars = { (ActorFunc)EnTest_Init, (ActorFunc)EnTest_Destroy, (ActorFunc)EnTest_Update, - (ActorFunc)EnTest_Draw + (ActorFunc)EnTest_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Test2/z_en_test2.c b/src/overlays/actors/ovl_En_Test2/z_en_test2.c index b330f263c1..b37c202196 100644 --- a/src/overlays/actors/ovl_En_Test2/z_en_test2.c +++ b/src/overlays/actors/ovl_En_Test2/z_en_test2.c @@ -17,7 +17,7 @@ const ActorInit En_Test2_InitVars = { (ActorFunc)EnTest2_Init, (ActorFunc)func_800BDFB0, (ActorFunc)EnTest2_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Test3/z_en_test3.c b/src/overlays/actors/ovl_En_Test3/z_en_test3.c index 9f5207c2aa..0f2999b7a3 100644 --- a/src/overlays/actors/ovl_En_Test3/z_en_test3.c +++ b/src/overlays/actors/ovl_En_Test3/z_en_test3.c @@ -18,7 +18,7 @@ const ActorInit En_Test3_InitVars = { (ActorFunc)EnTest3_Init, (ActorFunc)EnTest3_Destroy, (ActorFunc)EnTest3_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Test4/z_en_test4.c b/src/overlays/actors/ovl_En_Test4/z_en_test4.c index d5b7bbde7a..01fe8d3323 100644 --- a/src/overlays/actors/ovl_En_Test4/z_en_test4.c +++ b/src/overlays/actors/ovl_En_Test4/z_en_test4.c @@ -18,7 +18,7 @@ const ActorInit En_Test4_InitVars = { (ActorFunc)EnTest4_Init, (ActorFunc)EnTest4_Destroy, (ActorFunc)EnTest4_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Test5/z_en_test5.c b/src/overlays/actors/ovl_En_Test5/z_en_test5.c index 670e262779..c41b660947 100644 --- a/src/overlays/actors/ovl_En_Test5/z_en_test5.c +++ b/src/overlays/actors/ovl_En_Test5/z_en_test5.c @@ -18,7 +18,7 @@ const ActorInit En_Test5_InitVars = { (ActorFunc)EnTest5_Init, (ActorFunc)EnTest5_Destroy, (ActorFunc)EnTest5_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Test6/z_en_test6.c b/src/overlays/actors/ovl_En_Test6/z_en_test6.c index 8ba3b887be..8c9cfd2082 100644 --- a/src/overlays/actors/ovl_En_Test6/z_en_test6.c +++ b/src/overlays/actors/ovl_En_Test6/z_en_test6.c @@ -19,7 +19,7 @@ const ActorInit En_Test6_InitVars = { (ActorFunc)EnTest6_Init, (ActorFunc)EnTest6_Destroy, (ActorFunc)EnTest6_Update, - (ActorFunc)EnTest6_Draw + (ActorFunc)EnTest6_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Test7/z_en_test7.c b/src/overlays/actors/ovl_En_Test7/z_en_test7.c index 22b0593da0..b34fac1d17 100644 --- a/src/overlays/actors/ovl_En_Test7/z_en_test7.c +++ b/src/overlays/actors/ovl_En_Test7/z_en_test7.c @@ -19,7 +19,7 @@ const ActorInit En_Test7_InitVars = { (ActorFunc)EnTest7_Init, (ActorFunc)EnTest7_Destroy, (ActorFunc)EnTest7_Update, - (ActorFunc)EnTest7_Draw + (ActorFunc)EnTest7_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.c b/src/overlays/actors/ovl_En_Tg/z_en_tg.c index 0b4017f73d..4239f52819 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.c +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.c @@ -19,7 +19,7 @@ const ActorInit En_Tg_InitVars = { (ActorFunc)EnTg_Init, (ActorFunc)EnTg_Destroy, (ActorFunc)EnTg_Update, - (ActorFunc)EnTg_Draw + (ActorFunc)EnTg_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c index bc5e7d4b83..751ae3ba07 100644 --- a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c +++ b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c @@ -19,7 +19,7 @@ const ActorInit En_Thiefbird_InitVars = { (ActorFunc)EnThiefbird_Init, (ActorFunc)EnThiefbird_Destroy, (ActorFunc)EnThiefbird_Update, - (ActorFunc)EnThiefbird_Draw + (ActorFunc)EnThiefbird_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c index 71f71e0d95..8e061c6f80 100644 --- a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c +++ b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c @@ -18,7 +18,7 @@ const ActorInit En_Time_Tag_InitVars = { (ActorFunc)EnTimeTag_Init, (ActorFunc)EnTimeTag_Destroy, (ActorFunc)EnTimeTag_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/src/overlays/actors/ovl_En_Tite/z_en_tite.c index 339f6a4e65..4fe7bda1cc 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -19,7 +19,7 @@ const ActorInit En_Tite_InitVars = { (ActorFunc)EnTite_Init, (ActorFunc)EnTite_Destroy, (ActorFunc)EnTite_Update, - (ActorFunc)EnTite_Draw + (ActorFunc)EnTite_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index 18ae071cc8..741f301789 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -19,7 +19,7 @@ const ActorInit En_Tk_InitVars = { (ActorFunc)EnTk_Init, (ActorFunc)EnTk_Destroy, (ActorFunc)EnTk_Update, - (ActorFunc)EnTk_Draw + (ActorFunc)EnTk_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Torch/z_en_torch.c b/src/overlays/actors/ovl_En_Torch/z_en_torch.c index 15b68bfa78..233ba54455 100644 --- a/src/overlays/actors/ovl_En_Torch/z_en_torch.c +++ b/src/overlays/actors/ovl_En_Torch/z_en_torch.c @@ -7,15 +7,8 @@ void EnTorch_Init(Actor* thisx, GlobalContext* globalCtx); const ActorInit En_Torch_InitVars = { - ACTOR_EN_TORCH, - ACTORCAT_ITEMACTION, - FLAGS, - GAMEPLAY_KEEP, - sizeof(EnTorch), - (ActorFunc)EnTorch_Init, - (ActorFunc)NULL, - (ActorFunc)NULL, - (ActorFunc)NULL + ACTOR_EN_TORCH, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnTorch), + (ActorFunc)EnTorch_Init, (ActorFunc)NULL, (ActorFunc)NULL, (ActorFunc)NULL, }; static u8 sChestContents[] = { 0x02, 0x04, 0x05, 0x06, 0x36, 0x3A, 0x14, 0x14 }; @@ -24,8 +17,8 @@ void EnTorch_Init(Actor* thisx, GlobalContext* globalCtx) { EnTorch* this = THIS; s8 returnData = gSaveContext.extra.unk87; - Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_BOX, this->actor.world.pos.x, - this->actor.world.pos.y, this->actor.world.pos.z, 0, this->actor.shape.rot.y, 0, + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_BOX, this->actor.world.pos.x, this->actor.world.pos.y, + this->actor.world.pos.z, 0, this->actor.shape.rot.y, 0, (sChestContents[(returnData >> 0x5) & 0x7] << 0x5) | 0x5000 | (returnData & 0x1F)); Actor_MarkForDeath(&this->actor); } diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c index f4c22d5e1f..40a1d18341 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -19,7 +19,7 @@ const ActorInit En_Torch2_InitVars = { (ActorFunc)EnTorch2_Init, (ActorFunc)EnTorch2_Destroy, (ActorFunc)EnTorch2_Update, - (ActorFunc)EnTorch2_Draw + (ActorFunc)EnTorch2_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Toto/z_en_toto.c b/src/overlays/actors/ovl_En_Toto/z_en_toto.c index c2afb50df6..41253bcd26 100644 --- a/src/overlays/actors/ovl_En_Toto/z_en_toto.c +++ b/src/overlays/actors/ovl_En_Toto/z_en_toto.c @@ -19,7 +19,7 @@ const ActorInit En_Toto_InitVars = { (ActorFunc)EnToto_Init, (ActorFunc)EnToto_Destroy, (ActorFunc)EnToto_Update, - (ActorFunc)EnToto_Draw + (ActorFunc)EnToto_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Trt/z_en_trt.c b/src/overlays/actors/ovl_En_Trt/z_en_trt.c index 993b783aef..430f3972ff 100644 --- a/src/overlays/actors/ovl_En_Trt/z_en_trt.c +++ b/src/overlays/actors/ovl_En_Trt/z_en_trt.c @@ -19,7 +19,7 @@ const ActorInit En_Trt_InitVars = { (ActorFunc)EnTrt_Init, (ActorFunc)EnTrt_Destroy, (ActorFunc)EnTrt_Update, - (ActorFunc)EnTrt_Draw + (ActorFunc)EnTrt_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c index f2fd2caa2e..8f3327d74b 100644 --- a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c +++ b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c @@ -18,7 +18,7 @@ const ActorInit En_Trt2_InitVars = { (ActorFunc)EnTrt2_Init, (ActorFunc)EnTrt2_Destroy, (ActorFunc)EnTrt2_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Tru/z_en_tru.c b/src/overlays/actors/ovl_En_Tru/z_en_tru.c index 61510e9707..bcbc2a135d 100644 --- a/src/overlays/actors/ovl_En_Tru/z_en_tru.c +++ b/src/overlays/actors/ovl_En_Tru/z_en_tru.c @@ -19,7 +19,7 @@ const ActorInit En_Tru_InitVars = { (ActorFunc)EnTru_Init, (ActorFunc)EnTru_Destroy, (ActorFunc)EnTru_Update, - (ActorFunc)EnTru_Draw + (ActorFunc)EnTru_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c index 5739da6d7a..129070a10a 100644 --- a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c +++ b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c @@ -19,7 +19,7 @@ const ActorInit En_Tru_Mt_InitVars = { (ActorFunc)EnTruMt_Init, (ActorFunc)EnTruMt_Destroy, (ActorFunc)EnTruMt_Update, - (ActorFunc)EnTruMt_Draw + (ActorFunc)EnTruMt_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c index 180cc5641c..dea348c71e 100644 --- a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c +++ b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c @@ -19,7 +19,7 @@ const ActorInit En_Tsn_InitVars = { (ActorFunc)EnTsn_Init, (ActorFunc)EnTsn_Destroy, (ActorFunc)EnTsn_Update, - (ActorFunc)EnTsn_Draw + (ActorFunc)EnTsn_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c index 14a2f384e4..bd1b29e28a 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c @@ -8,13 +8,27 @@ void EnTuboTrap_Init(Actor* thisx, GlobalContext* globalCtx); void EnTuboTrap_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnTuboTrap_Update(Actor* thisx, GlobalContext* globalCtx); void EnTuboTrap_Draw(Actor* thisx, GlobalContext* globalCtx); -void func_80931004(EnTuboTrap *this, GlobalContext *globalCtx); +void func_80931004(EnTuboTrap* this, GlobalContext* globalCtx); void func_80931138(EnTuboTrap* this, GlobalContext* globalCtx); void func_809311C4(EnTuboTrap* this, GlobalContext* globalCtx); static ColliderCylinderInit sCylinderInit = { - { COLTYPE_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_NONE, OC2_TYPE_2, COLSHAPE_CYLINDER, }, - { ELEMTYPE_UNK0, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, }, + { + COLTYPE_NONE, + AT_ON | AT_TYPE_ENEMY, + AC_ON | AC_TYPE_PLAYER, + OC1_NONE, + OC2_TYPE_2, + COLSHAPE_CYLINDER, + }, + { + ELEMTYPE_UNK0, + { 0xF7CFFFFF, 0x00, 0x04 }, + { 0xF7CFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_NONE, + }, { 11, 28, 0, { 0, 0, 0 } }, }; @@ -27,7 +41,7 @@ const ActorInit En_Tubo_Trap_InitVars = { (ActorFunc)EnTuboTrap_Init, (ActorFunc)EnTuboTrap_Destroy, (ActorFunc)EnTuboTrap_Update, - (ActorFunc)EnTuboTrap_Draw + (ActorFunc)EnTuboTrap_Draw, }; static InitChainEntry sInitChain[] = { @@ -37,13 +51,13 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_STOP), }; -//used in WaitForProximity +// used in WaitForProximity s8 D_8093146C[] = { - 0x28, 0x28, 0x28, 0x19, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, + 0x28, 0x28, 0x28, 0x19, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -void EnTuboTrap_Init(Actor *thisx, GlobalContext *globalCtx) { +void EnTuboTrap_Init(Actor* thisx, GlobalContext* globalCtx) { EnTuboTrap* this = THIS; Actor_ProcessInitChain(&this->actor, sInitChain); @@ -55,26 +69,24 @@ void EnTuboTrap_Init(Actor *thisx, GlobalContext *globalCtx) { this->actionFunc = func_80931004; // idle } -void EnTuboTrap_Destroy(Actor* thisx, GlobalContext *globalCtx) { +void EnTuboTrap_Destroy(Actor* thisx, GlobalContext* globalCtx) { EnTuboTrap* this = THIS; Collider_DestroyCylinder(globalCtx, &this->collider); } // drop collectable -void func_8093089C(EnTuboTrap *this, GlobalContext *globalCtx) { +void func_8093089C(EnTuboTrap* this, GlobalContext* globalCtx) { s32 itemParam = ((this->actor.params >> 8) & 0x3F); s32 dropCount = func_800A8150(itemParam); if (dropCount >= 0) { - Item_DropCollectible(globalCtx, - &this->actor.world, - ((this->actor.params & 0x7F) << 8) | dropCount); + Item_DropCollectible(globalCtx, &this->actor.world, ((this->actor.params & 0x7F) << 8) | dropCount); } } // EnTuboTrap_SpawnEffectsOnLand -void func_809308F4(EnTuboTrap *this, GlobalContext *globalCtx) { +void func_809308F4(EnTuboTrap* this, GlobalContext* globalCtx) { f32 rand; f32 sin; f32 cos; @@ -86,9 +98,9 @@ void func_809308F4(EnTuboTrap *this, GlobalContext *globalCtx) { s16 var; s32 i; - Vec3f *actorPos = &this->actor.world.pos; + Vec3f* actorPos = &this->actor.world.pos; - for (i = 0, var = 0; i < 15; i++, var += 20000){ + for (i = 0, var = 0; i < 15; i++, var += 20000) { sin = Math_SinS(var); cos = Math_CosS(var); pos.x = sin * 8.0f; @@ -106,34 +118,20 @@ void func_809308F4(EnTuboTrap *this, GlobalContext *globalCtx) { rand = Rand_ZeroOne(); if (rand < 0.2f) { arg5 = 0x60; - }else if (rand < 0.6f){ + } else if (rand < 0.6f) { arg5 = 0x40; - }else { + } else { arg5 = 0x20; } - EffectSsKakera_Spawn(globalCtx, - &pos, - &vel, - actorPos, - -0xF0, - arg5, - 0x14, - 0, - 0, - ((Rand_ZeroOne() * 85.0f) + 15.0f), - 0, - 0, - 0x3C, - -1, - GAMEPLAY_DANGEON_KEEP, - &D_05018090); + EffectSsKakera_Spawn(globalCtx, &pos, &vel, actorPos, -0xF0, arg5, 0x14, 0, 0, + ((Rand_ZeroOne() * 85.0f) + 15.0f), 0, 0, 0x3C, -1, GAMEPLAY_DANGEON_KEEP, &D_05018090); } func_800BBFB0(globalCtx, actorPos, 30.0f, 4, 0x14, 0x32, 0); } // EnTuboTrap_SpawnEffectsInWater -void func_80930B60(EnTuboTrap *this, GlobalContext *globalCtx) { +void func_80930B60(EnTuboTrap* this, GlobalContext* globalCtx) { f32 rand; f32 sin; f32 cos; @@ -144,8 +142,7 @@ void func_80930B60(EnTuboTrap *this, GlobalContext *globalCtx) { s16 var; s32 arg5; s32 i; - Vec3f *actorPos = &this->actor.world.pos; - + Vec3f* actorPos = &this->actor.world.pos; pos = *actorPos; pos.y += this->actor.yDistToWater; @@ -174,32 +171,21 @@ void func_80930B60(EnTuboTrap *this, GlobalContext *globalCtx) { arg5 = 32; } - EffectSsKakera_Spawn(globalCtx, - &pos, - &vel, - actorPos, - -0xAA, - arg5, - 0x32, 5, 0, - ((Rand_ZeroOne() * 85.0f) + 15.0f), - 0, 0, 0x46, - -1, - GAMEPLAY_DANGEON_KEEP, - &D_05018090); - - } + EffectSsKakera_Spawn(globalCtx, &pos, &vel, actorPos, -0xAA, arg5, 0x32, 5, 0, + ((Rand_ZeroOne() * 85.0f) + 15.0f), 0, 0, 0x46, -1, GAMEPLAY_DANGEON_KEEP, &D_05018090); + } } // EnTuboTrap_HandleImpact -void func_80930DDC(EnTuboTrap *this, GlobalContext *globalCtx) { - Actor *player = PLAYER; - Actor *player2 = PLAYER; +void func_80930DDC(EnTuboTrap* this, GlobalContext* globalCtx) { + Actor* player = PLAYER; + Actor* player2 = PLAYER; // in oot func_800F0568 is Audio_PlaySoundAtPosition if (((this->actor.bgCheckFlags & 0x20) != 0) && (this->actor.yDistToWater > 15.0f)) { func_80930B60(this, globalCtx); - func_800F0568(globalCtx, &this->actor.world, 0x28, 0x2817); + func_800F0568(globalCtx, &this->actor.world, 0x28, 0x2817); func_8093089C(this, globalCtx); Actor_MarkForDeath(&this->actor); return; @@ -226,8 +212,8 @@ void func_80930DDC(EnTuboTrap *this, GlobalContext *globalCtx) { this->collider.base.atFlags &= ~AT_HIT; if (player == this->collider.base.at) { func_809308F4(this, globalCtx); - func_800F0568(globalCtx, &this->actor.world, 0x28, 0x2887); - func_800F0568(globalCtx, &player2->world, 0x28, 0x83E); + func_800F0568(globalCtx, &this->actor.world, 0x28, 0x2887); + func_800F0568(globalCtx, &player2->world, 0x28, 0x83E); func_8093089C(this, globalCtx); Actor_MarkForDeath(&this->actor); return; @@ -235,37 +221,37 @@ void func_80930DDC(EnTuboTrap *this, GlobalContext *globalCtx) { } if (((this->actor.bgCheckFlags & 8) != 0) || ((this->actor.bgCheckFlags & 1) != 0)) { func_809308F4(this, globalCtx); - func_800F0568(globalCtx, &this->actor.world, 0x28, 0x2887); + func_800F0568(globalCtx, &this->actor.world, 0x28, 0x2887); func_8093089C(this, globalCtx); Actor_MarkForDeath(&this->actor); } } -#if NON-MATCHING +#if NON - MATCHING // Wait For Proximity (idle) - // NON-MATCHING: wrong register used, v instead of t for the weirdValues[] pointer -void func_80931004(EnTuboTrap *this, GlobalContext *globalCtx) { - Actor *player = PLAYER; +// NON-MATCHING: wrong register used, v instead of t for the weirdValues[] pointer +void func_80931004(EnTuboTrap* this, GlobalContext* globalCtx) { + Actor* player = PLAYER; f32 currentHeight; s8 weirdvalue; s16 startingRotation; static s8 D_8093146C[] = { - 0x28, 0x28, 0x28, 0x19, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, + 0x28, 0x28, 0x28, 0x19, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; if ((this->actor.xzDistToPlayer < 200.0f) && (this->actor.world.pos.y <= player->world.pos.y)) { startingRotation = this->actor.home.rot.z; - if ((startingRotation == 0) || (this->actor.yDistToPlayer <= ((f32) startingRotation * 10.0f))) { + if ((startingRotation == 0) || (this->actor.yDistToPlayer <= ((f32)startingRotation * 10.0f))) { func_800BC154(globalCtx, &globalCtx->actorCtx, this, ACTORCAT_ENEMY); currentHeight = this->actor.world.pos.y; this->actor.flags |= 0x11; // always update and can target // hard to know what this value is even used for without knowing what ActorPlayer::unk14B is // wild guess: this is player animation state, height is modified to always point at center of link model - weirdvalue = D_8093146C[ ((ActorPlayer*) player)->unk14B & 0xFF]; + weirdvalue = D_8093146C[((ActorPlayer*)player)->unk14B & 0xFF]; - this->targetHeight = player->world.pos.y + (f32) weirdvalue; + this->targetHeight = player->world.pos.y + (f32)weirdvalue; if (this->targetHeight < currentHeight) { this->targetHeight = currentHeight; this->targetHeight += weirdvalue; @@ -281,7 +267,7 @@ void func_80931004(EnTuboTrap *this, GlobalContext *globalCtx) { #endif // levitate -void func_80931138(EnTuboTrap *this, GlobalContext *globalCtx) { +void func_80931138(EnTuboTrap* this, GlobalContext* globalCtx) { this->actor.shape.rot.y += 5000; Math_ApproachF(&this->actor.world.pos.y, this->targetHeight, 0.8f, 3.0f); @@ -293,14 +279,14 @@ void func_80931138(EnTuboTrap *this, GlobalContext *globalCtx) { } // flying at link -void func_809311C4(EnTuboTrap *this, GlobalContext *globalCtx) { +void func_809311C4(EnTuboTrap* this, GlobalContext* globalCtx) { f32 dX = this->originPos.x - this->actor.world.pos.x; f32 dY = this->originPos.y - this->actor.world.pos.y; f32 dZ = this->originPos.z - this->actor.world.pos.z; Audio_PlayActorSound2(&this->actor, 0x3037); - if ((SQ(dX) + SQ(dY) + SQ(dZ) > 57600.0f)) { //240.0f ^ 2 + if ((SQ(dX) + SQ(dY) + SQ(dZ) > 57600.0f)) { // 240.0f ^ 2 Math_ApproachF(&this->actor.gravity, -3.0f, 0.2f, 0.5f); } @@ -308,7 +294,7 @@ void func_809311C4(EnTuboTrap *this, GlobalContext *globalCtx) { func_80930DDC(this, globalCtx); // "handle impact" } -void EnTuboTrap_Update(Actor *thisx, GlobalContext *globalCtx) { +void EnTuboTrap_Update(Actor* thisx, GlobalContext* globalCtx) { EnTuboTrap* this = THIS; s32 padding; @@ -319,12 +305,12 @@ void EnTuboTrap_Update(Actor *thisx, GlobalContext *globalCtx) { if (this->actor.projectedPos.z < 811.0f) { if (this->actor.projectedPos.z > 300.0f) { - this->actor.shape.shadowAlpha = (u8) ( (0x32B - (s32) this->actor.projectedPos.z) >> 1); + this->actor.shape.shadowAlpha = (u8)((0x32B - (s32)this->actor.projectedPos.z) >> 1); this->actor.shape.shadowDraw = func_800B3FC0; } else if (this->actor.projectedPos.z > -10.0f) { this->actor.shape.shadowAlpha = 0xFF; this->actor.shape.shadowDraw = func_800B3FC0; - } else{ + } else { this->actor.shape.shadowDraw = NULL; } } else { @@ -336,7 +322,7 @@ void EnTuboTrap_Update(Actor *thisx, GlobalContext *globalCtx) { CollisionCheck_SetAT(globalCtx, &globalCtx->colCheckCtx, &this->collider.base); } -void EnTuboTrap_Draw(Actor *thisx, GlobalContext *globalCtx) { +void EnTuboTrap_Draw(Actor* thisx, GlobalContext* globalCtx) { // Gfx_DrawDListOpa with a display list func_800BDFC0(globalCtx, &D_05017EA0); } diff --git a/src/overlays/actors/ovl_En_Twig/z_en_twig.c b/src/overlays/actors/ovl_En_Twig/z_en_twig.c index c656347ada..c0c79a7844 100644 --- a/src/overlays/actors/ovl_En_Twig/z_en_twig.c +++ b/src/overlays/actors/ovl_En_Twig/z_en_twig.c @@ -19,7 +19,7 @@ const ActorInit En_Twig_InitVars = { (ActorFunc)EnTwig_Init, (ActorFunc)EnTwig_Destroy, (ActorFunc)EnTwig_Update, - (ActorFunc)EnTwig_Draw + (ActorFunc)EnTwig_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c index aa3a9df26f..3e7e088cb1 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -19,7 +19,7 @@ const ActorInit En_Viewer_InitVars = { (ActorFunc)EnViewer_Init, (ActorFunc)EnViewer_Destroy, (ActorFunc)EnViewer_Update, - (ActorFunc)EnViewer_Draw + (ActorFunc)EnViewer_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c index 7b59ace493..4ec5da5fd3 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -19,7 +19,7 @@ const ActorInit En_Vm_InitVars = { (ActorFunc)EnVm_Init, (ActorFunc)EnVm_Destroy, (ActorFunc)EnVm_Update, - (ActorFunc)EnVm_Draw + (ActorFunc)EnVm_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index 3403c6a736..5d0dfeaed2 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -19,7 +19,7 @@ const ActorInit En_Wallmas_InitVars = { (ActorFunc)EnWallmas_Init, (ActorFunc)EnWallmas_Destroy, (ActorFunc)EnWallmas_Update, - (ActorFunc)EnWallmas_Draw + (ActorFunc)EnWallmas_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c index fd6e426599..758e6222db 100644 --- a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c +++ b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c @@ -18,7 +18,7 @@ const ActorInit En_Warp_tag_InitVars = { (ActorFunc)EnWarptag_Init, (ActorFunc)EnWarptag_Destroy, (ActorFunc)EnWarptag_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c index 1f79e2bcd4..0848eff378 100644 --- a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c +++ b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c @@ -19,7 +19,7 @@ const ActorInit En_Water_Effect_InitVars = { (ActorFunc)EnWaterEffect_Init, (ActorFunc)EnWaterEffect_Destroy, (ActorFunc)EnWaterEffect_Update, - (ActorFunc)EnWaterEffect_Draw + (ActorFunc)EnWaterEffect_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c index 08103d7847..34d8d20992 100644 --- a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c +++ b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c @@ -19,7 +19,7 @@ const ActorInit En_Wdhand_InitVars = { (ActorFunc)EnWdhand_Init, (ActorFunc)EnWdhand_Destroy, (ActorFunc)EnWdhand_Update, - (ActorFunc)EnWdhand_Draw + (ActorFunc)EnWdhand_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c index f031ce670b..dbe4effdba 100644 --- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c +++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c @@ -19,7 +19,7 @@ const ActorInit En_Weather_Tag_InitVars = { (ActorFunc)EnWeatherTag_Init, (ActorFunc)EnWeatherTag_Destroy, (ActorFunc)EnWeatherTag_Update, - (ActorFunc)EnWeatherTag_Draw + (ActorFunc)EnWeatherTag_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.c b/src/overlays/actors/ovl_En_Wf/z_en_wf.c index 0d12fe69cc..df89668080 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -19,7 +19,7 @@ const ActorInit En_Wf_InitVars = { (ActorFunc)EnWf_Init, (ActorFunc)EnWf_Destroy, (ActorFunc)EnWf_Update, - (ActorFunc)EnWf_Draw + (ActorFunc)EnWf_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c index a981f04009..6e4611eb50 100644 --- a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c +++ b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c @@ -19,7 +19,7 @@ const ActorInit En_Wiz_InitVars = { (ActorFunc)EnWiz_Init, (ActorFunc)EnWiz_Destroy, (ActorFunc)EnWiz_Update, - (ActorFunc)EnWiz_Draw + (ActorFunc)EnWiz_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c index 7983f5a01b..9c54a39917 100644 --- a/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c +++ b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c @@ -19,7 +19,7 @@ const ActorInit En_Wiz_Brock_InitVars = { (ActorFunc)EnWizBrock_Init, (ActorFunc)EnWizBrock_Destroy, (ActorFunc)EnWizBrock_Update, - (ActorFunc)EnWizBrock_Draw + (ActorFunc)EnWizBrock_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c index b472571a66..3cc8b70b17 100644 --- a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c +++ b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c @@ -19,7 +19,7 @@ const ActorInit En_Wiz_Fire_InitVars = { (ActorFunc)EnWizFire_Init, (ActorFunc)EnWizFire_Destroy, (ActorFunc)EnWizFire_Update, - (ActorFunc)EnWizFire_Draw + (ActorFunc)EnWizFire_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c index 9c0339d09f..e541455782 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -19,7 +19,7 @@ const ActorInit En_Wood02_InitVars = { (ActorFunc)EnWood02_Init, (ActorFunc)EnWood02_Destroy, (ActorFunc)EnWood02_Update, - (ActorFunc)EnWood02_Draw + (ActorFunc)EnWood02_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Yb/z_en_yb.c b/src/overlays/actors/ovl_En_Yb/z_en_yb.c index 3e6c14f74b..445006584a 100644 --- a/src/overlays/actors/ovl_En_Yb/z_en_yb.c +++ b/src/overlays/actors/ovl_En_Yb/z_en_yb.c @@ -19,7 +19,7 @@ const ActorInit En_Yb_InitVars = { (ActorFunc)EnYb_Init, (ActorFunc)EnYb_Destroy, (ActorFunc)EnYb_Update, - (ActorFunc)EnYb_Draw + (ActorFunc)EnYb_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c index d06b5ab535..b029e220ac 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -18,7 +18,7 @@ const ActorInit En_Zl1_InitVars = { (ActorFunc)EnZl1_Init, (ActorFunc)EnZl1_Destroy, (ActorFunc)EnZl1_Update, - (ActorFunc)EnZl1_Draw + (ActorFunc)EnZl1_Draw, }; void EnZl1_Init(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c index d1695ccf83..679ad81630 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -19,7 +19,7 @@ const ActorInit En_Zl4_InitVars = { (ActorFunc)EnZl4_Init, (ActorFunc)EnZl4_Destroy, (ActorFunc)EnZl4_Update, - (ActorFunc)EnZl4_Draw + (ActorFunc)EnZl4_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c index bc6b8e49ac..68a99ae064 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -19,7 +19,7 @@ const ActorInit En_Zo_InitVars = { (ActorFunc)EnZo_Init, (ActorFunc)EnZo_Destroy, (ActorFunc)EnZo_Update, - (ActorFunc)EnZo_Draw + (ActorFunc)EnZo_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Zob/z_en_zob.c b/src/overlays/actors/ovl_En_Zob/z_en_zob.c index 9f713afe41..416816dc6b 100644 --- a/src/overlays/actors/ovl_En_Zob/z_en_zob.c +++ b/src/overlays/actors/ovl_En_Zob/z_en_zob.c @@ -19,7 +19,7 @@ const ActorInit En_Zob_InitVars = { (ActorFunc)EnZob_Init, (ActorFunc)EnZob_Destroy, (ActorFunc)EnZob_Update, - (ActorFunc)EnZob_Draw + (ActorFunc)EnZob_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Zod/z_en_zod.c b/src/overlays/actors/ovl_En_Zod/z_en_zod.c index 150ec48a9f..852e427b6c 100644 --- a/src/overlays/actors/ovl_En_Zod/z_en_zod.c +++ b/src/overlays/actors/ovl_En_Zod/z_en_zod.c @@ -19,7 +19,7 @@ const ActorInit En_Zod_InitVars = { (ActorFunc)EnZod_Init, (ActorFunc)EnZod_Destroy, (ActorFunc)EnZod_Update, - (ActorFunc)EnZod_Draw + (ActorFunc)EnZod_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Zog/z_en_zog.c b/src/overlays/actors/ovl_En_Zog/z_en_zog.c index 075e8b96d5..1c29ae2b79 100644 --- a/src/overlays/actors/ovl_En_Zog/z_en_zog.c +++ b/src/overlays/actors/ovl_En_Zog/z_en_zog.c @@ -19,7 +19,7 @@ const ActorInit En_Zog_InitVars = { (ActorFunc)EnZog_Init, (ActorFunc)EnZog_Destroy, (ActorFunc)EnZog_Update, - (ActorFunc)EnZog_Draw + (ActorFunc)EnZog_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c index fe1fb74f9c..a01e631faa 100644 --- a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c +++ b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c @@ -19,7 +19,7 @@ const ActorInit En_Zoraegg_InitVars = { (ActorFunc)EnZoraegg_Init, (ActorFunc)EnZoraegg_Destroy, (ActorFunc)EnZoraegg_Update, - (ActorFunc)EnZoraegg_Draw + (ActorFunc)EnZoraegg_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Zos/z_en_zos.c b/src/overlays/actors/ovl_En_Zos/z_en_zos.c index 03b8b24516..3aa7e76180 100644 --- a/src/overlays/actors/ovl_En_Zos/z_en_zos.c +++ b/src/overlays/actors/ovl_En_Zos/z_en_zos.c @@ -19,7 +19,7 @@ const ActorInit En_Zos_InitVars = { (ActorFunc)EnZos_Init, (ActorFunc)EnZos_Destroy, (ActorFunc)EnZos_Update, - (ActorFunc)EnZos_Draw + (ActorFunc)EnZos_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Zot/z_en_zot.c b/src/overlays/actors/ovl_En_Zot/z_en_zot.c index 679edc6664..2d05eff8c6 100644 --- a/src/overlays/actors/ovl_En_Zot/z_en_zot.c +++ b/src/overlays/actors/ovl_En_Zot/z_en_zot.c @@ -19,7 +19,7 @@ const ActorInit En_Zot_InitVars = { (ActorFunc)EnZot_Init, (ActorFunc)EnZot_Destroy, (ActorFunc)EnZot_Update, - (ActorFunc)EnZot_Draw + (ActorFunc)EnZot_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Zov/z_en_zov.c b/src/overlays/actors/ovl_En_Zov/z_en_zov.c index 208bfe0d66..d5016b7be0 100644 --- a/src/overlays/actors/ovl_En_Zov/z_en_zov.c +++ b/src/overlays/actors/ovl_En_Zov/z_en_zov.c @@ -19,7 +19,7 @@ const ActorInit En_Zov_InitVars = { (ActorFunc)EnZov_Init, (ActorFunc)EnZov_Destroy, (ActorFunc)EnZov_Update, - (ActorFunc)EnZov_Draw + (ActorFunc)EnZov_Draw, }; */ diff --git a/src/overlays/actors/ovl_En_Zow/z_en_zow.c b/src/overlays/actors/ovl_En_Zow/z_en_zow.c index 0fbb029437..2354a54035 100644 --- a/src/overlays/actors/ovl_En_Zow/z_en_zow.c +++ b/src/overlays/actors/ovl_En_Zow/z_en_zow.c @@ -19,7 +19,7 @@ const ActorInit En_Zow_InitVars = { (ActorFunc)EnZow_Init, (ActorFunc)EnZow_Destroy, (ActorFunc)EnZow_Update, - (ActorFunc)EnZow_Draw + (ActorFunc)EnZow_Draw, }; */ diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c index a0ab0e4a0a..2c47e2d79d 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -18,7 +18,7 @@ const ActorInit Item_Etcetera_InitVars = { (ActorFunc)ItemEtcetera_Init, (ActorFunc)ItemEtcetera_Destroy, (ActorFunc)ItemEtcetera_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c index 0cb0bca1c1..8bcb67a98c 100644 --- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c +++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c @@ -20,7 +20,7 @@ const ActorInit Item_Inbox_InitVars = { (ActorFunc)ItemInbox_Init, (ActorFunc)ItemInbox_Destroy, (ActorFunc)ItemInbox_Update, - (ActorFunc)ItemInbox_Draw + (ActorFunc)ItemInbox_Draw, }; void ItemInbox_Init(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c index 7a6a14abbb..526cccba07 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -19,7 +19,7 @@ const ActorInit Mir_Ray_InitVars = { (ActorFunc)MirRay_Init, (ActorFunc)MirRay_Destroy, (ActorFunc)MirRay_Update, - (ActorFunc)MirRay_Draw + (ActorFunc)MirRay_Draw, }; */ diff --git a/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c b/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c index 946319d697..c06a9f14e5 100644 --- a/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c +++ b/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c @@ -19,7 +19,7 @@ const ActorInit Mir_Ray2_InitVars = { (ActorFunc)MirRay2_Init, (ActorFunc)MirRay2_Destroy, (ActorFunc)MirRay2_Update, - (ActorFunc)MirRay2_Draw + (ActorFunc)MirRay2_Draw, }; */ diff --git a/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c index 69916d3d36..b77c2a7c25 100644 --- a/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c +++ b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c @@ -19,7 +19,7 @@ const ActorInit Mir_Ray3_InitVars = { (ActorFunc)MirRay3_Init, (ActorFunc)MirRay3_Destroy, (ActorFunc)MirRay3_Update, - (ActorFunc)MirRay3_Draw + (ActorFunc)MirRay3_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c index 023bbc0c65..14ca275cd1 100644 --- a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c +++ b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c @@ -19,7 +19,7 @@ const ActorInit Obj_Aqua_InitVars = { (ActorFunc)ObjAqua_Init, (ActorFunc)ObjAqua_Destroy, (ActorFunc)ObjAqua_Update, - (ActorFunc)ObjAqua_Draw + (ActorFunc)ObjAqua_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c index 0b4ce0ea31..68b2b054b0 100644 --- a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c +++ b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c @@ -19,7 +19,7 @@ const ActorInit Obj_Armos_InitVars = { (ActorFunc)ObjArmos_Init, (ActorFunc)ObjArmos_Destroy, (ActorFunc)ObjArmos_Update, - (ActorFunc)ObjArmos_Draw + (ActorFunc)ObjArmos_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c index bfa16d97e7..70084df845 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -18,7 +18,7 @@ const ActorInit Obj_Bean_InitVars = { (ActorFunc)ObjBean_Init, (ActorFunc)ObjBean_Destroy, (ActorFunc)ObjBean_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c index a22d8fd8c0..0981da4633 100644 --- a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c +++ b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c @@ -19,7 +19,7 @@ const ActorInit Obj_Bell_InitVars = { (ActorFunc)ObjBell_Init, (ActorFunc)ObjBell_Destroy, (ActorFunc)ObjBell_Update, - (ActorFunc)ObjBell_Draw + (ActorFunc)ObjBell_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c index 0e220dbed8..faf687e4a0 100644 --- a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c +++ b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c @@ -19,7 +19,7 @@ const ActorInit Obj_Bigicicle_InitVars = { (ActorFunc)ObjBigicicle_Init, (ActorFunc)ObjBigicicle_Destroy, (ActorFunc)ObjBigicicle_Update, - (ActorFunc)ObjBigicicle_Draw + (ActorFunc)ObjBigicicle_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c index ef6af07c01..5a89fc9cc7 100644 --- a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c +++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c @@ -17,7 +17,7 @@ const ActorInit Obj_Blockstop_InitVars = { (ActorFunc)ObjBlockstop_Init, (ActorFunc)func_800BDFB0, (ActorFunc)ObjBlockstop_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c index 9a6a3096ee..ead9c09399 100644 --- a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c +++ b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c @@ -19,7 +19,7 @@ const ActorInit Obj_Boat_InitVars = { (ActorFunc)ObjBoat_Init, (ActorFunc)ObjBoat_Destroy, (ActorFunc)ObjBoat_Update, - (ActorFunc)ObjBoat_Draw + (ActorFunc)ObjBoat_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c index 4813f50209..f81f5d4dca 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -18,7 +18,7 @@ const ActorInit Obj_Bombiwa_InitVars = { (ActorFunc)ObjBombiwa_Init, (ActorFunc)ObjBombiwa_Destroy, (ActorFunc)ObjBombiwa_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c index bb84a7eeec..a04bb58313 100644 --- a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c +++ b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c @@ -19,7 +19,7 @@ const ActorInit Obj_Chan_InitVars = { (ActorFunc)ObjChan_Init, (ActorFunc)ObjChan_Destroy, (ActorFunc)ObjChan_Update, - (ActorFunc)ObjChan_Draw + (ActorFunc)ObjChan_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c b/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c index a12836ce5d..bab86c7f03 100644 --- a/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c +++ b/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c @@ -19,7 +19,7 @@ const ActorInit Obj_Chikuwa_InitVars = { (ActorFunc)ObjChikuwa_Init, (ActorFunc)ObjChikuwa_Destroy, (ActorFunc)ObjChikuwa_Update, - (ActorFunc)ObjChikuwa_Draw + (ActorFunc)ObjChikuwa_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c index 5b0db44cc8..0d7c745fd9 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -19,7 +19,7 @@ const ActorInit Obj_Comb_InitVars = { (ActorFunc)ObjComb_Init, (ActorFunc)ObjComb_Destroy, (ActorFunc)ObjComb_Update, - (ActorFunc)ObjComb_Draw + (ActorFunc)ObjComb_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c index e1985037f2..b91347ce69 100644 --- a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c +++ b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c @@ -19,7 +19,7 @@ const ActorInit Obj_Danpeilift_InitVars = { (ActorFunc)ObjDanpeilift_Init, (ActorFunc)ObjDanpeilift_Destroy, (ActorFunc)ObjDanpeilift_Update, - (ActorFunc)ObjDanpeilift_Draw + (ActorFunc)ObjDanpeilift_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c b/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c index 09a81b2757..ac85db3205 100644 --- a/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c +++ b/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c @@ -17,7 +17,7 @@ const ActorInit Obj_Demo_InitVars = { (ActorFunc)ObjDemo_Init, (ActorFunc)func_800BDFB0, (ActorFunc)ObjDemo_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c index d7df56a342..5733e6fcb0 100644 --- a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c +++ b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c @@ -19,7 +19,7 @@ const ActorInit Obj_Dhouse_InitVars = { (ActorFunc)ObjDhouse_Init, (ActorFunc)ObjDhouse_Destroy, (ActorFunc)ObjDhouse_Update, - (ActorFunc)ObjDhouse_Draw + (ActorFunc)ObjDhouse_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c b/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c index c47a2712fe..50b30dca1b 100644 --- a/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c +++ b/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c @@ -18,7 +18,7 @@ const ActorInit Obj_Dinner_InitVars = { (ActorFunc)ObjDinner_Init, (ActorFunc)ObjDinner_Destroy, (ActorFunc)ObjDinner_Update, - (ActorFunc)ObjDinner_Draw + (ActorFunc)ObjDinner_Draw, }; extern Gfx D_060011E0[]; @@ -44,7 +44,6 @@ void ObjDinner_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; func_8012C28C(gfxCtx); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx), - G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gfxCtx->polyOpa.p++, D_060011E0); } diff --git a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c index c1947ad156..abb2e314bc 100644 --- a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c +++ b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c @@ -19,7 +19,7 @@ const ActorInit Obj_Dora_InitVars = { (ActorFunc)ObjDora_Init, (ActorFunc)ObjDora_Destroy, (ActorFunc)ObjDora_Update, - (ActorFunc)ObjDora_Draw + (ActorFunc)ObjDora_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c index c9483483c6..351084f625 100644 --- a/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c +++ b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c @@ -18,7 +18,7 @@ const ActorInit Obj_Dowsing_InitVars = { (ActorFunc)ObjDowsing_Init, (ActorFunc)ObjDowsing_Destroy, (ActorFunc)ObjDowsing_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c b/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c index 807c237d09..bf89d0eab4 100644 --- a/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c +++ b/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c @@ -19,7 +19,7 @@ const ActorInit Obj_Driftice_InitVars = { (ActorFunc)ObjDriftice_Init, (ActorFunc)ObjDriftice_Destroy, (ActorFunc)ObjDriftice_Update, - (ActorFunc)ObjDriftice_Draw + (ActorFunc)ObjDriftice_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c index 759b822bad..24acdde077 100644 --- a/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c +++ b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c @@ -18,7 +18,7 @@ const ActorInit Obj_Ending_InitVars = { (ActorFunc)ObjEnding_Init, (ActorFunc)func_800BDFB0, (ActorFunc)ObjEnding_Update, - (ActorFunc)ObjEnding_Draw + (ActorFunc)ObjEnding_Draw, }; */ @@ -37,26 +37,26 @@ static unkStruct D_80C25CE0[2] = { }; */ -void ObjEnding_Init(Actor* thisx, GlobalContext *globalCtx) { +void ObjEnding_Init(Actor* thisx, GlobalContext* globalCtx) { ObjEnding* this = THIS; - AnimatedMaterial *texture; + AnimatedMaterial* texture; Actor_ProcessInitChain(&this->actor, D_80C25CF8); this->unk144 = &D_80C25CE0[this->actor.params]; - if(false){} + if (false) {} texture = this->unk144->texture; - + if (texture != NULL) { this->texture = Lib_SegmentedToVirtual(texture); } } -void ObjEnding_Update(Actor *thisx, GlobalContext *globalCtx) { +void ObjEnding_Update(Actor* thisx, GlobalContext* globalCtx) { } -void ObjEnding_Draw(Actor *thisx, GlobalContext *globalCtx) { - ObjEnding *this = THIS; - Gfx *dl; +void ObjEnding_Draw(Actor* thisx, GlobalContext* globalCtx) { + ObjEnding* this = THIS; + Gfx* dl; UNK_TYPE4 tempunk4; if (this->texture != NULL) { diff --git a/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c b/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c index 48621de9b9..55475d5be3 100644 --- a/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c +++ b/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c @@ -19,7 +19,7 @@ const ActorInit Obj_Entotu_InitVars = { (ActorFunc)ObjEntotu_Init, (ActorFunc)ObjEntotu_Destroy, (ActorFunc)ObjEntotu_Update, - (ActorFunc)ObjEntotu_Draw + (ActorFunc)ObjEntotu_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c index dcb88a6576..ae145c8025 100644 --- a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c +++ b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c @@ -18,7 +18,7 @@ const ActorInit Obj_Etcetera_InitVars = { (ActorFunc)ObjEtcetera_Init, (ActorFunc)ObjEtcetera_Destroy, (ActorFunc)ObjEtcetera_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c index f38c2e6b0b..14d8b7644a 100644 --- a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c +++ b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c @@ -19,7 +19,7 @@ const ActorInit Obj_Fireshield_InitVars = { (ActorFunc)ObjFireshield_Init, (ActorFunc)ObjFireshield_Destroy, (ActorFunc)ObjFireshield_Update, - (ActorFunc)ObjFireshield_Draw + (ActorFunc)ObjFireshield_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c index 641a3810b8..d5d4bc8f6a 100644 --- a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c +++ b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c @@ -19,7 +19,7 @@ const ActorInit Obj_Flowerpot_InitVars = { (ActorFunc)ObjFlowerpot_Init, (ActorFunc)ObjFlowerpot_Destroy, (ActorFunc)ObjFlowerpot_Update, - (ActorFunc)ObjFlowerpot_Draw + (ActorFunc)ObjFlowerpot_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c index 8e4b9f8262..97b41d50f5 100644 --- a/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c +++ b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c @@ -16,7 +16,7 @@ const ActorInit Obj_Funen_InitVars = { (ActorFunc)ObjFunen_Init, (ActorFunc)func_800BDFB0, (ActorFunc)func_800BDFB0, - (ActorFunc)ObjFunen_Draw + (ActorFunc)ObjFunen_Draw, }; extern Gfx D_060000D0[]; diff --git a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c index 87d9f6d12e..27d52aa6b0 100644 --- a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c +++ b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c @@ -19,7 +19,7 @@ const ActorInit Obj_Ghaka_InitVars = { (ActorFunc)ObjGhaka_Init, (ActorFunc)ObjGhaka_Destroy, (ActorFunc)ObjGhaka_Update, - (ActorFunc)ObjGhaka_Draw + (ActorFunc)ObjGhaka_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c index 507e3f88d1..26b0c06ede 100644 --- a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c +++ b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c @@ -19,7 +19,7 @@ const ActorInit Obj_Grass_InitVars = { (ActorFunc)ObjGrass_Init, (ActorFunc)ObjGrass_Destroy, (ActorFunc)ObjGrass_Update, - (ActorFunc)ObjGrass_Draw + (ActorFunc)ObjGrass_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c index e65ffb56a9..09ecb1c28b 100644 --- a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c +++ b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c @@ -18,7 +18,7 @@ const ActorInit Obj_Grass_Carry_InitVars = { (ActorFunc)ObjGrassCarry_Init, (ActorFunc)ObjGrassCarry_Destroy, (ActorFunc)ObjGrassCarry_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c b/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c index 35f25e6f8f..3a0c29fc77 100644 --- a/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c +++ b/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c @@ -16,7 +16,7 @@ const ActorInit Obj_Grass_Unit_InitVars = { (ActorFunc)ObjGrassUnit_Init, (ActorFunc)func_800BDFB0, (ActorFunc)func_800BDFB0, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c index 8849a39868..182a123ce0 100644 --- a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c +++ b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c @@ -19,7 +19,7 @@ const ActorInit Obj_Hakaisi_InitVars = { (ActorFunc)ObjHakaisi_Init, (ActorFunc)ObjHakaisi_Destroy, (ActorFunc)ObjHakaisi_Update, - (ActorFunc)ObjHakaisi_Draw + (ActorFunc)ObjHakaisi_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c index b138e06892..1fe01b458a 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -19,7 +19,7 @@ const ActorInit Obj_Hamishi_InitVars = { (ActorFunc)ObjHamishi_Init, (ActorFunc)ObjHamishi_Destroy, (ActorFunc)ObjHamishi_Update, - (ActorFunc)ObjHamishi_Draw + (ActorFunc)ObjHamishi_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c index 5d1b8c5893..2ad90705c9 100644 --- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c +++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c @@ -23,7 +23,7 @@ const ActorInit Obj_Hana_InitVars = { (ActorFunc)ObjHana_Init, (ActorFunc)ObjHana_Destroy, (ActorFunc)ObjHana_Update, - (ActorFunc)ObjHana_Draw + (ActorFunc)ObjHana_Draw, }; extern UNK_TYPE D_06000500; @@ -37,7 +37,7 @@ static InitChainEntry sInitChain[] = { void ObjHana_Init(Actor* thisx, GlobalContext* globalCtx) { ObjHana* this = THIS; - + Actor_ProcessInitChain(&this->actor, sInitChain); } diff --git a/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c index 94fa4867bd..151dfe7770 100644 --- a/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c +++ b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c @@ -19,7 +19,7 @@ const ActorInit Obj_Hariko_InitVars = { (ActorFunc)ObjHariko_Init, (ActorFunc)ObjHariko_Destroy, (ActorFunc)ObjHariko_Update, - (ActorFunc)ObjHariko_Draw + (ActorFunc)ObjHariko_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c index fe5382c412..119fb9c15f 100644 --- a/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c +++ b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c @@ -19,7 +19,7 @@ const ActorInit Obj_Hgdoor_InitVars = { (ActorFunc)ObjHgdoor_Init, (ActorFunc)ObjHgdoor_Destroy, (ActorFunc)ObjHgdoor_Update, - (ActorFunc)ObjHgdoor_Draw + (ActorFunc)ObjHgdoor_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c index cab8d267f7..26fdfe2266 100644 --- a/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c +++ b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c @@ -19,7 +19,7 @@ const ActorInit Obj_HsStump_InitVars = { (ActorFunc)ObjHsStump_Init, (ActorFunc)ObjHsStump_Destroy, (ActorFunc)ObjHsStump_Update, - (ActorFunc)ObjHsStump_Draw + (ActorFunc)ObjHsStump_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c index 42d0d7f753..d75392f665 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -19,7 +19,7 @@ const ActorInit Obj_Hsblock_InitVars = { (ActorFunc)ObjHsblock_Init, (ActorFunc)ObjHsblock_Destroy, (ActorFunc)ObjHsblock_Update, - (ActorFunc)ObjHsblock_Draw + (ActorFunc)ObjHsblock_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c index dc1af5793e..8b666d641c 100644 --- a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c +++ b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c @@ -19,7 +19,7 @@ const ActorInit Obj_Hugebombiwa_InitVars = { (ActorFunc)ObjHugebombiwa_Init, (ActorFunc)ObjHugebombiwa_Destroy, (ActorFunc)ObjHugebombiwa_Update, - (ActorFunc)ObjHugebombiwa_Draw + (ActorFunc)ObjHugebombiwa_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c index 44779f47ab..4cb125413d 100644 --- a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c +++ b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c @@ -19,7 +19,7 @@ const ActorInit Obj_Hunsui_InitVars = { (ActorFunc)ObjHunsui_Init, (ActorFunc)ObjHunsui_Destroy, (ActorFunc)ObjHunsui_Update, - (ActorFunc)ObjHunsui_Draw + (ActorFunc)ObjHunsui_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c index 6cf8b0aefb..a0c554f2cf 100644 --- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c +++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c @@ -19,7 +19,7 @@ const ActorInit Obj_Ice_Poly_InitVars = { (ActorFunc)ObjIcePoly_Init, (ActorFunc)ObjIcePoly_Destroy, (ActorFunc)ObjIcePoly_Update, - (ActorFunc)ObjIcePoly_Draw + (ActorFunc)ObjIcePoly_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c index 2485b5577f..fb845cf6cf 100644 --- a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c +++ b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c @@ -19,7 +19,7 @@ const ActorInit Obj_Iceblock_InitVars = { (ActorFunc)ObjIceblock_Init, (ActorFunc)ObjIceblock_Destroy, (ActorFunc)ObjIceblock_Update, - (ActorFunc)ObjIceblock_Draw + (ActorFunc)ObjIceblock_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c b/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c index 80c480f644..1ec77ea173 100644 --- a/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c +++ b/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c @@ -19,7 +19,7 @@ const ActorInit Obj_Jg_Gakki_InitVars = { (ActorFunc)ObjJgGakki_Init, (ActorFunc)ObjJgGakki_Destroy, (ActorFunc)ObjJgGakki_Update, - (ActorFunc)ObjJgGakki_Draw + (ActorFunc)ObjJgGakki_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c index 849748b270..c51d25e8c1 100644 --- a/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c +++ b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c @@ -19,7 +19,7 @@ const ActorInit Obj_Jgame_Light_InitVars = { (ActorFunc)ObjJgameLight_Init, (ActorFunc)ObjJgameLight_Destroy, (ActorFunc)ObjJgameLight_Update, - (ActorFunc)ObjJgameLight_Draw + (ActorFunc)ObjJgameLight_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c index 79ac423c25..bf809480ec 100644 --- a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c +++ b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c @@ -19,7 +19,7 @@ const ActorInit Obj_Kendo_Kanban_InitVars = { (ActorFunc)ObjKendoKanban_Init, (ActorFunc)ObjKendoKanban_Destroy, (ActorFunc)ObjKendoKanban_Update, - (ActorFunc)ObjKendoKanban_Draw + (ActorFunc)ObjKendoKanban_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c b/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c index 402c4a61ba..a4d3098cf7 100644 --- a/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c +++ b/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c @@ -18,7 +18,7 @@ const ActorInit Obj_Kepn_Koya_InitVars = { (ActorFunc)ObjKepnKoya_Init, (ActorFunc)ObjKepnKoya_Destroy, (ActorFunc)ObjKepnKoya_Update, - (ActorFunc)ObjKepnKoya_Draw + (ActorFunc)ObjKepnKoya_Draw, }; static InitChainEntry D_80C07C40[] = { diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c index 5babc371eb..7fc2a6c9d5 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -18,7 +18,7 @@ const ActorInit Obj_Kibako_InitVars = { (ActorFunc)ObjKibako_Init, (ActorFunc)ObjKibako_Destroy, (ActorFunc)ObjKibako_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c index c20eefb152..2b77ffed2c 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -19,7 +19,7 @@ const ActorInit Obj_Kibako2_InitVars = { (ActorFunc)ObjKibako2_Init, (ActorFunc)ObjKibako2_Destroy, (ActorFunc)ObjKibako2_Update, - (ActorFunc)ObjKibako2_Draw + (ActorFunc)ObjKibako2_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c index 5bba1e6adf..053c9a42fa 100644 --- a/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c +++ b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c @@ -19,7 +19,7 @@ const ActorInit Obj_Kinoko_InitVars = { (ActorFunc)ObjKinoko_Init, (ActorFunc)ObjKinoko_Destroy, (ActorFunc)ObjKinoko_Update, - (ActorFunc)ObjKinoko_Draw + (ActorFunc)ObjKinoko_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c index fb08f3946d..7182ade64d 100644 --- a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c +++ b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c @@ -19,7 +19,7 @@ const ActorInit Obj_Kzsaku_InitVars = { (ActorFunc)ObjKzsaku_Init, (ActorFunc)ObjKzsaku_Destroy, (ActorFunc)ObjKzsaku_Update, - (ActorFunc)ObjKzsaku_Draw + (ActorFunc)ObjKzsaku_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c index a588f9fb77..63e12c2e96 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -19,7 +19,7 @@ const ActorInit Obj_Lift_InitVars = { (ActorFunc)ObjLift_Init, (ActorFunc)ObjLift_Destroy, (ActorFunc)ObjLift_Update, - (ActorFunc)ObjLift_Draw + (ActorFunc)ObjLift_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c index 16391780e1..96a063af59 100644 --- a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c +++ b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c @@ -19,7 +19,7 @@ const ActorInit Obj_Lightblock_InitVars = { (ActorFunc)ObjLightblock_Init, (ActorFunc)ObjLightblock_Destroy, (ActorFunc)ObjLightblock_Update, - (ActorFunc)ObjLightblock_Draw + (ActorFunc)ObjLightblock_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c index 3afe4c2cad..88483dc310 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -29,26 +29,55 @@ const ActorInit Obj_Lightswitch_InitVars = { (ActorFunc)ObjLightswitch_Init, (ActorFunc)ObjLightswitch_Destroy, (ActorFunc)ObjLightswitch_Update, - (ActorFunc)ObjLightswitch_Draw + (ActorFunc)ObjLightswitch_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { { - { ELEMTYPE_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00202000, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { + ELEMTYPE_UNK0, + { 0x00000000, 0x00, 0x00 }, + { 0x00202000, 0x00, 0x00 }, + TOUCH_NONE | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, { 0, { { 0, 0, 0 }, 19 }, 100 }, }, }; static ColliderJntSphInit sJntSphInit = { - { COLTYPE_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER | AC_TYPE_OTHER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_2, COLSHAPE_JNTSPH, }, - 1, sJntSphElementsInit, + { + COLTYPE_NONE, + AT_NONE, + AC_ON | AC_TYPE_PLAYER | AC_TYPE_OTHER, + OC1_ON | OC1_TYPE_ALL, + OC2_TYPE_2, + COLSHAPE_JNTSPH, + }, + 1, + sJntSphElementsInit, }; // different face addresses for (sleep -> waking -> awake) of light switch face -Gfx* lightswitchFaceGfx[] = {D_06000C20, D_06000420, D_06001420,}; +Gfx* lightswitchFaceGfx[] = { + D_06000C20, + D_06000420, + D_06001420, +}; -Color_RGBA8 lightswitchEffectPrimColor = { 0xFF, 0xFF, 0xA0, 0xA0, }; -Color_RGBA8 lightswitchEffectEnvColor = { 0xFF, 0x0, 0x0, 0x0, }; +Color_RGBA8 lightswitchEffectPrimColor = { + 0xFF, + 0xFF, + 0xA0, + 0xA0, +}; +Color_RGBA8 lightswitchEffectEnvColor = { + 0xFF, + 0x0, + 0x0, + 0x0, +}; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), @@ -63,15 +92,15 @@ void ObjLightswitch_InitCollider(ObjLightswitch* this, GlobalContext* globalCtx) Collider_InitJntSph(globalCtx, &this->collider); Collider_SetJntSph(globalCtx, &this->collider, &this->actor, &sJntSphInit, &this->elements); this->actor.colChkInfo.mass = 0xFF; - SysMatrix_SetStateRotationAndTranslation(this->actor.world.pos.x, - this->actor.world.pos.y + (this->actor.shape.yOffset * this->actor.scale.y), + SysMatrix_SetStateRotationAndTranslation( + this->actor.world.pos.x, this->actor.world.pos.y + (this->actor.shape.yOffset * this->actor.scale.y), this->actor.world.pos.z, &this->actor.shape); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, 1); Collider_UpdateSpheres(0, &this->collider); } void ObjLightswitch_UpdateSwitchFlags(ObjLightswitch* this, GlobalContext* globalCtx, s32 set) { - if (this){} + if (this) {} if (set) { Actor_SetSwitchFlag(globalCtx, GET_LIGHTSWITCH_SWITCHFLAG(this)); @@ -89,7 +118,7 @@ void ObjLightswitch_SpawnEffects(ObjLightswitch* this, GlobalContext* globalCtx) f32 sinResult; f32 cosResult; f32 tempResult; - f32 tempResult2; // must exist because of condition assignemt? + f32 tempResult2; // must exist because of condition assignemt? f32 tempResult_shorter; // tempResult - 30 f32 randomOutput; f32 tempResult5; @@ -98,7 +127,7 @@ void ObjLightswitch_SpawnEffects(ObjLightswitch* this, GlobalContext* globalCtx) cosResult = Math_CosS(this->actor.shape.rot.y); if (this->colorAlpha >= 0x1900) { // late rodata: 6.127451e-05f = 1 / 16320 ? - tempResult = (1.0f - ( this->colorAlpha * 6.127451e-05f)) * 400.0f; + tempResult = (1.0f - (this->colorAlpha * 6.127451e-05f)) * 400.0f; if (tempResult > 60.0f) { tempResult2 = 60.0f; @@ -122,26 +151,26 @@ void ObjLightswitch_SpawnEffects(ObjLightswitch* this, GlobalContext* globalCtx) tempResult5 = 2.0f * ((Rand_ZeroOne() - 0.5f) * tempResult); // permuter seems to think something could be added to fix ordering here, but doesn't fix enough - //goto dummy_label_809848; dummy_label_809848: ; // minor regalloc fix - //if (cosResult){} // minor regalloc fix, but breaks some code + // goto dummy_label_809848; dummy_label_809848: ; // minor regalloc fix + // if (cosResult){} // minor regalloc fix, but breaks some code // saving fabsf result as a temp might help, but need to reduce temps - //fabsResult = fabsf(tempResult5); - //randomOutput = (Rand_ZeroOne() * 10.0f) + ((30.0f - fabsResult) * 0.5f); - //randomOutput = fabsf(tempResult5); - //randomOutput = (Rand_ZeroOne() * 10.0f) + ((30.0f - randomOutput) * 0.5f); + // fabsResult = fabsf(tempResult5); + // randomOutput = (Rand_ZeroOne() * 10.0f) + ((30.0f - fabsResult) * 0.5f); + // randomOutput = fabsf(tempResult5); + // randomOutput = (Rand_ZeroOne() * 10.0f) + ((30.0f - randomOutput) * 0.5f); randomOutput = (Rand_ZeroOne() * 10.0f) + ((30.0f - fabsf(tempResult5)) * 0.5f); effectPos.x = this->actor.world.pos.x + ((randomOutput * sinResult) + (tempResult5 * cosResult)); effectPos.y = this->actor.world.pos.y + tempResult_shorter + 10.0f; effectPos.z = this->actor.world.pos.z + ((randomOutput * cosResult) - (tempResult5 * sinResult)); - // weirdly, using a temp here make a big difference, but.. is that right? just one temp? prob ordering issue above - //tempResult = this->actor.world.pos.z + ((randomOutput * cosResult) - (tempResult5 * sinResult)); - //effectPos.z = tempResult; - - EffectSsDeadDb_Spawn(globalCtx, &effectPos, &D_801D15B0, &D_801D15B0, - &lightswitchEffectPrimColor, &lightswitchEffectEnvColor, - 100, 0, 9); + // weirdly, using a temp here make a big difference, but.. is that right? just one temp? prob ordering issue + // above + // tempResult = this->actor.world.pos.z + ((randomOutput * cosResult) - (tempResult5 * sinResult)); + // effectPos.z = tempResult; + + EffectSsDeadDb_Spawn(globalCtx, &effectPos, &D_801D15B0, &D_801D15B0, &lightswitchEffectPrimColor, + &lightswitchEffectEnvColor, 100, 0, 9); } } #else @@ -233,7 +262,7 @@ void ObjLightSwitch_SetupAsleep(ObjLightswitch* this) { this->actionFunc = ObjLightSwitch_Asleep; } -void ObjLightSwitch_Asleep(ObjLightswitch* this, GlobalContext* globalCtx) { +void ObjLightSwitch_Asleep(ObjLightswitch* this, GlobalContext* globalCtx) { if (this->colorShiftTimer == 0) { Audio_PlayActorSound2(&this->actor, 0x286F); // sfx NA_SE_EV_SUN_MARK_FLASH } @@ -323,7 +352,7 @@ void ObjLightSwitch_Fade(ObjLightswitch* this, GlobalContext* globalCtx) { } else { func_800B9010(&this->actor, 0x321F); // sfx NA_SE_EN_COMMON_EXTINCT_LEV "burn into ashes" } -} +} void ObjLightswitch_Update(Actor* thisx, GlobalContext* globalCtx) { ObjLightswitch* this = THIS; @@ -342,7 +371,7 @@ void ObjLightswitch_Update(Actor* thisx, GlobalContext* globalCtx) { this->hitState++; } } else { - if (this->hitState < 10) { + if (this->hitState < 10) { this->hitState++; } } @@ -351,7 +380,7 @@ void ObjLightswitch_Update(Actor* thisx, GlobalContext* globalCtx) { } // why wouldn't this be in the action func? - if ((this->cutsceneTimer > 0) && ( (s32) this->actionFunc != (s32) ObjLightswitch_PlayCinema )) { + if ((this->cutsceneTimer > 0) && ((s32)this->actionFunc != (s32)ObjLightswitch_PlayCinema)) { this->cutsceneTimer--; if (this->cutsceneTimer == 0) { ActorCutscene_Stop(this->actor.cutscene); @@ -377,16 +406,12 @@ void ObjLightSwitch_DrawOpa(ObjLightswitch* this, GlobalContext* globalCtx) { func_8012C28C(globalCtx->state.gfxCtx); - //temp_v0->words.w1 = ((((s32) this->colorB >> 6) & 0xFF) << 8) - //| (((s32) this->colorR >> 6) << 0x18) - //| ((((s32) this->colorG >> 6) & 0xFF) << 0x10) - //| (((s32) this->colorAlpha >> 6) & 0xFF); + // temp_v0->words.w1 = ((((s32) this->colorB >> 6) & 0xFF) << 8) + //| (((s32) this->colorR >> 6) << 0x18) + //| ((((s32) this->colorG >> 6) & 0xFF) << 0x10) + //| (((s32) this->colorAlpha >> 6) & 0xFF); // load order issues with loading this in the right order for the function - gDPSetEnvColor(POLY_OPA_DISP++, - this->colorR >> 6, - this->colorG >> 6, - this->colorB >> 6, - this->colorAlpha >> 6); + gDPSetEnvColor(POLY_OPA_DISP++, this->colorR >> 6, this->colorG >> 6, this->colorB >> 6, this->colorAlpha >> 6); gSPSegment(POLY_OPA_DISP++, 0x09, D_801AEFA0); @@ -394,8 +419,7 @@ void ObjLightSwitch_DrawOpa(ObjLightswitch* this, GlobalContext* globalCtx) { tempPos.y = this->actor.world.pos.y + (this->actor.shape.yOffset * this->actor.scale.y); tempPos.z = this->actor.world.pos.z; - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), - G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(D_80960BC4[this->faceState])); @@ -407,8 +431,7 @@ void ObjLightSwitch_DrawOpa(ObjLightswitch* this, GlobalContext* globalCtx) { SysMatrix_SetStateRotationAndTranslation(tempPos.z, tempPos.y, tempPos.x, &tempRot); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, 1); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), - G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, 0x6000398); @@ -416,13 +439,11 @@ void ObjLightSwitch_DrawOpa(ObjLightswitch* this, GlobalContext* globalCtx) { SysMatrix_SetStateRotationAndTranslation(tempPos.z, tempPos.y, tempPos.x, &tempRot); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, 1); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), - G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, 0x6000408); CLOSE_DISPS(globalCtx->state.gfxCtx); - } #else #pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_Obj_Lightswitch_0x8095FBF0/ObjLightSwitch_DrawOpa.asm") @@ -438,16 +459,11 @@ void ObjLightSwitch_DrawXlu(ObjLightswitch* this, GlobalContext* globalCtx) { func_8012C2DC(globalCtx->state.gfxCtx); - //temp_v0->words.w1 = ((((s32) this->colorB >> 6) & 0xFF) << 8) - //| (((s32) this->colorR >> 6) << 0x18) - //| ((((s32) this->colorG >> 6) & 0xFF) << 0x10) - //| (((s32) this->colorAlpha >> 6) & 0xFF); - gDPSetEnvColor(POLY_XLU_DISP++, - this->colorR >> 6, - this->colorG >> 6, - this->colorB >> 6, - this->colorAlpha >> 6); - + // temp_v0->words.w1 = ((((s32) this->colorB >> 6) & 0xFF) << 8) + //| (((s32) this->colorR >> 6) << 0x18) + //| ((((s32) this->colorG >> 6) & 0xFF) << 0x10) + //| (((s32) this->colorAlpha >> 6) & 0xFF); + gDPSetEnvColor(POLY_XLU_DISP++, this->colorR >> 6, this->colorG >> 6, this->colorB >> 6, this->colorAlpha >> 6); gSPSegment(POLY_XLU_DISP++, 0x09, D_801AEF88); @@ -455,8 +471,7 @@ void ObjLightSwitch_DrawXlu(ObjLightswitch* this, GlobalContext* globalCtx) { tempPos.y = this->actor.world.pos.y + (this->actor.shape.yOffset * this->actor.scale.y); tempPos.z = this->actor.world.pos.z; - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), - G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(D_80960BC4[this->faceState])); @@ -465,11 +480,10 @@ void ObjLightSwitch_DrawXlu(ObjLightswitch* this, GlobalContext* globalCtx) { tempRot.x = this->actor.shape.rot.x; tempRot.y = this->actor.shape.rot.y; tempRot.z = this->actor.shape.rot.z + this->edgeRot; - SysMatrix_SetStateRotationAndTranslation(tempPos.x, tempPos.y, tempPos.z, &tempRot); - Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, 1); + SysMatrix_SetStateRotationAndTranslation(tempPos.x, tempPos.y, tempPos.z, &tempRot); + Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, 1); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), - G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, 0x6000398); @@ -477,8 +491,7 @@ void ObjLightSwitch_DrawXlu(ObjLightswitch* this, GlobalContext* globalCtx) { SysMatrix_SetStateRotationAndTranslation(tempPos.x, tempPos.y, tempPos.z, &tempRot); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, 1); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), - G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, 0x6000408); @@ -494,8 +507,7 @@ void ObjLightswitch_Draw(Actor* thisx, GlobalContext* globalCtx) { if ((GET_LIGHTSWITCH_TYPE(this) == LIGHTSWITCH_TYPE_FAKE) && (alpha > 0) && (alpha < 0xFF)) { ObjLightSwitch_DrawXlu(this, globalCtx); - } else { + } else { ObjLightSwitch_DrawOpa(this, globalCtx); } } - diff --git a/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c index 4ebb7cfac2..9f6fc51146 100644 --- a/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c +++ b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c @@ -19,7 +19,7 @@ const ActorInit Obj_Lupygamelift_InitVars = { (ActorFunc)ObjLupygamelift_Init, (ActorFunc)ObjLupygamelift_Destroy, (ActorFunc)ObjLupygamelift_Update, - (ActorFunc)ObjLupygamelift_Draw + (ActorFunc)ObjLupygamelift_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c index 290dc74179..16d9007929 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c @@ -18,7 +18,7 @@ const ActorInit Obj_Makekinsuta_InitVars = { (ActorFunc)ObjMakekinsuta_Init, (ActorFunc)ObjMakekinsuta_Destroy, (ActorFunc)ObjMakekinsuta_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c index 059b979019..c74bc95fd6 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c @@ -17,7 +17,7 @@ const ActorInit Obj_Makeoshihiki_InitVars = { (ActorFunc)ObjMakeoshihiki_Init, (ActorFunc)func_800BDFB0, (ActorFunc)ObjMakeoshihiki_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c b/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c index d724cb4a4a..7c25414657 100644 --- a/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c +++ b/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c @@ -19,7 +19,7 @@ const ActorInit Obj_Milk_Bin_InitVars = { (ActorFunc)ObjMilkBin_Init, (ActorFunc)ObjMilkBin_Destroy, (ActorFunc)ObjMilkBin_Update, - (ActorFunc)ObjMilkBin_Draw + (ActorFunc)ObjMilkBin_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c index e374d70ed3..f759ab30fd 100644 --- a/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c +++ b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c @@ -19,7 +19,7 @@ const ActorInit Obj_Mine_InitVars = { (ActorFunc)ObjMine_Init, (ActorFunc)ObjMine_Destroy, (ActorFunc)ObjMine_Update, - (ActorFunc)ObjMine_Draw + (ActorFunc)ObjMine_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c b/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c index ad8a95f731..a536aab05b 100644 --- a/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c +++ b/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c @@ -19,7 +19,7 @@ const ActorInit Obj_Moon_Stone_InitVars = { (ActorFunc)ObjMoonStone_Init, (ActorFunc)ObjMoonStone_Destroy, (ActorFunc)ObjMoonStone_Update, - (ActorFunc)ObjMoonStone_Draw + (ActorFunc)ObjMoonStone_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c b/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c index 7445eed561..add8af4a0a 100644 --- a/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c +++ b/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c @@ -19,7 +19,7 @@ const ActorInit Obj_Mu_Pict_InitVars = { (ActorFunc)ObjMuPict_Init, (ActorFunc)ObjMuPict_Destroy, (ActorFunc)ObjMuPict_Update, - (ActorFunc)ObjMuPict_Draw + (ActorFunc)ObjMuPict_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c index adc598e731..3bb34b6596 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -18,7 +18,7 @@ const ActorInit Obj_Mure_InitVars = { (ActorFunc)ObjMure_Init, (ActorFunc)ObjMure_Destroy, (ActorFunc)ObjMure_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c index 10e6e75417..1a4515a435 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c @@ -17,7 +17,7 @@ const ActorInit Obj_Mure2_InitVars = { (ActorFunc)ObjMure2_Init, (ActorFunc)func_800BDFB0, (ActorFunc)ObjMure2_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c index 9662aede70..38d216d6d0 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c @@ -18,7 +18,7 @@ const ActorInit Obj_Mure3_InitVars = { (ActorFunc)ObjMure3_Init, (ActorFunc)ObjMure3_Destroy, (ActorFunc)ObjMure3_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c index b96ecc899a..113c307b2d 100644 --- a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c +++ b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c @@ -18,7 +18,7 @@ const ActorInit Obj_Nozoki_InitVars = { (ActorFunc)ObjNozoki_Init, (ActorFunc)ObjNozoki_Destroy, (ActorFunc)ObjNozoki_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c index 5f7a721055..d799193573 100644 --- a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c +++ b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c @@ -19,7 +19,7 @@ const ActorInit Obj_Ocarinalift_InitVars = { (ActorFunc)ObjOcarinalift_Init, (ActorFunc)ObjOcarinalift_Destroy, (ActorFunc)ObjOcarinalift_Update, - (ActorFunc)ObjOcarinalift_Draw + (ActorFunc)ObjOcarinalift_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c index ba790f77e8..5015888ce6 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -19,7 +19,7 @@ const ActorInit Obj_Oshihiki_InitVars = { (ActorFunc)ObjOshihiki_Init, (ActorFunc)ObjOshihiki_Destroy, (ActorFunc)ObjOshihiki_Update, - (ActorFunc)ObjOshihiki_Draw + (ActorFunc)ObjOshihiki_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c index eb69069b5b..3abf41e3bb 100644 --- a/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c +++ b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c @@ -18,7 +18,7 @@ const ActorInit Obj_Purify_InitVars = { (ActorFunc)ObjPurify_Init, (ActorFunc)ObjPurify_Destroy, (ActorFunc)ObjPurify_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c index 9ec310fbcd..11127af603 100644 --- a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c +++ b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c @@ -18,7 +18,7 @@ const ActorInit Obj_Pzlblock_InitVars = { (ActorFunc)ObjPzlblock_Init, (ActorFunc)ObjPzlblock_Destroy, (ActorFunc)ObjPzlblock_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c index 3e88663b09..2a013494de 100644 --- a/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c +++ b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c @@ -19,7 +19,7 @@ const ActorInit Obj_Raillift_InitVars = { (ActorFunc)ObjRaillift_Init, (ActorFunc)ObjRaillift_Destroy, (ActorFunc)ObjRaillift_Update, - (ActorFunc)ObjRaillift_Draw + (ActorFunc)ObjRaillift_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c index cbc044cfaa..05e51d9523 100644 --- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c +++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c @@ -18,7 +18,7 @@ const ActorInit Obj_Roomtimer_InitVars = { (ActorFunc)ObjRoomtimer_Init, (ActorFunc)ObjRoomtimer_Destroy, (ActorFunc)ObjRoomtimer_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c index c46879b5bd..a7f844f5f2 100644 --- a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c +++ b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c @@ -19,7 +19,7 @@ const ActorInit Obj_Rotlift_InitVars = { (ActorFunc)ObjRotlift_Init, (ActorFunc)ObjRotlift_Destroy, (ActorFunc)ObjRotlift_Update, - (ActorFunc)ObjRotlift_Draw + (ActorFunc)ObjRotlift_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c b/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c index 2bbd26cd55..9af149d160 100644 --- a/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c +++ b/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c @@ -19,7 +19,7 @@ const ActorInit Obj_Shutter_InitVars = { (ActorFunc)ObjShutter_Init, (ActorFunc)ObjShutter_Destroy, (ActorFunc)ObjShutter_Update, - (ActorFunc)ObjShutter_Draw + (ActorFunc)ObjShutter_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c index 93515497e3..40b7dec901 100644 --- a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c +++ b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c @@ -19,7 +19,7 @@ const ActorInit Obj_Skateblock_InitVars = { (ActorFunc)ObjSkateblock_Init, (ActorFunc)ObjSkateblock_Destroy, (ActorFunc)ObjSkateblock_Update, - (ActorFunc)ObjSkateblock_Draw + (ActorFunc)ObjSkateblock_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c b/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c index a216b32869..c932883bbc 100644 --- a/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c +++ b/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c @@ -19,7 +19,7 @@ const ActorInit Obj_Smork_InitVars = { (ActorFunc)ObjSmork_Init, (ActorFunc)ObjSmork_Destroy, (ActorFunc)ObjSmork_Update, - (ActorFunc)ObjSmork_Draw + (ActorFunc)ObjSmork_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c index b84ee12b86..0af5f76e3d 100644 --- a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c +++ b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c @@ -19,7 +19,7 @@ const ActorInit Obj_Snowball_InitVars = { (ActorFunc)ObjSnowball_Init, (ActorFunc)ObjSnowball_Destroy, (ActorFunc)ObjSnowball_Update, - (ActorFunc)ObjSnowball_Draw + (ActorFunc)ObjSnowball_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c index 7357e14ee7..e79c848152 100644 --- a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c +++ b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c @@ -19,7 +19,7 @@ const ActorInit Obj_Snowball2_InitVars = { (ActorFunc)ObjSnowball2_Init, (ActorFunc)ObjSnowball2_Destroy, (ActorFunc)ObjSnowball2_Update, - (ActorFunc)ObjSnowball2_Draw + (ActorFunc)ObjSnowball2_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c b/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c index 74d72cddf6..2e846f4234 100644 --- a/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c +++ b/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c @@ -18,7 +18,7 @@ const ActorInit Obj_Sound_InitVars = { (ActorFunc)ObjSound_Init, (ActorFunc)ObjSound_Destroy, (ActorFunc)ObjSound_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c index 214ae01cdb..4ea35e79f6 100644 --- a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c +++ b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c @@ -19,7 +19,7 @@ const ActorInit Obj_Spidertent_InitVars = { (ActorFunc)ObjSpidertent_Init, (ActorFunc)ObjSpidertent_Destroy, (ActorFunc)ObjSpidertent_Update, - (ActorFunc)ObjSpidertent_Draw + (ActorFunc)ObjSpidertent_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c index be73d24aa3..db31d92812 100644 --- a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c +++ b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c @@ -19,7 +19,7 @@ const ActorInit Obj_Spinyroll_InitVars = { (ActorFunc)ObjSpinyroll_Init, (ActorFunc)ObjSpinyroll_Destroy, (ActorFunc)ObjSpinyroll_Update, - (ActorFunc)ObjSpinyroll_Draw + (ActorFunc)ObjSpinyroll_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c index a8a10ad807..a3513d8070 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -19,7 +19,7 @@ const ActorInit Obj_Switch_InitVars = { (ActorFunc)ObjSwitch_Init, (ActorFunc)ObjSwitch_Destroy, (ActorFunc)ObjSwitch_Update, - (ActorFunc)ObjSwitch_Draw + (ActorFunc)ObjSwitch_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c index 2a6dc50f98..07cbf940fb 100644 --- a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c +++ b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c @@ -18,7 +18,7 @@ const ActorInit Obj_Swprize_InitVars = { (ActorFunc)ObjSwprize_Init, (ActorFunc)ObjSwprize_Destroy, (ActorFunc)ObjSwprize_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c index ffa9dac5de..b2a9740ba2 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -19,7 +19,7 @@ const ActorInit Obj_Syokudai_InitVars = { (ActorFunc)ObjSyokudai_Init, (ActorFunc)ObjSyokudai_Destroy, (ActorFunc)ObjSyokudai_Update, - (ActorFunc)ObjSyokudai_Draw + (ActorFunc)ObjSyokudai_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c index c5ed7ec24e..eaed27d77c 100644 --- a/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c +++ b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c @@ -19,7 +19,7 @@ const ActorInit Obj_Takaraya_Wall_InitVars = { (ActorFunc)ObjTakarayaWall_Init, (ActorFunc)ObjTakarayaWall_Destroy, (ActorFunc)ObjTakarayaWall_Update, - (ActorFunc)ObjTakarayaWall_Draw + (ActorFunc)ObjTakarayaWall_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c index c3e97805b3..0e27430d57 100644 --- a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c +++ b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c @@ -19,7 +19,7 @@ const ActorInit Obj_Taru_InitVars = { (ActorFunc)ObjTaru_Init, (ActorFunc)ObjTaru_Destroy, (ActorFunc)ObjTaru_Update, - (ActorFunc)ObjTaru_Draw + (ActorFunc)ObjTaru_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c index a04ef157dc..f3ff437bdb 100644 --- a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c +++ b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c @@ -19,7 +19,7 @@ const ActorInit Obj_Toge_InitVars = { (ActorFunc)ObjToge_Init, (ActorFunc)ObjToge_Destroy, (ActorFunc)ObjToge_Update, - (ActorFunc)ObjToge_Draw + (ActorFunc)ObjToge_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c index cff48a81a1..a2a423a170 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c @@ -19,7 +19,7 @@ const ActorInit Obj_Tokei_Step_InitVars = { (ActorFunc)ObjTokeiStep_Init, (ActorFunc)ObjTokeiStep_Destroy, (ActorFunc)ObjTokeiStep_Update, - (ActorFunc)ObjTokeiStep_Draw + (ActorFunc)ObjTokeiStep_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c index 8abd2d9094..6167b0b556 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c @@ -19,7 +19,7 @@ const ActorInit Obj_Tokei_Tobira_InitVars = { (ActorFunc)ObjTokeiTobira_Init, (ActorFunc)ObjTokeiTobira_Destroy, (ActorFunc)ObjTokeiTobira_Update, - (ActorFunc)ObjTokeiTobira_Draw + (ActorFunc)ObjTokeiTobira_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c index 6ce3bd0438..867ea587af 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c @@ -19,7 +19,7 @@ const ActorInit Obj_Tokei_Turret_InitVars = { (ActorFunc)ObjTokeiTurret_Init, (ActorFunc)ObjTokeiTurret_Destroy, (ActorFunc)ObjTokeiTurret_Update, - (ActorFunc)ObjTokeiTurret_Draw + (ActorFunc)ObjTokeiTurret_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c index 087d1f326f..197cc99f1a 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -19,7 +19,7 @@ const ActorInit Obj_Tokeidai_InitVars = { (ActorFunc)ObjTokeidai_Init, (ActorFunc)ObjTokeidai_Destroy, (ActorFunc)ObjTokeidai_Update, - (ActorFunc)ObjTokeidai_Draw + (ActorFunc)ObjTokeidai_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c b/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c index daffbf8639..1df3774daf 100644 --- a/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c +++ b/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c @@ -19,7 +19,7 @@ const ActorInit Obj_Toudai_InitVars = { (ActorFunc)ObjToudai_Init, (ActorFunc)ObjToudai_Destroy, (ActorFunc)ObjToudai_Update, - (ActorFunc)ObjToudai_Draw + (ActorFunc)ObjToudai_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c index 3f51a0419d..884f996fdb 100644 --- a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c +++ b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c @@ -19,7 +19,7 @@ const ActorInit Obj_Tree_InitVars = { (ActorFunc)ObjTree_Init, (ActorFunc)ObjTree_Destroy, (ActorFunc)ObjTree_Update, - (ActorFunc)ObjTree_Draw + (ActorFunc)ObjTree_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c index 094ef03ae5..100a74e8b3 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -18,7 +18,7 @@ const ActorInit Obj_Tsubo_InitVars = { (ActorFunc)ObjTsubo_Init, (ActorFunc)ObjTsubo_Destroy, (ActorFunc)ObjTsubo_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Obj_Um/z_obj_um.c b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c index 1c2bc2817b..e538d3b43e 100644 --- a/src/overlays/actors/ovl_Obj_Um/z_obj_um.c +++ b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c @@ -19,7 +19,7 @@ const ActorInit Obj_Um_InitVars = { (ActorFunc)ObjUm_Init, (ActorFunc)ObjUm_Destroy, (ActorFunc)ObjUm_Update, - (ActorFunc)ObjUm_Draw + (ActorFunc)ObjUm_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c index 6a2cab5ea2..e6837182c4 100644 --- a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c +++ b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c @@ -19,7 +19,7 @@ const ActorInit Obj_Usiyane_InitVars = { (ActorFunc)ObjUsiyane_Init, (ActorFunc)ObjUsiyane_Destroy, (ActorFunc)ObjUsiyane_Update, - (ActorFunc)ObjUsiyane_Draw + (ActorFunc)ObjUsiyane_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c index ecc9a166a7..b2fd09eece 100644 --- a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c +++ b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c @@ -17,7 +17,7 @@ const ActorInit Obj_Visiblock_InitVars = { (ActorFunc)ObjVisiblock_Init, (ActorFunc)ObjVisiblock_Destroy, (ActorFunc)func_800BDFB0, - (ActorFunc)ObjVisiblock_Draw + (ActorFunc)ObjVisiblock_Draw, }; static InitChainEntry D_80ADEB50[] = { diff --git a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c index 122b44d5c4..001688c4b5 100644 --- a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c +++ b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c @@ -19,7 +19,7 @@ const ActorInit Obj_Vspinyroll_InitVars = { (ActorFunc)ObjVspinyroll_Init, (ActorFunc)ObjVspinyroll_Destroy, (ActorFunc)ObjVspinyroll_Update, - (ActorFunc)ObjVspinyroll_Draw + (ActorFunc)ObjVspinyroll_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c index c1eec03409..88e2ebc656 100644 --- a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c +++ b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c @@ -19,7 +19,7 @@ const ActorInit Obj_Warpstone_InitVars = { (ActorFunc)ObjWarpstone_Init, (ActorFunc)ObjWarpstone_Destroy, (ActorFunc)ObjWarpstone_Update, - (ActorFunc)ObjWarpstone_Draw + (ActorFunc)ObjWarpstone_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c index 7a38242f6e..ac4c2c15da 100644 --- a/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c +++ b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c @@ -19,7 +19,7 @@ const ActorInit Obj_Wind_InitVars = { (ActorFunc)ObjWind_Init, (ActorFunc)ObjWind_Destroy, (ActorFunc)ObjWind_Update, - (ActorFunc)ObjWind_Draw + (ActorFunc)ObjWind_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c index 0faf035136..79f722c20d 100644 --- a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c +++ b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c @@ -17,7 +17,7 @@ const ActorInit Obj_Wturn_InitVars = { (ActorFunc)ObjWturn_Init, (ActorFunc)func_800BDFB0, (ActorFunc)ObjWturn_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c b/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c index fe51e93ae6..636cbee26e 100644 --- a/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c +++ b/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c @@ -19,7 +19,7 @@ const ActorInit Obj_Y2lift_InitVars = { (ActorFunc)ObjY2lift_Init, (ActorFunc)ObjY2lift_Destroy, (ActorFunc)ObjY2lift_Update, - (ActorFunc)ObjY2lift_Draw + (ActorFunc)ObjY2lift_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c index b1f2737c38..5d2355d179 100644 --- a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c +++ b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c @@ -19,7 +19,7 @@ const ActorInit Obj_Y2shutter_InitVars = { (ActorFunc)ObjY2shutter_Init, (ActorFunc)ObjY2shutter_Destroy, (ActorFunc)ObjY2shutter_Update, - (ActorFunc)ObjY2shutter_Draw + (ActorFunc)ObjY2shutter_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c index a99361da0a..c1ccbc541e 100644 --- a/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c +++ b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c @@ -19,7 +19,7 @@ const ActorInit Obj_Yado_InitVars = { (ActorFunc)ObjYado_Init, (ActorFunc)ObjYado_Destroy, (ActorFunc)ObjYado_Update, - (ActorFunc)ObjYado_Draw + (ActorFunc)ObjYado_Draw, }; */ diff --git a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c index 727de0f05a..526c7b7e80 100644 --- a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c +++ b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c @@ -19,7 +19,7 @@ const ActorInit Obj_Yasi_InitVars = { (ActorFunc)ObjYasi_Init, (ActorFunc)ObjYasi_Destroy, (ActorFunc)ObjYasi_Update, - (ActorFunc)ObjYasi_Draw + (ActorFunc)ObjYasi_Draw, }; */ diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c index 75f59b521c..130011d614 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -19,7 +19,7 @@ const ActorInit Object_Kankyo_InitVars = { (ActorFunc)ObjectKankyo_Init, (ActorFunc)ObjectKankyo_Destroy, (ActorFunc)ObjectKankyo_Update, - (ActorFunc)ObjectKankyo_Draw + (ActorFunc)ObjectKankyo_Draw, }; */ diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c index 97c3975746..4f1c247819 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -19,7 +19,7 @@ const ActorInit Oceff_Spot_InitVars = { (ActorFunc)OceffSpot_Init, (ActorFunc)OceffSpot_Destroy, (ActorFunc)OceffSpot_Update, - (ActorFunc)OceffSpot_Draw + (ActorFunc)OceffSpot_Draw, }; */ diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c index b6cbbe27ae..0204d8d7d0 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -19,7 +19,7 @@ const ActorInit Oceff_Storm_InitVars = { (ActorFunc)OceffStorm_Init, (ActorFunc)OceffStorm_Destroy, (ActorFunc)OceffStorm_Update, - (ActorFunc)OceffStorm_Draw + (ActorFunc)OceffStorm_Draw, }; */ diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c index 2453cdd00d..e7fa974542 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -19,7 +19,7 @@ const ActorInit Oceff_Wipe_InitVars = { (ActorFunc)OceffWipe_Init, (ActorFunc)OceffWipe_Destroy, (ActorFunc)OceffWipe_Update, - (ActorFunc)OceffWipe_Draw + (ActorFunc)OceffWipe_Draw, }; */ diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c index c0fc98b9cd..9bd00ff4b1 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -19,7 +19,7 @@ const ActorInit Oceff_Wipe2_InitVars = { (ActorFunc)OceffWipe2_Init, (ActorFunc)OceffWipe2_Destroy, (ActorFunc)OceffWipe2_Update, - (ActorFunc)OceffWipe2_Draw + (ActorFunc)OceffWipe2_Draw, }; */ diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c index 7169dfc7ae..2b051b4924 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -19,7 +19,7 @@ const ActorInit Oceff_Wipe3_InitVars = { (ActorFunc)OceffWipe3_Init, (ActorFunc)OceffWipe3_Destroy, (ActorFunc)OceffWipe3_Update, - (ActorFunc)OceffWipe3_Draw + (ActorFunc)OceffWipe3_Draw, }; */ diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c index 092b413ac1..7a392be389 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -19,7 +19,7 @@ const ActorInit Oceff_Wipe4_InitVars = { (ActorFunc)OceffWipe4_Init, (ActorFunc)OceffWipe4_Destroy, (ActorFunc)OceffWipe4_Update, - (ActorFunc)OceffWipe4_Draw + (ActorFunc)OceffWipe4_Draw, }; */ diff --git a/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c b/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c index 60ec5f2c91..deb3ac6db0 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c +++ b/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c @@ -19,7 +19,7 @@ const ActorInit Oceff_Wipe5_InitVars = { (ActorFunc)OceffWipe5_Init, (ActorFunc)OceffWipe5_Destroy, (ActorFunc)OceffWipe5_Update, - (ActorFunc)OceffWipe5_Draw + (ActorFunc)OceffWipe5_Draw, }; */ diff --git a/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c index 100fe309d5..95cfd3ed1b 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c +++ b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c @@ -19,7 +19,7 @@ const ActorInit Oceff_Wipe6_InitVars = { (ActorFunc)OceffWipe6_Init, (ActorFunc)OceffWipe6_Destroy, (ActorFunc)OceffWipe6_Update, - (ActorFunc)OceffWipe6_Draw + (ActorFunc)OceffWipe6_Draw, }; */ diff --git a/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c b/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c index 080bf4238a..f89c49a3a1 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c +++ b/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c @@ -19,7 +19,7 @@ const ActorInit Oceff_Wipe7_InitVars = { (ActorFunc)OceffWipe7_Init, (ActorFunc)OceffWipe7_Destroy, (ActorFunc)OceffWipe7_Update, - (ActorFunc)OceffWipe7_Draw + (ActorFunc)OceffWipe7_Draw, }; */ diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c index fb745a54bc..6792102b88 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -18,7 +18,7 @@ const ActorInit Shot_Sun_InitVars = { (ActorFunc)ShotSun_Init, (ActorFunc)ShotSun_Destroy, (ActorFunc)ShotSun_Update, - (ActorFunc)NULL + (ActorFunc)NULL, }; */ diff --git a/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c b/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c index 96f16dda8f..bddfc75f49 100644 --- a/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c +++ b/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c @@ -21,7 +21,7 @@ const ActorInit TG_Sw_InitVars = { (ActorFunc)TGSw_Init, (ActorFunc)TGSw_Destroy, (ActorFunc)TGSw_Update, - (ActorFunc)TGSw_Draw + (ActorFunc)TGSw_Draw, }; static void TGSw_ActionDecider(struct TGSw* this, GlobalContext* globalCtx) { @@ -34,8 +34,7 @@ static void TGSw_ActionDecider(struct TGSw* this, GlobalContext* globalCtx) { scaledAbsoluteRotY = ABS_ALT(this->actor.world.rot.y) * 4.0f; scaledAbsoluteRotZ = ABS_ALT(this->actor.world.rot.z) * 4.0f; - if (!(scaledAbsoluteRotZ < this->actor.xzDistToPlayer) && - !(scaledAbsoluteRotY < this->actor.yDistToPlayer)) { + if (!(scaledAbsoluteRotZ < this->actor.xzDistToPlayer) && !(scaledAbsoluteRotY < this->actor.yDistToPlayer)) { unk1F4 = globalCtx->actorCtx.unk1F4; if (unk1F4 == 2 || !unk1F4) { this->actionFunc = &TGSw_ActionExecuteOneShot; @@ -50,7 +49,8 @@ static void TGSw_ActionExecuteOneShot(struct TGSw* this, GlobalContext* globalCt actorIterator = NULL; do { - actorEntry = func_ActorCategoryIterateById(globalCtx, (struct Actor*)actorIterator, ACTORCAT_ENEMY, ACTOR_EN_SW); + actorEntry = + func_ActorCategoryIterateById(globalCtx, (struct Actor*)actorIterator, ACTORCAT_ENEMY, ACTOR_EN_SW); if (actorIterator = (void*)!actorEntry) { break; } @@ -107,18 +107,16 @@ void TGSw_Draw(Actor* thisx, GlobalContext* globalCtx) { absoluteRotZ = ABS_ALT(this->actor.world.rot.z); factoredRotZ = absoluteRotZ * 0.2f; // if needs to use the factored Rot as a var, "true" doesnt work - if (factoredRotZ) - { + if (factoredRotZ) { ; } absoluteRotY = ABS_ALT(this->actor.world.rot.y); - - DebugDisplay_AddObject(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, - 0, this->actor.shape.rot.y, 0, 0.1f, 0.1f, factoredRotZ, 0xA0, 0xA0, 0xA0, 0xFF, 6, - globalCtx->state.gfxCtx); - DebugDisplay_AddObject(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, - 0, 0, 0, 0.1f, absoluteRotY * 0.2f, 0.1f, 0xA0, 0xA0, 0xA0, 0xFF, 6, + + DebugDisplay_AddObject(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, + this->actor.shape.rot.y, 0, 0.1f, 0.1f, factoredRotZ, 0xA0, 0xA0, 0xA0, 0xFF, 6, globalCtx->state.gfxCtx); + DebugDisplay_AddObject(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0.1f, + absoluteRotY * 0.2f, 0.1f, 0xA0, 0xA0, 0xA0, 0xFF, 6, globalCtx->state.gfxCtx); this->actor.shape.rot.y = (s16)(this->actor.shape.rot.y + 0x1000); } }