diff --git a/.clang-format b/.clang-format
index 24779e11c..6618450ed 100644
--- a/.clang-format
+++ b/.clang-format
@@ -53,7 +53,7 @@ BreakConstructorInitializersBeforeComma: false
 BreakConstructorInitializers: BeforeComma
 BreakAfterJavaFieldAnnotations: false
 BreakStringLiterals: true
-ColumnLimit:     89
+ColumnLimit:     140
 CommentPragmas:  '^ IWYU pragma:'
 CompactNamespaces: false
 ConstructorInitializerIndentWidth: 4
diff --git a/chao_garden/include/global.h b/chao_garden/include/global.h
index 0d31a648f..bdded76cd 100644
--- a/chao_garden/include/global.h
+++ b/chao_garden/include/global.h
@@ -16,7 +16,7 @@
 #if NON_MATCHING
 #define ASM_FUNC(path, decl)
 #else
-#define ASM_FUNC(path, decl)                                                            \
+#define ASM_FUNC(path, decl)                                                                                                               \
     NAKED decl { asm(".include " #path); }
 #endif
 
@@ -24,10 +24,10 @@
 #define NONMATCH(path, decl) decl
 #define END_NONMATCH
 #else
-#define NONMATCH(path, decl)                                                            \
-    NAKED decl                                                                          \
-    {                                                                                   \
-        asm(".include " #path);                                                         \
+#define NONMATCH(path, decl)                                                                                                               \
+    NAKED decl                                                                                                                             \
+    {                                                                                                                                      \
+        asm(".include " #path);                                                                                                            \
         if (0)
 #define END_NONMATCH }
 #endif
@@ -37,9 +37,9 @@
 // We define these when using certain IDEs to fool preproc
 #define _(x)  (x)
 #define __(x) (x)
-#define INCBIN(...)                                                                     \
-    {                                                                                   \
-        0                                                                               \
+#define INCBIN(...)                                                                                                                        \
+    {                                                                                                                                      \
+        0                                                                                                                                  \
     }
 #define INCBIN_U8  INCBIN
 #define INCBIN_U16 INCBIN
diff --git a/chao_garden/src/agb_flash.c b/chao_garden/src/agb_flash.c
index c9efb2ca6..78c903a09 100644
--- a/chao_garden/src/agb_flash.c
+++ b/chao_garden/src/agb_flash.c
@@ -27,11 +27,11 @@ void SwitchFlashBank(u8 bankNum)
     FLASH_WRITE(0x0000, bankNum);
 }
 
-#define DELAY()                                                                         \
-    do {                                                                                \
-        vu16 i;                                                                         \
-        for (i = 20000; i != 0; i--)                                                    \
-            ;                                                                           \
+#define DELAY()                                                                                                                            \
+    do {                                                                                                                                   \
+        vu16 i;                                                                                                                            \
+        for (i = 20000; i != 0; i--)                                                                                                       \
+            ;                                                                                                                              \
     } while (0)
 
 u16 ReadFlashId(void)
@@ -202,8 +202,7 @@ u32 VerifyFlashSector(u16 sectorNum, u8 *src)
         i--;
     }
 
-    verifyFlashSector_Core
-        = (u32(*)(u8 *, u8 *, u32))((s32)verifyFlashSector_Core_Buffer + 1);
+    verifyFlashSector_Core = (u32(*)(u8 *, u8 *, u32))((s32)verifyFlashSector_Core_Buffer + 1);
 
     tgt = FLASH_BASE + (sectorNum << gFlash->sector.shift);
     size = gFlash->sector.size;
@@ -238,8 +237,7 @@ u32 VerifyFlashSectorNBytes(u16 sectorNum, u8 *src, u32 n)
         i--;
     }
 
-    verifyFlashSector_Core
-        = (u32(*)(u8 *, u8 *, u32))((s32)verifyFlashSector_Core_Buffer + 1);
+    verifyFlashSector_Core = (u32(*)(u8 *, u8 *, u32))((s32)verifyFlashSector_Core_Buffer + 1);
 
     tgt = FLASH_BASE + (sectorNum << gFlash->sector.shift);
 
diff --git a/chao_garden/src/agb_flash_le_512k.c b/chao_garden/src/agb_flash_le_512k.c
index ae9b2c48a..f64a41cd1 100644
--- a/chao_garden/src/agb_flash_le_512k.c
+++ b/chao_garden/src/agb_flash_le_512k.c
@@ -2,10 +2,10 @@
 #include "gba/flash_internal.h"
 
 const u16 le512kMaxTime[] = {
-    10,  65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK,
-    10,  65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK,
-    40,  65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK,
-    200, 65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK,
+    10,  65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK, //
+    10,  65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK, //
+    40,  65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK, //
+    200, 65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK, //
 };
 
 const struct FlashSetupInfo DefaultFlash512K = {
@@ -144,8 +144,7 @@ u16 ProgramFlashSector_LE(u16 sectorNum, void *src)
 
     tryNum = 0;
     while ((result = EraseFlashSector_LE(sectorNum))
-           || (result = VerifyEraseSector(
-                   dest, (u8 *)((s32)&VerifyEraseSector_Core_Buffer + 1)))) {
+           || (result = VerifyEraseSector(dest, (u8 *)((s32)&VerifyEraseSector_Core_Buffer + 1)))) {
         tryNum++;
         if (tryNum == 0x51) {
             return result;
diff --git a/chao_garden/src/agb_flash_mx_512k.c b/chao_garden/src/agb_flash_mx_512k.c
index bcdc54f1a..48993d1b7 100644
--- a/chao_garden/src/agb_flash_mx_512k.c
+++ b/chao_garden/src/agb_flash_mx_512k.c
@@ -2,17 +2,17 @@
 #include "gba/flash_internal.h"
 
 const u16 mx512kMaxTime[] = {
-    10,   65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK,
-    10,   65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK,
-    2000, 65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK,
-    2000, 65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK,
+    10,   65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK, //
+    10,   65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK, //
+    2000, 65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK, //
+    2000, 65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK, //
 };
 
 const u16 paMaxTime[] = {
-    10,  65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK,
-    10,  65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK,
-    500, 65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK,
-    500, 65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK,
+    10,  65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK, //
+    10,  65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK, //
+    500, 65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK, //
+    500, 65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK, //
 };
 
 const struct FlashSetupInfo MX29L512 = {
diff --git a/chao_garden/src/m4a.c b/chao_garden/src/m4a.c
index 811f02523..1c16cc200 100644
--- a/chao_garden/src/m4a.c
+++ b/chao_garden/src/m4a.c
@@ -48,8 +48,7 @@ void m4aSoundInit(void)
 {
     s32 i;
 
-    CpuCopy32((void *)((s32)SoundMainRAM & ~1), SoundMainRAM_Buffer,
-              sizeof(SoundMainRAM_Buffer));
+    CpuCopy32((void *)((s32)SoundMainRAM & ~1), SoundMainRAM_Buffer, sizeof(SoundMainRAM_Buffer));
     SoundInit(&gSoundInfo);
     MPlayExtender(gCgbChans);
     m4aSoundMode(DEFAULT_SOUND_MODE);
@@ -84,8 +83,7 @@ void m4aSongNumStartOrChange(u16 n)
     if (mplay->info->songHeader != song->header) {
         MPlayStart(mplay->info, song->header);
     } else {
-        if ((mplay->info->status & MUSICPLAYER_STATUS_TRACK) == 0
-            || (mplay->info->status & MUSICPLAYER_STATUS_PAUSE)) {
+        if ((mplay->info->status & MUSICPLAYER_STATUS_TRACK) == 0 || (mplay->info->status & MUSICPLAYER_STATUS_PAUSE)) {
             MPlayStart(mplay->info, song->header);
         }
     }
@@ -146,10 +144,7 @@ void m4aMPlayAllContinue(void)
         MPlayContinue(gMPlayTable[i].info);
 }
 
-void m4aMPlayFadeOut(struct MusicPlayerInfo *mplayInfo, u16 speed)
-{
-    MPlayFadeOut(mplayInfo, speed);
-}
+void m4aMPlayFadeOut(struct MusicPlayerInfo *mplayInfo, u16 speed) { MPlayFadeOut(mplayInfo, speed); }
 
 void m4aMPlayFadeOutTemporarily(struct MusicPlayerInfo *mplayInfo, u16 speed)
 {
@@ -201,8 +196,7 @@ void MPlayExtender(struct CgbChannel *cgbChans)
     struct SoundInfo *soundInfo;
     u32 ident;
 
-    REG_SOUNDCNT_X
-        = SOUND_MASTER_ENABLE | SOUND_4_ON | SOUND_3_ON | SOUND_2_ON | SOUND_1_ON;
+    REG_SOUNDCNT_X = SOUND_MASTER_ENABLE | SOUND_4_ON | SOUND_3_ON | SOUND_2_ON | SOUND_1_ON;
     REG_SOUNDCNT_L = 0; // set master volume to zero
     REG_NR12 = 0x8;
     REG_NR22 = 0x8;
@@ -261,22 +255,14 @@ void SoundInit(struct SoundInfo *soundInfo)
 {
     soundInfo->ident = 0;
     if (REG_DMA1CNT & (DMA_REPEAT << 16))
-        REG_DMA1CNT
-            = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED)
-               << 16)
-            | 4;
+        REG_DMA1CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4;
     if (REG_DMA2CNT & (DMA_REPEAT << 16))
-        REG_DMA2CNT
-            = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED)
-               << 16)
-            | 4;
+        REG_DMA2CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4;
     REG_DMA1CNT_H = DMA_32BIT;
     REG_DMA2CNT_H = DMA_32BIT;
-    REG_SOUNDCNT_X
-        = SOUND_MASTER_ENABLE | SOUND_4_ON | SOUND_3_ON | SOUND_2_ON | SOUND_1_ON;
-    REG_SOUNDCNT_H = SOUND_B_FIFO_RESET | SOUND_B_TIMER_0 | SOUND_B_LEFT_OUTPUT
-        | SOUND_A_FIFO_RESET | SOUND_A_TIMER_0 | SOUND_A_RIGHT_OUTPUT
-        | SOUND_ALL_MIX_FULL;
+    REG_SOUNDCNT_X = SOUND_MASTER_ENABLE | SOUND_4_ON | SOUND_3_ON | SOUND_2_ON | SOUND_1_ON;
+    REG_SOUNDCNT_H = SOUND_B_FIFO_RESET | SOUND_B_TIMER_0 | SOUND_B_LEFT_OUTPUT | SOUND_A_FIFO_RESET | SOUND_A_TIMER_0
+        | SOUND_A_RIGHT_OUTPUT | SOUND_ALL_MIX_FULL;
     REG_SOUNDBIAS_H = (REG_SOUNDBIAS_H & 0x3F) | 0x40;
     REG_DMA1SAD = (s32)soundInfo->pcmBuffer;
     REG_DMA1DAD = (s32)&REG_FIFO_A;
@@ -397,15 +383,9 @@ void m4aSoundVSyncOff(void)
     if (soundInfo->ident >= ID_NUMBER && soundInfo->ident <= ID_NUMBER + 1) {
         soundInfo->ident += 10;
         if (REG_DMA1CNT & (DMA_REPEAT << 16))
-            REG_DMA1CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC
-                            | DMA_DEST_FIXED)
-                           << 16)
-                | 4;
+            REG_DMA1CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4;
         if (REG_DMA2CNT & (DMA_REPEAT << 16))
-            REG_DMA2CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC
-                            | DMA_DEST_FIXED)
-                           << 16)
-                | 4;
+            REG_DMA2CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4;
         REG_DMA1CNT_H = DMA_32BIT;
         REG_DMA2CNT_H = DMA_32BIT;
         CpuFill32(0, soundInfo->pcmBuffer, sizeof(soundInfo->pcmBuffer));
@@ -425,8 +405,7 @@ void m4aSoundVSyncOn(void)
     soundInfo->ident = ident - 10;
 }
 
-void MPlayOpen(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *tracks,
-               u8 trackCount)
+void MPlayOpen(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *tracks, u8 trackCount)
 {
     struct SoundInfo *soundInfo;
 
@@ -469,8 +448,7 @@ void MPlayStart(struct MusicPlayerInfo *mplayInfo, struct SongHeader *songHeader
     unk_B = mplayInfo->unk_B;
     if (!unk_B
         || ((!mplayInfo->songHeader || !(mplayInfo->tracks[0].flags & MPT_FLG_START))
-            && ((mplayInfo->status & MUSICPLAYER_STATUS_TRACK) == 0
-                || (mplayInfo->status & MUSICPLAYER_STATUS_PAUSE)))
+            && ((mplayInfo->status & MUSICPLAYER_STATUS_TRACK) == 0 || (mplayInfo->status & MUSICPLAYER_STATUS_PAUSE)))
         || (mplayInfo->priority <= songHeader->priority)) {
         ++mplayInfo->ident;
         mplayInfo->status = 0;
@@ -542,8 +520,7 @@ void FadeOutBody(struct MusicPlayerInfo *mplayInfo)
     mplayInfo->fadeOC = mplayInfo->fadeOI;
 
     if (mplayInfo->fadeOV & FADE_IN) {
-        if ((u16)(mplayInfo->fadeOV += (4 << FADE_VOL_SHIFT))
-            >= (64 << FADE_VOL_SHIFT)) {
+        if ((u16)(mplayInfo->fadeOV += (4 << FADE_VOL_SHIFT)) >= (64 << FADE_VOL_SHIFT)) {
             mplayInfo->fadeOV = (64 << FADE_VOL_SHIFT);
             mplayInfo->fadeOI = 0;
         }
@@ -614,8 +591,7 @@ void TrkVolPitSet(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *tr
     }
     if (track->flags & MPT_FLG_PITSET) {
         s32 bend = track->bend * track->bendRange;
-        s32 x = (track->tune + bend) * 4 + (track->keyShift << 8)
-            + (track->keyShiftX << 8) + track->pitX;
+        s32 x = (track->tune + bend) * 4 + (track->keyShift << 8) + (track->keyShiftX << 8) + track->pitX;
 
         if (track->modT == 0)
             x += 16 * track->modM;
@@ -845,8 +821,7 @@ void CgbSound(void)
                     --channels->ev;
                     if ((s8)(channels->ev & mask) <= 0) {
                     loc_82E0F02:
-                        channels->ev
-                            = ((channels->eg * channels->echoVolume) + 0xFF) >> 8;
+                        channels->ev = ((channels->eg * channels->echoVolume) + 0xFF) >> 8;
                         if (channels->ev) {
                             channels->sf |= 0x4;
                             channels->mo |= 1;
@@ -1107,10 +1082,10 @@ void m4aMPlayLFOSpeedSet(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u8 lf
     mplayInfo->ident = ID_NUMBER;
 }
 
-#define MEMACC_COND_JUMP(cond)                                                          \
-    if (cond)                                                                           \
-        goto cond_true;                                                                 \
-    else                                                                                \
+#define MEMACC_COND_JUMP(cond)                                                                                                             \
+    if (cond)                                                                                                                              \
+        goto cond_true;                                                                                                                    \
+    else                                                                                                                                   \
         goto cond_false;
 
 void ply_memacc(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
@@ -1184,8 +1159,7 @@ void ply_memacc(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *trac
             return;
     }
 cond_true : {
-    void (*func)(struct MusicPlayerInfo *, struct MusicPlayerTrack *)
-        = *(&gMPlayJumpTable[1]);
+    void (*func)(struct MusicPlayerInfo *, struct MusicPlayerTrack *) = *(&gMPlayJumpTable[1]);
     func(mplayInfo, track);
     return;
 }
@@ -1203,18 +1177,17 @@ void ply_xcmd(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
 
 void ply_xxx(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
 {
-    void (*func)(struct MusicPlayerInfo *, struct MusicPlayerTrack *)
-        = *(&gMPlayJumpTable[0]);
+    void (*func)(struct MusicPlayerInfo *, struct MusicPlayerTrack *) = *(&gMPlayJumpTable[0]);
 
     func(mplayInfo, track);
 }
 
-#define READ_XCMD_BYTE(var, n)                                                          \
-    {                                                                                   \
-        u32 byte = track->cmdPtr[(n)];                                                  \
-        byte <<= n * 8;                                                                 \
-        (var) &= ~(0xFF << (n * 8));                                                    \
-        (var) |= byte;                                                                  \
+#define READ_XCMD_BYTE(var, n)                                                                                                             \
+    {                                                                                                                                      \
+        u32 byte = track->cmdPtr[(n)];                                                                                                     \
+        byte <<= n * 8;                                                                                                                    \
+        (var) &= ~(0xFF << (n * 8));                                                                                                       \
+        (var) |= byte;                                                                                                                     \
     }
 
 void ply_xwave(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
diff --git a/chao_garden/src/m4a_tables.c b/chao_garden/src/m4a_tables.c
index 4776611b4..6448f8c0e 100644
--- a/chao_garden/src/m4a_tables.c
+++ b/chao_garden/src/m4a_tables.c
@@ -4,28 +4,22 @@
 // make this an array of void pointers or a struct. It's simpler to
 // just make it an array for now.
 void *const gMPlayJumpTableTemplate[] = {
-    ply_fine,      ply_goto,  ply_patt,    ply_pend,     ply_rept,       ply_fine,
-    ply_fine,      ply_fine,  ply_fine,    ply_prio,     ply_tempo,      ply_keysh,
-    ply_voice,     ply_vol,   ply_pan,     ply_bend,     ply_bendr,      ply_lfos,
-    ply_lfodl,     ply_mod,   ply_modt,    ply_fine,     ply_fine,       ply_tune,
-    ply_fine,      ply_fine,  ply_fine,    ply_port,     ply_fine,       ply_endtie,
-    SampleFreqSet, TrackStop, FadeOutBody, TrkVolPitSet, RealClearChain, SoundMainBTM,
+    ply_fine,  ply_goto,  ply_patt,   ply_pend,      ply_rept,  ply_fine,    ply_fine,     ply_fine,       ply_fine,
+    ply_prio,  ply_tempo, ply_keysh,  ply_voice,     ply_vol,   ply_pan,     ply_bend,     ply_bendr,      ply_lfos,
+    ply_lfodl, ply_mod,   ply_modt,   ply_fine,      ply_fine,  ply_tune,    ply_fine,     ply_fine,       ply_fine,
+    ply_port,  ply_fine,  ply_endtie, SampleFreqSet, TrackStop, FadeOutBody, TrkVolPitSet, RealClearChain, SoundMainBTM,
 };
 
 const u8 gScaleTable[] = {
-    0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xD0, 0xD1,
-    0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xC0, 0xC1, 0xC2, 0xC3,
-    0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5,
-    0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7,
-    0xA8, 0xA9, 0xAA, 0xAB, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
-    0x9A, 0x9B, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B,
-    0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x60, 0x61,
-    0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x50, 0x51, 0x52, 0x53,
-    0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45,
-    0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
-    0x38, 0x39, 0x3A, 0x3B, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29,
-    0x2A, 0x2B, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B,
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B,
+    0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7,
+    0xD8, 0xD9, 0xDA, 0xDB, 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xB0, 0xB1, 0xB2, 0xB3,
+    0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB,
+    0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+    0x88, 0x89, 0x8A, 0x8B, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x60, 0x61, 0x62, 0x63,
+    0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B,
+    0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+    0x38, 0x39, 0x3A, 0x3B, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x10, 0x11, 0x12, 0x13,
+    0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B,
 };
 
 const u32 gFreqTable[] = {
@@ -38,16 +32,12 @@ const u16 gPcmSamplesPerVBlankTable[] = {
 };
 
 const u8 gCgbScaleTable[] = {
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x10, 0x11,
-    0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x20, 0x21, 0x22, 0x23,
-    0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35,
-    0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
-    0x48, 0x49, 0x4A, 0x4B, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
-    0x5A, 0x5B, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B,
-    0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x80, 0x81,
-    0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x90, 0x91, 0x92, 0x93,
-    0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5,
-    0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB,
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19,
+    0x1A, 0x1B, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+    0x38, 0x39, 0x3A, 0x3B, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55,
+    0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x70, 0x71, 0x72, 0x73,
+    0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x90, 0x91,
+    0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB,
 };
 
 const s16 gCgbFreqTable[] = {
@@ -55,26 +45,21 @@ const s16 gCgbFreqTable[] = {
 };
 
 const u8 gNoiseTable[] = {
-    0xD7, 0xD6, 0xD5, 0xD4, 0xC7, 0xC6, 0xC5, 0xC4, 0xB7, 0xB6, 0xB5, 0xB4,
-    0xA7, 0xA6, 0xA5, 0xA4, 0x97, 0x96, 0x95, 0x94, 0x87, 0x86, 0x85, 0x84,
-    0x77, 0x76, 0x75, 0x74, 0x67, 0x66, 0x65, 0x64, 0x57, 0x56, 0x55, 0x54,
-    0x47, 0x46, 0x45, 0x44, 0x37, 0x36, 0x35, 0x34, 0x27, 0x26, 0x25, 0x24,
-    0x17, 0x16, 0x15, 0x14, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
+    0xD7, 0xD6, 0xD5, 0xD4, 0xC7, 0xC6, 0xC5, 0xC4, 0xB7, 0xB6, 0xB5, 0xB4, 0xA7, 0xA6, 0xA5, 0xA4, 0x97, 0x96, 0x95, 0x94,
+    0x87, 0x86, 0x85, 0x84, 0x77, 0x76, 0x75, 0x74, 0x67, 0x66, 0x65, 0x64, 0x57, 0x56, 0x55, 0x54, 0x47, 0x46, 0x45, 0x44,
+    0x37, 0x36, 0x35, 0x34, 0x27, 0x26, 0x25, 0x24, 0x17, 0x16, 0x15, 0x14, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
 };
 
 const u8 gCgb3Vol[] = {
-    0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x40, 0x40,
-    0x40, 0x40, 0x80, 0x80, 0x80, 0x80, 0x20, 0x20,
+    0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80, 0x20, 0x20,
 };
 
 const u8 gClockTable[] = {
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C,
-    0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x1C,
-    0x1E, 0x20, 0x24, 0x28, 0x2A, 0x2C, 0x30, 0x34, 0x36, 0x38, 0x3C, 0x40, 0x42,
-    0x44, 0x48, 0x4C, 0x4E, 0x50, 0x54, 0x58, 0x5A, 0x5C, 0x60,
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10,
+    0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x1C, 0x1E, 0x20, 0x24, 0x28, 0x2A, 0x2C, 0x30, 0x34,
+    0x36, 0x38, 0x3C, 0x40, 0x42, 0x44, 0x48, 0x4C, 0x4E, 0x50, 0x54, 0x58, 0x5A, 0x5C, 0x60,
 };
 
 const XcmdFunc gXcmdTable[] = {
-    ply_xxx,   ply_xwave, ply_xtype, ply_xxx,   ply_xatta, ply_xdeca,
-    ply_xsust, ply_xrele, ply_xiecv, ply_xiecl, ply_xleng, ply_xswee,
+    ply_xxx, ply_xwave, ply_xtype, ply_xxx, ply_xatta, ply_xdeca, ply_xsust, ply_xrele, ply_xiecv, ply_xiecl, ply_xleng, ply_xswee,
 };
diff --git a/data/maps/zone_1/act_1/tilemaps/bg/header.c b/data/maps/zone_1/act_1/tilemaps/bg/header.c
index fc3f30675..7fae62e34 100644
--- a/data/maps/zone_1/act_1/tilemaps/bg/header.c
+++ b/data/maps/zone_1/act_1/tilemaps/bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_1_act_1_bg[]
-    = INCBIN_U16("data/maps/zone_1/act_1/tilemaps/bg/palette.gbapal");
-const u8 Tiles_zone_1_act_1_bg[]
-    = INCBIN_U8("data/maps/zone_1/act_1/tilemaps/bg/tiles.4bpp");
-const u16 Tilemap_zone_1_act_1_bg[]
-    = INCBIN_U16("data/maps/zone_1/act_1/tilemaps/bg/tilemap.tilemap2");
+const u16 Palette_zone_1_act_1_bg[] = INCBIN_U16("data/maps/zone_1/act_1/tilemaps/bg/palette.gbapal");
+const u8 Tiles_zone_1_act_1_bg[] = INCBIN_U8("data/maps/zone_1/act_1/tilemaps/bg/tiles.4bpp");
+const u16 Tilemap_zone_1_act_1_bg[] = INCBIN_U16("data/maps/zone_1/act_1/tilemaps/bg/tilemap.tilemap2");
 
 const Tilemap zone_1_act_1_bg = {
     .xTiles = 32,
diff --git a/data/maps/zone_1/act_1/tilemaps/fg/header.c b/data/maps/zone_1/act_1/tilemaps/fg/header.c
index d2629668c..8a00ae8c8 100644
--- a/data/maps/zone_1/act_1/tilemaps/fg/header.c
+++ b/data/maps/zone_1/act_1/tilemaps/fg/header.c
@@ -1,24 +1,16 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_1_act_1_fg[]
-    = INCBIN_U16("data/maps/zone_1/act_1/tilemaps/fg/palette.gbapal");
-const u8 Tileset_zone_1_act_1_fg[]
-    = INCBIN_U8("data/maps/zone_1/act_1/tilemaps/fg/tileset.4bpp");
-const s8 CollHeightMap_zone_1_act_1_fg[]
-    = INCBIN_U8("data/maps/zone_1/act_1/tilemaps/fg/height_map.coll");
-const u8 CollTileRot_zone_1_act_1_fg[]
-    = INCBIN_U8("data/maps/zone_1/act_1/tilemaps/fg/tile_rot.coll");
-const u16 CollFlags_zone_1_act_1_fg[]
-    = INCBIN_U16("data/maps/zone_1/act_1/tilemaps/fg/flags.coll");
-const u16 Metatiles_zone_1_act_1_fg[]
-    = INCBIN_U16("data/maps/zone_1/act_1/tilemaps/fg/metatiles.tilemap2");
+const u16 Palette_zone_1_act_1_fg[] = INCBIN_U16("data/maps/zone_1/act_1/tilemaps/fg/palette.gbapal");
+const u8 Tileset_zone_1_act_1_fg[] = INCBIN_U8("data/maps/zone_1/act_1/tilemaps/fg/tileset.4bpp");
+const s8 CollHeightMap_zone_1_act_1_fg[] = INCBIN_U8("data/maps/zone_1/act_1/tilemaps/fg/height_map.coll");
+const u8 CollTileRot_zone_1_act_1_fg[] = INCBIN_U8("data/maps/zone_1/act_1/tilemaps/fg/tile_rot.coll");
+const u16 CollFlags_zone_1_act_1_fg[] = INCBIN_U16("data/maps/zone_1/act_1/tilemaps/fg/flags.coll");
+const u16 Metatiles_zone_1_act_1_fg[] = INCBIN_U16("data/maps/zone_1/act_1/tilemaps/fg/metatiles.tilemap2");
 
-const u16 Map_zone_1_act_1_fg0[]
-    = INCBIN_U16("data/maps/zone_1/act_1/tilemaps/fg/map_front.bin");
+const u16 Map_zone_1_act_1_fg0[] = INCBIN_U16("data/maps/zone_1/act_1/tilemaps/fg/map_front.bin");
 
-const u16 Map_zone_1_act_1_fg1[]
-    = INCBIN_U16("data/maps/zone_1/act_1/tilemaps/fg/map_back.bin");
+const u16 Map_zone_1_act_1_fg1[] = INCBIN_U16("data/maps/zone_1/act_1/tilemaps/fg/map_back.bin");
 
 ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_1_fg0 = 
 {
diff --git a/data/maps/zone_1/act_2/tilemaps/bg/header.c b/data/maps/zone_1/act_2/tilemaps/bg/header.c
index b21d2704c..01e7aff65 100644
--- a/data/maps/zone_1/act_2/tilemaps/bg/header.c
+++ b/data/maps/zone_1/act_2/tilemaps/bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_1_act_2_bg[]
-    = INCBIN_U16("data/maps/zone_1/act_2/tilemaps/bg/palette.gbapal");
-const u8 Tiles_zone_1_act_2_bg[]
-    = INCBIN_U8("data/maps/zone_1/act_2/tilemaps/bg/tiles.4bpp");
-const u16 Tilemap_zone_1_act_2_bg[]
-    = INCBIN_U16("data/maps/zone_1/act_2/tilemaps/bg/tilemap.tilemap2");
+const u16 Palette_zone_1_act_2_bg[] = INCBIN_U16("data/maps/zone_1/act_2/tilemaps/bg/palette.gbapal");
+const u8 Tiles_zone_1_act_2_bg[] = INCBIN_U8("data/maps/zone_1/act_2/tilemaps/bg/tiles.4bpp");
+const u16 Tilemap_zone_1_act_2_bg[] = INCBIN_U16("data/maps/zone_1/act_2/tilemaps/bg/tilemap.tilemap2");
 
 const Tilemap zone_1_act_2_bg = {
     .xTiles = 32,
diff --git a/data/maps/zone_1/act_2/tilemaps/fg/header.c b/data/maps/zone_1/act_2/tilemaps/fg/header.c
index 95b7339bd..297b82739 100644
--- a/data/maps/zone_1/act_2/tilemaps/fg/header.c
+++ b/data/maps/zone_1/act_2/tilemaps/fg/header.c
@@ -1,24 +1,16 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_1_act_2_fg[]
-    = INCBIN_U16("data/maps/zone_1/act_2/tilemaps/fg/palette.gbapal");
-const u8 Tileset_zone_1_act_2_fg[]
-    = INCBIN_U8("data/maps/zone_1/act_2/tilemaps/fg/tileset.4bpp");
-const s8 CollHeightMap_zone_1_act_2_fg[]
-    = INCBIN_U8("data/maps/zone_1/act_2/tilemaps/fg/height_map.coll");
-const u8 CollTileRot_zone_1_act_2_fg[]
-    = INCBIN_U8("data/maps/zone_1/act_2/tilemaps/fg/tile_rot.coll");
-const u16 CollFlags_zone_1_act_2_fg[]
-    = INCBIN_U16("data/maps/zone_1/act_2/tilemaps/fg/flags.coll");
-const u16 Metatiles_zone_1_act_2_fg[]
-    = INCBIN_U16("data/maps/zone_1/act_2/tilemaps/fg/metatiles.tilemap2");
+const u16 Palette_zone_1_act_2_fg[] = INCBIN_U16("data/maps/zone_1/act_2/tilemaps/fg/palette.gbapal");
+const u8 Tileset_zone_1_act_2_fg[] = INCBIN_U8("data/maps/zone_1/act_2/tilemaps/fg/tileset.4bpp");
+const s8 CollHeightMap_zone_1_act_2_fg[] = INCBIN_U8("data/maps/zone_1/act_2/tilemaps/fg/height_map.coll");
+const u8 CollTileRot_zone_1_act_2_fg[] = INCBIN_U8("data/maps/zone_1/act_2/tilemaps/fg/tile_rot.coll");
+const u16 CollFlags_zone_1_act_2_fg[] = INCBIN_U16("data/maps/zone_1/act_2/tilemaps/fg/flags.coll");
+const u16 Metatiles_zone_1_act_2_fg[] = INCBIN_U16("data/maps/zone_1/act_2/tilemaps/fg/metatiles.tilemap2");
 
-const u16 Map_zone_1_act_2_fg0[]
-    = INCBIN_U16("data/maps/zone_1/act_2/tilemaps/fg/map_front.bin");
+const u16 Map_zone_1_act_2_fg0[] = INCBIN_U16("data/maps/zone_1/act_2/tilemaps/fg/map_front.bin");
 
-const u16 Map_zone_1_act_2_fg1[]
-    = INCBIN_U16("data/maps/zone_1/act_2/tilemaps/fg/map_back.bin");
+const u16 Map_zone_1_act_2_fg1[] = INCBIN_U16("data/maps/zone_1/act_2/tilemaps/fg/map_back.bin");
 
 ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_2_fg0 = 
 {
diff --git a/data/maps/zone_1/act_boss/tilemaps/bg/header.c b/data/maps/zone_1/act_boss/tilemaps/bg/header.c
index 379397eb4..af2c255cc 100644
--- a/data/maps/zone_1/act_boss/tilemaps/bg/header.c
+++ b/data/maps/zone_1/act_boss/tilemaps/bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_1_act_boss_bg[]
-    = INCBIN_U16("data/maps/zone_1/act_boss/tilemaps/bg/palette.gbapal");
-const u8 Tiles_zone_1_act_boss_bg[]
-    = INCBIN_U8("data/maps/zone_1/act_boss/tilemaps/bg/tiles.4bpp");
-const u16 Tilemap_zone_1_act_boss_bg[]
-    = INCBIN_U16("data/maps/zone_1/act_boss/tilemaps/bg/tilemap.tilemap2");
+const u16 Palette_zone_1_act_boss_bg[] = INCBIN_U16("data/maps/zone_1/act_boss/tilemaps/bg/palette.gbapal");
+const u8 Tiles_zone_1_act_boss_bg[] = INCBIN_U8("data/maps/zone_1/act_boss/tilemaps/bg/tiles.4bpp");
+const u16 Tilemap_zone_1_act_boss_bg[] = INCBIN_U16("data/maps/zone_1/act_boss/tilemaps/bg/tilemap.tilemap2");
 
 const Tilemap zone_1_act_boss_bg = {
     .xTiles = 32,
diff --git a/data/maps/zone_1/act_boss/tilemaps/fg/header.c b/data/maps/zone_1/act_boss/tilemaps/fg/header.c
index 7887d884b..81465a25d 100644
--- a/data/maps/zone_1/act_boss/tilemaps/fg/header.c
+++ b/data/maps/zone_1/act_boss/tilemaps/fg/header.c
@@ -1,24 +1,16 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_1_act_boss_fg[]
-    = INCBIN_U16("data/maps/zone_1/act_boss/tilemaps/fg/palette.gbapal");
-const u8 Tileset_zone_1_act_boss_fg[]
-    = INCBIN_U8("data/maps/zone_1/act_boss/tilemaps/fg/tileset.4bpp");
-const s8 CollHeightMap_zone_1_act_boss_fg[]
-    = INCBIN_U8("data/maps/zone_1/act_boss/tilemaps/fg/height_map.coll");
-const u8 CollTileRot_zone_1_act_boss_fg[]
-    = INCBIN_U8("data/maps/zone_1/act_boss/tilemaps/fg/tile_rot.coll");
-const u16 CollFlags_zone_1_act_boss_fg[]
-    = INCBIN_U16("data/maps/zone_1/act_boss/tilemaps/fg/flags.coll");
-const u16 Metatiles_zone_1_act_boss_fg[]
-    = INCBIN_U16("data/maps/zone_1/act_boss/tilemaps/fg/metatiles.tilemap2");
+const u16 Palette_zone_1_act_boss_fg[] = INCBIN_U16("data/maps/zone_1/act_boss/tilemaps/fg/palette.gbapal");
+const u8 Tileset_zone_1_act_boss_fg[] = INCBIN_U8("data/maps/zone_1/act_boss/tilemaps/fg/tileset.4bpp");
+const s8 CollHeightMap_zone_1_act_boss_fg[] = INCBIN_U8("data/maps/zone_1/act_boss/tilemaps/fg/height_map.coll");
+const u8 CollTileRot_zone_1_act_boss_fg[] = INCBIN_U8("data/maps/zone_1/act_boss/tilemaps/fg/tile_rot.coll");
+const u16 CollFlags_zone_1_act_boss_fg[] = INCBIN_U16("data/maps/zone_1/act_boss/tilemaps/fg/flags.coll");
+const u16 Metatiles_zone_1_act_boss_fg[] = INCBIN_U16("data/maps/zone_1/act_boss/tilemaps/fg/metatiles.tilemap2");
 
-const u16 Map_zone_1_act_boss_fg0[]
-    = INCBIN_U16("data/maps/zone_1/act_boss/tilemaps/fg/map_front.bin");
+const u16 Map_zone_1_act_boss_fg0[] = INCBIN_U16("data/maps/zone_1/act_boss/tilemaps/fg/map_front.bin");
 
-const u16 Map_zone_1_act_boss_fg1[]
-    = INCBIN_U16("data/maps/zone_1/act_boss/tilemaps/fg/map_back.bin");
+const u16 Map_zone_1_act_boss_fg1[] = INCBIN_U16("data/maps/zone_1/act_boss/tilemaps/fg/map_back.bin");
 
 ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_boss_fg0 = 
 {
diff --git a/data/maps/zone_1/act_dummy/tilemaps/bg/header.c b/data/maps/zone_1/act_dummy/tilemaps/bg/header.c
index bbbc560ef..e23010813 100644
--- a/data/maps/zone_1/act_dummy/tilemaps/bg/header.c
+++ b/data/maps/zone_1/act_dummy/tilemaps/bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_1_act_dummy_bg[]
-    = INCBIN_U16("data/maps/zone_1/act_dummy/tilemaps/bg/palette.gbapal");
-const u8 Tiles_zone_1_act_dummy_bg[]
-    = INCBIN_U8("data/maps/zone_1/act_dummy/tilemaps/bg/tiles.4bpp");
-const u16 Tilemap_zone_1_act_dummy_bg[]
-    = INCBIN_U16("data/maps/zone_1/act_dummy/tilemaps/bg/tilemap.tilemap2");
+const u16 Palette_zone_1_act_dummy_bg[] = INCBIN_U16("data/maps/zone_1/act_dummy/tilemaps/bg/palette.gbapal");
+const u8 Tiles_zone_1_act_dummy_bg[] = INCBIN_U8("data/maps/zone_1/act_dummy/tilemaps/bg/tiles.4bpp");
+const u16 Tilemap_zone_1_act_dummy_bg[] = INCBIN_U16("data/maps/zone_1/act_dummy/tilemaps/bg/tilemap.tilemap2");
 
 const Tilemap zone_1_act_dummy_bg = {
     .xTiles = 32,
diff --git a/data/maps/zone_1/act_dummy/tilemaps/fg/header.c b/data/maps/zone_1/act_dummy/tilemaps/fg/header.c
index 8a467f7a2..06ca26ab8 100644
--- a/data/maps/zone_1/act_dummy/tilemaps/fg/header.c
+++ b/data/maps/zone_1/act_dummy/tilemaps/fg/header.c
@@ -1,24 +1,16 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_1_act_dummy_fg[]
-    = INCBIN_U16("data/maps/zone_1/act_dummy/tilemaps/fg/palette.gbapal");
-const u8 Tileset_zone_1_act_dummy_fg[]
-    = INCBIN_U8("data/maps/zone_1/act_dummy/tilemaps/fg/tileset.4bpp");
-const s8 CollHeightMap_zone_1_act_dummy_fg[]
-    = INCBIN_U8("data/maps/zone_1/act_dummy/tilemaps/fg/height_map.coll");
-const u8 CollTileRot_zone_1_act_dummy_fg[]
-    = INCBIN_U8("data/maps/zone_1/act_dummy/tilemaps/fg/tile_rot.coll");
-const u16 CollFlags_zone_1_act_dummy_fg[]
-    = INCBIN_U16("data/maps/zone_1/act_dummy/tilemaps/fg/flags.coll");
-const u16 Metatiles_zone_1_act_dummy_fg[]
-    = INCBIN_U16("data/maps/zone_1/act_dummy/tilemaps/fg/metatiles.tilemap2");
+const u16 Palette_zone_1_act_dummy_fg[] = INCBIN_U16("data/maps/zone_1/act_dummy/tilemaps/fg/palette.gbapal");
+const u8 Tileset_zone_1_act_dummy_fg[] = INCBIN_U8("data/maps/zone_1/act_dummy/tilemaps/fg/tileset.4bpp");
+const s8 CollHeightMap_zone_1_act_dummy_fg[] = INCBIN_U8("data/maps/zone_1/act_dummy/tilemaps/fg/height_map.coll");
+const u8 CollTileRot_zone_1_act_dummy_fg[] = INCBIN_U8("data/maps/zone_1/act_dummy/tilemaps/fg/tile_rot.coll");
+const u16 CollFlags_zone_1_act_dummy_fg[] = INCBIN_U16("data/maps/zone_1/act_dummy/tilemaps/fg/flags.coll");
+const u16 Metatiles_zone_1_act_dummy_fg[] = INCBIN_U16("data/maps/zone_1/act_dummy/tilemaps/fg/metatiles.tilemap2");
 
-const u16 Map_zone_1_act_dummy_fg0[]
-    = INCBIN_U16("data/maps/zone_1/act_dummy/tilemaps/fg/map_front.bin");
+const u16 Map_zone_1_act_dummy_fg0[] = INCBIN_U16("data/maps/zone_1/act_dummy/tilemaps/fg/map_front.bin");
 
-const u16 Map_zone_1_act_dummy_fg1[]
-    = INCBIN_U16("data/maps/zone_1/act_dummy/tilemaps/fg/map_back.bin");
+const u16 Map_zone_1_act_dummy_fg1[] = INCBIN_U16("data/maps/zone_1/act_dummy/tilemaps/fg/map_back.bin");
 
 ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_dummy_fg0 = 
 {
diff --git a/data/maps/zone_2/act_1/tilemaps/bg/header.c b/data/maps/zone_2/act_1/tilemaps/bg/header.c
index fb5779bbf..08b3ee20b 100644
--- a/data/maps/zone_2/act_1/tilemaps/bg/header.c
+++ b/data/maps/zone_2/act_1/tilemaps/bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_2_act_1_bg[]
-    = INCBIN_U16("data/maps/zone_2/act_1/tilemaps/bg/palette.gbapal");
-const u8 Tiles_zone_2_act_1_bg[]
-    = INCBIN_U8("data/maps/zone_2/act_1/tilemaps/bg/tiles.4bpp");
-const u16 Tilemap_zone_2_act_1_bg[]
-    = INCBIN_U16("data/maps/zone_2/act_1/tilemaps/bg/tilemap.tilemap2");
+const u16 Palette_zone_2_act_1_bg[] = INCBIN_U16("data/maps/zone_2/act_1/tilemaps/bg/palette.gbapal");
+const u8 Tiles_zone_2_act_1_bg[] = INCBIN_U8("data/maps/zone_2/act_1/tilemaps/bg/tiles.4bpp");
+const u16 Tilemap_zone_2_act_1_bg[] = INCBIN_U16("data/maps/zone_2/act_1/tilemaps/bg/tilemap.tilemap2");
 
 const Tilemap zone_2_act_1_bg = {
     .xTiles = 32,
diff --git a/data/maps/zone_2/act_1/tilemaps/fg/header.c b/data/maps/zone_2/act_1/tilemaps/fg/header.c
index 09f34e5f4..d5c24c575 100644
--- a/data/maps/zone_2/act_1/tilemaps/fg/header.c
+++ b/data/maps/zone_2/act_1/tilemaps/fg/header.c
@@ -1,24 +1,16 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_2_act_1_fg[]
-    = INCBIN_U16("data/maps/zone_2/act_1/tilemaps/fg/palette.gbapal");
-const u8 Tileset_zone_2_act_1_fg[]
-    = INCBIN_U8("data/maps/zone_2/act_1/tilemaps/fg/tileset.4bpp");
-const s8 CollHeightMap_zone_2_act_1_fg[]
-    = INCBIN_U8("data/maps/zone_2/act_1/tilemaps/fg/height_map.coll");
-const u8 CollTileRot_zone_2_act_1_fg[]
-    = INCBIN_U8("data/maps/zone_2/act_1/tilemaps/fg/tile_rot.coll");
-const u16 CollFlags_zone_2_act_1_fg[]
-    = INCBIN_U16("data/maps/zone_2/act_1/tilemaps/fg/flags.coll");
-const u16 Metatiles_zone_2_act_1_fg[]
-    = INCBIN_U16("data/maps/zone_2/act_1/tilemaps/fg/metatiles.tilemap2");
+const u16 Palette_zone_2_act_1_fg[] = INCBIN_U16("data/maps/zone_2/act_1/tilemaps/fg/palette.gbapal");
+const u8 Tileset_zone_2_act_1_fg[] = INCBIN_U8("data/maps/zone_2/act_1/tilemaps/fg/tileset.4bpp");
+const s8 CollHeightMap_zone_2_act_1_fg[] = INCBIN_U8("data/maps/zone_2/act_1/tilemaps/fg/height_map.coll");
+const u8 CollTileRot_zone_2_act_1_fg[] = INCBIN_U8("data/maps/zone_2/act_1/tilemaps/fg/tile_rot.coll");
+const u16 CollFlags_zone_2_act_1_fg[] = INCBIN_U16("data/maps/zone_2/act_1/tilemaps/fg/flags.coll");
+const u16 Metatiles_zone_2_act_1_fg[] = INCBIN_U16("data/maps/zone_2/act_1/tilemaps/fg/metatiles.tilemap2");
 
-const u16 Map_zone_2_act_1_fg0[]
-    = INCBIN_U16("data/maps/zone_2/act_1/tilemaps/fg/map_front.bin");
+const u16 Map_zone_2_act_1_fg0[] = INCBIN_U16("data/maps/zone_2/act_1/tilemaps/fg/map_front.bin");
 
-const u16 Map_zone_2_act_1_fg1[]
-    = INCBIN_U16("data/maps/zone_2/act_1/tilemaps/fg/map_back.bin");
+const u16 Map_zone_2_act_1_fg1[] = INCBIN_U16("data/maps/zone_2/act_1/tilemaps/fg/map_back.bin");
 
 ALIGNED(4) const struct MapHeader MapHeader_zone_2_act_1_fg0 = 
 {
diff --git a/data/maps/zone_2/act_2/tilemaps/bg/header.c b/data/maps/zone_2/act_2/tilemaps/bg/header.c
index 0bfd7a89c..026a11e57 100644
--- a/data/maps/zone_2/act_2/tilemaps/bg/header.c
+++ b/data/maps/zone_2/act_2/tilemaps/bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_2_act_2_bg[]
-    = INCBIN_U16("data/maps/zone_2/act_2/tilemaps/bg/palette.gbapal");
-const u8 Tiles_zone_2_act_2_bg[]
-    = INCBIN_U8("data/maps/zone_2/act_2/tilemaps/bg/tiles.4bpp");
-const u16 Tilemap_zone_2_act_2_bg[]
-    = INCBIN_U16("data/maps/zone_2/act_2/tilemaps/bg/tilemap.tilemap2");
+const u16 Palette_zone_2_act_2_bg[] = INCBIN_U16("data/maps/zone_2/act_2/tilemaps/bg/palette.gbapal");
+const u8 Tiles_zone_2_act_2_bg[] = INCBIN_U8("data/maps/zone_2/act_2/tilemaps/bg/tiles.4bpp");
+const u16 Tilemap_zone_2_act_2_bg[] = INCBIN_U16("data/maps/zone_2/act_2/tilemaps/bg/tilemap.tilemap2");
 
 const Tilemap zone_2_act_2_bg = {
     .xTiles = 32,
diff --git a/data/maps/zone_2/act_2/tilemaps/fg/header.c b/data/maps/zone_2/act_2/tilemaps/fg/header.c
index 74e70f19f..2a7efe5e1 100644
--- a/data/maps/zone_2/act_2/tilemaps/fg/header.c
+++ b/data/maps/zone_2/act_2/tilemaps/fg/header.c
@@ -1,24 +1,16 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_2_act_2_fg[]
-    = INCBIN_U16("data/maps/zone_2/act_2/tilemaps/fg/palette.gbapal");
-const u8 Tileset_zone_2_act_2_fg[]
-    = INCBIN_U8("data/maps/zone_2/act_2/tilemaps/fg/tileset.4bpp");
-const s8 CollHeightMap_zone_2_act_2_fg[]
-    = INCBIN_U8("data/maps/zone_2/act_2/tilemaps/fg/height_map.coll");
-const u8 CollTileRot_zone_2_act_2_fg[]
-    = INCBIN_U8("data/maps/zone_2/act_2/tilemaps/fg/tile_rot.coll");
-const u16 CollFlags_zone_2_act_2_fg[]
-    = INCBIN_U16("data/maps/zone_2/act_2/tilemaps/fg/flags.coll");
-const u16 Metatiles_zone_2_act_2_fg[]
-    = INCBIN_U16("data/maps/zone_2/act_2/tilemaps/fg/metatiles.tilemap2");
+const u16 Palette_zone_2_act_2_fg[] = INCBIN_U16("data/maps/zone_2/act_2/tilemaps/fg/palette.gbapal");
+const u8 Tileset_zone_2_act_2_fg[] = INCBIN_U8("data/maps/zone_2/act_2/tilemaps/fg/tileset.4bpp");
+const s8 CollHeightMap_zone_2_act_2_fg[] = INCBIN_U8("data/maps/zone_2/act_2/tilemaps/fg/height_map.coll");
+const u8 CollTileRot_zone_2_act_2_fg[] = INCBIN_U8("data/maps/zone_2/act_2/tilemaps/fg/tile_rot.coll");
+const u16 CollFlags_zone_2_act_2_fg[] = INCBIN_U16("data/maps/zone_2/act_2/tilemaps/fg/flags.coll");
+const u16 Metatiles_zone_2_act_2_fg[] = INCBIN_U16("data/maps/zone_2/act_2/tilemaps/fg/metatiles.tilemap2");
 
-const u16 Map_zone_2_act_2_fg0[]
-    = INCBIN_U16("data/maps/zone_2/act_2/tilemaps/fg/map_front.bin");
+const u16 Map_zone_2_act_2_fg0[] = INCBIN_U16("data/maps/zone_2/act_2/tilemaps/fg/map_front.bin");
 
-const u16 Map_zone_2_act_2_fg1[]
-    = INCBIN_U16("data/maps/zone_2/act_2/tilemaps/fg/map_back.bin");
+const u16 Map_zone_2_act_2_fg1[] = INCBIN_U16("data/maps/zone_2/act_2/tilemaps/fg/map_back.bin");
 
 ALIGNED(4) const struct MapHeader MapHeader_zone_2_act_2_fg0 = 
 {
diff --git a/data/maps/zone_2/act_boss/tilemaps/bg/header.c b/data/maps/zone_2/act_boss/tilemaps/bg/header.c
index 6d8756472..efa579d1e 100644
--- a/data/maps/zone_2/act_boss/tilemaps/bg/header.c
+++ b/data/maps/zone_2/act_boss/tilemaps/bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_2_act_boss_bg[]
-    = INCBIN_U16("data/maps/zone_2/act_boss/tilemaps/bg/palette.gbapal");
-const u8 Tiles_zone_2_act_boss_bg[]
-    = INCBIN_U8("data/maps/zone_2/act_boss/tilemaps/bg/tiles.4bpp");
-const u16 Tilemap_zone_2_act_boss_bg[]
-    = INCBIN_U16("data/maps/zone_2/act_boss/tilemaps/bg/tilemap.tilemap2");
+const u16 Palette_zone_2_act_boss_bg[] = INCBIN_U16("data/maps/zone_2/act_boss/tilemaps/bg/palette.gbapal");
+const u8 Tiles_zone_2_act_boss_bg[] = INCBIN_U8("data/maps/zone_2/act_boss/tilemaps/bg/tiles.4bpp");
+const u16 Tilemap_zone_2_act_boss_bg[] = INCBIN_U16("data/maps/zone_2/act_boss/tilemaps/bg/tilemap.tilemap2");
 
 const Tilemap zone_2_act_boss_bg = {
     .xTiles = 32,
diff --git a/data/maps/zone_2/act_boss/tilemaps/fg/header.c b/data/maps/zone_2/act_boss/tilemaps/fg/header.c
index 767484b54..82114f416 100644
--- a/data/maps/zone_2/act_boss/tilemaps/fg/header.c
+++ b/data/maps/zone_2/act_boss/tilemaps/fg/header.c
@@ -1,24 +1,16 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_2_act_boss_fg[]
-    = INCBIN_U16("data/maps/zone_2/act_boss/tilemaps/fg/palette.gbapal");
-const u8 Tileset_zone_2_act_boss_fg[]
-    = INCBIN_U8("data/maps/zone_2/act_boss/tilemaps/fg/tileset.4bpp");
-const s8 CollHeightMap_zone_2_act_boss_fg[]
-    = INCBIN_U8("data/maps/zone_2/act_boss/tilemaps/fg/height_map.coll");
-const u8 CollTileRot_zone_2_act_boss_fg[]
-    = INCBIN_U8("data/maps/zone_2/act_boss/tilemaps/fg/tile_rot.coll");
-const u16 CollFlags_zone_2_act_boss_fg[]
-    = INCBIN_U16("data/maps/zone_2/act_boss/tilemaps/fg/flags.coll");
-const u16 Metatiles_zone_2_act_boss_fg[]
-    = INCBIN_U16("data/maps/zone_2/act_boss/tilemaps/fg/metatiles.tilemap2");
+const u16 Palette_zone_2_act_boss_fg[] = INCBIN_U16("data/maps/zone_2/act_boss/tilemaps/fg/palette.gbapal");
+const u8 Tileset_zone_2_act_boss_fg[] = INCBIN_U8("data/maps/zone_2/act_boss/tilemaps/fg/tileset.4bpp");
+const s8 CollHeightMap_zone_2_act_boss_fg[] = INCBIN_U8("data/maps/zone_2/act_boss/tilemaps/fg/height_map.coll");
+const u8 CollTileRot_zone_2_act_boss_fg[] = INCBIN_U8("data/maps/zone_2/act_boss/tilemaps/fg/tile_rot.coll");
+const u16 CollFlags_zone_2_act_boss_fg[] = INCBIN_U16("data/maps/zone_2/act_boss/tilemaps/fg/flags.coll");
+const u16 Metatiles_zone_2_act_boss_fg[] = INCBIN_U16("data/maps/zone_2/act_boss/tilemaps/fg/metatiles.tilemap2");
 
-const u16 Map_zone_2_act_boss_fg0[]
-    = INCBIN_U16("data/maps/zone_2/act_boss/tilemaps/fg/map_front.bin");
+const u16 Map_zone_2_act_boss_fg0[] = INCBIN_U16("data/maps/zone_2/act_boss/tilemaps/fg/map_front.bin");
 
-const u16 Map_zone_2_act_boss_fg1[]
-    = INCBIN_U16("data/maps/zone_2/act_boss/tilemaps/fg/map_back.bin");
+const u16 Map_zone_2_act_boss_fg1[] = INCBIN_U16("data/maps/zone_2/act_boss/tilemaps/fg/map_back.bin");
 
 ALIGNED(4) const struct MapHeader MapHeader_zone_2_act_boss_fg0 = 
 {
diff --git a/data/maps/zone_3/act_1/tilemaps/bg/header.c b/data/maps/zone_3/act_1/tilemaps/bg/header.c
index 4ff1a7698..186c56a07 100644
--- a/data/maps/zone_3/act_1/tilemaps/bg/header.c
+++ b/data/maps/zone_3/act_1/tilemaps/bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_3_act_1_bg[]
-    = INCBIN_U16("data/maps/zone_3/act_1/tilemaps/bg/palette.gbapal");
-const u8 Tiles_zone_3_act_1_bg[]
-    = INCBIN_U8("data/maps/zone_3/act_1/tilemaps/bg/tiles.4bpp");
-const u16 Tilemap_zone_3_act_1_bg[]
-    = INCBIN_U16("data/maps/zone_3/act_1/tilemaps/bg/tilemap.tilemap2");
+const u16 Palette_zone_3_act_1_bg[] = INCBIN_U16("data/maps/zone_3/act_1/tilemaps/bg/palette.gbapal");
+const u8 Tiles_zone_3_act_1_bg[] = INCBIN_U8("data/maps/zone_3/act_1/tilemaps/bg/tiles.4bpp");
+const u16 Tilemap_zone_3_act_1_bg[] = INCBIN_U16("data/maps/zone_3/act_1/tilemaps/bg/tilemap.tilemap2");
 
 const Tilemap zone_3_act_1_bg = {
     .xTiles = 32,
diff --git a/data/maps/zone_3/act_1/tilemaps/fg/header.c b/data/maps/zone_3/act_1/tilemaps/fg/header.c
index de3243d01..a39e6d693 100644
--- a/data/maps/zone_3/act_1/tilemaps/fg/header.c
+++ b/data/maps/zone_3/act_1/tilemaps/fg/header.c
@@ -1,26 +1,17 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_3_act_1_fg[]
-    = INCBIN_U16("data/maps/zone_3/act_1/tilemaps/fg/palette.gbapal");
-const u8 Tileset_zone_3_act_1_fg[]
-    = INCBIN_U8("data/maps/zone_3/act_1/tilemaps/fg/tileset.4bpp");
-const u8 Tileset_AnimTiles_zone_3_act_1_fg[]
-    = INCBIN_U8("data/maps/zone_3/act_1/tilemaps/fg/tileset_anim.4bpp");
-const s8 CollHeightMap_zone_3_act_1_fg[]
-    = INCBIN_U8("data/maps/zone_3/act_1/tilemaps/fg/height_map.coll");
-const u8 CollTileRot_zone_3_act_1_fg[]
-    = INCBIN_U8("data/maps/zone_3/act_1/tilemaps/fg/tile_rot.coll");
-const u16 CollFlags_zone_3_act_1_fg[]
-    = INCBIN_U16("data/maps/zone_3/act_1/tilemaps/fg/flags.coll");
-const u16 Metatiles_zone_3_act_1_fg[]
-    = INCBIN_U16("data/maps/zone_3/act_1/tilemaps/fg/metatiles.tilemap2");
+const u16 Palette_zone_3_act_1_fg[] = INCBIN_U16("data/maps/zone_3/act_1/tilemaps/fg/palette.gbapal");
+const u8 Tileset_zone_3_act_1_fg[] = INCBIN_U8("data/maps/zone_3/act_1/tilemaps/fg/tileset.4bpp");
+const u8 Tileset_AnimTiles_zone_3_act_1_fg[] = INCBIN_U8("data/maps/zone_3/act_1/tilemaps/fg/tileset_anim.4bpp");
+const s8 CollHeightMap_zone_3_act_1_fg[] = INCBIN_U8("data/maps/zone_3/act_1/tilemaps/fg/height_map.coll");
+const u8 CollTileRot_zone_3_act_1_fg[] = INCBIN_U8("data/maps/zone_3/act_1/tilemaps/fg/tile_rot.coll");
+const u16 CollFlags_zone_3_act_1_fg[] = INCBIN_U16("data/maps/zone_3/act_1/tilemaps/fg/flags.coll");
+const u16 Metatiles_zone_3_act_1_fg[] = INCBIN_U16("data/maps/zone_3/act_1/tilemaps/fg/metatiles.tilemap2");
 
-const u16 Map_zone_3_act_1_fg0[]
-    = INCBIN_U16("data/maps/zone_3/act_1/tilemaps/fg/map_front.bin");
+const u16 Map_zone_3_act_1_fg0[] = INCBIN_U16("data/maps/zone_3/act_1/tilemaps/fg/map_front.bin");
 
-const u16 Map_zone_3_act_1_fg1[]
-    = INCBIN_U16("data/maps/zone_3/act_1/tilemaps/fg/map_back.bin");
+const u16 Map_zone_3_act_1_fg1[] = INCBIN_U16("data/maps/zone_3/act_1/tilemaps/fg/map_back.bin");
 
 ALIGNED(4) const struct MapHeader MapHeader_zone_3_act_1_fg0 = 
 {
diff --git a/data/maps/zone_3/act_2/tilemaps/bg/header.c b/data/maps/zone_3/act_2/tilemaps/bg/header.c
index dfbb37c93..0c920dea0 100644
--- a/data/maps/zone_3/act_2/tilemaps/bg/header.c
+++ b/data/maps/zone_3/act_2/tilemaps/bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_3_act_2_bg[]
-    = INCBIN_U16("data/maps/zone_3/act_2/tilemaps/bg/palette.gbapal");
-const u8 Tiles_zone_3_act_2_bg[]
-    = INCBIN_U8("data/maps/zone_3/act_2/tilemaps/bg/tiles.4bpp");
-const u16 Tilemap_zone_3_act_2_bg[]
-    = INCBIN_U16("data/maps/zone_3/act_2/tilemaps/bg/tilemap.tilemap2");
+const u16 Palette_zone_3_act_2_bg[] = INCBIN_U16("data/maps/zone_3/act_2/tilemaps/bg/palette.gbapal");
+const u8 Tiles_zone_3_act_2_bg[] = INCBIN_U8("data/maps/zone_3/act_2/tilemaps/bg/tiles.4bpp");
+const u16 Tilemap_zone_3_act_2_bg[] = INCBIN_U16("data/maps/zone_3/act_2/tilemaps/bg/tilemap.tilemap2");
 
 const Tilemap zone_3_act_2_bg = {
     .xTiles = 32,
diff --git a/data/maps/zone_3/act_2/tilemaps/fg/header.c b/data/maps/zone_3/act_2/tilemaps/fg/header.c
index 702b1d826..54abf3ae5 100644
--- a/data/maps/zone_3/act_2/tilemaps/fg/header.c
+++ b/data/maps/zone_3/act_2/tilemaps/fg/header.c
@@ -1,26 +1,17 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_3_act_2_fg[]
-    = INCBIN_U16("data/maps/zone_3/act_2/tilemaps/fg/palette.gbapal");
-const u8 Tileset_zone_3_act_2_fg[]
-    = INCBIN_U8("data/maps/zone_3/act_2/tilemaps/fg/tileset.4bpp");
-const u8 Tileset_AnimTiles_zone_3_act_2_fg[]
-    = INCBIN_U8("data/maps/zone_3/act_2/tilemaps/fg/tileset_anim.4bpp");
-const s8 CollHeightMap_zone_3_act_2_fg[]
-    = INCBIN_U8("data/maps/zone_3/act_2/tilemaps/fg/height_map.coll");
-const u8 CollTileRot_zone_3_act_2_fg[]
-    = INCBIN_U8("data/maps/zone_3/act_2/tilemaps/fg/tile_rot.coll");
-const u16 CollFlags_zone_3_act_2_fg[]
-    = INCBIN_U16("data/maps/zone_3/act_2/tilemaps/fg/flags.coll");
-const u16 Metatiles_zone_3_act_2_fg[]
-    = INCBIN_U16("data/maps/zone_3/act_2/tilemaps/fg/metatiles.tilemap2");
+const u16 Palette_zone_3_act_2_fg[] = INCBIN_U16("data/maps/zone_3/act_2/tilemaps/fg/palette.gbapal");
+const u8 Tileset_zone_3_act_2_fg[] = INCBIN_U8("data/maps/zone_3/act_2/tilemaps/fg/tileset.4bpp");
+const u8 Tileset_AnimTiles_zone_3_act_2_fg[] = INCBIN_U8("data/maps/zone_3/act_2/tilemaps/fg/tileset_anim.4bpp");
+const s8 CollHeightMap_zone_3_act_2_fg[] = INCBIN_U8("data/maps/zone_3/act_2/tilemaps/fg/height_map.coll");
+const u8 CollTileRot_zone_3_act_2_fg[] = INCBIN_U8("data/maps/zone_3/act_2/tilemaps/fg/tile_rot.coll");
+const u16 CollFlags_zone_3_act_2_fg[] = INCBIN_U16("data/maps/zone_3/act_2/tilemaps/fg/flags.coll");
+const u16 Metatiles_zone_3_act_2_fg[] = INCBIN_U16("data/maps/zone_3/act_2/tilemaps/fg/metatiles.tilemap2");
 
-const u16 Map_zone_3_act_2_fg0[]
-    = INCBIN_U16("data/maps/zone_3/act_2/tilemaps/fg/map_front.bin");
+const u16 Map_zone_3_act_2_fg0[] = INCBIN_U16("data/maps/zone_3/act_2/tilemaps/fg/map_front.bin");
 
-const u16 Map_zone_3_act_2_fg1[]
-    = INCBIN_U16("data/maps/zone_3/act_2/tilemaps/fg/map_back.bin");
+const u16 Map_zone_3_act_2_fg1[] = INCBIN_U16("data/maps/zone_3/act_2/tilemaps/fg/map_back.bin");
 
 ALIGNED(4) const struct MapHeader MapHeader_zone_3_act_2_fg0 = 
 {
diff --git a/data/maps/zone_3/act_boss/tilemaps/bg/header.c b/data/maps/zone_3/act_boss/tilemaps/bg/header.c
index 0ec70ec51..253b93cd8 100644
--- a/data/maps/zone_3/act_boss/tilemaps/bg/header.c
+++ b/data/maps/zone_3/act_boss/tilemaps/bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_3_act_boss_bg[]
-    = INCBIN_U16("data/maps/zone_3/act_boss/tilemaps/bg/palette.gbapal");
-const u8 Tiles_zone_3_act_boss_bg[]
-    = INCBIN_U8("data/maps/zone_3/act_boss/tilemaps/bg/tiles.4bpp");
-const u16 Tilemap_zone_3_act_boss_bg[]
-    = INCBIN_U16("data/maps/zone_3/act_boss/tilemaps/bg/tilemap.tilemap2");
+const u16 Palette_zone_3_act_boss_bg[] = INCBIN_U16("data/maps/zone_3/act_boss/tilemaps/bg/palette.gbapal");
+const u8 Tiles_zone_3_act_boss_bg[] = INCBIN_U8("data/maps/zone_3/act_boss/tilemaps/bg/tiles.4bpp");
+const u16 Tilemap_zone_3_act_boss_bg[] = INCBIN_U16("data/maps/zone_3/act_boss/tilemaps/bg/tilemap.tilemap2");
 
 const Tilemap zone_3_act_boss_bg = {
     .xTiles = 32,
diff --git a/data/maps/zone_3/act_boss/tilemaps/fg/header.c b/data/maps/zone_3/act_boss/tilemaps/fg/header.c
index e2c890e4d..3b833dae1 100644
--- a/data/maps/zone_3/act_boss/tilemaps/fg/header.c
+++ b/data/maps/zone_3/act_boss/tilemaps/fg/header.c
@@ -1,24 +1,16 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_3_act_boss_fg[]
-    = INCBIN_U16("data/maps/zone_3/act_boss/tilemaps/fg/palette.gbapal");
-const u8 Tileset_zone_3_act_boss_fg[]
-    = INCBIN_U8("data/maps/zone_3/act_boss/tilemaps/fg/tileset.4bpp");
-const s8 CollHeightMap_zone_3_act_boss_fg[]
-    = INCBIN_U8("data/maps/zone_3/act_boss/tilemaps/fg/height_map.coll");
-const u8 CollTileRot_zone_3_act_boss_fg[]
-    = INCBIN_U8("data/maps/zone_3/act_boss/tilemaps/fg/tile_rot.coll");
-const u16 CollFlags_zone_3_act_boss_fg[]
-    = INCBIN_U16("data/maps/zone_3/act_boss/tilemaps/fg/flags.coll");
-const u16 Metatiles_zone_3_act_boss_fg[]
-    = INCBIN_U16("data/maps/zone_3/act_boss/tilemaps/fg/metatiles.tilemap2");
+const u16 Palette_zone_3_act_boss_fg[] = INCBIN_U16("data/maps/zone_3/act_boss/tilemaps/fg/palette.gbapal");
+const u8 Tileset_zone_3_act_boss_fg[] = INCBIN_U8("data/maps/zone_3/act_boss/tilemaps/fg/tileset.4bpp");
+const s8 CollHeightMap_zone_3_act_boss_fg[] = INCBIN_U8("data/maps/zone_3/act_boss/tilemaps/fg/height_map.coll");
+const u8 CollTileRot_zone_3_act_boss_fg[] = INCBIN_U8("data/maps/zone_3/act_boss/tilemaps/fg/tile_rot.coll");
+const u16 CollFlags_zone_3_act_boss_fg[] = INCBIN_U16("data/maps/zone_3/act_boss/tilemaps/fg/flags.coll");
+const u16 Metatiles_zone_3_act_boss_fg[] = INCBIN_U16("data/maps/zone_3/act_boss/tilemaps/fg/metatiles.tilemap2");
 
-const u16 Map_zone_3_act_boss_fg0[]
-    = INCBIN_U16("data/maps/zone_3/act_boss/tilemaps/fg/map_front.bin");
+const u16 Map_zone_3_act_boss_fg0[] = INCBIN_U16("data/maps/zone_3/act_boss/tilemaps/fg/map_front.bin");
 
-const u16 Map_zone_3_act_boss_fg1[]
-    = INCBIN_U16("data/maps/zone_3/act_boss/tilemaps/fg/map_back.bin");
+const u16 Map_zone_3_act_boss_fg1[] = INCBIN_U16("data/maps/zone_3/act_boss/tilemaps/fg/map_back.bin");
 
 ALIGNED(4) const struct MapHeader MapHeader_zone_3_act_boss_fg0 = 
 {
diff --git a/data/maps/zone_4/act_1/tilemaps/bg/header.c b/data/maps/zone_4/act_1/tilemaps/bg/header.c
index 7968c5141..35bc82509 100644
--- a/data/maps/zone_4/act_1/tilemaps/bg/header.c
+++ b/data/maps/zone_4/act_1/tilemaps/bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_4_act_1_bg[]
-    = INCBIN_U16("data/maps/zone_4/act_1/tilemaps/bg/palette.gbapal");
-const u8 Tiles_zone_4_act_1_bg[]
-    = INCBIN_U8("data/maps/zone_4/act_1/tilemaps/bg/tiles.4bpp");
-const u16 Tilemap_zone_4_act_1_bg[]
-    = INCBIN_U16("data/maps/zone_4/act_1/tilemaps/bg/tilemap.tilemap2");
+const u16 Palette_zone_4_act_1_bg[] = INCBIN_U16("data/maps/zone_4/act_1/tilemaps/bg/palette.gbapal");
+const u8 Tiles_zone_4_act_1_bg[] = INCBIN_U8("data/maps/zone_4/act_1/tilemaps/bg/tiles.4bpp");
+const u16 Tilemap_zone_4_act_1_bg[] = INCBIN_U16("data/maps/zone_4/act_1/tilemaps/bg/tilemap.tilemap2");
 
 const Tilemap zone_4_act_1_bg = {
     .xTiles = 32,
diff --git a/data/maps/zone_4/act_1/tilemaps/fg/header.c b/data/maps/zone_4/act_1/tilemaps/fg/header.c
index 443cf623d..d04f046ce 100644
--- a/data/maps/zone_4/act_1/tilemaps/fg/header.c
+++ b/data/maps/zone_4/act_1/tilemaps/fg/header.c
@@ -1,24 +1,16 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_4_act_1_fg[]
-    = INCBIN_U16("data/maps/zone_4/act_1/tilemaps/fg/palette.gbapal");
-const u8 Tileset_zone_4_act_1_fg[]
-    = INCBIN_U8("data/maps/zone_4/act_1/tilemaps/fg/tileset.4bpp");
-const s8 CollHeightMap_zone_4_act_1_fg[]
-    = INCBIN_U8("data/maps/zone_4/act_1/tilemaps/fg/height_map.coll");
-const u8 CollTileRot_zone_4_act_1_fg[]
-    = INCBIN_U8("data/maps/zone_4/act_1/tilemaps/fg/tile_rot.coll");
-const u16 CollFlags_zone_4_act_1_fg[]
-    = INCBIN_U16("data/maps/zone_4/act_1/tilemaps/fg/flags.coll");
-const u16 Metatiles_zone_4_act_1_fg[]
-    = INCBIN_U16("data/maps/zone_4/act_1/tilemaps/fg/metatiles.tilemap2");
+const u16 Palette_zone_4_act_1_fg[] = INCBIN_U16("data/maps/zone_4/act_1/tilemaps/fg/palette.gbapal");
+const u8 Tileset_zone_4_act_1_fg[] = INCBIN_U8("data/maps/zone_4/act_1/tilemaps/fg/tileset.4bpp");
+const s8 CollHeightMap_zone_4_act_1_fg[] = INCBIN_U8("data/maps/zone_4/act_1/tilemaps/fg/height_map.coll");
+const u8 CollTileRot_zone_4_act_1_fg[] = INCBIN_U8("data/maps/zone_4/act_1/tilemaps/fg/tile_rot.coll");
+const u16 CollFlags_zone_4_act_1_fg[] = INCBIN_U16("data/maps/zone_4/act_1/tilemaps/fg/flags.coll");
+const u16 Metatiles_zone_4_act_1_fg[] = INCBIN_U16("data/maps/zone_4/act_1/tilemaps/fg/metatiles.tilemap2");
 
-const u16 Map_zone_4_act_1_fg0[]
-    = INCBIN_U16("data/maps/zone_4/act_1/tilemaps/fg/map_front.bin");
+const u16 Map_zone_4_act_1_fg0[] = INCBIN_U16("data/maps/zone_4/act_1/tilemaps/fg/map_front.bin");
 
-const u16 Map_zone_4_act_1_fg1[]
-    = INCBIN_U16("data/maps/zone_4/act_1/tilemaps/fg/map_back.bin");
+const u16 Map_zone_4_act_1_fg1[] = INCBIN_U16("data/maps/zone_4/act_1/tilemaps/fg/map_back.bin");
 
 ALIGNED(4) const struct MapHeader MapHeader_zone_4_act_1_fg0 = 
 {
diff --git a/data/maps/zone_4/act_2/tilemaps/bg/header.c b/data/maps/zone_4/act_2/tilemaps/bg/header.c
index dcc767ebd..90e322e11 100644
--- a/data/maps/zone_4/act_2/tilemaps/bg/header.c
+++ b/data/maps/zone_4/act_2/tilemaps/bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_4_act_2_bg[]
-    = INCBIN_U16("data/maps/zone_4/act_2/tilemaps/bg/palette.gbapal");
-const u8 Tiles_zone_4_act_2_bg[]
-    = INCBIN_U8("data/maps/zone_4/act_2/tilemaps/bg/tiles.4bpp");
-const u16 Tilemap_zone_4_act_2_bg[]
-    = INCBIN_U16("data/maps/zone_4/act_2/tilemaps/bg/tilemap.tilemap2");
+const u16 Palette_zone_4_act_2_bg[] = INCBIN_U16("data/maps/zone_4/act_2/tilemaps/bg/palette.gbapal");
+const u8 Tiles_zone_4_act_2_bg[] = INCBIN_U8("data/maps/zone_4/act_2/tilemaps/bg/tiles.4bpp");
+const u16 Tilemap_zone_4_act_2_bg[] = INCBIN_U16("data/maps/zone_4/act_2/tilemaps/bg/tilemap.tilemap2");
 
 const Tilemap zone_4_act_2_bg = {
     .xTiles = 32,
diff --git a/data/maps/zone_4/act_2/tilemaps/fg/header.c b/data/maps/zone_4/act_2/tilemaps/fg/header.c
index a4a7d1f02..d5addd26b 100644
--- a/data/maps/zone_4/act_2/tilemaps/fg/header.c
+++ b/data/maps/zone_4/act_2/tilemaps/fg/header.c
@@ -1,24 +1,16 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_4_act_2_fg[]
-    = INCBIN_U16("data/maps/zone_4/act_2/tilemaps/fg/palette.gbapal");
-const u8 Tileset_zone_4_act_2_fg[]
-    = INCBIN_U8("data/maps/zone_4/act_2/tilemaps/fg/tileset.4bpp");
-const s8 CollHeightMap_zone_4_act_2_fg[]
-    = INCBIN_U8("data/maps/zone_4/act_2/tilemaps/fg/height_map.coll");
-const u8 CollTileRot_zone_4_act_2_fg[]
-    = INCBIN_U8("data/maps/zone_4/act_2/tilemaps/fg/tile_rot.coll");
-const u16 CollFlags_zone_4_act_2_fg[]
-    = INCBIN_U16("data/maps/zone_4/act_2/tilemaps/fg/flags.coll");
-const u16 Metatiles_zone_4_act_2_fg[]
-    = INCBIN_U16("data/maps/zone_4/act_2/tilemaps/fg/metatiles.tilemap2");
+const u16 Palette_zone_4_act_2_fg[] = INCBIN_U16("data/maps/zone_4/act_2/tilemaps/fg/palette.gbapal");
+const u8 Tileset_zone_4_act_2_fg[] = INCBIN_U8("data/maps/zone_4/act_2/tilemaps/fg/tileset.4bpp");
+const s8 CollHeightMap_zone_4_act_2_fg[] = INCBIN_U8("data/maps/zone_4/act_2/tilemaps/fg/height_map.coll");
+const u8 CollTileRot_zone_4_act_2_fg[] = INCBIN_U8("data/maps/zone_4/act_2/tilemaps/fg/tile_rot.coll");
+const u16 CollFlags_zone_4_act_2_fg[] = INCBIN_U16("data/maps/zone_4/act_2/tilemaps/fg/flags.coll");
+const u16 Metatiles_zone_4_act_2_fg[] = INCBIN_U16("data/maps/zone_4/act_2/tilemaps/fg/metatiles.tilemap2");
 
-const u16 Map_zone_4_act_2_fg0[]
-    = INCBIN_U16("data/maps/zone_4/act_2/tilemaps/fg/map_front.bin");
+const u16 Map_zone_4_act_2_fg0[] = INCBIN_U16("data/maps/zone_4/act_2/tilemaps/fg/map_front.bin");
 
-const u16 Map_zone_4_act_2_fg1[]
-    = INCBIN_U16("data/maps/zone_4/act_2/tilemaps/fg/map_back.bin");
+const u16 Map_zone_4_act_2_fg1[] = INCBIN_U16("data/maps/zone_4/act_2/tilemaps/fg/map_back.bin");
 
 ALIGNED(4) const struct MapHeader MapHeader_zone_4_act_2_fg0 = 
 {
diff --git a/data/maps/zone_4/act_boss/tilemaps/bg/header.c b/data/maps/zone_4/act_boss/tilemaps/bg/header.c
index 305979607..4c10942e7 100644
--- a/data/maps/zone_4/act_boss/tilemaps/bg/header.c
+++ b/data/maps/zone_4/act_boss/tilemaps/bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_4_act_boss_bg[]
-    = INCBIN_U16("data/maps/zone_4/act_boss/tilemaps/bg/palette.gbapal");
-const u8 Tiles_zone_4_act_boss_bg[]
-    = INCBIN_U8("data/maps/zone_4/act_boss/tilemaps/bg/tiles.4bpp");
-const u16 Tilemap_zone_4_act_boss_bg[]
-    = INCBIN_U16("data/maps/zone_4/act_boss/tilemaps/bg/tilemap.tilemap2");
+const u16 Palette_zone_4_act_boss_bg[] = INCBIN_U16("data/maps/zone_4/act_boss/tilemaps/bg/palette.gbapal");
+const u8 Tiles_zone_4_act_boss_bg[] = INCBIN_U8("data/maps/zone_4/act_boss/tilemaps/bg/tiles.4bpp");
+const u16 Tilemap_zone_4_act_boss_bg[] = INCBIN_U16("data/maps/zone_4/act_boss/tilemaps/bg/tilemap.tilemap2");
 
 const Tilemap zone_4_act_boss_bg = {
     .xTiles = 32,
diff --git a/data/maps/zone_4/act_boss/tilemaps/fg/header.c b/data/maps/zone_4/act_boss/tilemaps/fg/header.c
index a81538fd2..225add40f 100644
--- a/data/maps/zone_4/act_boss/tilemaps/fg/header.c
+++ b/data/maps/zone_4/act_boss/tilemaps/fg/header.c
@@ -1,24 +1,16 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_4_act_boss_fg[]
-    = INCBIN_U16("data/maps/zone_4/act_boss/tilemaps/fg/palette.gbapal");
-const u8 Tileset_zone_4_act_boss_fg[]
-    = INCBIN_U8("data/maps/zone_4/act_boss/tilemaps/fg/tileset.4bpp");
-const s8 CollHeightMap_zone_4_act_boss_fg[]
-    = INCBIN_U8("data/maps/zone_4/act_boss/tilemaps/fg/height_map.coll");
-const u8 CollTileRot_zone_4_act_boss_fg[]
-    = INCBIN_U8("data/maps/zone_4/act_boss/tilemaps/fg/tile_rot.coll");
-const u16 CollFlags_zone_4_act_boss_fg[]
-    = INCBIN_U16("data/maps/zone_4/act_boss/tilemaps/fg/flags.coll");
-const u16 Metatiles_zone_4_act_boss_fg[]
-    = INCBIN_U16("data/maps/zone_4/act_boss/tilemaps/fg/metatiles.tilemap2");
+const u16 Palette_zone_4_act_boss_fg[] = INCBIN_U16("data/maps/zone_4/act_boss/tilemaps/fg/palette.gbapal");
+const u8 Tileset_zone_4_act_boss_fg[] = INCBIN_U8("data/maps/zone_4/act_boss/tilemaps/fg/tileset.4bpp");
+const s8 CollHeightMap_zone_4_act_boss_fg[] = INCBIN_U8("data/maps/zone_4/act_boss/tilemaps/fg/height_map.coll");
+const u8 CollTileRot_zone_4_act_boss_fg[] = INCBIN_U8("data/maps/zone_4/act_boss/tilemaps/fg/tile_rot.coll");
+const u16 CollFlags_zone_4_act_boss_fg[] = INCBIN_U16("data/maps/zone_4/act_boss/tilemaps/fg/flags.coll");
+const u16 Metatiles_zone_4_act_boss_fg[] = INCBIN_U16("data/maps/zone_4/act_boss/tilemaps/fg/metatiles.tilemap2");
 
-const u16 Map_zone_4_act_boss_fg0[]
-    = INCBIN_U16("data/maps/zone_4/act_boss/tilemaps/fg/map_front.bin");
+const u16 Map_zone_4_act_boss_fg0[] = INCBIN_U16("data/maps/zone_4/act_boss/tilemaps/fg/map_front.bin");
 
-const u16 Map_zone_4_act_boss_fg1[]
-    = INCBIN_U16("data/maps/zone_4/act_boss/tilemaps/fg/map_back.bin");
+const u16 Map_zone_4_act_boss_fg1[] = INCBIN_U16("data/maps/zone_4/act_boss/tilemaps/fg/map_back.bin");
 
 ALIGNED(4) const struct MapHeader MapHeader_zone_4_act_boss_fg0 = 
 {
diff --git a/data/maps/zone_5/act_1/tilemaps/bg/header.c b/data/maps/zone_5/act_1/tilemaps/bg/header.c
index b9de9715f..07c6ba564 100644
--- a/data/maps/zone_5/act_1/tilemaps/bg/header.c
+++ b/data/maps/zone_5/act_1/tilemaps/bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_5_act_1_bg[]
-    = INCBIN_U16("data/maps/zone_5/act_1/tilemaps/bg/palette.gbapal");
-const u8 Tiles_zone_5_act_1_bg[]
-    = INCBIN_U8("data/maps/zone_5/act_1/tilemaps/bg/tiles.4bpp");
-const u16 Tilemap_zone_5_act_1_bg[]
-    = INCBIN_U16("data/maps/zone_5/act_1/tilemaps/bg/tilemap.tilemap2");
+const u16 Palette_zone_5_act_1_bg[] = INCBIN_U16("data/maps/zone_5/act_1/tilemaps/bg/palette.gbapal");
+const u8 Tiles_zone_5_act_1_bg[] = INCBIN_U8("data/maps/zone_5/act_1/tilemaps/bg/tiles.4bpp");
+const u16 Tilemap_zone_5_act_1_bg[] = INCBIN_U16("data/maps/zone_5/act_1/tilemaps/bg/tilemap.tilemap2");
 
 const Tilemap zone_5_act_1_bg = {
     .xTiles = 32,
diff --git a/data/maps/zone_5/act_1/tilemaps/fg/header.c b/data/maps/zone_5/act_1/tilemaps/fg/header.c
index a11cd4642..cccbda676 100644
--- a/data/maps/zone_5/act_1/tilemaps/fg/header.c
+++ b/data/maps/zone_5/act_1/tilemaps/fg/header.c
@@ -1,24 +1,16 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_5_act_1_fg[]
-    = INCBIN_U16("data/maps/zone_5/act_1/tilemaps/fg/palette.gbapal");
-const u8 Tileset_zone_5_act_1_fg[]
-    = INCBIN_U8("data/maps/zone_5/act_1/tilemaps/fg/tileset.4bpp");
-const s8 CollHeightMap_zone_5_act_1_fg[]
-    = INCBIN_U8("data/maps/zone_5/act_1/tilemaps/fg/height_map.coll");
-const u8 CollTileRot_zone_5_act_1_fg[]
-    = INCBIN_U8("data/maps/zone_5/act_1/tilemaps/fg/tile_rot.coll");
-const u16 CollFlags_zone_5_act_1_fg[]
-    = INCBIN_U16("data/maps/zone_5/act_1/tilemaps/fg/flags.coll");
-const u16 Metatiles_zone_5_act_1_fg[]
-    = INCBIN_U16("data/maps/zone_5/act_1/tilemaps/fg/metatiles.tilemap2");
+const u16 Palette_zone_5_act_1_fg[] = INCBIN_U16("data/maps/zone_5/act_1/tilemaps/fg/palette.gbapal");
+const u8 Tileset_zone_5_act_1_fg[] = INCBIN_U8("data/maps/zone_5/act_1/tilemaps/fg/tileset.4bpp");
+const s8 CollHeightMap_zone_5_act_1_fg[] = INCBIN_U8("data/maps/zone_5/act_1/tilemaps/fg/height_map.coll");
+const u8 CollTileRot_zone_5_act_1_fg[] = INCBIN_U8("data/maps/zone_5/act_1/tilemaps/fg/tile_rot.coll");
+const u16 CollFlags_zone_5_act_1_fg[] = INCBIN_U16("data/maps/zone_5/act_1/tilemaps/fg/flags.coll");
+const u16 Metatiles_zone_5_act_1_fg[] = INCBIN_U16("data/maps/zone_5/act_1/tilemaps/fg/metatiles.tilemap2");
 
-const u16 Map_zone_5_act_1_fg0[]
-    = INCBIN_U16("data/maps/zone_5/act_1/tilemaps/fg/map_front.bin");
+const u16 Map_zone_5_act_1_fg0[] = INCBIN_U16("data/maps/zone_5/act_1/tilemaps/fg/map_front.bin");
 
-const u16 Map_zone_5_act_1_fg1[]
-    = INCBIN_U16("data/maps/zone_5/act_1/tilemaps/fg/map_back.bin");
+const u16 Map_zone_5_act_1_fg1[] = INCBIN_U16("data/maps/zone_5/act_1/tilemaps/fg/map_back.bin");
 
 ALIGNED(4) const struct MapHeader MapHeader_zone_5_act_1_fg0 = 
 {
diff --git a/data/maps/zone_5/act_2/tilemaps/bg/header.c b/data/maps/zone_5/act_2/tilemaps/bg/header.c
index ac0b249ac..9ee9fd30e 100644
--- a/data/maps/zone_5/act_2/tilemaps/bg/header.c
+++ b/data/maps/zone_5/act_2/tilemaps/bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_5_act_2_bg[]
-    = INCBIN_U16("data/maps/zone_5/act_2/tilemaps/bg/palette.gbapal");
-const u8 Tiles_zone_5_act_2_bg[]
-    = INCBIN_U8("data/maps/zone_5/act_2/tilemaps/bg/tiles.4bpp");
-const u16 Tilemap_zone_5_act_2_bg[]
-    = INCBIN_U16("data/maps/zone_5/act_2/tilemaps/bg/tilemap.tilemap2");
+const u16 Palette_zone_5_act_2_bg[] = INCBIN_U16("data/maps/zone_5/act_2/tilemaps/bg/palette.gbapal");
+const u8 Tiles_zone_5_act_2_bg[] = INCBIN_U8("data/maps/zone_5/act_2/tilemaps/bg/tiles.4bpp");
+const u16 Tilemap_zone_5_act_2_bg[] = INCBIN_U16("data/maps/zone_5/act_2/tilemaps/bg/tilemap.tilemap2");
 
 const Tilemap zone_5_act_2_bg = {
     .xTiles = 32,
diff --git a/data/maps/zone_5/act_2/tilemaps/fg/header.c b/data/maps/zone_5/act_2/tilemaps/fg/header.c
index e0021315d..6f57ad418 100644
--- a/data/maps/zone_5/act_2/tilemaps/fg/header.c
+++ b/data/maps/zone_5/act_2/tilemaps/fg/header.c
@@ -1,24 +1,16 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_5_act_2_fg[]
-    = INCBIN_U16("data/maps/zone_5/act_2/tilemaps/fg/palette.gbapal");
-const u8 Tileset_zone_5_act_2_fg[]
-    = INCBIN_U8("data/maps/zone_5/act_2/tilemaps/fg/tileset.4bpp");
-const s8 CollHeightMap_zone_5_act_2_fg[]
-    = INCBIN_U8("data/maps/zone_5/act_2/tilemaps/fg/height_map.coll");
-const u8 CollTileRot_zone_5_act_2_fg[]
-    = INCBIN_U8("data/maps/zone_5/act_2/tilemaps/fg/tile_rot.coll");
-const u16 CollFlags_zone_5_act_2_fg[]
-    = INCBIN_U16("data/maps/zone_5/act_2/tilemaps/fg/flags.coll");
-const u16 Metatiles_zone_5_act_2_fg[]
-    = INCBIN_U16("data/maps/zone_5/act_2/tilemaps/fg/metatiles.tilemap2");
+const u16 Palette_zone_5_act_2_fg[] = INCBIN_U16("data/maps/zone_5/act_2/tilemaps/fg/palette.gbapal");
+const u8 Tileset_zone_5_act_2_fg[] = INCBIN_U8("data/maps/zone_5/act_2/tilemaps/fg/tileset.4bpp");
+const s8 CollHeightMap_zone_5_act_2_fg[] = INCBIN_U8("data/maps/zone_5/act_2/tilemaps/fg/height_map.coll");
+const u8 CollTileRot_zone_5_act_2_fg[] = INCBIN_U8("data/maps/zone_5/act_2/tilemaps/fg/tile_rot.coll");
+const u16 CollFlags_zone_5_act_2_fg[] = INCBIN_U16("data/maps/zone_5/act_2/tilemaps/fg/flags.coll");
+const u16 Metatiles_zone_5_act_2_fg[] = INCBIN_U16("data/maps/zone_5/act_2/tilemaps/fg/metatiles.tilemap2");
 
-const u16 Map_zone_5_act_2_fg0[]
-    = INCBIN_U16("data/maps/zone_5/act_2/tilemaps/fg/map_front.bin");
+const u16 Map_zone_5_act_2_fg0[] = INCBIN_U16("data/maps/zone_5/act_2/tilemaps/fg/map_front.bin");
 
-const u16 Map_zone_5_act_2_fg1[]
-    = INCBIN_U16("data/maps/zone_5/act_2/tilemaps/fg/map_back.bin");
+const u16 Map_zone_5_act_2_fg1[] = INCBIN_U16("data/maps/zone_5/act_2/tilemaps/fg/map_back.bin");
 
 ALIGNED(4) const struct MapHeader MapHeader_zone_5_act_2_fg0 = 
 {
diff --git a/data/maps/zone_5/act_boss/tilemaps/bg/header.c b/data/maps/zone_5/act_boss/tilemaps/bg/header.c
index bf8493402..44776b162 100644
--- a/data/maps/zone_5/act_boss/tilemaps/bg/header.c
+++ b/data/maps/zone_5/act_boss/tilemaps/bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_5_act_boss_bg[]
-    = INCBIN_U16("data/maps/zone_5/act_boss/tilemaps/bg/palette.gbapal");
-const u8 Tiles_zone_5_act_boss_bg[]
-    = INCBIN_U8("data/maps/zone_5/act_boss/tilemaps/bg/tiles.4bpp");
-const u16 Tilemap_zone_5_act_boss_bg[]
-    = INCBIN_U16("data/maps/zone_5/act_boss/tilemaps/bg/tilemap.tilemap2");
+const u16 Palette_zone_5_act_boss_bg[] = INCBIN_U16("data/maps/zone_5/act_boss/tilemaps/bg/palette.gbapal");
+const u8 Tiles_zone_5_act_boss_bg[] = INCBIN_U8("data/maps/zone_5/act_boss/tilemaps/bg/tiles.4bpp");
+const u16 Tilemap_zone_5_act_boss_bg[] = INCBIN_U16("data/maps/zone_5/act_boss/tilemaps/bg/tilemap.tilemap2");
 
 const Tilemap zone_5_act_boss_bg = {
     .xTiles = 32,
diff --git a/data/maps/zone_5/act_boss/tilemaps/fg/header.c b/data/maps/zone_5/act_boss/tilemaps/fg/header.c
index 8eea9dac4..627d62c46 100644
--- a/data/maps/zone_5/act_boss/tilemaps/fg/header.c
+++ b/data/maps/zone_5/act_boss/tilemaps/fg/header.c
@@ -1,24 +1,16 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_5_act_boss_fg[]
-    = INCBIN_U16("data/maps/zone_5/act_boss/tilemaps/fg/palette.gbapal");
-const u8 Tileset_zone_5_act_boss_fg[]
-    = INCBIN_U8("data/maps/zone_5/act_boss/tilemaps/fg/tileset.4bpp");
-const s8 CollHeightMap_zone_5_act_boss_fg[]
-    = INCBIN_U8("data/maps/zone_5/act_boss/tilemaps/fg/height_map.coll");
-const u8 CollTileRot_zone_5_act_boss_fg[]
-    = INCBIN_U8("data/maps/zone_5/act_boss/tilemaps/fg/tile_rot.coll");
-const u16 CollFlags_zone_5_act_boss_fg[]
-    = INCBIN_U16("data/maps/zone_5/act_boss/tilemaps/fg/flags.coll");
-const u16 Metatiles_zone_5_act_boss_fg[]
-    = INCBIN_U16("data/maps/zone_5/act_boss/tilemaps/fg/metatiles.tilemap2");
+const u16 Palette_zone_5_act_boss_fg[] = INCBIN_U16("data/maps/zone_5/act_boss/tilemaps/fg/palette.gbapal");
+const u8 Tileset_zone_5_act_boss_fg[] = INCBIN_U8("data/maps/zone_5/act_boss/tilemaps/fg/tileset.4bpp");
+const s8 CollHeightMap_zone_5_act_boss_fg[] = INCBIN_U8("data/maps/zone_5/act_boss/tilemaps/fg/height_map.coll");
+const u8 CollTileRot_zone_5_act_boss_fg[] = INCBIN_U8("data/maps/zone_5/act_boss/tilemaps/fg/tile_rot.coll");
+const u16 CollFlags_zone_5_act_boss_fg[] = INCBIN_U16("data/maps/zone_5/act_boss/tilemaps/fg/flags.coll");
+const u16 Metatiles_zone_5_act_boss_fg[] = INCBIN_U16("data/maps/zone_5/act_boss/tilemaps/fg/metatiles.tilemap2");
 
-const u16 Map_zone_5_act_boss_fg0[]
-    = INCBIN_U16("data/maps/zone_5/act_boss/tilemaps/fg/map_front.bin");
+const u16 Map_zone_5_act_boss_fg0[] = INCBIN_U16("data/maps/zone_5/act_boss/tilemaps/fg/map_front.bin");
 
-const u16 Map_zone_5_act_boss_fg1[]
-    = INCBIN_U16("data/maps/zone_5/act_boss/tilemaps/fg/map_back.bin");
+const u16 Map_zone_5_act_boss_fg1[] = INCBIN_U16("data/maps/zone_5/act_boss/tilemaps/fg/map_back.bin");
 
 ALIGNED(4) const struct MapHeader MapHeader_zone_5_act_boss_fg0 = 
 {
diff --git a/data/maps/zone_6/act_1/tilemaps/bg/header.c b/data/maps/zone_6/act_1/tilemaps/bg/header.c
index 164aa0096..103341bbb 100644
--- a/data/maps/zone_6/act_1/tilemaps/bg/header.c
+++ b/data/maps/zone_6/act_1/tilemaps/bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_6_act_1_bg[]
-    = INCBIN_U16("data/maps/zone_6/act_1/tilemaps/bg/palette.gbapal");
-const u8 Tiles_zone_6_act_1_bg[]
-    = INCBIN_U8("data/maps/zone_6/act_1/tilemaps/bg/tiles.4bpp");
-const u16 Tilemap_zone_6_act_1_bg[]
-    = INCBIN_U16("data/maps/zone_6/act_1/tilemaps/bg/tilemap.tilemap2");
+const u16 Palette_zone_6_act_1_bg[] = INCBIN_U16("data/maps/zone_6/act_1/tilemaps/bg/palette.gbapal");
+const u8 Tiles_zone_6_act_1_bg[] = INCBIN_U8("data/maps/zone_6/act_1/tilemaps/bg/tiles.4bpp");
+const u16 Tilemap_zone_6_act_1_bg[] = INCBIN_U16("data/maps/zone_6/act_1/tilemaps/bg/tilemap.tilemap2");
 
 const Tilemap zone_6_act_1_bg = {
     .xTiles = 32,
diff --git a/data/maps/zone_6/act_1/tilemaps/fg/header.c b/data/maps/zone_6/act_1/tilemaps/fg/header.c
index 98a89d447..a90fea769 100644
--- a/data/maps/zone_6/act_1/tilemaps/fg/header.c
+++ b/data/maps/zone_6/act_1/tilemaps/fg/header.c
@@ -1,26 +1,17 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_6_act_1_fg[]
-    = INCBIN_U16("data/maps/zone_6/act_1/tilemaps/fg/palette.gbapal");
-const u8 Tileset_zone_6_act_1_fg[]
-    = INCBIN_U8("data/maps/zone_6/act_1/tilemaps/fg/tileset.4bpp");
-const u8 Tileset_AnimTiles_zone_6_act_1_fg[]
-    = INCBIN_U8("data/maps/zone_6/act_1/tilemaps/fg/tileset_anim.4bpp");
-const s8 CollHeightMap_zone_6_act_1_fg[]
-    = INCBIN_U8("data/maps/zone_6/act_1/tilemaps/fg/height_map.coll");
-const u8 CollTileRot_zone_6_act_1_fg[]
-    = INCBIN_U8("data/maps/zone_6/act_1/tilemaps/fg/tile_rot.coll");
-const u16 CollFlags_zone_6_act_1_fg[]
-    = INCBIN_U16("data/maps/zone_6/act_1/tilemaps/fg/flags.coll");
-const u16 Metatiles_zone_6_act_1_fg[]
-    = INCBIN_U16("data/maps/zone_6/act_1/tilemaps/fg/metatiles.tilemap2");
+const u16 Palette_zone_6_act_1_fg[] = INCBIN_U16("data/maps/zone_6/act_1/tilemaps/fg/palette.gbapal");
+const u8 Tileset_zone_6_act_1_fg[] = INCBIN_U8("data/maps/zone_6/act_1/tilemaps/fg/tileset.4bpp");
+const u8 Tileset_AnimTiles_zone_6_act_1_fg[] = INCBIN_U8("data/maps/zone_6/act_1/tilemaps/fg/tileset_anim.4bpp");
+const s8 CollHeightMap_zone_6_act_1_fg[] = INCBIN_U8("data/maps/zone_6/act_1/tilemaps/fg/height_map.coll");
+const u8 CollTileRot_zone_6_act_1_fg[] = INCBIN_U8("data/maps/zone_6/act_1/tilemaps/fg/tile_rot.coll");
+const u16 CollFlags_zone_6_act_1_fg[] = INCBIN_U16("data/maps/zone_6/act_1/tilemaps/fg/flags.coll");
+const u16 Metatiles_zone_6_act_1_fg[] = INCBIN_U16("data/maps/zone_6/act_1/tilemaps/fg/metatiles.tilemap2");
 
-const u16 Map_zone_6_act_1_fg0[]
-    = INCBIN_U16("data/maps/zone_6/act_1/tilemaps/fg/map_front.bin");
+const u16 Map_zone_6_act_1_fg0[] = INCBIN_U16("data/maps/zone_6/act_1/tilemaps/fg/map_front.bin");
 
-const u16 Map_zone_6_act_1_fg1[]
-    = INCBIN_U16("data/maps/zone_6/act_1/tilemaps/fg/map_back.bin");
+const u16 Map_zone_6_act_1_fg1[] = INCBIN_U16("data/maps/zone_6/act_1/tilemaps/fg/map_back.bin");
 
 ALIGNED(4) const struct MapHeader MapHeader_zone_6_act_1_fg0 = 
 {
diff --git a/data/maps/zone_6/act_2/tilemaps/bg/header.c b/data/maps/zone_6/act_2/tilemaps/bg/header.c
index dcd4f9abc..a9287cba4 100644
--- a/data/maps/zone_6/act_2/tilemaps/bg/header.c
+++ b/data/maps/zone_6/act_2/tilemaps/bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_6_act_2_bg[]
-    = INCBIN_U16("data/maps/zone_6/act_2/tilemaps/bg/palette.gbapal");
-const u8 Tiles_zone_6_act_2_bg[]
-    = INCBIN_U8("data/maps/zone_6/act_2/tilemaps/bg/tiles.4bpp");
-const u16 Tilemap_zone_6_act_2_bg[]
-    = INCBIN_U16("data/maps/zone_6/act_2/tilemaps/bg/tilemap.tilemap2");
+const u16 Palette_zone_6_act_2_bg[] = INCBIN_U16("data/maps/zone_6/act_2/tilemaps/bg/palette.gbapal");
+const u8 Tiles_zone_6_act_2_bg[] = INCBIN_U8("data/maps/zone_6/act_2/tilemaps/bg/tiles.4bpp");
+const u16 Tilemap_zone_6_act_2_bg[] = INCBIN_U16("data/maps/zone_6/act_2/tilemaps/bg/tilemap.tilemap2");
 
 const Tilemap zone_6_act_2_bg = {
     .xTiles = 32,
diff --git a/data/maps/zone_6/act_2/tilemaps/fg/header.c b/data/maps/zone_6/act_2/tilemaps/fg/header.c
index 8d6d1bdc0..5bfe1cdf8 100644
--- a/data/maps/zone_6/act_2/tilemaps/fg/header.c
+++ b/data/maps/zone_6/act_2/tilemaps/fg/header.c
@@ -1,26 +1,17 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_6_act_2_fg[]
-    = INCBIN_U16("data/maps/zone_6/act_2/tilemaps/fg/palette.gbapal");
-const u8 Tileset_zone_6_act_2_fg[]
-    = INCBIN_U8("data/maps/zone_6/act_2/tilemaps/fg/tileset.4bpp");
-const u8 Tileset_AnimTiles_zone_6_act_2_fg[]
-    = INCBIN_U8("data/maps/zone_6/act_2/tilemaps/fg/tileset_anim.4bpp");
-const s8 CollHeightMap_zone_6_act_2_fg[]
-    = INCBIN_U8("data/maps/zone_6/act_2/tilemaps/fg/height_map.coll");
-const u8 CollTileRot_zone_6_act_2_fg[]
-    = INCBIN_U8("data/maps/zone_6/act_2/tilemaps/fg/tile_rot.coll");
-const u16 CollFlags_zone_6_act_2_fg[]
-    = INCBIN_U16("data/maps/zone_6/act_2/tilemaps/fg/flags.coll");
-const u16 Metatiles_zone_6_act_2_fg[]
-    = INCBIN_U16("data/maps/zone_6/act_2/tilemaps/fg/metatiles.tilemap2");
+const u16 Palette_zone_6_act_2_fg[] = INCBIN_U16("data/maps/zone_6/act_2/tilemaps/fg/palette.gbapal");
+const u8 Tileset_zone_6_act_2_fg[] = INCBIN_U8("data/maps/zone_6/act_2/tilemaps/fg/tileset.4bpp");
+const u8 Tileset_AnimTiles_zone_6_act_2_fg[] = INCBIN_U8("data/maps/zone_6/act_2/tilemaps/fg/tileset_anim.4bpp");
+const s8 CollHeightMap_zone_6_act_2_fg[] = INCBIN_U8("data/maps/zone_6/act_2/tilemaps/fg/height_map.coll");
+const u8 CollTileRot_zone_6_act_2_fg[] = INCBIN_U8("data/maps/zone_6/act_2/tilemaps/fg/tile_rot.coll");
+const u16 CollFlags_zone_6_act_2_fg[] = INCBIN_U16("data/maps/zone_6/act_2/tilemaps/fg/flags.coll");
+const u16 Metatiles_zone_6_act_2_fg[] = INCBIN_U16("data/maps/zone_6/act_2/tilemaps/fg/metatiles.tilemap2");
 
-const u16 Map_zone_6_act_2_fg0[]
-    = INCBIN_U16("data/maps/zone_6/act_2/tilemaps/fg/map_front.bin");
+const u16 Map_zone_6_act_2_fg0[] = INCBIN_U16("data/maps/zone_6/act_2/tilemaps/fg/map_front.bin");
 
-const u16 Map_zone_6_act_2_fg1[]
-    = INCBIN_U16("data/maps/zone_6/act_2/tilemaps/fg/map_back.bin");
+const u16 Map_zone_6_act_2_fg1[] = INCBIN_U16("data/maps/zone_6/act_2/tilemaps/fg/map_back.bin");
 
 ALIGNED(4) const struct MapHeader MapHeader_zone_6_act_2_fg0 = 
 {
diff --git a/data/maps/zone_6/act_boss/tilemaps/bg/header.c b/data/maps/zone_6/act_boss/tilemaps/bg/header.c
index a0c37e3fb..01f1d3ad6 100644
--- a/data/maps/zone_6/act_boss/tilemaps/bg/header.c
+++ b/data/maps/zone_6/act_boss/tilemaps/bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_6_act_boss_bg[]
-    = INCBIN_U16("data/maps/zone_6/act_boss/tilemaps/bg/palette.gbapal");
-const u8 Tiles_zone_6_act_boss_bg[]
-    = INCBIN_U8("data/maps/zone_6/act_boss/tilemaps/bg/tiles.4bpp");
-const u16 Tilemap_zone_6_act_boss_bg[]
-    = INCBIN_U16("data/maps/zone_6/act_boss/tilemaps/bg/tilemap.tilemap2");
+const u16 Palette_zone_6_act_boss_bg[] = INCBIN_U16("data/maps/zone_6/act_boss/tilemaps/bg/palette.gbapal");
+const u8 Tiles_zone_6_act_boss_bg[] = INCBIN_U8("data/maps/zone_6/act_boss/tilemaps/bg/tiles.4bpp");
+const u16 Tilemap_zone_6_act_boss_bg[] = INCBIN_U16("data/maps/zone_6/act_boss/tilemaps/bg/tilemap.tilemap2");
 
 const Tilemap zone_6_act_boss_bg = {
     .xTiles = 32,
diff --git a/data/maps/zone_6/act_boss/tilemaps/fg/header.c b/data/maps/zone_6/act_boss/tilemaps/fg/header.c
index 1e5f8e440..d1922d8c8 100644
--- a/data/maps/zone_6/act_boss/tilemaps/fg/header.c
+++ b/data/maps/zone_6/act_boss/tilemaps/fg/header.c
@@ -1,26 +1,17 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_6_act_boss_fg[]
-    = INCBIN_U16("data/maps/zone_6/act_boss/tilemaps/fg/palette.gbapal");
-const u8 Tileset_zone_6_act_boss_fg[]
-    = INCBIN_U8("data/maps/zone_6/act_boss/tilemaps/fg/tileset.4bpp");
-const u8 Tileset_AnimTiles_zone_6_act_boss_fg[]
-    = INCBIN_U8("data/maps/zone_6/act_boss/tilemaps/fg/tileset_anim.4bpp");
-const s8 CollHeightMap_zone_6_act_boss_fg[]
-    = INCBIN_U8("data/maps/zone_6/act_boss/tilemaps/fg/height_map.coll");
-const u8 CollTileRot_zone_6_act_boss_fg[]
-    = INCBIN_U8("data/maps/zone_6/act_boss/tilemaps/fg/tile_rot.coll");
-const u16 CollFlags_zone_6_act_boss_fg[]
-    = INCBIN_U16("data/maps/zone_6/act_boss/tilemaps/fg/flags.coll");
-const u16 Metatiles_zone_6_act_boss_fg[]
-    = INCBIN_U16("data/maps/zone_6/act_boss/tilemaps/fg/metatiles.tilemap2");
+const u16 Palette_zone_6_act_boss_fg[] = INCBIN_U16("data/maps/zone_6/act_boss/tilemaps/fg/palette.gbapal");
+const u8 Tileset_zone_6_act_boss_fg[] = INCBIN_U8("data/maps/zone_6/act_boss/tilemaps/fg/tileset.4bpp");
+const u8 Tileset_AnimTiles_zone_6_act_boss_fg[] = INCBIN_U8("data/maps/zone_6/act_boss/tilemaps/fg/tileset_anim.4bpp");
+const s8 CollHeightMap_zone_6_act_boss_fg[] = INCBIN_U8("data/maps/zone_6/act_boss/tilemaps/fg/height_map.coll");
+const u8 CollTileRot_zone_6_act_boss_fg[] = INCBIN_U8("data/maps/zone_6/act_boss/tilemaps/fg/tile_rot.coll");
+const u16 CollFlags_zone_6_act_boss_fg[] = INCBIN_U16("data/maps/zone_6/act_boss/tilemaps/fg/flags.coll");
+const u16 Metatiles_zone_6_act_boss_fg[] = INCBIN_U16("data/maps/zone_6/act_boss/tilemaps/fg/metatiles.tilemap2");
 
-const u16 Map_zone_6_act_boss_fg0[]
-    = INCBIN_U16("data/maps/zone_6/act_boss/tilemaps/fg/map_front.bin");
+const u16 Map_zone_6_act_boss_fg0[] = INCBIN_U16("data/maps/zone_6/act_boss/tilemaps/fg/map_front.bin");
 
-const u16 Map_zone_6_act_boss_fg1[]
-    = INCBIN_U16("data/maps/zone_6/act_boss/tilemaps/fg/map_back.bin");
+const u16 Map_zone_6_act_boss_fg1[] = INCBIN_U16("data/maps/zone_6/act_boss/tilemaps/fg/map_back.bin");
 
 ALIGNED(4) const struct MapHeader MapHeader_zone_6_act_boss_fg0 = 
 {
diff --git a/data/maps/zone_7/act_1/tilemaps/bg/header.c b/data/maps/zone_7/act_1/tilemaps/bg/header.c
index 389563b5a..ab634e207 100644
--- a/data/maps/zone_7/act_1/tilemaps/bg/header.c
+++ b/data/maps/zone_7/act_1/tilemaps/bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_7_act_1_bg[]
-    = INCBIN_U16("data/maps/zone_7/act_1/tilemaps/bg/palette.gbapal");
-const u8 Tiles_zone_7_act_1_bg[]
-    = INCBIN_U8("data/maps/zone_7/act_1/tilemaps/bg/tiles.4bpp");
-const u16 Tilemap_zone_7_act_1_bg[]
-    = INCBIN_U16("data/maps/zone_7/act_1/tilemaps/bg/tilemap.tilemap2");
+const u16 Palette_zone_7_act_1_bg[] = INCBIN_U16("data/maps/zone_7/act_1/tilemaps/bg/palette.gbapal");
+const u8 Tiles_zone_7_act_1_bg[] = INCBIN_U8("data/maps/zone_7/act_1/tilemaps/bg/tiles.4bpp");
+const u16 Tilemap_zone_7_act_1_bg[] = INCBIN_U16("data/maps/zone_7/act_1/tilemaps/bg/tilemap.tilemap2");
 
 const Tilemap zone_7_act_1_bg = {
     .xTiles = 32,
diff --git a/data/maps/zone_7/act_1/tilemaps/fg/header.c b/data/maps/zone_7/act_1/tilemaps/fg/header.c
index c5b12df9d..d198db2c1 100644
--- a/data/maps/zone_7/act_1/tilemaps/fg/header.c
+++ b/data/maps/zone_7/act_1/tilemaps/fg/header.c
@@ -1,24 +1,16 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_7_act_1_fg[]
-    = INCBIN_U16("data/maps/zone_7/act_1/tilemaps/fg/palette.gbapal");
-const u8 Tileset_zone_7_act_1_fg[]
-    = INCBIN_U8("data/maps/zone_7/act_1/tilemaps/fg/tileset.4bpp");
-const s8 CollHeightMap_zone_7_act_1_fg[]
-    = INCBIN_U8("data/maps/zone_7/act_1/tilemaps/fg/height_map.coll");
-const u8 CollTileRot_zone_7_act_1_fg[]
-    = INCBIN_U8("data/maps/zone_7/act_1/tilemaps/fg/tile_rot.coll");
-const u16 CollFlags_zone_7_act_1_fg[]
-    = INCBIN_U16("data/maps/zone_7/act_1/tilemaps/fg/flags.coll");
-const u16 Metatiles_zone_7_act_1_fg[]
-    = INCBIN_U16("data/maps/zone_7/act_1/tilemaps/fg/metatiles.tilemap2");
+const u16 Palette_zone_7_act_1_fg[] = INCBIN_U16("data/maps/zone_7/act_1/tilemaps/fg/palette.gbapal");
+const u8 Tileset_zone_7_act_1_fg[] = INCBIN_U8("data/maps/zone_7/act_1/tilemaps/fg/tileset.4bpp");
+const s8 CollHeightMap_zone_7_act_1_fg[] = INCBIN_U8("data/maps/zone_7/act_1/tilemaps/fg/height_map.coll");
+const u8 CollTileRot_zone_7_act_1_fg[] = INCBIN_U8("data/maps/zone_7/act_1/tilemaps/fg/tile_rot.coll");
+const u16 CollFlags_zone_7_act_1_fg[] = INCBIN_U16("data/maps/zone_7/act_1/tilemaps/fg/flags.coll");
+const u16 Metatiles_zone_7_act_1_fg[] = INCBIN_U16("data/maps/zone_7/act_1/tilemaps/fg/metatiles.tilemap2");
 
-const u16 Map_zone_7_act_1_fg0[]
-    = INCBIN_U16("data/maps/zone_7/act_1/tilemaps/fg/map_front.bin");
+const u16 Map_zone_7_act_1_fg0[] = INCBIN_U16("data/maps/zone_7/act_1/tilemaps/fg/map_front.bin");
 
-const u16 Map_zone_7_act_1_fg1[]
-    = INCBIN_U16("data/maps/zone_7/act_1/tilemaps/fg/map_back.bin");
+const u16 Map_zone_7_act_1_fg1[] = INCBIN_U16("data/maps/zone_7/act_1/tilemaps/fg/map_back.bin");
 
 ALIGNED(4) const struct MapHeader MapHeader_zone_7_act_1_fg0 = 
 {
diff --git a/data/maps/zone_7/act_2/tilemaps/bg/header.c b/data/maps/zone_7/act_2/tilemaps/bg/header.c
index 263de9293..f228acbc8 100644
--- a/data/maps/zone_7/act_2/tilemaps/bg/header.c
+++ b/data/maps/zone_7/act_2/tilemaps/bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_7_act_2_bg[]
-    = INCBIN_U16("data/maps/zone_7/act_2/tilemaps/bg/palette.gbapal");
-const u8 Tiles_zone_7_act_2_bg[]
-    = INCBIN_U8("data/maps/zone_7/act_2/tilemaps/bg/tiles.4bpp");
-const u16 Tilemap_zone_7_act_2_bg[]
-    = INCBIN_U16("data/maps/zone_7/act_2/tilemaps/bg/tilemap.tilemap2");
+const u16 Palette_zone_7_act_2_bg[] = INCBIN_U16("data/maps/zone_7/act_2/tilemaps/bg/palette.gbapal");
+const u8 Tiles_zone_7_act_2_bg[] = INCBIN_U8("data/maps/zone_7/act_2/tilemaps/bg/tiles.4bpp");
+const u16 Tilemap_zone_7_act_2_bg[] = INCBIN_U16("data/maps/zone_7/act_2/tilemaps/bg/tilemap.tilemap2");
 
 const Tilemap zone_7_act_2_bg = {
     .xTiles = 32,
diff --git a/data/maps/zone_7/act_2/tilemaps/fg/header.c b/data/maps/zone_7/act_2/tilemaps/fg/header.c
index c3c2697d9..72376ccb0 100644
--- a/data/maps/zone_7/act_2/tilemaps/fg/header.c
+++ b/data/maps/zone_7/act_2/tilemaps/fg/header.c
@@ -1,24 +1,16 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_7_act_2_fg[]
-    = INCBIN_U16("data/maps/zone_7/act_2/tilemaps/fg/palette.gbapal");
-const u8 Tileset_zone_7_act_2_fg[]
-    = INCBIN_U8("data/maps/zone_7/act_2/tilemaps/fg/tileset.4bpp");
-const s8 CollHeightMap_zone_7_act_2_fg[]
-    = INCBIN_U8("data/maps/zone_7/act_2/tilemaps/fg/height_map.coll");
-const u8 CollTileRot_zone_7_act_2_fg[]
-    = INCBIN_U8("data/maps/zone_7/act_2/tilemaps/fg/tile_rot.coll");
-const u16 CollFlags_zone_7_act_2_fg[]
-    = INCBIN_U16("data/maps/zone_7/act_2/tilemaps/fg/flags.coll");
-const u16 Metatiles_zone_7_act_2_fg[]
-    = INCBIN_U16("data/maps/zone_7/act_2/tilemaps/fg/metatiles.tilemap2");
+const u16 Palette_zone_7_act_2_fg[] = INCBIN_U16("data/maps/zone_7/act_2/tilemaps/fg/palette.gbapal");
+const u8 Tileset_zone_7_act_2_fg[] = INCBIN_U8("data/maps/zone_7/act_2/tilemaps/fg/tileset.4bpp");
+const s8 CollHeightMap_zone_7_act_2_fg[] = INCBIN_U8("data/maps/zone_7/act_2/tilemaps/fg/height_map.coll");
+const u8 CollTileRot_zone_7_act_2_fg[] = INCBIN_U8("data/maps/zone_7/act_2/tilemaps/fg/tile_rot.coll");
+const u16 CollFlags_zone_7_act_2_fg[] = INCBIN_U16("data/maps/zone_7/act_2/tilemaps/fg/flags.coll");
+const u16 Metatiles_zone_7_act_2_fg[] = INCBIN_U16("data/maps/zone_7/act_2/tilemaps/fg/metatiles.tilemap2");
 
-const u16 Map_zone_7_act_2_fg0[]
-    = INCBIN_U16("data/maps/zone_7/act_2/tilemaps/fg/map_front.bin");
+const u16 Map_zone_7_act_2_fg0[] = INCBIN_U16("data/maps/zone_7/act_2/tilemaps/fg/map_front.bin");
 
-const u16 Map_zone_7_act_2_fg1[]
-    = INCBIN_U16("data/maps/zone_7/act_2/tilemaps/fg/map_back.bin");
+const u16 Map_zone_7_act_2_fg1[] = INCBIN_U16("data/maps/zone_7/act_2/tilemaps/fg/map_back.bin");
 
 ALIGNED(4) const struct MapHeader MapHeader_zone_7_act_2_fg0 = 
 {
diff --git a/data/maps/zone_7/act_boss/tilemaps/bg/header.c b/data/maps/zone_7/act_boss/tilemaps/bg/header.c
index d01ea0023..d318699ec 100644
--- a/data/maps/zone_7/act_boss/tilemaps/bg/header.c
+++ b/data/maps/zone_7/act_boss/tilemaps/bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_7_act_boss_bg[]
-    = INCBIN_U16("data/maps/zone_7/act_boss/tilemaps/bg/palette.gbapal");
-const u8 Tiles_zone_7_act_boss_bg[]
-    = INCBIN_U8("data/maps/zone_7/act_boss/tilemaps/bg/tiles.4bpp");
-const u16 Tilemap_zone_7_act_boss_bg[]
-    = INCBIN_U16("data/maps/zone_7/act_boss/tilemaps/bg/tilemap.tilemap2");
+const u16 Palette_zone_7_act_boss_bg[] = INCBIN_U16("data/maps/zone_7/act_boss/tilemaps/bg/palette.gbapal");
+const u8 Tiles_zone_7_act_boss_bg[] = INCBIN_U8("data/maps/zone_7/act_boss/tilemaps/bg/tiles.4bpp");
+const u16 Tilemap_zone_7_act_boss_bg[] = INCBIN_U16("data/maps/zone_7/act_boss/tilemaps/bg/tilemap.tilemap2");
 
 const Tilemap zone_7_act_boss_bg = {
     .xTiles = 32,
diff --git a/data/maps/zone_7/act_boss/tilemaps/fg/header.c b/data/maps/zone_7/act_boss/tilemaps/fg/header.c
index cb5f54dc9..e16600f8c 100644
--- a/data/maps/zone_7/act_boss/tilemaps/fg/header.c
+++ b/data/maps/zone_7/act_boss/tilemaps/fg/header.c
@@ -1,24 +1,16 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_7_act_boss_fg[]
-    = INCBIN_U16("data/maps/zone_7/act_boss/tilemaps/fg/palette.gbapal");
-const u8 Tileset_zone_7_act_boss_fg[]
-    = INCBIN_U8("data/maps/zone_7/act_boss/tilemaps/fg/tileset.4bpp");
-const s8 CollHeightMap_zone_7_act_boss_fg[]
-    = INCBIN_U8("data/maps/zone_7/act_boss/tilemaps/fg/height_map.coll");
-const u8 CollTileRot_zone_7_act_boss_fg[]
-    = INCBIN_U8("data/maps/zone_7/act_boss/tilemaps/fg/tile_rot.coll");
-const u16 CollFlags_zone_7_act_boss_fg[]
-    = INCBIN_U16("data/maps/zone_7/act_boss/tilemaps/fg/flags.coll");
-const u16 Metatiles_zone_7_act_boss_fg[]
-    = INCBIN_U16("data/maps/zone_7/act_boss/tilemaps/fg/metatiles.tilemap2");
+const u16 Palette_zone_7_act_boss_fg[] = INCBIN_U16("data/maps/zone_7/act_boss/tilemaps/fg/palette.gbapal");
+const u8 Tileset_zone_7_act_boss_fg[] = INCBIN_U8("data/maps/zone_7/act_boss/tilemaps/fg/tileset.4bpp");
+const s8 CollHeightMap_zone_7_act_boss_fg[] = INCBIN_U8("data/maps/zone_7/act_boss/tilemaps/fg/height_map.coll");
+const u8 CollTileRot_zone_7_act_boss_fg[] = INCBIN_U8("data/maps/zone_7/act_boss/tilemaps/fg/tile_rot.coll");
+const u16 CollFlags_zone_7_act_boss_fg[] = INCBIN_U16("data/maps/zone_7/act_boss/tilemaps/fg/flags.coll");
+const u16 Metatiles_zone_7_act_boss_fg[] = INCBIN_U16("data/maps/zone_7/act_boss/tilemaps/fg/metatiles.tilemap2");
 
-const u16 Map_zone_7_act_boss_fg0[]
-    = INCBIN_U16("data/maps/zone_7/act_boss/tilemaps/fg/map_front.bin");
+const u16 Map_zone_7_act_boss_fg0[] = INCBIN_U16("data/maps/zone_7/act_boss/tilemaps/fg/map_front.bin");
 
-const u16 Map_zone_7_act_boss_fg1[]
-    = INCBIN_U16("data/maps/zone_7/act_boss/tilemaps/fg/map_back.bin");
+const u16 Map_zone_7_act_boss_fg1[] = INCBIN_U16("data/maps/zone_7/act_boss/tilemaps/fg/map_back.bin");
 
 ALIGNED(4) const struct MapHeader MapHeader_zone_7_act_boss_fg0 = 
 {
diff --git a/data/maps/zone_final/act_ta53/tilemaps/bg/header.c b/data/maps/zone_final/act_ta53/tilemaps/bg/header.c
index b60a8c5d1..db339e3ec 100644
--- a/data/maps/zone_final/act_ta53/tilemaps/bg/header.c
+++ b/data/maps/zone_final/act_ta53/tilemaps/bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_final_act_ta53_bg[]
-    = INCBIN_U16("data/maps/zone_final/act_ta53/tilemaps/bg/palette.gbapal");
-const u8 Tiles_zone_final_act_ta53_bg[]
-    = INCBIN_U8("data/maps/zone_final/act_ta53/tilemaps/bg/tiles.4bpp");
-const u16 Tilemap_zone_final_act_ta53_bg[]
-    = INCBIN_U16("data/maps/zone_final/act_ta53/tilemaps/bg/tilemap.tilemap2");
+const u16 Palette_zone_final_act_ta53_bg[] = INCBIN_U16("data/maps/zone_final/act_ta53/tilemaps/bg/palette.gbapal");
+const u8 Tiles_zone_final_act_ta53_bg[] = INCBIN_U8("data/maps/zone_final/act_ta53/tilemaps/bg/tiles.4bpp");
+const u16 Tilemap_zone_final_act_ta53_bg[] = INCBIN_U16("data/maps/zone_final/act_ta53/tilemaps/bg/tilemap.tilemap2");
 
 const Tilemap zone_final_act_ta53_bg = {
     .xTiles = 32,
diff --git a/data/maps/zone_final/act_ta53/tilemaps/fg/header.c b/data/maps/zone_final/act_ta53/tilemaps/fg/header.c
index aa7fa7a21..b7b80c5dc 100644
--- a/data/maps/zone_final/act_ta53/tilemaps/fg/header.c
+++ b/data/maps/zone_final/act_ta53/tilemaps/fg/header.c
@@ -1,24 +1,16 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_final_act_ta53_fg[]
-    = INCBIN_U16("data/maps/zone_final/act_ta53/tilemaps/fg/palette.gbapal");
-const u8 Tileset_zone_final_act_ta53_fg[]
-    = INCBIN_U8("data/maps/zone_final/act_ta53/tilemaps/fg/tileset.4bpp");
-const s8 CollHeightMap_zone_final_act_ta53_fg[]
-    = INCBIN_U8("data/maps/zone_final/act_ta53/tilemaps/fg/height_map.coll");
-const u8 CollTileRot_zone_final_act_ta53_fg[]
-    = INCBIN_U8("data/maps/zone_final/act_ta53/tilemaps/fg/tile_rot.coll");
-const u16 CollFlags_zone_final_act_ta53_fg[]
-    = INCBIN_U16("data/maps/zone_final/act_ta53/tilemaps/fg/flags.coll");
-const u16 Metatiles_zone_final_act_ta53_fg[]
-    = INCBIN_U16("data/maps/zone_final/act_ta53/tilemaps/fg/metatiles.tilemap2");
+const u16 Palette_zone_final_act_ta53_fg[] = INCBIN_U16("data/maps/zone_final/act_ta53/tilemaps/fg/palette.gbapal");
+const u8 Tileset_zone_final_act_ta53_fg[] = INCBIN_U8("data/maps/zone_final/act_ta53/tilemaps/fg/tileset.4bpp");
+const s8 CollHeightMap_zone_final_act_ta53_fg[] = INCBIN_U8("data/maps/zone_final/act_ta53/tilemaps/fg/height_map.coll");
+const u8 CollTileRot_zone_final_act_ta53_fg[] = INCBIN_U8("data/maps/zone_final/act_ta53/tilemaps/fg/tile_rot.coll");
+const u16 CollFlags_zone_final_act_ta53_fg[] = INCBIN_U16("data/maps/zone_final/act_ta53/tilemaps/fg/flags.coll");
+const u16 Metatiles_zone_final_act_ta53_fg[] = INCBIN_U16("data/maps/zone_final/act_ta53/tilemaps/fg/metatiles.tilemap2");
 
-const u16 Map_zone_final_act_ta53_fg0[]
-    = INCBIN_U16("data/maps/zone_final/act_ta53/tilemaps/fg/map_front.bin");
+const u16 Map_zone_final_act_ta53_fg0[] = INCBIN_U16("data/maps/zone_final/act_ta53/tilemaps/fg/map_front.bin");
 
-const u16 Map_zone_final_act_ta53_fg1[]
-    = INCBIN_U16("data/maps/zone_final/act_ta53/tilemaps/fg/map_back.bin");
+const u16 Map_zone_final_act_ta53_fg1[] = INCBIN_U16("data/maps/zone_final/act_ta53/tilemaps/fg/map_back.bin");
 
 ALIGNED(4) const struct MapHeader MapHeader_zone_final_act_ta53_fg0 = 
 {
@@ -60,14 +52,13 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_final_act_ta53_fg1 =
     .mapHeight = 3,
 };
 
-const Collision CollHeader_zone_final_act_ta53_fg
-    = { CollHeightMap_zone_final_act_ta53_fg,
-        CollTileRot_zone_final_act_ta53_fg,
-        Metatiles_zone_final_act_ta53_fg,
-        Map_zone_final_act_ta53_fg0,
-        Map_zone_final_act_ta53_fg1,
-        CollFlags_zone_final_act_ta53_fg,
-        90,
-        3,
-        0x21C0,
-        0x0120 };
+const Collision CollHeader_zone_final_act_ta53_fg = { CollHeightMap_zone_final_act_ta53_fg,
+                                                      CollTileRot_zone_final_act_ta53_fg,
+                                                      Metatiles_zone_final_act_ta53_fg,
+                                                      Map_zone_final_act_ta53_fg0,
+                                                      Map_zone_final_act_ta53_fg1,
+                                                      CollFlags_zone_final_act_ta53_fg,
+                                                      90,
+                                                      3,
+                                                      0x21C0,
+                                                      0x0120 };
diff --git a/data/maps/zone_final/act_unused/tilemaps/bg/header.c b/data/maps/zone_final/act_unused/tilemaps/bg/header.c
index 0e58f56a7..9ccc51a26 100644
--- a/data/maps/zone_final/act_unused/tilemaps/bg/header.c
+++ b/data/maps/zone_final/act_unused/tilemaps/bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_final_act_unused_bg[]
-    = INCBIN_U16("data/maps/zone_final/act_unused/tilemaps/bg/palette.gbapal");
-const u8 Tiles_zone_final_act_unused_bg[]
-    = INCBIN_U8("data/maps/zone_final/act_unused/tilemaps/bg/tiles.4bpp");
-const u16 Tilemap_zone_final_act_unused_bg[]
-    = INCBIN_U16("data/maps/zone_final/act_unused/tilemaps/bg/tilemap.tilemap2");
+const u16 Palette_zone_final_act_unused_bg[] = INCBIN_U16("data/maps/zone_final/act_unused/tilemaps/bg/palette.gbapal");
+const u8 Tiles_zone_final_act_unused_bg[] = INCBIN_U8("data/maps/zone_final/act_unused/tilemaps/bg/tiles.4bpp");
+const u16 Tilemap_zone_final_act_unused_bg[] = INCBIN_U16("data/maps/zone_final/act_unused/tilemaps/bg/tilemap.tilemap2");
 
 const Tilemap zone_final_act_unused_bg = {
     .xTiles = 32,
diff --git a/data/maps/zone_final/act_unused/tilemaps/fg/header.c b/data/maps/zone_final/act_unused/tilemaps/fg/header.c
index c766c8ddc..0e78d763a 100644
--- a/data/maps/zone_final/act_unused/tilemaps/fg/header.c
+++ b/data/maps/zone_final/act_unused/tilemaps/fg/header.c
@@ -1,23 +1,16 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_final_act_unused_fg[]
-    = INCBIN_U16("data/maps/zone_final/act_unused/tilemaps/fg/palette.gbapal");
+const u16 Palette_zone_final_act_unused_fg[] = INCBIN_U16("data/maps/zone_final/act_unused/tilemaps/fg/palette.gbapal");
 const u8 Tileset_zone_final_act_unused_fg[] = { 0xFF, 0xFF, 0xFF, 0xFF };
-const s8 CollHeightMap_zone_final_act_unused_fg[]
-    = INCBIN_U8("data/maps/zone_final/act_unused/tilemaps/fg/height_map.coll");
-const u8 CollTileRot_zone_final_act_unused_fg[]
-    = INCBIN_U8("data/maps/zone_final/act_unused/tilemaps/fg/tile_rot.coll");
-const u16 CollFlags_zone_final_act_unused_fg[]
-    = INCBIN_U16("data/maps/zone_final/act_unused/tilemaps/fg/flags.coll");
-const u16 Metatiles_zone_final_act_unused_fg[]
-    = INCBIN_U16("data/maps/zone_final/act_unused/tilemaps/fg/metatiles.tilemap2");
+const s8 CollHeightMap_zone_final_act_unused_fg[] = INCBIN_U8("data/maps/zone_final/act_unused/tilemaps/fg/height_map.coll");
+const u8 CollTileRot_zone_final_act_unused_fg[] = INCBIN_U8("data/maps/zone_final/act_unused/tilemaps/fg/tile_rot.coll");
+const u16 CollFlags_zone_final_act_unused_fg[] = INCBIN_U16("data/maps/zone_final/act_unused/tilemaps/fg/flags.coll");
+const u16 Metatiles_zone_final_act_unused_fg[] = INCBIN_U16("data/maps/zone_final/act_unused/tilemaps/fg/metatiles.tilemap2");
 
-const u16 Map_zone_final_act_unused_fg0[]
-    = INCBIN_U16("data/maps/zone_final/act_unused/tilemaps/fg/map_front.bin");
+const u16 Map_zone_final_act_unused_fg0[] = INCBIN_U16("data/maps/zone_final/act_unused/tilemaps/fg/map_front.bin");
 
-const u16 Map_zone_final_act_unused_fg1[]
-    = INCBIN_U16("data/maps/zone_final/act_unused/tilemaps/fg/map_back.bin");
+const u16 Map_zone_final_act_unused_fg1[] = INCBIN_U16("data/maps/zone_final/act_unused/tilemaps/fg/map_back.bin");
 
 // = 0x08933538
 ALIGNED(4) const struct MapHeader MapHeader_zone_final_act_unused_fg0 = 
@@ -61,14 +54,13 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_final_act_unused_fg1 =
     .mapHeight = 12,
 };
 
-const Collision CollHeader_zone_final_act_unused_fg
-    = { CollHeightMap_zone_final_act_unused_fg, // -> 0x0892F744
-        CollTileRot_zone_final_act_unused_fg, // -> 0x0892FFC4
-        Metatiles_zone_final_act_unused_fg, // -> 0x08930118
-        Map_zone_final_act_unused_fg0, // -> 0x08933178
-        Map_zone_final_act_unused_fg1, // -> 0x08933358
-        CollFlags_zone_final_act_unused_fg, // -> 0x089300D4
-        20,
-        12,
-        0x0780,
-        0x0480 };
+const Collision CollHeader_zone_final_act_unused_fg = { CollHeightMap_zone_final_act_unused_fg, // -> 0x0892F744
+                                                        CollTileRot_zone_final_act_unused_fg, // -> 0x0892FFC4
+                                                        Metatiles_zone_final_act_unused_fg, // -> 0x08930118
+                                                        Map_zone_final_act_unused_fg0, // -> 0x08933178
+                                                        Map_zone_final_act_unused_fg1, // -> 0x08933358
+                                                        CollFlags_zone_final_act_unused_fg, // -> 0x089300D4
+                                                        20,
+                                                        12,
+                                                        0x0780,
+                                                        0x0480 };
diff --git a/data/maps/zone_final/act_xx/tilemaps/bg/header.c b/data/maps/zone_final/act_xx/tilemaps/bg/header.c
index f1a9cfcd5..8f07c3b75 100644
--- a/data/maps/zone_final/act_xx/tilemaps/bg/header.c
+++ b/data/maps/zone_final/act_xx/tilemaps/bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_final_act_xx_bg[]
-    = INCBIN_U16("data/maps/zone_final/act_xx/tilemaps/bg/palette.gbapal");
-const u8 Tiles_zone_final_act_xx_bg[]
-    = INCBIN_U8("data/maps/zone_final/act_xx/tilemaps/bg/tiles.4bpp");
-const u16 Tilemap_zone_final_act_xx_bg[]
-    = INCBIN_U16("data/maps/zone_final/act_xx/tilemaps/bg/tilemap.tilemap2");
+const u16 Palette_zone_final_act_xx_bg[] = INCBIN_U16("data/maps/zone_final/act_xx/tilemaps/bg/palette.gbapal");
+const u8 Tiles_zone_final_act_xx_bg[] = INCBIN_U8("data/maps/zone_final/act_xx/tilemaps/bg/tiles.4bpp");
+const u16 Tilemap_zone_final_act_xx_bg[] = INCBIN_U16("data/maps/zone_final/act_xx/tilemaps/bg/tilemap.tilemap2");
 
 const Tilemap zone_final_act_xx_bg = {
     .xTiles = 32,
diff --git a/data/maps/zone_final/act_xx/tilemaps/fg/header.c b/data/maps/zone_final/act_xx/tilemaps/fg/header.c
index 1de900148..ba61bd2c7 100644
--- a/data/maps/zone_final/act_xx/tilemaps/fg/header.c
+++ b/data/maps/zone_final/act_xx/tilemaps/fg/header.c
@@ -1,24 +1,16 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_final_act_xx_fg[]
-    = INCBIN_U16("data/maps/zone_final/act_xx/tilemaps/fg/palette.gbapal");
-const u8 Tileset_zone_final_act_xx_fg[]
-    = INCBIN_U8("data/maps/zone_final/act_xx/tilemaps/fg/tileset.4bpp");
-const s8 CollHeightMap_zone_final_act_xx_fg[]
-    = INCBIN_U8("data/maps/zone_final/act_xx/tilemaps/fg/height_map.coll");
-const u8 CollTileRot_zone_final_act_xx_fg[]
-    = INCBIN_U8("data/maps/zone_final/act_xx/tilemaps/fg/tile_rot.coll");
-const u16 CollFlags_zone_final_act_xx_fg[]
-    = INCBIN_U16("data/maps/zone_final/act_xx/tilemaps/fg/flags.coll");
-const u16 Metatiles_zone_final_act_xx_fg[]
-    = INCBIN_U16("data/maps/zone_final/act_xx/tilemaps/fg/metatiles.tilemap2");
+const u16 Palette_zone_final_act_xx_fg[] = INCBIN_U16("data/maps/zone_final/act_xx/tilemaps/fg/palette.gbapal");
+const u8 Tileset_zone_final_act_xx_fg[] = INCBIN_U8("data/maps/zone_final/act_xx/tilemaps/fg/tileset.4bpp");
+const s8 CollHeightMap_zone_final_act_xx_fg[] = INCBIN_U8("data/maps/zone_final/act_xx/tilemaps/fg/height_map.coll");
+const u8 CollTileRot_zone_final_act_xx_fg[] = INCBIN_U8("data/maps/zone_final/act_xx/tilemaps/fg/tile_rot.coll");
+const u16 CollFlags_zone_final_act_xx_fg[] = INCBIN_U16("data/maps/zone_final/act_xx/tilemaps/fg/flags.coll");
+const u16 Metatiles_zone_final_act_xx_fg[] = INCBIN_U16("data/maps/zone_final/act_xx/tilemaps/fg/metatiles.tilemap2");
 
-const u16 Map_zone_final_act_xx_fg0[]
-    = INCBIN_U16("data/maps/zone_final/act_xx/tilemaps/fg/map_front.bin");
+const u16 Map_zone_final_act_xx_fg0[] = INCBIN_U16("data/maps/zone_final/act_xx/tilemaps/fg/map_front.bin");
 
-const u16 Map_zone_final_act_xx_fg1[]
-    = INCBIN_U16("data/maps/zone_final/act_xx/tilemaps/fg/map_back.bin");
+const u16 Map_zone_final_act_xx_fg1[] = INCBIN_U16("data/maps/zone_final/act_xx/tilemaps/fg/map_back.bin");
 
 ALIGNED(4) const struct MapHeader MapHeader_zone_final_act_xx_fg0 = 
 {
diff --git a/data/tilemaps/character_select_background/header.c b/data/tilemaps/character_select_background/header.c
index 88e3fc14f..719e87881 100644
--- a/data/tilemaps/character_select_background/header.c
+++ b/data/tilemaps/character_select_background/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_character_select_background[]
-    = INCBIN_U16("data/tilemaps/character_select_background/palette.gbapal");
-const u8 Tiles_character_select_background[]
-    = INCBIN_U8("data/tilemaps/character_select_background/tiles.4bpp");
-const u16 Tilemap_character_select_background[]
-    = INCBIN_U16("data/tilemaps/character_select_background/tilemap.tilemap2");
+const u16 Palette_character_select_background[] = INCBIN_U16("data/tilemaps/character_select_background/palette.gbapal");
+const u8 Tiles_character_select_background[] = INCBIN_U8("data/tilemaps/character_select_background/tiles.4bpp");
+const u16 Tilemap_character_select_background[] = INCBIN_U16("data/tilemaps/character_select_background/tilemap.tilemap2");
 
 const Tilemap character_select_background = {
     .xTiles = 30,
diff --git a/data/tilemaps/character_select_background_0/header.c b/data/tilemaps/character_select_background_0/header.c
index 8a6b00ea8..d274f36b1 100644
--- a/data/tilemaps/character_select_background_0/header.c
+++ b/data/tilemaps/character_select_background_0/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_character_select_background_0[]
-    = INCBIN_U16("data/tilemaps/character_select_background_0/palette.gbapal");
-const u8 Tiles_character_select_background_0[]
-    = INCBIN_U8("data/tilemaps/character_select_background_0/tiles.4bpp");
-const u16 Tilemap_character_select_background_0[]
-    = INCBIN_U16("data/tilemaps/character_select_background_0/tilemap.tilemap2");
+const u16 Palette_character_select_background_0[] = INCBIN_U16("data/tilemaps/character_select_background_0/palette.gbapal");
+const u8 Tiles_character_select_background_0[] = INCBIN_U8("data/tilemaps/character_select_background_0/tiles.4bpp");
+const u16 Tilemap_character_select_background_0[] = INCBIN_U16("data/tilemaps/character_select_background_0/tilemap.tilemap2");
 
 const Tilemap character_select_background_0 = {
     .xTiles = 32,
diff --git a/data/tilemaps/character_select_background_1/header.c b/data/tilemaps/character_select_background_1/header.c
index aa400b0d6..ac632f53f 100644
--- a/data/tilemaps/character_select_background_1/header.c
+++ b/data/tilemaps/character_select_background_1/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_character_select_background_1[]
-    = INCBIN_U16("data/tilemaps/character_select_background_1/palette.gbapal");
-const u8 Tiles_character_select_background_1[]
-    = INCBIN_U8("data/tilemaps/character_select_background_1/tiles.4bpp");
-const u16 Tilemap_character_select_background_1[]
-    = INCBIN_U16("data/tilemaps/character_select_background_1/tilemap.tilemap2");
+const u16 Palette_character_select_background_1[] = INCBIN_U16("data/tilemaps/character_select_background_1/palette.gbapal");
+const u8 Tiles_character_select_background_1[] = INCBIN_U8("data/tilemaps/character_select_background_1/tiles.4bpp");
+const u16 Tilemap_character_select_background_1[] = INCBIN_U16("data/tilemaps/character_select_background_1/tilemap.tilemap2");
 
 const Tilemap character_select_background_1 = {
     .xTiles = 32,
diff --git a/data/tilemaps/character_select_wheel/header.c b/data/tilemaps/character_select_wheel/header.c
index 20e249852..98575eb9b 100644
--- a/data/tilemaps/character_select_wheel/header.c
+++ b/data/tilemaps/character_select_wheel/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_character_select_wheel[]
-    = INCBIN_U16("data/tilemaps/character_select_wheel/palette.gbapal");
-const u8 Tiles_character_select_wheel[]
-    = INCBIN_U8("data/tilemaps/character_select_wheel/tiles.4bpp");
-const u16 Tilemap_character_select_wheel[]
-    = INCBIN_U16("data/tilemaps/character_select_wheel/tilemap.tilemap2");
+const u16 Palette_character_select_wheel[] = INCBIN_U16("data/tilemaps/character_select_wheel/palette.gbapal");
+const u8 Tiles_character_select_wheel[] = INCBIN_U8("data/tilemaps/character_select_wheel/tiles.4bpp");
+const u16 Tilemap_character_select_wheel[] = INCBIN_U16("data/tilemaps/character_select_wheel/tilemap.tilemap2");
 
 const Tilemap character_select_wheel = {
     .xTiles = 30,
diff --git a/data/tilemaps/collect_all_chaos_emeralds_de/header.c b/data/tilemaps/collect_all_chaos_emeralds_de/header.c
index 626485090..efe51aa5a 100644
--- a/data/tilemaps/collect_all_chaos_emeralds_de/header.c
+++ b/data/tilemaps/collect_all_chaos_emeralds_de/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_collect_all_chaos_emeralds_de[]
-    = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_de/palette.gbapal");
-const u8 Tiles_collect_all_chaos_emeralds_de[]
-    = INCBIN_U8("data/tilemaps/collect_all_chaos_emeralds_de/tiles.4bpp");
-const u16 Tilemap_collect_all_chaos_emeralds_de[]
-    = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_de/tilemap.tilemap2");
+const u16 Palette_collect_all_chaos_emeralds_de[] = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_de/palette.gbapal");
+const u8 Tiles_collect_all_chaos_emeralds_de[] = INCBIN_U8("data/tilemaps/collect_all_chaos_emeralds_de/tiles.4bpp");
+const u16 Tilemap_collect_all_chaos_emeralds_de[] = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_de/tilemap.tilemap2");
 
 const Tilemap collect_all_chaos_emeralds_de = {
     .xTiles = 30,
diff --git a/data/tilemaps/collect_all_chaos_emeralds_en/header.c b/data/tilemaps/collect_all_chaos_emeralds_en/header.c
index 561d86f06..ff3e762b4 100644
--- a/data/tilemaps/collect_all_chaos_emeralds_en/header.c
+++ b/data/tilemaps/collect_all_chaos_emeralds_en/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_collect_all_chaos_emeralds_en[]
-    = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_en/palette.gbapal");
-const u8 Tiles_collect_all_chaos_emeralds_en[]
-    = INCBIN_U8("data/tilemaps/collect_all_chaos_emeralds_en/tiles.4bpp");
-const u16 Tilemap_collect_all_chaos_emeralds_en[]
-    = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_en/tilemap.tilemap2");
+const u16 Palette_collect_all_chaos_emeralds_en[] = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_en/palette.gbapal");
+const u8 Tiles_collect_all_chaos_emeralds_en[] = INCBIN_U8("data/tilemaps/collect_all_chaos_emeralds_en/tiles.4bpp");
+const u16 Tilemap_collect_all_chaos_emeralds_en[] = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_en/tilemap.tilemap2");
 
 const Tilemap collect_all_chaos_emeralds_en = {
     .xTiles = 30,
diff --git a/data/tilemaps/collect_all_chaos_emeralds_es/header.c b/data/tilemaps/collect_all_chaos_emeralds_es/header.c
index 996c3c41f..4c59df2df 100644
--- a/data/tilemaps/collect_all_chaos_emeralds_es/header.c
+++ b/data/tilemaps/collect_all_chaos_emeralds_es/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_collect_all_chaos_emeralds_es[]
-    = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_es/palette.gbapal");
-const u8 Tiles_collect_all_chaos_emeralds_es[]
-    = INCBIN_U8("data/tilemaps/collect_all_chaos_emeralds_es/tiles.4bpp");
-const u16 Tilemap_collect_all_chaos_emeralds_es[]
-    = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_es/tilemap.tilemap2");
+const u16 Palette_collect_all_chaos_emeralds_es[] = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_es/palette.gbapal");
+const u8 Tiles_collect_all_chaos_emeralds_es[] = INCBIN_U8("data/tilemaps/collect_all_chaos_emeralds_es/tiles.4bpp");
+const u16 Tilemap_collect_all_chaos_emeralds_es[] = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_es/tilemap.tilemap2");
 
 const Tilemap collect_all_chaos_emeralds_es = {
     .xTiles = 30,
diff --git a/data/tilemaps/collect_all_chaos_emeralds_fr/header.c b/data/tilemaps/collect_all_chaos_emeralds_fr/header.c
index 4782c5aac..f62852efe 100644
--- a/data/tilemaps/collect_all_chaos_emeralds_fr/header.c
+++ b/data/tilemaps/collect_all_chaos_emeralds_fr/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_collect_all_chaos_emeralds_fr[]
-    = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_fr/palette.gbapal");
-const u8 Tiles_collect_all_chaos_emeralds_fr[]
-    = INCBIN_U8("data/tilemaps/collect_all_chaos_emeralds_fr/tiles.4bpp");
-const u16 Tilemap_collect_all_chaos_emeralds_fr[]
-    = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_fr/tilemap.tilemap2");
+const u16 Palette_collect_all_chaos_emeralds_fr[] = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_fr/palette.gbapal");
+const u8 Tiles_collect_all_chaos_emeralds_fr[] = INCBIN_U8("data/tilemaps/collect_all_chaos_emeralds_fr/tiles.4bpp");
+const u16 Tilemap_collect_all_chaos_emeralds_fr[] = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_fr/tilemap.tilemap2");
 
 const Tilemap collect_all_chaos_emeralds_fr = {
     .xTiles = 30,
diff --git a/data/tilemaps/collect_all_chaos_emeralds_it/header.c b/data/tilemaps/collect_all_chaos_emeralds_it/header.c
index d62f5e340..67f86a028 100644
--- a/data/tilemaps/collect_all_chaos_emeralds_it/header.c
+++ b/data/tilemaps/collect_all_chaos_emeralds_it/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_collect_all_chaos_emeralds_it[]
-    = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_it/palette.gbapal");
-const u8 Tiles_collect_all_chaos_emeralds_it[]
-    = INCBIN_U8("data/tilemaps/collect_all_chaos_emeralds_it/tiles.4bpp");
-const u16 Tilemap_collect_all_chaos_emeralds_it[]
-    = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_it/tilemap.tilemap2");
+const u16 Palette_collect_all_chaos_emeralds_it[] = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_it/palette.gbapal");
+const u8 Tiles_collect_all_chaos_emeralds_it[] = INCBIN_U8("data/tilemaps/collect_all_chaos_emeralds_it/tiles.4bpp");
+const u16 Tilemap_collect_all_chaos_emeralds_it[] = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_it/tilemap.tilemap2");
 
 const Tilemap collect_all_chaos_emeralds_it = {
     .xTiles = 30,
diff --git a/data/tilemaps/collect_all_chaos_emeralds_jp/header.c b/data/tilemaps/collect_all_chaos_emeralds_jp/header.c
index 4acbfe655..e167fca07 100644
--- a/data/tilemaps/collect_all_chaos_emeralds_jp/header.c
+++ b/data/tilemaps/collect_all_chaos_emeralds_jp/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_collect_all_chaos_emeralds_jp[]
-    = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_jp/palette.gbapal");
-const u8 Tiles_collect_all_chaos_emeralds_jp[]
-    = INCBIN_U8("data/tilemaps/collect_all_chaos_emeralds_jp/tiles.4bpp");
-const u16 Tilemap_collect_all_chaos_emeralds_jp[]
-    = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_jp/tilemap.tilemap2");
+const u16 Palette_collect_all_chaos_emeralds_jp[] = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_jp/palette.gbapal");
+const u8 Tiles_collect_all_chaos_emeralds_jp[] = INCBIN_U8("data/tilemaps/collect_all_chaos_emeralds_jp/tiles.4bpp");
+const u16 Tilemap_collect_all_chaos_emeralds_jp[] = INCBIN_U16("data/tilemaps/collect_all_chaos_emeralds_jp/tilemap.tilemap2");
 
 const Tilemap collect_all_chaos_emeralds_jp = {
     .xTiles = 30,
diff --git a/data/tilemaps/credits_copyright/header.c b/data/tilemaps/credits_copyright/header.c
index c726a6d7b..c3f754538 100644
--- a/data/tilemaps/credits_copyright/header.c
+++ b/data/tilemaps/credits_copyright/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_credits_copyright[]
-    = INCBIN_U16("data/tilemaps/credits_copyright/palette.gbapal");
-const u8 Tiles_credits_copyright[]
-    = INCBIN_U8("data/tilemaps/credits_copyright/tiles.4bpp");
-const u16 Tilemap_credits_copyright[]
-    = INCBIN_U16("data/tilemaps/credits_copyright/tilemap.tilemap2");
+const u16 Palette_credits_copyright[] = INCBIN_U16("data/tilemaps/credits_copyright/palette.gbapal");
+const u8 Tiles_credits_copyright[] = INCBIN_U8("data/tilemaps/credits_copyright/tiles.4bpp");
+const u16 Tilemap_credits_copyright[] = INCBIN_U16("data/tilemaps/credits_copyright/tilemap.tilemap2");
 
 const Tilemap credits_copyright = {
     .xTiles = 30,
diff --git a/data/tilemaps/credits_presented_by_sega/header.c b/data/tilemaps/credits_presented_by_sega/header.c
index 8c311e779..600468a59 100644
--- a/data/tilemaps/credits_presented_by_sega/header.c
+++ b/data/tilemaps/credits_presented_by_sega/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_credits_presented_by_sega[]
-    = INCBIN_U16("data/tilemaps/credits_presented_by_sega/palette.gbapal");
-const u8 Tiles_credits_presented_by_sega[]
-    = INCBIN_U8("data/tilemaps/credits_presented_by_sega/tiles.4bpp");
-const u16 Tilemap_credits_presented_by_sega[]
-    = INCBIN_U16("data/tilemaps/credits_presented_by_sega/tilemap.tilemap2");
+const u16 Palette_credits_presented_by_sega[] = INCBIN_U16("data/tilemaps/credits_presented_by_sega/palette.gbapal");
+const u8 Tiles_credits_presented_by_sega[] = INCBIN_U8("data/tilemaps/credits_presented_by_sega/tiles.4bpp");
+const u16 Tilemap_credits_presented_by_sega[] = INCBIN_U16("data/tilemaps/credits_presented_by_sega/tilemap.tilemap2");
 
 const Tilemap credits_presented_by_sega = {
     .xTiles = 30,
diff --git a/data/tilemaps/credits_sa2_logo_en/header.c b/data/tilemaps/credits_sa2_logo_en/header.c
index 944d4f914..798ae783e 100644
--- a/data/tilemaps/credits_sa2_logo_en/header.c
+++ b/data/tilemaps/credits_sa2_logo_en/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_credits_sa2_logo_en[]
-    = INCBIN_U16("data/tilemaps/credits_sa2_logo_en/palette.gbapal");
-const u8 Tiles_credits_sa2_logo_en[]
-    = INCBIN_U8("data/tilemaps/credits_sa2_logo_en/tiles.4bpp");
-const u16 Tilemap_credits_sa2_logo_en[]
-    = INCBIN_U16("data/tilemaps/credits_sa2_logo_en/tilemap.tilemap2");
+const u16 Palette_credits_sa2_logo_en[] = INCBIN_U16("data/tilemaps/credits_sa2_logo_en/palette.gbapal");
+const u8 Tiles_credits_sa2_logo_en[] = INCBIN_U8("data/tilemaps/credits_sa2_logo_en/tiles.4bpp");
+const u16 Tilemap_credits_sa2_logo_en[] = INCBIN_U16("data/tilemaps/credits_sa2_logo_en/tilemap.tilemap2");
 
 const Tilemap credits_sa2_logo_en = {
     .xTiles = 30,
diff --git a/data/tilemaps/credits_sa2_logo_jp/header.c b/data/tilemaps/credits_sa2_logo_jp/header.c
index 404e14af1..c1b10eda1 100644
--- a/data/tilemaps/credits_sa2_logo_jp/header.c
+++ b/data/tilemaps/credits_sa2_logo_jp/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_credits_sa2_logo_jp[]
-    = INCBIN_U16("data/tilemaps/credits_sa2_logo_jp/palette.gbapal");
-const u8 Tiles_credits_sa2_logo_jp[]
-    = INCBIN_U8("data/tilemaps/credits_sa2_logo_jp/tiles.4bpp");
-const u16 Tilemap_credits_sa2_logo_jp[]
-    = INCBIN_U16("data/tilemaps/credits_sa2_logo_jp/tilemap.tilemap2");
+const u16 Palette_credits_sa2_logo_jp[] = INCBIN_U16("data/tilemaps/credits_sa2_logo_jp/palette.gbapal");
+const u8 Tiles_credits_sa2_logo_jp[] = INCBIN_U8("data/tilemaps/credits_sa2_logo_jp/tiles.4bpp");
+const u16 Tilemap_credits_sa2_logo_jp[] = INCBIN_U16("data/tilemaps/credits_sa2_logo_jp/tilemap.tilemap2");
 
 const Tilemap credits_sa2_logo_jp = {
     .xTiles = 30,
diff --git a/data/tilemaps/cutscene_final_ending_fall_bg/header.c b/data/tilemaps/cutscene_final_ending_fall_bg/header.c
index 131b47d79..66edc3767 100644
--- a/data/tilemaps/cutscene_final_ending_fall_bg/header.c
+++ b/data/tilemaps/cutscene_final_ending_fall_bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_cutscene_final_ending_fall_bg[]
-    = INCBIN_U16("data/tilemaps/cutscene_final_ending_fall_bg/palette.gbapal");
-const u8 Tiles_cutscene_final_ending_fall_bg[]
-    = INCBIN_U8("data/tilemaps/cutscene_final_ending_fall_bg/tiles.4bpp");
-const u16 Tilemap_cutscene_final_ending_fall_bg[]
-    = INCBIN_U16("data/tilemaps/cutscene_final_ending_fall_bg/tilemap.tilemap2");
+const u16 Palette_cutscene_final_ending_fall_bg[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_fall_bg/palette.gbapal");
+const u8 Tiles_cutscene_final_ending_fall_bg[] = INCBIN_U8("data/tilemaps/cutscene_final_ending_fall_bg/tiles.4bpp");
+const u16 Tilemap_cutscene_final_ending_fall_bg[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_fall_bg/tilemap.tilemap2");
 
 const Tilemap cutscene_final_ending_fall_bg = {
     .xTiles = 32,
diff --git a/data/tilemaps/cutscene_final_ending_fall_bg_dark/header.c b/data/tilemaps/cutscene_final_ending_fall_bg_dark/header.c
index 0c6803c20..492fda145 100644
--- a/data/tilemaps/cutscene_final_ending_fall_bg_dark/header.c
+++ b/data/tilemaps/cutscene_final_ending_fall_bg_dark/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_cutscene_final_ending_fall_bg_dark[]
-    = INCBIN_U16("data/tilemaps/cutscene_final_ending_fall_bg_dark/palette.gbapal");
-const u8 Tiles_cutscene_final_ending_fall_bg_dark[]
-    = INCBIN_U8("data/tilemaps/cutscene_final_ending_fall_bg_dark/tiles.4bpp");
-const u16 Tilemap_cutscene_final_ending_fall_bg_dark[]
-    = INCBIN_U16("data/tilemaps/cutscene_final_ending_fall_bg_dark/tilemap.tilemap2");
+const u16 Palette_cutscene_final_ending_fall_bg_dark[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_fall_bg_dark/palette.gbapal");
+const u8 Tiles_cutscene_final_ending_fall_bg_dark[] = INCBIN_U8("data/tilemaps/cutscene_final_ending_fall_bg_dark/tiles.4bpp");
+const u16 Tilemap_cutscene_final_ending_fall_bg_dark[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_fall_bg_dark/tilemap.tilemap2");
 
 const Tilemap cutscene_final_ending_fall_bg_dark = {
     .xTiles = 32,
diff --git a/data/tilemaps/cutscene_final_ending_fall_bg_dark_2/header.c b/data/tilemaps/cutscene_final_ending_fall_bg_dark_2/header.c
index 8af6729ea..e0e90484c 100644
--- a/data/tilemaps/cutscene_final_ending_fall_bg_dark_2/header.c
+++ b/data/tilemaps/cutscene_final_ending_fall_bg_dark_2/header.c
@@ -1,10 +1,8 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_cutscene_final_ending_fall_bg_dark_2[]
-    = INCBIN_U16("data/tilemaps/cutscene_final_ending_fall_bg_dark_2/palette.gbapal");
-const u8 Tiles_cutscene_final_ending_fall_bg_dark_2[]
-    = INCBIN_U8("data/tilemaps/cutscene_final_ending_fall_bg_dark_2/tiles.4bpp");
+const u16 Palette_cutscene_final_ending_fall_bg_dark_2[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_fall_bg_dark_2/palette.gbapal");
+const u8 Tiles_cutscene_final_ending_fall_bg_dark_2[] = INCBIN_U8("data/tilemaps/cutscene_final_ending_fall_bg_dark_2/tiles.4bpp");
 const u16 Tilemap_cutscene_final_ending_fall_bg_dark_2[]
     = INCBIN_U16("data/tilemaps/cutscene_final_ending_fall_bg_dark_2/tilemap.tilemap2");
 
diff --git a/data/tilemaps/cutscene_final_ending_fall_clouds/header.c b/data/tilemaps/cutscene_final_ending_fall_clouds/header.c
index f569717b4..396e6da9d 100644
--- a/data/tilemaps/cutscene_final_ending_fall_clouds/header.c
+++ b/data/tilemaps/cutscene_final_ending_fall_clouds/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_cutscene_final_ending_fall_clouds[]
-    = INCBIN_U16("data/tilemaps/cutscene_final_ending_fall_clouds/palette.gbapal");
-const u8 Tiles_cutscene_final_ending_fall_clouds[]
-    = INCBIN_U8("data/tilemaps/cutscene_final_ending_fall_clouds/tiles.4bpp");
-const u16 Tilemap_cutscene_final_ending_fall_clouds[]
-    = INCBIN_U16("data/tilemaps/cutscene_final_ending_fall_clouds/tilemap.tilemap2");
+const u16 Palette_cutscene_final_ending_fall_clouds[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_fall_clouds/palette.gbapal");
+const u8 Tiles_cutscene_final_ending_fall_clouds[] = INCBIN_U8("data/tilemaps/cutscene_final_ending_fall_clouds/tiles.4bpp");
+const u16 Tilemap_cutscene_final_ending_fall_clouds[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_fall_clouds/tilemap.tilemap2");
 
 const Tilemap cutscene_final_ending_fall_clouds = {
     .xTiles = 32,
diff --git a/data/tilemaps/cutscene_final_ending_land_bg/header.c b/data/tilemaps/cutscene_final_ending_land_bg/header.c
index 9f2a1948f..64f34eb4d 100644
--- a/data/tilemaps/cutscene_final_ending_land_bg/header.c
+++ b/data/tilemaps/cutscene_final_ending_land_bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_cutscene_final_ending_land_bg[]
-    = INCBIN_U16("data/tilemaps/cutscene_final_ending_land_bg/palette.gbapal");
-const u8 Tiles_cutscene_final_ending_land_bg[]
-    = INCBIN_U8("data/tilemaps/cutscene_final_ending_land_bg/tiles.4bpp");
-const u16 Tilemap_cutscene_final_ending_land_bg[]
-    = INCBIN_U16("data/tilemaps/cutscene_final_ending_land_bg/tilemap.tilemap2");
+const u16 Palette_cutscene_final_ending_land_bg[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_land_bg/palette.gbapal");
+const u8 Tiles_cutscene_final_ending_land_bg[] = INCBIN_U8("data/tilemaps/cutscene_final_ending_land_bg/tiles.4bpp");
+const u16 Tilemap_cutscene_final_ending_land_bg[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_land_bg/tilemap.tilemap2");
 
 const Tilemap cutscene_final_ending_land_bg = {
     .xTiles = 32,
diff --git a/data/tilemaps/cutscene_final_ending_land_bg_alt/header.c b/data/tilemaps/cutscene_final_ending_land_bg_alt/header.c
index 438048ff9..461702320 100644
--- a/data/tilemaps/cutscene_final_ending_land_bg_alt/header.c
+++ b/data/tilemaps/cutscene_final_ending_land_bg_alt/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_cutscene_final_ending_land_bg_alt[]
-    = INCBIN_U16("data/tilemaps/cutscene_final_ending_land_bg_alt/palette.gbapal");
-const u8 Tiles_cutscene_final_ending_land_bg_alt[]
-    = INCBIN_U8("data/tilemaps/cutscene_final_ending_land_bg_alt/tiles.4bpp");
-const u16 Tilemap_cutscene_final_ending_land_bg_alt[]
-    = INCBIN_U16("data/tilemaps/cutscene_final_ending_land_bg_alt/tilemap.tilemap2");
+const u16 Palette_cutscene_final_ending_land_bg_alt[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_land_bg_alt/palette.gbapal");
+const u8 Tiles_cutscene_final_ending_land_bg_alt[] = INCBIN_U8("data/tilemaps/cutscene_final_ending_land_bg_alt/tiles.4bpp");
+const u16 Tilemap_cutscene_final_ending_land_bg_alt[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_land_bg_alt/tilemap.tilemap2");
 
 const Tilemap cutscene_final_ending_land_bg_alt = {
     .xTiles = 32,
diff --git a/data/tilemaps/cutscene_final_ending_land_fg/header.c b/data/tilemaps/cutscene_final_ending_land_fg/header.c
index e2789184c..f4ff27150 100644
--- a/data/tilemaps/cutscene_final_ending_land_fg/header.c
+++ b/data/tilemaps/cutscene_final_ending_land_fg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_cutscene_final_ending_land_fg[]
-    = INCBIN_U16("data/tilemaps/cutscene_final_ending_land_fg/palette.gbapal");
-const u8 Tiles_cutscene_final_ending_land_fg[]
-    = INCBIN_U8("data/tilemaps/cutscene_final_ending_land_fg/tiles.4bpp");
-const u16 Tilemap_cutscene_final_ending_land_fg[]
-    = INCBIN_U16("data/tilemaps/cutscene_final_ending_land_fg/tilemap.tilemap2");
+const u16 Palette_cutscene_final_ending_land_fg[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_land_fg/palette.gbapal");
+const u8 Tiles_cutscene_final_ending_land_fg[] = INCBIN_U8("data/tilemaps/cutscene_final_ending_land_fg/tiles.4bpp");
+const u16 Tilemap_cutscene_final_ending_land_fg[] = INCBIN_U16("data/tilemaps/cutscene_final_ending_land_fg/tilemap.tilemap2");
 
 const Tilemap cutscene_final_ending_land_fg = {
     .xTiles = 32,
diff --git a/data/tilemaps/cutscene_final_ending_land_flower_field/header.c b/data/tilemaps/cutscene_final_ending_land_flower_field/header.c
index 6c9d40058..37284d063 100644
--- a/data/tilemaps/cutscene_final_ending_land_flower_field/header.c
+++ b/data/tilemaps/cutscene_final_ending_land_flower_field/header.c
@@ -3,10 +3,9 @@
 
 const u16 Palette_cutscene_final_ending_land_flower_field[]
     = INCBIN_U16("data/tilemaps/cutscene_final_ending_land_flower_field/palette.gbapal");
-const u8 Tiles_cutscene_final_ending_land_flower_field[]
-    = INCBIN_U8("data/tilemaps/cutscene_final_ending_land_flower_field/tiles.4bpp");
-const u16 Tilemap_cutscene_final_ending_land_flower_field[] = INCBIN_U16(
-    "data/tilemaps/cutscene_final_ending_land_flower_field/tilemap.tilemap2");
+const u8 Tiles_cutscene_final_ending_land_flower_field[] = INCBIN_U8("data/tilemaps/cutscene_final_ending_land_flower_field/tiles.4bpp");
+const u16 Tilemap_cutscene_final_ending_land_flower_field[]
+    = INCBIN_U16("data/tilemaps/cutscene_final_ending_land_flower_field/tilemap.tilemap2");
 
 const Tilemap cutscene_final_ending_land_flower_field = {
     .xTiles = 32,
diff --git a/data/tilemaps/cutscene_post_extra_boss_bg/header.c b/data/tilemaps/cutscene_post_extra_boss_bg/header.c
index 8c76a8697..71b0b8e4b 100644
--- a/data/tilemaps/cutscene_post_extra_boss_bg/header.c
+++ b/data/tilemaps/cutscene_post_extra_boss_bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_cutscene_post_extra_boss_bg[]
-    = INCBIN_U16("data/tilemaps/cutscene_post_extra_boss_bg/palette.gbapal");
-const u8 Tiles_cutscene_post_extra_boss_bg[]
-    = INCBIN_U8("data/tilemaps/cutscene_post_extra_boss_bg/tiles.4bpp");
-const u16 Tilemap_cutscene_post_extra_boss_bg[]
-    = INCBIN_U16("data/tilemaps/cutscene_post_extra_boss_bg/tilemap.tilemap2");
+const u16 Palette_cutscene_post_extra_boss_bg[] = INCBIN_U16("data/tilemaps/cutscene_post_extra_boss_bg/palette.gbapal");
+const u8 Tiles_cutscene_post_extra_boss_bg[] = INCBIN_U8("data/tilemaps/cutscene_post_extra_boss_bg/tiles.4bpp");
+const u16 Tilemap_cutscene_post_extra_boss_bg[] = INCBIN_U16("data/tilemaps/cutscene_post_extra_boss_bg/tilemap.tilemap2");
 
 const Tilemap cutscene_post_extra_boss_bg = {
     .xTiles = 32,
diff --git a/data/tilemaps/cutscene_vanilla_kidnapped_full_map/header.c b/data/tilemaps/cutscene_vanilla_kidnapped_full_map/header.c
index 38feec411..70b65f42e 100644
--- a/data/tilemaps/cutscene_vanilla_kidnapped_full_map/header.c
+++ b/data/tilemaps/cutscene_vanilla_kidnapped_full_map/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_cutscene_vanilla_kidnapped_full_map[]
-    = INCBIN_U16("data/tilemaps/cutscene_vanilla_kidnapped_full_map/palette.gbapal");
-const u8 Tiles_cutscene_vanilla_kidnapped_full_map[]
-    = INCBIN_U8("data/tilemaps/cutscene_vanilla_kidnapped_full_map/tiles.4bpp");
-const u16 Tilemap_cutscene_vanilla_kidnapped_full_map[]
-    = INCBIN_U16("data/tilemaps/cutscene_vanilla_kidnapped_full_map/tilemap.tilemap2");
+const u16 Palette_cutscene_vanilla_kidnapped_full_map[] = INCBIN_U16("data/tilemaps/cutscene_vanilla_kidnapped_full_map/palette.gbapal");
+const u8 Tiles_cutscene_vanilla_kidnapped_full_map[] = INCBIN_U8("data/tilemaps/cutscene_vanilla_kidnapped_full_map/tiles.4bpp");
+const u16 Tilemap_cutscene_vanilla_kidnapped_full_map[] = INCBIN_U16("data/tilemaps/cutscene_vanilla_kidnapped_full_map/tilemap.tilemap2");
 
 const Tilemap cutscene_vanilla_kidnapped_full_map = {
     .xTiles = 32,
diff --git a/data/tilemaps/cutscene_vanilla_kidnapped_full_map_copy/header.c b/data/tilemaps/cutscene_vanilla_kidnapped_full_map_copy/header.c
index 37571eb3d..fc4af93d3 100644
--- a/data/tilemaps/cutscene_vanilla_kidnapped_full_map_copy/header.c
+++ b/data/tilemaps/cutscene_vanilla_kidnapped_full_map_copy/header.c
@@ -1,12 +1,11 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_cutscene_vanilla_kidnapped_full_map_copy[] = INCBIN_U16(
-    "data/tilemaps/cutscene_vanilla_kidnapped_full_map_copy/palette.gbapal");
-const u8 Tiles_cutscene_vanilla_kidnapped_full_map_copy[]
-    = INCBIN_U8("data/tilemaps/cutscene_vanilla_kidnapped_full_map_copy/tiles.4bpp");
-const u16 Tilemap_cutscene_vanilla_kidnapped_full_map_copy[] = INCBIN_U16(
-    "data/tilemaps/cutscene_vanilla_kidnapped_full_map_copy/tilemap.tilemap2");
+const u16 Palette_cutscene_vanilla_kidnapped_full_map_copy[]
+    = INCBIN_U16("data/tilemaps/cutscene_vanilla_kidnapped_full_map_copy/palette.gbapal");
+const u8 Tiles_cutscene_vanilla_kidnapped_full_map_copy[] = INCBIN_U8("data/tilemaps/cutscene_vanilla_kidnapped_full_map_copy/tiles.4bpp");
+const u16 Tilemap_cutscene_vanilla_kidnapped_full_map_copy[]
+    = INCBIN_U16("data/tilemaps/cutscene_vanilla_kidnapped_full_map_copy/tilemap.tilemap2");
 
 const Tilemap cutscene_vanilla_kidnapped_full_map_copy = {
     .xTiles = 32,
diff --git a/data/tilemaps/cutscene_vanilla_kidnapped_super_sonic_art/header.c b/data/tilemaps/cutscene_vanilla_kidnapped_super_sonic_art/header.c
index 5af137f84..97d195b89 100644
--- a/data/tilemaps/cutscene_vanilla_kidnapped_super_sonic_art/header.c
+++ b/data/tilemaps/cutscene_vanilla_kidnapped_super_sonic_art/header.c
@@ -1,12 +1,12 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_cutscene_vanilla_kidnapped_super_sonic_art[] = INCBIN_U16(
-    "data/tilemaps/cutscene_vanilla_kidnapped_super_sonic_art/palette.gbapal");
+const u16 Palette_cutscene_vanilla_kidnapped_super_sonic_art[]
+    = INCBIN_U16("data/tilemaps/cutscene_vanilla_kidnapped_super_sonic_art/palette.gbapal");
 const u8 Tiles_cutscene_vanilla_kidnapped_super_sonic_art[]
     = INCBIN_U8("data/tilemaps/cutscene_vanilla_kidnapped_super_sonic_art/tiles.4bpp");
-const u16 Tilemap_cutscene_vanilla_kidnapped_super_sonic_art[] = INCBIN_U16(
-    "data/tilemaps/cutscene_vanilla_kidnapped_super_sonic_art/tilemap.tilemap2");
+const u16 Tilemap_cutscene_vanilla_kidnapped_super_sonic_art[]
+    = INCBIN_U16("data/tilemaps/cutscene_vanilla_kidnapped_super_sonic_art/tilemap.tilemap2");
 
 const Tilemap cutscene_vanilla_kidnapped_super_sonic_art = {
     .xTiles = 13,
@@ -18,7 +18,6 @@ const Tilemap cutscene_vanilla_kidnapped_super_sonic_art = {
     .tilesSize = sizeof(Tiles_cutscene_vanilla_kidnapped_super_sonic_art),
     .palette = Palette_cutscene_vanilla_kidnapped_super_sonic_art,
     .palOffset = 0,
-    .palLength
-    = sizeof(Palette_cutscene_vanilla_kidnapped_super_sonic_art) / sizeof(u16),
+    .palLength = sizeof(Palette_cutscene_vanilla_kidnapped_super_sonic_art) / sizeof(u16),
     .map = Tilemap_cutscene_vanilla_kidnapped_super_sonic_art,
 };
diff --git a/data/tilemaps/egg_saucer_wheel_copy/header.c b/data/tilemaps/egg_saucer_wheel_copy/header.c
index 3e142b0a9..83a3763fe 100644
--- a/data/tilemaps/egg_saucer_wheel_copy/header.c
+++ b/data/tilemaps/egg_saucer_wheel_copy/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_egg_saucer_wheel_copy[]
-    = INCBIN_U16("data/tilemaps/egg_saucer_wheel_copy/palette.gbapal");
-const u8 Tiles_egg_saucer_wheel_copy[]
-    = INCBIN_U8("data/tilemaps/egg_saucer_wheel_copy/tiles.4bpp");
-const u16 Tilemap_egg_saucer_wheel_copy[]
-    = INCBIN_U16("data/tilemaps/egg_saucer_wheel_copy/tilemap.tilemap2");
+const u16 Palette_egg_saucer_wheel_copy[] = INCBIN_U16("data/tilemaps/egg_saucer_wheel_copy/palette.gbapal");
+const u8 Tiles_egg_saucer_wheel_copy[] = INCBIN_U8("data/tilemaps/egg_saucer_wheel_copy/tiles.4bpp");
+const u16 Tilemap_egg_saucer_wheel_copy[] = INCBIN_U16("data/tilemaps/egg_saucer_wheel_copy/tilemap.tilemap2");
 
 const Tilemap egg_saucer_wheel_copy = {
     .xTiles = 14,
diff --git a/data/tilemaps/extra_boss_background/header.c b/data/tilemaps/extra_boss_background/header.c
index 9a22cdfe7..d3a7a0fb5 100644
--- a/data/tilemaps/extra_boss_background/header.c
+++ b/data/tilemaps/extra_boss_background/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_extra_boss_background[]
-    = INCBIN_U16("data/tilemaps/extra_boss_background/palette.gbapal");
-const u8 Tiles_extra_boss_background[]
-    = INCBIN_U8("data/tilemaps/extra_boss_background/tiles.4bpp");
-const u16 Tilemap_extra_boss_background[]
-    = INCBIN_U16("data/tilemaps/extra_boss_background/tilemap.tilemap2");
+const u16 Palette_extra_boss_background[] = INCBIN_U16("data/tilemaps/extra_boss_background/palette.gbapal");
+const u8 Tiles_extra_boss_background[] = INCBIN_U8("data/tilemaps/extra_boss_background/tiles.4bpp");
+const u16 Tilemap_extra_boss_background[] = INCBIN_U16("data/tilemaps/extra_boss_background/tilemap.tilemap2");
 
 const Tilemap extra_boss_background = {
     .xTiles = 32,
diff --git a/data/tilemaps/extra_boss_background_copy/header.c b/data/tilemaps/extra_boss_background_copy/header.c
index 6ddfb7cb3..6249b1139 100644
--- a/data/tilemaps/extra_boss_background_copy/header.c
+++ b/data/tilemaps/extra_boss_background_copy/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_extra_boss_background_copy[]
-    = INCBIN_U16("data/tilemaps/extra_boss_background_copy/palette.gbapal");
-const u8 Tiles_extra_boss_background_copy[]
-    = INCBIN_U8("data/tilemaps/extra_boss_background_copy/tiles.4bpp");
-const u16 Tilemap_extra_boss_background_copy[]
-    = INCBIN_U16("data/tilemaps/extra_boss_background_copy/tilemap.tilemap2");
+const u16 Palette_extra_boss_background_copy[] = INCBIN_U16("data/tilemaps/extra_boss_background_copy/palette.gbapal");
+const u8 Tiles_extra_boss_background_copy[] = INCBIN_U8("data/tilemaps/extra_boss_background_copy/tiles.4bpp");
+const u16 Tilemap_extra_boss_background_copy[] = INCBIN_U16("data/tilemaps/extra_boss_background_copy/tilemap.tilemap2");
 
 const Tilemap extra_boss_background_copy = {
     .xTiles = 32,
diff --git a/data/tilemaps/extra_boss_cockpit/header.c b/data/tilemaps/extra_boss_cockpit/header.c
index 903ac03a9..d84156915 100644
--- a/data/tilemaps/extra_boss_cockpit/header.c
+++ b/data/tilemaps/extra_boss_cockpit/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_extra_boss_cockpit[]
-    = INCBIN_U16("data/tilemaps/extra_boss_cockpit/palette.gbapal");
-const u8 Tiles_extra_boss_cockpit[]
-    = INCBIN_U8("data/tilemaps/extra_boss_cockpit/tiles.4bpp");
-const u8 Tilemap_extra_boss_cockpit[]
-    = INCBIN_U8("data/tilemaps/extra_boss_cockpit/tilemap.tilemap2");
+const u16 Palette_extra_boss_cockpit[] = INCBIN_U16("data/tilemaps/extra_boss_cockpit/palette.gbapal");
+const u8 Tiles_extra_boss_cockpit[] = INCBIN_U8("data/tilemaps/extra_boss_cockpit/tiles.4bpp");
+const u8 Tilemap_extra_boss_cockpit[] = INCBIN_U8("data/tilemaps/extra_boss_cockpit/tilemap.tilemap2");
 
 const Tilemap extra_boss_cockpit = {
     .xTiles = 10,
diff --git a/data/tilemaps/green_caret/header.c b/data/tilemaps/green_caret/header.c
index df6af2ea6..be1885add 100644
--- a/data/tilemaps/green_caret/header.c
+++ b/data/tilemaps/green_caret/header.c
@@ -3,8 +3,7 @@
 
 const u16 Palette_green_caret[] = INCBIN_U16("data/tilemaps/green_caret/palette.gbapal");
 const u8 Tiles_green_caret[] = INCBIN_U8("data/tilemaps/green_caret/tiles.4bpp");
-const u16 Tilemap_green_caret[]
-    = INCBIN_U16("data/tilemaps/green_caret/tilemap.tilemap2");
+const u16 Tilemap_green_caret[] = INCBIN_U16("data/tilemaps/green_caret/tilemap.tilemap2");
 
 const Tilemap green_caret = {
     .xTiles = 30,
diff --git a/data/tilemaps/intro_created_by_sonic_team/header.c b/data/tilemaps/intro_created_by_sonic_team/header.c
index 904dfa83a..f7280b519 100644
--- a/data/tilemaps/intro_created_by_sonic_team/header.c
+++ b/data/tilemaps/intro_created_by_sonic_team/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_intro_created_by_sonic_team[]
-    = INCBIN_U16("data/tilemaps/intro_created_by_sonic_team/palette.gbapal");
-const u8 Tiles_intro_created_by_sonic_team[]
-    = INCBIN_U8("data/tilemaps/intro_created_by_sonic_team/tiles.4bpp");
-const u16 Tilemap_intro_created_by_sonic_team[]
-    = INCBIN_U16("data/tilemaps/intro_created_by_sonic_team/tilemap.tilemap2");
+const u16 Palette_intro_created_by_sonic_team[] = INCBIN_U16("data/tilemaps/intro_created_by_sonic_team/palette.gbapal");
+const u8 Tiles_intro_created_by_sonic_team[] = INCBIN_U8("data/tilemaps/intro_created_by_sonic_team/tiles.4bpp");
+const u16 Tilemap_intro_created_by_sonic_team[] = INCBIN_U16("data/tilemaps/intro_created_by_sonic_team/tilemap.tilemap2");
 
 const Tilemap intro_created_by_sonic_team = {
     .xTiles = 30,
diff --git a/data/tilemaps/intro_presented_by_sega/header.c b/data/tilemaps/intro_presented_by_sega/header.c
index 485a3a7f5..5aa2188de 100644
--- a/data/tilemaps/intro_presented_by_sega/header.c
+++ b/data/tilemaps/intro_presented_by_sega/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_intro_presented_by_sega[]
-    = INCBIN_U16("data/tilemaps/intro_presented_by_sega/palette.gbapal");
-const u8 Tiles_intro_presented_by_sega[]
-    = INCBIN_U8("data/tilemaps/intro_presented_by_sega/tiles.4bpp");
-const u16 Tilemap_intro_presented_by_sega[]
-    = INCBIN_U16("data/tilemaps/intro_presented_by_sega/tilemap.tilemap2");
+const u16 Palette_intro_presented_by_sega[] = INCBIN_U16("data/tilemaps/intro_presented_by_sega/palette.gbapal");
+const u8 Tiles_intro_presented_by_sega[] = INCBIN_U8("data/tilemaps/intro_presented_by_sega/tiles.4bpp");
+const u16 Tilemap_intro_presented_by_sega[] = INCBIN_U16("data/tilemaps/intro_presented_by_sega/tilemap.tilemap2");
 
 const Tilemap intro_presented_by_sega = {
     .xTiles = 30,
diff --git a/data/tilemaps/lens_flare_bg/header.c b/data/tilemaps/lens_flare_bg/header.c
index 2a3921ccd..34f3abc55 100644
--- a/data/tilemaps/lens_flare_bg/header.c
+++ b/data/tilemaps/lens_flare_bg/header.c
@@ -1,11 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_lens_flare_bg[]
-    = INCBIN_U16("data/tilemaps/lens_flare_bg/palette.gbapal");
+const u16 Palette_lens_flare_bg[] = INCBIN_U16("data/tilemaps/lens_flare_bg/palette.gbapal");
 const u8 Tiles_lens_flare_bg[] = INCBIN_U8("data/tilemaps/lens_flare_bg/tiles.4bpp");
-const u16 Tilemap_lens_flare_bg[]
-    = INCBIN_U16("data/tilemaps/lens_flare_bg/tilemap.tilemap2");
+const u16 Tilemap_lens_flare_bg[] = INCBIN_U16("data/tilemaps/lens_flare_bg/tilemap.tilemap2");
 
 const Tilemap lens_flare_bg = {
     .xTiles = 7,
diff --git a/data/tilemaps/message_box_black/header.c b/data/tilemaps/message_box_black/header.c
index eb20ed109..2c47e9502 100644
--- a/data/tilemaps/message_box_black/header.c
+++ b/data/tilemaps/message_box_black/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_message_box_black[]
-    = INCBIN_U16("data/tilemaps/message_box_black/palette.gbapal");
-const u8 Tiles_message_box_black[]
-    = INCBIN_U8("data/tilemaps/message_box_black/tiles.4bpp");
-const u16 Tilemap_message_box_black[]
-    = INCBIN_U16("data/tilemaps/message_box_black/tilemap.tilemap2");
+const u16 Palette_message_box_black[] = INCBIN_U16("data/tilemaps/message_box_black/palette.gbapal");
+const u8 Tiles_message_box_black[] = INCBIN_U8("data/tilemaps/message_box_black/tiles.4bpp");
+const u16 Tilemap_message_box_black[] = INCBIN_U16("data/tilemaps/message_box_black/tilemap.tilemap2");
 
 const Tilemap message_box_black = {
     .xTiles = 28,
diff --git a/data/tilemaps/mp_character_selected_amy/header.c b/data/tilemaps/mp_character_selected_amy/header.c
index 1888adcea..28f9d1c17 100644
--- a/data/tilemaps/mp_character_selected_amy/header.c
+++ b/data/tilemaps/mp_character_selected_amy/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_character_selected_amy[]
-    = INCBIN_U16("data/tilemaps/mp_character_selected_amy/palette.gbapal");
-const u8 Tiles_mp_character_selected_amy[]
-    = INCBIN_U8("data/tilemaps/mp_character_selected_amy/tiles.4bpp");
-const u16 Tilemap_mp_character_selected_amy[]
-    = INCBIN_U16("data/tilemaps/mp_character_selected_amy/tilemap.tilemap2");
+const u16 Palette_mp_character_selected_amy[] = INCBIN_U16("data/tilemaps/mp_character_selected_amy/palette.gbapal");
+const u8 Tiles_mp_character_selected_amy[] = INCBIN_U8("data/tilemaps/mp_character_selected_amy/tiles.4bpp");
+const u16 Tilemap_mp_character_selected_amy[] = INCBIN_U16("data/tilemaps/mp_character_selected_amy/tilemap.tilemap2");
 
 const Tilemap mp_character_selected_amy = {
     .xTiles = 10,
diff --git a/data/tilemaps/mp_character_selected_amy_bg/header.c b/data/tilemaps/mp_character_selected_amy_bg/header.c
index d01020fa7..07e677b38 100644
--- a/data/tilemaps/mp_character_selected_amy_bg/header.c
+++ b/data/tilemaps/mp_character_selected_amy_bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_character_selected_amy_bg[]
-    = INCBIN_U16("data/tilemaps/mp_character_selected_amy_bg/palette.gbapal");
-const u8 Tiles_mp_character_selected_amy_bg[]
-    = INCBIN_U8("data/tilemaps/mp_character_selected_amy_bg/tiles.4bpp");
-const u16 Tilemap_mp_character_selected_amy_bg[]
-    = INCBIN_U16("data/tilemaps/mp_character_selected_amy_bg/tilemap.tilemap2");
+const u16 Palette_mp_character_selected_amy_bg[] = INCBIN_U16("data/tilemaps/mp_character_selected_amy_bg/palette.gbapal");
+const u8 Tiles_mp_character_selected_amy_bg[] = INCBIN_U8("data/tilemaps/mp_character_selected_amy_bg/tiles.4bpp");
+const u16 Tilemap_mp_character_selected_amy_bg[] = INCBIN_U16("data/tilemaps/mp_character_selected_amy_bg/tilemap.tilemap2");
 
 const Tilemap mp_character_selected_amy_bg = {
     .xTiles = 10,
diff --git a/data/tilemaps/mp_character_selected_cream/header.c b/data/tilemaps/mp_character_selected_cream/header.c
index c411ceb90..f9bb5165e 100644
--- a/data/tilemaps/mp_character_selected_cream/header.c
+++ b/data/tilemaps/mp_character_selected_cream/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_character_selected_cream[]
-    = INCBIN_U16("data/tilemaps/mp_character_selected_cream/palette.gbapal");
-const u8 Tiles_mp_character_selected_cream[]
-    = INCBIN_U8("data/tilemaps/mp_character_selected_cream/tiles.4bpp");
-const u16 Tilemap_mp_character_selected_cream[]
-    = INCBIN_U16("data/tilemaps/mp_character_selected_cream/tilemap.tilemap2");
+const u16 Palette_mp_character_selected_cream[] = INCBIN_U16("data/tilemaps/mp_character_selected_cream/palette.gbapal");
+const u8 Tiles_mp_character_selected_cream[] = INCBIN_U8("data/tilemaps/mp_character_selected_cream/tiles.4bpp");
+const u16 Tilemap_mp_character_selected_cream[] = INCBIN_U16("data/tilemaps/mp_character_selected_cream/tilemap.tilemap2");
 
 const Tilemap mp_character_selected_cream = {
     .xTiles = 10,
diff --git a/data/tilemaps/mp_character_selected_cream_bg/header.c b/data/tilemaps/mp_character_selected_cream_bg/header.c
index 8abd5ed5a..6aa7fc972 100644
--- a/data/tilemaps/mp_character_selected_cream_bg/header.c
+++ b/data/tilemaps/mp_character_selected_cream_bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_character_selected_cream_bg[]
-    = INCBIN_U16("data/tilemaps/mp_character_selected_cream_bg/palette.gbapal");
-const u8 Tiles_mp_character_selected_cream_bg[]
-    = INCBIN_U8("data/tilemaps/mp_character_selected_cream_bg/tiles.4bpp");
-const u16 Tilemap_mp_character_selected_cream_bg[]
-    = INCBIN_U16("data/tilemaps/mp_character_selected_cream_bg/tilemap.tilemap2");
+const u16 Palette_mp_character_selected_cream_bg[] = INCBIN_U16("data/tilemaps/mp_character_selected_cream_bg/palette.gbapal");
+const u8 Tiles_mp_character_selected_cream_bg[] = INCBIN_U8("data/tilemaps/mp_character_selected_cream_bg/tiles.4bpp");
+const u16 Tilemap_mp_character_selected_cream_bg[] = INCBIN_U16("data/tilemaps/mp_character_selected_cream_bg/tilemap.tilemap2");
 
 const Tilemap mp_character_selected_cream_bg = {
     .xTiles = 10,
diff --git a/data/tilemaps/mp_character_selected_knuckles/header.c b/data/tilemaps/mp_character_selected_knuckles/header.c
index ea2f49546..0764e01d5 100644
--- a/data/tilemaps/mp_character_selected_knuckles/header.c
+++ b/data/tilemaps/mp_character_selected_knuckles/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_character_selected_knuckles[]
-    = INCBIN_U16("data/tilemaps/mp_character_selected_knuckles/palette.gbapal");
-const u8 Tiles_mp_character_selected_knuckles[]
-    = INCBIN_U8("data/tilemaps/mp_character_selected_knuckles/tiles.4bpp");
-const u16 Tilemap_mp_character_selected_knuckles[]
-    = INCBIN_U16("data/tilemaps/mp_character_selected_knuckles/tilemap.tilemap2");
+const u16 Palette_mp_character_selected_knuckles[] = INCBIN_U16("data/tilemaps/mp_character_selected_knuckles/palette.gbapal");
+const u8 Tiles_mp_character_selected_knuckles[] = INCBIN_U8("data/tilemaps/mp_character_selected_knuckles/tiles.4bpp");
+const u16 Tilemap_mp_character_selected_knuckles[] = INCBIN_U16("data/tilemaps/mp_character_selected_knuckles/tilemap.tilemap2");
 
 const Tilemap mp_character_selected_knuckles = {
     .xTiles = 10,
diff --git a/data/tilemaps/mp_character_selected_knuckles_bg/header.c b/data/tilemaps/mp_character_selected_knuckles_bg/header.c
index df07b3e96..2c6694268 100644
--- a/data/tilemaps/mp_character_selected_knuckles_bg/header.c
+++ b/data/tilemaps/mp_character_selected_knuckles_bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_character_selected_knuckles_bg[]
-    = INCBIN_U16("data/tilemaps/mp_character_selected_knuckles_bg/palette.gbapal");
-const u8 Tiles_mp_character_selected_knuckles_bg[]
-    = INCBIN_U8("data/tilemaps/mp_character_selected_knuckles_bg/tiles.4bpp");
-const u16 Tilemap_mp_character_selected_knuckles_bg[]
-    = INCBIN_U16("data/tilemaps/mp_character_selected_knuckles_bg/tilemap.tilemap2");
+const u16 Palette_mp_character_selected_knuckles_bg[] = INCBIN_U16("data/tilemaps/mp_character_selected_knuckles_bg/palette.gbapal");
+const u8 Tiles_mp_character_selected_knuckles_bg[] = INCBIN_U8("data/tilemaps/mp_character_selected_knuckles_bg/tiles.4bpp");
+const u16 Tilemap_mp_character_selected_knuckles_bg[] = INCBIN_U16("data/tilemaps/mp_character_selected_knuckles_bg/tilemap.tilemap2");
 
 const Tilemap mp_character_selected_knuckles_bg = {
     .xTiles = 10,
diff --git a/data/tilemaps/mp_character_selected_sonic/header.c b/data/tilemaps/mp_character_selected_sonic/header.c
index d08948cc6..aa320a9f6 100644
--- a/data/tilemaps/mp_character_selected_sonic/header.c
+++ b/data/tilemaps/mp_character_selected_sonic/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_character_selected_sonic[]
-    = INCBIN_U16("data/tilemaps/mp_character_selected_sonic/palette.gbapal");
-const u8 Tiles_mp_character_selected_sonic[]
-    = INCBIN_U8("data/tilemaps/mp_character_selected_sonic/tiles.4bpp");
-const u16 Tilemap_mp_character_selected_sonic[]
-    = INCBIN_U16("data/tilemaps/mp_character_selected_sonic/tilemap.tilemap2");
+const u16 Palette_mp_character_selected_sonic[] = INCBIN_U16("data/tilemaps/mp_character_selected_sonic/palette.gbapal");
+const u8 Tiles_mp_character_selected_sonic[] = INCBIN_U8("data/tilemaps/mp_character_selected_sonic/tiles.4bpp");
+const u16 Tilemap_mp_character_selected_sonic[] = INCBIN_U16("data/tilemaps/mp_character_selected_sonic/tilemap.tilemap2");
 
 const Tilemap mp_character_selected_sonic = {
     .xTiles = 10,
diff --git a/data/tilemaps/mp_character_selected_sonic_bg/header.c b/data/tilemaps/mp_character_selected_sonic_bg/header.c
index 7a3d08fc1..f620adde3 100644
--- a/data/tilemaps/mp_character_selected_sonic_bg/header.c
+++ b/data/tilemaps/mp_character_selected_sonic_bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_character_selected_sonic_bg[]
-    = INCBIN_U16("data/tilemaps/mp_character_selected_sonic_bg/palette.gbapal");
-const u8 Tiles_mp_character_selected_sonic_bg[]
-    = INCBIN_U8("data/tilemaps/mp_character_selected_sonic_bg/tiles.4bpp");
-const u16 Tilemap_mp_character_selected_sonic_bg[]
-    = INCBIN_U16("data/tilemaps/mp_character_selected_sonic_bg/tilemap.tilemap2");
+const u16 Palette_mp_character_selected_sonic_bg[] = INCBIN_U16("data/tilemaps/mp_character_selected_sonic_bg/palette.gbapal");
+const u8 Tiles_mp_character_selected_sonic_bg[] = INCBIN_U8("data/tilemaps/mp_character_selected_sonic_bg/tiles.4bpp");
+const u16 Tilemap_mp_character_selected_sonic_bg[] = INCBIN_U16("data/tilemaps/mp_character_selected_sonic_bg/tilemap.tilemap2");
 
 const Tilemap mp_character_selected_sonic_bg = {
     .xTiles = 10,
diff --git a/data/tilemaps/mp_character_selected_tails/header.c b/data/tilemaps/mp_character_selected_tails/header.c
index 99d064cc2..54b606a90 100644
--- a/data/tilemaps/mp_character_selected_tails/header.c
+++ b/data/tilemaps/mp_character_selected_tails/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_character_selected_tails[]
-    = INCBIN_U16("data/tilemaps/mp_character_selected_tails/palette.gbapal");
-const u8 Tiles_mp_character_selected_tails[]
-    = INCBIN_U8("data/tilemaps/mp_character_selected_tails/tiles.4bpp");
-const u16 Tilemap_mp_character_selected_tails[]
-    = INCBIN_U16("data/tilemaps/mp_character_selected_tails/tilemap.tilemap2");
+const u16 Palette_mp_character_selected_tails[] = INCBIN_U16("data/tilemaps/mp_character_selected_tails/palette.gbapal");
+const u8 Tiles_mp_character_selected_tails[] = INCBIN_U8("data/tilemaps/mp_character_selected_tails/tiles.4bpp");
+const u16 Tilemap_mp_character_selected_tails[] = INCBIN_U16("data/tilemaps/mp_character_selected_tails/tilemap.tilemap2");
 
 const Tilemap mp_character_selected_tails = {
     .xTiles = 10,
diff --git a/data/tilemaps/mp_character_selected_tails_bg/header.c b/data/tilemaps/mp_character_selected_tails_bg/header.c
index 1126fa3dc..5659d50a2 100644
--- a/data/tilemaps/mp_character_selected_tails_bg/header.c
+++ b/data/tilemaps/mp_character_selected_tails_bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_character_selected_tails_bg[]
-    = INCBIN_U16("data/tilemaps/mp_character_selected_tails_bg/palette.gbapal");
-const u8 Tiles_mp_character_selected_tails_bg[]
-    = INCBIN_U8("data/tilemaps/mp_character_selected_tails_bg/tiles.4bpp");
-const u16 Tilemap_mp_character_selected_tails_bg[]
-    = INCBIN_U16("data/tilemaps/mp_character_selected_tails_bg/tilemap.tilemap2");
+const u16 Palette_mp_character_selected_tails_bg[] = INCBIN_U16("data/tilemaps/mp_character_selected_tails_bg/palette.gbapal");
+const u8 Tiles_mp_character_selected_tails_bg[] = INCBIN_U8("data/tilemaps/mp_character_selected_tails_bg/tiles.4bpp");
+const u16 Tilemap_mp_character_selected_tails_bg[] = INCBIN_U16("data/tilemaps/mp_character_selected_tails_bg/tilemap.tilemap2");
 
 const Tilemap mp_character_selected_tails_bg = {
     .xTiles = 10,
diff --git a/data/tilemaps/mp_characters_selected_de/header.c b/data/tilemaps/mp_characters_selected_de/header.c
index 818e3e1f1..93037060e 100644
--- a/data/tilemaps/mp_characters_selected_de/header.c
+++ b/data/tilemaps/mp_characters_selected_de/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_characters_selected_de[]
-    = INCBIN_U16("data/tilemaps/mp_characters_selected_de/palette.gbapal");
-const u8 Tiles_mp_characters_selected_de[]
-    = INCBIN_U8("data/tilemaps/mp_characters_selected_de/tiles.4bpp");
-const u16 Tilemap_mp_characters_selected_de[]
-    = INCBIN_U16("data/tilemaps/mp_characters_selected_de/tilemap.tilemap2");
+const u16 Palette_mp_characters_selected_de[] = INCBIN_U16("data/tilemaps/mp_characters_selected_de/palette.gbapal");
+const u8 Tiles_mp_characters_selected_de[] = INCBIN_U8("data/tilemaps/mp_characters_selected_de/tiles.4bpp");
+const u16 Tilemap_mp_characters_selected_de[] = INCBIN_U16("data/tilemaps/mp_characters_selected_de/tilemap.tilemap2");
 
 const Tilemap mp_characters_selected_de = {
     .xTiles = 30,
diff --git a/data/tilemaps/mp_characters_selected_en/header.c b/data/tilemaps/mp_characters_selected_en/header.c
index 1f5829d28..d4ff11477 100644
--- a/data/tilemaps/mp_characters_selected_en/header.c
+++ b/data/tilemaps/mp_characters_selected_en/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_characters_selected_en[]
-    = INCBIN_U16("data/tilemaps/mp_characters_selected_en/palette.gbapal");
-const u8 Tiles_mp_characters_selected_en[]
-    = INCBIN_U8("data/tilemaps/mp_characters_selected_en/tiles.4bpp");
-const u16 Tilemap_mp_characters_selected_en[]
-    = INCBIN_U16("data/tilemaps/mp_characters_selected_en/tilemap.tilemap2");
+const u16 Palette_mp_characters_selected_en[] = INCBIN_U16("data/tilemaps/mp_characters_selected_en/palette.gbapal");
+const u8 Tiles_mp_characters_selected_en[] = INCBIN_U8("data/tilemaps/mp_characters_selected_en/tiles.4bpp");
+const u16 Tilemap_mp_characters_selected_en[] = INCBIN_U16("data/tilemaps/mp_characters_selected_en/tilemap.tilemap2");
 
 const Tilemap mp_characters_selected_en = {
     .xTiles = 30,
diff --git a/data/tilemaps/mp_characters_selected_es/header.c b/data/tilemaps/mp_characters_selected_es/header.c
index 8edeb8f3e..293a22bf2 100644
--- a/data/tilemaps/mp_characters_selected_es/header.c
+++ b/data/tilemaps/mp_characters_selected_es/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_characters_selected_es[]
-    = INCBIN_U16("data/tilemaps/mp_characters_selected_es/palette.gbapal");
-const u8 Tiles_mp_characters_selected_es[]
-    = INCBIN_U8("data/tilemaps/mp_characters_selected_es/tiles.4bpp");
-const u16 Tilemap_mp_characters_selected_es[]
-    = INCBIN_U16("data/tilemaps/mp_characters_selected_es/tilemap.tilemap2");
+const u16 Palette_mp_characters_selected_es[] = INCBIN_U16("data/tilemaps/mp_characters_selected_es/palette.gbapal");
+const u8 Tiles_mp_characters_selected_es[] = INCBIN_U8("data/tilemaps/mp_characters_selected_es/tiles.4bpp");
+const u16 Tilemap_mp_characters_selected_es[] = INCBIN_U16("data/tilemaps/mp_characters_selected_es/tilemap.tilemap2");
 
 const Tilemap mp_characters_selected_es = {
     .xTiles = 30,
diff --git a/data/tilemaps/mp_characters_selected_fr/header.c b/data/tilemaps/mp_characters_selected_fr/header.c
index 149241d08..9ebbf3734 100644
--- a/data/tilemaps/mp_characters_selected_fr/header.c
+++ b/data/tilemaps/mp_characters_selected_fr/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_characters_selected_fr[]
-    = INCBIN_U16("data/tilemaps/mp_characters_selected_fr/palette.gbapal");
-const u8 Tiles_mp_characters_selected_fr[]
-    = INCBIN_U8("data/tilemaps/mp_characters_selected_fr/tiles.4bpp");
-const u16 Tilemap_mp_characters_selected_fr[]
-    = INCBIN_U16("data/tilemaps/mp_characters_selected_fr/tilemap.tilemap2");
+const u16 Palette_mp_characters_selected_fr[] = INCBIN_U16("data/tilemaps/mp_characters_selected_fr/palette.gbapal");
+const u8 Tiles_mp_characters_selected_fr[] = INCBIN_U8("data/tilemaps/mp_characters_selected_fr/tiles.4bpp");
+const u16 Tilemap_mp_characters_selected_fr[] = INCBIN_U16("data/tilemaps/mp_characters_selected_fr/tilemap.tilemap2");
 
 const Tilemap mp_characters_selected_fr = {
     .xTiles = 30,
diff --git a/data/tilemaps/mp_characters_selected_it/header.c b/data/tilemaps/mp_characters_selected_it/header.c
index 7395194cd..23a881d56 100644
--- a/data/tilemaps/mp_characters_selected_it/header.c
+++ b/data/tilemaps/mp_characters_selected_it/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_characters_selected_it[]
-    = INCBIN_U16("data/tilemaps/mp_characters_selected_it/palette.gbapal");
-const u8 Tiles_mp_characters_selected_it[]
-    = INCBIN_U8("data/tilemaps/mp_characters_selected_it/tiles.4bpp");
-const u16 Tilemap_mp_characters_selected_it[]
-    = INCBIN_U16("data/tilemaps/mp_characters_selected_it/tilemap.tilemap2");
+const u16 Palette_mp_characters_selected_it[] = INCBIN_U16("data/tilemaps/mp_characters_selected_it/palette.gbapal");
+const u8 Tiles_mp_characters_selected_it[] = INCBIN_U8("data/tilemaps/mp_characters_selected_it/tiles.4bpp");
+const u16 Tilemap_mp_characters_selected_it[] = INCBIN_U16("data/tilemaps/mp_characters_selected_it/tilemap.tilemap2");
 
 const Tilemap mp_characters_selected_it = {
     .xTiles = 30,
diff --git a/data/tilemaps/mp_characters_selected_jp/header.c b/data/tilemaps/mp_characters_selected_jp/header.c
index e18d717b1..4ce91f712 100644
--- a/data/tilemaps/mp_characters_selected_jp/header.c
+++ b/data/tilemaps/mp_characters_selected_jp/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_characters_selected_jp[]
-    = INCBIN_U16("data/tilemaps/mp_characters_selected_jp/palette.gbapal");
-const u8 Tiles_mp_characters_selected_jp[]
-    = INCBIN_U8("data/tilemaps/mp_characters_selected_jp/tiles.4bpp");
-const u16 Tilemap_mp_characters_selected_jp[]
-    = INCBIN_U16("data/tilemaps/mp_characters_selected_jp/tilemap.tilemap2");
+const u16 Palette_mp_characters_selected_jp[] = INCBIN_U16("data/tilemaps/mp_characters_selected_jp/palette.gbapal");
+const u8 Tiles_mp_characters_selected_jp[] = INCBIN_U8("data/tilemaps/mp_characters_selected_jp/tiles.4bpp");
+const u16 Tilemap_mp_characters_selected_jp[] = INCBIN_U16("data/tilemaps/mp_characters_selected_jp/tilemap.tilemap2");
 
 const Tilemap mp_characters_selected_jp = {
     .xTiles = 30,
diff --git a/data/tilemaps/mp_cheese_please_wait_de/header.c b/data/tilemaps/mp_cheese_please_wait_de/header.c
index e447ded43..4ac0d38aa 100644
--- a/data/tilemaps/mp_cheese_please_wait_de/header.c
+++ b/data/tilemaps/mp_cheese_please_wait_de/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_cheese_please_wait_de[]
-    = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_de/palette.gbapal");
-const u8 Tiles_mp_cheese_please_wait_de[]
-    = INCBIN_U8("data/tilemaps/mp_cheese_please_wait_de/tiles.4bpp");
-const u16 Tilemap_mp_cheese_please_wait_de[]
-    = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_de/tilemap.tilemap2");
+const u16 Palette_mp_cheese_please_wait_de[] = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_de/palette.gbapal");
+const u8 Tiles_mp_cheese_please_wait_de[] = INCBIN_U8("data/tilemaps/mp_cheese_please_wait_de/tiles.4bpp");
+const u16 Tilemap_mp_cheese_please_wait_de[] = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_de/tilemap.tilemap2");
 
 const Tilemap mp_cheese_please_wait_de = {
     .xTiles = 30,
diff --git a/data/tilemaps/mp_cheese_please_wait_en/header.c b/data/tilemaps/mp_cheese_please_wait_en/header.c
index 6057a79fa..fb2dde9fb 100644
--- a/data/tilemaps/mp_cheese_please_wait_en/header.c
+++ b/data/tilemaps/mp_cheese_please_wait_en/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_cheese_please_wait_en[]
-    = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_en/palette.gbapal");
-const u8 Tiles_mp_cheese_please_wait_en[]
-    = INCBIN_U8("data/tilemaps/mp_cheese_please_wait_en/tiles.4bpp");
-const u16 Tilemap_mp_cheese_please_wait_en[]
-    = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_en/tilemap.tilemap2");
+const u16 Palette_mp_cheese_please_wait_en[] = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_en/palette.gbapal");
+const u8 Tiles_mp_cheese_please_wait_en[] = INCBIN_U8("data/tilemaps/mp_cheese_please_wait_en/tiles.4bpp");
+const u16 Tilemap_mp_cheese_please_wait_en[] = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_en/tilemap.tilemap2");
 
 const Tilemap mp_cheese_please_wait_en = {
     .xTiles = 30,
diff --git a/data/tilemaps/mp_cheese_please_wait_es/header.c b/data/tilemaps/mp_cheese_please_wait_es/header.c
index 1502efbb1..a2b2ebe47 100644
--- a/data/tilemaps/mp_cheese_please_wait_es/header.c
+++ b/data/tilemaps/mp_cheese_please_wait_es/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_cheese_please_wait_es[]
-    = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_es/palette.gbapal");
-const u8 Tiles_mp_cheese_please_wait_es[]
-    = INCBIN_U8("data/tilemaps/mp_cheese_please_wait_es/tiles.4bpp");
-const u16 Tilemap_mp_cheese_please_wait_es[]
-    = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_es/tilemap.tilemap2");
+const u16 Palette_mp_cheese_please_wait_es[] = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_es/palette.gbapal");
+const u8 Tiles_mp_cheese_please_wait_es[] = INCBIN_U8("data/tilemaps/mp_cheese_please_wait_es/tiles.4bpp");
+const u16 Tilemap_mp_cheese_please_wait_es[] = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_es/tilemap.tilemap2");
 
 const Tilemap mp_cheese_please_wait_es = {
     .xTiles = 30,
diff --git a/data/tilemaps/mp_cheese_please_wait_fr/header.c b/data/tilemaps/mp_cheese_please_wait_fr/header.c
index 135ae8fa6..2e9c0676e 100644
--- a/data/tilemaps/mp_cheese_please_wait_fr/header.c
+++ b/data/tilemaps/mp_cheese_please_wait_fr/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_cheese_please_wait_fr[]
-    = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_fr/palette.gbapal");
-const u8 Tiles_mp_cheese_please_wait_fr[]
-    = INCBIN_U8("data/tilemaps/mp_cheese_please_wait_fr/tiles.4bpp");
-const u16 Tilemap_mp_cheese_please_wait_fr[]
-    = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_fr/tilemap.tilemap2");
+const u16 Palette_mp_cheese_please_wait_fr[] = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_fr/palette.gbapal");
+const u8 Tiles_mp_cheese_please_wait_fr[] = INCBIN_U8("data/tilemaps/mp_cheese_please_wait_fr/tiles.4bpp");
+const u16 Tilemap_mp_cheese_please_wait_fr[] = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_fr/tilemap.tilemap2");
 
 const Tilemap mp_cheese_please_wait_fr = {
     .xTiles = 30,
diff --git a/data/tilemaps/mp_cheese_please_wait_it/header.c b/data/tilemaps/mp_cheese_please_wait_it/header.c
index a69658399..408f681a9 100644
--- a/data/tilemaps/mp_cheese_please_wait_it/header.c
+++ b/data/tilemaps/mp_cheese_please_wait_it/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_cheese_please_wait_it[]
-    = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_it/palette.gbapal");
-const u8 Tiles_mp_cheese_please_wait_it[]
-    = INCBIN_U8("data/tilemaps/mp_cheese_please_wait_it/tiles.4bpp");
-const u16 Tilemap_mp_cheese_please_wait_it[]
-    = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_it/tilemap.tilemap2");
+const u16 Palette_mp_cheese_please_wait_it[] = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_it/palette.gbapal");
+const u8 Tiles_mp_cheese_please_wait_it[] = INCBIN_U8("data/tilemaps/mp_cheese_please_wait_it/tiles.4bpp");
+const u16 Tilemap_mp_cheese_please_wait_it[] = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_it/tilemap.tilemap2");
 
 const Tilemap mp_cheese_please_wait_it = {
     .xTiles = 30,
diff --git a/data/tilemaps/mp_cheese_please_wait_jp/header.c b/data/tilemaps/mp_cheese_please_wait_jp/header.c
index 7ee6a2086..a332b366e 100644
--- a/data/tilemaps/mp_cheese_please_wait_jp/header.c
+++ b/data/tilemaps/mp_cheese_please_wait_jp/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_cheese_please_wait_jp[]
-    = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_jp/palette.gbapal");
-const u8 Tiles_mp_cheese_please_wait_jp[]
-    = INCBIN_U8("data/tilemaps/mp_cheese_please_wait_jp/tiles.4bpp");
-const u16 Tilemap_mp_cheese_please_wait_jp[]
-    = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_jp/tilemap.tilemap2");
+const u16 Palette_mp_cheese_please_wait_jp[] = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_jp/palette.gbapal");
+const u8 Tiles_mp_cheese_please_wait_jp[] = INCBIN_U8("data/tilemaps/mp_cheese_please_wait_jp/tiles.4bpp");
+const u16 Tilemap_mp_cheese_please_wait_jp[] = INCBIN_U16("data/tilemaps/mp_cheese_please_wait_jp/tilemap.tilemap2");
 
 const Tilemap mp_cheese_please_wait_jp = {
     .xTiles = 30,
diff --git a/data/tilemaps/mp_message_box_unknown/header.c b/data/tilemaps/mp_message_box_unknown/header.c
index 84541dbff..72d948a78 100644
--- a/data/tilemaps/mp_message_box_unknown/header.c
+++ b/data/tilemaps/mp_message_box_unknown/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_message_box_unknown[]
-    = INCBIN_U16("data/tilemaps/mp_message_box_unknown/palette.gbapal");
-const u8 Tiles_mp_message_box_unknown[]
-    = INCBIN_U8("data/tilemaps/mp_message_box_unknown/tiles.4bpp");
-const u16 Tilemap_mp_message_box_unknown[]
-    = INCBIN_U16("data/tilemaps/mp_message_box_unknown/tilemap.tilemap2");
+const u16 Palette_mp_message_box_unknown[] = INCBIN_U16("data/tilemaps/mp_message_box_unknown/palette.gbapal");
+const u8 Tiles_mp_message_box_unknown[] = INCBIN_U8("data/tilemaps/mp_message_box_unknown/tiles.4bpp");
+const u16 Tilemap_mp_message_box_unknown[] = INCBIN_U16("data/tilemaps/mp_message_box_unknown/tilemap.tilemap2");
 
 const Tilemap mp_message_box_unknown = {
     .xTiles = 30,
diff --git a/data/tilemaps/mp_orange_bg/header.c b/data/tilemaps/mp_orange_bg/header.c
index 614b176e0..84138f32c 100644
--- a/data/tilemaps/mp_orange_bg/header.c
+++ b/data/tilemaps/mp_orange_bg/header.c
@@ -1,11 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_orange_bg[]
-    = INCBIN_U16("data/tilemaps/mp_orange_bg/palette.gbapal");
+const u16 Palette_mp_orange_bg[] = INCBIN_U16("data/tilemaps/mp_orange_bg/palette.gbapal");
 const u8 Tiles_mp_orange_bg[] = INCBIN_U8("data/tilemaps/mp_orange_bg/tiles.4bpp");
-const u16 Tilemap_mp_orange_bg[]
-    = INCBIN_U16("data/tilemaps/mp_orange_bg/tilemap.tilemap2");
+const u16 Tilemap_mp_orange_bg[] = INCBIN_U16("data/tilemaps/mp_orange_bg/tilemap.tilemap2");
 
 const Tilemap mp_orange_bg = {
     .xTiles = 32,
diff --git a/data/tilemaps/mp_unknown_green/header.c b/data/tilemaps/mp_unknown_green/header.c
index 9ae154b14..863e86de1 100644
--- a/data/tilemaps/mp_unknown_green/header.c
+++ b/data/tilemaps/mp_unknown_green/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_unknown_green[]
-    = INCBIN_U16("data/tilemaps/mp_unknown_green/palette.gbapal");
-const u8 Tiles_mp_unknown_green[]
-    = INCBIN_U8("data/tilemaps/mp_unknown_green/tiles.4bpp");
-const u16 Tilemap_mp_unknown_green[]
-    = INCBIN_U16("data/tilemaps/mp_unknown_green/tilemap.tilemap2");
+const u16 Palette_mp_unknown_green[] = INCBIN_U16("data/tilemaps/mp_unknown_green/palette.gbapal");
+const u8 Tiles_mp_unknown_green[] = INCBIN_U8("data/tilemaps/mp_unknown_green/tiles.4bpp");
+const u16 Tilemap_mp_unknown_green[] = INCBIN_U16("data/tilemaps/mp_unknown_green/tilemap.tilemap2");
 
 const Tilemap mp_unknown_green = {
     .xTiles = 30,
diff --git a/data/tilemaps/mp_unknown_orange_zigzag/header.c b/data/tilemaps/mp_unknown_orange_zigzag/header.c
index 6b7c52ac1..22c7565b4 100644
--- a/data/tilemaps/mp_unknown_orange_zigzag/header.c
+++ b/data/tilemaps/mp_unknown_orange_zigzag/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_unknown_orange_zigzag[]
-    = INCBIN_U16("data/tilemaps/mp_unknown_orange_zigzag/palette.gbapal");
-const u8 Tiles_mp_unknown_orange_zigzag[]
-    = INCBIN_U8("data/tilemaps/mp_unknown_orange_zigzag/tiles.4bpp");
-const u16 Tilemap_mp_unknown_orange_zigzag[]
-    = INCBIN_U16("data/tilemaps/mp_unknown_orange_zigzag/tilemap.tilemap2");
+const u16 Palette_mp_unknown_orange_zigzag[] = INCBIN_U16("data/tilemaps/mp_unknown_orange_zigzag/palette.gbapal");
+const u8 Tiles_mp_unknown_orange_zigzag[] = INCBIN_U8("data/tilemaps/mp_unknown_orange_zigzag/tiles.4bpp");
+const u16 Tilemap_mp_unknown_orange_zigzag[] = INCBIN_U16("data/tilemaps/mp_unknown_orange_zigzag/tilemap.tilemap2");
 
 const Tilemap mp_unknown_orange_zigzag = {
     .xTiles = 30,
diff --git a/data/tilemaps/mp_vs_background_text/header.c b/data/tilemaps/mp_vs_background_text/header.c
index 2cee6cd78..486aaddd4 100644
--- a/data/tilemaps/mp_vs_background_text/header.c
+++ b/data/tilemaps/mp_vs_background_text/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_vs_background_text[]
-    = INCBIN_U16("data/tilemaps/mp_vs_background_text/palette.gbapal");
-const u8 Tiles_mp_vs_background_text[]
-    = INCBIN_U8("data/tilemaps/mp_vs_background_text/tiles.4bpp");
-const u16 Tilemap_mp_vs_background_text[]
-    = INCBIN_U16("data/tilemaps/mp_vs_background_text/tilemap.tilemap2");
+const u16 Palette_mp_vs_background_text[] = INCBIN_U16("data/tilemaps/mp_vs_background_text/palette.gbapal");
+const u8 Tiles_mp_vs_background_text[] = INCBIN_U8("data/tilemaps/mp_vs_background_text/tiles.4bpp");
+const u16 Tilemap_mp_vs_background_text[] = INCBIN_U16("data/tilemaps/mp_vs_background_text/tilemap.tilemap2");
 
 const Tilemap mp_vs_background_text = {
     .xTiles = 32,
diff --git a/data/tilemaps/mp_wait_connection/header.c b/data/tilemaps/mp_wait_connection/header.c
index 76522310b..b221507ff 100644
--- a/data/tilemaps/mp_wait_connection/header.c
+++ b/data/tilemaps/mp_wait_connection/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_wait_connection[]
-    = INCBIN_U16("data/tilemaps/mp_wait_connection/palette.gbapal");
-const u8 Tiles_mp_wait_connection[]
-    = INCBIN_U8("data/tilemaps/mp_wait_connection/tiles.4bpp");
-const u16 Tilemap_mp_wait_connection[]
-    = INCBIN_U16("data/tilemaps/mp_wait_connection/tilemap.tilemap2");
+const u16 Palette_mp_wait_connection[] = INCBIN_U16("data/tilemaps/mp_wait_connection/palette.gbapal");
+const u8 Tiles_mp_wait_connection[] = INCBIN_U8("data/tilemaps/mp_wait_connection/tiles.4bpp");
+const u16 Tilemap_mp_wait_connection[] = INCBIN_U16("data/tilemaps/mp_wait_connection/tilemap.tilemap2");
 
 const Tilemap mp_wait_connection = {
     .xTiles = 30,
diff --git a/data/tilemaps/music_plant_moving_stars/header.c b/data/tilemaps/music_plant_moving_stars/header.c
index b6946e0dc..a98530d94 100644
--- a/data/tilemaps/music_plant_moving_stars/header.c
+++ b/data/tilemaps/music_plant_moving_stars/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_music_plant_moving_stars[]
-    = INCBIN_U16("data/tilemaps/music_plant_moving_stars/palette.gbapal");
-const u8 Tiles_music_plant_moving_stars[]
-    = INCBIN_U8("data/tilemaps/music_plant_moving_stars/tiles.4bpp");
-const u16 Tilemap_music_plant_moving_stars[]
-    = INCBIN_U16("data/tilemaps/music_plant_moving_stars/tilemap.tilemap2");
+const u16 Palette_music_plant_moving_stars[] = INCBIN_U16("data/tilemaps/music_plant_moving_stars/palette.gbapal");
+const u8 Tiles_music_plant_moving_stars[] = INCBIN_U8("data/tilemaps/music_plant_moving_stars/tiles.4bpp");
+const u16 Tilemap_music_plant_moving_stars[] = INCBIN_U16("data/tilemaps/music_plant_moving_stars/tilemap.tilemap2");
 
 const Tilemap music_plant_moving_stars = {
     .xTiles = 32,
diff --git a/data/tilemaps/options_bg0/header.c b/data/tilemaps/options_bg0/header.c
index 5c9520392..5273cf8fd 100644
--- a/data/tilemaps/options_bg0/header.c
+++ b/data/tilemaps/options_bg0/header.c
@@ -3,8 +3,7 @@
 
 const u16 Palette_options_bg0[] = INCBIN_U16("data/tilemaps/options_bg0/palette.gbapal");
 const u8 Tiles_options_bg0[] = INCBIN_U8("data/tilemaps/options_bg0/tiles.4bpp");
-const u16 Tilemap_options_bg0[]
-    = INCBIN_U16("data/tilemaps/options_bg0/tilemap.tilemap2");
+const u16 Tilemap_options_bg0[] = INCBIN_U16("data/tilemaps/options_bg0/tilemap.tilemap2");
 
 const Tilemap options_bg0 = {
     .xTiles = 30,
diff --git a/data/tilemaps/options_enter_name/header.c b/data/tilemaps/options_enter_name/header.c
index 775eaa7ae..a6b0da0c0 100644
--- a/data/tilemaps/options_enter_name/header.c
+++ b/data/tilemaps/options_enter_name/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_options_enter_name[]
-    = INCBIN_U16("data/tilemaps/options_enter_name/palette.gbapal");
-const u8 Tiles_options_enter_name[]
-    = INCBIN_U8("data/tilemaps/options_enter_name/tiles.4bpp");
-const u16 Tilemap_options_enter_name[]
-    = INCBIN_U16("data/tilemaps/options_enter_name/tilemap.tilemap2");
+const u16 Palette_options_enter_name[] = INCBIN_U16("data/tilemaps/options_enter_name/palette.gbapal");
+const u8 Tiles_options_enter_name[] = INCBIN_U8("data/tilemaps/options_enter_name/tiles.4bpp");
+const u16 Tilemap_options_enter_name[] = INCBIN_U16("data/tilemaps/options_enter_name/tilemap.tilemap2");
 
 const Tilemap options_enter_name = {
     .xTiles = 30,
diff --git a/data/tilemaps/options_enter_name_characters/header.c b/data/tilemaps/options_enter_name_characters/header.c
index b3a000911..982d1a4c4 100644
--- a/data/tilemaps/options_enter_name_characters/header.c
+++ b/data/tilemaps/options_enter_name_characters/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_options_enter_name_characters[]
-    = INCBIN_U16("data/tilemaps/options_enter_name_characters/palette.gbapal");
-const u8 Tiles_options_enter_name_characters[]
-    = INCBIN_U8("data/tilemaps/options_enter_name_characters/tiles.4bpp");
-const u16 Tilemap_options_enter_name_characters[]
-    = INCBIN_U16("data/tilemaps/options_enter_name_characters/tilemap.tilemap2");
+const u16 Palette_options_enter_name_characters[] = INCBIN_U16("data/tilemaps/options_enter_name_characters/palette.gbapal");
+const u8 Tiles_options_enter_name_characters[] = INCBIN_U8("data/tilemaps/options_enter_name_characters/tiles.4bpp");
+const u16 Tilemap_options_enter_name_characters[] = INCBIN_U16("data/tilemaps/options_enter_name_characters/tilemap.tilemap2");
 
 const Tilemap options_enter_name_characters = {
     .xTiles = 22,
diff --git a/data/tilemaps/options_language_select/header.c b/data/tilemaps/options_language_select/header.c
index 26493b8f2..fbb3d561f 100644
--- a/data/tilemaps/options_language_select/header.c
+++ b/data/tilemaps/options_language_select/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_options_language_select[]
-    = INCBIN_U16("data/tilemaps/options_language_select/palette.gbapal");
-const u8 Tiles_options_language_select[]
-    = INCBIN_U8("data/tilemaps/options_language_select/tiles.4bpp");
-const u16 Tilemap_options_language_select[]
-    = INCBIN_U16("data/tilemaps/options_language_select/tilemap.tilemap2");
+const u16 Palette_options_language_select[] = INCBIN_U16("data/tilemaps/options_language_select/palette.gbapal");
+const u8 Tiles_options_language_select[] = INCBIN_U8("data/tilemaps/options_language_select/tiles.4bpp");
+const u16 Tilemap_options_language_select[] = INCBIN_U16("data/tilemaps/options_language_select/tilemap.tilemap2");
 
 const Tilemap options_language_select = {
     .xTiles = 30,
diff --git a/data/tilemaps/options_time_record_bg0/header.c b/data/tilemaps/options_time_record_bg0/header.c
index 09abda0ad..da66027bf 100644
--- a/data/tilemaps/options_time_record_bg0/header.c
+++ b/data/tilemaps/options_time_record_bg0/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_options_time_record_bg0[]
-    = INCBIN_U16("data/tilemaps/options_time_record_bg0/palette.gbapal");
-const u8 Tiles_options_time_record_bg0[]
-    = INCBIN_U8("data/tilemaps/options_time_record_bg0/tiles.4bpp");
-const u16 Tilemap_options_time_record_bg0[]
-    = INCBIN_U16("data/tilemaps/options_time_record_bg0/tilemap.tilemap2");
+const u16 Palette_options_time_record_bg0[] = INCBIN_U16("data/tilemaps/options_time_record_bg0/palette.gbapal");
+const u8 Tiles_options_time_record_bg0[] = INCBIN_U8("data/tilemaps/options_time_record_bg0/tiles.4bpp");
+const u16 Tilemap_options_time_record_bg0[] = INCBIN_U16("data/tilemaps/options_time_record_bg0/tilemap.tilemap2");
 
 const Tilemap options_time_record_bg0 = {
     .xTiles = 30,
diff --git a/data/tilemaps/options_time_record_bg1/header.c b/data/tilemaps/options_time_record_bg1/header.c
index 33f5916d1..31199989f 100644
--- a/data/tilemaps/options_time_record_bg1/header.c
+++ b/data/tilemaps/options_time_record_bg1/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_options_time_record_bg1[]
-    = INCBIN_U16("data/tilemaps/options_time_record_bg1/palette.gbapal");
-const u8 Tiles_options_time_record_bg1[]
-    = INCBIN_U8("data/tilemaps/options_time_record_bg1/tiles.4bpp");
-const u16 Tilemap_options_time_record_bg1[]
-    = INCBIN_U16("data/tilemaps/options_time_record_bg1/tilemap.tilemap2");
+const u16 Palette_options_time_record_bg1[] = INCBIN_U16("data/tilemaps/options_time_record_bg1/palette.gbapal");
+const u8 Tiles_options_time_record_bg1[] = INCBIN_U8("data/tilemaps/options_time_record_bg1/tiles.4bpp");
+const u16 Tilemap_options_time_record_bg1[] = INCBIN_U16("data/tilemaps/options_time_record_bg1/tilemap.tilemap2");
 
 const Tilemap options_time_record_bg1 = {
     .xTiles = 30,
diff --git a/data/tilemaps/options_vs_record_bg1/header.c b/data/tilemaps/options_vs_record_bg1/header.c
index 00874c001..e36f1cb22 100644
--- a/data/tilemaps/options_vs_record_bg1/header.c
+++ b/data/tilemaps/options_vs_record_bg1/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_options_vs_record_bg1[]
-    = INCBIN_U16("data/tilemaps/options_vs_record_bg1/palette.gbapal");
-const u8 Tiles_options_vs_record_bg1[]
-    = INCBIN_U8("data/tilemaps/options_vs_record_bg1/tiles.4bpp");
-const u16 Tilemap_options_vs_record_bg1[]
-    = INCBIN_U16("data/tilemaps/options_vs_record_bg1/tilemap.tilemap2");
+const u16 Palette_options_vs_record_bg1[] = INCBIN_U16("data/tilemaps/options_vs_record_bg1/palette.gbapal");
+const u8 Tiles_options_vs_record_bg1[] = INCBIN_U8("data/tilemaps/options_vs_record_bg1/tiles.4bpp");
+const u16 Tilemap_options_vs_record_bg1[] = INCBIN_U16("data/tilemaps/options_vs_record_bg1/tilemap.tilemap2");
 
 const Tilemap options_vs_record_bg1 = {
     .xTiles = 30,
diff --git a/data/tilemaps/regular_final_boss/header.c b/data/tilemaps/regular_final_boss/header.c
index 6f843c3fa..c0453b40a 100644
--- a/data/tilemaps/regular_final_boss/header.c
+++ b/data/tilemaps/regular_final_boss/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_regular_final_boss[]
-    = INCBIN_U16("data/tilemaps/regular_final_boss/palette.gbapal");
-const u8 Tiles_regular_final_boss[]
-    = INCBIN_U8("data/tilemaps/regular_final_boss/tiles.4bpp");
-const u16 Tilemap_regular_final_boss[]
-    = INCBIN_U16("data/tilemaps/regular_final_boss/tilemap.tilemap2");
+const u16 Palette_regular_final_boss[] = INCBIN_U16("data/tilemaps/regular_final_boss/palette.gbapal");
+const u8 Tiles_regular_final_boss[] = INCBIN_U8("data/tilemaps/regular_final_boss/tiles.4bpp");
+const u16 Tilemap_regular_final_boss[] = INCBIN_U16("data/tilemaps/regular_final_boss/tilemap.tilemap2");
 
 const Tilemap regular_final_boss = {
     .xTiles = 30,
diff --git a/data/tilemaps/regular_final_boss_building_bg/header.c b/data/tilemaps/regular_final_boss_building_bg/header.c
index a7444802c..b170c3bac 100644
--- a/data/tilemaps/regular_final_boss_building_bg/header.c
+++ b/data/tilemaps/regular_final_boss_building_bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_regular_final_boss_building_bg[]
-    = INCBIN_U16("data/tilemaps/regular_final_boss_building_bg/palette.gbapal");
-const u8 Tiles_regular_final_boss_building_bg[]
-    = INCBIN_U8("data/tilemaps/regular_final_boss_building_bg/tiles.4bpp");
-const u16 Tilemap_regular_final_boss_building_bg[]
-    = INCBIN_U16("data/tilemaps/regular_final_boss_building_bg/tilemap.tilemap2");
+const u16 Palette_regular_final_boss_building_bg[] = INCBIN_U16("data/tilemaps/regular_final_boss_building_bg/palette.gbapal");
+const u8 Tiles_regular_final_boss_building_bg[] = INCBIN_U8("data/tilemaps/regular_final_boss_building_bg/tiles.4bpp");
+const u16 Tilemap_regular_final_boss_building_bg[] = INCBIN_U16("data/tilemaps/regular_final_boss_building_bg/tilemap.tilemap2");
 
 const Tilemap regular_final_boss_building_bg = {
     .xTiles = 32,
diff --git a/data/tilemaps/sa1_title_bg/header.c b/data/tilemaps/sa1_title_bg/header.c
index 352b08681..642e5ae60 100644
--- a/data/tilemaps/sa1_title_bg/header.c
+++ b/data/tilemaps/sa1_title_bg/header.c
@@ -2,37 +2,26 @@
 #include "core.h"
 
 const u16 Palette_sa1_title_bg[] = {
-    0x8340, 0,      0x9000, 0x2000, 0x421,  0x8c20, 0x2800, 0x1c20, 0x3000, 0xb000,
-    0xac20, 0x9c40, 0x8842, 0x3802, 0x3022, 0xac40, 0xb820, 0xb802, 0xb440, 0x65,
-    0x3423, 0x3860, 0x2082, 0xb061, 0x1084, 0x3c60, 0x3844, 0xe1,   0x4460, 0x3046,
-    0xaca0, 0x4860, 0xca6,  0xac83, 0x9ca3, 0xd060, 0x94a5, 0xbc81, 0xd460, 0xb865,
-    0x14,   0xd860, 0x2c88, 0xc0c0, 0xc8a1, 0x98c6, 0x5c80, 0x15,   0xe060, 0x28e4,
-    0xb8c4, 0x17,   0x80ac, 0x18,   0x60a0, 0x4900, 0xd4a2, 0x19,   0x48e3, 0xe0a1,
-    0x182,  0x28ca, 0x1a,   0x1d08, 0x38e8, 0xdcc2, 0x2d26, 0x5140, 0x64e1, 0x3d25,
-    0xa0cd, 0xe502, 0x941c, 0x4d25, 0xa529, 0x5980, 0xe502, 0x910e, 0x145a, 0x201,
-    0xe104, 0x5da0, 0xb548, 0x4929, 0x1d4c, 0x2d6b, 0xcd48, 0x9130, 0xe1c0, 0xd185,
-    0xe06,  0xe945, 0xc16b, 0x318c, 0x71c0, 0xe5e0, 0x155,  0x20bc, 0x5189, 0x1173,
-    0x19eb, 0xa18f, 0x6a20, 0x6587, 0xfdc0, 0xd1a9, 0x35ad, 0x7e00, 0x6e40, 0xd9e6,
-    0x8995, 0xeda7, 0xa1b1, 0xfe01, 0xe624, 0x39ce, 0x7260, 0x82a6, 0xad39, 0xe1c9,
-    0xc9cd, 0xe227, 0x7e42, 0x5d6,  0x3179, 0xc1ef, 0xa5f2, 0xf1e9, 0xee64, 0x620b,
-    0x7e64, 0xea48, 0x85f8, 0xda0e, 0x1616, 0x4231, 0xf2a4, 0x7e85, 0xf22b, 0xae34,
-    0xee88, 0xd230, 0x3d9d, 0x7ae3, 0x639,  0x7ea6, 0x4a52, 0x666d, 0x7ec6, 0x7ec7,
-    0x726d, 0x5271, 0xf2a9, 0xae56, 0xc1db, 0x4e73, 0xfec7, 0x9f0d, 0x728d, 0x7ee8,
-    0xd672, 0x1e3d, 0x7ee8, 0xfee9, 0x3297, 0xee90, 0x1e98, 0xfee9, 0xd694, 0x76ae,
-    0xfeea, 0x2bc,  0x7f0a, 0x267d, 0x56b5, 0xb2b8, 0x4e5d, 0x1ada, 0xf6d0, 0x82bf,
-    0x2a9e, 0x5ed5, 0x7f2d, 0x32fa, 0x82df, 0xdad6, 0xaebe, 0x7b12, 0x82ff, 0xe2f7,
-    0x7f4f, 0x31f,  0x5abe, 0xb2de, 0x7b33, 0x831f, 0x3f1b, 0xe317, 0xa73c, 0x133e,
-    0xb6ff, 0x833f, 0xe718, 0xff52, 0x6339, 0x35f,  0x7f72, 0x7f72, 0x3b1f, 0x37f,
-    0x433d, 0xff55, 0xe739, 0x535a, 0xff73, 0x3f3f, 0x837f, 0x39f,  0xa77d, 0xc33f,
-    0xe71e, 0x7f95, 0xeb5a, 0x3bf,  0x435f, 0x13bf, 0xff96, 0x3df,  0x6f7b, 0x477f,
-    0x83df, 0x7fb7, 0x579c, 0x3ff,  0x6f5f, 0x479f, 0x97df, 0x83ff, 0xffb8, 0x739c,
-    0xcf9f, 0xffb9, 0x77bd, 0x7fda, 0x779f, 0x63df, 0xffdc, 0x7bde, 0xfbbf, 0x7ffd,
-    0xfbde, 0x7ffd, 0xebff, 0x7fff, 0xfffe, 0xffff,
+    0x8340, 0,      0x9000, 0x2000, 0x421,  0x8c20, 0x2800, 0x1c20, 0x3000, 0xb000, 0xac20, 0x9c40, 0x8842, 0x3802, 0x3022, 0xac40,
+    0xb820, 0xb802, 0xb440, 0x65,   0x3423, 0x3860, 0x2082, 0xb061, 0x1084, 0x3c60, 0x3844, 0xe1,   0x4460, 0x3046, 0xaca0, 0x4860,
+    0xca6,  0xac83, 0x9ca3, 0xd060, 0x94a5, 0xbc81, 0xd460, 0xb865, 0x14,   0xd860, 0x2c88, 0xc0c0, 0xc8a1, 0x98c6, 0x5c80, 0x15,
+    0xe060, 0x28e4, 0xb8c4, 0x17,   0x80ac, 0x18,   0x60a0, 0x4900, 0xd4a2, 0x19,   0x48e3, 0xe0a1, 0x182,  0x28ca, 0x1a,   0x1d08,
+    0x38e8, 0xdcc2, 0x2d26, 0x5140, 0x64e1, 0x3d25, 0xa0cd, 0xe502, 0x941c, 0x4d25, 0xa529, 0x5980, 0xe502, 0x910e, 0x145a, 0x201,
+    0xe104, 0x5da0, 0xb548, 0x4929, 0x1d4c, 0x2d6b, 0xcd48, 0x9130, 0xe1c0, 0xd185, 0xe06,  0xe945, 0xc16b, 0x318c, 0x71c0, 0xe5e0,
+    0x155,  0x20bc, 0x5189, 0x1173, 0x19eb, 0xa18f, 0x6a20, 0x6587, 0xfdc0, 0xd1a9, 0x35ad, 0x7e00, 0x6e40, 0xd9e6, 0x8995, 0xeda7,
+    0xa1b1, 0xfe01, 0xe624, 0x39ce, 0x7260, 0x82a6, 0xad39, 0xe1c9, 0xc9cd, 0xe227, 0x7e42, 0x5d6,  0x3179, 0xc1ef, 0xa5f2, 0xf1e9,
+    0xee64, 0x620b, 0x7e64, 0xea48, 0x85f8, 0xda0e, 0x1616, 0x4231, 0xf2a4, 0x7e85, 0xf22b, 0xae34, 0xee88, 0xd230, 0x3d9d, 0x7ae3,
+    0x639,  0x7ea6, 0x4a52, 0x666d, 0x7ec6, 0x7ec7, 0x726d, 0x5271, 0xf2a9, 0xae56, 0xc1db, 0x4e73, 0xfec7, 0x9f0d, 0x728d, 0x7ee8,
+    0xd672, 0x1e3d, 0x7ee8, 0xfee9, 0x3297, 0xee90, 0x1e98, 0xfee9, 0xd694, 0x76ae, 0xfeea, 0x2bc,  0x7f0a, 0x267d, 0x56b5, 0xb2b8,
+    0x4e5d, 0x1ada, 0xf6d0, 0x82bf, 0x2a9e, 0x5ed5, 0x7f2d, 0x32fa, 0x82df, 0xdad6, 0xaebe, 0x7b12, 0x82ff, 0xe2f7, 0x7f4f, 0x31f,
+    0x5abe, 0xb2de, 0x7b33, 0x831f, 0x3f1b, 0xe317, 0xa73c, 0x133e, 0xb6ff, 0x833f, 0xe718, 0xff52, 0x6339, 0x35f,  0x7f72, 0x7f72,
+    0x3b1f, 0x37f,  0x433d, 0xff55, 0xe739, 0x535a, 0xff73, 0x3f3f, 0x837f, 0x39f,  0xa77d, 0xc33f, 0xe71e, 0x7f95, 0xeb5a, 0x3bf,
+    0x435f, 0x13bf, 0xff96, 0x3df,  0x6f7b, 0x477f, 0x83df, 0x7fb7, 0x579c, 0x3ff,  0x6f5f, 0x479f, 0x97df, 0x83ff, 0xffb8, 0x739c,
+    0xcf9f, 0xffb9, 0x77bd, 0x7fda, 0x779f, 0x63df, 0xffdc, 0x7bde, 0xfbbf, 0x7ffd, 0xfbde, 0x7ffd, 0xebff, 0x7fff, 0xfffe, 0xffff,
 };
 
 const u8 Tiles_sa1_title_bg[] = INCBIN_U8("data/tilemaps/sa1_title_bg/tiles.4bpp");
-const u16 Tilemap_sa1_title_bg[]
-    = INCBIN_U16("data/tilemaps/sa1_title_bg/tilemap.tilemap2");
+const u16 Tilemap_sa1_title_bg[] = INCBIN_U16("data/tilemaps/sa1_title_bg/tilemap.tilemap2");
 
 const Tilemap sa1_title_bg = {
     .xTiles = 30,
diff --git a/data/tilemaps/sa1_title_logo/header.c b/data/tilemaps/sa1_title_logo/header.c
index 1d4edb263..5b624b470 100644
--- a/data/tilemaps/sa1_title_logo/header.c
+++ b/data/tilemaps/sa1_title_logo/header.c
@@ -3,37 +3,26 @@
 
 // This uses transparency, which gbagfx doesn't (yet) support
 const u16 Palette_sa1_title_logo[] = {
-    0x8340, 0,      0x9000, 0x2000, 0x421,  0x8c20, 0x2800, 0x1c20, 0x3000, 0xb000,
-    0xac20, 0x9c40, 0x8842, 0x3802, 0x3022, 0xac40, 0xb820, 0xb802, 0xb440, 0x65,
-    0x3423, 0x3860, 0x2082, 0xb061, 0x1084, 0x3c60, 0x3844, 0xe1,   0x4460, 0x3046,
-    0xaca0, 0x4860, 0xca6,  0xac83, 0x9ca3, 0xd060, 0x94a5, 0xbc81, 0xd460, 0xb865,
-    0x14,   0xd860, 0x2c88, 0xc0c0, 0xc8a1, 0x98c6, 0x5c80, 0x15,   0xe060, 0x28e4,
-    0xb8c4, 0x17,   0x80ac, 0x18,   0x60a0, 0x4900, 0xd4a2, 0x19,   0x48e3, 0xe0a1,
-    0x182,  0x28ca, 0x1a,   0x1d08, 0x38e8, 0xdcc2, 0x2d26, 0x5140, 0x64e1, 0x3d25,
-    0xa0cd, 0xe502, 0x941c, 0x4d25, 0xa529, 0x5980, 0xe502, 0x910e, 0x145a, 0x201,
-    0xe104, 0x5da0, 0xb548, 0x4929, 0x1d4c, 0x2d6b, 0xcd48, 0x9130, 0xe1c0, 0xd185,
-    0xe06,  0xe945, 0xc16b, 0x318c, 0x71c0, 0xe5e0, 0x155,  0x20bc, 0x5189, 0x1173,
-    0x19eb, 0xa18f, 0x6a20, 0x6587, 0xfdc0, 0xd1a9, 0x35ad, 0x7e00, 0x6e40, 0xd9e6,
-    0x8995, 0xeda7, 0xa1b1, 0xfe01, 0xe624, 0x39ce, 0x7260, 0x82a6, 0xad39, 0xe1c9,
-    0xc9cd, 0xe227, 0x7e42, 0x5d6,  0x3179, 0xc1ef, 0xa5f2, 0xf1e9, 0xee64, 0x620b,
-    0x7e64, 0xea48, 0x85f8, 0xda0e, 0x1616, 0x4231, 0xf2a4, 0x7e85, 0xf22b, 0xae34,
-    0xee88, 0xd230, 0x3d9d, 0x7ae3, 0x639,  0x7ea6, 0x4a52, 0x666d, 0x7ec6, 0x7ec7,
-    0x726d, 0x5271, 0xf2a9, 0xae56, 0xc1db, 0x4e73, 0xfec7, 0x9f0d, 0x728d, 0x7ee8,
-    0xd672, 0x1e3d, 0x7ee8, 0xfee9, 0x3297, 0xee90, 0x1e98, 0xfee9, 0xd694, 0x76ae,
-    0xfeea, 0x2bc,  0x7f0a, 0x267d, 0x56b5, 0xb2b8, 0x4e5d, 0x1ada, 0xf6d0, 0x82bf,
-    0x2a9e, 0x5ed5, 0x7f2d, 0x32fa, 0x82df, 0xdad6, 0xaebe, 0x7b12, 0x82ff, 0xe2f7,
-    0x7f4f, 0x31f,  0x5abe, 0xb2de, 0x7b33, 0x831f, 0x3f1b, 0xe317, 0xa73c, 0x133e,
-    0xb6ff, 0x833f, 0xe718, 0xff52, 0x6339, 0x35f,  0x7f72, 0x7f72, 0x3b1f, 0x37f,
-    0x433d, 0xff55, 0xe739, 0x535a, 0xff73, 0x3f3f, 0x837f, 0x39f,  0xa77d, 0xc33f,
-    0xe71e, 0x7f95, 0xeb5a, 0x3bf,  0x435f, 0x13bf, 0xff96, 0x3df,  0x6f7b, 0x477f,
-    0x83df, 0x7fb7, 0x579c, 0x3ff,  0x6f5f, 0x479f, 0x97df, 0x83ff, 0xffb8, 0x739c,
-    0xcf9f, 0xffb9, 0x77bd, 0x7fda, 0x779f, 0x63df, 0xffdc, 0x7bde, 0xfbbf, 0x7ffd,
-    0xfbde, 0x7ffd, 0xebff, 0x7fff, 0xfffe, 0xffff,
+    0x8340, 0,      0x9000, 0x2000, 0x421,  0x8c20, 0x2800, 0x1c20, 0x3000, 0xb000, 0xac20, 0x9c40, 0x8842, 0x3802, 0x3022, 0xac40,
+    0xb820, 0xb802, 0xb440, 0x65,   0x3423, 0x3860, 0x2082, 0xb061, 0x1084, 0x3c60, 0x3844, 0xe1,   0x4460, 0x3046, 0xaca0, 0x4860,
+    0xca6,  0xac83, 0x9ca3, 0xd060, 0x94a5, 0xbc81, 0xd460, 0xb865, 0x14,   0xd860, 0x2c88, 0xc0c0, 0xc8a1, 0x98c6, 0x5c80, 0x15,
+    0xe060, 0x28e4, 0xb8c4, 0x17,   0x80ac, 0x18,   0x60a0, 0x4900, 0xd4a2, 0x19,   0x48e3, 0xe0a1, 0x182,  0x28ca, 0x1a,   0x1d08,
+    0x38e8, 0xdcc2, 0x2d26, 0x5140, 0x64e1, 0x3d25, 0xa0cd, 0xe502, 0x941c, 0x4d25, 0xa529, 0x5980, 0xe502, 0x910e, 0x145a, 0x201,
+    0xe104, 0x5da0, 0xb548, 0x4929, 0x1d4c, 0x2d6b, 0xcd48, 0x9130, 0xe1c0, 0xd185, 0xe06,  0xe945, 0xc16b, 0x318c, 0x71c0, 0xe5e0,
+    0x155,  0x20bc, 0x5189, 0x1173, 0x19eb, 0xa18f, 0x6a20, 0x6587, 0xfdc0, 0xd1a9, 0x35ad, 0x7e00, 0x6e40, 0xd9e6, 0x8995, 0xeda7,
+    0xa1b1, 0xfe01, 0xe624, 0x39ce, 0x7260, 0x82a6, 0xad39, 0xe1c9, 0xc9cd, 0xe227, 0x7e42, 0x5d6,  0x3179, 0xc1ef, 0xa5f2, 0xf1e9,
+    0xee64, 0x620b, 0x7e64, 0xea48, 0x85f8, 0xda0e, 0x1616, 0x4231, 0xf2a4, 0x7e85, 0xf22b, 0xae34, 0xee88, 0xd230, 0x3d9d, 0x7ae3,
+    0x639,  0x7ea6, 0x4a52, 0x666d, 0x7ec6, 0x7ec7, 0x726d, 0x5271, 0xf2a9, 0xae56, 0xc1db, 0x4e73, 0xfec7, 0x9f0d, 0x728d, 0x7ee8,
+    0xd672, 0x1e3d, 0x7ee8, 0xfee9, 0x3297, 0xee90, 0x1e98, 0xfee9, 0xd694, 0x76ae, 0xfeea, 0x2bc,  0x7f0a, 0x267d, 0x56b5, 0xb2b8,
+    0x4e5d, 0x1ada, 0xf6d0, 0x82bf, 0x2a9e, 0x5ed5, 0x7f2d, 0x32fa, 0x82df, 0xdad6, 0xaebe, 0x7b12, 0x82ff, 0xe2f7, 0x7f4f, 0x31f,
+    0x5abe, 0xb2de, 0x7b33, 0x831f, 0x3f1b, 0xe317, 0xa73c, 0x133e, 0xb6ff, 0x833f, 0xe718, 0xff52, 0x6339, 0x35f,  0x7f72, 0x7f72,
+    0x3b1f, 0x37f,  0x433d, 0xff55, 0xe739, 0x535a, 0xff73, 0x3f3f, 0x837f, 0x39f,  0xa77d, 0xc33f, 0xe71e, 0x7f95, 0xeb5a, 0x3bf,
+    0x435f, 0x13bf, 0xff96, 0x3df,  0x6f7b, 0x477f, 0x83df, 0x7fb7, 0x579c, 0x3ff,  0x6f5f, 0x479f, 0x97df, 0x83ff, 0xffb8, 0x739c,
+    0xcf9f, 0xffb9, 0x77bd, 0x7fda, 0x779f, 0x63df, 0xffdc, 0x7bde, 0xfbbf, 0x7ffd, 0xfbde, 0x7ffd, 0xebff, 0x7fff, 0xfffe, 0xffff,
 };
 
 const u8 Tiles_sa1_title_logo[] = INCBIN_U8("data/tilemaps/sa1_title_logo/tiles.4bpp");
-const u8 Tilemap_sa1_title_logo[]
-    = INCBIN_U8("data/tilemaps/sa1_title_logo/tilemap.tilemap2");
+const u8 Tilemap_sa1_title_logo[] = INCBIN_U8("data/tilemaps/sa1_title_logo/tilemap.tilemap2");
 
 const Tilemap sa1_title_logo = {
     .xTiles = 24,
diff --git a/data/tilemaps/sa1_title_logo_jp/header.c b/data/tilemaps/sa1_title_logo_jp/header.c
index fe424a5e8..28f3f1ddf 100644
--- a/data/tilemaps/sa1_title_logo_jp/header.c
+++ b/data/tilemaps/sa1_title_logo_jp/header.c
@@ -2,41 +2,28 @@
 #include "core.h"
 
 const u16 Palette_sa1_title_logo_jp[] = {
-    0x8340u, 0u,      0x9000u, 0x2000u, 0x421u,  0x8c20u, 0x2800u, 0x1c20u, 0x3000u,
-    0xb000u, 0xac20u, 0x9c40u, 0x8842u, 0x3802u, 0x3022u, 0xac40u, 0xb820u, 0xb802u,
-    0xb440u, 0x65u,   0x3423u, 0x3860u, 0x2082u, 0xb061u, 0x1084u, 0x3c60u, 0x3844u,
-    0xe1u,   0x4460u, 0x3046u, 0xaca0u, 0x4860u, 0xca6u,  0xac83u, 0x9ca3u, 0xd060u,
-    0x94a5u, 0xbc81u, 0xd460u, 0xb865u, 0x14u,   0xd860u, 0x2c88u, 0xc0c0u, 0xc8a1u,
-    0x98c6u, 0x5c80u, 0x15u,   0xe060u, 0x28e4u, 0xb8c4u, 0x17u,   0x80acu, 0x18u,
-    0x60a0u, 0x4900u, 0xd4a2u, 0x19u,   0x48e3u, 0xe0a1u, 0x182u,  0x28cau, 0x1au,
-    0x1d08u, 0x38e8u, 0xdcc2u, 0x2d26u, 0x5140u, 0x64e1u, 0x3d25u, 0xa0cdu, 0xe502u,
-    0x941cu, 0x4d25u, 0xa529u, 0x5980u, 0xe502u, 0x910eu, 0x145au, 0x201u,  0xe104u,
-    0x5da0u, 0xb548u, 0x4929u, 0x1d4cu, 0x2d6bu, 0xcd48u, 0x9130u, 0xe1c0u, 0xd185u,
-    0xe06u,  0xe945u, 0xc16bu, 0x318cu, 0x71c0u, 0xe5e0u, 0x155u,  0x20bcu, 0x5189u,
-    0x1173u, 0x19ebu, 0xa18fu, 0x6a20u, 0x6587u, 0xfdc0u, 0xd1a9u, 0x35adu, 0x7e00u,
-    0x6e40u, 0xd9e6u, 0x8995u, 0xeda7u, 0xa1b1u, 0xfe01u, 0xe624u, 0x39ceu, 0x7260u,
-    0x82a6u, 0xad39u, 0xe1c9u, 0xc9cdu, 0xe227u, 0x7e42u, 0x5d6u,  0x3179u, 0xc1efu,
-    0xa5f2u, 0xf1e9u, 0xee64u, 0x620bu, 0x7e64u, 0xea48u, 0x85f8u, 0xda0eu, 0x1616u,
-    0x4231u, 0xf2a4u, 0x7e85u, 0xf22bu, 0xae34u, 0xee88u, 0xd230u, 0x3d9du, 0x7ae3u,
-    0x639u,  0x7ea6u, 0x4a52u, 0x666du, 0x7ec6u, 0x7ec7u, 0x726du, 0x5271u, 0xf2a9u,
-    0xae56u, 0xc1dbu, 0x4e73u, 0xfec7u, 0x9f0du, 0x728du, 0x7ee8u, 0xd672u, 0x1e3du,
-    0x7ee8u, 0xfee9u, 0x3297u, 0xee90u, 0x1e98u, 0xfee9u, 0xd694u, 0x76aeu, 0xfeeau,
-    0x2bcu,  0x7f0au, 0x267du, 0x56b5u, 0xb2b8u, 0x4e5du, 0x1adau, 0xf6d0u, 0x82bfu,
-    0x2a9eu, 0x5ed5u, 0x7f2du, 0x32fau, 0x82dfu, 0xdad6u, 0xaebeu, 0x7b12u, 0x82ffu,
-    0xe2f7u, 0x7f4fu, 0x31fu,  0x5abeu, 0xb2deu, 0x7b33u, 0x831fu, 0x3f1bu, 0xe317u,
-    0xa73cu, 0x133eu, 0xb6ffu, 0x833fu, 0xe718u, 0xff52u, 0x6339u, 0x35fu,  0x7f72u,
-    0x7f72u, 0x3b1fu, 0x37fu,  0x433du, 0xff55u, 0xe739u, 0x535au, 0xff73u, 0x3f3fu,
-    0x837fu, 0x39fu,  0xa77du, 0xc33fu, 0xe71eu, 0x7f95u, 0xeb5au, 0x3bfu,  0x435fu,
-    0x13bfu, 0xff96u, 0x3dfu,  0x6f7bu, 0x477fu, 0x83dfu, 0x7fb7u, 0x579cu, 0x3ffu,
-    0x6f5fu, 0x479fu, 0x97dfu, 0x83ffu, 0xffb8u, 0x739cu, 0xcf9fu, 0xffb9u, 0x77bdu,
-    0x7fdau, 0x779fu, 0x63dfu, 0xffdcu, 0x7bdeu, 0xfbbfu, 0x7ffdu, 0xfbdeu, 0x7ffdu,
-    0xebffu, 0x7fffu, 0xfffeu, 0xffffu,
+    0x8340u, 0u,      0x9000u, 0x2000u, 0x421u,  0x8c20u, 0x2800u, 0x1c20u, 0x3000u, 0xb000u, 0xac20u, 0x9c40u, 0x8842u, 0x3802u, 0x3022u,
+    0xac40u, 0xb820u, 0xb802u, 0xb440u, 0x65u,   0x3423u, 0x3860u, 0x2082u, 0xb061u, 0x1084u, 0x3c60u, 0x3844u, 0xe1u,   0x4460u, 0x3046u,
+    0xaca0u, 0x4860u, 0xca6u,  0xac83u, 0x9ca3u, 0xd060u, 0x94a5u, 0xbc81u, 0xd460u, 0xb865u, 0x14u,   0xd860u, 0x2c88u, 0xc0c0u, 0xc8a1u,
+    0x98c6u, 0x5c80u, 0x15u,   0xe060u, 0x28e4u, 0xb8c4u, 0x17u,   0x80acu, 0x18u,   0x60a0u, 0x4900u, 0xd4a2u, 0x19u,   0x48e3u, 0xe0a1u,
+    0x182u,  0x28cau, 0x1au,   0x1d08u, 0x38e8u, 0xdcc2u, 0x2d26u, 0x5140u, 0x64e1u, 0x3d25u, 0xa0cdu, 0xe502u, 0x941cu, 0x4d25u, 0xa529u,
+    0x5980u, 0xe502u, 0x910eu, 0x145au, 0x201u,  0xe104u, 0x5da0u, 0xb548u, 0x4929u, 0x1d4cu, 0x2d6bu, 0xcd48u, 0x9130u, 0xe1c0u, 0xd185u,
+    0xe06u,  0xe945u, 0xc16bu, 0x318cu, 0x71c0u, 0xe5e0u, 0x155u,  0x20bcu, 0x5189u, 0x1173u, 0x19ebu, 0xa18fu, 0x6a20u, 0x6587u, 0xfdc0u,
+    0xd1a9u, 0x35adu, 0x7e00u, 0x6e40u, 0xd9e6u, 0x8995u, 0xeda7u, 0xa1b1u, 0xfe01u, 0xe624u, 0x39ceu, 0x7260u, 0x82a6u, 0xad39u, 0xe1c9u,
+    0xc9cdu, 0xe227u, 0x7e42u, 0x5d6u,  0x3179u, 0xc1efu, 0xa5f2u, 0xf1e9u, 0xee64u, 0x620bu, 0x7e64u, 0xea48u, 0x85f8u, 0xda0eu, 0x1616u,
+    0x4231u, 0xf2a4u, 0x7e85u, 0xf22bu, 0xae34u, 0xee88u, 0xd230u, 0x3d9du, 0x7ae3u, 0x639u,  0x7ea6u, 0x4a52u, 0x666du, 0x7ec6u, 0x7ec7u,
+    0x726du, 0x5271u, 0xf2a9u, 0xae56u, 0xc1dbu, 0x4e73u, 0xfec7u, 0x9f0du, 0x728du, 0x7ee8u, 0xd672u, 0x1e3du, 0x7ee8u, 0xfee9u, 0x3297u,
+    0xee90u, 0x1e98u, 0xfee9u, 0xd694u, 0x76aeu, 0xfeeau, 0x2bcu,  0x7f0au, 0x267du, 0x56b5u, 0xb2b8u, 0x4e5du, 0x1adau, 0xf6d0u, 0x82bfu,
+    0x2a9eu, 0x5ed5u, 0x7f2du, 0x32fau, 0x82dfu, 0xdad6u, 0xaebeu, 0x7b12u, 0x82ffu, 0xe2f7u, 0x7f4fu, 0x31fu,  0x5abeu, 0xb2deu, 0x7b33u,
+    0x831fu, 0x3f1bu, 0xe317u, 0xa73cu, 0x133eu, 0xb6ffu, 0x833fu, 0xe718u, 0xff52u, 0x6339u, 0x35fu,  0x7f72u, 0x7f72u, 0x3b1fu, 0x37fu,
+    0x433du, 0xff55u, 0xe739u, 0x535au, 0xff73u, 0x3f3fu, 0x837fu, 0x39fu,  0xa77du, 0xc33fu, 0xe71eu, 0x7f95u, 0xeb5au, 0x3bfu,  0x435fu,
+    0x13bfu, 0xff96u, 0x3dfu,  0x6f7bu, 0x477fu, 0x83dfu, 0x7fb7u, 0x579cu, 0x3ffu,  0x6f5fu, 0x479fu, 0x97dfu, 0x83ffu, 0xffb8u, 0x739cu,
+    0xcf9fu, 0xffb9u, 0x77bdu, 0x7fdau, 0x779fu, 0x63dfu, 0xffdcu, 0x7bdeu, 0xfbbfu, 0x7ffdu, 0xfbdeu, 0x7ffdu, 0xebffu, 0x7fffu, 0xfffeu,
+    0xffffu,
 };
 
-const u8 Tiles_sa1_title_logo_jp[]
-    = INCBIN_U8("data/tilemaps/sa1_title_logo_jp/tiles.8bpp");
-const u16 Tilemap_sa1_title_logo_jp[]
-    = INCBIN_U16("data/tilemaps/sa1_title_logo_jp/tilemap.tilemap1");
+const u8 Tiles_sa1_title_logo_jp[] = INCBIN_U8("data/tilemaps/sa1_title_logo_jp/tiles.8bpp");
+const u16 Tilemap_sa1_title_logo_jp[] = INCBIN_U16("data/tilemaps/sa1_title_logo_jp/tilemap.tilemap1");
 
 const Tilemap sa1_title_logo_jp = {
     .xTiles = 24,
diff --git a/data/tilemaps/sa2_title_logo_jp/header.c b/data/tilemaps/sa2_title_logo_jp/header.c
index 822599ae0..105505be1 100644
--- a/data/tilemaps/sa2_title_logo_jp/header.c
+++ b/data/tilemaps/sa2_title_logo_jp/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_sa2_title_logo_jp[]
-    = INCBIN_U16("data/tilemaps/sa2_title_logo_jp/palette.gbapal");
-const u8 Tiles_sa2_title_logo_jp[]
-    = INCBIN_U8("data/tilemaps/sa2_title_logo_jp/tiles.4bpp");
-const u8 Tilemap_sa2_title_logo_jp[]
-    = INCBIN_U8("data/tilemaps/sa2_title_logo_jp/tilemap.tilemap2");
+const u16 Palette_sa2_title_logo_jp[] = INCBIN_U16("data/tilemaps/sa2_title_logo_jp/palette.gbapal");
+const u8 Tiles_sa2_title_logo_jp[] = INCBIN_U8("data/tilemaps/sa2_title_logo_jp/tiles.4bpp");
+const u8 Tilemap_sa2_title_logo_jp[] = INCBIN_U8("data/tilemaps/sa2_title_logo_jp/tilemap.tilemap2");
 
 const Tilemap sa2_title_logo_jp = {
     .xTiles = 26,
diff --git a/data/tilemaps/sky_canyon_clouds_foreground/header.c b/data/tilemaps/sky_canyon_clouds_foreground/header.c
index 33b2e7d5d..e8779bd2d 100644
--- a/data/tilemaps/sky_canyon_clouds_foreground/header.c
+++ b/data/tilemaps/sky_canyon_clouds_foreground/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_sky_canyon_clouds_foreground[]
-    = INCBIN_U16("data/tilemaps/sky_canyon_clouds_foreground/palette.gbapal");
-const u8 Tiles_sky_canyon_clouds_foreground[]
-    = INCBIN_U8("data/tilemaps/sky_canyon_clouds_foreground/tiles.4bpp");
-const u16 Tilemap_sky_canyon_clouds_foreground[]
-    = INCBIN_U16("data/tilemaps/sky_canyon_clouds_foreground/tilemap.tilemap2");
+const u16 Palette_sky_canyon_clouds_foreground[] = INCBIN_U16("data/tilemaps/sky_canyon_clouds_foreground/palette.gbapal");
+const u8 Tiles_sky_canyon_clouds_foreground[] = INCBIN_U8("data/tilemaps/sky_canyon_clouds_foreground/tiles.4bpp");
+const u16 Tilemap_sky_canyon_clouds_foreground[] = INCBIN_U16("data/tilemaps/sky_canyon_clouds_foreground/tilemap.tilemap2");
 
 const Tilemap sky_canyon_clouds_foreground = {
     .xTiles = 32,
diff --git a/data/tilemaps/sound_test_bg/header.c b/data/tilemaps/sound_test_bg/header.c
index 82ea5812a..3aea7ea91 100644
--- a/data/tilemaps/sound_test_bg/header.c
+++ b/data/tilemaps/sound_test_bg/header.c
@@ -1,11 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_sound_test_bg[]
-    = INCBIN_U16("data/tilemaps/sound_test_bg/palette.gbapal");
+const u16 Palette_sound_test_bg[] = INCBIN_U16("data/tilemaps/sound_test_bg/palette.gbapal");
 const u8 Tiles_sound_test_bg[] = INCBIN_U8("data/tilemaps/sound_test_bg/tiles.4bpp");
-const u16 Tilemap_sound_test_bg[]
-    = INCBIN_U16("data/tilemaps/sound_test_bg/tilemap.tilemap2");
+const u16 Tilemap_sound_test_bg[] = INCBIN_U16("data/tilemaps/sound_test_bg/tilemap.tilemap2");
 
 const Tilemap sound_test_bg = {
     .xTiles = 32,
diff --git a/data/tilemaps/special_stage_1/header.c b/data/tilemaps/special_stage_1/header.c
index 8feef292b..b04bb54ba 100644
--- a/data/tilemaps/special_stage_1/header.c
+++ b/data/tilemaps/special_stage_1/header.c
@@ -1,11 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_special_stage_1[]
-    = INCBIN_U16("data/tilemaps/special_stage_1/palette.gbapal");
+const u16 Palette_special_stage_1[] = INCBIN_U16("data/tilemaps/special_stage_1/palette.gbapal");
 const u8 Tiles_special_stage_1[] = INCBIN_U8("data/tilemaps/special_stage_1/tiles.4bpp");
-const u8 Tilemap_special_stage_1[]
-    = INCBIN_U8("data/tilemaps/special_stage_1/tilemap.tilemap2");
+const u8 Tilemap_special_stage_1[] = INCBIN_U8("data/tilemaps/special_stage_1/tilemap.tilemap2");
 
 const Tilemap special_stage_1 = {
     .xTiles = 128,
diff --git a/data/tilemaps/special_stage_1_bg/header.c b/data/tilemaps/special_stage_1_bg/header.c
index b64a2d4a1..6c4ce24b8 100644
--- a/data/tilemaps/special_stage_1_bg/header.c
+++ b/data/tilemaps/special_stage_1_bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_special_stage_1_bg[]
-    = INCBIN_U16("data/tilemaps/special_stage_1_bg/palette.gbapal");
-const u8 Tiles_special_stage_1_bg[]
-    = INCBIN_U8("data/tilemaps/special_stage_1_bg/tiles.4bpp");
-const u16 Tilemap_special_stage_1_bg[]
-    = INCBIN_U16("data/tilemaps/special_stage_1_bg/tilemap.tilemap2");
+const u16 Palette_special_stage_1_bg[] = INCBIN_U16("data/tilemaps/special_stage_1_bg/palette.gbapal");
+const u8 Tiles_special_stage_1_bg[] = INCBIN_U8("data/tilemaps/special_stage_1_bg/tiles.4bpp");
+const u16 Tilemap_special_stage_1_bg[] = INCBIN_U16("data/tilemaps/special_stage_1_bg/tilemap.tilemap2");
 
 const Tilemap special_stage_1_bg = {
     .xTiles = 32,
diff --git a/data/tilemaps/special_stage_2/header.c b/data/tilemaps/special_stage_2/header.c
index ac9988bd2..e1a49ff06 100644
--- a/data/tilemaps/special_stage_2/header.c
+++ b/data/tilemaps/special_stage_2/header.c
@@ -1,11 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_special_stage_2[]
-    = INCBIN_U16("data/tilemaps/special_stage_2/palette.gbapal");
+const u16 Palette_special_stage_2[] = INCBIN_U16("data/tilemaps/special_stage_2/palette.gbapal");
 const u8 Tiles_special_stage_2[] = INCBIN_U8("data/tilemaps/special_stage_2/tiles.4bpp");
-const u8 Tilemap_special_stage_2[]
-    = INCBIN_U8("data/tilemaps/special_stage_2/tilemap.tilemap2");
+const u8 Tilemap_special_stage_2[] = INCBIN_U8("data/tilemaps/special_stage_2/tilemap.tilemap2");
 
 const Tilemap special_stage_2 = {
     .xTiles = 128,
diff --git a/data/tilemaps/special_stage_2_bg/header.c b/data/tilemaps/special_stage_2_bg/header.c
index b62c65ccb..2738b9bec 100644
--- a/data/tilemaps/special_stage_2_bg/header.c
+++ b/data/tilemaps/special_stage_2_bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_special_stage_2_bg[]
-    = INCBIN_U16("data/tilemaps/special_stage_2_bg/palette.gbapal");
-const u8 Tiles_special_stage_2_bg[]
-    = INCBIN_U8("data/tilemaps/special_stage_2_bg/tiles.4bpp");
-const u16 Tilemap_special_stage_2_bg[]
-    = INCBIN_U16("data/tilemaps/special_stage_2_bg/tilemap.tilemap2");
+const u16 Palette_special_stage_2_bg[] = INCBIN_U16("data/tilemaps/special_stage_2_bg/palette.gbapal");
+const u8 Tiles_special_stage_2_bg[] = INCBIN_U8("data/tilemaps/special_stage_2_bg/tiles.4bpp");
+const u16 Tilemap_special_stage_2_bg[] = INCBIN_U16("data/tilemaps/special_stage_2_bg/tilemap.tilemap2");
 
 const Tilemap special_stage_2_bg = {
     .xTiles = 32,
diff --git a/data/tilemaps/special_stage_3/header.c b/data/tilemaps/special_stage_3/header.c
index 6ae8f6b30..2b001635d 100644
--- a/data/tilemaps/special_stage_3/header.c
+++ b/data/tilemaps/special_stage_3/header.c
@@ -1,11 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_special_stage_3[]
-    = INCBIN_U16("data/tilemaps/special_stage_3/palette.gbapal");
+const u16 Palette_special_stage_3[] = INCBIN_U16("data/tilemaps/special_stage_3/palette.gbapal");
 const u8 Tiles_special_stage_3[] = INCBIN_U8("data/tilemaps/special_stage_3/tiles.4bpp");
-const u8 Tilemap_special_stage_3[]
-    = INCBIN_U8("data/tilemaps/special_stage_3/tilemap.tilemap2");
+const u8 Tilemap_special_stage_3[] = INCBIN_U8("data/tilemaps/special_stage_3/tilemap.tilemap2");
 
 const Tilemap special_stage_3 = {
     .xTiles = 128,
diff --git a/data/tilemaps/special_stage_3_bg/header.c b/data/tilemaps/special_stage_3_bg/header.c
index af669164a..304f17bd2 100644
--- a/data/tilemaps/special_stage_3_bg/header.c
+++ b/data/tilemaps/special_stage_3_bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_special_stage_3_bg[]
-    = INCBIN_U16("data/tilemaps/special_stage_3_bg/palette.gbapal");
-const u8 Tiles_special_stage_3_bg[]
-    = INCBIN_U8("data/tilemaps/special_stage_3_bg/tiles.4bpp");
-const u16 Tilemap_special_stage_3_bg[]
-    = INCBIN_U16("data/tilemaps/special_stage_3_bg/tilemap.tilemap2");
+const u16 Palette_special_stage_3_bg[] = INCBIN_U16("data/tilemaps/special_stage_3_bg/palette.gbapal");
+const u8 Tiles_special_stage_3_bg[] = INCBIN_U8("data/tilemaps/special_stage_3_bg/tiles.4bpp");
+const u16 Tilemap_special_stage_3_bg[] = INCBIN_U16("data/tilemaps/special_stage_3_bg/tilemap.tilemap2");
 
 const Tilemap special_stage_3_bg = {
     .xTiles = 32,
diff --git a/data/tilemaps/special_stage_4/header.c b/data/tilemaps/special_stage_4/header.c
index 5ca1ec5eb..869c3d7f7 100644
--- a/data/tilemaps/special_stage_4/header.c
+++ b/data/tilemaps/special_stage_4/header.c
@@ -1,11 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_special_stage_4[]
-    = INCBIN_U16("data/tilemaps/special_stage_4/palette.gbapal");
+const u16 Palette_special_stage_4[] = INCBIN_U16("data/tilemaps/special_stage_4/palette.gbapal");
 const u8 Tiles_special_stage_4[] = INCBIN_U8("data/tilemaps/special_stage_4/tiles.4bpp");
-const u8 Tilemap_special_stage_4[]
-    = INCBIN_U8("data/tilemaps/special_stage_4/tilemap.tilemap2");
+const u8 Tilemap_special_stage_4[] = INCBIN_U8("data/tilemaps/special_stage_4/tilemap.tilemap2");
 
 const Tilemap special_stage_4 = {
     .xTiles = 128,
diff --git a/data/tilemaps/special_stage_4_bg/header.c b/data/tilemaps/special_stage_4_bg/header.c
index 1e74de62a..83107bb29 100644
--- a/data/tilemaps/special_stage_4_bg/header.c
+++ b/data/tilemaps/special_stage_4_bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_special_stage_4_bg[]
-    = INCBIN_U16("data/tilemaps/special_stage_4_bg/palette.gbapal");
-const u8 Tiles_special_stage_4_bg[]
-    = INCBIN_U8("data/tilemaps/special_stage_4_bg/tiles.4bpp");
-const u16 Tilemap_special_stage_4_bg[]
-    = INCBIN_U16("data/tilemaps/special_stage_4_bg/tilemap.tilemap2");
+const u16 Palette_special_stage_4_bg[] = INCBIN_U16("data/tilemaps/special_stage_4_bg/palette.gbapal");
+const u8 Tiles_special_stage_4_bg[] = INCBIN_U8("data/tilemaps/special_stage_4_bg/tiles.4bpp");
+const u16 Tilemap_special_stage_4_bg[] = INCBIN_U16("data/tilemaps/special_stage_4_bg/tilemap.tilemap2");
 
 const Tilemap special_stage_4_bg = {
     .xTiles = 32,
diff --git a/data/tilemaps/special_stage_5/header.c b/data/tilemaps/special_stage_5/header.c
index 9e5b1be75..fdcdeafa3 100644
--- a/data/tilemaps/special_stage_5/header.c
+++ b/data/tilemaps/special_stage_5/header.c
@@ -1,11 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_special_stage_5[]
-    = INCBIN_U16("data/tilemaps/special_stage_5/palette.gbapal");
+const u16 Palette_special_stage_5[] = INCBIN_U16("data/tilemaps/special_stage_5/palette.gbapal");
 const u8 Tiles_special_stage_5[] = INCBIN_U8("data/tilemaps/special_stage_5/tiles.4bpp");
-const u8 Tilemap_special_stage_5[]
-    = INCBIN_U8("data/tilemaps/special_stage_5/tilemap.tilemap2");
+const u8 Tilemap_special_stage_5[] = INCBIN_U8("data/tilemaps/special_stage_5/tilemap.tilemap2");
 
 const Tilemap special_stage_5 = {
     .xTiles = 128,
diff --git a/data/tilemaps/special_stage_5_bg/header.c b/data/tilemaps/special_stage_5_bg/header.c
index 8ca63479a..0212262cc 100644
--- a/data/tilemaps/special_stage_5_bg/header.c
+++ b/data/tilemaps/special_stage_5_bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_special_stage_5_bg[]
-    = INCBIN_U16("data/tilemaps/special_stage_5_bg/palette.gbapal");
-const u8 Tiles_special_stage_5_bg[]
-    = INCBIN_U8("data/tilemaps/special_stage_5_bg/tiles.4bpp");
-const u16 Tilemap_special_stage_5_bg[]
-    = INCBIN_U16("data/tilemaps/special_stage_5_bg/tilemap.tilemap2");
+const u16 Palette_special_stage_5_bg[] = INCBIN_U16("data/tilemaps/special_stage_5_bg/palette.gbapal");
+const u8 Tiles_special_stage_5_bg[] = INCBIN_U8("data/tilemaps/special_stage_5_bg/tiles.4bpp");
+const u16 Tilemap_special_stage_5_bg[] = INCBIN_U16("data/tilemaps/special_stage_5_bg/tilemap.tilemap2");
 
 const Tilemap special_stage_5_bg = {
     .xTiles = 32,
diff --git a/data/tilemaps/special_stage_6/header.c b/data/tilemaps/special_stage_6/header.c
index 84c0cfef9..20da90a4b 100644
--- a/data/tilemaps/special_stage_6/header.c
+++ b/data/tilemaps/special_stage_6/header.c
@@ -1,11 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_special_stage_6[]
-    = INCBIN_U16("data/tilemaps/special_stage_6/palette.gbapal");
+const u16 Palette_special_stage_6[] = INCBIN_U16("data/tilemaps/special_stage_6/palette.gbapal");
 const u8 Tiles_special_stage_6[] = INCBIN_U8("data/tilemaps/special_stage_6/tiles.4bpp");
-const u8 Tilemap_special_stage_6[]
-    = INCBIN_U8("data/tilemaps/special_stage_6/tilemap.tilemap2");
+const u8 Tilemap_special_stage_6[] = INCBIN_U8("data/tilemaps/special_stage_6/tilemap.tilemap2");
 
 const Tilemap special_stage_6 = {
     .xTiles = 128,
diff --git a/data/tilemaps/special_stage_6_bg/header.c b/data/tilemaps/special_stage_6_bg/header.c
index 770b8f66f..b3412849d 100644
--- a/data/tilemaps/special_stage_6_bg/header.c
+++ b/data/tilemaps/special_stage_6_bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_special_stage_6_bg[]
-    = INCBIN_U16("data/tilemaps/special_stage_6_bg/palette.gbapal");
-const u8 Tiles_special_stage_6_bg[]
-    = INCBIN_U8("data/tilemaps/special_stage_6_bg/tiles.4bpp");
-const u16 Tilemap_special_stage_6_bg[]
-    = INCBIN_U16("data/tilemaps/special_stage_6_bg/tilemap.tilemap2");
+const u16 Palette_special_stage_6_bg[] = INCBIN_U16("data/tilemaps/special_stage_6_bg/palette.gbapal");
+const u8 Tiles_special_stage_6_bg[] = INCBIN_U8("data/tilemaps/special_stage_6_bg/tiles.4bpp");
+const u16 Tilemap_special_stage_6_bg[] = INCBIN_U16("data/tilemaps/special_stage_6_bg/tilemap.tilemap2");
 
 const Tilemap special_stage_6_bg = {
     .xTiles = 32,
diff --git a/data/tilemaps/special_stage_7/header.c b/data/tilemaps/special_stage_7/header.c
index 228d24fc1..3b79093b0 100644
--- a/data/tilemaps/special_stage_7/header.c
+++ b/data/tilemaps/special_stage_7/header.c
@@ -1,11 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_special_stage_7[]
-    = INCBIN_U16("data/tilemaps/special_stage_7/palette.gbapal");
+const u16 Palette_special_stage_7[] = INCBIN_U16("data/tilemaps/special_stage_7/palette.gbapal");
 const u8 Tiles_special_stage_7[] = INCBIN_U8("data/tilemaps/special_stage_7/tiles.4bpp");
-const u8 Tilemap_special_stage_7[]
-    = INCBIN_U8("data/tilemaps/special_stage_7/tilemap.tilemap2");
+const u8 Tilemap_special_stage_7[] = INCBIN_U8("data/tilemaps/special_stage_7/tilemap.tilemap2");
 
 const Tilemap special_stage_7 = {
     .xTiles = 128,
diff --git a/data/tilemaps/special_stage_7_bg/header.c b/data/tilemaps/special_stage_7_bg/header.c
index c7cb72128..f64a0540c 100644
--- a/data/tilemaps/special_stage_7_bg/header.c
+++ b/data/tilemaps/special_stage_7_bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_special_stage_7_bg[]
-    = INCBIN_U16("data/tilemaps/special_stage_7_bg/palette.gbapal");
-const u8 Tiles_special_stage_7_bg[]
-    = INCBIN_U8("data/tilemaps/special_stage_7_bg/tiles.4bpp");
-const u16 Tilemap_special_stage_7_bg[]
-    = INCBIN_U16("data/tilemaps/special_stage_7_bg/tilemap.tilemap2");
+const u16 Palette_special_stage_7_bg[] = INCBIN_U16("data/tilemaps/special_stage_7_bg/palette.gbapal");
+const u8 Tiles_special_stage_7_bg[] = INCBIN_U8("data/tilemaps/special_stage_7_bg/tiles.4bpp");
+const u16 Tilemap_special_stage_7_bg[] = INCBIN_U16("data/tilemaps/special_stage_7_bg/tilemap.tilemap2");
 
 const Tilemap special_stage_7_bg = {
     .xTiles = 32,
diff --git a/data/tilemaps/spotlight_snow/header.c b/data/tilemaps/spotlight_snow/header.c
index 62e84e107..efdcd3e63 100644
--- a/data/tilemaps/spotlight_snow/header.c
+++ b/data/tilemaps/spotlight_snow/header.c
@@ -1,13 +1,10 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_spotlight_snow[]
-    = INCBIN_U16("data/tilemaps/spotlight_snow/palette.gbapal");
+const u16 Palette_spotlight_snow[] = INCBIN_U16("data/tilemaps/spotlight_snow/palette.gbapal");
 const u8 Tiles_spotlight_snow[] = INCBIN_U8("data/tilemaps/spotlight_snow/tiles.4bpp");
-const u8 Tiles_AnimTiles_spotlight_snow[]
-    = INCBIN_U8("data/tilemaps/spotlight_snow/tiles_anim.4bpp");
-const u16 Tilemap_spotlight_snow[]
-    = INCBIN_U16("data/tilemaps/spotlight_snow/tilemap.tilemap2");
+const u8 Tiles_AnimTiles_spotlight_snow[] = INCBIN_U8("data/tilemaps/spotlight_snow/tiles_anim.4bpp");
+const u16 Tilemap_spotlight_snow[] = INCBIN_U16("data/tilemaps/spotlight_snow/tilemap.tilemap2");
 
 /* This is the snow effect inside Ice Paradise's spotlights */
 
diff --git a/data/tilemaps/stage_1_bg_0_copy/header.c b/data/tilemaps/stage_1_bg_0_copy/header.c
index 745c98174..1e9ccd98d 100644
--- a/data/tilemaps/stage_1_bg_0_copy/header.c
+++ b/data/tilemaps/stage_1_bg_0_copy/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_stage_1_bg_0_copy[]
-    = INCBIN_U16("data/tilemaps/stage_1_bg_0_copy/palette.gbapal");
-const u8 Tiles_stage_1_bg_0_copy[]
-    = INCBIN_U8("data/tilemaps/stage_1_bg_0_copy/tiles.4bpp");
-const u16 Tilemap_stage_1_bg_0_copy[]
-    = INCBIN_U16("data/tilemaps/stage_1_bg_0_copy/tilemap.tilemap2");
+const u16 Palette_stage_1_bg_0_copy[] = INCBIN_U16("data/tilemaps/stage_1_bg_0_copy/palette.gbapal");
+const u8 Tiles_stage_1_bg_0_copy[] = INCBIN_U8("data/tilemaps/stage_1_bg_0_copy/tiles.4bpp");
+const u16 Tilemap_stage_1_bg_0_copy[] = INCBIN_U16("data/tilemaps/stage_1_bg_0_copy/tilemap.tilemap2");
 
 const Tilemap stage_1_bg_0_copy = {
     .xTiles = 32,
diff --git a/data/tilemaps/stage_select_bg_amy/header.c b/data/tilemaps/stage_select_bg_amy/header.c
index 1ec2e3ebd..b5715177a 100644
--- a/data/tilemaps/stage_select_bg_amy/header.c
+++ b/data/tilemaps/stage_select_bg_amy/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_stage_select_bg_amy[]
-    = INCBIN_U16("data/tilemaps/stage_select_bg_amy/palette.gbapal");
-const u8 Tiles_stage_select_bg_amy[]
-    = INCBIN_U8("data/tilemaps/stage_select_bg_amy/tiles.4bpp");
-const u16 Tilemap_stage_select_bg_amy[]
-    = INCBIN_U16("data/tilemaps/stage_select_bg_amy/tilemap.tilemap2");
+const u16 Palette_stage_select_bg_amy[] = INCBIN_U16("data/tilemaps/stage_select_bg_amy/palette.gbapal");
+const u8 Tiles_stage_select_bg_amy[] = INCBIN_U8("data/tilemaps/stage_select_bg_amy/tiles.4bpp");
+const u16 Tilemap_stage_select_bg_amy[] = INCBIN_U16("data/tilemaps/stage_select_bg_amy/tilemap.tilemap2");
 
 const Tilemap stage_select_bg_amy = {
     .xTiles = 30,
diff --git a/data/tilemaps/stage_select_bg_cream/header.c b/data/tilemaps/stage_select_bg_cream/header.c
index e8c2e7947..6454cb542 100644
--- a/data/tilemaps/stage_select_bg_cream/header.c
+++ b/data/tilemaps/stage_select_bg_cream/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_stage_select_bg_cream[]
-    = INCBIN_U16("data/tilemaps/stage_select_bg_cream/palette.gbapal");
-const u8 Tiles_stage_select_bg_cream[]
-    = INCBIN_U8("data/tilemaps/stage_select_bg_cream/tiles.4bpp");
-const u16 Tilemap_stage_select_bg_cream[]
-    = INCBIN_U16("data/tilemaps/stage_select_bg_cream/tilemap.tilemap2");
+const u16 Palette_stage_select_bg_cream[] = INCBIN_U16("data/tilemaps/stage_select_bg_cream/palette.gbapal");
+const u8 Tiles_stage_select_bg_cream[] = INCBIN_U8("data/tilemaps/stage_select_bg_cream/tiles.4bpp");
+const u16 Tilemap_stage_select_bg_cream[] = INCBIN_U16("data/tilemaps/stage_select_bg_cream/tilemap.tilemap2");
 
 const Tilemap stage_select_bg_cream = {
     .xTiles = 30,
diff --git a/data/tilemaps/stage_select_bg_knuckles/header.c b/data/tilemaps/stage_select_bg_knuckles/header.c
index 9fe4ad238..c9903933f 100644
--- a/data/tilemaps/stage_select_bg_knuckles/header.c
+++ b/data/tilemaps/stage_select_bg_knuckles/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_stage_select_bg_knuckles[]
-    = INCBIN_U16("data/tilemaps/stage_select_bg_knuckles/palette.gbapal");
-const u8 Tiles_stage_select_bg_knuckles[]
-    = INCBIN_U8("data/tilemaps/stage_select_bg_knuckles/tiles.4bpp");
-const u16 Tilemap_stage_select_bg_knuckles[]
-    = INCBIN_U16("data/tilemaps/stage_select_bg_knuckles/tilemap.tilemap2");
+const u16 Palette_stage_select_bg_knuckles[] = INCBIN_U16("data/tilemaps/stage_select_bg_knuckles/palette.gbapal");
+const u8 Tiles_stage_select_bg_knuckles[] = INCBIN_U8("data/tilemaps/stage_select_bg_knuckles/tiles.4bpp");
+const u16 Tilemap_stage_select_bg_knuckles[] = INCBIN_U16("data/tilemaps/stage_select_bg_knuckles/tilemap.tilemap2");
 
 const Tilemap stage_select_bg_knuckles = {
     .xTiles = 30,
diff --git a/data/tilemaps/stage_select_bg_sonic/header.c b/data/tilemaps/stage_select_bg_sonic/header.c
index 39c507418..a6971863e 100644
--- a/data/tilemaps/stage_select_bg_sonic/header.c
+++ b/data/tilemaps/stage_select_bg_sonic/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_stage_select_bg_sonic[]
-    = INCBIN_U16("data/tilemaps/stage_select_bg_sonic/palette.gbapal");
-const u8 Tiles_stage_select_bg_sonic[]
-    = INCBIN_U8("data/tilemaps/stage_select_bg_sonic/tiles.4bpp");
-const u16 Tilemap_stage_select_bg_sonic[]
-    = INCBIN_U16("data/tilemaps/stage_select_bg_sonic/tilemap.tilemap2");
+const u16 Palette_stage_select_bg_sonic[] = INCBIN_U16("data/tilemaps/stage_select_bg_sonic/palette.gbapal");
+const u8 Tiles_stage_select_bg_sonic[] = INCBIN_U8("data/tilemaps/stage_select_bg_sonic/tiles.4bpp");
+const u16 Tilemap_stage_select_bg_sonic[] = INCBIN_U16("data/tilemaps/stage_select_bg_sonic/tilemap.tilemap2");
 
 const Tilemap stage_select_bg_sonic = {
     .xTiles = 30,
diff --git a/data/tilemaps/stage_select_bg_tails/header.c b/data/tilemaps/stage_select_bg_tails/header.c
index 298f31861..e1d952724 100644
--- a/data/tilemaps/stage_select_bg_tails/header.c
+++ b/data/tilemaps/stage_select_bg_tails/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_stage_select_bg_tails[]
-    = INCBIN_U16("data/tilemaps/stage_select_bg_tails/palette.gbapal");
-const u8 Tiles_stage_select_bg_tails[]
-    = INCBIN_U8("data/tilemaps/stage_select_bg_tails/tiles.4bpp");
-const u16 Tilemap_stage_select_bg_tails[]
-    = INCBIN_U16("data/tilemaps/stage_select_bg_tails/tilemap.tilemap2");
+const u16 Palette_stage_select_bg_tails[] = INCBIN_U16("data/tilemaps/stage_select_bg_tails/palette.gbapal");
+const u8 Tiles_stage_select_bg_tails[] = INCBIN_U8("data/tilemaps/stage_select_bg_tails/tiles.4bpp");
+const u16 Tilemap_stage_select_bg_tails[] = INCBIN_U16("data/tilemaps/stage_select_bg_tails/tilemap.tilemap2");
 
 const Tilemap stage_select_bg_tails = {
     .xTiles = 30,
diff --git a/data/tilemaps/stage_select_map/header.c b/data/tilemaps/stage_select_map/header.c
index 3b668cdb1..56c9bedc0 100644
--- a/data/tilemaps/stage_select_map/header.c
+++ b/data/tilemaps/stage_select_map/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_stage_select_map[]
-    = INCBIN_U16("data/tilemaps/stage_select_map/palette.gbapal");
-const u8 Tiles_stage_select_map[]
-    = INCBIN_U8("data/tilemaps/stage_select_map/tiles.4bpp");
-const u16 Tilemap_stage_select_map[]
-    = INCBIN_U16("data/tilemaps/stage_select_map/tilemap.tilemap2");
+const u16 Palette_stage_select_map[] = INCBIN_U16("data/tilemaps/stage_select_map/palette.gbapal");
+const u8 Tiles_stage_select_map[] = INCBIN_U8("data/tilemaps/stage_select_map/tiles.4bpp");
+const u16 Tilemap_stage_select_map[] = INCBIN_U16("data/tilemaps/stage_select_map/tilemap.tilemap2");
 
 const Tilemap stage_select_map = {
     .xTiles = 60,
diff --git a/data/tilemaps/storyframe_cream_cheese_vanilla_happy/header.c b/data/tilemaps/storyframe_cream_cheese_vanilla_happy/header.c
index 141b87835..2b487e093 100644
--- a/data/tilemaps/storyframe_cream_cheese_vanilla_happy/header.c
+++ b/data/tilemaps/storyframe_cream_cheese_vanilla_happy/header.c
@@ -3,8 +3,7 @@
 
 const u16 Palette_storyframe_cream_cheese_vanilla_happy[]
     = INCBIN_U16("data/tilemaps/storyframe_cream_cheese_vanilla_happy/palette.gbapal");
-const u8 Tiles_storyframe_cream_cheese_vanilla_happy[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_cheese_vanilla_happy/tiles.4bpp");
+const u8 Tiles_storyframe_cream_cheese_vanilla_happy[] = INCBIN_U8("data/tilemaps/storyframe_cream_cheese_vanilla_happy/tiles.4bpp");
 const u16 Tilemap_storyframe_cream_cheese_vanilla_happy[]
     = INCBIN_U16("data/tilemaps/storyframe_cream_cheese_vanilla_happy/tilemap.tilemap2");
 
diff --git a/data/tilemaps/storyframe_cream_hugs_vanilla/header.c b/data/tilemaps/storyframe_cream_hugs_vanilla/header.c
index 341b7bf85..37b17166b 100644
--- a/data/tilemaps/storyframe_cream_hugs_vanilla/header.c
+++ b/data/tilemaps/storyframe_cream_hugs_vanilla/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_hugs_vanilla[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_hugs_vanilla/palette.gbapal");
-const u8 Tiles_storyframe_cream_hugs_vanilla[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_hugs_vanilla/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_hugs_vanilla[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_hugs_vanilla/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_hugs_vanilla[] = INCBIN_U16("data/tilemaps/storyframe_cream_hugs_vanilla/palette.gbapal");
+const u8 Tiles_storyframe_cream_hugs_vanilla[] = INCBIN_U8("data/tilemaps/storyframe_cream_hugs_vanilla/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_hugs_vanilla[] = INCBIN_U16("data/tilemaps/storyframe_cream_hugs_vanilla/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_hugs_vanilla = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_tails_vanilla_look_around/header.c b/data/tilemaps/storyframe_cream_tails_vanilla_look_around/header.c
index c976f2b22..be46c191d 100644
--- a/data/tilemaps/storyframe_cream_tails_vanilla_look_around/header.c
+++ b/data/tilemaps/storyframe_cream_tails_vanilla_look_around/header.c
@@ -1,12 +1,12 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_tails_vanilla_look_around[] = INCBIN_U16(
-    "data/tilemaps/storyframe_cream_tails_vanilla_look_around/palette.gbapal");
+const u16 Palette_storyframe_cream_tails_vanilla_look_around[]
+    = INCBIN_U16("data/tilemaps/storyframe_cream_tails_vanilla_look_around/palette.gbapal");
 const u8 Tiles_storyframe_cream_tails_vanilla_look_around[]
     = INCBIN_U8("data/tilemaps/storyframe_cream_tails_vanilla_look_around/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_tails_vanilla_look_around[] = INCBIN_U16(
-    "data/tilemaps/storyframe_cream_tails_vanilla_look_around/tilemap.tilemap2");
+const u16 Tilemap_storyframe_cream_tails_vanilla_look_around[]
+    = INCBIN_U16("data/tilemaps/storyframe_cream_tails_vanilla_look_around/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_tails_vanilla_look_around = {
     .xTiles = 30,
@@ -18,7 +18,6 @@ const Tilemap storyframe_cream_tails_vanilla_look_around = {
     .tilesSize = sizeof(Tiles_storyframe_cream_tails_vanilla_look_around),
     .palette = Palette_storyframe_cream_tails_vanilla_look_around,
     .palOffset = 0,
-    .palLength
-    = sizeof(Palette_storyframe_cream_tails_vanilla_look_around) / sizeof(u16),
+    .palLength = sizeof(Palette_storyframe_cream_tails_vanilla_look_around) / sizeof(u16),
     .map = Tilemap_storyframe_cream_tails_vanilla_look_around,
 };
diff --git a/data/tilemaps/storyframe_cream_unlock_0/header.c b/data/tilemaps/storyframe_cream_unlock_0/header.c
index 3e5264a65..d3687e1d4 100644
--- a/data/tilemaps/storyframe_cream_unlock_0/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_0/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_0[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_0[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_0/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_0[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_0[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_0[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_0/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_0[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_0 = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_0_dlg_de/header.c b/data/tilemaps/storyframe_cream_unlock_0_dlg_de/header.c
index 9977ea184..5d336d0d4 100644
--- a/data/tilemaps/storyframe_cream_unlock_0_dlg_de/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_0_dlg_de/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_0_dlg_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_de/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_0_dlg_de[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_0_dlg_de/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_0_dlg_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_de/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_0_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_de/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_0_dlg_de[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_0_dlg_de/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_0_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_de/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_0_dlg_de = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_0_dlg_en/header.c b/data/tilemaps/storyframe_cream_unlock_0_dlg_en/header.c
index ca8a2a789..ada12fb00 100644
--- a/data/tilemaps/storyframe_cream_unlock_0_dlg_en/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_0_dlg_en/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_0_dlg_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_en/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_0_dlg_en[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_0_dlg_en/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_0_dlg_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_en/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_0_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_en/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_0_dlg_en[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_0_dlg_en/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_0_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_en/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_0_dlg_en = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_0_dlg_es/header.c b/data/tilemaps/storyframe_cream_unlock_0_dlg_es/header.c
index fdd88394f..9a3efd886 100644
--- a/data/tilemaps/storyframe_cream_unlock_0_dlg_es/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_0_dlg_es/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_0_dlg_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_es/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_0_dlg_es[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_0_dlg_es/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_0_dlg_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_es/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_0_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_es/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_0_dlg_es[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_0_dlg_es/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_0_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_es/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_0_dlg_es = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_0_dlg_fr/header.c b/data/tilemaps/storyframe_cream_unlock_0_dlg_fr/header.c
index d1b2228c2..1aa5f0e40 100644
--- a/data/tilemaps/storyframe_cream_unlock_0_dlg_fr/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_0_dlg_fr/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_0_dlg_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_fr/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_0_dlg_fr[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_0_dlg_fr/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_0_dlg_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_fr/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_0_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_fr/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_0_dlg_fr[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_0_dlg_fr/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_0_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_fr/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_0_dlg_fr = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_0_dlg_it/header.c b/data/tilemaps/storyframe_cream_unlock_0_dlg_it/header.c
index c85e60cc2..f2e3a4aa9 100644
--- a/data/tilemaps/storyframe_cream_unlock_0_dlg_it/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_0_dlg_it/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_0_dlg_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_it/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_0_dlg_it[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_0_dlg_it/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_0_dlg_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_it/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_0_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_it/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_0_dlg_it[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_0_dlg_it/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_0_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_it/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_0_dlg_it = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_0_dlg_jp/header.c b/data/tilemaps/storyframe_cream_unlock_0_dlg_jp/header.c
index e7120d75f..ddfad4f67 100644
--- a/data/tilemaps/storyframe_cream_unlock_0_dlg_jp/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_0_dlg_jp/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_0_dlg_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_jp/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_0_dlg_jp[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_0_dlg_jp/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_0_dlg_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_jp/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_0_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_jp/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_0_dlg_jp[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_0_dlg_jp/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_0_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_dlg_jp/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_0_dlg_jp = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_0_sepia/header.c b/data/tilemaps/storyframe_cream_unlock_0_sepia/header.c
index 32d25bf74..5350dd136 100644
--- a/data/tilemaps/storyframe_cream_unlock_0_sepia/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_0_sepia/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_0_sepia[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_sepia/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_0_sepia[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_0_sepia/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_0_sepia[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_sepia/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_0_sepia[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_sepia/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_0_sepia[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_0_sepia/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_0_sepia[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_0_sepia/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_0_sepia = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_1/header.c b/data/tilemaps/storyframe_cream_unlock_1/header.c
index 2eff2db03..4ec883230 100644
--- a/data/tilemaps/storyframe_cream_unlock_1/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_1/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_1[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_1[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_1/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_1[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_1[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_1[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_1/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_1[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_1 = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_1_dlg_de/header.c b/data/tilemaps/storyframe_cream_unlock_1_dlg_de/header.c
index c8fd07dbe..db87bb504 100644
--- a/data/tilemaps/storyframe_cream_unlock_1_dlg_de/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_1_dlg_de/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_1_dlg_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_de/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_1_dlg_de[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_1_dlg_de/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_1_dlg_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_de/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_1_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_de/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_1_dlg_de[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_1_dlg_de/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_1_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_de/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_1_dlg_de = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_1_dlg_en/header.c b/data/tilemaps/storyframe_cream_unlock_1_dlg_en/header.c
index 79e821049..ae9ef14d2 100644
--- a/data/tilemaps/storyframe_cream_unlock_1_dlg_en/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_1_dlg_en/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_1_dlg_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_en/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_1_dlg_en[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_1_dlg_en/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_1_dlg_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_en/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_1_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_en/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_1_dlg_en[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_1_dlg_en/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_1_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_en/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_1_dlg_en = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_1_dlg_es/header.c b/data/tilemaps/storyframe_cream_unlock_1_dlg_es/header.c
index 2782d333f..a864ec0c1 100644
--- a/data/tilemaps/storyframe_cream_unlock_1_dlg_es/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_1_dlg_es/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_1_dlg_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_es/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_1_dlg_es[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_1_dlg_es/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_1_dlg_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_es/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_1_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_es/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_1_dlg_es[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_1_dlg_es/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_1_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_es/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_1_dlg_es = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_1_dlg_fr/header.c b/data/tilemaps/storyframe_cream_unlock_1_dlg_fr/header.c
index fb21e02fd..03494c961 100644
--- a/data/tilemaps/storyframe_cream_unlock_1_dlg_fr/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_1_dlg_fr/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_1_dlg_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_fr/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_1_dlg_fr[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_1_dlg_fr/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_1_dlg_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_fr/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_1_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_fr/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_1_dlg_fr[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_1_dlg_fr/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_1_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_fr/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_1_dlg_fr = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_1_dlg_it/header.c b/data/tilemaps/storyframe_cream_unlock_1_dlg_it/header.c
index 58e875a48..c35ab5c9a 100644
--- a/data/tilemaps/storyframe_cream_unlock_1_dlg_it/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_1_dlg_it/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_1_dlg_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_it/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_1_dlg_it[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_1_dlg_it/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_1_dlg_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_it/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_1_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_it/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_1_dlg_it[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_1_dlg_it/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_1_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_it/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_1_dlg_it = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_1_dlg_jp/header.c b/data/tilemaps/storyframe_cream_unlock_1_dlg_jp/header.c
index 9058a8fc7..a49b95ffd 100644
--- a/data/tilemaps/storyframe_cream_unlock_1_dlg_jp/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_1_dlg_jp/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_1_dlg_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_jp/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_1_dlg_jp[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_1_dlg_jp/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_1_dlg_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_jp/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_1_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_jp/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_1_dlg_jp[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_1_dlg_jp/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_1_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_dlg_jp/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_1_dlg_jp = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_1_sepia/header.c b/data/tilemaps/storyframe_cream_unlock_1_sepia/header.c
index c212099f4..af1cbd025 100644
--- a/data/tilemaps/storyframe_cream_unlock_1_sepia/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_1_sepia/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_1_sepia[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_sepia/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_1_sepia[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_1_sepia/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_1_sepia[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_sepia/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_1_sepia[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_sepia/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_1_sepia[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_1_sepia/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_1_sepia[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_1_sepia/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_1_sepia = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_2/header.c b/data/tilemaps/storyframe_cream_unlock_2/header.c
index 124255513..d482a4a7b 100644
--- a/data/tilemaps/storyframe_cream_unlock_2/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_2/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_2[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_2[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_2/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_2[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_2[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_2[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_2/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_2[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_2 = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_2_dlg_de/header.c b/data/tilemaps/storyframe_cream_unlock_2_dlg_de/header.c
index 33de2dcde..b2db8f8d2 100644
--- a/data/tilemaps/storyframe_cream_unlock_2_dlg_de/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_2_dlg_de/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_2_dlg_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_de/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_2_dlg_de[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_2_dlg_de/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_2_dlg_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_de/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_2_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_de/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_2_dlg_de[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_2_dlg_de/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_2_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_de/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_2_dlg_de = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_2_dlg_en/header.c b/data/tilemaps/storyframe_cream_unlock_2_dlg_en/header.c
index eaa11485f..9a0ed8d58 100644
--- a/data/tilemaps/storyframe_cream_unlock_2_dlg_en/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_2_dlg_en/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_2_dlg_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_en/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_2_dlg_en[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_2_dlg_en/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_2_dlg_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_en/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_2_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_en/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_2_dlg_en[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_2_dlg_en/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_2_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_en/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_2_dlg_en = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_2_dlg_es/header.c b/data/tilemaps/storyframe_cream_unlock_2_dlg_es/header.c
index 6d17869b8..741095c56 100644
--- a/data/tilemaps/storyframe_cream_unlock_2_dlg_es/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_2_dlg_es/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_2_dlg_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_es/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_2_dlg_es[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_2_dlg_es/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_2_dlg_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_es/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_2_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_es/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_2_dlg_es[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_2_dlg_es/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_2_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_es/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_2_dlg_es = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_2_dlg_fr/header.c b/data/tilemaps/storyframe_cream_unlock_2_dlg_fr/header.c
index 86ef38b80..a2fadb224 100644
--- a/data/tilemaps/storyframe_cream_unlock_2_dlg_fr/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_2_dlg_fr/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_2_dlg_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_fr/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_2_dlg_fr[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_2_dlg_fr/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_2_dlg_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_fr/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_2_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_fr/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_2_dlg_fr[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_2_dlg_fr/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_2_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_fr/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_2_dlg_fr = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_2_dlg_it/header.c b/data/tilemaps/storyframe_cream_unlock_2_dlg_it/header.c
index a115ea688..3bd6e2343 100644
--- a/data/tilemaps/storyframe_cream_unlock_2_dlg_it/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_2_dlg_it/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_2_dlg_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_it/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_2_dlg_it[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_2_dlg_it/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_2_dlg_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_it/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_2_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_it/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_2_dlg_it[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_2_dlg_it/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_2_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_it/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_2_dlg_it = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_2_dlg_jp/header.c b/data/tilemaps/storyframe_cream_unlock_2_dlg_jp/header.c
index 2be552fd4..258d1e90f 100644
--- a/data/tilemaps/storyframe_cream_unlock_2_dlg_jp/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_2_dlg_jp/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_2_dlg_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_jp/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_2_dlg_jp[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_2_dlg_jp/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_2_dlg_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_jp/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_2_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_jp/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_2_dlg_jp[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_2_dlg_jp/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_2_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_2_dlg_jp/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_2_dlg_jp = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_3/header.c b/data/tilemaps/storyframe_cream_unlock_3/header.c
index e01411e6c..f73ebc584 100644
--- a/data/tilemaps/storyframe_cream_unlock_3/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_3/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_3[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_3[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_3/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_3[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_3[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_3[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_3/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_3[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_3 = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_3_dlg_de/header.c b/data/tilemaps/storyframe_cream_unlock_3_dlg_de/header.c
index 9d6b727e5..c404088e2 100644
--- a/data/tilemaps/storyframe_cream_unlock_3_dlg_de/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_3_dlg_de/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_3_dlg_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_de/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_3_dlg_de[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_3_dlg_de/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_3_dlg_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_de/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_3_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_de/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_3_dlg_de[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_3_dlg_de/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_3_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_de/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_3_dlg_de = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_3_dlg_en/header.c b/data/tilemaps/storyframe_cream_unlock_3_dlg_en/header.c
index c35c5e02a..8c33746ee 100644
--- a/data/tilemaps/storyframe_cream_unlock_3_dlg_en/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_3_dlg_en/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_3_dlg_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_en/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_3_dlg_en[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_3_dlg_en/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_3_dlg_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_en/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_3_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_en/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_3_dlg_en[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_3_dlg_en/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_3_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_en/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_3_dlg_en = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_3_dlg_es/header.c b/data/tilemaps/storyframe_cream_unlock_3_dlg_es/header.c
index 2bfcadcf0..c7ea29892 100644
--- a/data/tilemaps/storyframe_cream_unlock_3_dlg_es/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_3_dlg_es/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_3_dlg_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_es/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_3_dlg_es[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_3_dlg_es/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_3_dlg_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_es/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_3_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_es/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_3_dlg_es[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_3_dlg_es/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_3_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_es/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_3_dlg_es = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_3_dlg_fr/header.c b/data/tilemaps/storyframe_cream_unlock_3_dlg_fr/header.c
index 578dd33d8..48cc5807f 100644
--- a/data/tilemaps/storyframe_cream_unlock_3_dlg_fr/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_3_dlg_fr/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_3_dlg_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_fr/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_3_dlg_fr[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_3_dlg_fr/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_3_dlg_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_fr/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_3_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_fr/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_3_dlg_fr[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_3_dlg_fr/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_3_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_fr/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_3_dlg_fr = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_3_dlg_it/header.c b/data/tilemaps/storyframe_cream_unlock_3_dlg_it/header.c
index fe1f76cc0..fd037959d 100644
--- a/data/tilemaps/storyframe_cream_unlock_3_dlg_it/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_3_dlg_it/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_3_dlg_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_it/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_3_dlg_it[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_3_dlg_it/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_3_dlg_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_it/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_3_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_it/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_3_dlg_it[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_3_dlg_it/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_3_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_it/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_3_dlg_it = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_3_dlg_jp/header.c b/data/tilemaps/storyframe_cream_unlock_3_dlg_jp/header.c
index 2de1f2541..ed2b14c5b 100644
--- a/data/tilemaps/storyframe_cream_unlock_3_dlg_jp/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_3_dlg_jp/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_3_dlg_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_jp/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_3_dlg_jp[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_3_dlg_jp/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_3_dlg_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_jp/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_3_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_jp/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_3_dlg_jp[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_3_dlg_jp/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_3_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_dlg_jp/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_3_dlg_jp = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlock_3_sepia/header.c b/data/tilemaps/storyframe_cream_unlock_3_sepia/header.c
index 5d0e3a16f..c7172ea5a 100644
--- a/data/tilemaps/storyframe_cream_unlock_3_sepia/header.c
+++ b/data/tilemaps/storyframe_cream_unlock_3_sepia/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlock_3_sepia[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_sepia/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlock_3_sepia[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_3_sepia/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlock_3_sepia[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_sepia/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlock_3_sepia[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_sepia/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlock_3_sepia[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlock_3_sepia/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlock_3_sepia[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlock_3_sepia/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlock_3_sepia = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlocked_de/header.c b/data/tilemaps/storyframe_cream_unlocked_de/header.c
index e8f65fc1f..ee1977c6f 100644
--- a/data/tilemaps/storyframe_cream_unlocked_de/header.c
+++ b/data/tilemaps/storyframe_cream_unlocked_de/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlocked_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_de/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlocked_de[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlocked_de/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlocked_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_de/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlocked_de[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_de/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlocked_de[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlocked_de/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlocked_de[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_de/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlocked_de = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlocked_en/header.c b/data/tilemaps/storyframe_cream_unlocked_en/header.c
index 40df638e7..cbb061620 100644
--- a/data/tilemaps/storyframe_cream_unlocked_en/header.c
+++ b/data/tilemaps/storyframe_cream_unlocked_en/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlocked_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_en/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlocked_en[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlocked_en/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlocked_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_en/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlocked_en[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_en/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlocked_en[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlocked_en/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlocked_en[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_en/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlocked_en = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlocked_es/header.c b/data/tilemaps/storyframe_cream_unlocked_es/header.c
index c89e80e12..a86ad2f74 100644
--- a/data/tilemaps/storyframe_cream_unlocked_es/header.c
+++ b/data/tilemaps/storyframe_cream_unlocked_es/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlocked_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_es/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlocked_es[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlocked_es/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlocked_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_es/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlocked_es[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_es/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlocked_es[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlocked_es/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlocked_es[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_es/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlocked_es = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlocked_fr/header.c b/data/tilemaps/storyframe_cream_unlocked_fr/header.c
index 63fe98ddc..5a25ddb7b 100644
--- a/data/tilemaps/storyframe_cream_unlocked_fr/header.c
+++ b/data/tilemaps/storyframe_cream_unlocked_fr/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlocked_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_fr/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlocked_fr[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlocked_fr/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlocked_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_fr/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlocked_fr[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_fr/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlocked_fr[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlocked_fr/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlocked_fr[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_fr/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlocked_fr = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlocked_it/header.c b/data/tilemaps/storyframe_cream_unlocked_it/header.c
index 885ddf066..43e47e758 100644
--- a/data/tilemaps/storyframe_cream_unlocked_it/header.c
+++ b/data/tilemaps/storyframe_cream_unlocked_it/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlocked_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_it/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlocked_it[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlocked_it/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlocked_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_it/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlocked_it[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_it/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlocked_it[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlocked_it/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlocked_it[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_it/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlocked_it = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_cream_unlocked_jp/header.c b/data/tilemaps/storyframe_cream_unlocked_jp/header.c
index 1fa5668d0..b048e0d8b 100644
--- a/data/tilemaps/storyframe_cream_unlocked_jp/header.c
+++ b/data/tilemaps/storyframe_cream_unlocked_jp/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_cream_unlocked_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_jp/palette.gbapal");
-const u8 Tiles_storyframe_cream_unlocked_jp[]
-    = INCBIN_U8("data/tilemaps/storyframe_cream_unlocked_jp/tiles.4bpp");
-const u16 Tilemap_storyframe_cream_unlocked_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_jp/tilemap.tilemap2");
+const u16 Palette_storyframe_cream_unlocked_jp[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_jp/palette.gbapal");
+const u8 Tiles_storyframe_cream_unlocked_jp[] = INCBIN_U8("data/tilemaps/storyframe_cream_unlocked_jp/tiles.4bpp");
+const u16 Tilemap_storyframe_cream_unlocked_jp[] = INCBIN_U16("data/tilemaps/storyframe_cream_unlocked_jp/tilemap.tilemap2");
 
 const Tilemap storyframe_cream_unlocked_jp = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_0/header.c b/data/tilemaps/storyframe_knuckles_unlock_0/header.c
index a4f5563f1..252ced1b9 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_0/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_0/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_0[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_0[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_0/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_0[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_0[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_0[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_0/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_0[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_0 = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_0_dlg_de/header.c b/data/tilemaps/storyframe_knuckles_unlock_0_dlg_de/header.c
index 672f4fe8a..5b5192c4a 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_0_dlg_de/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_0_dlg_de/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_0_dlg_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_de/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_0_dlg_de[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_0_dlg_de/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_0_dlg_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_de/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_0_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_de/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_0_dlg_de[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_0_dlg_de/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_0_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_de/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_0_dlg_de = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_0_dlg_en/header.c b/data/tilemaps/storyframe_knuckles_unlock_0_dlg_en/header.c
index a84d28a21..d789b589d 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_0_dlg_en/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_0_dlg_en/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_0_dlg_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_en/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_0_dlg_en[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_0_dlg_en/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_0_dlg_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_en/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_0_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_en/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_0_dlg_en[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_0_dlg_en/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_0_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_en/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_0_dlg_en = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_0_dlg_es/header.c b/data/tilemaps/storyframe_knuckles_unlock_0_dlg_es/header.c
index 44fde80ee..5f89e3191 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_0_dlg_es/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_0_dlg_es/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_0_dlg_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_es/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_0_dlg_es[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_0_dlg_es/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_0_dlg_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_es/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_0_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_es/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_0_dlg_es[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_0_dlg_es/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_0_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_es/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_0_dlg_es = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_0_dlg_fr/header.c b/data/tilemaps/storyframe_knuckles_unlock_0_dlg_fr/header.c
index 4c94fdeee..847da09ea 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_0_dlg_fr/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_0_dlg_fr/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_0_dlg_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_fr/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_0_dlg_fr[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_0_dlg_fr/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_0_dlg_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_fr/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_0_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_fr/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_0_dlg_fr[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_0_dlg_fr/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_0_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_fr/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_0_dlg_fr = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_0_dlg_it/header.c b/data/tilemaps/storyframe_knuckles_unlock_0_dlg_it/header.c
index b758f077e..4a5964827 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_0_dlg_it/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_0_dlg_it/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_0_dlg_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_it/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_0_dlg_it[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_0_dlg_it/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_0_dlg_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_it/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_0_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_it/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_0_dlg_it[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_0_dlg_it/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_0_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_it/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_0_dlg_it = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_0_dlg_jp/header.c b/data/tilemaps/storyframe_knuckles_unlock_0_dlg_jp/header.c
index 3d7ad8046..35ede24ae 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_0_dlg_jp/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_0_dlg_jp/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_0_dlg_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_jp/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_0_dlg_jp[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_0_dlg_jp/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_0_dlg_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_jp/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_0_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_jp/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_0_dlg_jp[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_0_dlg_jp/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_0_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_0_dlg_jp/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_0_dlg_jp = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_1/header.c b/data/tilemaps/storyframe_knuckles_unlock_1/header.c
index ecba109fd..df36e8689 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_1/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_1/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_1[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_1[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_1/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_1[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_1[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_1[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_1/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_1[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_1 = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_1_dlg_de/header.c b/data/tilemaps/storyframe_knuckles_unlock_1_dlg_de/header.c
index 8e01a46fa..0a1f1f337 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_1_dlg_de/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_1_dlg_de/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_1_dlg_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_de/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_1_dlg_de[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_1_dlg_de/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_1_dlg_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_de/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_1_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_de/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_1_dlg_de[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_1_dlg_de/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_1_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_de/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_1_dlg_de = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_1_dlg_en/header.c b/data/tilemaps/storyframe_knuckles_unlock_1_dlg_en/header.c
index f44c9da9e..4390aa4a8 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_1_dlg_en/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_1_dlg_en/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_1_dlg_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_en/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_1_dlg_en[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_1_dlg_en/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_1_dlg_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_en/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_1_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_en/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_1_dlg_en[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_1_dlg_en/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_1_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_en/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_1_dlg_en = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_1_dlg_es/header.c b/data/tilemaps/storyframe_knuckles_unlock_1_dlg_es/header.c
index ff4b193a3..9a5c8f881 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_1_dlg_es/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_1_dlg_es/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_1_dlg_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_es/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_1_dlg_es[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_1_dlg_es/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_1_dlg_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_es/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_1_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_es/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_1_dlg_es[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_1_dlg_es/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_1_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_es/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_1_dlg_es = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_1_dlg_fr/header.c b/data/tilemaps/storyframe_knuckles_unlock_1_dlg_fr/header.c
index 2c61a24b5..7c1a8c77e 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_1_dlg_fr/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_1_dlg_fr/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_1_dlg_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_fr/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_1_dlg_fr[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_1_dlg_fr/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_1_dlg_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_fr/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_1_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_fr/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_1_dlg_fr[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_1_dlg_fr/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_1_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_fr/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_1_dlg_fr = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_1_dlg_it/header.c b/data/tilemaps/storyframe_knuckles_unlock_1_dlg_it/header.c
index 0de665198..aebbc4c41 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_1_dlg_it/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_1_dlg_it/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_1_dlg_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_it/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_1_dlg_it[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_1_dlg_it/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_1_dlg_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_it/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_1_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_it/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_1_dlg_it[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_1_dlg_it/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_1_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_it/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_1_dlg_it = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_1_dlg_jp/header.c b/data/tilemaps/storyframe_knuckles_unlock_1_dlg_jp/header.c
index cb03c89a1..c97f5efe2 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_1_dlg_jp/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_1_dlg_jp/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_1_dlg_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_jp/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_1_dlg_jp[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_1_dlg_jp/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_1_dlg_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_jp/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_1_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_jp/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_1_dlg_jp[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_1_dlg_jp/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_1_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_dlg_jp/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_1_dlg_jp = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_1_sepia/header.c b/data/tilemaps/storyframe_knuckles_unlock_1_sepia/header.c
index e95c71a2a..0dd8f6827 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_1_sepia/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_1_sepia/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_1_sepia[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_sepia/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_1_sepia[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_1_sepia/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_1_sepia[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_sepia/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_1_sepia[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_sepia/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_1_sepia[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_1_sepia/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_1_sepia[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_1_sepia/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_1_sepia = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_2/header.c b/data/tilemaps/storyframe_knuckles_unlock_2/header.c
index 53a1b1a71..ff1c3f1aa 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_2/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_2/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_2[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_2[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_2/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_2[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_2[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_2[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_2/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_2[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_2 = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_2_dlg_de/header.c b/data/tilemaps/storyframe_knuckles_unlock_2_dlg_de/header.c
index 9c7ca59ce..a79f14fe6 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_2_dlg_de/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_2_dlg_de/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_2_dlg_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_de/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_2_dlg_de[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_2_dlg_de/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_2_dlg_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_de/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_2_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_de/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_2_dlg_de[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_2_dlg_de/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_2_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_de/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_2_dlg_de = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_2_dlg_en/header.c b/data/tilemaps/storyframe_knuckles_unlock_2_dlg_en/header.c
index 7a7585197..a96359d66 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_2_dlg_en/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_2_dlg_en/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_2_dlg_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_en/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_2_dlg_en[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_2_dlg_en/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_2_dlg_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_en/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_2_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_en/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_2_dlg_en[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_2_dlg_en/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_2_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_en/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_2_dlg_en = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_2_dlg_es/header.c b/data/tilemaps/storyframe_knuckles_unlock_2_dlg_es/header.c
index 5766d6d19..41fa22cff 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_2_dlg_es/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_2_dlg_es/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_2_dlg_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_es/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_2_dlg_es[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_2_dlg_es/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_2_dlg_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_es/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_2_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_es/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_2_dlg_es[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_2_dlg_es/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_2_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_es/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_2_dlg_es = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_2_dlg_fr/header.c b/data/tilemaps/storyframe_knuckles_unlock_2_dlg_fr/header.c
index 586bea2fd..3bc3fddef 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_2_dlg_fr/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_2_dlg_fr/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_2_dlg_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_fr/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_2_dlg_fr[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_2_dlg_fr/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_2_dlg_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_fr/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_2_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_fr/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_2_dlg_fr[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_2_dlg_fr/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_2_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_fr/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_2_dlg_fr = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_2_dlg_it/header.c b/data/tilemaps/storyframe_knuckles_unlock_2_dlg_it/header.c
index c9519f7f1..e93f17701 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_2_dlg_it/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_2_dlg_it/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_2_dlg_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_it/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_2_dlg_it[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_2_dlg_it/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_2_dlg_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_it/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_2_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_it/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_2_dlg_it[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_2_dlg_it/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_2_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_it/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_2_dlg_it = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_2_dlg_jp/header.c b/data/tilemaps/storyframe_knuckles_unlock_2_dlg_jp/header.c
index 24a5f7029..cf3653f12 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_2_dlg_jp/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_2_dlg_jp/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_2_dlg_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_jp/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_2_dlg_jp[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_2_dlg_jp/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_2_dlg_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_jp/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_2_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_jp/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_2_dlg_jp[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_2_dlg_jp/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_2_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_2_dlg_jp/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_2_dlg_jp = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_3/header.c b/data/tilemaps/storyframe_knuckles_unlock_3/header.c
index 9389d7f93..1bd5df963 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_3/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_3/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_3[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_3[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_3/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_3[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_3[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_3[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_3/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_3[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_3 = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_3_dlg_de/header.c b/data/tilemaps/storyframe_knuckles_unlock_3_dlg_de/header.c
index 1f63d164b..4604abfef 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_3_dlg_de/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_3_dlg_de/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_3_dlg_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_de/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_3_dlg_de[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_3_dlg_de/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_3_dlg_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_de/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_3_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_de/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_3_dlg_de[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_3_dlg_de/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_3_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_de/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_3_dlg_de = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_3_dlg_en/header.c b/data/tilemaps/storyframe_knuckles_unlock_3_dlg_en/header.c
index f1826197e..1031c7c0f 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_3_dlg_en/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_3_dlg_en/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_3_dlg_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_en/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_3_dlg_en[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_3_dlg_en/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_3_dlg_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_en/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_3_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_en/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_3_dlg_en[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_3_dlg_en/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_3_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_en/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_3_dlg_en = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_3_dlg_es/header.c b/data/tilemaps/storyframe_knuckles_unlock_3_dlg_es/header.c
index a74951fb4..b52b478fc 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_3_dlg_es/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_3_dlg_es/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_3_dlg_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_es/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_3_dlg_es[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_3_dlg_es/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_3_dlg_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_es/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_3_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_es/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_3_dlg_es[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_3_dlg_es/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_3_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_es/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_3_dlg_es = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_3_dlg_fr/header.c b/data/tilemaps/storyframe_knuckles_unlock_3_dlg_fr/header.c
index 06b392657..933205ca6 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_3_dlg_fr/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_3_dlg_fr/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_3_dlg_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_fr/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_3_dlg_fr[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_3_dlg_fr/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_3_dlg_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_fr/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_3_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_fr/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_3_dlg_fr[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_3_dlg_fr/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_3_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_fr/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_3_dlg_fr = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_3_dlg_it/header.c b/data/tilemaps/storyframe_knuckles_unlock_3_dlg_it/header.c
index b6672cb32..7b20afdc8 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_3_dlg_it/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_3_dlg_it/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_3_dlg_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_it/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_3_dlg_it[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_3_dlg_it/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_3_dlg_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_it/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_3_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_it/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_3_dlg_it[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_3_dlg_it/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_3_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_it/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_3_dlg_it = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlock_3_dlg_jp/header.c b/data/tilemaps/storyframe_knuckles_unlock_3_dlg_jp/header.c
index 53f5294aa..1127ab298 100644
--- a/data/tilemaps/storyframe_knuckles_unlock_3_dlg_jp/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlock_3_dlg_jp/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlock_3_dlg_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_jp/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlock_3_dlg_jp[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_3_dlg_jp/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlock_3_dlg_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_jp/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlock_3_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_jp/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlock_3_dlg_jp[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlock_3_dlg_jp/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlock_3_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlock_3_dlg_jp/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlock_3_dlg_jp = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlocked_de/header.c b/data/tilemaps/storyframe_knuckles_unlocked_de/header.c
index f7767bacd..568806169 100644
--- a/data/tilemaps/storyframe_knuckles_unlocked_de/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlocked_de/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlocked_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_de/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlocked_de[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlocked_de/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlocked_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_de/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlocked_de[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_de/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlocked_de[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlocked_de/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlocked_de[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_de/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlocked_de = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlocked_en/header.c b/data/tilemaps/storyframe_knuckles_unlocked_en/header.c
index 6f3281824..b21bcfcb6 100644
--- a/data/tilemaps/storyframe_knuckles_unlocked_en/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlocked_en/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlocked_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_en/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlocked_en[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlocked_en/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlocked_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_en/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlocked_en[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_en/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlocked_en[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlocked_en/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlocked_en[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_en/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlocked_en = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlocked_es/header.c b/data/tilemaps/storyframe_knuckles_unlocked_es/header.c
index 25ea9fa2a..da9fd8ca4 100644
--- a/data/tilemaps/storyframe_knuckles_unlocked_es/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlocked_es/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlocked_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_es/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlocked_es[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlocked_es/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlocked_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_es/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlocked_es[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_es/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlocked_es[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlocked_es/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlocked_es[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_es/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlocked_es = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlocked_fr/header.c b/data/tilemaps/storyframe_knuckles_unlocked_fr/header.c
index 59af86791..6ad7d43f4 100644
--- a/data/tilemaps/storyframe_knuckles_unlocked_fr/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlocked_fr/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlocked_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_fr/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlocked_fr[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlocked_fr/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlocked_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_fr/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlocked_fr[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_fr/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlocked_fr[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlocked_fr/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlocked_fr[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_fr/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlocked_fr = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlocked_it/header.c b/data/tilemaps/storyframe_knuckles_unlocked_it/header.c
index 7459fdb39..1de3881db 100644
--- a/data/tilemaps/storyframe_knuckles_unlocked_it/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlocked_it/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlocked_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_it/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlocked_it[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlocked_it/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlocked_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_it/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlocked_it[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_it/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlocked_it[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlocked_it/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlocked_it[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_it/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlocked_it = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_knuckles_unlocked_jp/header.c b/data/tilemaps/storyframe_knuckles_unlocked_jp/header.c
index 4fb9a12d1..05bf24e09 100644
--- a/data/tilemaps/storyframe_knuckles_unlocked_jp/header.c
+++ b/data/tilemaps/storyframe_knuckles_unlocked_jp/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_knuckles_unlocked_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_jp/palette.gbapal");
-const u8 Tiles_storyframe_knuckles_unlocked_jp[]
-    = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlocked_jp/tiles.4bpp");
-const u16 Tilemap_storyframe_knuckles_unlocked_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_jp/tilemap.tilemap2");
+const u16 Palette_storyframe_knuckles_unlocked_jp[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_jp/palette.gbapal");
+const u8 Tiles_storyframe_knuckles_unlocked_jp[] = INCBIN_U8("data/tilemaps/storyframe_knuckles_unlocked_jp/tiles.4bpp");
+const u16 Tilemap_storyframe_knuckles_unlocked_jp[] = INCBIN_U16("data/tilemaps/storyframe_knuckles_unlocked_jp/tilemap.tilemap2");
 
 const Tilemap storyframe_knuckles_unlocked_jp = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_sonic_catches_vanilla/header.c b/data/tilemaps/storyframe_sonic_catches_vanilla/header.c
index 7859d9f32..27f9fc125 100644
--- a/data/tilemaps/storyframe_sonic_catches_vanilla/header.c
+++ b/data/tilemaps/storyframe_sonic_catches_vanilla/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_sonic_catches_vanilla[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_catches_vanilla/palette.gbapal");
-const u8 Tiles_storyframe_sonic_catches_vanilla[]
-    = INCBIN_U8("data/tilemaps/storyframe_sonic_catches_vanilla/tiles.4bpp");
-const u16 Tilemap_storyframe_sonic_catches_vanilla[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_catches_vanilla/tilemap.tilemap2");
+const u16 Palette_storyframe_sonic_catches_vanilla[] = INCBIN_U16("data/tilemaps/storyframe_sonic_catches_vanilla/palette.gbapal");
+const u8 Tiles_storyframe_sonic_catches_vanilla[] = INCBIN_U8("data/tilemaps/storyframe_sonic_catches_vanilla/tiles.4bpp");
+const u16 Tilemap_storyframe_sonic_catches_vanilla[] = INCBIN_U16("data/tilemaps/storyframe_sonic_catches_vanilla/tilemap.tilemap2");
 
 const Tilemap storyframe_sonic_catches_vanilla = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_sonic_finds_friends/header.c b/data/tilemaps/storyframe_sonic_finds_friends/header.c
index fcbb6998f..56c519013 100644
--- a/data/tilemaps/storyframe_sonic_finds_friends/header.c
+++ b/data/tilemaps/storyframe_sonic_finds_friends/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_sonic_finds_friends[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_finds_friends/palette.gbapal");
-const u8 Tiles_storyframe_sonic_finds_friends[]
-    = INCBIN_U8("data/tilemaps/storyframe_sonic_finds_friends/tiles.4bpp");
-const u16 Tilemap_storyframe_sonic_finds_friends[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_finds_friends/tilemap.tilemap2");
+const u16 Palette_storyframe_sonic_finds_friends[] = INCBIN_U16("data/tilemaps/storyframe_sonic_finds_friends/palette.gbapal");
+const u8 Tiles_storyframe_sonic_finds_friends[] = INCBIN_U8("data/tilemaps/storyframe_sonic_finds_friends/tiles.4bpp");
+const u16 Tilemap_storyframe_sonic_finds_friends[] = INCBIN_U16("data/tilemaps/storyframe_sonic_finds_friends/tilemap.tilemap2");
 
 const Tilemap storyframe_sonic_finds_friends = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_sonic_leaves_0/header.c b/data/tilemaps/storyframe_sonic_leaves_0/header.c
index c3bca1d56..db21c85b7 100644
--- a/data/tilemaps/storyframe_sonic_leaves_0/header.c
+++ b/data/tilemaps/storyframe_sonic_leaves_0/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_sonic_leaves_0[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_0/palette.gbapal");
-const u8 Tiles_storyframe_sonic_leaves_0[]
-    = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_0/tiles.4bpp");
-const u16 Tilemap_storyframe_sonic_leaves_0[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_0/tilemap.tilemap2");
+const u16 Palette_storyframe_sonic_leaves_0[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_0/palette.gbapal");
+const u8 Tiles_storyframe_sonic_leaves_0[] = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_0/tiles.4bpp");
+const u16 Tilemap_storyframe_sonic_leaves_0[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_0/tilemap.tilemap2");
 
 const Tilemap storyframe_sonic_leaves_0 = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_sonic_leaves_1/header.c b/data/tilemaps/storyframe_sonic_leaves_1/header.c
index c70eeb398..7af4ba781 100644
--- a/data/tilemaps/storyframe_sonic_leaves_1/header.c
+++ b/data/tilemaps/storyframe_sonic_leaves_1/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_sonic_leaves_1[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_1/palette.gbapal");
-const u8 Tiles_storyframe_sonic_leaves_1[]
-    = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_1/tiles.4bpp");
-const u16 Tilemap_storyframe_sonic_leaves_1[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_1/tilemap.tilemap2");
+const u16 Palette_storyframe_sonic_leaves_1[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_1/palette.gbapal");
+const u8 Tiles_storyframe_sonic_leaves_1[] = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_1/tiles.4bpp");
+const u16 Tilemap_storyframe_sonic_leaves_1[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_1/tilemap.tilemap2");
 
 const Tilemap storyframe_sonic_leaves_1 = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_sonic_leaves_10/header.c b/data/tilemaps/storyframe_sonic_leaves_10/header.c
index 93b2eb080..abcbc9890 100644
--- a/data/tilemaps/storyframe_sonic_leaves_10/header.c
+++ b/data/tilemaps/storyframe_sonic_leaves_10/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_sonic_leaves_10[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_10/palette.gbapal");
-const u8 Tiles_storyframe_sonic_leaves_10[]
-    = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_10/tiles.4bpp");
-const u16 Tilemap_storyframe_sonic_leaves_10[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_10/tilemap.tilemap2");
+const u16 Palette_storyframe_sonic_leaves_10[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_10/palette.gbapal");
+const u8 Tiles_storyframe_sonic_leaves_10[] = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_10/tiles.4bpp");
+const u16 Tilemap_storyframe_sonic_leaves_10[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_10/tilemap.tilemap2");
 
 const Tilemap storyframe_sonic_leaves_10 = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_sonic_leaves_2/header.c b/data/tilemaps/storyframe_sonic_leaves_2/header.c
index a9c7174b1..00d3ca2e9 100644
--- a/data/tilemaps/storyframe_sonic_leaves_2/header.c
+++ b/data/tilemaps/storyframe_sonic_leaves_2/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_sonic_leaves_2[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_2/palette.gbapal");
-const u8 Tiles_storyframe_sonic_leaves_2[]
-    = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_2/tiles.4bpp");
-const u16 Tilemap_storyframe_sonic_leaves_2[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_2/tilemap.tilemap2");
+const u16 Palette_storyframe_sonic_leaves_2[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_2/palette.gbapal");
+const u8 Tiles_storyframe_sonic_leaves_2[] = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_2/tiles.4bpp");
+const u16 Tilemap_storyframe_sonic_leaves_2[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_2/tilemap.tilemap2");
 
 const Tilemap storyframe_sonic_leaves_2 = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_sonic_leaves_3/header.c b/data/tilemaps/storyframe_sonic_leaves_3/header.c
index 908d4c00a..f27a373d0 100644
--- a/data/tilemaps/storyframe_sonic_leaves_3/header.c
+++ b/data/tilemaps/storyframe_sonic_leaves_3/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_sonic_leaves_3[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_3/palette.gbapal");
-const u8 Tiles_storyframe_sonic_leaves_3[]
-    = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_3/tiles.4bpp");
-const u16 Tilemap_storyframe_sonic_leaves_3[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_3/tilemap.tilemap2");
+const u16 Palette_storyframe_sonic_leaves_3[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_3/palette.gbapal");
+const u8 Tiles_storyframe_sonic_leaves_3[] = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_3/tiles.4bpp");
+const u16 Tilemap_storyframe_sonic_leaves_3[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_3/tilemap.tilemap2");
 
 const Tilemap storyframe_sonic_leaves_3 = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_sonic_leaves_4/header.c b/data/tilemaps/storyframe_sonic_leaves_4/header.c
index 39d3e05b6..3a7a988ac 100644
--- a/data/tilemaps/storyframe_sonic_leaves_4/header.c
+++ b/data/tilemaps/storyframe_sonic_leaves_4/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_sonic_leaves_4[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_4/palette.gbapal");
-const u8 Tiles_storyframe_sonic_leaves_4[]
-    = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_4/tiles.4bpp");
-const u16 Tilemap_storyframe_sonic_leaves_4[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_4/tilemap.tilemap2");
+const u16 Palette_storyframe_sonic_leaves_4[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_4/palette.gbapal");
+const u8 Tiles_storyframe_sonic_leaves_4[] = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_4/tiles.4bpp");
+const u16 Tilemap_storyframe_sonic_leaves_4[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_4/tilemap.tilemap2");
 
 const Tilemap storyframe_sonic_leaves_4 = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_sonic_leaves_5/header.c b/data/tilemaps/storyframe_sonic_leaves_5/header.c
index a0667c6d4..9b8ab1b89 100644
--- a/data/tilemaps/storyframe_sonic_leaves_5/header.c
+++ b/data/tilemaps/storyframe_sonic_leaves_5/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_sonic_leaves_5[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_5/palette.gbapal");
-const u8 Tiles_storyframe_sonic_leaves_5[]
-    = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_5/tiles.4bpp");
-const u16 Tilemap_storyframe_sonic_leaves_5[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_5/tilemap.tilemap2");
+const u16 Palette_storyframe_sonic_leaves_5[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_5/palette.gbapal");
+const u8 Tiles_storyframe_sonic_leaves_5[] = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_5/tiles.4bpp");
+const u16 Tilemap_storyframe_sonic_leaves_5[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_5/tilemap.tilemap2");
 
 const Tilemap storyframe_sonic_leaves_5 = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_sonic_leaves_6/header.c b/data/tilemaps/storyframe_sonic_leaves_6/header.c
index a20a7a582..7cb9c0cac 100644
--- a/data/tilemaps/storyframe_sonic_leaves_6/header.c
+++ b/data/tilemaps/storyframe_sonic_leaves_6/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_sonic_leaves_6[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_6/palette.gbapal");
-const u8 Tiles_storyframe_sonic_leaves_6[]
-    = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_6/tiles.4bpp");
-const u16 Tilemap_storyframe_sonic_leaves_6[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_6/tilemap.tilemap2");
+const u16 Palette_storyframe_sonic_leaves_6[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_6/palette.gbapal");
+const u8 Tiles_storyframe_sonic_leaves_6[] = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_6/tiles.4bpp");
+const u16 Tilemap_storyframe_sonic_leaves_6[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_6/tilemap.tilemap2");
 
 const Tilemap storyframe_sonic_leaves_6 = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_sonic_leaves_7/header.c b/data/tilemaps/storyframe_sonic_leaves_7/header.c
index 23f784207..9461e1000 100644
--- a/data/tilemaps/storyframe_sonic_leaves_7/header.c
+++ b/data/tilemaps/storyframe_sonic_leaves_7/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_sonic_leaves_7[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_7/palette.gbapal");
-const u8 Tiles_storyframe_sonic_leaves_7[]
-    = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_7/tiles.4bpp");
-const u16 Tilemap_storyframe_sonic_leaves_7[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_7/tilemap.tilemap2");
+const u16 Palette_storyframe_sonic_leaves_7[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_7/palette.gbapal");
+const u8 Tiles_storyframe_sonic_leaves_7[] = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_7/tiles.4bpp");
+const u16 Tilemap_storyframe_sonic_leaves_7[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_7/tilemap.tilemap2");
 
 const Tilemap storyframe_sonic_leaves_7 = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_sonic_leaves_8/header.c b/data/tilemaps/storyframe_sonic_leaves_8/header.c
index 7467e0d55..ca17ba472 100644
--- a/data/tilemaps/storyframe_sonic_leaves_8/header.c
+++ b/data/tilemaps/storyframe_sonic_leaves_8/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_sonic_leaves_8[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_8/palette.gbapal");
-const u8 Tiles_storyframe_sonic_leaves_8[]
-    = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_8/tiles.4bpp");
-const u16 Tilemap_storyframe_sonic_leaves_8[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_8/tilemap.tilemap2");
+const u16 Palette_storyframe_sonic_leaves_8[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_8/palette.gbapal");
+const u8 Tiles_storyframe_sonic_leaves_8[] = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_8/tiles.4bpp");
+const u16 Tilemap_storyframe_sonic_leaves_8[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_8/tilemap.tilemap2");
 
 const Tilemap storyframe_sonic_leaves_8 = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_sonic_leaves_9/header.c b/data/tilemaps/storyframe_sonic_leaves_9/header.c
index 82e747e25..ba93e5b18 100644
--- a/data/tilemaps/storyframe_sonic_leaves_9/header.c
+++ b/data/tilemaps/storyframe_sonic_leaves_9/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_sonic_leaves_9[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_9/palette.gbapal");
-const u8 Tiles_storyframe_sonic_leaves_9[]
-    = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_9/tiles.4bpp");
-const u16 Tilemap_storyframe_sonic_leaves_9[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_9/tilemap.tilemap2");
+const u16 Palette_storyframe_sonic_leaves_9[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_9/palette.gbapal");
+const u8 Tiles_storyframe_sonic_leaves_9[] = INCBIN_U8("data/tilemaps/storyframe_sonic_leaves_9/tiles.4bpp");
+const u16 Tilemap_storyframe_sonic_leaves_9[] = INCBIN_U16("data/tilemaps/storyframe_sonic_leaves_9/tilemap.tilemap2");
 
 const Tilemap storyframe_sonic_leaves_9 = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_sonic_pats_tails/header.c b/data/tilemaps/storyframe_sonic_pats_tails/header.c
index 7fb09d87e..28c0e7b82 100644
--- a/data/tilemaps/storyframe_sonic_pats_tails/header.c
+++ b/data/tilemaps/storyframe_sonic_pats_tails/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_sonic_pats_tails[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_pats_tails/palette.gbapal");
-const u8 Tiles_storyframe_sonic_pats_tails[]
-    = INCBIN_U8("data/tilemaps/storyframe_sonic_pats_tails/tiles.4bpp");
-const u16 Tilemap_storyframe_sonic_pats_tails[]
-    = INCBIN_U16("data/tilemaps/storyframe_sonic_pats_tails/tilemap.tilemap2");
+const u16 Palette_storyframe_sonic_pats_tails[] = INCBIN_U16("data/tilemaps/storyframe_sonic_pats_tails/palette.gbapal");
+const u8 Tiles_storyframe_sonic_pats_tails[] = INCBIN_U8("data/tilemaps/storyframe_sonic_pats_tails/tiles.4bpp");
+const u16 Tilemap_storyframe_sonic_pats_tails[] = INCBIN_U16("data/tilemaps/storyframe_sonic_pats_tails/tilemap.tilemap2");
 
 const Tilemap storyframe_sonic_pats_tails = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_0/header.c b/data/tilemaps/storyframe_tails_unlock_0/header.c
index 73f656bf7..c20d4f7f9 100644
--- a/data/tilemaps/storyframe_tails_unlock_0/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_0/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_0[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_0[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_0/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_0[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_0[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_0[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_0/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_0[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_0 = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_0_dlg_de/header.c b/data/tilemaps/storyframe_tails_unlock_0_dlg_de/header.c
index 7e964ce1b..50b65dfd6 100644
--- a/data/tilemaps/storyframe_tails_unlock_0_dlg_de/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_0_dlg_de/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_0_dlg_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_de/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_0_dlg_de[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_0_dlg_de/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_0_dlg_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_de/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_0_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_de/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_0_dlg_de[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_0_dlg_de/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_0_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_de/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_0_dlg_de = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_0_dlg_en/header.c b/data/tilemaps/storyframe_tails_unlock_0_dlg_en/header.c
index 2d9d15b3d..bfefab0e2 100644
--- a/data/tilemaps/storyframe_tails_unlock_0_dlg_en/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_0_dlg_en/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_0_dlg_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_en/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_0_dlg_en[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_0_dlg_en/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_0_dlg_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_en/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_0_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_en/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_0_dlg_en[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_0_dlg_en/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_0_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_en/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_0_dlg_en = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_0_dlg_es/header.c b/data/tilemaps/storyframe_tails_unlock_0_dlg_es/header.c
index bea1fac2e..dcd142b17 100644
--- a/data/tilemaps/storyframe_tails_unlock_0_dlg_es/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_0_dlg_es/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_0_dlg_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_es/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_0_dlg_es[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_0_dlg_es/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_0_dlg_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_es/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_0_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_es/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_0_dlg_es[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_0_dlg_es/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_0_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_es/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_0_dlg_es = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_0_dlg_fr/header.c b/data/tilemaps/storyframe_tails_unlock_0_dlg_fr/header.c
index 76e7ca79a..aa0167a56 100644
--- a/data/tilemaps/storyframe_tails_unlock_0_dlg_fr/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_0_dlg_fr/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_0_dlg_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_fr/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_0_dlg_fr[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_0_dlg_fr/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_0_dlg_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_fr/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_0_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_fr/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_0_dlg_fr[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_0_dlg_fr/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_0_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_fr/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_0_dlg_fr = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_0_dlg_it/header.c b/data/tilemaps/storyframe_tails_unlock_0_dlg_it/header.c
index 76e1da8ed..de88b9ef0 100644
--- a/data/tilemaps/storyframe_tails_unlock_0_dlg_it/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_0_dlg_it/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_0_dlg_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_it/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_0_dlg_it[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_0_dlg_it/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_0_dlg_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_it/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_0_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_it/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_0_dlg_it[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_0_dlg_it/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_0_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_it/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_0_dlg_it = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_0_dlg_jp/header.c b/data/tilemaps/storyframe_tails_unlock_0_dlg_jp/header.c
index 30fb6713a..71ad84fe0 100644
--- a/data/tilemaps/storyframe_tails_unlock_0_dlg_jp/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_0_dlg_jp/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_0_dlg_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_jp/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_0_dlg_jp[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_0_dlg_jp/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_0_dlg_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_jp/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_0_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_jp/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_0_dlg_jp[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_0_dlg_jp/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_0_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_0_dlg_jp/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_0_dlg_jp = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_1/header.c b/data/tilemaps/storyframe_tails_unlock_1/header.c
index d97d16484..a5b041060 100644
--- a/data/tilemaps/storyframe_tails_unlock_1/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_1/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_1[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_1[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_1/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_1[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_1[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_1[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_1/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_1[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_1 = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_1_dlg_de/header.c b/data/tilemaps/storyframe_tails_unlock_1_dlg_de/header.c
index f40ef4d2b..10c05f314 100644
--- a/data/tilemaps/storyframe_tails_unlock_1_dlg_de/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_1_dlg_de/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_1_dlg_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_de/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_1_dlg_de[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_1_dlg_de/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_1_dlg_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_de/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_1_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_de/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_1_dlg_de[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_1_dlg_de/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_1_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_de/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_1_dlg_de = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_1_dlg_en/header.c b/data/tilemaps/storyframe_tails_unlock_1_dlg_en/header.c
index 9cc21956f..5709f11ee 100644
--- a/data/tilemaps/storyframe_tails_unlock_1_dlg_en/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_1_dlg_en/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_1_dlg_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_en/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_1_dlg_en[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_1_dlg_en/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_1_dlg_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_en/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_1_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_en/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_1_dlg_en[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_1_dlg_en/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_1_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_en/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_1_dlg_en = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_1_dlg_es/header.c b/data/tilemaps/storyframe_tails_unlock_1_dlg_es/header.c
index c237dc8d2..90bea69fa 100644
--- a/data/tilemaps/storyframe_tails_unlock_1_dlg_es/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_1_dlg_es/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_1_dlg_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_es/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_1_dlg_es[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_1_dlg_es/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_1_dlg_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_es/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_1_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_es/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_1_dlg_es[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_1_dlg_es/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_1_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_es/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_1_dlg_es = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_1_dlg_fr/header.c b/data/tilemaps/storyframe_tails_unlock_1_dlg_fr/header.c
index af7c9434a..e9da4a256 100644
--- a/data/tilemaps/storyframe_tails_unlock_1_dlg_fr/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_1_dlg_fr/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_1_dlg_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_fr/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_1_dlg_fr[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_1_dlg_fr/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_1_dlg_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_fr/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_1_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_fr/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_1_dlg_fr[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_1_dlg_fr/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_1_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_fr/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_1_dlg_fr = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_1_dlg_it/header.c b/data/tilemaps/storyframe_tails_unlock_1_dlg_it/header.c
index f30e8c798..1d3e858a0 100644
--- a/data/tilemaps/storyframe_tails_unlock_1_dlg_it/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_1_dlg_it/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_1_dlg_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_it/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_1_dlg_it[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_1_dlg_it/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_1_dlg_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_it/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_1_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_it/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_1_dlg_it[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_1_dlg_it/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_1_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_it/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_1_dlg_it = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_1_dlg_jp/header.c b/data/tilemaps/storyframe_tails_unlock_1_dlg_jp/header.c
index bd4f6960e..3ae3fed93 100644
--- a/data/tilemaps/storyframe_tails_unlock_1_dlg_jp/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_1_dlg_jp/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_1_dlg_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_jp/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_1_dlg_jp[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_1_dlg_jp/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_1_dlg_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_jp/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_1_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_jp/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_1_dlg_jp[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_1_dlg_jp/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_1_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_dlg_jp/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_1_dlg_jp = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_1_sepia/header.c b/data/tilemaps/storyframe_tails_unlock_1_sepia/header.c
index 0688ef3cf..e3c96eddf 100644
--- a/data/tilemaps/storyframe_tails_unlock_1_sepia/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_1_sepia/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_1_sepia[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_sepia/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_1_sepia[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_1_sepia/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_1_sepia[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_sepia/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_1_sepia[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_sepia/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_1_sepia[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_1_sepia/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_1_sepia[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_1_sepia/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_1_sepia = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_2/header.c b/data/tilemaps/storyframe_tails_unlock_2/header.c
index 28629df12..646a53ae4 100644
--- a/data/tilemaps/storyframe_tails_unlock_2/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_2/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_2[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_2[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_2/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_2[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_2[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_2[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_2/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_2[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_2 = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_2_dlg_de/header.c b/data/tilemaps/storyframe_tails_unlock_2_dlg_de/header.c
index cb91108a5..1153dc97d 100644
--- a/data/tilemaps/storyframe_tails_unlock_2_dlg_de/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_2_dlg_de/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_2_dlg_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_de/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_2_dlg_de[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_2_dlg_de/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_2_dlg_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_de/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_2_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_de/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_2_dlg_de[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_2_dlg_de/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_2_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_de/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_2_dlg_de = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_2_dlg_en/header.c b/data/tilemaps/storyframe_tails_unlock_2_dlg_en/header.c
index e1f43596b..f0670c63f 100644
--- a/data/tilemaps/storyframe_tails_unlock_2_dlg_en/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_2_dlg_en/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_2_dlg_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_en/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_2_dlg_en[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_2_dlg_en/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_2_dlg_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_en/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_2_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_en/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_2_dlg_en[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_2_dlg_en/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_2_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_en/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_2_dlg_en = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_2_dlg_es/header.c b/data/tilemaps/storyframe_tails_unlock_2_dlg_es/header.c
index 0999a7a22..00ef628c0 100644
--- a/data/tilemaps/storyframe_tails_unlock_2_dlg_es/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_2_dlg_es/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_2_dlg_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_es/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_2_dlg_es[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_2_dlg_es/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_2_dlg_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_es/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_2_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_es/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_2_dlg_es[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_2_dlg_es/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_2_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_es/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_2_dlg_es = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_2_dlg_fr/header.c b/data/tilemaps/storyframe_tails_unlock_2_dlg_fr/header.c
index f26c30e32..39b2f5821 100644
--- a/data/tilemaps/storyframe_tails_unlock_2_dlg_fr/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_2_dlg_fr/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_2_dlg_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_fr/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_2_dlg_fr[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_2_dlg_fr/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_2_dlg_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_fr/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_2_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_fr/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_2_dlg_fr[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_2_dlg_fr/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_2_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_fr/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_2_dlg_fr = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_2_dlg_it/header.c b/data/tilemaps/storyframe_tails_unlock_2_dlg_it/header.c
index efa1e97a9..7bfd9f5ba 100644
--- a/data/tilemaps/storyframe_tails_unlock_2_dlg_it/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_2_dlg_it/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_2_dlg_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_it/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_2_dlg_it[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_2_dlg_it/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_2_dlg_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_it/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_2_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_it/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_2_dlg_it[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_2_dlg_it/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_2_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_it/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_2_dlg_it = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_2_dlg_jp/header.c b/data/tilemaps/storyframe_tails_unlock_2_dlg_jp/header.c
index c400c9954..d23861717 100644
--- a/data/tilemaps/storyframe_tails_unlock_2_dlg_jp/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_2_dlg_jp/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_2_dlg_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_jp/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_2_dlg_jp[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_2_dlg_jp/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_2_dlg_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_jp/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_2_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_jp/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_2_dlg_jp[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_2_dlg_jp/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_2_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_2_dlg_jp/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_2_dlg_jp = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_3/header.c b/data/tilemaps/storyframe_tails_unlock_3/header.c
index afcfe286e..89ceca4d5 100644
--- a/data/tilemaps/storyframe_tails_unlock_3/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_3/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_3[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_3[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_3/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_3[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_3[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_3[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_3/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_3[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_3 = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_3_dlg_de/header.c b/data/tilemaps/storyframe_tails_unlock_3_dlg_de/header.c
index 5d615ec43..79eddab11 100644
--- a/data/tilemaps/storyframe_tails_unlock_3_dlg_de/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_3_dlg_de/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_3_dlg_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_de/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_3_dlg_de[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_3_dlg_de/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_3_dlg_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_de/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_3_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_de/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_3_dlg_de[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_3_dlg_de/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_3_dlg_de[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_de/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_3_dlg_de = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_3_dlg_en/header.c b/data/tilemaps/storyframe_tails_unlock_3_dlg_en/header.c
index 85492c5e7..c449177a2 100644
--- a/data/tilemaps/storyframe_tails_unlock_3_dlg_en/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_3_dlg_en/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_3_dlg_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_en/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_3_dlg_en[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_3_dlg_en/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_3_dlg_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_en/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_3_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_en/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_3_dlg_en[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_3_dlg_en/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_3_dlg_en[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_en/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_3_dlg_en = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_3_dlg_es/header.c b/data/tilemaps/storyframe_tails_unlock_3_dlg_es/header.c
index 85ed18c69..d1f31a429 100644
--- a/data/tilemaps/storyframe_tails_unlock_3_dlg_es/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_3_dlg_es/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_3_dlg_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_es/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_3_dlg_es[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_3_dlg_es/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_3_dlg_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_es/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_3_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_es/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_3_dlg_es[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_3_dlg_es/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_3_dlg_es[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_es/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_3_dlg_es = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_3_dlg_fr/header.c b/data/tilemaps/storyframe_tails_unlock_3_dlg_fr/header.c
index 62e7688fc..01cb1fbe0 100644
--- a/data/tilemaps/storyframe_tails_unlock_3_dlg_fr/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_3_dlg_fr/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_3_dlg_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_fr/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_3_dlg_fr[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_3_dlg_fr/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_3_dlg_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_fr/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_3_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_fr/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_3_dlg_fr[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_3_dlg_fr/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_3_dlg_fr[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_fr/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_3_dlg_fr = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_3_dlg_it/header.c b/data/tilemaps/storyframe_tails_unlock_3_dlg_it/header.c
index 6350da552..a30a3821e 100644
--- a/data/tilemaps/storyframe_tails_unlock_3_dlg_it/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_3_dlg_it/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_3_dlg_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_it/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_3_dlg_it[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_3_dlg_it/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_3_dlg_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_it/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_3_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_it/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_3_dlg_it[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_3_dlg_it/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_3_dlg_it[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_it/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_3_dlg_it = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlock_3_dlg_jp/header.c b/data/tilemaps/storyframe_tails_unlock_3_dlg_jp/header.c
index 35ca4e9b6..a7717f692 100644
--- a/data/tilemaps/storyframe_tails_unlock_3_dlg_jp/header.c
+++ b/data/tilemaps/storyframe_tails_unlock_3_dlg_jp/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlock_3_dlg_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_jp/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlock_3_dlg_jp[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_3_dlg_jp/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlock_3_dlg_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_jp/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlock_3_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_jp/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlock_3_dlg_jp[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlock_3_dlg_jp/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlock_3_dlg_jp[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlock_3_dlg_jp/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlock_3_dlg_jp = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlocked_de/header.c b/data/tilemaps/storyframe_tails_unlocked_de/header.c
index b0f9e501c..79ba8486e 100644
--- a/data/tilemaps/storyframe_tails_unlocked_de/header.c
+++ b/data/tilemaps/storyframe_tails_unlocked_de/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlocked_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_de/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlocked_de[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlocked_de/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlocked_de[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_de/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlocked_de[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_de/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlocked_de[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlocked_de/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlocked_de[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_de/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlocked_de = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlocked_en/header.c b/data/tilemaps/storyframe_tails_unlocked_en/header.c
index 4cef53b95..d04bbddd4 100644
--- a/data/tilemaps/storyframe_tails_unlocked_en/header.c
+++ b/data/tilemaps/storyframe_tails_unlocked_en/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlocked_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_en/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlocked_en[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlocked_en/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlocked_en[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_en/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlocked_en[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_en/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlocked_en[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlocked_en/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlocked_en[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_en/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlocked_en = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlocked_es/header.c b/data/tilemaps/storyframe_tails_unlocked_es/header.c
index 01f499dc8..0d79774cd 100644
--- a/data/tilemaps/storyframe_tails_unlocked_es/header.c
+++ b/data/tilemaps/storyframe_tails_unlocked_es/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlocked_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_es/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlocked_es[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlocked_es/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlocked_es[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_es/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlocked_es[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_es/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlocked_es[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlocked_es/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlocked_es[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_es/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlocked_es = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlocked_fr/header.c b/data/tilemaps/storyframe_tails_unlocked_fr/header.c
index 37fd09c68..08e57eed1 100644
--- a/data/tilemaps/storyframe_tails_unlocked_fr/header.c
+++ b/data/tilemaps/storyframe_tails_unlocked_fr/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlocked_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_fr/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlocked_fr[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlocked_fr/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlocked_fr[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_fr/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlocked_fr[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_fr/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlocked_fr[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlocked_fr/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlocked_fr[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_fr/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlocked_fr = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlocked_it/header.c b/data/tilemaps/storyframe_tails_unlocked_it/header.c
index 70f72b22e..f8c06e901 100644
--- a/data/tilemaps/storyframe_tails_unlocked_it/header.c
+++ b/data/tilemaps/storyframe_tails_unlocked_it/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlocked_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_it/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlocked_it[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlocked_it/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlocked_it[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_it/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlocked_it[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_it/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlocked_it[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlocked_it/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlocked_it[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_it/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlocked_it = {
     .xTiles = 30,
diff --git a/data/tilemaps/storyframe_tails_unlocked_jp/header.c b/data/tilemaps/storyframe_tails_unlocked_jp/header.c
index 30baa5cd5..5d937a960 100644
--- a/data/tilemaps/storyframe_tails_unlocked_jp/header.c
+++ b/data/tilemaps/storyframe_tails_unlocked_jp/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_storyframe_tails_unlocked_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_jp/palette.gbapal");
-const u8 Tiles_storyframe_tails_unlocked_jp[]
-    = INCBIN_U8("data/tilemaps/storyframe_tails_unlocked_jp/tiles.4bpp");
-const u16 Tilemap_storyframe_tails_unlocked_jp[]
-    = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_jp/tilemap.tilemap2");
+const u16 Palette_storyframe_tails_unlocked_jp[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_jp/palette.gbapal");
+const u8 Tiles_storyframe_tails_unlocked_jp[] = INCBIN_U8("data/tilemaps/storyframe_tails_unlocked_jp/tiles.4bpp");
+const u16 Tilemap_storyframe_tails_unlocked_jp[] = INCBIN_U16("data/tilemaps/storyframe_tails_unlocked_jp/tilemap.tilemap2");
 
 const Tilemap storyframe_tails_unlocked_jp = {
     .xTiles = 30,
diff --git a/data/tilemaps/ta_and_mp_white_bg/header.c b/data/tilemaps/ta_and_mp_white_bg/header.c
index ad460090d..389844e28 100644
--- a/data/tilemaps/ta_and_mp_white_bg/header.c
+++ b/data/tilemaps/ta_and_mp_white_bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_ta_and_mp_white_bg[]
-    = INCBIN_U16("data/tilemaps/ta_and_mp_white_bg/palette.gbapal");
-const u8 Tiles_ta_and_mp_white_bg[]
-    = INCBIN_U8("data/tilemaps/ta_and_mp_white_bg/tiles.4bpp");
-const u16 Tilemap_ta_and_mp_white_bg[]
-    = INCBIN_U16("data/tilemaps/ta_and_mp_white_bg/tilemap.tilemap2");
+const u16 Palette_ta_and_mp_white_bg[] = INCBIN_U16("data/tilemaps/ta_and_mp_white_bg/palette.gbapal");
+const u8 Tiles_ta_and_mp_white_bg[] = INCBIN_U8("data/tilemaps/ta_and_mp_white_bg/tiles.4bpp");
+const u16 Tilemap_ta_and_mp_white_bg[] = INCBIN_U16("data/tilemaps/ta_and_mp_white_bg/tilemap.tilemap2");
 
 const Tilemap ta_and_mp_white_bg = {
     .xTiles = 32,
diff --git a/data/tilemaps/ta_orange_bg/header.c b/data/tilemaps/ta_orange_bg/header.c
index 57e5342c2..d73b9710e 100644
--- a/data/tilemaps/ta_orange_bg/header.c
+++ b/data/tilemaps/ta_orange_bg/header.c
@@ -1,11 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_ta_orange_bg[]
-    = INCBIN_U16("data/tilemaps/ta_orange_bg/palette.gbapal");
+const u16 Palette_ta_orange_bg[] = INCBIN_U16("data/tilemaps/ta_orange_bg/palette.gbapal");
 const u8 Tiles_ta_orange_bg[] = INCBIN_U8("data/tilemaps/ta_orange_bg/tiles.4bpp");
-const u16 Tilemap_ta_orange_bg[]
-    = INCBIN_U16("data/tilemaps/ta_orange_bg/tilemap.tilemap2");
+const u16 Tilemap_ta_orange_bg[] = INCBIN_U16("data/tilemaps/ta_orange_bg/tilemap.tilemap2");
 
 const Tilemap ta_orange_bg = {
     .xTiles = 32,
diff --git a/data/tilemaps/techno_base_bg_circuit_mask/header.c b/data/tilemaps/techno_base_bg_circuit_mask/header.c
index 54d41cbae..2da122ccd 100644
--- a/data/tilemaps/techno_base_bg_circuit_mask/header.c
+++ b/data/tilemaps/techno_base_bg_circuit_mask/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_techno_base_bg_circuit_mask[]
-    = INCBIN_U16("data/tilemaps/techno_base_bg_circuit_mask/palette.gbapal");
-const u8 Tiles_techno_base_bg_circuit_mask[]
-    = INCBIN_U8("data/tilemaps/techno_base_bg_circuit_mask/tiles.4bpp");
-const u16 Tilemap_techno_base_bg_circuit_mask[]
-    = INCBIN_U16("data/tilemaps/techno_base_bg_circuit_mask/tilemap.tilemap2");
+const u16 Palette_techno_base_bg_circuit_mask[] = INCBIN_U16("data/tilemaps/techno_base_bg_circuit_mask/palette.gbapal");
+const u8 Tiles_techno_base_bg_circuit_mask[] = INCBIN_U8("data/tilemaps/techno_base_bg_circuit_mask/tiles.4bpp");
+const u16 Tilemap_techno_base_bg_circuit_mask[] = INCBIN_U16("data/tilemaps/techno_base_bg_circuit_mask/tilemap.tilemap2");
 
 const Tilemap techno_base_bg_circuit_mask = {
     .xTiles = 32,
diff --git a/data/tilemaps/techno_base_bg_purple_grid/header.c b/data/tilemaps/techno_base_bg_purple_grid/header.c
index 75dd42db7..1eb7474e5 100644
--- a/data/tilemaps/techno_base_bg_purple_grid/header.c
+++ b/data/tilemaps/techno_base_bg_purple_grid/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_techno_base_bg_purple_grid[]
-    = INCBIN_U16("data/tilemaps/techno_base_bg_purple_grid/palette.gbapal");
-const u8 Tiles_techno_base_bg_purple_grid[]
-    = INCBIN_U8("data/tilemaps/techno_base_bg_purple_grid/tiles.4bpp");
-const u16 Tilemap_techno_base_bg_purple_grid[]
-    = INCBIN_U16("data/tilemaps/techno_base_bg_purple_grid/tilemap.tilemap2");
+const u16 Palette_techno_base_bg_purple_grid[] = INCBIN_U16("data/tilemaps/techno_base_bg_purple_grid/palette.gbapal");
+const u8 Tiles_techno_base_bg_purple_grid[] = INCBIN_U8("data/tilemaps/techno_base_bg_purple_grid/tiles.4bpp");
+const u16 Tilemap_techno_base_bg_purple_grid[] = INCBIN_U16("data/tilemaps/techno_base_bg_purple_grid/tilemap.tilemap2");
 
 const Tilemap techno_base_bg_purple_grid = {
     .xTiles = 32,
diff --git a/data/tilemaps/tilemap_108/header.c b/data/tilemaps/tilemap_108/header.c
index 6ce526f33..a73933e77 100644
--- a/data/tilemaps/tilemap_108/header.c
+++ b/data/tilemaps/tilemap_108/header.c
@@ -3,8 +3,7 @@
 
 const u16 Palette_tilemap_108[] = INCBIN_U16("data/tilemaps/tilemap_108/palette.gbapal");
 const u8 Tiles_tilemap_108[] = INCBIN_U8("data/tilemaps/tilemap_108/tiles.4bpp");
-const u16 Tilemap_tilemap_108[]
-    = INCBIN_U16("data/tilemaps/tilemap_108/tilemap.tilemap2");
+const u16 Tilemap_tilemap_108[] = INCBIN_U16("data/tilemaps/tilemap_108/tilemap.tilemap2");
 
 const Tilemap tilemap_108 = {
     .xTiles = 30,
diff --git a/data/tilemaps/tilemap_139/header.c b/data/tilemaps/tilemap_139/header.c
index 344aa0fa0..024d06431 100644
--- a/data/tilemaps/tilemap_139/header.c
+++ b/data/tilemaps/tilemap_139/header.c
@@ -3,8 +3,7 @@
 
 const u16 Palette_tilemap_139[] = INCBIN_U16("data/tilemaps/tilemap_139/palette.gbapal");
 const u8 Tiles_tilemap_139[] = INCBIN_U8("data/tilemaps/tilemap_139/tiles.4bpp");
-const u16 Tilemap_tilemap_139[]
-    = INCBIN_U16("data/tilemaps/tilemap_139/tilemap.tilemap2");
+const u16 Tilemap_tilemap_139[] = INCBIN_U16("data/tilemaps/tilemap_139/tilemap.tilemap2");
 
 const Tilemap tilemap_139 = {
     .xTiles = 30,
diff --git a/data/tilemaps/title_screen_bg/header.c b/data/tilemaps/title_screen_bg/header.c
index 82a52d9af..86393d5a2 100644
--- a/data/tilemaps/title_screen_bg/header.c
+++ b/data/tilemaps/title_screen_bg/header.c
@@ -1,11 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_title_screen_bg[]
-    = INCBIN_U16("data/tilemaps/title_screen_bg/palette.gbapal");
+const u16 Palette_title_screen_bg[] = INCBIN_U16("data/tilemaps/title_screen_bg/palette.gbapal");
 const u8 Tiles_title_screen_bg[] = INCBIN_U8("data/tilemaps/title_screen_bg/tiles.4bpp");
-const u16 Tilemap_title_screen_bg[]
-    = INCBIN_U16("data/tilemaps/title_screen_bg/tilemap.tilemap2");
+const u16 Tilemap_title_screen_bg[] = INCBIN_U16("data/tilemaps/title_screen_bg/tilemap.tilemap2");
 
 const Tilemap title_screen_bg = {
     .xTiles = 32,
diff --git a/data/tilemaps/unk_space_bg/header.c b/data/tilemaps/unk_space_bg/header.c
index 605be84fd..ee440e1b8 100644
--- a/data/tilemaps/unk_space_bg/header.c
+++ b/data/tilemaps/unk_space_bg/header.c
@@ -1,11 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unk_space_bg[]
-    = INCBIN_U16("data/tilemaps/unk_space_bg/palette.gbapal");
+const u16 Palette_unk_space_bg[] = INCBIN_U16("data/tilemaps/unk_space_bg/palette.gbapal");
 const u8 Tiles_unk_space_bg[] = INCBIN_U8("data/tilemaps/unk_space_bg/tiles.4bpp");
-const u16 Tilemap_unk_space_bg[]
-    = INCBIN_U16("data/tilemaps/unk_space_bg/tilemap.tilemap2");
+const u16 Tilemap_unk_space_bg[] = INCBIN_U16("data/tilemaps/unk_space_bg/tilemap.tilemap2");
 
 const Tilemap unk_space_bg = {
     .xTiles = 32,
diff --git a/data/tilemaps/unknown_message_box_white/header.c b/data/tilemaps/unknown_message_box_white/header.c
index 42402e729..f5d16dac9 100644
--- a/data/tilemaps/unknown_message_box_white/header.c
+++ b/data/tilemaps/unknown_message_box_white/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unknown_message_box_white[]
-    = INCBIN_U16("data/tilemaps/unknown_message_box_white/palette.gbapal");
-const u8 Tiles_unknown_message_box_white[]
-    = INCBIN_U8("data/tilemaps/unknown_message_box_white/tiles.4bpp");
-const u16 Tilemap_unknown_message_box_white[]
-    = INCBIN_U16("data/tilemaps/unknown_message_box_white/tilemap.tilemap2");
+const u16 Palette_unknown_message_box_white[] = INCBIN_U16("data/tilemaps/unknown_message_box_white/palette.gbapal");
+const u8 Tiles_unknown_message_box_white[] = INCBIN_U8("data/tilemaps/unknown_message_box_white/tiles.4bpp");
+const u16 Tilemap_unknown_message_box_white[] = INCBIN_U16("data/tilemaps/unknown_message_box_white/tilemap.tilemap2");
 
 const Tilemap unknown_message_box_white = {
     .xTiles = 30,
diff --git a/data/tilemaps/unknown_message_box_white_small/header.c b/data/tilemaps/unknown_message_box_white_small/header.c
index 13d19cfee..85cb2cd17 100644
--- a/data/tilemaps/unknown_message_box_white_small/header.c
+++ b/data/tilemaps/unknown_message_box_white_small/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unknown_message_box_white_small[]
-    = INCBIN_U16("data/tilemaps/unknown_message_box_white_small/palette.gbapal");
-const u8 Tiles_unknown_message_box_white_small[]
-    = INCBIN_U8("data/tilemaps/unknown_message_box_white_small/tiles.4bpp");
-const u16 Tilemap_unknown_message_box_white_small[]
-    = INCBIN_U16("data/tilemaps/unknown_message_box_white_small/tilemap.tilemap2");
+const u16 Palette_unknown_message_box_white_small[] = INCBIN_U16("data/tilemaps/unknown_message_box_white_small/palette.gbapal");
+const u8 Tiles_unknown_message_box_white_small[] = INCBIN_U8("data/tilemaps/unknown_message_box_white_small/tiles.4bpp");
+const u16 Tilemap_unknown_message_box_white_small[] = INCBIN_U16("data/tilemaps/unknown_message_box_white_small/tilemap.tilemap2");
 
 const Tilemap unknown_message_box_white_small = {
     .xTiles = 30,
diff --git a/data/tilemaps/unknown_options_bg/header.c b/data/tilemaps/unknown_options_bg/header.c
index 2bab2608b..301e3fcf3 100644
--- a/data/tilemaps/unknown_options_bg/header.c
+++ b/data/tilemaps/unknown_options_bg/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unknown_options_bg[]
-    = INCBIN_U16("data/tilemaps/unknown_options_bg/palette.gbapal");
-const u8 Tiles_unknown_options_bg[]
-    = INCBIN_U8("data/tilemaps/unknown_options_bg/tiles.4bpp");
-const u16 Tilemap_unknown_options_bg[]
-    = INCBIN_U16("data/tilemaps/unknown_options_bg/tilemap.tilemap2");
+const u16 Palette_unknown_options_bg[] = INCBIN_U16("data/tilemaps/unknown_options_bg/palette.gbapal");
+const u8 Tiles_unknown_options_bg[] = INCBIN_U8("data/tilemaps/unknown_options_bg/tiles.4bpp");
+const u16 Tilemap_unknown_options_bg[] = INCBIN_U16("data/tilemaps/unknown_options_bg/tilemap.tilemap2");
 
 const Tilemap unknown_options_bg = {
     .xTiles = 32,
diff --git a/data/tilemaps/unlocked_amy_de/header.c b/data/tilemaps/unlocked_amy_de/header.c
index 34746d22b..583b9c29a 100644
--- a/data/tilemaps/unlocked_amy_de/header.c
+++ b/data/tilemaps/unlocked_amy_de/header.c
@@ -1,11 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unlocked_amy_de[]
-    = INCBIN_U16("data/tilemaps/unlocked_amy_de/palette.gbapal");
+const u16 Palette_unlocked_amy_de[] = INCBIN_U16("data/tilemaps/unlocked_amy_de/palette.gbapal");
 const u8 Tiles_unlocked_amy_de[] = INCBIN_U8("data/tilemaps/unlocked_amy_de/tiles.4bpp");
-const u16 Tilemap_unlocked_amy_de[]
-    = INCBIN_U16("data/tilemaps/unlocked_amy_de/tilemap.tilemap2");
+const u16 Tilemap_unlocked_amy_de[] = INCBIN_U16("data/tilemaps/unlocked_amy_de/tilemap.tilemap2");
 
 const Tilemap unlocked_amy_de = {
     .xTiles = 30,
diff --git a/data/tilemaps/unlocked_amy_en/header.c b/data/tilemaps/unlocked_amy_en/header.c
index c54ee7c30..3cec46723 100644
--- a/data/tilemaps/unlocked_amy_en/header.c
+++ b/data/tilemaps/unlocked_amy_en/header.c
@@ -1,11 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unlocked_amy_en[]
-    = INCBIN_U16("data/tilemaps/unlocked_amy_en/palette.gbapal");
+const u16 Palette_unlocked_amy_en[] = INCBIN_U16("data/tilemaps/unlocked_amy_en/palette.gbapal");
 const u8 Tiles_unlocked_amy_en[] = INCBIN_U8("data/tilemaps/unlocked_amy_en/tiles.4bpp");
-const u16 Tilemap_unlocked_amy_en[]
-    = INCBIN_U16("data/tilemaps/unlocked_amy_en/tilemap.tilemap2");
+const u16 Tilemap_unlocked_amy_en[] = INCBIN_U16("data/tilemaps/unlocked_amy_en/tilemap.tilemap2");
 
 const Tilemap unlocked_amy_en = {
     .xTiles = 30,
diff --git a/data/tilemaps/unlocked_amy_es/header.c b/data/tilemaps/unlocked_amy_es/header.c
index 99fc3f58a..6209c2748 100644
--- a/data/tilemaps/unlocked_amy_es/header.c
+++ b/data/tilemaps/unlocked_amy_es/header.c
@@ -1,11 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unlocked_amy_es[]
-    = INCBIN_U16("data/tilemaps/unlocked_amy_es/palette.gbapal");
+const u16 Palette_unlocked_amy_es[] = INCBIN_U16("data/tilemaps/unlocked_amy_es/palette.gbapal");
 const u8 Tiles_unlocked_amy_es[] = INCBIN_U8("data/tilemaps/unlocked_amy_es/tiles.4bpp");
-const u16 Tilemap_unlocked_amy_es[]
-    = INCBIN_U16("data/tilemaps/unlocked_amy_es/tilemap.tilemap2");
+const u16 Tilemap_unlocked_amy_es[] = INCBIN_U16("data/tilemaps/unlocked_amy_es/tilemap.tilemap2");
 
 const Tilemap unlocked_amy_es = {
     .xTiles = 30,
diff --git a/data/tilemaps/unlocked_amy_fr/header.c b/data/tilemaps/unlocked_amy_fr/header.c
index 52df19300..4a985dd77 100644
--- a/data/tilemaps/unlocked_amy_fr/header.c
+++ b/data/tilemaps/unlocked_amy_fr/header.c
@@ -1,11 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unlocked_amy_fr[]
-    = INCBIN_U16("data/tilemaps/unlocked_amy_fr/palette.gbapal");
+const u16 Palette_unlocked_amy_fr[] = INCBIN_U16("data/tilemaps/unlocked_amy_fr/palette.gbapal");
 const u8 Tiles_unlocked_amy_fr[] = INCBIN_U8("data/tilemaps/unlocked_amy_fr/tiles.4bpp");
-const u16 Tilemap_unlocked_amy_fr[]
-    = INCBIN_U16("data/tilemaps/unlocked_amy_fr/tilemap.tilemap2");
+const u16 Tilemap_unlocked_amy_fr[] = INCBIN_U16("data/tilemaps/unlocked_amy_fr/tilemap.tilemap2");
 
 const Tilemap unlocked_amy_fr = {
     .xTiles = 30,
diff --git a/data/tilemaps/unlocked_amy_it/header.c b/data/tilemaps/unlocked_amy_it/header.c
index 7fab254d8..283afad74 100644
--- a/data/tilemaps/unlocked_amy_it/header.c
+++ b/data/tilemaps/unlocked_amy_it/header.c
@@ -1,11 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unlocked_amy_it[]
-    = INCBIN_U16("data/tilemaps/unlocked_amy_it/palette.gbapal");
+const u16 Palette_unlocked_amy_it[] = INCBIN_U16("data/tilemaps/unlocked_amy_it/palette.gbapal");
 const u8 Tiles_unlocked_amy_it[] = INCBIN_U8("data/tilemaps/unlocked_amy_it/tiles.4bpp");
-const u16 Tilemap_unlocked_amy_it[]
-    = INCBIN_U16("data/tilemaps/unlocked_amy_it/tilemap.tilemap2");
+const u16 Tilemap_unlocked_amy_it[] = INCBIN_U16("data/tilemaps/unlocked_amy_it/tilemap.tilemap2");
 
 const Tilemap unlocked_amy_it = {
     .xTiles = 30,
diff --git a/data/tilemaps/unlocked_amy_jp/header.c b/data/tilemaps/unlocked_amy_jp/header.c
index 36b840db8..c6ced3949 100644
--- a/data/tilemaps/unlocked_amy_jp/header.c
+++ b/data/tilemaps/unlocked_amy_jp/header.c
@@ -1,11 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unlocked_amy_jp[]
-    = INCBIN_U16("data/tilemaps/unlocked_amy_jp/palette.gbapal");
+const u16 Palette_unlocked_amy_jp[] = INCBIN_U16("data/tilemaps/unlocked_amy_jp/palette.gbapal");
 const u8 Tiles_unlocked_amy_jp[] = INCBIN_U8("data/tilemaps/unlocked_amy_jp/tiles.4bpp");
-const u16 Tilemap_unlocked_amy_jp[]
-    = INCBIN_U16("data/tilemaps/unlocked_amy_jp/tilemap.tilemap2");
+const u16 Tilemap_unlocked_amy_jp[] = INCBIN_U16("data/tilemaps/unlocked_amy_jp/tilemap.tilemap2");
 
 const Tilemap unlocked_amy_jp = {
     .xTiles = 30,
diff --git a/data/tilemaps/unlocked_bosses_time_attack_de/header.c b/data/tilemaps/unlocked_bosses_time_attack_de/header.c
index fce5a909a..338dfa24d 100644
--- a/data/tilemaps/unlocked_bosses_time_attack_de/header.c
+++ b/data/tilemaps/unlocked_bosses_time_attack_de/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unlocked_bosses_time_attack_de[]
-    = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_de/palette.gbapal");
-const u8 Tiles_unlocked_bosses_time_attack_de[]
-    = INCBIN_U8("data/tilemaps/unlocked_bosses_time_attack_de/tiles.4bpp");
-const u16 Tilemap_unlocked_bosses_time_attack_de[]
-    = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_de/tilemap.tilemap2");
+const u16 Palette_unlocked_bosses_time_attack_de[] = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_de/palette.gbapal");
+const u8 Tiles_unlocked_bosses_time_attack_de[] = INCBIN_U8("data/tilemaps/unlocked_bosses_time_attack_de/tiles.4bpp");
+const u16 Tilemap_unlocked_bosses_time_attack_de[] = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_de/tilemap.tilemap2");
 
 const Tilemap unlocked_bosses_time_attack_de = {
     .xTiles = 30,
diff --git a/data/tilemaps/unlocked_bosses_time_attack_en/header.c b/data/tilemaps/unlocked_bosses_time_attack_en/header.c
index f460a322a..aa407ffb5 100644
--- a/data/tilemaps/unlocked_bosses_time_attack_en/header.c
+++ b/data/tilemaps/unlocked_bosses_time_attack_en/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unlocked_bosses_time_attack_en[]
-    = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_en/palette.gbapal");
-const u8 Tiles_unlocked_bosses_time_attack_en[]
-    = INCBIN_U8("data/tilemaps/unlocked_bosses_time_attack_en/tiles.4bpp");
-const u16 Tilemap_unlocked_bosses_time_attack_en[]
-    = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_en/tilemap.tilemap2");
+const u16 Palette_unlocked_bosses_time_attack_en[] = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_en/palette.gbapal");
+const u8 Tiles_unlocked_bosses_time_attack_en[] = INCBIN_U8("data/tilemaps/unlocked_bosses_time_attack_en/tiles.4bpp");
+const u16 Tilemap_unlocked_bosses_time_attack_en[] = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_en/tilemap.tilemap2");
 
 const Tilemap unlocked_bosses_time_attack_en = {
     .xTiles = 30,
diff --git a/data/tilemaps/unlocked_bosses_time_attack_es/header.c b/data/tilemaps/unlocked_bosses_time_attack_es/header.c
index 79142d7cd..9a9d7947e 100644
--- a/data/tilemaps/unlocked_bosses_time_attack_es/header.c
+++ b/data/tilemaps/unlocked_bosses_time_attack_es/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unlocked_bosses_time_attack_es[]
-    = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_es/palette.gbapal");
-const u8 Tiles_unlocked_bosses_time_attack_es[]
-    = INCBIN_U8("data/tilemaps/unlocked_bosses_time_attack_es/tiles.4bpp");
-const u16 Tilemap_unlocked_bosses_time_attack_es[]
-    = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_es/tilemap.tilemap2");
+const u16 Palette_unlocked_bosses_time_attack_es[] = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_es/palette.gbapal");
+const u8 Tiles_unlocked_bosses_time_attack_es[] = INCBIN_U8("data/tilemaps/unlocked_bosses_time_attack_es/tiles.4bpp");
+const u16 Tilemap_unlocked_bosses_time_attack_es[] = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_es/tilemap.tilemap2");
 
 const Tilemap unlocked_bosses_time_attack_es = {
     .xTiles = 30,
diff --git a/data/tilemaps/unlocked_bosses_time_attack_fr/header.c b/data/tilemaps/unlocked_bosses_time_attack_fr/header.c
index 685d4fcf3..d66797cf0 100644
--- a/data/tilemaps/unlocked_bosses_time_attack_fr/header.c
+++ b/data/tilemaps/unlocked_bosses_time_attack_fr/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unlocked_bosses_time_attack_fr[]
-    = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_fr/palette.gbapal");
-const u8 Tiles_unlocked_bosses_time_attack_fr[]
-    = INCBIN_U8("data/tilemaps/unlocked_bosses_time_attack_fr/tiles.4bpp");
-const u16 Tilemap_unlocked_bosses_time_attack_fr[]
-    = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_fr/tilemap.tilemap2");
+const u16 Palette_unlocked_bosses_time_attack_fr[] = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_fr/palette.gbapal");
+const u8 Tiles_unlocked_bosses_time_attack_fr[] = INCBIN_U8("data/tilemaps/unlocked_bosses_time_attack_fr/tiles.4bpp");
+const u16 Tilemap_unlocked_bosses_time_attack_fr[] = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_fr/tilemap.tilemap2");
 
 const Tilemap unlocked_bosses_time_attack_fr = {
     .xTiles = 30,
diff --git a/data/tilemaps/unlocked_bosses_time_attack_it/header.c b/data/tilemaps/unlocked_bosses_time_attack_it/header.c
index 2c034872d..d6facf488 100644
--- a/data/tilemaps/unlocked_bosses_time_attack_it/header.c
+++ b/data/tilemaps/unlocked_bosses_time_attack_it/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unlocked_bosses_time_attack_it[]
-    = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_it/palette.gbapal");
-const u8 Tiles_unlocked_bosses_time_attack_it[]
-    = INCBIN_U8("data/tilemaps/unlocked_bosses_time_attack_it/tiles.4bpp");
-const u16 Tilemap_unlocked_bosses_time_attack_it[]
-    = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_it/tilemap.tilemap2");
+const u16 Palette_unlocked_bosses_time_attack_it[] = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_it/palette.gbapal");
+const u8 Tiles_unlocked_bosses_time_attack_it[] = INCBIN_U8("data/tilemaps/unlocked_bosses_time_attack_it/tiles.4bpp");
+const u16 Tilemap_unlocked_bosses_time_attack_it[] = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_it/tilemap.tilemap2");
 
 const Tilemap unlocked_bosses_time_attack_it = {
     .xTiles = 30,
diff --git a/data/tilemaps/unlocked_bosses_time_attack_jp/header.c b/data/tilemaps/unlocked_bosses_time_attack_jp/header.c
index c1a3047c8..b02c64be6 100644
--- a/data/tilemaps/unlocked_bosses_time_attack_jp/header.c
+++ b/data/tilemaps/unlocked_bosses_time_attack_jp/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unlocked_bosses_time_attack_jp[]
-    = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_jp/palette.gbapal");
-const u8 Tiles_unlocked_bosses_time_attack_jp[]
-    = INCBIN_U8("data/tilemaps/unlocked_bosses_time_attack_jp/tiles.4bpp");
-const u16 Tilemap_unlocked_bosses_time_attack_jp[]
-    = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_jp/tilemap.tilemap2");
+const u16 Palette_unlocked_bosses_time_attack_jp[] = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_jp/palette.gbapal");
+const u8 Tiles_unlocked_bosses_time_attack_jp[] = INCBIN_U8("data/tilemaps/unlocked_bosses_time_attack_jp/tiles.4bpp");
+const u16 Tilemap_unlocked_bosses_time_attack_jp[] = INCBIN_U16("data/tilemaps/unlocked_bosses_time_attack_jp/tilemap.tilemap2");
 
 const Tilemap unlocked_bosses_time_attack_jp = {
     .xTiles = 30,
diff --git a/data/tilemaps/unlocked_sound_test_de/header.c b/data/tilemaps/unlocked_sound_test_de/header.c
index df4ce7c38..7f60896ad 100644
--- a/data/tilemaps/unlocked_sound_test_de/header.c
+++ b/data/tilemaps/unlocked_sound_test_de/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unlocked_sound_test_de[]
-    = INCBIN_U16("data/tilemaps/unlocked_sound_test_de/palette.gbapal");
-const u8 Tiles_unlocked_sound_test_de[]
-    = INCBIN_U8("data/tilemaps/unlocked_sound_test_de/tiles.4bpp");
-const u16 Tilemap_unlocked_sound_test_de[]
-    = INCBIN_U16("data/tilemaps/unlocked_sound_test_de/tilemap.tilemap2");
+const u16 Palette_unlocked_sound_test_de[] = INCBIN_U16("data/tilemaps/unlocked_sound_test_de/palette.gbapal");
+const u8 Tiles_unlocked_sound_test_de[] = INCBIN_U8("data/tilemaps/unlocked_sound_test_de/tiles.4bpp");
+const u16 Tilemap_unlocked_sound_test_de[] = INCBIN_U16("data/tilemaps/unlocked_sound_test_de/tilemap.tilemap2");
 
 const Tilemap unlocked_sound_test_de = {
     .xTiles = 30,
diff --git a/data/tilemaps/unlocked_sound_test_en/header.c b/data/tilemaps/unlocked_sound_test_en/header.c
index c2ff1dad4..cd042763b 100644
--- a/data/tilemaps/unlocked_sound_test_en/header.c
+++ b/data/tilemaps/unlocked_sound_test_en/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unlocked_sound_test_en[]
-    = INCBIN_U16("data/tilemaps/unlocked_sound_test_en/palette.gbapal");
-const u8 Tiles_unlocked_sound_test_en[]
-    = INCBIN_U8("data/tilemaps/unlocked_sound_test_en/tiles.4bpp");
-const u16 Tilemap_unlocked_sound_test_en[]
-    = INCBIN_U16("data/tilemaps/unlocked_sound_test_en/tilemap.tilemap2");
+const u16 Palette_unlocked_sound_test_en[] = INCBIN_U16("data/tilemaps/unlocked_sound_test_en/palette.gbapal");
+const u8 Tiles_unlocked_sound_test_en[] = INCBIN_U8("data/tilemaps/unlocked_sound_test_en/tiles.4bpp");
+const u16 Tilemap_unlocked_sound_test_en[] = INCBIN_U16("data/tilemaps/unlocked_sound_test_en/tilemap.tilemap2");
 
 const Tilemap unlocked_sound_test_en = {
     .xTiles = 30,
diff --git a/data/tilemaps/unlocked_sound_test_es/header.c b/data/tilemaps/unlocked_sound_test_es/header.c
index c9db1085f..c0379d5b0 100644
--- a/data/tilemaps/unlocked_sound_test_es/header.c
+++ b/data/tilemaps/unlocked_sound_test_es/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unlocked_sound_test_es[]
-    = INCBIN_U16("data/tilemaps/unlocked_sound_test_es/palette.gbapal");
-const u8 Tiles_unlocked_sound_test_es[]
-    = INCBIN_U8("data/tilemaps/unlocked_sound_test_es/tiles.4bpp");
-const u16 Tilemap_unlocked_sound_test_es[]
-    = INCBIN_U16("data/tilemaps/unlocked_sound_test_es/tilemap.tilemap2");
+const u16 Palette_unlocked_sound_test_es[] = INCBIN_U16("data/tilemaps/unlocked_sound_test_es/palette.gbapal");
+const u8 Tiles_unlocked_sound_test_es[] = INCBIN_U8("data/tilemaps/unlocked_sound_test_es/tiles.4bpp");
+const u16 Tilemap_unlocked_sound_test_es[] = INCBIN_U16("data/tilemaps/unlocked_sound_test_es/tilemap.tilemap2");
 
 const Tilemap unlocked_sound_test_es = {
     .xTiles = 30,
diff --git a/data/tilemaps/unlocked_sound_test_fr/header.c b/data/tilemaps/unlocked_sound_test_fr/header.c
index 836bd4e5d..7fdfad943 100644
--- a/data/tilemaps/unlocked_sound_test_fr/header.c
+++ b/data/tilemaps/unlocked_sound_test_fr/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unlocked_sound_test_fr[]
-    = INCBIN_U16("data/tilemaps/unlocked_sound_test_fr/palette.gbapal");
-const u8 Tiles_unlocked_sound_test_fr[]
-    = INCBIN_U8("data/tilemaps/unlocked_sound_test_fr/tiles.4bpp");
-const u16 Tilemap_unlocked_sound_test_fr[]
-    = INCBIN_U16("data/tilemaps/unlocked_sound_test_fr/tilemap.tilemap2");
+const u16 Palette_unlocked_sound_test_fr[] = INCBIN_U16("data/tilemaps/unlocked_sound_test_fr/palette.gbapal");
+const u8 Tiles_unlocked_sound_test_fr[] = INCBIN_U8("data/tilemaps/unlocked_sound_test_fr/tiles.4bpp");
+const u16 Tilemap_unlocked_sound_test_fr[] = INCBIN_U16("data/tilemaps/unlocked_sound_test_fr/tilemap.tilemap2");
 
 const Tilemap unlocked_sound_test_fr = {
     .xTiles = 30,
diff --git a/data/tilemaps/unlocked_sound_test_it/header.c b/data/tilemaps/unlocked_sound_test_it/header.c
index d40c1b97a..62025328b 100644
--- a/data/tilemaps/unlocked_sound_test_it/header.c
+++ b/data/tilemaps/unlocked_sound_test_it/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unlocked_sound_test_it[]
-    = INCBIN_U16("data/tilemaps/unlocked_sound_test_it/palette.gbapal");
-const u8 Tiles_unlocked_sound_test_it[]
-    = INCBIN_U8("data/tilemaps/unlocked_sound_test_it/tiles.4bpp");
-const u16 Tilemap_unlocked_sound_test_it[]
-    = INCBIN_U16("data/tilemaps/unlocked_sound_test_it/tilemap.tilemap2");
+const u16 Palette_unlocked_sound_test_it[] = INCBIN_U16("data/tilemaps/unlocked_sound_test_it/palette.gbapal");
+const u8 Tiles_unlocked_sound_test_it[] = INCBIN_U8("data/tilemaps/unlocked_sound_test_it/tiles.4bpp");
+const u16 Tilemap_unlocked_sound_test_it[] = INCBIN_U16("data/tilemaps/unlocked_sound_test_it/tilemap.tilemap2");
 
 const Tilemap unlocked_sound_test_it = {
     .xTiles = 30,
diff --git a/data/tilemaps/unlocked_sound_test_jp/header.c b/data/tilemaps/unlocked_sound_test_jp/header.c
index 23eb2f5a2..dd277416d 100644
--- a/data/tilemaps/unlocked_sound_test_jp/header.c
+++ b/data/tilemaps/unlocked_sound_test_jp/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unlocked_sound_test_jp[]
-    = INCBIN_U16("data/tilemaps/unlocked_sound_test_jp/palette.gbapal");
-const u8 Tiles_unlocked_sound_test_jp[]
-    = INCBIN_U8("data/tilemaps/unlocked_sound_test_jp/tiles.4bpp");
-const u16 Tilemap_unlocked_sound_test_jp[]
-    = INCBIN_U16("data/tilemaps/unlocked_sound_test_jp/tilemap.tilemap2");
+const u16 Palette_unlocked_sound_test_jp[] = INCBIN_U16("data/tilemaps/unlocked_sound_test_jp/palette.gbapal");
+const u8 Tiles_unlocked_sound_test_jp[] = INCBIN_U8("data/tilemaps/unlocked_sound_test_jp/tiles.4bpp");
+const u16 Tilemap_unlocked_sound_test_jp[] = INCBIN_U16("data/tilemaps/unlocked_sound_test_jp/tilemap.tilemap2");
 
 const Tilemap unlocked_sound_test_jp = {
     .xTiles = 30,
diff --git a/data/tilemaps/unlocked_tiny_chao_garden_de/header.c b/data/tilemaps/unlocked_tiny_chao_garden_de/header.c
index 44bc55620..7714c78fc 100644
--- a/data/tilemaps/unlocked_tiny_chao_garden_de/header.c
+++ b/data/tilemaps/unlocked_tiny_chao_garden_de/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unlocked_tiny_chao_garden_de[]
-    = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_de/palette.gbapal");
-const u8 Tiles_unlocked_tiny_chao_garden_de[]
-    = INCBIN_U8("data/tilemaps/unlocked_tiny_chao_garden_de/tiles.4bpp");
-const u16 Tilemap_unlocked_tiny_chao_garden_de[]
-    = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_de/tilemap.tilemap2");
+const u16 Palette_unlocked_tiny_chao_garden_de[] = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_de/palette.gbapal");
+const u8 Tiles_unlocked_tiny_chao_garden_de[] = INCBIN_U8("data/tilemaps/unlocked_tiny_chao_garden_de/tiles.4bpp");
+const u16 Tilemap_unlocked_tiny_chao_garden_de[] = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_de/tilemap.tilemap2");
 
 const Tilemap unlocked_tiny_chao_garden_de = {
     .xTiles = 30,
diff --git a/data/tilemaps/unlocked_tiny_chao_garden_en/header.c b/data/tilemaps/unlocked_tiny_chao_garden_en/header.c
index 67a7e8c0f..462682d9c 100644
--- a/data/tilemaps/unlocked_tiny_chao_garden_en/header.c
+++ b/data/tilemaps/unlocked_tiny_chao_garden_en/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unlocked_tiny_chao_garden_en[]
-    = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_en/palette.gbapal");
-const u8 Tiles_unlocked_tiny_chao_garden_en[]
-    = INCBIN_U8("data/tilemaps/unlocked_tiny_chao_garden_en/tiles.4bpp");
-const u16 Tilemap_unlocked_tiny_chao_garden_en[]
-    = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_en/tilemap.tilemap2");
+const u16 Palette_unlocked_tiny_chao_garden_en[] = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_en/palette.gbapal");
+const u8 Tiles_unlocked_tiny_chao_garden_en[] = INCBIN_U8("data/tilemaps/unlocked_tiny_chao_garden_en/tiles.4bpp");
+const u16 Tilemap_unlocked_tiny_chao_garden_en[] = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_en/tilemap.tilemap2");
 
 const Tilemap unlocked_tiny_chao_garden_en = {
     .xTiles = 30,
diff --git a/data/tilemaps/unlocked_tiny_chao_garden_es/header.c b/data/tilemaps/unlocked_tiny_chao_garden_es/header.c
index a1aee3c02..bac15e10f 100644
--- a/data/tilemaps/unlocked_tiny_chao_garden_es/header.c
+++ b/data/tilemaps/unlocked_tiny_chao_garden_es/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unlocked_tiny_chao_garden_es[]
-    = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_es/palette.gbapal");
-const u8 Tiles_unlocked_tiny_chao_garden_es[]
-    = INCBIN_U8("data/tilemaps/unlocked_tiny_chao_garden_es/tiles.4bpp");
-const u16 Tilemap_unlocked_tiny_chao_garden_es[]
-    = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_es/tilemap.tilemap2");
+const u16 Palette_unlocked_tiny_chao_garden_es[] = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_es/palette.gbapal");
+const u8 Tiles_unlocked_tiny_chao_garden_es[] = INCBIN_U8("data/tilemaps/unlocked_tiny_chao_garden_es/tiles.4bpp");
+const u16 Tilemap_unlocked_tiny_chao_garden_es[] = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_es/tilemap.tilemap2");
 
 const Tilemap unlocked_tiny_chao_garden_es = {
     .xTiles = 30,
diff --git a/data/tilemaps/unlocked_tiny_chao_garden_fr/header.c b/data/tilemaps/unlocked_tiny_chao_garden_fr/header.c
index 8a6ae8359..67ba5beee 100644
--- a/data/tilemaps/unlocked_tiny_chao_garden_fr/header.c
+++ b/data/tilemaps/unlocked_tiny_chao_garden_fr/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unlocked_tiny_chao_garden_fr[]
-    = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_fr/palette.gbapal");
-const u8 Tiles_unlocked_tiny_chao_garden_fr[]
-    = INCBIN_U8("data/tilemaps/unlocked_tiny_chao_garden_fr/tiles.4bpp");
-const u16 Tilemap_unlocked_tiny_chao_garden_fr[]
-    = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_fr/tilemap.tilemap2");
+const u16 Palette_unlocked_tiny_chao_garden_fr[] = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_fr/palette.gbapal");
+const u8 Tiles_unlocked_tiny_chao_garden_fr[] = INCBIN_U8("data/tilemaps/unlocked_tiny_chao_garden_fr/tiles.4bpp");
+const u16 Tilemap_unlocked_tiny_chao_garden_fr[] = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_fr/tilemap.tilemap2");
 
 const Tilemap unlocked_tiny_chao_garden_fr = {
     .xTiles = 30,
diff --git a/data/tilemaps/unlocked_tiny_chao_garden_it/header.c b/data/tilemaps/unlocked_tiny_chao_garden_it/header.c
index 957ba63c4..edffa16ee 100644
--- a/data/tilemaps/unlocked_tiny_chao_garden_it/header.c
+++ b/data/tilemaps/unlocked_tiny_chao_garden_it/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unlocked_tiny_chao_garden_it[]
-    = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_it/palette.gbapal");
-const u8 Tiles_unlocked_tiny_chao_garden_it[]
-    = INCBIN_U8("data/tilemaps/unlocked_tiny_chao_garden_it/tiles.4bpp");
-const u16 Tilemap_unlocked_tiny_chao_garden_it[]
-    = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_it/tilemap.tilemap2");
+const u16 Palette_unlocked_tiny_chao_garden_it[] = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_it/palette.gbapal");
+const u8 Tiles_unlocked_tiny_chao_garden_it[] = INCBIN_U8("data/tilemaps/unlocked_tiny_chao_garden_it/tiles.4bpp");
+const u16 Tilemap_unlocked_tiny_chao_garden_it[] = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_it/tilemap.tilemap2");
 
 const Tilemap unlocked_tiny_chao_garden_it = {
     .xTiles = 30,
diff --git a/data/tilemaps/unlocked_tiny_chao_garden_jp/header.c b/data/tilemaps/unlocked_tiny_chao_garden_jp/header.c
index e00622687..617854dca 100644
--- a/data/tilemaps/unlocked_tiny_chao_garden_jp/header.c
+++ b/data/tilemaps/unlocked_tiny_chao_garden_jp/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unlocked_tiny_chao_garden_jp[]
-    = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_jp/palette.gbapal");
-const u8 Tiles_unlocked_tiny_chao_garden_jp[]
-    = INCBIN_U8("data/tilemaps/unlocked_tiny_chao_garden_jp/tiles.4bpp");
-const u16 Tilemap_unlocked_tiny_chao_garden_jp[]
-    = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_jp/tilemap.tilemap2");
+const u16 Palette_unlocked_tiny_chao_garden_jp[] = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_jp/palette.gbapal");
+const u8 Tiles_unlocked_tiny_chao_garden_jp[] = INCBIN_U8("data/tilemaps/unlocked_tiny_chao_garden_jp/tiles.4bpp");
+const u16 Tilemap_unlocked_tiny_chao_garden_jp[] = INCBIN_U16("data/tilemaps/unlocked_tiny_chao_garden_jp/tilemap.tilemap2");
 
 const Tilemap unlocked_tiny_chao_garden_jp = {
     .xTiles = 30,
diff --git a/data/tilemaps/unused_credits_frame_manual_production_copy/header.c b/data/tilemaps/unused_credits_frame_manual_production_copy/header.c
index 5212ca90f..4313cefda 100644
--- a/data/tilemaps/unused_credits_frame_manual_production_copy/header.c
+++ b/data/tilemaps/unused_credits_frame_manual_production_copy/header.c
@@ -1,12 +1,12 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unused_credits_frame_manual_production_copy[] = INCBIN_U16(
-    "data/tilemaps/unused_credits_frame_manual_production_copy/palette.gbapal");
+const u16 Palette_unused_credits_frame_manual_production_copy[]
+    = INCBIN_U16("data/tilemaps/unused_credits_frame_manual_production_copy/palette.gbapal");
 const u8 Tiles_unused_credits_frame_manual_production_copy[]
     = INCBIN_U8("data/tilemaps/unused_credits_frame_manual_production_copy/tiles.4bpp");
-const u16 Tilemap_unused_credits_frame_manual_production_copy[] = INCBIN_U16(
-    "data/tilemaps/unused_credits_frame_manual_production_copy/tilemap.tilemap2");
+const u16 Tilemap_unused_credits_frame_manual_production_copy[]
+    = INCBIN_U16("data/tilemaps/unused_credits_frame_manual_production_copy/tilemap.tilemap2");
 
 const Tilemap unused_credits_frame_manual_production_copy = {
     .xTiles = 30,
@@ -18,7 +18,6 @@ const Tilemap unused_credits_frame_manual_production_copy = {
     .tilesSize = sizeof(Tiles_unused_credits_frame_manual_production_copy),
     .palette = Palette_unused_credits_frame_manual_production_copy,
     .palOffset = 0,
-    .palLength
-    = sizeof(Palette_unused_credits_frame_manual_production_copy) / sizeof(u16),
+    .palLength = sizeof(Palette_unused_credits_frame_manual_production_copy) / sizeof(u16),
     .map = Tilemap_unused_credits_frame_manual_production_copy,
 };
diff --git a/data/tilemaps/unused_credits_frame_sonic_leaves/header.c b/data/tilemaps/unused_credits_frame_sonic_leaves/header.c
index 9ae8233f5..dc5fedd2c 100644
--- a/data/tilemaps/unused_credits_frame_sonic_leaves/header.c
+++ b/data/tilemaps/unused_credits_frame_sonic_leaves/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unused_credits_frame_sonic_leaves[]
-    = INCBIN_U16("data/tilemaps/unused_credits_frame_sonic_leaves/palette.gbapal");
-const u8 Tiles_unused_credits_frame_sonic_leaves[]
-    = INCBIN_U8("data/tilemaps/unused_credits_frame_sonic_leaves/tiles.4bpp");
-const u16 Tilemap_unused_credits_frame_sonic_leaves[]
-    = INCBIN_U16("data/tilemaps/unused_credits_frame_sonic_leaves/tilemap.tilemap2");
+const u16 Palette_unused_credits_frame_sonic_leaves[] = INCBIN_U16("data/tilemaps/unused_credits_frame_sonic_leaves/palette.gbapal");
+const u8 Tiles_unused_credits_frame_sonic_leaves[] = INCBIN_U8("data/tilemaps/unused_credits_frame_sonic_leaves/tiles.4bpp");
+const u16 Tilemap_unused_credits_frame_sonic_leaves[] = INCBIN_U16("data/tilemaps/unused_credits_frame_sonic_leaves/tilemap.tilemap2");
 
 const Tilemap unused_credits_frame_sonic_leaves = {
     .xTiles = 30,
diff --git a/data/tilemaps/unused_options_window/header.c b/data/tilemaps/unused_options_window/header.c
index 14d976d3c..20f7106e4 100644
--- a/data/tilemaps/unused_options_window/header.c
+++ b/data/tilemaps/unused_options_window/header.c
@@ -1,12 +1,9 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_unused_options_window[]
-    = INCBIN_U16("data/tilemaps/unused_options_window/palette.gbapal");
-const u8 Tiles_unused_options_window[]
-    = INCBIN_U8("data/tilemaps/unused_options_window/tiles.4bpp");
-const u16 Tilemap_unused_options_window[]
-    = INCBIN_U16("data/tilemaps/unused_options_window/tilemap.tilemap2");
+const u16 Palette_unused_options_window[] = INCBIN_U16("data/tilemaps/unused_options_window/palette.gbapal");
+const u8 Tiles_unused_options_window[] = INCBIN_U8("data/tilemaps/unused_options_window/tiles.4bpp");
+const u16 Tilemap_unused_options_window[] = INCBIN_U16("data/tilemaps/unused_options_window/tilemap.tilemap2");
 
 const Tilemap unused_options_window = {
     .xTiles = 30,
diff --git a/include/animation_commands_bg.h b/include/animation_commands_bg.h
index d1a7319d6..b216fdfd2 100644
--- a/include/animation_commands_bg.h
+++ b/include/animation_commands_bg.h
@@ -6,8 +6,7 @@
 
 void UpdateBgAnimationTiles(Background *);
 
-s32 RenderText(void *dest, const void *font, u16 x, u16 y, u8 bg, const char *text,
-               u8 palette);
+s32 RenderText(void *dest, const void *font, u16 x, u16 y, u8 bg, const char *text, u8 palette);
 
 void numToASCII(u8 digits[5], u16 number);
 
diff --git a/include/bg_triangles.h b/include/bg_triangles.h
index 7f4f191cb..dc5534b55 100644
--- a/include/bg_triangles.h
+++ b/include/bg_triangles.h
@@ -15,7 +15,6 @@ typedef struct {
 extern void sub_800724C(u8 bg, TriParam1 *param1);
 extern void sub_80075D0(u8 bg, u8 param1, u8 param2, s16 param3, u16 param4, u16 param5);
 extern void sub_8007858(u8 param0, u8 param1, u8 param2, u16 param3, u16 param4);
-extern void sub_80078D4(u8 bg, int_vcount minY, int_vcount maxY, u16 offsetEven,
-                        u16 offsetOdd);
+extern void sub_80078D4(u8 bg, int_vcount minY, int_vcount maxY, u16 offsetEven, u16 offsetOdd);
 
 #endif
diff --git a/include/constants/animations.h b/include/constants/animations.h
index 6967e8b56..f73cbc14c 100644
--- a/include/constants/animations.h
+++ b/include/constants/animations.h
@@ -13,8 +13,7 @@
 #define SA2_ANIM_CHAR_ID_CHEESE 5
 
 #define SA2_NUM_PLAYER_CHAR_ANIMATIONS (91) // TODO: Don't use constant here
-#define SA2_ANIM_CHAR(anim, character)                                                  \
-    ((anim) + character * SA2_NUM_PLAYER_CHAR_ANIMATIONS)
+#define SA2_ANIM_CHAR(anim, character) ((anim) + character * SA2_NUM_PLAYER_CHAR_ANIMATIONS)
 
 // TODO: If possible, make player animations macros, so there's no redundancy
 #define SA2_CHAR_ANIM_IDLE               0
@@ -118,7 +117,7 @@
 #define SA2_ANIM_CHEESE_BACKFLIP                       457
 #define SA2_ANIM_CHEESE_NERVOUS                        458
 #define SA2_ANIM_CHEESE_PIROUETTE                      459
-#define SA2_ANIM_CHEESE_SHOCKED                                                         \
+#define SA2_ANIM_CHEESE_SHOCKED                                                                                                            \
     460 // Not sure about this one. They put their hand to their mouth, but it doesn't
         // have an eating animation
 #define SA2_ANIM_CHEESE_LIFTING              461
@@ -446,18 +445,16 @@
 #define SA2_ANIM_VARIANT_GAME_OVER_NUE   3
 #define SA2_ANIM_VARIANT_GAME_OVER_TIME  4
 
-#define SA2_ANIM_NOTIFICATION_RING_BONUS                735
-#define SA2_ANIM_CHAR_SELECT_CHARACTER                  736
-#define SA2_ANIM_VARIANT_CHAR_SELECT_CHARACTER_STATIC   0
-#define SA2_ANIM_VARIANT_CHAR_SELECT_CHARACTER_SELECTED 1
-#define SA2_CHAR_SELECT_NUM_CHARACTER_ANIMATIONS        2
-#define SA2_ANIM_VARIANT_SELECT_CHARACTER(character, type)                              \
-    ((character)*SA2_CHAR_SELECT_NUM_CHARACTER_ANIMATIONS + type)
+#define SA2_ANIM_NOTIFICATION_RING_BONUS                   735
+#define SA2_ANIM_CHAR_SELECT_CHARACTER                     736
+#define SA2_ANIM_VARIANT_CHAR_SELECT_CHARACTER_STATIC      0
+#define SA2_ANIM_VARIANT_CHAR_SELECT_CHARACTER_SELECTED    1
+#define SA2_CHAR_SELECT_NUM_CHARACTER_ANIMATIONS           2
+#define SA2_ANIM_VARIANT_SELECT_CHARACTER(character, type) ((character)*SA2_CHAR_SELECT_NUM_CHARACTER_ANIMATIONS + type)
 
 #define SA2_ANIM_CHAR_SELECT_CIRCLE                  737
 #define SA2_ANIM_VARIANT_CHAR_SELECT_CIRCLE_INACTIVE 0
-#define SA2_ANIM_VARIANT_CHAR_SELECT_CIRCLE_ACTIVE                                      \
-    (SA2_ANIM_VARIANT_CHAR_SELECT_CIRCLE_INACTIVE + NUM_CHARACTERS)
+#define SA2_ANIM_VARIANT_CHAR_SELECT_CIRCLE_ACTIVE   (SA2_ANIM_VARIANT_CHAR_SELECT_CIRCLE_INACTIVE + NUM_CHARACTERS)
 
 #define SA2_ANIM_CHAR_SELECT_ARROW                   738
 #define SA2_ANIM_VARIANT_CHAR_SELECT_ARROW_STATIC    0
diff --git a/include/constants/characters.h b/include/constants/characters.h
index c237fcd1e..4d1c66df3 100644
--- a/include/constants/characters.h
+++ b/include/constants/characters.h
@@ -11,8 +11,7 @@
 
 #define CHARACTER_BIT(character) (1 << (character))
 
-#define MAIN_CHARACTERS                                                                 \
-    (CHARACTER_BIT(CHARACTER_SONIC) | CHARACTER_BIT(CHARACTER_CREAM)                    \
-     | CHARACTER_BIT(CHARACTER_TAILS) | CHARACTER_BIT(CHARACTER_KNUCKLES))
+#define MAIN_CHARACTERS                                                                                                                    \
+    (CHARACTER_BIT(CHARACTER_SONIC) | CHARACTER_BIT(CHARACTER_CREAM) | CHARACTER_BIT(CHARACTER_TAILS) | CHARACTER_BIT(CHARACTER_KNUCKLES))
 
 #endif
diff --git a/include/constants/move_states.h b/include/constants/move_states.h
index c20a6cb28..a57964fda 100644
--- a/include/constants/move_states.h
+++ b/include/constants/move_states.h
@@ -40,9 +40,8 @@
 #define MOVESTATE_8000000         0x08000000
 #define MOVESTATE_10000000        0x10000000
 #define MOVESTATE_20000000        0x20000000
-#define MOVESTATE_IN_SCRIPTED                                                           \
-    0x40000000 // Player speed/pos are currently handled by an Interactable
-#define MOVESTATE_80000000 0x80000000
+#define MOVESTATE_IN_SCRIPTED     0x40000000 // Player speed/pos are currently handled by an Interactable
+#define MOVESTATE_80000000        0x80000000
 #endif
 
 /* Sonic Advance 3 */
diff --git a/include/constants/songs.h b/include/constants/songs.h
index b8d78de1e..3391ca5b2 100644
--- a/include/constants/songs.h
+++ b/include/constants/songs.h
@@ -5,11 +5,10 @@
 #define MUS_INTRO               1
 #define MUS_TITLE_FANFARE       2
 #define MUS_CHARACTER_SELECTION 3
-#define MUS_TA_COURSE_SELECTION                                                         \
-    4 // plays both in Time Attack and (initially) the zone map
-#define MUS_COURSE_SELECTION_2 5
-#define MUS_COURSE_SELECTION_3 6
-#define MUS_TIME_ATTACK_MENU   7
+#define MUS_TA_COURSE_SELECTION 4 // plays both in Time Attack and (initially) the zone map
+#define MUS_COURSE_SELECTION_2  5
+#define MUS_COURSE_SELECTION_3  6
+#define MUS_TIME_ATTACK_MENU    7
 // 8
 #define MUS_OPTIONS 9
 // 10
diff --git a/include/constants/text.h b/include/constants/text.h
index a9ff8f2bf..8572d8108 100644
--- a/include/constants/text.h
+++ b/include/constants/text.h
@@ -10,25 +10,19 @@
 
 #define LanguageIndex(lang) (lang - 1)
 
-#define TextElementOffset(lang, elementsPerLang, element)                               \
-    (element + ((lang) * (elementsPerLang)))
-#define TextElementOffsetAlt(lang, elementsPerLang, element)                            \
-    (((lang) * (elementsPerLang)) + element)
+#define TextElementOffset(lang, elementsPerLang, element)    (element + ((lang) * (elementsPerLang)))
+#define TextElementOffsetAlt(lang, elementsPerLang, element) (((lang) * (elementsPerLang)) + element)
 
 // TODO: move these to a better place
 
-#define TextElementAlt(elementsPerLang, lang, element, a, b)                            \
-    [(lang) * (elementsPerLang) + (element - 1)]                                        \
-        = { .numTiles = (a), .anim = (b), .variant = (element) }
-#define TextElement(elementsPerLang, lang, element, a, b)                               \
-    [TextElementOffset(lang, elementsPerLang, element)]                                 \
-        = { .numTiles = (a), .anim = (b), .variant = (element) }
+#define TextElementAlt(elementsPerLang, lang, element, a, b)                                                                               \
+    [(lang) * (elementsPerLang) + (element - 1)] = { .numTiles = (a), .anim = (b), .variant = (element) }
+#define TextElement(elementsPerLang, lang, element, a, b)                                                                                  \
+    [TextElementOffset(lang, elementsPerLang, element)] = { .numTiles = (a), .anim = (b), .variant = (element) }
 
-#define TextElementAlt2(lang, element, a, b)                                            \
-    [lang] = { .numTiles = (a), .anim = (b), .variant = (element) }
-#define TextElementAlt3(element, a, b)                                                  \
-    [element] = { .numTiles = (a), .anim = (b), .variant = (element) }
-#define TextElementAlt4(_variant, _numTiles, _anim)                                     \
-    {                                                                                   \
-        .numTiles = (_numTiles), .anim = (_anim), .variant = (_variant)                 \
+#define TextElementAlt2(lang, element, a, b) [lang] = { .numTiles = (a), .anim = (b), .variant = (element) }
+#define TextElementAlt3(element, a, b)       [element] = { .numTiles = (a), .anim = (b), .variant = (element) }
+#define TextElementAlt4(_variant, _numTiles, _anim)                                                                                        \
+    {                                                                                                                                      \
+        .numTiles = (_numTiles), .anim = (_anim), .variant = (_variant)                                                                    \
     }
diff --git a/include/constants/zones.h b/include/constants/zones.h
index 7c70fef52..4c3958ace 100644
--- a/include/constants/zones.h
+++ b/include/constants/zones.h
@@ -30,33 +30,28 @@
 
 #define LEVEL_TO_ZONE(level) ((level) >> 2)
 // ((((level) / (ACTS_PER_ZONE + 1)) * 2) | ((level) & 1))
-#define LEVEL_TO_COURSE_INDEX(level)                                                    \
-    ((((level) / ACT_SLOTS_PER_ZONE) << 0x19 >> 0x18) | ((level)&1))
+#define LEVEL_TO_COURSE_INDEX(level)        ((((level) / ACT_SLOTS_PER_ZONE) << 0x19 >> 0x18) | ((level)&1))
 #define COURSE_LEVEL_TO_COURSE_INDEX(level) (((level) >> 1) + ((level)&1))
 
 #define COURSE_INDEX(zone, act) (LEVEL_TO_COURSE_INDEX(LEVEL_INDEX(zone, act)))
 
 #define CHAOS_EMERALD(zone) (1 << (zone))
-#define ALL_ZONE_CHAOS_EMERALDS                                                         \
-    (CHAOS_EMERALD(ZONE_1) | CHAOS_EMERALD(ZONE_2) | CHAOS_EMERALD(ZONE_3)              \
-     | CHAOS_EMERALD(ZONE_4) | CHAOS_EMERALD(ZONE_5) | CHAOS_EMERALD(ZONE_6)            \
-     | CHAOS_EMERALD(ZONE_7))
+#define ALL_ZONE_CHAOS_EMERALDS                                                                                                            \
+    (CHAOS_EMERALD(ZONE_1) | CHAOS_EMERALD(ZONE_2) | CHAOS_EMERALD(ZONE_3) | CHAOS_EMERALD(ZONE_4) | CHAOS_EMERALD(ZONE_5)                 \
+     | CHAOS_EMERALD(ZONE_6) | CHAOS_EMERALD(ZONE_7))
 
 #define CHAOS_EMERALDS_COMPLETED CHAOS_EMERALD(7)
 
-#define IS_BOSS_STAGE(lvl)                                                              \
-    ((ACT_INDEX(lvl) == ACT_BOSS)                                                       \
-     || (((lvl) == LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE))                          \
-         && (gUnknown_030054B0 == 0))                                                   \
+#define IS_BOSS_STAGE(lvl)                                                                                                                 \
+    ((ACT_INDEX(lvl) == ACT_BOSS) || (((lvl) == LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE)) && (gUnknown_030054B0 == 0))                   \
      || (((lvl) == LEVEL_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53))))
 
 #define IS_FINAL_STAGE(lvl)          ((lvl) == LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE))
 #define IS_EXTRA_STAGE(lvl)          ((lvl) == LEVEL_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53))
 #define IS_FINAL_OR_EXTRA_STAGE(lvl) ((IS_FINAL_STAGE(lvl)) || (IS_EXTRA_STAGE(lvl)))
 
-#define ZONE_TIME_TO_INT(minutes, seconds)                                              \
-    (int)(((minutes * 60.) + seconds) * GBA_FRAMES_PER_SECOND)
-#define MAX_COURSE_TIME (ZONE_TIME_TO_INT(10, 0))
+#define ZONE_TIME_TO_INT(minutes, seconds) (int)(((minutes * 60.) + seconds) * GBA_FRAMES_PER_SECOND)
+#define MAX_COURSE_TIME                    (ZONE_TIME_TO_INT(10, 0))
 
 #define SPECIAL_STAGE_REQUIRED_SP_RING_COUNT 7
 
diff --git a/include/core.h b/include/core.h
index 721638f26..01060545f 100644
--- a/include/core.h
+++ b/include/core.h
@@ -155,16 +155,16 @@ struct SpriteTables {
 // No idea why this exists when there is a
 // better random number generator in the math
 // module
-#define PseudoRandom32()                                                                \
-    ({                                                                                  \
-        gPseudoRandom = (gPseudoRandom * 0x196225) + 0x3C6EF35F;                        \
-        gPseudoRandom;                                                                  \
+#define PseudoRandom32()                                                                                                                   \
+    ({                                                                                                                                     \
+        gPseudoRandom = (gPseudoRandom * 0x196225) + 0x3C6EF35F;                                                                           \
+        gPseudoRandom;                                                                                                                     \
     })
 
-#define MultiplayerPseudoRandom32()                                                     \
-    ({                                                                                  \
-        gMultiplayerPseudoRandom = (gMultiplayerPseudoRandom * 0x196225) + 0x3C6EF35F;  \
-        gMultiplayerPseudoRandom;                                                       \
+#define MultiplayerPseudoRandom32()                                                                                                        \
+    ({                                                                                                                                     \
+        gMultiplayerPseudoRandom = (gMultiplayerPseudoRandom * 0x196225) + 0x3C6EF35F;                                                     \
+        gMultiplayerPseudoRandom;                                                                                                          \
     })
 #define PseudoRandBetween(min, max) ((PseudoRandom32() & ((-min) + (max - 1))) + (min))
 
@@ -278,9 +278,8 @@ extern u8 gUnknown_03004D80[16]; // TODO: Is this 4 (# backgrounds), instead of
 
 #define LOG_GRAPHICS_QUEUE TRUE
 #if (!PLATFORM_GBA && LOG_GRAPHICS_QUEUE)
-#define GFX_QUEUE_LOG_ADD(gfx)                                                          \
-    printf("GFX %d: src 0x%p, dst 0x%p, size 0x%04X\n", gVramGraphicsCopyQueueIndex,    \
-           (gfx)->src, (gfx)->dest, (gfx)->size);
+#define GFX_QUEUE_LOG_ADD(gfx)                                                                                                             \
+    printf("GFX %d: src 0x%p, dst 0x%p, size 0x%04X\n", gVramGraphicsCopyQueueIndex, (gfx)->src, (gfx)->dest, (gfx)->size);
 #else
 #define GFX_QUEUE_LOG_ADD(gfx)
 #endif
@@ -291,13 +290,12 @@ extern u8 gVramGraphicsCopyQueueIndex;
 // just making them equal will pause the queue.
 #define PAUSE_GRAPHICS_QUEUE() gVramGraphicsCopyCursor = gVramGraphicsCopyQueueIndex;
 
-#define INC_GRAPHICS_QUEUE_CURSOR(cursor)                                               \
-    cursor = (cursor + 1) % ARRAY_COUNT(gVramGraphicsCopyQueue);
+#define INC_GRAPHICS_QUEUE_CURSOR(cursor) cursor = (cursor + 1) % ARRAY_COUNT(gVramGraphicsCopyQueue);
 
-#define ADD_TO_GRAPHICS_QUEUE(gfx)                                                      \
-    gVramGraphicsCopyQueue[gVramGraphicsCopyQueueIndex] = gfx;                          \
-    /* Log has to happen before gVramGraphicsCopyQueueIndex increment */                \
-    GFX_QUEUE_LOG_ADD(gfx)                                                              \
+#define ADD_TO_GRAPHICS_QUEUE(gfx)                                                                                                         \
+    gVramGraphicsCopyQueue[gVramGraphicsCopyQueueIndex] = gfx;                                                                             \
+    /* Log has to happen before gVramGraphicsCopyQueueIndex increment */                                                                   \
+    GFX_QUEUE_LOG_ADD(gfx)                                                                                                                 \
     INC_GRAPHICS_QUEUE_CURSOR(gVramGraphicsCopyQueueIndex);
 
 extern u16 *gUnknown_030022AC;
diff --git a/include/game/enemies/balloon.h b/include/game/enemies/balloon.h
index 5853e99a9..3105a1d7c 100644
--- a/include/game/enemies/balloon.h
+++ b/include/game/enemies/balloon.h
@@ -4,7 +4,6 @@
 #include "global.h"
 #include "game/entity.h"
 
-void CreateEntity_Balloon(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                          u8 spriteY);
+void CreateEntity_Balloon(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY);
 
 #endif // GUARD_ENEMY_BALLOON_H
\ No newline at end of file
diff --git a/include/game/enemies/bullet_buzzer.h b/include/game/enemies/bullet_buzzer.h
index 376f304dd..df4301d61 100644
--- a/include/game/enemies/bullet_buzzer.h
+++ b/include/game/enemies/bullet_buzzer.h
@@ -4,7 +4,6 @@
 #include "global.h"
 #include "game/entity.h"
 
-void CreateEntity_BulletBuzzer(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                               u8 spriteY);
+void CreateEntity_BulletBuzzer(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY);
 
 #endif // GUARD_ENEMY_BULLET_BUZZER_H
\ No newline at end of file
diff --git a/include/game/enemies/buzzer.h b/include/game/enemies/buzzer.h
index 8394813dc..d724bd2c8 100644
--- a/include/game/enemies/buzzer.h
+++ b/include/game/enemies/buzzer.h
@@ -4,7 +4,6 @@
 #include "global.h"
 #include "game/entity.h"
 
-void CreateEntity_Buzzer(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                         u8 spriteY);
+void CreateEntity_Buzzer(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY);
 
 #endif // GUARD_ENEMY_BUZZER_H
\ No newline at end of file
diff --git a/include/game/enemies/circus.h b/include/game/enemies/circus.h
index 296910489..93d30b9a7 100644
--- a/include/game/enemies/circus.h
+++ b/include/game/enemies/circus.h
@@ -4,7 +4,6 @@
 #include "global.h"
 #include "game/entity.h"
 
-void CreateEntity_Circus(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                         u8 spriteY);
+void CreateEntity_Circus(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY);
 
 #endif // GUARD_ENEMY_CIRCUS_H
\ No newline at end of file
diff --git a/include/game/enemies/flickey.h b/include/game/enemies/flickey.h
index eaba4f079..ae0daf969 100644
--- a/include/game/enemies/flickey.h
+++ b/include/game/enemies/flickey.h
@@ -4,7 +4,6 @@
 #include "global.h"
 #include "game/entity.h"
 
-void CreateEntity_Flickey(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                          u8 spriteY);
+void CreateEntity_Flickey(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY);
 
 #endif // GUARD_ENEMY_FLICKEY_H
diff --git a/include/game/enemies/geji_geji.h b/include/game/enemies/geji_geji.h
index 3445b0c00..8d326843f 100644
--- a/include/game/enemies/geji_geji.h
+++ b/include/game/enemies/geji_geji.h
@@ -4,7 +4,6 @@
 #include "global.h"
 #include "game/entity.h"
 
-void CreateEntity_GejiGeji(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                           u8 spriteY);
+void CreateEntity_GejiGeji(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY);
 
 #endif // GUARD_ENEMY_GEJI_GEJI_H
\ No newline at end of file
diff --git a/include/game/enemies/hammerhead.h b/include/game/enemies/hammerhead.h
index 76456bb8d..8ccb9d491 100644
--- a/include/game/enemies/hammerhead.h
+++ b/include/game/enemies/hammerhead.h
@@ -4,7 +4,6 @@
 #include "global.h"
 #include "game/entity.h"
 
-void CreateEntity_Hammerhead(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                             u8 spriteY);
+void CreateEntity_Hammerhead(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY);
 
 #endif // GUARD_ENEMY_HAMMERHEAD_H
\ No newline at end of file
diff --git a/include/game/enemies/kubinaga.h b/include/game/enemies/kubinaga.h
index f85a692ad..f5e83225a 100644
--- a/include/game/enemies/kubinaga.h
+++ b/include/game/enemies/kubinaga.h
@@ -4,7 +4,6 @@
 #include "global.h"
 #include "game/entity.h"
 
-void CreateEntity_Kubinaga(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                           u8 spriteY);
+void CreateEntity_Kubinaga(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY);
 
 #endif // GUARD_ENEMY_KUBINAGA_H
\ No newline at end of file
diff --git a/include/game/enemies/kura_kura.h b/include/game/enemies/kura_kura.h
index d7bf5161f..30ef734bd 100644
--- a/include/game/enemies/kura_kura.h
+++ b/include/game/enemies/kura_kura.h
@@ -4,7 +4,6 @@
 #include "global.h"
 #include "game/entity.h"
 
-void CreateEntity_KuraKura(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                           u8 spriteY);
+void CreateEntity_KuraKura(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY);
 
 #endif // GUARD_ENEMY_KURA_KURA_H
\ No newline at end of file
diff --git a/include/game/enemies/madillo.h b/include/game/enemies/madillo.h
index eb763c7d6..c8831dfaa 100644
--- a/include/game/enemies/madillo.h
+++ b/include/game/enemies/madillo.h
@@ -4,7 +4,6 @@
 #include "global.h"
 #include "game/entity.h"
 
-void CreateEntity_Madillo(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                          u8 spriteY);
+void CreateEntity_Madillo(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY);
 
 #endif // GUARD_ENEMY_MADILLO_H
\ No newline at end of file
diff --git a/include/game/enemies/piko_piko.h b/include/game/enemies/piko_piko.h
index 5a36ddebc..d69241a7b 100644
--- a/include/game/enemies/piko_piko.h
+++ b/include/game/enemies/piko_piko.h
@@ -4,7 +4,6 @@
 #include "global.h"
 #include "game/entity.h"
 
-void CreateEntity_PikoPiko(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                           u8 spriteY);
+void CreateEntity_PikoPiko(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY);
 
 #endif // GUARD_ENEMY_PIKO_PIKO_H
\ No newline at end of file
diff --git a/include/game/enemies/spinner.h b/include/game/enemies/spinner.h
index 4dda98994..336bdf9f6 100644
--- a/include/game/enemies/spinner.h
+++ b/include/game/enemies/spinner.h
@@ -4,7 +4,6 @@
 #include "global.h"
 #include "game/entity.h"
 
-void CreateEntity_Spinner(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                          u8 spriteY);
+void CreateEntity_Spinner(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY);
 
 #endif // GUARD_ENEMY_SPINNER_H
diff --git a/include/game/entity.h b/include/game/entity.h
index 12f52b108..7312e31c3 100644
--- a/include/game/entity.h
+++ b/include/game/entity.h
@@ -70,174 +70,155 @@ u32 sub_800DF38(Sprite *, s32, s32, Player *);
 #define MAP_ENTITY_STATE_MINUS_THREE (-3)
 
 // TODO: Find a way to simplify/remove this macro!
-#define SET_MAP_ENTITY_INITIALIZED(mapEnt)                                              \
-    {                                                                                   \
-        s32 negativeTwo;                                                                \
-        s16 forMatching;                                                                \
-        negativeTwo = MAP_ENTITY_STATE_INITIALIZED;                                     \
-        forMatching = negativeTwo;                                                      \
-        mapEnt->x = forMatching;                                                        \
+#define SET_MAP_ENTITY_INITIALIZED(mapEnt)                                                                                                 \
+    {                                                                                                                                      \
+        s32 negativeTwo;                                                                                                                   \
+        s16 forMatching;                                                                                                                   \
+        negativeTwo = MAP_ENTITY_STATE_INITIALIZED;                                                                                        \
+        forMatching = negativeTwo;                                                                                                         \
+        mapEnt->x = forMatching;                                                                                                           \
     }
 
-#define SET_MAP_ENTITY_NOT_INITIALIZED(mapEnt, initialX)                                \
-    {                                                                                   \
-        mapEnt->x = initialX;                                                           \
+#define SET_MAP_ENTITY_NOT_INITIALIZED(mapEnt, initialX)                                                                                   \
+    {                                                                                                                                      \
+        mapEnt->x = initialX;                                                                                                              \
     }
 
 // Used by Enemies that do not appear in EASY-mode
-#define DIFFICULTY_LEVEL_IS_NOT_EASY                                                    \
-    (gGameMode == GAME_MODE_TIME_ATTACK || gDifficultyLevel != DIFFICULTY_EASY)
+#define DIFFICULTY_LEVEL_IS_NOT_EASY (gGameMode == GAME_MODE_TIME_ATTACK || gDifficultyLevel != DIFFICULTY_EASY)
 
 // Used for bosses
-#define DIFFICULTY_BOSS_IS_NOT_NORMAL                                                   \
-    (gDifficultyLevel != DIFFICULTY_NORMAL && gGameMode != GAME_MODE_BOSS_TIME_ATTACK)
+#define DIFFICULTY_BOSS_IS_NOT_NORMAL (gDifficultyLevel != DIFFICULTY_NORMAL && gGameMode != GAME_MODE_BOSS_TIME_ATTACK)
 
-#define DIFFICULTY_LEVEL_IS_NOT_EASY_AND_ZONE_IS_NOT_1                                  \
-    (gGameMode == GAME_MODE_TIME_ATTACK || gCurrentLevel > 3                            \
-     || gDifficultyLevel != DIFFICULTY_EASY)
+#define DIFFICULTY_LEVEL_IS_NOT_EASY_AND_ZONE_IS_NOT_1                                                                                     \
+    (gGameMode == GAME_MODE_TIME_ATTACK || gCurrentLevel > 3 || gDifficultyLevel != DIFFICULTY_EASY)
 
-#define ENEMY_SET_SPAWN_POS_STATIC(_enemy, _mapEntity)                                  \
-    _enemy->spawnX = Q(TO_WORLD_POS(_mapEntity->x, spriteRegionX));                     \
+#define ENEMY_SET_SPAWN_POS_STATIC(_enemy, _mapEntity)                                                                                     \
+    _enemy->spawnX = Q(TO_WORLD_POS(_mapEntity->x, spriteRegionX));                                                                        \
     _enemy->spawnY = Q(TO_WORLD_POS(_mapEntity->y, spriteRegionY));
 
-#define ENEMY_SET_SPAWN_POS_FLYING(_enemy, _mapEntity)                                  \
-    ENEMY_SET_SPAWN_POS_STATIC(_enemy, _mapEntity);                                     \
-    _enemy->offsetX = 0;                                                                \
+#define ENEMY_SET_SPAWN_POS_FLYING(_enemy, _mapEntity)                                                                                     \
+    ENEMY_SET_SPAWN_POS_STATIC(_enemy, _mapEntity);                                                                                        \
+    _enemy->offsetX = 0;                                                                                                                   \
     _enemy->offsetY = 0;
 
-#define ENEMY_SET_SPAWN_POS_GROUND(_enemy, _mapEntity)                                  \
-    ENEMY_SET_SPAWN_POS_STATIC(_enemy, _mapEntity);                                     \
-    _enemy->offsetX = 0;                                                                \
-    _enemy->offsetY = Q(sub_801F07C(I(_enemy->spawnY), I(_enemy->spawnX),               \
-                                    _enemy->clampParam, 8, NULL, sub_801EE64));
+#define ENEMY_SET_SPAWN_POS_GROUND(_enemy, _mapEntity)                                                                                     \
+    ENEMY_SET_SPAWN_POS_STATIC(_enemy, _mapEntity);                                                                                        \
+    _enemy->offsetX = 0;                                                                                                                   \
+    _enemy->offsetY = Q(sub_801F07C(I(_enemy->spawnY), I(_enemy->spawnX), _enemy->clampParam, 8, NULL, sub_801EE64));
 
-#define ENEMY_UPDATE_EX_RAW(_s, _posX, _posY, code_insert)                              \
-    Player_UpdateHomingPosition(_posX, _posY);                                          \
-    { code_insert };                                                                    \
-    UpdateSpriteAnimation(_s);                                                          \
+#define ENEMY_UPDATE_EX_RAW(_s, _posX, _posY, code_insert)                                                                                 \
+    Player_UpdateHomingPosition(_posX, _posY);                                                                                             \
+    { code_insert };                                                                                                                       \
+    UpdateSpriteAnimation(_s);                                                                                                             \
     DisplaySprite(_s);
 
-#define ENEMY_UPDATE_EX(_s, _posX, _posY, code_insert)                                  \
-    ENEMY_UPDATE_EX_RAW(_s, QS(_posX), QS(_posY), code_insert);
+#define ENEMY_UPDATE_EX(_s, _posX, _posY, code_insert) ENEMY_UPDATE_EX_RAW(_s, QS(_posX), QS(_posY), code_insert);
 
 #define ENEMY_UPDATE(_s, _posX, _posY) ENEMY_UPDATE_EX(_s, _posX, _posY, {});
 
-#define ENEMY_UPDATE_POSITION_RAW(_enemy, _sprite, _posX, _posY, _offsetX, _offsetY)    \
-    _posX = I(_enemy->spawnX + _offsetX);                                               \
-    _posY = I(_enemy->spawnY + _offsetY);                                               \
-    _sprite->x = _posX - gCamera.x;                                                     \
+#define ENEMY_UPDATE_POSITION_RAW(_enemy, _sprite, _posX, _posY, _offsetX, _offsetY)                                                       \
+    _posX = I(_enemy->spawnX + _offsetX);                                                                                                  \
+    _posY = I(_enemy->spawnY + _offsetY);                                                                                                  \
+    _sprite->x = _posX - gCamera.x;                                                                                                        \
     _sprite->y = _posY - gCamera.y;
 
-#define ENEMY_UPDATE_POSITION(_enemy, _sprite, _posX, _posY)                            \
-    ENEMY_UPDATE_POSITION_RAW(_enemy, _sprite, _posX, _posY, _enemy->offsetX,           \
-                              _enemy->offsetY)
+#define ENEMY_UPDATE_POSITION(_enemy, _sprite, _posX, _posY)                                                                               \
+    ENEMY_UPDATE_POSITION_RAW(_enemy, _sprite, _posX, _posY, _enemy->offsetX, _enemy->offsetY)
 
-#define ENEMY_UPDATE_POSITION_STATIC(_enemy, _sprite, _posX, _posY)                     \
-    ENEMY_UPDATE_POSITION_RAW(_enemy, _sprite, _posX, _posY, 0, 0)
+#define ENEMY_UPDATE_POSITION_STATIC(_enemy, _sprite, _posX, _posY) ENEMY_UPDATE_POSITION_RAW(_enemy, _sprite, _posX, _posY, 0, 0)
 
-#define ENEMY_TURN_TO_PLAYER(_posX, s)                                                  \
-    if (gPlayer.x < _posX) {                                                            \
-        SPRITE_FLAG_CLEAR(s, X_FLIP);                                                   \
-    } else {                                                                            \
-        SPRITE_FLAG_SET(s, X_FLIP);                                                     \
+#define ENEMY_TURN_TO_PLAYER(_posX, s)                                                                                                     \
+    if (gPlayer.x < _posX) {                                                                                                               \
+        SPRITE_FLAG_CLEAR(s, X_FLIP);                                                                                                      \
+    } else {                                                                                                                               \
+        SPRITE_FLAG_SET(s, X_FLIP);                                                                                                        \
     }
 
-#define ENEMY_TURN_AROUND(_s)                                                           \
-    if (_s->frameFlags & SPRITE_FLAG_MASK_X_FLIP) {                                     \
-        SPRITE_FLAG_CLEAR(_s, X_FLIP);                                                  \
-    } else {                                                                            \
-        SPRITE_FLAG_SET(_s, X_FLIP);                                                    \
+#define ENEMY_TURN_AROUND(_s)                                                                                                              \
+    if (_s->frameFlags & SPRITE_FLAG_MASK_X_FLIP) {                                                                                        \
+        SPRITE_FLAG_CLEAR(_s, X_FLIP);                                                                                                     \
+    } else {                                                                                                                               \
+        SPRITE_FLAG_SET(_s, X_FLIP);                                                                                                       \
     }
 
-#define ENEMY_CROSSED_LEFT_BORDER(_enemy, _mapEntity)                                   \
-    ((I(_enemy->offsetX) <= _mapEntity->d.sData[0] * TILE_WIDTH))
+#define ENEMY_CROSSED_LEFT_BORDER(_enemy, _mapEntity) ((I(_enemy->offsetX) <= _mapEntity->d.sData[0] * TILE_WIDTH))
 
-#define ENEMY_CROSSED_RIGHT_BORDER(_enemy, _mapEntity)                                  \
-    ((I(_enemy->offsetX)                                                                \
-      >= (_mapEntity->d.sData[0] * TILE_WIDTH + _mapEntity->d.uData[2] * TILE_WIDTH)))
+#define ENEMY_CROSSED_RIGHT_BORDER(_enemy, _mapEntity)                                                                                     \
+    ((I(_enemy->offsetX) >= (_mapEntity->d.sData[0] * TILE_WIDTH + _mapEntity->d.uData[2] * TILE_WIDTH)))
 
-#define ENEMY_CROSSED_TOP_BORDER_RAW(_enemy, _mapEntity, _offsetY)                      \
-    ((_offsetY <= _mapEntity->d.sData[1] * TILE_WIDTH))
+#define ENEMY_CROSSED_TOP_BORDER_RAW(_enemy, _mapEntity, _offsetY) ((_offsetY <= _mapEntity->d.sData[1] * TILE_WIDTH))
 
-#define ENEMY_CROSSED_TOP_BORDER(_enemy, _mapEntity)                                    \
-    ENEMY_CROSSED_TOP_BORDER_RAW(_enemy, _mapEntity, I(_enemy->offsetY))
+#define ENEMY_CROSSED_TOP_BORDER(_enemy, _mapEntity) ENEMY_CROSSED_TOP_BORDER_RAW(_enemy, _mapEntity, I(_enemy->offsetY))
 
-#define ENEMY_CROSSED_BOTTOM_BORDER_RAW(_enemy, _mapEntity, _offsetY)                   \
-    ((_offsetY                                                                          \
-      >= (_mapEntity->d.sData[1] * TILE_WIDTH + _mapEntity->d.uData[3] * TILE_WIDTH)))
+#define ENEMY_CROSSED_BOTTOM_BORDER_RAW(_enemy, _mapEntity, _offsetY)                                                                      \
+    ((_offsetY >= (_mapEntity->d.sData[1] * TILE_WIDTH + _mapEntity->d.uData[3] * TILE_WIDTH)))
 
-#define ENEMY_CROSSED_BOTTOM_BORDER(_enemy, _mapEntity)                                 \
-    ENEMY_CROSSED_BOTTOM_BORDER_RAW(_enemy, _mapEntity, I(_enemy->offsetY))
+#define ENEMY_CROSSED_BOTTOM_BORDER(_enemy, _mapEntity) ENEMY_CROSSED_BOTTOM_BORDER_RAW(_enemy, _mapEntity, I(_enemy->offsetY))
 
-#define ENEMY_CLAMP_TO_GROUND_INNER(_enemy, _unknownBool, _task)                        \
-    sub_801F100(I(_enemy->spawnY + _enemy->offsetY),                                    \
-                I(_enemy->spawnX + _enemy->offsetX), _unknownBool, 8, _task);
+#define ENEMY_CLAMP_TO_GROUND_INNER(_enemy, _unknownBool, _task)                                                                           \
+    sub_801F100(I(_enemy->spawnY + _enemy->offsetY), I(_enemy->spawnX + _enemy->offsetX), _unknownBool, 8, _task);
 
-#define ENEMY_CLAMP_TO_GROUND_INNER_X_FIRST(_enemy, _unknownBool)                       \
-    sub_801F100(I(_enemy->spawnX + _enemy->offsetX),                                    \
-                I(_enemy->spawnY + _enemy->offsetY), _unknownBool, 8, sub_801EC3C);
+#define ENEMY_CLAMP_TO_GROUND_INNER_X_FIRST(_enemy, _unknownBool)                                                                          \
+    sub_801F100(I(_enemy->spawnX + _enemy->offsetX), I(_enemy->spawnY + _enemy->offsetY), _unknownBool, 8, sub_801EC3C);
 
-#define ENEMY_CLAMP_TO_GROUND_RAW(_enemy, _unknownBool, _p)                             \
-    {                                                                                   \
-        s32 delta = sub_801F07C(I(_enemy->spawnY + _enemy->offsetY),                    \
-                                I(_enemy->spawnX + _enemy->offsetX), _unknownBool, 8,   \
-                                _p, sub_801EE64);                                       \
-                                                                                        \
-        if (delta < 0) {                                                                \
-            _enemy->offsetY += Q(delta);                                                \
-            delta = ENEMY_CLAMP_TO_GROUND_INNER(_enemy, _unknownBool, sub_801EC3C);     \
-        }                                                                               \
-                                                                                        \
-        if (delta > 0) {                                                                \
-            _enemy->offsetY += Q(delta);                                                \
-        }                                                                               \
+#define ENEMY_CLAMP_TO_GROUND_RAW(_enemy, _unknownBool, _p)                                                                                \
+    {                                                                                                                                      \
+        s32 delta                                                                                                                          \
+            = sub_801F07C(I(_enemy->spawnY + _enemy->offsetY), I(_enemy->spawnX + _enemy->offsetX), _unknownBool, 8, _p, sub_801EE64);     \
+                                                                                                                                           \
+        if (delta < 0) {                                                                                                                   \
+            _enemy->offsetY += Q(delta);                                                                                                   \
+            delta = ENEMY_CLAMP_TO_GROUND_INNER(_enemy, _unknownBool, sub_801EC3C);                                                        \
+        }                                                                                                                                  \
+                                                                                                                                           \
+        if (delta > 0) {                                                                                                                   \
+            _enemy->offsetY += Q(delta);                                                                                                   \
+        }                                                                                                                                  \
     }
 
-#define ENEMY_CLAMP_TO_GROUND(_enemy, _unknownBool)                                     \
-    ENEMY_CLAMP_TO_GROUND_RAW(_enemy, _unknownBool, NULL)
+#define ENEMY_CLAMP_TO_GROUND(_enemy, _unknownBool) ENEMY_CLAMP_TO_GROUND_RAW(_enemy, _unknownBool, NULL)
 
-#define ENEMY_CLAMP_TO_GROUND_2(_enemy, _unknownBool)                                   \
-    {                                                                                   \
-        s32 delta = sub_801F07C(I(_enemy->spawnY + _enemy->offsetY),                    \
-                                I(_enemy->spawnX + _enemy->offsetX), _unknownBool, -8,  \
-                                NULL, sub_801EE64);                                     \
-                                                                                        \
-        if (delta < 0) {                                                                \
-            _enemy->offsetY -= Q(delta);                                                \
-            delta = ENEMY_CLAMP_TO_GROUND_INNER(_enemy, _unknownBool, sub_801EC3C);     \
-        }                                                                               \
-                                                                                        \
-        if (delta > 0) {                                                                \
-            _enemy->offsetY -= Q(delta);                                                \
-        }                                                                               \
+#define ENEMY_CLAMP_TO_GROUND_2(_enemy, _unknownBool)                                                                                      \
+    {                                                                                                                                      \
+        s32 delta                                                                                                                          \
+            = sub_801F07C(I(_enemy->spawnY + _enemy->offsetY), I(_enemy->spawnX + _enemy->offsetX), _unknownBool, -8, NULL, sub_801EE64);  \
+                                                                                                                                           \
+        if (delta < 0) {                                                                                                                   \
+            _enemy->offsetY -= Q(delta);                                                                                                   \
+            delta = ENEMY_CLAMP_TO_GROUND_INNER(_enemy, _unknownBool, sub_801EC3C);                                                        \
+        }                                                                                                                                  \
+                                                                                                                                           \
+        if (delta > 0) {                                                                                                                   \
+            _enemy->offsetY -= Q(delta);                                                                                                   \
+        }                                                                                                                                  \
     }
 
-#define ENEMY_DESTROY_IF_PLAYER_HIT(_s, _pos)                                           \
-    if (sub_800C4FC(_s, _pos.x, _pos.y, 0) == TRUE) {                                   \
-        TaskDestroy(gCurTask);                                                          \
-        return;                                                                         \
+#define ENEMY_DESTROY_IF_PLAYER_HIT(_s, _pos)                                                                                              \
+    if (sub_800C4FC(_s, _pos.x, _pos.y, 0) == TRUE) {                                                                                      \
+        TaskDestroy(gCurTask);                                                                                                             \
+        return;                                                                                                                            \
     }
 
-#define ENEMY_DESTROY_IF_PLAYER_HIT_2(_s, _pos)                                         \
-    if (sub_800C4FC(_s, _pos.x, _pos.y, 0)) {                                           \
-        TaskDestroy(gCurTask);                                                          \
-        return;                                                                         \
+#define ENEMY_DESTROY_IF_PLAYER_HIT_2(_s, _pos)                                                                                            \
+    if (sub_800C4FC(_s, _pos.x, _pos.y, 0)) {                                                                                              \
+        TaskDestroy(gCurTask);                                                                                                             \
+        return;                                                                                                                            \
     }
 
-#define ENEMY_DESTROY_IF_OUT_OF_CAM_RANGE(_enemy, _mapEntity, _sprite)                  \
-    if (IS_OUT_OF_CAM_RANGE(_sprite->x, _sprite->y)) {                                  \
-        SET_MAP_ENTITY_NOT_INITIALIZED(_mapEntity, _enemy->base.spriteX);               \
-        TaskDestroy(gCurTask);                                                          \
-        return;                                                                         \
+#define ENEMY_DESTROY_IF_OUT_OF_CAM_RANGE(_enemy, _mapEntity, _sprite)                                                                     \
+    if (IS_OUT_OF_CAM_RANGE(_sprite->x, _sprite->y)) {                                                                                     \
+        SET_MAP_ENTITY_NOT_INITIALIZED(_mapEntity, _enemy->base.spriteX);                                                                  \
+        TaskDestroy(gCurTask);                                                                                                             \
+        return;                                                                                                                            \
     }
 
-#define ENEMY_DESTROY_IF_OFFSCREEN_RAW(_enemy, _mapEntity, _sprite, _posX, _posY)       \
-    if (IS_OUT_OF_DISPLAY_RANGE(_posX, _posY)) {                                        \
-        ENEMY_DESTROY_IF_OUT_OF_CAM_RANGE(_enemy, _mapEntity, _sprite);                 \
+#define ENEMY_DESTROY_IF_OFFSCREEN_RAW(_enemy, _mapEntity, _sprite, _posX, _posY)                                                          \
+    if (IS_OUT_OF_DISPLAY_RANGE(_posX, _posY)) {                                                                                           \
+        ENEMY_DESTROY_IF_OUT_OF_CAM_RANGE(_enemy, _mapEntity, _sprite);                                                                    \
     }
 
-#define ENEMY_DESTROY_IF_OFFSCREEN(_enemy, _mapEntity, _sprite)                         \
-    ENEMY_DESTROY_IF_OFFSCREEN_RAW(_enemy, _mapEntity, _sprite, I(_enemy->spawnX),      \
-                                   I(_enemy->spawnY))
+#define ENEMY_DESTROY_IF_OFFSCREEN(_enemy, _mapEntity, _sprite)                                                                            \
+    ENEMY_DESTROY_IF_OFFSCREEN_RAW(_enemy, _mapEntity, _sprite, I(_enemy->spawnX), I(_enemy->spawnY))
 
 #endif // GUARD_INTERACTABLE_H
diff --git a/include/game/interactables_2/hot_crater/dash_ring.h b/include/game/interactables_2/hot_crater/dash_ring.h
index 01b99efc9..e515b1af7 100644
--- a/include/game/interactables_2/hot_crater/dash_ring.h
+++ b/include/game/interactables_2/hot_crater/dash_ring.h
@@ -49,7 +49,6 @@ typedef struct {
     /* 0x7D */ u8 spriteY;
 } Sprite_DashRing; /* size: 0x80 */
 
-void CreateEntity_DashRing(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                           u8 spriteY);
+void CreateEntity_DashRing(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY);
 
 #endif // GUARD_IA_DASH_RING_H
\ No newline at end of file
diff --git a/include/game/interactables_2/hot_crater/floating_spring.h b/include/game/interactables_2/hot_crater/floating_spring.h
index 0a75d92f0..be6172de2 100644
--- a/include/game/interactables_2/hot_crater/floating_spring.h
+++ b/include/game/interactables_2/hot_crater/floating_spring.h
@@ -4,7 +4,6 @@
 #include "global.h"
 #include "game/entity.h"
 
-void CreateEntity_FloatingSpring_Up(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                    u8 spriteY);
+void CreateEntity_FloatingSpring_Up(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY);
 
 #endif
diff --git a/include/game/interactables_2/music_plant/pipe_horn.h b/include/game/interactables_2/music_plant/pipe_horn.h
index 343a5ad0b..54c25de13 100644
--- a/include/game/interactables_2/music_plant/pipe_horn.h
+++ b/include/game/interactables_2/music_plant/pipe_horn.h
@@ -4,10 +4,8 @@
 #include "global.h"
 #include "game/entity.h"
 
-void CreateEntity_PipeInstrument_Entry(MapEntity *me, u16 spriteRegionX,
-                                       u16 spriteRegionY, u8 spriteY);
-void CreateEntity_FrenchHorn_Entry(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                   u8 spriteY);
+void CreateEntity_PipeInstrument_Entry(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY);
+void CreateEntity_FrenchHorn_Entry(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY);
 
 typedef struct {
     /* 0x00 */ s32 x0;
diff --git a/include/game/interactables_2/techno_base/bounce_block.h b/include/game/interactables_2/techno_base/bounce_block.h
index ce6a063f8..23210a143 100644
--- a/include/game/interactables_2/techno_base/bounce_block.h
+++ b/include/game/interactables_2/techno_base/bounce_block.h
@@ -4,7 +4,6 @@
 #include "global.h"
 #include "game/entity.h"
 
-void CreateEntity_NoteBlock(MapEntity *ia, u16 spriteRegionX, u16 spriteRegionY,
-                            u8 spriteY);
+void CreateEntity_NoteBlock(MapEntity *ia, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY);
 
 #endif
diff --git a/include/game/interactables_2/techno_base/light_bridge.h b/include/game/interactables_2/techno_base/light_bridge.h
index 536adc803..418e7395b 100644
--- a/include/game/interactables_2/techno_base/light_bridge.h
+++ b/include/game/interactables_2/techno_base/light_bridge.h
@@ -13,7 +13,6 @@
 #include "global.h"
 #include "game/entity.h"
 
-void CreateEntity_LightBridge(MapEntity *ia, u16 spriteRegionX, u16 spriteRegionY,
-                              u8 spriteY);
+void CreateEntity_LightBridge(MapEntity *ia, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY);
 
 #endif
diff --git a/include/game/math.h b/include/game/math.h
index 76ba043d1..5c0dd6aa1 100644
--- a/include/game/math.h
+++ b/include/game/math.h
@@ -43,17 +43,17 @@ u16 Random(void);
 // Returns a 32-bit pseudorandom number
 #define Random32() ((Random() << 16) | Random())
 
-#define ShuffleRngSeed()                                                                \
-    ({                                                                                  \
-        u32 rand1, rand2, rand3;                                                        \
-        rand1 ^= (Random() << 16);                                                      \
-        rand1 ^= Random();                                                              \
-        rand3 ^= rand1;                                                                 \
-        SeedRng(rand2, rand3);                                                          \
-        rand1 ^= (Random() << 16);                                                      \
-        rand1 ^= Random();                                                              \
-        rand2 ^= rand1;                                                                 \
-        SeedRng(rand2, rand3);                                                          \
+#define ShuffleRngSeed()                                                                                                                   \
+    ({                                                                                                                                     \
+        u32 rand1, rand2, rand3;                                                                                                           \
+        rand1 ^= (Random() << 16);                                                                                                         \
+        rand1 ^= Random();                                                                                                                 \
+        rand3 ^= rand1;                                                                                                                    \
+        SeedRng(rand2, rand3);                                                                                                             \
+        rand1 ^= (Random() << 16);                                                                                                         \
+        rand1 ^= Random();                                                                                                                 \
+        rand2 ^= rand1;                                                                                                                    \
+        SeedRng(rand2, rand3);                                                                                                             \
     })
 
 // Sets the initial seed values of the pseudorandom number generator
diff --git a/include/game/multiplayer/multipak_connection.h b/include/game/multiplayer/multipak_connection.h
index 851128111..68a79b844 100644
--- a/include/game/multiplayer/multipak_connection.h
+++ b/include/game/multiplayer/multipak_connection.h
@@ -12,27 +12,25 @@ void StartMultiPakConnect(void);
 void MultiPakCommunicationError(void);
 
 // TOOD: MultiSioHeartBeat
-#define MultiPakHeartbeat()                                                             \
-    ({                                                                                  \
-        if (IS_MULTI_PLAYER) {                                                          \
-            u32 i;                                                                      \
-            for (i = 0;                                                                 \
-                 i < MULTI_SIO_PLAYERS_MAX && GetBit(gMultiplayerConnections, i);       \
-                 i++) {                                                                 \
-                if (!(gMultiSioStatusFlags & MULTI_SIO_RECV_ID(i))) {                   \
-                    if (gMultiplayerMissingHeartbeats[i]++ > 0xB4) {                    \
-                        TasksDestroyAll();                                              \
-                        gUnknown_03002AE4 = gUnknown_0300287C;                          \
-                        gUnknown_03005390 = 0;                                          \
-                        gVramGraphicsCopyCursor = gVramGraphicsCopyQueueIndex;          \
-                        MultiPakCommunicationError();                                   \
-                        return;                                                         \
-                    }                                                                   \
-                } else {                                                                \
-                    gMultiplayerMissingHeartbeats[i] = 0;                               \
-                }                                                                       \
-            }                                                                           \
-        }                                                                               \
+#define MultiPakHeartbeat()                                                                                                                \
+    ({                                                                                                                                     \
+        if (IS_MULTI_PLAYER) {                                                                                                             \
+            u32 i;                                                                                                                         \
+            for (i = 0; i < MULTI_SIO_PLAYERS_MAX && GetBit(gMultiplayerConnections, i); i++) {                                            \
+                if (!(gMultiSioStatusFlags & MULTI_SIO_RECV_ID(i))) {                                                                      \
+                    if (gMultiplayerMissingHeartbeats[i]++ > 0xB4) {                                                                       \
+                        TasksDestroyAll();                                                                                                 \
+                        gUnknown_03002AE4 = gUnknown_0300287C;                                                                             \
+                        gUnknown_03005390 = 0;                                                                                             \
+                        gVramGraphicsCopyCursor = gVramGraphicsCopyQueueIndex;                                                             \
+                        MultiPakCommunicationError();                                                                                      \
+                        return;                                                                                                            \
+                    }                                                                                                                      \
+                } else {                                                                                                                   \
+                    gMultiplayerMissingHeartbeats[i] = 0;                                                                                  \
+                }                                                                                                                          \
+            }                                                                                                                              \
+        }                                                                                                                                  \
     })
 
 #endif // GUARD_MULTIPLAYER_MULTIPAK_CONNECTION_H
diff --git a/include/game/mystery_item_box.h b/include/game/mystery_item_box.h
index 2042fc745..ce58607e1 100644
--- a/include/game/mystery_item_box.h
+++ b/include/game/mystery_item_box.h
@@ -4,7 +4,6 @@
 #include "global.h"
 #include "game/entity.h"
 
-void CreateEntity_MysteryItemBox(MapEntity *ia, u16 spriteRegionX, u16 spriteRegionY,
-                                 u8 spriteY);
+void CreateEntity_MysteryItemBox(MapEntity *ia, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY);
 
 #endif // GUARD_MYSTERY_ITEM_BOX_H
diff --git a/include/game/options_screen.h b/include/game/options_screen.h
index 987f1870b..0a3392320 100644
--- a/include/game/options_screen.h
+++ b/include/game/options_screen.h
@@ -79,24 +79,20 @@ extern const u16 gUnknown_080D95C8[5];
 extern const u16 gUnknown_080D95D2[2];
 extern const u16 gUnknown_080D95D6[4][2];
 
-#define ResetProfileScreensVram()                                                       \
-    ({                                                                                  \
-        gProfileScreenNextVramAddress = (void *)OBJ_VRAM0;                              \
-        gProfileScreenSubMenuNextVramAddress = NULL;                                    \
+#define ResetProfileScreensVram()                                                                                                          \
+    ({                                                                                                                                     \
+        gProfileScreenNextVramAddress = (void *)OBJ_VRAM0;                                                                                 \
+        gProfileScreenSubMenuNextVramAddress = NULL;                                                                                       \
     })
 
-#define ResetProfileScreensSubMenuVram()                                                \
-    ({ gProfileScreenSubMenuNextVramAddress = NULL; })
+#define ResetProfileScreensSubMenuVram() ({ gProfileScreenSubMenuNextVramAddress = NULL; })
 
 void CreateOptionsScreen(u16);
-void CreateTimeAttackLevelSelectScreen(bool16 isBossView, s16 selectedCharacter,
-                                       s8 currentLevel);
+void CreateTimeAttackLevelSelectScreen(bool16 isBossView, s16 selectedCharacter, s8 currentLevel);
 void CreateNewProfileScreen(void);
 void CreateNewProfileNameScreen(s16 mode);
 
-void sub_806A568(Sprite *obj, s8 target, u32 size, u16 c, u32 assetId, s16 xPos,
-                 s16 yPos, u16 oamOrder, u8 variant, u8 palId);
-void OptionsInitBackground(Background *unk2400, u32 a, u32 b, u8 tilemapId, u16 d, u16 e,
-                           u16 f, u8 g, u16 scrollX, u16 scrollY);
+void sub_806A568(Sprite *obj, s8 target, u32 size, u16 c, u32 assetId, s16 xPos, s16 yPos, u16 oamOrder, u8 variant, u8 palId);
+void OptionsInitBackground(Background *unk2400, u32 a, u32 b, u8 tilemapId, u16 d, u16 e, u16 f, u8 g, u16 scrollX, u16 scrollY);
 
 #endif // GUARD_OPTION_SCREEN_H
diff --git a/include/game/save.h b/include/game/save.h
index ec5339eba..188cbb2e3 100644
--- a/include/game/save.h
+++ b/include/game/save.h
@@ -32,8 +32,7 @@ struct TimeRecords {
     u16 table[NUM_CHARACTERS][NUM_COURSE_ZONES][ACTS_PER_ZONE][TIME_RECORDS_PER_COURSE];
 };
 
-#define NUM_TIME_RECORD_ROWS                                                            \
-    (NUM_COURSE_ZONES * ACTS_PER_ZONE * NUM_CHARACTERS * TIME_RECORDS_PER_COURSE)
+#define NUM_TIME_RECORD_ROWS (NUM_COURSE_ZONES * ACTS_PER_ZONE * NUM_CHARACTERS * TIME_RECORDS_PER_COURSE)
 
 struct SaveGame {
     /* 0x000 */ u32 id;
diff --git a/include/game/special_stage/data.h b/include/game/special_stage/data.h
index a8989d896..71152df33 100644
--- a/include/game/special_stage/data.h
+++ b/include/game/special_stage/data.h
@@ -5,9 +5,9 @@
 #include "sprite.h" // for the 'AnimId' type
 #include "constants/zones.h"
 
-#define SPRITE_ARRAY_END                                                                \
-    {                                                                                   \
-        65535, 65535, 65535,                                                            \
+#define SPRITE_ARRAY_END                                                                                                                   \
+    {                                                                                                                                      \
+        65535, 65535, 65535,                                                                                                               \
     }
 
 struct UNK_8C878E8 {
diff --git a/include/game/special_stage/utils.h b/include/game/special_stage/utils.h
index 9daa2a2ab..9e8c6b7cc 100644
--- a/include/game/special_stage/utils.h
+++ b/include/game/special_stage/utils.h
@@ -14,13 +14,9 @@ extern void *gUnknown_03005B5C;
 #define RENDER_TARGET_SCREEN   0
 #define RENDER_TARGET_SUB_MENU 1
 
-void sub_806CA88(Sprite *obj, s8 target, u32 size, u16 c, u32 assetId, s16 xPos,
-                 s16 yPos, u16 g, u8 h, u8 palId);
-void sub_806CEC4(Background *background, u32 a, u32 b, u8 assetId, u16 d, u16 e, u16 f,
-                 u8 g, u16 scrollX, u16 scrollY);
-bool16 sub_806CB84(struct UNK_806CB84 *a,
-                   struct SpecialStageCollectables_UNK874_2 *unk874,
-                   struct SpecialStage *stage);
+void sub_806CA88(Sprite *obj, s8 target, u32 size, u16 c, u32 assetId, s16 xPos, s16 yPos, u16 g, u8 h, u8 palId);
+void sub_806CEC4(Background *background, u32 a, u32 b, u8 assetId, u16 d, u16 e, u16 f, u8 g, u16 scrollX, u16 scrollY);
+bool16 sub_806CB84(struct UNK_806CB84 *a, struct SpecialStageCollectables_UNK874_2 *unk874, struct SpecialStage *stage);
 void sub_806CD68(Sprite *element);
 void InitSpecialStageScreenVram(void);
 s16 MaxSpriteSize(const struct UNK_80DF670 *spriteConfig);
diff --git a/include/game/stage/player.h b/include/game/stage/player.h
index 81747aa09..5207d6e74 100644
--- a/include/game/stage/player.h
+++ b/include/game/stage/player.h
@@ -44,26 +44,25 @@ type8029A28 sub_8029A74(Player *player, u8 *p1, type8029A28 *out);
 
 bool32 sub_8029E6C(Player *);
 
-#define GET_CHARACTER_ANIM(player)                                                      \
-    (player->anim - gPlayerCharacterIdleAnims[player->character])
+#define GET_CHARACTER_ANIM(player) (player->anim - gPlayerCharacterIdleAnims[player->character])
 
 #define PLAYERFN_SET(proc)          gPlayer.callback = proc;
 #define PLAYERFN_CALL(proc, player) proc(player);
-#define PLAYERFN_SET_AND_CALL(proc, player)                                             \
-    {                                                                                   \
-        PLAYERFN_SET(proc);                                                             \
-        PLAYERFN_CALL(proc, player);                                                    \
+#define PLAYERFN_SET_AND_CALL(proc, player)                                                                                                \
+    {                                                                                                                                      \
+        PLAYERFN_SET(proc);                                                                                                                \
+        PLAYERFN_CALL(proc, player);                                                                                                       \
     }
 
-#define PLAYERFN_SET_SHIFT_OFFSETS(player, x, y)                                        \
-    {                                                                                   \
-        player->unk16 = x;                                                              \
-        player->unk17 = y;                                                              \
+#define PLAYERFN_SET_SHIFT_OFFSETS(player, x, y)                                                                                           \
+    {                                                                                                                                      \
+        player->unk16 = x;                                                                                                                 \
+        player->unk17 = y;                                                                                                                 \
     }
-#define PLAYERFN_CHANGE_SHIFT_OFFSETS(player, x, y)                                     \
-    {                                                                                   \
-        sub_8023B5C(player, y);                                                         \
-        PLAYERFN_SET_SHIFT_OFFSETS(player, x, y)                                        \
+#define PLAYERFN_CHANGE_SHIFT_OFFSETS(player, x, y)                                                                                        \
+    {                                                                                                                                      \
+        sub_8023B5C(player, y);                                                                                                            \
+        PLAYERFN_SET_SHIFT_OFFSETS(player, x, y)                                                                                           \
     }
 
 extern const u16 gUnknown_080D6736[][2];
diff --git a/include/game/stage/player_super_sonic.h b/include/game/stage/player_super_sonic.h
index 2da9c518f..cfe5e01d2 100644
--- a/include/game/stage/player_super_sonic.h
+++ b/include/game/stage/player_super_sonic.h
@@ -46,18 +46,18 @@ struct SuperSonic {
 
 #define SUPER_SONIC_AFTERIMAGE_COUNT 3
 
-#define SUPER_SWITCH_ANIM(_sonic, _tileInfoIndex)                                       \
-    {                                                                                   \
-        _sonic->tileInfoId = _tileInfoIndex;                                            \
-        _sonic->spr.graphics.anim = gAnims_SuperSonic_080D69C8[_tileInfoIndex].anim;    \
-        _sonic->spr.variant = gAnims_SuperSonic_080D69C8[_tileInfoIndex].variant;       \
-        _sonic->spr.prevVariant = -1;                                                   \
-        _sonic->spr.graphics.size = 0;                                                  \
-        _sonic->spr.animCursor = 0;                                                     \
-        _sonic->spr.timeUntilNextFrame = 0;                                             \
-        _sonic->unk10 = 0;                                                              \
-        _sonic->unk14 = 0;                                                              \
-        _sonic->unk22 = 0;                                                              \
+#define SUPER_SWITCH_ANIM(_sonic, _tileInfoIndex)                                                                                          \
+    {                                                                                                                                      \
+        _sonic->tileInfoId = _tileInfoIndex;                                                                                               \
+        _sonic->spr.graphics.anim = gAnims_SuperSonic_080D69C8[_tileInfoIndex].anim;                                                       \
+        _sonic->spr.variant = gAnims_SuperSonic_080D69C8[_tileInfoIndex].variant;                                                          \
+        _sonic->spr.prevVariant = -1;                                                                                                      \
+        _sonic->spr.graphics.size = 0;                                                                                                     \
+        _sonic->spr.animCursor = 0;                                                                                                        \
+        _sonic->spr.timeUntilNextFrame = 0;                                                                                                \
+        _sonic->unk10 = 0;                                                                                                                 \
+        _sonic->unk14 = 0;                                                                                                                 \
+        _sonic->unk22 = 0;                                                                                                                 \
     }
 
 extern void SuperSonicInit(void);
diff --git a/include/global.h b/include/global.h
index bb2c2cda2..d899b2dbd 100644
--- a/include/global.h
+++ b/include/global.h
@@ -28,7 +28,7 @@ typedef void (*VoidFn)(void);
 #ifdef NON_MATCHING
 #define ASM_FUNC(path, decl)
 #else
-#define ASM_FUNC(path, decl)                                                            \
+#define ASM_FUNC(path, decl)                                                                                                               \
     NAKED decl { asm(".include " #path); }
 #endif
 
@@ -36,10 +36,10 @@ typedef void (*VoidFn)(void);
 #define NONMATCH(path, decl) decl
 #define END_NONMATCH
 #else
-#define NONMATCH(path, decl)                                                            \
-    NAKED decl                                                                          \
-    {                                                                                   \
-        asm(".include " #path);                                                         \
+#define NONMATCH(path, decl)                                                                                                               \
+    NAKED decl                                                                                                                             \
+    {                                                                                                                                      \
+        asm(".include " #path);                                                                                                            \
         if (0)
 #define END_NONMATCH }
 #endif
@@ -49,9 +49,9 @@ typedef void (*VoidFn)(void);
 // We define these when using certain IDEs to fool preproc
 #define _(x)  (x)
 #define __(x) (x)
-#define INCBIN(...)                                                                     \
-    {                                                                                   \
-        0                                                                               \
+#define INCBIN(...)                                                                                                                        \
+    {                                                                                                                                      \
+        0                                                                                                                                  \
     }
 #define INCBIN_U8  INCBIN
 #define INCBIN_U16 INCBIN
@@ -141,58 +141,58 @@ typedef void (*VoidFn)(void);
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
 #define MAX(a, b) (((a) > (b)) ? (a) : (b))
 
-#define CLAMP(value, min, max)                                                          \
-    ({                                                                                  \
-        s32 clamped;                                                                    \
-        if ((value) < (min)) {                                                          \
-            clamped = (min);                                                            \
-        } else {                                                                        \
-            clamped = (value) > (max) ? (max) : (value);                                \
-        }                                                                               \
-        clamped;                                                                        \
+#define CLAMP(value, min, max)                                                                                                             \
+    ({                                                                                                                                     \
+        s32 clamped;                                                                                                                       \
+        if ((value) < (min)) {                                                                                                             \
+            clamped = (min);                                                                                                               \
+        } else {                                                                                                                           \
+            clamped = (value) > (max) ? (max) : (value);                                                                                   \
+        }                                                                                                                                  \
+        clamped;                                                                                                                           \
     })
 
-#define CLAMP_T(type, value, min, max)                                                  \
-    ({                                                                                  \
-        type clamped;                                                                   \
-        if ((value) >= (min)) {                                                         \
-            clamped = (value) > (max) ? (max) : (value);                                \
-        } else {                                                                        \
-            clamped = (min);                                                            \
-        }                                                                               \
-        clamped;                                                                        \
+#define CLAMP_T(type, value, min, max)                                                                                                     \
+    ({                                                                                                                                     \
+        type clamped;                                                                                                                      \
+        if ((value) >= (min)) {                                                                                                            \
+            clamped = (value) > (max) ? (max) : (value);                                                                                   \
+        } else {                                                                                                                           \
+            clamped = (min);                                                                                                               \
+        }                                                                                                                                  \
+        clamped;                                                                                                                           \
     })
 
 #define CLAMP_16(value, min, max) CLAMP_T(s16, value, min, max)
 #define CLAMP_32(value, min, max) CLAMP_T(s32, value, min, max)
 
-#define CLAMP_INLINE(var, min, max)                                                     \
-    ({                                                                                  \
-        if ((var) < (min)) {                                                            \
-            var = (min);                                                                \
-        } else if ((var) > (max)) {                                                     \
-            var = (max);                                                                \
-        }                                                                               \
+#define CLAMP_INLINE(var, min, max)                                                                                                        \
+    ({                                                                                                                                     \
+        if ((var) < (min)) {                                                                                                               \
+            var = (min);                                                                                                                   \
+        } else if ((var) > (max)) {                                                                                                        \
+            var = (max);                                                                                                                   \
+        }                                                                                                                                  \
     })
 
-#define CLAMP_INLINE_NO_ELSE(var, min, max)                                             \
-    ({                                                                                  \
-        if ((var) < (min)) {                                                            \
-            var = (min);                                                                \
-        }                                                                               \
-                                                                                        \
-        if ((var) > (max)) {                                                            \
-            var = (max);                                                                \
-        }                                                                               \
+#define CLAMP_INLINE_NO_ELSE(var, min, max)                                                                                                \
+    ({                                                                                                                                     \
+        if ((var) < (min)) {                                                                                                               \
+            var = (min);                                                                                                                   \
+        }                                                                                                                                  \
+                                                                                                                                           \
+        if ((var) > (max)) {                                                                                                               \
+            var = (max);                                                                                                                   \
+        }                                                                                                                                  \
     })
 
-#define CLAMP_INLINE2(var, min, max)                                                    \
-    ({                                                                                  \
-        if ((var) > (max)) {                                                            \
-            var = (max);                                                                \
-        } else if ((var) < (min)) {                                                     \
-            var = (min);                                                                \
-        }                                                                               \
+#define CLAMP_INLINE2(var, min, max)                                                                                                       \
+    ({                                                                                                                                     \
+        if ((var) > (max)) {                                                                                                               \
+            var = (max);                                                                                                                   \
+        } else if ((var) < (min)) {                                                                                                        \
+            var = (min);                                                                                                                   \
+        }                                                                                                                                  \
     })
 
 #define ABS(aValue) ((aValue) >= 0 ? (aValue) : -(aValue))
@@ -206,22 +206,22 @@ typedef void (*VoidFn)(void);
 #define GBA_FRAMES_PER_SECOND 60
 
 // TODO: fix casts here(?)
-#define XOR_SWAP(a, b)                                                                  \
-    a ^= (u8)b;                                                                         \
-    b ^= (u8)a;                                                                         \
+#define XOR_SWAP(a, b)                                                                                                                     \
+    a ^= (u8)b;                                                                                                                            \
+    b ^= (u8)a;                                                                                                                            \
     a = ((u8)b ^ (u8)a);
 
 // TODO: fix casts here
-#define SWAP_AND_NEGATE(a, b)                                                           \
-    a ^= (u8)b;                                                                         \
-    b ^= (u8)a;                                                                         \
-    a = ((u8)b ^ (u8)a) * -1;                                                           \
+#define SWAP_AND_NEGATE(a, b)                                                                                                              \
+    a ^= (u8)b;                                                                                                                            \
+    b ^= (u8)a;                                                                                                                            \
+    a = ((u8)b ^ (u8)a) * -1;                                                                                                              \
     b = (u8)b * -1;
 
-#define NEGATE(var)                                                                     \
-    ({                                                                                  \
-        s32 temp = var;                                                                 \
-        var = -temp;                                                                    \
+#define NEGATE(var)                                                                                                                        \
+    ({                                                                                                                                     \
+        s32 temp = var;                                                                                                                    \
+        var = -temp;                                                                                                                       \
     })
 #define DIRECT_NEGATE(var) (var = -var;)
 
diff --git a/include/lib/m4a.h b/include/lib/m4a.h
index eb4ef71e8..4146628e6 100644
--- a/include/lib/m4a.h
+++ b/include/lib/m4a.h
@@ -31,8 +31,6 @@ void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16
 void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s16 pitch);
 void m4aMPlayPanpotControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s8 pan);
 
-#define DEFAULT_SOUND_MODE                                                              \
-    (SOUND_MODE_DA_BIT_8 | SOUND_MODE_FREQ_10512 | (15 << SOUND_MODE_MASVOL_SHIFT)      \
-     | (5 << SOUND_MODE_MAXCHN_SHIFT))
+#define DEFAULT_SOUND_MODE (SOUND_MODE_DA_BIT_8 | SOUND_MODE_FREQ_10512 | (15 << SOUND_MODE_MASVOL_SHIFT) | (5 << SOUND_MODE_MAXCHN_SHIFT))
 
 #endif // GUARD_M4A_H
diff --git a/include/multi_boot.h b/include/multi_boot.h
index b01988ee5..5d1dd8934 100644
--- a/include/multi_boot.h
+++ b/include/multi_boot.h
@@ -70,8 +70,7 @@ extern void MultiBootStartProbe(struct MultiBootParam *mp);
 /*                   Starts Transfer from Master Server             */
 /*------------------------------------------------------------------*/
 
-extern void MultiBootStartMaster(struct MultiBootParam *mp, const u8 *srcp, s32 length,
-                                 u8 palette_color, s8 palette_speed);
+extern void MultiBootStartMaster(struct MultiBootParam *mp, const u8 *srcp, s32 length, u8 palette_color, s8 palette_speed);
 
 //* Among the units connected by multi-play communication cable, only
 // those units with game pak inserted
diff --git a/include/multi_sio.h b/include/multi_sio.h
index de7edb83d..93328d814 100644
--- a/include/multi_sio.h
+++ b/include/multi_sio.h
@@ -60,12 +60,11 @@
 
 // Timer count number is calculated from communication data block
 // size.
-#define MULTI_SIO_TIMER_COUNT_TMP                                                       \
-    (SYSTEM_CLOCK / 60 / ((2 + 4 + MULTI_SIO_BLOCK_SIZE + 6) / (16 / 8)))
+#define MULTI_SIO_TIMER_COUNT_TMP (SYSTEM_CLOCK / 60 / ((2 + 4 + MULTI_SIO_BLOCK_SIZE + 6) / (16 / 8)))
 // Timer Count Temporary Value
-#define MULTI_SIO_TIMER_COUNT_MIN                                                       \
-    (MULTI_SIO_1P_SEND_CLOCKS * MULTI_SIO_PLAYERS_MAX + MULTI_SIO_START_BIT_WAIT        \
-     + MULTI_SIO_INTR_MARGIN + MULTI_SIO_INTR_DELAY_MAX + MULTI_SIO_INTR_CLOCK_MAX)
+#define MULTI_SIO_TIMER_COUNT_MIN                                                                                                          \
+    (MULTI_SIO_1P_SEND_CLOCKS * MULTI_SIO_PLAYERS_MAX + MULTI_SIO_START_BIT_WAIT + MULTI_SIO_INTR_MARGIN + MULTI_SIO_INTR_DELAY_MAX        \
+     + MULTI_SIO_INTR_CLOCK_MAX)
 // Timer Count Minimum Value
 #define MULTI_SIO_TIMER_COUNT_MAX 0x10000 // Timer Count Maximum Value
 #define MULTI_SIO_TIMER_COUNT     (MULTI_SIO_TIMER_COUNT_MAX - MULTI_SIO_TIMER_COUNT_TMP)
@@ -214,9 +213,8 @@ extern u32 MultiSioMain(void *sendp, void *recvp, u32 loadRequest);
 #define MULTI_SIO_RECV_ID(x)      (0x0001 << (x))
 #define MULTI_SIO_CONNECTED_ID(x) (0x0100 << (x))
 
-#define MULTI_SIO_ALL_CONNECTED                                                         \
-    (MULTI_SIO_CONNECTED_ID(0) | MULTI_SIO_CONNECTED_ID(1) | MULTI_SIO_CONNECTED_ID(2)  \
-     | MULTI_SIO_CONNECTED_ID(3))
+#define MULTI_SIO_ALL_CONNECTED                                                                                                            \
+    (MULTI_SIO_CONNECTED_ID(0) | MULTI_SIO_CONNECTED_ID(1) | MULTI_SIO_CONNECTED_ID(2) | MULTI_SIO_CONNECTED_ID(3))
 
 // Return Value Structure
 struct MultiSioReturn {
diff --git a/include/rect.h b/include/rect.h
index 2920f99bd..c7770647f 100644
--- a/include/rect.h
+++ b/include/rect.h
@@ -18,26 +18,15 @@ struct Rect8 {
 #define RECT_TOP(y, hb)    ((y) + (hb)->top)
 #define RECT_BOTTOM(y, hb) (RECT_TOP(y, hb) + RECT_HEIGHT(hb))
 
-#define RECT_COLLISION_A_X(x0, hb0, x1, hb1)                                            \
-    (RECT_LEFT(x0, hb0) <= RECT_LEFT(x1, hb1)                                           \
-     && RECT_RIGHT(x0, hb0) >= RECT_LEFT(x1, hb1))
-#define RECT_COLLISION_B_X(x0, hb0, x1, hb1)                                            \
-    (RECT_LEFT(x0, hb0) >= RECT_LEFT(x1, hb1)                                           \
-     && RECT_RIGHT(x1, hb1) >= RECT_LEFT(x0, hb0))
-#define RECT_COLLISION_A_Y(y0, hb0, y1, hb1)                                            \
-    (RECT_TOP((y0), hb0) <= RECT_TOP((y1), hb1)                                         \
-     && RECT_BOTTOM((y0), hb0) >= RECT_TOP((y1), hb1))
-#define RECT_COLLISION_B_Y(y0, hb0, y1, hb1)                                            \
-    (RECT_TOP((y0), hb0) >= RECT_TOP((y1), hb1)                                         \
-     && RECT_BOTTOM((y1), hb1) >= RECT_TOP((y0), hb0))
+#define RECT_COLLISION_A_X(x0, hb0, x1, hb1) (RECT_LEFT(x0, hb0) <= RECT_LEFT(x1, hb1) && RECT_RIGHT(x0, hb0) >= RECT_LEFT(x1, hb1))
+#define RECT_COLLISION_B_X(x0, hb0, x1, hb1) (RECT_LEFT(x0, hb0) >= RECT_LEFT(x1, hb1) && RECT_RIGHT(x1, hb1) >= RECT_LEFT(x0, hb0))
+#define RECT_COLLISION_A_Y(y0, hb0, y1, hb1) (RECT_TOP((y0), hb0) <= RECT_TOP((y1), hb1) && RECT_BOTTOM((y0), hb0) >= RECT_TOP((y1), hb1))
+#define RECT_COLLISION_B_Y(y0, hb0, y1, hb1) (RECT_TOP((y0), hb0) >= RECT_TOP((y1), hb1) && RECT_BOTTOM((y1), hb1) >= RECT_TOP((y0), hb0))
 
-#define RECT_COLLISION_X(x0, hb0, x1, hb1)                                              \
-    (RECT_COLLISION_A_X(x0, hb0, x1, hb1) || RECT_COLLISION_B_X(x0, hb0, x1, hb1))
-#define RECT_COLLISION_Y(y0, hb0, y1, hb1)                                              \
-    (RECT_COLLISION_A_Y(y0, hb0, y1, hb1) || RECT_COLLISION_B_Y(y0, hb0, y1, hb1))
+#define RECT_COLLISION_X(x0, hb0, x1, hb1) (RECT_COLLISION_A_X(x0, hb0, x1, hb1) || RECT_COLLISION_B_X(x0, hb0, x1, hb1))
+#define RECT_COLLISION_Y(y0, hb0, y1, hb1) (RECT_COLLISION_A_Y(y0, hb0, y1, hb1) || RECT_COLLISION_B_Y(y0, hb0, y1, hb1))
 
-#define RECT_COLLISION(x0, y0, hb0, x1, y1, hb1)                                        \
-    (RECT_COLLISION_X(x0, hb0, x1, hb1) && RECT_COLLISION_Y(y0, hb0, y1, hb1))
+#define RECT_COLLISION(x0, y0, hb0, x1, y1, hb1) (RECT_COLLISION_X(x0, hb0, x1, hb1) && RECT_COLLISION_Y(y0, hb0, y1, hb1))
 
 /* Rect collision checks using Fixed-point values */
 #define Q_RECT_WIDTH(hb)      QS(RECT_WIDTH(hb))
@@ -51,26 +40,19 @@ struct Rect8 {
 #define Q_RECT_BOTTOM(y, hb)  (Q_RECT_TOP(y, hb) + Q_RECT_HEIGHT(hb))
 #define Q_RECT_BOTTOM2(y, hb) (Q_RECT_TOP2(y, hb) + Q_RECT_HEIGHT(hb))
 
-#define Q_RECT_COLLISION_A_X(x0, hb0, x1, hb1)                                          \
-    (Q_RECT_LEFT2(x0, hb0) <= Q_RECT_LEFT(x1, hb1)                                      \
-     && Q_RECT_RIGHT2(x0, hb0) >= Q_RECT_LEFT(x1, hb1))
-#define Q_RECT_COLLISION_B_X(x0, hb0, x1, hb1)                                          \
-    (Q_RECT_LEFT2(x0, hb0) >= Q_RECT_LEFT(x1, hb1)                                      \
-     && Q_RECT_RIGHT(x1, hb1) >= Q_RECT_LEFT2(x0, hb0))
-#define Q_RECT_COLLISION_A_Y(y0, hb0, y1, hb1)                                          \
-    (Q_RECT_TOP2((y0), hb0) <= Q_RECT_TOP((y1), hb1)                                    \
-     && Q_RECT_BOTTOM2((y0), hb0) >= Q_RECT_TOP((y1), hb1))
-#define Q_RECT_COLLISION_B_Y(y0, hb0, y1, hb1)                                          \
-    (Q_RECT_TOP2((y0), hb0) >= Q_RECT_TOP((y1), hb1)                                    \
-     && Q_RECT_BOTTOM((y1), hb1) >= Q_RECT_TOP2((y0), hb0))
+#define Q_RECT_COLLISION_A_X(x0, hb0, x1, hb1)                                                                                             \
+    (Q_RECT_LEFT2(x0, hb0) <= Q_RECT_LEFT(x1, hb1) && Q_RECT_RIGHT2(x0, hb0) >= Q_RECT_LEFT(x1, hb1))
+#define Q_RECT_COLLISION_B_X(x0, hb0, x1, hb1)                                                                                             \
+    (Q_RECT_LEFT2(x0, hb0) >= Q_RECT_LEFT(x1, hb1) && Q_RECT_RIGHT(x1, hb1) >= Q_RECT_LEFT2(x0, hb0))
+#define Q_RECT_COLLISION_A_Y(y0, hb0, y1, hb1)                                                                                             \
+    (Q_RECT_TOP2((y0), hb0) <= Q_RECT_TOP((y1), hb1) && Q_RECT_BOTTOM2((y0), hb0) >= Q_RECT_TOP((y1), hb1))
+#define Q_RECT_COLLISION_B_Y(y0, hb0, y1, hb1)                                                                                             \
+    (Q_RECT_TOP2((y0), hb0) >= Q_RECT_TOP((y1), hb1) && Q_RECT_BOTTOM((y1), hb1) >= Q_RECT_TOP2((y0), hb0))
 
-#define Q_RECT_COLLISION_X(x0, hb0, x1, hb1)                                            \
-    (Q_RECT_COLLISION_A_X(x0, hb0, x1, hb1) || Q_RECT_COLLISION_B_X(x0, hb0, x1, hb1))
-#define Q_RECT_COLLISION_Y(y0, hb0, y1, hb1)                                            \
-    (Q_RECT_COLLISION_A_Y(y0, hb0, y1, hb1) || Q_RECT_COLLISION_B_Y(y0, hb0, y1, hb1))
+#define Q_RECT_COLLISION_X(x0, hb0, x1, hb1) (Q_RECT_COLLISION_A_X(x0, hb0, x1, hb1) || Q_RECT_COLLISION_B_X(x0, hb0, x1, hb1))
+#define Q_RECT_COLLISION_Y(y0, hb0, y1, hb1) (Q_RECT_COLLISION_A_Y(y0, hb0, y1, hb1) || Q_RECT_COLLISION_B_Y(y0, hb0, y1, hb1))
 
-#define RECT_COLLISION_2(x0, y0, hb0, x1, y1, hb1)                                      \
-    (Q_RECT_COLLISION_X(x0, hb0, x1, hb1) && Q_RECT_COLLISION_Y(y0, hb0, y1, hb1))
+#define RECT_COLLISION_2(x0, y0, hb0, x1, y1, hb1) (Q_RECT_COLLISION_X(x0, hb0, x1, hb1) && Q_RECT_COLLISION_Y(y0, hb0, y1, hb1))
 
 /* Rect collision checks using integer values
    Clones of the RECT_ ,macros that access values directly */
@@ -81,21 +63,14 @@ struct Rect8 {
 #define HB_TOP(y, hb)    ((y) + hb.top)
 #define HB_BOTTOM(y, hb) (HB_TOP(y, hb) + HB_HEIGHT(hb))
 
-#define HB_COLLISION_A_X(x0, hb0, x1, hb1)                                              \
-    (HB_LEFT(x0, hb0) <= HB_LEFT(x1, hb1) && HB_RIGHT(x0, hb0) >= HB_LEFT(x1, hb1))
-#define HB_COLLISION_B_X(x0, hb0, x1, hb1)                                              \
-    (HB_LEFT(x0, hb0) >= HB_LEFT(x1, hb1) && HB_RIGHT(x1, hb1) >= HB_LEFT(x0, hb0))
-#define HB_COLLISION_A_Y(y0, hb0, y1, hb1)                                              \
-    (HB_TOP((y0), hb0) <= HB_TOP((y1), hb1) && HB_BOTTOM((y0), hb0) >= HB_TOP((y1), hb1))
-#define HB_COLLISION_B_Y(y0, hb0, y1, hb1)                                              \
-    (HB_TOP((y0), hb0) >= HB_TOP((y1), hb1) && HB_BOTTOM((y1), hb1) >= HB_TOP((y0), hb0))
+#define HB_COLLISION_A_X(x0, hb0, x1, hb1) (HB_LEFT(x0, hb0) <= HB_LEFT(x1, hb1) && HB_RIGHT(x0, hb0) >= HB_LEFT(x1, hb1))
+#define HB_COLLISION_B_X(x0, hb0, x1, hb1) (HB_LEFT(x0, hb0) >= HB_LEFT(x1, hb1) && HB_RIGHT(x1, hb1) >= HB_LEFT(x0, hb0))
+#define HB_COLLISION_A_Y(y0, hb0, y1, hb1) (HB_TOP((y0), hb0) <= HB_TOP((y1), hb1) && HB_BOTTOM((y0), hb0) >= HB_TOP((y1), hb1))
+#define HB_COLLISION_B_Y(y0, hb0, y1, hb1) (HB_TOP((y0), hb0) >= HB_TOP((y1), hb1) && HB_BOTTOM((y1), hb1) >= HB_TOP((y0), hb0))
 
-#define HB_COLLISION_X(x0, hb0, x1, hb1)                                                \
-    (HB_COLLISION_A_X(x0, hb0, x1, hb1) || HB_COLLISION_B_X(x0, hb0, x1, hb1))
-#define HB_COLLISION_Y(y0, hb0, y1, hb1)                                                \
-    (HB_COLLISION_A_Y(y0, hb0, y1, hb1) || HB_COLLISION_B_Y(y0, hb0, y1, hb1))
+#define HB_COLLISION_X(x0, hb0, x1, hb1) (HB_COLLISION_A_X(x0, hb0, x1, hb1) || HB_COLLISION_B_X(x0, hb0, x1, hb1))
+#define HB_COLLISION_Y(y0, hb0, y1, hb1) (HB_COLLISION_A_Y(y0, hb0, y1, hb1) || HB_COLLISION_B_Y(y0, hb0, y1, hb1))
 
-#define HB_COLLISION(x0, y0, hb0, x1, y1, hb1)                                          \
-    (HB_COLLISION_X(x0, hb0, x1, hb1) && HB_COLLISION_Y(y0, hb0, y1, hb1))
+#define HB_COLLISION(x0, y0, hb0, x1, y1, hb1) (HB_COLLISION_X(x0, hb0, x1, hb1) && HB_COLLISION_Y(y0, hb0, y1, hb1))
 
 #endif // GUARD_RECT_H
\ No newline at end of file
diff --git a/include/sakit/camera.h b/include/sakit/camera.h
index 073dd39b5..3f03eea95 100644
--- a/include/sakit/camera.h
+++ b/include/sakit/camera.h
@@ -63,39 +63,33 @@ struct Camera {
 extern struct Camera gCamera;
 
 // TODO: Merge all these into one!
-#define IS_OUT_OF_RANGE_2(x, y, radiusX, radiusY)                                       \
-    ((x < -(radiusX)) || (x > DISPLAY_WIDTH + (radiusX)) || (y < -(radiusY))            \
-     || (y > DISPLAY_HEIGHT + (radiusY)))
+#define IS_OUT_OF_RANGE_2(x, y, radiusX, radiusY)                                                                                          \
+    ((x < -(radiusX)) || (x > DISPLAY_WIDTH + (radiusX)) || (y < -(radiusY)) || (y > DISPLAY_HEIGHT + (radiusY)))
 
 // No idea on this one
-#define IS_OUT_OF_RANGE_3(x, y, radiusX, radiusY)                                       \
-    ((x < -(radiusX)) || (x > DISPLAY_WIDTH + (radiusX)) || ((y) + (radiusY) < 0)       \
-     || (y > DISPLAY_HEIGHT + (radiusY)))
+#define IS_OUT_OF_RANGE_3(x, y, radiusX, radiusY)                                                                                          \
+    ((x < -(radiusX)) || (x > DISPLAY_WIDTH + (radiusX)) || ((y) + (radiusY) < 0) || (y > DISPLAY_HEIGHT + (radiusY)))
 
 // TODO: Merge all these into one!
 #define IS_OUT_OF_RANGE_(UNUSED, x, y, radius) IS_OUT_OF_RANGE_2(x, y, radius, radius)
 
-#define IS_OUT_OF_RANGE_OLD(castType, x, y, dim)                                        \
-    (((castType)(x + (dim / 2)) > DISPLAY_WIDTH + dim) || (y + (dim / 2) < 0)           \
-     || (y > DISPLAY_HEIGHT + (dim / 2)))
+#define IS_OUT_OF_RANGE_OLD(castType, x, y, dim)                                                                                           \
+    (((castType)(x + (dim / 2)) > DISPLAY_WIDTH + dim) || (y + (dim / 2) < 0) || (y > DISPLAY_HEIGHT + (dim / 2)))
 
 #define IS_OUT_OF_RANGE IS_OUT_OF_RANGE_OLD
 
 // @NOTE/INVESTIGATE: Some places match with u16, some with u32,
 // but u16 is more common, so it's the default.
-#define IS_OUT_OF_CAM_RANGE(_x, _y) IS_OUT_OF_RANGE(u16, _x, _y, CAM_REGION_WIDTH)
-#define IS_OUT_OF_CAM_RANGE_TYPED(castType, _x, _y)                                     \
-    IS_OUT_OF_RANGE(castType, _x, _y, CAM_REGION_WIDTH)
+#define IS_OUT_OF_CAM_RANGE(_x, _y)                 IS_OUT_OF_RANGE(u16, _x, _y, CAM_REGION_WIDTH)
+#define IS_OUT_OF_CAM_RANGE_TYPED(castType, _x, _y) IS_OUT_OF_RANGE(castType, _x, _y, CAM_REGION_WIDTH)
 
 // TODO: Remove macro and replace calls of it with 'IS_OUT_OF_RANGE' once rewritten.
 #define IS_OUT_OF_CAM_RANGE_2(x, y) IS_OUT_OF_RANGE_(u16, x, y, (CAM_REGION_WIDTH / 2))
 
-#define IS_OUT_OF_DISPLAY_RANGE(_x, _y)                                                 \
-    ((_x) > gCamera.x + (DISPLAY_WIDTH + (CAM_REGION_WIDTH / 2))                        \
-     || (_x) < gCamera.x - (CAM_REGION_WIDTH / 2) || (_y) > gCamera.y + CAM_BOUND_Y     \
-     || (_y) < gCamera.y - (CAM_REGION_WIDTH / 2))
+#define IS_OUT_OF_DISPLAY_RANGE(_x, _y)                                                                                                    \
+    ((_x) > gCamera.x + (DISPLAY_WIDTH + (CAM_REGION_WIDTH / 2)) || (_x) < gCamera.x - (CAM_REGION_WIDTH / 2)                              \
+     || (_y) > gCamera.y + CAM_BOUND_Y || (_y) < gCamera.y - (CAM_REGION_WIDTH / 2))
 
-#define IS_OUT_OF_LOOP_TRIGGER_RANGE(x, y)                                              \
-    IS_OUT_OF_RANGE_3(x, y, (CAM_REGION_WIDTH / 2), (CAM_REGION_WIDTH / 2))
+#define IS_OUT_OF_LOOP_TRIGGER_RANGE(x, y) IS_OUT_OF_RANGE_3(x, y, (CAM_REGION_WIDTH / 2), (CAM_REGION_WIDTH / 2))
 
 #endif // GUARD_SAKIT_CAMERA_H
diff --git a/include/sakit/collision.h b/include/sakit/collision.h
index 9fd07b661..03211ec45 100644
--- a/include/sakit/collision.h
+++ b/include/sakit/collision.h
@@ -16,8 +16,7 @@
 #define COLL_FLAG_80000  0x00080000
 #define COLL_FLAG_100000 0x00100000
 
-u32 CheckRectCollision_SpritePlayer(Sprite *s, s32 sx, s32 sy, Player *p,
-                                    struct Rect8 *rectPlayer);
+u32 CheckRectCollision_SpritePlayer(Sprite *s, s32 sx, s32 sy, Player *p, struct Rect8 *rectPlayer);
 
 // TODO: Include header this belongs to
 u32 sub_800C944(Sprite *, s32, s32);
@@ -26,8 +25,7 @@ bool32 sub_800C204(Sprite *, s32, s32, s16, Player *, s16);
 bool32 sub_800C320(Sprite *s, s32 sx, s32 sy, s16 hbIndex, Player *p);
 bool32 sub_800CA20(Sprite *s, s32 sx, s32 sy, s16 hbIndex, Player *p);
 bool32 IsColliding_Cheese(Sprite *sprTarget, s32 sx, s32 sy, s16 hbIndex, Player *p);
-u32 sub_800DA4C(Sprite *opponent, s16 oppX, s16 oppY, UNUSED s32 param3,
-                UNUSED s32 param4, u8 layer);
+u32 sub_800DA4C(Sprite *opponent, s16 oppX, s16 oppY, UNUSED s32 param3, UNUSED s32 param4, u8 layer);
 
 // Lose rings?
 bool32 sub_800CBA4(Player *);
diff --git a/include/sakit/globals.h b/include/sakit/globals.h
index a6e0edc3b..3d504cafd 100644
--- a/include/sakit/globals.h
+++ b/include/sakit/globals.h
@@ -12,9 +12,8 @@
 #define GAME_MODE_TEAM_PLAY                  4
 #define GAME_MODE_MULTI_PLAYER_COLLECT_RINGS 5
 
-#define IS_SINGLE_PLAYER                                                                \
-    ((gGameMode == GAME_MODE_SINGLE_PLAYER) || (gGameMode == GAME_MODE_TIME_ATTACK)     \
-     || (gGameMode == GAME_MODE_BOSS_TIME_ATTACK))
+#define IS_SINGLE_PLAYER                                                                                                                   \
+    ((gGameMode == GAME_MODE_SINGLE_PLAYER) || (gGameMode == GAME_MODE_TIME_ATTACK) || (gGameMode == GAME_MODE_BOSS_TIME_ATTACK))
 
 #define IS_MULTI_PLAYER (!(IS_SINGLE_PLAYER))
 
@@ -181,127 +180,127 @@ extern struct InputCounters gNewInputCounters[32];
 
 extern u8 gUnknown_030055D8;
 
-#define INCREMENT_SCORE_A(incVal)                                                       \
-    {                                                                                   \
-        s32 divResA, divResB;                                                           \
-        s32 oldScore = gLevelScore;                                                     \
-        gLevelScore += incVal;                                                          \
-                                                                                        \
-        divResA = Div(gLevelScore, 50000);                                              \
-        divResB = Div(oldScore, 50000);                                                 \
-                                                                                        \
-        if ((divResA != divResB) && (gGameMode == GAME_MODE_SINGLE_PLAYER)) {           \
-            u16 lives = divResA - divResB;                                              \
-            lives += gNumLives;                                                         \
-                                                                                        \
-            gNumLives = ({                                                              \
-                if (lives > 255)                                                        \
-                    lives = 255;                                                        \
-                lives;                                                                  \
-            });                                                                         \
-        }                                                                               \
+#define INCREMENT_SCORE_A(incVal)                                                                                                          \
+    {                                                                                                                                      \
+        s32 divResA, divResB;                                                                                                              \
+        s32 oldScore = gLevelScore;                                                                                                        \
+        gLevelScore += incVal;                                                                                                             \
+                                                                                                                                           \
+        divResA = Div(gLevelScore, 50000);                                                                                                 \
+        divResB = Div(oldScore, 50000);                                                                                                    \
+                                                                                                                                           \
+        if ((divResA != divResB) && (gGameMode == GAME_MODE_SINGLE_PLAYER)) {                                                              \
+            u16 lives = divResA - divResB;                                                                                                 \
+            lives += gNumLives;                                                                                                            \
+                                                                                                                                           \
+            gNumLives = ({                                                                                                                 \
+                if (lives > 255)                                                                                                           \
+                    lives = 255;                                                                                                           \
+                lives;                                                                                                                     \
+            });                                                                                                                            \
+        }                                                                                                                                  \
     }
 
 // if-else only matches like this in some cases
-#define INCREMENT_SCORE_B_BASE(incVal, _unk3)                                           \
-    {                                                                                   \
-        s32 divResA, divResB;                                                           \
-        s32 oldScore = gLevelScore;                                                     \
-        gLevelScore += incVal;                                                          \
-                                                                                        \
-        divResA = Div(gLevelScore, 50000);                                              \
-        divResB = Div(oldScore, 50000);                                                 \
-                                                                                        \
-        if ((divResA != divResB) && (gGameMode == GAME_MODE_SINGLE_PLAYER)) {           \
-            u16 lives = divResA - divResB;                                              \
-            lives += gNumLives;                                                         \
-                                                                                        \
-            if (lives > 255) {                                                          \
-                gNumLives = 255;                                                        \
-            } else {                                                                    \
-                gNumLives = lives;                                                      \
-            }                                                                           \
-                                                                                        \
-            gUnknown_030054A8.unk3 = _unk3;                                             \
-        }                                                                               \
+#define INCREMENT_SCORE_B_BASE(incVal, _unk3)                                                                                              \
+    {                                                                                                                                      \
+        s32 divResA, divResB;                                                                                                              \
+        s32 oldScore = gLevelScore;                                                                                                        \
+        gLevelScore += incVal;                                                                                                             \
+                                                                                                                                           \
+        divResA = Div(gLevelScore, 50000);                                                                                                 \
+        divResB = Div(oldScore, 50000);                                                                                                    \
+                                                                                                                                           \
+        if ((divResA != divResB) && (gGameMode == GAME_MODE_SINGLE_PLAYER)) {                                                              \
+            u16 lives = divResA - divResB;                                                                                                 \
+            lives += gNumLives;                                                                                                            \
+                                                                                                                                           \
+            if (lives > 255) {                                                                                                             \
+                gNumLives = 255;                                                                                                           \
+            } else {                                                                                                                       \
+                gNumLives = lives;                                                                                                         \
+            }                                                                                                                              \
+                                                                                                                                           \
+            gUnknown_030054A8.unk3 = _unk3;                                                                                                \
+        }                                                                                                                                  \
     }
 
 #define INCREMENT_SCORE_B(incVal) INCREMENT_SCORE_B_BASE(incVal, 16)
 
-#define INCREMENT_SCORE_C(incVal)                                                       \
-    INCREMENT_SCORE_A(incVal)                                                           \
+#define INCREMENT_SCORE_C(incVal)                                                                                                          \
+    INCREMENT_SCORE_A(incVal)                                                                                                              \
     gUnknown_030054A8.unk1 = 48;
 
-#define INCREMENT_SCORE(incVal)                                                         \
-    {                                                                                   \
-        s32 divResA, divResB;                                                           \
-        s32 oldScore = gLevelScore;                                                     \
-        gLevelScore += incVal;                                                          \
-                                                                                        \
-        divResA = Div(gLevelScore, 50000);                                              \
-        divResB = Div(oldScore, 50000);                                                 \
-                                                                                        \
-        if ((divResA != divResB) && (gGameMode == GAME_MODE_SINGLE_PLAYER)) {           \
-            u16 lives = divResA - divResB;                                              \
-            lives += gNumLives;                                                         \
-                                                                                        \
-            gNumLives = ({                                                              \
-                if (lives > 255)                                                        \
-                    lives = 255;                                                        \
-                lives;                                                                  \
-            });                                                                         \
-                                                                                        \
-            gUnknown_030054A8.unk3 = 16;                                                \
-        }                                                                               \
+#define INCREMENT_SCORE(incVal)                                                                                                            \
+    {                                                                                                                                      \
+        s32 divResA, divResB;                                                                                                              \
+        s32 oldScore = gLevelScore;                                                                                                        \
+        gLevelScore += incVal;                                                                                                             \
+                                                                                                                                           \
+        divResA = Div(gLevelScore, 50000);                                                                                                 \
+        divResB = Div(oldScore, 50000);                                                                                                    \
+                                                                                                                                           \
+        if ((divResA != divResB) && (gGameMode == GAME_MODE_SINGLE_PLAYER)) {                                                              \
+            u16 lives = divResA - divResB;                                                                                                 \
+            lives += gNumLives;                                                                                                            \
+                                                                                                                                           \
+            gNumLives = ({                                                                                                                 \
+                if (lives > 255)                                                                                                           \
+                    lives = 255;                                                                                                           \
+                lives;                                                                                                                     \
+            });                                                                                                                            \
+                                                                                                                                           \
+            gUnknown_030054A8.unk3 = 16;                                                                                                   \
+        }                                                                                                                                  \
     }
 
-#define INCREMENT_RINGS(incVal)                                                         \
-    {                                                                                   \
-        s32 prevLives, newLives;                                                        \
-        s32 oldRings = gRingCount;                                                      \
-        gRingCount += incVal;                                                           \
-                                                                                        \
-        if (!(IS_EXTRA_STAGE(gCurrentLevel))) {                                         \
-            newLives = Div(gRingCount, 100);                                            \
-            prevLives = Div(oldRings, 100);                                             \
-                                                                                        \
-            if ((newLives != prevLives) && (gGameMode == GAME_MODE_SINGLE_PLAYER)) {    \
-                u16 lives = gNumLives + 1;                                              \
-                                                                                        \
-                gNumLives = ({                                                          \
-                    if (lives > 255)                                                    \
-                        lives = 255;                                                    \
-                    lives;                                                              \
-                });                                                                     \
-                                                                                        \
-                gUnknown_030054A8.unk3 = 16;                                            \
-            }                                                                           \
-        }                                                                               \
+#define INCREMENT_RINGS(incVal)                                                                                                            \
+    {                                                                                                                                      \
+        s32 prevLives, newLives;                                                                                                           \
+        s32 oldRings = gRingCount;                                                                                                         \
+        gRingCount += incVal;                                                                                                              \
+                                                                                                                                           \
+        if (!(IS_EXTRA_STAGE(gCurrentLevel))) {                                                                                            \
+            newLives = Div(gRingCount, 100);                                                                                               \
+            prevLives = Div(oldRings, 100);                                                                                                \
+                                                                                                                                           \
+            if ((newLives != prevLives) && (gGameMode == GAME_MODE_SINGLE_PLAYER)) {                                                       \
+                u16 lives = gNumLives + 1;                                                                                                 \
+                                                                                                                                           \
+                gNumLives = ({                                                                                                             \
+                    if (lives > 255)                                                                                                       \
+                        lives = 255;                                                                                                       \
+                    lives;                                                                                                                 \
+                });                                                                                                                        \
+                                                                                                                                           \
+                gUnknown_030054A8.unk3 = 16;                                                                                               \
+            }                                                                                                                              \
+        }                                                                                                                                  \
     }
 
-#define INCREMENT_RINGS2(incVal)                                                        \
-    {                                                                                   \
-        s32 prevLives, newLives;                                                        \
-        s32 oldRings = gRingCount;                                                      \
-        gRingCount += incVal;                                                           \
-                                                                                        \
-        if (!IS_EXTRA_STAGE(gCurrentLevel)) {                                           \
-            newLives = Div(gRingCount, 100);                                            \
-            prevLives = Div(oldRings, 100);                                             \
-                                                                                        \
-            /* RingsScatterSingleplayer_NormalGravity turns the if around */            \
-            if ((newLives != prevLives) && (gGameMode == GAME_MODE_SINGLE_PLAYER)) {    \
-                u16 lives = gNumLives + 1;                                              \
-                                                                                        \
-                gNumLives = ({                                                          \
-                    if (lives > 255)                                                    \
-                        lives = 255;                                                    \
-                    lives;                                                              \
-                });                                                                     \
-                                                                                        \
-                gUnknown_030054A8.unk3 = 16;                                            \
-            }                                                                           \
-        }                                                                               \
+#define INCREMENT_RINGS2(incVal)                                                                                                           \
+    {                                                                                                                                      \
+        s32 prevLives, newLives;                                                                                                           \
+        s32 oldRings = gRingCount;                                                                                                         \
+        gRingCount += incVal;                                                                                                              \
+                                                                                                                                           \
+        if (!IS_EXTRA_STAGE(gCurrentLevel)) {                                                                                              \
+            newLives = Div(gRingCount, 100);                                                                                               \
+            prevLives = Div(oldRings, 100);                                                                                                \
+                                                                                                                                           \
+            /* RingsScatterSingleplayer_NormalGravity turns the if around */                                                               \
+            if ((newLives != prevLives) && (gGameMode == GAME_MODE_SINGLE_PLAYER)) {                                                       \
+                u16 lives = gNumLives + 1;                                                                                                 \
+                                                                                                                                           \
+                gNumLives = ({                                                                                                             \
+                    if (lives > 255)                                                                                                       \
+                        lives = 255;                                                                                                       \
+                    lives;                                                                                                                 \
+                });                                                                                                                        \
+                                                                                                                                           \
+                gUnknown_030054A8.unk3 = 16;                                                                                               \
+            }                                                                                                                              \
+        }                                                                                                                                  \
     }
 
 #endif // GUARD_SAKIT_GLOBALS_H
diff --git a/include/sakit/interactables/platform.h b/include/sakit/interactables/platform.h
index 6f2ab088b..e21785c54 100644
--- a/include/sakit/interactables/platform.h
+++ b/include/sakit/interactables/platform.h
@@ -5,7 +5,6 @@
 #include "game/entity.h"
 
 void CreateEntity_Platform_A(MapEntity *, u16, u16, u8);
-void CreateEntity_Platform_B(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                             u8 spriteY);
+void CreateEntity_Platform_B(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY);
 
 #endif // GUARD_INTERACTABLE_PLATFORM_H
diff --git a/include/sakit/palette_loader.h b/include/sakit/palette_loader.h
index 3caa6827c..9ed6006e7 100644
--- a/include/sakit/palette_loader.h
+++ b/include/sakit/palette_loader.h
@@ -5,7 +5,6 @@
 #include "task.h"
 #include "sprite.h"
 
-struct Task *CreatePaletteLoaderTask(u16 priority, AnimId anim, u8 variant,
-                                     TaskDestructor dtor);
+struct Task *CreatePaletteLoaderTask(u16 priority, AnimId anim, u8 variant, TaskDestructor dtor);
 
 #endif
diff --git a/include/sakit/player.h b/include/sakit/player.h
index 57787e50b..91c20a82b 100644
--- a/include/sakit/player.h
+++ b/include/sakit/player.h
@@ -64,9 +64,7 @@ typedef void (*PlayerCallback)(struct Player_ *);
 #define PLAYER_ITEM_EFFECT__20              0x20
 #define PLAYER_ITEM_EFFECT__80              0x80
 
-#define HAS_SHIELD(p)                                                                   \
-    ((p)->itemEffect                                                                    \
-     & (PLAYER_ITEM_EFFECT__SHIELD_MAGNETIC | PLAYER_ITEM_EFFECT__SHIELD_NORMAL))
+#define HAS_SHIELD(p) ((p)->itemEffect & (PLAYER_ITEM_EFFECT__SHIELD_MAGNETIC | PLAYER_ITEM_EFFECT__SHIELD_NORMAL))
 
 // Confusion
 #define PLAYER_ITEM_EFFECT__40 0x40
diff --git a/include/sio32_multi_load.h b/include/sio32_multi_load.h
index f043a7fb3..528022cdc 100644
--- a/include/sio32_multi_load.h
+++ b/include/sio32_multi_load.h
@@ -14,7 +14,7 @@
 
 #define SIO32ML_INTR_CLOCK_MAX 256 // Communication Interrupt Processing Maximum Clocks
 
-#define SIO32ML_SYNC_DATA                                                               \
+#define SIO32ML_SYNC_DATA                                                                                                                  \
     0xfefefefe // Synchronized Data (0x00000000and 0xffffffff
                // prohibited)
 
@@ -39,24 +39,19 @@
 
 // Timer count temporary value is calculated from communication data
 // block size.
-#define SIO32ML_TIMER_COUNT_TMP                                                         \
-    (SIO32ML_SYSTEM_CLOCK / SIO32ML_SHIFT_CLOCK * 32 + SIO32ML_INTR_DELAY_MAX           \
-     + SIO32ML_INTR_CLOCK_MAX)
+#define SIO32ML_TIMER_COUNT_TMP (SIO32ML_SYSTEM_CLOCK / SIO32ML_SHIFT_CLOCK * 32 + SIO32ML_INTR_DELAY_MAX + SIO32ML_INTR_CLOCK_MAX)
 // Timer Count Temporary Value
 #define SIO32ML_TIMER_COUNT_MAX 0x10000 // Timer Count Maximum Value
-#define SIO32ML_TIMER_COUNT                                                             \
-    ((SIO32ML_TIMER_COUNT_TMP > SIO32ML_TIMER_COUNT_MAX)                                \
-         ? SIO32ML_TIMER_COUNT_MAX - SIO32ML_TIMER_COUNT_MAX                            \
-         : SIO32ML_TIMER_COUNT_MAX - SIO32ML_TIMER_COUNT_TMP)
+#define SIO32ML_TIMER_COUNT                                                                                                                \
+    ((SIO32ML_TIMER_COUNT_TMP > SIO32ML_TIMER_COUNT_MAX) ? SIO32ML_TIMER_COUNT_MAX - SIO32ML_TIMER_COUNT_MAX                               \
+                                                         : SIO32ML_TIMER_COUNT_MAX - SIO32ML_TIMER_COUNT_TMP)
 // Timer Count
 
 // Load timeout frames is calculated from above values.
 #define SIO32ML_MODE_WAIT_FRAMES 6 // SIO Mode Switch Wait Frames
-#define SIO32ML_LD_TIMEOUT_FRAMES                                                       \
-    (((SIO32ML_TIMER_COUNT_MAX - SIO32ML_TIMER_COUNT + SIO32ML_INTR_DELAY_MAX           \
-       + SIO32ML_INTR_CLOCK_MAX)                                                        \
-      * (SIO32ML_BLOCK_SIZE / 4))                                                       \
-         / (SIO32ML_LINE_CLOCKS * 228)                                                  \
+#define SIO32ML_LD_TIMEOUT_FRAMES                                                                                                          \
+    (((SIO32ML_TIMER_COUNT_MAX - SIO32ML_TIMER_COUNT + SIO32ML_INTR_DELAY_MAX + SIO32ML_INTR_CLOCK_MAX) * (SIO32ML_BLOCK_SIZE / 4))        \
+         / (SIO32ML_LINE_CLOCKS * 228)                                                                                                     \
      + SIO32ML_MODE_WAIT_FRAMES + 2)
 // Load timeout frames
 
diff --git a/include/sprite.h b/include/sprite.h
index e3ade78de..db2d6aa13 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -254,8 +254,7 @@ void TransformSprite(Sprite *, SpriteTransform *);
 void UnusedTransform(Sprite *, SpriteTransform *);
 void sub_8004E14(Sprite *, SpriteTransform *);
 
-void sub_8003EE4(u16 p0, s16 p1, s16 p2, s16 p3, s16 p4, s16 p5, s16 p6,
-                 BgAffineReg *affine);
+void sub_8003EE4(u16 p0, s16 p1, s16 p2, s16 p3, s16 p4, s16 p5, s16 p6, BgAffineReg *affine);
 void sub_8006228(u8 p0, u8 p1, u8 p2, u8 p3, u8 p4, u8 p5);
 void sub_80064A8(u8 p0, u8 p1, u8 p2, u8 p3, u8 p4, u8 p5);
 
@@ -265,82 +264,74 @@ void sub_80047A0(u16, s16, s16, u16);
 
 s16 sub_8004418(s16 x, s16 y);
 
-#define SpriteShouldUpdate(sprite)                                                      \
-    (((sprite)->prevVariant != (sprite)->variant)                                       \
-     || ((sprite)->prevAnim != (sprite)->graphics.anim))
+#define SpriteShouldUpdate(sprite) (((sprite)->prevVariant != (sprite)->variant) || ((sprite)->prevAnim != (sprite)->graphics.anim))
 
-#define SPRITE_INIT_ANIM_IF_CHANGED(_sprite)                                            \
-    if (SpriteShouldUpdate(_sprite)) {                                                  \
-        (_sprite)->graphics.size = 0;                                                   \
-        (_sprite)->prevVariant = (_sprite)->variant;                                    \
-        (_sprite)->prevAnim = (_sprite)->graphics.anim;                                 \
-        (_sprite)->animCursor = 0;                                                      \
-        (_sprite)->timeUntilNextFrame = 0;                                              \
-        SPRITE_FLAG_CLEAR(_sprite, ANIM_OVER);                                          \
+#define SPRITE_INIT_ANIM_IF_CHANGED(_sprite)                                                                                               \
+    if (SpriteShouldUpdate(_sprite)) {                                                                                                     \
+        (_sprite)->graphics.size = 0;                                                                                                      \
+        (_sprite)->prevVariant = (_sprite)->variant;                                                                                       \
+        (_sprite)->prevAnim = (_sprite)->graphics.anim;                                                                                    \
+        (_sprite)->animCursor = 0;                                                                                                         \
+        (_sprite)->timeUntilNextFrame = 0;                                                                                                 \
+        SPRITE_FLAG_CLEAR(_sprite, ANIM_OVER);                                                                                             \
     }
 
-#define SPRITE_INIT_ANIM(_sprite, _anim, _variant, _order)                              \
-    _sprite->graphics.anim = _anim;                                                     \
-    _sprite->variant = _variant;                                                        \
-    _sprite->oamFlags = SPRITE_OAM_ORDER(_order);                                       \
+#define SPRITE_INIT_ANIM(_sprite, _anim, _variant, _order)                                                                                 \
+    _sprite->graphics.anim = _anim;                                                                                                        \
+    _sprite->variant = _variant;                                                                                                           \
+    _sprite->oamFlags = SPRITE_OAM_ORDER(_order);                                                                                          \
     _sprite->graphics.size = 0;
 
-#define SPRITE_INIT_SCRIPT(_sprite, _speed)                                             \
-    _sprite->animCursor = 0;                                                            \
-    _sprite->timeUntilNextFrame = 0;                                                    \
-    _sprite->prevVariant = -1;                                                          \
-    _sprite->animSpeed = SPRITE_ANIM_SPEED(_speed);                                     \
-    _sprite->palId = 0;                                                                 \
+#define SPRITE_INIT_SCRIPT(_sprite, _speed)                                                                                                \
+    _sprite->animCursor = 0;                                                                                                               \
+    _sprite->timeUntilNextFrame = 0;                                                                                                       \
+    _sprite->prevVariant = -1;                                                                                                             \
+    _sprite->animSpeed = SPRITE_ANIM_SPEED(_speed);                                                                                        \
+    _sprite->palId = 0;                                                                                                                    \
     _sprite->hitboxes[0].index = HITBOX_STATE_INACTIVE;
 
-#define SPRITE_INIT_ANIM_AND_SCRIPT(_sprite, _anim, _variant, _order)                   \
-    SPRITE_INIT_ANIM(_sprite, _anim, _variant, _order);                                 \
+#define SPRITE_INIT_ANIM_AND_SCRIPT(_sprite, _anim, _variant, _order)                                                                      \
+    SPRITE_INIT_ANIM(_sprite, _anim, _variant, _order);                                                                                    \
     SPRITE_INIT_SCRIPT(_sprite, 1.0);
 
-#define SPRITE_INIT_WITH_POS(_sprite, _numTiles, _anim, _variant, _order, _priority)    \
-    _sprite->graphics.dest = VramMalloc(_numTiles);                                     \
-    SPRITE_INIT_ANIM(_sprite, _anim, _variant, _order);                                 \
-    _sprite->x = 0;                                                                     \
-    _sprite->y = 0;                                                                     \
-    SPRITE_INIT_SCRIPT(_sprite, 1.0)                                                    \
+#define SPRITE_INIT_WITH_POS(_sprite, _numTiles, _anim, _variant, _order, _priority)                                                       \
+    _sprite->graphics.dest = VramMalloc(_numTiles);                                                                                        \
+    SPRITE_INIT_ANIM(_sprite, _anim, _variant, _order);                                                                                    \
+    _sprite->x = 0;                                                                                                                        \
+    _sprite->y = 0;                                                                                                                        \
+    SPRITE_INIT_SCRIPT(_sprite, 1.0)                                                                                                       \
     _sprite->frameFlags = SPRITE_FLAG(PRIORITY, _priority);
 
-#define SPRITE_INIT_WITHOUT_VRAM(_sprite, _anim, _variant, _order, _priority, _flags)   \
-    SPRITE_INIT_ANIM_AND_SCRIPT(_sprite, _anim, _variant, _order);                      \
+#define SPRITE_INIT_WITHOUT_VRAM(_sprite, _anim, _variant, _order, _priority, _flags)                                                      \
+    SPRITE_INIT_ANIM_AND_SCRIPT(_sprite, _anim, _variant, _order);                                                                         \
     _sprite->frameFlags = (SPRITE_FLAG(PRIORITY, _priority) | (_flags));
 
-#define SPRITE_INIT_WITHOUT_ANIM_OR_VRAM(_sprite, _order, _priority, _flags)            \
-    _sprite->oamFlags = SPRITE_OAM_ORDER(_order);                                       \
-    _sprite->graphics.size = 0;                                                         \
-    SPRITE_INIT_SCRIPT(_sprite, 1.0);                                                   \
+#define SPRITE_INIT_WITHOUT_ANIM_OR_VRAM(_sprite, _order, _priority, _flags)                                                               \
+    _sprite->oamFlags = SPRITE_OAM_ORDER(_order);                                                                                          \
+    _sprite->graphics.size = 0;                                                                                                            \
+    SPRITE_INIT_SCRIPT(_sprite, 1.0);                                                                                                      \
     _sprite->frameFlags = (SPRITE_FLAG(PRIORITY, _priority) | (_flags));
 
-#define SPRITE_INIT_FLAGS(_sprite, _numTiles, _anim, _variant, _order, _priority,       \
-                          _flags)                                                       \
-    _sprite->graphics.dest = VramMalloc(_numTiles);                                     \
+#define SPRITE_INIT_FLAGS(_sprite, _numTiles, _anim, _variant, _order, _priority, _flags)                                                  \
+    _sprite->graphics.dest = VramMalloc(_numTiles);                                                                                        \
     SPRITE_INIT_WITHOUT_VRAM(_sprite, _anim, _variant, _order, _priority, _flags);
 
-#define SPRITE_INIT(_sprite, _numTiles, _anim, _variant, _order, _priority)             \
+#define SPRITE_INIT(_sprite, _numTiles, _anim, _variant, _order, _priority)                                                                \
     SPRITE_INIT_FLAGS(_sprite, _numTiles, _anim, _variant, _order, _priority, 0)
 
 #define SF_SHIFT(name) (SPRITE_FLAG_SHIFT_##name)
 
 #define SPRITE_FLAG(flagName, value) ((value) << SF_SHIFT(flagName))
 
-#define SPRITE_FLAG_GET(sprite, flagName)                                               \
-    (((sprite)->frameFlags & (SPRITE_FLAG_MASK_##flagName)) >> (SF_SHIFT(flagName)))
+#define SPRITE_FLAG_GET(sprite, flagName) (((sprite)->frameFlags & (SPRITE_FLAG_MASK_##flagName)) >> (SF_SHIFT(flagName)))
 
-#define SPRITE_FLAG_CLEAR(sprite, flagName)                                             \
-    (sprite)->frameFlags &= ~(SPRITE_FLAG_MASK_##flagName)
+#define SPRITE_FLAG_CLEAR(sprite, flagName) (sprite)->frameFlags &= ~(SPRITE_FLAG_MASK_##flagName)
 
-#define SPRITE_FLAG_SET(sprite, flagName)                                               \
-    (sprite)->frameFlags |= (SPRITE_FLAG_MASK_##flagName)
+#define SPRITE_FLAG_SET(sprite, flagName) (sprite)->frameFlags |= (SPRITE_FLAG_MASK_##flagName)
 
-#define SPRITE_FLAG_FLIP(sprite, flagName)                                              \
-    (sprite)->frameFlags ^= (SPRITE_FLAG_MASK_##flagName)
+#define SPRITE_FLAG_FLIP(sprite, flagName) (sprite)->frameFlags ^= (SPRITE_FLAG_MASK_##flagName)
 
-#define SPRITE_FLAG_SET_VALUE(sprite, flagName, value)                                  \
-    (sprite)->frameFlags |= SPRITE_FLAG(flagName, value)
+#define SPRITE_FLAG_SET_VALUE(sprite, flagName, value) (sprite)->frameFlags |= SPRITE_FLAG(flagName, value)
 
 #define SPRITE_FLAG_SHIFT_ROT_SCALE             0
 #define SPRITE_FLAG_SHIFT_ROT_SCALE_ENABLE      5
@@ -359,10 +350,9 @@ s16 sub_8004418(s16 x, s16 y);
 #define SPRITE_FLAG_SHIFT_30                    30
 #define SPRITE_FLAG_SHIFT_31                    31
 
-#define SPRITE_FLAG_MASK_ROT_SCALE        SPRITE_FLAG(ROT_SCALE, 0x1F) // 0x1F
-#define SPRITE_FLAG_MASK_ROT_SCALE_ENABLE SPRITE_FLAG(ROT_SCALE_ENABLE, 1) // 0x20
-#define SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE                                          \
-    SPRITE_FLAG(ROT_SCALE_DOUBLE_SIZE, 1) // 0x40
+#define SPRITE_FLAG_MASK_ROT_SCALE             SPRITE_FLAG(ROT_SCALE, 0x1F) // 0x1F
+#define SPRITE_FLAG_MASK_ROT_SCALE_ENABLE      SPRITE_FLAG(ROT_SCALE_ENABLE, 1) // 0x20
+#define SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE SPRITE_FLAG(ROT_SCALE_DOUBLE_SIZE, 1) // 0x40
 
 #define SPRITE_FLAG_MASK_OBJ_MODE  SPRITE_FLAG(OBJ_MODE, 3)
 #define SPRITE_FLAG_MASK_MOSAIC    SPRITE_FLAG(MOSAIC, 1) // 0x200
diff --git a/include/task.h b/include/task.h
index 654fb810b..3f03287df 100644
--- a/include/task.h
+++ b/include/task.h
@@ -99,21 +99,18 @@ void TasksExec(void);
 #if ENABLE_TASK_LOGGING
 #include <stdio.h>
 
-struct Task *TaskCreate(TaskMain taskMain, u16 structSize, u16 priority, u16 flags,
-                        TaskDestructor taskDestructor, const char *name);
+struct Task *TaskCreate(TaskMain taskMain, u16 structSize, u16 priority, u16 flags, TaskDestructor taskDestructor, const char *name);
 
 // The printout is split so we can still read the input, even if TaskCreate crashes.
-#define TaskCreate(taskMain, structSize, priority, flags, taskDestructor)               \
-    ({                                                                                  \
-        printf("New '%s' (0x%X, 0x%p) ", #taskMain, (u32)structSize, taskMain);         \
-        struct Task *tt = TaskCreate(taskMain, structSize, priority, flags,             \
-                                     taskDestructor, #taskMain);                        \
-        printf("at 0x%p\n", tt);                                                        \
-        tt;                                                                             \
+#define TaskCreate(taskMain, structSize, priority, flags, taskDestructor)                                                                  \
+    ({                                                                                                                                     \
+        printf("New '%s' (0x%X, 0x%p) ", #taskMain, (u32)structSize, taskMain);                                                            \
+        struct Task *tt = TaskCreate(taskMain, structSize, priority, flags, taskDestructor, #taskMain);                                    \
+        printf("at 0x%p\n", tt);                                                                                                           \
+        tt;                                                                                                                                \
     })
 #else
-struct Task *TaskCreate(TaskMain taskMain, u16 structSize, u16 priority, u16 flags,
-                        TaskDestructor taskDestructor);
+struct Task *TaskCreate(TaskMain taskMain, u16 structSize, u16 priority, u16 flags, TaskDestructor taskDestructor);
 #endif
 
 void TaskDestroy(struct Task *);
diff --git a/include/trig.h b/include/trig.h
index ddf3df102..39d1b10d8 100644
--- a/include/trig.h
+++ b/include/trig.h
@@ -7,10 +7,10 @@ extern const s16 gSineTable[1280];
 
 #define SIN_PERIOD 1024
 
-#define CLAMP_SIN_PERIOD(val)                                                           \
-    ({                                                                                  \
-        s16 clamped = (val) & (SIN_PERIOD - 1);                                         \
-        clamped;                                                                        \
+#define CLAMP_SIN_PERIOD(val)                                                                                                              \
+    ({                                                                                                                                     \
+        s16 clamped = (val) & (SIN_PERIOD - 1);                                                                                            \
+        clamped;                                                                                                                           \
     })
 
 #define ONE_CYCLE (SIN_PERIOD - 1)
diff --git a/libagbsyscall/libagbsyscall.c b/libagbsyscall/libagbsyscall.c
index 8b9d683a6..1d31082b3 100644
--- a/libagbsyscall/libagbsyscall.c
+++ b/libagbsyscall/libagbsyscall.c
@@ -220,42 +220,29 @@ void HuffUnComp(void) { }
 #if L_LZ77UnCompWram
 #include "platform/platform.h"
 
-void LZ77UnCompWram(const void *src, void *dest)
-{
-    Platform_LZDecompressUnsafe(src, dest);
-}
+void LZ77UnCompWram(const void *src, void *dest) { Platform_LZDecompressUnsafe(src, dest); }
 #endif
 
 #if L_LZ77UnCompVram
 #include "platform/platform.h"
 
-void LZ77UnCompVram(const void *src, void *dest)
-{
-    Platform_LZDecompressUnsafe(src, dest);
-}
+void LZ77UnCompVram(const void *src, void *dest) { Platform_LZDecompressUnsafe(src, dest); }
 #endif
 
 #if L_RLUnCompWram
 #include "platform/platform.h"
 
-void RLUnCompWram(const void *src, void *dest)
-{
-    Platform_RLDecompressUnsafe(src, dest);
-}
+void RLUnCompWram(const void *src, void *dest) { Platform_RLDecompressUnsafe(src, dest); }
 #endif
 
 #if L_RLUnCompVram
 #include "platform/platform.h"
 
-void RLUnCompVram(const void *src, void *dest)
-{
-    Platform_RLDecompressUnsafe(src, dest);
-}
+void RLUnCompVram(const void *src, void *dest) { Platform_RLDecompressUnsafe(src, dest); }
 #endif
 
 #if L_BgAffineSet
-void BgAffineSet(struct BgAffineSrcData *src, struct BgAffineDstData *dest, s32 count) {
-}
+void BgAffineSet(struct BgAffineSrcData *src, struct BgAffineDstData *dest, s32 count) { }
 #endif
 
 #if L_ObjAffineSet
diff --git a/multi_boot/programs/subgame_loader/include/global.h b/multi_boot/programs/subgame_loader/include/global.h
index 6b10ad6e9..358e48c33 100644
--- a/multi_boot/programs/subgame_loader/include/global.h
+++ b/multi_boot/programs/subgame_loader/include/global.h
@@ -16,7 +16,7 @@
 #if NON_MATCHING
 #define ASM_FUNC(path, decl)
 #else
-#define ASM_FUNC(path, decl)                                                            \
+#define ASM_FUNC(path, decl)                                                                                                               \
     NAKED decl { asm(".include " #path); }
 #endif
 
@@ -24,10 +24,10 @@
 #define NONMATCH(path, decl) decl
 #define END_NONMATCH
 #else
-#define NONMATCH(path, decl)                                                            \
-    NAKED decl                                                                          \
-    {                                                                                   \
-        asm(".include " #path);                                                         \
+#define NONMATCH(path, decl)                                                                                                               \
+    NAKED decl                                                                                                                             \
+    {                                                                                                                                      \
+        asm(".include " #path);                                                                                                            \
         if (0)
 #define END_NONMATCH }
 #endif
@@ -37,9 +37,9 @@
 // We define these when using certain IDEs to fool preproc
 #define _(x)  (x)
 #define __(x) (x)
-#define INCBIN(...)                                                                     \
-    {                                                                                   \
-        0                                                                               \
+#define INCBIN(...)                                                                                                                        \
+    {                                                                                                                                      \
+        0                                                                                                                                  \
     }
 #define INCBIN_U8  INCBIN
 #define INCBIN_U16 INCBIN
diff --git a/multi_boot/programs/subgame_loader/include/multi_sio.h b/multi_boot/programs/subgame_loader/include/multi_sio.h
index de7edb83d..93328d814 100644
--- a/multi_boot/programs/subgame_loader/include/multi_sio.h
+++ b/multi_boot/programs/subgame_loader/include/multi_sio.h
@@ -60,12 +60,11 @@
 
 // Timer count number is calculated from communication data block
 // size.
-#define MULTI_SIO_TIMER_COUNT_TMP                                                       \
-    (SYSTEM_CLOCK / 60 / ((2 + 4 + MULTI_SIO_BLOCK_SIZE + 6) / (16 / 8)))
+#define MULTI_SIO_TIMER_COUNT_TMP (SYSTEM_CLOCK / 60 / ((2 + 4 + MULTI_SIO_BLOCK_SIZE + 6) / (16 / 8)))
 // Timer Count Temporary Value
-#define MULTI_SIO_TIMER_COUNT_MIN                                                       \
-    (MULTI_SIO_1P_SEND_CLOCKS * MULTI_SIO_PLAYERS_MAX + MULTI_SIO_START_BIT_WAIT        \
-     + MULTI_SIO_INTR_MARGIN + MULTI_SIO_INTR_DELAY_MAX + MULTI_SIO_INTR_CLOCK_MAX)
+#define MULTI_SIO_TIMER_COUNT_MIN                                                                                                          \
+    (MULTI_SIO_1P_SEND_CLOCKS * MULTI_SIO_PLAYERS_MAX + MULTI_SIO_START_BIT_WAIT + MULTI_SIO_INTR_MARGIN + MULTI_SIO_INTR_DELAY_MAX        \
+     + MULTI_SIO_INTR_CLOCK_MAX)
 // Timer Count Minimum Value
 #define MULTI_SIO_TIMER_COUNT_MAX 0x10000 // Timer Count Maximum Value
 #define MULTI_SIO_TIMER_COUNT     (MULTI_SIO_TIMER_COUNT_MAX - MULTI_SIO_TIMER_COUNT_TMP)
@@ -214,9 +213,8 @@ extern u32 MultiSioMain(void *sendp, void *recvp, u32 loadRequest);
 #define MULTI_SIO_RECV_ID(x)      (0x0001 << (x))
 #define MULTI_SIO_CONNECTED_ID(x) (0x0100 << (x))
 
-#define MULTI_SIO_ALL_CONNECTED                                                         \
-    (MULTI_SIO_CONNECTED_ID(0) | MULTI_SIO_CONNECTED_ID(1) | MULTI_SIO_CONNECTED_ID(2)  \
-     | MULTI_SIO_CONNECTED_ID(3))
+#define MULTI_SIO_ALL_CONNECTED                                                                                                            \
+    (MULTI_SIO_CONNECTED_ID(0) | MULTI_SIO_CONNECTED_ID(1) | MULTI_SIO_CONNECTED_ID(2) | MULTI_SIO_CONNECTED_ID(3))
 
 // Return Value Structure
 struct MultiSioReturn {
diff --git a/multi_boot/programs/subgame_loader/include/sio32_multi_load.h b/multi_boot/programs/subgame_loader/include/sio32_multi_load.h
index f043a7fb3..528022cdc 100644
--- a/multi_boot/programs/subgame_loader/include/sio32_multi_load.h
+++ b/multi_boot/programs/subgame_loader/include/sio32_multi_load.h
@@ -14,7 +14,7 @@
 
 #define SIO32ML_INTR_CLOCK_MAX 256 // Communication Interrupt Processing Maximum Clocks
 
-#define SIO32ML_SYNC_DATA                                                               \
+#define SIO32ML_SYNC_DATA                                                                                                                  \
     0xfefefefe // Synchronized Data (0x00000000and 0xffffffff
                // prohibited)
 
@@ -39,24 +39,19 @@
 
 // Timer count temporary value is calculated from communication data
 // block size.
-#define SIO32ML_TIMER_COUNT_TMP                                                         \
-    (SIO32ML_SYSTEM_CLOCK / SIO32ML_SHIFT_CLOCK * 32 + SIO32ML_INTR_DELAY_MAX           \
-     + SIO32ML_INTR_CLOCK_MAX)
+#define SIO32ML_TIMER_COUNT_TMP (SIO32ML_SYSTEM_CLOCK / SIO32ML_SHIFT_CLOCK * 32 + SIO32ML_INTR_DELAY_MAX + SIO32ML_INTR_CLOCK_MAX)
 // Timer Count Temporary Value
 #define SIO32ML_TIMER_COUNT_MAX 0x10000 // Timer Count Maximum Value
-#define SIO32ML_TIMER_COUNT                                                             \
-    ((SIO32ML_TIMER_COUNT_TMP > SIO32ML_TIMER_COUNT_MAX)                                \
-         ? SIO32ML_TIMER_COUNT_MAX - SIO32ML_TIMER_COUNT_MAX                            \
-         : SIO32ML_TIMER_COUNT_MAX - SIO32ML_TIMER_COUNT_TMP)
+#define SIO32ML_TIMER_COUNT                                                                                                                \
+    ((SIO32ML_TIMER_COUNT_TMP > SIO32ML_TIMER_COUNT_MAX) ? SIO32ML_TIMER_COUNT_MAX - SIO32ML_TIMER_COUNT_MAX                               \
+                                                         : SIO32ML_TIMER_COUNT_MAX - SIO32ML_TIMER_COUNT_TMP)
 // Timer Count
 
 // Load timeout frames is calculated from above values.
 #define SIO32ML_MODE_WAIT_FRAMES 6 // SIO Mode Switch Wait Frames
-#define SIO32ML_LD_TIMEOUT_FRAMES                                                       \
-    (((SIO32ML_TIMER_COUNT_MAX - SIO32ML_TIMER_COUNT + SIO32ML_INTR_DELAY_MAX           \
-       + SIO32ML_INTR_CLOCK_MAX)                                                        \
-      * (SIO32ML_BLOCK_SIZE / 4))                                                       \
-         / (SIO32ML_LINE_CLOCKS * 228)                                                  \
+#define SIO32ML_LD_TIMEOUT_FRAMES                                                                                                          \
+    (((SIO32ML_TIMER_COUNT_MAX - SIO32ML_TIMER_COUNT + SIO32ML_INTR_DELAY_MAX + SIO32ML_INTR_CLOCK_MAX) * (SIO32ML_BLOCK_SIZE / 4))        \
+         / (SIO32ML_LINE_CLOCKS * 228)                                                                                                     \
      + SIO32ML_MODE_WAIT_FRAMES + 2)
 // Load timeout frames
 
diff --git a/multi_boot/programs/subgame_loader/src/loader_tables.c b/multi_boot/programs/subgame_loader/src/loader_tables.c
index 24cb8b210..1ec4e9f1c 100644
--- a/multi_boot/programs/subgame_loader/src/loader_tables.c
+++ b/multi_boot/programs/subgame_loader/src/loader_tables.c
@@ -5,8 +5,7 @@
 void *const gSegmentLoadBuffers[] = {
     PROGRAM_WORK_BUFFER + (SIO32ML_BLOCK_SIZE * 0),
     PROGRAM_WORK_BUFFER + (SIO32ML_BLOCK_SIZE * 1),
-    PROGRAM_WORK_BUFFER
-        + (SIO32ML_BLOCK_SIZE * 2), // combined and uncompressed into ewram (code)
+    PROGRAM_WORK_BUFFER + (SIO32ML_BLOCK_SIZE * 2), // combined and uncompressed into ewram (code)
 
     PROGRAM_WORK_BUFFER, // bg tileset for map
 
diff --git a/multi_boot/programs/subgame_loader/src/main.c b/multi_boot/programs/subgame_loader/src/main.c
index c489523bb..44cb3d5fc 100644
--- a/multi_boot/programs/subgame_loader/src/main.c
+++ b/multi_boot/programs/subgame_loader/src/main.c
@@ -151,8 +151,7 @@ static u16 sub_0203b2f0(u16 state, Loader *loader)
             case SEGMENT_COMPRESSED_SPRITE_OBJ_TILES_2:
             case SEGMENT_COMPRESSED_SPRITE_OBJ_TILES_3:
                 // Uncompress the sprite object tiles for our device, ignore the others
-                if (loader->sioId
-                    == loader->segment - (SEGMENT_COMPRESSED_SPRITE_OBJ_TILES_1 - 1)) {
+                if (loader->sioId == loader->segment - (SEGMENT_COMPRESSED_SPRITE_OBJ_TILES_1 - 1)) {
                     LZ77UnCompWram(RECV_BUFFER, PROGRAM_WORK_BUFFER);
                 }
                 break;
@@ -184,8 +183,7 @@ static u16 sub_0203b3d8(u16 state, Loader *loader)
     if (loader->segment == 9) {
         REG_DISPCNT = 0;
 
-        if (*ROM_MAKER_CODE_ADDR == DIMPS_MAKER_CODE
-            && *ROM_GAME_CODE_ADDR == EXPECTED_GAME_CODE) {
+        if (*ROM_MAKER_CODE_ADDR == DIMPS_MAKER_CODE && *ROM_GAME_CODE_ADDR == EXPECTED_GAME_CODE) {
             u8 i;
             for (i = 0; i < ARRAY_COUNT(expectedTitle) - 1; i++) {
                 if (actualTitle[i] != expectedTitle[i]) {
@@ -242,8 +240,7 @@ void LoaderInit(Loader *loader)
     DmaFill32(3, 0xA0, OAM, OAM_SIZE);
 
     REG_IE = 1;
-    if (*ROM_MAKER_CODE_ADDR == DIMPS_MAKER_CODE
-        && *ROM_GAME_CODE_ADDR == EXPECTED_GAME_CODE) {
+    if (*ROM_MAKER_CODE_ADDR == DIMPS_MAKER_CODE && *ROM_GAME_CODE_ADDR == EXPECTED_GAME_CODE) {
         REG_IE |= 0x2000;
     }
 
@@ -321,8 +318,7 @@ static u16 sub_0203b7d0(u16 state, Loader *loader)
         state = 4;
     }
 
-    gMultiSioStatusFlags
-        = MultiSioMain(&gMultiSioSend, gMultiSioRecv, loader->loadRequest);
+    gMultiSioStatusFlags = MultiSioMain(&gMultiSioSend, gMultiSioRecv, loader->loadRequest);
     loader->unk13 = gMultiSioRecv[0].pat0.unk0;
     if (loader->segment != gMultiSioRecv[0].pat0.unk2) {
         loader->segment = gMultiSioRecv[0].pat0.unk2;
diff --git a/multi_boot/programs/subgame_loader/src/multi_sio.c b/multi_boot/programs/subgame_loader/src/multi_sio.c
index 62b60d02d..291cd6dad 100644
--- a/multi_boot/programs/subgame_loader/src/multi_sio.c
+++ b/multi_boot/programs/subgame_loader/src/multi_sio.c
@@ -5,8 +5,7 @@
 static const char sMultiSioLibVer[] = "MultiSio4Sio32Load010528";
 
 #ifdef MULTI_SIO_DI_FUNC_FAST
-u32 gMultiSioIntrFuncBuf[0x120 / 4] ALIGNED(16)
-    = {}; // Interrupt Routine RAM Execution Buffer
+u32 gMultiSioIntrFuncBuf[0x120 / 4] ALIGNED(16) = {}; // Interrupt Routine RAM Execution Buffer
 #endif
 
 struct MultiSioArea gMultiSioArea = {};
@@ -40,8 +39,7 @@ void MultiSioInit(u32 connectedFlags)
 #endif
     gMultiSioArea.connectedFlags = connectedFlags;
     gMultiSioArea.sendBufCounter = 13;
-    gMultiSioArea.nextSendBufp
-        = (u16 *)&gMultiSioArea.sendBuf[0]; // Set Send Buffer Pointer
+    gMultiSioArea.nextSendBufp = (u16 *)&gMultiSioArea.sendBuf[0]; // Set Send Buffer Pointer
     gMultiSioArea.currentSendBufp = (u16 *)&gMultiSioArea.sendBuf[1];
     for (i = 0; i < 4; ++i) { // Set Receive Buffer Pointer
         gMultiSioArea.currentRecvBufp[i] = (u16 *)&gMultiSioArea.recvBuf[i][0];
@@ -73,8 +71,7 @@ u32 MultiSioMain(void *sendp, void *recvp, u32 loadRequest)
                     REG_IE &= ~INTR_FLAG_SERIAL; // Disable SIO Interrupt
                     REG_IE |= MULTI_SIO_TIMER_INTR_FLAG; // Enable Timer Interrupt
                     REG_IME = 1;
-                    ((struct SioMultiCnt *)REG_ADDR_SIOCNT)->ifEnable
-                        = 0; // Reset SIO-IFE
+                    ((struct SioMultiCnt *)REG_ADDR_SIOCNT)->ifEnable = 0; // Reset SIO-IFE
                     REG_IF = INTR_FLAG_SERIAL | MULTI_SIO_TIMER_INTR_FLAG;
                     REG_MULTI_SIO_TIMER = MULTI_SIO_TIMER_COUNT; // Timer Initialization
                     gMultiSioArea.type = SIO_MULTI_PARENT;
@@ -89,11 +86,9 @@ u32 MultiSioMain(void *sendp, void *recvp, u32 loadRequest)
             break;
     }
     ++gMultiSioArea.sendFrameCounter;
-    return gMultiSioArea.recvSuccessFlags | gMultiSioArea.loadEnable << 4
-        | gMultiSioArea.loadRequest << 5 | gMultiSioArea.loadSuccessFlag << 6
-        | (gMultiSioArea.type == SIO_MULTI_PARENT) << 7
-        | gMultiSioArea.connectedFlags << 8 | (gMultiSioArea.hardError != 0) << 12
-        | (sioCntBak.id >= MULTI_SIO_PLAYERS_MAX) << 13;
+    return gMultiSioArea.recvSuccessFlags | gMultiSioArea.loadEnable << 4 | gMultiSioArea.loadRequest << 5
+        | gMultiSioArea.loadSuccessFlag << 6 | (gMultiSioArea.type == SIO_MULTI_PARENT) << 7 | gMultiSioArea.connectedFlags << 8
+        | (gMultiSioArea.hardError != 0) << 12 | (sioCntBak.id >= MULTI_SIO_PLAYERS_MAX) << 13;
 }
 
 /*------------------------------------------------------------------*/
@@ -106,27 +101,21 @@ void MultiSioSendDataSet(void *sendp, u32 loadRequest)
     s32 i;
 
     ((struct MultiSioPacket *)gMultiSioArea.nextSendBufp)->loadRequest = loadRequest;
-    ((struct MultiSioPacket *)gMultiSioArea.nextSendBufp)->downloadSuccessFlag
-        = gSio32MultiLoadArea.downloadSuccessFlag;
-    ((struct MultiSioPacket *)gMultiSioArea.nextSendBufp)->loadSuccessFlag
-        = gMultiSioArea.loadSuccessFlag;
-    ((struct MultiSioPacket *)gMultiSioArea.nextSendBufp)->frameCounter
-        = (u8)gMultiSioArea.sendFrameCounter;
-    ((struct MultiSioPacket *)gMultiSioArea.nextSendBufp)->recvErrorFlags
-        = gMultiSioArea.connectedFlags ^ gMultiSioArea.recvSuccessFlags;
+    ((struct MultiSioPacket *)gMultiSioArea.nextSendBufp)->downloadSuccessFlag = gSio32MultiLoadArea.downloadSuccessFlag;
+    ((struct MultiSioPacket *)gMultiSioArea.nextSendBufp)->loadSuccessFlag = gMultiSioArea.loadSuccessFlag;
+    ((struct MultiSioPacket *)gMultiSioArea.nextSendBufp)->frameCounter = (u8)gMultiSioArea.sendFrameCounter;
+    ((struct MultiSioPacket *)gMultiSioArea.nextSendBufp)->recvErrorFlags = gMultiSioArea.connectedFlags ^ gMultiSioArea.recvSuccessFlags;
     ((struct MultiSioPacket *)gMultiSioArea.nextSendBufp)->checkSum = 0;
     CpuCopy32(sendp, &gMultiSioArea.nextSendBufp[2],
               MULTI_SIO_BLOCK_SIZE); // Set Send Data
-    for (i = 0; i < sizeof(struct MultiSioPacket) / 2 - 2;
-         ++i) // Calculate Checksum Send Data
+    for (i = 0; i < sizeof(struct MultiSioPacket) / 2 - 2; ++i) // Calculate Checksum Send Data
         checkSum += gMultiSioArea.nextSendBufp[i];
     ((struct MultiSioPacket *)gMultiSioArea.nextSendBufp)->checkSum = ~checkSum;
     if (gMultiSioArea.type)
         REG_MULTI_SIO_TIMER_H = 0; // Stop Timer
     gMultiSioArea.sendBufCounter = -1;
     if (gMultiSioArea.type && gMultiSioArea.startFlag)
-        REG_MULTI_SIO_TIMER_H
-            = TIMER_1CLK | TIMER_INTR_ENABLE | TIMER_ENABLE; // Start Timer
+        REG_MULTI_SIO_TIMER_H = TIMER_1CLK | TIMER_INTR_ENABLE | TIMER_ENABLE; // Start Timer
 }
 
 /*------------------------------------------------------------------*/
@@ -163,34 +152,23 @@ u32 MultiSioRecvDataCheck(void *recvp)
         if (syncRecvFlagBak[i]) // Receive Success Confirmation
             if ((s16)checkSum == -1) {
                 gMultiSioArea.recvSuccessFlags |= 1 << i;
-                gMultiSioArea.downloadSuccessFlags
-                    |= ((struct MultiSioPacket *)gMultiSioArea.recvCheckBufp[i])
-                           ->downloadSuccessFlag
-                    << i;
-                CpuCopy32(&((u8 *)gMultiSioArea.recvCheckBufp[i])[4],
-                          &((u8 *)recvp)[i * MULTI_SIO_BLOCK_SIZE],
-                          MULTI_SIO_BLOCK_SIZE);
+                gMultiSioArea.downloadSuccessFlags |= ((struct MultiSioPacket *)gMultiSioArea.recvCheckBufp[i])->downloadSuccessFlag << i;
+                CpuCopy32(&((u8 *)gMultiSioArea.recvCheckBufp[i])[4], &((u8 *)recvp)[i * MULTI_SIO_BLOCK_SIZE], MULTI_SIO_BLOCK_SIZE);
             }
         CpuFill32(0, &((u8 *)gMultiSioArea.recvCheckBufp[i])[4], MULTI_SIO_BLOCK_SIZE);
     }
-    gMultiSioArea.connectedFlags
-        |= gMultiSioArea.recvSuccessFlags; // Set Connect Complete Flag
+    gMultiSioArea.connectedFlags |= gMultiSioArea.recvSuccessFlags; // Set Connect Complete Flag
     if (gMultiSioArea.recvSuccessFlags & 1) {
 
         if (gMultiSioArea.type == SIO_MULTI_PARENT) {
             if (gMultiSioArea.recvSuccessFlags & 0x3) // Enable Load
                 if (gMultiSioArea.recvSuccessFlags == gMultiSioArea.connectedFlags)
                     gMultiSioArea.loadEnable = 1;
-            if ((gMultiSioArea.downloadSuccessFlags & 0xe)
-                == (gMultiSioArea.connectedFlags & 0xe)) // Check Load
+            if ((gMultiSioArea.downloadSuccessFlags & 0xe) == (gMultiSioArea.connectedFlags & 0xe)) // Check Load
                 gMultiSioArea.loadSuccessFlag = 1;
         } else
-            gMultiSioArea.loadSuccessFlag
-                |= ((struct MultiSioPacket *)gMultiSioArea.recvCheckBufp[0])
-                       ->loadSuccessFlag;
-        gMultiSioArea.loadRequest
-            |= ((struct MultiSioPacket *)gMultiSioArea.recvCheckBufp[0])
-                   ->loadRequest; // Request Load
+            gMultiSioArea.loadSuccessFlag |= ((struct MultiSioPacket *)gMultiSioArea.recvCheckBufp[0])->loadSuccessFlag;
+        gMultiSioArea.loadRequest |= ((struct MultiSioPacket *)gMultiSioArea.recvCheckBufp[0])->loadRequest; // Request Load
     }
     return gMultiSioArea.recvSuccessFlags;
 }
@@ -212,8 +190,7 @@ void MultiSioStart(void)
 void MultiSioStop(void)
 {
     REG_IME = 0;
-    REG_IE &= ~(INTR_FLAG_SERIAL
-                | MULTI_SIO_TIMER_INTR_FLAG); // Disable SIO & Timer Interrupt
+    REG_IE &= ~(INTR_FLAG_SERIAL | MULTI_SIO_TIMER_INTR_FLAG); // Disable SIO & Timer Interrupt
     REG_IME = 1;
     REG_SIOCNT = SIO_MULTI_MODE | MULTI_SIO_BAUD_RATE_NO; // Stop SIO
     REG_MULTI_SIO_TIMER = MULTI_SIO_TIMER_COUNT; // Stop Timer
@@ -244,39 +221,32 @@ void MultiSioIntr(void)
         gMultiSioArea.currentSendBufp = gMultiSioArea.nextSendBufp;
         gMultiSioArea.nextSendBufp = bufpTmp;
     } else if (gMultiSioArea.sendBufCounter >= 0) { // Set Send Data
-        ((struct SioMultiCnt *)REG_ADDR_SIOCNT)->data
-            = gMultiSioArea.currentSendBufp[gMultiSioArea.sendBufCounter];
+        ((struct SioMultiCnt *)REG_ADDR_SIOCNT)->data = gMultiSioArea.currentSendBufp[gMultiSioArea.sendBufCounter];
     }
     if (gMultiSioArea.sendBufCounter < (s32)(sizeof(struct MultiSioPacket) / 2 - 1))
         ++gMultiSioArea.sendBufCounter;
     // Receive Data Processing (Max. Approx. 350 Clocks/Included in wait period)
     for (i = 0; i < 4; ++i) {
-        if (recvTmp[i] == MULTI_SIO_SYNC_DATA
-            && gMultiSioArea.recvBufCounter[i]
-                > (s32)(sizeof(struct MultiSioPacket) / 2 - 3)) {
+        if (recvTmp[i] == MULTI_SIO_SYNC_DATA && gMultiSioArea.recvBufCounter[i] > (s32)(sizeof(struct MultiSioPacket) / 2 - 3)) {
             gMultiSioArea.recvBufCounter[i] = -1;
         } else {
-            gMultiSioArea.currentRecvBufp[i][gMultiSioArea.recvBufCounter[i]]
-                = recvTmp[i];
+            gMultiSioArea.currentRecvBufp[i][gMultiSioArea.recvBufCounter[i]] = recvTmp[i];
             // Store Receive Data
-            if (gMultiSioArea.recvBufCounter[i]
-                == (s32)(sizeof(struct MultiSioPacket) / 2 - 3)) {
+            if (gMultiSioArea.recvBufCounter[i] == (s32)(sizeof(struct MultiSioPacket) / 2 - 3)) {
                 bufpTmp = gMultiSioArea.lastRecvBufp[i]; // Change Receive Buffer
                 gMultiSioArea.lastRecvBufp[i] = gMultiSioArea.currentRecvBufp[i];
                 gMultiSioArea.currentRecvBufp[i] = bufpTmp;
                 gMultiSioArea.syncRecvFlag[i] = 1; // Receive Complete Flag
             }
         }
-        if (gMultiSioArea.recvBufCounter[i]
-            < (s32)(sizeof(struct MultiSioPacket) / 2 - 1))
+        if (gMultiSioArea.recvBufCounter[i] < (s32)(sizeof(struct MultiSioPacket) / 2 - 1))
             ++gMultiSioArea.recvBufCounter[i];
     }
     // Start Master Send
     if (gMultiSioArea.type == SIO_MULTI_PARENT) {
         REG_MULTI_SIO_TIMER_H = 0; // Stop Timer
         REG_SIOCNT |= SIO_ENABLE; // Restart Send
-        REG_MULTI_SIO_TIMER_H
-            = TIMER_1CLK | TIMER_INTR_ENABLE | TIMER_ENABLE; // Restart Timer
+        REG_MULTI_SIO_TIMER_H = TIMER_1CLK | TIMER_INTR_ENABLE | TIMER_ENABLE; // Restart Timer
     }
 }
 #endif
diff --git a/multi_boot/programs/subgame_loader/src/sio32_multi_load.c b/multi_boot/programs/subgame_loader/src/sio32_multi_load.c
index 775560a5e..7637e9cc7 100644
--- a/multi_boot/programs/subgame_loader/src/sio32_multi_load.c
+++ b/multi_boot/programs/subgame_loader/src/sio32_multi_load.c
@@ -19,14 +19,12 @@ u32 Sio32MultiLoadMain(u32 *progressCounterp)
 
     switch (gSio32MultiLoadArea.state) {
         case 0:
-            if (gSio32MultiLoadArea.type
-                || gSio32MultiLoadArea.frameCounter) // Slave SIO Mode switch delay wait
+            if (gSio32MultiLoadArea.type || gSio32MultiLoadArea.frameCounter) // Slave SIO Mode switch delay wait
                 gSio32MultiLoadArea.state = 1;
             break;
         case 1:
             if (gSio32MultiLoadArea.type == SIO_SCK_IN) {
-                if (gSio32MultiLoadArea.frameCounter
-                    < SIO32ML_MODE_WAIT_FRAMES) // Master wait
+                if (gSio32MultiLoadArea.frameCounter < SIO32ML_MODE_WAIT_FRAMES) // Master wait
                     break;
             } else // Slave
                 REG_SIOCNT = SIO_32BIT_MODE; // Switches to SIO mode
@@ -34,9 +32,7 @@ u32 Sio32MultiLoadMain(u32 *progressCounterp)
             REG_IF = INTR_FLAG_SERIAL | SIO32ML_TIMER_INTR_FLAG; // Resets IF
             if (gSio32MultiLoadArea.type == SIO_SCK_IN) { // Sets Master
                 REG_SIOCNT |= SIO_ENABLE; // Starts communication
-                REG_SIO32ML_TIMER = SIO32ML_TIMER_COUNT
-                    | ((TIMER_1CLK | TIMER_INTR_ENABLE | TIMER_ENABLE)
-                       << 16); // Starts timer
+                REG_SIO32ML_TIMER = SIO32ML_TIMER_COUNT | ((TIMER_1CLK | TIMER_INTR_ENABLE | TIMER_ENABLE) << 16); // Starts timer
                 REG_IME = 0;
                 REG_IE |= SIO32ML_TIMER_INTR_FLAG; // Enables timer interrupt
                 REG_IME = 1;
@@ -59,25 +55,19 @@ u32 Sio32MultiLoadMain(u32 *progressCounterp)
             if (progressCounterp)
                 *progressCounterp = dataCounter; // Set progress counter
             if (gSio32MultiLoadArea.type != SIO_SCK_IN) { // Slave
-                while (gSio32MultiLoadArea.checkSumCounter
-                       < dataCounter) // Receiving data sum check
-                    gSio32MultiLoadArea.checkSumTmp
-                        += ((s32 *)gSio32MultiLoadArea
-                                .datap)[gSio32MultiLoadArea.checkSumCounter++];
+                while (gSio32MultiLoadArea.checkSumCounter < dataCounter) // Receiving data sum check
+                    gSio32MultiLoadArea.checkSumTmp += ((s32 *)gSio32MultiLoadArea.datap)[gSio32MultiLoadArea.checkSumCounter++];
                 if (dataCounterBak > SIO32ML_BLOCK_SIZE / 4)
-                    if ((gSio32MultiLoadArea.checkSum += gSio32MultiLoadArea.checkSumTmp)
-                        == -1)
+                    if ((gSio32MultiLoadArea.checkSum += gSio32MultiLoadArea.checkSumTmp) == -1)
                         gSio32MultiLoadArea.downloadSuccessFlag = 1; // Succeeds download
             }
             if (dataCounterBak > SIO32ML_BLOCK_SIZE / 4 // Complete communication
-                || gSio32MultiLoadArea.frameCounter
-                    == 0x8C) // SIO32ML_LD_TIMEOUT_FRAMES in SDK doesn't match
+                || gSio32MultiLoadArea.frameCounter == 0x8C) // SIO32ML_LD_TIMEOUT_FRAMES in SDK doesn't match
                 gSio32MultiLoadArea.state = 3; // Load time out
             break;
         case 3:
             REG_IME = 0;
-            REG_IE &= ~(INTR_FLAG_SERIAL
-                        | SIO32ML_TIMER_INTR_FLAG); // Disables SIO and timer interrupt
+            REG_IE &= ~(INTR_FLAG_SERIAL | SIO32ML_TIMER_INTR_FLAG); // Disables SIO and timer interrupt
             REG_IME = 1;
             REG_SIOCNT = SIO_32BIT_MODE; // Stops SIO32
             *(vu32 *)REG_ADDR_SIOCNT = SIO_MULTI_MODE; // Switches to SIO mode
@@ -119,9 +109,8 @@ void Sio32MultiLoadIntr(void)
         // Process sending data
         if (gSio32MultiLoadArea.dataCounter < 0) // Sets synchronous data
             REG_SIODATA32 = SIO32ML_SYNC_DATA;
-        else if (gSio32MultiLoadArea.dataCounter
-                 < SIO32ML_BLOCK_SIZE / 4) // Sets sending
-                                           // data
+        else if (gSio32MultiLoadArea.dataCounter < SIO32ML_BLOCK_SIZE / 4) // Sets sending
+                                                                           // data
             REG_SIODATA32 = gSio32MultiLoadArea.datap[gSio32MultiLoadArea.dataCounter];
         else
             REG_SIODATA32 = gSio32MultiLoadArea.checkSum; // Sets check sum
@@ -142,8 +131,7 @@ void Sio32MultiLoadIntr(void)
         // Master starts to sending
         if (gSio32MultiLoadArea.type == SIO_SCK_IN) {
             REG_SIOCNT |= SIO_ENABLE; // Restarts sending
-            REG_SIO32ML_TIMER_H
-                = TIMER_1CLK | TIMER_INTR_ENABLE | TIMER_ENABLE; // Restarts timer
+            REG_SIO32ML_TIMER_H = TIMER_1CLK | TIMER_INTR_ENABLE | TIMER_ENABLE; // Restarts timer
         }
     }
 }
@@ -158,8 +146,7 @@ void Sio32MultiLoadInit(u32 type, void *datap)
     UNUSED s32 i; // declared in SDK
 
     REG_IME = 0;
-    REG_IE &= ~(INTR_FLAG_SERIAL
-                | SIO32ML_TIMER_INTR_FLAG); // Disables SIO and timer interrupt
+    REG_IE &= ~(INTR_FLAG_SERIAL | SIO32ML_TIMER_INTR_FLAG); // Disables SIO and timer interrupt
     REG_IME = 1;
     CpuFill32(0, &gSio32MultiLoadArea,
               sizeof(gSio32MultiLoadArea)); // Clears 32bit serial
@@ -167,8 +154,7 @@ void Sio32MultiLoadInit(u32 type, void *datap)
 #ifdef SIO32ML_DI_FUNC_FAST // Copies function
     CpuCopy32(Sio32MultiLoadIntr, gMultiSioIntrFuncBuf, sizeof(gMultiSioIntrFuncBuf));
 #endif
-    *(vu32 *)REG_ADDR_SIOCNT
-        = SIO_MULTI_MODE | MULTI_SIO_BAUD_RATE_NO; // Stops multi-play communication
+    *(vu32 *)REG_ADDR_SIOCNT = SIO_MULTI_MODE | MULTI_SIO_BAUD_RATE_NO; // Stops multi-play communication
     gSio32MultiLoadArea.datap = datap; // Sets data pointer
     gSio32MultiLoadArea.dataCounter = -1;
     if (type) { // Sets Master
diff --git a/src/background.c b/src/background.c
index e77c90e4d..b20e40fa8 100644
--- a/src/background.c
+++ b/src/background.c
@@ -21,12 +21,9 @@ static AnimCmdResult animCmd_SetSpritePriority_BG(void *, Sprite *);
 static AnimCmdResult animCmd_SetOamOrder_BG(void *, Sprite *);
 
 const AnimationCommandFunc animCmdTable_BG[12] = {
-    animCmd_GetTiles_BG,          animCmd_GetPalette_BG,
-    animCmd_JumpBack_BG,          animCmd_End_BG,
-    animCmd_PlaySoundEffect_BG,   animCmd_AddHitbox_BG,
-    animCmd_TranslateSprite_BG,   animCmd_8_BG,
-    animCmd_SetIdAndVariant_BG,   animCmd_10_BG,
-    animCmd_SetSpritePriority_BG, animCmd_SetOamOrder_BG,
+    animCmd_GetTiles_BG,        animCmd_GetPalette_BG, animCmd_JumpBack_BG,          animCmd_End_BG,
+    animCmd_PlaySoundEffect_BG, animCmd_AddHitbox_BG,  animCmd_TranslateSprite_BG,   animCmd_8_BG,
+    animCmd_SetIdAndVariant_BG, animCmd_10_BG,         animCmd_SetSpritePriority_BG, animCmd_SetOamOrder_BG,
 };
 
 #define ReadInstruction(script, cursor) ((void *)(script) + (cursor * sizeof(s32)))
@@ -56,8 +53,7 @@ void DrawBackground(Background *background)
     background->paletteOffset = mapHeader->h.palOffset;
 
     if (!(background->flags & BACKGROUND_UPDATE_PALETTE)) {
-        DmaCopy16(3, pal, gBgPalette + background->paletteOffset,
-                  palSize * sizeof(*pal));
+        DmaCopy16(3, pal, gBgPalette + background->paletteOffset, palSize * sizeof(*pal));
         gFlags |= FLAGS_UPDATE_BACKGROUND_PALETTES;
         background->flags ^= BACKGROUND_UPDATE_PALETTE;
     }
@@ -106,8 +102,7 @@ NONMATCH("asm/non_matching/engine/sub_8002B20.inc", bool32 sub_8002B20(void))
             index = (index + 1) % ARRAY_COUNT(gUnknown_03001800);
             gUnknown_03002AE4 = index;
 
-            if ((bg->flags & BACKGROUND_FLAG_20) && (bg->scrollX == bg->prevScrollX)
-                && bg->scrollY == bg->prevScrollY)
+            if ((bg->flags & BACKGROUND_FLAG_20) && (bg->scrollX == bg->prevScrollX) && bg->scrollY == bg->prevScrollY)
                 continue;
         }
         // NOTE: register r4 = sp00
@@ -148,8 +143,7 @@ NONMATCH("asm/non_matching/engine/sub_8002B20.inc", bool32 sub_8002B20(void))
                     if (bg->flags & BACKGROUND_FLAG_80) {
                         u32 r0Index = (((bg->unk20 + r5) - 1) * sp00) * sp08;
                         void *r2Ptr = CastPointer(bg->layout, r0Index);
-                        u16 *r4Ptr = CastPointer(
-                            r2Ptr, ((bg->unk1E + bg->targetTilesX) - 1) * sp08);
+                        u16 *r4Ptr = CastPointer(r2Ptr, ((bg->unk1E + bg->targetTilesX) - 1) * sp08);
 
                         // _08002C7C
                         while (r5-- != 0) {
@@ -209,8 +203,7 @@ NONMATCH("asm/non_matching/engine/sub_8002B20.inc", bool32 sub_8002B20(void))
                         }
                     } else {
                         // _08002DD4
-                        if ((affine & 1) && (sp08 == 2) && ((0x20 - bg->unk22) > 0)
-                            && ((bg->targetTilesX + bg->unk22 - 0x20) > 0)) {
+                        if ((affine & 1) && (sp08 == 2) && ((0x20 - bg->unk22) > 0) && ((bg->targetTilesX + bg->unk22 - 0x20) > 0)) {
                             s32 vR2;
                             // __08002DF8
                             r4Ptr = (u16 *)(&bg->layout[bg->unk20 * sp00] + bg->unk1E);
@@ -221,8 +214,7 @@ NONMATCH("asm/non_matching/engine/sub_8002B20.inc", bool32 sub_8002B20(void))
                                 // _08002E1C
                                 // r7 <- sp08
                                 DmaCopy16(3, r4Ptr, r7, sb);
-                                DmaCopy16(3, CastPointer(r4Ptr, sb),
-                                          CastPointer(r7, sp04), vR2);
+                                DmaCopy16(3, CastPointer(r4Ptr, sb), CastPointer(r7, sp04), vR2);
 
                                 r7 = CastPointer(r7, sp0C);
                                 r4Ptr = CastPointer(r4Ptr, (sp00 * sp08));
@@ -231,8 +223,7 @@ NONMATCH("asm/non_matching/engine/sub_8002B20.inc", bool32 sub_8002B20(void))
                         } else {
                             // __08002E74
                             u32 r0Index = bg->unk20 * sp00 * sp08;
-                            void *r1Ptr
-                                = CastPointer(bg->layout, bg->unk20 * sp00 * sp08);
+                            void *r1Ptr = CastPointer(bg->layout, bg->unk20 * sp00 * sp08);
                             void *r4Ptr = CastPointer(r1Ptr, bg->unk1E * sp08);
 
                             // r0 = r0Index
@@ -365,8 +356,7 @@ NONMATCH("asm/non_matching/engine/sub_8002B20.inc", bool32 sub_8002B20(void))
             gBgScrollRegs[bgId][0] = bg->scrollX & 0x7;
             gBgScrollRegs[bgId][1] = bg->scrollY & 0x7;
 
-            if ((bg->prevScrollX >> 3 != bg->scrollX >> 3)
-                || (bg->prevScrollY >> 3 != bg->scrollY >> 3)) {
+            if ((bg->prevScrollX >> 3 != bg->scrollX >> 3) || (bg->prevScrollY >> 3 != bg->scrollY >> 3)) {
                 if (!(bg->flags & BACKGROUND_FLAG_IS_LEVEL_MAP)) {
                     // _08003072
                     // TODO: Something'S wrong with the types here (r2 should be s16?)
@@ -777,8 +767,7 @@ static AnimCmdResult animCmd_AddHitbox_BG(void *cursor, Sprite *s)
 
     DmaCopy32(3, &cmd->hitbox, &s->hitboxes[index].index, 8);
 
-    if ((cmd->hitbox.left == 0) && (cmd->hitbox.top == 0) && (cmd->hitbox.right == 0)
-        && (cmd->hitbox.bottom == 0)) {
+    if ((cmd->hitbox.left == 0) && (cmd->hitbox.top == 0) && (cmd->hitbox.right == 0) && (cmd->hitbox.bottom == 0)) {
         s->hitboxes[index].index = -1;
     } else {
         if (s->frameFlags & SPRITE_FLAG_MASK_Y_FLIP) {
@@ -870,8 +859,7 @@ NONMATCH("asm/non_matching/engine/sub_80039E4.inc", bool32 sub_80039E4(void))
 
             if (dims != (void *)-1) {
                 u32 bgId = SPRITE_FLAG_GET(s, BG_ID);
-                void *bgVram
-                    = (void *)BG_CHAR_ADDR((gBgCntRegs[bgId] & BGCNT_CHARBASE(3)) >> 2);
+                void *bgVram = (void *)BG_CHAR_ADDR((gBgCntRegs[bgId] & BGCNT_CHARBASE(3)) >> 2);
                 void *bgBase = bgVram + ((gBgCntRegs[bgId] & BGCNT_SCREENBASE(31)) * 8);
 
                 if (gBgCntRegs[bgId] & BGCNT_256COLOR) {
@@ -991,8 +979,7 @@ NONMATCH("asm/non_matching/engine/sub_80039E4.inc", bool32 sub_80039E4(void))
 }
 END_NONMATCH
 
-void sub_8003EE4(u16 p0, s16 p1, s16 p2, s16 p3, s16 p4, s16 p5, s16 p6,
-                 BgAffineReg *affine)
+void sub_8003EE4(u16 p0, s16 p1, s16 p2, s16 p3, s16 p4, s16 p5, s16 p6, BgAffineReg *affine)
 {
     affine->pa = (COS_24_8(p0) * (s16)Div(0x10000, p1)) >> 8;
     affine->pb = (SIN_24_8(p0) * (s16)Div(0x10000, p1)) >> 8;
@@ -1047,8 +1034,7 @@ NONMATCH("asm/non_matching/engine/sub_8004010.inc", u32 sub_8004010(void))
 
             sp08 = gUnknown_03002280[bgIndex][0];
 
-            if ((bgIndex > 1)
-                && (gDispCnt & (DISPCNT_MODE_2 | DISPCNT_MODE_1 | DISPCNT_MODE_0))) {
+            if ((bgIndex > 1) && (gDispCnt & (DISPCNT_MODE_2 | DISPCNT_MODE_1 | DISPCNT_MODE_0))) {
                 // _0800408E
                 spVramPtr = (u8 *)&vramBgCtrl[sp08];
                 bgSize_TxtOrAff = (0x10 << (gBgCntRegs[bgIndex] >> 14));
@@ -1060,8 +1046,7 @@ NONMATCH("asm/non_matching/engine/sub_8004010.inc", u32 sub_8004010(void))
                     v |= v << 8;
 
                     value = ((gUnknown_03002280[bgIndex][3] - r4) * bgSize_TxtOrAff);
-                    DmaFill16(3, v, (void *)&spVramPtr[bgSize_TxtOrAff],
-                              (((s32)(value + (value >> 31))) >> 1));
+                    DmaFill16(3, v, (void *)&spVramPtr[bgSize_TxtOrAff], (((s32)(value + (value >> 31))) >> 1));
                 } else {
                     // _080040F8
                     // u8 i2 = i + 1;
@@ -1069,9 +1054,7 @@ NONMATCH("asm/non_matching/engine/sub_8004010.inc", u32 sub_8004010(void))
                         u16 v = gUnknown_03004D80[bgIndex];
                         v |= v << 8;
 
-                        DmaFill16(
-                            3, v, &spVramPtr[bgIndex * r4],
-                            (s32)(bgIndex * 4 - gUnknown_03002280[bgIndex][0] + 1));
+                        DmaFill16(3, v, &spVramPtr[bgIndex * r4], (s32)(bgIndex * 4 - gUnknown_03002280[bgIndex][0] + 1));
                     }
                 }
                 // then -> _0800422C
@@ -1097,15 +1080,12 @@ NONMATCH("asm/non_matching/engine/sub_8004010.inc", u32 sub_8004010(void))
                     // _080041D8
                     for (; r4 <= gUnknown_03002280[bgIndex][3]; r4++) {
                         // _080041F6
-                        DmaFill16(3, gUnknown_03004D80[bgIndex],
-                                  &gUnknown_03002280[bgIndex][tileSize],
-                                  ARRAY_COUNT(gUnknown_03002280[0]));
+                        DmaFill16(3, gUnknown_03004D80[bgIndex], &gUnknown_03002280[bgIndex][tileSize], ARRAY_COUNT(gUnknown_03002280[0]));
                     }
                 }
             }
             // _0800422C
-            DmaFill32(3, 0, &gUnknown_03002280[bgIndex],
-                      ARRAY_COUNT(gUnknown_03002280[bgIndex]));
+            DmaFill32(3, 0, &gUnknown_03002280[bgIndex], ARRAY_COUNT(gUnknown_03002280[bgIndex]));
         }
     }
 
@@ -1125,11 +1105,9 @@ u32 sub_8004010(void)
     u8 sp08;
 
     for (bg = 0; bg < 4; bg++) {
-        if ((gUnknown_03002280[bg][1] != gUnknown_03002280[bg][3])
-            || (gUnknown_03002280[bg][0] != gUnknown_03002280[bg][2])) {
+        if ((gUnknown_03002280[bg][1] != gUnknown_03002280[bg][3]) || (gUnknown_03002280[bg][0] != gUnknown_03002280[bg][2])) {
             // _08004056
-            void *vramBase
-                = ((void *)BG_VRAM + ((gBgCntRegs[bg] & BGCNT_SCREENBASE_MASK) << 3));
+            void *vramBase = ((void *)BG_VRAM + ((gBgCntRegs[bg] & BGCNT_SCREENBASE_MASK) << 3));
             sp08 = gUnknown_03002280[bg][0];
 
             // Potential bug?
@@ -1152,8 +1130,7 @@ u32 sub_8004010(void)
                     // __080040A2
                     u16 cb = combine(gUnknown_03004D80[bg]);
                     void *vram = (vramBase + (gUnknown_03002280[bg][1] * affineSize));
-                    s32 size = affineSize
-                        * (gUnknown_03002280[bg][3] - gUnknown_03002280[bg][1]);
+                    s32 size = affineSize * (gUnknown_03002280[bg][3] - gUnknown_03002280[bg][1]);
 
                     DmaFill16(3, cb, vram, ABS(size));
                 } else {
@@ -1162,8 +1139,7 @@ u32 sub_8004010(void)
 
                     for (; r4 <= gUnknown_03002280[bg][3]; r4++) {
                         u16 cb = combine(gUnknown_03004D80[bg]);
-                        void *vram
-                            = (vramBase + (gUnknown_03002280[bg][1] * affineSize));
+                        void *vram = (vramBase + (gUnknown_03002280[bg][1] * affineSize));
                         s32 size = (gUnknown_03002280[bg][2] - sp08) + 1;
 
                         DmaFill16(3, cb, vram, ABS(size));
@@ -1193,8 +1169,7 @@ u32 sub_8004010(void)
                 if (gUnknown_03002280[bg][2] == 0xFF) {
                     // __0800418C
                     void *vram = (vramBase + (gUnknown_03002280[bg][1] * tileSize));
-                    s32 size = tileSize
-                        * (gUnknown_03002280[bg][3] - gUnknown_03002280[bg][1]);
+                    s32 size = tileSize * (gUnknown_03002280[bg][3] - gUnknown_03002280[bg][1]);
 
                     DmaFill16(3, gUnknown_03004D80[bg], vram, size * 2);
                 } else {
@@ -1202,8 +1177,7 @@ u32 sub_8004010(void)
                     u8 r4 = gUnknown_03002280[bg][1];
 
                     for (; r4 < gUnknown_03002280[bg][3]; r4++) {
-                        void *vram
-                            = (vramBase + (gUnknown_03002280[bg][1] * (tileSize * 2)));
+                        void *vram = (vramBase + (gUnknown_03002280[bg][1] * (tileSize * 2)));
                         s32 size = tileSize * (gUnknown_03002280[bg][2] - sp08) + 1;
                         DmaFill16(3, gUnknown_03004D80[bg], vram, size * 2);
                     }
@@ -1220,8 +1194,7 @@ u32 sub_8004010(void)
 #endif
 
 // Copies the font to VRAM and displays the input text by using it as tileset.
-s32 RenderText(void *dest, const void *font, u16 x, u16 y, u8 bg, const char *text,
-               u8 palette)
+s32 RenderText(void *dest, const void *font, u16 x, u16 y, u8 bg, const char *text, u8 palette)
 {
     u8 i = 0;
 
@@ -1263,8 +1236,7 @@ static AnimCmdResult animCmd_GetPalette_BG(void *cursor, Sprite *s)
     if (!(s->frameFlags & SPRITE_FLAG_MASK_18)) {
         s32 paletteIndex = cmd->palId;
 
-        DmaCopy32(3, &gRefSpriteTables->palettes[paletteIndex * 16],
-                  &gBgPalette[s->palId * 16 + cmd->insertOffset], cmd->numColors * 2);
+        DmaCopy32(3, &gRefSpriteTables->palettes[paletteIndex * 16], &gBgPalette[s->palId * 16 + cmd->insertOffset], cmd->numColors * 2);
 
         gFlags |= FLAGS_UPDATE_BACKGROUND_PALETTES;
     }
diff --git a/src/bg_triangles.c b/src/bg_triangles.c
index 003e0736c..a8d331f61 100644
--- a/src/bg_triangles.c
+++ b/src/bg_triangles.c
@@ -73,8 +73,7 @@ typedef struct {
 // This function filters out all non-lit parts to display them normally.
 // TODO: validate type of param1!
 // (80.10%) https://decomp.me/scratch/8wQzE
-NONMATCH("asm/non_matching/engine/sub_800724C.inc",
-         void sub_800724C(u8 bg, TriParam1 *param1))
+NONMATCH("asm/non_matching/engine/sub_800724C.inc", void sub_800724C(u8 bg, TriParam1 *param1))
 {
     Unknown *u;
     Unknown sp00[5];
@@ -396,8 +395,8 @@ void sub_80075D0(u8 bg, u8 param1, u8 param2, s16 param3, u16 param4, u16 param5
     }
 }
 
-void sub_8007738(u8 bg, int_vcount minY, int_vcount maxY, u16 param3, u8 param4,
-                 u8 param5, u16 param6, u8 param7, u8 param8, s16 param9, s16 param10)
+void sub_8007738(u8 bg, int_vcount minY, int_vcount maxY, u16 param3, u8 param4, u8 param5, u16 param6, u8 param7, u8 param8, s16 param9,
+                 s16 param10)
 {
     u16 *cursor;
 
@@ -461,8 +460,7 @@ void sub_80078D4(u8 bg, int_vcount minY, int_vcount maxY, u16 offsetEven, u16 of
     }
 }
 
-void sub_8007958(u8 bg, int_vcount minY, int_vcount maxY, s16 param3, s8 param4,
-                 u16 param5, u16 param6)
+void sub_8007958(u8 bg, int_vcount minY, int_vcount maxY, s16 param3, s8 param4, u16 param5, u16 param6)
 {
     u16 *cursor;
 
diff --git a/src/bg_triangles_0.c b/src/bg_triangles_0.c
index 922bb94ff..7fdd0e5df 100644
--- a/src/bg_triangles_0.c
+++ b/src/bg_triangles_0.c
@@ -9,8 +9,7 @@
 
 // Almost identical to sub_80064A8
 // (99%) https://decomp.me/scratch/78CWY
-NONMATCH("asm/non_matching/engine/sub_8006228.inc",
-         void sub_8006228(u8 bg, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5))
+NONMATCH("asm/non_matching/engine/sub_8006228.inc", void sub_8006228(u8 bg, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5))
 {
     int_vcount *cursor;
     s16 r1, r2, r4, r5, r7, r8;
@@ -134,8 +133,7 @@ END_NONMATCH
 
 // Almost identical to sub_8006228
 // (99.04%) https://decomp.me/scratch/oriiw
-NONMATCH("asm/non_matching/engine/sub_80064A8.inc",
-         void sub_80064A8(u8 bg, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5))
+NONMATCH("asm/non_matching/engine/sub_80064A8.inc", void sub_80064A8(u8 bg, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5))
 {
     int_vcount *cursor;
     s16 r1, r2, r4, r5, r7, r8;
diff --git a/src/core.c b/src/core.c
index d47b041e5..9df847aa3 100644
--- a/src/core.c
+++ b/src/core.c
@@ -45,8 +45,7 @@ u32 gMultiSioStatusFlags = 0;
 bool8 gMultiSioEnabled = FALSE;
 
 struct Task *gTaskPtrs[] ALIGNED(16) = {};
-u32 gBgOffsetsBuffer[2][DISPLAY_HEIGHT]
-    = {}; /* TODO: Find out how this is different from gBgOffsetsHBlank */
+u32 gBgOffsetsBuffer[2][DISPLAY_HEIGHT] = {}; /* TODO: Find out how this is different from gBgOffsetsHBlank */
 u16 gObjPalette[] = {};
 struct MapHeader **gTilemapsRef = NULL;
 u32 gFrameCount = 0;
@@ -430,8 +429,7 @@ static void UpdateScreenDma(void)
         REG_IE |= INTR_FLAG_HBLANK;
         DmaFill32(3, 0, gHBlankIntrs, sizeof(gHBlankIntrs));
         if (gNumHBlankCallbacks != 0) {
-            DmaCopy32(3, gHBlankCallbacks, gHBlankIntrs,
-                      gNumHBlankCallbacks * sizeof(HBlankFunc));
+            DmaCopy32(3, gHBlankCallbacks, gHBlankIntrs, gNumHBlankCallbacks * sizeof(HBlankFunc));
         }
         gNumHBlankIntrs = gNumHBlankCallbacks;
     } else {
@@ -468,8 +466,7 @@ static void UpdateScreenDma(void)
     if (gFlags & FLAGS_10) {
         DmaFill32(3, 0, gUnknown_030053A0, sizeof(gUnknown_030053A0));
         if (gUnknown_03004D50 != 0) {
-            DmaCopy32(3, gUnknown_03001870, gUnknown_030053A0,
-                      gUnknown_03004D50 * sizeof(FuncType_030053A0));
+            DmaCopy32(3, gUnknown_03001870, gUnknown_030053A0, gUnknown_03004D50 * sizeof(FuncType_030053A0));
         }
         gUnknown_03001948 = gUnknown_03004D50;
     } else {
@@ -613,8 +610,7 @@ static void VBlankIntr(void)
 
         DmaCopy16(0, gBgOffsetsHBlank, gUnknown_03002878, gUnknown_03002A80);
         DmaSet(0, gBgOffsetsHBlank + gUnknown_03002A80, gUnknown_03002878,
-               ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16)
-                   | (gUnknown_03002A80 >> 1));
+               ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | (gUnknown_03002A80 >> 1));
 
     } else if (gUnknown_03002878) {
         REG_IE &= ~INTR_FLAG_HBLANK;
@@ -672,8 +668,7 @@ static bool32 ProcessVramGraphicsCopyQueue(void)
     struct GraphicsData_Hack *graphics;
 
     while (gVramGraphicsCopyCursor != gVramGraphicsCopyQueueIndex) {
-        graphics = (struct GraphicsData_Hack *)
-            gVramGraphicsCopyQueue[gVramGraphicsCopyCursor];
+        graphics = (struct GraphicsData_Hack *)gVramGraphicsCopyQueue[gVramGraphicsCopyCursor];
 
         if (graphics->remainingBytes != 0) {
             for (offset = 0; graphics->remainingBytes > 0; offset += COPY_CHUNK_SIZE) {
@@ -682,8 +677,7 @@ static bool32 ProcessVramGraphicsCopyQueue(void)
                     if ((graphics->src != 0) && (graphics->dest != 0))
 #endif
                     {
-                        DmaCopy16(3, (void *)(graphics->src + offset),
-                                  (void *)(graphics->dest + offset), COPY_CHUNK_SIZE);
+                        DmaCopy16(3, (void *)(graphics->src + offset), (void *)(graphics->dest + offset), COPY_CHUNK_SIZE);
                     }
                     graphics->remainingBytes -= COPY_CHUNK_SIZE;
                 } else {
@@ -691,9 +685,7 @@ static bool32 ProcessVramGraphicsCopyQueue(void)
                     if ((graphics->src != 0) && (graphics->dest != 0))
 #endif
                     {
-                        DmaCopy16(3, (void *)(graphics->src + offset),
-                                  (void *)(graphics->dest + offset),
-                                  graphics->remainingBytes);
+                        DmaCopy16(3, (void *)(graphics->src + offset), (void *)(graphics->dest + offset), graphics->remainingBytes);
                     }
                     graphics->remainingBytes = 0;
                 }
@@ -713,8 +705,7 @@ static bool32 ProcessVramGraphicsCopyQueue(void)
 static void GetInput(void)
 {
     s8 i;
-    u8 *repeatKeyCounters = gRepeatedKeysTestCounter,
-       *firstIntervals = gKeysFirstRepeatIntervals,
+    u8 *repeatKeyCounters = gRepeatedKeysTestCounter, *firstIntervals = gKeysFirstRepeatIntervals,
        *continuedHoldIntervals = gKeysContinuedRepeatIntervals;
 
     gInput = (~REG_KEYINPUT & KEYS_MASK);
diff --git a/src/game/amy_attack_heart_effect.c b/src/game/amy_attack_heart_effect.c
index c2e22fa26..0070a8f79 100644
--- a/src/game/amy_attack_heart_effect.c
+++ b/src/game/amy_attack_heart_effect.c
@@ -90,11 +90,8 @@ void CreateAmyAttackHeartEffect(u16 kind)
         return;
     }
 
-    if ((gPlayer.unk64 == SA2_CHAR_ANIM_15)
-        || (gPlayer.unk64 == SA2_CHAR_ANIM_INSTA_SHIELD_2)
-        || (gPlayer.unk64 == SA2_CHAR_ANIM_36)) {
-        struct Task *t = TaskCreate(Task_8015CE4, sizeof(AmyAtkHearts), 0x3001, 0,
-                                    TaskDestructor_8015FF0);
+    if ((gPlayer.unk64 == SA2_CHAR_ANIM_15) || (gPlayer.unk64 == SA2_CHAR_ANIM_INSTA_SHIELD_2) || (gPlayer.unk64 == SA2_CHAR_ANIM_36)) {
+        struct Task *t = TaskCreate(Task_8015CE4, sizeof(AmyAtkHearts), 0x3001, 0, TaskDestructor_8015FF0);
         AmyAtkHearts *hearts = TASK_DATA(t);
 
         hearts->unk100 = gUnknown_080D6736[gPlayer.unk64][0];
@@ -128,9 +125,7 @@ void Task_8015CE4(void)
     u8 i;
 
     // TODO: Fix horrible cast!
-    if ((!PLAYER_IS_ALIVE)
-        || ((*(u32 *)&hearts->unk100 != *(u32 *)&gPlayer.anim)
-            && (*(u32 *)&gPlayer.anim != 0x0001019F))) {
+    if ((!PLAYER_IS_ALIVE) || ((*(u32 *)&hearts->unk100 != *(u32 *)&gPlayer.anim) && (*(u32 *)&gPlayer.anim != 0x0001019F))) {
         TaskDestroy(t);
         return;
     } else {
diff --git a/src/game/assets/compressed/entities.c b/src/game/assets/compressed/entities.c
index 2a4c441d1..f093a081c 100644
--- a/src/game/assets/compressed/entities.c
+++ b/src/game/assets/compressed/entities.c
@@ -2,203 +2,121 @@
 #include "game/assets/compressed/entities.h"
 
 const u8 zone1_act1_rings[] = INCBIN_U8("data/maps/zone_1/act_1/entities/rings.bin.rl");
-const u8 zone1_act1_enemies[]
-    = INCBIN_U8("data/maps/zone_1/act_1/entities/enemies.bin.rl");
-const u8 zone1_act1_itemboxes[]
-    = INCBIN_U8("data/maps/zone_1/act_1/entities/itemboxes.bin.rl");
-const u8 zone1_act1_interactables[]
-    = INCBIN_U8("data/maps/zone_1/act_1/entities/interactables.bin.rl");
+const u8 zone1_act1_enemies[] = INCBIN_U8("data/maps/zone_1/act_1/entities/enemies.bin.rl");
+const u8 zone1_act1_itemboxes[] = INCBIN_U8("data/maps/zone_1/act_1/entities/itemboxes.bin.rl");
+const u8 zone1_act1_interactables[] = INCBIN_U8("data/maps/zone_1/act_1/entities/interactables.bin.rl");
 
 const u8 zone1_act2_rings[] = INCBIN_U8("data/maps/zone_1/act_2/entities/rings.bin.rl");
-const u8 zone1_act2_enemies[]
-    = INCBIN_U8("data/maps/zone_1/act_2/entities/enemies.bin.rl");
-const u8 zone1_act2_itemboxes[]
-    = INCBIN_U8("data/maps/zone_1/act_2/entities/itemboxes.bin.rl");
-const u8 zone1_act2_interactables[]
-    = INCBIN_U8("data/maps/zone_1/act_2/entities/interactables.bin.rl");
+const u8 zone1_act2_enemies[] = INCBIN_U8("data/maps/zone_1/act_2/entities/enemies.bin.rl");
+const u8 zone1_act2_itemboxes[] = INCBIN_U8("data/maps/zone_1/act_2/entities/itemboxes.bin.rl");
+const u8 zone1_act2_interactables[] = INCBIN_U8("data/maps/zone_1/act_2/entities/interactables.bin.rl");
 
-const u8 zone1_boss_rings[]
-    = INCBIN_U8("data/maps/zone_1/act_boss/entities/rings.bin.rl");
-const u8 zone1_boss_enemies[]
-    = INCBIN_U8("data/maps/zone_1/act_boss/entities/enemies.bin.rl");
-const u8 zone1_boss_itemboxes[]
-    = INCBIN_U8("data/maps/zone_1/act_boss/entities/itemboxes.bin.rl");
-const u8 zone1_boss_interactables[]
-    = INCBIN_U8("data/maps/zone_1/act_boss/entities/interactables.bin.rl");
+const u8 zone1_boss_rings[] = INCBIN_U8("data/maps/zone_1/act_boss/entities/rings.bin.rl");
+const u8 zone1_boss_enemies[] = INCBIN_U8("data/maps/zone_1/act_boss/entities/enemies.bin.rl");
+const u8 zone1_boss_itemboxes[] = INCBIN_U8("data/maps/zone_1/act_boss/entities/itemboxes.bin.rl");
+const u8 zone1_boss_interactables[] = INCBIN_U8("data/maps/zone_1/act_boss/entities/interactables.bin.rl");
 
 const u8 zone2_act1_rings[] = INCBIN_U8("data/maps/zone_2/act_1/entities/rings.bin.rl");
-const u8 zone2_act1_enemies[]
-    = INCBIN_U8("data/maps/zone_2/act_1/entities/enemies.bin.rl");
-const u8 zone2_act1_itemboxes[]
-    = INCBIN_U8("data/maps/zone_2/act_1/entities/itemboxes.bin.rl");
-const u8 zone2_act1_interactables[]
-    = INCBIN_U8("data/maps/zone_2/act_1/entities/interactables.bin.rl");
+const u8 zone2_act1_enemies[] = INCBIN_U8("data/maps/zone_2/act_1/entities/enemies.bin.rl");
+const u8 zone2_act1_itemboxes[] = INCBIN_U8("data/maps/zone_2/act_1/entities/itemboxes.bin.rl");
+const u8 zone2_act1_interactables[] = INCBIN_U8("data/maps/zone_2/act_1/entities/interactables.bin.rl");
 
 const u8 zone2_act2_rings[] = INCBIN_U8("data/maps/zone_2/act_2/entities/rings.bin.rl");
-const u8 zone2_act2_enemies[]
-    = INCBIN_U8("data/maps/zone_2/act_2/entities/enemies.bin.rl");
-const u8 zone2_act2_itemboxes[]
-    = INCBIN_U8("data/maps/zone_2/act_2/entities/itemboxes.bin.rl");
-const u8 zone2_act2_interactables[]
-    = INCBIN_U8("data/maps/zone_2/act_2/entities/interactables.bin.rl");
+const u8 zone2_act2_enemies[] = INCBIN_U8("data/maps/zone_2/act_2/entities/enemies.bin.rl");
+const u8 zone2_act2_itemboxes[] = INCBIN_U8("data/maps/zone_2/act_2/entities/itemboxes.bin.rl");
+const u8 zone2_act2_interactables[] = INCBIN_U8("data/maps/zone_2/act_2/entities/interactables.bin.rl");
 
-const u8 zone2_boss_rings[]
-    = INCBIN_U8("data/maps/zone_2/act_boss/entities/rings.bin.rl");
-const u8 zone2_boss_enemies[]
-    = INCBIN_U8("data/maps/zone_2/act_boss/entities/enemies.bin.rl");
-const u8 zone2_boss_itemboxes[]
-    = INCBIN_U8("data/maps/zone_2/act_boss/entities/itemboxes.bin.rl");
-const u8 zone2_boss_interactables[]
-    = INCBIN_U8("data/maps/zone_2/act_boss/entities/interactables.bin.rl");
+const u8 zone2_boss_rings[] = INCBIN_U8("data/maps/zone_2/act_boss/entities/rings.bin.rl");
+const u8 zone2_boss_enemies[] = INCBIN_U8("data/maps/zone_2/act_boss/entities/enemies.bin.rl");
+const u8 zone2_boss_itemboxes[] = INCBIN_U8("data/maps/zone_2/act_boss/entities/itemboxes.bin.rl");
+const u8 zone2_boss_interactables[] = INCBIN_U8("data/maps/zone_2/act_boss/entities/interactables.bin.rl");
 
 const u8 zone3_act1_rings[] = INCBIN_U8("data/maps/zone_3/act_1/entities/rings.bin.rl");
-const u8 zone3_act1_enemies[]
-    = INCBIN_U8("data/maps/zone_3/act_1/entities/enemies.bin.rl");
-const u8 zone3_act1_itemboxes[]
-    = INCBIN_U8("data/maps/zone_3/act_1/entities/itemboxes.bin.rl");
-const u8 zone3_act1_interactables[]
-    = INCBIN_U8("data/maps/zone_3/act_1/entities/interactables.bin.rl");
+const u8 zone3_act1_enemies[] = INCBIN_U8("data/maps/zone_3/act_1/entities/enemies.bin.rl");
+const u8 zone3_act1_itemboxes[] = INCBIN_U8("data/maps/zone_3/act_1/entities/itemboxes.bin.rl");
+const u8 zone3_act1_interactables[] = INCBIN_U8("data/maps/zone_3/act_1/entities/interactables.bin.rl");
 
 const u8 zone3_act2_rings[] = INCBIN_U8("data/maps/zone_3/act_2/entities/rings.bin.rl");
-const u8 zone3_act2_enemies[]
-    = INCBIN_U8("data/maps/zone_3/act_2/entities/enemies.bin.rl");
-const u8 zone3_act2_itemboxes[]
-    = INCBIN_U8("data/maps/zone_3/act_2/entities/itemboxes.bin.rl");
-const u8 zone3_act2_interactables[]
-    = INCBIN_U8("data/maps/zone_3/act_2/entities/interactables.bin.rl");
+const u8 zone3_act2_enemies[] = INCBIN_U8("data/maps/zone_3/act_2/entities/enemies.bin.rl");
+const u8 zone3_act2_itemboxes[] = INCBIN_U8("data/maps/zone_3/act_2/entities/itemboxes.bin.rl");
+const u8 zone3_act2_interactables[] = INCBIN_U8("data/maps/zone_3/act_2/entities/interactables.bin.rl");
 
-const u8 zone3_boss_rings[]
-    = INCBIN_U8("data/maps/zone_3/act_boss/entities/rings.bin.rl");
-const u8 zone3_boss_enemies[]
-    = INCBIN_U8("data/maps/zone_3/act_boss/entities/enemies.bin.rl");
-const u8 zone3_boss_itemboxes[]
-    = INCBIN_U8("data/maps/zone_3/act_boss/entities/itemboxes.bin.rl");
-const u8 zone3_boss_interactables[]
-    = INCBIN_U8("data/maps/zone_3/act_boss/entities/interactables.bin.rl");
+const u8 zone3_boss_rings[] = INCBIN_U8("data/maps/zone_3/act_boss/entities/rings.bin.rl");
+const u8 zone3_boss_enemies[] = INCBIN_U8("data/maps/zone_3/act_boss/entities/enemies.bin.rl");
+const u8 zone3_boss_itemboxes[] = INCBIN_U8("data/maps/zone_3/act_boss/entities/itemboxes.bin.rl");
+const u8 zone3_boss_interactables[] = INCBIN_U8("data/maps/zone_3/act_boss/entities/interactables.bin.rl");
 
 const u8 zone4_act1_rings[] = INCBIN_U8("data/maps/zone_4/act_1/entities/rings.bin.rl");
-const u8 zone4_act1_enemies[]
-    = INCBIN_U8("data/maps/zone_4/act_1/entities/enemies.bin.rl");
-const u8 zone4_act1_itemboxes[]
-    = INCBIN_U8("data/maps/zone_4/act_1/entities/itemboxes.bin.rl");
-const u8 zone4_act1_interactables[]
-    = INCBIN_U8("data/maps/zone_4/act_1/entities/interactables.bin.rl");
+const u8 zone4_act1_enemies[] = INCBIN_U8("data/maps/zone_4/act_1/entities/enemies.bin.rl");
+const u8 zone4_act1_itemboxes[] = INCBIN_U8("data/maps/zone_4/act_1/entities/itemboxes.bin.rl");
+const u8 zone4_act1_interactables[] = INCBIN_U8("data/maps/zone_4/act_1/entities/interactables.bin.rl");
 
 const u8 zone4_act2_rings[] = INCBIN_U8("data/maps/zone_4/act_2/entities/rings.bin.rl");
-const u8 zone4_act2_enemies[]
-    = INCBIN_U8("data/maps/zone_4/act_2/entities/enemies.bin.rl");
-const u8 zone4_act2_itemboxes[]
-    = INCBIN_U8("data/maps/zone_4/act_2/entities/itemboxes.bin.rl");
-const u8 zone4_act2_interactables[]
-    = INCBIN_U8("data/maps/zone_4/act_2/entities/interactables.bin.rl");
+const u8 zone4_act2_enemies[] = INCBIN_U8("data/maps/zone_4/act_2/entities/enemies.bin.rl");
+const u8 zone4_act2_itemboxes[] = INCBIN_U8("data/maps/zone_4/act_2/entities/itemboxes.bin.rl");
+const u8 zone4_act2_interactables[] = INCBIN_U8("data/maps/zone_4/act_2/entities/interactables.bin.rl");
 
-const u8 zone4_boss_rings[]
-    = INCBIN_U8("data/maps/zone_4/act_boss/entities/rings.bin.rl");
-const u8 zone4_boss_enemies[]
-    = INCBIN_U8("data/maps/zone_4/act_boss/entities/enemies.bin.rl");
-const u8 zone4_boss_itemboxes[]
-    = INCBIN_U8("data/maps/zone_4/act_boss/entities/itemboxes.bin.rl");
-const u8 zone4_boss_interactables[]
-    = INCBIN_U8("data/maps/zone_4/act_boss/entities/interactables.bin.rl");
+const u8 zone4_boss_rings[] = INCBIN_U8("data/maps/zone_4/act_boss/entities/rings.bin.rl");
+const u8 zone4_boss_enemies[] = INCBIN_U8("data/maps/zone_4/act_boss/entities/enemies.bin.rl");
+const u8 zone4_boss_itemboxes[] = INCBIN_U8("data/maps/zone_4/act_boss/entities/itemboxes.bin.rl");
+const u8 zone4_boss_interactables[] = INCBIN_U8("data/maps/zone_4/act_boss/entities/interactables.bin.rl");
 
 const u8 zone5_act1_rings[] = INCBIN_U8("data/maps/zone_5/act_1/entities/rings.bin.rl");
-const u8 zone5_act1_enemies[]
-    = INCBIN_U8("data/maps/zone_5/act_1/entities/enemies.bin.rl");
-const u8 zone5_act1_itemboxes[]
-    = INCBIN_U8("data/maps/zone_5/act_1/entities/itemboxes.bin.rl");
-const u8 zone5_act1_interactables[]
-    = INCBIN_U8("data/maps/zone_5/act_1/entities/interactables.bin.rl");
+const u8 zone5_act1_enemies[] = INCBIN_U8("data/maps/zone_5/act_1/entities/enemies.bin.rl");
+const u8 zone5_act1_itemboxes[] = INCBIN_U8("data/maps/zone_5/act_1/entities/itemboxes.bin.rl");
+const u8 zone5_act1_interactables[] = INCBIN_U8("data/maps/zone_5/act_1/entities/interactables.bin.rl");
 
 const u8 zone5_act2_rings[] = INCBIN_U8("data/maps/zone_5/act_2/entities/rings.bin.rl");
-const u8 zone5_act2_enemies[]
-    = INCBIN_U8("data/maps/zone_5/act_2/entities/enemies.bin.rl");
-const u8 zone5_act2_itemboxes[]
-    = INCBIN_U8("data/maps/zone_5/act_2/entities/itemboxes.bin.rl");
-const u8 zone5_act2_interactables[]
-    = INCBIN_U8("data/maps/zone_5/act_2/entities/interactables.bin.rl");
+const u8 zone5_act2_enemies[] = INCBIN_U8("data/maps/zone_5/act_2/entities/enemies.bin.rl");
+const u8 zone5_act2_itemboxes[] = INCBIN_U8("data/maps/zone_5/act_2/entities/itemboxes.bin.rl");
+const u8 zone5_act2_interactables[] = INCBIN_U8("data/maps/zone_5/act_2/entities/interactables.bin.rl");
 
-const u8 zone5_boss_rings[]
-    = INCBIN_U8("data/maps/zone_5/act_boss/entities/rings.bin.rl");
-const u8 zone5_boss_enemies[]
-    = INCBIN_U8("data/maps/zone_5/act_boss/entities/enemies.bin.rl");
-const u8 zone5_boss_itemboxes[]
-    = INCBIN_U8("data/maps/zone_5/act_boss/entities/itemboxes.bin.rl");
-const u8 zone5_boss_interactables[]
-    = INCBIN_U8("data/maps/zone_5/act_boss/entities/interactables.bin.rl");
+const u8 zone5_boss_rings[] = INCBIN_U8("data/maps/zone_5/act_boss/entities/rings.bin.rl");
+const u8 zone5_boss_enemies[] = INCBIN_U8("data/maps/zone_5/act_boss/entities/enemies.bin.rl");
+const u8 zone5_boss_itemboxes[] = INCBIN_U8("data/maps/zone_5/act_boss/entities/itemboxes.bin.rl");
+const u8 zone5_boss_interactables[] = INCBIN_U8("data/maps/zone_5/act_boss/entities/interactables.bin.rl");
 
 const u8 zone6_act1_rings[] = INCBIN_U8("data/maps/zone_6/act_1/entities/rings.bin.rl");
-const u8 zone6_act1_enemies[]
-    = INCBIN_U8("data/maps/zone_6/act_1/entities/enemies.bin.rl");
-const u8 zone6_act1_itemboxes[]
-    = INCBIN_U8("data/maps/zone_6/act_1/entities/itemboxes.bin.rl");
-const u8 zone6_act1_interactables[]
-    = INCBIN_U8("data/maps/zone_6/act_1/entities/interactables.bin.rl");
+const u8 zone6_act1_enemies[] = INCBIN_U8("data/maps/zone_6/act_1/entities/enemies.bin.rl");
+const u8 zone6_act1_itemboxes[] = INCBIN_U8("data/maps/zone_6/act_1/entities/itemboxes.bin.rl");
+const u8 zone6_act1_interactables[] = INCBIN_U8("data/maps/zone_6/act_1/entities/interactables.bin.rl");
 
 const u8 zone6_act2_rings[] = INCBIN_U8("data/maps/zone_6/act_2/entities/rings.bin.rl");
-const u8 zone6_act2_enemies[]
-    = INCBIN_U8("data/maps/zone_6/act_2/entities/enemies.bin.rl");
-const u8 zone6_act2_itemboxes[]
-    = INCBIN_U8("data/maps/zone_6/act_2/entities/itemboxes.bin.rl");
-const u8 zone6_act2_interactables[]
-    = INCBIN_U8("data/maps/zone_6/act_2/entities/interactables.bin.rl");
+const u8 zone6_act2_enemies[] = INCBIN_U8("data/maps/zone_6/act_2/entities/enemies.bin.rl");
+const u8 zone6_act2_itemboxes[] = INCBIN_U8("data/maps/zone_6/act_2/entities/itemboxes.bin.rl");
+const u8 zone6_act2_interactables[] = INCBIN_U8("data/maps/zone_6/act_2/entities/interactables.bin.rl");
 
-const u8 zone6_boss_rings[]
-    = INCBIN_U8("data/maps/zone_6/act_boss/entities/rings.bin.rl");
-const u8 zone6_boss_enemies[]
-    = INCBIN_U8("data/maps/zone_6/act_boss/entities/enemies.bin.rl");
-const u8 zone6_boss_itemboxes[]
-    = INCBIN_U8("data/maps/zone_6/act_boss/entities/itemboxes.bin.rl");
-const u8 zone6_boss_interactables[]
-    = INCBIN_U8("data/maps/zone_6/act_boss/entities/interactables.bin.rl");
+const u8 zone6_boss_rings[] = INCBIN_U8("data/maps/zone_6/act_boss/entities/rings.bin.rl");
+const u8 zone6_boss_enemies[] = INCBIN_U8("data/maps/zone_6/act_boss/entities/enemies.bin.rl");
+const u8 zone6_boss_itemboxes[] = INCBIN_U8("data/maps/zone_6/act_boss/entities/itemboxes.bin.rl");
+const u8 zone6_boss_interactables[] = INCBIN_U8("data/maps/zone_6/act_boss/entities/interactables.bin.rl");
 
 const u8 zone7_act1_rings[] = INCBIN_U8("data/maps/zone_7/act_1/entities/rings.bin.rl");
-const u8 zone7_act1_enemies[]
-    = INCBIN_U8("data/maps/zone_7/act_1/entities/enemies.bin.rl");
-const u8 zone7_act1_itemboxes[]
-    = INCBIN_U8("data/maps/zone_7/act_1/entities/itemboxes.bin.rl");
-const u8 zone7_act1_interactables[]
-    = INCBIN_U8("data/maps/zone_7/act_1/entities/interactables.bin.rl");
+const u8 zone7_act1_enemies[] = INCBIN_U8("data/maps/zone_7/act_1/entities/enemies.bin.rl");
+const u8 zone7_act1_itemboxes[] = INCBIN_U8("data/maps/zone_7/act_1/entities/itemboxes.bin.rl");
+const u8 zone7_act1_interactables[] = INCBIN_U8("data/maps/zone_7/act_1/entities/interactables.bin.rl");
 
 const u8 zone7_act2_rings[] = INCBIN_U8("data/maps/zone_7/act_2/entities/rings.bin.rl");
-const u8 zone7_act2_enemies[]
-    = INCBIN_U8("data/maps/zone_7/act_2/entities/enemies.bin.rl");
-const u8 zone7_act2_itemboxes[]
-    = INCBIN_U8("data/maps/zone_7/act_2/entities/itemboxes.bin.rl");
-const u8 zone7_act2_interactables[]
-    = INCBIN_U8("data/maps/zone_7/act_2/entities/interactables.bin.rl");
+const u8 zone7_act2_enemies[] = INCBIN_U8("data/maps/zone_7/act_2/entities/enemies.bin.rl");
+const u8 zone7_act2_itemboxes[] = INCBIN_U8("data/maps/zone_7/act_2/entities/itemboxes.bin.rl");
+const u8 zone7_act2_interactables[] = INCBIN_U8("data/maps/zone_7/act_2/entities/interactables.bin.rl");
 
-const u8 zone7_boss_rings[]
-    = INCBIN_U8("data/maps/zone_7/act_boss/entities/rings.bin.rl");
-const u8 zone7_boss_enemies[]
-    = INCBIN_U8("data/maps/zone_7/act_boss/entities/enemies.bin.rl");
-const u8 zone7_boss_itemboxes[]
-    = INCBIN_U8("data/maps/zone_7/act_boss/entities/itemboxes.bin.rl");
-const u8 zone7_boss_interactables[]
-    = INCBIN_U8("data/maps/zone_7/act_boss/entities/interactables.bin.rl");
+const u8 zone7_boss_rings[] = INCBIN_U8("data/maps/zone_7/act_boss/entities/rings.bin.rl");
+const u8 zone7_boss_enemies[] = INCBIN_U8("data/maps/zone_7/act_boss/entities/enemies.bin.rl");
+const u8 zone7_boss_itemboxes[] = INCBIN_U8("data/maps/zone_7/act_boss/entities/itemboxes.bin.rl");
+const u8 zone7_boss_interactables[] = INCBIN_U8("data/maps/zone_7/act_boss/entities/interactables.bin.rl");
 
-const u8 zone8_act1_rings[]
-    = INCBIN_U8("data/maps/zone_final/act_xx/entities/rings.bin.rl");
-const u8 zone8_act1_enemies[]
-    = INCBIN_U8("data/maps/zone_final/act_xx/entities/enemies.bin.rl");
-const u8 zone8_act1_itemboxes[]
-    = INCBIN_U8("data/maps/zone_final/act_xx/entities/itemboxes.bin.rl");
-const u8 zone8_act1_interactables[]
-    = INCBIN_U8("data/maps/zone_final/act_xx/entities/interactables.bin.rl");
+const u8 zone8_act1_rings[] = INCBIN_U8("data/maps/zone_final/act_xx/entities/rings.bin.rl");
+const u8 zone8_act1_enemies[] = INCBIN_U8("data/maps/zone_final/act_xx/entities/enemies.bin.rl");
+const u8 zone8_act1_itemboxes[] = INCBIN_U8("data/maps/zone_final/act_xx/entities/itemboxes.bin.rl");
+const u8 zone8_act1_interactables[] = INCBIN_U8("data/maps/zone_final/act_xx/entities/interactables.bin.rl");
 
-const u8 zone8_act2_rings[]
-    = INCBIN_U8("data/maps/zone_final/act_ta53/entities/rings.bin.rl");
-const u8 zone8_act2_enemies[]
-    = INCBIN_U8("data/maps/zone_final/act_ta53/entities/enemies.bin.rl");
-const u8 zone8_act2_itemboxes[]
-    = INCBIN_U8("data/maps/zone_final/act_ta53/entities/itemboxes.bin.rl");
-const u8 zone8_act2_interactables[]
-    = INCBIN_U8("data/maps/zone_final/act_ta53/entities/interactables.bin.rl");
+const u8 zone8_act2_rings[] = INCBIN_U8("data/maps/zone_final/act_ta53/entities/rings.bin.rl");
+const u8 zone8_act2_enemies[] = INCBIN_U8("data/maps/zone_final/act_ta53/entities/enemies.bin.rl");
+const u8 zone8_act2_itemboxes[] = INCBIN_U8("data/maps/zone_final/act_ta53/entities/itemboxes.bin.rl");
+const u8 zone8_act2_interactables[] = INCBIN_U8("data/maps/zone_final/act_ta53/entities/interactables.bin.rl");
 
-const u8 zone8_boss_rings[]
-    = INCBIN_U8("data/maps/zone_final/act_unused/entities/rings.bin.rl");
-const u8 zone8_boss_enemies[]
-    = INCBIN_U8("data/maps/zone_final/act_unused/entities/enemies.bin.rl");
-const u8 zone8_boss_itemboxes[]
-    = INCBIN_U8("data/maps/zone_final/act_unused/entities/itemboxes.bin.rl");
-const u8 zone8_boss_interactables[]
-    = INCBIN_U8("data/maps/zone_final/act_unused/entities/interactables.bin.rl");
+const u8 zone8_boss_rings[] = INCBIN_U8("data/maps/zone_final/act_unused/entities/rings.bin.rl");
+const u8 zone8_boss_enemies[] = INCBIN_U8("data/maps/zone_final/act_unused/entities/enemies.bin.rl");
+const u8 zone8_boss_itemboxes[] = INCBIN_U8("data/maps/zone_final/act_unused/entities/itemboxes.bin.rl");
+const u8 zone8_boss_interactables[] = INCBIN_U8("data/maps/zone_final/act_unused/entities/interactables.bin.rl");
diff --git a/src/game/assets/compressed/roms.c b/src/game/assets/compressed/roms.c
index 36b184f3f..f885b7227 100644
--- a/src/game/assets/compressed/roms.c
+++ b/src/game/assets/compressed/roms.c
@@ -3,9 +3,7 @@
 
 // TODO: build japan tiny chao garden
 #ifdef JAPAN
-const u8 gMultiBootProgram_TinyChaoGarden[]
-    = INCBIN_U8("data/mb_chao_garden_japan.gba.lz");
+const u8 gMultiBootProgram_TinyChaoGarden[] = INCBIN_U8("data/mb_chao_garden_japan.gba.lz");
 #else
-const u8 gMultiBootProgram_TinyChaoGarden[]
-    = INCBIN_U8("chao_garden/mb_chao_garden.gba.lz");
+const u8 gMultiBootProgram_TinyChaoGarden[] = INCBIN_U8("chao_garden/mb_chao_garden.gba.lz");
 #endif
diff --git a/src/game/boost_effect.c b/src/game/boost_effect.c
index abfb9e4bf..6ad907a4e 100644
--- a/src/game/boost_effect.c
+++ b/src/game/boost_effect.c
@@ -27,11 +27,9 @@ typedef struct {
 
 #define BE_BUFFER_SIZE 16
 
-#define BE_RING_INDEX(_bufferName, _num)                                                \
-    ((_bufferName##Index + (_num)) % (unsigned)ARRAY_COUNT(_bufferName))
+#define BE_RING_INDEX(_bufferName, _num) ((_bufferName##Index + (_num)) % (unsigned)ARRAY_COUNT(_bufferName))
 
-#define ADD_BE_INDEX(_bufferName, _num)                                                 \
-    _bufferName##Index = BE_RING_INDEX(_bufferName, (_num))
+#define ADD_BE_INDEX(_bufferName, _num) _bufferName##Index = BE_RING_INDEX(_bufferName, (_num))
 
 #define INC_BE_INDEX(_bufferName) ADD_BE_INDEX(_bufferName, 1)
 
@@ -46,10 +44,8 @@ static u8 ALIGNED(4) sPlayerPosBufferIndex = 0;
 const u8 gUnknown_080D5674[4] = { 2, 4, 6, 0 };
 
 const AnimId sCharacterPalettesBoostEffect[NUM_CHARACTERS] = {
-    SA2_ANIM_CHAR(SA2_CHAR_ANIM_BOOST_PALETTE, CHARACTER_SONIC),
-    SA2_ANIM_CHAR(SA2_CHAR_ANIM_BOOST_PALETTE, CHARACTER_CREAM),
-    SA2_ANIM_CHAR(SA2_CHAR_ANIM_BOOST_PALETTE, CHARACTER_TAILS),
-    SA2_ANIM_CHAR(SA2_CHAR_ANIM_BOOST_PALETTE, CHARACTER_KNUCKLES),
+    SA2_ANIM_CHAR(SA2_CHAR_ANIM_BOOST_PALETTE, CHARACTER_SONIC), SA2_ANIM_CHAR(SA2_CHAR_ANIM_BOOST_PALETTE, CHARACTER_CREAM),
+    SA2_ANIM_CHAR(SA2_CHAR_ANIM_BOOST_PALETTE, CHARACTER_TAILS), SA2_ANIM_CHAR(SA2_CHAR_ANIM_BOOST_PALETTE, CHARACTER_KNUCKLES),
     SA2_ANIM_CHAR(SA2_CHAR_ANIM_BOOST_PALETTE, CHARACTER_AMY),
 };
 
@@ -173,8 +169,7 @@ static inline void sub_8015B64_inline(AnimId anim, u16 palId)
         insertOffset += palId;
         numColors = *pAnim % 256u;
 
-        DmaCopy32(3, &gRefSpriteTables->palettes[animPalId * 16],
-                  &gObjPalette[insertOffset], numColors * sizeof(u16));
+        DmaCopy32(3, &gRefSpriteTables->palettes[animPalId * 16], &gObjPalette[insertOffset], numColors * sizeof(u16));
 
         gFlags |= FLAGS_UPDATE_SPRITE_PALETTES;
     }
@@ -189,8 +184,7 @@ void sub_801583C(void)
         gUnknown_030055BC = TRUE;
 
         for (i = 0; i < 3; i++) {
-            struct Task *t = TaskCreate(Task_80159C8, sizeof(PlayerActions), 0x4000, 0,
-                                        TaskDestructor_8015B50);
+            struct Task *t = TaskCreate(Task_80159C8, sizeof(PlayerActions), 0x4000, 0, TaskDestructor_8015B50);
             PlayerActions *actions = TASK_DATA(t);
 
             actions->unk5C = i;
@@ -216,8 +210,7 @@ void sub_801583C(void)
         }
 
         if (s->palId != 0) {
-            sub_8015B64_inline(sCharacterPalettesBoostEffect[gPlayer.character],
-                               s->palId);
+            sub_8015B64_inline(sCharacterPalettesBoostEffect[gPlayer.character], s->palId);
         }
     }
 }
@@ -271,8 +264,7 @@ void Task_80159C8(void)
                 u32 moveState;
 
                 SPRITE_FLAG_CLEAR(s, ROT_SCALE);
-                s->frameFlags
-                    |= (gUnknown_030054B8++) | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE;
+                s->frameFlags |= (gUnknown_030054B8++) | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE;
 
                 if (actions->plState.moveState & MOVESTATE_FACING_LEFT) {
                     transform->width = 0x100;
diff --git a/src/game/boost_mode_particles.c b/src/game/boost_mode_particles.c
index 00f9d795c..b98af0dec 100644
--- a/src/game/boost_mode_particles.c
+++ b/src/game/boost_mode_particles.c
@@ -28,8 +28,7 @@ void sub_808A234(struct Task *);
 void CreateBoostModeParticles(void)
 {
     s32 i;
-    struct Task *t = TaskCreate(sub_8089E54, sizeof(struct BoostModeParticles), 0x5050,
-                                0, sub_808A234);
+    struct Task *t = TaskCreate(sub_8089E54, sizeof(struct BoostModeParticles), 0x5050, 0, sub_808A234);
     struct BoostModeParticles *particles = TASK_DATA(t);
     Sprite *s = &particles->unk0;
 
@@ -72,39 +71,25 @@ void CreateBoostModeParticles(void)
 #else
             temp1 = gPlayer.rotation + 0xC0;
 #endif
-            particles->unk62[i][0]
-                = ((gSineTable[((gPlayer.rotation + 0x80) & 0xff) * 4 + 0x100] >> 6)
-                   * particles->unk62[i][1])
-                >> 8;
-            particles->unk62[i][1]
-                = ((gSineTable[((gPlayer.rotation + 0x80) & 0xff) * 4] >> 6)
-                   * particles->unk62[i][1])
-                >> 8;
+            particles->unk62[i][0] = ((gSineTable[((gPlayer.rotation + 0x80) & 0xff) * 4 + 0x100] >> 6) * particles->unk62[i][1]) >> 8;
+            particles->unk62[i][1] = ((gSineTable[((gPlayer.rotation + 0x80) & 0xff) * 4] >> 6) * particles->unk62[i][1]) >> 8;
 
         } else {
             temp1 = gPlayer.rotation + 0x40;
-            particles->unk62[i][0] = ((gSineTable[(gPlayer.rotation) * 4 + 0x100] >> 6)
-                                      * particles->unk62[i][1])
-                >> 8;
-            particles->unk62[i][1]
-                = ((gSineTable[(gPlayer.rotation) * 4] >> 6) * particles->unk62[i][1])
-                >> 8;
+            particles->unk62[i][0] = ((gSineTable[(gPlayer.rotation) * 4 + 0x100] >> 6) * particles->unk62[i][1]) >> 8;
+            particles->unk62[i][1] = ((gSineTable[(gPlayer.rotation) * 4] >> 6) * particles->unk62[i][1]) >> 8;
         }
 #ifndef NON_MATCHING
         {
             register s32 ip asm("ip");
             rand = ((s32(*)(void))Random)();
             ip = 0x3ff;
-            particles->unkA2[i][0]
-                = ((gSineTable[temp1 * 4 + 0x100] >> 6) * (var = (rand & ip) + 0x200))
-                >> 8;
+            particles->unkA2[i][0] = ((gSineTable[temp1 * 4 + 0x100] >> 6) * (var = (rand & ip) + 0x200)) >> 8;
             particles->unkA2[i][1] = ((gSineTable[temp1 * 4] >> 6) * var) >> 8;
         }
 #else
         rand = Random();
-        particles->unkA2[i][0]
-            = ((gSineTable[temp1 * 4 + 0x100] >> 6) * (var = (rand & 0x3ff) + 0x200))
-            >> 8;
+        particles->unkA2[i][0] = ((gSineTable[temp1 * 4 + 0x100] >> 6) * (var = (rand & 0x3ff) + 0x200)) >> 8;
         particles->unkA2[i][1] = ((gSineTable[temp1 * 4] >> 6) * var) >> 8;
 #endif
     }
@@ -148,21 +133,16 @@ void sub_8089E54(void)
             if (gPlayer.moveState & MOVESTATE_FACING_LEFT) {
                 temp = Random();
                 temp += 64;
-                particles->unkE2
-                    = (gSineTable[((gPlayer.rotation + 0x80) & 0xFF) * 4 + 0x100] >> 6)
-                    << 2;
-                particles->unkE4
-                    = (gSineTable[((gPlayer.rotation + 0x80) & 0xFF) * 4] >> 6) << 2;
+                particles->unkE2 = (gSineTable[((gPlayer.rotation + 0x80) & 0xFF) * 4 + 0x100] >> 6) << 2;
+                particles->unkE4 = (gSineTable[((gPlayer.rotation + 0x80) & 0xFF) * 4] >> 6) << 2;
             } else {
                 temp = Random();
-                particles->unkE2 = (gSineTable[(gPlayer.rotation * 4) + 0x100] >> 6)
-                    << 2;
+                particles->unkE2 = (gSineTable[(gPlayer.rotation * 4) + 0x100] >> 6) << 2;
                 particles->unkE4 = (gSineTable[gPlayer.rotation * 4] >> 6) << 2;
             }
 
             rand = (Random() & 0x3FF);
-            particles->unkA2[i][0]
-                = ((gSineTable[temp * 4 + 0x100] >> 6) * (rand + 0x600)) >> 8;
+            particles->unkA2[i][0] = ((gSineTable[temp * 4 + 0x100] >> 6) * (rand + 0x600)) >> 8;
             particles->unkA2[i][1] = ((rand + 0x600) * (gSineTable[temp * 4] >> 6)) >> 8;
         }
 
diff --git a/src/game/bosses/boss_1.c b/src/game/bosses/boss_1.c
index 660a5605c..709bbe0a2 100644
--- a/src/game/bosses/boss_1.c
+++ b/src/game/bosses/boss_1.c
@@ -160,8 +160,7 @@ static const u8 gUnknown_080D7AA2[] = {
 static const TaskMain gUnknown_080D7AA8[] = { sub_803CAC8, sub_803B018 };
 
 static const HammertankFunc gUnknown_080D7AB0[] = {
-    sub_803B17C, sub_803B264, sub_803CB84, sub_803B2F8,
-    sub_803CBA4, sub_803B4A0, sub_803B57C, sub_803B62C,
+    sub_803B17C, sub_803B264, sub_803CB84, sub_803B2F8, sub_803CBA4, sub_803B4A0, sub_803B57C, sub_803B62C,
 };
 
 static const u16 gUnknown_080D7AD0[][16] = {
@@ -179,8 +178,7 @@ void CreateEggHammerTankII(void)
 
     gPlayer.moveState |= MOVESTATE_IGNORE_INPUT;
     gPseudoRandom = gStageTime;
-    t = TaskCreate(Task_EggHammerTankIIMain, sizeof(EggHammerTankII), 0x4000, 0,
-                   TaskDestructor_EggHammerTankIIMain);
+    t = TaskCreate(Task_EggHammerTankIIMain, sizeof(EggHammerTankII), 0x4000, 0, TaskDestructor_EggHammerTankIIMain);
 
     boss = TASK_DATA(t);
     if (IS_FINAL_STAGE(gCurrentLevel)) {
@@ -190,8 +188,7 @@ void CreateEggHammerTankII(void)
         } else {
             boss->unkB0 = 4;
         }
-    } else if (gDifficultyLevel != DIFFICULTY_NORMAL
-               && gGameMode != GAME_MODE_BOSS_TIME_ATTACK) {
+    } else if (gDifficultyLevel != DIFFICULTY_NORMAL && gGameMode != GAME_MODE_BOSS_TIME_ATTACK) {
         boss->unkB0 = 6;
     } else {
         boss->unkB0 = 8;
@@ -277,8 +274,7 @@ void CreateEggHammerTankII(void)
 
     s->frameFlags = (gUnknown_030054B8++) | 0x2060;
 
-    if (!IS_FINAL_STAGE(gCurrentLevel) && gSelectedCharacter == CHARACTER_SONIC
-        && gLoadedSaveGame->unlockedLevels[0] <= gCurrentLevel) {
+    if (!IS_FINAL_STAGE(gCurrentLevel) && gSelectedCharacter == CHARACTER_SONIC && gLoadedSaveGame->unlockedLevels[0] <= gCurrentLevel) {
 
         s = &boss->cream;
         s->x = 0;
@@ -361,14 +357,11 @@ static void sub_803A8E4(EggHammerTankII *boss)
 #endif
 
             r2 = I(boss->x);
-            r0 = (((boss->unk54[0][5] * COS(boss->unk54[1][5] & (SIN_PERIOD - 1)))
-                   >> 0x17)
-                  - 8);
+            r0 = (((boss->unk54[0][5] * COS(boss->unk54[1][5] & (SIN_PERIOD - 1))) >> 0x17) - 8);
             pos.x = r2 + r0;
 
             r2 = I(boss->y);
-            r0 = ((boss->unk54[0][5] * SIN(boss->unk54[1][5] & (SIN_PERIOD - 1))
-                   >> 0x17));
+            r0 = ((boss->unk54[0][5] * SIN(boss->unk54[1][5] & (SIN_PERIOD - 1)) >> 0x17));
             pos.y = r2 + r0;
 
             pos.x -= I(gPlayer.x);
@@ -389,17 +382,14 @@ static void sub_803A8E4(EggHammerTankII *boss)
         sub_800CA20(s, pos.x, pos.y, 1, &gPlayer);
         Player_UpdateHomingPosition(QS(pos.x), QS(pos.y));
 
-        if (boss->unkB1 == 0
-            || ((gPlayer.speedAirY > 0 || !(gPlayer.moveState & 2))
-                && (gPlayer.moveState & 2))) {
+        if (boss->unkB1 == 0 || ((gPlayer.speedAirY > 0 || !(gPlayer.moveState & 2)) && (gPlayer.moveState & 2))) {
             if (sub_800C320(s, pos.x, pos.y, 0, &gPlayer) == 1) {
                 sub_803B6AC(boss);
             } else {
                 sub_800CA20(s, pos.x, pos.y, 0, &gPlayer);
             }
 
-            if (boss->unkB1 == 0
-                && IsColliding_Cheese(s, pos.x, pos.y, 0, &gPlayer) == TRUE) {
+            if (boss->unkB1 == 0 && IsColliding_Cheese(s, pos.x, pos.y, 0, &gPlayer) == TRUE) {
                 sub_803B6AC(boss);
             }
         }
@@ -479,9 +469,7 @@ static void sub_803AA40(void)
             if (!IS_FINAL_STAGE(gCurrentLevel)) {
                 if (gGameMode == GAME_MODE_BOSS_TIME_ATTACK) {
                     CreateTimeAttackResults(gCourseTime);
-                } else if (gSelectedCharacter == CHARACTER_SONIC
-                           && gLoadedSaveGame->unlockedLevels[CHARACTER_SONIC]
-                               <= gCurrentLevel) {
+                } else if (gSelectedCharacter == CHARACTER_SONIC && gLoadedSaveGame->unlockedLevels[CHARACTER_SONIC] <= gCurrentLevel) {
                     CreateStageResultsCutscene(0);
                 } else {
                     CreateStageResults(gCourseTime, gRingCount, gSpecialRingCount);
@@ -543,12 +531,8 @@ static void sub_803AC2C(EggHammerTankII *boss)
     y = I(boss->y) - gCamera.y;
 
     for (i = 6; i >= 0; i--) {
-        s->x = x
-            + ((COS((boss->unkC[1][i] + 80) & (SIN_PERIOD - 1)) * boss->unkC[0][i])
-               >> 23);
-        s->y = y
-            + ((SIN((boss->unkC[1][i] + 80) & (SIN_PERIOD - 1)) * boss->unkC[0][i])
-               >> 23);
+        s->x = x + ((COS((boss->unkC[1][i] + 80) & (SIN_PERIOD - 1)) * boss->unkC[0][i]) >> 23);
+        s->y = y + ((SIN((boss->unkC[1][i] + 80) & (SIN_PERIOD - 1)) * boss->unkC[0][i]) >> 23);
         DisplaySprite(s);
 
         if (boss->unkB0 != 0) {
@@ -558,10 +542,8 @@ static void sub_803AC2C(EggHammerTankII *boss)
     }
 
     s = &boss->hand;
-    s->x = x
-        + ((COS((boss->unkC[1][7] + 80) & (SIN_PERIOD - 1)) * boss->unkC[0][7]) >> 23);
-    s->y = y
-        + ((SIN((boss->unkC[1][7] + 80) & (SIN_PERIOD - 1)) * boss->unkC[0][7]) >> 23);
+    s->x = x + ((COS((boss->unkC[1][7] + 80) & (SIN_PERIOD - 1)) * boss->unkC[0][7]) >> 23);
+    s->y = y + ((SIN((boss->unkC[1][7] + 80) & (SIN_PERIOD - 1)) * boss->unkC[0][7]) >> 23);
 
     x3 = s->x;
     y3 = s->y;
@@ -585,23 +567,19 @@ static void sub_803AC2C(EggHammerTankII *boss)
     s->oamFlags = SPRITE_OAM_ORDER(25);
 
     for (i = 0; i < 6; i++) {
-        s->x = x - 8
-            + ((COS((boss->unk54[1][i]) & (SIN_PERIOD - 1)) * boss->unk54[0][i]) >> 23);
-        s->y = y
-            + ((SIN((boss->unk54[1][i]) & (SIN_PERIOD - 1)) * boss->unk54[0][i]) >> 23);
+        s->x = x - 8 + ((COS((boss->unk54[1][i]) & (SIN_PERIOD - 1)) * boss->unk54[0][i]) >> 23);
+        s->y = y + ((SIN((boss->unk54[1][i]) & (SIN_PERIOD - 1)) * boss->unk54[0][i]) >> 23);
         DisplaySprite(s);
     }
 
     s = &boss->hammer;
     transform = &boss->transform;
 
-    s->x = x - 8
-        + ((COS((boss->unk54[1][5]) & (SIN_PERIOD - 1)) * boss->unk54[0][5]) >> 23);
+    s->x = x - 8 + ((COS((boss->unk54[1][5]) & (SIN_PERIOD - 1)) * boss->unk54[0][5]) >> 23);
     s->y = y + ((SIN((boss->unk54[1][5]) & (SIN_PERIOD - 1)) * boss->unk54[0][5]) >> 23);
     s->frameFlags = gUnknown_030054B8++ | 0x2060;
 
-    transform->rotation
-        = (boss->unk54[1][5] - (boss->unk94) + boss->unk54[1][5]) & (SIN_PERIOD - 1);
+    transform->rotation = (boss->unk54[1][5] - (boss->unk94) + boss->unk54[1][5]) & (SIN_PERIOD - 1);
     if (transform->rotation != 768) {
         transform->rotation += 10;
     }
@@ -686,8 +664,7 @@ static void sub_803B17C(EggHammerTankII *boss)
     boss->unk54[1][0] = boss->unk94;
 
     for (i = 1; i < ARRAY_COUNT(boss->unk54[0]); i++) {
-        boss->unk54[1][i]
-            += I((boss->unk54[1][i - 1] - boss->unk54[1][i]) * gUnknown_080D7A78[i + 8]);
+        boss->unk54[1][i] += I((boss->unk54[1][i - 1] - boss->unk54[1][i]) * gUnknown_080D7A78[i + 8]);
     }
 
     boss->timer -= 1;
@@ -753,16 +730,11 @@ static void sub_803B2F8(EggHammerTankII *boss)
     boss->unk54[1][0] = boss->unk94;
 
     for (i = 1; i < 8; i++) {
-        boss->unk54[1][i]
-            += I((boss->unk54[1][i - 1] - boss->unk54[1][i]) * gUnknown_080D7A78[i]);
+        boss->unk54[1][i] += I((boss->unk54[1][i - 1] - boss->unk54[1][i]) * gUnknown_080D7A78[i]);
     }
 
-    x = I(boss->x)
-        + ((boss->unk54[0][7] * COS((boss->unk54[1][7] - val) & (SIN_PERIOD - 1)))
-           >> 0x17);
-    y = I(boss->y)
-        + ((boss->unk54[0][7] * SIN((boss->unk54[1][7] - val) & (SIN_PERIOD - 1)))
-           >> 0x17);
+    x = I(boss->x) + ((boss->unk54[0][7] * COS((boss->unk54[1][7] - val) & (SIN_PERIOD - 1))) >> 0x17);
+    y = I(boss->y) + ((boss->unk54[0][7] * SIN((boss->unk54[1][7] - val) & (SIN_PERIOD - 1))) >> 0x17);
 
     result = sub_801E6D4(y, x, 1, 8, NULL, sub_801EE64);
 
@@ -772,8 +744,7 @@ static void sub_803B2F8(EggHammerTankII *boss)
         boss->unkA0 = 4;
 
         result = sub_8004418(SIN((boss->unk54[1][7] + val) & (SIN_PERIOD - 1)) >> 6,
-                             (COS((boss->unk54[1][7] + val) & (SIN_PERIOD - 1)) >> 6)
-                                 + result);
+                             (COS((boss->unk54[1][7] + val) & (SIN_PERIOD - 1)) >> 6) + result);
 
         for (i = 0; i < 8; i++) {
             boss->unk54[1][i] = result;
@@ -798,8 +769,7 @@ static void sub_803B4A0(EggHammerTankII *boss)
     boss->unk54[1][0] = boss->unk94;
 
     for (i = 1; i < 8; i++) {
-        boss->unk54[1][i]
-            += I((boss->unk54[1][i - 1] - boss->unk54[1][i]) * gUnknown_080D7A78[i + 8]);
+        boss->unk54[1][i] += I((boss->unk54[1][i - 1] - boss->unk54[1][i]) * gUnknown_080D7A78[i + 8]);
     }
 
     for (i = 0, val = 1; i < 5; i++) {
@@ -868,8 +838,7 @@ static void sub_803B62C(EggHammerTankII *boss)
 
     boss->unk54[1][0] = boss->unk94;
     for (i = 1; i < 8; i++) {
-        boss->unk54[1][i]
-            += I((boss->unk54[1][i - 1] - boss->unk54[1][i]) * gUnknown_080D7A78[i]);
+        boss->unk54[1][i] += I((boss->unk54[1][i - 1] - boss->unk54[1][i]) * gUnknown_080D7A78[i]);
     }
 
     boss->timer--;
@@ -980,8 +949,7 @@ static void sub_803B84C(EggHammerTankII *boss)
             unkB4->unk278[i][0] += unkB4->unk278[i][2];
             unkB4->unk278[i][1] += unkB4->unk278[i][3];
 
-            result1 = sub_801F100(I(unkB4->unk278[i][1]), I(unkB4->unk278[i][0]), 1, 8,
-                                  sub_801EC3C);
+            result1 = sub_801F100(I(unkB4->unk278[i][1]), I(unkB4->unk278[i][0]), 1, 8, sub_801EC3C);
             if (result1 < 0) {
                 s32 r0;
                 if (unkB4->unk278[i][4] != 0) {
@@ -1028,8 +996,7 @@ static void sub_803B84C(EggHammerTankII *boss)
 
         unkB4->unkF8[i][1] += unkB4->unkF8[i][3];
 
-        result = sub_801F100(I(unkB4->unkF8[i][1]) + 5, I(unkB4->unkF8[i][0]), 1, 8,
-                             sub_801EC3C);
+        result = sub_801F100(I(unkB4->unkF8[i][1]) + 5, I(unkB4->unkF8[i][0]), 1, 8, sub_801EC3C);
 
         if (result < 0) {
             if (unkB4->unkF8[i][4] != 0) {
@@ -1053,8 +1020,7 @@ static void sub_803B84C(EggHammerTankII *boss)
 
         unkB4->unk1B8[i][1] += unkB4->unk1B8[i][3];
 
-        result = sub_801F100(I(unkB4->unk1B8[i][1]) + 5, I(unkB4->unk1B8[i][0]), 1, 8,
-                             sub_801EC3C);
+        result = sub_801F100(I(unkB4->unk1B8[i][1]) + 5, I(unkB4->unk1B8[i][0]), 1, 8, sub_801EC3C);
 
         if (result < 0) {
             if (unkB4->unk1B8[i][4] != 0) {
@@ -1189,11 +1155,9 @@ static void sub_803BDB8(void)
         unkB4->unkF8[i][0] = Q(unkB4->unkF8[i][0]);
         unkB4->unkF8[i][1] = Q(unkB4->unkF8[i][1]);
 
-        unkB4->unkF8[i][2] = boss->speedX
-            + ((COS(boss->unkC[1][i] & (SIN_PERIOD - 1)) * boss->unkC[0][i]) >> 18);
+        unkB4->unkF8[i][2] = boss->speedX + ((COS(boss->unkC[1][i] & (SIN_PERIOD - 1)) * boss->unkC[0][i]) >> 18);
 
-        unkB4->unkF8[i][3]
-            = (SIN(boss->unkC[1][i] & (SIN_PERIOD - 1)) * boss->unkC[0][i]) >> 18;
+        unkB4->unkF8[i][3] = (SIN(boss->unkC[1][i] & (SIN_PERIOD - 1)) * boss->unkC[0][i]) >> 18;
         unkB4->unkF8[i][4] = 3;
         unkB4->unkF8[i][5] = 30;
     }
@@ -1201,26 +1165,17 @@ static void sub_803BDB8(void)
     x = boss->x;
     y = boss->y;
     for (i = 0; i < 8; i++) {
-        unkB4->unk1B8[i][0] = x
-            + ((COS((boss->unk54[1][i] + 768) & (SIN_PERIOD - 1)) * boss->unk54[0][i])
-               >> 0xF);
-        unkB4->unk1B8[i][1] = y
-            + ((SIN((boss->unk54[1][i] + 768) & (SIN_PERIOD - 1)) * boss->unk54[0][i])
-               >> 0xf);
-        unkB4->unk1B8[i][2] = boss->speedX
-            + ((COS((boss->unk54[1][i]) & (SIN_PERIOD - 1)) * boss->unk54[0][i])
-               >> 0x12);
-        unkB4->unk1B8[i][3]
-            = (SIN(boss->unk54[1][i] & (SIN_PERIOD - 1)) * boss->unk54[0][i]) >> 18;
+        unkB4->unk1B8[i][0] = x + ((COS((boss->unk54[1][i] + 768) & (SIN_PERIOD - 1)) * boss->unk54[0][i]) >> 0xF);
+        unkB4->unk1B8[i][1] = y + ((SIN((boss->unk54[1][i] + 768) & (SIN_PERIOD - 1)) * boss->unk54[0][i]) >> 0xf);
+        unkB4->unk1B8[i][2] = boss->speedX + ((COS((boss->unk54[1][i]) & (SIN_PERIOD - 1)) * boss->unk54[0][i]) >> 0x12);
+        unkB4->unk1B8[i][3] = (SIN(boss->unk54[1][i] & (SIN_PERIOD - 1)) * boss->unk54[0][i]) >> 18;
         unkB4->unk1B8[i][4] = 3;
         unkB4->unk1B8[i][5] = 30;
     }
 
     transform = &boss->transform;
-    unkB4->unkD0
-        = x + ((COS(boss->unk54[1][5] & (SIN_PERIOD - 1)) * boss->unk54[0][5]) >> 15);
-    unkB4->unkD4
-        = y + ((SIN(boss->unk54[1][5] & (SIN_PERIOD - 1)) * boss->unk54[0][5]) >> 15);
+    unkB4->unkD0 = x + ((COS(boss->unk54[1][5] & (SIN_PERIOD - 1)) * boss->unk54[0][5]) >> 15);
+    unkB4->unkD4 = y + ((SIN(boss->unk54[1][5] & (SIN_PERIOD - 1)) * boss->unk54[0][5]) >> 15);
     unkB4->unkD8 = boss->speedX;
     unkB4->unkDC = boss->speedY - 2048;
     unkB4->unk2D8 = transform->rotation;
@@ -1581,8 +1536,7 @@ static void sub_803CB18(EggHammerTankII *boss)
     boss->unkC[1][0] = boss->unk50;
 
     for (i = 1; i < ARRAY_COUNT(boss->unkC[0]); i++) {
-        boss->unkC[1][i] += I(
-            (boss->unkC[1][i - 1] - boss->unkC[1][i]) * gUnknown_080D7A28[i] - Q(12));
+        boss->unkC[1][i] += I((boss->unkC[1][i - 1] - boss->unkC[1][i]) * gUnknown_080D7A28[i] - Q(12));
     }
 }
 
diff --git a/src/game/bosses/boss_2.c b/src/game/bosses/boss_2.c
index 615f03d05..22907fe39 100644
--- a/src/game/bosses/boss_2.c
+++ b/src/game/bosses/boss_2.c
@@ -117,10 +117,8 @@ static void Task_BombExplosionMain(void);
 
 static const s8 sBodyWheelPositionsX[] = { -28, 2, 32 };
 
-static const u8 sExplosionTimes[]
-    = { 90, 60, 30, 90, 60, 90, 60, 30, 30, 60, 90, 30, 60, 30, 90, 30,
-        0,  0,  1,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  1,  0,  0,
-        0,  1,  0,  0,  1,  0,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0 };
+static const u8 sExplosionTimes[] = { 90, 60, 30, 90, 60, 90, 60, 30, 30, 60, 90, 30, 60, 30, 90, 30, 0, 0, 1, 0, 0, 0, 0, 0,
+                                      1,  0,  0,  0,  0,  1,  0,  0,  0,  1,  0,  0,  1,  0,  1,  1,  0, 0, 0, 0, 0, 0, 0, 0 };
 
 static const s8 sExplositionPositions[][2] = {
     { 0, 0 }, { -16, 16 }, { -16, -16 }, { 16, 16 }, { 16, -16 },
@@ -153,8 +151,7 @@ static const u16 gUnknown_080D7B4E[][2] = {
     },
 };
 
-static const BossFunction sBossModeTasks[]
-    = { HandleCannonBombTrigger, HandleCannonlessBombTrigger };
+static const BossFunction sBossModeTasks[] = { HandleCannonBombTrigger, HandleCannonlessBombTrigger };
 
 static const u16 gUnknown_080D7B70[][16] = {
     INCBIN_U16("graphics/80D7B70.gbapal"),
@@ -172,8 +169,7 @@ void CreateEggBomberTank(void)
 
     sub_8039ED4();
     gPseudoRandom = gStageTime;
-    t = TaskCreate(Task_EggBomberTankIntro, sizeof(EggBomberTank), 0x4000, 0,
-                   TaskDestructor_EggBomberTankMain);
+    t = TaskCreate(Task_EggBomberTankIntro, sizeof(EggBomberTank), 0x4000, 0, TaskDestructor_EggBomberTankMain);
     boss = TASK_DATA(t);
 
     if (gDifficultyLevel != 0 && gGameMode != GAME_MODE_BOSS_TIME_ATTACK) {
@@ -378,8 +374,7 @@ static void Task_TransitionToEscapeSequence(void)
     }
 
     if (x < 50) {
-        CreateEggmobileEscapeSequence(I(boss->x) - gCamera.x - 4,
-                                      I(boss->y) - gCamera.y - 0x21, 0x2000);
+        CreateEggmobileEscapeSequence(I(boss->x) - gCamera.x - 4, I(boss->y) - gCamera.y - 0x21, 0x2000);
         gCurTask->main = Task_WaitForBossOffScreen;
     }
 }
@@ -544,8 +539,7 @@ static void UpdatePosition(EggBomberTank *boss)
             boss->wheelPositions[idx][0] += boss->unk3C[idx][0];
             boss->wheelPositions[idx][1] += boss->unk3C[idx][1];
 
-            ground = sub_801E4E4(I(boss->wheelPositions[idx][1]) - 8,
-                                 I(boss->wheelPositions[idx][0]), 1, 8, 0, sub_801EE64);
+            ground = sub_801E4E4(I(boss->wheelPositions[idx][1]) - 8, I(boss->wheelPositions[idx][0]), 1, 8, 0, sub_801EE64);
             if (ground < 0) {
                 boss->wheelPositions[idx][1] += QS(ground);
                 boss->unk3C[idx][0] -= 0x20;
@@ -681,10 +675,8 @@ static u8 RenderCannon(EggBomberTank *boss)
         explosion.unk4 = 0;
 
         for (i = 0; i < 5; i++) {
-            explosion.spawnX
-                = (I(boss->unk54) - gCamera.x) + sExplositionPositions[i][0];
-            explosion.spawnY
-                = (I(boss->unk58) - gCamera.y) + sExplositionPositions[i][1];
+            explosion.spawnX = (I(boss->unk54) - gCamera.x) + sExplositionPositions[i][0];
+            explosion.spawnY = (I(boss->unk58) - gCamera.y) + sExplositionPositions[i][1];
             CreateBossParticleWithExplosionUpdate(&explosion, &boss->unk76);
         }
         ret = 1;
@@ -762,8 +754,7 @@ static void HandleCannonBombTrigger(EggBomberTank *boss)
             boss->timer = 12;
             gCurTask->main = Task_BomberTankCannonReload;
             m4aSongNumStart(SE_241);
-            CreateBomberTankBomb(boss, x, y, boss->cannonAngle, 64,
-                                 sExplosionTimes[PseudoRandom32() & 0xF]);
+            CreateBomberTankBomb(boss, x, y, boss->cannonAngle, 64, sExplosionTimes[PseudoRandom32() & 0xF]);
 
         } else {
             boss->timer--;
@@ -895,8 +886,7 @@ static u8 CheckBossDestruction(EggBomberTank *boss, Player *player)
     Player_UpdateHomingPosition(boss->x, boss->y);
 
     if (boss->bossHitTimer == 0) {
-        if (IsColliding_Cheese(s, I(boss->x), I(boss->y), 0, player) == 1
-            && boss->cannonHealth == 0) {
+        if (IsColliding_Cheese(s, I(boss->x), I(boss->y), 0, player) == 1 && boss->cannonHealth == 0) {
             ret = HandleBossHit(boss);
         }
     }
@@ -942,8 +932,7 @@ static void CreateDestructionExplosions(EggBomberTank *boss)
 
             init.rotation = PseudoRandom32() & (SIN_PERIOD - 1);
             init.speed = 0x600;
-            init.vram = (void *)OBJ_VRAM0
-                + (gTileInfoBossScrews[boss->unk75][0] * TILE_SIZE_4BPP);
+            init.vram = (void *)OBJ_VRAM0 + (gTileInfoBossScrews[boss->unk75][0] * TILE_SIZE_4BPP);
             init.anim = gTileInfoBossScrews[boss->unk75][1];
             init.variant = gTileInfoBossScrews[boss->unk75][2];
             init.unk4 = 1;
@@ -1085,8 +1074,7 @@ static void HandleCannonlessBombTrigger(EggBomberTank *boss)
 {
     RenderCannon(boss);
     if (boss->timer == 0) {
-        CreateBomberTankBomb(boss, boss->x - 0x800, boss->y - 0x1600, 0x200, 8,
-                             sExplosionTimes[PseudoRandom32() & 0xF]);
+        CreateBomberTankBomb(boss, boss->x - 0x800, boss->y - 0x1600, 0x200, 8, sExplosionTimes[PseudoRandom32() & 0xF]);
         boss->timer = 113;
     } else {
         if (boss->timer > 150) {
@@ -1115,11 +1103,9 @@ UNUSED static void sub_803E798(EggBomberTank *boss)
     }
 }
 
-static void CreateBomberTankBomb(EggBomberTank *boss, s32 x, s32 y, u16 angle, u16 p5,
-                                 u8 explosionTime)
+static void CreateBomberTankBomb(EggBomberTank *boss, s32 x, s32 y, u16 angle, u16 p5, u8 explosionTime)
 {
-    struct Task *t = TaskCreate(Task_EggBomberTankBombExplosion,
-                                sizeof(EggBomberTankBomb), 0x6100, 0, NULL);
+    struct Task *t = TaskCreate(Task_EggBomberTankBombExplosion, sizeof(EggBomberTankBomb), 0x6100, 0, NULL);
     Sprite *s;
     EggBomberTankBomb *bomb = TASK_DATA(t);
     bomb->x = x - QS(gCamera.x);
@@ -1163,8 +1149,7 @@ static void Task_EggBomberTankBombExplosion(void)
         bomb->y += bomb->speedY + QS(gCamera.dy);
     }
 
-    ground = sub_801E4E4(I(bomb->y) + 0xC + gCamera.y, I(bomb->x) + gCamera.x, 1, 8,
-                         &unusedByte, sub_801EE64);
+    ground = sub_801E4E4(I(bomb->y) + 0xC + gCamera.y, I(bomb->x) + gCamera.x, 1, 8, &unusedByte, sub_801EE64);
     if (ground < 0) {
         bomb->y += QS(ground);
         bomb->speedY = Div(-(bomb->speedY * 8), 10);
@@ -1175,8 +1160,7 @@ static void Task_EggBomberTankBombExplosion(void)
 
     if (bomb->boss->unk70) {
         // If hit player
-        if (sub_800CA20(s, I(bomb->x) + gCamera.x, I(bomb->y) + gCamera.y, 0, &gPlayer)
-            == 1) {
+        if (sub_800CA20(s, I(bomb->x) + gCamera.x, I(bomb->y) + gCamera.y, 0, &gPlayer) == 1) {
             if (bomb->boss->bossHitTimer == 0) {
                 Sprite *s = &bomb->boss->pilot;
                 bomb->boss->unk73 = 30;
@@ -1201,16 +1185,14 @@ static void Task_EggBomberTankBombExplosion(void)
             graphics.anim = SA2_ANIM_EXPLOSION_1;
             graphics.variant = 0;
 
-            CreateBombExplosion(bomb->boss, I(bomb->x) + gCamera.x,
-                                I(bomb->y) + gCamera.y, graphics);
+            CreateBombExplosion(bomb->boss, I(bomb->x) + gCamera.x, I(bomb->y) + gCamera.y, graphics);
         } else {
             m4aSongNumStart(SE_243);
             graphics.vram = s->graphics.dest + 0x740;
             graphics.anim = SA2_ANIM_EXPLOSION_2;
             graphics.variant = 0;
 
-            CreateBombExplosion(bomb->boss, I(bomb->x) + gCamera.x,
-                                I(bomb->y) + 0xF + ground + gCamera.y, graphics);
+            CreateBombExplosion(bomb->boss, I(bomb->x) + gCamera.x, I(bomb->y) + 0xF + ground + gCamera.y, graphics);
         }
 
         gCurTask->main = Task_EggBomberTankBombDestroy;
@@ -1220,8 +1202,7 @@ static void Task_EggBomberTankBombExplosion(void)
     }
 }
 
-static void CreateBombExplosion(EggBomberTank *boss, s32 x, s32 y,
-                                ExplosionGraphics graphics)
+static void CreateBombExplosion(EggBomberTank *boss, s32 x, s32 y, ExplosionGraphics graphics)
 {
     struct Task *t;
     Sprite *s;
@@ -1257,9 +1238,7 @@ static void Task_BombExplosionMain(void)
     s->y = explosion->y;
 
     if (explosion->boss->unk70 != 0) {
-        if (sub_800CA20(s, explosion->x + gCamera.x, explosion->y + gCamera.y, 0,
-                        &gPlayer)
-            == 1) {
+        if (sub_800CA20(s, explosion->x + gCamera.x, explosion->y + gCamera.y, 0, &gPlayer) == 1) {
             if (explosion->boss->bossHitTimer == 0) {
                 Sprite *s = &explosion->boss->pilot;
                 explosion->boss->unk73 = 30;
diff --git a/src/game/bosses/boss_3.c b/src/game/bosses/boss_3.c
index 2b613f954..e8038254e 100644
--- a/src/game/bosses/boss_3.c
+++ b/src/game/bosses/boss_3.c
@@ -146,59 +146,41 @@ const s16 gUnknown_080D7BDC[3] = { Q(22), Q(13), -Q(16) };
 const s16 sTotemDiscYs[3] = { -Q(32), -Q(48), -Q(64) };
 
 const EggTotemDataA gUnknown_080D7BE8[] = {
-    { 0x1, 0x200, 0x200, 0 }, { 0x20, 0, 0, 0 },        { 0x40, 0, 0x100, 0 },
-    { 0x3c, 0, 0, 0 },        { 0x1, 0x200, 0x100, 0 }, { 0x3f, 0, 0x100, 0 },
-    { 0x20, 0, 0, 0 },        { 0, 0, 0, 0 },           { 0x1, 0x200, 0x280, 0 },
-    { 0x20, 0, 0, 0 },        { 0x60, 0, 0x140, 0 },    { 0x3c, 0, 0, 0 },
-    { 0x1, 0x200, 0x140, 0 }, { 0x5f, 0, 0x140, 0 },    { 0x20, 0, 0, 0 },
-    { 0, 0, 0, 0 },           { 0x1, 0x200, 0x280, 0 }, { 0x20, 0, 0, 0 },
-    { 0x80, 0, 0x140, 0 },    { 0x3c, 0, 0, 0 },        { 0x1, 0x200, 0x140, 0 },
-    { 0x7f, 0, 0x140, 0 },    { 0x20, 0, 0, 0 },        { 0, 0, 0, 0 },
-    { 0x1, 0x200, 0x200, 0 }, { 0x20, 0, 0, 0 },        { 0x80, 0, 0x100, 0 },
-    { 0x3c, 0, 0, 0 },        { 0x1, 0x200, 0x100, 0 }, { 0x7f, 0, 0x100, 0 },
-    { 0x20, 0, 0, 0 },        { 0, 0, 0, 0 },           { 0x1, 0x200, 0x190, 0 },
-    { 0x20, 0, 0, 0 },        { 0x80, 0, 0x90, 0 },     { 0x40, 0x8, 0xc8, 0 },
-    { 0x80, 0, 0x90, 0 },     { 0x20, 0, 0, 0 },        { 0, 0, 0, 0 },
-    { 0x1, 0x200, 0x190, 0 }, { 0x20, 0, 0, 0 },        { 0x80, 0, 0x120, 0 },
-    { 0x40, 0x3f8, 0xca, 0 }, { 0x80, 0, 0x120, 0 },    { 0x20, 0, 0, 0 },
-    { 0, 0, 0, 0 },           { 0x1, 0x200, 0x190, 0 }, { 0x20, 0, 0, 0 },
-    { 0x40, 0, 0xb8, 0 },     { 0x80, 0, 0, 0 },        { 0x1, 0x100, 0, 0 },
-    { 0x14, 0, 0xc8, 0 },     { 0x80, 0, 0, 0 },        { 0x1, 0x100, 0, 0 },
-    { 0x40, 0, 0xb8, 0 },     { 0x20, 0, 0, 0 },        { 0, 0, 0, 0 },
-    { 0x1, 0x200, 0x190, 0 }, { 0x20, 0, 0, 0 },        { 0xc0, 0, 0xb8, 0 },
-    { 0x1, 0x300, 0, 0 },     { 0x14, 0, 0xd0, 0 },     { 0x1, 0x300, 0, 0 },
-    { 0xc0, 0, 0xb8, 0 },     { 0x20, 0, 0, 0 },        { 0, 0, 0, 0 },
-    { 0x1, 0x200, 0x1b0, 0 }, { 0x20, 0, 0, 0 },        { 0xc0, 0, 0xd8, 0 },
-    { 0x1, 0x200, 0xd8, 0 },  { 0x96, 0, 0, 0 },        { 0xbf, 0, 0xd8, 0 },
-    { 0x20, 0, 0, 0 },        { 0, 0, 0, 0 },           { 0x1, 0x200, 0x190, 0 },
-    { 0x20, 0, 0, 0 },        { 0xc0, 0, 0x80, 0 },     { 0x1, 0x200, 0x80, 0 },
-    { 0x96, 0, 0, 0 },        { 0xbf, 0, 0x80, 0 },     { 0x20, 0, 0, 0 },
-    { 0, 0, 0, 0 },
+    { 0x1, 0x200, 0x200, 0 }, { 0x20, 0, 0, 0 },        { 0x40, 0, 0x100, 0 },    { 0x3c, 0, 0, 0 },        { 0x1, 0x200, 0x100, 0 },
+    { 0x3f, 0, 0x100, 0 },    { 0x20, 0, 0, 0 },        { 0, 0, 0, 0 },           { 0x1, 0x200, 0x280, 0 }, { 0x20, 0, 0, 0 },
+    { 0x60, 0, 0x140, 0 },    { 0x3c, 0, 0, 0 },        { 0x1, 0x200, 0x140, 0 }, { 0x5f, 0, 0x140, 0 },    { 0x20, 0, 0, 0 },
+    { 0, 0, 0, 0 },           { 0x1, 0x200, 0x280, 0 }, { 0x20, 0, 0, 0 },        { 0x80, 0, 0x140, 0 },    { 0x3c, 0, 0, 0 },
+    { 0x1, 0x200, 0x140, 0 }, { 0x7f, 0, 0x140, 0 },    { 0x20, 0, 0, 0 },        { 0, 0, 0, 0 },           { 0x1, 0x200, 0x200, 0 },
+    { 0x20, 0, 0, 0 },        { 0x80, 0, 0x100, 0 },    { 0x3c, 0, 0, 0 },        { 0x1, 0x200, 0x100, 0 }, { 0x7f, 0, 0x100, 0 },
+    { 0x20, 0, 0, 0 },        { 0, 0, 0, 0 },           { 0x1, 0x200, 0x190, 0 }, { 0x20, 0, 0, 0 },        { 0x80, 0, 0x90, 0 },
+    { 0x40, 0x8, 0xc8, 0 },   { 0x80, 0, 0x90, 0 },     { 0x20, 0, 0, 0 },        { 0, 0, 0, 0 },           { 0x1, 0x200, 0x190, 0 },
+    { 0x20, 0, 0, 0 },        { 0x80, 0, 0x120, 0 },    { 0x40, 0x3f8, 0xca, 0 }, { 0x80, 0, 0x120, 0 },    { 0x20, 0, 0, 0 },
+    { 0, 0, 0, 0 },           { 0x1, 0x200, 0x190, 0 }, { 0x20, 0, 0, 0 },        { 0x40, 0, 0xb8, 0 },     { 0x80, 0, 0, 0 },
+    { 0x1, 0x100, 0, 0 },     { 0x14, 0, 0xc8, 0 },     { 0x80, 0, 0, 0 },        { 0x1, 0x100, 0, 0 },     { 0x40, 0, 0xb8, 0 },
+    { 0x20, 0, 0, 0 },        { 0, 0, 0, 0 },           { 0x1, 0x200, 0x190, 0 }, { 0x20, 0, 0, 0 },        { 0xc0, 0, 0xb8, 0 },
+    { 0x1, 0x300, 0, 0 },     { 0x14, 0, 0xd0, 0 },     { 0x1, 0x300, 0, 0 },     { 0xc0, 0, 0xb8, 0 },     { 0x20, 0, 0, 0 },
+    { 0, 0, 0, 0 },           { 0x1, 0x200, 0x1b0, 0 }, { 0x20, 0, 0, 0 },        { 0xc0, 0, 0xd8, 0 },     { 0x1, 0x200, 0xd8, 0 },
+    { 0x96, 0, 0, 0 },        { 0xbf, 0, 0xd8, 0 },     { 0x20, 0, 0, 0 },        { 0, 0, 0, 0 },           { 0x1, 0x200, 0x190, 0 },
+    { 0x20, 0, 0, 0 },        { 0xc0, 0, 0x80, 0 },     { 0x1, 0x200, 0x80, 0 },  { 0x96, 0, 0, 0 },        { 0xbf, 0, 0x80, 0 },
+    { 0x20, 0, 0, 0 },        { 0, 0, 0, 0 },
 };
 
 const EggTotemDataA *const gUnknown_080D7E78[10] = {
-    &gUnknown_080D7BE8[0 * 8],     &gUnknown_080D7BE8[1 * 8],
-    &gUnknown_080D7BE8[2 * 8],     &gUnknown_080D7BE8[3 * 8],
-    &gUnknown_080D7BE8[4 * 8],     &gUnknown_080D7BE8[5 * 8 - 1],
-    &gUnknown_080D7BE8[6 * 8 - 2], &gUnknown_080D7BE8[7 * 8 + 1],
+    &gUnknown_080D7BE8[0 * 8],     &gUnknown_080D7BE8[1 * 8],     &gUnknown_080D7BE8[2 * 8],     &gUnknown_080D7BE8[3 * 8],
+    &gUnknown_080D7BE8[4 * 8],     &gUnknown_080D7BE8[5 * 8 - 1], &gUnknown_080D7BE8[6 * 8 - 2], &gUnknown_080D7BE8[7 * 8 + 1],
     &gUnknown_080D7BE8[8 * 8 + 2], &gUnknown_080D7BE8[9 * 8 + 2],
 };
 
 const u8 gUnknown_080D7EA0[0x34]
-    = { 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x02, 0x00, 0x01, 0x00, 0x01, 0x01,
-        0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x00, 0x02, 0x01, 0x01, 0x02, 0x01, 0x02,
-        0x02, 0x01, 0x00, 0x03, 0x01, 0x01, 0x03, 0x01, 0x02, 0x03, 0x02, 0x00, 0x04,
-        0x02, 0x05, 0x02, 0x01, 0x06, 0x02, 0x07, 0x02, 0x00, 0x08, 0x01, 0x09, 0x00 };
+    = { 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x02, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01,
+        0x01, 0x00, 0x02, 0x01, 0x01, 0x02, 0x01, 0x02, 0x02, 0x01, 0x00, 0x03, 0x01, 0x01, 0x03, 0x01, 0x02, 0x03,
+        0x02, 0x00, 0x04, 0x02, 0x05, 0x02, 0x01, 0x06, 0x02, 0x07, 0x02, 0x00, 0x08, 0x01, 0x09, 0x00 };
 
 const u8 *const gUnknown_080D7ED4[] = {
-    &gUnknown_080D7EA0[0 * 3],        &gUnknown_080D7EA0[1 * 3],
-    &gUnknown_080D7EA0[2 * 3],        &gUnknown_080D7EA0[3 * 3],
-    &gUnknown_080D7EA0[4 * 3],        &gUnknown_080D7EA0[5 * 3],
-    &gUnknown_080D7EA0[6 * 3],        &gUnknown_080D7EA0[7 * 3],
-    &gUnknown_080D7EA0[8 * 3],        &gUnknown_080D7EA0[9 * 3],
-    &gUnknown_080D7EA0[10 * 3],       &gUnknown_080D7EA0[11 * 3],
-    &gUnknown_080D7EA0[12 * 3],       &gUnknown_080D7EA0[13 * 3 + 0x2],
-    &gUnknown_080D7EA0[14 * 3 + 0x4],
+    &gUnknown_080D7EA0[0 * 3],  &gUnknown_080D7EA0[1 * 3],        &gUnknown_080D7EA0[2 * 3],        &gUnknown_080D7EA0[3 * 3],
+    &gUnknown_080D7EA0[4 * 3],  &gUnknown_080D7EA0[5 * 3],        &gUnknown_080D7EA0[6 * 3],        &gUnknown_080D7EA0[7 * 3],
+    &gUnknown_080D7EA0[8 * 3],  &gUnknown_080D7EA0[9 * 3],        &gUnknown_080D7EA0[10 * 3],       &gUnknown_080D7EA0[11 * 3],
+    &gUnknown_080D7EA0[12 * 3], &gUnknown_080D7EA0[13 * 3 + 0x2], &gUnknown_080D7EA0[14 * 3 + 0x4],
 };
 
 const u8 gUnknown_080D7F10[EGGTOTEM_NUM_PLATFORMS] = { 14, 14, 8 };
@@ -227,8 +209,7 @@ void CreateEggTotem(void)
 
     gPseudoRandom = gStageTime;
 
-    t = TaskCreate(Task_EggTotemMain, sizeof(EggTotem), 0x4000, 0,
-                   TaskDestructor_EggTotemMain);
+    t = TaskCreate(Task_EggTotemMain, sizeof(EggTotem), 0x4000, 0, TaskDestructor_EggTotemMain);
     totem = TASK_DATA(t);
 
     if (DIFFICULTY_BOSS_IS_NOT_NORMAL) {
@@ -344,8 +325,7 @@ void CreateEggTotem(void)
         s = &totem->sprWheels[i];
         s->x = 0;
         s->y = 0;
-        SPRITE_INIT(s, sTileInfoWheels[i].numTiles, sTileInfoWheels[i].anim,
-                    sTileInfoWheels[i].variant, sWheelsOamOrderIds[i], 2);
+        SPRITE_INIT(s, sTileInfoWheels[i].numTiles, sTileInfoWheels[i].anim, sTileInfoWheels[i].variant, sWheelsOamOrderIds[i], 2);
     }
 
     // _0803F1A8
@@ -378,9 +358,7 @@ void CreateEggTotem(void)
         s->frameFlags = SPRITE_FLAG(PRIORITY, 2);
 
 #else
-        SPRITE_INIT(s, sTileInfoBulletLauncher[i].numTiles,
-                    sTileInfoBulletLauncher[i].anim, sTileInfoBulletLauncher[i].variant,
-                    21, 2);
+        SPRITE_INIT(s, sTileInfoBulletLauncher[i].numTiles, sTileInfoBulletLauncher[i].anim, sTileInfoBulletLauncher[i].variant, 21, 2);
 #endif
     }
 
@@ -623,8 +601,7 @@ void sub_803F698(EggTotem *totem)
 
         if (t3c->unk17 != 0) {
             s8 r3;
-            s = (t3c->unk14 != 0) ? &totem->sprBulletLauncher[0]
-                                  : &totem->sprBulletLauncher[1];
+            s = (t3c->unk14 != 0) ? &totem->sprBulletLauncher[0] : &totem->sprBulletLauncher[1];
 
             if (t3c->unk17 > 0) {
                 r3 = 0;
@@ -708,8 +685,7 @@ bool32 sub_803F878(EggTotem *totem)
         s->y = I(totem->qUnk94) - gCamera.y - 81;
 
         if (s->x < 50) {
-            CreateEggmobileEscapeSequence(I(totem->qUnk90) - gCamera.x - 4,
-                                          I(totem->qUnk94) - gCamera.y - 79, 0x2000);
+            CreateEggmobileEscapeSequence(I(totem->qUnk90) - gCamera.x - 4, I(totem->qUnk94) - gCamera.y - 79, 0x2000);
 
             totem->unk3A = TRUE;
         }
@@ -789,8 +765,7 @@ void sub_803FB88(EggTotem *totem)
         res = totem->qWheelPos[i].y;
         discY += res;
 
-        totem->qWheelPos[i].y += Q(
-            sub_801F100(I(res) - 1, I(totem->qWheelPos[i].x), 1, +8, sub_801EC3C) + 1);
+        totem->qWheelPos[i].y += Q(sub_801F100(I(res) - 1, I(totem->qWheelPos[i].x), 1, +8, sub_801EC3C) + 1);
     }
 
     res = Div(discY, 3) - Q(2.0);
@@ -799,8 +774,7 @@ void sub_803FB88(EggTotem *totem)
 }
 
 // (91.19%) https://decomp.me/scratch/29ZCq
-NONMATCH("asm/non_matching/game/bosses/boss_3__sub_803FC14.inc",
-         void sub_803FC14(EggTotem *totem))
+NONMATCH("asm/non_matching/game/bosses/boss_3__sub_803FC14.inc", void sub_803FC14(EggTotem *totem))
 {
     u8 i;
     ExplosionPartsInfo info;
@@ -909,8 +883,7 @@ NONMATCH("asm/non_matching/game/bosses/boss_3__sub_803FC14.inc",
 END_NONMATCH
 
 // (81.46%) https://decomp.me/scratch/gT3he
-NONMATCH("asm/non_matching/game/bosses/boss_3__sub_803FF44.inc",
-         void sub_803FF44(EggTotem *totem))
+NONMATCH("asm/non_matching/game/bosses/boss_3__sub_803FF44.inc", void sub_803FF44(EggTotem *totem))
 {
     u8 i, j;
     s32 res;
@@ -1172,11 +1145,9 @@ void sub_804063C(EggTotem *totem)
         if ((PseudoRandom32() % 2u) != 0) {
             if ((v == 0) && (totem->unk3C[EGGTOTEM_NUM_PLATFORMS - 1].unk13 == 0)) {
                 r2 = 12;
-            } else if ((v == 1)
-                       && (totem->unk3C[EGGTOTEM_NUM_PLATFORMS - 1].unk13 == 0)) {
+            } else if ((v == 1) && (totem->unk3C[EGGTOTEM_NUM_PLATFORMS - 1].unk13 == 0)) {
                 r2 = 13;
-            } else if ((v == 0)
-                       && (totem->unk3C[EGGTOTEM_NUM_PLATFORMS - 2].unk13 == 0)) {
+            } else if ((v == 0) && (totem->unk3C[EGGTOTEM_NUM_PLATFORMS - 2].unk13 == 0)) {
                 r2 = 14;
             }
         }
@@ -1294,8 +1265,7 @@ void sub_80408C4(EggTotem *totem)
                     }
                 }
 
-                if ((t3c->unk17 != 0) && (totem->unk36 == 0)
-                    && (sub_8040B30(totem, i) << 24 != 0)) {
+                if ((t3c->unk17 != 0) && (totem->unk36 == 0) && (sub_8040B30(totem, i) << 24 != 0)) {
                     t3c->unk16 &= ~0x80;
                     totem->unk36 = 30;
                 }
@@ -1728,8 +1698,7 @@ void CreateEggTotemBullet(EggTotem *totem, s32 qX, s32 qY, u16 qSpeed)
     Sprite *s;
     u16 sinIndex;
 
-    struct Task *t
-        = TaskCreate(Task_EggTotemBullet, sizeof(EggTotemBullet), 0x6100, 0, NULL);
+    struct Task *t = TaskCreate(Task_EggTotemBullet, sizeof(EggTotemBullet), 0x6100, 0, NULL);
 
     EggTotemBullet *bullet = TASK_DATA(t);
 
@@ -1781,11 +1750,8 @@ void Task_EggTotemBullet(void)
     // TODO: Make stage values global and make this a #define:
     // NOTE: 752 in the last condition =
     //       (Boss 3 Stage width in pixels [8 * 96 = 768]) - (bullet GFX width [16])
-    if ((s->x < -32 && bullet->qDX < 0)
-        || ((s->x > (DISPLAY_WIDTH + 32)) && bullet->qDX > 0)
-        || (s->y < -32 && bullet->qDY < 0)
-        || ((s->y > (DISPLAY_HEIGHT + 32)) && bullet->qDY > 0) || (s->x < -Q(2))
-        || s->x > 752) {
+    if ((s->x < -32 && bullet->qDX < 0) || ((s->x > (DISPLAY_WIDTH + 32)) && bullet->qDX > 0) || (s->y < -32 && bullet->qDY < 0)
+        || ((s->y > (DISPLAY_HEIGHT + 32)) && bullet->qDY > 0) || (s->x < -Q(2)) || s->x > 752) {
         TaskDestroy(gCurTask);
         return;
     }
@@ -1793,8 +1759,7 @@ void Task_EggTotemBullet(void)
     if (bullet->totem->lives != 0) {
         bool32 res;
 
-        res = sub_800CA20(s, I(bullet->qScreenX) + gCamera.x,
-                          I(bullet->qScreenY) + gCamera.y, 0, &gPlayer);
+        res = sub_800CA20(s, I(bullet->qScreenX) + gCamera.x, I(bullet->qScreenY) + gCamera.y, 0, &gPlayer);
 
         if (res == TRUE && bullet->totem->unk35 == 0) {
             Sprite *s2;
diff --git a/src/game/bosses/boss_4.c b/src/game/bosses/boss_4.c
index 16cf6d6ce..c02b44f48 100644
--- a/src/game/bosses/boss_4.c
+++ b/src/game/bosses/boss_4.c
@@ -129,51 +129,49 @@ void CreateAeroEggBomb(AeroEgg *boss, s32 spawnX, s32 spawnY);
 static void AeroEgg_UpdatePos(AeroEgg *boss);
 static void AeroEgg_UpdatePartsAfterBossDefeated(AeroEgg *boss);
 static void AeroEgg_UpdateBossSpritesOnDefeat(AeroEgg *boss);
-static void CreateAeroEggBombDebris(AeroEgg *boss, s32 screenX, s32 screenY, s16 param3,
-                                    u16 param4);
+static void CreateAeroEggBombDebris(AeroEgg *boss, s32 screenX, s32 screenY, s16 param3, u16 param4);
 
-#define AE_DEFEATED_COLL_BODY(_sub, _part)                                              \
-    {                                                                                   \
-        if (_sub->unk6B != 0) {                                                         \
-            if (--_sub->unk6B == 0) {                                                   \
-                _part.dy = 0;                                                           \
-                _part.status = 1;                                                       \
-            }                                                                           \
-                                                                                        \
-            CreateScreenShake(0x400, 0x20, 0x80, 0x14, SCREENSHAKE_VERTICAL | 0x3);     \
-        }                                                                               \
+#define AE_DEFEATED_COLL_BODY(_sub, _part)                                                                                                 \
+    {                                                                                                                                      \
+        if (_sub->unk6B != 0) {                                                                                                            \
+            if (--_sub->unk6B == 0) {                                                                                                      \
+                _part.dy = 0;                                                                                                              \
+                _part.status = 1;                                                                                                          \
+            }                                                                                                                              \
+                                                                                                                                           \
+            CreateScreenShake(0x400, 0x20, 0x80, 0x14, SCREENSHAKE_VERTICAL | 0x3);                                                        \
+        }                                                                                                                                  \
     }
 
-#define AE_DEFEATED_COLL_PART(_part)                                                    \
-    {                                                                                   \
-        if (_part.dy > -48) {                                                           \
-            _part.dy = 0;                                                               \
-            _part.status = 1;                                                           \
-        }                                                                               \
+#define AE_DEFEATED_COLL_PART(_part)                                                                                                       \
+    {                                                                                                                                      \
+        if (_part.dy > -48) {                                                                                                              \
+            _part.dy = 0;                                                                                                                  \
+            _part.status = 1;                                                                                                              \
+        }                                                                                                                                  \
     }
 
-#define AE_UPDATE_PART_DEFEATED(_sub, _part, _halfHeight, _dyNum, _dyDenom,             \
-                                CODE_ON_COLL)                                           \
-    if ((_sub->unk00 > 10) && (_part.status == 0)) {                                    \
-        _part.dy += 0x10;                                                               \
-    }                                                                                   \
-    _part.x += _part.dx;                                                                \
-    _part.y += _part.dy;                                                                \
-                                                                                        \
-    res = sub_801E4E4(I(_part.y) + _halfHeight, I(_part.x), 1, 8, NULL, &sub_801EE64);  \
-                                                                                        \
-    if ((res <= 0) && (_part.dy >= 0)) {                                                \
-        _part.y += Q(res);                                                              \
-        _part.dy = Div((_part.dy * (_dyNum)), (_dyDenom));                              \
-                                                                                        \
-        CODE_ON_COLL;                                                                   \
-                                                                                        \
-        _part.dx -= 8;                                                                  \
-        if (_part.dx < 0) {                                                             \
-            _part.dx = 0;                                                               \
-        }                                                                               \
-    } else if (_part.status != 0) {                                                     \
-        _part.y += Q(res);                                                              \
+#define AE_UPDATE_PART_DEFEATED(_sub, _part, _halfHeight, _dyNum, _dyDenom, CODE_ON_COLL)                                                  \
+    if ((_sub->unk00 > 10) && (_part.status == 0)) {                                                                                       \
+        _part.dy += 0x10;                                                                                                                  \
+    }                                                                                                                                      \
+    _part.x += _part.dx;                                                                                                                   \
+    _part.y += _part.dy;                                                                                                                   \
+                                                                                                                                           \
+    res = sub_801E4E4(I(_part.y) + _halfHeight, I(_part.x), 1, 8, NULL, &sub_801EE64);                                                     \
+                                                                                                                                           \
+    if ((res <= 0) && (_part.dy >= 0)) {                                                                                                   \
+        _part.y += Q(res);                                                                                                                 \
+        _part.dy = Div((_part.dy * (_dyNum)), (_dyDenom));                                                                                 \
+                                                                                                                                           \
+        CODE_ON_COLL;                                                                                                                      \
+                                                                                                                                           \
+        _part.dx -= 8;                                                                                                                     \
+        if (_part.dx < 0) {                                                                                                                \
+            _part.dx = 0;                                                                                                                  \
+        }                                                                                                                                  \
+    } else if (_part.status != 0) {                                                                                                        \
+        _part.y += Q(res);                                                                                                                 \
     }
 
 void CreateAeroEgg(void)
@@ -184,8 +182,7 @@ void CreateAeroEgg(void)
     gPlayer.moveState |= MOVESTATE_IGNORE_INPUT;
     sub_8039ED4();
     gPseudoRandom = gStageTime;
-    gActiveBossTask = TaskCreate(Task_AeroEggMain, sizeof(AeroEgg), 0x4000, 0,
-                                 TaskDestructor_AeroEggMain);
+    gActiveBossTask = TaskCreate(Task_AeroEggMain, sizeof(AeroEgg), 0x4000, 0, TaskDestructor_AeroEggMain);
     boss = TASK_DATA(gActiveBossTask);
 
     if (DIFFICULTY_BOSS_IS_NOT_NORMAL) {
@@ -220,14 +217,12 @@ void CreateAeroEgg(void)
     s = &boss->sub.sprBody;
     s->x = 0;
     s->y = 0;
-    SPRITE_INIT_FLAGS(s, 8 * 8, SA2_ANIM_AERO_EGG_BODY, 0, 20, 2,
-                      SPRITE_FLAG_MASK_X_FLIP);
+    SPRITE_INIT_FLAGS(s, 8 * 8, SA2_ANIM_AERO_EGG_BODY, 0, 20, 2, SPRITE_FLAG_MASK_X_FLIP);
 
     s = &boss->sub.sprPilot;
     s->x = 0;
     s->y = 0;
-    SPRITE_INIT_FLAGS(s, 4 * 3, SA2_ANIM_HAMMERTANK_PILOT, 0, 21, 2,
-                      SPRITE_FLAG_MASK_X_FLIP);
+    SPRITE_INIT_FLAGS(s, 4 * 3, SA2_ANIM_HAMMERTANK_PILOT, 0, 21, 2, SPRITE_FLAG_MASK_X_FLIP);
 
     s = &boss->sub.sprTail;
     s->x = 0;
@@ -260,9 +255,7 @@ static void Task_AeroEggExploding(void)
         if ((I(sub->body.x) - gCamera.x < 50) && (sub->unk68 != 0)) {
             sub->unk6C = 1;
 
-            CreateEggmobileEscapeSequence(I(sub->body.x) - gCamera.x,
-                                          I(sub->body.y) - gCamera.y - 15,
-                                          SPRITE_FLAG(PRIORITY, 2));
+            CreateEggmobileEscapeSequence(I(sub->body.x) - gCamera.x, I(sub->body.y) - gCamera.y - 15, SPRITE_FLAG(PRIORITY, 2));
         }
     }
 
@@ -350,10 +343,8 @@ static void sub_8041A08(AeroEgg *boss)
 
     tVal = (u16)(SIN_24_8((gStageTime * 12 + 0x200) & ONE_CYCLE) >> 3);
     s = &boss->sub.sprTailTip;
-    worldX = AEROEGG_TAILTIP_OFFSET_X + I(boss->main.qWorldX)
-        + ((COS((tVal + 500) & ONE_CYCLE) * 15) >> 12);
-    worldY = AEROEGG_TAILTIP_OFFSET_Y + I(boss->main.qWorldY)
-        + ((SIN((tVal + 500) & ONE_CYCLE) * 15) >> 12);
+    worldX = AEROEGG_TAILTIP_OFFSET_X + I(boss->main.qWorldX) + ((COS((tVal + 500) & ONE_CYCLE) * 15) >> 12);
+    worldY = AEROEGG_TAILTIP_OFFSET_Y + I(boss->main.qWorldY) + ((SIN((tVal + 500) & ONE_CYCLE) * 15) >> 12);
 
     if (boss->main.unk17 == 0) {
         Player *p = &gPlayer;
@@ -493,8 +484,7 @@ static void AeroEgg_UpdateBossSpritesOnDefeat(AeroEgg *boss)
 }
 
 // (93.54%) https://decomp.me/scratch/PPILk
-NONMATCH("asm/non_matching/game/bosses/boss_4__sub_8041D34.inc",
-         static void sub_8041D34(AeroEgg *boss))
+NONMATCH("asm/non_matching/game/bosses/boss_4__sub_8041D34.inc", static void sub_8041D34(AeroEgg *boss))
 {
     ExplosionPartsInfo partsInfo;
     s32 res;
@@ -564,8 +554,7 @@ NONMATCH("asm/non_matching/game/bosses/boss_4__sub_8041D34.inc",
         partsInfo.rotation = (PseudoRandom32() & 0x3FF);
         partsInfo.speed = 1792 - (PseudoRandom32() % 512u);
 
-        partsInfo.vram
-            = (void *)(OBJ_VRAM0 + (gTileInfoBossScrews[r7][0] * TILE_SIZE_4BPP));
+        partsInfo.vram = (void *)(OBJ_VRAM0 + (gTileInfoBossScrews[r7][0] * TILE_SIZE_4BPP));
         partsInfo.anim = gTileInfoBossScrews[r7][1];
         partsInfo.variant = gTileInfoBossScrews[r7][2];
         partsInfo.unk4 = 1;
@@ -629,8 +618,7 @@ NONMATCH("asm/non_matching/game/bosses/boss_4__sub_8041D34.inc",
 END_NONMATCH
 
 // (99.64%) https://decomp.me/scratch/WJcpn
-NONMATCH("asm/non_matching/game/bosses/AeroEgg_InitPartsDefeated.inc",
-         static void AeroEgg_InitPartsDefeated(AeroEgg *boss))
+NONMATCH("asm/non_matching/game/bosses/AeroEgg_InitPartsDefeated.inc", static void AeroEgg_InitPartsDefeated(AeroEgg *boss))
 {
     Sprite *s;
     AeroEggSub *sub = &boss->sub;
@@ -697,16 +685,13 @@ static void AeroEgg_UpdatePartsAfterBossDefeated(AeroEgg *boss)
     sub->unk68 = 1;
     sub->unk00++;
 
-    AE_UPDATE_PART_DEFEATED(sub, sub->body, 13, -70, 100,
-                            AE_DEFEATED_COLL_BODY(sub, sub->body));
+    AE_UPDATE_PART_DEFEATED(sub, sub->body, 13, -70, 100, AE_DEFEATED_COLL_BODY(sub, sub->body));
 
     for (i = 0; i < ARRAY_COUNT(sub->tail); i++) {
-        AE_UPDATE_PART_DEFEATED(sub, sub->tail[i], 7, -6, 10,
-                                AE_DEFEATED_COLL_PART(sub->tail[i]));
+        AE_UPDATE_PART_DEFEATED(sub, sub->tail[i], 7, -6, 10, AE_DEFEATED_COLL_PART(sub->tail[i]));
     }
 
-    AE_UPDATE_PART_DEFEATED(sub, sub->tailTip, 9, -6, 10,
-                            AE_DEFEATED_COLL_PART(sub->tailTip));
+    AE_UPDATE_PART_DEFEATED(sub, sub->tailTip, 9, -6, 10, AE_DEFEATED_COLL_PART(sub->tailTip));
 }
 
 static bool32 sub_80423EC(AeroEgg *boss)
@@ -894,8 +879,7 @@ static void TaskDestructor_AeroEggMain(struct Task *t)
 
 void CreateAeroEggBomb(AeroEgg *boss, s32 spawnX, s32 spawnY)
 {
-    struct Task *t
-        = TaskCreate(Task_CreateAeroEggBombMain, sizeof(AeroEggBomb), 0x6100, 0, NULL);
+    struct Task *t = TaskCreate(Task_CreateAeroEggBombMain, sizeof(AeroEggBomb), 0x6100, 0, NULL);
     AeroEggBomb *eb = TASK_DATA(t);
     Sprite *s;
 
@@ -946,9 +930,7 @@ static void Task_CreateAeroEggBombMain(void)
         s->y = I(eb->screenY);
     }
 
-    if (sub_801E4E4(I(eb->screenY) + gCamera.y, I(eb->screenX) + gCamera.x, 1, 8, NULL,
-                    sub_801EE64)
-        < 0) {
+    if (sub_801E4E4(I(eb->screenY) + gCamera.y, I(eb->screenX) + gCamera.x, 1, 8, NULL, sub_801EE64) < 0) {
         m4aSongNumStart(SE_PROJECTILE_IMPACT);
 
         eb->dx = 0;
@@ -965,9 +947,7 @@ static void Task_CreateAeroEggBombMain(void)
     }
 
     if (eb->boss->main.lives > 0) {
-        if (sub_800CA20(s, I(eb->screenX) + gCamera.x, I(eb->screenY) + gCamera.y, 0,
-                        &gPlayer)
-            == TRUE) {
+        if (sub_800CA20(s, I(eb->screenX) + gCamera.x, I(eb->screenY) + gCamera.y, 0, &gPlayer) == TRUE) {
             if (eb->boss->main.unk16 == 0) {
                 Sprite *s2 = &eb->boss->sub.sprPilot;
                 eb->boss->main.unk15 = 30;
@@ -998,9 +978,7 @@ static void Task_AeroEggBombHitGround(void)
     s->y = I(eb->screenY);
 
     if (eb->boss->main.lives > 0) {
-        if (sub_800CA20(s, I(eb->screenX) + gCamera.x, I(eb->screenY) + gCamera.y, 0,
-                        &gPlayer)
-            == TRUE) {
+        if (sub_800CA20(s, I(eb->screenX) + gCamera.x, I(eb->screenY) + gCamera.y, 0, &gPlayer) == TRUE) {
             if (eb->boss->main.unk16 == 0) {
                 Sprite *s2 = &eb->boss->sub.sprPilot;
                 eb->boss->main.unk15 = 30;
@@ -1018,11 +996,9 @@ static void Task_AeroEggBombHitGround(void)
     DisplaySprite(s);
 }
 
-static void CreateAeroEggBombDebris(AeroEgg *boss, s32 screenX, s32 screenY, s16 param3,
-                                    u16 param4)
+static void CreateAeroEggBombDebris(AeroEgg *boss, s32 screenX, s32 screenY, s16 param3, u16 param4)
 {
-    struct Task *t
-        = TaskCreate(Task_AeroEggBombDebris, sizeof(AeroEggDebris), 0x6100, 0, NULL);
+    struct Task *t = TaskCreate(Task_AeroEggBombDebris, sizeof(AeroEggDebris), 0x6100, 0, NULL);
     AeroEggDebris *deb = TASK_DATA(t);
     Sprite *s;
 
@@ -1071,9 +1047,7 @@ static void Task_AeroEggBombDebris(void)
     s->x = I(deb->screenX);
     s->y = I(deb->screenY);
 
-    if (sub_801E4E4(I(deb->screenY) + gCamera.y, I(deb->screenX) + gCamera.x, 1, 8, NULL,
-                    sub_801EE64)
-        < 0) {
+    if (sub_801E4E4(I(deb->screenY) + gCamera.y, I(deb->screenX) + gCamera.x, 1, 8, NULL, sub_801EE64) < 0) {
         if (deb->dy > 0) {
             TaskDestroy(gCurTask);
             return;
@@ -1081,9 +1055,7 @@ static void Task_AeroEggBombDebris(void)
     }
 
     if (deb->boss->main.lives > 0) {
-        if (sub_800CA20(s, I(deb->screenX) + gCamera.x, I(deb->screenY) + gCamera.y, 0,
-                        &gPlayer)
-            == TRUE) {
+        if (sub_800CA20(s, I(deb->screenX) + gCamera.x, I(deb->screenY) + gCamera.y, 0, &gPlayer) == TRUE) {
             if (deb->boss->main.unk16 == 0) {
                 Sprite *s2 = &deb->boss->sub.sprPilot;
                 deb->boss->main.unk15 = 30;
diff --git a/src/game/bosses/boss_5.c b/src/game/bosses/boss_5.c
index a9cda0087..83b816ed5 100644
--- a/src/game/bosses/boss_5.c
+++ b/src/game/bosses/boss_5.c
@@ -127,8 +127,7 @@ typedef struct {
 } EggSaucer; /* 0x4B0 */
 
 // Attack speeds?
-const u16 gUnknown_080D7F94[2]
-    = { 4 * GBA_FRAMES_PER_SECOND, 8 * GBA_FRAMES_PER_SECOND };
+const u16 gUnknown_080D7F94[2] = { 4 * GBA_FRAMES_PER_SECOND, 8 * GBA_FRAMES_PER_SECOND };
 
 typedef void (*EggSaucerCallback)(EggSaucer *);
 
@@ -144,14 +143,10 @@ static const EggSaucerCallback gArmFunctions[] = {
 };
 
 static const TileInfo gUnknown_080D7FB0[] = {
-    { 2, SA2_ANIM_EGG_SAUCER_SMACK_PARTICLE_RIGHT, 0 },
-    { 4, SA2_ANIM_EGG_SAUCER_SMACK_PARTICLE_DOWN_RIGHT, 0 },
-    { 2, SA2_ANIM_EGG_SAUCER_SMACK_PARTICLE_DOWN, 0 },
-    { 4, SA2_ANIM_EGG_SAUCER_SMACK_PARTICLE_DOWN_LEFT, 0 },
-    { 2, SA2_ANIM_EGG_SAUCER_SMACK_PARTICLE_LEFT, 0 },
-    { 4, SA2_ANIM_EGG_SAUCER_SMACK_PARTICLE_UP_LEFT, 0 },
-    { 2, SA2_ANIM_EGG_SAUCER_SMACK_PARTICLE_UP, 0 },
-    { 4, SA2_ANIM_EGG_SAUCER_SMACK_PARTICLE_UP_RIGHT, 0 },
+    { 2, SA2_ANIM_EGG_SAUCER_SMACK_PARTICLE_RIGHT, 0 }, { 4, SA2_ANIM_EGG_SAUCER_SMACK_PARTICLE_DOWN_RIGHT, 0 },
+    { 2, SA2_ANIM_EGG_SAUCER_SMACK_PARTICLE_DOWN, 0 },  { 4, SA2_ANIM_EGG_SAUCER_SMACK_PARTICLE_DOWN_LEFT, 0 },
+    { 2, SA2_ANIM_EGG_SAUCER_SMACK_PARTICLE_LEFT, 0 },  { 4, SA2_ANIM_EGG_SAUCER_SMACK_PARTICLE_UP_LEFT, 0 },
+    { 2, SA2_ANIM_EGG_SAUCER_SMACK_PARTICLE_UP, 0 },    { 4, SA2_ANIM_EGG_SAUCER_SMACK_PARTICLE_UP_RIGHT, 0 },
 };
 
 static const u16 gUnknown_080D7FF0[][16] = {
@@ -226,8 +221,7 @@ void CreateEggSaucer(void)
     gUnknown_03005AA0.s.frameFlags &= ~SPRITE_FLAG_MASK_PRIORITY;
     gUnknown_03005AA0.s.frameFlags |= SPRITE_FLAG(PRIORITY, 1);
 
-    gActiveBossTask = TaskCreate(Task_EggSaucerIntro, sizeof(EggSaucer), 0x4000, 0,
-                                 TaskDestructor_EggSaucerMain);
+    gActiveBossTask = TaskCreate(Task_EggSaucerIntro, sizeof(EggSaucer), 0x4000, 0, TaskDestructor_EggSaucerMain);
     boss = TASK_DATA(gActiveBossTask);
 
     fade = &boss->screenTransition;
@@ -235,9 +229,8 @@ void CreateEggSaucer(void)
     fade->brightness = 0;
     fade->flags = 2;
     fade->speed = 0;
-    fade->bldCnt
-        = (BLDCNT_TGT2_BD | BLDCNT_TGT2_OBJ | BLDCNT_EFFECT_DARKEN | BLDCNT_TGT1_BD
-           | BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3);
+    fade->bldCnt = (BLDCNT_TGT2_BD | BLDCNT_TGT2_OBJ | BLDCNT_EFFECT_DARKEN | BLDCNT_TGT1_BD | BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1
+                    | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3);
     fade->bldAlpha = 0;
 
     if (gDifficultyLevel != 0 && gGameMode != GAME_MODE_BOSS_TIME_ATTACK) {
@@ -321,8 +314,7 @@ void CreateEggSaucer(void)
     s->graphics.dest = vram;
     vram += PILOT_TILES * TILE_SIZE_4BPP;
 
-    if ((gCurrentLevel != LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE)
-         && gSelectedCharacter == CHARACTER_SONIC)
+    if ((gCurrentLevel != LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE) && gSelectedCharacter == CHARACTER_SONIC)
         && gLoadedSaveGame->unlockedLevels[CHARACTER_SONIC] <= gCurrentLevel) {
         s->graphics.anim = SA2_ANIM_EGG_SAUCER_PILOT_KNUCKLES;
         s->variant = 0;
@@ -355,8 +347,8 @@ void CreateEggSaucer(void)
     // Seems a lot of tiles for this
     vram += 64 * TILE_SIZE_4BPP;
     SPRITE_INIT_ANIM_AND_SCRIPT(s, SA2_ANIM_EGG_SAUCER_GUN, 0, 23);
-    s->frameFlags = gUnknown_030054B8++ | SPRITE_FLAG(PRIORITY, 1)
-        | SPRITE_FLAG(ROT_SCALE_ENABLE, 1) | SPRITE_FLAG(ROT_SCALE_DOUBLE_SIZE, 1);
+    s->frameFlags
+        = gUnknown_030054B8++ | SPRITE_FLAG(PRIORITY, 1) | SPRITE_FLAG(ROT_SCALE_ENABLE, 1) | SPRITE_FLAG(ROT_SCALE_DOUBLE_SIZE, 1);
 
     s = &boss->gunCharge;
     s->x = 0;
@@ -396,8 +388,7 @@ void CreateEggSaucer(void)
         s->graphics.dest = vramBase;
         vramBase += gUnknown_080D7FB0[i].numTiles * TILE_SIZE_4BPP;
 
-        SPRITE_INIT_WITHOUT_VRAM(s, gUnknown_080D7FB0[i].anim,
-                                 gUnknown_080D7FB0[i].variant, 11, 1, 0);
+        SPRITE_INIT_WITHOUT_VRAM(s, gUnknown_080D7FB0[i].anim, gUnknown_080D7FB0[i].variant, 11, 1, 0);
     }
 }
 
@@ -465,8 +456,7 @@ void sub_80435BC(void)
         m4aSongNumStart(SE_144);
     }
 
-    if ((gCurrentLevel != LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE)
-         && gSelectedCharacter == CHARACTER_SONIC)
+    if ((gCurrentLevel != LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE) && gSelectedCharacter == CHARACTER_SONIC)
         && gLoadedSaveGame->unlockedLevels[CHARACTER_SONIC] <= gCurrentLevel) {
         if (boss->unk15 == 0 && I(boss->cabinX) - gCamera.x < 50) {
             boss->unk15 = 1;
@@ -474,9 +464,7 @@ void sub_80435BC(void)
     } else {
         if (boss->unk15 == 0 && I(boss->cabinX) - gCamera.x < 50) {
             boss->unk15 = 1;
-            CreateEggmobileEscapeSequence(I(boss->cabinX) - gCamera.x,
-                                          I(boss->cabinY) - gCamera.y,
-                                          SPRITE_FLAG(PRIORITY, 2));
+            CreateEggmobileEscapeSequence(I(boss->cabinX) - gCamera.x, I(boss->cabinY) - gCamera.y, SPRITE_FLAG(PRIORITY, 2));
         }
     }
     sub_8045898(boss);
@@ -681,8 +669,7 @@ void sub_8043BEC(EggSaucer *boss)
     DisplaySprite(s);
 
     if (boss->unk15 == 0
-        || (gCurrentLevel != LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE)
-            && gSelectedCharacter == CHARACTER_SONIC
+        || (gCurrentLevel != LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE) && gSelectedCharacter == CHARACTER_SONIC
             && gLoadedSaveGame->unlockedLevels[CHARACTER_SONIC] <= gCurrentLevel)) {
         s = &boss->pilot;
         s->x = I(boss->cabinX) - gCamera.x;
@@ -969,15 +956,9 @@ static void SaucerUpdatePosAndRotate(EggSaucer *boss)
 
     boss->y += Q(sub_801E4E4(bottomY, bottomX, 1, 8, 0, sub_801EE64));
 
-    boss->cabinDiskAngle = ({
-        (boss->cabinDiskAngle + DEG_TO_SIN(BOSS_ROTATE_SPEED_DEG)) & (SIN_PERIOD - 1);
-    });
-    boss->gunDiskAngle = ({
-        (boss->gunDiskAngle + DEG_TO_SIN(BOSS_ROTATE_SPEED_DEG)) & (SIN_PERIOD - 1);
-    });
-    boss->armDiskAngle = ({
-        (boss->armDiskAngle + DEG_TO_SIN(BOSS_ROTATE_SPEED_DEG)) & (SIN_PERIOD - 1);
-    });
+    boss->cabinDiskAngle = ({ (boss->cabinDiskAngle + DEG_TO_SIN(BOSS_ROTATE_SPEED_DEG)) & (SIN_PERIOD - 1); });
+    boss->gunDiskAngle = ({ (boss->gunDiskAngle + DEG_TO_SIN(BOSS_ROTATE_SPEED_DEG)) & (SIN_PERIOD - 1); });
+    boss->armDiskAngle = ({ (boss->armDiskAngle + DEG_TO_SIN(BOSS_ROTATE_SPEED_DEG)) & (SIN_PERIOD - 1); });
 }
 
 void sub_8044540(EggSaucer *boss)
@@ -1574,8 +1555,7 @@ void sub_80452F8(EggSaucer *boss)
 
     if (boss->unk13 == 0) {
         boss->unk12 = 0x1E;
-        if ((gCurrentLevel != LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE)
-             && gSelectedCharacter == CHARACTER_SONIC)
+        if ((gCurrentLevel != LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE) && gSelectedCharacter == CHARACTER_SONIC)
             && gLoadedSaveGame->unlockedLevels[CHARACTER_SONIC] <= gCurrentLevel) {
             s->graphics.anim = SA2_ANIM_EGG_SAUCER_PILOT_KNUCKLES;
             s->variant = 1;
@@ -1601,8 +1581,7 @@ void sub_8045368(EggSaucer *boss)
 
     boss->unk13 = 30;
     boss->unk12 = 0;
-    if ((gCurrentLevel != LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE)
-         && gSelectedCharacter == CHARACTER_SONIC)
+    if ((gCurrentLevel != LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE) && gSelectedCharacter == CHARACTER_SONIC)
         && gLoadedSaveGame->unlockedLevels[CHARACTER_SONIC] <= gCurrentLevel) {
         if (!boss->unk10) {
             s->graphics.anim = SA2_ANIM_EGG_SAUCER_PILOT_KNUCKLES;
@@ -1624,8 +1603,7 @@ void sub_8045368(EggSaucer *boss)
     }
     s->prevVariant = -1;
 
-    if (gCurrentLevel != LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE)
-        && boss->unk10 == 4) {
+    if (gCurrentLevel != LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE) && boss->unk10 == 4) {
         gUnknown_030054A8.unk1 = 0x11;
     }
 }
@@ -1646,8 +1624,7 @@ void sub_80454A4(EggSaucer *boss)
 
     s = &boss->pilot;
 
-    if ((gCurrentLevel != LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE)
-         && gSelectedCharacter == CHARACTER_SONIC)
+    if ((gCurrentLevel != LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE) && gSelectedCharacter == CHARACTER_SONIC)
         && gLoadedSaveGame->unlockedLevels[CHARACTER_SONIC] <= gCurrentLevel) {
         if (!boss->unk10) {
             s->graphics.anim = SA2_ANIM_EGG_SAUCER_PILOT_KNUCKLES;
@@ -1669,8 +1646,7 @@ void sub_80454A4(EggSaucer *boss)
 }
 
 // (86.11%) https://decomp.me/scratch/wnQsf
-NONMATCH("asm/non_matching/game/bosses/boss_5__sub_8045564.inc",
-         void sub_8045564(EggSaucer *boss))
+NONMATCH("asm/non_matching/game/bosses/boss_5__sub_8045564.inc", void sub_8045564(EggSaucer *boss))
 {
     s32 index;
     u8 val2;
@@ -1783,8 +1759,7 @@ void sub_804598C(void) { TaskDestroy(gCurTask); }
 
 void sub_80459A0(EggSaucer *boss)
 {
-    if (boss->unk11 == 0
-        && boss->armDiskAngle != ((boss->cabinDiskAngle + 0x200) & (SIN_PERIOD - 1))) {
+    if (boss->unk11 == 0 && boss->armDiskAngle != ((boss->cabinDiskAngle + 0x200) & (SIN_PERIOD - 1))) {
         boss->armDiskAngle = CLAMP_SIN_PERIOD(boss->armDiskAngle + 1);
     }
 }
diff --git a/src/game/bosses/boss_6.c b/src/game/bosses/boss_6.c
index c1a7553b6..2349f166f 100644
--- a/src/game/bosses/boss_6.c
+++ b/src/game/bosses/boss_6.c
@@ -192,8 +192,7 @@ void CreateEggGoRound(void)
     gPlayer.unk3C = NULL;
     gPlayer.moveState &= ~MOVESTATE_8;
 
-    gActiveBossTask = TaskCreate(Task_IntroRollIn, sizeof(EggGoRound), 0x4000, 0,
-                                 TaskDestructor_EggGoRound);
+    gActiveBossTask = TaskCreate(Task_IntroRollIn, sizeof(EggGoRound), 0x4000, 0, TaskDestructor_EggGoRound);
     boss = TASK_DATA(gActiveBossTask);
 
     if (gDifficultyLevel != 0 && gGameMode != GAME_MODE_BOSS_TIME_ATTACK) {
@@ -349,8 +348,7 @@ static void sub_8045E78(EggGoRound *boss)
 
         if (Mod(boss->unk22, 30) == 0) {
             u8 i;
-            u16 targetAngle
-                = sub_8004418(I(gPlayer.y - boss->y), I(gPlayer.x - boss->x));
+            u16 targetAngle = sub_8004418(I(gPlayer.y - boss->y), I(gPlayer.x - boss->x));
 
             for (i = 0; i < NUM_PROJECTILES; i++) {
                 ProjectilePosition *projPos = &boss->projectilePositions[i];
@@ -508,19 +506,16 @@ static void Task_DestructionCutScene3(void)
         m4aSongNumStart(SE_144);
     }
 
-    if (boss->destructionProps.unk1C1 == 0
-        && (I(destruction->cabin.x) - gCamera.x) < 50) {
+    if (boss->destructionProps.unk1C1 == 0 && (I(destruction->cabin.x) - gCamera.x) < 50) {
         u32 flags = boss->pilot.frameFlags;
         flags &= SPRITE_FLAG_MASK_X_FLIP;
         flags |= SPRITE_FLAG(PRIORITY, 1);
         boss->destructionProps.unk1C1 = 1;
-        CreateEggmobileEscapeSequence(I(destruction->cabin.x) - gCamera.x,
-                                      I(destruction->cabin.y) - gCamera.y - 15, flags);
+        CreateEggmobileEscapeSequence(I(destruction->cabin.x) - gCamera.x, I(destruction->cabin.y) - gCamera.y - 15, flags);
     }
 
     // when off screen
-    if (I(boss->destructionProps.cabin.x) - gCamera.x < -200
-        && boss->destructionProps.unk1C1 != 0) {
+    if (I(boss->destructionProps.cabin.x) - gCamera.x < -200 && boss->destructionProps.unk1C1 != 0) {
         sub_802EF68(-40, 150, 5);
         // destroy the task on the next frame
         gCurTask->main = Task_HandleDestroy;
@@ -548,14 +543,8 @@ static void Render(EggGoRound *boss)
         idx = ((u32)((boss->rotation + (i << 0x10)) << 0xE) >> 0x16);
         s = &boss->link;
         for (j = 0; j < NUM_LINKS; j++) {
-            s->x = (I(boss->x) - gCamera.x)
-                + ((sLinkPositions[j]
-                    * COS(CLAMP_SIN_PERIOD(idx + (j * boss->linkRotOffset))))
-                   >> 14);
-            s->y = (I(boss->y) - gCamera.y)
-                + ((sLinkPositions[j]
-                    * SIN(CLAMP_SIN_PERIOD(idx + (j * boss->linkRotOffset))))
-                   >> 14);
+            s->x = (I(boss->x) - gCamera.x) + ((sLinkPositions[j] * COS(CLAMP_SIN_PERIOD(idx + (j * boss->linkRotOffset)))) >> 14);
+            s->y = (I(boss->y) - gCamera.y) + ((sLinkPositions[j] * SIN(CLAMP_SIN_PERIOD(idx + (j * boss->linkRotOffset)))) >> 14);
             DisplaySprite(s);
         }
     }
@@ -574,8 +563,7 @@ static void Render(EggGoRound *boss)
         s->x = (I(boss->x) - gCamera.x) + ((COS(idx) * platformPos) >> 14);
         s->y = (I(boss->y) - gCamera.y) + ((SIN(idx) * platformPos) >> 14);
 
-        if (boss->unk1E != 0 && boss->unk24 == 0 && (i % 2)
-            && (boss->state == 1 || boss->state == 2)) {
+        if (boss->unk1E != 0 && boss->unk24 == 0 && (i % 2) && (boss->state == 1 || boss->state == 2)) {
             SpriteTransform *transform = &boss->platforms[i].transform;
             transform->rotation = I(boss->platformRotation);
             transform->width = 0x100;
@@ -621,23 +609,11 @@ static void sub_804655C(EggGoRound *boss, u8 val)
         s = &boss->link;
         for (j = temp; j < NUM_LINKS; j++) {
             if (j & 1) {
-                s->x = (I(boss->x) - gCamera.x)
-                    + ((sLinkPositions[j]
-                        * COS(CLAMP_SIN_PERIOD(idx + (j * boss->linkRotOffset))))
-                       >> 14);
-                s->y = (I(boss->y) - gCamera.y)
-                    + ((sLinkPositions[j]
-                        * SIN(CLAMP_SIN_PERIOD(idx + (j * boss->linkRotOffset))))
-                       >> 14);
+                s->x = (I(boss->x) - gCamera.x) + ((sLinkPositions[j] * COS(CLAMP_SIN_PERIOD(idx + (j * boss->linkRotOffset)))) >> 14);
+                s->y = (I(boss->y) - gCamera.y) + ((sLinkPositions[j] * SIN(CLAMP_SIN_PERIOD(idx + (j * boss->linkRotOffset)))) >> 14);
             } else {
-                s->x = (I(boss->x) - gCamera.x)
-                    + ((sLinkPositions[j]
-                        * COS(CLAMP_SIN_PERIOD(idx - (j * boss->linkRotOffset))))
-                       >> 14);
-                s->y = (I(boss->y) - gCamera.y)
-                    + ((sLinkPositions[j]
-                        * SIN(CLAMP_SIN_PERIOD(idx - (j * boss->linkRotOffset))))
-                       >> 14);
+                s->x = (I(boss->x) - gCamera.x) + ((sLinkPositions[j] * COS(CLAMP_SIN_PERIOD(idx - (j * boss->linkRotOffset)))) >> 14);
+                s->y = (I(boss->y) - gCamera.y) + ((sLinkPositions[j] * SIN(CLAMP_SIN_PERIOD(idx - (j * boss->linkRotOffset)))) >> 14);
             }
 
             DisplaySprite(s);
@@ -658,8 +634,7 @@ static void sub_804655C(EggGoRound *boss, u8 val)
         s->x = (I(boss->x) - gCamera.x) + ((COS(idx) * platformPos) >> 14);
         s->y = (I(boss->y) - gCamera.y) + ((SIN(idx) * platformPos) >> 14);
 
-        if (boss->unk1E != 0 && boss->unk24 == 0 && (i % 2)
-            && (boss->state == 1 || boss->state == 2)) {
+        if (boss->unk1E != 0 && boss->unk24 == 0 && (i % 2) && (boss->state == 1 || boss->state == 2)) {
             SpriteTransform *transform = &boss->platforms[i].transform;
             transform->rotation = I(boss->platformRotation);
             transform->width = 0x100;
@@ -736,15 +711,12 @@ static void sub_804683C(EggGoRound *boss)
             }
         } else {
             if (boss->unk27 == 0) {
-                boss->platformRotSpeed
-                    += gUnknown_080D809E[(boss->health < 5) ? 1 : 0][boss->unk26];
-                if (boss->platformRotSpeed
-                    == gUnknown_080D8076[boss->health < 5 ? 1 : 0][boss->unk26]) {
+                boss->platformRotSpeed += gUnknown_080D809E[(boss->health < 5) ? 1 : 0][boss->unk26];
+                if (boss->platformRotSpeed == gUnknown_080D8076[boss->health < 5 ? 1 : 0][boss->unk26]) {
                     boss->unk27 = 1;
                 }
             } else if (boss->unk27 == 1) {
-                boss->platformRotSpeed
-                    -= gUnknown_080D809E[boss->health < 5 ? 1 : 0][boss->unk26];
+                boss->platformRotSpeed -= gUnknown_080D809E[boss->health < 5 ? 1 : 0][boss->unk26];
 
                 if (boss->platformRotSpeed == 0) {
                     boss->unk27 = 2;
@@ -754,8 +726,7 @@ static void sub_804683C(EggGoRound *boss)
             }
         }
 
-        boss->platformRotation
-            = (boss->platformRotation + boss->platformRotSpeed) % (unsigned)Q(1024);
+        boss->platformRotation = (boss->platformRotation + boss->platformRotSpeed) % (unsigned)Q(1024);
         if (--boss->unk1E == 0) {
             u8 i;
             for (i = 0; i < NUM_PLATFORMS; i++) {
@@ -769,8 +740,7 @@ static void sub_804683C(EggGoRound *boss)
             boss->platformRotSpeed = 0;
         }
     } else {
-        boss->state
-            = sStateChoices[Mod(PseudoRandBetween(0, 256), ARRAY_COUNT(sStateChoices))];
+        boss->state = sStateChoices[Mod(PseudoRandBetween(0, 256), ARRAY_COUNT(sStateChoices))];
         boss->unk26 = Mod(PseudoRandBetween(0, 256), 10);
 
         boss->unk1E = gUnknown_080D804E[boss->health < 5 ? 1 : 0][boss->unk26];
@@ -836,15 +806,12 @@ static void sub_8046C28(EggGoRound *boss)
 
         for (i = 0; i < NUM_PLATFORMS; i++) {
             u8 platformPos = sLinkPositions[ARRAY_COUNT(sLinkPositions) - 1];
-            u32 idx
-                = CLAMP_SIN_PERIOD(((u32)((boss->rotation + (i << 0x10)) << 0xE) >> 0x16)
-                                   + (boss->linkRotOffset * NUM_LINKS));
+            u32 idx = CLAMP_SIN_PERIOD(((u32)((boss->rotation + (i << 0x10)) << 0xE) >> 0x16) + (boss->linkRotOffset * NUM_LINKS));
             Sprite *s = &boss->platforms[i].s;
             s32 x = I(boss->x) + ((COS(idx) * platformPos) >> 14);
             s32 y = I(boss->y) + ((SIN(idx) * platformPos) >> 14);
 
-            if (boss->unk1E != 0 && boss->unk24 == 0 && (i % 2)
-                && (boss->state == 1 || boss->state == 2)
+            if (boss->unk1E != 0 && boss->unk24 == 0 && (i % 2) && (boss->state == 1 || boss->state == 2)
                 && ((gPlayer.moveState & MOVESTATE_8) && gPlayer.unk3C == s)) {
                 gPlayer.moveState &= ~MOVESTATE_8;
                 gPlayer.moveState &= ~MOVESTATE_100;
@@ -856,8 +823,7 @@ static void sub_8046C28(EggGoRound *boss)
                 continue;
             }
 
-            if (boss->unk1E == 0 || boss->unk24 != 0 || !(i % 2)
-                || (boss->state != 1 && boss->state != 2)) {
+            if (boss->unk1E == 0 || boss->unk24 != 0 || !(i % 2) || (boss->state != 1 && boss->state != 2)) {
                 u32 val;
                 u8 someBool;
                 s32 speedAirY;
@@ -869,8 +835,7 @@ static void sub_8046C28(EggGoRound *boss)
                 }
                 speedAirY = gPlayer.speedAirY;
 
-                if (gPlayer.moveState & MOVESTATE_IN_AIR
-                    || (gPlayer.moveState & MOVESTATE_8 && gPlayer.unk3C == s)) {
+                if (gPlayer.moveState & MOVESTATE_IN_AIR || (gPlayer.moveState & MOVESTATE_8 && gPlayer.unk3C == s)) {
                     val = sub_800CCB8(s, x, y, &gPlayer);
                 } else {
                     val = 0;
@@ -882,8 +847,7 @@ static void sub_8046C28(EggGoRound *boss)
                         gPlayer.speedGroundX -= BOSS_X_SPEED;
                     }
 
-                    if (boss->unk1E != 0 && !boss->unk24 && !(i % 2)
-                        && (boss->state == 0 || boss->state == 2)) {
+                    if (boss->unk1E != 0 && !boss->unk24 && !(i % 2) && (boss->state == 0 || boss->state == 2)) {
                         sub_8047940(boss);
                         sub_800CBA4(&gPlayer);
                         return;
@@ -961,10 +925,8 @@ static void sub_8046F00(EggGoRound *boss)
             u8 j;
 
             u16 idx = ((u32)((boss->rotation + (i << 0x10)) << 0xE) >> 0x16);
-            s16 x
-                = ((I(boss->x) - gCamera.x) + ((sLinkPositions[temp] * COS(idx)) >> 14));
-            s16 y
-                = ((I(boss->y) - gCamera.y) + ((sLinkPositions[temp] * SIN(idx)) >> 14));
+            s16 x = ((I(boss->x) - gCamera.x) + ((sLinkPositions[temp] * COS(idx)) >> 14));
+            s16 y = ((I(boss->y) - gCamera.y) + ((sLinkPositions[temp] * SIN(idx)) >> 14));
             for (j = 0; j < NUM_LINKS; j++) {
                 u32 rand;
 
@@ -983,8 +945,7 @@ static void sub_8046F00(EggGoRound *boss)
                 explosion.variant = 0;
                 explosion.unk4 = 0;
 
-                CreateBossParticleWithExplosionUpdate(&explosion,
-                                                      &destruction->explosionState);
+                CreateBossParticleWithExplosionUpdate(&explosion, &destruction->explosionState);
             }
         }
     }
@@ -1013,8 +974,7 @@ static void sub_8047060(EggGoRound *boss)
         explosion.variant = 0;
         explosion.unk4 = 0;
 
-        CreateBossParticleWithExplosionUpdate(&explosion,
-                                              &boss->destructionProps.explosionState);
+        CreateBossParticleWithExplosionUpdate(&explosion, &boss->destructionProps.explosionState);
     }
 }
 
@@ -1042,8 +1002,7 @@ static void sub_8047138(EggGoRound *boss)
         explosion.variant = 0;
         explosion.unk4 = 0;
 
-        CreateBossParticleWithExplosionUpdate(&explosion,
-                                              &boss->destructionProps.explosionState);
+        CreateBossParticleWithExplosionUpdate(&explosion, &boss->destructionProps.explosionState);
     }
 }
 
@@ -1110,15 +1069,11 @@ static void sub_804732C(EggGoRound *boss)
 
         for (j = 0; j < NUM_LINKS; j++) {
 #ifndef NON_MATCHING
-            destruction_2->platformLinks[i][j].x
-                = boss->x + ((sLinkPositions[j] * COS(idx)) >> 6);
-            destruction_2->platformLinks[i][j].y
-                = boss->y + ((sLinkPositions[j] * SIN(idx)) >> 6);
+            destruction_2->platformLinks[i][j].x = boss->x + ((sLinkPositions[j] * COS(idx)) >> 6);
+            destruction_2->platformLinks[i][j].y = boss->y + ((sLinkPositions[j] * SIN(idx)) >> 6);
 #else
-            destruction->platformLinks[i][j].x
-                = boss->x + ((sLinkPositions[j] * COS(idx)) >> 6);
-            destruction->platformLinks[i][j].y
-                = boss->y + ((sLinkPositions[j] * SIN(idx)) >> 6);
+            destruction->platformLinks[i][j].x = boss->x + ((sLinkPositions[j] * COS(idx)) >> 6);
+            destruction->platformLinks[i][j].y = boss->y + ((sLinkPositions[j] * SIN(idx)) >> 6);
 #endif
             destruction->platformLinks[i][j].speedX = (7 - j) * 20;
             destruction->platformLinks[i][j].speedY = 1;
@@ -1243,8 +1198,7 @@ static void HandleCollisions(EggGoRound *boss)
         return;
     }
 
-    if (IsColliding_Cheese(s, x, y, 0, &gPlayer) == TRUE
-        || sub_800C320(s, x, y, 0, &gPlayer) == TRUE) {
+    if (IsColliding_Cheese(s, x, y, 0, &gPlayer) == TRUE || sub_800C320(s, x, y, 0, &gPlayer) == TRUE) {
         HandleHit(boss);
         return;
     }
diff --git a/src/game/bosses/boss_7.c b/src/game/bosses/boss_7.c
index 82d9757d2..df14a3784 100644
--- a/src/game/bosses/boss_7.c
+++ b/src/game/bosses/boss_7.c
@@ -113,9 +113,8 @@ static void sub_8049174(EggFrog *);
 static void sub_80491C4(EggFrog *);
 
 static const TileInfo gUnknown_080D8108[] = {
-    { 12, SA2_ANIM_EGG_FROG_WHEELS, 0 },     { 4, SA2_ANIM_EGG_FROG_ARM_SEGMENT, 0 },
-    { 12, SA2_ANIM_EGG_FROG_WHEELS, 0 },     { 4, SA2_ANIM_EGG_FROG_ARM_SEGMENT, 0 },
-    { 4, SA2_ANIM_EGG_FROG_ARM_SEGMENT, 1 }, { 4, SA2_ANIM_EGG_FROG_ARM_SEGMENT, 2 },
+    { 12, SA2_ANIM_EGG_FROG_WHEELS, 0 },     { 4, SA2_ANIM_EGG_FROG_ARM_SEGMENT, 0 }, { 12, SA2_ANIM_EGG_FROG_WHEELS, 0 },
+    { 4, SA2_ANIM_EGG_FROG_ARM_SEGMENT, 0 }, { 4, SA2_ANIM_EGG_FROG_ARM_SEGMENT, 1 }, { 4, SA2_ANIM_EGG_FROG_ARM_SEGMENT, 2 },
     { 4, SA2_ANIM_EGG_FROG_ARM_SEGMENT, 3 }, { 4, SA2_ANIM_EGG_FROG_ARM_SEGMENT, 4 },
 };
 
@@ -173,64 +172,57 @@ const u16 gUnknown_080D814C[][12] = {
 };
 
 const u16 *const gUnknown_080D859C[][6] = {
-    { gUnknown_080D814C[40], gUnknown_080D814C[41], gUnknown_080D814C[42],
-      gUnknown_080D814C[43], gUnknown_080D814C[44], gUnknown_080D814C[45] },
+    { gUnknown_080D814C[40], gUnknown_080D814C[41], gUnknown_080D814C[42], gUnknown_080D814C[43], gUnknown_080D814C[44],
+      gUnknown_080D814C[45] },
 
-    { gUnknown_080D814C[0], gUnknown_080D814C[1], gUnknown_080D814C[2],
-      gUnknown_080D814C[3], gUnknown_080D814C[4], gUnknown_080D814C[5] },
+    { gUnknown_080D814C[0], gUnknown_080D814C[1], gUnknown_080D814C[2], gUnknown_080D814C[3], gUnknown_080D814C[4], gUnknown_080D814C[5] },
 
-    { gUnknown_080D814C[0], gUnknown_080D814C[14], gUnknown_080D814C[15],
-      gUnknown_080D814C[3], gUnknown_080D814C[16], gUnknown_080D814C[17] },
+    { gUnknown_080D814C[0], gUnknown_080D814C[14], gUnknown_080D814C[15], gUnknown_080D814C[3], gUnknown_080D814C[16],
+      gUnknown_080D814C[17] },
 
-    { gUnknown_080D814C[0], gUnknown_080D814C[18], gUnknown_080D814C[19],
-      gUnknown_080D814C[3], gUnknown_080D814C[20], gUnknown_080D814C[21] },
+    { gUnknown_080D814C[0], gUnknown_080D814C[18], gUnknown_080D814C[19], gUnknown_080D814C[3], gUnknown_080D814C[20],
+      gUnknown_080D814C[21] },
 
-    { gUnknown_080D814C[0], gUnknown_080D814C[10], gUnknown_080D814C[11],
-      gUnknown_080D814C[3], gUnknown_080D814C[12], gUnknown_080D814C[13] },
+    { gUnknown_080D814C[0], gUnknown_080D814C[10], gUnknown_080D814C[11], gUnknown_080D814C[3], gUnknown_080D814C[12],
+      gUnknown_080D814C[13] },
 
-    { gUnknown_080D814C[0], gUnknown_080D814C[22], gUnknown_080D814C[23],
-      gUnknown_080D814C[3], gUnknown_080D814C[24], gUnknown_080D814C[25] },
+    { gUnknown_080D814C[0], gUnknown_080D814C[22], gUnknown_080D814C[23], gUnknown_080D814C[3], gUnknown_080D814C[24],
+      gUnknown_080D814C[25] },
 
-    { gUnknown_080D814C[0], gUnknown_080D814C[6], gUnknown_080D814C[7],
-      gUnknown_080D814C[3], gUnknown_080D814C[8], gUnknown_080D814C[9] },
+    { gUnknown_080D814C[0], gUnknown_080D814C[6], gUnknown_080D814C[7], gUnknown_080D814C[3], gUnknown_080D814C[8], gUnknown_080D814C[9] },
 
-    { gUnknown_080D814C[0], gUnknown_080D814C[22], gUnknown_080D814C[23],
-      gUnknown_080D814C[3], gUnknown_080D814C[24], gUnknown_080D814C[25] },
+    { gUnknown_080D814C[0], gUnknown_080D814C[22], gUnknown_080D814C[23], gUnknown_080D814C[3], gUnknown_080D814C[24],
+      gUnknown_080D814C[25] },
 
-    { gUnknown_080D814C[0], gUnknown_080D814C[28], gUnknown_080D814C[29],
-      gUnknown_080D814C[3], gUnknown_080D814C[30], gUnknown_080D814C[31] },
+    { gUnknown_080D814C[0], gUnknown_080D814C[28], gUnknown_080D814C[29], gUnknown_080D814C[3], gUnknown_080D814C[30],
+      gUnknown_080D814C[31] },
 
-    { gUnknown_080D814C[0], gUnknown_080D814C[26], gUnknown_080D814C[26],
-      gUnknown_080D814C[3], gUnknown_080D814C[27], gUnknown_080D814C[27] },
+    { gUnknown_080D814C[0], gUnknown_080D814C[26], gUnknown_080D814C[26], gUnknown_080D814C[3], gUnknown_080D814C[27],
+      gUnknown_080D814C[27] },
 
-    { gUnknown_080D814C[0], gUnknown_080D814C[1], gUnknown_080D814C[2],
-      gUnknown_080D814C[3], gUnknown_080D814C[4], gUnknown_080D814C[5] },
+    { gUnknown_080D814C[0], gUnknown_080D814C[1], gUnknown_080D814C[2], gUnknown_080D814C[3], gUnknown_080D814C[4], gUnknown_080D814C[5] },
 
-    { gUnknown_080D814C[0], gUnknown_080D814C[32], gUnknown_080D814C[33],
-      gUnknown_080D814C[3], gUnknown_080D814C[34], gUnknown_080D814C[35] },
+    { gUnknown_080D814C[0], gUnknown_080D814C[32], gUnknown_080D814C[33], gUnknown_080D814C[3], gUnknown_080D814C[34],
+      gUnknown_080D814C[35] },
 
-    { gUnknown_080D814C[0], gUnknown_080D814C[36], gUnknown_080D814C[37],
-      gUnknown_080D814C[3], gUnknown_080D814C[38], gUnknown_080D814C[39] },
+    { gUnknown_080D814C[0], gUnknown_080D814C[36], gUnknown_080D814C[37], gUnknown_080D814C[3], gUnknown_080D814C[38],
+      gUnknown_080D814C[39] },
 };
 
 const u16 *const *const gUnknown_080D86D4[] = {
-    gUnknown_080D859C[1], gUnknown_080D859C[2],  gUnknown_080D859C[4],
-    gUnknown_080D859C[5], gUnknown_080D859C[6],  gUnknown_080D859C[7],
-    gUnknown_080D859C[3], gUnknown_080D859C[7],  gUnknown_080D859C[8],
-    gUnknown_080D859C[9], gUnknown_080D859C[10], gUnknown_080D859C[11],
-    gUnknown_080D859C[1], gUnknown_080D859C[12], gUnknown_080D859C[0],
+    gUnknown_080D859C[1],  gUnknown_080D859C[2],  gUnknown_080D859C[4], gUnknown_080D859C[5],  gUnknown_080D859C[6],
+    gUnknown_080D859C[7],  gUnknown_080D859C[3],  gUnknown_080D859C[7], gUnknown_080D859C[8],  gUnknown_080D859C[9],
+    gUnknown_080D859C[10], gUnknown_080D859C[11], gUnknown_080D859C[1], gUnknown_080D859C[12], gUnknown_080D859C[0],
 };
 
 const UNK_80D8710 gUnknown_080D8710[] = {
-    { 64, 0, 0 },  { 128, 0, 1 }, { 512, 0, 1 }, { 256, 1, 1 }, { 256, 0, 1 },
-    { 256, 1, 1 }, { 128, 0, 1 }, { 64, 1, 0 },  { 128, 1, 1 }, { 512, 1, 1 },
-    { 256, 0, 1 }, { 256, 1, 1 }, { 256, 0, 1 }, { 128, 1, 1 }, { 256, 0, 0 },
+    { 64, 0, 0 },  { 128, 0, 1 }, { 512, 0, 1 }, { 256, 1, 1 }, { 256, 0, 1 }, { 256, 1, 1 }, { 128, 0, 1 }, { 64, 1, 0 },
+    { 128, 1, 1 }, { 512, 1, 1 }, { 256, 0, 1 }, { 256, 1, 1 }, { 256, 0, 1 }, { 128, 1, 1 }, { 256, 0, 0 },
 };
 
 const EggFrogCallback gUnknown_080D874C[] = {
-    sub_8048F7C, sub_8048FA4, sub_804893C, sub_80489B0, sub_8048A4C,
-    sub_8048FF4, sub_804904C, sub_804909C, sub_80490C4, sub_8048AD8,
-    sub_8048B50, sub_8048BF0, sub_804911C, sub_8049174, sub_80491C4,
+    sub_8048F7C, sub_8048FA4, sub_804893C, sub_80489B0, sub_8048A4C, sub_8048FF4, sub_804904C, sub_804909C,
+    sub_80490C4, sub_8048AD8, sub_8048B50, sub_8048BF0, sub_804911C, sub_8049174, sub_80491C4,
 };
 
 const u8 gUnknown_080D8788[][7] = {
@@ -265,8 +257,7 @@ void CreateEggFrog(void)
     gPseudoRandom = gStageTime;
     gUnknown_03005AF0.s.frameFlags &= ~0x3000;
     gUnknown_03005AF0.s.frameFlags |= 0x1000;
-    gActiveBossTask = TaskCreate(Task_EggFrogMain, sizeof(EggFrog), 0x4000, 0,
-                                 TaskDestructor_EggFrogMain);
+    gActiveBossTask = TaskCreate(Task_EggFrogMain, sizeof(EggFrog), 0x4000, 0, TaskDestructor_EggFrogMain);
 
     boss = TASK_DATA(gActiveBossTask);
 
@@ -343,8 +334,7 @@ void CreateEggFrog(void)
 
         a = 3 + i;
 
-        SPRITE_INIT(s, gUnknown_080D8108[a].numTiles, gUnknown_080D8108[a].anim,
-                    gUnknown_080D8108[a].variant, i + 27, 2);
+        SPRITE_INIT(s, gUnknown_080D8108[a].numTiles, gUnknown_080D8108[a].anim, gUnknown_080D8108[a].variant, i + 27, 2);
 
         UpdateSpriteAnimation(s);
     }
@@ -354,16 +344,14 @@ void CreateEggFrog(void)
     s->y = 0;
     vram = VramMalloc(gUnknown_080D8108[2].numTiles);
     s->graphics.dest = vram;
-    SPRITE_INIT_WITHOUT_VRAM(s, gUnknown_080D8108[2].anim, gUnknown_080D8108[2].variant,
-                             25, 2, 0);
+    SPRITE_INIT_WITHOUT_VRAM(s, gUnknown_080D8108[2].anim, gUnknown_080D8108[2].variant, 25, 2, 0);
     UpdateSpriteAnimation(s);
 
     s = &boss->unk188[1];
     s->x = 0;
     s->y = 0;
     s->graphics.dest = vram;
-    SPRITE_INIT_WITHOUT_VRAM(s, gUnknown_080D8108[2].anim, gUnknown_080D8108[2].variant,
-                             25, 2, 0);
+    SPRITE_INIT_WITHOUT_VRAM(s, gUnknown_080D8108[2].anim, gUnknown_080D8108[2].variant, 25, 2, 0);
     UpdateSpriteAnimation(s);
 }
 
@@ -436,8 +424,7 @@ static void sub_8047F0C(void)
         s->variant = 4;
         s->prevVariant = -1;
         boss->unk65 = 1;
-        CreateEggmobileEscapeSequence(I(boss->x) - gCamera.x,
-                                      I(boss->y) - gCamera.y - 15,
+        CreateEggmobileEscapeSequence(I(boss->x) - gCamera.x, I(boss->y) - gCamera.y - 15,
                                       SPRITE_FLAG(PRIORITY, 2) | SPRITE_FLAG(X_FLIP, 1));
     }
 
@@ -542,8 +529,7 @@ static void sub_8048408(EggFrog *boss)
 
         Player_UpdateHomingPosition(QS(pos.x), QS(pos.y));
 
-        if (boss->unk16 == 0
-            && IsColliding_Cheese(s, pos.x, pos.y, 0, &gPlayer) == TRUE) {
+        if (boss->unk16 == 0 && IsColliding_Cheese(s, pos.x, pos.y, 0, &gPlayer) == TRUE) {
             sub_8048D78(boss);
             gCheeseTarget.task->unk15 = 0;
         }
@@ -856,8 +842,7 @@ static void sub_8048BF0(EggFrog *boss)
 
 // https://decomp.me/scratch/aDy46
 // 81% though looks functionally matching
-NONMATCH("asm/non_matching/game/bosses/boss_7__sub_8048C7C.inc",
-         static bool8 sub_8048C7C(EggFrog *boss))
+NONMATCH("asm/non_matching/game/bosses/boss_7__sub_8048C7C.inc", static bool8 sub_8048C7C(EggFrog *boss))
 {
     const u16 *const *unk60 = boss->unk60;
     s16 *unk28 = boss->unk28;
@@ -1250,8 +1235,7 @@ static void sub_80494EC(void)
     s->x = I(bomb->x);
     s->y = I(bomb->y);
     if (bomb->boss->unk14) {
-        s32 result = sub_800CA20(s, I(bomb->x) + gCamera.x, I(bomb->y) + gCamera.y, 0,
-                                 &gPlayer);
+        s32 result = sub_800CA20(s, I(bomb->x) + gCamera.x, I(bomb->y) + gCamera.y, 0, &gPlayer);
         if (result == 1 && bomb->boss->unk16 == 0) {
             Sprite *unk68 = &bomb->boss->unk68;
             bomb->boss->unk15 = 0x1E;
@@ -1347,8 +1331,7 @@ static void Task_80497E0(void)
     s->x = I(bombFlame->x);
     s->y = I(bombFlame->y);
     if (bombFlame->boss->unk14) {
-        s32 result = sub_800CA20(s, I(bombFlame->x) + gCamera.x,
-                                 I(bombFlame->y) + gCamera.y, 0, &gPlayer);
+        s32 result = sub_800CA20(s, I(bombFlame->x) + gCamera.x, I(bombFlame->y) + gCamera.y, 0, &gPlayer);
         if (result == 1 && bombFlame->boss->unk16 == 0) {
             Sprite *unk68 = &bombFlame->boss->unk68;
             bombFlame->boss->unk15 = 30;
diff --git a/src/game/bosses/boss_8.c b/src/game/bosses/boss_8.c
index 19ff8ad83..d3ad17b17 100644
--- a/src/game/bosses/boss_8.c
+++ b/src/game/bosses/boss_8.c
@@ -139,13 +139,11 @@ const u16 sBossRunCameraYTriggers[] = {
 };
 
 const u16 gUnknown_080D87E6[][2] = {
-    { 5804, 177 },  { 13292, 177 }, { 17420, 177 }, { 22508, 177 },
-    { 28585, 177 }, { 37484, 201 }, { 41600, 225 }, { 41600, 225 },
+    { 5804, 177 }, { 13292, 177 }, { 17420, 177 }, { 22508, 177 }, { 28585, 177 }, { 37484, 201 }, { 41600, 225 }, { 41600, 225 },
 };
 
 const s32 gUnknown_080D8808[][2] = {
-    { 5376, -4512 },  { 12864, -5952 }, { 17088, -2688 }, { 22080, -3552 },
-    { 28128, -4512 }, { 37058, -7394 }, { 42240, -3648 },
+    { 5376, -4512 }, { 12864, -5952 }, { 17088, -2688 }, { 22080, -3552 }, { 28128, -4512 }, { 37058, -7394 }, { 42240, -3648 },
 };
 
 const s32 gUnknown_080D8840[][2] = {
@@ -170,32 +168,30 @@ const SuperEggRoboZTowersCallback sTowerStateCallbacks[] = {
 const u16 gUnknown_080D8888[2][2] = { { Q(188), Q(110) }, { Q(162), Q(110) } };
 
 static const EggRoboFn sArmFuncs[8]
-    = { sub_804B43C, sub_804B594, sub_804B734, sub_804B984,
-        sub_804BC44, sub_804BE6C, sub_804BAC0, sub_804C240 };
+    = { sub_804B43C, sub_804B594, sub_804B734, sub_804B984, sub_804BC44, sub_804BE6C, sub_804BAC0, sub_804C240 };
 
 const u16 sArmPalettes[2][16] = {
     INCBIN_U16("graphics/boss_8_a.gbapal"),
     INCBIN_U16("graphics/boss_8_b.gbapal"),
 };
 
-#define SWITCH_ARM_VARIANT(boss, arm, vNum)                                             \
-    {                                                                                   \
-        Sprite *s = &boss->bsArms[arm].s;                                               \
-                                                                                        \
-        if (arm != ARM_LEFT) {                                                          \
-            s->graphics.anim = SA2_ANIM_SUPER_EGG_ROBO_Z_ARM_RIGHT;                     \
-            s->variant = vNum;                                                          \
-        } else {                                                                        \
-            s->graphics.anim = SA2_ANIM_SUPER_EGG_ROBO_Z_ARM_LEFT;                      \
-            s->variant = vNum;                                                          \
-        }                                                                               \
-        s->prevVariant = -1;                                                            \
+#define SWITCH_ARM_VARIANT(boss, arm, vNum)                                                                                                \
+    {                                                                                                                                      \
+        Sprite *s = &boss->bsArms[arm].s;                                                                                                  \
+                                                                                                                                           \
+        if (arm != ARM_LEFT) {                                                                                                             \
+            s->graphics.anim = SA2_ANIM_SUPER_EGG_ROBO_Z_ARM_RIGHT;                                                                        \
+            s->variant = vNum;                                                                                                             \
+        } else {                                                                                                                           \
+            s->graphics.anim = SA2_ANIM_SUPER_EGG_ROBO_Z_ARM_LEFT;                                                                         \
+            s->variant = vNum;                                                                                                             \
+        }                                                                                                                                  \
+        s->prevVariant = -1;                                                                                                               \
     }
 
 void CreateBossRunManager(u8 bossIndex)
 {
-    struct Task *t = TaskCreate(Task_BossRunManagerMain, sizeof(BossRunManager), 0x4000,
-                                0, TaskDestructor_BossRunManager);
+    struct Task *t = TaskCreate(Task_BossRunManagerMain, sizeof(BossRunManager), 0x4000, 0, TaskDestructor_BossRunManager);
     BossRunManager *manager = TASK_DATA(t);
     manager->bossIndex = bossIndex;
     manager->unk5 = 0;
@@ -270,8 +266,7 @@ static void Task_BossRunManagerMain(void)
                         gCamera.unk10--;
                     }
                 }
-            } else if (gPlayer.x < Q(42700)
-                       && gPlayer.x > Q(gUnknown_080D8808[6][0] + 20)) {
+            } else if (gPlayer.x < Q(42700) && gPlayer.x > Q(gUnknown_080D8808[6][0] + 20)) {
                 if (gActiveBossTask == NULL && !(gStageFlags & STAGE_FLAG__100)) {
                     gPlayer.checkpointTime = gCourseTime;
                     CreateZoneBoss(7);
@@ -334,8 +329,7 @@ static void Task_BossRunManagerMain(void)
         }
     }
 
-    if (manager->unk5 < 7
-        && gCamera.unk10 > sBossRunCameraYTriggers[manager->unk5] - 600) {
+    if (manager->unk5 < 7 && gCamera.unk10 > sBossRunCameraYTriggers[manager->unk5] - 600) {
         if (manager->unk5 == 6) {
             if (manager->unk6 == 0) {
                 gCamera.unkC = 1;
@@ -372,9 +366,7 @@ static void TaskDestructor_BossRunManager(struct Task *t) { }
 static void CreateSuperEggRoboZTowers(void *vram, SuperEggRoboZ *boss)
 {
     u8 i, j;
-    struct Task *t
-        = TaskCreate(Task_SuperEggRoboZTowersMain, sizeof(SuperEggRoboZTowers), 0x4080,
-                     0, TaskDestructor_SuperEggRoboZTowers);
+    struct Task *t = TaskCreate(Task_SuperEggRoboZTowersMain, sizeof(SuperEggRoboZTowers), 0x4080, 0, TaskDestructor_SuperEggRoboZTowers);
     SuperEggRoboZTowers *towers = TASK_DATA(t);
     void *vrams[2];
     Sprite *s;
@@ -400,8 +392,7 @@ static void CreateSuperEggRoboZTowers(void *vram, SuperEggRoboZ *boss)
             s->x = 80;
             s->y = 80;
             s->graphics.dest = vrams[j];
-            SPRITE_INIT_WITHOUT_VRAM(s, sTowerPiecesTileInfo[j].anim,
-                                     sTowerPiecesTileInfo[j].variant, 28, 1, 0);
+            SPRITE_INIT_WITHOUT_VRAM(s, sTowerPiecesTileInfo[j].anim, sTowerPiecesTileInfo[j].variant, 28, 1, 0);
             UpdateSpriteAnimation(s);
         }
     }
@@ -457,10 +448,8 @@ static void sub_8049F1C(SuperEggRoboZTowers *towers, u8 towerIndex)
     if (*unk15F == 0) {
 
         if (--towers->unk154[towerIndex] == 0) {
-            towers->unk154[towerIndex]
-                = gUnknown_080D8858[towers->unk15A[towerIndex]][1];
-            towers->unk15A[towerIndex]
-                = gUnknown_080D8858[towers->unk15A[towerIndex]][0];
+            towers->unk154[towerIndex] = gUnknown_080D8858[towers->unk15A[towerIndex]][1];
+            towers->unk15A[towerIndex] = gUnknown_080D8858[towers->unk15A[towerIndex]][0];
         }
     }
 
@@ -517,10 +506,8 @@ static void sub_804A070(SuperEggRoboZTowers *towers, u8 towerIndex)
     if (towers->unk15F == 0) {
         m4aSongNumStart(SE_264);
         if (--towers->unk154[towerIndex] == 0) {
-            towers->unk154[towerIndex]
-                = gUnknown_080D8858[towers->unk15A[towerIndex]][1];
-            towers->unk15A[towerIndex]
-                = gUnknown_080D8858[towers->unk15A[towerIndex]][0];
+            towers->unk154[towerIndex] = gUnknown_080D8858[towers->unk15A[towerIndex]][1];
+            towers->unk15A[towerIndex] = gUnknown_080D8858[towers->unk15A[towerIndex]][0];
         }
     }
 
@@ -576,10 +563,8 @@ static void sub_804A1C0(SuperEggRoboZTowers *towers, u8 towerIndex)
         }
 
         if (--towers->unk154[towerIndex] == 0) {
-            towers->unk154[towerIndex]
-                = gUnknown_080D8858[towers->unk15A[towerIndex]][1];
-            towers->unk15A[towerIndex]
-                = gUnknown_080D8858[towers->unk15A[towerIndex]][0];
+            towers->unk154[towerIndex] = gUnknown_080D8858[towers->unk15A[towerIndex]][1];
+            towers->unk15A[towerIndex] = gUnknown_080D8858[towers->unk15A[towerIndex]][0];
         }
     }
 
@@ -616,8 +601,7 @@ static void sub_804A398(SuperEggRoboZTowers *towers, u8 towerIndex)
     s32 preY = -towers->offsets[towerIndex].y;
 
     if (towers->unk15F == 0) {
-        towers->offsets[towerIndex].y
-            -= ((COS(towers->unk154[towerIndex] * 2) * 3) >> 7);
+        towers->offsets[towerIndex].y -= ((COS(towers->unk154[towerIndex] * 2) * 3) >> 7);
     }
     preY += towers->offsets[towerIndex].y;
 
@@ -629,10 +613,8 @@ static void sub_804A398(SuperEggRoboZTowers *towers, u8 towerIndex)
 
     if (towers->unk15F == 0) {
         if (--towers->unk154[towerIndex] == 0) {
-            towers->unk154[towerIndex]
-                = gUnknown_080D8858[towers->unk15A[towerIndex]][1];
-            towers->unk15A[towerIndex]
-                = gUnknown_080D8858[towers->unk15A[towerIndex]][0];
+            towers->unk154[towerIndex] = gUnknown_080D8858[towers->unk15A[towerIndex]][1];
+            towers->unk15A[towerIndex] = gUnknown_080D8858[towers->unk15A[towerIndex]][0];
         }
     }
 
@@ -684,10 +666,8 @@ static void sub_804A53C(SuperEggRoboZTowers *towers, u8 towerIndex)
 
     if (towers->unk15F == 0) {
         if (--towers->unk154[towerIndex] == 0) {
-            towers->unk154[towerIndex]
-                = gUnknown_080D8858[towers->unk15A[towerIndex]][1];
-            towers->unk15A[towerIndex]
-                = gUnknown_080D8858[towers->unk15A[towerIndex]][0];
+            towers->unk154[towerIndex] = gUnknown_080D8858[towers->unk15A[towerIndex]][1];
+            towers->unk15A[towerIndex] = gUnknown_080D8858[towers->unk15A[towerIndex]][0];
         }
     }
 
@@ -732,10 +712,8 @@ void CreateSuperEggRoboZ(void)
     Background *body;
     u8 arm;
 
-    gBgCntRegs[0] = (BGCNT_TXT512x512 | BGCNT_SCREENBASE(20) | BGCNT_CHARBASE(3)
-                     | BGCNT_PRIORITY(2));
-    gBgCntRegs[2] = (BGCNT_TXT256x256 | BGCNT_SCREENBASE(31) | BGCNT_CHARBASE(0)
-                     | BGCNT_PRIORITY(1));
+    gBgCntRegs[0] = (BGCNT_TXT512x512 | BGCNT_SCREENBASE(20) | BGCNT_CHARBASE(3) | BGCNT_PRIORITY(2));
+    gBgCntRegs[2] = (BGCNT_TXT256x256 | BGCNT_SCREENBASE(31) | BGCNT_CHARBASE(0) | BGCNT_PRIORITY(1));
     gBgScrollRegs[0][0] = 0;
     gBgScrollRegs[0][1] = 0;
     gUnknown_03004D80[0] = 0;
@@ -751,8 +729,7 @@ void CreateSuperEggRoboZ(void)
     gUnknown_03005AA0.s.frameFlags &= ~SPRITE_FLAG_MASK_PRIORITY;
     gUnknown_03005AA0.s.frameFlags |= SPRITE_FLAG(PRIORITY, 1);
 
-    t = TaskCreate(Task_SuperEggRoboZMain, sizeof(SuperEggRoboZ), 0x4000, 0,
-                   TaskDestructor_SuperEggRoboZMain);
+    t = TaskCreate(Task_SuperEggRoboZMain, sizeof(SuperEggRoboZ), 0x4000, 0, TaskDestructor_SuperEggRoboZMain);
     gActiveBossTask = t;
     boss = TASK_DATA(t);
     fade = &boss->fade;
@@ -819,8 +796,7 @@ void CreateSuperEggRoboZ(void)
     fade->brightness = 0;
     fade->flags = SCREEN_FADE_FLAG_2;
     fade->speed = 0;
-    fade->bldCnt = ((BLDCNT_TGT2_ALL & ~BLDCNT_TGT2_BG3) | BLDCNT_EFFECT_LIGHTEN
-                    | BLDCNT_TGT1_ALL);
+    fade->bldCnt = ((BLDCNT_TGT2_ALL & ~BLDCNT_TGT2_BG3) | BLDCNT_EFFECT_LIGHTEN | BLDCNT_TGT1_ALL);
     fade->bldAlpha = 0;
 
     body = &boss->body;
@@ -916,8 +892,7 @@ static void Task_804A9D8(void)
 }
 
 // (99.89%) https://decomp.me/scratch/kiah8
-NONMATCH("asm/non_matching/game/bosses/boss_8__Task_804AB24.inc",
-         static void Task_804AB24(void))
+NONMATCH("asm/non_matching/game/bosses/boss_8__Task_804AB24.inc", static void Task_804AB24(void))
 {
     s32 speed;
     SuperEggRoboZ *boss = TASK_DATA(gCurTask);
@@ -1046,8 +1021,7 @@ static void Task_804AD68(void)
 // (95.06%) https://decomp.me/scratch/of4k0
 // (98.77%) https://decomp.me/scratch/Kzx1m
 // (99.59%) https://decomp.me/scratch/IzRyM
-NONMATCH("asm/non_matching/game/bosses/boss_8__sub_804AE40.inc",
-         static void sub_804AE40(SuperEggRoboZ *boss))
+NONMATCH("asm/non_matching/game/bosses/boss_8__sub_804AE40.inc", static void sub_804AE40(SuperEggRoboZ *boss))
 {
     Sprite *s;
 
@@ -1269,8 +1243,7 @@ static u8 sub_804B0EC(SuperEggRoboZ *boss, u8 arm)
 //     ...
 // }
 // (93.51%) https://decomp.me/scratch/ecqNB
-NONMATCH("asm/non_matching/game/bosses/boss_8__sub_804B2EC.inc",
-         static bool8 sub_804B2EC(SuperEggRoboZ *boss, u8 arm))
+NONMATCH("asm/non_matching/game/bosses/boss_8__sub_804B2EC.inc", static bool8 sub_804B2EC(SuperEggRoboZ *boss, u8 arm))
 {
     u8 result = 0;
     s32 sp04, ip;
@@ -1528,8 +1501,7 @@ static void sub_804BAC0(SuperEggRoboZ *boss, u8 arm)
 }
 
 // (81.31%) https://decomp.me/scratch/432q4
-NONMATCH("asm/non_matching/game/bosses/boss_8__sub_804BC44.inc",
-         static void sub_804BC44(SuperEggRoboZ *boss, u8 arm))
+NONMATCH("asm/non_matching/game/bosses/boss_8__sub_804BC44.inc", static void sub_804BC44(SuperEggRoboZ *boss, u8 arm))
 {
     ExplosionPartsInfo info;
     s32 speed0;
@@ -1565,8 +1537,7 @@ NONMATCH("asm/non_matching/game/bosses/boss_8__sub_804BC44.inc",
                 info.spawnY = I(y) - ((SIN(index & ONE_CYCLE) * (i - 1)) >> 11);
 
                 info.velocity = 0;
-                info.rotation
-                    = (boss->rotation[arm] + 576 - boss->rotation2[arm]) & ONE_CYCLE;
+                info.rotation = (boss->rotation[arm] + 576 - boss->rotation2[arm]) & ONE_CYCLE;
                 speed0 = (Q(2) + (j * Q(0.5)));
 
                 if ((1 - i) >= 0) {
@@ -1623,8 +1594,7 @@ static void sub_804BE6C(SuperEggRoboZ *boss, u8 arm)
                 {
                     s32 speed;
                     speed = ((j * Q(0.375)) + Q(0.5));
-                    info.speed = ((1 - i) >= 0) ? speed - ((1 - i) * Q(0.125))
-                                                : speed - ((i - 1) * Q(0.125));
+                    info.speed = ((1 - i) >= 0) ? speed - ((1 - i) * Q(0.125)) : speed - ((i - 1) * Q(0.125));
                 }
 
                 info.vram = boss->tilesCloud;
@@ -1696,8 +1666,7 @@ static void sub_804C080(SuperEggRoboZ *boss)
 }
 
 // (87.37%) https://decomp.me/scratch/98Mjg
-NONMATCH("asm/non_matching/game/bosses/boss_8__sub_804C240.inc",
-         static void sub_804C240(SuperEggRoboZ *boss, u8 arm))
+NONMATCH("asm/non_matching/game/bosses/boss_8__sub_804C240.inc", static void sub_804C240(SuperEggRoboZ *boss, u8 arm))
 {
     ExplosionPartsInfo info;
     s32 x, y;
@@ -1731,8 +1700,7 @@ NONMATCH("asm/non_matching/game/bosses/boss_8__sub_804C240.inc",
         info.spawnX = I(x);
         info.spawnY = I(y);
         info.velocity = 0;
-        info.rotation
-            = sub_8004418(-(boss->qUnk34[arm][1] >> 3), -(boss->qUnk34[arm][0] >> 3));
+        info.rotation = sub_8004418(-(boss->qUnk34[arm][1] >> 3), -(boss->qUnk34[arm][0] >> 3));
 
         rand = PseudoRandom32();
         index = (info.rotation + (rand & 0x1F));
@@ -1779,9 +1747,8 @@ static void sub_804C3AC(SuperEggRoboZ *boss)
     s->x = I(sp00.x) - gCamera.x;
     s->y = I(sp00.y) - gCamera.y;
 
-    s->frameFlags = (gUnknown_030054B8++
-                     | (SPRITE_FLAG(PRIORITY, 3) | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE
-                        | SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE));
+    s->frameFlags
+        = (gUnknown_030054B8++ | (SPRITE_FLAG(PRIORITY, 3) | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE | SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE));
 
     tf->rotation = boss->unk10;
     tf->width = Q(1);
@@ -1804,8 +1771,7 @@ static void sub_804C3AC(SuperEggRoboZ *boss)
         s->y = I(sp00.y) - gCamera.y;
 
         s->frameFlags = (gUnknown_030054B8++
-                         | (SPRITE_FLAG(PRIORITY, 1) | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE
-                            | SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE));
+                         | (SPRITE_FLAG(PRIORITY, 1) | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE | SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE));
 
         tf->rotation = boss->rotation[i];
         tf->width = Q(1);
@@ -1868,9 +1834,8 @@ static void sub_804C5B8(SuperEggRoboZ *boss)
     s->x = I(sp00.x) - gCamera.x;
     s->y = I(sp00.y) - gCamera.y + r3;
 
-    s->frameFlags = (gUnknown_030054B8++
-                     | (SPRITE_FLAG(PRIORITY, 3) | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE
-                        | SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE));
+    s->frameFlags
+        = (gUnknown_030054B8++ | (SPRITE_FLAG(PRIORITY, 3) | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE | SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE));
 
     tf->rotation = boss->unk10;
     tf->width = Q(1);
@@ -1897,8 +1862,7 @@ static void sub_804C5B8(SuperEggRoboZ *boss)
         s->y = I(sp00.y) - gCamera.y;
 
         s->frameFlags = (gUnknown_030054B8++
-                         | (SPRITE_FLAG(PRIORITY, 1) | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE
-                            | SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE));
+                         | (SPRITE_FLAG(PRIORITY, 1) | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE | SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE));
 
         tf->rotation = boss->rotation[i];
         tf->width = Q(1);
@@ -2102,8 +2066,7 @@ static void sub_804CCD0(SuperEggRoboZ *boss, s32 qP1)
 {
     Vec2_32 pos = { boss->qPos.x + Q(190), boss->qPos.y + Q(40) };
 
-    if ((I(gPlayer.y) < pos.x) && (gPlayer.y >= (pos.y - qP1))
-        && (gPlayer.y <= (qP1 + pos.y))) {
+    if ((I(gPlayer.y) < pos.x) && (gPlayer.y >= (pos.y - qP1)) && (gPlayer.y <= (qP1 + pos.y))) {
         sub_800CBA4(&gPlayer);
     }
 }
diff --git a/src/game/bosses/boss_9.c b/src/game/bosses/boss_9.c
index a27a8543e..de5830aec 100644
--- a/src/game/bosses/boss_9.c
+++ b/src/game/bosses/boss_9.c
@@ -79,47 +79,32 @@ bool32 sub_804EE84(Sprite *s, s32 x, s32 y);
 bool32 sub_804F010(Sprite *s, s32 x, s32 y, u8 param3);
 
 const TileInfo gUnknown_080D88F0[5] = {
-    { 8 * 8, SA2_ANIM_TRUE_AREA_53_BOSS_SEGMENT_0, 0 },
-    { 8 * 8, SA2_ANIM_TRUE_AREA_53_BOSS_SEGMENT_1, 0 },
-    { 8 * 8, SA2_ANIM_TRUE_AREA_53_BOSS_SEGMENT_2, 0 },
-    { 8 * 8, SA2_ANIM_TRUE_AREA_53_BOSS_CANNON, 0 },
+    { 8 * 8, SA2_ANIM_TRUE_AREA_53_BOSS_SEGMENT_0, 0 }, { 8 * 8, SA2_ANIM_TRUE_AREA_53_BOSS_SEGMENT_1, 0 },
+    { 8 * 8, SA2_ANIM_TRUE_AREA_53_BOSS_SEGMENT_2, 0 }, { 8 * 8, SA2_ANIM_TRUE_AREA_53_BOSS_CANNON, 0 },
     { 10 * 9, SA2_ANIM_TRUE_AREA_53_BOSS_COCKPIT, 0 },
 };
 
 const TileInfo gUnknown_080D8918[17] = {
-    { 8, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 12 },
-    { 8, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 11 },
-    { 16, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 10 },
-    { 8, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 9 },
-    { 8, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 8 },
-    { 12, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 7 },
-    { 16, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 6 },
-    { 8, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 5 },
-    { 8, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 4 },
-    { 8, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 3 },
-    { 16, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 2 },
-    { 8, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 1 },
-    { 8, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 0 },
-    { 12, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 15 },
-    { 16, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 14 },
-    { 8, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 13 },
+    { 8, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 12 },    { 8, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 11 },
+    { 16, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 10 },   { 8, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 9 },
+    { 8, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 8 },     { 12, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 7 },
+    { 16, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 6 },    { 8, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 5 },
+    { 8, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 4 },     { 8, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 3 },
+    { 16, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 2 },    { 8, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 1 },
+    { 8, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 0 },     { 12, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 15 },
+    { 16, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 14 },   { 8, SA2_ANIM_TRUE_AREA_53_BOSS_ROCKET, 13 },
     { 16, SA2_ANIM_TRUE_AREA_53_BOSS_EXPLOSION, 0 },
 };
 
 const s8 gUnknown_080D89A0[5] = { 0, -4, -8, -12, -16 };
 const u8 gUnknown_080D89A5[6] = { 0, 20, 24, 20, 18, 30 };
 
-const TA53SubFunc gUnknown_080D89AC[7]
-    = { sub_804F6AC, sub_804F768, sub_804F850, sub_804F9BC,
-        sub_804FAA4, sub_804FC10, sub_804FD58 };
+const TA53SubFunc gUnknown_080D89AC[7] = { sub_804F6AC, sub_804F768, sub_804F850, sub_804F9BC, sub_804FAA4, sub_804FC10, sub_804FD58 };
 
 const TA53_80D89C8 gUnknown_080D89C8[7]
-    = { { 0, SA2_ANIM_TRUE_AREA_53_BOSS_PROJ_RED, 0, 0, 1, 0 },
-        { 0, SA2_ANIM_EGG_GO_ROUND_PROJECTILE, 0, 0, 1, 0 },
-        { 0, SA2_ANIM_TRUE_AREA_53_BOSS_PROJ_RED, 0, 0, 1, 0 },
-        { 0, SA2_ANIM_EGG_GO_ROUND_PROJECTILE, 0, 0, 1, 0 },
-        { 0, SA2_ANIM_TRUE_AREA_53_BOSS_PROJ_RED, 0, 0, 1, 0 },
-        { 0, SA2_ANIM_EGG_GO_ROUND_PROJECTILE, 0, 0, 1, 0 },
+    = { { 0, SA2_ANIM_TRUE_AREA_53_BOSS_PROJ_RED, 0, 0, 1, 0 }, { 0, SA2_ANIM_EGG_GO_ROUND_PROJECTILE, 0, 0, 1, 0 },
+        { 0, SA2_ANIM_TRUE_AREA_53_BOSS_PROJ_RED, 0, 0, 1, 0 }, { 0, SA2_ANIM_EGG_GO_ROUND_PROJECTILE, 0, 0, 1, 0 },
+        { 0, SA2_ANIM_TRUE_AREA_53_BOSS_PROJ_RED, 0, 0, 1, 0 }, { 0, SA2_ANIM_EGG_GO_ROUND_PROJECTILE, 0, 0, 1, 0 },
         { 0, SA2_ANIM_TRUE_AREA_53_BOSS_PROJ_RED, 0, 0, 1, 0 } };
 
 const s16 gUnknown_080D8A1C[3][4] = {
@@ -243,23 +228,19 @@ const s16 gUnknown_080D8BE4[3][4] = {
 };
 
 const void *const gUnknown_080D8BFC[5] = {
-    &gUnknown_080D8A1C, &gUnknown_080D8A34, &gUnknown_080D8A4C,
-    &gUnknown_080D8A64, &gUnknown_080D8A7C,
+    &gUnknown_080D8A1C, &gUnknown_080D8A34, &gUnknown_080D8A4C, &gUnknown_080D8A64, &gUnknown_080D8A7C,
 };
 
 const void *const gUnknown_080D8C10[5] = {
-    &gUnknown_080D8A94, &gUnknown_080D8AAC, &gUnknown_080D8AC4,
-    &gUnknown_080D8ADC, &gUnknown_080D8AF4,
+    &gUnknown_080D8A94, &gUnknown_080D8AAC, &gUnknown_080D8AC4, &gUnknown_080D8ADC, &gUnknown_080D8AF4,
 };
 
 const void *const gUnknown_080D8C24[5] = {
-    &gUnknown_080D8B0C, &gUnknown_080D8B24, &gUnknown_080D8B3C,
-    &gUnknown_080D8B54, &gUnknown_080D8B6C,
+    &gUnknown_080D8B0C, &gUnknown_080D8B24, &gUnknown_080D8B3C, &gUnknown_080D8B54, &gUnknown_080D8B6C,
 };
 
 const void *const gUnknown_080D8C38[5] = {
-    &gUnknown_080D8B84, &gUnknown_080D8B9C, &gUnknown_080D8BB4,
-    &gUnknown_080D8BCC, &gUnknown_080D8BE4,
+    &gUnknown_080D8B84, &gUnknown_080D8B9C, &gUnknown_080D8BB4, &gUnknown_080D8BCC, &gUnknown_080D8BE4,
 };
 
 const s16 gUnknown_080D8C4C[4] = { +10, -10, +10, -10 };
@@ -328,27 +309,19 @@ const void *const gUnknown_080D8D64[] = {
 };
 
 const TA53_Data0 gUnknown_080D8D6C[8] = {
-    { sub_804E078, (void *)&gUnknown_080D8BFC, 40 },
-    { sub_804E4CC, (void *)&gUnknown_080D8BFC, 40 },
-    { sub_8050BFC, (void *)&gUnknown_080D8C24, 126 },
-    { sub_8050C50, (void *)&gUnknown_080D8C24, 512 },
-    { sub_804E15C, (void *)&gUnknown_080D8C38, 160 },
-    { sub_8050CBC, (void *)&gUnknown_080D8C10, 80 },
-    { sub_8050D24, (void *)&gUnknown_080D8C10, 80 },
-    { sub_8050D9C, (void *)&gUnknown_080D8C10, 80 },
+    { sub_804E078, (void *)&gUnknown_080D8BFC, 40 },  { sub_804E4CC, (void *)&gUnknown_080D8BFC, 40 },
+    { sub_8050BFC, (void *)&gUnknown_080D8C24, 126 }, { sub_8050C50, (void *)&gUnknown_080D8C24, 512 },
+    { sub_804E15C, (void *)&gUnknown_080D8C38, 160 }, { sub_8050CBC, (void *)&gUnknown_080D8C10, 80 },
+    { sub_8050D24, (void *)&gUnknown_080D8C10, 80 },  { sub_8050D9C, (void *)&gUnknown_080D8C10, 80 },
 };
 
 const TA53_Data1 gUnknown_080D8DCC[6] = {
-    { sub_8050BD8, (void *)&gUnknown_080D8D3C, 40 },
-    { sub_8050BE4, (void *)&gUnknown_080D8D54, 100 },
-    { sub_8050BE4, (void *)&gUnknown_080D8D5C, 100 },
-    { sub_8050BE4, (void *)&gUnknown_080D8D5C, 100 },
-    { sub_8050BF0, (void *)&gUnknown_080D8D44, 20 },
-    { sub_8050BF0, (void *)&gUnknown_080D8D4C, 100 },
+    { sub_8050BD8, (void *)&gUnknown_080D8D3C, 40 },  { sub_8050BE4, (void *)&gUnknown_080D8D54, 100 },
+    { sub_8050BE4, (void *)&gUnknown_080D8D5C, 100 }, { sub_8050BE4, (void *)&gUnknown_080D8D5C, 100 },
+    { sub_8050BF0, (void *)&gUnknown_080D8D44, 20 },  { sub_8050BF0, (void *)&gUnknown_080D8D4C, 100 },
 };
 
-const TA53_Rocket_Callback gUnknown_080D8E14[3]
-    = { sub_804E974, sub_804EB6C, sub_804EC6C };
+const TA53_Rocket_Callback gUnknown_080D8E14[3] = { sub_804E974, sub_804EB6C, sub_804EC6C };
 const u8 sRGB_080D8E20[4][16][3] = {
     {
         { 0, 0, 0 },
@@ -439,8 +412,7 @@ void SetupEggmanKidnapsVanillaTask(void)
     TA53_unk48 *unk48;
     u8 i;
 
-    gActiveBossTask = TaskCreate(Task_EggmanKidnapsVanilla, sizeof(TA53Boss), 0x4000, 0,
-                                 TaskDestructor_TrueArea53BossGfx);
+    gActiveBossTask = TaskCreate(Task_EggmanKidnapsVanilla, sizeof(TA53Boss), 0x4000, 0, TaskDestructor_TrueArea53BossGfx);
 
     CreateTrueArea53Boss();
 
@@ -479,14 +451,12 @@ void SetupEggmanKidnapsVanillaTask(void)
         unk48->unk24[i] = gUnknown_080D8AF4[0][i];
     }
 
-    gDispCnt = (DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP
-                | DISPCNT_MODE_1);
+    gDispCnt = (DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP | DISPCNT_MODE_1);
 }
 
 // (39.42%) https://decomp.me/scratch/CKySX
 // (77.90%) https://decomp.me/scratch/cSWIn
-NONMATCH("asm/non_matching/game/bosses/boss_9__CreateTrueArea53Boss.inc",
-         void CreateTrueArea53Boss(void))
+NONMATCH("asm/non_matching/game/bosses/boss_9__CreateTrueArea53Boss.inc", void CreateTrueArea53Boss(void))
 {
     void *vram;
     TA53Boss *boss;
@@ -502,8 +472,7 @@ NONMATCH("asm/non_matching/game/bosses/boss_9__CreateTrueArea53Boss.inc",
     gStageFlags |= STAGE_FLAG__DISABLE_PAUSE_MENU;
 
     if (gActiveBossTask == NULL) {
-        gActiveBossTask = TaskCreate(Task_TrueArea53BossMain, sizeof(TA53Boss), 0x4000,
-                                     0, TaskDestructor_TrueArea53BossGfx);
+        gActiveBossTask = TaskCreate(Task_TrueArea53BossMain, sizeof(TA53Boss), 0x4000, 0, TaskDestructor_TrueArea53BossGfx);
     }
 
     boss = TASK_DATA(gActiveBossTask);
@@ -771,8 +740,7 @@ NONMATCH("asm/non_matching/game/bosses/boss_9__CreateTrueArea53Boss.inc",
 END_NONMATCH
 
 // (95.99%) https://decomp.me/scratch/05cvE
-NONMATCH("asm/non_matching/game/bosses/boss_9__TrueArea53BossMove.inc",
-         void TrueArea53BossMove(s32 dX, s32 dY))
+NONMATCH("asm/non_matching/game/bosses/boss_9__TrueArea53BossMove.inc", void TrueArea53BossMove(s32 dX, s32 dY))
 {
     u8 i, j;
     TA53Boss *boss;
@@ -846,9 +814,8 @@ void Task_EggmanKidnapsVanilla(void)
     unk48->callback(unk48);
     sub_80505B8(boss);
 
-    gWinRegs[WINREG_WINOUT]
-        = (WINOUT_WINOBJ_CLR | WINOUT_WINOBJ_BG0 | WINOUT_WINOBJ_BG1 | WINOUT_WINOBJ_BG2
-           | WINOUT_WIN01_CLR | WINOUT_WIN01_OBJ | WINOUT_WIN01_BG0 | WINOUT_WIN01_BG2);
+    gWinRegs[WINREG_WINOUT] = (WINOUT_WINOBJ_CLR | WINOUT_WINOBJ_BG0 | WINOUT_WINOBJ_BG1 | WINOUT_WINOBJ_BG2 | WINOUT_WIN01_CLR
+                               | WINOUT_WIN01_OBJ | WINOUT_WIN01_BG0 | WINOUT_WIN01_BG2);
 
     gFlags |= FLAGS_4;
     gUnknown_03002878 = (void *)&REG_BG1VOFS;
@@ -977,8 +944,7 @@ void Task_804D9DC(void)
         MPlayStop(&gMPlayInfo_SE2);
         MPlayStop(&gMPlayInfo_SE3);
 
-        gStageFlags
-            |= (STAGE_FLAG__DISABLE_PAUSE_MENU | STAGE_FLAG__2 | STAGE_FLAG__ACT_START);
+        gStageFlags |= (STAGE_FLAG__DISABLE_PAUSE_MENU | STAGE_FLAG__2 | STAGE_FLAG__ACT_START);
         sub_802B81C();
         sub_804D8E0(boss);
         sub_80501D4(boss);
@@ -1230,8 +1196,7 @@ void sub_804E078(struct TA53_unk48 *unk48)
 }
 
 // (94.10%) https://decomp.me/scratch/rjfvR
-NONMATCH("asm/non_matching/game/bosses/boss_9__sub_804E15C.inc",
-         void sub_804E15C(struct TA53_unk48 *unk48))
+NONMATCH("asm/non_matching/game/bosses/boss_9__sub_804E15C.inc", void sub_804E15C(struct TA53_unk48 *unk48))
 {
     TA53Boss *boss = TASK_DATA(gCurTask);
     TA53_unk558 *unk558 = &boss->unk558;
@@ -1294,8 +1259,7 @@ NONMATCH("asm/non_matching/game/bosses/boss_9__sub_804E15C.inc",
                 u16 r1;
                 s32 x, y;
 
-                if ((gMPlayTable[2].info->songHeader != gSongTable[SE_269].header)
-                    && (sp14 == 6)) {
+                if ((gMPlayTable[2].info->songHeader != gSongTable[SE_269].header) && (sp14 == 6)) {
                     m4aSongNumStart(SE_269);
                 }
                 // _0804E30A
@@ -1316,10 +1280,8 @@ NONMATCH("asm/non_matching/game/bosses/boss_9__sub_804E15C.inc",
                 gWinRegs[WINREG_WIN0H] = WIN_RANGE(0, DISPLAY_HEIGHT);
                 gWinRegs[WINREG_WIN0V] = WIN_RANGE(0, DISPLAY_WIDTH);
                 gWinRegs[WINREG_WININ] = WININ_WIN0_ALL;
-                gWinRegs[WINREG_WINOUT]
-                    = (WINOUT_WIN01_BG0 | WINOUT_WIN01_BG2 | WINOUT_WIN01_OBJ);
-                gBldRegs.bldCnt
-                    = (BLDCNT_TGT2_ALL | BLDCNT_EFFECT_LIGHTEN | BLDCNT_TGT1_ALL);
+                gWinRegs[WINREG_WINOUT] = (WINOUT_WIN01_BG0 | WINOUT_WIN01_BG2 | WINOUT_WIN01_OBJ);
+                gBldRegs.bldCnt = (BLDCNT_TGT2_ALL | BLDCNT_EFFECT_LIGHTEN | BLDCNT_TGT1_ALL);
                 gBldRegs.bldAlpha = BLDALPHA_BLEND(8, 0);
                 gBldRegs.bldY = 8;
 
@@ -1367,8 +1329,7 @@ NONMATCH("asm/non_matching/game/bosses/boss_9__sub_804E15C.inc",
 END_NONMATCH
 
 // (89.56%) https://decomp.me/scratch/sGKWf
-NONMATCH("asm/non_matching/game/bosses/boss_9__sub_804E4CC.inc",
-         void sub_804E4CC(struct TA53_unk48 *unk48))
+NONMATCH("asm/non_matching/game/bosses/boss_9__sub_804E4CC.inc", void sub_804E4CC(struct TA53_unk48 *unk48))
 {
     u16 r2;
 
@@ -1578,8 +1539,7 @@ void sub_804E974(struct TA53_unkA8 *unkA8)
         unkA8->unk4 &= ~0x2;
     }
 
-    sinVal
-        = sub_8004418(I(qSonicPos.y - unkA8->pos14.y), I(qSonicPos.x - unkA8->pos14.x));
+    sinVal = sub_8004418(I(qSonicPos.y - unkA8->pos14.y), I(qSonicPos.x - unkA8->pos14.x));
     ;
     unkA8->unkC = sinVal;
 
@@ -1659,8 +1619,7 @@ void sub_804EB6C(struct TA53_unkA8 *unkA8)
         unkA8->pos14.y += Q(0) + unkA8->unk10;
 
         if (boss->unkD == 0) {
-            if ((unkA8->unk6 == 0)
-                && sub_804ED98(I(unkA8->pos14.x), I(unkA8->pos14.y))) {
+            if ((unkA8->unk6 == 0) && sub_804ED98(I(unkA8->pos14.x), I(unkA8->pos14.y))) {
                 if (boss->lives & 0x1) {
                     m4aSongNumStart(SE_143);
                 } else {
@@ -1792,29 +1751,24 @@ bool32 sub_804EE84(Sprite *sprIn, s32 x, s32 y)
         return FALSE;
     }
 
-    if (!PLAYER_IS_ALIVE || !HITBOX_IS_ACTIVE(sprIn->hitboxes[1])
-        || !HITBOX_IS_ACTIVE(sprSonic->hitboxes[1])) {
+    if (!PLAYER_IS_ALIVE || !HITBOX_IS_ACTIVE(sprIn->hitboxes[1]) || !HITBOX_IS_ACTIVE(sprSonic->hitboxes[1])) {
         return FALSE;
     }
 
-    if (RECT_COLLISION(x, y, &sprIn->hitboxes[1], I(qSonicX), I(qSonicY),
-                       &sprSonic->hitboxes[1])) {
+    if (RECT_COLLISION(x, y, &sprIn->hitboxes[1], I(qSonicX), I(qSonicY), &sprSonic->hitboxes[1])) {
         return TRUE;
     }
 
     return FALSE;
 }
 
-bool32 sub_804EF68(Sprite *sprRocket, s32 rocketX, s32 rocketY, Sprite *sprMouth,
-                   s32 mouthX, s32 mouthY)
+bool32 sub_804EF68(Sprite *sprRocket, s32 rocketX, s32 rocketY, Sprite *sprMouth, s32 mouthX, s32 mouthY)
 {
-    if ((!HITBOX_IS_ACTIVE(sprRocket->hitboxes[1]))
-        || (!HITBOX_IS_ACTIVE(sprMouth->hitboxes[0]))) {
+    if ((!HITBOX_IS_ACTIVE(sprRocket->hitboxes[1])) || (!HITBOX_IS_ACTIVE(sprMouth->hitboxes[0]))) {
         return FALSE;
     }
 
-    if (RECT_COLLISION(rocketX, rocketY, &sprRocket->hitboxes[1], mouthX, mouthY,
-                       &sprMouth->hitboxes[0])) {
+    if (RECT_COLLISION(rocketX, rocketY, &sprRocket->hitboxes[1], mouthX, mouthY, &sprMouth->hitboxes[0])) {
         return TRUE;
     } else {
         return FALSE;
@@ -1832,13 +1786,11 @@ bool32 sub_804F010(Sprite *s, s32 x, s32 y, u8 hbIndex)
     SuperSonicGetFlags();
 #endif
 
-    if (!PLAYER_IS_ALIVE || !HITBOX_IS_ACTIVE(s->hitboxes[hbIndex])
-        || !HITBOX_IS_ACTIVE(sprSonic->hitboxes[0])) {
+    if (!PLAYER_IS_ALIVE || !HITBOX_IS_ACTIVE(s->hitboxes[hbIndex]) || !HITBOX_IS_ACTIVE(sprSonic->hitboxes[0])) {
         return FALSE;
     }
 
-    if (HB_COLLISION(x, y, s->hitboxes[hbIndex], I(qSonicX), I(qSonicY),
-                     sprSonic->hitboxes[0])) {
+    if (HB_COLLISION(x, y, s->hitboxes[hbIndex], I(qSonicX), I(qSonicY), sprSonic->hitboxes[0])) {
         return TRUE;
     } else {
         return FALSE;
@@ -1877,8 +1829,7 @@ void sub_804F108(TA53_unk558 *unk558)
 }
 
 // (81.57%) https://decomp.me/scratch/iqeu1
-NONMATCH("asm/non_matching/game/bosses/boss_9__sub_804F1EC.inc",
-         void sub_804F1EC(struct TA53_unk558 *unk558))
+NONMATCH("asm/non_matching/game/bosses/boss_9__sub_804F1EC.inc", void sub_804F1EC(struct TA53_unk558 *unk558))
 {
     TA53Boss *boss = TASK_DATA(gCurTask);
     TA53_unk1C *unk1C = &boss->unk1C;
@@ -1951,28 +1902,21 @@ NONMATCH("asm/non_matching/game/bosses/boss_9__sub_804F1EC.inc",
 
                 if (unkA8->unk4 & 0x1) {
                     // TODO: This is a range-comparison, remove '<< 16'!
-                    s32 res
-                        = (sub_8004418(I(unkA8->pos14.y - qY), I(unkA8->pos14.x - qX))
-                           - 301)
-                        << 16;
+                    s32 res = (sub_8004418(I(unkA8->pos14.y - qY), I(unkA8->pos14.x - qX)) - 301) << 16;
                     if (((unsigned)res <= 422 << 16) || (unkA8->unk6 > 0)) {
                         s32 unk1C = unkA8->unk1C + 0xA;
                         unkA8->unk6 = 1;
                         unkA8->unk1C = unk1C;
 
-                        unkA8->pos14.x
-                            = sub_8085698(unkA8->pos14.x, +Q(22) + qX, (unk1C), 10, 2);
-                        unkA8->pos14.y
-                            = sub_8085698(unkA8->pos14.y, qY, (unk1C + 0xA0), 10, 2);
+                        unkA8->pos14.x = sub_8085698(unkA8->pos14.x, +Q(22) + qX, (unk1C), 10, 2);
+                        unkA8->pos14.y = sub_8085698(unkA8->pos14.y, qY, (unk1C + 0xA0), 10, 2);
 
                         unkA8->unkE = Div(unkA8->unkE * 90, 100);
                         unkA8->unk10 = Div(unkA8->unk10 * 90, 100);
                     }
                     // _0804F430
 
-                    if (sub_804EF68(&unkA8->spr20, I(unkA8->pos14.x), I(unkA8->pos14.y),
-                                    s, I(qX) + 16, I(qY))
-                        == TRUE) {
+                    if (sub_804EF68(&unkA8->spr20, I(unkA8->pos14.x), I(unkA8->pos14.y), s, I(qX) + 16, I(qY)) == TRUE) {
                         unkA8->unk4 = 0;
                     }
                 }
@@ -2065,8 +2009,7 @@ void sub_804F5BC(struct TA53_unk654 *unk654)
             unk654->qPos70[i].y += unk654->unk2E[i][1];
 
             if (!(SuperSonicGetFlags() & (SUPER_FLAG__200 | SUPER_FLAG__8))) {
-                if (sub_804F010(s, I(unk654->qPos70[i].x), I(unk654->qPos70[i].y), 0)
-                    == TRUE) {
+                if (sub_804F010(s, I(unk654->qPos70[i].x), I(unk654->qPos70[i].y), 0) == TRUE) {
                     sub_802BA8C();
                 }
             }
@@ -2126,8 +2069,7 @@ void sub_804F768(u32 qX, u32 qY, s16 param2, u32 sinIndex_)
 }
 
 // (98.75%) https://decomp.me/scratch/h8qQS
-NONMATCH("asm/non_matching/game/bosses/boss_9__sub_804F850.inc",
-         void sub_804F850(u32 qX, u32 qY, s16 param2, u32 sinIndex_))
+NONMATCH("asm/non_matching/game/bosses/boss_9__sub_804F850.inc", void sub_804F850(u32 qX, u32 qY, s16 param2, u32 sinIndex_))
 {
     u8 array[0x8];
     u8 i;
@@ -2222,8 +2164,7 @@ void sub_804F9BC(u32 qX, u32 qY, UNUSED s16 param2, UNUSED u32 sinIndex_)
 // NOTE/TODO: The logic of this does not match the game.
 //            The lowest loop is incorrect.
 // (61.23%) https://decomp.me/scratch/kecMc
-NONMATCH("asm/non_matching/game/bosses/boss_9__sub_804FAA4.inc",
-         void sub_804FAA4(u32 qX, u32 qY, s16 param2, u32 sinIndex_))
+NONMATCH("asm/non_matching/game/bosses/boss_9__sub_804FAA4.inc", void sub_804FAA4(u32 qX, u32 qY, s16 param2, u32 sinIndex_))
 {
     u8 array[0x8];
     u8 i;
@@ -2295,10 +2236,7 @@ END_NONMATCH
 
 // TODO: Implement
 // Code resembles sub_804F850 and sub_804FAA4
-NONMATCH("asm/non_matching/game/bosses/boss_9__sub_804FC10.inc",
-         void sub_804FC10(u32 qX, u32 qY, s16 param2, u32 sinIndex_))
-{
-}
+NONMATCH("asm/non_matching/game/bosses/boss_9__sub_804FC10.inc", void sub_804FC10(u32 qX, u32 qY, s16 param2, u32 sinIndex_)) { }
 END_NONMATCH
 
 void sub_804FD58(u32 qX, u32 qY, UNUSED s16 param2, UNUSED u32 sinIndex_)
@@ -2413,8 +2351,7 @@ void sub_804FF9C(struct TA53_unk654 *unk654)
 
 #if 01
 // (97.04%) https://decomp.me/scratch/dsxMM
-NONMATCH("asm/non_matching/game/bosses/boss_9__sub_8050030.inc",
-         bool8 sub_8050030(struct TA53_unk48 *unk48))
+NONMATCH("asm/non_matching/game/bosses/boss_9__sub_8050030.inc", bool8 sub_8050030(struct TA53_unk48 *unk48))
 {
     u8 r3, i;
     u32 r2;
@@ -2471,8 +2408,7 @@ END_NONMATCH
 #endif
 
 // (97.13%) https://decomp.me/scratch/ymnVO
-NONMATCH("asm/non_matching/game/bosses/boss_9__sub_8050104.inc",
-         bool8 sub_8050104(struct TA53_unk1C *unk1C))
+NONMATCH("asm/non_matching/game/bosses/boss_9__sub_8050104.inc", bool8 sub_8050104(struct TA53_unk1C *unk1C))
 {
     u8 r3, i;
     u32 r2;
@@ -2635,9 +2571,8 @@ void sub_80501D4(TA53Boss *boss)
         s->x = I(qX) - gCamera.x;
         s->y = I(qY) - gCamera.y;
 
-        s->frameFlags
-            |= (SPRITE_FLAG(PRIORITY, 2) | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE
-                | SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE | (u8)gUnknown_030054B8++);
+        s->frameFlags |= (SPRITE_FLAG(PRIORITY, 2) | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE | SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE
+                          | (u8)gUnknown_030054B8++);
 
         transform->rotation = r7;
         transform->width = 0x100;
@@ -2659,9 +2594,8 @@ void sub_80501D4(TA53Boss *boss)
     s->x = I(qX) - gCamera.x;
     s->y = I(qY) - gCamera.y;
 
-    s->frameFlags
-        |= (SPRITE_FLAG(PRIORITY, 2) | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE
-            | SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE | (u8)gUnknown_030054B8++);
+    s->frameFlags |= (SPRITE_FLAG(PRIORITY, 2) | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE | SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE
+                      | (u8)gUnknown_030054B8++);
 
     transform->rotation = sinIndex;
     transform->width = 0x100;
@@ -2759,9 +2693,8 @@ void sub_80505B8(TA53Boss *boss)
         s->x = I(qX) - gCamera.x;
         s->y = I(qY) - gCamera.y;
 
-        s->frameFlags
-            |= (SPRITE_FLAG(PRIORITY, 1) | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE
-                | SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE | (u8)gUnknown_030054B8++);
+        s->frameFlags |= (SPRITE_FLAG(PRIORITY, 1) | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE | SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE
+                          | (u8)gUnknown_030054B8++);
 
         transform->rotation = r7;
         transform->width = 0x100;
@@ -2783,9 +2716,8 @@ void sub_80505B8(TA53Boss *boss)
     s->x = I(qX) - gCamera.x;
     s->y = I(qY) - gCamera.y;
 
-    s->frameFlags
-        |= (SPRITE_FLAG(PRIORITY, 1) | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE
-            | SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE | (u8)gUnknown_030054B8++);
+    s->frameFlags |= (SPRITE_FLAG(PRIORITY, 1) | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE | SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE
+                      | (u8)gUnknown_030054B8++);
 
     transform->rotation = sinIndex;
     transform->width = 0x100;
@@ -2805,11 +2737,9 @@ void sub_80508C4(TA53Boss *boss, u16 blend, bool8 param2)
 
     if (param2) {
         gDispCnt |= DISPCNT_OBJWIN_ON;
-        gWinRegs[WINREG_WINOUT]
-            = ((WINOUT_WINOBJ_ALL & ~WINOUT_WINOBJ_BG3)
-               | (WINOUT_WIN01_ALL & ~(WINOUT_WIN01_BG1 | WINOUT_WIN01_BG3)));
-        gBldRegs.bldCnt = ((BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_OBJ)
-                           | BLDCNT_EFFECT_BLEND | (BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2));
+        gWinRegs[WINREG_WINOUT] = ((WINOUT_WINOBJ_ALL & ~WINOUT_WINOBJ_BG3) | (WINOUT_WIN01_ALL & ~(WINOUT_WIN01_BG1 | WINOUT_WIN01_BG3)));
+        gBldRegs.bldCnt
+            = ((BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_OBJ) | BLDCNT_EFFECT_BLEND | (BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2));
 
         bldTarget2 = (((blend * 3) >> 8) + 10) % 16u;
         bldTarget1 = (((blend * 5) >> 8) + 8) % 16u;
@@ -2842,10 +2772,8 @@ void sub_8050958(TA53Boss *boss)
 
             if (boss->lives < 4) {
                 for (i = 0; i < 16; i++) {
-                    gObjPalette[8 * 16 + ((i + r6) % 16u)]
-                        = gUnknown_080D8EF0[0][i] >> 5;
-                    gBgPalette[0 * 16 + ((i + r6) % 16u)]
-                        = gObjPalette[8 * 16 + ((i + r6) % 16u)];
+                    gObjPalette[8 * 16 + ((i + r6) % 16u)] = gUnknown_080D8EF0[0][i] >> 5;
+                    gBgPalette[0 * 16 + ((i + r6) % 16u)] = gObjPalette[8 * 16 + ((i + r6) % 16u)];
                 }
             } else {
                 for (i = 0; i < 16; i++) {
@@ -2857,12 +2785,9 @@ void sub_8050958(TA53Boss *boss)
 
                     colId = ((i + r6) % 16u);
                     objPalId = 8 * 16 + colId;
-                    objPalTgt[objPalId] = ((gUnknown_080D8EF0[0][i] << 5)
-                                           | (gUnknown_080D8EF0[0][i] >> 5))
-                        | gUnknown_080D8EF0[0][i];
-                    gBgPalette[0 * 16 + colId] = ((gUnknown_080D8EF0[0][i] << 5)
-                                                  | (gUnknown_080D8EF0[0][i] >> 5))
-                        | gUnknown_080D8EF0[0][i];
+                    objPalTgt[objPalId] = ((gUnknown_080D8EF0[0][i] << 5) | (gUnknown_080D8EF0[0][i] >> 5)) | gUnknown_080D8EF0[0][i];
+                    gBgPalette[0 * 16 + colId]
+                        = ((gUnknown_080D8EF0[0][i] << 5) | (gUnknown_080D8EF0[0][i] >> 5)) | gUnknown_080D8EF0[0][i];
                 }
             }
         }
diff --git a/src/game/bosses/common.c b/src/game/bosses/common.c
index 4930ba1a1..e6a0538cd 100644
--- a/src/game/bosses/common.c
+++ b/src/game/bosses/common.c
@@ -24,22 +24,19 @@
 struct Task *gActiveBossTask = NULL;
 
 const VoidFn sBossCreationFuncs[] = {
-    CreateEggHammerTankII, CreateEggBomberTank, CreateEggTotem,
-    CreateAeroEgg,         CreateEggSaucer,     CreateEggGoRound,
-    CreateEggFrog,         CreateSuperEggRoboZ, CreateTrueArea53Boss,
+    CreateEggHammerTankII, CreateEggBomberTank, CreateEggTotem,      CreateAeroEgg,        CreateEggSaucer,
+    CreateEggGoRound,      CreateEggFrog,       CreateSuperEggRoboZ, CreateTrueArea53Boss,
 };
 
 // NOTE:
 // "Super Egg Robo Z" does not having a 'Move' function, because it's static.
 const TranslateBossFunction MoveBossPositionFuncs[] = {
-    EggHammerTankIIMove, EggBomberTankMove, EggTotemMove, AeroEggMove,
-    EggSaucerMove,       EggGoRoundMove,    EggFrogMove,  TrueArea53BossMove,
+    EggHammerTankIIMove, EggBomberTankMove, EggTotemMove, AeroEggMove, EggSaucerMove, EggGoRoundMove, EggFrogMove, TrueArea53BossMove,
 };
 
 // Anims for screws etc.
 const u32 gTileInfoBossScrews[][3] = {
-    { 412, 620, 0 }, { 416, 620, 1 }, { 420, 621, 0 },
-    { 436, 621, 1 }, { 448, 622, 0 }, { 449, 622, 1 },
+    { 412, 620, 0 }, { 416, 620, 1 }, { 420, 621, 0 }, { 436, 621, 1 }, { 448, 622, 0 }, { 449, 622, 1 },
 };
 
 void CreateZoneBoss(u8 boss)
@@ -63,8 +60,7 @@ void sub_8039ED4(void)
 // Moves the bosses' position back when close to the end of the map.
 void sub_8039F14(s32 p0, s32 p1)
 {
-    if ((gCurrentLevel != LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE))
-        && (gActiveBossTask != NULL)) {
+    if ((gCurrentLevel != LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE)) && (gActiveBossTask != NULL)) {
         MoveBossPositionFuncs[LEVEL_TO_ZONE(gCurrentLevel)](p0, p1);
     }
 }
diff --git a/src/game/bosses/eggmobile_escape_sequence.c b/src/game/bosses/eggmobile_escape_sequence.c
index a606f1931..4401f699a 100644
--- a/src/game/bosses/eggmobile_escape_sequence.c
+++ b/src/game/bosses/eggmobile_escape_sequence.c
@@ -25,8 +25,7 @@ static void TaskDestructor_EggmobileEscape(struct Task *t);
 
 void CreateEggmobileEscapeSequence(s16 x, s16 y, u32 spriteFlags)
 {
-    struct Task *t = TaskCreate(Task_EggmobileMoveUp, sizeof(Sprite_EggMobile), 0x3800,
-                                0, TaskDestructor_EggmobileEscape);
+    struct Task *t = TaskCreate(Task_EggmobileMoveUp, sizeof(Sprite_EggMobile), 0x3800, 0, TaskDestructor_EggmobileEscape);
     Sprite_EggMobile *em = TASK_DATA(t);
     Sprite *s;
 
diff --git a/src/game/bosses/explosion_parts.c b/src/game/bosses/explosion_parts.c
index acda89b28..b4ad5885b 100644
--- a/src/game/bosses/explosion_parts.c
+++ b/src/game/bosses/explosion_parts.c
@@ -27,8 +27,7 @@ void Task_DestroyExplosionParts(void);
 void CreateBossParticleWithExplosionUpdate(ExplosionPartsInfo *info, u8 *numCreatedParts)
 {
     if (!(info->unk4 & 1) || *numCreatedParts < 16) {
-        struct Task *t = TaskCreate(Task_BossParticleWithExplosionUpdate,
-                                    sizeof(Sprite_ExplosionParts), 0x5432, 0, NULL);
+        struct Task *t = TaskCreate(Task_BossParticleWithExplosionUpdate, sizeof(Sprite_ExplosionParts), 0x5432, 0, NULL);
         Sprite_ExplosionParts *parts = TASK_DATA(t);
         Sprite *s = &parts->s;
         s32 cos, sin;
@@ -79,8 +78,7 @@ void Task_BossParticleWithExplosionUpdate(void)
     s->x = I(parts->posX);
     s->y = I(parts->posY);
 
-    if (((s->x < -BOSS_PARTS_DIMENSION) && (parts->accelX < 0))
-        || ((s->x > (DISPLAY_WIDTH + BOSS_PARTS_DIMENSION)) && (parts->accelX > 0))
+    if (((s->x < -BOSS_PARTS_DIMENSION) && (parts->accelX < 0)) || ((s->x > (DISPLAY_WIDTH + BOSS_PARTS_DIMENSION)) && (parts->accelX > 0))
         || ((s->y < -BOSS_PARTS_DIMENSION) && (parts->accelY < 0))
         || ((s->y > (DISPLAY_HEIGHT + BOSS_PARTS_DIMENSION)) && (parts->accelY > 0))) {
         gCurTask->main = Task_DestroyBossParts;
@@ -96,8 +94,7 @@ void Task_BossParticleWithExplosionUpdate(void)
 void CreateBossParticleStatic(ExplosionPartsInfo *info, u8 *numCreatedParts)
 {
     if (!(info->unk4 & 1) || *numCreatedParts < 16) {
-        struct Task *t = TaskCreate(Task_BossParticleStatic,
-                                    sizeof(Sprite_ExplosionParts), 0x5432, 0, NULL);
+        struct Task *t = TaskCreate(Task_BossParticleStatic, sizeof(Sprite_ExplosionParts), 0x5432, 0, NULL);
         Sprite_ExplosionParts *parts = TASK_DATA(t);
         Sprite *s = &parts->s;
         s32 cos, sin;
@@ -144,8 +141,7 @@ void Task_BossParticleStatic(void)
     s->x = I(parts->posX) - gCamera.x;
     s->y = I(parts->posY) - gCamera.y;
 
-    if (((s->x < -BOSS_PARTS_DIMENSION) && (parts->accelX < 0))
-        || ((s->x > (DISPLAY_WIDTH + BOSS_PARTS_DIMENSION)) && (parts->accelX > 0))
+    if (((s->x < -BOSS_PARTS_DIMENSION) && (parts->accelX < 0)) || ((s->x > (DISPLAY_WIDTH + BOSS_PARTS_DIMENSION)) && (parts->accelX > 0))
         || ((s->y < -BOSS_PARTS_DIMENSION) && (parts->accelY < 0))
         || ((s->y > (DISPLAY_HEIGHT + BOSS_PARTS_DIMENSION)) && (parts->accelY > 0))) {
         gCurTask->main = Task_DestroyBossParts;
diff --git a/src/game/bosses/final_intro.c b/src/game/bosses/final_intro.c
index ed125907f..309170cbd 100644
--- a/src/game/bosses/final_intro.c
+++ b/src/game/bosses/final_intro.c
@@ -145,48 +145,47 @@ void sub_8038E20(void);
 
 #define ACTOR_CHEESE 4
 
-#define NEXT_SEQUENCE_ANIM(actor, s)                                                    \
-    ({                                                                                  \
-        const TileInfoPtr *animSet, *tileInfo;                                          \
-        (actor)->animFrame                                                              \
-            = gUnknown_080D7704[(actor)->character][++(actor)->sequence];               \
-                                                                                        \
-        animSet = gUnknown_080D76F0[(actor)->character];                                \
-        tileInfo = &animSet[(actor)->sequence];                                         \
-                                                                                        \
-        (s)->graphics.anim = tileInfo->anim;                                            \
-        (s)->variant = tileInfo->variant;                                               \
-        (s)->prevVariant = -1;                                                          \
+#define NEXT_SEQUENCE_ANIM(actor, s)                                                                                                       \
+    ({                                                                                                                                     \
+        const TileInfoPtr *animSet, *tileInfo;                                                                                             \
+        (actor)->animFrame = gUnknown_080D7704[(actor)->character][++(actor)->sequence];                                                   \
+                                                                                                                                           \
+        animSet = gUnknown_080D76F0[(actor)->character];                                                                                   \
+        tileInfo = &animSet[(actor)->sequence];                                                                                            \
+                                                                                                                                           \
+        (s)->graphics.anim = tileInfo->anim;                                                                                               \
+        (s)->variant = tileInfo->variant;                                                                                                  \
+        (s)->prevVariant = -1;                                                                                                             \
     })
 
-#define OBJ_RENDER_SPRITE(obj, s)                                                       \
-    ({                                                                                  \
-        (s)->x = I((obj)->x);                                                           \
-        (s)->y = I((obj)->y) - gCamera.y;                                               \
-        UpdateSpriteAnimation(s);                                                       \
-        DisplaySprite(s);                                                               \
+#define OBJ_RENDER_SPRITE(obj, s)                                                                                                          \
+    ({                                                                                                                                     \
+        (s)->x = I((obj)->x);                                                                                                              \
+        (s)->y = I((obj)->y) - gCamera.y;                                                                                                  \
+        UpdateSpriteAnimation(s);                                                                                                          \
+        DisplaySprite(s);                                                                                                                  \
     })
 
-#define OBJ_UPDATE_POS(obj)                                                             \
-    ({                                                                                  \
-        (obj)->x += (obj)->speedX;                                                      \
-        (obj)->y += (obj)->speedY;                                                      \
+#define OBJ_UPDATE_POS(obj)                                                                                                                \
+    ({                                                                                                                                     \
+        (obj)->x += (obj)->speedX;                                                                                                         \
+        (obj)->y += (obj)->speedY;                                                                                                         \
     })
 
-#define OBJ_ACCELERATE_Y(obj, val)                                                      \
-    ({                                                                                  \
-        (obj)->speedY += (val);                                                         \
-        if ((val) < 0 && (obj)->speedY < 0) {                                           \
-            (obj)->speedY = 0;                                                          \
-        }                                                                               \
+#define OBJ_ACCELERATE_Y(obj, val)                                                                                                         \
+    ({                                                                                                                                     \
+        (obj)->speedY += (val);                                                                                                            \
+        if ((val) < 0 && (obj)->speedY < 0) {                                                                                              \
+            (obj)->speedY = 0;                                                                                                             \
+        }                                                                                                                                  \
     })
 
-#define OBJ_ACCELERATE_X(obj, val)                                                      \
-    ({                                                                                  \
-        (obj)->speedX += (val);                                                         \
-        if ((val) < 0 && (obj)->speedX < 0) {                                           \
-            (obj)->speedX = 0;                                                          \
-        }                                                                               \
+#define OBJ_ACCELERATE_X(obj, val)                                                                                                         \
+    ({                                                                                                                                     \
+        (obj)->speedX += (val);                                                                                                            \
+        if ((val) < 0 && (obj)->speedX < 0) {                                                                                              \
+            (obj)->speedX = 0;                                                                                                             \
+        }                                                                                                                                  \
     })
 
 static const TileInfoPtr gUnknown_080D7540[] = {
@@ -205,9 +204,8 @@ static const TileInfoPtr gUnknown_080D7560[] = {
 };
 
 static const TileInfoPtr gUnknown_080D7588[] = {
-    { OBJ_VRAM0, 9, 2 }, { NULL, 9, 1 },   { NULL, 835, 0 }, { NULL, 835, 1 },
-    { NULL, 835, 2 },    { NULL, 835, 3 }, { NULL, 835, 5 }, { NULL, 835, 5 },
-    { NULL, 836, 0 },    { NULL, 836, 1 }, { NULL, 836, 2 }, { NULL, 836, 3 },
+    { OBJ_VRAM0, 9, 2 }, { NULL, 9, 1 },   { NULL, 835, 0 }, { NULL, 835, 1 }, { NULL, 835, 2 }, { NULL, 835, 3 },
+    { NULL, 835, 5 },    { NULL, 835, 5 }, { NULL, 836, 0 }, { NULL, 836, 1 }, { NULL, 836, 2 }, { NULL, 836, 3 },
 };
 static const TileInfoPtr gUnknown_080D75E8[] = {
     { OBJ_VRAM0 + 0x1000, 191, 2 },
@@ -252,8 +250,7 @@ static const TileInfoPtr gUnknown_080D76B0[] = {
 };
 
 static const TileInfoPtr *const gUnknown_080D76F0[] = {
-    gUnknown_080D7588, gUnknown_080D7668, gUnknown_080D75E8,
-    gUnknown_080D7628, gUnknown_080D76B0,
+    gUnknown_080D7588, gUnknown_080D7668, gUnknown_080D75E8, gUnknown_080D7628, gUnknown_080D76B0,
 };
 
 static const u16 gUnknown_080D7704[][17] = {
@@ -266,23 +263,18 @@ static const u16 gUnknown_080D7704[][17] = {
 };
 
 static const s32 gUnknown_080D77D0[][4] = {
-    { Q(-344), Q(178), Q(2), Q(0) }, { Q(-4), Q(178), Q(2), Q(0) },
-    { Q(-406), Q(178), Q(2), Q(0) }, { Q(-388), Q(178), Q(2), Q(0) },
-    { Q(-14), Q(158), Q(2), Q(0) },  { Q(0), Q(0), Q(0), Q(0) },
+    { Q(-344), Q(178), Q(2), Q(0) }, { Q(-4), Q(178), Q(2), Q(0) },  { Q(-406), Q(178), Q(2), Q(0) },
+    { Q(-388), Q(178), Q(2), Q(0) }, { Q(-14), Q(158), Q(2), Q(0) }, { Q(0), Q(0), Q(0), Q(0) },
 };
 
 static const s16 gUnknown_080D7830[][5] = {
-    { 120, 85, 5, 6, 0 },   { 130, 90, 4, 5, 1 },   { 140, 95, 7, 4, 2 },
-    { 90, 100, 8, 5, 0 },   { 100, 105, 10, 3, 1 }, { 110, 110, 5, 1, 2 },
-    { 120, 115, 9, 4, 0 },  { 80, 120, 4, 3, 1 },   { 120, 125, 8, 2, 2 },
-    { 130, 130, 6, 4, 0 },  { 140, 135, 4, 2, 1 },  { 150, 140, 5, 1, 2 },
-    { 100, 145, 10, 5, 0 }, { 110, 150, 7, 1, 1 },  { 120, 155, 6, 4, 2 },
-    { 80, 160, 4, 3, 0 },   { 80, 160, 5, 6, 2 },   { 70, 150, 4, 5, 1 },
-    { 60, 140, 7, 4, 2 },   { 50, 130, 8, 5, 0 },   { 50, 120, 10, 3, 1 },
-    { 60, 110, 5, 1, 2 },   { 70, 100, 9, 4, 0 },   { 80, 90, 4, 3, 1 },
-    { 150, 120, 5, 6, 2 },  { 160, 100, 4, 5, 1 },  { 140, 140, 7, 4, 2 },
-    { 150, 80, 8, 5, 0 },   { 70, 90, 10, 6, 1 },   { 60, 110, 5, 5, 2 },
-    { 70, 100, 9, 7, 0 },   { 80, 90, 8, 4, 1 },
+    { 120, 85, 5, 6, 0 },  { 130, 90, 4, 5, 1 },  { 140, 95, 7, 4, 2 },   { 90, 100, 8, 5, 0 },  { 100, 105, 10, 3, 1 },
+    { 110, 110, 5, 1, 2 }, { 120, 115, 9, 4, 0 }, { 80, 120, 4, 3, 1 },   { 120, 125, 8, 2, 2 }, { 130, 130, 6, 4, 0 },
+    { 140, 135, 4, 2, 1 }, { 150, 140, 5, 1, 2 }, { 100, 145, 10, 5, 0 }, { 110, 150, 7, 1, 1 }, { 120, 155, 6, 4, 2 },
+    { 80, 160, 4, 3, 0 },  { 80, 160, 5, 6, 2 },  { 70, 150, 4, 5, 1 },   { 60, 140, 7, 4, 2 },  { 50, 130, 8, 5, 0 },
+    { 50, 120, 10, 3, 1 }, { 60, 110, 5, 1, 2 },  { 70, 100, 9, 4, 0 },   { 80, 90, 4, 3, 1 },   { 150, 120, 5, 6, 2 },
+    { 160, 100, 4, 5, 1 }, { 140, 140, 7, 4, 2 }, { 150, 80, 8, 5, 0 },   { 70, 90, 10, 6, 1 },  { 60, 110, 5, 5, 2 },
+    { 70, 100, 9, 7, 0 },  { 80, 90, 8, 4, 1 },
 };
 
 static const TaskMain gUnknown_080D7970[] = {
@@ -367,8 +359,7 @@ void CreateOrbitingEmeraldsSequence(void)
     Background *background;
     Sprite *emerald;
 
-    struct Task *t = TaskCreate(Task_OrbitingEmeraldsMoveOutwards,
-                                sizeof(OrbitingEmeraldsSequence), 0x7000, 0, NULL);
+    struct Task *t = TaskCreate(Task_OrbitingEmeraldsMoveOutwards, sizeof(OrbitingEmeraldsSequence), 0x7000, 0, NULL);
     OrbitingEmeraldsSequence *sequence = TASK_DATA(t);
     sequence->animFrame = 32;
 
@@ -411,10 +402,10 @@ void CreateOrbitingEmeraldsSequence(void)
 #define ORBIT_BASE_X 120
 #define ORBIT_BASE_Y 100
 
-#define ORBIT_SET_SPRITE_POS(s, pos)                                                    \
-    ({                                                                                  \
-        s->x = pos[0] + ORBIT_BASE_X;                                                   \
-        s->y = pos[1] + ORBIT_BASE_Y;                                                   \
+#define ORBIT_SET_SPRITE_POS(s, pos)                                                                                                       \
+    ({                                                                                                                                     \
+        s->x = pos[0] + ORBIT_BASE_X;                                                                                                      \
+        s->y = pos[1] + ORBIT_BASE_Y;                                                                                                      \
     })
 
 void Task_OrbitingEmeraldsMoveOutwards(void)
@@ -565,8 +556,7 @@ void Task_DisplaySonicSonicArtworkAndDestroyTask(void)
 void CreateSuperSonicSpark(s32 x, s32 y)
 {
     Sprite *s;
-    struct Task *t
-        = TaskCreate(Task_SuperSonicSpark, sizeof(SuperSonicSpark), 0x7000, 0, NULL);
+    struct Task *t = TaskCreate(Task_SuperSonicSpark, sizeof(SuperSonicSpark), 0x7000, 0, NULL);
     u32 type = PseudoRandBetween(2, 4);
     SuperSonicSpark *spark = TASK_DATA(t);
     spark->animFrame = 40;
@@ -612,8 +602,7 @@ void CreateActor(u8 character)
 {
     Sprite *s;
     const TileInfoPtr *tileInfo;
-    struct Task *t
-        = TaskCreate(gUnknown_080D7970[character], sizeof(IntroActor), 0x7000, 0, NULL);
+    struct Task *t = TaskCreate(gUnknown_080D7970[character], sizeof(IntroActor), 0x7000, 0, NULL);
     IntroActor *actor = TASK_DATA(t);
     actor->character = character;
     actor->sequence = 0;
@@ -1416,13 +1405,9 @@ void sub_80393A4(void)
 
         for (i = 0; i < 32; i++) {
             if (intro->unk10[i] != 0) {
-                intro->birdPositions[i][0]
-                    = sub_8085698(intro->birdPositions[i][0], x, intro->animFrame, 10,
-                                  gUnknown_080D7830[i][4] + 2);
+                intro->birdPositions[i][0] = sub_8085698(intro->birdPositions[i][0], x, intro->animFrame, 10, gUnknown_080D7830[i][4] + 2);
 
-                intro->birdPositions[i][1]
-                    = sub_8085698(intro->birdPositions[i][1], y, intro->animFrame, 10,
-                                  gUnknown_080D7830[i][4] + 2);
+                intro->birdPositions[i][1] = sub_8085698(intro->birdPositions[i][1], y, intro->animFrame, 10, gUnknown_080D7830[i][4] + 2);
 
                 intro->birdSpeeds[i][0] -= (intro->birdSpeeds[i][0] >> 3);
                 intro->birdSpeeds[i][1] -= (intro->birdSpeeds[i][1] >> 3);
diff --git a/src/game/character_select.c b/src/game/character_select.c
index 8c6c4ba69..b0532d602 100644
--- a/src/game/character_select.c
+++ b/src/game/character_select.c
@@ -102,27 +102,23 @@ static void RenderUI(struct CharacterSelectionScreen *);
 #define CHARACTER_HIDDEN_LABEL 5
 
 static ALIGNED(4) const u16 sCharacterTitleLeftSideAssets[][2] = {
-    [CHARACTER_SONIC] = { 739, 0 }, [CHARACTER_CREAM] = { 739, 8 },
-    [CHARACTER_TAILS] = { 739, 2 }, [CHARACTER_KNUCKLES] = { 739, 4 },
-    [CHARACTER_AMY] = { 739, 6 },   [CHARACTER_HIDDEN_LABEL] = { 739, 10 },
+    [CHARACTER_SONIC] = { 739, 0 },    [CHARACTER_CREAM] = { 739, 8 }, [CHARACTER_TAILS] = { 739, 2 },
+    [CHARACTER_KNUCKLES] = { 739, 4 }, [CHARACTER_AMY] = { 739, 6 },   [CHARACTER_HIDDEN_LABEL] = { 739, 10 },
 };
 
 static const u16 sCharacteTitleRightSideAssets[][2] = {
-    [CHARACTER_SONIC] = { 739, 1 }, [CHARACTER_CREAM] = { 739, 9 },
-    [CHARACTER_TAILS] = { 739, 3 }, [CHARACTER_KNUCKLES] = { 739, 5 },
-    [CHARACTER_AMY] = { 739, 7 },   [CHARACTER_HIDDEN_LABEL] = { 739, 11 },
+    [CHARACTER_SONIC] = { 739, 1 },    [CHARACTER_CREAM] = { 739, 9 }, [CHARACTER_TAILS] = { 739, 3 },
+    [CHARACTER_KNUCKLES] = { 739, 5 }, [CHARACTER_AMY] = { 739, 7 },   [CHARACTER_HIDDEN_LABEL] = { 739, 11 },
 };
 
 static const u16 sCharacterSpriteAssets[][2] = {
-    [CHARACTER_SONIC] = { 736, 0 }, [CHARACTER_CREAM] = { 736, 2 },
-    [CHARACTER_TAILS] = { 736, 4 }, [CHARACTER_KNUCKLES] = { 736, 6 },
-    [CHARACTER_AMY] = { 736, 8 },
+    [CHARACTER_SONIC] = { 736, 0 },    [CHARACTER_CREAM] = { 736, 2 }, [CHARACTER_TAILS] = { 736, 4 },
+    [CHARACTER_KNUCKLES] = { 736, 6 }, [CHARACTER_AMY] = { 736, 8 },
 };
 
 static const u16 sCharacterSelectedSpriteAssets[][2] = {
-    [CHARACTER_SONIC] = { 736, 1 }, [CHARACTER_CREAM] = { 736, 3 },
-    [CHARACTER_TAILS] = { 736, 5 }, [CHARACTER_KNUCKLES] = { 736, 7 },
-    [CHARACTER_AMY] = { 736, 9 },
+    [CHARACTER_SONIC] = { 736, 1 },    [CHARACTER_CREAM] = { 736, 3 }, [CHARACTER_TAILS] = { 736, 5 },
+    [CHARACTER_KNUCKLES] = { 736, 7 }, [CHARACTER_AMY] = { 736, 9 },
 };
 
 static const u16 sCharacterNameSubTextAssets[][2] = {
@@ -131,20 +127,14 @@ static const u16 sCharacterNameSubTextAssets[][2] = {
 };
 
 static const u16 sScreenTitleTextAssets[][2] = {
-    [LanguageIndex(LANG_JAPANESE)] = { 740, 0 },
-    [LanguageIndex(LANG_ENGLISH)] = { 743, 0 },
-    [LanguageIndex(LANG_GERMAN)] = { 744, 0 },
-    [LanguageIndex(LANG_FRENCH)] = { 748, 0 },
-    [LanguageIndex(LANG_SPANISH)] = { 745, 0 },
-    [LanguageIndex(LANG_ITALIAN)] = { 746, 0 },
+    [LanguageIndex(LANG_JAPANESE)] = { 740, 0 }, [LanguageIndex(LANG_ENGLISH)] = { 743, 0 }, [LanguageIndex(LANG_GERMAN)] = { 744, 0 },
+    [LanguageIndex(LANG_FRENCH)] = { 748, 0 },   [LanguageIndex(LANG_SPANISH)] = { 745, 0 }, [LanguageIndex(LANG_ITALIAN)] = { 746, 0 },
 };
 
 static const u8 gUnknown_080D7274[] = { 8, 10, 10, 14 };
 static const u16 gCharacterAnnouncements[] = {
-    [CHARACTER_SONIC] = VOICE__ANNOUNCER__SONIC,
-    [CHARACTER_CREAM] = VOICE__ANNOUNCER__CREAM,
-    [CHARACTER_TAILS] = VOICE__ANNOUNCER__TAILS,
-    [CHARACTER_KNUCKLES] = VOICE__ANNOUNCER__KNUCKLES,
+    [CHARACTER_SONIC] = VOICE__ANNOUNCER__SONIC, [CHARACTER_CREAM] = VOICE__ANNOUNCER__CREAM,
+    [CHARACTER_TAILS] = VOICE__ANNOUNCER__TAILS, [CHARACTER_KNUCKLES] = VOICE__ANNOUNCER__KNUCKLES,
     [CHARACTER_AMY] = VOICE__ANNOUNCER__AMY,
 };
 
@@ -162,8 +152,7 @@ static const u16 sCourselScrollAnimVelocities[] = {
 };
 
 static const u8 sCharacterChosenAnimLengths[] = {
-    [CHARACTER_SONIC] = 30,    [CHARACTER_CREAM] = 30, [CHARACTER_TAILS] = 30,
-    [CHARACTER_KNUCKLES] = 30, [CHARACTER_AMY] = 30,
+    [CHARACTER_SONIC] = 30, [CHARACTER_CREAM] = 30, [CHARACTER_TAILS] = 30, [CHARACTER_KNUCKLES] = 30, [CHARACTER_AMY] = 30,
 };
 
 #define CHEESE_SILHOUETTE 5
@@ -173,27 +162,26 @@ static const u8 sCharacterSilhouettes[] = {
     [CHARACTER_KNUCKLES] = 6, [CHARACTER_AMY] = 5,   [CHEESE_SILHOUETTE] = 3,
 };
 
-#define BackgroundAnim()                                                                \
-    ({                                                                                  \
-        gBgScrollRegs[0][1] = (gBgScrollRegs[0][1] - 1) & 0xFF;                         \
-        gBgScrollRegs[2][0] = (gBgScrollRegs[2][0] - 1) & 0xFF;                         \
-        gBgScrollRegs[2][1] = (gBgScrollRegs[2][1] + 1) & 0xFF;                         \
+#define BackgroundAnim()                                                                                                                   \
+    ({                                                                                                                                     \
+        gBgScrollRegs[0][1] = (gBgScrollRegs[0][1] - 1) & 0xFF;                                                                            \
+        gBgScrollRegs[2][0] = (gBgScrollRegs[2][0] - 1) & 0xFF;                                                                            \
+        gBgScrollRegs[2][1] = (gBgScrollRegs[2][1] + 1) & 0xFF;                                                                            \
     })
 
 // These values have to be passed in, as it seems some of the
 // functions don't use u8 i values, who knows what's going on here
-#define ReadMultiplayerSelections(characterScreen, i, packet)                           \
-    ({                                                                                  \
-        (characterScreen)->multiplayerSelections = 0;                                   \
-        for ((i) = 0; (i) < MULTI_SIO_PLAYERS_MAX; (i)++) {                             \
-            if ((i) != SIO_MULTI_CNT->id && GetBit(gMultiplayerConnections, (i))) {     \
-                (packet) = &gMultiSioRecv[(i)];                                         \
-                if ((packet)->pat0.unk0 > 0x4020) {                                     \
-                    (characterScreen)->multiplayerSelections                            \
-                        |= CHARACTER_BIT(packet->pat0.unk2);                            \
-                }                                                                       \
-            }                                                                           \
-        }                                                                               \
+#define ReadMultiplayerSelections(characterScreen, i, packet)                                                                              \
+    ({                                                                                                                                     \
+        (characterScreen)->multiplayerSelections = 0;                                                                                      \
+        for ((i) = 0; (i) < MULTI_SIO_PLAYERS_MAX; (i)++) {                                                                                \
+            if ((i) != SIO_MULTI_CNT->id && GetBit(gMultiplayerConnections, (i))) {                                                        \
+                (packet) = &gMultiSioRecv[(i)];                                                                                            \
+                if ((packet)->pat0.unk0 > 0x4020) {                                                                                        \
+                    (characterScreen)->multiplayerSelections |= CHARACTER_BIT(packet->pat0.unk2);                                          \
+                }                                                                                                                          \
+            }                                                                                                                              \
+        }                                                                                                                                  \
     })
 
 void CreateCharacterSelectionScreen(u8 initialSelection, bool8 allUnlocked)
@@ -236,9 +224,7 @@ void CreateCharacterSelectionScreen(u8 initialSelection, bool8 allUnlocked)
     gBgScrollRegs[1][0] = 0;
     gBgScrollRegs[1][1] = 0;
 
-    t = TaskCreate(Task_FadeInAndStartRollInAnim,
-                   sizeof(struct CharacterSelectionScreen), 0x4100, 0,
-                   CharacterSelectScreenOnDestroy);
+    t = TaskCreate(Task_FadeInAndStartRollInAnim, sizeof(struct CharacterSelectionScreen), 0x4100, 0, CharacterSelectScreenOnDestroy);
     characterScreen = TASK_DATA(t);
 
     characterScreen->availableCharacters = gLoadedSaveGame->unlockedCharacters;
@@ -256,8 +242,7 @@ void CreateCharacterSelectionScreen(u8 initialSelection, bool8 allUnlocked)
     characterScreen->scrollingDown = FALSE;
 
     if (allUnlocked) {
-        characterScreen->carouselPosition
-            = ((0x108 - (0x66 * initialSelection)) & 0x3FF) * 0x100 + 2;
+        characterScreen->carouselPosition = ((0x108 - (0x66 * initialSelection)) & 0x3FF) * 0x100 + 2;
         characterScreen->amyUnlocked = TRUE;
         characterScreen->initialSelection = initialSelection;
 
@@ -266,8 +251,7 @@ void CreateCharacterSelectionScreen(u8 initialSelection, bool8 allUnlocked)
         }
     } else {
 
-        characterScreen->carouselPosition
-            = ((0x16E - (initialSelection * 0x66)) & 0x3FF) * 0x100 + 4;
+        characterScreen->carouselPosition = ((0x16E - (initialSelection * 0x66)) & 0x3FF) * 0x100 + 4;
         characterScreen->amyUnlocked = FALSE;
         characterScreen->initialSelection = initialSelection;
         if (initialSelection > CHARACTER_KNUCKLES) {
@@ -375,10 +359,8 @@ void CreateCharacterSelectionScreen(u8 initialSelection, bool8 allUnlocked)
     s->x = 0;
     s->y = 0;
     s->graphics.dest = VramMalloc(0x24);
-    s->graphics.anim = sCharacterNameSubTextAssets[characterScreen->initialSelection
-                                                   + (something * 6)][0];
-    s->variant = sCharacterNameSubTextAssets[characterScreen->initialSelection
-                                             + (something * 6)][1];
+    s->graphics.anim = sCharacterNameSubTextAssets[characterScreen->initialSelection + (something * 6)][0];
+    s->variant = sCharacterNameSubTextAssets[characterScreen->initialSelection + (something * 6)][1];
     s->oamFlags = SPRITE_OAM_ORDER(4);
     s->graphics.size = 0;
     s->animCursor = 0;
@@ -394,8 +376,7 @@ void CreateCharacterSelectionScreen(u8 initialSelection, bool8 allUnlocked)
     s->x = 0;
     s->y = 0;
     s->graphics.dest = VramMalloc(0x40);
-    s->graphics.anim
-        = sCharacterTitleLeftSideAssets[characterScreen->initialSelection][0];
+    s->graphics.anim = sCharacterTitleLeftSideAssets[characterScreen->initialSelection][0];
     s->variant = sCharacterTitleLeftSideAssets[characterScreen->initialSelection][1];
     s->oamFlags = SPRITE_OAM_ORDER(4);
     s->graphics.size = 0;
@@ -412,8 +393,7 @@ void CreateCharacterSelectionScreen(u8 initialSelection, bool8 allUnlocked)
     s->x = 0;
     s->y = 0;
     s->graphics.dest = VramMalloc(0x40);
-    s->graphics.anim
-        = sCharacteTitleRightSideAssets[characterScreen->initialSelection][0];
+    s->graphics.anim = sCharacteTitleRightSideAssets[characterScreen->initialSelection][0];
     s->variant = sCharacteTitleRightSideAssets[characterScreen->initialSelection][1];
     s->oamFlags = SPRITE_OAM_ORDER(4);
     s->graphics.size = 0;
@@ -482,8 +462,7 @@ void CreateCharacterSelectionScreen(u8 initialSelection, bool8 allUnlocked)
     s->y = 0;
     s->graphics.dest = (void *)(OBJ_VRAM0 + 0x400);
     s->graphics.anim = SA2_ANIM_CHAR_SELECT_CHARACTER;
-    s->variant = SA2_ANIM_VARIANT_SELECT_CHARACTER(
-        SA2_ANIM_CHAR_ID_CHEESE, SA2_ANIM_VARIANT_CHAR_SELECT_CHARACTER_STATIC);
+    s->variant = SA2_ANIM_VARIANT_SELECT_CHARACTER(SA2_ANIM_CHAR_ID_CHEESE, SA2_ANIM_VARIANT_CHAR_SELECT_CHARACTER_STATIC);
     s->oamFlags = SPRITE_OAM_ORDER(4);
     s->graphics.size = 0;
     s->animCursor = 0;
@@ -582,11 +561,9 @@ static void Task_RollInAnim(void)
         RenderTransitionInUIAnim(characterScreen);
     } else {
 #ifndef NON_MATCHING
-        characterScreen->carouselPosition
-            -= Div(gSineTable[(((r0 = animFrame + 4) << 2) & 0x3FF) + 0x100], 3);
+        characterScreen->carouselPosition -= Div(gSineTable[(((r0 = animFrame + 4) << 2) & 0x3FF) + 0x100], 3);
 #else
-        characterScreen->carouselPosition
-            -= Div(gSineTable[(((animFrame + 4) << 2) & 0x3FF) + 0x100], 3);
+        characterScreen->carouselPosition -= Div(gSineTable[(((animFrame + 4) << 2) & 0x3FF) + 0x100], 3);
 #endif
         if (characterScreen->amyUnlocked) {
             characterScreen->carouselPosition += 6;
@@ -651,16 +628,13 @@ static void Task_CharacterSelectMain(void)
 
     if (characterScreen->selectionComplete) {
         s = &characterScreen->characterSprite;
-        s->graphics.anim
-            = sCharacterSelectedSpriteAssets[characterScreen->selectedCharacter][0];
-        s->variant
-            = sCharacterSelectedSpriteAssets[characterScreen->selectedCharacter][1];
+        s->graphics.anim = sCharacterSelectedSpriteAssets[characterScreen->selectedCharacter][0];
+        s->variant = sCharacterSelectedSpriteAssets[characterScreen->selectedCharacter][1];
         s->prevVariant = -1;
 
         s = &characterScreen->characterSecondarySprite;
         s->graphics.anim = SA2_ANIM_CHAR_SELECT_CHARACTER;
-        s->variant = SA2_ANIM_VARIANT_SELECT_CHARACTER(
-            SA2_ANIM_CHAR_ID_CHEESE, SA2_ANIM_VARIANT_CHAR_SELECT_CHARACTER_SELECTED);
+        s->variant = SA2_ANIM_VARIANT_SELECT_CHARACTER(SA2_ANIM_CHAR_ID_CHEESE, SA2_ANIM_VARIANT_CHAR_SELECT_CHARACTER_SELECTED);
         s->prevVariant = -1;
         gSelectedCharacter = characterScreen->selectedCharacter;
 
@@ -684,17 +658,14 @@ static void Task_CharacterSelectMain(void)
         RenderUI(characterScreen);
     } else {
         if (gInput & (DPAD_LEFT | DPAD_UP)) {
-            if (characterScreen->selectedCharacter == CHARACTER_SONIC
-                && !characterScreen->amyUnlocked) {
+            if (characterScreen->selectedCharacter == CHARACTER_SONIC && !characterScreen->amyUnlocked) {
                 characterScreen->carouselPosition = 0x26800;
             }
 
             characterScreen->cursorAnimFrame = 0;
             characterScreen->upArrowActviteFrames = 12;
             characterScreen->previousSelection = characterScreen->selectedCharacter;
-            characterScreen->selectedCharacter
-                = gUnknown_080D7282[characterScreen->amyUnlocked + 2]
-                                   [characterScreen->selectedCharacter];
+            characterScreen->selectedCharacter = gUnknown_080D7282[characterScreen->amyUnlocked + 2][characterScreen->selectedCharacter];
             characterScreen->animFrame = 0;
             characterScreen->unk3C4 = 0;
             characterScreen->scrollingDown = FALSE;
@@ -709,9 +680,7 @@ static void Task_CharacterSelectMain(void)
             characterScreen->cursorAnimFrame = 0;
             characterScreen->downArrowActiveFrames = 12;
             characterScreen->previousSelection = characterScreen->selectedCharacter;
-            characterScreen->selectedCharacter
-                = gUnknown_080D7282[characterScreen->amyUnlocked]
-                                   [characterScreen->selectedCharacter];
+            characterScreen->selectedCharacter = gUnknown_080D7282[characterScreen->amyUnlocked][characterScreen->selectedCharacter];
             characterScreen->animFrame = 0;
             characterScreen->unk3C4 = 0;
             characterScreen->scrollingDown = TRUE;
@@ -727,8 +696,7 @@ static void Task_CharacterSelectMain(void)
 #ifndef NON_MATCHING
             if (!(IS_SINGLE_PLAYER
                   && !((gPressedKeys & A_BUTTON)
-                       && (characterScreen->availableCharacters
-                           & CHARACTER_BIT(characterScreen->selectedCharacter))))) {
+                       && (characterScreen->availableCharacters & CHARACTER_BIT(characterScreen->selectedCharacter))))) {
                 goto code;
             }
             while (0)
@@ -738,29 +706,21 @@ static void Task_CharacterSelectMain(void)
 #else
             if (IS_SINGLE_PLAYER
                 && !((gPressedKeys & A_BUTTON)
-                     && (characterScreen->availableCharacters
-                         & CHARACTER_BIT(characterScreen->selectedCharacter)))) {
+                     && (characterScreen->availableCharacters & CHARACTER_BIT(characterScreen->selectedCharacter)))) {
                 RenderCarouselScrollAnim(characterScreen);
             } else
 #endif
             if (IS_SINGLE_PLAYER // completely optimized out
                 || (gPressedKeys & A_BUTTON
-                    && !(characterScreen->multiplayerSelections
-                         & CHARACTER_BIT(characterScreen->selectedCharacter)))) {
+                    && !(characterScreen->multiplayerSelections & CHARACTER_BIT(characterScreen->selectedCharacter)))) {
                 s = &characterScreen->characterSprite;
-                s->graphics.anim
-                    = sCharacterSelectedSpriteAssets[characterScreen->selectedCharacter]
-                                                    [0];
-                s->variant
-                    = sCharacterSelectedSpriteAssets[characterScreen->selectedCharacter]
-                                                    [1];
+                s->graphics.anim = sCharacterSelectedSpriteAssets[characterScreen->selectedCharacter][0];
+                s->variant = sCharacterSelectedSpriteAssets[characterScreen->selectedCharacter][1];
                 s->prevVariant = -1;
 
                 s = &characterScreen->characterSecondarySprite;
                 s->graphics.anim = SA2_ANIM_CHAR_SELECT_CHARACTER;
-                s->variant = SA2_ANIM_VARIANT_SELECT_CHARACTER(
-                    SA2_ANIM_CHAR_ID_CHEESE,
-                    SA2_ANIM_VARIANT_CHAR_SELECT_CHARACTER_SELECTED);
+                s->variant = SA2_ANIM_VARIANT_SELECT_CHARACTER(SA2_ANIM_CHAR_ID_CHEESE, SA2_ANIM_VARIANT_CHAR_SELECT_CHARACTER_SELECTED);
                 s->prevVariant = -1;
 
                 gSelectedCharacter = characterScreen->selectedCharacter;
@@ -773,8 +733,7 @@ static void Task_CharacterSelectMain(void)
                 fade->speed = 0x180;
                 fade->bldCnt = (BLDCNT_EFFECT_DARKEN | BLDCNT_TGT1_ALL);
                 fade->bldAlpha = 0;
-                m4aSongNumStart(
-                    gCharacterAnnouncements[characterScreen->selectedCharacter]);
+                m4aSongNumStart(gCharacterAnnouncements[characterScreen->selectedCharacter]);
 
                 if (IS_MULTI_PLAYER) {
                     gCurTask->main = Task_MultiplayerWaitForSelections;
@@ -782,17 +741,13 @@ static void Task_CharacterSelectMain(void)
                     gCurTask->main = Task_SelectionCompleteFadeOutAndExit;
                 }
                 RenderUI(characterScreen);
-            } else if (IS_MULTI_PLAYER
-                       && characterScreen->multiplayerSelections
-                           & CHARACTER_BIT(characterScreen->selectedCharacter)) {
+            } else if (IS_MULTI_PLAYER && characterScreen->multiplayerSelections & CHARACTER_BIT(characterScreen->selectedCharacter)) {
                 if (characterScreen->scrollingDown) {
                     characterScreen->cursorAnimFrame = 0;
                     characterScreen->downArrowActiveFrames = 12;
-                    characterScreen->previousSelection
-                        = characterScreen->selectedCharacter;
+                    characterScreen->previousSelection = characterScreen->selectedCharacter;
                     characterScreen->selectedCharacter
-                        = gUnknown_080D7282[characterScreen->amyUnlocked]
-                                           [characterScreen->selectedCharacter];
+                        = gUnknown_080D7282[characterScreen->amyUnlocked][characterScreen->selectedCharacter];
 
                     characterScreen->animFrame = 0;
                     characterScreen->unk3C4 = 0;
@@ -803,18 +758,15 @@ static void Task_CharacterSelectMain(void)
                     m4aSongNumStart(SE_SHIFT);
                     gCurTask->main = Task_HandleCarouselScrollDown;
                 } else {
-                    if (characterScreen->selectedCharacter == CHARACTER_SONIC
-                        && !characterScreen->amyUnlocked) {
+                    if (characterScreen->selectedCharacter == CHARACTER_SONIC && !characterScreen->amyUnlocked) {
                         characterScreen->carouselPosition = 0x26800;
                     }
                     characterScreen->cursorAnimFrame = 0;
                     characterScreen->upArrowActviteFrames = 12;
-                    characterScreen->previousSelection
-                        = characterScreen->selectedCharacter;
+                    characterScreen->previousSelection = characterScreen->selectedCharacter;
 
                     characterScreen->selectedCharacter
-                        = gUnknown_080D7282[characterScreen->amyUnlocked + 2]
-                                           [characterScreen->selectedCharacter];
+                        = gUnknown_080D7282[characterScreen->amyUnlocked + 2][characterScreen->selectedCharacter];
                     characterScreen->animFrame = 0;
                     characterScreen->unk3C4 = 0;
                     characterScreen->scrollingDown = FALSE;
@@ -869,11 +821,9 @@ static void Task_HandleCarouselScrollUp(void)
     characterScreen->carouselPosition &= 0x3FFFF;
 
     if ((IS_SINGLE_PLAYER && (gPressedKeys & A_BUTTON)
-         && (characterScreen->availableCharacters
-             & CHARACTER_BIT(characterScreen->selectedCharacter)))
+         && (characterScreen->availableCharacters & CHARACTER_BIT(characterScreen->selectedCharacter)))
         || (IS_MULTI_PLAYER && (gPressedKeys & A_BUTTON)
-            && !(characterScreen->multiplayerSelections
-                 & CHARACTER_BIT(characterScreen->selectedCharacter)))) {
+            && !(characterScreen->multiplayerSelections & CHARACTER_BIT(characterScreen->selectedCharacter)))) {
         characterScreen->selectionComplete = TRUE;
     } else if (IS_SINGLE_PLAYER && (gPressedKeys & B_BUTTON)) {
         if (!characterScreen->exiting) {
@@ -927,11 +877,9 @@ static void Task_HandleCarouselScrollDown(void)
     characterScreen->carouselPosition &= 0x3FFFF;
 
     if ((IS_SINGLE_PLAYER && (gPressedKeys & A_BUTTON)
-         && (characterScreen->availableCharacters
-             & CHARACTER_BIT(characterScreen->selectedCharacter)))
+         && (characterScreen->availableCharacters & CHARACTER_BIT(characterScreen->selectedCharacter)))
         || (IS_MULTI_PLAYER && (gPressedKeys & A_BUTTON)
-            && !(characterScreen->multiplayerSelections
-                 & CHARACTER_BIT(characterScreen->selectedCharacter)))) {
+            && !(characterScreen->multiplayerSelections & CHARACTER_BIT(characterScreen->selectedCharacter)))) {
         characterScreen->selectionComplete = TRUE;
     } else if (IS_SINGLE_PLAYER && (gPressedKeys & B_BUTTON)) {
         if (!characterScreen->exiting) {
@@ -987,11 +935,9 @@ static void Task_CarouselScrollCompleteAnim(void)
     }
 
     if ((IS_SINGLE_PLAYER && (gPressedKeys & A_BUTTON)
-         && (characterScreen->availableCharacters
-             & CHARACTER_BIT(characterScreen->selectedCharacter)))
+         && (characterScreen->availableCharacters & CHARACTER_BIT(characterScreen->selectedCharacter)))
         || (IS_MULTI_PLAYER && (gPressedKeys & A_BUTTON)
-            && !(characterScreen->multiplayerSelections
-                 & CHARACTER_BIT(characterScreen->selectedCharacter)))) {
+            && !(characterScreen->multiplayerSelections & CHARACTER_BIT(characterScreen->selectedCharacter)))) {
         characterScreen->selectionComplete = TRUE;
     }
 
@@ -1040,8 +986,7 @@ static void Task_SelectionCompleteFadeOutAndExit(void)
         }
     }
 
-    if ((characterScreen->animFrame
-         >= sCharacterChosenAnimLengths[characterScreen->selectedCharacter])
+    if ((characterScreen->animFrame >= sCharacterChosenAnimLengths[characterScreen->selectedCharacter])
         && UpdateScreenFade(unk0) == SCREEN_FADE_COMPLETE) {
         TaskDestroy(gCurTask);
 
@@ -1051,31 +996,24 @@ static void Task_SelectionCompleteFadeOutAndExit(void)
         }
 
         if (gGameMode != GAME_MODE_SINGLE_PLAYER) {
-            CreateTimeAttackLevelSelectScreen(
-                (gGameMode & GAME_MODE_BOSS_TIME_ATTACK) ? 1 : 0, gSelectedCharacter,
-                gCurrentLevel);
+            CreateTimeAttackLevelSelectScreen((gGameMode & GAME_MODE_BOSS_TIME_ATTACK) ? 1 : 0, gSelectedCharacter, gCurrentLevel);
             return;
         }
 
         // Only 1 zone available
-        if (gLoadedSaveGame->unlockedLevels[gSelectedCharacter]
-            <= LEVEL_INDEX(ZONE_1, ACT_BOSS)) {
+        if (gLoadedSaveGame->unlockedLevels[gSelectedCharacter] <= LEVEL_INDEX(ZONE_1, ACT_BOSS)) {
             gCurrentLevel = LEVEL_INDEX(ZONE_1, ACT_1);
             GameStageStart();
             return;
         }
 
-        if (gLoadedSaveGame->extraZoneStatus == 1
-            && gSelectedCharacter == CHARACTER_SONIC) {
-            CreateCourseSelectionScreen(
-                LEVEL_INDEX(ZONE_1, ACT_1),
-                gLoadedSaveGame->unlockedLevels[gSelectedCharacter],
-                CUT_SCENE_UNLOCK_TRUE_AREA_53);
+        if (gLoadedSaveGame->extraZoneStatus == 1 && gSelectedCharacter == CHARACTER_SONIC) {
+            CreateCourseSelectionScreen(LEVEL_INDEX(ZONE_1, ACT_1), gLoadedSaveGame->unlockedLevels[gSelectedCharacter],
+                                        CUT_SCENE_UNLOCK_TRUE_AREA_53);
             return;
         }
 
-        CreateCourseSelectionScreen(LEVEL_INDEX(ZONE_1, ACT_1),
-                                    gLoadedSaveGame->unlockedLevels[gSelectedCharacter],
+        CreateCourseSelectionScreen(LEVEL_INDEX(ZONE_1, ACT_1), gLoadedSaveGame->unlockedLevels[gSelectedCharacter],
                                     COURSE_SELECT_CUT_SCENE_NONE);
         return;
     }
@@ -1112,23 +1050,13 @@ static void RenderCarouselRollInAnim(struct CharacterSelectionScreen *characterS
 
     if (characterScreen->amyUnlocked) {
         for (i = 0; i < 10; i++) {
-            if ((characterScreen->animFrame
-                 > (i - characterScreen->initialSelection) * 5)
-                || (characterScreen->initialSelection == 4 && i < 2
-                    && (characterScreen->animFrame > 0x13))) {
+            if ((characterScreen->animFrame > (i - characterScreen->initialSelection) * 5)
+                || (characterScreen->initialSelection == 4 && i < 2 && (characterScreen->animFrame > 0x13))) {
                 u8 temp = i - Div(i, 5) * 5;
                 s = &characterScreen->carouselBlobs[temp];
 
-                s->x = Q_2_14_TO_INT(
-                           COS(((characterScreen->carouselPosition >> 8) + (i * 0x66))
-                               & 0x3FF)
-                           * 92)
-                    + 10;
-                s->y = Q_2_14_TO_INT(
-                           SIN((((characterScreen->carouselPosition >> 8) + (i * 0x66))
-                                & 0x3FF))
-                           * 92)
-                    + 80;
+                s->x = Q_2_14_TO_INT(COS(((characterScreen->carouselPosition >> 8) + (i * 0x66)) & 0x3FF) * 92) + 10;
+                s->y = Q_2_14_TO_INT(SIN((((characterScreen->carouselPosition >> 8) + (i * 0x66)) & 0x3FF)) * 92) + 80;
                 DisplaySprite(s);
             }
         }
@@ -1136,8 +1064,7 @@ static void RenderCarouselRollInAnim(struct CharacterSelectionScreen *characterS
         u16 temp = ((characterScreen->carouselPosition >> 8) + 0x330) & 0x3FF;
 
         for (i = 0; i < 9; i++) {
-            if (characterScreen->animFrame
-                > (s8)(i - characterScreen->initialSelection)) {
+            if (characterScreen->animFrame > (s8)(i - characterScreen->initialSelection)) {
                 u32 temp2;
                 s = &characterScreen->carouselBlobs[(i + 2) & 3];
 
@@ -1148,9 +1075,7 @@ static void RenderCarouselRollInAnim(struct CharacterSelectionScreen *characterS
             }
         }
 
-        if (characterScreen->initialSelection > 0
-            && characterScreen->initialSelection < 4
-            && characterScreen->animFrame > 0x13) {
+        if (characterScreen->initialSelection > 0 && characterScreen->initialSelection < 4 && characterScreen->animFrame > 0x13) {
             for (; i < gUnknown_080D7274[characterScreen->initialSelection]; i++) {
                 u32 temp2;
                 s = &characterScreen->carouselBlobs[(i + 2) & 3];
@@ -1178,24 +1103,12 @@ static void RenderTransitionInUIAnim(struct CharacterSelectionScreen *characterS
     if (characterScreen->amyUnlocked) {
         for (i = 0; i < 10; i++) {
             u8 temp2 = i - Div(i, 5) * 5;
-            if (temp2 != characterScreen->selectedCharacter
-                || characterScreen->unk3C4 != 0x10) {
+            if (temp2 != characterScreen->selectedCharacter || characterScreen->unk3C4 != 0x10) {
 
                 s = &characterScreen->carouselBlobs[temp2];
 
-                s->x = ((gSineTable[(((characterScreen->carouselPosition >> 8)
-                                      + (i * 0x66) + 2)
-                                     & 0x3FF)
-                                    + 0x100]
-                         * 0x5C)
-                        >> 0xE)
-                    + 10;
-                s->y = ((gSineTable[(
-                             ((characterScreen->carouselPosition >> 8) + (i * 0x66) + 2)
-                             & 0x3FF)]
-                         * 0x5C)
-                        >> 0xE)
-                    + 0x50;
+                s->x = ((gSineTable[(((characterScreen->carouselPosition >> 8) + (i * 0x66) + 2) & 0x3FF) + 0x100] * 0x5C) >> 0xE) + 10;
+                s->y = ((gSineTable[(((characterScreen->carouselPosition >> 8) + (i * 0x66) + 2) & 0x3FF)] * 0x5C) >> 0xE) + 0x50;
                 DisplaySprite(s);
             }
         }
@@ -1204,8 +1117,7 @@ static void RenderTransitionInUIAnim(struct CharacterSelectionScreen *characterS
         for (i = 0; i < 8; i++) {
             u32 temp2;
             u32 temp3 = (i + 2) & 3;
-            if (temp3 != characterScreen->selectedCharacter
-                || characterScreen->unk3C4 < 0xD) {
+            if (temp3 != characterScreen->selectedCharacter || characterScreen->unk3C4 < 0xD) {
                 s = &characterScreen->carouselBlobs[temp3];
                 temp2 = ((temp + i * 0x66) + 4) & 0x3FF;
                 s->x = (gSineTable[temp2 + 0x100] * 0x5C >> 0xE) + 10;
@@ -1219,17 +1131,12 @@ static void RenderTransitionInUIAnim(struct CharacterSelectionScreen *characterS
 
     s->x = 101;
     s->y = 79;
-    s->variant = characterScreen->selectedCharacter
-        + SA2_ANIM_VARIANT_CHAR_SELECT_CIRCLE_ACTIVE;
+    s->variant = characterScreen->selectedCharacter + SA2_ANIM_VARIANT_CHAR_SELECT_CIRCLE_ACTIVE;
     s->prevVariant = -1;
 
     transformOptions->rotation = 0;
-    transformOptions->width
-        = (gSineTable[(characterScreen->cursorAnimFrame * 0x10 + 0x100) & 0x3FF] >> 8)
-        + 0xC0;
-    transformOptions->height
-        = (gSineTable[(characterScreen->cursorAnimFrame * 0x10 + 0x100) & 0x3FF] >> 8)
-        + 0xC0;
+    transformOptions->width = (gSineTable[(characterScreen->cursorAnimFrame * 0x10 + 0x100) & 0x3FF] >> 8) + 0xC0;
+    transformOptions->height = (gSineTable[(characterScreen->cursorAnimFrame * 0x10 + 0x100) & 0x3FF] >> 8) + 0xC0;
     transformOptions->x = s->x;
     transformOptions->y = s->y;
 
@@ -1256,8 +1163,7 @@ static void RenderTransitionInUIAnim(struct CharacterSelectionScreen *characterS
 
     s = &characterScreen->characterSprite;
     if (i > 0) {
-        s->x = characterScreen->characterBaseXPos
-            + (0x80 - (gSineTable[i * 0x10 + 0x100] >> 7)) * 2;
+        s->x = characterScreen->characterBaseXPos + (0x80 - (gSineTable[i * 0x10 + 0x100] >> 7)) * 2;
     } else {
         s->x = characterScreen->characterBaseXPos;
     }
@@ -1265,9 +1171,7 @@ static void RenderTransitionInUIAnim(struct CharacterSelectionScreen *characterS
     s->y = 0x82;
     x = s->x;
 
-    if (!(characterScreen->availableCharacters
-          & CHARACTER_BIT(characterScreen->selectedCharacter))
-        && IS_SINGLE_PLAYER) {
+    if (!(characterScreen->availableCharacters & CHARACTER_BIT(characterScreen->selectedCharacter)) && IS_SINGLE_PLAYER) {
         s->frameFlags |= 0x40000;
         s->palId = sCharacterSilhouettes[characterScreen->selectedCharacter];
     } else {
@@ -1281,9 +1185,7 @@ static void RenderTransitionInUIAnim(struct CharacterSelectionScreen *characterS
         s->x = x;
         s->y = 0x82;
 
-        if (!(characterScreen->availableCharacters
-              & CHARACTER_BIT(characterScreen->selectedCharacter))
-            && IS_SINGLE_PLAYER) {
+        if (!(characterScreen->availableCharacters & CHARACTER_BIT(characterScreen->selectedCharacter)) && IS_SINGLE_PLAYER) {
             // make shadow mode
             s->frameFlags |= 0x40000;
             s->palId = sCharacterSilhouettes[CHEESE_SILHOUETTE];
@@ -1391,9 +1293,7 @@ static void RenderCarouselScrollAnim(struct CharacterSelectionScreen *characterS
         s->variant = sCharacterSpriteAssets[selectedCharacter][1];
         s->prevVariant = -1;
 
-        if (!(characterScreen->availableCharacters
-              & CHARACTER_BIT(characterScreen->selectedCharacter))
-            && IS_SINGLE_PLAYER) {
+        if (!(characterScreen->availableCharacters & CHARACTER_BIT(characterScreen->selectedCharacter)) && IS_SINGLE_PLAYER) {
             s->frameFlags |= 0x40000;
             s->palId = sCharacterSilhouettes[characterScreen->selectedCharacter];
         } else {
@@ -1403,9 +1303,7 @@ static void RenderCarouselScrollAnim(struct CharacterSelectionScreen *characterS
 
         UpdateSpriteAnimation(s);
 
-        if (!(characterScreen->availableCharacters
-              & CHARACTER_BIT(characterScreen->selectedCharacter))
-            && IS_SINGLE_PLAYER) {
+        if (!(characterScreen->availableCharacters & CHARACTER_BIT(characterScreen->selectedCharacter)) && IS_SINGLE_PLAYER) {
             s = &characterScreen->characterNameSubText;
             s->graphics.anim = sCharacterNameSubTextAssets[CHARACTER_HIDDEN_LABEL][0];
             s->variant = sCharacterNameSubTextAssets[CHARACTER_HIDDEN_LABEL][1];
@@ -1423,10 +1321,8 @@ static void RenderCarouselScrollAnim(struct CharacterSelectionScreen *characterS
             s->prevVariant = -1;
         } else {
             s = &characterScreen->characterNameSubText;
-            s->graphics.anim
-                = sCharacterNameSubTextAssets[selectedCharacter + somethinga * 6][0];
-            s->variant
-                = sCharacterNameSubTextAssets[selectedCharacter + somethinga * 6][1];
+            s->graphics.anim = sCharacterNameSubTextAssets[selectedCharacter + somethinga * 6][0];
+            s->variant = sCharacterNameSubTextAssets[selectedCharacter + somethinga * 6][1];
             s->prevVariant = -1;
             UpdateSpriteAnimation(s);
 
@@ -1445,24 +1341,12 @@ static void RenderCarouselScrollAnim(struct CharacterSelectionScreen *characterS
     if (characterScreen->amyUnlocked) {
         for (i = 0; i < 10; i++) {
             u8 temp2 = i - Div(i, 5) * 5;
-            if (temp2 != characterScreen->selectedCharacter
-                || characterScreen->unk3C4 < 0xD) {
+            if (temp2 != characterScreen->selectedCharacter || characterScreen->unk3C4 < 0xD) {
 
                 s = &characterScreen->carouselBlobs[temp2];
 
-                s->x = ((gSineTable[(((characterScreen->carouselPosition >> 8)
-                                      + (i * 0x66) + 2)
-                                     & 0x3FF)
-                                    + 0x100]
-                         * 0x5C)
-                        >> 0xE)
-                    + 10;
-                s->y = ((gSineTable[(
-                             ((characterScreen->carouselPosition >> 8) + (i * 0x66) + 2)
-                             & 0x3FF)]
-                         * 0x5C)
-                        >> 0xE)
-                    + 0x50;
+                s->x = ((gSineTable[(((characterScreen->carouselPosition >> 8) + (i * 0x66) + 2) & 0x3FF) + 0x100] * 0x5C) >> 0xE) + 10;
+                s->y = ((gSineTable[(((characterScreen->carouselPosition >> 8) + (i * 0x66) + 2) & 0x3FF)] * 0x5C) >> 0xE) + 0x50;
                 DisplaySprite(s);
             }
         }
@@ -1471,8 +1355,7 @@ static void RenderCarouselScrollAnim(struct CharacterSelectionScreen *characterS
         for (i = 0; i < 8; i++) {
             u32 temp2;
             u32 temp3 = (i + 2) & 3;
-            if (temp3 != characterScreen->selectedCharacter
-                || characterScreen->unk3C4 < 0xD) {
+            if (temp3 != characterScreen->selectedCharacter || characterScreen->unk3C4 < 0xD) {
                 s = &characterScreen->carouselBlobs[temp3];
                 temp2 = ((temp + i * 0x66) + 4) & 0x3FF;
                 s->x = (gSineTable[temp2 + 0x100] * 0x5C >> 0xE) + 10;
@@ -1488,19 +1371,12 @@ static void RenderCarouselScrollAnim(struct CharacterSelectionScreen *characterS
 
         s->x = 0x65;
         s->y = 0x4F;
-        s->variant = characterScreen->selectedCharacter
-            + SA2_ANIM_VARIANT_CHAR_SELECT_CIRCLE_ACTIVE;
+        s->variant = characterScreen->selectedCharacter + SA2_ANIM_VARIANT_CHAR_SELECT_CIRCLE_ACTIVE;
         s->prevVariant = -1;
 
         transformOptions->rotation = 0;
-        transformOptions->width
-            = (gSineTable[(characterScreen->cursorAnimFrame * 0x10 + 0x100) & 0x3FF]
-               >> 8)
-            + 0xC0;
-        transformOptions->height
-            = (gSineTable[(characterScreen->cursorAnimFrame * 0x10 + 0x100) & 0x3FF]
-               >> 8)
-            + 0xC0;
+        transformOptions->width = (gSineTable[(characterScreen->cursorAnimFrame * 0x10 + 0x100) & 0x3FF] >> 8) + 0xC0;
+        transformOptions->height = (gSineTable[(characterScreen->cursorAnimFrame * 0x10 + 0x100) & 0x3FF] >> 8) + 0xC0;
         transformOptions->x = s->x;
         transformOptions->y = s->y;
 
@@ -1513,8 +1389,7 @@ static void RenderCarouselScrollAnim(struct CharacterSelectionScreen *characterS
     s = &characterScreen->characterSprite;
 
     if (b > 0) {
-        s->x = characterScreen->characterBaseXPos
-            + (0x80 - (gSineTable[b * 0x10 + 0x100] >> 7)) * 2;
+        s->x = characterScreen->characterBaseXPos + (0x80 - (gSineTable[b * 0x10 + 0x100] >> 7)) * 2;
         f = s->x;
         e = characterScreen->characterBaseXPos + (b * 0x12);
 
@@ -1525,9 +1400,7 @@ static void RenderCarouselScrollAnim(struct CharacterSelectionScreen *characterS
     }
     s->y = 0x82;
 
-    if (!(characterScreen->availableCharacters
-          & CHARACTER_BIT(characterScreen->selectedCharacter))
-        && IS_SINGLE_PLAYER) {
+    if (!(characterScreen->availableCharacters & CHARACTER_BIT(characterScreen->selectedCharacter)) && IS_SINGLE_PLAYER) {
         s->frameFlags |= 0x40000;
         s->palId = sCharacterSilhouettes[characterScreen->selectedCharacter];
     } else {
@@ -1541,9 +1414,7 @@ static void RenderCarouselScrollAnim(struct CharacterSelectionScreen *characterS
         s->x = e;
         s->y = 0x82;
 
-        if (!(characterScreen->availableCharacters
-              & CHARACTER_BIT(characterScreen->selectedCharacter))
-            && IS_SINGLE_PLAYER) {
+        if (!(characterScreen->availableCharacters & CHARACTER_BIT(characterScreen->selectedCharacter)) && IS_SINGLE_PLAYER) {
             s->frameFlags |= 0x40000;
             s->palId = sCharacterSilhouettes[CHEESE_SILHOUETTE];
         } else {
@@ -1554,9 +1425,7 @@ static void RenderCarouselScrollAnim(struct CharacterSelectionScreen *characterS
         DisplaySprite(s);
     }
 
-    if (IS_MULTI_PLAYER
-        && characterScreen->multiplayerSelections
-            & CHARACTER_BIT(characterScreen->selectedCharacter)) {
+    if (IS_MULTI_PLAYER && characterScreen->multiplayerSelections & CHARACTER_BIT(characterScreen->selectedCharacter)) {
         s = &characterScreen->characterUnavailableIndicator;
         s->x = f;
         s->y = 130;
@@ -1640,24 +1509,12 @@ static void RenderUI(struct CharacterSelectionScreen *characterScreen)
     if (characterScreen->amyUnlocked) {
         for (i = 0; i < NUM_CHARACTERS * 2; i++) {
             u8 temp2 = i - Div(i, 5) * 5;
-            if (temp2 != characterScreen->selectedCharacter
-                || characterScreen->unk3C4 < 0xD) {
+            if (temp2 != characterScreen->selectedCharacter || characterScreen->unk3C4 < 0xD) {
 
                 s = &characterScreen->carouselBlobs[temp2];
 
-                s->x = ((gSineTable[(((characterScreen->carouselPosition >> 8)
-                                      + (i * 0x66) + 2)
-                                     & 0x3FF)
-                                    + 0x100]
-                         * 0x5C)
-                        >> 0xE)
-                    + 10;
-                s->y = ((gSineTable[(
-                             ((characterScreen->carouselPosition >> 8) + (i * 0x66) + 2)
-                             & 0x3FF)]
-                         * 0x5C)
-                        >> 0xE)
-                    + 0x50;
+                s->x = ((gSineTable[(((characterScreen->carouselPosition >> 8) + (i * 0x66) + 2) & 0x3FF) + 0x100] * 0x5C) >> 0xE) + 10;
+                s->y = ((gSineTable[(((characterScreen->carouselPosition >> 8) + (i * 0x66) + 2) & 0x3FF)] * 0x5C) >> 0xE) + 0x50;
                 DisplaySprite(s);
             }
         }
@@ -1666,8 +1523,7 @@ static void RenderUI(struct CharacterSelectionScreen *characterScreen)
         for (i = 0; i < (NUM_CHARACTERS - 1) * 2; i++) {
             u32 temp2;
             u32 temp3 = (i + 2) & 3;
-            if (temp3 != characterScreen->selectedCharacter
-                || characterScreen->unk3C4 < 0xD) {
+            if (temp3 != characterScreen->selectedCharacter || characterScreen->unk3C4 < 0xD) {
                 s = &characterScreen->carouselBlobs[temp3];
                 temp2 = ((temp + i * 0x66) + 4) & 0x3FF;
                 s->x = (gSineTable[temp2 + 0x100] * 0x5C >> 0xE) + 10;
@@ -1683,19 +1539,12 @@ static void RenderUI(struct CharacterSelectionScreen *characterScreen)
 
         s->x = 101;
         s->y = 79;
-        s->variant = characterScreen->selectedCharacter
-            + SA2_ANIM_VARIANT_CHAR_SELECT_CIRCLE_ACTIVE;
+        s->variant = characterScreen->selectedCharacter + SA2_ANIM_VARIANT_CHAR_SELECT_CIRCLE_ACTIVE;
         s->prevVariant = -1;
 
         transformOptions->rotation = 0;
-        transformOptions->width
-            = (gSineTable[(characterScreen->cursorAnimFrame * 0x10 + 0x100) & 0x3FF]
-               >> 8)
-            + 0xC0;
-        transformOptions->height
-            = (gSineTable[(characterScreen->cursorAnimFrame * 0x10 + 0x100) & 0x3FF]
-               >> 8)
-            + 0xC0;
+        transformOptions->width = (gSineTable[(characterScreen->cursorAnimFrame * 0x10 + 0x100) & 0x3FF] >> 8) + 0xC0;
+        transformOptions->height = (gSineTable[(characterScreen->cursorAnimFrame * 0x10 + 0x100) & 0x3FF] >> 8) + 0xC0;
         transformOptions->x = s->x;
         transformOptions->y = s->y;
 
@@ -1712,9 +1561,7 @@ static void RenderUI(struct CharacterSelectionScreen *characterScreen)
         UpdateSpriteAnimation(element2);
         DisplaySprite(element2);
     }
-    if (IS_MULTI_PLAYER
-        && (characterScreen->multiplayerSelections
-            & CHARACTER_BIT(characterScreen->selectedCharacter))) {
+    if (IS_MULTI_PLAYER && (characterScreen->multiplayerSelections & CHARACTER_BIT(characterScreen->selectedCharacter))) {
         DisplaySprite(&characterScreen->characterUnavailableIndicator);
     }
     DisplaySprite(&characterScreen->characterNameSubText);
@@ -1771,8 +1618,7 @@ static void Task_MultiplayerWaitForSelections(void)
 
         s = &characterScreen->characterSecondarySprite;
         s->graphics.anim = SA2_ANIM_CHAR_SELECT_CHARACTER;
-        s->variant = SA2_ANIM_VARIANT_SELECT_CHARACTER(
-            SA2_ANIM_CHAR_ID_CHEESE, SA2_ANIM_VARIANT_CHAR_SELECT_CHARACTER_STATIC);
+        s->variant = SA2_ANIM_VARIANT_SELECT_CHARACTER(SA2_ANIM_CHAR_ID_CHEESE, SA2_ANIM_VARIANT_CHAR_SELECT_CHARACTER_STATIC);
         s->prevVariant = -1;
 
         RenderUI(characterScreen);
@@ -1809,26 +1655,20 @@ static void Task_MultiplayerWaitForSelections(void)
         if (GetBit(gMultiplayerConnections, i) && i != SIO_MULTI_CNT->id) {
             recv = &gMultiSioRecv[i];
             // Conflict
-            if (recv->pat0.unk0 == 0x4021
-                && recv->pat0.unk2 == characterScreen->selectedCharacter
-                && i < SIO_MULTI_CNT->id) {
+            if (recv->pat0.unk0 == 0x4021 && recv->pat0.unk2 == characterScreen->selectedCharacter && i < SIO_MULTI_CNT->id) {
                 gCurTask->main = Task_CharacterSelectMain;
                 m4aSongNumStart(SE_RETURN);
                 characterScreen->selectionComplete = FALSE;
 
                 s = &characterScreen->characterSprite;
-                s->graphics.anim
-                    = sCharacterSpriteAssets[characterScreen->selectedCharacter][0];
-                s->variant
-                    = sCharacterSpriteAssets[characterScreen->selectedCharacter][1];
+                s->graphics.anim = sCharacterSpriteAssets[characterScreen->selectedCharacter][0];
+                s->variant = sCharacterSpriteAssets[characterScreen->selectedCharacter][1];
                 s->prevVariant = -1;
                 UpdateSpriteAnimation(s);
 
                 s = &characterScreen->characterSecondarySprite;
                 s->graphics.anim = SA2_ANIM_CHAR_SELECT_CHARACTER;
-                s->variant = SA2_ANIM_VARIANT_SELECT_CHARACTER(
-                    SA2_ANIM_CHAR_ID_CHEESE,
-                    SA2_ANIM_VARIANT_CHAR_SELECT_CHARACTER_STATIC);
+                s->variant = SA2_ANIM_VARIANT_SELECT_CHARACTER(SA2_ANIM_CHAR_ID_CHEESE, SA2_ANIM_VARIANT_CHAR_SELECT_CHARACTER_STATIC);
                 s->prevVariant = -1;
                 UpdateSpriteAnimation(s);
 
diff --git a/src/game/cheese.c b/src/game/cheese.c
index 3da762213..fd82287a6 100644
--- a/src/game/cheese.c
+++ b/src/game/cheese.c
@@ -59,27 +59,21 @@ void sub_80149EC(void);
 void sub_80152EC(void);
 
 const u16 gUnknown_080D5548[][2] = {
-    { 0x1C7, 0 }, { 0x1C8, 0 }, { 0x1C9, 0 }, { 0x1C7, 0 }, { 0x1C8, 0 }, { 0x1C9, 0 },
-    { 0x1C9, 1 }, { 0x1CA, 0 }, { 0x1CB, 0 }, { 0x1CC, 0 }, { 0x1CC, 1 }, { 0x1CD, 0 },
-    { 0x1CE, 0 }, { 0x1CF, 0 }, { 0x1CF, 1 }, { 0x1D0, 0 }, { 0x1D1, 0 }, { 0x1D6, 0 },
+    { 0x1C7, 0 }, { 0x1C8, 0 }, { 0x1C9, 0 }, { 0x1C7, 0 }, { 0x1C8, 0 }, { 0x1C9, 0 }, { 0x1C9, 1 }, { 0x1CA, 0 }, { 0x1CB, 0 },
+    { 0x1CC, 0 }, { 0x1CC, 1 }, { 0x1CD, 0 }, { 0x1CE, 0 }, { 0x1CF, 0 }, { 0x1CF, 1 }, { 0x1D0, 0 }, { 0x1D1, 0 }, { 0x1D6, 0 },
 };
 
 const u8 gUnknown_080D5590[] = {
-    0,  9,  10, 10, 0, 0, 0, 0, 0,  0,  3,  3,  0, 0,  0, 0, 0, 0, 0, 0,  1, 1,
-    0,  0,  0,  0,  0, 0, 0, 0, 2,  2,  4,  4,  0, 4,  0, 2, 0, 0, 0, 11, 2, 16,
-    16, 16, 16, 15, 0, 0, 0, 0, 12, 12, 13, 14, 0, 17, 0, 0, 0, 0, 0, 0,  0, 0,
-    0,  0,  8,  8,  8, 8, 8, 5, 5,  5,  5,  5,  0, 0,  0, 0, 0, 0, 0, 0,  0, 0,
-    0,  0,  0,  0,  0, 0, 0, 0, 0,  0,  0,  0,  0, 0,  0, 0, 0, 0, 0, 0,  0, 0,
-    0,  0,  0,  0,  0, 0, 0, 0, 0,  0,  0,  0,  0, 0,  0, 8, 8, 8, 0, 0,  0, 0,
-    0,  0,  0,  0,  0, 0, 0, 0, 0,  0,  0,  0,  0, 0,  0, 0, 0, 0, 0, 0,
+    0, 9, 10, 10, 0, 0,  0,  0,  0,  0,  3, 3, 0, 0, 0,  0,  0,  0,  0, 0,  1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 4, 4, 0, 4, 0, 2,
+    0, 0, 0,  11, 2, 16, 16, 16, 16, 15, 0, 0, 0, 0, 12, 12, 13, 14, 0, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 5, 5, 5,
+    5, 5, 0,  0,  0, 0,  0,  0,  0,  0,  0, 0, 0, 0, 0,  0,  0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0,  0,  0, 0,  0,  0,  0,  0,  0, 8, 8, 8, 0,  0,  0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 };
 
 const u8 gUnknown_080D5628[] = {
-    0,   1,   4,   6,   8,   10,  11,  12,  14,  16,  22,  25,  28,  29,  30,  30,
-    32,  35,  30,  38,  40,  41,  42,  0,   0,   0,   0,   0,   43,  46,  47,  49,
-    52,  54,  56,  57,  58,  0,   62,  64,  0,   0,   0,   66,  0,   0,   0,   0,
-    68,  71,  73,  76,  78,  81,  83,  85,  86,  0,   94,  95,  107, 119, 120, 122,
-    124, 125, 128, 131, 132, 141, 143, 144, 146, 147, 150, 151,
+    0,  1,  4,  6,  8,  10, 11, 12, 14,  16,  22,  25,  28,  29,  30,  30,  32,  35,  30,  38,  40,  41,  42,  0,   0,  0,
+    0,  0,  43, 46, 47, 49, 52, 54, 56,  57,  58,  0,   62,  64,  0,   0,   0,   66,  0,   0,   0,   0,   68,  71,  73, 76,
+    78, 81, 83, 85, 86, 0,  94, 95, 107, 119, 120, 122, 124, 125, 128, 131, 132, 141, 143, 144, 146, 147, 150, 151,
 };
 
 void CreateCheese(Player *player)
@@ -162,10 +156,7 @@ void sub_801412C(Cheese *cheese)
     Sprite *s = &cheese->s;
     Cheese_UNK54 *unk54 = &cheese->unk54;
     u32 temp;
-    if (cheese->unk10 != 18
-        && cheese->unk14
-            != gUnknown_080D5548[cheese->unk10][0]
-                + gUnknown_080D5548[cheese->unk10][1]) {
+    if (cheese->unk10 != 18 && cheese->unk14 != gUnknown_080D5548[cheese->unk10][0] + gUnknown_080D5548[cheese->unk10][1]) {
         s->graphics.anim = gUnknown_080D5548[cheese->unk10][0];
         s->variant = gUnknown_080D5548[cheese->unk10][1];
         cheese->unk14 = s->graphics.anim + s->variant;
@@ -190,9 +181,7 @@ void sub_801412C(Cheese *cheese)
         temp ^= 0x800;
     }
 
-    s->frameFlags
-        = (temp | (s->frameFlags & ~(SPRITE_FLAG_MASK_X_FLIP | SPRITE_FLAG_MASK_Y_FLIP)))
-        & ~SPRITE_FLAG_MASK_PRIORITY;
+    s->frameFlags = (temp | (s->frameFlags & ~(SPRITE_FLAG_MASK_X_FLIP | SPRITE_FLAG_MASK_Y_FLIP))) & ~SPRITE_FLAG_MASK_PRIORITY;
     s->frameFlags |= (unk54->unk68->frameFlags) & SPRITE_FLAG_MASK_PRIORITY;
     UpdateSpriteAnimation(s);
     if (!(cheese->unkC & 2)) {
@@ -268,9 +257,7 @@ void sub_8014350(void)
     sub_8014CC8(cheese);
 
     if (unk54->unk68->graphics.anim < 0xB6) {
-        cheese->unk10
-            = gUnknown_080D5590[gUnknown_080D5628[unk54->unk68->graphics.anim - 0x5b]
-                                + unk54->unk68->variant];
+        cheese->unk10 = gUnknown_080D5590[gUnknown_080D5628[unk54->unk68->graphics.anim - 0x5b] + unk54->unk68->variant];
     }
 
     if (unk54->unk60 & 0x100000) {
@@ -360,8 +347,7 @@ void sub_80144CC(void)
 
     temp = 10;
     if (unk54->unk68->graphics.anim < 0xB6) {
-        temp = gUnknown_080D5590[gUnknown_080D5628[unk54->unk68->graphics.anim - 0x5B]
-                                 + unk54->unk68->variant];
+        temp = gUnknown_080D5590[gUnknown_080D5628[unk54->unk68->graphics.anim - 0x5B] + unk54->unk68->variant];
     }
 
     if (temp != 9) {
@@ -412,8 +398,8 @@ void sub_801464C(void)
         temp2 = 0x20;
     }
 
-    if (cheese->unkC & 0x10 && unk54->unk68->graphics.anim != 0x69
-        && unk54->unk68->graphics.anim != 0x6D && unk54->unk68->graphics.anim != 0x71) {
+    if (cheese->unkC & 0x10 && unk54->unk68->graphics.anim != 0x69 && unk54->unk68->graphics.anim != 0x6D
+        && unk54->unk68->graphics.anim != 0x71) {
         cheese->unkC &= ~0x10;
     }
 
@@ -458,8 +444,7 @@ void sub_801464C(void)
     }
 end:
 
-    temp5 = QS(t->unk16) - cheese->posX > -1 ? Q(t->unk16) - cheese->posX
-                                             : cheese->posX - QS(t->unk16);
+    temp5 = QS(t->unk16) - cheese->posX > -1 ? Q(t->unk16) - cheese->posX : cheese->posX - QS(t->unk16);
 
     if (QS(t->unk16) > cheese->posX) {
         temp3 = temp5 >> temp1;
@@ -476,8 +461,7 @@ end:
         }
     }
 
-    temp5 = QS(t->unk18 - 4) - cheese->posY > -1 ? QS(t->unk18 - 4) - cheese->posY
-                                                 : cheese->posY - QS(t->unk18 - 4);
+    temp5 = QS(t->unk18 - 4) - cheese->posY > -1 ? QS(t->unk18 - 4) - cheese->posY : cheese->posY - QS(t->unk18 - 4);
 
     if (QS(t->unk18 - 4) > cheese->posY) {
         temp4 = temp5 >> temp1;
@@ -530,8 +514,8 @@ void sub_8014834(void)
     Cheese *cheese = TASK_DATA(gCurTask);
     struct Task *t = cheese->unk18;
     Cheese_UNK54 *unk54 = &cheese->unk54;
-    if (cheese->unkC & 0x10 && unk54->unk68->graphics.anim != 0x69
-        && unk54->unk68->graphics.anim != 0x6D && unk54->unk68->graphics.anim != 0x71) {
+    if (cheese->unkC & 0x10 && unk54->unk68->graphics.anim != 0x69 && unk54->unk68->graphics.anim != 0x6D
+        && unk54->unk68->graphics.anim != 0x71) {
         cheese->unkC &= ~0x10;
     }
 
@@ -564,8 +548,8 @@ void sub_80148B8(void)
         temp1 = 1;
     }
 
-    if (cheese->unkC & 0x10 && unk54->unk68->graphics.anim != 0x69
-        && unk54->unk68->graphics.anim != 0x6D && unk54->unk68->graphics.anim != 0x71) {
+    if (cheese->unkC & 0x10 && unk54->unk68->graphics.anim != 0x69 && unk54->unk68->graphics.anim != 0x6D
+        && unk54->unk68->graphics.anim != 0x71) {
         cheese->unkC &= ~0x10;
     }
 
@@ -573,9 +557,7 @@ void sub_80148B8(void)
 
     if (sub_8014EFC(cheese, 0x20, 0x20, temp1) == 1) {
         if (unk54->unk68->graphics.anim < 0xB6) {
-            cheese->unk10
-                = gUnknown_080D5590[gUnknown_080D5628[unk54->unk68->graphics.anim - 0x5b]
-                                    + unk54->unk68->variant];
+            cheese->unk10 = gUnknown_080D5590[gUnknown_080D5628[unk54->unk68->graphics.anim - 0x5b] + unk54->unk68->variant];
         }
 
         if (cheese->unkE > 0x3C && cheese->unk10 != 2) {
@@ -588,8 +570,7 @@ void sub_80148B8(void)
     cheese->unk10 = 0;
 
     if (unk54->unk68->graphics.anim < 0xB6) {
-        temp0 = gUnknown_080D5590[gUnknown_080D5628[unk54->unk68->graphics.anim - 0x5b]
-                                  + unk54->unk68->variant];
+        temp0 = gUnknown_080D5590[gUnknown_080D5628[unk54->unk68->graphics.anim - 0x5b] + unk54->unk68->variant];
     }
 
     if (!(cheese->unkC & 0x10)) {
@@ -621,9 +602,7 @@ void sub_80149EC(void)
     cheese->unk10 = 7;
     if (cheese->unkA++ > 0x3C) {
         if (unk54->unk68->graphics.anim < 0xB6) {
-            cheese->unk10
-                = gUnknown_080D5590[gUnknown_080D5628[unk54->unk68->graphics.anim - 0x5b]
-                                    + unk54->unk68->variant];
+            cheese->unk10 = gUnknown_080D5590[gUnknown_080D5628[unk54->unk68->graphics.anim - 0x5b] + unk54->unk68->variant];
         }
         if (cheese->unk10 != 7) {
             gCurTask->main = sub_8014350;
@@ -651,9 +630,7 @@ void sub_8014A68(void)
     sub_8014EFC(cheese, cos, sin, 0);
 
     if (unk54->unk68->graphics.anim < 0xB6) {
-        cheese->unk10
-            = gUnknown_080D5590[gUnknown_080D5628[unk54->unk68->graphics.anim - 0x5b]
-                                + unk54->unk68->variant];
+        cheese->unk10 = gUnknown_080D5590[gUnknown_080D5628[unk54->unk68->graphics.anim - 0x5b] + unk54->unk68->variant];
     }
 
     if (cheese->unk10 != 4) {
@@ -679,9 +656,7 @@ void sub_8014AFC(void)
     sub_8014EFC(cheese, cos, sin + 0x30, 0);
 
     if (unk54->unk68->graphics.anim < 0xB6) {
-        cheese->unk10
-            = gUnknown_080D5590[gUnknown_080D5628[unk54->unk68->graphics.anim - 0x5b]
-                                + unk54->unk68->variant];
+        cheese->unk10 = gUnknown_080D5590[gUnknown_080D5628[unk54->unk68->graphics.anim - 0x5b] + unk54->unk68->variant];
     }
 
     if (cheese->unk10 != 0xC) {
@@ -702,8 +677,7 @@ void sub_8014AFC(void)
 
 void sub_8014BB0(Cheese *cheese)
 {
-    struct Task *t
-        = TaskCreate(sub_8014C60, sizeof(Cheese_UNK8014BB0), 0x5040, 0, sub_8015604);
+    struct Task *t = TaskCreate(sub_8014C60, sizeof(Cheese_UNK8014BB0), 0x5040, 0, sub_8015604);
     Cheese_UNK8014BB0 *unk4BB0 = TASK_DATA(t);
 
     unk4BB0->unk3C = 0;
@@ -804,8 +778,7 @@ u8 sub_8014CC8(Cheese *cheese)
     sin = ((SIN(temp * 4) >> 6) * 0x20) + unk54->unk58;
 
     if (cheese->unk8 != 2) {
-        temp2 = unk54->unk54 - cheese->posX > -1 ? unk54->unk54 - cheese->posX
-                                                 : cheese->posX - unk54->unk54;
+        temp2 = unk54->unk54 - cheese->posX > -1 ? unk54->unk54 - cheese->posX : cheese->posX - unk54->unk54;
         if (temp2 > 0x5000) {
             cheese->unk8 = 2;
         } else {
@@ -837,8 +810,7 @@ u8 sub_8014CC8(Cheese *cheese)
     }
 
     if (cheese->unk9 != 2) {
-        temp2 = unk54->unk58 - cheese->posY > -1 ? unk54->unk58 - cheese->posY
-                                                 : cheese->posY - unk54->unk58;
+        temp2 = unk54->unk58 - cheese->posY > -1 ? unk54->unk58 - cheese->posY : cheese->posY - unk54->unk58;
 
         if (temp2 > 0x5000) {
             cheese->unk9 = 2;
@@ -953,8 +925,7 @@ u8 sub_8014EFC(Cheese *cheese, s16 x, s16 y, u8 p4)
         return 1;
     }
     if ((cos - cheese->posX > -1 ? cos - cheese->posX : cheese->posX - cos) < 0x600) {
-        if ((sin - cheese->posY > -1 ? sin - cheese->posY : cheese->posY - sin)
-            < 0x600) {
+        if ((sin - cheese->posY > -1 ? sin - cheese->posY : cheese->posY - sin) < 0x600) {
             ret = 1;
         }
     }
@@ -1053,8 +1024,7 @@ bool8 sub_8015118(Cheese *cheese)
             unk54->unk60 |= 0x100000;
         }
 
-        if (gSelectedCharacter == CHARACTER_CREAM
-            && gPlayer.moveState & MOVESTATE_400000) {
+        if (gSelectedCharacter == CHARACTER_CREAM && gPlayer.moveState & MOVESTATE_400000) {
             thing = TRUE;
         }
 
@@ -1104,9 +1074,7 @@ void sub_80152EC(void)
     Cheese *cheese = TASK_DATA(gCurTask);
     Cheese_UNK54 *unk54 = &cheese->unk54;
     if (unk54->unk68->graphics.anim < SA2_ANIM_TAILS_IDLE
-        && gUnknown_080D5590[gUnknown_080D5628[unk54->unk68->graphics.anim - 0x5b]
-                             + unk54->unk68->variant]
-            == 4) {
+        && gUnknown_080D5590[gUnknown_080D5628[unk54->unk68->graphics.anim - 0x5b] + unk54->unk68->variant] == 4) {
         cheese->unkA = 0;
         cheese->unkE = 0;
         gCheeseTarget.task->unk15 = 0;
@@ -1133,9 +1101,7 @@ void sub_8015378(void)
     }
 
     if (unk54->unk68->graphics.anim < SA2_ANIM_TAILS_IDLE) {
-        cheese->unk10
-            = gUnknown_080D5590[gUnknown_080D5628[unk54->unk68->graphics.anim - 0x5b]
-                                + unk54->unk68->variant];
+        cheese->unk10 = gUnknown_080D5590[gUnknown_080D5628[unk54->unk68->graphics.anim - 0x5b] + unk54->unk68->variant];
     }
 
     if (cheese->unk10 != 11) {
@@ -1153,9 +1119,7 @@ void sub_80153F8(void)
     sub_8014EFC(cheese, 8, 0xf, 0);
 
     if (unk54->unk68->graphics.anim < SA2_ANIM_TAILS_IDLE) {
-        cheese->unk10
-            = gUnknown_080D5590[gUnknown_080D5628[unk54->unk68->graphics.anim - 0x5b]
-                                + unk54->unk68->variant];
+        cheese->unk10 = gUnknown_080D5590[gUnknown_080D5628[unk54->unk68->graphics.anim - 0x5b] + unk54->unk68->variant];
     }
 
     if (cheese->unk10 != 11) {
@@ -1215,9 +1179,7 @@ void sub_801555C(void)
     cheese->unk10 = 14;
 
     if (unk54->unk68->graphics.anim < SA2_ANIM_TAILS_IDLE) {
-        cheese->unk10
-            = gUnknown_080D5590[gUnknown_080D5628[unk54->unk68->graphics.anim - 0x5b]
-                                + unk54->unk68->variant];
+        cheese->unk10 = gUnknown_080D5590[gUnknown_080D5628[unk54->unk68->graphics.anim - 0x5b] + unk54->unk68->variant];
     }
 
     if (cheese->unk10 != 0xE) {
diff --git a/src/game/countdown.c b/src/game/countdown.c
index 9d3b22143..9a116b040 100644
--- a/src/game/countdown.c
+++ b/src/game/countdown.c
@@ -26,20 +26,15 @@ struct CourseStartCountdown {
 };
 
 const TileInfo gUnknown_080D7518[NUM_CHARACTERS] = {
-    TextElementAlt4(SA2_CHAR_ANIM_VARIANT_BEFORE_COUNTDOWN_LIFTOFF, 0,
-                    SA2_ANIM_CHAR(SA2_CHAR_ANIM_BEFORE_COUNTDOWN, CHARACTER_SONIC)),
+    TextElementAlt4(SA2_CHAR_ANIM_VARIANT_BEFORE_COUNTDOWN_LIFTOFF, 0, SA2_ANIM_CHAR(SA2_CHAR_ANIM_BEFORE_COUNTDOWN, CHARACTER_SONIC)),
 
-    TextElementAlt4(SA2_CHAR_ANIM_VARIANT_BEFORE_COUNTDOWN_LIFTOFF, 0,
-                    SA2_ANIM_CHAR(SA2_CHAR_ANIM_BEFORE_COUNTDOWN, CHARACTER_CREAM)),
+    TextElementAlt4(SA2_CHAR_ANIM_VARIANT_BEFORE_COUNTDOWN_LIFTOFF, 0, SA2_ANIM_CHAR(SA2_CHAR_ANIM_BEFORE_COUNTDOWN, CHARACTER_CREAM)),
 
-    TextElementAlt4(SA2_CHAR_ANIM_VARIANT_BEFORE_COUNTDOWN_LIFTOFF, 0,
-                    SA2_ANIM_CHAR(SA2_CHAR_ANIM_BEFORE_COUNTDOWN, CHARACTER_TAILS)),
+    TextElementAlt4(SA2_CHAR_ANIM_VARIANT_BEFORE_COUNTDOWN_LIFTOFF, 0, SA2_ANIM_CHAR(SA2_CHAR_ANIM_BEFORE_COUNTDOWN, CHARACTER_TAILS)),
 
-    TextElementAlt4(SA2_CHAR_ANIM_VARIANT_BEFORE_COUNTDOWN_LIFTOFF, 0,
-                    SA2_ANIM_CHAR(SA2_CHAR_ANIM_BEFORE_COUNTDOWN, CHARACTER_KNUCKLES)),
+    TextElementAlt4(SA2_CHAR_ANIM_VARIANT_BEFORE_COUNTDOWN_LIFTOFF, 0, SA2_ANIM_CHAR(SA2_CHAR_ANIM_BEFORE_COUNTDOWN, CHARACTER_KNUCKLES)),
 
-    TextElementAlt4(SA2_CHAR_ANIM_VARIANT_BEFORE_COUNTDOWN_LIFTOFF, 0,
-                    SA2_ANIM_CHAR(SA2_CHAR_ANIM_BEFORE_COUNTDOWN, CHARACTER_AMY)),
+    TextElementAlt4(SA2_CHAR_ANIM_VARIANT_BEFORE_COUNTDOWN_LIFTOFF, 0, SA2_ANIM_CHAR(SA2_CHAR_ANIM_BEFORE_COUNTDOWN, CHARACTER_AMY)),
 };
 
 void sub_8036168(void);
@@ -52,8 +47,7 @@ void CreateCourseStartCountdown(bool8 playerSkippedIntro)
     Sprite *s;
 
     gStageFlags |= STAGE_FLAG__100;
-    t = TaskCreate(sub_8036168, sizeof(struct CourseStartCountdown), 0x3000, 0,
-                   sub_8036638);
+    t = TaskCreate(sub_8036168, sizeof(struct CourseStartCountdown), 0x3000, 0, sub_8036638);
     countdown = TASK_DATA(t);
 
     countdown->unk6A = 0;
@@ -103,8 +97,7 @@ void sub_8036168(void)
     Sprite *s;
 
     // Skip intro
-    if (IS_SINGLE_PLAYER && countdown->unk68 > (GBA_FRAMES_PER_SECOND * 3)
-        && gPressedKeys & (A_BUTTON | B_BUTTON)) {
+    if (IS_SINGLE_PLAYER && countdown->unk68 > (GBA_FRAMES_PER_SECOND * 3) && gPressedKeys & (A_BUTTON | B_BUTTON)) {
         countdown->unk68 = GBA_FRAMES_PER_SECOND * 3;
     }
 
@@ -153,8 +146,7 @@ void sub_8036168(void)
 
     if (countdown->unk68 < (GBA_FRAMES_PER_SECOND * 3)) {
         s = &countdown->sprCountdownDigits;
-        s->variant = SA2_ANIM_VARIANT_COUNTDOWN_1
-            - Div(countdown->unk68, GBA_FRAMES_PER_SECOND);
+        s->variant = SA2_ANIM_VARIANT_COUNTDOWN_1 - Div(countdown->unk68, GBA_FRAMES_PER_SECOND);
         s->prevVariant = -1;
         s->x = (I(gPlayer.x) - gCamera.x) + 0x18;
         s->y = (I(gPlayer.y) - gCamera.y) - 0x18;
@@ -162,8 +154,7 @@ void sub_8036168(void)
         DisplaySprite(s);
     }
 
-    if (countdown->unk68 >= (int)((1 + 1. / 6.) * GBA_FRAMES_PER_SECOND)
-        && countdown->unk68 < 3 * GBA_FRAMES_PER_SECOND) {
+    if (countdown->unk68 >= (int)((1 + 1. / 6.) * GBA_FRAMES_PER_SECOND) && countdown->unk68 < 3 * GBA_FRAMES_PER_SECOND) {
         gPlayer.anim = gUnknown_080D7518[gSelectedCharacter].anim;
         gPlayer.variant = gUnknown_080D7518[gSelectedCharacter].variant;
         gPlayer.unk6C = 1;
@@ -208,8 +199,7 @@ struct RaceStartMessage {
 
 void CreateRaceStartMessage(void)
 {
-    struct Task *t = TaskCreate(sub_8036524, sizeof(struct RaceStartMessage), 0x3000, 0,
-                                sub_8036654);
+    struct Task *t = TaskCreate(sub_8036524, sizeof(struct RaceStartMessage), 0x3000, 0, sub_8036654);
     struct RaceStartMessage *startMessage = TASK_DATA(t);
     Sprite *s;
 
diff --git a/src/game/course_select.c b/src/game/course_select.c
index 9744f6278..8f7480503 100644
--- a/src/game/course_select.c
+++ b/src/game/course_select.c
@@ -83,27 +83,23 @@ static void RenderZoneMapPathsAndUI(struct CourseSelectionScreen *coursesScreen)
 static void CourseSelectionScreenOnDestroy(struct Task *t);
 
 static const u16 sZoneMapPathAssets[][3] = {
-    [ZONE_1] = { 6, 749, 1 },  [ZONE_2] = { 12, 750, 1 },     [ZONE_3] = { 10, 751, 1 },
-    [ZONE_4] = { 6, 752, 1 },  [ZONE_5] = { 16, 753, 1 },     [ZONE_6] = { 21, 754, 1 },
-    [ZONE_7] = { 36, 755, 1 }, [ZONE_FINAL] = { 30, 756, 1 },
+    [ZONE_1] = { 6, 749, 1 },  [ZONE_2] = { 12, 750, 1 }, [ZONE_3] = { 10, 751, 1 }, [ZONE_4] = { 6, 752, 1 },
+    [ZONE_5] = { 16, 753, 1 }, [ZONE_6] = { 21, 754, 1 }, [ZONE_7] = { 36, 755, 1 }, [ZONE_FINAL] = { 30, 756, 1 },
 };
 
 static const u16 sZoneMapPathAnimatedAssets[][3] = {
-    [ZONE_1] = { 6, 749, 0 },  [ZONE_2] = { 12, 750, 0 },     [ZONE_3] = { 10, 751, 0 },
-    [ZONE_4] = { 6, 752, 0 },  [ZONE_5] = { 16, 753, 0 },     [ZONE_6] = { 28, 754, 0 },
-    [ZONE_7] = { 36, 755, 0 }, [ZONE_FINAL] = { 30, 756, 0 },
+    [ZONE_1] = { 6, 749, 0 },  [ZONE_2] = { 12, 750, 0 }, [ZONE_3] = { 10, 751, 0 }, [ZONE_4] = { 6, 752, 0 },
+    [ZONE_5] = { 16, 753, 0 }, [ZONE_6] = { 28, 754, 0 }, [ZONE_7] = { 36, 755, 0 }, [ZONE_FINAL] = { 30, 756, 0 },
 };
 
 static const s16 sUnused_080D7318[][2] = {
-    { 9, 106 },  { 25, 106 }, { 40, 76 },  { 56, 76 },  { 75, 114 }, { 91, 114 },
-    { 97, 66 },  { 113, 66 }, { 146, 77 }, { 162, 77 }, { 204, 97 }, { 220, 97 },
-    { 284, 77 }, { 300, 77 }, { 402, 72 }, { 455, 93 },
+    { 9, 106 },  { 25, 106 }, { 40, 76 },  { 56, 76 },  { 75, 114 }, { 91, 114 }, { 97, 66 },  { 113, 66 },
+    { 146, 77 }, { 162, 77 }, { 204, 97 }, { 220, 97 }, { 284, 77 }, { 300, 77 }, { 402, 72 }, { 455, 93 },
 };
 
 static const s16 sZoneMapCameraTargets[][2] = {
-    { 4, 100 },  { 20, 100 }, { 35, 70 },  { 51, 70 },  { 70, 108 }, { 86, 108 },
-    { 92, 60 },  { 108, 60 }, { 141, 71 }, { 157, 71 }, { 199, 91 }, { 215, 91 },
-    { 279, 71 }, { 295, 71 }, { 373, 93 }, { 449, 81 },
+    { 4, 100 },  { 20, 100 }, { 35, 70 },  { 51, 70 },  { 70, 108 }, { 86, 108 }, { 92, 60 },  { 108, 60 },
+    { 141, 71 }, { 157, 71 }, { 199, 91 }, { 215, 91 }, { 279, 71 }, { 295, 71 }, { 373, 93 }, { 449, 81 },
 };
 
 static const u16 sZoneNameAssets[][2] = {
@@ -145,14 +141,12 @@ static const u16 sZoneNameAssets[][2] = {
 };
 
 static const u16 sZoneTypeAssets[][2] = {
-    { 757, 0 }, { 757, 0 }, { 757, 0 }, { 757, 0 }, { 757, 0 }, { 757, 0 },
-    { 757, 0 }, { 757, 0 }, { 757, 0 }, { 757, 0 }, { 757, 0 }, { 757, 0 },
-    { 757, 0 }, { 757, 0 }, { 757, 1 }, { 757, 2 },
+    { 757, 0 }, { 757, 0 }, { 757, 0 }, { 757, 0 }, { 757, 0 }, { 757, 0 }, { 757, 0 }, { 757, 0 },
+    { 757, 0 }, { 757, 0 }, { 757, 0 }, { 757, 0 }, { 757, 0 }, { 757, 0 }, { 757, 1 }, { 757, 2 },
 };
 
 static const u16 sChaoEmeraldAssets[][2] = {
-    { 760, 0 }, { 760, 1 }, { 760, 2 }, { 760, 3 },
-    { 760, 4 }, { 760, 5 }, { 760, 6 }, { 760, 7 },
+    { 760, 0 }, { 760, 1 }, { 760, 2 }, { 760, 3 }, { 760, 4 }, { 760, 5 }, { 760, 6 }, { 760, 7 },
 };
 
 static const u8 sCourseIndexToNumZonePaths[] = {
@@ -178,9 +172,8 @@ static const s16 sZoneMapCourseXPositions[] = {
 };
 
 static const u16 sZoneMapPathPositions[][2] = {
-    [ZONE_1] = { 24, 80 },  [ZONE_2] = { 56, 80 },      [ZONE_3] = { 88, 72 },
-    [ZONE_4] = { 120, 64 }, [ZONE_5] = { 168, 72 },     [ZONE_6] = { 224, 72 },
-    [ZONE_7] = { 304, 72 }, [ZONE_FINAL] = { 384, 80 },
+    [ZONE_1] = { 24, 80 },  [ZONE_2] = { 56, 80 },  [ZONE_3] = { 88, 72 },  [ZONE_4] = { 120, 64 },
+    [ZONE_5] = { 168, 72 }, [ZONE_6] = { 224, 72 }, [ZONE_7] = { 304, 72 }, [ZONE_FINAL] = { 384, 80 },
 };
 
 static const u16 sZoneMapPathReverseAngles[] = {
@@ -194,8 +187,7 @@ static const u16 sZoneMapPathReverseAngles[] = {
     484, 0, // ZONE_FINAL
 };
 
-static const u16 sZoneMapPathForwardAngles[]
-    = { -1, 0, 850, 0, 180, 0, 788, 0, 56, 0, 72, 0, 976, 0, 44, 1000 };
+static const u16 sZoneMapPathForwardAngles[] = { -1, 0, 850, 0, 180, 0, 788, 0, 56, 0, 72, 0, 976, 0, 44, 1000 };
 
 static const u8 sCourseIndexToLevelIndex[] = {
     LEVEL_INDEX(ZONE_1, ACT_1),
@@ -216,30 +208,30 @@ static const u8 sCourseIndexToLevelIndex[] = {
     LEVEL_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53),
 };
 
-#define Render(coursesScreen)                                                           \
-    ({                                                                                  \
-        gBgScrollRegs[0][0] = TO_SCREEN_COORD((coursesScreen)->cameraScrollX);          \
-        RenderZoneMapPathsAndUI(coursesScreen);                                         \
+#define Render(coursesScreen)                                                                                                              \
+    ({                                                                                                                                     \
+        gBgScrollRegs[0][0] = TO_SCREEN_COORD((coursesScreen)->cameraScrollX);                                                             \
+        RenderZoneMapPathsAndUI(coursesScreen);                                                                                            \
     })
 
-#define SetCameraScrollX(coursesScreen, x)                                              \
-    ({                                                                                  \
-        (coursesScreen)->cameraScrollX = (x);                                           \
-        if ((coursesScreen)->cameraScrollX < MIN_CAMERA_SCROLL_X) {                     \
-            (coursesScreen)->cameraScrollX = MIN_CAMERA_SCROLL_X;                       \
-        } else if ((coursesScreen)->cameraScrollX > MAX_CAMERA_SCROLL_X) {              \
-            (coursesScreen)->cameraScrollX = MAX_CAMERA_SCROLL_X;                       \
-        }                                                                               \
+#define SetCameraScrollX(coursesScreen, x)                                                                                                 \
+    ({                                                                                                                                     \
+        (coursesScreen)->cameraScrollX = (x);                                                                                              \
+        if ((coursesScreen)->cameraScrollX < MIN_CAMERA_SCROLL_X) {                                                                        \
+            (coursesScreen)->cameraScrollX = MIN_CAMERA_SCROLL_X;                                                                          \
+        } else if ((coursesScreen)->cameraScrollX > MAX_CAMERA_SCROLL_X) {                                                                 \
+            (coursesScreen)->cameraScrollX = MAX_CAMERA_SCROLL_X;                                                                          \
+        }                                                                                                                                  \
     })
 
 // Text scrolls in from the right, so take that as base for pixel value
 #define CS_LOCAL_ZONE_TEXT_X (DISPLAY_WIDTH - 160)
-#define ScrollInZoneName(s, speed)                                                      \
-    ({                                                                                  \
-        (s)->x -= speed;                                                                \
-        if ((s)->x < CS_LOCAL_ZONE_TEXT_X) {                                            \
-            (s)->x = CS_LOCAL_ZONE_TEXT_X;                                              \
-        }                                                                               \
+#define ScrollInZoneName(s, speed)                                                                                                         \
+    ({                                                                                                                                     \
+        (s)->x -= speed;                                                                                                                   \
+        if ((s)->x < CS_LOCAL_ZONE_TEXT_X) {                                                                                               \
+            (s)->x = CS_LOCAL_ZONE_TEXT_X;                                                                                                 \
+        }                                                                                                                                  \
     })
 
 void CreateCourseSelectionScreen(u8 currentLevel, u8 maxLevel, u8 cutScenes)
@@ -272,8 +264,7 @@ void CreateCourseSelectionScreen(u8 currentLevel, u8 maxLevel, u8 cutScenes)
         if (maxLevel < LEVEL_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53)) {
             maxLevel++;
         } else {
-            if (gLoadedSaveGame->extraZoneStatus != 0
-                && gSelectedCharacter == CHARACTER_SONIC) {
+            if (gLoadedSaveGame->extraZoneStatus != 0 && gSelectedCharacter == CHARACTER_SONIC) {
                 maxLevel = LEVEL_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53);
             } else {
                 maxLevel = LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE);
@@ -306,24 +297,19 @@ void CreateCourseSelectionScreen(u8 currentLevel, u8 maxLevel, u8 cutScenes)
     gBgScrollRegs[1][0] = 0;
     gBgScrollRegs[1][1] = 0;
 
-    if (cutScenes & (CUT_SCENE_UNLOCK_NEXT_COURSE | CUT_SCENE_UNLOCK_TRUE_AREA_53)
-        && IS_SINGLE_PLAYER) {
-        t = TaskCreate(Task_FadeInIntroAndStartUnlockCutScene,
-                       sizeof(struct CourseSelectionScreen), 0x3100, 0,
+    if (cutScenes & (CUT_SCENE_UNLOCK_NEXT_COURSE | CUT_SCENE_UNLOCK_TRUE_AREA_53) && IS_SINGLE_PLAYER) {
+        t = TaskCreate(Task_FadeInIntroAndStartUnlockCutScene, sizeof(struct CourseSelectionScreen), 0x3100, 0,
                        CourseSelectionScreenOnDestroy);
     } else {
-        t = TaskCreate(Task_FadeInIntro, sizeof(struct CourseSelectionScreen), 0x3100, 0,
-                       CourseSelectionScreenOnDestroy);
+        t = TaskCreate(Task_FadeInIntro, sizeof(struct CourseSelectionScreen), 0x3100, 0, CourseSelectionScreenOnDestroy);
     }
 
     coursesScreen = TASK_DATA(t);
     coursesScreen->cameraScrollX = 0;
 
     courseIndex = LEVEL_TO_COURSE_INDEX(currentLevel);
-    coursesScreen->avatarTargetX
-        = sZoneMapCameraTargets[courseIndex][0] * UNITS_PER_PIXEL;
-    coursesScreen->avatarTargetY
-        = sZoneMapCameraTargets[courseIndex][1] * UNITS_PER_PIXEL;
+    coursesScreen->avatarTargetX = sZoneMapCameraTargets[courseIndex][0] * UNITS_PER_PIXEL;
+    coursesScreen->avatarTargetY = sZoneMapCameraTargets[courseIndex][1] * UNITS_PER_PIXEL;
     coursesScreen->currentCourse = courseIndex;
     coursesScreen->zoneNameAnimFrame = 0;
     coursesScreen->levelChosen = FALSE;
@@ -335,8 +321,7 @@ void CreateCourseSelectionScreen(u8 currentLevel, u8 maxLevel, u8 cutScenes)
     }
 
     coursesScreen->zonePathsUnlocked = sCourseIndexToNumZonePaths[maxCourseIndex];
-    if (cutScenes & (CUT_SCENE_UNLOCK_NEXT_COURSE | CUT_SCENE_UNLOCK_TRUE_AREA_53)
-        && coursesScreen->zonePathsUnlocked != 0) {
+    if (cutScenes & (CUT_SCENE_UNLOCK_NEXT_COURSE | CUT_SCENE_UNLOCK_TRUE_AREA_53) && coursesScreen->zonePathsUnlocked != 0) {
         coursesScreen->zonePathsUnlocked--;
     }
 
@@ -418,8 +403,7 @@ void CreateCourseSelectionScreen(u8 currentLevel, u8 maxLevel, u8 cutScenes)
         s->x = 0;
         s->y = 0;
         s->graphics.dest = VramMalloc(sZoneMapPathAssets[i][0]);
-        if ((cutScenes & (CUT_SCENE_UNLOCK_NEXT_COURSE | CUT_SCENE_UNLOCK_TRUE_AREA_53))
-            && coursesScreen->zonePathsUnlocked == i) {
+        if ((cutScenes & (CUT_SCENE_UNLOCK_NEXT_COURSE | CUT_SCENE_UNLOCK_TRUE_AREA_53)) && coursesScreen->zonePathsUnlocked == i) {
             s->graphics.anim = sZoneMapPathAnimatedAssets[i][1];
             s->variant = sZoneMapPathAnimatedAssets[i][2];
         } else {
@@ -556,10 +540,8 @@ static void Task_FadeInIntro(void)
     // Wait for fade
     if (UpdateScreenFade(&coursesScreen->fade) == SCREEN_FADE_COMPLETE) {
         if (coursesScreen->cameraScrollX == MAX_CAMERA_SCROLL_X
-            || coursesScreen->cameraScrollX
-                >= coursesScreen->avatarTargetX - (CAMERA_FOV_WIDTH / 2)) {
-            coursesScreen->cameraScrollX
-                = coursesScreen->avatarTargetX - (CAMERA_FOV_WIDTH / 2);
+            || coursesScreen->cameraScrollX >= coursesScreen->avatarTargetX - (CAMERA_FOV_WIDTH / 2)) {
+            coursesScreen->cameraScrollX = coursesScreen->avatarTargetX - (CAMERA_FOV_WIDTH / 2);
 
             if ((coursesScreen->cutScenes & 4) && IS_SINGLE_PLAYER) {
                 coursesScreen->currentCourse++;
@@ -570,10 +552,8 @@ static void Task_FadeInIntro(void)
         }
     }
 
-    if (coursesScreen->cameraScrollX
-        >= coursesScreen->avatarTargetX - (CAMERA_FOV_WIDTH / 2)) {
-        coursesScreen->cameraScrollX
-            = coursesScreen->avatarTargetX - (CAMERA_FOV_WIDTH / 2);
+    if (coursesScreen->cameraScrollX >= coursesScreen->avatarTargetX - (CAMERA_FOV_WIDTH / 2)) {
+        coursesScreen->cameraScrollX = coursesScreen->avatarTargetX - (CAMERA_FOV_WIDTH / 2);
         if (coursesScreen->cameraScrollX < 0) {
             coursesScreen->cameraScrollX = 0;
         }
@@ -592,22 +572,15 @@ static void Task_FadeInIntroAndStartUnlockCutScene(void)
     if (UpdateScreenFade(&coursesScreen->fade) == SCREEN_FADE_COMPLETE) {
         if (coursesScreen->cameraScrollX == MAX_CAMERA_SCROLL_X
             || coursesScreen->cameraScrollX
-                >= ((sZoneMapCourseXPositions[coursesScreen->unlockedCourse]
-                     * UNITS_PER_PIXEL)
-                    - (CAMERA_FOV_WIDTH / 2))) {
+                >= ((sZoneMapCourseXPositions[coursesScreen->unlockedCourse] * UNITS_PER_PIXEL) - (CAMERA_FOV_WIDTH / 2))) {
             coursesScreen->cameraScrollX
-                = (sZoneMapCourseXPositions[coursesScreen->unlockedCourse]
-                   * UNITS_PER_PIXEL)
-                - (CAMERA_FOV_WIDTH / 2);
+                = (sZoneMapCourseXPositions[coursesScreen->unlockedCourse] * UNITS_PER_PIXEL) - (CAMERA_FOV_WIDTH / 2);
             m4aSongNumStart(SE_MAP_214);
             gCurTask->main = Task_UnlockCutSceneNewPathAnim;
         }
     }
 
-    SetCameraScrollX(
-        coursesScreen,
-        (sZoneMapCourseXPositions[coursesScreen->unlockedCourse] * UNITS_PER_PIXEL)
-            - (CAMERA_FOV_WIDTH / 2));
+    SetCameraScrollX(coursesScreen, (sZoneMapCourseXPositions[coursesScreen->unlockedCourse] * UNITS_PER_PIXEL) - (CAMERA_FOV_WIDTH / 2));
     Render(coursesScreen);
 }
 
@@ -636,10 +609,8 @@ static void Task_UnlockCutSceneScrollAnim(void)
     SetCameraScrollX(coursesScreen, coursesScreen->cameraScrollX - CAM_MAX_X_SPEED);
 
     if (coursesScreen->cameraScrollX == MIN_CAMERA_SCROLL_X
-        || coursesScreen->cameraScrollX
-            <= coursesScreen->avatarTargetX - (CAMERA_FOV_WIDTH / 2)) {
-        coursesScreen->cameraScrollX
-            = coursesScreen->avatarTargetX - (CAMERA_FOV_WIDTH / 2);
+        || coursesScreen->cameraScrollX <= coursesScreen->avatarTargetX - (CAMERA_FOV_WIDTH / 2)) {
+        coursesScreen->cameraScrollX = coursesScreen->avatarTargetX - (CAMERA_FOV_WIDTH / 2);
 
         if (coursesScreen->cutScenes & CUT_SCENE_UNLOCK_NEXT_COURSE) {
             if (coursesScreen->currentCourse < coursesScreen->maxCourse) {
@@ -649,8 +620,7 @@ static void Task_UnlockCutSceneScrollAnim(void)
             m4aSongNumStart(SE_MAP_MOVE);
             gCurTask->main = Task_UnlockCutSceneScrollToNextCourseAnim;
         } else {
-            if (coursesScreen->maxCourse
-                == COURSE_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53) + 1) {
+            if (coursesScreen->maxCourse == COURSE_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53) + 1) {
                 Sprite *s;
 
                 coursesScreen->maxCourse = COURSE_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53);
@@ -661,10 +631,8 @@ static void Task_UnlockCutSceneScrollAnim(void)
             gCurTask->main = Task_CourseSelectMain;
         }
 
-        if (coursesScreen->cameraScrollX
-            <= coursesScreen->avatarTargetX - (CAMERA_FOV_WIDTH / 2)) {
-            coursesScreen->cameraScrollX
-                = coursesScreen->avatarTargetX - (CAMERA_FOV_WIDTH / 2);
+        if (coursesScreen->cameraScrollX <= coursesScreen->avatarTargetX - (CAMERA_FOV_WIDTH / 2)) {
+            coursesScreen->cameraScrollX = coursesScreen->avatarTargetX - (CAMERA_FOV_WIDTH / 2);
             if (coursesScreen->cameraScrollX < 0) {
                 coursesScreen->cameraScrollX = 0;
             }
@@ -726,8 +694,7 @@ static void Task_CourseSelectMain(void)
                 m4aSongNumStart(SE_MAP_MOVE);
                 gCurTask->main = Task_ScrollToNextLevelAnim;
             }
-        } else if (!(gInput & (DPAD_RIGHT | DPAD_LEFT)) && (gPressedKeys & A_BUTTON)
-                   && IS_SINGLE_PLAYER) {
+        } else if (!(gInput & (DPAD_RIGHT | DPAD_LEFT)) && (gPressedKeys & A_BUTTON) && IS_SINGLE_PLAYER) {
             fade->window = SCREEN_FADE_USE_WINDOW_0;
             fade->brightness = 0;
             fade->flags = SCREEN_FADE_FLAG_LIGHTEN;
@@ -766,8 +733,7 @@ static void Task_CourseSelectMain(void)
         send->pat1.unk4 = TO_SCREEN_COORD(coursesScreen->avatarTargetX);
         send->pat1.unk3 = TO_SCREEN_COORD(coursesScreen->avatarTargetY);
 
-        if (gMultiSioStatusFlags & MULTI_SIO_PARENT
-            && (gPressedKeys & A_BUTTON || coursesScreen->levelChosen)
+        if (gMultiSioStatusFlags & MULTI_SIO_PARENT && (gPressedKeys & A_BUTTON || coursesScreen->levelChosen)
             && !(gRepeatedKeys & (DPAD_LEFT | DPAD_RIGHT))) {
             coursesScreen->levelChosen = TRUE;
             send->pat1.unk0 = 0x4051;
@@ -786,8 +752,7 @@ static void Task_CourseSelectMain(void)
         }
     }
 
-    SetCameraScrollX(coursesScreen,
-                     coursesScreen->avatarTargetX - (CAMERA_FOV_WIDTH / 2));
+    SetCameraScrollX(coursesScreen, coursesScreen->avatarTargetX - (CAMERA_FOV_WIDTH / 2));
     Render(coursesScreen);
 }
 
@@ -800,24 +765,17 @@ static void Task_ScrollToPreviousLevelAnim(void)
 
     ScrollInZoneName(zoneName, 16);
 
-    coursesScreen->avatarTargetX
-        += gSineTable[sZoneMapPathReverseAngles[coursesScreen->currentCourse] + 0x100]
-        >> 5;
-    coursesScreen->avatarTargetY
-        += gSineTable[sZoneMapPathReverseAngles[coursesScreen->currentCourse]] >> 5;
+    coursesScreen->avatarTargetX += gSineTable[sZoneMapPathReverseAngles[coursesScreen->currentCourse] + 0x100] >> 5;
+    coursesScreen->avatarTargetY += gSineTable[sZoneMapPathReverseAngles[coursesScreen->currentCourse]] >> 5;
 
-    if (coursesScreen->avatarTargetX
-        < (sZoneMapCameraTargets[coursesScreen->currentCourse][0] * UNITS_PER_PIXEL)) {
-        coursesScreen->avatarTargetX
-            = sZoneMapCameraTargets[coursesScreen->currentCourse][0] * UNITS_PER_PIXEL;
-        coursesScreen->avatarTargetY
-            = sZoneMapCameraTargets[coursesScreen->currentCourse][1] * UNITS_PER_PIXEL;
+    if (coursesScreen->avatarTargetX < (sZoneMapCameraTargets[coursesScreen->currentCourse][0] * UNITS_PER_PIXEL)) {
+        coursesScreen->avatarTargetX = sZoneMapCameraTargets[coursesScreen->currentCourse][0] * UNITS_PER_PIXEL;
+        coursesScreen->avatarTargetY = sZoneMapCameraTargets[coursesScreen->currentCourse][1] * UNITS_PER_PIXEL;
         m4aSongNumStart(SE_MAP_MOVE_END);
         gCurTask->main = Task_DisplayZoneNameAnim;
     }
 
-    SetCameraScrollX(coursesScreen,
-                     coursesScreen->avatarTargetX - (CAMERA_FOV_WIDTH / 2));
+    SetCameraScrollX(coursesScreen, coursesScreen->avatarTargetX - (CAMERA_FOV_WIDTH / 2));
 
     if (gInput & A_BUTTON) {
         coursesScreen->levelChosen = TRUE;
@@ -846,24 +804,17 @@ static void Task_ScrollToNextLevelAnim(void)
 
     ScrollInZoneName(zoneName, 16);
 
-    coursesScreen->avatarTargetX
-        += gSineTable[sZoneMapPathForwardAngles[coursesScreen->currentCourse] + 0x100]
-        >> 5;
-    coursesScreen->avatarTargetY
-        += gSineTable[sZoneMapPathForwardAngles[coursesScreen->currentCourse]] >> 5;
+    coursesScreen->avatarTargetX += gSineTable[sZoneMapPathForwardAngles[coursesScreen->currentCourse] + 0x100] >> 5;
+    coursesScreen->avatarTargetY += gSineTable[sZoneMapPathForwardAngles[coursesScreen->currentCourse]] >> 5;
 
-    if (coursesScreen->avatarTargetX
-        > (sZoneMapCameraTargets[coursesScreen->currentCourse][0] * UNITS_PER_PIXEL)) {
-        coursesScreen->avatarTargetX
-            = sZoneMapCameraTargets[coursesScreen->currentCourse][0] * UNITS_PER_PIXEL;
-        coursesScreen->avatarTargetY
-            = sZoneMapCameraTargets[coursesScreen->currentCourse][1] * UNITS_PER_PIXEL;
+    if (coursesScreen->avatarTargetX > (sZoneMapCameraTargets[coursesScreen->currentCourse][0] * UNITS_PER_PIXEL)) {
+        coursesScreen->avatarTargetX = sZoneMapCameraTargets[coursesScreen->currentCourse][0] * UNITS_PER_PIXEL;
+        coursesScreen->avatarTargetY = sZoneMapCameraTargets[coursesScreen->currentCourse][1] * UNITS_PER_PIXEL;
         m4aSongNumStart(SE_MAP_MOVE_END);
         gCurTask->main = Task_DisplayZoneNameAnim;
     }
 
-    SetCameraScrollX(coursesScreen,
-                     coursesScreen->avatarTargetX - (CAMERA_FOV_WIDTH / 2));
+    SetCameraScrollX(coursesScreen, coursesScreen->avatarTargetX - (CAMERA_FOV_WIDTH / 2));
 
     if (gInput & A_BUTTON) {
         coursesScreen->levelChosen = TRUE;
@@ -907,24 +858,17 @@ static void Task_UnlockCutSceneScrollToNextCourseAnim(void)
 
     ScrollInZoneName(zoneName, 16);
 
-    coursesScreen->avatarTargetX
-        += gSineTable[sZoneMapPathForwardAngles[coursesScreen->currentCourse] + 0x100]
-        >> 6;
-    coursesScreen->avatarTargetY
-        += gSineTable[sZoneMapPathForwardAngles[coursesScreen->currentCourse]] >> 6;
+    coursesScreen->avatarTargetX += gSineTable[sZoneMapPathForwardAngles[coursesScreen->currentCourse] + 0x100] >> 6;
+    coursesScreen->avatarTargetY += gSineTable[sZoneMapPathForwardAngles[coursesScreen->currentCourse]] >> 6;
 
-    if (coursesScreen->avatarTargetX
-        > (sZoneMapCameraTargets[coursesScreen->currentCourse][0] * UNITS_PER_PIXEL)) {
-        coursesScreen->avatarTargetX
-            = sZoneMapCameraTargets[coursesScreen->currentCourse][0] * UNITS_PER_PIXEL;
-        coursesScreen->avatarTargetY
-            = sZoneMapCameraTargets[coursesScreen->currentCourse][1] * UNITS_PER_PIXEL;
+    if (coursesScreen->avatarTargetX > (sZoneMapCameraTargets[coursesScreen->currentCourse][0] * UNITS_PER_PIXEL)) {
+        coursesScreen->avatarTargetX = sZoneMapCameraTargets[coursesScreen->currentCourse][0] * UNITS_PER_PIXEL;
+        coursesScreen->avatarTargetY = sZoneMapCameraTargets[coursesScreen->currentCourse][1] * UNITS_PER_PIXEL;
         m4aSongNumStart(SE_MAP_MOVE_END);
         gCurTask->main = Task_UnlockCutSceneNextCoursePause;
     }
 
-    SetCameraScrollX(coursesScreen,
-                     coursesScreen->avatarTargetX - (CAMERA_FOV_WIDTH / 2));
+    SetCameraScrollX(coursesScreen, coursesScreen->avatarTargetX - (CAMERA_FOV_WIDTH / 2));
     Render(coursesScreen);
 }
 
@@ -956,16 +900,14 @@ static bool8 AnimateNewZonePath(struct CourseSelectionScreen *coursesScreen)
 
     for (i = 0; i < coursesScreen->zonePathsUnlocked; i++) {
         s = &coursesScreen->mapPaths[i];
-        s->x = sZoneMapPathPositions[i][0]
-            - TO_SCREEN_COORD(coursesScreen->cameraScrollX);
+        s->x = sZoneMapPathPositions[i][0] - TO_SCREEN_COORD(coursesScreen->cameraScrollX);
         s->y = sZoneMapPathPositions[i][1];
         UpdateSpriteAnimation(s);
         DisplaySprite(s);
     }
 
     s = &coursesScreen->mapPaths[coursesScreen->zonePathsUnlocked];
-    s->x = sZoneMapPathPositions[coursesScreen->zonePathsUnlocked][0]
-        - TO_SCREEN_COORD(coursesScreen->cameraScrollX);
+    s->x = sZoneMapPathPositions[coursesScreen->zonePathsUnlocked][0] - TO_SCREEN_COORD(coursesScreen->cameraScrollX);
     s->y = sZoneMapPathPositions[coursesScreen->zonePathsUnlocked][1];
     animDone = UpdateSpriteAnimation(s) == 0;
     DisplaySprite(s);
@@ -987,8 +929,7 @@ static void RenderUI(struct CourseSelectionScreen *coursesScreen)
     }
 
     s = &coursesScreen->playerAvatar;
-    s->x = TO_SCREEN_COORD(coursesScreen->avatarTargetX - coursesScreen->cameraScrollX)
-        + 5;
+    s->x = TO_SCREEN_COORD(coursesScreen->avatarTargetX - coursesScreen->cameraScrollX) + 5;
     s->y = TO_SCREEN_COORD(coursesScreen->avatarTargetY) + 6;
     DisplaySprite(s);
 
@@ -1020,8 +961,7 @@ static void RenderUI(struct CourseSelectionScreen *coursesScreen)
     somethinga++;
     somethinga--;
 #endif
-    s->graphics.anim
-        = sZoneNameAssets[coursesScreen->currentCourse + (somethinga * 16)][0];
+    s->graphics.anim = sZoneNameAssets[coursesScreen->currentCourse + (somethinga * 16)][0];
     s->variant = sZoneNameAssets[coursesScreen->currentCourse + (somethinga * 16)][1];
     s->prevVariant = -1;
     UpdateSpriteAnimation(s);
@@ -1129,8 +1069,7 @@ static void Task_FadeOutAndExitToCharacterSelect(void)
 
     if (UpdateScreenFade(&coursesScreen->fade) == SCREEN_FADE_COMPLETE) {
         DestroyUI(coursesScreen);
-        CreateCharacterSelectionScreen(gSelectedCharacter,
-                                       gLoadedSaveGame->unlockedCharacters & 0x10);
+        CreateCharacterSelectionScreen(gSelectedCharacter, gLoadedSaveGame->unlockedCharacters & 0x10);
         TaskDestroy(gCurTask);
         return;
     }
@@ -1144,8 +1083,7 @@ static void RenderZoneMapPathsAndUI(struct CourseSelectionScreen *coursesScreen)
 
     for (i = 0; i < coursesScreen->zonePathsUnlocked; i++) {
         s = &coursesScreen->mapPaths[i];
-        s->x = sZoneMapPathPositions[i][0]
-            - TO_SCREEN_COORD(coursesScreen->cameraScrollX);
+        s->x = sZoneMapPathPositions[i][0] - TO_SCREEN_COORD(coursesScreen->cameraScrollX);
         s->y = sZoneMapPathPositions[i][1];
         UpdateSpriteAnimation(s);
         DisplaySprite(s);
diff --git a/src/game/cutscenes/credits.c b/src/game/cutscenes/credits.c
index edcdda50e..6726e3be9 100644
--- a/src/game/cutscenes/credits.c
+++ b/src/game/cutscenes/credits.c
@@ -48,8 +48,7 @@ static const u16 gUnknown_080E1244[] = {
     TM_STORYFRAME_CREAM_CHEESE_VANILLA_HAPPY,
 };
 
-UNUSED static const u16 gUnknown_080E124E[]
-    = { 56, 0, 828, 0, 78, 0, 828, 1, 60, 0, 828, 2, 96, 0, 828, 3 };
+UNUSED static const u16 gUnknown_080E124E[] = { 56, 0, 828, 0, 78, 0, 828, 1, 60, 0, 828, 2, 96, 0, 828, 3 };
 
 void CreateCreditsCutScene(u8 creditsVariant, u8 b, u8 c)
 {
@@ -68,8 +67,7 @@ void CreateCreditsCutScene(u8 creditsVariant, u8 b, u8 c)
     gUnknown_03002280[0][2] = 0xff;
     gUnknown_03002280[0][3] = 0x20;
 
-    t = TaskCreate(sub_808EBC4, sizeof(struct CreditsCutScene), 0x3100, 0,
-                   TaskDestroy_CreditsCutScene);
+    t = TaskCreate(sub_808EBC4, sizeof(struct CreditsCutScene), 0x3100, 0, TaskDestroy_CreditsCutScene);
 
     // BUG: assigning to null pointer
     scene->unk52 = 0;
@@ -86,11 +84,9 @@ void CreateCreditsCutScene(u8 creditsVariant, u8 b, u8 c)
         scene->unk50 = 0;
     }
 
-    if ((scene->variant == CREDITS_VARIANT_FINAL_ENDING
-         && gLoadedSaveGame->completedCharacters[CHARACTER_AMY])) {
+    if ((scene->variant == CREDITS_VARIANT_FINAL_ENDING && gLoadedSaveGame->completedCharacters[CHARACTER_AMY])) {
         scene->unk4D = 1;
-    } else if (scene->variant == CREDITS_VARIANT_EXTRA_ENDING
-               && gLoadedSaveGame->extraEndingCreditsPlayed) {
+    } else if (scene->variant == CREDITS_VARIANT_EXTRA_ENDING && gLoadedSaveGame->extraEndingCreditsPlayed) {
         scene->unk4D = 2;
     } else {
         scene->unk4D = 0;
diff --git a/src/game/cutscenes/credits_end.c b/src/game/cutscenes/credits_end.c
index 9f923b348..4b61a33df 100644
--- a/src/game/cutscenes/credits_end.c
+++ b/src/game/cutscenes/credits_end.c
@@ -56,14 +56,11 @@ static void Task_SequenceEnd(void);
 static void Task_FadeIn(void);
 
 static const u16 sTilemapsCreditsEndSlides[] = {
-    [0] = TM_CREDITS_SA2_LOGO_JP,         [1] = TM_CREDITS_SA2_LOGO_EN,
-    [2] = TM_STORYFRAME_SONIC_LEAVES_0,   [3] = TM_STORYFRAME_SONIC_LEAVES_1,
-    [4] = TM_STORYFRAME_SONIC_LEAVES_2,   [5] = TM_STORYFRAME_SONIC_LEAVES_3,
-    [6] = TM_STORYFRAME_SONIC_LEAVES_4,   [7] = TM_STORYFRAME_SONIC_LEAVES_5,
-    [8] = TM_STORYFRAME_SONIC_LEAVES_6,   [9] = TM_STORYFRAME_SONIC_LEAVES_7,
-    [10] = TM_STORYFRAME_SONIC_LEAVES_8,  [11] = TM_STORYFRAME_SONIC_LEAVES_9,
-    [12] = TM_STORYFRAME_SONIC_LEAVES_10, [13] = TM_CREDITS_PRESENTED_BY_SEGA,
-    [14] = TM_CREDITS_COPYRIGHT,
+    [0] = TM_CREDITS_SA2_LOGO_JP,         [1] = TM_CREDITS_SA2_LOGO_EN,        [2] = TM_STORYFRAME_SONIC_LEAVES_0,
+    [3] = TM_STORYFRAME_SONIC_LEAVES_1,   [4] = TM_STORYFRAME_SONIC_LEAVES_2,  [5] = TM_STORYFRAME_SONIC_LEAVES_3,
+    [6] = TM_STORYFRAME_SONIC_LEAVES_4,   [7] = TM_STORYFRAME_SONIC_LEAVES_5,  [8] = TM_STORYFRAME_SONIC_LEAVES_6,
+    [9] = TM_STORYFRAME_SONIC_LEAVES_7,   [10] = TM_STORYFRAME_SONIC_LEAVES_8, [11] = TM_STORYFRAME_SONIC_LEAVES_9,
+    [12] = TM_STORYFRAME_SONIC_LEAVES_10, [13] = TM_CREDITS_PRESENTED_BY_SEGA, [14] = TM_CREDITS_COPYRIGHT,
 };
 
 static const TileInfo gUnknown_080E12D0[4] = {
@@ -115,8 +112,7 @@ void CreateCreditsEndCutScene(u8 creditsVariant)
     gUnknown_03002280[1][2] = 0xff;
     gUnknown_03002280[1][3] = 0x20;
 
-    t = TaskCreate(Task_FadeIn, sizeof(struct CreditsEndCutScene), 0x3100, 0,
-                   TaskDestroy_CreditsEndCutScene);
+    t = TaskCreate(Task_FadeIn, sizeof(struct CreditsEndCutScene), 0x3100, 0, TaskDestroy_CreditsEndCutScene);
     scene = TASK_DATA(t);
     scene->delayFrames = 270;
     scene->creditsVariant = creditsVariant;
@@ -386,8 +382,7 @@ static void Task_SequenceMain(void)
                 gBgScrollRegs[0][0] = 0;
                 gBgScrollRegs[0][1] = 0;
 
-                background->tilemapId
-                    = sTilemapsCreditsEndSlides[scene->sonicAnimFrame + 2];
+                background->tilemapId = sTilemapsCreditsEndSlides[scene->sonicAnimFrame + 2];
                 background->targetTilesX = 0x1E;
                 background->targetTilesY = 0x14;
                 background->flags = BACKGROUND_FLAGS_BG_ID(0);
@@ -437,24 +432,21 @@ static void Task_HandleGameCompletion(void)
         }
 
         for (i = 0; i < NUM_CHARACTERS; i++) {
-            if (gLoadedSaveGame->unlockedLevels[i]
-                > LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE)) {
+            if (gLoadedSaveGame->unlockedLevels[i] > LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE)) {
                 zonesCompleteCharacters |= CHARACTER_BIT(i);
             }
         }
 
         // sonic, cream, tails, knuckles, all completed, and all chaos emeralds
         // unlock true area 53.
-        if (zonesCompleteCharacters >= MAIN_CHARACTERS
-            && (gLoadedSaveGame->chaosEmeralds[0] & CHAOS_EMERALDS_COMPLETED)
+        if (zonesCompleteCharacters >= MAIN_CHARACTERS && (gLoadedSaveGame->chaosEmeralds[0] & CHAOS_EMERALDS_COMPLETED)
             && gLoadedSaveGame->extraZoneStatus == 0) {
             gLoadedSaveGame->extraZoneStatus |= 1;
             WriteSaveGame();
         }
 
         if (gSelectedCharacter != CHARACTER_AMY) {
-            if ((gLoadedSaveGame->chaosEmeralds[gSelectedCharacter]
-                 & CHAOS_EMERALDS_COMPLETED)) {
+            if ((gLoadedSaveGame->chaosEmeralds[gSelectedCharacter] & CHAOS_EMERALDS_COMPLETED)) {
                 gLoadedSaveGame->completedCharacters[gSelectedCharacter] = TRUE;
 
                 for (i = 0; i < 4; i++) {
@@ -465,10 +457,8 @@ static void Task_HandleGameCompletion(void)
 
                 if ((charactersCompleted == 1 && gLoadedSaveGame->chaoGardenUnlocked)
                     || (charactersCompleted == 2 && gLoadedSaveGame->soundTestUnlocked)
-                    || (charactersCompleted == 3
-                        && gLoadedSaveGame->bossTimeAttackUnlocked)
-                    || (charactersCompleted >= 4
-                        && gLoadedSaveGame->unlockedCharacters > MAIN_CHARACTERS)) {
+                    || (charactersCompleted == 3 && gLoadedSaveGame->bossTimeAttackUnlocked)
+                    || (charactersCompleted >= 4 && gLoadedSaveGame->unlockedCharacters > MAIN_CHARACTERS)) {
                     scene->hasAllEmeralds = TRUE;
                     scene->delayFrames = 180;
                 } else {
@@ -479,19 +469,16 @@ static void Task_HandleGameCompletion(void)
                     } else if (charactersCompleted == 3) {
                         gLoadedSaveGame->bossTimeAttackUnlocked = TRUE;
                     } else if (charactersCompleted == 4) {
-                        gLoadedSaveGame->unlockedCharacters
-                            |= CHARACTER_BIT(CHARACTER_AMY);
+                        gLoadedSaveGame->unlockedCharacters |= CHARACTER_BIT(CHARACTER_AMY);
                     }
                     WriteSaveGame();
                     scene->hasAllEmeralds = FALSE;
                     scene->delayFrames = 105;
-                    scene->fade.bldCnt
-                        = (BLDCNT_EFFECT_DARKEN | BLDCNT_TGT1_ALL | BLDCNT_TGT2_ALL);
+                    scene->fade.bldCnt = (BLDCNT_EFFECT_DARKEN | BLDCNT_TGT1_ALL | BLDCNT_TGT2_ALL);
                 }
             } else {
                 scene->hasAllEmeralds = FALSE;
-                scene->fade.bldCnt
-                    = (BLDCNT_EFFECT_DARKEN | BLDCNT_TGT1_ALL | BLDCNT_TGT2_ALL);
+                scene->fade.bldCnt = (BLDCNT_EFFECT_DARKEN | BLDCNT_TGT1_ALL | BLDCNT_TGT2_ALL);
                 scene->delayFrames = 105;
             }
         } else {
diff --git a/src/game/cutscenes/credits_slides.c b/src/game/cutscenes/credits_slides.c
index d32554762..cb172a6c3 100644
--- a/src/game/cutscenes/credits_slides.c
+++ b/src/game/cutscenes/credits_slides.c
@@ -32,11 +32,9 @@ void sub_808F004(void);
 void sub_808F148(struct Task *);
 
 static const u16 sTilemapsCreditsSlides[] = {
-    TM_CREDITS_0,  TM_CREDITS_1,  TM_CREDITS_2,  TM_CREDITS_3,  TM_CREDITS_4,
-    TM_CREDITS_5,  TM_CREDITS_6,  TM_CREDITS_7,  TM_CREDITS_8,  TM_CREDITS_9,
-    TM_CREDITS_10, TM_CREDITS_11, TM_CREDITS_12, TM_CREDITS_13, TM_CREDITS_14,
-    TM_CREDITS_15, TM_CREDITS_16, TM_CREDITS_17, TM_CREDITS_18, TM_CREDITS_19,
-    TM_CREDITS_20, TM_CREDITS_21, TM_CREDITS_22, TM_CREDITS_23, TM_CREDITS_24,
+    TM_CREDITS_0,  TM_CREDITS_1,  TM_CREDITS_2,  TM_CREDITS_3,  TM_CREDITS_4,  TM_CREDITS_5,  TM_CREDITS_6,  TM_CREDITS_7,  TM_CREDITS_8,
+    TM_CREDITS_9,  TM_CREDITS_10, TM_CREDITS_11, TM_CREDITS_12, TM_CREDITS_13, TM_CREDITS_14, TM_CREDITS_15, TM_CREDITS_16, TM_CREDITS_17,
+    TM_CREDITS_18, TM_CREDITS_19, TM_CREDITS_20, TM_CREDITS_21, TM_CREDITS_22, TM_CREDITS_23, TM_CREDITS_24,
 };
 
 static const u8 gUnknown_080E12AA[] = { 6, 6, 8, 5, 0, 0 };
@@ -68,11 +66,9 @@ void CreateCreditsSlidesCutScene(u8 creditsVariant, u8 b, u8 c)
     scene->unk54 = 0x96;
     scene->unk50 = 0;
 
-    if (scene->creditsVariant == CREDITS_VARIANT_FINAL_ENDING
-        && gLoadedSaveGame->completedCharacters[CHARACTER_AMY]) {
+    if (scene->creditsVariant == CREDITS_VARIANT_FINAL_ENDING && gLoadedSaveGame->completedCharacters[CHARACTER_AMY]) {
         scene->unk4D = 1;
-    } else if (scene->creditsVariant == CREDITS_VARIANT_EXTRA_ENDING
-               && gLoadedSaveGame->extraEndingCreditsPlayed) {
+    } else if (scene->creditsVariant == CREDITS_VARIANT_EXTRA_ENDING && gLoadedSaveGame->extraEndingCreditsPlayed) {
         scene->unk4D = 2;
     } else {
         scene->unk4D = 0;
diff --git a/src/game/cutscenes/endings.c b/src/game/cutscenes/endings.c
index f8ae8c7c2..202a10296 100644
--- a/src/game/cutscenes/endings.c
+++ b/src/game/cutscenes/endings.c
@@ -26,8 +26,7 @@ void sub_808E9F8(struct Task *);
 
 void StartEndingCutscenes(void)
 {
-    struct Task *t = TaskCreate(sub_808E9AC, sizeof(struct EndingCutSceneTransition),
-                                0x3100, 0, sub_808E9F8);
+    struct Task *t = TaskCreate(sub_808E9AC, sizeof(struct EndingCutSceneTransition), 0x3100, 0, sub_808E9F8);
     struct EndingCutSceneTransition *fade = TASK_DATA(t);
 
     fade->unk6C = 0;
@@ -87,8 +86,7 @@ void sub_808E9F8(UNUSED struct Task *t)
 UNUSED void sub_808E9FC(void)
 {
     struct EndingCutSceneTransition *fade = TASK_DATA(gCurTask);
-    if (gLoadedSaveGame->unlockedLevels[gSelectedCharacter]
-        > (LEVEL_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53))) {
+    if (gLoadedSaveGame->unlockedLevels[gSelectedCharacter] > (LEVEL_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53))) {
         fade->unk6D = 2;
     } else {
         fade->unk6D = 1;
diff --git a/src/game/cutscenes/extra_ending_fall.c b/src/game/cutscenes/extra_ending_fall.c
index de46493c6..61c204fb7 100644
--- a/src/game/cutscenes/extra_ending_fall.c
+++ b/src/game/cutscenes/extra_ending_fall.c
@@ -69,28 +69,23 @@ void sub_8090480(void);
 void sub_8091480(struct Task *);
 
 static const TileInfo gUnknown_080E12FC[] = {
-    { 24, 818, 0 }, { 30, 819, 0 }, { 35, 822, 0 }, { 80, 824, 3 }, { 30, 824, 2 },
-    { 21, 824, 1 }, { 10, 824, 0 }, { 4, 821, 0 },  { 35, 820, 0 }, { 15, 823, 0 },
-    { 42, 791, 0 }, { 42, 791, 1 }, { 64, 791, 2 }, { 15, 792, 0 }, { 6, 793, 0 },
-    { 6, 794, 0 },  { 15, 795, 0 }, { 6, 796, 0 },  { 6, 797, 0 },  { 4, 798, 0 },
-    { 24, 799, 0 }, { 42, 822, 1 },
+    { 24, 818, 0 }, { 30, 819, 0 }, { 35, 822, 0 }, { 80, 824, 3 }, { 30, 824, 2 }, { 21, 824, 1 }, { 10, 824, 0 }, { 4, 821, 0 },
+    { 35, 820, 0 }, { 15, 823, 0 }, { 42, 791, 0 }, { 42, 791, 1 }, { 64, 791, 2 }, { 15, 792, 0 }, { 6, 793, 0 },  { 6, 794, 0 },
+    { 15, 795, 0 }, { 6, 796, 0 },  { 6, 797, 0 },  { 4, 798, 0 },  { 24, 799, 0 }, { 42, 822, 1 },
 };
 
 static const u32 gUnknown_080E13AC[12][3] = {
-    { 110, 90, 704 }, { 110, 75, 448 }, { 125, 98, 640 }, { 130, 80, 768 },
-    { 128, 82, 512 }, { 132, 85, 480 }, { 130, 70, 320 }, { 135, 76, 640 },
-    { 130, 63, 448 }, { 135, 71, 480 }, { 130, 68, 404 }, { 125, 87, 768 },
+    { 110, 90, 704 }, { 110, 75, 448 }, { 125, 98, 640 }, { 130, 80, 768 }, { 128, 82, 512 }, { 132, 85, 480 },
+    { 130, 70, 320 }, { 135, 76, 640 }, { 130, 63, 448 }, { 135, 71, 480 }, { 130, 68, 404 }, { 125, 87, 768 },
 };
 
 static const u32 gUnknown_080E143C[6][3] = {
-    { 120, 80, 704 }, { 120, 80, 448 }, { 120, 80, 640 },
-    { 120, 80, 768 }, { 120, 80, 512 }, { 120, 80, 480 },
+    { 120, 80, 704 }, { 120, 80, 448 }, { 120, 80, 640 }, { 120, 80, 768 }, { 120, 80, 512 }, { 120, 80, 480 },
 };
 
 static const u32 gUnknown_080E1484[12][3] = {
-    { 110, 80, 3 }, { 115, 80, 3 }, { 120, 80, 2 }, { 125, 80, 3 },
-    { 130, 80, 2 }, { 135, 80, 3 }, { 140, 80, 2 }, { 135, 80, 5 },
-    { 130, 80, 4 }, { 125, 80, 3 }, { 120, 80, 4 }, { 115, 80, 2 },
+    { 110, 80, 3 }, { 115, 80, 3 }, { 120, 80, 2 }, { 125, 80, 3 }, { 130, 80, 2 }, { 135, 80, 3 },
+    { 140, 80, 2 }, { 135, 80, 5 }, { 130, 80, 4 }, { 125, 80, 3 }, { 120, 80, 4 }, { 115, 80, 2 },
 };
 
 static const u16 gUnknown_080E1514[14] = {
@@ -105,8 +100,7 @@ static const u8 gUnknown_080E154A[] = {
 };
 
 UNUSED static const u32 gUnknown_080E155C[] = {
-    32,  128,     112,    640,     192,    768,    896,    288,    736,    608,
-    448, 1310735, 327690, 1310770, 655440, 327780, 655490, 983240, 524518,
+    32, 128, 112, 640, 192, 768, 896, 288, 736, 608, 448, 1310735, 327690, 1310770, 655440, 327780, 655490, 983240, 524518,
 };
 static const u32 gUnknown_080E15A8[8] = {
     512, 256, 128, 64, 640, 192, 96, 32,
@@ -115,20 +109,16 @@ static const u32 gUnknown_080E15A8[8] = {
 // TODO: extract these palettes?
 static const u8 gUnknown_080E15C8[][0x20] = {
     {
-        96,  110, 127, 1,  94,  2,  215, 1, 85,  0, 68, 8,   255, 127, 8,   33,
-        123, 111, 16,  66, 214, 90, 191, 3, 255, 2, 57, 103, 115, 78,  140, 49,
+        96, 110, 127, 1, 94, 2, 215, 1, 85, 0, 68, 8, 255, 127, 8, 33, 123, 111, 16, 66, 214, 90, 191, 3, 255, 2, 57, 103, 115, 78, 140, 49,
     },
     {
-        96, 110, 63,  1,  31,  2,  157, 1, 27,  0, 10,  0,  191, 115, 206, 20,
-        63, 99,  214, 53, 156, 78, 127, 3, 191, 2, 255, 90, 57,  66,  82,  37,
+        96, 110, 63, 1, 31, 2, 157, 1, 27, 0, 10, 0, 191, 115, 206, 20, 63, 99, 214, 53, 156, 78, 127, 3, 191, 2, 255, 90, 57, 66, 82, 37,
     },
     {
-        96,  110, 255, 0,  223, 1,  95, 1, 31,  0, 16,  0,  127, 103, 148, 8,
-        255, 86,  156, 41, 95,  66, 63, 3, 127, 2, 191, 78, 255, 53,  24,  25,
+        96, 110, 255, 0, 223, 1, 95, 1, 31, 0, 16, 0, 127, 103, 148, 8, 255, 86, 156, 41, 95, 66, 63, 3, 127, 2, 191, 78, 255, 53, 24, 25,
     },
     {
-        96,  110, 191, 0,  159, 1,  31,  1, 31, 0, 22,  0,  63,  91, 90,  0,
-        191, 74,  95,  29, 31,  54, 255, 2, 63, 2, 127, 66, 191, 41, 222, 12,
+        96, 110, 191, 0, 159, 1, 31, 1, 31, 0, 22, 0, 63, 91, 90, 0, 191, 74, 95, 29, 31, 54, 255, 2, 63, 2, 127, 66, 191, 41, 222, 12,
     },
 };
 
@@ -154,8 +144,7 @@ void CreateExtraEndingFallCutScene(void)
     m4aMPlayAllStop();
     m4aSongNumStart(MUS_EXTRA_ENDING);
 
-    t = TaskCreate(sub_8090480, sizeof(struct ExtraEndingCutScene), 0x3100, 0,
-                   sub_8091480);
+    t = TaskCreate(sub_8090480, sizeof(struct ExtraEndingCutScene), 0x3100, 0, sub_8091480);
     scene = TASK_DATA(t);
     scene->unk37C = 0;
     scene->unk390 = gUnknown_080E1514[0];
@@ -726,8 +715,7 @@ void sub_8090904(struct ExtraEndingCutScene *scene)
                     scene->unk47C[i][4] = 0;
                 }
 
-                scene->unk47C[i][1] = scene->unk470[1] - Q(30)
-                    + ((SIN((scene->unk47C[i][4] & 0xFF) * 4) >> 6) * 8);
+                scene->unk47C[i][1] = scene->unk470[1] - Q(30) + ((SIN((scene->unk47C[i][4] & 0xFF) * 4) >> 6) * 8);
             }
 #ifndef NON_MATCHING
             ++i;
@@ -850,11 +838,9 @@ void sub_8090F6C(struct ExtraEndingCutScene *scene)
         if (scene->unk37F != 0) {
             scene->unk37F--;
             if (scene->unk37E <= 3) {
-                DmaCopy32(3, gUnknown_080E15C8[scene->unk37E], &gObjPalette[0x30],
-                          sizeof(gUnknown_080E15C8[0]));
+                DmaCopy32(3, gUnknown_080E15C8[scene->unk37E], &gObjPalette[0x30], sizeof(gUnknown_080E15C8[0]));
             } else {
-                DmaCopy32(3, gUnknown_080E15C8[6 - scene->unk37E], &gObjPalette[0x30],
-                          sizeof(gUnknown_080E15C8[0]));
+                DmaCopy32(3, gUnknown_080E15C8[6 - scene->unk37E], &gObjPalette[0x30], sizeof(gUnknown_080E15C8[0]));
             }
         } else {
             scene->unk37E++;
diff --git a/src/game/cutscenes/extra_ending_slides.c b/src/game/cutscenes/extra_ending_slides.c
index 61ff03616..af9d0a254 100644
--- a/src/game/cutscenes/extra_ending_slides.c
+++ b/src/game/cutscenes/extra_ending_slides.c
@@ -37,8 +37,7 @@ void CreateExtraEndingSlidesCutScene(void)
     gUnknown_03002280[0][2] = 0xFF;
     gUnknown_03002280[0][3] = 0x20;
 
-    t = TaskCreate(sub_8091590, sizeof(struct ExtraEndingCutSceneSlides), 0x3100, 0,
-                   sub_8091680);
+    t = TaskCreate(sub_8091590, sizeof(struct ExtraEndingCutSceneSlides), 0x3100, 0, sub_8091680);
     scene = TASK_DATA(t);
 
     scene->unk4C = 0xF0;
diff --git a/src/game/cutscenes/final_ending_fall.c b/src/game/cutscenes/final_ending_fall.c
index 5c81971a7..614a97d37 100644
--- a/src/game/cutscenes/final_ending_fall.c
+++ b/src/game/cutscenes/final_ending_fall.c
@@ -80,12 +80,10 @@ static const u16 gUnknown_080E1648[4] = {
     TM_CUTSCENE_FINAL_ENDING_FALL_BG_DARK_2,
 };
 static const TileInfo gUnknown_080E1650[29] = {
-    { 15, 823, 0 }, { 30, 815, 0 }, { 9, 817, 0 },   { 4, 816, 0 },   { 4, 816, 1 },
-    { 0, 907, 0 },  { 0, 908, 0 },  { 104, 785, 0 }, { 104, 785, 2 }, { 80, 786, 0 },
-    { 80, 786, 2 }, { 99, 787, 0 }, { 99, 787, 2 },  { 72, 788, 0 },  { 72, 788, 2 },
-    { 56, 789, 0 }, { 56, 789, 2 }, { 48, 785, 1 },  { 48, 785, 3 },  { 80, 786, 1 },
-    { 80, 786, 3 }, { 80, 787, 1 }, { 80, 787, 3 },  { 64, 788, 1 },  { 64, 788, 3 },
-    { 42, 789, 1 }, { 42, 789, 3 }, { 30, 790, 0 },  { 30, 790, 1 },
+    { 15, 823, 0 },  { 30, 815, 0 }, { 9, 817, 0 },  { 4, 816, 0 },  { 4, 816, 1 },  { 0, 907, 0 },  { 0, 908, 0 },  { 104, 785, 0 },
+    { 104, 785, 2 }, { 80, 786, 0 }, { 80, 786, 2 }, { 99, 787, 0 }, { 99, 787, 2 }, { 72, 788, 0 }, { 72, 788, 2 }, { 56, 789, 0 },
+    { 56, 789, 2 },  { 48, 785, 1 }, { 48, 785, 3 }, { 80, 786, 1 }, { 80, 786, 3 }, { 80, 787, 1 }, { 80, 787, 3 }, { 64, 788, 1 },
+    { 64, 788, 3 },  { 42, 789, 1 }, { 42, 789, 3 }, { 30, 790, 0 }, { 30, 790, 1 },
 };
 
 static const u8 gUnknown_080E1738[] = {
@@ -100,8 +98,7 @@ static const u8 gUnknown_080E1752[0x10] = {
 };
 
 static const s16 gUnknown_080E1762[][2] = {
-    { 15, 20 }, { 10, 5 },   { 50, 20 },  { 80, 10 },
-    { 100, 5 }, { 130, 10 }, { 200, 15 }, { 230, 8 },
+    { 15, 20 }, { 10, 5 }, { 50, 20 }, { 80, 10 }, { 100, 5 }, { 130, 10 }, { 200, 15 }, { 230, 8 },
 };
 
 static const s16 gUnknown_080E1782[][2] = {
@@ -141,8 +138,7 @@ void CreateFinalEndingFallCutScene(void)
     m4aMPlayAllStop();
     m4aSongNumStart(MUS_FINAL_ENDING);
 
-    t = TaskCreate(sub_8092690, sizeof(struct FinalEndingFallCutScene), 0x3100, 0,
-                   sub_8092800);
+    t = TaskCreate(sub_8092690, sizeof(struct FinalEndingFallCutScene), 0x3100, 0, sub_8092800);
     scene = TASK_DATA(t);
 
     scene->unk35C = 0;
@@ -528,8 +524,7 @@ void sub_8091F68(struct FinalEndingFallCutScene *scene)
     }
 
     if (gBgScrollRegs[0][1] < 0x88 && scene->unk35C < 10) {
-        if (scene->unk474 > 0 && (gBgScrollRegs[1][1] & 7) == 0
-            && (scene->unk474 >> 8) > gBgScrollRegs[1][1]) {
+        if (scene->unk474 > 0 && (gBgScrollRegs[1][1] & 7) == 0 && (scene->unk474 >> 8) > gBgScrollRegs[1][1]) {
             scene->unk364++;
         }
 
diff --git a/src/game/cutscenes/final_ending_land.c b/src/game/cutscenes/final_ending_land.c
index fb8ef9748..4fe85c179 100644
--- a/src/game/cutscenes/final_ending_land.c
+++ b/src/game/cutscenes/final_ending_land.c
@@ -71,17 +71,13 @@ static const u16 gUnknown_080E179C[4] = {
 };
 
 static const TileInfo gUnknown_080E17A4[52] = {
-    { 42, 765, 0 },  { 24, 766, 0 },  { 28, 767, 0 },  { 35, 768, 0 },  { 24, 769, 0 },
-    { 16, 765, 1 },  { 16, 766, 1 },  { 24, 767, 1 },  { 16, 768, 1 },  { 16, 769, 1 },
-    { 20, 0, 0 },    { 16, 91, 0 },   { 30, 182, 0 },  { 20, 273, 0 },  { 20, 364, 0 },
-    { 30, 771, 0 },  { 20, 772, 0 },  { 30, 773, 0 },  { 24, 774, 0 },  { 24, 775, 0 },
-    { 64, 776, 0 },  { 64, 777, 0 },  { 64, 778, 0 },  { 64, 779, 0 },  { 64, 780, 0 },
-    { 168, 804, 0 }, { 140, 808, 0 }, { 210, 806, 0 }, { 192, 805, 0 }, { 176, 807, 0 },
-    { 20, 782, 0 },  { 20, 782, 1 },  { 20, 783, 0 },  { 24, 784, 0 },  { 24, 784, 1 },
-    { 16, 770, 0 },  { 4, 526, 0 },   { 4, 517, 0 },   { 4, 516, 0 },   { 4, 524, 0 },
-    { 48, 781, 0 },  { 26, 781, 1 },  { 32, 781, 2 },  { 9, 457, 0 },   { 9, 455, 0 },
-    { 9, 460, 0 },   { 9, 465, 0 },   { 9, 462, 0 },   { 9, 459, 0 },   { 30, 809, 0 },
-    { 24, 783, 1 },  { 24, 784, 2 },
+    { 42, 765, 0 }, { 24, 766, 0 },  { 28, 767, 0 },  { 35, 768, 0 },  { 24, 769, 0 },  { 16, 765, 1 },  { 16, 766, 1 }, { 24, 767, 1 },
+    { 16, 768, 1 }, { 16, 769, 1 },  { 20, 0, 0 },    { 16, 91, 0 },   { 30, 182, 0 },  { 20, 273, 0 },  { 20, 364, 0 }, { 30, 771, 0 },
+    { 20, 772, 0 }, { 30, 773, 0 },  { 24, 774, 0 },  { 24, 775, 0 },  { 64, 776, 0 },  { 64, 777, 0 },  { 64, 778, 0 }, { 64, 779, 0 },
+    { 64, 780, 0 }, { 168, 804, 0 }, { 140, 808, 0 }, { 210, 806, 0 }, { 192, 805, 0 }, { 176, 807, 0 }, { 20, 782, 0 }, { 20, 782, 1 },
+    { 20, 783, 0 }, { 24, 784, 0 },  { 24, 784, 1 },  { 16, 770, 0 },  { 4, 526, 0 },   { 4, 517, 0 },   { 4, 516, 0 },  { 4, 524, 0 },
+    { 48, 781, 0 }, { 26, 781, 1 },  { 32, 781, 2 },  { 9, 457, 0 },   { 9, 455, 0 },   { 9, 460, 0 },   { 9, 465, 0 },  { 9, 462, 0 },
+    { 9, 459, 0 },  { 30, 809, 0 },  { 24, 783, 1 },  { 24, 784, 2 },
 };
 
 static const u16 gUnknown_080E1944[][8] = {
@@ -90,18 +86,14 @@ static const u16 gUnknown_080E1944[][8] = {
 };
 
 static const u32 gUnknown_080E1964[20][5] = {
-    { 298, 96, 1, 50, 170 },   { 384, 32, 2, 180, 130 }, { 480, 64, 0, 60, 115 },
-    { 608, 32, 3, 130, 140 },  { 576, 64, 1, 190, 120 }, { 224, 64, 0, 50, 155 },
-    { 256, 128, 0, 180, 140 }, { 416, 96, 1, 80, 120 },  { 224, 32, 2, 70, 150 },
-    { 544, 96, 1, 70, 140 },   { 352, 32, 2, 50, 160 },  { 320, 96, 1, 170, 128 },
-    { 224, 32, 2, 100, 130 },  { 416, 96, 1, 160, 170 }, { 256, 32, 2, 180, 150 },
-    { 416, 96, 1, 70, 140 },   { 352, 32, 2, 50, 160 },  { 256, 96, 1, 170, 128 },
-    { 224, 32, 2, 100, 130 },  { 544, 96, 1, 160, 170 },
+    { 298, 96, 1, 50, 170 }, { 384, 32, 2, 180, 130 },  { 480, 64, 0, 60, 115 },  { 608, 32, 3, 130, 140 }, { 576, 64, 1, 190, 120 },
+    { 224, 64, 0, 50, 155 }, { 256, 128, 0, 180, 140 }, { 416, 96, 1, 80, 120 },  { 224, 32, 2, 70, 150 },  { 544, 96, 1, 70, 140 },
+    { 352, 32, 2, 50, 160 }, { 320, 96, 1, 170, 128 },  { 224, 32, 2, 100, 130 }, { 416, 96, 1, 160, 170 }, { 256, 32, 2, 180, 150 },
+    { 416, 96, 1, 70, 140 }, { 352, 32, 2, 50, 160 },   { 256, 96, 1, 170, 128 }, { 224, 32, 2, 100, 130 }, { 544, 96, 1, 160, 170 },
 };
 
 static const u16 gUnknown_080E1AF4[0x10] = {
-    992,   32400, 1022, 32494, 9081,  14133, 17136, 21128,
-    23104, 0,     0,    20478, 17328, 22327, 25329, 28298,
+    992, 32400, 1022, 32494, 9081, 14133, 17136, 21128, 23104, 0, 0, 20478, 17328, 22327, 25329, 28298,
 };
 
 static const u16 gUnknown_080E1B14[][7] = {
@@ -110,15 +102,11 @@ static const u16 gUnknown_080E1B14[][7] = {
 };
 
 static const s32 gUnknown_080E1B30[35][2] = {
-    { -2086, -3844 },  { -2086, -5244 },  { -4298, -6129 },  { -5976, -9111 },
-    { -5976, -10536 }, { -7056, -12505 }, { -7524, -13461 }, { -7524, -14975 },
-    { -7415, -16825 }, { -7415, -18194 }, { -6806, -19801 }, { -6806, -20929 },
-    { -5806, -22206 }, { -5806, -23029 }, { -4548, -23921 }, { -4548, -24399 },
-    { -3171, -24898 }, { -3171, -25025 }, { -1815, -25159 }, { -1183, -25045 },
-    { -600, -24788 },  { -77, -24406 },   { 375, -23921 },   { 752, -23355 },
-    { 1048, -22731 },  { 1260, -22073 },  { 1260, -21817 },  { 1389, -21087 },
-    { 1389, -20767 },  { 1409, -19499 },  { 1409, -18859 },  { 1152, -17816 },
-    { 1152, -16536 },  { 693, -14573 },   { 0, -12013 },
+    { -2086, -3844 },  { -2086, -5244 },  { -4298, -6129 },  { -5976, -9111 },  { -5976, -10536 }, { -7056, -12505 }, { -7524, -13461 },
+    { -7524, -14975 }, { -7415, -16825 }, { -7415, -18194 }, { -6806, -19801 }, { -6806, -20929 }, { -5806, -22206 }, { -5806, -23029 },
+    { -4548, -23921 }, { -4548, -24399 }, { -3171, -24898 }, { -3171, -25025 }, { -1815, -25159 }, { -1183, -25045 }, { -600, -24788 },
+    { -77, -24406 },   { 375, -23921 },   { 752, -23355 },   { 1048, -22731 },  { 1260, -22073 },  { 1260, -21817 },  { 1389, -21087 },
+    { 1389, -20767 },  { 1409, -19499 },  { 1409, -18859 },  { 1152, -17816 },  { 1152, -16536 },  { 693, -14573 },   { 0, -12013 },
 };
 
 static const u8 gUnknown_080E1C48[6] = {
@@ -161,8 +149,7 @@ void CreateFinalEndingLandingCutScene(void)
     gUnknown_03002280[1][2] = 0xff;
     gUnknown_03002280[1][3] = 0x20;
 
-    t = TaskCreate(sub_8093EDC, sizeof(struct FinalEndingLandCutScene), 0x3100, 0,
-                   sub_8093F9C);
+    t = TaskCreate(sub_8093EDC, sizeof(struct FinalEndingLandCutScene), 0x3100, 0, sub_8093F9C);
     scene = TASK_DATA(t);
     // TODO: chaos emeralds are probabyl wrong
     if (gLoadedSaveGame->chaosEmeralds[gSelectedCharacter] & CHAOS_EMERALD(ZONE_FINAL)) {
@@ -525,8 +512,7 @@ void CreateFinalEndingLandingCutScene(void)
         DrawBackground(background);
     }
 
-    if (!(gLoadedSaveGame->chaosEmeralds[gSelectedCharacter]
-          & CHAOS_EMERALDS_COMPLETED)) {
+    if (!(gLoadedSaveGame->chaosEmeralds[gSelectedCharacter] & CHAOS_EMERALDS_COMPLETED)) {
         memcpy(unk1AF4, gUnknown_080E1AF4, 0x20);
         DmaCopy32(3, unk1AF4, &gBgPalette[0x20], 0x20);
     }
@@ -583,13 +569,10 @@ void sub_809334C(void)
     sub_80940BC(scene);
     sub_8093868(scene);
 
-    if ((scene->unk5E0[0][1]
-             == ((gUnknown_080E1944[scene->unk33B][scene->unk338] - gBgScrollRegs[1][1])
-                 * 0x100)
+    if ((scene->unk5E0[0][1] == ((gUnknown_080E1944[scene->unk33B][scene->unk338] - gBgScrollRegs[1][1]) * 0x100)
          || (scene->unk33B == 0 && scene->unk338 > 3))
         || (scene->unk33B == 1 && scene->unk338 > 4)) {
-        if ((scene->unk33B == 0 && scene->unk338 < 6)
-            || (scene->unk33B == 1 && scene->unk338 < 7)) {
+        if ((scene->unk33B == 0 && scene->unk338 < 6) || (scene->unk33B == 1 && scene->unk338 < 7)) {
             if (scene->unk342 != 0) {
                 scene->unk342--;
             } else {
@@ -613,25 +596,17 @@ void sub_809334C(void)
 
 void sub_80934B8(struct FinalEndingLandCutScene *scene)
 {
-    if (scene->unk5E0[0][1]
-            < ((gUnknown_080E1944[scene->unk33B][scene->unk338] - gBgScrollRegs[1][1])
-               * 0x100)
-        && scene->unk338 == 0) {
+    if (scene->unk5E0[0][1] < ((gUnknown_080E1944[scene->unk33B][scene->unk338] - gBgScrollRegs[1][1]) * 0x100) && scene->unk338 == 0) {
         scene->unk5E0[0][1] += 0x320;
         scene->unk5E0[0][0] = 0x7800;
     } else if (scene->unk338 == 0) {
-        scene->unk5E0[0][1]
-            = ((gUnknown_080E1944[scene->unk33B][scene->unk338] - gBgScrollRegs[1][1])
-               * 0x100);
+        scene->unk5E0[0][1] = ((gUnknown_080E1944[scene->unk33B][scene->unk338] - gBgScrollRegs[1][1]) * 0x100);
         scene->unk5E0[0][0] = 0x7800;
     } else if (scene->unk338 == 1) {
-        scene->unk5E0[0][1]
-            = (gUnknown_080E1944[scene->unk33B][scene->unk338] - gBgScrollRegs[1][1])
-            * 0x100;
+        scene->unk5E0[0][1] = (gUnknown_080E1944[scene->unk33B][scene->unk338] - gBgScrollRegs[1][1]) * 0x100;
         scene->unk5E0[0][0] = 0x7800;
     } else {
-        if ((gSelectedCharacter == 1 && scene->unk338 == 5)
-            || (gSelectedCharacter != 1 && scene->unk338 == 4)) {
+        if ((gSelectedCharacter == 1 && scene->unk338 == 5) || (gSelectedCharacter != 1 && scene->unk338 == 4)) {
             if (scene->unk342 & 1) {
                 if (scene->unk33E < 0x23) {
                     scene->unk33E++;
@@ -654,9 +629,7 @@ void sub_80934B8(struct FinalEndingLandCutScene *scene)
             }
             return;
         }
-        scene->unk5E0[0][1]
-            = (gUnknown_080E1944[scene->unk33B][scene->unk338] - gBgScrollRegs[1][1])
-            * 0x100;
+        scene->unk5E0[0][1] = (gUnknown_080E1944[scene->unk33B][scene->unk338] - gBgScrollRegs[1][1]) * 0x100;
         scene->unk5E0[0][0] = 0x7800;
     }
 }
@@ -732,42 +705,28 @@ void sub_8093868(struct FinalEndingLandCutScene *scene)
 
     transform = &scene->transform;
 
-    if ((gSelectedCharacter == 1 && scene->unk338 < 5)
-        || (gSelectedCharacter != 1 && scene->unk338 < 4)) {
+    if ((gSelectedCharacter == 1 && scene->unk338 < 5) || (gSelectedCharacter != 1 && scene->unk338 < 4)) {
         s = &scene->unk80;
 
         if (scene->unk338 < 3) {
-            s->graphics.anim = gUnknown_080E17A4[gUnknown_080E1C48[scene->unk338]
-                                                 + gSelectedCharacter]
-                                   .anim;
-            s->variant = gUnknown_080E17A4[gUnknown_080E1C48[scene->unk338]
-                                           + gSelectedCharacter]
-                             .variant;
+            s->graphics.anim = gUnknown_080E17A4[gUnknown_080E1C48[scene->unk338] + gSelectedCharacter].anim;
+            s->variant = gUnknown_080E17A4[gUnknown_080E1C48[scene->unk338] + gSelectedCharacter].variant;
         } else if (gSelectedCharacter == 1 && scene->unk338 < 5) {
             s->graphics.anim = gUnknown_080E17A4[gUnknown_080E1C4E[scene->unk338]].anim;
             s->variant = gUnknown_080E17A4[gUnknown_080E1C4E[scene->unk338]].variant;
 
         } else if (gSelectedCharacter == 1) {
-            s->graphics.anim = gUnknown_080E17A4[gUnknown_080E1C4E[scene->unk338]
-                                                 + gSelectedCharacter]
-                                   .anim;
-            s->variant = gUnknown_080E17A4[gUnknown_080E1C4E[scene->unk338]
-                                           + gSelectedCharacter]
-                             .variant;
+            s->graphics.anim = gUnknown_080E17A4[gUnknown_080E1C4E[scene->unk338] + gSelectedCharacter].anim;
+            s->variant = gUnknown_080E17A4[gUnknown_080E1C4E[scene->unk338] + gSelectedCharacter].variant;
         } else {
-            s->graphics.anim = gUnknown_080E17A4[gUnknown_080E1C48[scene->unk338]
-                                                 + gSelectedCharacter]
-                                   .anim;
-            s->variant = gUnknown_080E17A4[gUnknown_080E1C48[scene->unk338]
-                                           + gSelectedCharacter]
-                             .variant;
+            s->graphics.anim = gUnknown_080E17A4[gUnknown_080E1C48[scene->unk338] + gSelectedCharacter].anim;
+            s->variant = gUnknown_080E17A4[gUnknown_080E1C48[scene->unk338] + gSelectedCharacter].variant;
         }
         s->x = scene->unk5E0[0][0] >> 8;
         s->y = scene->unk5E0[0][1] >> 8;
     }
 
-    if ((gSelectedCharacter != 1 && scene->unk338 == 4)
-        || (gSelectedCharacter == 1 && scene->unk338 == 5)) {
+    if ((gSelectedCharacter != 1 && scene->unk338 == 4) || (gSelectedCharacter == 1 && scene->unk338 == 5)) {
         s = &scene->unkB0;
 
         s->x = scene->unk5E0[0][0] >> 8;
@@ -783,19 +742,14 @@ void sub_8093868(struct FinalEndingLandCutScene *scene)
     UpdateSpriteAnimation(s);
     DisplaySprite(s);
 
-    if ((gSelectedCharacter != 1 && scene->unk338 > 4)
-        || (gSelectedCharacter == 1 && scene->unk338 > 5)) {
+    if ((gSelectedCharacter != 1 && scene->unk338 > 4) || (gSelectedCharacter == 1 && scene->unk338 > 5)) {
         s = &scene->unkE0;
         if (gSelectedCharacter != 1) {
-            s->graphics.anim
-                = gUnknown_080E17A4[gUnknown_080E1C48[5] + gSelectedCharacter].anim;
-            s->variant
-                = gUnknown_080E17A4[gUnknown_080E1C48[5] + gSelectedCharacter].variant;
+            s->graphics.anim = gUnknown_080E17A4[gUnknown_080E1C48[5] + gSelectedCharacter].anim;
+            s->variant = gUnknown_080E17A4[gUnknown_080E1C48[5] + gSelectedCharacter].variant;
         } else {
-            s->graphics.anim
-                = gUnknown_080E17A4[gUnknown_080E1C4E[6] + gSelectedCharacter].anim;
-            s->variant
-                = gUnknown_080E17A4[gUnknown_080E1C4E[6] + gSelectedCharacter].variant;
+            s->graphics.anim = gUnknown_080E17A4[gUnknown_080E1C4E[6] + gSelectedCharacter].anim;
+            s->variant = gUnknown_080E17A4[gUnknown_080E1C4E[6] + gSelectedCharacter].variant;
         }
         s->x = scene->unk5E0[0][0] >> 8;
         s->y = scene->unk5E0[0][1] >> 8;
@@ -835,8 +789,7 @@ void sub_8093868(struct FinalEndingLandCutScene *scene)
         }
 
         s->x = gUnknown_080E1964[i][3] + (scene->unk34C[i][0] >> 8);
-        s->y = (gUnknown_080E1964[i][4] - gBgScrollRegs[1][1])
-            + (scene->unk34C[i][1] >> 8);
+        s->y = (gUnknown_080E1964[i][4] - gBgScrollRegs[1][1]) + (scene->unk34C[i][1] >> 8);
 
         UpdateSpriteAnimation(s);
         DisplaySprite(s);
@@ -877,8 +830,7 @@ void sub_8093868(struct FinalEndingLandCutScene *scene)
         }
     }
 
-    if ((gSelectedCharacter == 1 && scene->unk338 > 5)
-        || (gSelectedCharacter != 1 && scene->unk338 > 4)) {
+    if ((gSelectedCharacter == 1 && scene->unk338 > 5) || (gSelectedCharacter != 1 && scene->unk338 > 4)) {
         s = &scene->unk200;
         s->graphics.anim = gUnknown_080E17A4[41].anim;
         s->variant = gUnknown_080E17A4[41].variant;
@@ -1000,8 +952,7 @@ void sub_8094044(struct FinalEndingLandCutScene *scene)
 
 void sub_8094060(struct FinalEndingLandCutScene *scene)
 {
-    if ((gSelectedCharacter != 1 && scene->unk338 == 5)
-        || (gSelectedCharacter == 1 && scene->unk338 == 6)) {
+    if ((gSelectedCharacter != 1 && scene->unk338 == 5) || (gSelectedCharacter == 1 && scene->unk338 == 6)) {
         scene->unk5E0[3][0] = 0x78;
         if (scene->unk5E0[3][1] > 0x8200) {
             scene->unk5E0[3][1] -= 0x300;
@@ -1011,8 +962,7 @@ void sub_8094060(struct FinalEndingLandCutScene *scene)
 
 void sub_80940BC(struct FinalEndingLandCutScene *scene)
 {
-    if ((gSelectedCharacter != 1 && scene->unk338 == 5)
-        || (gSelectedCharacter == 1 && scene->unk338 == 6)) {
+    if ((gSelectedCharacter != 1 && scene->unk338 == 5) || (gSelectedCharacter == 1 && scene->unk338 == 6)) {
         scene->unk5E0[4][0] = 0x78;
         if (scene->unk5E0[4][1] > 0x9600) {
             scene->unk5E0[4][1] -= 0x300;
diff --git a/src/game/cutscenes/level_endings.c b/src/game/cutscenes/level_endings.c
index 1cdef7ca6..6dc40ffc1 100644
--- a/src/game/cutscenes/level_endings.c
+++ b/src/game/cutscenes/level_endings.c
@@ -60,43 +60,34 @@ static void sub_808E114(void);
 
 // slides
 static const u16 sTilemapsCharacterSlides[] = {
-    TM_STORYFRAME_CREAM_UNLOCK_0,    TM_STORYFRAME_CREAM_UNLOCK_1,
-    TM_STORYFRAME_CREAM_UNLOCK_2,    TM_STORYFRAME_CREAM_UNLOCK_3,
+    TM_STORYFRAME_CREAM_UNLOCK_0,    TM_STORYFRAME_CREAM_UNLOCK_1,    TM_STORYFRAME_CREAM_UNLOCK_2,    TM_STORYFRAME_CREAM_UNLOCK_3,
 
-    TM_STORYFRAME_KNUCKLES_UNLOCK_0, TM_STORYFRAME_KNUCKLES_UNLOCK_1,
-    TM_STORYFRAME_KNUCKLES_UNLOCK_2, TM_STORYFRAME_KNUCKLES_UNLOCK_3,
+    TM_STORYFRAME_KNUCKLES_UNLOCK_0, TM_STORYFRAME_KNUCKLES_UNLOCK_1, TM_STORYFRAME_KNUCKLES_UNLOCK_2, TM_STORYFRAME_KNUCKLES_UNLOCK_3,
 
-    TM_STORYFRAME_TAILS_UNLOCK_0,    TM_STORYFRAME_TAILS_UNLOCK_1,
-    TM_STORYFRAME_TAILS_UNLOCK_2,    TM_STORYFRAME_TAILS_UNLOCK_3,
+    TM_STORYFRAME_TAILS_UNLOCK_0,    TM_STORYFRAME_TAILS_UNLOCK_1,    TM_STORYFRAME_TAILS_UNLOCK_2,    TM_STORYFRAME_TAILS_UNLOCK_3,
 };
 
-#define SLIDES_GROUP(i0, i1, i2, i3, i4, i5, i6, i7, i8, i9, i10, i11, i12, i13, i14)   \
+#define SLIDES_GROUP(i0, i1, i2, i3, i4, i5, i6, i7, i8, i9, i10, i11, i12, i13, i14)                                                      \
     i0, i1, i2, i3, i4, i5, i6, i7, i8, i9, i10, i11, i12, i13, i14
 
 static const u16 sTilemapsCharacterDialogue[] = {
     /* LANG_JAPANESE */
-    SLIDES_GROUP(270, 271, 272, 273, 274, 304, 305, 306, 307, 308, 338, 339, 340, 341,
-                 342),
+    SLIDES_GROUP(270, 271, 272, 273, 274, 304, 305, 306, 307, 308, 338, 339, 340, 341, 342),
 
     /* LANG_ENGLISH */
-    SLIDES_GROUP(275, 276, 277, 278, 279, 309, 310, 311, 312, 313, 343, 344, 345, 346,
-                 347),
+    SLIDES_GROUP(275, 276, 277, 278, 279, 309, 310, 311, 312, 313, 343, 344, 345, 346, 347),
 
     /* LANG_FRENCH */
-    SLIDES_GROUP(285, 286, 287, 288, 289, 319, 320, 321, 322, 323, 353, 354, 355, 356,
-                 357),
+    SLIDES_GROUP(285, 286, 287, 288, 289, 319, 320, 321, 322, 323, 353, 354, 355, 356, 357),
 
     /* LANG_GERMAN */
-    SLIDES_GROUP(280, 281, 282, 283, 284, 314, 315, 316, 317, 318, 348, 349, 350, 351,
-                 352),
+    SLIDES_GROUP(280, 281, 282, 283, 284, 314, 315, 316, 317, 318, 348, 349, 350, 351, 352),
 
     /* LANG_SPANISH */
-    SLIDES_GROUP(295, 296, 297, 298, 299, 329, 330, 331, 332, 333, 363, 364, 365, 366,
-                 367),
+    SLIDES_GROUP(295, 296, 297, 298, 299, 329, 330, 331, 332, 333, 363, 364, 365, 366, 367),
 
     /* LANG_ITALIAN */
-    SLIDES_GROUP(290, 291, 292, 293, 294, 324, 325, 326, 327, 328, 358, 359, 360, 361,
-                 362),
+    SLIDES_GROUP(290, 291, 292, 293, 294, 324, 325, 326, 327, 328, 358, 359, 360, 361, 362),
 };
 
 static const u32 sAnimsCharacterRescued[] = {
@@ -389,9 +380,7 @@ static void sub_808E114(void)
         scene->unk70 = player->x - (gCamera.x * 256) - 0x4000;
     }
 
-    result
-        = sub_801F100((scene->unk72 >> 8) + gCamera.y,
-                      (scene->unk70 >> 8) + gCamera.x + scene->unk7C, 1, 8, sub_801EC3C);
+    result = sub_801F100((scene->unk72 >> 8) + gCamera.y, (scene->unk70 >> 8) + gCamera.x + scene->unk7C, 1, 8, sub_801EC3C);
 
     if (result < 0) {
         scene->unk72 += result * 0x100;
@@ -562,8 +551,7 @@ void sub_808E4C8(void)
             background->layoutVram = (void *)BG_SCREEN_ADDR(28);
             background->unk18 = 0;
             background->unk1A = 0;
-            background->tilemapId
-                = sTilemapsCharacterDialogue[scene->unk10E + 1 + (lang * 15)];
+            background->tilemapId = sTilemapsCharacterDialogue[scene->unk10E + 1 + (lang * 15)];
             background->unk1E = 0;
             background->unk20 = 0;
             background->unk22 = 0;
@@ -617,11 +605,9 @@ void sub_808E6B0(void)
 
     if (UpdateScreenFade(&scene->unk100) == SCREEN_FADE_COMPLETE) {
         if (gCurrentLevel >= gLoadedSaveGame->unlockedLevels[gSelectedCharacter]) {
-            CreateCourseSelectionScreen(
-                gCurrentLevel, gLoadedSaveGame->unlockedLevels[gSelectedCharacter], 1);
+            CreateCourseSelectionScreen(gCurrentLevel, gLoadedSaveGame->unlockedLevels[gSelectedCharacter], 1);
         } else {
-            CreateCourseSelectionScreen(
-                gCurrentLevel, gLoadedSaveGame->unlockedLevels[gSelectedCharacter], 4);
+            CreateCourseSelectionScreen(gCurrentLevel, gLoadedSaveGame->unlockedLevels[gSelectedCharacter], 4);
         }
         TaskDestroy(gCurTask);
     }
@@ -629,8 +615,7 @@ void sub_808E6B0(void)
 
 void CreateCharacterUnlockCutScene(u8 zone)
 {
-    struct Task *t = TaskCreate(sub_808E424, sizeof(struct CharacterUnlockCutScene),
-                                0x1000, 0, NULL);
+    struct Task *t = TaskCreate(sub_808E424, sizeof(struct CharacterUnlockCutScene), 0x1000, 0, NULL);
     struct CharacterUnlockCutScene *scene = TASK_DATA(t);
     scene->unk10C = zone * 4;
     scene->unk10E = zone * 5;
@@ -641,8 +626,7 @@ void CreateCharacterUnlockCutScene(u8 zone)
 
 void CreateCreamUnlockCutScene(void)
 {
-    struct Task *t = TaskCreate(sub_808E424, sizeof(struct CharacterUnlockCutScene),
-                                0x1000, 0, NULL);
+    struct Task *t = TaskCreate(sub_808E424, sizeof(struct CharacterUnlockCutScene), 0x1000, 0, NULL);
     struct CharacterUnlockCutScene *scene = TASK_DATA(t);
     scene->unk10C = 0;
     scene->unk10E = 0;
@@ -652,8 +636,7 @@ void CreateCreamUnlockCutScene(void)
 
 void CreateTailsUnlockCutScene(void)
 {
-    struct Task *t = TaskCreate(sub_808E424, sizeof(struct CharacterUnlockCutScene),
-                                0x1000, 0, NULL);
+    struct Task *t = TaskCreate(sub_808E424, sizeof(struct CharacterUnlockCutScene), 0x1000, 0, NULL);
     struct CharacterUnlockCutScene *scene = TASK_DATA(t);
     scene->unk10C = 8;
     scene->unk10E = 10;
@@ -663,8 +646,7 @@ void CreateTailsUnlockCutScene(void)
 
 void CreateKnucklesUnlockCutScene(void)
 {
-    struct Task *t = TaskCreate(sub_808E424, sizeof(struct CharacterUnlockCutScene),
-                                0x1000, 0, NULL);
+    struct Task *t = TaskCreate(sub_808E424, sizeof(struct CharacterUnlockCutScene), 0x1000, 0, NULL);
     struct CharacterUnlockCutScene *scene = TASK_DATA(t);
     scene->unk10C = 4;
     scene->unk10E = 5;
diff --git a/src/game/cutscenes/missing_emeralds.c b/src/game/cutscenes/missing_emeralds.c
index 6ef92e1b2..53e835a53 100644
--- a/src/game/cutscenes/missing_emeralds.c
+++ b/src/game/cutscenes/missing_emeralds.c
@@ -100,8 +100,7 @@ void CreateMissingChaosEmaraldsCutScene(void)
 
     DmaFill32(3, 0, (void *)BG_VRAM, BG_VRAM_SIZE);
 
-    t = TaskCreate(Task_8094360, sizeof(struct MissingChaosEmaraldsCutScene), 0x3100, 0,
-                   TaskDestructor_80945A0);
+    t = TaskCreate(Task_8094360, sizeof(struct MissingChaosEmaraldsCutScene), 0x3100, 0, TaskDestructor_80945A0);
     scene = TASK_DATA(t);
 
     scene->unkBC = 0;
diff --git a/src/game/decomp_credits.c b/src/game/decomp_credits.c
index aa0289d6f..78db64dff 100644
--- a/src/game/decomp_credits.c
+++ b/src/game/decomp_credits.c
@@ -66,8 +66,7 @@ void CreateDecompCreditsScreen(bool32 hasProfile)
 
     Debug_CreateAsciiTask(0, 0);
 
-    t = TaskCreate(Task_DecompCreditsFirst, sizeof(DCCredits), 0, 0,
-                   TaskDestructor_DecompCredits);
+    t = TaskCreate(Task_DecompCreditsFirst, sizeof(DCCredits), 0, 0, TaskDestructor_DecompCredits);
     cred = TASK_DATA(t);
 
     cred->hasProfile = hasProfile;
@@ -79,8 +78,7 @@ void CreateDecompCreditsScreen(bool32 hasProfile)
     s = &cred->sprSonic;
     s->x = -508;
     s->y = (DISPLAY_HEIGHT / 2) - 16;
-    SPRITE_INIT_FLAGS(s, 64, SA2_ANIM_CHAR(SA2_CHAR_ANIM_WALK, CHARACTER_SONIC), 4, 18,
-                      2, SPRITE_FLAG_MASK_X_FLIP);
+    SPRITE_INIT_FLAGS(s, 64, SA2_ANIM_CHAR(SA2_CHAR_ANIM_WALK, CHARACTER_SONIC), 4, 18, 2, SPRITE_FLAG_MASK_X_FLIP);
     s->animSpeed = SPRITE_ANIM_SPEED(4);
     cred->qSonicScreenX = Q(s->x);
 
@@ -174,8 +172,7 @@ void Task_DecompCreditsFirst()
             cred->logoFrameT0 = cred->frames;
             SPRITE_FLAG_CLEAR(&cred->sprLogoOllie, X_FLIP);
             m4aSongNumStart(SE_LONG_BRAKE);
-            cred->sprSonic.graphics.anim
-                = SA2_ANIM_CHAR(SA2_CHAR_ANIM_BRAKE, CHARACTER_SONIC);
+            cred->sprSonic.graphics.anim = SA2_ANIM_CHAR(SA2_CHAR_ANIM_BRAKE, CHARACTER_SONIC);
             cred->sprSonic.variant = 0;
         }
 
@@ -185,8 +182,7 @@ void Task_DecompCreditsFirst()
         } else {
             m4aSongNumStop(SE_LONG_BRAKE);
 
-            cred->sprSonic.graphics.anim
-                = SA2_ANIM_CHAR(SA2_CHAR_ANIM_WALK, CHARACTER_SONIC);
+            cred->sprSonic.graphics.anim = SA2_ANIM_CHAR(SA2_CHAR_ANIM_WALK, CHARACTER_SONIC);
             cred->sprSonic.variant = 2;
             cred->sprSonic.animSpeed = SPRITE_ANIM_SPEED(1.5);
             SPRITE_FLAG_CLEAR(&cred->sprSonic, X_FLIP);
@@ -224,8 +220,7 @@ void Task_SonicArrived(void)
     UpdateSprites(cred);
 
     if (cred->sonicArrivedT0 > 10 * GBA_FRAMES_PER_SECOND) {
-        cred->sprSonic.graphics.anim
-            = SA2_ANIM_CHAR(SA2_CHAR_ANIM_TAUNT, CHARACTER_SONIC);
+        cred->sprSonic.graphics.anim = SA2_ANIM_CHAR(SA2_CHAR_ANIM_TAUNT, CHARACTER_SONIC);
         cred->sprSonic.variant = 0;
     }
 
@@ -287,8 +282,7 @@ void customHBlank(void)
     u16 vcount = REG_VCOUNT;
     if ((vcount >= DISPLAY_HEIGHT - 16 - 1) && (vcount < DISPLAY_HEIGHT - 1)) {
         ((u16 *)BG_PLTT)[0] = RGB_WHITE;
-    } else if ((vcount >= DISPLAY_HEIGHT - 64 - 16 - 1)
-               && (vcount < DISPLAY_HEIGHT - 1)) {
+    } else if ((vcount >= DISPLAY_HEIGHT - 64 - 16 - 1) && (vcount < DISPLAY_HEIGHT - 1)) {
         ((u16 *)BG_PLTT)[0] = ((u16 *)OBJ_PLTT)[3 * 16];
     } else {
         ((u16 *)BG_PLTT)[0] = ((u16 *)OBJ_PLTT)[2 * 16];
diff --git a/src/game/dummy_task.c b/src/game/dummy_task.c
index 0b687b64a..bfb001483 100644
--- a/src/game/dummy_task.c
+++ b/src/game/dummy_task.c
@@ -9,10 +9,7 @@ struct Task *gDummyTask = NULL;
 static void Task_DummyFunc(void);
 static void DummyTaskOnDestroy(struct Task *);
 
-UNUSED void CreateDummyTask(void)
-{
-    gDummyTask = TaskCreate(Task_DummyFunc, 0, 0x100, 0, DummyTaskOnDestroy);
-}
+UNUSED void CreateDummyTask(void) { gDummyTask = TaskCreate(Task_DummyFunc, 0, 0x100, 0, DummyTaskOnDestroy); }
 
 UNUSED static void DestroyDummyTask(void)
 {
diff --git a/src/game/enemies/balloon.c b/src/game/enemies/balloon.c
index c52d4d8b2..2445547b2 100644
--- a/src/game/enemies/balloon.c
+++ b/src/game/enemies/balloon.c
@@ -26,12 +26,10 @@ typedef struct {
 
 void Task_BalloonMain(void);
 
-void CreateEntity_Balloon(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                          u8 spriteY)
+void CreateEntity_Balloon(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     if (DIFFICULTY_LEVEL_IS_NOT_EASY) {
-        struct Task *t = TaskCreate(Task_BalloonMain, sizeof(Sprite_Balloon), 0x4040, 0,
-                                    TaskDestructor_80095E8);
+        struct Task *t = TaskCreate(Task_BalloonMain, sizeof(Sprite_Balloon), 0x4040, 0, TaskDestructor_80095E8);
         Sprite_Balloon *balloon = TASK_DATA(t);
         Sprite *s = &balloon->s;
         balloon->base.regionX = spriteRegionX;
diff --git a/src/game/enemies/bell.c b/src/game/enemies/bell.c
index c0149f96a..fda01c349 100644
--- a/src/game/enemies/bell.c
+++ b/src/game/enemies/bell.c
@@ -27,8 +27,7 @@ static void sub_8054D20(void);
 
 void CreateEntity_Bell(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_BellMain, sizeof(Sprite_Bell), 0x4080, 0,
-                                TaskDestructor_80095E8);
+    struct Task *t = TaskCreate(Task_BellMain, sizeof(Sprite_Bell), 0x4080, 0, TaskDestructor_80095E8);
     Sprite_Bell *bell = TASK_DATA(t);
     Sprite *s = &bell->s;
     bell->unk4C = 120;
diff --git a/src/game/enemies/bullet_buzzer.c b/src/game/enemies/bullet_buzzer.c
index 3ab8ac573..09b5f006a 100644
--- a/src/game/enemies/bullet_buzzer.c
+++ b/src/game/enemies/bullet_buzzer.c
@@ -30,11 +30,9 @@ typedef struct {
 
 void Task_BulletBuzzerMain(void);
 
-void CreateEntity_BulletBuzzer(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                               u8 spriteY)
+void CreateEntity_BulletBuzzer(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_BulletBuzzerMain, sizeof(Sprite_BulletBuzzer),
-                                0x4040, 0, TaskDestructor_80095E8);
+    struct Task *t = TaskCreate(Task_BulletBuzzerMain, sizeof(Sprite_BulletBuzzer), 0x4040, 0, TaskDestructor_80095E8);
     Sprite_BulletBuzzer *bbuzzer = TASK_DATA(t);
     Sprite *s = &bbuzzer->s;
     bbuzzer->base.regionX = spriteRegionX;
@@ -56,8 +54,7 @@ void CreateEntity_BulletBuzzer(MapEntity *me, u16 spriteRegionX, u16 spriteRegio
     SET_MAP_ENTITY_INITIALIZED(me);
 
     s->graphics.dest = VramMalloc(24);
-    SPRITE_INIT_WITHOUT_VRAM(s, SA2_ANIM_BULLETBUZZER, 0, 18, 2,
-                             SPRITE_FLAG_MASK_X_FLIP);
+    SPRITE_INIT_WITHOUT_VRAM(s, SA2_ANIM_BULLETBUZZER, 0, 18, 2, SPRITE_FLAG_MASK_X_FLIP);
 }
 
 void sub_8059B04(void);
diff --git a/src/game/enemies/buzzer.c b/src/game/enemies/buzzer.c
index 6767925dc..7306a2c02 100644
--- a/src/game/enemies/buzzer.c
+++ b/src/game/enemies/buzzer.c
@@ -35,8 +35,7 @@ static void sub_8053620(void);
 void CreateEntity_Buzzer(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     if (DIFFICULTY_LEVEL_IS_NOT_EASY_AND_ZONE_IS_NOT_1) {
-        struct Task *t = TaskCreate(Task_BuzzerMain, sizeof(Sprite_Buzzer), 0x4030, 0,
-                                    TaskDestructor_Buzzer);
+        struct Task *t = TaskCreate(Task_BuzzerMain, sizeof(Sprite_Buzzer), 0x4030, 0, TaskDestructor_Buzzer);
         Sprite_Buzzer *buzzer = TASK_DATA(t);
         Sprite *s = &buzzer->s;
         buzzer->base.regionX = spriteRegionX;
@@ -92,8 +91,7 @@ static void Task_BuzzerMain(void)
          --buzzer->unk68 == 0
 #endif
          )
-        && !(s->frameFlags & SPRITE_FLAG_MASK_X_FLIP) && I(gPlayer.x) > (pos.x - 0x3C)
-        && I(gPlayer.x) < pos.x && I(gPlayer.y) > pos.y
+        && !(s->frameFlags & SPRITE_FLAG_MASK_X_FLIP) && I(gPlayer.x) > (pos.x - 0x3C) && I(gPlayer.x) < pos.x && I(gPlayer.y) > pos.y
         && I(gPlayer.y) < (pos.y + 0x50)) {
         gCurTask->main = sub_80534F0;
         s->graphics.anim = SA2_ANIM_BUZZER;
@@ -102,8 +100,7 @@ static void Task_BuzzerMain(void)
         buzzer->unk5C = gPlayer.y;
         buzzer->unk64 = Div(gPlayer.x - QS(pos.x), 0x20);
         buzzer->unk66 = Div(gPlayer.y - QS(pos.y), 0x20);
-    } else if (buzzer->unk68 == 0 && (s->frameFlags & SPRITE_FLAG_MASK_X_FLIP)
-               && I(gPlayer.x) > pos.x && I(gPlayer.x) < (pos.x + 0x3C)
+    } else if (buzzer->unk68 == 0 && (s->frameFlags & SPRITE_FLAG_MASK_X_FLIP) && I(gPlayer.x) > pos.x && I(gPlayer.x) < (pos.x + 0x3C)
                && I(gPlayer.y) > pos.y && I(gPlayer.y) < (pos.y + 0x50)) {
         gCurTask->main = sub_80534F0;
         s->graphics.anim = SA2_ANIM_BUZZER;
@@ -120,14 +117,12 @@ static void Task_BuzzerMain(void)
 #ifndef NON_MATCHING
     lab:
 #endif
-        if (ENEMY_CROSSED_LEFT_BORDER(buzzer, me)
-            && !(s->frameFlags & SPRITE_FLAG_MASK_X_FLIP)) {
+        if (ENEMY_CROSSED_LEFT_BORDER(buzzer, me) && !(s->frameFlags & SPRITE_FLAG_MASK_X_FLIP)) {
             gCurTask->main = sub_80533B4;
             s->graphics.anim = SA2_ANIM_BUZZER;
             s->variant = 2;
             s->prevVariant = -1;
-        } else if (ENEMY_CROSSED_RIGHT_BORDER(buzzer, me)
-                   && s->frameFlags & SPRITE_FLAG_MASK_X_FLIP) {
+        } else if (ENEMY_CROSSED_RIGHT_BORDER(buzzer, me) && s->frameFlags & SPRITE_FLAG_MASK_X_FLIP) {
             gCurTask->main = sub_80533B4;
             s->graphics.anim = SA2_ANIM_BUZZER;
             s->variant = 2;
@@ -173,8 +168,7 @@ static void sub_80534F0(void)
     buzzer->unk54 += buzzer->unk64;
     buzzer->unk58 += buzzer->unk66;
 
-    ENEMY_UPDATE_POSITION_RAW(buzzer, s, pos.x, pos.y, buzzer->offsetX + buzzer->unk54,
-                              buzzer->unk58);
+    ENEMY_UPDATE_POSITION_RAW(buzzer, s, pos.x, pos.y, buzzer->offsetX + buzzer->unk54, buzzer->unk58);
 
     ENEMY_DESTROY_IF_PLAYER_HIT_2(s, pos);
     ENEMY_DESTROY_IF_OFFSCREEN(buzzer, me, s);
@@ -196,8 +190,7 @@ static void sub_8053620(void)
     buzzer->unk54 -= buzzer->unk64;
     buzzer->unk58 -= buzzer->unk66;
 
-    ENEMY_UPDATE_POSITION_RAW(buzzer, s, pos.x, pos.y, buzzer->offsetX + buzzer->unk54,
-                              buzzer->unk58);
+    ENEMY_UPDATE_POSITION_RAW(buzzer, s, pos.x, pos.y, buzzer->offsetX + buzzer->unk54, buzzer->unk58);
 
     ENEMY_DESTROY_IF_PLAYER_HIT_2(s, pos);
     ENEMY_DESTROY_IF_OFFSCREEN(buzzer, me, s);
diff --git a/src/game/enemies/circus.c b/src/game/enemies/circus.c
index f2900caa5..4d24ed9be 100644
--- a/src/game/enemies/circus.c
+++ b/src/game/enemies/circus.c
@@ -28,8 +28,7 @@ void TaskDestructor_Circus(struct Task *);
 
 void CreateEntity_Circus(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_CircusMain, sizeof(Sprite_Circus), 0x4090, 0,
-                                TaskDestructor_Circus);
+    struct Task *t = TaskCreate(Task_CircusMain, sizeof(Sprite_Circus), 0x4090, 0, TaskDestructor_Circus);
     Sprite_Circus *circus = TASK_DATA(t);
     Sprite *s = &circus->s;
     circus->base.regionX = spriteRegionX;
diff --git a/src/game/enemies/flickey.c b/src/game/enemies/flickey.c
index 5833ab946..2b536896a 100644
--- a/src/game/enemies/flickey.c
+++ b/src/game/enemies/flickey.c
@@ -40,15 +40,13 @@ static void sub_8058EDC(void);
 static void Flickey_RenderIronBalls(Sprite_Flickey *flickey);
 static void TaskDestructor_Flickey(struct Task *);
 
-void CreateEntity_Flickey(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                          u8 spriteY)
+void CreateEntity_Flickey(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     u8 i;
     s32 x, y;
 
     if (DIFFICULTY_LEVEL_IS_NOT_EASY) {
-        struct Task *t = TaskCreate(Task_FlickeyMain, sizeof(Sprite_Flickey), 0x4040, 0,
-                                    TaskDestructor_Flickey);
+        struct Task *t = TaskCreate(Task_FlickeyMain, sizeof(Sprite_Flickey), 0x4040, 0, TaskDestructor_Flickey);
         Sprite_Flickey *flickey = TASK_DATA(t);
         Sprite *s = &flickey->s;
         flickey->base.regionX = spriteRegionX;
@@ -130,8 +128,7 @@ static void Task_FlickeyMain(void)
 
             positions[i][0] = flickey->positions[index].x;
             positions[i][1] = flickey->positions[index].y;
-            positions[i][2]
-                = flickey->positions[index].y - flickey->positions[(index - 1) & 0x3F].y;
+            positions[i][2] = flickey->positions[index].y - flickey->positions[(index - 1) & 0x3F].y;
 
             DisplaySprite(s);
         }
@@ -224,8 +221,7 @@ static void sub_8058EDC(void)
 
             positions[i][0] = flickey->positions[index].x;
             positions[i][1] = flickey->positions[index].y;
-            positions[i][2]
-                = flickey->positions[index].y - flickey->positions[(index - 1) & 0x3F].y;
+            positions[i][2] = flickey->positions[index].y - flickey->positions[(index - 1) & 0x3F].y;
 
             DisplaySprite(s);
         }
@@ -281,8 +277,7 @@ static void sub_80591FC(void)
         flickey->positions[i + 3].y += 0x30;
         flickey->positions[i].x += flickey->positions[i + 3].x;
         flickey->positions[i].y += flickey->positions[i + 3].y;
-        someVal = sub_801F07C(I(flickey->positions[i].y), I(flickey->positions[i].x), 1,
-                              8, 0, sub_801EE64);
+        someVal = sub_801F07C(I(flickey->positions[i].y), I(flickey->positions[i].x), 1, 8, 0, sub_801EE64);
 
         if (someVal < 0) {
             flickey->positions[i].y += QS(someVal);
diff --git a/src/game/enemies/geji_geji.c b/src/game/enemies/geji_geji.c
index 10ab0acb7..8f95ad32e 100644
--- a/src/game/enemies/geji_geji.c
+++ b/src/game/enemies/geji_geji.c
@@ -36,12 +36,10 @@ static const TileInfo gUnknown_080D8F50[4] = {
     { .numTiles = 12, .anim = SA2_ANIM_GEJIGEJI, .variant = 0 },
 };
 
-void CreateEntity_GejiGeji(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                           u8 spriteY)
+void CreateEntity_GejiGeji(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     u8 i;
-    struct Task *t
-        = TaskCreate(sub_8057F80, sizeof(Sprite_GejiGeji), 0x4040, 0, sub_8058480);
+    struct Task *t = TaskCreate(sub_8057F80, sizeof(Sprite_GejiGeji), 0x4040, 0, sub_8058480);
     Sprite_GejiGeji *gg = TASK_DATA(t);
 
     Sprite *s = &gg->s;
@@ -74,15 +72,13 @@ void CreateEntity_GejiGeji(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
     s->y = TO_WORLD_POS(me->y, spriteRegionY);
     SET_MAP_ENTITY_INITIALIZED(me);
 
-    SPRITE_INIT(s, gUnknown_080D8F50[gg->unk27C].numTiles,
-                gUnknown_080D8F50[gg->unk27C].anim,
-                gUnknown_080D8F50[gg->unk27C].variant, 18, 2);
+    SPRITE_INIT(s, gUnknown_080D8F50[gg->unk27C].numTiles, gUnknown_080D8F50[gg->unk27C].anim, gUnknown_080D8F50[gg->unk27C].variant, 18,
+                2);
 
     s = &gg->s2;
     s->x = 0;
     s->y = 0;
-    SPRITE_INIT(s, gUnknown_080D8F50[gg->unk27C + 2].numTiles,
-                gUnknown_080D8F50[gg->unk27C + 2].anim,
+    SPRITE_INIT(s, gUnknown_080D8F50[gg->unk27C + 2].numTiles, gUnknown_080D8F50[gg->unk27C + 2].anim,
                 gUnknown_080D8F50[gg->unk27C + 2].variant, 20, 2);
 }
 
@@ -126,22 +122,18 @@ static void sub_8057F80(void)
     ENEMY_DESTROY_IF_OFFSCREEN(gg, me, s);
 
     if (gg->unk27C) {
-        if (ENEMY_CROSSED_TOP_BORDER(gg, me)
-            && !(s->frameFlags & SPRITE_FLAG_MASK_Y_FLIP)) {
+        if (ENEMY_CROSSED_TOP_BORDER(gg, me) && !(s->frameFlags & SPRITE_FLAG_MASK_Y_FLIP)) {
             gg->unk27D = 0x3C;
             gCurTask->main = sub_8058264;
-        } else if (ENEMY_CROSSED_BOTTOM_BORDER(gg, me)
-                   && (s->frameFlags & SPRITE_FLAG_MASK_Y_FLIP)) {
+        } else if (ENEMY_CROSSED_BOTTOM_BORDER(gg, me) && (s->frameFlags & SPRITE_FLAG_MASK_Y_FLIP)) {
             gg->unk27D = 0x3C;
             gCurTask->main = sub_8058264;
         }
     } else {
-        if (ENEMY_CROSSED_LEFT_BORDER(gg, me)
-            && !(s->frameFlags & SPRITE_FLAG_MASK_X_FLIP)) {
+        if (ENEMY_CROSSED_LEFT_BORDER(gg, me) && !(s->frameFlags & SPRITE_FLAG_MASK_X_FLIP)) {
             gg->unk27D = 0x3C;
             gCurTask->main = sub_8058264;
-        } else if ((ENEMY_CROSSED_RIGHT_BORDER(gg, me)
-                    && s->frameFlags & SPRITE_FLAG_MASK_X_FLIP)) {
+        } else if ((ENEMY_CROSSED_RIGHT_BORDER(gg, me) && s->frameFlags & SPRITE_FLAG_MASK_X_FLIP)) {
             gg->unk27D = 0x3C;
             gCurTask->main = sub_8058264;
         }
diff --git a/src/game/enemies/gohla.c b/src/game/enemies/gohla.c
index 23f2b4e53..519ae10f3 100644
--- a/src/game/enemies/gohla.c
+++ b/src/game/enemies/gohla.c
@@ -39,8 +39,7 @@ static void TaskDestructor_Gohla(struct Task *);
 void CreateEntity_Gohla(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     if (gGameMode == GAME_MODE_TIME_ATTACK || gDifficultyLevel != 1) {
-        struct Task *t = TaskCreate(sub_8051928, sizeof(Sprite_Gohla), 0x4040, 0,
-                                    TaskDestructor_Gohla);
+        struct Task *t = TaskCreate(sub_8051928, sizeof(Sprite_Gohla), 0x4040, 0, TaskDestructor_Gohla);
         Sprite_Gohla *gohla = TASK_DATA(t);
         Sprite *s = &gohla->s;
         gohla->base.regionX = spriteRegionX;
@@ -58,8 +57,7 @@ void CreateEntity_Gohla(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8
         gohla->spawnX = Q(TO_WORLD_POS(me->x, spriteRegionX));
         gohla->spawnY = Q(TO_WORLD_POS(me->y, spriteRegionY));
         gohla->offsetX = 0;
-        gohla->offsetY = Q(sub_801F07C(I(gohla->spawnY), I(gohla->spawnX), gohla->unk8C,
-                                       8, NULL, sub_801EE64));
+        gohla->offsetY = Q(sub_801F07C(I(gohla->spawnY), I(gohla->spawnX), gohla->unk8C, 8, NULL, sub_801EE64));
         gohla->projX = 0;
         gohla->projY = 0;
         gohla->projZ = 0;
diff --git a/src/game/enemies/hammerhead.c b/src/game/enemies/hammerhead.c
index bbadc7d95..eeb386bcd 100644
--- a/src/game/enemies/hammerhead.c
+++ b/src/game/enemies/hammerhead.c
@@ -25,11 +25,9 @@ static void Task_Hammerhead(void);
 static void sub_8056EDC(Enemy_Hammerhead *hammerhead);
 static void TaskDestructor_Hammerhead(struct Task *);
 
-void CreateEntity_Hammerhead(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                             u8 spriteY)
+void CreateEntity_Hammerhead(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_Hammerhead, sizeof(Enemy_Hammerhead), 0x4040, 0,
-                                TaskDestructor_Hammerhead);
+    struct Task *t = TaskCreate(Task_Hammerhead, sizeof(Enemy_Hammerhead), 0x4040, 0, TaskDestructor_Hammerhead);
     Enemy_Hammerhead *hammerhead = TASK_DATA(t);
     Sprite *s = &hammerhead->s;
     hammerhead->base.regionX = spriteRegionX;
diff --git a/src/game/enemies/kiki.c b/src/game/enemies/kiki.c
index 563b43ad6..5403c236d 100644
--- a/src/game/enemies/kiki.c
+++ b/src/game/enemies/kiki.c
@@ -42,8 +42,7 @@ static void TaskDestructor_KikiProj(struct Task *);
 
 void CreateEntity_Kiki(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_KikiMain, sizeof(Sprite_Kiki), 0x4020, 0,
-                                TaskDestructor_80095E8);
+    struct Task *t = TaskCreate(Task_KikiMain, sizeof(Sprite_Kiki), 0x4020, 0, TaskDestructor_80095E8);
     Sprite_Kiki *kiki = TASK_DATA(t);
     Sprite *s = &kiki->s;
 
@@ -174,8 +173,7 @@ static void sub_8053A38(void)
 
 static void CreateKikiProjectile(s16 x, s16 y)
 {
-    struct Task *t = TaskCreate(Task_KikiProjMain, sizeof(Kiki_Proj), 0x4028, 0,
-                                TaskDestructor_KikiProj);
+    struct Task *t = TaskCreate(Task_KikiProjMain, sizeof(Kiki_Proj), 0x4028, 0, TaskDestructor_KikiProj);
     Kiki_Proj *proj = TASK_DATA(t);
     Sprite *s = &proj->s;
 
@@ -285,8 +283,7 @@ static void Task_KikiProjSplit(void)
 
 static void CreateKikiProjectilePiece(s16 x, s16 y)
 {
-    struct Task *t = TaskCreate(Task_ProjPieceMain, sizeof(Kiki_Proj), 0x2000, 0,
-                                TaskDestructor_KikiProj);
+    struct Task *t = TaskCreate(Task_ProjPieceMain, sizeof(Kiki_Proj), 0x2000, 0, TaskDestructor_KikiProj);
     Kiki_Proj *proj = TASK_DATA(t);
     Sprite *s = &proj->s;
 
@@ -330,8 +327,7 @@ static void Task_ProjPieceMain(void)
             y1 = y + s->hitboxes[0].top;
             y2 = I(gPlayer.y) + s2->hitboxes[0].top;
             if ((y1 <= y2 && y1 + (s->hitboxes[0].bottom - s->hitboxes[0].top) >= y2)
-                || (y1 >= y2
-                    && y2 + (s2->hitboxes[0].bottom - s2->hitboxes[0].top) >= y1)) {
+                || (y1 >= y2 && y2 + (s2->hitboxes[0].bottom - s2->hitboxes[0].top) >= y1)) {
                 sub_800CBA4(&gPlayer);
             }
         }
diff --git a/src/game/enemies/koura.c b/src/game/enemies/koura.c
index 919692662..6edb999a5 100644
--- a/src/game/enemies/koura.c
+++ b/src/game/enemies/koura.c
@@ -39,8 +39,7 @@ static const u16 gUnknown_080D8F38[][2] = {
 void CreateEntity_Koura(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
 
-    struct Task *t = TaskCreate(sub_8054224, sizeof(Sprite_Koura), 0x40B0, 0,
-                                TaskDestructor_80095E8);
+    struct Task *t = TaskCreate(sub_8054224, sizeof(Sprite_Koura), 0x40B0, 0, TaskDestructor_80095E8);
     Sprite_Koura *koura = TASK_DATA(t);
     Sprite *s = &koura->s;
     koura->base.regionX = spriteRegionX;
@@ -69,8 +68,7 @@ void CreateEntity_Koura(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8
     ENEMY_SET_SPAWN_POS_STATIC(koura, me);
     koura->offsetX = 0;
     if (koura->unk54 < 2) {
-        koura->offsetY = QS(sub_801F07C(I(koura->spawnY), I(koura->spawnX), koura->unk54,
-                                        8, NULL, sub_801EE64));
+        koura->offsetY = QS(sub_801F07C(I(koura->spawnY), I(koura->spawnX), koura->unk54, 8, NULL, sub_801EE64));
     } else {
         koura->offsetY = 0;
     }
@@ -78,8 +76,7 @@ void CreateEntity_Koura(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8
     s->x = TO_WORLD_POS(me->x, spriteRegionX);
     s->y = TO_WORLD_POS(me->y, spriteRegionY);
     SET_MAP_ENTITY_INITIALIZED(me);
-    SPRITE_INIT(s, 30, gUnknown_080D8F38[koura->unk54 & 2][0],
-                gUnknown_080D8F38[koura->unk54 & 2][1], 18, 2);
+    SPRITE_INIT(s, 30, gUnknown_080D8F38[koura->unk54 & 2][0], gUnknown_080D8F38[koura->unk54 & 2][1], 18, 2);
 }
 
 static void sub_8054224(void)
@@ -152,8 +149,7 @@ static void sub_8054224(void)
             koura->unk58 = NEGATE(koura->unk58);
         }
 
-        if ((SPRITE_FLAG_GET(s, X_FLIP) && gPlayer.x < QS(pos.x))
-            || (!SPRITE_FLAG_GET(s, X_FLIP) && gPlayer.x > QS(pos.x))) {
+        if ((SPRITE_FLAG_GET(s, X_FLIP) && gPlayer.x < QS(pos.x)) || (!SPRITE_FLAG_GET(s, X_FLIP) && gPlayer.x > QS(pos.x))) {
             gCurTask->main = sub_805462C;
             s->graphics.anim = gUnknown_080D8F38[5][0];
             s->variant = gUnknown_080D8F38[5][1];
diff --git a/src/game/enemies/kubinaga.c b/src/game/enemies/kubinaga.c
index a72fc0c31..a806e76f5 100644
--- a/src/game/enemies/kubinaga.c
+++ b/src/game/enemies/kubinaga.c
@@ -45,11 +45,9 @@ static const u16 gUnknown_080D8F30[][2] = {
     { SA2_ANIM_KUBINAGA_BASE, 1 },
 };
 
-void CreateEntity_Kubinaga(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                           u8 spriteY)
+void CreateEntity_Kubinaga(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t
-        = TaskCreate(sub_80524D0, sizeof(Sprite_Kubinaga), 0x4060, 0, sub_8052F70);
+    struct Task *t = TaskCreate(sub_80524D0, sizeof(Sprite_Kubinaga), 0x4060, 0, sub_8052F70);
     Sprite_Kubinaga *k = TASK_DATA(t);
     Sprite *s = &k->sBase;
 
@@ -70,8 +68,7 @@ void CreateEntity_Kubinaga(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
     s->x = TO_WORLD_POS(me->x, spriteRegionX);
     s->y = TO_WORLD_POS(me->y, spriteRegionY);
 
-    SPRITE_INIT(s, 6, gUnknown_080D8F30[me->d.uData[0] & 1][0],
-                gUnknown_080D8F30[me->d.uData[0] & 1][1], 18, 2);
+    SPRITE_INIT(s, 6, gUnknown_080D8F30[me->d.uData[0] & 1][0], gUnknown_080D8F30[me->d.uData[0] & 1][1], 18, 2);
 
     if (me->d.uData[0] & 1) {
         if (me->d.sData[1]) {
@@ -114,8 +111,8 @@ static void sub_80524D0(void)
     Player_UpdateHomingPosition(k->spawnX, k->spawnY);
     if (k->unkB8 != 0) {
         k->unkB8--;
-    } else if (gPlayer.x > k->spawnX - 0x7800 && gPlayer.x < k->spawnX + 0x7800
-               && gPlayer.y > k->spawnY - 0x6400 && gPlayer.y < k->spawnY + 0x6400) {
+    } else if (gPlayer.x > k->spawnX - 0x7800 && gPlayer.x < k->spawnX + 0x7800 && gPlayer.y > k->spawnY - 0x6400
+               && gPlayer.y < k->spawnY + 0x6400) {
         k->unkBE = 0;
         if (k->unkC0 == 0) {
             k->unkBA = sub_8004418((I(gPlayer.y) - pos.y) + 10, I(gPlayer.x) - pos.x);
@@ -343,19 +340,16 @@ static void sub_8052CC8(Sprite_Kubinaga *k)
 
     if (k->unkC0 == 0) {
         sHead->y = (pos.y - gCamera.y) - 10;
-        transform->rotation
-            = sub_8004418(I(gPlayer.y) - pos.y + 10, I(gPlayer.x) - pos.x);
+        transform->rotation = sub_8004418(I(gPlayer.y) - pos.y + 10, I(gPlayer.x) - pos.x);
     } else {
         if (k->unkC0 & 1) {
 
             sHead->x = sHead->x + 10;
-            transform->rotation
-                = sub_8004418(I(gPlayer.y) - pos.y, (I(gPlayer.x) - pos.x) + 10);
+            transform->rotation = sub_8004418(I(gPlayer.y) - pos.y, (I(gPlayer.x) - pos.x) + 10);
         } else {
 
             sHead->x = sHead->x - 10;
-            transform->rotation
-                = sub_8004418(I(gPlayer.y) - pos.y, (I(gPlayer.x) - pos.x) - 10);
+            transform->rotation = sub_8004418(I(gPlayer.y) - pos.y, (I(gPlayer.x) - pos.x) - 10);
         }
         sHead->y = (pos.y - gCamera.y);
     }
@@ -379,8 +373,8 @@ static void sub_8052CC8(Sprite_Kubinaga *k)
         sHead->prevVariant = -1;
     }
 
-    sHead->frameFlags = gUnknown_030054B8++ | SPRITE_FLAG(PRIORITY, 2)
-        | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE | SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE;
+    sHead->frameFlags
+        = gUnknown_030054B8++ | SPRITE_FLAG(PRIORITY, 2) | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE | SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE;
 
     UpdateSpriteAnimation(sHead);
     TransformSprite(sHead, transform);
diff --git a/src/game/enemies/kura_kura.c b/src/game/enemies/kura_kura.c
index 72037393a..e90bcd4b2 100644
--- a/src/game/enemies/kura_kura.c
+++ b/src/game/enemies/kura_kura.c
@@ -29,11 +29,9 @@ typedef struct {
 void Task_8052024(void);
 void TaskDestructor_8052264(struct Task *);
 
-void CreateEntity_KuraKura(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                           u8 spriteY)
+void CreateEntity_KuraKura(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_8052024, sizeof(Sprite_KuraKura), 0x4050, 0,
-                                TaskDestructor_8052264);
+    struct Task *t = TaskCreate(Task_8052024, sizeof(Sprite_KuraKura), 0x4050, 0, TaskDestructor_8052264);
     Sprite_KuraKura *kk = TASK_DATA(t);
     Sprite *s = &kk->s;
     kk->unkB0 = 0;
diff --git a/src/game/enemies/kyura.c b/src/game/enemies/kyura.c
index 3405cec69..af318b16f 100644
--- a/src/game/enemies/kyura.c
+++ b/src/game/enemies/kyura.c
@@ -34,8 +34,7 @@ void Task_KyuraRecover(void);
 
 void CreateEntity_Kyura(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_KyuraMain, sizeof(Sprite_Kyura), 0x4040, 0,
-                                TaskDestructor_80095E8);
+    struct Task *t = TaskCreate(Task_KyuraMain, sizeof(Sprite_Kyura), 0x4040, 0, TaskDestructor_80095E8);
     Sprite_Kyura *kyura = TASK_DATA(t);
     Sprite *s = &kyura->s;
     kyura->base.regionX = spriteRegionX;
diff --git a/src/game/enemies/madillo.c b/src/game/enemies/madillo.c
index 90f6075ab..7f3a50e99 100644
--- a/src/game/enemies/madillo.c
+++ b/src/game/enemies/madillo.c
@@ -25,11 +25,9 @@ static void Task_MadilloMain(void);
 static void Task_8056230(void);
 static void Task_80564BC(void);
 
-void CreateEntity_Madillo(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                          u8 spriteY)
+void CreateEntity_Madillo(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_MadilloMain, sizeof(Sprite_Madillo), 0x4040, 0,
-                                TaskDestructor_80095E8);
+    struct Task *t = TaskCreate(Task_MadilloMain, sizeof(Sprite_Madillo), 0x4040, 0, TaskDestructor_80095E8);
     Sprite_Madillo *madillo = TASK_DATA(t);
     Sprite *s = &madillo->s;
     madillo->base.regionX = spriteRegionX;
@@ -65,12 +63,10 @@ static void Task_MadilloMain(void)
 
     // TODO: Merge with ENEMY_CLAMP_TO_GROUND macro
     {
-        s32 delta
-            = ENEMY_CLAMP_TO_GROUND_INNER(madillo, madillo->clampParam, sub_801EC3C);
+        s32 delta = ENEMY_CLAMP_TO_GROUND_INNER(madillo, madillo->clampParam, sub_801EC3C);
         if (delta < 0) {
             madillo->offsetY += Q(delta);
-            delta
-                = ENEMY_CLAMP_TO_GROUND_INNER(madillo, madillo->clampParam, sub_801EC3C);
+            delta = ENEMY_CLAMP_TO_GROUND_INNER(madillo, madillo->clampParam, sub_801EC3C);
         }
 
         if (delta > 0) {
@@ -100,8 +96,7 @@ static void Task_MadilloMain(void)
             } else {
                 // _080561BC
                 if (Q(pos.x + 120) > gPlayer.x) {
-                    if (I(madillo->offsetX)
-                        < (me->d.sData[0] + me->d.uData[2]) * TILE_WIDTH) {
+                    if (I(madillo->offsetX) < (me->d.sData[0] + me->d.uData[2]) * TILE_WIDTH) {
                         gCurTask->main = Task_8056230;
                         s->graphics.anim = SA2_ANIM_MADILLO;
                         s->variant = 1;
@@ -148,8 +143,7 @@ static void Task_8056230(void)
             y1 = pos.y + s->hitboxes[0].top;
             y2 = I(p->y) + s2->hitboxes[0].top;
             if ((y1 <= y2 && y1 + (s->hitboxes[0].bottom - s->hitboxes[0].top) >= y2)
-                || (y1 >= y2
-                    && y2 + (s2->hitboxes[0].bottom - s2->hitboxes[0].top) >= y1)) {
+                || (y1 >= y2 && y2 + (s2->hitboxes[0].bottom - s2->hitboxes[0].top) >= y1)) {
                 if ((p->itemEffect & 0x2) == PLAYER_ITEM_EFFECT__NONE) {
                     sub_800CBA4(p);
                 }
@@ -159,10 +153,8 @@ static void Task_8056230(void)
 
     ENEMY_DESTROY_IF_OFFSCREEN(madillo, me, s);
 
-    if ((s->frameFlags & 0x400
-         && I(madillo->offsetX) > (me->d.sData[0] + me->d.uData[2]) * TILE_WIDTH)
-        || (!(s->frameFlags & 0x400)
-            && I(madillo->offsetX) < me->d.sData[0] * TILE_WIDTH)) {
+    if ((s->frameFlags & 0x400 && I(madillo->offsetX) > (me->d.sData[0] + me->d.uData[2]) * TILE_WIDTH)
+        || (!(s->frameFlags & 0x400) && I(madillo->offsetX) < me->d.sData[0] * TILE_WIDTH)) {
         gCurTask->main = Task_80564BC;
         s->graphics.anim = SA2_ANIM_MADILLO;
         s->variant = 0;
diff --git a/src/game/enemies/mon.c b/src/game/enemies/mon.c
index 2dc34b86c..a54f81768 100644
--- a/src/game/enemies/mon.c
+++ b/src/game/enemies/mon.c
@@ -31,8 +31,7 @@ typedef struct {
 void CreateEntity_Mon(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     u32 r2;
-    struct Task *t = TaskCreate(Task_MonMain, sizeof(Sprite_Mon), 0x4010, 0,
-                                TaskDestructor_80095E8);
+    struct Task *t = TaskCreate(Task_MonMain, sizeof(Sprite_Mon), 0x4010, 0, TaskDestructor_80095E8);
     Sprite_Mon *mon = TASK_DATA(t);
     Sprite *s = &mon->s;
     mon->base.regionX = spriteRegionX;
@@ -85,9 +84,8 @@ static void Task_MonMain(void)
         SET_MAP_ENTITY_NOT_INITIALIZED(me, mon->base.spriteX);
         TaskDestroy(gCurTask);
     } else {
-        if ((gPlayer.x > mon->x - Q(DISPLAY_WIDTH / 2))
-            && (gPlayer.x < mon->x + Q(DISPLAY_WIDTH / 2))
-            && (gPlayer.y > mon->y - Q(50)) && (gPlayer.y < mon->y + Q(50))) {
+        if ((gPlayer.x > mon->x - Q(DISPLAY_WIDTH / 2)) && (gPlayer.x < mon->x + Q(DISPLAY_WIDTH / 2)) && (gPlayer.y > mon->y - Q(50))
+            && (gPlayer.y < mon->y + Q(50))) {
             gCurTask->main = Task_Mon_2;
             s->graphics.anim = SA2_ANIM_MON;
             s->variant = 2;
@@ -177,9 +175,8 @@ static void Task_Mon_4(void)
         Player_UpdateHomingPosition(mon->x, mon->y);
 
         if (UpdateSpriteAnimation(s) == 0) {
-            if ((gPlayer.x > mon->x - Q(DISPLAY_WIDTH / 2))
-                && (gPlayer.x < mon->x + Q(DISPLAY_WIDTH / 2))
-                && (gPlayer.y > mon->y - Q(50)) && (gPlayer.y < mon->y + Q(50))) {
+            if ((gPlayer.x > mon->x - Q(DISPLAY_WIDTH / 2)) && (gPlayer.x < mon->x + Q(DISPLAY_WIDTH / 2)) && (gPlayer.y > mon->y - Q(50))
+                && (gPlayer.y < mon->y + Q(50))) {
 
                 ENEMY_TURN_TO_PLAYER(mon->x, s);
 
diff --git a/src/game/enemies/mouse.c b/src/game/enemies/mouse.c
index 061dd474d..2b9e74342 100644
--- a/src/game/enemies/mouse.c
+++ b/src/game/enemies/mouse.c
@@ -31,8 +31,7 @@ static void sub_8057618(void);
 void CreateEntity_Mouse(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     if (gGameMode == GAME_MODE_TIME_ATTACK || gDifficultyLevel != 1) {
-        struct Task *t = TaskCreate(sub_8057348, sizeof(Sprite_Mouse), 0x4040, 0,
-                                    TaskDestructor_80095E8);
+        struct Task *t = TaskCreate(sub_8057348, sizeof(Sprite_Mouse), 0x4040, 0, TaskDestructor_80095E8);
         Sprite_Mouse *mouse = TASK_DATA(t);
         Sprite *s = &mouse->s;
         mouse->base.regionX = spriteRegionX;
@@ -59,11 +58,9 @@ void CreateEntity_Mouse(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8
         }
 
         if (mouse->unk51) {
-            mouse->offsetY = Q(sub_801F07C(I(mouse->spawnY), I(mouse->spawnX),
-                                           mouse->unk50, 8, 0, sub_801EE64));
+            mouse->offsetY = Q(sub_801F07C(I(mouse->spawnY), I(mouse->spawnX), mouse->unk50, 8, 0, sub_801EE64));
         } else {
-            mouse->offsetY = Q(sub_801F07C(I(mouse->spawnY), I(mouse->spawnX),
-                                           mouse->unk50, 8, 0, sub_801EE64));
+            mouse->offsetY = Q(sub_801F07C(I(mouse->spawnY), I(mouse->spawnX), mouse->unk50, 8, 0, sub_801EE64));
         }
         mouse->unk4C = 0;
         mouse->unk52 = 0;
@@ -129,14 +126,12 @@ static void sub_8057348(void)
         }
     }
 
-    if (I(mouse->offsetX) <= (me->d.sData[0] * TILE_WIDTH)
-        && !(s->frameFlags & SPRITE_FLAG_MASK_X_FLIP)) {
+    if (I(mouse->offsetX) <= (me->d.sData[0] * TILE_WIDTH) && !(s->frameFlags & SPRITE_FLAG_MASK_X_FLIP)) {
         gCurTask->main = sub_8057618;
         s->graphics.anim = SA2_ANIM_MOUSE;
         s->variant = 1;
         s->prevVariant = -1;
-    } else if ((I(mouse->offsetX) >= ((me->d.sData[0] + me->d.uData[2]) * TILE_WIDTH)
-                && s->frameFlags & SPRITE_FLAG_MASK_X_FLIP)) {
+    } else if ((I(mouse->offsetX) >= ((me->d.sData[0] + me->d.uData[2]) * TILE_WIDTH) && s->frameFlags & SPRITE_FLAG_MASK_X_FLIP)) {
         gCurTask->main = sub_8057618;
         s->graphics.anim = SA2_ANIM_MOUSE;
         s->variant = 1;
diff --git a/src/game/enemies/pen.c b/src/game/enemies/pen.c
index 7a79869a9..4391a55a1 100644
--- a/src/game/enemies/pen.c
+++ b/src/game/enemies/pen.c
@@ -29,8 +29,7 @@ static void Task_PenTurn(void);
 
 void CreateEntity_Pen(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_PenMove, sizeof(Sprite_Pen), 0x4040, 0,
-                                TaskDestructor_80095E8);
+    struct Task *t = TaskCreate(Task_PenMove, sizeof(Sprite_Pen), 0x4040, 0, TaskDestructor_80095E8);
     Sprite_Pen *pen = TASK_DATA(t);
     Sprite *s = &pen->s;
     pen->base.regionX = spriteRegionX;
@@ -112,14 +111,12 @@ static void Task_PenMove(void)
     }
 
     // Turn when end of range reached
-    if (ENEMY_CROSSED_LEFT_BORDER(pen, me)
-        && !(s->frameFlags & SPRITE_FLAG_MASK_X_FLIP)) {
+    if (ENEMY_CROSSED_LEFT_BORDER(pen, me) && !(s->frameFlags & SPRITE_FLAG_MASK_X_FLIP)) {
         gCurTask->main = Task_PenTurn;
         s->graphics.anim = SA2_ANIM_PEN;
         s->variant = SA2_ANIM_PEN_VARIANT_TURN;
         s->prevVariant = -1;
-    } else if (ENEMY_CROSSED_RIGHT_BORDER(pen, me)
-               && (s->frameFlags & SPRITE_FLAG_MASK_X_FLIP)) {
+    } else if (ENEMY_CROSSED_RIGHT_BORDER(pen, me) && (s->frameFlags & SPRITE_FLAG_MASK_X_FLIP)) {
         gCurTask->main = Task_PenTurn;
         s->graphics.anim = SA2_ANIM_PEN;
         s->variant = SA2_ANIM_PEN_VARIANT_TURN;
diff --git a/src/game/enemies/piko_piko.c b/src/game/enemies/piko_piko.c
index 08e7cf76d..aa0c67f18 100644
--- a/src/game/enemies/piko_piko.c
+++ b/src/game/enemies/piko_piko.c
@@ -27,12 +27,10 @@ static void TaskDestructor_PikoPiko(struct Task *);
 
 #define ENEMY_SPEED_PIKOPIKO Q(1.0)
 
-void CreateEntity_PikoPiko(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                           u8 spriteY)
+void CreateEntity_PikoPiko(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     if (DIFFICULTY_LEVEL_IS_NOT_EASY) {
-        struct Task *t = TaskCreate(Task_PikoPiko, sizeof(Sprite_PikoPiko), 0x4080, 0,
-                                    TaskDestructor_PikoPiko);
+        struct Task *t = TaskCreate(Task_PikoPiko, sizeof(Sprite_PikoPiko), 0x4080, 0, TaskDestructor_PikoPiko);
         Sprite_PikoPiko *piko = TASK_DATA(t);
         Sprite *s = &piko->s;
         piko->base.regionX = spriteRegionX;
diff --git a/src/game/enemies/projectiles.c b/src/game/enemies/projectiles.c
index 9408867ce..5f18f5ee3 100644
--- a/src/game/enemies/projectiles.c
+++ b/src/game/enemies/projectiles.c
@@ -31,8 +31,7 @@ void TaskDestructor_8051200(struct Task *);
 
 void CreateProjectile(ProjInit *init)
 {
-    struct Task *t = TaskCreate(Task_805102C, sizeof(ProjectileA), 0x4000, 0,
-                                TaskDestructor_80511EC);
+    struct Task *t = TaskCreate(Task_805102C, sizeof(ProjectileA), 0x4000, 0, TaskDestructor_80511EC);
     ProjectileA *proj = TASK_DATA(t);
     Sprite *s;
     s32 velocityX, velocityY;
@@ -52,8 +51,7 @@ void CreateProjectile(ProjInit *init)
 
 void CreateSeveralProjectiles(ProjInit *init, u8 count, s8 spreadAngle)
 {
-    struct Task *t = TaskCreate(Task_80510B0, sizeof(ProjectileB), 0x4000, 0,
-                                TaskDestructor_8051200);
+    struct Task *t = TaskCreate(Task_80510B0, sizeof(ProjectileB), 0x4000, 0, TaskDestructor_8051200);
     ProjectileB *proj = TASK_DATA(t);
     Sprite *s;
     u8 i;
diff --git a/src/game/enemies/spinner.c b/src/game/enemies/spinner.c
index 571b4b77b..cd82280be 100644
--- a/src/game/enemies/spinner.c
+++ b/src/game/enemies/spinner.c
@@ -21,11 +21,9 @@ typedef struct {
 
 void Task_EnemySpinner(void);
 
-void CreateEntity_Spinner(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                          u8 spriteY)
+void CreateEntity_Spinner(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_EnemySpinner, sizeof(Sprite_Spinner), 0x4040, 0,
-                                TaskDestructor_80095E8);
+    struct Task *t = TaskCreate(Task_EnemySpinner, sizeof(Sprite_Spinner), 0x4040, 0, TaskDestructor_80095E8);
     Sprite_Spinner *spinner = TASK_DATA(t);
     Sprite *s = &spinner->s;
     spinner->base.regionX = spriteRegionX;
@@ -75,14 +73,12 @@ void Task_EnemySpinner(void)
             x1 = pos.x + s->hitboxes[1].left;
             x2 = I(p->x) + s2->hitboxes[0].left;
             if ((x1 <= x2 && x1 + (s->hitboxes[1].right - s->hitboxes[1].left) >= x2)
-                || (x1 >= x2
-                    && x2 + (s2->hitboxes[0].right - s2->hitboxes[0].left) >= x1)) {
+                || (x1 >= x2 && x2 + (s2->hitboxes[0].right - s2->hitboxes[0].left) >= x1)) {
                 s32 y1, y2;
                 y1 = pos.y + s->hitboxes[1].top;
                 y2 = I(p->y) + s2->hitboxes[0].top;
                 if ((y1 <= y2 && y1 + (s->hitboxes[1].bottom - s->hitboxes[1].top) >= y2)
-                    || (y1 >= y2
-                        && y2 + (s2->hitboxes[0].bottom - s2->hitboxes[0].top) >= y1)) {
+                    || (y1 >= y2 && y2 + (s2->hitboxes[0].bottom - s2->hitboxes[0].top) >= y1)) {
                     if ((p->itemEffect & 0x2) == PLAYER_ITEM_EFFECT__NONE) {
                         sub_800CBA4(p);
                     }
diff --git a/src/game/enemies/star.c b/src/game/enemies/star.c
index 3265eb04d..ce5e962e5 100644
--- a/src/game/enemies/star.c
+++ b/src/game/enemies/star.c
@@ -27,19 +27,18 @@ static void Task_StarOpen(void);
 #define SPIN_TIME       GBA_FRAMES_PER_SECOND * 2
 #define OPEN_CLOSE_TIME GBA_FRAMES_PER_SECOND / 3
 
-#define STAR_SWITCH_TASK_ON_TIMER_ZERO(_star, _sprite, _time, _anim, _variant, _task)   \
-    if (--_star->timer == 0) {                                                          \
-        _star->timer = _time;                                                           \
-        _sprite->graphics.anim = _anim;                                                 \
-        _sprite->variant = _variant;                                                    \
-        _sprite->prevVariant = -1;                                                      \
-        gCurTask->main = _task;                                                         \
+#define STAR_SWITCH_TASK_ON_TIMER_ZERO(_star, _sprite, _time, _anim, _variant, _task)                                                      \
+    if (--_star->timer == 0) {                                                                                                             \
+        _star->timer = _time;                                                                                                              \
+        _sprite->graphics.anim = _anim;                                                                                                    \
+        _sprite->variant = _variant;                                                                                                       \
+        _sprite->prevVariant = -1;                                                                                                         \
+        gCurTask->main = _task;                                                                                                            \
     }
 
 void CreateEntity_Star(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_StarIdle, sizeof(Sprite_Star), 0x4050, 0,
-                                TaskDestructor_80095E8);
+    struct Task *t = TaskCreate(Task_StarIdle, sizeof(Sprite_Star), 0x4050, 0, TaskDestructor_80095E8);
     Sprite_Star *star = TASK_DATA(t);
     Sprite *s = &star->s;
     star->base.regionX = spriteRegionX;
@@ -59,43 +58,36 @@ void CreateEntity_Star(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 s
     SPRITE_INIT(s, 25, SA2_ANIM_STAR, 0, 18, 2);
 }
 
-#define STAR_TASK(_time, _anim, _variant, _nextTask, _code_insert)                      \
-    {                                                                                   \
-        Sprite_Star *star = TASK_DATA(gCurTask);                                        \
-        Sprite *s = &star->s;                                                           \
-        MapEntity *me = star->base.me;                                                  \
-                                                                                        \
-        Vec2_32 pos;                                                                    \
-        ENEMY_UPDATE_POSITION_STATIC(star, s, pos.x, pos.y);                            \
-                                                                                        \
-        { _code_insert };                                                               \
-        ENEMY_DESTROY_IF_OFFSCREEN_RAW(star, me, s, pos.x, pos.y);                      \
-                                                                                        \
-        STAR_SWITCH_TASK_ON_TIMER_ZERO(star, s, _time, _anim, _variant, _nextTask);     \
-                                                                                        \
-        ENEMY_UPDATE_EX_RAW(s, star->spawnX, star->spawnY, {});                         \
+#define STAR_TASK(_time, _anim, _variant, _nextTask, _code_insert)                                                                         \
+    {                                                                                                                                      \
+        Sprite_Star *star = TASK_DATA(gCurTask);                                                                                           \
+        Sprite *s = &star->s;                                                                                                              \
+        MapEntity *me = star->base.me;                                                                                                     \
+                                                                                                                                           \
+        Vec2_32 pos;                                                                                                                       \
+        ENEMY_UPDATE_POSITION_STATIC(star, s, pos.x, pos.y);                                                                               \
+                                                                                                                                           \
+        { _code_insert };                                                                                                                  \
+        ENEMY_DESTROY_IF_OFFSCREEN_RAW(star, me, s, pos.x, pos.y);                                                                         \
+                                                                                                                                           \
+        STAR_SWITCH_TASK_ON_TIMER_ZERO(star, s, _time, _anim, _variant, _nextTask);                                                        \
+                                                                                                                                           \
+        ENEMY_UPDATE_EX_RAW(s, star->spawnX, star->spawnY, {});                                                                            \
     }
 
-static void Task_StarIdle(void)
-{
-    STAR_TASK(OPEN_CLOSE_TIME, SA2_ANIM_STAR, 1, Task_StarClose,
-              { ENEMY_DESTROY_IF_PLAYER_HIT_2(s, pos) });
-}
+static void Task_StarIdle(void) { STAR_TASK(OPEN_CLOSE_TIME, SA2_ANIM_STAR, 1, Task_StarClose, { ENEMY_DESTROY_IF_PLAYER_HIT_2(s, pos) }); }
 
 static void Task_StarClose(void)
 {
-    STAR_TASK(SPIN_TIME, SA2_ANIM_STAR, 2, Task_StarSpin,
-              { sub_800C84C(s, pos.x, pos.y); });
+    STAR_TASK(SPIN_TIME, SA2_ANIM_STAR, 2, Task_StarSpin, { sub_800C84C(s, pos.x, pos.y); });
 }
 
 static void Task_StarSpin(void)
 {
-    STAR_TASK(OPEN_CLOSE_TIME, SA2_ANIM_STAR, 3, Task_StarOpen,
-              { sub_800C84C(s, pos.x, pos.y); });
+    STAR_TASK(OPEN_CLOSE_TIME, SA2_ANIM_STAR, 3, Task_StarOpen, { sub_800C84C(s, pos.x, pos.y); });
 }
 
 static void Task_StarOpen(void)
 {
-    STAR_TASK(IDLE_TIME, SA2_ANIM_STAR, 0, Task_StarIdle,
-              { sub_800C84C(s, pos.x, pos.y); });
+    STAR_TASK(IDLE_TIME, SA2_ANIM_STAR, 0, Task_StarIdle, { sub_800C84C(s, pos.x, pos.y); });
 }
diff --git a/src/game/enemies/straw.c b/src/game/enemies/straw.c
index d94eff811..7aab841d1 100644
--- a/src/game/enemies/straw.c
+++ b/src/game/enemies/straw.c
@@ -37,8 +37,7 @@ void CreateEntity_Straw(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8
 {
     if (DIFFICULTY_LEVEL_IS_NOT_EASY) {
         s32 rand;
-        struct Task *t = TaskCreate(Task_StrawMain, sizeof(Sprite_Straw), 0x4040, 0,
-                                    TaskDestructor_80095E8);
+        struct Task *t = TaskCreate(Task_StrawMain, sizeof(Sprite_Straw), 0x4040, 0, TaskDestructor_80095E8);
         Sprite_Straw *straw = TASK_DATA(t);
         Sprite *s = &straw->s;
         straw->base.regionX = spriteRegionX;
diff --git a/src/game/enemies/yado.c b/src/game/enemies/yado.c
index 3a454a797..ac13296b9 100644
--- a/src/game/enemies/yado.c
+++ b/src/game/enemies/yado.c
@@ -32,15 +32,14 @@ void TaskDestructor_Yado(struct Task *);
 #define YADO_PLAYER_ACCEL  -Q(9.0)
 #define YADO_PROJ_COOLDOWN (2 * GBA_FRAMES_PER_SECOND)
 
-#define IS_YADO_FACING_PLAYER(_yado, _yadoX, _player)                                   \
-    (((I(gPlayer.x) < _yadoX) && (s->frameFlags & SPRITE_FLAG_MASK_X_FLIP))             \
+#define IS_YADO_FACING_PLAYER(_yado, _yadoX, _player)                                                                                      \
+    (((I(gPlayer.x) < _yadoX) && (s->frameFlags & SPRITE_FLAG_MASK_X_FLIP))                                                                \
      || ((I(gPlayer.x) > _yadoX) && (~s->frameFlags & SPRITE_FLAG_MASK_X_FLIP)))
 
 void CreateEntity_Yado(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     s32 regX, regY;
-    struct Task *t
-        = TaskCreate(Task_YadoMain, sizeof(Sprite_Yado), 0x4090, 0, TaskDestructor_Yado);
+    struct Task *t = TaskCreate(Task_YadoMain, sizeof(Sprite_Yado), 0x4090, 0, TaskDestructor_Yado);
     Sprite_Yado *yado = TASK_DATA(t);
     Sprite *s = &yado->s;
     yado->base.regionX = spriteRegionX;
@@ -154,17 +153,12 @@ void Task_8055084(void)
                 x1 = x + s->hitboxes[0].left;
                 x2 = I(a4->posX) + a4->s.hitboxes[1].left;
                 if ((x1 <= x2 && x1 + (s->hitboxes[0].right - s->hitboxes[0].left) >= x2)
-                    || (x1 >= x2
-                        && x2 + (a4->s.hitboxes[1].right - a4->s.hitboxes[1].left)
-                            >= x1)) {
+                    || (x1 >= x2 && x2 + (a4->s.hitboxes[1].right - a4->s.hitboxes[1].left) >= x1)) {
                     s32 y1, y2;
                     y1 = y + s->hitboxes[0].top;
                     y2 = I(a4->posY) + a4->s.hitboxes[1].top;
-                    if ((y1 <= y2
-                         && y1 + (s->hitboxes[0].bottom - s->hitboxes[0].top) >= y2)
-                        || (y1 >= y2
-                            && y2 + (a4->s.hitboxes[1].bottom - a4->s.hitboxes[1].top)
-                                >= y1)) {
+                    if ((y1 <= y2 && y1 + (s->hitboxes[0].bottom - s->hitboxes[0].top) >= y2)
+                        || (y1 >= y2 && y2 + (a4->s.hitboxes[1].bottom - a4->s.hitboxes[1].top) >= y1)) {
                         s16 x3, y3;
                         if (IS_MULTI_PLAYER) {
                             struct UNK_3005510 *unk = sub_8019224();
diff --git a/src/game/game_over.c b/src/game/game_over.c
index e75839c2c..addf12b3a 100644
--- a/src/game/game_over.c
+++ b/src/game/game_over.c
@@ -28,8 +28,7 @@ void Task_FadeoutToOverScreen(void);
 
 void CreateGameOverScreen(LostLifeCause lostLifeCause)
 {
-    struct Task *t = TaskCreate(Task_FadeoutToOverScreen, sizeof(GameOverScreenFade),
-                                0x2220, 0, NULL);
+    struct Task *t = TaskCreate(Task_FadeoutToOverScreen, sizeof(GameOverScreenFade), 0x2220, 0, NULL);
     GameOverScreenFade *screen = TASK_DATA(t);
 
     ScreenFade *fade = &screen->unk0;
@@ -110,11 +109,9 @@ static void InitOverScreen(LostLifeCause lostLifeCause)
     gFlags |= FLAGS_UPDATE_BACKGROUND_PALETTES;
 
     if (lostLifeCause & OVER_CAUSE_ZERO_LIVES) {
-        t = TaskCreate(Task_GameOverScreenMain, sizeof(GameOverScreen), 0x1000, 0,
-                       TaskDestructor_GameOverTimeOverScreen);
+        t = TaskCreate(Task_GameOverScreenMain, sizeof(GameOverScreen), 0x1000, 0, TaskDestructor_GameOverTimeOverScreen);
     } else {
-        t = TaskCreate(Task_TimeOverScreenMain, sizeof(GameOverScreen), 0x1000, 0,
-                       TaskDestructor_GameOverTimeOverScreen);
+        t = TaskCreate(Task_TimeOverScreenMain, sizeof(GameOverScreen), 0x1000, 0, TaskDestructor_GameOverTimeOverScreen);
     }
 
     screen = TASK_DATA(t);
@@ -185,8 +182,7 @@ void Task_GameOverScreenMain(void)
         screen->unk0.brightness = Q(0);
         screen->unk0.flags = SCREEN_FADE_FLAG_LIGHTEN;
         screen->unk0.speed = Q(4.0);
-        screen->unk0.bldCnt
-            = (BLDCNT_TGT2_ALL | BLDCNT_EFFECT_LIGHTEN | BLDCNT_TGT1_OBJ);
+        screen->unk0.bldCnt = (BLDCNT_TGT2_ALL | BLDCNT_EFFECT_LIGHTEN | BLDCNT_TGT1_OBJ);
         screen->unk0.bldAlpha = 0;
     }
 
@@ -195,8 +191,7 @@ void Task_GameOverScreenMain(void)
         screen->unk0.brightness = Q(0);
         screen->unk0.flags = (SCREEN_FADE_FLAG_2 | SCREEN_FADE_FLAG_DARKEN);
         screen->unk0.speed = Q(4.0);
-        screen->unk0.bldCnt
-            = (BLDCNT_TGT2_ALL | BLDCNT_EFFECT_LIGHTEN | BLDCNT_TGT1_OBJ);
+        screen->unk0.bldCnt = (BLDCNT_TGT2_ALL | BLDCNT_EFFECT_LIGHTEN | BLDCNT_TGT1_OBJ);
         screen->unk0.bldAlpha = 0;
     }
 
@@ -216,9 +211,8 @@ void Task_GameOverScreenMain(void)
         screen->unk0.brightness = Q(0);
         screen->unk0.flags = SCREEN_FADE_FLAG_LIGHTEN;
         screen->unk0.speed = Q(1. / 4.);
-        screen->unk0.bldCnt
-            = (BLDCNT_EFFECT_LIGHTEN | BLDCNT_TGT1_BD | BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1
-               | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT2_ALL);
+        screen->unk0.bldCnt = (BLDCNT_EFFECT_LIGHTEN | BLDCNT_TGT1_BD | BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2
+                               | BLDCNT_TGT1_BG3 | BLDCNT_TGT2_ALL);
         screen->unk0.bldAlpha = 0;
 
         screen->framesUntilDone = 120;
@@ -240,8 +234,7 @@ void sub_80369D8(void)
         screen->unk0.brightness = Q(0);
         screen->unk0.flags = (SCREEN_FADE_FLAG_LIGHTEN);
         screen->unk0.speed = Q(1.0);
-        screen->unk0.bldCnt
-            = (BLDCNT_EFFECT_LIGHTEN | BLDCNT_TGT1_ALL | BLDCNT_TGT2_ALL);
+        screen->unk0.bldCnt = (BLDCNT_EFFECT_LIGHTEN | BLDCNT_TGT1_ALL | BLDCNT_TGT2_ALL);
         screen->unk0.bldAlpha = 0;
         memset(gBgPalette, RGB16(31, 7, 0), sizeof(gBgPalette));
         gFlags |= 0x1;
@@ -266,8 +259,7 @@ void Task_TimeOverScreenMain(void)
         screen->unk0.brightness = Q(0);
         screen->unk0.flags = SCREEN_FADE_FLAG_LIGHTEN;
         screen->unk0.speed = Q(4.0);
-        screen->unk0.bldCnt
-            = (BLDCNT_TGT2_ALL | BLDCNT_EFFECT_LIGHTEN | BLDCNT_TGT1_OBJ);
+        screen->unk0.bldCnt = (BLDCNT_TGT2_ALL | BLDCNT_EFFECT_LIGHTEN | BLDCNT_TGT1_OBJ);
         screen->unk0.bldAlpha = 0;
     }
 
@@ -276,8 +268,7 @@ void Task_TimeOverScreenMain(void)
         screen->unk0.brightness = Q(0);
         screen->unk0.flags = (SCREEN_FADE_FLAG_2 | SCREEN_FADE_FLAG_DARKEN);
         screen->unk0.speed = Q(2.0);
-        screen->unk0.bldCnt
-            = (BLDCNT_TGT2_ALL | BLDCNT_EFFECT_LIGHTEN | BLDCNT_TGT1_OBJ);
+        screen->unk0.bldCnt = (BLDCNT_TGT2_ALL | BLDCNT_EFFECT_LIGHTEN | BLDCNT_TGT1_OBJ);
         screen->unk0.bldAlpha = 0;
     }
 
diff --git a/src/game/heart_particles_effect.c b/src/game/heart_particles_effect.c
index 9f5c48b1a..d90d35a72 100644
--- a/src/game/heart_particles_effect.c
+++ b/src/game/heart_particles_effect.c
@@ -30,8 +30,7 @@ static void sub_8086BE8(u8);
 void CreateHeartParticles(void)
 {
     u8 i;
-    struct Task *t
-        = TaskCreate(sub_8086A88, sizeof(HeartParticles), 0x4000, 0, sub_8086CBC);
+    struct Task *t = TaskCreate(sub_8086A88, sizeof(HeartParticles), 0x4000, 0, sub_8086CBC);
     HeartParticles *unk998 = TASK_DATA(t);
     unk998->unkC2 = 0;
     unk998->unkE4 = 0;
diff --git a/src/game/interactables_1/booster.c b/src/game/interactables_1/booster.c
index 53fc84d1a..553e61d4f 100644
--- a/src/game/interactables_1/booster.c
+++ b/src/game/interactables_1/booster.c
@@ -44,22 +44,20 @@ const TileInfo sBoosterAnimationData[2][6] = {
 #define BOOSTER_SPEED 3072
 
 // Look left and accelerate
-#define BOOSTER_ACCEL_LEFT(player)                                                      \
-    (player).moveState |= MOVESTATE_FACING_LEFT;                                        \
-    if (gPlayer.speedGroundX > -BOOSTER_SPEED)                                          \
+#define BOOSTER_ACCEL_LEFT(player)                                                                                                         \
+    (player).moveState |= MOVESTATE_FACING_LEFT;                                                                                           \
+    if (gPlayer.speedGroundX > -BOOSTER_SPEED)                                                                                             \
         gPlayer.speedGroundX = -BOOSTER_SPEED;
 
 // Look right and accelerate
-#define BOOSTER_ACCEL_RIGHT(player)                                                     \
-    (player).moveState &= ~MOVESTATE_FACING_LEFT;                                       \
-    if (gPlayer.speedGroundX < BOOSTER_SPEED)                                           \
+#define BOOSTER_ACCEL_RIGHT(player)                                                                                                        \
+    (player).moveState &= ~MOVESTATE_FACING_LEFT;                                                                                          \
+    if (gPlayer.speedGroundX < BOOSTER_SPEED)                                                                                              \
         gPlayer.speedGroundX = BOOSTER_SPEED;
 
-void CreateEntity_Booster(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                          u8 spriteY)
+void CreateEntity_Booster(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_Interactable_Booster, sizeof(Sprite_Booster),
-                                0x2000, 0, TaskDestructor_80095E8);
+    struct Task *t = TaskCreate(Task_Interactable_Booster, sizeof(Sprite_Booster), 0x2000, 0, TaskDestructor_80095E8);
     Sprite_Booster *booster = TASK_DATA(t);
     Sprite *s = &booster->s;
     u32 value;
@@ -115,8 +113,7 @@ void Task_Interactable_Booster(void)
     s->x = screenX - gCamera.x;
     s->y = screenY - gCamera.y;
 
-    if (!(gPlayer.moveState & (MOVESTATE_DEAD | MOVESTATE_IN_AIR))
-        && (sub_800C204(s, screenX, screenY, 0, &gPlayer, 0) == 1)) {
+    if (!(gPlayer.moveState & (MOVESTATE_DEAD | MOVESTATE_IN_AIR)) && (sub_800C204(s, screenX, screenY, 0, &gPlayer, 0) == 1)) {
         Player_TransitionCancelFlyingAndBoost(&gPlayer);
 
         if (gPlayer.moveState & MOVESTATE_4) {
diff --git a/src/game/interactables_1/bouncy_bar.c b/src/game/interactables_1/bouncy_bar.c
index 538015e6c..57cf24e5b 100644
--- a/src/game/interactables_1/bouncy_bar.c
+++ b/src/game/interactables_1/bouncy_bar.c
@@ -32,12 +32,10 @@ const s8 gUnknown_080D94EE[] = { -16, -18, -20 };
 
 const s16 gUnknown_080D94F2[] = { -384, -384, -384 };
 
-void CreateEntity_BouncyBar(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                            u8 spriteY)
+void CreateEntity_BouncyBar(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     Sprite *s;
-    struct Task *t
-        = TaskCreate(sub_806160C, sizeof(BouncyBar), 0x2010, 0, TaskDestructor_80095E8);
+    struct Task *t = TaskCreate(sub_806160C, sizeof(BouncyBar), 0x2010, 0, TaskDestructor_80095E8);
     BouncyBar *bar = TASK_DATA(t);
 
     s = &bar->s;
@@ -89,9 +87,8 @@ void sub_806160C(void)
     s->x = screenX - gCamera.x;
     s->y = screenY - gCamera.y;
 
-    if (!(gPlayer.moveState & MOVESTATE_DEAD)
-        && (sub_800C204(s, screenX, screenY, 0, &gPlayer, 0) == 1)
-        && (gPlayer.speedAirY > 0) && (I(gPlayer.y) + 4) < screenY) {
+    if (!(gPlayer.moveState & MOVESTATE_DEAD) && (sub_800C204(s, screenX, screenY, 0, &gPlayer, 0) == 1) && (gPlayer.speedAirY > 0)
+        && (I(gPlayer.y) + 4) < screenY) {
         gPlayer.unk64 = 0x32;
         gPlayer.transition = PLTRANS_PT5;
 
@@ -103,8 +100,7 @@ void sub_806160C(void)
         bar->unk3D = (bar->unk3C * 5) + 10;
         bar->unk3E = gUnknown_080D94E8[bar->unk3C];
 
-        bar->unk40 = screenX - I(gPlayer.x) >= 0 ? screenX - I(gPlayer.x)
-                                                 : I(gPlayer.x) - screenX;
+        bar->unk40 = screenX - I(gPlayer.x) >= 0 ? screenX - I(gPlayer.x) : I(gPlayer.x) - screenX;
 
         gCurTask->main = sub_80617A4;
         gPlayer.moveState |= MOVESTATE_400000;
@@ -152,8 +148,7 @@ void sub_80617A4(void)
             }
 
             gPlayer.speedAirY = gUnknown_080D94F2[bar->unk3C];
-            gPlayer.speedAirY
-                += ((temp * bar->unk3E) * gUnknown_080D94EE[bar->unk3C]) >> 1;
+            gPlayer.speedAirY += ((temp * bar->unk3E) * gUnknown_080D94EE[bar->unk3C]) >> 1;
             gPlayer.moveState &= ~MOVESTATE_400000;
             gPlayer.moveState &= ~MOVESTATE_100;
         }
diff --git a/src/game/interactables_1/checkpoint.c b/src/game/interactables_1/checkpoint.c
index 3c00c36f0..a65cabc93 100644
--- a/src/game/interactables_1/checkpoint.c
+++ b/src/game/interactables_1/checkpoint.c
@@ -49,14 +49,11 @@ extern u32 gCheckpointTime;
  *
  * Using a struct doesn't match */
 static const u16 sAnimIdsCheckpoint[NUM_COURSE_ZONES + 1][2] = {
-    [ZONE_1] = { SA2_ANIM_898, 0 }, [ZONE_2] = { SA2_ANIM_899, 0 },
-    [ZONE_3] = { SA2_ANIM_903, 0 }, [ZONE_4] = { SA2_ANIM_902, 0 },
-    [ZONE_5] = { SA2_ANIM_904, 0 }, [ZONE_6] = { SA2_ANIM_947, 0 },
-    [ZONE_7] = { SA2_ANIM_905, 0 }, [ZONE_FINAL] = { SA2_ANIM_899, 0 },
+    [ZONE_1] = { SA2_ANIM_898, 0 }, [ZONE_2] = { SA2_ANIM_899, 0 }, [ZONE_3] = { SA2_ANIM_903, 0 }, [ZONE_4] = { SA2_ANIM_902, 0 },
+    [ZONE_5] = { SA2_ANIM_904, 0 }, [ZONE_6] = { SA2_ANIM_947, 0 }, [ZONE_7] = { SA2_ANIM_905, 0 }, [ZONE_FINAL] = { SA2_ANIM_899, 0 },
 };
 
-void CreateEntity_Checkpoint(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                             u8 spriteY)
+void CreateEntity_Checkpoint(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     struct Task *t;
     Sprite_Checkpoint *chkPt;
@@ -65,11 +62,9 @@ void CreateEntity_Checkpoint(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY
     u16 anim;
     u8 variant;
     if (gBossIndex == 0) {
-        t = TaskCreate(Task_8062FD8, sizeof(Sprite_Checkpoint), 0x2010, 0,
-                       TaskDestructor_8063214);
+        t = TaskCreate(Task_8062FD8, sizeof(Sprite_Checkpoint), 0x2010, 0, TaskDestructor_8063214);
     } else {
-        t = TaskCreate(Task_806319C, sizeof(Sprite_Checkpoint), 0x2010, 0,
-                       TaskDestructor_8063214);
+        t = TaskCreate(Task_806319C, sizeof(Sprite_Checkpoint), 0x2010, 0, TaskDestructor_8063214);
     }
 
     chkPt = TASK_DATA(t);
@@ -122,8 +117,7 @@ void Task_8062FD8(void)
         TaskDestroy(chkPt->task);
         TaskDestroy(gCurTask);
     } else {
-        if (!(gPlayer.moveState & (MOVESTATE_400000 | MOVESTATE_DEAD))
-            && posX <= I(gPlayer.x)) {
+        if (!(gPlayer.moveState & (MOVESTATE_400000 | MOVESTATE_DEAD)) && posX <= I(gPlayer.x)) {
             gPlayer.checkPointX = gUnknown_080D63FC[gCurrentLevel][0];
             gPlayer.checkPointY = gUnknown_080D63FC[gCurrentLevel][1];
             gPlayer.checkpointTime = gCheckpointTime;
@@ -213,8 +207,7 @@ void Task_8063228(struct Task *unused)
         offset = numColors >> 16;
         numColors %= 256;
 
-        DmaCopy32(3, &gRefSpriteTables->palettes[palId * 16], &gBgPalette[offset],
-                  numColors * sizeof(u16));
+        DmaCopy32(3, &gRefSpriteTables->palettes[palId * 16], &gBgPalette[offset], numColors * sizeof(u16));
 
         gFlags |= FLAGS_UPDATE_BACKGROUND_PALETTES;
     }
@@ -236,8 +229,7 @@ static void Task_Interactable_Toggle_Checkpoint(void)
     if (IS_OUT_OF_CAM_RANGE(screenX, screenY)) {
         me->x = toggle->base.spriteX;
         TaskDestroy(gCurTask);
-    } else if (!(gPlayer.moveState & (MOVESTATE_400000 | MOVESTATE_DEAD))
-               && posX <= I(gPlayer.x)) {
+    } else if (!(gPlayer.moveState & (MOVESTATE_400000 | MOVESTATE_DEAD)) && posX <= I(gPlayer.x)) {
         gPlayer.checkPointX = gUnknown_080D63FC[gCurrentLevel][0];
         gPlayer.checkPointY = gUnknown_080D63FC[gCurrentLevel][1];
         gPlayer.checkpointTime = gCheckpointTime;
@@ -252,12 +244,10 @@ static void Task_Interactable_Toggle_Checkpoint(void)
     }
 }
 
-void CreateEntity_Toggle_Checkpoint(MapEntity *in_ia, u16 spriteRegionX,
-                                    u16 spriteRegionY, u8 spriteY)
+void CreateEntity_Toggle_Checkpoint(MapEntity *in_ia, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     if (gBossIndex == 0) {
-        struct Task *t = TaskCreate(Task_Interactable_Toggle_Checkpoint,
-                                    sizeof(Sprite_Toggle_Checkpoint), 0x2010, 0, NULL);
+        struct Task *t = TaskCreate(Task_Interactable_Toggle_Checkpoint, sizeof(Sprite_Toggle_Checkpoint), 0x2010, 0, NULL);
 
         Sprite_Toggle_Checkpoint *toggle = TASK_DATA(t);
         toggle->base.regionX = spriteRegionX;
diff --git a/src/game/interactables_1/corkscrew.c b/src/game/interactables_1/corkscrew.c
index 5fcfdb2d3..d83bae169 100644
--- a/src/game/interactables_1/corkscrew.c
+++ b/src/game/interactables_1/corkscrew.c
@@ -35,11 +35,9 @@ void Task_8060D34(void)
 
     if (PLAYER_IS_ALIVE) {
         if ((x + (me->d.sData[0] * TILE_WIDTH) <= I(gPlayer.x)
-             && (x + (me->d.sData[0] * TILE_WIDTH) + (me->d.uData[2] * TILE_WIDTH)
-                 >= I(gPlayer.x)))
+             && (x + (me->d.sData[0] * TILE_WIDTH) + (me->d.uData[2] * TILE_WIDTH) >= I(gPlayer.x)))
             && (y + (me->d.sData[1] * TILE_WIDTH) <= I(gPlayer.y)
-                && y + (me->d.sData[1] * TILE_WIDTH) + (me->d.uData[3] * TILE_WIDTH)
-                    >= I(gPlayer.y))) {
+                && y + (me->d.sData[1] * TILE_WIDTH) + (me->d.uData[3] * TILE_WIDTH) >= I(gPlayer.y))) {
             if (x < I(gPlayer.x) && (corkscrew->base.spriteY & 1)) {
                 s32 idx;
                 s32 y24_8;
@@ -52,8 +50,7 @@ void Task_8060D34(void)
 
                 gPlayer.speedAirY = 0;
                 gCurTask->main = sub_8060ED0;
-            } else if ((x >= I(gPlayer.x)) && gPlayer.speedGroundX > Q_8_8(4)
-                       && !(gPlayer.moveState & MOVESTATE_IN_AIR)
+            } else if ((x >= I(gPlayer.x)) && gPlayer.speedGroundX > Q_8_8(4) && !(gPlayer.moveState & MOVESTATE_IN_AIR)
                        && !(gPlayer.unk5E & gPlayerControls.jump)) {
                 corkscrew->base.spriteY |= 1;
             } else {
@@ -148,11 +145,9 @@ void sub_8061088(void)
 
     if (PLAYER_IS_ALIVE) {
         if ((x + (me->d.sData[0] * TILE_WIDTH) <= I(gPlayer.x)
-             && (x + (me->d.sData[0] * TILE_WIDTH) + (me->d.uData[2] * TILE_WIDTH)
-                 >= I(gPlayer.x)))
+             && (x + (me->d.sData[0] * TILE_WIDTH) + (me->d.uData[2] * TILE_WIDTH) >= I(gPlayer.x)))
             && (y + (me->d.sData[1] * TILE_WIDTH) <= I(gPlayer.y)
-                && y + (me->d.sData[1] * TILE_WIDTH) + (me->d.uData[3] * TILE_WIDTH)
-                    >= I(gPlayer.y))) {
+                && y + (me->d.sData[1] * TILE_WIDTH) + (me->d.uData[3] * TILE_WIDTH) >= I(gPlayer.y))) {
             if (x > I(gPlayer.x) && (corkscrew->base.spriteY & 1)) {
                 s32 idx;
                 s32 y24_8;
@@ -165,8 +160,7 @@ void sub_8061088(void)
 
                 gPlayer.speedAirY = 0;
                 gCurTask->main = sub_8061228;
-            } else if ((x <= I(gPlayer.x)) && gPlayer.speedGroundX < -Q_8_8(4)
-                       && !(gPlayer.moveState & MOVESTATE_IN_AIR)
+            } else if ((x <= I(gPlayer.x)) && gPlayer.speedGroundX < -Q_8_8(4) && !(gPlayer.moveState & MOVESTATE_IN_AIR)
                        && !(gPlayer.unk5E & gPlayerControls.jump)) {
                 corkscrew->base.spriteY |= 1;
             } else {
@@ -247,8 +241,7 @@ void sub_8061228(void)
     }
 }
 
-void CreateEntity_Corkscrew_Start(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                  u8 spriteY)
+void CreateEntity_Corkscrew_Start(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     struct Task *t = TaskCreate(Task_8060D34, sizeof(Sprite_Corkscrew), 0x2000, 0, NULL);
     Sprite_Corkscrew *corkscrew = TASK_DATA(t);
@@ -263,8 +256,7 @@ void CreateEntity_Corkscrew_Start(MapEntity *me, u16 spriteRegionX, u16 spriteRe
     corkscrew->unk10 = Q(4);
 }
 
-void CreateEntity_Corkscrew_End(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                u8 spriteY)
+void CreateEntity_Corkscrew_End(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     struct Task *t = TaskCreate(sub_8061088, sizeof(Sprite_Corkscrew), 0x2000, 0, NULL);
     Sprite_Corkscrew *corkscrew = TASK_DATA(t);
diff --git a/src/game/interactables_1/corkscrew_3d.c b/src/game/interactables_1/corkscrew_3d.c
index bcc4bb3d7..4b515a5a4 100644
--- a/src/game/interactables_1/corkscrew_3d.c
+++ b/src/game/interactables_1/corkscrew_3d.c
@@ -41,11 +41,9 @@ void Task_8061914(void)
 
     if (PLAYER_IS_ALIVE) {
         if ((x + (me->d.sData[0] * TILE_WIDTH) <= I(gPlayer.x)
-             && (x + (me->d.sData[0] * TILE_WIDTH) + (me->d.uData[2] * TILE_WIDTH)
-                 >= I(gPlayer.x)))
+             && (x + (me->d.sData[0] * TILE_WIDTH) + (me->d.uData[2] * TILE_WIDTH) >= I(gPlayer.x)))
             && (y + (me->d.sData[1] * TILE_WIDTH) <= I(gPlayer.y)
-                && y + (me->d.sData[1] * TILE_WIDTH) + (me->d.uData[3] * TILE_WIDTH)
-                    >= I(gPlayer.y))) {
+                && y + (me->d.sData[1] * TILE_WIDTH) + (me->d.uData[3] * TILE_WIDTH) >= I(gPlayer.y))) {
             if (x < I(gPlayer.x) && (corkscrew->base.spriteY & 1)) {
                 s32 idx;
                 s32 y24_8;
@@ -58,8 +56,7 @@ void Task_8061914(void)
 
                 gPlayer.speedAirY = 0;
                 gCurTask->main = sub_8061AB0;
-            } else if ((x >= I(gPlayer.x)) && gPlayer.speedGroundX > Q_8_8(4)
-                       && !(gPlayer.moveState & MOVESTATE_IN_AIR)
+            } else if ((x >= I(gPlayer.x)) && gPlayer.speedGroundX > Q_8_8(4) && !(gPlayer.moveState & MOVESTATE_IN_AIR)
                        && !(gPlayer.unk5E & gPlayerControls.jump)) {
                 corkscrew->base.spriteY |= 1;
             } else {
@@ -133,8 +130,7 @@ void sub_8061AB0(void)
             player->moveState |= MOVESTATE_4;
             m4aSongNumStart(SE_SPIN_ATTACK);
         } else if (!(player->moveState & MOVESTATE_4)) {
-            player->anim
-                = gPlayerCharacterIdleAnims[player->character] + SA2_CHAR_ANIM_68;
+            player->anim = gPlayerCharacterIdleAnims[player->character] + SA2_CHAR_ANIM_68;
             player->variant = Div((idx - 282) & ONE_CYCLE, 94);
         }
     }
@@ -270,11 +266,9 @@ void Task_8061F60(void)
 
     if (PLAYER_IS_ALIVE) {
         if ((x + (me->d.sData[0] * TILE_WIDTH) <= I(gPlayer.x)
-             && (x + (me->d.sData[0] * TILE_WIDTH) + (me->d.uData[2] * TILE_WIDTH)
-                 >= I(gPlayer.x)))
+             && (x + (me->d.sData[0] * TILE_WIDTH) + (me->d.uData[2] * TILE_WIDTH) >= I(gPlayer.x)))
             && (y + (me->d.sData[1] * TILE_WIDTH) <= I(gPlayer.y)
-                && y + (me->d.sData[1] * TILE_WIDTH) + (me->d.uData[3] * TILE_WIDTH)
-                    >= I(gPlayer.y))) {
+                && y + (me->d.sData[1] * TILE_WIDTH) + (me->d.uData[3] * TILE_WIDTH) >= I(gPlayer.y))) {
             if (x > I(gPlayer.x) && (corkscrew->base.spriteY & 1)) {
                 s32 idx;
                 s32 y24_8;
@@ -287,8 +281,7 @@ void Task_8061F60(void)
 
                 gPlayer.speedAirY = 0;
                 gCurTask->main = Task_8062100;
-            } else if ((x <= I(gPlayer.x)) && gPlayer.speedGroundX < -Q_8_8(4)
-                       && !(gPlayer.moveState & MOVESTATE_IN_AIR)
+            } else if ((x <= I(gPlayer.x)) && gPlayer.speedGroundX < -Q_8_8(4) && !(gPlayer.moveState & MOVESTATE_IN_AIR)
                        && !(gPlayer.unk5E & gPlayerControls.jump)) {
                 corkscrew->base.spriteY |= 1;
             } else {
@@ -360,8 +353,7 @@ void Task_8062100(void)
             player->moveState |= MOVESTATE_4;
             m4aSongNumStart(SE_SPIN_ATTACK);
         } else if (!(player->moveState & MOVESTATE_4)) {
-            player->anim
-                = gPlayerCharacterIdleAnims[player->character] + SA2_CHAR_ANIM_68;
+            player->anim = gPlayerCharacterIdleAnims[player->character] + SA2_CHAR_ANIM_68;
             player->variant = Div((idx - 282) & ONE_CYCLE, 94);
         }
     }
@@ -482,11 +474,9 @@ void Task_8062414(void)
     }
 }
 
-void CreateEntity_Corkscrew3D_Start(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                    u8 spriteY)
+void CreateEntity_Corkscrew3D_Start(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t
-        = TaskCreate(Task_8061914, sizeof(Sprite_Corkscrew3D), 0x2000, 0, NULL);
+    struct Task *t = TaskCreate(Task_8061914, sizeof(Sprite_Corkscrew3D), 0x2000, 0, NULL);
     Sprite_Corkscrew3D *corkscrew = TASK_DATA(t);
     corkscrew->base.regionX = spriteRegionX;
     corkscrew->base.regionY = spriteRegionY;
@@ -499,11 +489,9 @@ void CreateEntity_Corkscrew3D_Start(MapEntity *me, u16 spriteRegionX, u16 sprite
     corkscrew->unkC = +Q(4);
 }
 
-void CreateEntity_Corkscrew3D_End(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                  u8 spriteY)
+void CreateEntity_Corkscrew3D_End(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t
-        = TaskCreate(Task_8061F60, sizeof(Sprite_Corkscrew3D), 0x2000, 0, NULL);
+    struct Task *t = TaskCreate(Task_8061F60, sizeof(Sprite_Corkscrew3D), 0x2000, 0, NULL);
     Sprite_Corkscrew3D *corkscrew = TASK_DATA(t);
     corkscrew->base.regionX = spriteRegionX;
     corkscrew->base.regionY = spriteRegionY;
diff --git a/src/game/interactables_1/decoration.c b/src/game/interactables_1/decoration.c
index 1883d9155..ea324344a 100644
--- a/src/game/interactables_1/decoration.c
+++ b/src/game/interactables_1/decoration.c
@@ -36,8 +36,7 @@ void CreateEntity_Decoration(MapEntity *me, u16 regionX, u16 regionY, u8 spriteY
     Sprite *s;
 
     if (me->decoId >= 0) {
-        t = TaskCreate(Task_Decoration, sizeof(Sprite_Decoration), 0x2010, 0,
-                       TaskDestructor_Decoration);
+        t = TaskCreate(Task_Decoration, sizeof(Sprite_Decoration), 0x2010, 0, TaskDestructor_Decoration);
         base = TASK_DATA(t);
         s = &base->displayed;
 
diff --git a/src/game/interactables_1/gapped_loop.c b/src/game/interactables_1/gapped_loop.c
index 05f982256..c9f20450b 100644
--- a/src/game/interactables_1/gapped_loop.c
+++ b/src/game/interactables_1/gapped_loop.c
@@ -33,14 +33,10 @@ static void Task_GappedLoopForwardsMain(void)
         if (x <= I(gPlayer.x) && (x + me->d.uData[2] * 8) >= I(gPlayer.x)) {
             if (y <= I(gPlayer.y) && (y + me->d.uData[3] * 8) >= I(gPlayer.y)) {
                 if (y <= I(gPlayer.y) && (y + me->d.uData[3] * 8) >= I(gPlayer.y)) {
-                    if (gPlayer.speedGroundX > Q(3)
-                        && !(gPlayer.moveState
-                             & (MOVESTATE_FACING_LEFT | MOVESTATE_IN_AIR))) {
+                    if (gPlayer.speedGroundX > Q(3) && !(gPlayer.moveState & (MOVESTATE_FACING_LEFT | MOVESTATE_IN_AIR))) {
                         gCurTask->main = Task_JumpSequenceForwards;
                         gPlayer.moveState |= MOVESTATE_400000;
-                        gappedLoop->playerAngle
-                            = sub_8004418(I(gPlayer.y - gappedLoop->unk10),
-                                          I(gPlayer.x - gappedLoop->unkC));
+                        gappedLoop->playerAngle = sub_8004418(I(gPlayer.y - gappedLoop->unk10), I(gPlayer.x - gappedLoop->unkC));
                         gappedLoop->spinSpeed = -8;
                     }
                 }
@@ -73,13 +69,11 @@ static void Task_JumpSequenceForwards(void)
 
     x = TO_WORLD_POS(spriteX, regionX);
     y = TO_WORLD_POS(me->y, regionY);
-    gappedLoop->playerAngle
-        = (gappedLoop->playerAngle + gappedLoop->spinSpeed) & ONE_CYCLE;
+    gappedLoop->playerAngle = (gappedLoop->playerAngle + gappedLoop->spinSpeed) & ONE_CYCLE;
     gPlayer.rotation += gappedLoop->spinSpeed;
 
     r3 = ABS(Q(3) - gappedLoop->playerAngle) >> 4;
-    gPlayer.y = gappedLoop->unk10
-        + Q_2_14_TO_Q_24_8(SIN(gappedLoop->playerAngle) * (r3 + 135));
+    gPlayer.y = gappedLoop->unk10 + Q_2_14_TO_Q_24_8(SIN(gappedLoop->playerAngle) * (r3 + 135));
     gPlayer.x = gappedLoop->unkC + Q_2_14_TO_Q_24_8(COS(gappedLoop->playerAngle) * 135);
 
     x -= gCamera.x;
@@ -111,14 +105,11 @@ static void Task_GappedLoopReverseMain(void)
         if (base <= I(gPlayer.x) && (base + me->d.uData[2] * 8) >= I(gPlayer.x)) {
             if (y <= I(gPlayer.y) && (y + me->d.uData[3] * 8) >= I(gPlayer.y)) {
                 if (y <= I(gPlayer.y) && (y + me->d.uData[3] * 8) >= I(gPlayer.y)) {
-                    if (gPlayer.speedGroundX < -Q(3)
-                        && (gPlayer.moveState & MOVESTATE_FACING_LEFT)
+                    if (gPlayer.speedGroundX < -Q(3) && (gPlayer.moveState & MOVESTATE_FACING_LEFT)
                         && !(gPlayer.moveState & MOVESTATE_IN_AIR)) {
                         gCurTask->main = Task_JumpSequenceReverse;
                         gPlayer.moveState |= MOVESTATE_400000;
-                        gappedLoop->playerAngle
-                            = sub_8004418(I(gPlayer.y - gappedLoop->unk10),
-                                          I(gPlayer.x - gappedLoop->unkC));
+                        gappedLoop->playerAngle = sub_8004418(I(gPlayer.y - gappedLoop->unk10), I(gPlayer.x - gappedLoop->unkC));
                         gappedLoop->spinSpeed = 8;
                     }
                 }
@@ -151,13 +142,11 @@ static void Task_JumpSequenceReverse(void)
 
     x = TO_WORLD_POS(spriteX, regionX);
     y = TO_WORLD_POS(me->y, regionY);
-    gappedLoop->playerAngle
-        = (gappedLoop->playerAngle + gappedLoop->spinSpeed) & ONE_CYCLE;
+    gappedLoop->playerAngle = (gappedLoop->playerAngle + gappedLoop->spinSpeed) & ONE_CYCLE;
     gPlayer.rotation += gappedLoop->spinSpeed;
 
     r3 = ABS(Q(3) - gappedLoop->playerAngle) >> 4;
-    gPlayer.y = gappedLoop->unk10
-        + Q_2_14_TO_Q_24_8(SIN(gappedLoop->playerAngle) * (r3 + 135));
+    gPlayer.y = gappedLoop->unk10 + Q_2_14_TO_Q_24_8(SIN(gappedLoop->playerAngle) * (r3 + 135));
     gPlayer.x = gappedLoop->unkC + Q_2_14_TO_Q_24_8(COS(gappedLoop->playerAngle) * 135);
 
     x -= gCamera.x;
@@ -174,11 +163,9 @@ static void Task_JumpSequenceReverse(void)
     }
 }
 
-void CreateEntity_GappedLoop_Start(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                   u8 spriteY)
+void CreateEntity_GappedLoop_Start(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_GappedLoopForwardsMain, sizeof(Sprite_GappedLoop),
-                                0x2000, 0, NULL);
+    struct Task *t = TaskCreate(Task_GappedLoopForwardsMain, sizeof(Sprite_GappedLoop), 0x2000, 0, NULL);
     Sprite_GappedLoop *gappedLoop = TASK_DATA(t);
     gappedLoop->base.regionX = spriteRegionX;
     gappedLoop->base.regionY = spriteRegionY;
@@ -190,11 +177,9 @@ void CreateEntity_GappedLoop_Start(MapEntity *me, u16 spriteRegionX, u16 spriteR
     gappedLoop->unk10 = Q(TO_WORLD_POS(me->y, spriteRegionY) + 96);
 }
 
-void CreateEntity_GappedLoop_End(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                 u8 spriteY)
+void CreateEntity_GappedLoop_End(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_GappedLoopReverseMain, sizeof(Sprite_GappedLoop),
-                                0x2000, 0, NULL);
+    struct Task *t = TaskCreate(Task_GappedLoopReverseMain, sizeof(Sprite_GappedLoop), 0x2000, 0, NULL);
     Sprite_GappedLoop *gappedLoop = TASK_DATA(t);
     gappedLoop->base.regionX = spriteRegionX;
     gappedLoop->base.regionY = spriteRegionY;
diff --git a/src/game/interactables_1/incline_ramp.c b/src/game/interactables_1/incline_ramp.c
index b138d4427..76dc98da1 100644
--- a/src/game/interactables_1/incline_ramp.c
+++ b/src/game/interactables_1/incline_ramp.c
@@ -28,11 +28,8 @@ static void Task_InclineRamp(void)
     screenY = TO_WORLD_POS(me->y, ramp->base.regionX);
 
     moveState = gPlayer.moveState;
-    if (!(moveState & MOVESTATE_DEAD) && (screenX <= I(gPlayer.x))
-        && ((screenX + me->d.uData[2] * TILE_WIDTH) >= I(gPlayer.x))
-        && (screenY <= I(gPlayer.y))
-        && ((screenY + me->d.uData[3] * TILE_WIDTH) >= I(gPlayer.y))
-        && (!(moveState & MOVESTATE_IN_AIR))) {
+    if (!(moveState & MOVESTATE_DEAD) && (screenX <= I(gPlayer.x)) && ((screenX + me->d.uData[2] * TILE_WIDTH) >= I(gPlayer.x))
+        && (screenY <= I(gPlayer.y)) && ((screenY + me->d.uData[3] * TILE_WIDTH) >= I(gPlayer.y)) && (!(moveState & MOVESTATE_IN_AIR))) {
         //  spriteY == me->d.uData[0]; (set in initSprite, below)
         if (((s8)ramp->base.spriteY) == 0) {
             if (gPlayer.speedAirX > Q(4)) {
@@ -98,11 +95,9 @@ static void Task_InclineRamp(void)
     }
 }
 
-void CreateEntity_InclineRamp(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                              u8 param3)
+void CreateEntity_InclineRamp(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 param3)
 {
-    struct Task *t
-        = TaskCreate(Task_InclineRamp, sizeof(Sprite_InclineRamp), 0x2000, 0, NULL);
+    struct Task *t = TaskCreate(Task_InclineRamp, sizeof(Sprite_InclineRamp), 0x2000, 0, NULL);
     Sprite_InclineRamp *ramp = TASK_DATA(t);
 
     // @BUG? (regionY gets set to regionX and vice versa)
diff --git a/src/game/interactables_1/platform_crumbling.c b/src/game/interactables_1/platform_crumbling.c
index 244b9c452..4ae3584af 100644
--- a/src/game/interactables_1/platform_crumbling.c
+++ b/src/game/interactables_1/platform_crumbling.c
@@ -24,8 +24,7 @@ typedef struct {
 // @NOTE/@BUG: This only has 2 entries, so using this MapEntity in
 // anything beyond Leaf Forest Act 2 will use a wrong AnimID.
 static const u16 sInt019_AnimationIds[]
-    = { [LEVEL_INDEX(ZONE_1, ACT_1)] = SA2_ANIM_PLATFORM_LF_WIDE,
-        [LEVEL_INDEX(ZONE_1, ACT_2)] = SA2_ANIM_PLATFORM_LF_WIDE };
+    = { [LEVEL_INDEX(ZONE_1, ACT_1)] = SA2_ANIM_PLATFORM_LF_WIDE, [LEVEL_INDEX(ZONE_1, ACT_2)] = SA2_ANIM_PLATFORM_LF_WIDE };
 
 extern const struct SpriteTables *gRefSpriteTables;
 
@@ -41,11 +40,9 @@ static void TaskDestructor_Interactable019(struct Task *);
 // @TODO: Replace with tile-count from the graphics data itself
 #define IA_019_NUM_TILES 32
 
-void CreateEntity_PlatformCrumbling(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                    u8 spriteY)
+void CreateEntity_PlatformCrumbling(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_Interactable_019, sizeof(Sprite_019), 0x2000, 0,
-                                TaskDestructor_Interactable019);
+    struct Task *t = TaskCreate(Task_Interactable_019, sizeof(Sprite_019), 0x2000, 0, TaskDestructor_Interactable019);
     Sprite_019 *platform = TASK_DATA(t);
     SpriteBase *base = &platform->base;
     Sprite *s = &platform->s;
@@ -67,8 +64,7 @@ void CreateEntity_PlatformCrumbling(MapEntity *me, u16 spriteRegionX, u16 sprite
 
 #ifdef BUG_FIX
     // Prevent overflow
-    s->graphics.anim
-        = sInt019_AnimationIds[gCurrentLevel % ARRAY_COUNT(sInt019_AnimationIds)];
+    s->graphics.anim = sInt019_AnimationIds[gCurrentLevel % ARRAY_COUNT(sInt019_AnimationIds)];
 #else
     s->graphics.anim = sInt019_AnimationIds[gCurrentLevel];
 #endif
@@ -116,10 +112,8 @@ void Task_Interactable_019(void)
 
     // _0805E2C2
 
-    if ((screenX > gCamera.x + DISPLAY_WIDTH + (CAM_REGION_WIDTH / 2)
-         || (screenX < gCamera.x - (CAM_REGION_WIDTH / 2))
-         || (screenY > gCamera.y + DISPLAY_HEIGHT + (CAM_REGION_WIDTH / 2))
-         || (screenY < gCamera.y - (CAM_REGION_WIDTH / 2)))
+    if ((screenX > gCamera.x + DISPLAY_WIDTH + (CAM_REGION_WIDTH / 2) || (screenX < gCamera.x - (CAM_REGION_WIDTH / 2))
+         || (screenY > gCamera.y + DISPLAY_HEIGHT + (CAM_REGION_WIDTH / 2)) || (screenY < gCamera.y - (CAM_REGION_WIDTH / 2)))
         && (IS_OUT_OF_CAM_RANGE(s->x, s->y))) {
         me->x = base->spriteX;
         TaskDestroy(gCurTask);
@@ -151,10 +145,8 @@ void Task_805E35C(void)
         gCurTask->main = Task_805E480;
     }
 
-    if ((screenX > gCamera.x + DISPLAY_WIDTH + (CAM_REGION_WIDTH / 2)
-         || (screenX < gCamera.x - (CAM_REGION_WIDTH / 2))
-         || (screenY > gCamera.y + DISPLAY_HEIGHT + (CAM_REGION_WIDTH / 2))
-         || (screenY < gCamera.y - (CAM_REGION_WIDTH / 2)))
+    if ((screenX > gCamera.x + DISPLAY_WIDTH + (CAM_REGION_WIDTH / 2) || (screenX < gCamera.x - (CAM_REGION_WIDTH / 2))
+         || (screenY > gCamera.y + DISPLAY_HEIGHT + (CAM_REGION_WIDTH / 2)) || (screenY < gCamera.y - (CAM_REGION_WIDTH / 2)))
         && (IS_OUT_OF_CAM_RANGE(s->x, s->y))) {
         me->x = platform->base.spriteX;
         TaskDestroy(gCurTask);
@@ -185,10 +177,8 @@ void Task_805E480(void)
 
     sub_800C060(s, screenX, screenY, &gPlayer);
 
-    if (screenX > gCamera.x + DISPLAY_WIDTH + (CAM_REGION_WIDTH / 2)
-        || (screenX < gCamera.x - (CAM_REGION_WIDTH / 2))) {
-        if ((u16)(s->x + (CAM_REGION_WIDTH / 2))
-            > (u16)(DISPLAY_WIDTH + CAM_REGION_WIDTH)) {
+    if (screenX > gCamera.x + DISPLAY_WIDTH + (CAM_REGION_WIDTH / 2) || (screenX < gCamera.x - (CAM_REGION_WIDTH / 2))) {
+        if ((u16)(s->x + (CAM_REGION_WIDTH / 2)) > (u16)(DISPLAY_WIDTH + CAM_REGION_WIDTH)) {
             me->x = platform->base.spriteX;
             TaskDestroy(gCurTask);
             return;
@@ -209,8 +199,7 @@ void Task_805E480(void)
             if (value > 0) {
                 if (r6 == 0 && value == 1) {
                     if ((gPlayer.moveState & MOVESTATE_8) && gPlayer.unk3C == s) {
-                        gPlayer.moveState
-                            = ((gPlayer.moveState & (~MOVESTATE_8)) | MOVESTATE_IN_AIR);
+                        gPlayer.moveState = ((gPlayer.moveState & (~MOVESTATE_8)) | MOVESTATE_IN_AIR);
                     }
 
                     gCurTask->main = Task_805E6A4;
@@ -256,8 +245,7 @@ void Task_805E480(void)
 #endif
 
             pointer->all.attr2
-                = (((oam[2] + s->palId) & ~0xFFF) | (SPRITE_FLAG_GET(s, PRIORITY) << 10)
-                   | (u16)(GET_TILE_NUM(s->graphics.dest) + r6));
+                = (((oam[2] + s->palId) & ~0xFFF) | (SPRITE_FLAG_GET(s, PRIORITY) << 10) | (u16)(GET_TILE_NUM(s->graphics.dest) + r6));
         }
     }
 }
@@ -283,10 +271,8 @@ void Task_805E6A4(void)
     s->y = screenY - gCamera.y;
     platform->unk3C++;
 
-    if (screenX > gCamera.x + DISPLAY_WIDTH + (CAM_REGION_WIDTH / 2)
-        || (screenX < gCamera.x - (CAM_REGION_WIDTH / 2))) {
-        if ((u16)(s->x + (CAM_REGION_WIDTH / 2))
-            > (u16)(DISPLAY_WIDTH + CAM_REGION_WIDTH)) {
+    if (screenX > gCamera.x + DISPLAY_WIDTH + (CAM_REGION_WIDTH / 2) || (screenX < gCamera.x - (CAM_REGION_WIDTH / 2))) {
+        if ((u16)(s->x + (CAM_REGION_WIDTH / 2)) > (u16)(DISPLAY_WIDTH + CAM_REGION_WIDTH)) {
             me->x = platform->base.spriteX;
             TaskDestroy(gCurTask);
             return;
@@ -328,8 +314,7 @@ void Task_805E6A4(void)
             }
 
             pointer->all.attr2
-                = (((oam[2] + s->palId) & ~0xFFF) | ((s->frameFlags & 0x3000) >> 2)
-                   | (u16)(GET_TILE_NUM(s->graphics.dest) + r6));
+                = (((oam[2] + s->palId) & ~0xFFF) | ((s->frameFlags & 0x3000) >> 2) | (u16)(GET_TILE_NUM(s->graphics.dest) + r6));
         }
     }
 }
diff --git a/src/game/interactables_1/rotating_handle.c b/src/game/interactables_1/rotating_handle.c
index 6e09593ef..4a2899a8d 100644
--- a/src/game/interactables_1/rotating_handle.c
+++ b/src/game/interactables_1/rotating_handle.c
@@ -32,12 +32,10 @@ static void sub_805EF90(void);
 static void sub_805EA94(void);
 static void sub_805ECA0(void);
 
-void CreateEntity_RotatingHandle(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                 u8 spriteY)
+void CreateEntity_RotatingHandle(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     if (me->d.sData[0] >= 0) {
-        struct Task *t = TaskCreate(sub_805EA94, sizeof(Sprite_RotatingHandle), 0x2010,
-                                    0, TaskDestructor_80095E8);
+        struct Task *t = TaskCreate(sub_805EA94, sizeof(Sprite_RotatingHandle), 0x2010, 0, TaskDestructor_80095E8);
         Sprite_RotatingHandle *rotatingHandle = TASK_DATA(t);
         Sprite *s = &rotatingHandle->s;
         rotatingHandle->base.regionX = spriteRegionX;
@@ -80,8 +78,7 @@ static void sub_805EA94(void)
     s->x = x - gCamera.x;
     s->y = y - gCamera.y;
 
-    if (!(gPlayer.moveState & (MOVESTATE_400000 | MOVESTATE_DEAD))
-        && sub_800C204(s, x, y, 0, &gPlayer, 0) == 1) {
+    if (!(gPlayer.moveState & (MOVESTATE_400000 | MOVESTATE_DEAD)) && sub_800C204(s, x, y, 0, &gPlayer, 0) == 1) {
 #ifndef NON_MATCHING
         register s32 temp1 asm("r0"), temp2;
 #else
@@ -146,8 +143,7 @@ static void sub_805EA94(void)
 }
 
 // (95.57%) https://decomp.me/scratch/RaPDV
-NONMATCH("asm/non_matching/game/interactables_1/sub_805ECA0.inc",
-         static void sub_805ECA0())
+NONMATCH("asm/non_matching/game/interactables_1/sub_805ECA0.inc", static void sub_805ECA0())
 {
     Sprite_RotatingHandle *rotatingHandle = TASK_DATA(gCurTask);
     Sprite *s = &rotatingHandle->s;
diff --git a/src/game/interactables_1/spikes.c b/src/game/interactables_1/spikes.c
index ca260ebf7..12175aafb 100644
--- a/src/game/interactables_1/spikes.c
+++ b/src/game/interactables_1/spikes.c
@@ -25,13 +25,8 @@ typedef struct {
 
 const u16 sSpikesOfZone[NUM_COURSE_ZONES + 1] = {
     [ZONE_1] = SA2_ANIM_SPIKES, // NOTE: Comment tells formatter to keep this as-is!
-    [ZONE_2] = SA2_ANIM_SPIKES,
-    [ZONE_3] = SA2_ANIM_SPIKES_MUS_PLA,
-    [ZONE_4] = SA2_ANIM_SPIKES,
-    [ZONE_5] = SA2_ANIM_SPIKES,
-    [ZONE_6] = SA2_ANIM_SPIKES_TEC_BAS,
-    [ZONE_7] = SA2_ANIM_SPIKES,
-    [ZONE_FINAL] = 0,
+    [ZONE_2] = SA2_ANIM_SPIKES,         [ZONE_3] = SA2_ANIM_SPIKES_MUS_PLA, [ZONE_4] = SA2_ANIM_SPIKES, [ZONE_5] = SA2_ANIM_SPIKES,
+    [ZONE_6] = SA2_ANIM_SPIKES_TEC_BAS, [ZONE_7] = SA2_ANIM_SPIKES,         [ZONE_FINAL] = 0,
 };
 
 static void sub_805F810(void);
@@ -46,8 +41,7 @@ static bool32 sub_80609B4(Sprite *, MapEntity *, Sprite_Spikes *, Player *, u32
 static void TaskDestructor_8060CF4(struct Task *);
 static u32 sub_8060D08(Sprite *, s32 x, s32 y, Player *);
 
-void CreateEntity_Spikes_Up(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                            u8 spriteY)
+void CreateEntity_Spikes_Up(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     struct Task *t = TaskCreate(sub_805F810, sizeof(Sprite_Spikes), 0x2000, 0, NULL);
     Sprite_Spikes *spikes = TASK_DATA(t);
@@ -87,8 +81,7 @@ void CreateEntity_Spikes_Up(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
     UpdateSpriteAnimation(s);
 }
 
-void CreateEntity_Spikes_Down(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                              u8 spriteY)
+void CreateEntity_Spikes_Down(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     struct Task *t = TaskCreate(sub_805F928, sizeof(Sprite_Spikes), 0x2000, 0, NULL);
     Sprite_Spikes *spikes = TASK_DATA(t);
@@ -142,8 +135,7 @@ static void sub_805F810(void)
         sub_8060440(s, me, spikes, &gPlayer);
     }
 
-    if ((gGameMode == GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) && (me->d.sData[0] == 0)
-        && (gUnknown_030053E0 == 0)) {
+    if ((gGameMode == GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) && (me->d.sData[0] == 0) && (gUnknown_030053E0 == 0)) {
         if (spikes->unk3C[0] & 0xC0000) {
             gPlayer.moveState &= ~MOVESTATE_20;
         }
@@ -177,8 +169,7 @@ static void sub_805F928(void)
     s->x = screenX - gCamera.x;
     s->y = screenY - gCamera.y;
 
-    if ((gGameMode != GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) || (me->d.sData[0] != 0)
-        || (gUnknown_030053E0 != 0)) {
+    if ((gGameMode != GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) || (me->d.sData[0] != 0) || (gUnknown_030053E0 != 0)) {
         if (!GRAVITY_IS_INVERTED) {
             sub_8060440(s, me, spikes, &gPlayer);
         } else {
@@ -186,8 +177,7 @@ static void sub_805F928(void)
         }
     }
 
-    if ((gGameMode == GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) && (me->d.sData[0] == 0)
-        && (gUnknown_030053E0 == 0)) {
+    if ((gGameMode == GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) && (me->d.sData[0] == 0) && (gUnknown_030053E0 == 0)) {
         if (spikes->unk3C[0] & MOVESTATE_20) {
             gPlayer.moveState &= ~MOVESTATE_20;
         }
@@ -201,19 +191,16 @@ static void sub_805F928(void)
         me->x = spikes->base.spriteX;
         TaskDestroy(gCurTask);
     } else {
-        if ((gGameMode != GAME_MODE_MULTI_PLAYER_COLLECT_RINGS)
-            || (me->d.sData[0] != 0 || gUnknown_030053E0 != 0)) {
+        if ((gGameMode != GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) || (me->d.sData[0] != 0 || gUnknown_030053E0 != 0)) {
             UpdateSpriteAnimation(s);
             DisplaySprite(s);
         }
     }
 }
 
-void CreateEntity_Spikes_LeftRight(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                   u8 spriteY)
+void CreateEntity_Spikes_LeftRight(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(sub_805FBA0, sizeof(Sprite_Spikes), 0x2000, 0,
-                                TaskDestructor_8060CF4);
+    struct Task *t = TaskCreate(sub_805FBA0, sizeof(Sprite_Spikes), 0x2000, 0, TaskDestructor_8060CF4);
     Sprite_Spikes *spikes = TASK_DATA(t);
     Sprite *s = &spikes->s;
 
@@ -281,8 +268,7 @@ static void sub_805FBA0(void)
     s->x = screenX - gCamera.x;
     s->y = screenY - gCamera.y;
 
-    if (gGameMode != GAME_MODE_MULTI_PLAYER_COLLECT_RINGS || me->d.sData[0] != 0
-        || gUnknown_030053E0 != 0) {
+    if (gGameMode != GAME_MODE_MULTI_PLAYER_COLLECT_RINGS || me->d.sData[0] != 0 || gUnknown_030053E0 != 0) {
         // _0805FC16
         s32 r4 = sub_800CCB8(s, screenX, screenY, &gPlayer);
 #ifdef NON_MATCHING
@@ -367,8 +353,7 @@ static void sub_805FBA0(void)
     }
     // _0805FDA4
 
-    if ((gGameMode == GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) && (me->d.sData[0] == 0)
-        && (gUnknown_030053E0 == 0)) {
+    if ((gGameMode == GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) && (me->d.sData[0] == 0) && (gUnknown_030053E0 == 0)) {
         if (spikes->unk3C[0] & 0x20) {
             gPlayer.moveState &= ~MOVESTATE_20;
         }
@@ -382,19 +367,16 @@ static void sub_805FBA0(void)
         me->x = spikes->base.spriteX;
         TaskDestroy(gCurTask);
     } else {
-        if ((gGameMode != GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) || (me->d.sData[0] != 0)
-            || (gUnknown_030053E0 != 0)) {
+        if ((gGameMode != GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) || (me->d.sData[0] != 0) || (gUnknown_030053E0 != 0)) {
             UpdateSpriteAnimation(s);
             DisplaySprite(s);
         }
     }
 }
 
-void CreateEntity_Spikes_HidingUp(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                  u8 spriteY)
+void CreateEntity_Spikes_HidingUp(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_805FF68, sizeof(Sprite_Spikes), 0x2000, 0,
-                                TaskDestructor_8060CF4);
+    struct Task *t = TaskCreate(Task_805FF68, sizeof(Sprite_Spikes), 0x2000, 0, TaskDestructor_8060CF4);
     Sprite_Spikes *spikes = TASK_DATA(t);
     Sprite *s = &spikes->s;
 
@@ -458,11 +440,9 @@ static void Task_805FF68(void)
     }
 }
 
-void CreateEntity_Spikes_HidingDown(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                    u8 spriteY)
+void CreateEntity_Spikes_HidingDown(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_806012C, sizeof(Sprite_Spikes), 0x2000, 0,
-                                TaskDestructor_8060CF4);
+    struct Task *t = TaskCreate(Task_806012C, sizeof(Sprite_Spikes), 0x2000, 0, TaskDestructor_8060CF4);
     Sprite_Spikes *spikes = TASK_DATA(t);
     Sprite *s = &spikes->s;
 
@@ -541,8 +521,7 @@ bool32 sub_80601F8(Sprite *s, MapEntity *me, Sprite_Spikes *spikes, Player *play
     s->x = screenX - gCamera.x;
     s->y = screenY - gCamera.y;
 
-    if ((gGameMode == GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) && (me->d.sData[0] == 0)
-        && (gUnknown_030053E0 == 30)) {
+    if ((gGameMode == GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) && (me->d.sData[0] == 0) && (gUnknown_030053E0 == 30)) {
         u32 flags = sub_800CCB8(s, screenX, screenY, player);
 
         if (flags) {
@@ -649,8 +628,7 @@ bool32 sub_80601F8(Sprite *s, MapEntity *me, Sprite_Spikes *spikes, Player *play
     return FALSE;
 }
 
-static bool32 sub_8060440(Sprite *s, MapEntity *me, Sprite_Spikes *spikes,
-                          Player *player)
+static bool32 sub_8060440(Sprite *s, MapEntity *me, Sprite_Spikes *spikes, Player *player)
 {
 
     s16 screenX, screenY;
@@ -695,8 +673,7 @@ static bool32 sub_8060440(Sprite *s, MapEntity *me, Sprite_Spikes *spikes,
     return FALSE;
 }
 
-static bool32 sub_8060554(Sprite *s, MapEntity *me, Sprite_Spikes *spikes,
-                          Player *player, u32 *param4) //)
+static bool32 sub_8060554(Sprite *s, MapEntity *me, Sprite_Spikes *spikes, Player *player, u32 *param4) //)
 {
     s16 screenX, screenY;
     u32 sp0C[1] = { gStageTime & 0x7F };
@@ -752,8 +729,7 @@ static bool32 sub_8060554(Sprite *s, MapEntity *me, Sprite_Spikes *spikes,
         s->variant = SA2_ANIM_VARIANT_SPIKES_UP_MID;
         UpdateSpriteAnimation(s);
     } else if (sp0C[0] < 124) {
-        if ((s->variant != SA2_ANIM_VARIANT_SPIKES_UP)
-            || ((player->unk60 != 0) && (*param4 != 0))) {
+        if ((s->variant != SA2_ANIM_VARIANT_SPIKES_UP) || ((player->unk60 != 0) && (*param4 != 0))) {
             if (player->unk60 == 0) {
                 // TODO: Replace magic number
                 *param4 = 1;
@@ -864,8 +840,7 @@ static bool32 sub_8060554(Sprite *s, MapEntity *me, Sprite_Spikes *spikes,
     return TRUE;
 }
 
-static bool32 sub_80609B4(Sprite *s, MapEntity *me, Sprite_Spikes *spikes,
-                          Player *player, u32 *param4)
+static bool32 sub_80609B4(Sprite *s, MapEntity *me, Sprite_Spikes *spikes, Player *player, u32 *param4)
 {
     s16 screenX, screenY;
     u32 sp0C[1] = { gStageTime & 0x7F };
@@ -921,8 +896,7 @@ static bool32 sub_80609B4(Sprite *s, MapEntity *me, Sprite_Spikes *spikes,
         s->variant = SA2_ANIM_VARIANT_SPIKES_UP_MID;
         UpdateSpriteAnimation(s);
     } else if (sp0C[0] < 124) {
-        if ((s->variant != SA2_ANIM_VARIANT_SPIKES_UP)
-            || ((player->unk60 != 0) && (*param4 != 0))) {
+        if ((s->variant != SA2_ANIM_VARIANT_SPIKES_UP) || ((player->unk60 != 0) && (*param4 != 0))) {
             if (player->unk60 == 0) {
                 // TODO: Replace magic number
                 *param4 = 1;
@@ -932,8 +906,7 @@ static bool32 sub_80609B4(Sprite *s, MapEntity *me, Sprite_Spikes *spikes,
             s->variant = SA2_ANIM_VARIANT_SPIKES_UP;
             UpdateSpriteAnimation(s);
 
-            if ((sub_800DF38(s, screenX, screenY, player) == 0x80000)
-                && ((sub_8060D08(s, screenX, screenY, player) & 0xD0000) != 0)) {
+            if ((sub_800DF38(s, screenX, screenY, player) == 0x80000) && ((sub_8060D08(s, screenX, screenY, player) & 0xD0000) != 0)) {
 
                 u32 v = ((u8)player->unk16 + 5);
                 s8 sp00[4] = { -v, 1 - player->unk17, v, player->unk17 - 1 };
diff --git a/src/game/interactables_1/spring_bouncy.c b/src/game/interactables_1/spring_bouncy.c
index 193fdb9b8..82976ca81 100644
--- a/src/game/interactables_1/spring_bouncy.c
+++ b/src/game/interactables_1/spring_bouncy.c
@@ -43,12 +43,10 @@ static const TileInfo gUnknown_080D94BC[3] = {
     { 24, SA2_ANIM_603, 3 },
 };
 
-void CreateEntity_BouncySpring(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                               u8 spriteY)
+void CreateEntity_BouncySpring(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     struct Task *t
-        = TaskCreate(Task_Interactable_BouncySpring, sizeof(Sprite_BouncySpring), 0x2010,
-                     0, TaskDestructor_Interactable_BouncySpring);
+        = TaskCreate(Task_Interactable_BouncySpring, sizeof(Sprite_BouncySpring), 0x2010, 0, TaskDestructor_Interactable_BouncySpring);
     Sprite_BouncySpring *spring = TASK_DATA(t);
     Sprite *s = &spring->s;
     u32 variant = 0;
diff --git a/src/game/interactables_1/stage_goal.c b/src/game/interactables_1/stage_goal.c
index cf1e674af..4e3f7b575 100644
--- a/src/game/interactables_1/stage_goal.c
+++ b/src/game/interactables_1/stage_goal.c
@@ -39,11 +39,9 @@ static void StageGoalToggle_HandleMultiplayerFinish(void);
 
 #define GOAL_LEVER_TILES 4
 
-void CreateEntity_StageGoal(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                            u8 spriteY)
+void CreateEntity_StageGoal(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_StageGoalMain, sizeof(Sprite_StageGoal), 0x2010, 0,
-                                TaskDestructor_8062E7C);
+    struct Task *t = TaskCreate(Task_StageGoalMain, sizeof(Sprite_StageGoal), 0x2010, 0, TaskDestructor_8062E7C);
     Sprite_StageGoal *stageGoal = TASK_DATA(t);
     Sprite *s = &stageGoal->s;
 
@@ -135,8 +133,7 @@ static void Task_StageGoalToggleMain(void)
     s32 y = TO_WORLD_POS(me->y, regionY);
 
     if (IS_MULTI_PLAYER) {
-        if (x <= I(gPlayer.x)
-            && !(gPlayer.moveState & (MOVESTATE_8000000 | MOVESTATE_8))) {
+        if (x <= I(gPlayer.x) && !(gPlayer.moveState & (MOVESTATE_8000000 | MOVESTATE_8))) {
             gPlayer.transition = PLTRANS_PT10;
             gStageGoalX = x;
             StageGoalToggle_HandleMultiplayerFinish();
@@ -146,9 +143,7 @@ static void Task_StageGoalToggleMain(void)
         gStageFlags |= 0x21;
         gStageGoalX = x;
 
-        if (gGameMode == GAME_MODE_SINGLE_PLAYER
-            && !(gPlayer.moveState & MOVESTATE_IN_AIR)
-            && gPlayer.speedGroundX > Q(2.5)) {
+        if (gGameMode == GAME_MODE_SINGLE_PLAYER && !(gPlayer.moveState & MOVESTATE_IN_AIR) && gPlayer.speedGroundX > Q(2.5)) {
             u32 extraScore;
             if (gPlayer.speedGroundX <= Q(4.0)) {
                 extraScore = 200;
@@ -186,9 +181,7 @@ static void StageGoalToggle_HandleMultiplayerFinish(void)
 
     if (!(player->unk5C & 1)) {
         u32 j;
-        for (j = 0; j < ARRAY_COUNT(gMultiplayerPlayerTasks)
-             && gMultiplayerPlayerTasks[j] != NULL;
-             j++) {
+        for (j = 0; j < ARRAY_COUNT(gMultiplayerPlayerTasks) && gMultiplayerPlayerTasks[j] != NULL; j++) {
             MultiplayerPlayer *otherPlayer = TASK_DATA(gMultiplayerPlayerTasks[j]);
             if (otherPlayer->unk5C & 1) {
                 count++;
@@ -226,21 +219,17 @@ static UNUSED void sub_8062BD0(void)
     for (j = 0; j < ARRAY_COUNT(gMultiplayerPlayerTasks) && mpTasks[j] != NULL; j++) {
         // TODO: make this a macro? What does it even mean
         if ((gMultiplayerConnections & (0x10 << (j))) >> ((j + 4))
-                != (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id)))
-                    >> (SIO_MULTI_CNT->id + 4)
+                != (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id))) >> (SIO_MULTI_CNT->id + 4)
             && gUnknown_030054B4[j] == 0) {
             thing = 1;
             break;
         }
     }
 
-    for (j = 0;
-         j < ARRAY_COUNT(gMultiplayerPlayerTasks) && gMultiplayerPlayerTasks[j] != NULL;
-         j++) {
+    for (j = 0; j < ARRAY_COUNT(gMultiplayerPlayerTasks) && gMultiplayerPlayerTasks[j] != NULL; j++) {
         if (gUnknown_030054B4[j] == -1) {
             if ((gMultiplayerConnections & (0x10 << (j))) >> ((j + 4))
-                == (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id)))
-                    >> (SIO_MULTI_CNT->id + 4)) {
+                == (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id))) >> (SIO_MULTI_CNT->id + 4)) {
                 sub_8019CCC(j, thing);
             } else {
                 sub_8019CCC(j, thing ^ 1);
@@ -265,8 +254,7 @@ static void sub_8062D44(void)
     if (gUnknown_030054B4[id] != -1) {
         u32 j;
         struct Task **tasks;
-        for (j = 0, tasks = gMultiplayerPlayerTasks;
-             j < ARRAY_COUNT(gMultiplayerPlayerTasks) && tasks[j] != NULL; j++) {
+        for (j = 0, tasks = gMultiplayerPlayerTasks; j < ARRAY_COUNT(gMultiplayerPlayerTasks) && tasks[j] != NULL; j++) {
             MultiplayerPlayer *otherPlayer = TASK_DATA(tasks[j]);
             if (otherPlayer->unk54 & 0x100) {
                 count++;
@@ -278,8 +266,7 @@ static void sub_8062D44(void)
             u32 i;
             // Check seems redundant, required for match
             if (gMultiplayerPlayerTasks[0] != NULL) {
-                for (i = 0, tasks = gMultiplayerPlayerTasks;
-                     i < ARRAY_COUNT(gMultiplayerPlayerTasks) && tasks[i] != NULL; i++) {
+                for (i = 0, tasks = gMultiplayerPlayerTasks; i < ARRAY_COUNT(gMultiplayerPlayerTasks) && tasks[i] != NULL; i++) {
                     MultiplayerPlayer *otherPlayer = TASK_DATA(tasks[i]);
                     if (!(otherPlayer->unk5C & 1) && gGameMode != GAME_MODE_TEAM_PLAY) {
                         otherPlayer->unk5C |= 1;
@@ -295,11 +282,9 @@ static void sub_8062D44(void)
     }
 }
 
-void CreateEntity_Toggle_StageGoal(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                   u8 spriteY)
+void CreateEntity_Toggle_StageGoal(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_StageGoalToggleMain, sizeof(Sprite_StageGoalToggle),
-                                0x2010, 0, NULL);
+    struct Task *t = TaskCreate(Task_StageGoalToggleMain, sizeof(Sprite_StageGoalToggle), 0x2010, 0, NULL);
     Sprite_StageGoalToggle *stageGoalToggle = TASK_DATA(t);
 
     stageGoalToggle->base.regionX = spriteRegionX;
diff --git a/src/game/interactables_1/toggle_player_layer.c b/src/game/interactables_1/toggle_player_layer.c
index 51fba9c62..8997074c6 100644
--- a/src/game/interactables_1/toggle_player_layer.c
+++ b/src/game/interactables_1/toggle_player_layer.c
@@ -36,8 +36,7 @@ static void Task_Interactable_Toggle_PlayerLayer(void)
     screenX = TO_WORLD_POS(spriteX, regionX);
     screenY = TO_WORLD_POS(me->y, regionY);
 
-    if ((screenX <= I(gPlayer.x)) && (screenX + (me->width * TILE_WIDTH) >= I(gPlayer.x))
-        && (screenY <= I(gPlayer.y))
+    if ((screenX <= I(gPlayer.x)) && (screenX + (me->width * TILE_WIDTH) >= I(gPlayer.x)) && (screenY <= I(gPlayer.y))
         && (screenY + (me->height * TILE_WIDTH) >= I(gPlayer.y))) {
 
         // The interactable-index determines, whether the layer we switch to
@@ -60,11 +59,9 @@ static void Task_Interactable_Toggle_PlayerLayer(void)
     }
 }
 
-void CreateEntity_Toggle_PlayerLayer(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                     UNUSED u8 spriteY)
+void CreateEntity_Toggle_PlayerLayer(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, UNUSED u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_Interactable_Toggle_PlayerLayer,
-                                sizeof(Sprite_ChangePlayerLayer), 0x2000, 0, NULL);
+    struct Task *t = TaskCreate(Task_Interactable_Toggle_PlayerLayer, sizeof(Sprite_ChangePlayerLayer), 0x2000, 0, NULL);
     Sprite_ChangePlayerLayer *layerChanger = TASK_DATA(t);
     SpriteBase *base = &layerChanger->base;
 
diff --git a/src/game/interactables_1/windmill.c b/src/game/interactables_1/windmill.c
index 5bf30d8c3..99ba5a6e7 100644
--- a/src/game/interactables_1/windmill.c
+++ b/src/game/interactables_1/windmill.c
@@ -23,19 +23,16 @@ static void TaskDestructor_Windmill(struct Task *);
 static void Task_WindmillMain(void);
 
 static const TileInfo sWindmillParts[] = {
-    { 4, SA2_ANIM_WIND_MILL_PART, 3 }, { 4, SA2_ANIM_WIND_MILL_PART, 2 },
-    { 4, SA2_ANIM_WIND_MILL_PART, 1 }, { 4, SA2_ANIM_WIND_MILL_PART, 0 },
-    { 4, SA2_ANIM_WIND_MILL_PART, 6 },
+    { 4, SA2_ANIM_WIND_MILL_PART, 3 }, { 4, SA2_ANIM_WIND_MILL_PART, 2 }, { 4, SA2_ANIM_WIND_MILL_PART, 1 },
+    { 4, SA2_ANIM_WIND_MILL_PART, 0 }, { 4, SA2_ANIM_WIND_MILL_PART, 6 },
 };
 
-void CreateEntity_Windmill(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                           u8 spriteY)
+void CreateEntity_Windmill(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     u8 i, j;
     void *ramDests[4];
     Sprite *s;
-    struct Task *t = TaskCreate(Task_WindmillMain, sizeof(InteractableWindmill), 0x2010,
-                                0, TaskDestructor_Windmill);
+    struct Task *t = TaskCreate(Task_WindmillMain, sizeof(InteractableWindmill), 0x2010, 0, TaskDestructor_Windmill);
     InteractableWindmill *windmill = TASK_DATA(t);
 
     s = &windmill->center;
@@ -123,10 +120,8 @@ static void Task_WindmillMain(void)
             transform = &windmill->blades[i * 4 + j].transform;
             sinPeriod = (gStageTime * 2 + (i * 256));
 
-            s->x = screenX
-                + ((COS(CLAMP_SIN_PERIOD(sinPeriod)) * ((j + 1) * 16 - 8)) >> 14);
-            s->y = screenY
-                + ((SIN(CLAMP_SIN_PERIOD(sinPeriod)) * ((j + 1) * 16 - 8)) >> 14);
+            s->x = screenX + ((COS(CLAMP_SIN_PERIOD(sinPeriod)) * ((j + 1) * 16 - 8)) >> 14);
+            s->y = screenY + ((SIN(CLAMP_SIN_PERIOD(sinPeriod)) * ((j + 1) * 16 - 8)) >> 14);
             transform->rotation = CLAMP_SIN_PERIOD(sinPeriod);
             transform->width = 256;
             transform->height = 256;
diff --git a/src/game/interactables_2/105.c b/src/game/interactables_2/105.c
index df9f78086..cc6d36986 100644
--- a/src/game/interactables_2/105.c
+++ b/src/game/interactables_2/105.c
@@ -28,11 +28,9 @@ static bool32 sub_80809B8(Sprite_IA105 *);
 static bool32 sub_8080A9C(Sprite_IA105 *);
 static void sub_8080AE4(Sprite_IA105 *);
 
-void CreateEntity_Interactable105(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                  u8 spriteY)
+void CreateEntity_Interactable105(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_Interactable105, sizeof(Sprite_IA105), 0x1FF0, 0,
-                                TaskDestructor_Interactable105);
+    struct Task *t = TaskCreate(Task_Interactable105, sizeof(Sprite_IA105), 0x1FF0, 0, TaskDestructor_Interactable105);
     Sprite_IA105 *ia105 = TASK_DATA(t);
 
     ia105->posX = TO_WORLD_POS(me->x, spriteRegionX);
@@ -62,8 +60,7 @@ static bool32 sub_80809B8(Sprite_IA105 *ia105)
         someX = ia105->width - ia105->offsetX;
         someY = ia105->height - ia105->offsetY;
 
-        if ((screenX <= playerX) && (screenX + someX >= playerX) && (screenY <= playerY)
-            && (screenY + someY >= playerY)) {
+        if ((screenX <= playerX) && (screenX + someX >= playerX) && (screenY <= playerY) && (screenY + someY >= playerY)) {
             return TRUE;
         }
     }
diff --git a/src/game/interactables_2/egg_utopia/cannon.c b/src/game/interactables_2/egg_utopia/cannon.c
index 885f26b78..9013a3c84 100644
--- a/src/game/interactables_2/egg_utopia/cannon.c
+++ b/src/game/interactables_2/egg_utopia/cannon.c
@@ -50,8 +50,7 @@ static void sub_807E7B0(void);
 void CreateEntity_Cannon(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     Sprite *s;
-    struct Task *t = TaskCreate(Task_Interactable093, sizeof(Sprite_Cannon), 0x2010, 0,
-                                TaskDestructor_Interactable093);
+    struct Task *t = TaskCreate(Task_Interactable093, sizeof(Sprite_Cannon), 0x2010, 0, TaskDestructor_Interactable093);
     Sprite_Cannon *cannon = TASK_DATA(t);
     cannon->unk68 = me->d.sData[0];
     cannon->x = TO_WORLD_POS(me->x, spriteRegionX);
@@ -88,8 +87,7 @@ void CreateEntity_Cannon(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8
 static void sub_807E314(void)
 {
     Sprite_Cannon *cannon = TASK_DATA(gCurTask);
-    if (!PLAYER_IS_ALIVE || --cannon->unk6C == 0xFFFF
-        || gPlayer.unk5E & (gPlayerControls.jump | gPlayerControls.attack)) {
+    if (!PLAYER_IS_ALIVE || --cannon->unk6C == 0xFFFF || gPlayer.unk5E & (gPlayerControls.jump | gPlayerControls.attack)) {
         sub_807E408(cannon);
     } else {
         sub_807E56C(cannon);
@@ -204,8 +202,7 @@ static void sub_807E56C(Sprite_Cannon *cannon)
 #endif
     s32 r1;
 
-    r3 = (cannon->unk68 == 0) ? ((cannon->unk6E == 0) ? 0x280 : 0x180)
-                              : ((cannon->unk6E == 0) ? 0x80 : 0x380);
+    r3 = (cannon->unk68 == 0) ? ((cannon->unk6E == 0) ? 0x280 : 0x180) : ((cannon->unk6E == 0) ? 0x80 : 0x380);
     temp2 = sub_808558C(cannon->unk6A, r3, 10);
     temp3 = temp2;
 
@@ -256,8 +253,7 @@ static void sub_807E5F0(Sprite_Cannon *cannon)
 
 // (68.07%) https://decomp.me/scratch/TDVLh
 // (72.09%) https://decomp.me/scratch/sgt5z
-NONMATCH("asm/non_matching/game/interactables_2/egg_utopia/sub_807E66C.inc",
-         static bool32 sub_807E66C(Sprite_Cannon *cannon))
+NONMATCH("asm/non_matching/game/interactables_2/egg_utopia/sub_807E66C.inc", static bool32 sub_807E66C(Sprite_Cannon *cannon))
 {
     s16 x, y;
     s32 biggerX, biggerY, temp2, temp3;
@@ -277,8 +273,7 @@ NONMATCH("asm/non_matching/game/interactables_2/egg_utopia/sub_807E66C.inc",
         playerX = I(gPlayer.x) - gCamera.x;
         playerY = I(gPlayer.y) - gCamera.y;
 
-        if (HB_COLLISION(playerX, playerY, cannon->sprite2.hitboxes[0], x, y,
-                         gUnknown_03005AF0.s.hitboxes[0])) {
+        if (HB_COLLISION(playerX, playerY, cannon->sprite2.hitboxes[0], x, y, gUnknown_03005AF0.s.hitboxes[0])) {
             return 1;
         }
     }
@@ -386,10 +381,7 @@ static void sub_807E8FC(void)
     }
 }
 
-static void sub_807E940(UNUSED Sprite_Cannon *cannon)
-{
-    gCurTask->main = Task_Interactable093;
-}
+static void sub_807E940(UNUSED Sprite_Cannon *cannon) { gCurTask->main = Task_Interactable093; }
 
 static bool16 sub_807E954(Sprite_Cannon *cannon)
 {
diff --git a/src/game/interactables_2/egg_utopia/flying_handle.c b/src/game/interactables_2/egg_utopia/flying_handle.c
index f7adbfc53..df499fe48 100644
--- a/src/game/interactables_2/egg_utopia/flying_handle.c
+++ b/src/game/interactables_2/egg_utopia/flying_handle.c
@@ -54,13 +54,11 @@ static void sub_807F784(Sprite_FlyingHandle *);
 
 #define FLYING_HANDLE_VRAM_TILES 25
 
-void CreateEntity_FlyingHandle(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                               u8 spriteY)
+void CreateEntity_FlyingHandle(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     u32 i;
     Sprite *s;
-    struct Task *t = TaskCreate(Task_FlyingHandle, sizeof(Sprite_FlyingHandle), 0x2010,
-                                0, TaskDestructor_FlyingHandle);
+    struct Task *t = TaskCreate(Task_FlyingHandle, sizeof(Sprite_FlyingHandle), 0x2010, 0, TaskDestructor_FlyingHandle);
     Sprite_FlyingHandle *flyingHandle = TASK_DATA(t);
     flyingHandle->unk68 = 0;
     flyingHandle->unk5C = 0;
@@ -73,8 +71,7 @@ void CreateEntity_FlyingHandle(MapEntity *me, u16 spriteRegionX, u16 spriteRegio
     flyingHandle->width = flyingHandle->offsetX + me->d.uData[2] * 8;
     flyingHandle->height = flyingHandle->offsetY + me->d.uData[3] * 8;
 
-    flyingHandle->unk44
-        = Q(((flyingHandle->offsetX + flyingHandle->width) >> 1) + flyingHandle->x);
+    flyingHandle->unk44 = Q(((flyingHandle->offsetX + flyingHandle->width) >> 1) + flyingHandle->x);
     flyingHandle->unk48 = Q(flyingHandle->y + flyingHandle->height);
     flyingHandle->unk4C = 0;
     flyingHandle->unk50 = 0;
@@ -181,8 +178,7 @@ static void sub_807F484(Sprite_FlyingHandle *flyingHandle)
 static void sub_807F4F0(Sprite_FlyingHandle *flyingHandle)
 {
     if (flyingHandle->unk60 != 0) {
-        if (flyingHandle->unk48 <= Q(flyingHandle->y + flyingHandle->offsetY)
-            && flyingHandle->unk5E > -1) {
+        if (flyingHandle->unk48 <= Q(flyingHandle->y + flyingHandle->offsetY) && flyingHandle->unk5E > -1) {
             flyingHandle->unk50 = SIN_24_8(flyingHandle->unk68 * 4) * 8;
             flyingHandle->unk68 += 4;
             flyingHandle->unk5E = 0;
@@ -281,15 +277,9 @@ static void TaskDestructor_FlyingHandle(struct Task *t)
     VramFree(flyingHandle->s.graphics.dest);
 }
 
-static void sub_807F770(UNUSED Sprite_FlyingHandle *flyingHandle)
-{
-    gCurTask->main = Task_FlyingHandle;
-}
+static void sub_807F770(UNUSED Sprite_FlyingHandle *flyingHandle) { gCurTask->main = Task_FlyingHandle; }
 
-static void sub_807F784(UNUSED Sprite_FlyingHandle *flyingHandle)
-{
-    gCurTask->main = Task_FlyingHandle;
-}
+static void sub_807F784(UNUSED Sprite_FlyingHandle *flyingHandle) { gCurTask->main = Task_FlyingHandle; }
 
 static void sub_807F798(Sprite_FlyingHandle *flyingHandle)
 {
@@ -318,18 +308,15 @@ static void sub_807F7D0(Sprite_FlyingHandle *flyingHandle)
     }
 }
 
-static void sub_807F818(UNUSED Sprite_FlyingHandle *flyingHandle)
-{
-    m4aSongNumStartOrContinue(SE_291);
-}
+static void sub_807F818(UNUSED Sprite_FlyingHandle *flyingHandle) { m4aSongNumStartOrContinue(SE_291); }
 
 static bool32 ShouldDespawn(Sprite_FlyingHandle *flyingHandle)
 {
     s16 x = flyingHandle->x - gCamera.x;
     s16 y = flyingHandle->y - gCamera.y;
 
-    if (x + flyingHandle->width < -128 || x + flyingHandle->offsetX > 368
-        || y + flyingHandle->height < -128 || y + flyingHandle->offsetY > 288) {
+    if (x + flyingHandle->width < -128 || x + flyingHandle->offsetX > 368 || y + flyingHandle->height < -128
+        || y + flyingHandle->offsetY > 288) {
         return TRUE;
     }
 
diff --git a/src/game/interactables_2/egg_utopia/gravity_toggle.c b/src/game/interactables_2/egg_utopia/gravity_toggle.c
index e7b9b9d46..41f1494eb 100644
--- a/src/game/interactables_2/egg_utopia/gravity_toggle.c
+++ b/src/game/interactables_2/egg_utopia/gravity_toggle.c
@@ -47,12 +47,9 @@ static void Task_GravityToggle(void);
 #define GRAVITY_KIND__UP     1
 #define GRAVITY_KIND__TOGGLE 2
 
-static void CreateEntity_Toggle_Gravity(MapEntity *in_ia, u16 spriteRegionX,
-                                        u16 spriteRegionY, u8 id, u8 toggleKind)
+static void CreateEntity_Toggle_Gravity(MapEntity *in_ia, u16 spriteRegionX, u16 spriteRegionY, u8 id, u8 toggleKind)
 {
-    struct Task *t
-        = TaskCreate(Task_GravityToggleNoAliveCheck, sizeof(Sprite_GravityToggle),
-                     0x2010, 0, TaskDestructor_8080230);
+    struct Task *t = TaskCreate(Task_GravityToggleNoAliveCheck, sizeof(Sprite_GravityToggle), 0x2010, 0, TaskDestructor_8080230);
     Sprite_GravityToggle *toggle = TASK_DATA(t);
     Interactable_GravityToggle *me = (Interactable_GravityToggle *)in_ia;
 
@@ -87,10 +84,8 @@ void ChangeGravityByKind(Sprite_GravityToggle *toggle)
 
         case GRAVITY_KIND__TOGGLE: {
             // Maybe collision on enter/exit?
-            if (((toggle->playerAirX > 0) && (gPlayer.speedAirX > 0))
-                || ((toggle->playerAirX < 0) && (gPlayer.speedAirX < 0))
-                || ((toggle->playerAirY > 0) && (gPlayer.speedAirY > 0))
-                || ((toggle->playerAirY < 0) && (gPlayer.speedAirY < 0))) {
+            if (((toggle->playerAirX > 0) && (gPlayer.speedAirX > 0)) || ((toggle->playerAirX < 0) && (gPlayer.speedAirX < 0))
+                || ((toggle->playerAirY > 0) && (gPlayer.speedAirY > 0)) || ((toggle->playerAirY < 0) && (gPlayer.speedAirY < 0))) {
                 gStageFlags ^= STAGE_FLAG__GRAVITY_INVERTED;
             }
 
@@ -116,8 +111,8 @@ static bool32 AlivePlayerIsInToggle(Sprite_GravityToggle *toggle)
         playerX = I(gPlayer.x) - gCamera.x;
         playerY = I(gPlayer.y) - gCamera.y;
 
-        if ((screenLeft <= playerX) && ((screenLeft + toggle->width) >= playerX)
-            && (screenTop <= playerY) && ((screenTop + toggle->height) >= playerY)) {
+        if ((screenLeft <= playerX) && ((screenLeft + toggle->width) >= playerX) && (screenTop <= playerY)
+            && ((screenTop + toggle->height) >= playerY)) {
             return TRUE;
         }
     }
@@ -166,24 +161,19 @@ void DestroyGravityToggle(Sprite_GravityToggle *toggle)
     TaskDestroy(gCurTask);
 }
 
-void CreateEntity_Toggle_Gravity__Down(MapEntity *me, u16 spriteRegionX,
-                                       u16 spriteRegionY, u8 id)
+void CreateEntity_Toggle_Gravity__Down(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 id)
 {
-    CreateEntity_Toggle_Gravity(me, spriteRegionX, spriteRegionY, id,
-                                GRAVITY_KIND__DOWN);
+    CreateEntity_Toggle_Gravity(me, spriteRegionX, spriteRegionY, id, GRAVITY_KIND__DOWN);
 }
 
-void CreateEntity_Toggle_Gravity__Up(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                     u8 id)
+void CreateEntity_Toggle_Gravity__Up(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 id)
 {
     CreateEntity_Toggle_Gravity(me, spriteRegionX, spriteRegionY, id, GRAVITY_KIND__UP);
 }
 
-void CreateEntity_Toggle_Gravity__Toggle(MapEntity *me, u16 spriteRegionX,
-                                         u16 spriteRegionY, u8 id)
+void CreateEntity_Toggle_Gravity__Toggle(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 id)
 {
-    CreateEntity_Toggle_Gravity(me, spriteRegionX, spriteRegionY, id,
-                                GRAVITY_KIND__TOGGLE);
+    CreateEntity_Toggle_Gravity(me, spriteRegionX, spriteRegionY, id, GRAVITY_KIND__TOGGLE);
 }
 
 void Task_GravityToggle(void)
diff --git a/src/game/interactables_2/egg_utopia/iron_ball.c b/src/game/interactables_2/egg_utopia/iron_ball.c
index 734f6c55e..359b52dce 100644
--- a/src/game/interactables_2/egg_utopia/iron_ball.c
+++ b/src/game/interactables_2/egg_utopia/iron_ball.c
@@ -34,11 +34,9 @@ static bool32 sub_807F120(Sprite_IA95 *);
 static void TaskDestructor_Interactable095(struct Task *);
 static void DestroyInteractable095(Sprite_IA95 *);
 
-void CreateEntity_IronBall(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                           u8 spriteY)
+void CreateEntity_IronBall(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_Interactable095Main, sizeof(Sprite_IA95), 0x2010, 0,
-                                TaskDestructor_Interactable095);
+    struct Task *t = TaskCreate(Task_Interactable095Main, sizeof(Sprite_IA95), 0x2010, 0, TaskDestructor_Interactable095);
     Sprite_IA95 *ia95 = TASK_DATA(t);
     Sprite *s;
     ia95->unk44 = 0;
@@ -97,18 +95,12 @@ static void sub_807EFC4(Sprite_IA95 *ia95)
 
     if (ia95->unk4C != 0) {
         s32 temp = me->d.uData[2] * 0x800;
-        ia95->unk44
-            = (temp
-               * SIN((ia95->unk4C * ((gStageTime + ia95->unk50) & 0xFF)) & ONE_CYCLE))
-            >> 0xF;
+        ia95->unk44 = (temp * SIN((ia95->unk4C * ((gStageTime + ia95->unk50) & 0xFF)) & ONE_CYCLE)) >> 0xF;
     }
 
     if (ia95->unk4E != 0) {
         s32 temp = (me->d.uData[3] * 0x800);
-        ia95->unk48
-            = (temp
-               * SIN((ia95->unk4E * ((gStageTime + ia95->unk50) & 0xFF)) & ONE_CYCLE))
-            >> 0xF;
+        ia95->unk48 = (temp * SIN((ia95->unk4E * ((gStageTime + ia95->unk50) & 0xFF)) & ONE_CYCLE)) >> 0xF;
     }
 
     ia95->unk3C = TO_WORLD_POS(ia95->base.spriteX, ia95->base.regionX) + I(ia95->unk44);
diff --git a/src/game/interactables_2/egg_utopia/launcher.c b/src/game/interactables_2/egg_utopia/launcher.c
index 89000bd9f..b1aee31fc 100644
--- a/src/game/interactables_2/egg_utopia/launcher.c
+++ b/src/game/interactables_2/egg_utopia/launcher.c
@@ -42,17 +42,14 @@ typedef struct {
 #define LAUN_GRAVITY_DOWN           0
 #define LAUN_GRAVITY_UP             1
 #define LAUNCHER_KIND(dir, gravity) (((gravity) << 1) | (dir))
-#define IS_LAUNCHER_DIR_LEFT(kind)                                                      \
-    ((kind == LAUNCHER_KIND(LAUN_DIR_LEFT, LAUN_GRAVITY_DOWN))                          \
-     || (kind == LAUNCHER_KIND(LAUN_DIR_LEFT, LAUN_GRAVITY_UP)))
+#define IS_LAUNCHER_DIR_LEFT(kind)                                                                                                         \
+    ((kind == LAUNCHER_KIND(LAUN_DIR_LEFT, LAUN_GRAVITY_DOWN)) || (kind == LAUNCHER_KIND(LAUN_DIR_LEFT, LAUN_GRAVITY_UP)))
 
-#define IS_LAUNCHER_RIGHTSIDE_UP(kind)                                                  \
-    ((kind == LAUNCHER_KIND(LAUN_DIR_LEFT, LAUN_GRAVITY_DOWN))                          \
-     || (kind == LAUNCHER_KIND(LAUN_DIR_RIGHT, LAUN_GRAVITY_DOWN)))
+#define IS_LAUNCHER_RIGHTSIDE_UP(kind)                                                                                                     \
+    ((kind == LAUNCHER_KIND(LAUN_DIR_LEFT, LAUN_GRAVITY_DOWN)) || (kind == LAUNCHER_KIND(LAUN_DIR_RIGHT, LAUN_GRAVITY_DOWN)))
 
-#define IS_LAUNCHER_UPSIDE_DOWN(kind)                                                   \
-    ((kind == LAUNCHER_KIND(LAUN_DIR_LEFT, LAUN_GRAVITY_UP))                            \
-     || (kind == LAUNCHER_KIND(LAUN_DIR_RIGHT, LAUN_GRAVITY_UP)))
+#define IS_LAUNCHER_UPSIDE_DOWN(kind)                                                                                                      \
+    ((kind == LAUNCHER_KIND(LAUN_DIR_LEFT, LAUN_GRAVITY_UP)) || (kind == LAUNCHER_KIND(LAUN_DIR_RIGHT, LAUN_GRAVITY_UP)))
 
 static void sub_807DC80(Sprite_EggUtopia_Launcher *launcher);
 static void sub_807DD04(Sprite_EggUtopia_Launcher *launcher);
@@ -78,11 +75,9 @@ static void SetTaskMain_807DE98(Sprite_EggUtopia_Launcher *unused);
 static void Task_807E16C(void);
 static bool16 sub_807E1C4(Sprite_EggUtopia_Launcher *launcher);
 
-void CreateEntity_Launcher(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                           u8 spriteY, u32 kind)
+void CreateEntity_Launcher(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY, u32 kind)
 {
-    struct Task *t = TaskCreate(Task_807DE98, sizeof(Sprite_EggUtopia_Launcher), 0x2010,
-                                0, TaskDestructor_807DF38);
+    struct Task *t = TaskCreate(Task_807DE98, sizeof(Sprite_EggUtopia_Launcher), 0x2010, 0, TaskDestructor_807DF38);
     Sprite_EggUtopia_Launcher *launcher = TASK_DATA(t);
 
     launcher->kind = kind;
@@ -311,8 +306,7 @@ static bool32 sub_807DDF0(Sprite_EggUtopia_Launcher *launcher)
         playerX = I(gPlayer.x) - gCamera.x;
         playerY = I(gPlayer.y) - gCamera.y;
 
-        if ((someX - 2 * TILE_WIDTH <= playerX) && (someX + 2 * TILE_WIDTH >= playerX)
-            && (someY - 2 * TILE_WIDTH <= playerY)
+        if ((someX - 2 * TILE_WIDTH <= playerX) && (someX + 2 * TILE_WIDTH >= playerX) && (someY - 2 * TILE_WIDTH <= playerY)
             && (someY + 2 * TILE_WIDTH >= playerY))
             return TRUE;
     }
@@ -362,10 +356,7 @@ void TaskDestructor_807DF38(struct Task *t)
     VramFree(launcher->s.graphics.dest);
 }
 
-static void SetTaskMain_807E16C(Sprite_EggUtopia_Launcher *unused)
-{
-    gCurTask->main = Task_807E16C;
-}
+static void SetTaskMain_807E16C(Sprite_EggUtopia_Launcher *unused) { gCurTask->main = Task_807E16C; }
 
 static bool16 sub_807DF60(Sprite_EggUtopia_Launcher *launcher)
 {
@@ -426,10 +417,8 @@ static bool32 sub_807E044(Sprite_EggUtopia_Launcher *launcher)
     posX = launcher->posX - gCamera.x;
     posY = launcher->posY - gCamera.y;
 
-    if (((posX + launcher->unk50) < -(CAM_REGION_WIDTH / 2))
-        || ((posX + launcher->unk4C) > DISPLAY_WIDTH + (CAM_REGION_WIDTH / 2))
-        || ((posY + launcher->unk52) < -(CAM_REGION_WIDTH / 2))
-        || ((posY + launcher->unk4E) > DISPLAY_HEIGHT + (CAM_REGION_WIDTH / 2)))
+    if (((posX + launcher->unk50) < -(CAM_REGION_WIDTH / 2)) || ((posX + launcher->unk4C) > DISPLAY_WIDTH + (CAM_REGION_WIDTH / 2))
+        || ((posY + launcher->unk52) < -(CAM_REGION_WIDTH / 2)) || ((posY + launcher->unk4E) > DISPLAY_HEIGHT + (CAM_REGION_WIDTH / 2)))
         return TRUE;
 
     return FALSE;
@@ -451,32 +440,24 @@ static void sub_807E0D0(Sprite_EggUtopia_Launcher *launcher)
     launcher->unk60[0][1] = launcher->unk58;
 }
 
-void CreateEntity_Launcher_Left_GDown(MapEntity *me, u16 spriteRegionX,
-                                      u16 spriteRegionY, u8 spriteY)
+void CreateEntity_Launcher_Left_GDown(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    CreateEntity_Launcher(me, spriteRegionX, spriteRegionY, spriteY,
-                          LAUNCHER_KIND(LAUN_DIR_LEFT, LAUN_GRAVITY_DOWN));
+    CreateEntity_Launcher(me, spriteRegionX, spriteRegionY, spriteY, LAUNCHER_KIND(LAUN_DIR_LEFT, LAUN_GRAVITY_DOWN));
 }
 
-void CreateEntity_Launcher_Right_GDown(MapEntity *me, u16 spriteRegionX,
-                                       u16 spriteRegionY, u8 spriteY)
+void CreateEntity_Launcher_Right_GDown(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    CreateEntity_Launcher(me, spriteRegionX, spriteRegionY, spriteY,
-                          LAUNCHER_KIND(LAUN_DIR_RIGHT, LAUN_GRAVITY_DOWN));
+    CreateEntity_Launcher(me, spriteRegionX, spriteRegionY, spriteY, LAUNCHER_KIND(LAUN_DIR_RIGHT, LAUN_GRAVITY_DOWN));
 }
 
-void CreateEntity_Launcher_Left_GUp(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                    u8 spriteY)
+void CreateEntity_Launcher_Left_GUp(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    CreateEntity_Launcher(me, spriteRegionX, spriteRegionY, spriteY,
-                          LAUNCHER_KIND(LAUN_DIR_LEFT, LAUN_GRAVITY_UP));
+    CreateEntity_Launcher(me, spriteRegionX, spriteRegionY, spriteY, LAUNCHER_KIND(LAUN_DIR_LEFT, LAUN_GRAVITY_UP));
 }
 
-void CreateEntity_Launcher_Right_GUp(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                     u8 spriteY)
+void CreateEntity_Launcher_Right_GUp(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    CreateEntity_Launcher(me, spriteRegionX, spriteRegionY, spriteY,
-                          LAUNCHER_KIND(LAUN_DIR_RIGHT, LAUN_GRAVITY_UP));
+    CreateEntity_Launcher(me, spriteRegionX, spriteRegionY, spriteY, LAUNCHER_KIND(LAUN_DIR_RIGHT, LAUN_GRAVITY_UP));
 }
 
 static void Task_807E16C(void)
@@ -494,10 +475,7 @@ static void Task_807E16C(void)
     sub_807DDA0(launcher);
 }
 
-static void SetTaskMain_807DE98(Sprite_EggUtopia_Launcher *unused)
-{
-    gCurTask->main = Task_807DE98;
-}
+static void SetTaskMain_807DE98(Sprite_EggUtopia_Launcher *unused) { gCurTask->main = Task_807DE98; }
 
 static bool16 sub_807E1C4(Sprite_EggUtopia_Launcher *launcher)
 {
diff --git a/src/game/interactables_2/egg_utopia/pole.c b/src/game/interactables_2/egg_utopia/pole.c
index 036373a4b..bf3a20f1b 100644
--- a/src/game/interactables_2/egg_utopia/pole.c
+++ b/src/game/interactables_2/egg_utopia/pole.c
@@ -34,8 +34,7 @@ static void Task_807EA8C(void);
 
 void CreateEntity_Pole(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_Pole_NotTouching, sizeof(Sprite_Pole), 0x2010, 0,
-                                TaskDestructor_Interactable094);
+    struct Task *t = TaskCreate(Task_Pole_NotTouching, sizeof(Sprite_Pole), 0x2010, 0, TaskDestructor_Interactable094);
     Sprite_Pole *pole = TASK_DATA(t);
     pole->worldX = TO_WORLD_POS(me->x, spriteRegionX);
     pole->worldY = TO_WORLD_POS(me->y, spriteRegionY);
@@ -137,8 +136,7 @@ static bool32 PlayerTouchesPole(Sprite_Pole *pole)
     playerScreenY = I(gPlayer.y) - gCamera.y;
 
     if (poleScreenX <= playerScreenX && poleScreenX + pole->width >= playerScreenX) {
-        if (poleScreenY <= playerScreenY
-            && poleScreenY + pole->height >= playerScreenY) {
+        if (poleScreenY <= playerScreenY && poleScreenY + pole->height >= playerScreenY) {
             return TRUE;
         }
     }
@@ -233,10 +231,8 @@ static bool32 PoleIsOffScreen(Sprite_Pole *pole)
 
     screenX = pole->worldX - gCamera.x;
     screenY = pole->worldY - gCamera.y;
-    if (screenX + pole->right < -((CAM_REGION_WIDTH) / 2)
-        || screenX + pole->left > (DISPLAY_WIDTH + ((CAM_REGION_WIDTH) / 2))
-        || screenY + pole->bottom < -((CAM_REGION_WIDTH) / 2)
-        || screenY + pole->top > (DISPLAY_HEIGHT + ((CAM_REGION_WIDTH) / 2))) {
+    if (screenX + pole->right < -((CAM_REGION_WIDTH) / 2) || screenX + pole->left > (DISPLAY_WIDTH + ((CAM_REGION_WIDTH) / 2))
+        || screenY + pole->bottom < -((CAM_REGION_WIDTH) / 2) || screenY + pole->top > (DISPLAY_HEIGHT + ((CAM_REGION_WIDTH) / 2))) {
         return TRUE;
     }
 
diff --git a/src/game/interactables_2/egg_utopia/speeding_platform.c b/src/game/interactables_2/egg_utopia/speeding_platform.c
index 028ad3882..8a5d672e3 100644
--- a/src/game/interactables_2/egg_utopia/speeding_platform.c
+++ b/src/game/interactables_2/egg_utopia/speeding_platform.c
@@ -51,12 +51,10 @@ static void sub_807FF20(void);
 static void sub_807FF88(Sprite_SpeedingPlatform *);
 static void sub_807FFB0(void);
 
-void CreateEntity_SpeedingPlatform(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                   u8 spriteY)
+void CreateEntity_SpeedingPlatform(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     u32 i;
-    struct Task *t = TaskCreate(Task_Interactable097, sizeof(Sprite_SpeedingPlatform),
-                                0x2010, 0, TaskDestructor_Interactable097);
+    struct Task *t = TaskCreate(Task_Interactable097, sizeof(Sprite_SpeedingPlatform), 0x2010, 0, TaskDestructor_Interactable097);
     Sprite_SpeedingPlatform *platform = TASK_DATA(t);
     Sprite *s;
     platform->unk54 = 0;
@@ -108,8 +106,7 @@ static void sub_807F9F0(void)
 
     sub_807FB1C(platform);
     if (platform->unk4C && platform->unk5A > -1) {
-        s32 res = sub_801F100(platform->y + I(platform->unk48),
-                              platform->x + I(platform->unk44), 1, 8, sub_801EC3C);
+        s32 res = sub_801F100(platform->y + I(platform->unk48), platform->x + I(platform->unk44), 1, 8, sub_801EC3C);
         if (res < 0) {
             platform->unk4C = FALSE;
             gPlayer.transition = PLTRANS_PT3;
@@ -155,8 +152,7 @@ static void sub_807FB1C(Sprite_SpeedingPlatform *platform)
 
     if (PLAYER_IS_ALIVE && platform->unk4C) {
         gPlayer.x = platform->unk50 + (Q(platform->x) + platform->unk44);
-        gPlayer.y
-            = platform->unk52 + (Q(platform->y) + platform->unk48) - Q(gPlayer.unk17);
+        gPlayer.y = platform->unk52 + (Q(platform->y) + platform->unk48) - Q(gPlayer.unk17);
         platform->unk50 += gPlayer.speedAirX;
         platform->unk52 += gPlayer.speedAirY;
     }
@@ -187,8 +183,7 @@ static bool32 sub_807FC9C(Sprite_SpeedingPlatform *platform)
         return FALSE;
     }
 
-    if (gPlayer.moveState
-        & (MOVESTATE_1000000 | MOVESTATE_400000 | MOVESTATE_IN_AIR | MOVESTATE_DEAD)) {
+    if (gPlayer.moveState & (MOVESTATE_1000000 | MOVESTATE_400000 | MOVESTATE_IN_AIR | MOVESTATE_DEAD)) {
         gPlayer.moveState &= ~MOVESTATE_8;
         gPlayer.unk3C = NULL;
         return FALSE;
@@ -211,8 +206,7 @@ static bool32 sub_807FC9C(Sprite_SpeedingPlatform *platform)
 static u32 sub_807FD0C(Sprite_SpeedingPlatform *platform)
 {
     if (PLAYER_IS_ALIVE) {
-        u32 temp = sub_800CCB8(&platform->s, platform->x + I(platform->unk44),
-                               platform->y + I(platform->unk48), &gPlayer);
+        u32 temp = sub_800CCB8(&platform->s, platform->x + I(platform->unk44), platform->y + I(platform->unk48), &gPlayer);
 
         if (temp != 0) {
             if (temp & 0x10000) {
diff --git a/src/game/interactables_2/hot_crater/crane.c b/src/game/interactables_2/hot_crater/crane.c
index 86334ac31..39c2f5eee 100644
--- a/src/game/interactables_2/hot_crater/crane.c
+++ b/src/game/interactables_2/hot_crater/crane.c
@@ -77,8 +77,7 @@ static void sub_8074604(Sprite_HCCrane *);
 
 void CreateEntity_Crane(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_8073AA8, sizeof(Sprite_HCCrane), 0x2010, 0,
-                                TaskDestructor_80743B8);
+    struct Task *t = TaskCreate(Task_8073AA8, sizeof(Sprite_HCCrane), 0x2010, 0, TaskDestructor_80743B8);
     Sprite_HCCrane *crane = TASK_DATA(t);
     CraneStruct *cs;
     u16 i;
@@ -435,8 +434,7 @@ static void Task_8073E20(void)
         crane->unk1B8.unkA += r2;
 
         if (((crane->unk1B8.unk8 > 0) && (crane->unk1B8.unk8 <= crane->unk1B8.unkA))
-            || ((crane->unk1B8.unk8 < 0)
-                && (crane->unk1B8.unk8 >= crane->unk1B8.unkA))) {
+            || ((crane->unk1B8.unk8 < 0) && (crane->unk1B8.unk8 >= crane->unk1B8.unkA))) {
             u16 unk8 = crane->unk1B8.unk8;
             crane->unk1B8.unkA = unk8;
             crane->unk1B8.accelY = unk8;
@@ -632,8 +630,7 @@ static bool32 sub_807432C(Sprite_HCCrane *crane)
             s16 playerX = I(gPlayer.x) - gCamera.x;
             s16 playerY = I(gPlayer.y) - gCamera.y;
 
-            if (((screenX - 24) <= playerX) && ((screenX + 24) >= playerX)
-                && ((screenY - 24) <= playerY) && ((screenY + 24) >= playerY)) {
+            if (((screenX - 24) <= playerX) && ((screenX + 24) >= playerX) && ((screenY - 24) <= playerY) && ((screenY + 24) >= playerY)) {
                 return TRUE;
             }
         }
@@ -701,10 +698,7 @@ static void sub_8074490(Sprite_HCCrane *crane, s16 p1)
     }
 }
 
-static bool32 sub_80744D0(Sprite_HCCrane *crane, s16 p1)
-{
-    return sub_80744E0(crane, 7, p1);
-}
+static bool32 sub_80744D0(Sprite_HCCrane *crane, s16 p1) { return sub_80744E0(crane, 7, p1); }
 
 static bool32 sub_80744E0(Sprite_HCCrane *crane, u16 index, s16 p2)
 {
@@ -755,8 +749,7 @@ static bool32 sub_80745B4(Sprite_HCCrane *crane)
     screenY = crane->posY - gCamera.y;
 
     // TODO: Replace constants!
-    if (((u16)(screenX + 192) > 624) || ((screenY + 64) < -128)
-        || ((screenY - 64) > 288)) {
+    if (((u16)(screenX + 192) > 624) || ((screenY + 64) < -128) || ((screenY - 64) > 288)) {
         return TRUE;
     }
 
diff --git a/src/game/interactables_2/hot_crater/dash_ring.c b/src/game/interactables_2/hot_crater/dash_ring.c
index 1cfce7883..c7cdd98e1 100644
--- a/src/game/interactables_2/hot_crater/dash_ring.c
+++ b/src/game/interactables_2/hot_crater/dash_ring.c
@@ -28,91 +28,87 @@ static bool32 DashRing_ShouldDespawn(Sprite_DashRing *);
 static void DashRing_Despawn(Sprite_DashRing *);
 
 // type: UnkDashRingStruct
-static const u16 sAnimInfoDashRing[DASH_RING__NUM_TYPES][DASH_RING__NUM_ORIENTATIONS][2]
-                                  [6]
-    = {
-          {
-              {
-                  { SA2_ANIM_DASH_RING, 0x0002, 12, 0x0000, 0x0000, 0x0000 },
-                  { SA2_ANIM_DASH_RING, 0x0003, 6, 0x0000, 0x0000, 0x0000 },
-              },
-              {
-                  { SA2_ANIM_DASH_RING, 0x0004, 36, 0x0400, 0x0000, 0x0000 },
-                  { SA2_ANIM_DASH_RING, 0x0005, 25, 0x0400, 0x0000, 0x0000 },
-              },
-              {
-                  { SA2_ANIM_DASH_RING, 0x0000, 12, 0x0000, 0x0000, 0x0000 },
-                  { SA2_ANIM_DASH_RING, 0x0001, 6, 0x0000, 0x0000, 0x0000 },
-              },
-              {
-                  { SA2_ANIM_DASH_RING, 0x0004, 36, 0x0C00, 0x0000, 0x0000 },
-                  { SA2_ANIM_DASH_RING, 0x0005, 25, 0x0C00, 0x0000, 0x0000 },
-              },
-              {
-                  { SA2_ANIM_DASH_RING, 0x0002, 12, 0x0800, 0x0000, 0x0000 },
-                  { SA2_ANIM_DASH_RING, 0x0003, 6, 0x0800, 0x0000, 0x0000 },
-              },
-              {
-                  { SA2_ANIM_DASH_RING, 0x0004, 36, 0x0800, 0x0000, 0x0000 },
-                  { SA2_ANIM_DASH_RING, 0x0005, 25, 0x0800, 0x0000, 0x0000 },
-              },
-              {
-                  { SA2_ANIM_DASH_RING, 0x0000, 12, 0x0400, 0x0000, 0x0000 },
-                  { SA2_ANIM_DASH_RING, 0x0001, 6, 0x0400, 0x0000, 0x0000 },
-              },
-              {
-                  { SA2_ANIM_DASH_RING, 0x0004, 36, 0x0000, 0x0000, 0x0000 },
-                  { SA2_ANIM_DASH_RING, 0x0005, 25, 0x0000, 0x0000, 0x0000 },
-              },
-          },
-          {
-              {
-                  { SA2_ANIM_DASH_RING_TEC_BAS, 0x0002, 12, 0x0000, 0x0000, 0x0000 },
-                  { SA2_ANIM_DASH_RING_TEC_BAS, 0x0003, 6, 0x0000, 0x0000, 0x0000 },
-              },
-              {
-                  { SA2_ANIM_DASH_RING_TEC_BAS, 0x0004, 36, 0x0400, 0x0000, 0x0000 },
-                  { SA2_ANIM_DASH_RING_TEC_BAS, 0x0005, 25, 0x0400, 0x0000, 0x0000 },
-              },
-              {
-                  { SA2_ANIM_DASH_RING_TEC_BAS, 0x0000, 12, 0x0000, 0x0000, 0x0000 },
-                  { SA2_ANIM_DASH_RING_TEC_BAS, 0x0001, 6, 0x0000, 0x0000, 0x0000 },
-              },
-              {
-                  { SA2_ANIM_DASH_RING_TEC_BAS, 0x0004, 36, 0x0C00, 0x0000, 0x0000 },
-                  { SA2_ANIM_DASH_RING_TEC_BAS, 0x0005, 25, 0x0C00, 0x0000, 0x0000 },
-              },
-              {
-                  { SA2_ANIM_DASH_RING_TEC_BAS, 0x0002, 12, 0x0800, 0x0000, 0x0000 },
-                  { SA2_ANIM_DASH_RING_TEC_BAS, 0x0003, 6, 0x0800, 0x0000, 0x0000 },
-              },
-              {
-                  { SA2_ANIM_DASH_RING_TEC_BAS, 0x0004, 36, 0x0800, 0x0000, 0x0000 },
-                  { SA2_ANIM_DASH_RING_TEC_BAS, 0x0005, 25, 0x0800, 0x0000, 0x0000 },
-              },
-              {
-                  { SA2_ANIM_DASH_RING_TEC_BAS, 0x0000, 12, 0x0400, 0x0000, 0x0000 },
-                  { SA2_ANIM_DASH_RING_TEC_BAS, 0x0001, 6, 0x0400, 0x0000, 0x0000 },
-              },
-              {
-                  { SA2_ANIM_DASH_RING_TEC_BAS, 0x0004, 36, 0x0000, 0x0000, 0x0000 },
-                  { SA2_ANIM_DASH_RING_TEC_BAS, 0x0005, 25, 0x0000, 0x0000, 0x0000 },
-              },
-          },
-      };
+static const u16 sAnimInfoDashRing[DASH_RING__NUM_TYPES][DASH_RING__NUM_ORIENTATIONS][2][6] = {
+    {
+        {
+            { SA2_ANIM_DASH_RING, 0x0002, 12, 0x0000, 0x0000, 0x0000 },
+            { SA2_ANIM_DASH_RING, 0x0003, 6, 0x0000, 0x0000, 0x0000 },
+        },
+        {
+            { SA2_ANIM_DASH_RING, 0x0004, 36, 0x0400, 0x0000, 0x0000 },
+            { SA2_ANIM_DASH_RING, 0x0005, 25, 0x0400, 0x0000, 0x0000 },
+        },
+        {
+            { SA2_ANIM_DASH_RING, 0x0000, 12, 0x0000, 0x0000, 0x0000 },
+            { SA2_ANIM_DASH_RING, 0x0001, 6, 0x0000, 0x0000, 0x0000 },
+        },
+        {
+            { SA2_ANIM_DASH_RING, 0x0004, 36, 0x0C00, 0x0000, 0x0000 },
+            { SA2_ANIM_DASH_RING, 0x0005, 25, 0x0C00, 0x0000, 0x0000 },
+        },
+        {
+            { SA2_ANIM_DASH_RING, 0x0002, 12, 0x0800, 0x0000, 0x0000 },
+            { SA2_ANIM_DASH_RING, 0x0003, 6, 0x0800, 0x0000, 0x0000 },
+        },
+        {
+            { SA2_ANIM_DASH_RING, 0x0004, 36, 0x0800, 0x0000, 0x0000 },
+            { SA2_ANIM_DASH_RING, 0x0005, 25, 0x0800, 0x0000, 0x0000 },
+        },
+        {
+            { SA2_ANIM_DASH_RING, 0x0000, 12, 0x0400, 0x0000, 0x0000 },
+            { SA2_ANIM_DASH_RING, 0x0001, 6, 0x0400, 0x0000, 0x0000 },
+        },
+        {
+            { SA2_ANIM_DASH_RING, 0x0004, 36, 0x0000, 0x0000, 0x0000 },
+            { SA2_ANIM_DASH_RING, 0x0005, 25, 0x0000, 0x0000, 0x0000 },
+        },
+    },
+    {
+        {
+            { SA2_ANIM_DASH_RING_TEC_BAS, 0x0002, 12, 0x0000, 0x0000, 0x0000 },
+            { SA2_ANIM_DASH_RING_TEC_BAS, 0x0003, 6, 0x0000, 0x0000, 0x0000 },
+        },
+        {
+            { SA2_ANIM_DASH_RING_TEC_BAS, 0x0004, 36, 0x0400, 0x0000, 0x0000 },
+            { SA2_ANIM_DASH_RING_TEC_BAS, 0x0005, 25, 0x0400, 0x0000, 0x0000 },
+        },
+        {
+            { SA2_ANIM_DASH_RING_TEC_BAS, 0x0000, 12, 0x0000, 0x0000, 0x0000 },
+            { SA2_ANIM_DASH_RING_TEC_BAS, 0x0001, 6, 0x0000, 0x0000, 0x0000 },
+        },
+        {
+            { SA2_ANIM_DASH_RING_TEC_BAS, 0x0004, 36, 0x0C00, 0x0000, 0x0000 },
+            { SA2_ANIM_DASH_RING_TEC_BAS, 0x0005, 25, 0x0C00, 0x0000, 0x0000 },
+        },
+        {
+            { SA2_ANIM_DASH_RING_TEC_BAS, 0x0002, 12, 0x0800, 0x0000, 0x0000 },
+            { SA2_ANIM_DASH_RING_TEC_BAS, 0x0003, 6, 0x0800, 0x0000, 0x0000 },
+        },
+        {
+            { SA2_ANIM_DASH_RING_TEC_BAS, 0x0004, 36, 0x0800, 0x0000, 0x0000 },
+            { SA2_ANIM_DASH_RING_TEC_BAS, 0x0005, 25, 0x0800, 0x0000, 0x0000 },
+        },
+        {
+            { SA2_ANIM_DASH_RING_TEC_BAS, 0x0000, 12, 0x0400, 0x0000, 0x0000 },
+            { SA2_ANIM_DASH_RING_TEC_BAS, 0x0001, 6, 0x0400, 0x0000, 0x0000 },
+        },
+        {
+            { SA2_ANIM_DASH_RING_TEC_BAS, 0x0004, 36, 0x0000, 0x0000, 0x0000 },
+            { SA2_ANIM_DASH_RING_TEC_BAS, 0x0005, 25, 0x0000, 0x0000, 0x0000 },
+        },
+    },
+};
 
 // NOTE(Jace): Maybe these are UnkDashRingStruct[8]?
 static const u16 sUnknown_080DFB90[DASH_RING__NUM_ORIENTATIONS][6] = {
     { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 },
 };
 
-void CreateEntity_DashRing(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                           u8 spriteY)
+void CreateEntity_DashRing(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     u32 ringType = DASH_RING__TYPE_REGULAR;
 
-    struct Task *t = TaskCreate(Task_Interactable_DashRing, sizeof(Sprite_DashRing),
-                                0x2010, 0, TaskDestructor_Interactable_DashRing);
+    struct Task *t = TaskCreate(Task_Interactable_DashRing, sizeof(Sprite_DashRing), 0x2010, 0, TaskDestructor_Interactable_DashRing);
 
     Sprite_DashRing *ring = TASK_DATA(t);
     ring->orientation = me->d.sData[0];
@@ -139,8 +135,7 @@ void CreateEntity_DashRing(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
         s->frameFlags = 0x2000;
         s->graphics.anim = sAnimInfoDashRing[ringType][ring->orientation][0][0];
         s->variant = sAnimInfoDashRing[ringType][ring->orientation][0][1];
-        s->graphics.dest
-            = VramMalloc(sAnimInfoDashRing[ringType][ring->orientation][0][2]);
+        s->graphics.dest = VramMalloc(sAnimInfoDashRing[ringType][ring->orientation][0][2]);
         s->frameFlags |= sAnimInfoDashRing[ringType][ring->orientation][0][3];
     }
     {
@@ -157,8 +152,7 @@ void CreateEntity_DashRing(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
         s->frameFlags = 0x2000;
         s->graphics.anim = sAnimInfoDashRing[ringType][ring->orientation][1][0];
         s->variant = sAnimInfoDashRing[ringType][ring->orientation][1][1];
-        s->graphics.dest
-            = VramMalloc(sAnimInfoDashRing[ringType][ring->orientation][1][2]);
+        s->graphics.dest = VramMalloc(sAnimInfoDashRing[ringType][ring->orientation][1][2]);
         s->frameFlags |= sAnimInfoDashRing[ringType][ring->orientation][1][3];
     }
     DashRing_UpdateScreenPos(ring);
@@ -268,8 +262,8 @@ static bool32 DashRing_PlayerIsColliding(Sprite_DashRing *ring)
         ringScreenX2 = ringScreenX2 + ring->positions[i].x - 12;
         ringScreenY2 = ringScreenY2 + ring->positions[i].y - 12;
 
-        if ((ringScreenX2 <= playerScreenX) && ((ringScreenX2 + 24) >= playerScreenX)
-            && (ringScreenY2 <= playerScreenY) && (ringScreenY2 + 24) >= playerScreenY) {
+        if ((ringScreenX2 <= playerScreenX) && ((ringScreenX2 + 24) >= playerScreenX) && (ringScreenY2 <= playerScreenY)
+            && (ringScreenY2 + 24) >= playerScreenY) {
             return TRUE;
         }
     }
@@ -330,8 +324,7 @@ static bool32 DashRing_ShouldDespawn(Sprite_DashRing *ring)
     screenX = ring->posX - gCamera.x;
     screenY = ring->posY - gCamera.y;
 
-    if (((u16)(screenX + 140) > 520) || ((screenY + 12) < -128)
-        || ((screenY - 12) > 288)) {
+    if (((u16)(screenX + 140) > 520) || ((screenY + 12) < -128) || ((screenY - 12) > 288)) {
         return TRUE;
     }
 
diff --git a/src/game/interactables_2/hot_crater/floating_spring.c b/src/game/interactables_2/hot_crater/floating_spring.c
index 6467bad83..6fcab4f5a 100644
--- a/src/game/interactables_2/hot_crater/floating_spring.c
+++ b/src/game/interactables_2/hot_crater/floating_spring.c
@@ -43,11 +43,9 @@ static bool32 sub_80751CC(Sprite_FloatingSpring *);
 static void sub_80752D8(void);
 static void sub_8075334(Sprite_FloatingSpring *);
 
-void CreateEntity_FloatingSpring_Up(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                    u8 spriteY)
+void CreateEntity_FloatingSpring_Up(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t
-        = TaskCreate(sub_80750A8, sizeof(Sprite_FloatingSpring), 0x2010, 0, sub_8075140);
+    struct Task *t = TaskCreate(sub_80750A8, sizeof(Sprite_FloatingSpring), 0x2010, 0, sub_8075140);
     Sprite_FloatingSpring *floatingSpring = TASK_DATA(t);
     Sprite *s = &floatingSpring->s;
 
@@ -110,34 +108,22 @@ static void sub_8074E44(Sprite_FloatingSpring *floatingSpring)
 
     if (floatingSpring->unk52 != 0) {
         s32 temp = me->d.uData[2] * 2048;
-        floatingSpring->unk44
-            = (SIN((floatingSpring->unk52 * ((gStageTime + floatingSpring->unk56) & 255))
-                   & ONE_CYCLE)
-               * temp)
-            >> 15;
+        floatingSpring->unk44 = (SIN((floatingSpring->unk52 * ((gStageTime + floatingSpring->unk56) & 255)) & ONE_CYCLE) * temp) >> 15;
     }
 
     if (floatingSpring->unk54 != 0) {
         s32 temp = me->d.uData[3] * 2048;
-        floatingSpring->unk48
-            = (SIN((floatingSpring->unk54 * ((gStageTime + floatingSpring->unk56) & 255))
-                   & ONE_CYCLE)
-               * temp)
-            >> 15;
+        floatingSpring->unk48 = (SIN((floatingSpring->unk54 * ((gStageTime + floatingSpring->unk56) & 255)) & ONE_CYCLE) * temp) >> 15;
     }
 
-    floatingSpring->unk3C
-        = TO_WORLD_POS(floatingSpring->base.spriteX, floatingSpring->base.regionX)
-        + I(floatingSpring->unk44);
-    floatingSpring->unk40
-        = TO_WORLD_POS(me->y, floatingSpring->base.regionY) + I(floatingSpring->unk48);
+    floatingSpring->unk3C = TO_WORLD_POS(floatingSpring->base.spriteX, floatingSpring->base.regionX) + I(floatingSpring->unk44);
+    floatingSpring->unk40 = TO_WORLD_POS(me->y, floatingSpring->base.regionY) + I(floatingSpring->unk48);
 }
 
 static u32 sub_8074EF4(Sprite_FloatingSpring *floatingSpring)
 {
     if (PLAYER_IS_ALIVE) {
-        u32 temp = sub_800CDBC(&floatingSpring->s, floatingSpring->unk3C,
-                               floatingSpring->unk40, &gPlayer);
+        u32 temp = sub_800CDBC(&floatingSpring->s, floatingSpring->unk3C, floatingSpring->unk40, &gPlayer);
         if (temp != 0) {
             if (I(gPlayer.y) < floatingSpring->unk40) {
                 gPlayer.y += Q(floatingSpring->s.hitboxes[0].top);
diff --git a/src/game/interactables_2/hot_crater/hook_rail.c b/src/game/interactables_2/hot_crater/hook_rail.c
index 8112b2cfa..24f2fc3a1 100644
--- a/src/game/interactables_2/hot_crater/hook_rail.c
+++ b/src/game/interactables_2/hot_crater/hook_rail.c
@@ -61,8 +61,7 @@ static void sub_8072BB8(void);
 #define PLAYER_TOUCH_DIRECTION_FORWARDS 1
 #define PLAYER_TOUCH_DIRECTION_REVERSE  2
 
-void CreateEntity_HookRail(u32 triggerType, MapEntity *me, u16 spriteRegionX,
-                           u16 spriteRegionY, u8 spriteY)
+void CreateEntity_HookRail(u32 triggerType, MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     struct Task *t;
     Sprite_HookRail *hookRail;
@@ -228,11 +227,8 @@ static u32 IsPlayerTouching(Sprite_HookRail *hookRail)
     playerX = I(gPlayer.x) - gCamera.x;
     playerY = I(gPlayer.y) - gCamera.y;
 
-    if (x + hookRail->width <= playerX
-        && (x + hookRail->width) + (hookRail->offsetX - hookRail->width) >= playerX) {
-        if (y + hookRail->height <= playerY
-            && (y + hookRail->height) + (hookRail->offsetY - hookRail->height)
-                >= playerY) {
+    if (x + hookRail->width <= playerX && (x + hookRail->width) + (hookRail->offsetX - hookRail->width) >= playerX) {
+        if (y + hookRail->height <= playerY && (y + hookRail->height) + (hookRail->offsetY - hookRail->height) >= playerY) {
             s16 railEndX = x + ((hookRail->offsetX + hookRail->width) >> 1);
             if (playerX < railEndX) {
                 return PLAYER_TOUCH_DIRECTION_FORWARDS;
@@ -268,8 +264,7 @@ static void sub_8072F8C(void)
 {
     Sprite_HookRail *hookRail = TASK_DATA(gCurTask);
 
-    if (IsPlayerTouching(hookRail) != PLAYER_TOUCH_DIRECTION_NONE
-        && gPlayer.unk64 == 55) {
+    if (IsPlayerTouching(hookRail) != PLAYER_TOUCH_DIRECTION_NONE && gPlayer.unk64 == 55) {
         sub_80730BC(hookRail);
     }
 
@@ -299,10 +294,7 @@ static void sub_8072FD8(Sprite_HookRail *hookRail)
     gCurTask->main = sub_8072C90;
 }
 
-static void sub_8073034(UNUSED Sprite_HookRail *hookRail)
-{
-    gCurTask->main = sub_8072F38;
-}
+static void sub_8073034(UNUSED Sprite_HookRail *hookRail) { gCurTask->main = sub_8072F38; }
 
 static void sub_8073048(UNUSED Sprite_HookRail *hookRail)
 {
@@ -413,20 +405,17 @@ static void sub_8073280(Sprite_HookRail *hookRail)
     TaskDestroy(gCurTask);
 }
 
-void CreateEntity_HookRail_Unused(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                  u8 spriteY)
+void CreateEntity_HookRail_Unused(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     CreateEntity_HookRail(0, me, spriteRegionX, spriteRegionY, spriteY);
 }
 
-void CreateEntity_HookRail_Start(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                 u8 spriteY)
+void CreateEntity_HookRail_Start(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     CreateEntity_HookRail(1, me, spriteRegionX, spriteRegionY, spriteY);
 }
 
-void CreateEntity_HookRail_End(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                               u8 spriteY)
+void CreateEntity_HookRail_End(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     CreateEntity_HookRail(2, me, spriteRegionX, spriteRegionY, spriteY);
 }
diff --git a/src/game/interactables_2/hot_crater/turnaround_bar.c b/src/game/interactables_2/hot_crater/turnaround_bar.c
index 1ec85218c..356ef95d8 100644
--- a/src/game/interactables_2/hot_crater/turnaround_bar.c
+++ b/src/game/interactables_2/hot_crater/turnaround_bar.c
@@ -30,11 +30,9 @@ static void sub_8073600(void);
 static void sub_80736E0(Sprite_TurnAroundBar *);
 static void sub_807371C(Sprite_TurnAroundBar *);
 
-void CreateEntity_TurnAroundBar(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                u8 spriteY)
+void CreateEntity_TurnAroundBar(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_TurnAroundBarMain, sizeof(Sprite_TurnAroundBar),
-                                0x2010, 0, TaskDestructor_InteractableTurnAroundBar);
+    struct Task *t = TaskCreate(Task_TurnAroundBarMain, sizeof(Sprite_TurnAroundBar), 0x2010, 0, TaskDestructor_InteractableTurnAroundBar);
     Sprite_TurnAroundBar *turnAroundBar = TASK_DATA(t);
     Sprite *s = &turnAroundBar->s;
 
diff --git a/src/game/interactables_2/hot_crater/windup_stick.c b/src/game/interactables_2/hot_crater/windup_stick.c
index f0236ac32..71806508b 100644
--- a/src/game/interactables_2/hot_crater/windup_stick.c
+++ b/src/game/interactables_2/hot_crater/windup_stick.c
@@ -35,11 +35,9 @@ static void sub_80729D8(Sprite_WindUpStick *);
 static u32 sub_8072A5C(Sprite_WindUpStick *);
 static void sub_8072AC0(Sprite_WindUpStick *);
 
-void CreateEntity_WindUpStick(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                              u8 spriteY)
+void CreateEntity_WindUpStick(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t
-        = TaskCreate(sub_8072998, sizeof(Sprite_WindUpStick), 0x2010, 0, sub_80729D4);
+    struct Task *t = TaskCreate(sub_8072998, sizeof(Sprite_WindUpStick), 0x2010, 0, sub_80729D4);
     Sprite_WindUpStick *windUpStick = TASK_DATA(t);
     windUpStick->unk11 = 0;
     windUpStick->unk0 = TO_WORLD_POS(me->x, spriteRegionX);
@@ -90,8 +88,7 @@ static void sub_80726E8(Sprite_WindUpStick *windUpStick)
     gPlayer.unk17 = 14;
     Player_SetMovestate_IsInScriptedSequence();
     gPlayer.moveState |= MOVESTATE_400000;
-    windUpStick->unk12 = (gUnknown_03005AF0.s.frameFlags & SPRITE_FLAG_MASK_PRIORITY)
-        >> SPRITE_FLAG_SHIFT_PRIORITY;
+    windUpStick->unk12 = (gUnknown_03005AF0.s.frameFlags & SPRITE_FLAG_MASK_PRIORITY) >> SPRITE_FLAG_SHIFT_PRIORITY;
     gUnknown_03005AF0.s.frameFlags &= ~SPRITE_FLAG_MASK_PRIORITY;
     gUnknown_03005AF0.s.frameFlags |= SPRITE_FLAG(PRIORITY, 1);
     gPlayer.y = Q(windUpStick->unk4 + 3);
@@ -186,12 +183,8 @@ static u8 sub_80728D4(Sprite_WindUpStick *windUpStick)
         s16 playerX = I(gPlayer.x) - gCamera.x;
         s16 playerY = I(gPlayer.y) - gCamera.y;
 
-        if ((posX + windUpStick->unk8) <= playerX
-            && (posX + windUpStick->unk8) + (windUpStick->unkC - windUpStick->unk8)
-                >= playerX) {
-            if (posY + windUpStick->unkA <= playerY
-                && (posY + windUpStick->unkA) + (windUpStick->unkE - windUpStick->unkA)
-                    >= playerY) {
+        if ((posX + windUpStick->unk8) <= playerX && (posX + windUpStick->unk8) + (windUpStick->unkC - windUpStick->unk8) >= playerX) {
+            if (posY + windUpStick->unkA <= playerY && (posY + windUpStick->unkA) + (windUpStick->unkE - windUpStick->unkA) >= playerY) {
                 if (gPlayer.moveState & MOVESTATE_IN_AIR) {
                     if (gPlayer.speedAirY < 0) {
                         return 1;
@@ -268,8 +261,7 @@ bool32 sub_8072A5C(Sprite_WindUpStick *windUpStick)
     s16 x = windUpStick->unk0 - gCamera.x;
     s16 y = windUpStick->unk4 - gCamera.y;
 
-    if (x + windUpStick->unkC < -128 || x + windUpStick->unk8 > 368
-        || y + windUpStick->unkE < -128 || y + windUpStick->unkA > 288) {
+    if (x + windUpStick->unkC < -128 || x + windUpStick->unk8 > 368 || y + windUpStick->unkE < -128 || y + windUpStick->unkA > 288) {
         return TRUE;
     }
     return FALSE;
diff --git a/src/game/interactables_2/ice_paradise/big_snowball.c b/src/game/interactables_2/ice_paradise/big_snowball.c
index 5a1b7e115..ec2da6e37 100644
--- a/src/game/interactables_2/ice_paradise/big_snowball.c
+++ b/src/game/interactables_2/ice_paradise/big_snowball.c
@@ -53,11 +53,9 @@ typedef struct {
 void Task_Interactable069(void);
 void TaskDestructor_Interactable069(struct Task *);
 
-void CreateEntity_BigSnowball(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                              u8 spriteY)
+void CreateEntity_BigSnowball(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_Interactable069, sizeof(Sprite_IA69), 0x2010, 0,
-                                TaskDestructor_Interactable069);
+    struct Task *t = TaskCreate(Task_Interactable069, sizeof(Sprite_IA69), 0x2010, 0, TaskDestructor_Interactable069);
     Sprite *s;
     Sprite_IA69 *ia69 = TASK_DATA(t);
     void *vramBase;
@@ -346,8 +344,7 @@ void sub_80792AC(Sprite_IA69 *ia69)
         for (i = 0; i < 2; i++, unk178++) {
             s32 temp2 = I(ia69->unk168 + unk178->unk2);
             if (temp2 < temp) {
-                ia69->unk30.x
-                    = ia69->unk158 - gCamera.x + I(ia69->unk164 + unk178->unk0);
+                ia69->unk30.x = ia69->unk158 - gCamera.x + I(ia69->unk164 + unk178->unk0);
                 ia69->unk30.y = ia69->unk15C - gCamera.y + temp2;
                 DisplaySprite(&ia69->unk30);
             }
@@ -356,8 +353,7 @@ void sub_80792AC(Sprite_IA69 *ia69)
         for (i = 0; i < 2; i++, unk178++) {
             s32 temp2 = I(ia69->unk168 + unk178->unk2);
             if (temp2 < temp) {
-                ia69->unk60.x
-                    = ia69->unk158 - gCamera.x + I(ia69->unk164 + unk178->unk0);
+                ia69->unk60.x = ia69->unk158 - gCamera.x + I(ia69->unk164 + unk178->unk0);
                 ia69->unk60.y = ia69->unk15C - gCamera.y + temp2;
                 DisplaySprite(&ia69->unk60);
             }
@@ -366,8 +362,7 @@ void sub_80792AC(Sprite_IA69 *ia69)
         for (i = 0; i < 4; i++, unk178++) {
             s32 temp2 = I(ia69->unk168 + unk178->unk2);
             if (temp2 < temp) {
-                ia69->unk90.x
-                    = ia69->unk158 - gCamera.x + I(ia69->unk164 + unk178->unk0);
+                ia69->unk90.x = ia69->unk158 - gCamera.x + I(ia69->unk164 + unk178->unk0);
                 ia69->unk90.y = ia69->unk15C - gCamera.y + temp2;
                 DisplaySprite(&ia69->unk90);
             }
@@ -376,8 +371,7 @@ void sub_80792AC(Sprite_IA69 *ia69)
         for (i = 0; i < 4; i++, unk178++) {
             s32 temp2 = I(ia69->unk168 + unk178->unk2);
             if (temp2 < temp) {
-                ia69->unkC0.x
-                    = ia69->unk158 - gCamera.x + I(ia69->unk164 + unk178->unk0);
+                ia69->unkC0.x = ia69->unk158 - gCamera.x + I(ia69->unk164 + unk178->unk0);
                 ia69->unkC0.y = ia69->unk15C - gCamera.y + temp2;
                 DisplaySprite(&ia69->unkC0);
             }
@@ -439,8 +433,7 @@ bool32 sub_8079624(Sprite_IA69 *ia69)
 
     temp2 = temp1;
     temp3 = temp;
-    if ((temp2 + ia69->unk1B0) < -128 || (temp2 + ia69->unk1AC) > 368
-        || (temp3 + ia69->unk1B2) < -128 || (temp3 + ia69->unk1AE) >= 289) {
+    if ((temp2 + ia69->unk1B0) < -128 || (temp2 + ia69->unk1AC) > 368 || (temp3 + ia69->unk1B2) < -128 || (temp3 + ia69->unk1AE) >= 289) {
         return TRUE;
     }
 
diff --git a/src/game/interactables_2/ice_paradise/funnel_sphere.c b/src/game/interactables_2/ice_paradise/funnel_sphere.c
index f85d27451..45ba58f93 100644
--- a/src/game/interactables_2/ice_paradise/funnel_sphere.c
+++ b/src/game/interactables_2/ice_paradise/funnel_sphere.c
@@ -151,15 +151,13 @@ static void sub_8078170(Sprite_FunnelSphere *funnelSphere)
     switch (gPlayer.character) {
         case CHARACTER_CREAM:
         case CHARACTER_TAILS:
-            funnelSphere->unk14
-                = (gPlayer.unk94->s.frameFlags & SPRITE_FLAG_MASK_PRIORITY) >> 12;
+            funnelSphere->unk14 = (gPlayer.unk94->s.frameFlags & SPRITE_FLAG_MASK_PRIORITY) >> 12;
             gPlayer.unk94->s.frameFlags &= ~SPRITE_FLAG_MASK_PRIORITY;
             gPlayer.unk94->s.frameFlags |= SPRITE_FLAG(PRIORITY, 1);
         case CHARACTER_SONIC:
         case CHARACTER_KNUCKLES:
         case CHARACTER_AMY:
-            funnelSphere->unk12
-                = (gPlayer.unk90->s.frameFlags & SPRITE_FLAG_MASK_PRIORITY) >> 12;
+            funnelSphere->unk12 = (gPlayer.unk90->s.frameFlags & SPRITE_FLAG_MASK_PRIORITY) >> 12;
             gPlayer.unk90->s.frameFlags &= ~SPRITE_FLAG_MASK_PRIORITY;
             gPlayer.unk90->s.frameFlags |= SPRITE_FLAG(PRIORITY, 1);
     }
@@ -306,11 +304,9 @@ static void sub_8078594(Sprite_FunnelSphere *funnelSphere)
     TaskDestroy(gCurTask);
 }
 
-void CreateEntity_FunnelSphere(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                               u8 spriteY)
+void CreateEntity_FunnelSphere(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t
-        = TaskCreate(sub_8078414, sizeof(Sprite_FunnelSphere), 0x2010, 0, sub_8078688);
+    struct Task *t = TaskCreate(sub_8078414, sizeof(Sprite_FunnelSphere), 0x2010, 0, sub_8078688);
     Sprite_FunnelSphere *funnelSphere = TASK_DATA(t);
     funnelSphere->me = me;
     funnelSphere->spriteX = me->x;
diff --git a/src/game/interactables_2/ice_paradise/half_pipe.c b/src/game/interactables_2/ice_paradise/half_pipe.c
index 3f12f80d1..ad6b8987c 100644
--- a/src/game/interactables_2/ice_paradise/half_pipe.c
+++ b/src/game/interactables_2/ice_paradise/half_pipe.c
@@ -39,11 +39,9 @@ static void DestroyHalfPipe(Sprite_IceParadiseHalfPipe *);
 #define HALF_PIPE_DIRECTION_FORWARD 0
 #define HALF_PIPE_DIRECTION_REVERSE 1
 
-static void CreateEntity_HalfPipe(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                  u8 spriteY, s32 direction)
+static void CreateEntity_HalfPipe(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY, s32 direction)
 {
-    struct Task *t = TaskCreate(Task_HalfPipeMain, sizeof(Sprite_IceParadiseHalfPipe),
-                                0x2010, 0, TaskDestructor_HalfPipe);
+    struct Task *t = TaskCreate(Task_HalfPipeMain, sizeof(Sprite_IceParadiseHalfPipe), 0x2010, 0, TaskDestructor_HalfPipe);
     Sprite_IceParadiseHalfPipe *halfPipe = TASK_DATA(t);
     halfPipe->direction = direction;
     halfPipe->x = Q(spriteRegionX) + me->x * TILE_WIDTH;
@@ -76,9 +74,8 @@ static void Task_HalfPipeSequenceMain(void)
     } else {
         u16 posWithinHalfPipe;
         gPlayer.moveState |= MOVESTATE_8000;
-        posWithinHalfPipe = halfPipe->direction == HALF_PIPE_DIRECTION_FORWARD
-            ? I(gPlayer.x) - (halfPipe->x + halfPipe->offsetX)
-            : (halfPipe->x + halfPipe->width) - I(gPlayer.x);
+        posWithinHalfPipe = halfPipe->direction == HALF_PIPE_DIRECTION_FORWARD ? I(gPlayer.x) - (halfPipe->x + halfPipe->offsetX)
+                                                                               : (halfPipe->x + halfPipe->width) - I(gPlayer.x);
         UpdatePlayerPosOnHalfPipe(halfPipe, posWithinHalfPipe);
     }
 }
@@ -139,12 +136,8 @@ static bool32 PlayerWithinHalfPipe(Sprite_IceParadiseHalfPipe *halfPipe)
     s16 playerX = I(gPlayer.x) - gCamera.x;
     s16 playerY = I(gPlayer.y) - gCamera.y;
 
-    if ((posX + halfPipe->offsetX) <= playerX
-        && (posX + halfPipe->offsetX) + (halfPipe->width - halfPipe->offsetX)
-            >= playerX) {
-        if (posY + halfPipe->offsetY <= playerY
-            && (posY + halfPipe->offsetY) + (halfPipe->height - halfPipe->offsetY)
-                >= playerY) {
+    if ((posX + halfPipe->offsetX) <= playerX && (posX + halfPipe->offsetX) + (halfPipe->width - halfPipe->offsetX) >= playerX) {
+        if (posY + halfPipe->offsetY <= playerY && (posY + halfPipe->offsetY) + (halfPipe->height - halfPipe->offsetY) >= playerY) {
             return TRUE;
         }
     }
@@ -176,10 +169,7 @@ static void StartHalfPipeSequence(Sprite_IceParadiseHalfPipe *halfPipe)
     gCurTask->main = Task_HalfPipeSequenceMain;
 }
 
-static void EndHalfPipeSequence(Sprite_IceParadiseHalfPipe *halfPipe)
-{
-    gCurTask->main = Task_HalfPipeMain;
-}
+static void EndHalfPipeSequence(Sprite_IceParadiseHalfPipe *halfPipe) { gCurTask->main = Task_HalfPipeMain; }
 
 static bool32 sub_80789AC(Sprite_IceParadiseHalfPipe *halfPipe)
 {
@@ -198,8 +188,7 @@ static bool32 ShouldDespawn(Sprite_IceParadiseHalfPipe *halfPipe)
     s16 x = halfPipe->x - gCamera.x;
     s16 y = halfPipe->y - gCamera.y;
 
-    if (x + halfPipe->width < -128 || x + halfPipe->offsetX > 368
-        || y + halfPipe->height < -128 || y + halfPipe->offsetY > 288) {
+    if (x + halfPipe->width < -128 || x + halfPipe->offsetX > 368 || y + halfPipe->height < -128 || y + halfPipe->offsetY > 288) {
         return TRUE;
     }
     return FALSE;
@@ -241,16 +230,12 @@ static void DestroyHalfPipe(Sprite_IceParadiseHalfPipe *halfPipe)
     TaskDestroy(gCurTask);
 }
 
-void CreateEntity_HalfPipe_End(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                               u8 spriteY)
+void CreateEntity_HalfPipe_End(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    CreateEntity_HalfPipe(me, spriteRegionX, spriteRegionY, spriteY,
-                          HALF_PIPE_DIRECTION_REVERSE);
+    CreateEntity_HalfPipe(me, spriteRegionX, spriteRegionY, spriteY, HALF_PIPE_DIRECTION_REVERSE);
 }
 
-void CreateEntity_HalfPipe_Start(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                 u8 spriteY)
+void CreateEntity_HalfPipe_Start(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    CreateEntity_HalfPipe(me, spriteRegionX, spriteRegionY, spriteY,
-                          HALF_PIPE_DIRECTION_FORWARD);
+    CreateEntity_HalfPipe(me, spriteRegionX, spriteRegionY, spriteY, HALF_PIPE_DIRECTION_FORWARD);
 }
diff --git a/src/game/interactables_2/ice_paradise/slowing_snow.c b/src/game/interactables_2/ice_paradise/slowing_snow.c
index 3247dcbe0..37ca68dc7 100644
--- a/src/game/interactables_2/ice_paradise/slowing_snow.c
+++ b/src/game/interactables_2/ice_paradise/slowing_snow.c
@@ -35,11 +35,9 @@ static void Task_SlowingSnow(void);
 static void TaskDestructor_SlowingSnow(struct Task *t);
 static bool32 ShouldDespawn(Sprite_SlowingSnow *);
 
-void CreateEntity_SlowingSnow(MapEntity *in_ia, u16 spriteRegionX, u16 spriteRegionY,
-                              u8 spriteY)
+void CreateEntity_SlowingSnow(MapEntity *in_ia, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_SlowingSnow, sizeof(Sprite_SlowingSnow), 0x2010, 0,
-                                TaskDestructor_SlowingSnow);
+    struct Task *t = TaskCreate(Task_SlowingSnow, sizeof(Sprite_SlowingSnow), 0x2010, 0, TaskDestructor_SlowingSnow);
 
     Sprite_SlowingSnow *snow = TASK_DATA(t);
     Interactable_SlowingSnow *me = (Interactable_SlowingSnow *)in_ia;
@@ -65,12 +63,9 @@ static bool32 PlayerIsTouchingSnow(Sprite_SlowingSnow *snow)
             s16 playerScreenX = I(gPlayer.x) - gCamera.x;
             s16 playerScreenY = I(gPlayer.y) - gCamera.y;
 
-            if (((snowScreenX + snow->left) <= playerScreenX)
-                && ((snowScreenX + snow->left) + (snow->right - snow->left)
-                    >= playerScreenX)
+            if (((snowScreenX + snow->left) <= playerScreenX) && ((snowScreenX + snow->left) + (snow->right - snow->left) >= playerScreenX)
                 && ((snowScreenY + snow->top) <= playerScreenY)
-                && ((snowScreenY + snow->top) + (snow->bottom - snow->top)
-                    >= playerScreenY)) {
+                && ((snowScreenY + snow->top) + (snow->bottom - snow->top) >= playerScreenY)) {
                 return TRUE;
             }
         }
@@ -102,10 +97,8 @@ static bool32 ShouldDespawn(Sprite_SlowingSnow *snow)
     screenX = snow->posX - gCamera.x;
     screenY = snow->posY - gCamera.y;
 
-    if ((screenX + snow->right < -(CAM_REGION_WIDTH / 2))
-        || (screenX + snow->left > DISPLAY_WIDTH + (CAM_REGION_WIDTH / 2))
-        || (screenY + snow->bottom < -(CAM_REGION_WIDTH / 2))
-        || (screenY + snow->top > CAM_BOUND_Y))
+    if ((screenX + snow->right < -(CAM_REGION_WIDTH / 2)) || (screenX + snow->left > DISPLAY_WIDTH + (CAM_REGION_WIDTH / 2))
+        || (screenY + snow->bottom < -(CAM_REGION_WIDTH / 2)) || (screenY + snow->top > CAM_BOUND_Y))
         return TRUE;
 
     return FALSE;
diff --git a/src/game/interactables_2/music_plant/german_flute.c b/src/game/interactables_2/music_plant/german_flute.c
index 26843f7f6..a8c178f11 100644
--- a/src/game/interactables_2/music_plant/german_flute.c
+++ b/src/game/interactables_2/music_plant/german_flute.c
@@ -127,8 +127,7 @@ static void sub_80769E0(void)
     gPlayer.speedAirY += Q(1. / 6.);
 
     // NOTE/BUG(?): Are the first 2 parameters swapped?
-    res = sub_801F100(I(gPlayer.y) - gPlayer.unk17, I(gPlayer.x), gPlayer.unk38, -8,
-                      sub_801EC3C);
+    res = sub_801F100(I(gPlayer.y) - gPlayer.unk17, I(gPlayer.x), gPlayer.unk38, -8, sub_801EC3C);
 
     if (res < 0) {
         gPlayer.y -= Q(res);
@@ -162,8 +161,7 @@ static void Task_8076A6C(void)
     gPlayer.y += flute->unkA;
 
     // NOTE/BUG(?): Are the first 2 parameters swapped?
-    res = sub_801F100(I(gPlayer.y) - gPlayer.unk17, I(r1), gPlayer.unk38, -8,
-                      sub_801EC3C);
+    res = sub_801F100(I(gPlayer.y) - gPlayer.unk17, I(r1), gPlayer.unk38, -8, sub_801EC3C);
     if (res < 0) {
         gPlayer.y -= Q(res);
     }
@@ -273,10 +271,7 @@ static void sub_8076CC0(Sprite_GermanFlute UNUSED *flute)
     gCurTask->main = Task_GermanFlute;
 }
 
-static void sub_8076CF4(Sprite_GermanFlute UNUSED *flute)
-{
-    gCurTask->main = Task_GermanFlute;
-}
+static void sub_8076CF4(Sprite_GermanFlute UNUSED *flute) { gCurTask->main = Task_GermanFlute; }
 
 static void sub_8076D08(Sprite_GermanFlute UNUSED *flute)
 {
@@ -284,11 +279,9 @@ static void sub_8076D08(Sprite_GermanFlute UNUSED *flute)
     gCurTask->main = Task_GermanFlute;
 }
 
-void CreateEntity_GermanFlute(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                              u8 spriteY)
+void CreateEntity_GermanFlute(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_GermanFlute, sizeof(Sprite_GermanFlute), 0x2010, 0,
-                                TaskDestructor_GermanFlute);
+    struct Task *t = TaskCreate(Task_GermanFlute, sizeof(Sprite_GermanFlute), 0x2010, 0, TaskDestructor_GermanFlute);
     Sprite_GermanFlute *flute = TASK_DATA(t);
     s32 posX, posY;
 
@@ -355,10 +348,8 @@ static bool32 sub_8076EAC(Sprite_GermanFlute *flute)
     screenX = flute->posX - gCamera.x;
     screenY = flute->posY - gCamera.y;
 
-    if ((screenX < -((CAM_REGION_WIDTH + 8) / 2))
-        || (screenX > DISPLAY_WIDTH + ((CAM_REGION_WIDTH + 8) / 2))
-        || (screenY < -(CAM_REGION_WIDTH / 2))
-        || (screenY > DISPLAY_HEIGHT + (CAM_REGION_WIDTH / 2))) {
+    if ((screenX < -((CAM_REGION_WIDTH + 8) / 2)) || (screenX > DISPLAY_WIDTH + ((CAM_REGION_WIDTH + 8) / 2))
+        || (screenY < -(CAM_REGION_WIDTH / 2)) || (screenY > DISPLAY_HEIGHT + (CAM_REGION_WIDTH / 2))) {
         return TRUE;
     }
 
diff --git a/src/game/interactables_2/music_plant/guitar_string.c b/src/game/interactables_2/music_plant/guitar_string.c
index ea6a0ee4b..49d8aabe8 100644
--- a/src/game/interactables_2/music_plant/guitar_string.c
+++ b/src/game/interactables_2/music_plant/guitar_string.c
@@ -38,11 +38,9 @@ extern void sub_80762BC(Sprite_GuitarString *);
 extern void sub_80762E0(Sprite_GuitarString *);
 extern bool32 sub_8076320(Sprite_GuitarString *);
 
-void CreateEntity_GuitarString(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                               u8 spriteY)
+void CreateEntity_GuitarString(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_GuitarString, sizeof(Sprite_GuitarString), 0x2010,
-                                0, TaskDestructor_GuitarString);
+    struct Task *t = TaskCreate(Task_GuitarString, sizeof(Sprite_GuitarString), 0x2010, 0, TaskDestructor_GuitarString);
     Sprite_GuitarString *gs = TASK_DATA(t);
     Sprite *s = &gs->s1;
     u16 i;
@@ -248,8 +246,8 @@ bool32 sub_807618C(Sprite_GuitarString *gs)
         s16 playerX = I(gPlayer.x) - gCamera.x;
         s16 playerY = I(gPlayer.y) - gCamera.y;
 
-        if ((screenX <= playerX) && ((screenX + GUITARSTR_WIDTH_PX) >= playerX)
-            && ((screenY - 9) <= playerY) && ((screenY + 9) >= playerY)) {
+        if ((screenX <= playerX) && ((screenX + GUITARSTR_WIDTH_PX) >= playerX) && ((screenY - 9) <= playerY)
+            && ((screenY + 9) >= playerY)) {
             return TRUE;
         }
     }
@@ -338,9 +336,7 @@ bool32 sub_8076320(Sprite_GuitarString *gs)
     otherY = screenY;
     otherX = screenX;
 
-    if (IS_OUT_OF_RANGE_2(otherX, otherY,
-                          (CAM_REGION_WIDTH + (GUITARSTR_WIDTH_PX / 2)) / 2,
-                          CAM_REGION_WIDTH / 2)) {
+    if (IS_OUT_OF_RANGE_2(otherX, otherY, (CAM_REGION_WIDTH + (GUITARSTR_WIDTH_PX / 2)) / 2, CAM_REGION_WIDTH / 2)) {
         return TRUE;
     }
 
diff --git a/src/game/interactables_2/music_plant/keyboard.c b/src/game/interactables_2/music_plant/keyboard.c
index 5e1179861..8fbf63771 100644
--- a/src/game/interactables_2/music_plant/keyboard.c
+++ b/src/game/interactables_2/music_plant/keyboard.c
@@ -55,11 +55,9 @@ const s16 sKeyboardAccelTechnoBase[3][2] = {
     { Q_8_8(5.0), Q_8_8(8.0) },
 };
 
-void CreateEntity_Keyboard(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                           u8 spriteY, u32 type)
+void CreateEntity_Keyboard(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY, u32 type)
 {
-    struct Task *t = TaskCreate(Task_Keyboard, sizeof(Sprite_Keyboard), 0x2010, 0,
-                                TaskDestructor_Keyboard);
+    struct Task *t = TaskCreate(Task_Keyboard, sizeof(Sprite_Keyboard), 0x2010, 0, TaskDestructor_Keyboard);
 
     Sprite_Keyboard *kb = TASK_DATA(t);
     kb->kbType = type;
@@ -245,10 +243,8 @@ static bool32 sub_8076780(Sprite_Keyboard *kb)
             s16 playerX = I(gPlayer.x) - gCamera.x;
             s16 playerY = I(gPlayer.y) - gCamera.y;
 
-            if (((screenX + kb->unkC) <= playerX)
-                && (((screenX + kb->unkC) + (kb->unk10 - kb->unkC)) >= playerX)
-                && ((screenY + kb->unkE) <= playerY)
-                && (((screenY + kb->unkE) + (kb->unk12 - kb->unkE)) >= playerY)) {
+            if (((screenX + kb->unkC) <= playerX) && (((screenX + kb->unkC) + (kb->unk10 - kb->unkC)) >= playerX)
+                && ((screenY + kb->unkE) <= playerY) && (((screenY + kb->unkE) + (kb->unk12 - kb->unkE)) >= playerY)) {
                 return TRUE;
             }
         } else {
@@ -278,10 +274,8 @@ static bool32 sub_8076848(Sprite_Keyboard *kb)
     s16 screenX = kb->posX - gCamera.x;
     s16 screenY = kb->posY - gCamera.y;
 
-    if (((screenX + kb->unk18) < -(CAM_REGION_WIDTH / 2))
-        || ((screenX + kb->unk14) > DISPLAY_WIDTH + (CAM_REGION_WIDTH / 2))
-        || (screenY + kb->unk1A < -(CAM_REGION_WIDTH / 2))
-        || ((screenY + kb->unk16) > DISPLAY_HEIGHT + (CAM_REGION_WIDTH / 2))) {
+    if (((screenX + kb->unk18) < -(CAM_REGION_WIDTH / 2)) || ((screenX + kb->unk14) > DISPLAY_WIDTH + (CAM_REGION_WIDTH / 2))
+        || (screenY + kb->unk1A < -(CAM_REGION_WIDTH / 2)) || ((screenY + kb->unk16) > DISPLAY_HEIGHT + (CAM_REGION_WIDTH / 2))) {
         return TRUE;
     }
 
@@ -294,23 +288,17 @@ static void DespawnKeyboard(Sprite_Keyboard *kb)
     TaskDestroy(gCurTask);
 }
 
-void CreateEntity_Keyboard_Vertical(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                    u8 spriteY)
+void CreateEntity_Keyboard_Vertical(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    CreateEntity_Keyboard(me, spriteRegionX, spriteRegionY, spriteY,
-                          MUSIC_PLANT_KEYBOARD_TYPE_VERTICAL);
+    CreateEntity_Keyboard(me, spriteRegionX, spriteRegionY, spriteY, MUSIC_PLANT_KEYBOARD_TYPE_VERTICAL);
 }
 
-void CreateEntity_Keyboard_Horizontal_PushLeft(MapEntity *me, u16 spriteRegionX,
-                                               u16 spriteRegionY, u8 spriteY)
+void CreateEntity_Keyboard_Horizontal_PushLeft(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    CreateEntity_Keyboard(me, spriteRegionX, spriteRegionY, spriteY,
-                          MUSIC_PLANT_KEYBOARD_TYPE_HORIZONTAL_LEFT);
+    CreateEntity_Keyboard(me, spriteRegionX, spriteRegionY, spriteY, MUSIC_PLANT_KEYBOARD_TYPE_HORIZONTAL_LEFT);
 }
 
-void CreateEntity_Keyboard_Horizontal_PushRight(MapEntity *me, u16 spriteRegionX,
-                                                u16 spriteRegionY, u8 spriteY)
+void CreateEntity_Keyboard_Horizontal_PushRight(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    CreateEntity_Keyboard(me, spriteRegionX, spriteRegionY, spriteY,
-                          MUSIC_PLANT_KEYBOARD_TYPE_HORIZONTAL_RIGHT);
+    CreateEntity_Keyboard(me, spriteRegionX, spriteRegionY, spriteY, MUSIC_PLANT_KEYBOARD_TYPE_HORIZONTAL_RIGHT);
 }
diff --git a/src/game/interactables_2/music_plant/note_block.c b/src/game/interactables_2/music_plant/note_block.c
index 93b456a27..0940ab637 100644
--- a/src/game/interactables_2/music_plant/note_block.c
+++ b/src/game/interactables_2/music_plant/note_block.c
@@ -39,9 +39,8 @@ static void sub_8075DE8(Sprite_NoteBlock *);
 
 /* animId, variant, tileId (OBJ VRAM) */
 const u16 gUnknown_080DFC40[NUM_NOTE_BLOCK_TYPES][3] = {
-    { SA2_ANIM_NOTE_BLOCK, 0, 0x16C }, { SA2_ANIM_NOTE_BLOCK, 1, 0x170 },
-    { SA2_ANIM_NOTE_BLOCK, 2, 0x174 }, { SA2_ANIM_NOTE_BLOCK, 3, 0x178 },
-    { SA2_ANIM_NOTE_BLOCK, 4, 0x17C }, { SA2_ANIM_NOTE_BLOCK, 5, 0x180 },
+    { SA2_ANIM_NOTE_BLOCK, 0, 0x16C }, { SA2_ANIM_NOTE_BLOCK, 1, 0x170 }, { SA2_ANIM_NOTE_BLOCK, 2, 0x174 },
+    { SA2_ANIM_NOTE_BLOCK, 3, 0x178 }, { SA2_ANIM_NOTE_BLOCK, 4, 0x17C }, { SA2_ANIM_NOTE_BLOCK, 5, 0x180 },
     { SA2_ANIM_NOTE_BLOCK, 6, 0x184 },
 };
 
@@ -56,17 +55,13 @@ const s16 gUnknown_080DFC6A[NUM_NOTE_BLOCK_TYPES] = {
 };
 
 const u16 sSfxGlockenspiel[NUM_NOTE_BLOCK_TYPES + 1] = {
-    SE_MUSIC_PLANT_GLOCKENSPIEL_1, SE_MUSIC_PLANT_GLOCKENSPIEL_2,
-    SE_MUSIC_PLANT_GLOCKENSPIEL_3, SE_MUSIC_PLANT_GLOCKENSPIEL_4,
-    SE_MUSIC_PLANT_GLOCKENSPIEL_5, SE_MUSIC_PLANT_GLOCKENSPIEL_6,
-    SE_MUSIC_PLANT_GLOCKENSPIEL_6, MUS_DUMMY,
+    SE_MUSIC_PLANT_GLOCKENSPIEL_1, SE_MUSIC_PLANT_GLOCKENSPIEL_2, SE_MUSIC_PLANT_GLOCKENSPIEL_3, SE_MUSIC_PLANT_GLOCKENSPIEL_4,
+    SE_MUSIC_PLANT_GLOCKENSPIEL_5, SE_MUSIC_PLANT_GLOCKENSPIEL_6, SE_MUSIC_PLANT_GLOCKENSPIEL_6, MUS_DUMMY,
 };
 
-void CreateEntity_Note_Block(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                             u8 spriteY)
+void CreateEntity_Note_Block(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_8075C6C, sizeof(Sprite_NoteBlock), 0x2010, 0,
-                                TaskDestructor_8075CC0);
+    struct Task *t = TaskCreate(Task_8075C6C, sizeof(Sprite_NoteBlock), 0x2010, 0, TaskDestructor_8075CC0);
     Sprite_NoteBlock *block = TASK_DATA(t);
     Sprite *s = &block->s;
 
@@ -161,11 +156,8 @@ void sub_8075B50(Sprite_NoteBlock *block)
                 (-((gUnknown_080DFC6A[block->unk48] * 3) << 14)) >> 16, 1);
 
     if (--block->unk4B == 1) {
-        block->s.graphics.dest
-            = &((u8 *)OBJ_VRAM0)[gUnknown_080DFC40[ARRAY_COUNT(gUnknown_080DFC40) - 1][2]
-                                 * TILE_SIZE_4BPP];
-        block->s.graphics.anim
-            = gUnknown_080DFC40[ARRAY_COUNT(gUnknown_080DFC40) - 1][0];
+        block->s.graphics.dest = &((u8 *)OBJ_VRAM0)[gUnknown_080DFC40[ARRAY_COUNT(gUnknown_080DFC40) - 1][2] * TILE_SIZE_4BPP];
+        block->s.graphics.anim = gUnknown_080DFC40[ARRAY_COUNT(gUnknown_080DFC40) - 1][0];
         block->s.variant = gUnknown_080DFC40[ARRAY_COUNT(gUnknown_080DFC40) - 1][1];
         UpdateSpriteAnimation(&block->s);
     }
@@ -251,8 +243,7 @@ bool32 sub_8075D58(Sprite_NoteBlock *block)
     otherX = screenX;
     if ((otherX) > 752 || (otherY) > 672) {
 #else
-    if ((screenX < -256 || screenX > (256 + DISPLAY_WIDTH))
-        || (screenY < -256 || screenY > (256 + DISPLAY_HEIGHT))) {
+    if ((screenX < -256 || screenX > (256 + DISPLAY_WIDTH)) || (screenY < -256 || screenY > (256 + DISPLAY_HEIGHT))) {
 #endif
         return TRUE;
     }
diff --git a/src/game/interactables_2/music_plant/note_sphere.c b/src/game/interactables_2/music_plant/note_sphere.c
index a2241eb33..ff90fd2fe 100644
--- a/src/game/interactables_2/music_plant/note_sphere.c
+++ b/src/game/interactables_2/music_plant/note_sphere.c
@@ -42,28 +42,23 @@ static void NoteSphere_Despawn(Sprite_NoteSphere *);
 
 /* animId, variant, tileId (OBJ VRAM) */
 static const u16 sNoteSphereAnimInfo[8][3] = {
-    { SA2_ANIM_NOTE_BLOCK, 7, 0x188 },  { SA2_ANIM_NOTE_BLOCK, 8, 0x18E },
-    { SA2_ANIM_NOTE_BLOCK, 9, 0x194 },  { SA2_ANIM_NOTE_BLOCK, 10, 0x19A },
-    { SA2_ANIM_NOTE_BLOCK, 11, 0x1A0 }, { SA2_ANIM_NOTE_BLOCK, 12, 0x1A6 },
+    { SA2_ANIM_NOTE_BLOCK, 7, 0x188 },  { SA2_ANIM_NOTE_BLOCK, 8, 0x18E },  { SA2_ANIM_NOTE_BLOCK, 9, 0x194 },
+    { SA2_ANIM_NOTE_BLOCK, 10, 0x19A }, { SA2_ANIM_NOTE_BLOCK, 11, 0x1A0 }, { SA2_ANIM_NOTE_BLOCK, 12, 0x1A6 },
     { SA2_ANIM_NOTE_BLOCK, 13, 0x1AC }, { SA2_ANIM_NOTE_BLOCK, 14, 0x1B2 },
 };
 
 static const s16 sNoteSphereVelocities[8] = {
-    Q_8_8(4.5), Q_8_8(5.0), Q_8_8(5.5), Q_8_8(6.0),
-    Q_8_8(6.5), Q_8_8(7.0), Q_8_8(7.5), Q_8_8(8.0),
+    Q_8_8(4.5), Q_8_8(5.0), Q_8_8(5.5), Q_8_8(6.0), Q_8_8(6.5), Q_8_8(7.0), Q_8_8(7.5), Q_8_8(8.0),
 };
 
 static const u16 sNoteSphereSfx[8] = {
-    SE_MUSIC_PLANT_NOTES_1, SE_MUSIC_PLANT_NOTES_2, SE_MUSIC_PLANT_NOTES_3,
-    SE_MUSIC_PLANT_NOTES_4, SE_MUSIC_PLANT_NOTES_5, SE_MUSIC_PLANT_NOTES_6,
-    SE_MUSIC_PLANT_NOTES_7, SE_MUSIC_PLANT_NOTES_8,
+    SE_MUSIC_PLANT_NOTES_1, SE_MUSIC_PLANT_NOTES_2, SE_MUSIC_PLANT_NOTES_3, SE_MUSIC_PLANT_NOTES_4,
+    SE_MUSIC_PLANT_NOTES_5, SE_MUSIC_PLANT_NOTES_6, SE_MUSIC_PLANT_NOTES_7, SE_MUSIC_PLANT_NOTES_8,
 };
 
-void CreateEntity_Note_Sphere(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                              u8 spriteY)
+void CreateEntity_Note_Sphere(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_Note_Sphere, sizeof(Sprite_NoteSphere), 0x2010, 0,
-                                TaskDestructor_Interactable_MusicPlant_Note_Sphere);
+    struct Task *t = TaskCreate(Task_Note_Sphere, sizeof(Sprite_NoteSphere), 0x2010, 0, TaskDestructor_Interactable_MusicPlant_Note_Sphere);
     Sprite_NoteSphere *note = TASK_DATA(t);
     Sprite *s = &note->disp;
     note->unk44 = 0;
@@ -85,8 +80,7 @@ void CreateEntity_Note_Sphere(MapEntity *me, u16 spriteRegionX, u16 spriteRegion
     s->hitboxes[0].index = -1;
     s->frameFlags = 0x2000;
 
-    s->graphics.dest
-        = &((u8 *)OBJ_VRAM0)[sNoteSphereAnimInfo[note->kind][2] * TILE_SIZE_4BPP];
+    s->graphics.dest = &((u8 *)OBJ_VRAM0)[sNoteSphereAnimInfo[note->kind][2] * TILE_SIZE_4BPP];
     s->graphics.anim = sNoteSphereAnimInfo[note->kind][0];
     s->variant = sNoteSphereAnimInfo[note->kind][1];
 
@@ -175,10 +169,8 @@ static u8 NoteSphere_BouncePlayer(Sprite_NoteSphere *note)
 
         r4 = (u8)(newAngle + (sub_808558C(newAngle, angle, 8) << 1));
 
-        gPlayer.speedAirX
-            = I(sNoteSphereVelocities[note->kind] * Q_2_14_TO_Q_24_8(COS(r4 * 4)));
-        gPlayer.speedAirY
-            = I(sNoteSphereVelocities[note->kind] * Q_2_14_TO_Q_24_8(SIN(r4 * 4)));
+        gPlayer.speedAirX = I(sNoteSphereVelocities[note->kind] * Q_2_14_TO_Q_24_8(COS(r4 * 4)));
+        gPlayer.speedAirY = I(sNoteSphereVelocities[note->kind] * Q_2_14_TO_Q_24_8(SIN(r4 * 4)));
     }
 
     gPlayer.transition = PLTRANS_PT5;
@@ -255,8 +247,7 @@ static bool32 NoteSphere_ShouldDespawn(Sprite_NoteSphere *note)
     posY = screenY;
     posX = screenX;
 
-    if ((posX > (DISPLAY_WIDTH + CAM_REGION_WIDTH))
-        || (posY > (DISPLAY_HEIGHT + CAM_REGION_WIDTH))) {
+    if ((posX > (DISPLAY_WIDTH + CAM_REGION_WIDTH)) || (posY > (DISPLAY_HEIGHT + CAM_REGION_WIDTH))) {
         return TRUE;
     }
 
diff --git a/src/game/interactables_2/music_plant/pipe_horn.c b/src/game/interactables_2/music_plant/pipe_horn.c
index 87aa893f8..75ecfdaa1 100644
--- a/src/game/interactables_2/music_plant/pipe_horn.c
+++ b/src/game/interactables_2/music_plant/pipe_horn.c
@@ -322,25 +322,19 @@ const Pipe_Data gUnknown_080DFE30[] = {
 };
 
 const s16 gUnknown_080DFE90[9][2] = {
-    { Q_8_8(0.0), Q_8_8(-9.0) },  { Q_8_8(0.0), Q_8_8(-12.0) },
-    { Q_8_8(0.0), Q_8_8(-9.0) },  { Q_8_8(0.0), Q_8_8(-12.0) },
-    { Q_8_8(9.0), Q_8_8(-9.0) },  { Q_8_8(0.0), Q_8_8(-9.0) },
-    { Q_8_8(0.0), Q_8_8(-12.0) }, { Q_8_8(0.0), Q_8_8(-9.0) },
-    { Q_8_8(0.0), Q_8_8(-12.0) },
+    { Q_8_8(0.0), Q_8_8(-9.0) },  { Q_8_8(0.0), Q_8_8(-12.0) }, { Q_8_8(0.0), Q_8_8(-9.0) },
+    { Q_8_8(0.0), Q_8_8(-12.0) }, { Q_8_8(9.0), Q_8_8(-9.0) },  { Q_8_8(0.0), Q_8_8(-9.0) },
+    { Q_8_8(0.0), Q_8_8(-12.0) }, { Q_8_8(0.0), Q_8_8(-9.0) },  { Q_8_8(0.0), Q_8_8(-12.0) },
 };
 
 const s16 gUnknown_080DFEB4[14] = {
-    Q_8_8(0.75),   Q_8_8(0.75),    Q_8_8(0.75),   Q_8_8(0.75), Q_8_8(0.875),
-    Q_8_8(0.75),   Q_8_8(0.75),    Q_8_8(0.75),   Q_8_8(0.75), Q_8_8(-63.25),
-    Q_8_8(-63.25), Q_8_8(-63.125), Q_8_8(-63.25), Q_8_8(0.75),
+    Q_8_8(0.75), Q_8_8(0.75), Q_8_8(0.75),   Q_8_8(0.75),   Q_8_8(0.875),   Q_8_8(0.75),   Q_8_8(0.75),
+    Q_8_8(0.75), Q_8_8(0.75), Q_8_8(-63.25), Q_8_8(-63.25), Q_8_8(-63.125), Q_8_8(-63.25), Q_8_8(0.75),
 };
 
 const u16 gUnknown_080DFED0[10] = {
-    SE_MUSIC_PLANT_EXIT_HORN2, SE_MUSIC_PLANT_HORN3,
-    SE_MUSIC_PLANT_EXIT_HORN2, SE_MUSIC_PLANT_HORN3,
-    SE_MUSIC_PLANT_EXIT_HORN2, SE_MUSIC_PLANT_EXIT_HORN2,
-    SE_MUSIC_PLANT_HORN3,      SE_MUSIC_PLANT_EXIT_HORN2,
-    SE_MUSIC_PLANT_HORN3,      MUS_DUMMY,
+    SE_MUSIC_PLANT_EXIT_HORN2, SE_MUSIC_PLANT_HORN3, SE_MUSIC_PLANT_EXIT_HORN2, SE_MUSIC_PLANT_HORN3, SE_MUSIC_PLANT_EXIT_HORN2,
+    SE_MUSIC_PLANT_EXIT_HORN2, SE_MUSIC_PLANT_HORN3, SE_MUSIC_PLANT_EXIT_HORN2, SE_MUSIC_PLANT_HORN3, MUS_DUMMY,
 };
 
 const Pipe_Data gUnknown_080DFEE4[] = {
@@ -1009,11 +1003,9 @@ void sub_8077994(Sprite_Pipe_Horn *pipe)
     TaskDestroy(gCurTask);
 }
 
-void CreateEntity_PipeInstrument_Entry(MapEntity *me, u16 spriteRegionX,
-                                       u16 spriteRegionY, u8 spriteY)
+void CreateEntity_PipeInstrument_Entry(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(sub_80778AC, sizeof(Sprite_Pipe_Horn), 0x2010, 0,
-                                TaskDestructor_Pipe);
+    struct Task *t = TaskCreate(sub_80778AC, sizeof(Sprite_Pipe_Horn), 0x2010, 0, TaskDestructor_Pipe);
     Sprite_Pipe_Horn *pipe = TASK_DATA(t);
 
     pipe->kind = me->d.sData[0];
@@ -1186,11 +1178,9 @@ void FrenchHorn_Despawn(Sprite_Pipe_Horn *horn)
     TaskDestroy(gCurTask);
 }
 
-void CreateEntity_FrenchHorn_Entry(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                   u8 spriteY)
+void CreateEntity_FrenchHorn_Entry(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_FrenchHorn_8077C04, sizeof(Sprite_Pipe_Horn),
-                                0x2010, 0, TaskDestructor_FrenchHorn);
+    struct Task *t = TaskCreate(Task_FrenchHorn_8077C04, sizeof(Sprite_Pipe_Horn), 0x2010, 0, TaskDestructor_FrenchHorn);
     Sprite_Pipe_Horn *horn = TASK_DATA(t);
 
     horn->kind = me->d.sData[0];
diff --git a/src/game/interactables_2/note_particle.c b/src/game/interactables_2/note_particle.c
index ee67aa551..47964ffa1 100644
--- a/src/game/interactables_2/note_particle.c
+++ b/src/game/interactables_2/note_particle.c
@@ -38,11 +38,9 @@ static void Task_8080DB8(void);
 static void Task_8080E54(void);
 static void TaskDestructor_8080EF8(struct Task *);
 
-void sub_8080AFC(s32 posX, s32 posY, u16 framesUntilVisible, u16 framesUntilDestroyed,
-                 s16 velocity, u8 quarterAngle, u8 kind)
+void sub_8080AFC(s32 posX, s32 posY, u16 framesUntilVisible, u16 framesUntilDestroyed, s16 velocity, u8 quarterAngle, u8 kind)
 {
-    struct Task *t = TaskCreate(Task_8080DB8, sizeof(Sprite_NoteParticle), 0x2010, 0,
-                                TaskDestructor_8080EF8);
+    struct Task *t = TaskCreate(Task_8080DB8, sizeof(Sprite_NoteParticle), 0x2010, 0, TaskDestructor_8080EF8);
     Sprite_NoteParticle *np = TASK_DATA(t);
     Sprite *s = &np->s;
 
@@ -62,8 +60,7 @@ void sub_8080AFC(s32 posX, s32 posY, u16 framesUntilVisible, u16 framesUntilDest
     if (gUnknown_080E0140[kind][3] != 0) {
         s->graphics.dest = VramMalloc(gUnknown_080E0140[kind][2]);
     } else {
-        s->graphics.dest
-            = (void *)(OBJ_VRAM0 + gUnknown_080E0140[kind][2] * TILE_SIZE_4BPP);
+        s->graphics.dest = (void *)(OBJ_VRAM0 + gUnknown_080E0140[kind][2] * TILE_SIZE_4BPP);
     }
 
     s->graphics.anim = gUnknown_080E0140[kind][0];
@@ -71,11 +68,9 @@ void sub_8080AFC(s32 posX, s32 posY, u16 framesUntilVisible, u16 framesUntilDest
     UpdateSpriteAnimation(s);
 }
 
-void sub_8080C78(s32 posX, s32 posY, u16 framesUntilVisible, u16 framesUntilDestroyed,
-                 s16 accelX, s16 accelY, u8 kind)
+void sub_8080C78(s32 posX, s32 posY, u16 framesUntilVisible, u16 framesUntilDestroyed, s16 accelX, s16 accelY, u8 kind)
 {
-    struct Task *t = TaskCreate(Task_8080E54, sizeof(Sprite_NoteParticle), 0x2010, 0,
-                                TaskDestructor_8080EF8);
+    struct Task *t = TaskCreate(Task_8080E54, sizeof(Sprite_NoteParticle), 0x2010, 0, TaskDestructor_8080EF8);
     Sprite_NoteParticle *np = TASK_DATA(t);
     Sprite *s = &np->s;
 
@@ -95,8 +90,7 @@ void sub_8080C78(s32 posX, s32 posY, u16 framesUntilVisible, u16 framesUntilDest
     if (gUnknown_080E0140[kind][3] != 0) {
         s->graphics.dest = VramMalloc(gUnknown_080E0140[kind][2]);
     } else {
-        s->graphics.dest
-            = (void *)(OBJ_VRAM0 + gUnknown_080E0140[kind][2] * TILE_SIZE_4BPP);
+        s->graphics.dest = (void *)(OBJ_VRAM0 + gUnknown_080E0140[kind][2] * TILE_SIZE_4BPP);
     }
 
     s->graphics.anim = gUnknown_080E0140[kind][0];
diff --git a/src/game/interactables_2/notification_ring_bonus.c b/src/game/interactables_2/notification_ring_bonus.c
index b0021ae1d..5b4ac6207 100644
--- a/src/game/interactables_2/notification_ring_bonus.c
+++ b/src/game/interactables_2/notification_ring_bonus.c
@@ -46,11 +46,9 @@ static void Task_8080750(void);
 static void TaskDestructor_8080790(struct Task *t);
 static void Task_80807A4(void);
 
-void CreateEntity_MultiplayerTeleport(MapEntity *me, u16 spriteRegionX,
-                                      u16 spriteRegionY, UNUSED u8 spriteY)
+void CreateEntity_MultiplayerTeleport(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, UNUSED u8 spriteY)
 {
-    struct Task *t
-        = TaskCreate(Task_80806F4, sizeof(Sprite_MultiplayerTeleport), 0x2010, 0, NULL);
+    struct Task *t = TaskCreate(Task_80806F4, sizeof(Sprite_MultiplayerTeleport), 0x2010, 0, NULL);
     Sprite_MultiplayerTeleport *sprite = TASK_DATA(t);
 
     sprite->timer = 0;
@@ -74,8 +72,7 @@ void CreateEntity_MultiplayerTeleport(MapEntity *me, u16 spriteRegionX,
 
 void sub_80803FC(Sprite_MultiplayerTeleport *sprite)
 {
-    if ((sprite->someX < Q(sprite->posX + sprite->unk8))
-        && (gPlayer.x > Q(sprite->posX + sprite->unkC))) {
+    if ((sprite->someX < Q(sprite->posX + sprite->unk8)) && (gPlayer.x > Q(sprite->posX + sprite->unkC))) {
         if (sprite->unk1C != 0) {
             u16 timeDiff;
             u16 prevRingCount;
@@ -101,8 +98,7 @@ void sub_80803FC(Sprite_MultiplayerTeleport *sprite)
                 ringBonus += gRingCount;
                 gRingCount = ringBonus;
 
-                if ((gCurrentLevel != LEVEL_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53))
-                    && (Div(gRingCount, 100) != Div(prevRingCount, 100))
+                if ((gCurrentLevel != LEVEL_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53)) && (Div(gRingCount, 100) != Div(prevRingCount, 100))
                     && (gGameMode == GAME_MODE_SINGLE_PLAYER)) {
                     u32 lives = gNumLives + 1;
                     if (lives > 255)
@@ -130,8 +126,7 @@ void sub_80803FC(Sprite_MultiplayerTeleport *sprite)
             sprite->timer = gCheckpointTime;
         }
         sprite->someX = gPlayer.x;
-    } else if ((sprite->someX > Q(sprite->posX + sprite->unkC))
-               && (gPlayer.x < Q(sprite->posX + sprite->unk8))) {
+    } else if ((sprite->someX > Q(sprite->posX + sprite->unkC)) && (gPlayer.x < Q(sprite->posX + sprite->unk8))) {
         if (sprite->unk1C != 0) {
             sprite->unk18--;
         }
@@ -152,8 +147,8 @@ bool32 sub_808055C(Sprite_MultiplayerTeleport *sprite)
     playerX = I(gPlayer.x) - gCamera.x;
     playerY = I(gPlayer.y) - gCamera.y;
 
-    if ((spriteX + sprite->unk8 <= playerX) && (playerX <= spriteX + sprite->unkC)
-        && (spriteY + sprite->unkA <= playerY) && (playerY <= spriteY + sprite->unkE)) {
+    if ((spriteX + sprite->unk8 <= playerX) && (playerX <= spriteX + sprite->unkC) && (spriteY + sprite->unkA <= playerY)
+        && (playerY <= spriteY + sprite->unkE)) {
         return TRUE;
     } else {
         return FALSE;
@@ -192,8 +187,7 @@ void sub_80805D0(Sprite_MultiplayerTeleport *sprite)
 
 void CreateSprite_Notif_RingBonus(void)
 {
-    struct Task *t = TaskCreate(Task_8080750, sizeof(Sprite_Notif_RingBonus), 0x2010, 0,
-                                TaskDestructor_8080790);
+    struct Task *t = TaskCreate(Task_8080750, sizeof(Sprite_Notif_RingBonus), 0x2010, 0, TaskDestructor_8080790);
     Sprite_Notif_RingBonus *notif = TASK_DATA(t);
     Sprite *s = &notif->s;
 
diff --git a/src/game/interactables_2/sky_canyon/fan.c b/src/game/interactables_2/sky_canyon/fan.c
index 30ce7ea55..ef8977827 100644
--- a/src/game/interactables_2/sky_canyon/fan.c
+++ b/src/game/interactables_2/sky_canyon/fan.c
@@ -54,13 +54,9 @@ typedef struct {
 #define FAN_DIR_RIGHT                    1
 #define FAN_MASK_PERIODIC                2
 #define SKYCAN_FAN_KIND(dir, isPeriodic) (((isPeriodic) << 1) | (dir))
-#define IS_PROPELLER_DIR_LEFT(kind)                                                     \
-    (((kind) == SKYCAN_FAN_KIND(FAN_DIR_LEFT, FALSE))                                   \
-     || ((kind) == SKYCAN_FAN_KIND(FAN_DIR_LEFT, TRUE)))
+#define IS_PROPELLER_DIR_LEFT(kind)      (((kind) == SKYCAN_FAN_KIND(FAN_DIR_LEFT, FALSE)) || ((kind) == SKYCAN_FAN_KIND(FAN_DIR_LEFT, TRUE)))
 
-#define IS_FAN_PERIODIC(kind)                                                           \
-    (((kind) == SKYCAN_FAN_KIND(FAN_DIR_LEFT, TRUE))                                    \
-     || ((kind) == SKYCAN_FAN_KIND(FAN_DIR_RIGHT, TRUE)))
+#define IS_FAN_PERIODIC(kind) (((kind) == SKYCAN_FAN_KIND(FAN_DIR_LEFT, TRUE)) || ((kind) == SKYCAN_FAN_KIND(FAN_DIR_RIGHT, TRUE)))
 
 static void Task_IA_Fan_UpdateRegular(void);
 static void TaskDestructor_IA_Fan_UpdateRegular(struct Task *);
@@ -77,11 +73,9 @@ void Task_IA_SmallPropeller_UpdateInFanRegion(void);
 void SetTaskMain_UpdateRegular(Sprite_Fan *unused);
 void DestroyTask_Interactable087(Sprite_Fan *);
 
-static void CreateEntity_Fan(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                             u8 spriteY, u32 kind)
+static void CreateEntity_Fan(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY, u32 kind)
 {
-    struct Task *t = TaskCreate(Task_IA_Fan_UpdateRegular, sizeof(Sprite_Fan), 0x2010, 0,
-                                TaskDestructor_IA_Fan_UpdateRegular);
+    struct Task *t = TaskCreate(Task_IA_Fan_UpdateRegular, sizeof(Sprite_Fan), 0x2010, 0, TaskDestructor_IA_Fan_UpdateRegular);
     Sprite_Fan *prop = TASK_DATA(t);
     Sprite *s;
 
@@ -174,8 +168,7 @@ static void sub_807D468(Sprite_Fan *prop)
 
             r3 = Q(prop->posX + prop->left) + Q(48);
 
-            if ((prop->kind != SKYCAN_FAN_KIND(FAN_DIR_RIGHT, TRUE))
-                && newPlayerX < r3) {
+            if ((prop->kind != SKYCAN_FAN_KIND(FAN_DIR_RIGHT, TRUE)) && newPlayerX < r3) {
                 gPlayer.x = r3;
             }
 
@@ -275,9 +268,7 @@ static bool32 IsPlayerInFanRegion(Sprite_Fan *prop)
         u16 width = prop->right - prop->left;
         u16 height = prop->bottom - prop->top;
 
-        if (((propX + prop->left) <= playerX)
-            && ((propX + prop->left + width) >= playerX)
-            && ((propY + prop->top) <= playerY)
+        if (((propX + prop->left) <= playerX) && ((propX + prop->left + width) >= playerX) && ((propY + prop->top) <= playerY)
             && ((propY + prop->top + height) >= playerY))
             return TRUE;
     }
@@ -307,16 +298,12 @@ static void TaskDestructor_IA_Fan_UpdateRegular(struct Task *t)
     VramFree(prop->s.graphics.dest);
 }
 
-static void SetTaskMain_807D978(Sprite_Fan *unused)
-{
-    gCurTask->main = Task_IA_SmallPropeller_UpdateInFanRegion;
-}
+static void SetTaskMain_807D978(Sprite_Fan *unused) { gCurTask->main = Task_IA_SmallPropeller_UpdateInFanRegion; }
 
 static s16 ClampPlayerSpeed(s16 speed)
 {
     if (gPlayer.unk5A) {
-        CLAMP_INLINE2(speed, -PROP_PLAYER_CLAMP_SPEED_BOOST,
-                      PROP_PLAYER_CLAMP_SPEED_BOOST);
+        CLAMP_INLINE2(speed, -PROP_PLAYER_CLAMP_SPEED_BOOST, PROP_PLAYER_CLAMP_SPEED_BOOST);
     } else {
         // @BUG: Seems like a copy-paste error?
 #ifdef BUGFIX
@@ -336,8 +323,8 @@ static bool32 IsPropellerOffScreen(Sprite_Fan *prop)
     posX = prop->posX - gCamera.x;
     posY = prop->posY - gCamera.y;
 
-    if (((posX + prop->right) < -128) || ((posX + prop->left) > DISPLAY_WIDTH + 128)
-        || ((posY + prop->bottom) < -128) || ((posY + prop->top) > DISPLAY_HEIGHT + 128))
+    if (((posX + prop->right) < -128) || ((posX + prop->left) > DISPLAY_WIDTH + 128) || ((posY + prop->bottom) < -128)
+        || ((posY + prop->top) > DISPLAY_HEIGHT + 128))
         return TRUE;
 
     return FALSE;
@@ -349,32 +336,24 @@ void DestroyTask_Interactable087(Sprite_Fan *prop)
     TaskDestroy(gCurTask);
 }
 
-void CreateEntity_Fan_Left(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                           u8 spriteY)
+void CreateEntity_Fan_Left(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    CreateEntity_Fan(me, spriteRegionX, spriteRegionY, spriteY,
-                     SKYCAN_FAN_KIND(FAN_DIR_LEFT, FALSE));
+    CreateEntity_Fan(me, spriteRegionX, spriteRegionY, spriteY, SKYCAN_FAN_KIND(FAN_DIR_LEFT, FALSE));
 }
 
-void CreateEntity_Fan_Right(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                            u8 spriteY)
+void CreateEntity_Fan_Right(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    CreateEntity_Fan(me, spriteRegionX, spriteRegionY, spriteY,
-                     SKYCAN_FAN_KIND(FAN_DIR_RIGHT, FALSE));
+    CreateEntity_Fan(me, spriteRegionX, spriteRegionY, spriteY, SKYCAN_FAN_KIND(FAN_DIR_RIGHT, FALSE));
 }
 
-void CreateEntity_Fan_Left_Periodic(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                    u8 spriteY)
+void CreateEntity_Fan_Left_Periodic(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    CreateEntity_Fan(me, spriteRegionX, spriteRegionY, spriteY,
-                     SKYCAN_FAN_KIND(FAN_DIR_LEFT, TRUE));
+    CreateEntity_Fan(me, spriteRegionX, spriteRegionY, spriteY, SKYCAN_FAN_KIND(FAN_DIR_LEFT, TRUE));
 }
 
-void CreateEntity_Fan_Right_Periodic(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                     u8 spriteY)
+void CreateEntity_Fan_Right_Periodic(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    CreateEntity_Fan(me, spriteRegionX, spriteRegionY, spriteY,
-                     SKYCAN_FAN_KIND(FAN_DIR_RIGHT, TRUE));
+    CreateEntity_Fan(me, spriteRegionX, spriteRegionY, spriteY, SKYCAN_FAN_KIND(FAN_DIR_RIGHT, TRUE));
 }
 
 void Task_IA_SmallPropeller_UpdateInFanRegion(void)
@@ -391,7 +370,4 @@ void Task_IA_SmallPropeller_UpdateInFanRegion(void)
     UpdateFanSpritePosition(prop);
 }
 
-void SetTaskMain_UpdateRegular(Sprite_Fan *unused)
-{
-    gCurTask->main = Task_IA_Fan_UpdateRegular;
-}
\ No newline at end of file
+void SetTaskMain_UpdateRegular(Sprite_Fan *unused) { gCurTask->main = Task_IA_Fan_UpdateRegular; }
\ No newline at end of file
diff --git a/src/game/interactables_2/sky_canyon/propeller.c b/src/game/interactables_2/sky_canyon/propeller.c
index 3b68ef1fd..066b1333f 100644
--- a/src/game/interactables_2/sky_canyon/propeller.c
+++ b/src/game/interactables_2/sky_canyon/propeller.c
@@ -69,24 +69,20 @@ static void Task_PlayerFloating(void)
             gPlayer.x -= Q(0.5);
         }
 
-        temp = sub_801F100(({ I(gPlayer.x) + 2; }) + gPlayer.unk16, I(gPlayer.y),
-                           gPlayer.unk38, +8, sub_801EB44);
+        temp = sub_801F100(({ I(gPlayer.x) + 2; }) + gPlayer.unk16, I(gPlayer.y), gPlayer.unk38, +8, sub_801EB44);
         if (temp < 0) {
             gPlayer.x += Q(temp);
         }
-        temp = sub_801F100(({ I(gPlayer.x) - 2; }) - gPlayer.unk16, I(gPlayer.y),
-                           gPlayer.unk38, -8, sub_801EB44);
+        temp = sub_801F100(({ I(gPlayer.x) - 2; }) - gPlayer.unk16, I(gPlayer.y), gPlayer.unk38, -8, sub_801EB44);
         if (temp < 0) {
             gPlayer.x -= Q(temp);
         }
 
-        temp = sub_801F100(I(gPlayer.y) + gPlayer.unk17, I(gPlayer.x), gPlayer.unk38, 8,
-                           sub_801EC3C);
+        temp = sub_801F100(I(gPlayer.y) + gPlayer.unk17, I(gPlayer.x), gPlayer.unk38, 8, sub_801EC3C);
         if (temp < 0) {
             gPlayer.y += Q(temp);
         }
-        temp = sub_801F100(I(gPlayer.y) - gPlayer.unk17, I(gPlayer.x), gPlayer.unk38, -8,
-                           sub_801EC3C);
+        temp = sub_801F100(I(gPlayer.y) - gPlayer.unk17, I(gPlayer.x), gPlayer.unk38, -8, sub_801EC3C);
         if (temp < 0) {
             gPlayer.y -= Q(temp);
         }
@@ -136,26 +132,22 @@ static void sub_807B530(void)
         gPlayer.y += propeller->unk46;
         propeller->unk48 -= 4;
 
-        temp = sub_801F100(({ I(gPlayer.x) + 2; }) + gPlayer.unk16, I(gPlayer.y),
-                           gPlayer.unk38, 8, sub_801EB44);
+        temp = sub_801F100(({ I(gPlayer.x) + 2; }) + gPlayer.unk16, I(gPlayer.y), gPlayer.unk38, 8, sub_801EB44);
         if (temp < 0) {
             gPlayer.x += Q(temp);
             propeller->unk44 = 32;
         }
-        temp = sub_801F100(({ I(gPlayer.x) - 2; }) - gPlayer.unk16, I(gPlayer.y),
-                           gPlayer.unk38, -8, sub_801EB44);
+        temp = sub_801F100(({ I(gPlayer.x) - 2; }) - gPlayer.unk16, I(gPlayer.y), gPlayer.unk38, -8, sub_801EB44);
         if (temp < 0) {
             gPlayer.x -= Q(temp);
             propeller->unk44 = -32;
         }
 
-        temp = sub_801F100(I(gPlayer.y) + gPlayer.unk17, I(gPlayer.x), gPlayer.unk38, 8,
-                           sub_801EC3C);
+        temp = sub_801F100(I(gPlayer.y) + gPlayer.unk17, I(gPlayer.x), gPlayer.unk38, 8, sub_801EC3C);
         if (temp < 0) {
             gPlayer.y += Q(temp);
         }
-        temp = sub_801F100(I(gPlayer.y) - gPlayer.unk17, I(gPlayer.x), gPlayer.unk38, -8,
-                           sub_801EC3C);
+        temp = sub_801F100(I(gPlayer.y) - gPlayer.unk17, I(gPlayer.x), gPlayer.unk38, -8, sub_801EC3C);
         if (temp < 0) {
             gPlayer.y -= Q(temp);
         }
@@ -216,10 +208,8 @@ bool32 IsPlayerInteracting(Sprite_Propeller *propeller)
     y = propeller->y - gCamera.y;
     playerX = I(gPlayer.x) - gCamera.x;
     playerY = I(gPlayer.y) - gCamera.y;
-    if (x - (PROPELLER_HITBOX_WIDTH / 2) <= playerX
-        && x + (PROPELLER_HITBOX_WIDTH / 2) >= playerX) {
-        if (y - (PROPELLER_HITBOX_HEIGHT / 2) <= playerY
-            && y + (PROPELLER_HITBOX_HEIGHT / 2) >= playerY) {
+    if (x - (PROPELLER_HITBOX_WIDTH / 2) <= playerX && x + (PROPELLER_HITBOX_WIDTH / 2) >= playerX) {
+        if (y - (PROPELLER_HITBOX_HEIGHT / 2) <= playerY && y + (PROPELLER_HITBOX_HEIGHT / 2) >= playerY) {
             return TRUE;
         }
     }
@@ -287,8 +277,7 @@ static bool32 IsPlayerInAirCurrent(Sprite_Propeller *propeller)
         s16 x = propeller->x - gCamera.x;
         s16 playerX = I(gPlayer.x) - gCamera.x;
 
-        if (x - (PROPELLER_HITBOX_WIDTH / 2) <= playerX
-            && (x + (PROPELLER_HITBOX_WIDTH / 2) >= playerX)) {
+        if (x - (PROPELLER_HITBOX_WIDTH / 2) <= playerX && (x + (PROPELLER_HITBOX_WIDTH / 2) >= playerX)) {
             return TRUE;
         }
     }
@@ -332,11 +321,9 @@ static void sub_807BA70(void)
     level->unk62++;
 }
 
-void CreateEntity_Propeller(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                            u8 spriteY)
+void CreateEntity_Propeller(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_GiantPropellerIdle, sizeof(Sprite_Propeller),
-                                0x2010, 0, TaskDestructor_GiantPropeller);
+    struct Task *t = TaskCreate(Task_GiantPropellerIdle, sizeof(Sprite_Propeller), 0x2010, 0, TaskDestructor_GiantPropeller);
 
     Sprite_Propeller *propeller = TASK_DATA(t);
     propeller->x = TO_WORLD_POS(me->x, spriteRegionX);
diff --git a/src/game/interactables_2/sky_canyon/propeller_spring.c b/src/game/interactables_2/sky_canyon/propeller_spring.c
index 5deac4121..53dbdee41 100644
--- a/src/game/interactables_2/sky_canyon/propeller_spring.c
+++ b/src/game/interactables_2/sky_canyon/propeller_spring.c
@@ -222,11 +222,9 @@ static void sub_807C614(void)
     level->unk60++;
 }
 
-void CreateEntity_PropellerSpring(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                  u8 spriteY)
+void CreateEntity_PropellerSpring(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_Interactable085, sizeof(Sprite_IA85), 0x2010, 0,
-                                TaskDestructor_Interactable085);
+    struct Task *t = TaskCreate(Task_Interactable085, sizeof(Sprite_IA85), 0x2010, 0, TaskDestructor_Interactable085);
     Sprite_IA85 *ia85 = TASK_DATA(t);
     ia85->unk3C = TO_WORLD_POS(me->x, spriteRegionX);
     ia85->unk40 = TO_WORLD_POS(me->y, spriteRegionY);
diff --git a/src/game/interactables_2/sky_canyon/small_windmill.c b/src/game/interactables_2/sky_canyon/small_windmill.c
index 10d5d5c61..c538f9ea7 100644
--- a/src/game/interactables_2/sky_canyon/small_windmill.c
+++ b/src/game/interactables_2/sky_canyon/small_windmill.c
@@ -39,12 +39,10 @@ static void RenderWindmill(Sprite_SmallWindmill *);
 static void Despawn(Sprite_SmallWindmill *);
 static void ResetWindmill(Sprite_SmallWindmill *);
 
-void CreateEntity_SmallWindmill(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                u8 spriteY)
+void CreateEntity_SmallWindmill(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t
-        = TaskCreate(Task_SmallSpinnyWindmill, sizeof(Sprite_SmallWindmill), 0x2010, 0,
-                     TaskDestructor_Interactable_SkyCanyon_SmallSpinnyWindmill);
+    struct Task *t = TaskCreate(Task_SmallSpinnyWindmill, sizeof(Sprite_SmallWindmill), 0x2010, 0,
+                                TaskDestructor_Interactable_SkyCanyon_SmallSpinnyWindmill);
     Sprite_SmallWindmill *windmill = TASK_DATA(t);
     Sprite *s;
     windmill->type = me->d.uData[0];
@@ -104,10 +102,8 @@ static void StartSpinSequence(Sprite_SmallWindmill *windmill)
     }
 
     windmill->rotation = windmill->rotationTarget;
-    gPlayer.x
-        = COS_24_8(windmill->rotationTarget * 4) * PLAYER_SPIN_DIAMETER + Q(windmill->x);
-    gPlayer.y
-        = SIN_24_8(windmill->rotationTarget * 4) * PLAYER_SPIN_DIAMETER + Q(windmill->y);
+    gPlayer.x = COS_24_8(windmill->rotationTarget * 4) * PLAYER_SPIN_DIAMETER + Q(windmill->x);
+    gPlayer.y = SIN_24_8(windmill->rotationTarget * 4) * PLAYER_SPIN_DIAMETER + Q(windmill->y);
 
     switch (windmill->initialTouchAngle) {
         case 1:
@@ -190,10 +186,8 @@ static bool32 RotateWindmill(Sprite_SmallWindmill *windmill)
     }
 
     if (PLAYER_IS_ALIVE) {
-        gPlayer.x
-            = COS_24_8(windmill->rotation * 4) * PLAYER_SPIN_DIAMETER + Q(windmill->x);
-        gPlayer.y
-            = SIN_24_8(windmill->rotation * 4) * PLAYER_SPIN_DIAMETER + Q(windmill->y);
+        gPlayer.x = COS_24_8(windmill->rotation * 4) * PLAYER_SPIN_DIAMETER + Q(windmill->x);
+        gPlayer.y = SIN_24_8(windmill->rotation * 4) * PLAYER_SPIN_DIAMETER + Q(windmill->y);
     }
 
     return windmill->rotation == windmill->rotationTarget;
diff --git a/src/game/interactables_2/sky_canyon/whirlwind.c b/src/game/interactables_2/sky_canyon/whirlwind.c
index 4d18b3796..aae29a400 100644
--- a/src/game/interactables_2/sky_canyon/whirlwind.c
+++ b/src/game/interactables_2/sky_canyon/whirlwind.c
@@ -91,11 +91,9 @@ static const u8 gUnknown_080E0136[8] = { 0, 0, 0, 0, 1, 1, 1, 2 };
 
 #define UNKNOWN_WHIRLWIND_THIRYTWO 32
 
-void CreateEntity_Whirlwind(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                            u8 spriteY, u32 kind)
+void CreateEntity_Whirlwind(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY, u32 kind)
 {
-    struct Task *t = TaskCreate(Task_807D06C, sizeof(Sprite_IA86), 0x2010, 0,
-                                TaskDestructor_Interactable086);
+    struct Task *t = TaskCreate(Task_807D06C, sizeof(Sprite_IA86), 0x2010, 0, TaskDestructor_Interactable086);
     Sprite_IA86 *ia086 = TASK_DATA(t);
     s32 someX, someY;
     s32 value;
@@ -108,8 +106,7 @@ void CreateEntity_Whirlwind(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
     ia086->unk228.right = ia086->unk228.left + me->d.uData[2] * TILE_WIDTH;
     ia086->unk228.bottom = ia086->unk228.top + me->d.uData[3] * TILE_WIDTH;
 
-    ia086->unk228.centerX
-        = ia086->unk228.posX + ((ia086->unk228.right + ia086->unk228.left) >> 1);
+    ia086->unk228.centerX = ia086->unk228.posX + ((ia086->unk228.right + ia086->unk228.left) >> 1);
 
     ia086->unk228.centerY = ia086->unk228.posY + (ia086->unk228.bottom);
 
@@ -480,9 +477,7 @@ bool32 sub_807CF2C(Sprite_IA86 *ia086)
     s16 screenX = ia086->unk228.posX - gCamera.x;
     s16 screenY = ia086->unk228.posY - gCamera.y;
 
-    if (((screenX + ia086->unk228.right) < -128)
-        || ((screenX + ia086->unk228.left) > 368)
-        || ((screenY + ia086->unk228.bottom) < -128)
+    if (((screenX + ia086->unk228.right) < -128) || ((screenX + ia086->unk228.left) > 368) || ((screenY + ia086->unk228.bottom) < -128)
         || ((screenY + ia086->unk228.top) > 288)) {
 
         return TRUE;
@@ -600,14 +595,12 @@ void sub_807D1BC(Sprite_IA86 *ia086)
     sub_807CCBC(ia086);
 }
 
-void CreateEntity_Whirlwind_A(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                              u8 spriteY)
+void CreateEntity_Whirlwind_A(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     CreateEntity_Whirlwind(me, spriteRegionX, spriteRegionY, spriteY, 0);
 }
 
-void CreateEntity_Whirlwind_B(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                              u8 spriteY)
+void CreateEntity_Whirlwind_B(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     CreateEntity_Whirlwind(me, spriteRegionX, spriteRegionY, spriteY, 1);
 }
diff --git a/src/game/interactables_2/sky_canyon_init.c b/src/game/interactables_2/sky_canyon_init.c
index 6633ee963..f42d10d28 100644
--- a/src/game/interactables_2/sky_canyon_init.c
+++ b/src/game/interactables_2/sky_canyon_init.c
@@ -16,8 +16,7 @@ static void Task_80808DC(void);
 
 struct Task *sub_80807CC(void)
 {
-    struct Task *t
-        = TaskCreate(Task_80808DC, sizeof(Sprite_OnInit_SkyCanyon), 0x2001, 0, NULL);
+    struct Task *t = TaskCreate(Task_80808DC, sizeof(Sprite_OnInit_SkyCanyon), 0x2001, 0, NULL);
     Sprite_OnInit_SkyCanyon *init = TASK_DATA(t);
     Sprite *spring, *propellor;
 
diff --git a/src/game/interactables_2/special_ring.c b/src/game/interactables_2/special_ring.c
index 06193138b..2a455cdf5 100644
--- a/src/game/interactables_2/special_ring.c
+++ b/src/game/interactables_2/special_ring.c
@@ -31,13 +31,11 @@ static void sub_80811A0(Sprite_SpecialRing *, u32);
 static void sub_8081134(Sprite_SpecialRing *);
 static void Task_80811BC(void);
 
-void CreateEntity_SpecialRing(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                              u8 spriteY)
+void CreateEntity_SpecialRing(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     if (IS_SINGLE_PLAYER) {
         struct Task *t
-            = TaskCreate(Task_Interactable_SpecialRing, sizeof(Sprite_SpecialRing),
-                         0x4040, 0, TaskDestructor_Interactable_SpecialRing);
+            = TaskCreate(Task_Interactable_SpecialRing, sizeof(Sprite_SpecialRing), 0x4040, 0, TaskDestructor_Interactable_SpecialRing);
 
         Sprite_SpecialRing *ring = TASK_DATA(t);
         Sprite *s;
diff --git a/src/game/interactables_2/techno_base/arrow_platform.c b/src/game/interactables_2/techno_base/arrow_platform.c
index 38347bf42..af764ac48 100644
--- a/src/game/interactables_2/techno_base/arrow_platform.c
+++ b/src/game/interactables_2/techno_base/arrow_platform.c
@@ -47,13 +47,11 @@ static void sub_807A73C(Sprite_IA75 *);
 static void sub_807A7F4(Sprite_IA75 *);
 static void sub_807AABC(void);
 
-static void sub_807A33C(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY,
-                        u8 param)
+static void sub_807A33C(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY, u8 param)
 {
     s32 i;
     Sprite *s;
-    struct Task *t
-        = TaskCreate(sub_807AA68, sizeof(Sprite_IA75), 0x2010, 0, sub_807AB04);
+    struct Task *t = TaskCreate(sub_807AA68, sizeof(Sprite_IA75), 0x2010, 0, sub_807AB04);
     Sprite_IA75 *ia75 = TASK_DATA(t);
     ia75->unk94 = param;
     ia75->unk8C = 0;
@@ -296,8 +294,8 @@ static bool32 sub_807A920(Sprite_IA75 *ia75)
     s16 x = ia75->x - gCamera.x;
     s16 y = ia75->y - gCamera.y;
 
-    if ((x + ia75->offsetX + 24) < -128 || (x + ia75->width - 24) > 368
-        || (y + ia75->offsetY + 24) < -128 || (y + ia75->height - 24) > 288) {
+    if ((x + ia75->offsetX + 24) < -128 || (x + ia75->width - 24) > 368 || (y + ia75->offsetY + 24) < -128
+        || (y + ia75->height - 24) > 288) {
         return TRUE;
     }
     return FALSE;
@@ -306,8 +304,7 @@ static bool32 sub_807A920(Sprite_IA75 *ia75)
 static u32 sub_807A99C(Sprite_IA75 *ia75)
 {
     if (PLAYER_IS_ALIVE) {
-        u32 temp = sub_800CCB8(&ia75->s2, ia75->x + I(ia75->unk74),
-                               ia75->y + I(ia75->unk78), &gPlayer);
+        u32 temp = sub_800CCB8(&ia75->s2, ia75->x + I(ia75->unk74), ia75->y + I(ia75->unk78), &gPlayer);
         if (temp != 0) {
             if (temp & 0x10000) {
                 gPlayer.y += Q_8_8(temp);
@@ -407,20 +404,17 @@ static void sub_807AB6C(Sprite_IA75 *ia75)
     ia75->unk98[0][1] = ia75->unk78;
 }
 
-void CreateEntity_ArrowPlatform_Left(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                     u8 spriteY)
+void CreateEntity_ArrowPlatform_Left(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     sub_807A33C(me, spriteRegionX, spriteRegionY, spriteY, 0);
 }
 
-void CreateEntity_ArrowPlatform_Right(MapEntity *me, u16 spriteRegionX,
-                                      u16 spriteRegionY, u8 spriteY)
+void CreateEntity_ArrowPlatform_Right(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     sub_807A33C(me, spriteRegionX, spriteRegionY, spriteY, 1);
 }
 
-void CreateEntity_ArrowPlatform_Up(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                   u8 spriteY)
+void CreateEntity_ArrowPlatform_Up(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     sub_807A33C(me, spriteRegionX, spriteRegionY, spriteY, 2);
 }
diff --git a/src/game/interactables_2/techno_base/bounce_block.c b/src/game/interactables_2/techno_base/bounce_block.c
index 8c50dcec7..1b83a3946 100644
--- a/src/game/interactables_2/techno_base/bounce_block.c
+++ b/src/game/interactables_2/techno_base/bounce_block.c
@@ -46,11 +46,9 @@ static const u16 sTecBasBlockSfx[] = {
     SE_TECHNO_BASE_COMMON,
 };
 
-void CreateEntity_NoteBlock(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                            u8 spriteY)
+void CreateEntity_NoteBlock(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_NoteBlock, sizeof(Sprite_TecBaseNoteBlock), 0x2010,
-                                0, TaskDestructor_NoteBlock);
+    struct Task *t = TaskCreate(Task_NoteBlock, sizeof(Sprite_TecBaseNoteBlock), 0x2010, 0, TaskDestructor_NoteBlock);
     Sprite_TecBaseNoteBlock *noteBlock = TASK_DATA(t);
     Sprite *s = &noteBlock->s;
     noteBlock->unk44 = 0;
@@ -128,8 +126,7 @@ static bool32 sub_8079AC4(Sprite_TecBaseNoteBlock *noteBlock)
         if (temp3 < 49 && temp4 < 33) {
             s16 speedGround = gPlayer.speedGroundX;
 
-            temp = sub_800CDBC(&noteBlock->s, noteBlock->unk3C, noteBlock->unk40,
-                               &gPlayer);
+            temp = sub_800CDBC(&noteBlock->s, noteBlock->unk3C, noteBlock->unk40, &gPlayer);
             if (temp == 0) {
                 return 0;
             }
diff --git a/src/game/interactables_2/techno_base/light_bridge.c b/src/game/interactables_2/techno_base/light_bridge.c
index 356b8e79a..169d808a6 100644
--- a/src/game/interactables_2/techno_base/light_bridge.c
+++ b/src/game/interactables_2/techno_base/light_bridge.c
@@ -12,11 +12,11 @@
 #include "constants/animations.h"
 #include "constants/songs.h"
 
-#define MACRO_F7C(a, b, c)                                                              \
-    ({                                                                                  \
-        s32 temp = ((a) - (b));                                                         \
-        temp += (c);                                                                    \
-        temp;                                                                           \
+#define MACRO_F7C(a, b, c)                                                                                                                 \
+    ({                                                                                                                                     \
+        s32 temp = ((a) - (b));                                                                                                            \
+        temp += (c);                                                                                                                       \
+        temp;                                                                                                                              \
     })
 
 typedef struct {
@@ -73,19 +73,16 @@ static const u16 sSoundDurations[][2] = {
 
 // x, y,
 static const s16 sCurvedBridgePositions[][3] = {
-    { 0, 0, 1 },    { 11, -2, 1 },  { 23, -5, 1 },  { 35, -9, 1 },
-    { 48, -15, 1 }, { 58, -23, 1 }, { 68, -34, 0 }, { 76, -44, 0 },
-    { 83, -58, 0 }, { 88, -69, 0 }, { 91, -81, 0 }, { 92, -92, 0 },
+    { 0, 0, 1 },    { 11, -2, 1 },  { 23, -5, 1 },  { 35, -9, 1 },  { 48, -15, 1 }, { 58, -23, 1 },
+    { 68, -34, 0 }, { 76, -44, 0 }, { 83, -58, 0 }, { 88, -69, 0 }, { 91, -81, 0 }, { 92, -92, 0 },
 };
 
-void CreateEntity_LightBridge(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                              u8 spriteY)
+void CreateEntity_LightBridge(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     void *vram;
     u8 i;
     struct Task *t
-        = TaskCreate(Task_LightBridgeInactive, sizeof(Sprite_LightBridge), 0x2010, 0,
-                     TaskDestructor_InteractableTecBaseLightBridge);
+        = TaskCreate(Task_LightBridgeInactive, sizeof(Sprite_LightBridge), 0x2010, 0, TaskDestructor_InteractableTecBaseLightBridge);
     Sprite_LightBridge *lightBridge = TASK_DATA(t);
     Sprite *s;
     lightBridge->type = me->d.uData[0];
@@ -158,8 +155,7 @@ static void RenderStraightBridge(Sprite_LightBridge *lightBridge)
     s16 y = MACRO_F7C(lightBridge->posY, gCamera.y, 0);
 
     u8 i;
-    for (i = (gStageTime >> 1) & 1;
-         x <= maxX && x <= 246; // x <= (BRIDGE_SEGMENT_WIDTH * 20.5)
+    for (i = (gStageTime >> 1) & 1; x <= maxX && x <= 246; // x <= (BRIDGE_SEGMENT_WIDTH * 20.5)
          x += BRIDGE_SEGMENT_WIDTH, i++) {
         if ((i & 1) && x > 5) {
             s->x = x;
@@ -249,10 +245,8 @@ static bool32 IsPlayerWithinRange(Sprite_LightBridge *lightBridge)
             s16 temp2 = posY;
             temp2 + temp1;
         });
-        c = sWithinRangeDimensions[lightBridge->type].maxX
-            - sWithinRangeDimensions[lightBridge->type].minX;
-        d = sWithinRangeDimensions[lightBridge->type].maxY
-            - sWithinRangeDimensions[lightBridge->type].minY;
+        c = sWithinRangeDimensions[lightBridge->type].maxX - sWithinRangeDimensions[lightBridge->type].minX;
+        d = sWithinRangeDimensions[lightBridge->type].maxY - sWithinRangeDimensions[lightBridge->type].minY;
 
         if (a <= playerX && (a + c >= playerX)) {
             if (b <= playerY && (b + d >= playerY)) {
@@ -303,9 +297,7 @@ static void DeactivateBridge(Sprite_LightBridge *lightBridge)
 
 static void sub_807A25C(Sprite_LightBridge *lightBridge)
 {
-    u16 val = (gStageTime + lightBridge->unk6C)
-        % (sSoundDurations[lightBridge->type][0]
-           + sSoundDurations[lightBridge->type][1]);
+    u16 val = (gStageTime + lightBridge->unk6C) % (sSoundDurations[lightBridge->type][0] + sSoundDurations[lightBridge->type][1]);
 
     if (val < sSoundDurations[lightBridge->type][0]) {
         lightBridge->active = TRUE;
diff --git a/src/game/interactables_2/techno_base/light_globe.c b/src/game/interactables_2/techno_base/light_globe.c
index 6670aff52..6596c8fc2 100644
--- a/src/game/interactables_2/techno_base/light_globe.c
+++ b/src/game/interactables_2/techno_base/light_globe.c
@@ -31,11 +31,9 @@ static void sub_807B318(Sprite_LightGlobe *);
 static void sub_807B350(Sprite_LightGlobe *);
 static void sub_807B3B0(void);
 
-void CreateEntity_LightGlobe(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                             u8 spriteY)
+void CreateEntity_LightGlobe(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_Interactable080, sizeof(Sprite_LightGlobe), 0x2010,
-                                0, TaskDestructor_Interactable080);
+    struct Task *t = TaskCreate(Task_Interactable080, sizeof(Sprite_LightGlobe), 0x2010, 0, TaskDestructor_Interactable080);
     Sprite_LightGlobe *globe = TASK_DATA(t);
     Sprite *s;
 
diff --git a/src/game/interactables_2/techno_base/spike_platform.c b/src/game/interactables_2/techno_base/spike_platform.c
index c0043a867..ca74cbb16 100644
--- a/src/game/interactables_2/techno_base/spike_platform.c
+++ b/src/game/interactables_2/techno_base/spike_platform.c
@@ -30,28 +30,22 @@ static void sub_807B004(Sprite_IA78 *);
 static void sub_807B070(Sprite_IA78 *);
 
 static const u16 gUnknown_080E00B4[][2] = {
-    { SA2_ANIM_SPIKE_PLATFORM, 2 }, { SA2_ANIM_SPIKE_PLATFORM, 3 },
-    { SA2_ANIM_SPIKE_PLATFORM, 4 }, { SA2_ANIM_SPIKE_PLATFORM, 5 },
-    { SA2_ANIM_SPIKE_PLATFORM, 6 }, { SA2_ANIM_SPIKE_PLATFORM, 7 },
-    { SA2_ANIM_SPIKE_PLATFORM, 8 }, { SA2_ANIM_SPIKE_PLATFORM, 9 },
+    { SA2_ANIM_SPIKE_PLATFORM, 2 }, { SA2_ANIM_SPIKE_PLATFORM, 3 }, { SA2_ANIM_SPIKE_PLATFORM, 4 }, { SA2_ANIM_SPIKE_PLATFORM, 5 },
+    { SA2_ANIM_SPIKE_PLATFORM, 6 }, { SA2_ANIM_SPIKE_PLATFORM, 7 }, { SA2_ANIM_SPIKE_PLATFORM, 8 }, { SA2_ANIM_SPIKE_PLATFORM, 9 },
 };
 
 static const u16 gUnknown_080E00D4[][2] = {
-    { 0, 0 },  { 2, 2 },  { 4, 4 },  { 6, 6 },  { 12, 0 },
-    { 18, 6 }, { 21, 0 }, { 27, 6 }, { 33, 4 }, { 35, 0 },
+    { 0, 0 }, { 2, 2 }, { 4, 4 }, { 6, 6 }, { 12, 0 }, { 18, 6 }, { 21, 0 }, { 27, 6 }, { 33, 4 }, { 35, 0 },
 };
 
 static const u16 gUnknown_080E00FC[][2] = {
-    { 0, 0 },  { 6, 4 },  { 8, 6 },  { 38, 0 }, { 44, 6 },
-    { 47, 0 }, { 53, 6 }, { 59, 4 }, { 51, 2 }, { 53, 0 },
+    { 0, 0 }, { 6, 4 }, { 8, 6 }, { 38, 0 }, { 44, 6 }, { 47, 0 }, { 53, 6 }, { 59, 4 }, { 51, 2 }, { 53, 0 },
 };
 
-void CreateEntity_SpikePlatform(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                u8 spriteY)
+void CreateEntity_SpikePlatform(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     Sprite *s;
-    struct Task *t = TaskCreate(Task_Interactable078, sizeof(Sprite_IA78), 0x2010, 0,
-                                TaskDestructor_Interactable078);
+    struct Task *t = TaskCreate(Task_Interactable078, sizeof(Sprite_IA78), 0x2010, 0, TaskDestructor_Interactable078);
     Sprite_IA78 *ia78 = TASK_DATA(t);
 
     ia78->base.me = me;
diff --git a/src/game/math_0.c b/src/game/math_0.c
index 6813947a4..31b31c550 100644
--- a/src/game/math_0.c
+++ b/src/game/math_0.c
@@ -209,10 +209,7 @@ s32 sub_8085714(s32 a, s32 b, s32 c) { return ((a + b * 8) - c) >> 3; }
 
 s32 sub_8085720(s32 a, s32 b, s32 c) { return ((b * 8 - a) + c) >> 3; }
 
-s32 sub_808572C(s32 a, s32 b, s32 c, s32 d, u32 e, u8 f)
-{
-    return ((s64)(b - a) * (s64)((1 << f) - c)) >> f;
-}
+s32 sub_808572C(s32 a, s32 b, s32 c, s32 d, u32 e, u8 f) { return ((s64)(b - a) * (s64)((1 << f) - c)) >> f; }
 
 s32 sub_8085758(s32 a, s32 b) { return b - a; }
 
diff --git a/src/game/math_1.c b/src/game/math_1.c
index 201876236..3c25f8812 100644
--- a/src/game/math_1.c
+++ b/src/game/math_1.c
@@ -345,15 +345,9 @@ UNK_8085DEC *sub_8085DEC(UNK_8085DEC *thing, u16 num)
     return thing;
 }
 
-void sub_8085E10(struct UNK_8085F1C *p1, struct UNK_8085F1C *p2)
-{
-    memcpy(p2, &p1->unk10, 0x10);
-}
+void sub_8085E10(struct UNK_8085F1C *p1, struct UNK_8085F1C *p2) { memcpy(p2, &p1->unk10, 0x10); }
 
-void sub_8085E24(struct UNK_8085F1C *p1, struct UNK_8085F1C *p2)
-{
-    memcpy(&p1->unk10, p2, 0x10);
-}
+void sub_8085E24(struct UNK_8085F1C *p1, struct UNK_8085F1C *p2) { memcpy(&p1->unk10, p2, 0x10); }
 
 void sub_8085E38(struct UNK_8085F1C *p1, struct UNK_8085F1C *p2)
 {
diff --git a/src/game/multiboot/collect_rings/results.c b/src/game/multiboot/collect_rings/results.c
index 1277de146..c4b79bbf0 100644
--- a/src/game/multiboot/collect_rings/results.c
+++ b/src/game/multiboot/collect_rings/results.c
@@ -271,24 +271,16 @@ void sub_808207C(void)
         for (i = 0; i < 4; i++) {
             if (!(gMultiSioStatusFlags & MULTI_SIO_RECV_ID(i + 8))) {
                 if (gUnknown_030054B4[i] & 1) {
-                    sub_80078D4(3, i * 40, (i + 1) * 40,
-                                DISPLAY_WIDTH - resultsScreen->unk430,
-                                DISPLAY_HEIGHT - i * 40);
+                    sub_80078D4(3, i * 40, (i + 1) * 40, DISPLAY_WIDTH - resultsScreen->unk430, DISPLAY_HEIGHT - i * 40);
                 } else {
-                    sub_80078D4(3, i * 40, (i + 1) * 40,
-                                resultsScreen->unk430 - DISPLAY_WIDTH,
-                                DISPLAY_HEIGHT - i * 40);
+                    sub_80078D4(3, i * 40, (i + 1) * 40, resultsScreen->unk430 - DISPLAY_WIDTH, DISPLAY_HEIGHT - i * 40);
                 }
             } else {
                 if (gUnknown_030054B4[i] & 1) {
-                    sub_80078D4(3, gUnknown_030054B4[i] * 40,
-                                (gUnknown_030054B4[i] + 1) * 40,
-                                DISPLAY_WIDTH - resultsScreen->unk430,
+                    sub_80078D4(3, gUnknown_030054B4[i] * 40, (gUnknown_030054B4[i] + 1) * 40, DISPLAY_WIDTH - resultsScreen->unk430,
                                 (i * 5 - gUnknown_030054B4[i] * 5) * 8);
                 } else {
-                    sub_80078D4(3, gUnknown_030054B4[i] * 40,
-                                (gUnknown_030054B4[i] + 1) * 40,
-                                resultsScreen->unk430 - DISPLAY_WIDTH,
+                    sub_80078D4(3, gUnknown_030054B4[i] * 40, (gUnknown_030054B4[i] + 1) * 40, resultsScreen->unk430 - DISPLAY_WIDTH,
                                 (i * 5 - gUnknown_030054B4[i] * 5) * 8);
                 }
             }
@@ -380,9 +372,7 @@ void sub_80823FC(void)
             packet->pat0.unk3 = gMultiplayerLanguage;
         }
 
-        if ((gMultiSioStatusFlags & MULTI_SIO_PARENT && gPressedKeys & START_BUTTON
-             && !val && val2 > 1)
-            || resultsScreen->actor) {
+        if ((gMultiSioStatusFlags & MULTI_SIO_PARENT && gPressedKeys & START_BUTTON && !val && val2 > 1) || resultsScreen->actor) {
             resultsScreen->actor = 1;
             packet->pat0.unk0 = 0x4012;
         }
@@ -473,8 +463,7 @@ void sub_8082788(void)
         if (!(gMultiSioStatusFlags & MULTI_SIO_RECV_ID(i + 8))) {
             sub_80078D4(3, i * 40, (i + 1) * 40, 0, DISPLAY_HEIGHT - i * 40);
         } else {
-            sub_80078D4(3, gUnknown_030054B4[i] * 40, (gUnknown_030054B4[i] + 1) * 40, 0,
-                        i * 40 - gUnknown_030054B4[i] * 40);
+            sub_80078D4(3, gUnknown_030054B4[i] * 40, (gUnknown_030054B4[i] + 1) * 40, 0, i * 40 - gUnknown_030054B4[i] * 40);
             if (resultsScreen->unk434) {
                 u16 temp;
 
@@ -564,8 +553,7 @@ void sub_8082AA8(void)
 
 struct MultiplayerSinglePakResultsScreen *sub_8082B1C(s16 mode)
 {
-    struct Task *t = TaskCreate(
-        sub_808207C, sizeof(struct MultiplayerSinglePakResultsScreen), 0x2000, 0, NULL);
+    struct Task *t = TaskCreate(sub_808207C, sizeof(struct MultiplayerSinglePakResultsScreen), 0x2000, 0, NULL);
     struct MultiplayerSinglePakResultsScreen *resultsScreen = TASK_DATA(t);
 
     resultsScreen->unk434 = mode;
@@ -584,8 +572,7 @@ void sub_8082B80(struct MultiplayerSinglePakResultsScreen *resultsScreen)
 
     for (i = 0; i < 4; i++) {
         u16 anim = gPlayerCharacterIdleAnims[i];
-        sub_8082CEC(&resultsScreen->unk80[i].unk0, OBJ_VRAM0 + (i * 0x800), anim, 0,
-                    0x78, (i * 40) + 20, SPRITE_OAM_ORDER(16), i, 0x1000);
+        sub_8082CEC(&resultsScreen->unk80[i].unk0, OBJ_VRAM0 + (i * 0x800), anim, 0, 0x78, (i * 40) + 20, SPRITE_OAM_ORDER(16), i, 0x1000);
     }
 }
 
@@ -594,8 +581,7 @@ void sub_8082BF8(struct MultiplayerSinglePakResultsScreen *resultsScreen)
     s16 i;
 
     for (i = 0; i < 10; i++) {
-        sub_8082CEC(&resultsScreen->unk160[i], OBJ_VRAM0 + (i * 4 + 0x100) * 0x20, 0x451,
-                    i, 0, 0, SPRITE_OAM_ORDER(4), 0, 0x1000);
+        sub_8082CEC(&resultsScreen->unk160[i], OBJ_VRAM0 + (i * 4 + 0x100) * 0x20, 0x451, i, 0, 0, SPRITE_OAM_ORDER(4), 0, 0x1000);
     }
 }
 
@@ -604,19 +590,16 @@ void sub_8082C58(struct MultiplayerSinglePakResultsScreen *resultsScreen)
     s16 i;
 
     for (i = 0; i < 3; i++) {
-        sub_8082CEC(&resultsScreen->unk370[i], OBJ_VRAM0 + 0x2500 + i * 0xC0, 1099, i, 0,
-                    0, SPRITE_OAM_ORDER(4), 0, 0x1000);
+        sub_8082CEC(&resultsScreen->unk370[i], OBJ_VRAM0 + 0x2500 + i * 0xC0, 1099, i, 0, 0, SPRITE_OAM_ORDER(4), 0, 0x1000);
     }
 }
 
 void sub_8082CB4(struct MultiplayerSinglePakResultsScreen *resultsScreen)
 {
-    sub_8082CEC(&resultsScreen->unk340, OBJ_VRAM0 + 0x2F00, 1099, 3, 0, 0,
-                SPRITE_OAM_ORDER(4), 0, 0x1000);
+    sub_8082CEC(&resultsScreen->unk340, OBJ_VRAM0 + 0x2F00, 1099, 3, 0, 0, SPRITE_OAM_ORDER(4), 0, 0x1000);
 }
 
-void sub_8082CEC(Sprite *s, void *vramAddr, u16 animId, u8 variant, s16 x, s16 y,
-                 u16 oamFlags, u8 unk25, u32 unk10)
+void sub_8082CEC(Sprite *s, void *vramAddr, u16 animId, u8 variant, s16 x, s16 y, u16 oamFlags, u8 unk25, u32 unk10)
 {
     s->x = x;
     s->y = y;
diff --git a/src/game/multiboot/collect_rings/time_display.c b/src/game/multiboot/collect_rings/time_display.c
index 19221afc3..b7d7e0933 100644
--- a/src/game/multiboot/collect_rings/time_display.c
+++ b/src/game/multiboot/collect_rings/time_display.c
@@ -18,10 +18,9 @@ void sub_808328C(void);
 u32 gUnknown_03005B6C = 0;
 
 const u8 gUnknown_080E0234[] = {
-    0,   2,   3,   5,   7,   8,   16,  18,  19,  21,  23,  24,  32,  34,  35,
-    37,  39,  40,  48,  50,  51,  53,  55,  56,  64,  66,  67,  69,  71,  72,
-    80,  82,  83,  85,  87,  88,  96,  98,  99,  101, 103, 104, 112, 114, 115,
-    117, 119, 120, 128, 130, 131, 133, 135, 136, 144, 146, 147, 149, 151, 152,
+    0,   2,   3,   5,   7,   8,   16,  18,  19,  21,  23,  24,  32,  34,  35,  37,  39,  40,  48,  50,
+    51,  53,  55,  56,  64,  66,  67,  69,  71,  72,  80,  82,  83,  85,  87,  88,  96,  98,  99,  101,
+    103, 104, 112, 114, 115, 117, 119, 120, 128, 130, 131, 133, 135, 136, 144, 146, 147, 149, 151, 152,
 };
 
 const u16 gUnknown_080E0270[] = INCBIN_U16("graphics/80E0270.gbapal");
@@ -31,8 +30,7 @@ void CreateCollectRingsTimeDisplay(void)
     u32 i;
     TimeDisplay *timeDisplay;
     Sprite *s;
-    struct Task *t
-        = TaskCreate(sub_808328C, sizeof(TimeDisplay), 0x2102, 0, sub_80832E0);
+    struct Task *t = TaskCreate(sub_808328C, sizeof(TimeDisplay), 0x2102, 0, sub_80832E0);
     gUnknown_03005B6C = 0;
     timeDisplay = TASK_DATA(t);
 
diff --git a/src/game/multiboot/connection.c b/src/game/multiboot/connection.c
index e2021ab07..8c1b411b0 100644
--- a/src/game/multiboot/connection.c
+++ b/src/game/multiboot/connection.c
@@ -177,8 +177,8 @@ void StartSinglePakConnect(void)
     }
 
     connectScreen->mbProgStart = gUnknown_080E01E0[connectScreen->unkFA][0];
-    connectScreen->mbProgLength = (uintptr_t)gUnknown_080E01E0[connectScreen->unkFA][1]
-        - (uintptr_t)gUnknown_080E01E0[connectScreen->unkFA][0];
+    connectScreen->mbProgLength
+        = (uintptr_t)gUnknown_080E01E0[connectScreen->unkFA][1] - (uintptr_t)gUnknown_080E01E0[connectScreen->unkFA][0];
     connectScreen->unkF0 = 0;
     connectScreen->unkF9 = 0;
     connectScreen->unkE4 = 0;
@@ -318,8 +318,7 @@ void sub_8081604(void)
                 DmaStop(1);
                 DmaStop(2);
                 DmaStop(3);
-                MultiBootStartMaster(&gMultiBootParam, connectScreen->mbProgStart + 0xC0,
-                                     connectScreen->mbProgLength - 0xC0, 4, 1);
+                MultiBootStartMaster(&gMultiBootParam, connectScreen->mbProgStart + 0xC0, connectScreen->mbProgLength - 0xC0, 4, 1);
             }
         }
     } else {
@@ -338,10 +337,8 @@ void sub_8081604(void)
     }
 
     multiBootFlags = MultiBootMain(&gMultiBootParam);
-    if (multiBootFlags == MULTIBOOT_ERROR_NO_PROBE_TARGET
-        || multiBootFlags == MULTIBOOT_ERROR_NO_DLREADY
-        || multiBootFlags == MULTIBOOT_ERROR_BOOT_FAILURE
-        || multiBootFlags == MULTIBOOT_ERROR_HANDSHAKE_FAILURE) {
+    if (multiBootFlags == MULTIBOOT_ERROR_NO_PROBE_TARGET || multiBootFlags == MULTIBOOT_ERROR_NO_DLREADY
+        || multiBootFlags == MULTIBOOT_ERROR_BOOT_FAILURE || multiBootFlags == MULTIBOOT_ERROR_HANDSHAKE_FAILURE) {
         TasksDestroyAll();
         gUnknown_03002AE4 = gUnknown_0300287C;
         gUnknown_03005390 = 0;
@@ -393,8 +390,7 @@ void sub_80818B8(void)
     u16 i, j;
     u32 temp;
     struct SinglePakConnectScreen *connectScreen = TASK_DATA(gCurTask);
-    if (gMultiSioStatusFlags & MULTI_SIO_LD_REQUEST
-        && connectScreen->unkF9 < ARRAY_COUNT(gCollectRingsSegments)) {
+    if (gMultiSioStatusFlags & MULTI_SIO_LD_REQUEST && connectScreen->unkF9 < ARRAY_COUNT(gCollectRingsSegments)) {
         gCurTask->main = sub_8081D04;
     }
 
@@ -403,17 +399,14 @@ void sub_80818B8(void)
     }
 
     gMultiSioSend.pat2.unk0 = connectScreen->unkFA;
-    gMultiSioStatusFlags
-        = MultiSioMain(&gMultiSioSend, &gMultiSioRecv, connectScreen->unkF8);
+    gMultiSioStatusFlags = MultiSioMain(&gMultiSioSend, &gMultiSioRecv, connectScreen->unkF8);
 
     if (connectScreen->unkF4 == 0) {
         MultiSioStart();
         connectScreen->unkF4 = 1;
     }
 
-    temp = ((gMultiSioStatusFlags
-             & (MULTI_SIO_CONNECTED_ID0 | MULTI_SIO_CONNECTED_ID1
-                | MULTI_SIO_CONNECTED_ID2 | MULTI_SIO_CONNECTED_ID3))
+    temp = ((gMultiSioStatusFlags & (MULTI_SIO_CONNECTED_ID0 | MULTI_SIO_CONNECTED_ID1 | MULTI_SIO_CONNECTED_ID2 | MULTI_SIO_CONNECTED_ID3))
             >> 8);
 
     for (i = 1; i < 4; i++) {
@@ -582,8 +575,7 @@ void sub_8081D04(void)
     struct SinglePakConnectScreen *connectScreen = TASK_DATA(gCurTask);
     MultiSioStop();
     gIntrTable[0] = Sio32MultiLoadIntr;
-    Sio32MultiLoadInit(gMultiSioStatusFlags & MULTI_SIO_PARENT,
-                       gCollectRingsSegments[connectScreen->unkF9]);
+    Sio32MultiLoadInit(gMultiSioStatusFlags & MULTI_SIO_PARENT, gCollectRingsSegments[connectScreen->unkF9]);
     gCurTask->main = sub_8081A5C;
 }
 
@@ -599,8 +591,7 @@ s8 sub_8081D70(UNUSED struct SinglePakConnectScreen *connectScreen)
     s8 result;
 
     for (result = 1, i = 1; i < MULTI_SIO_PLAYERS_MAX; i++) {
-        if (GetBit(gMultiBootParam.response_bit, i)
-            && GetBit(gMultiBootParam.client_bit, i)) {
+        if (GetBit(gMultiBootParam.response_bit, i) && GetBit(gMultiBootParam.client_bit, i)) {
             result++;
         }
     }
diff --git a/src/game/multiplayer/communication_outcome.c b/src/game/multiplayer/communication_outcome.c
index d78e3310e..6db9c2182 100644
--- a/src/game/multiplayer/communication_outcome.c
+++ b/src/game/multiplayer/communication_outcome.c
@@ -38,43 +38,27 @@ struct CommunicationOutcomeScreen {
 
 static void sub_805BC40(void);
 
-static const u16 sCheeseSittingAnims[2]
-    = { SA2_ANIM_MULTIPLAYER_CHEESE_SITTING, SA2_ANIM_MULTIPLAYER_CHEESE_SITTING };
+static const u16 sCheeseSittingAnims[2] = { SA2_ANIM_MULTIPLAYER_CHEESE_SITTING, SA2_ANIM_MULTIPLAYER_CHEESE_SITTING };
 static const u8 sCheeseSittingVariants[2]
-    = { SA2_ANIM_VARIANT_MULTIPLAYER_CHEESE_SITTING_HAPPY,
-        SA2_ANIM_VARIANT_MULTIPLAYER_CHEESE_SITTING_SAD };
+    = { SA2_ANIM_VARIANT_MULTIPLAYER_CHEESE_SITTING_HAPPY, SA2_ANIM_VARIANT_MULTIPLAYER_CHEESE_SITTING_SAD };
 static const TileInfo sCommMessages[][7] = {
     {
-        TextElementAlt2(LANG_DEFAULT, SA2_ANIM_VARIANT_MP_COMM_MSG_COMMUNICATION_ERROR,
-                        51, SA2_ANIM_MP_MSG),
-        TextElementAlt2(LANG_JAPANESE, SA2_ANIM_VARIANT_MP_COMM_MSG_COMMUNICATION_ERROR,
-                        51, SA2_ANIM_MP_MSG),
-        TextElementAlt2(LANG_ENGLISH, SA2_ANIM_VARIANT_MP_COMM_MSG_COMMUNICATION_ERROR,
-                        75, SA2_ANIM_MP_COMM_MSG_EN),
-        TextElementAlt2(LANG_GERMAN, SA2_ANIM_VARIANT_MP_COMM_MSG_COMMUNICATION_ERROR,
-                        75, SA2_ANIM_MP_COMM_MSG_DE),
-        TextElementAlt2(LANG_FRENCH, SA2_ANIM_VARIANT_MP_COMM_MSG_COMMUNICATION_ERROR,
-                        57, SA2_ANIM_MP_COMM_MSG_FR),
-        TextElementAlt2(LANG_SPANISH, SA2_ANIM_VARIANT_MP_COMM_MSG_COMMUNICATION_ERROR,
-                        45, SA2_ANIM_MP_COMM_MSG_ES),
-        TextElementAlt2(LANG_ITALIAN, SA2_ANIM_VARIANT_MP_COMM_MSG_COMMUNICATION_ERROR,
-                        51, SA2_ANIM_MP_COMM_MSG_IT),
+        TextElementAlt2(LANG_DEFAULT, SA2_ANIM_VARIANT_MP_COMM_MSG_COMMUNICATION_ERROR, 51, SA2_ANIM_MP_MSG),
+        TextElementAlt2(LANG_JAPANESE, SA2_ANIM_VARIANT_MP_COMM_MSG_COMMUNICATION_ERROR, 51, SA2_ANIM_MP_MSG),
+        TextElementAlt2(LANG_ENGLISH, SA2_ANIM_VARIANT_MP_COMM_MSG_COMMUNICATION_ERROR, 75, SA2_ANIM_MP_COMM_MSG_EN),
+        TextElementAlt2(LANG_GERMAN, SA2_ANIM_VARIANT_MP_COMM_MSG_COMMUNICATION_ERROR, 75, SA2_ANIM_MP_COMM_MSG_DE),
+        TextElementAlt2(LANG_FRENCH, SA2_ANIM_VARIANT_MP_COMM_MSG_COMMUNICATION_ERROR, 57, SA2_ANIM_MP_COMM_MSG_FR),
+        TextElementAlt2(LANG_SPANISH, SA2_ANIM_VARIANT_MP_COMM_MSG_COMMUNICATION_ERROR, 45, SA2_ANIM_MP_COMM_MSG_ES),
+        TextElementAlt2(LANG_ITALIAN, SA2_ANIM_VARIANT_MP_COMM_MSG_COMMUNICATION_ERROR, 51, SA2_ANIM_MP_COMM_MSG_IT),
     },
     {
-        TextElementAlt2(LANG_DEFAULT, SA2_ANIM_VARIANT_MP_COMM_MSG_LETS_PLAY_WITH_2P, 66,
-                        SA2_ANIM_MP_MSG),
-        TextElementAlt2(LANG_JAPANESE, SA2_ANIM_VARIANT_MP_COMM_MSG_LETS_PLAY_WITH_2P,
-                        66, SA2_ANIM_MP_MSG),
-        TextElementAlt2(LANG_ENGLISH, SA2_ANIM_VARIANT_MP_COMM_MSG_LETS_PLAY_WITH_2P, 68,
-                        SA2_ANIM_MP_COMM_MSG_EN),
-        TextElementAlt2(LANG_GERMAN, SA2_ANIM_VARIANT_MP_COMM_MSG_LETS_PLAY_WITH_2P, 88,
-                        SA2_ANIM_MP_COMM_MSG_DE),
-        TextElementAlt2(LANG_FRENCH, SA2_ANIM_VARIANT_MP_COMM_MSG_LETS_PLAY_WITH_2P, 60,
-                        SA2_ANIM_MP_COMM_MSG_FR),
-        TextElementAlt2(LANG_SPANISH, SA2_ANIM_VARIANT_MP_COMM_MSG_LETS_PLAY_WITH_2P, 68,
-                        SA2_ANIM_MP_COMM_MSG_ES),
-        TextElementAlt2(LANG_ITALIAN, SA2_ANIM_VARIANT_MP_COMM_MSG_LETS_PLAY_WITH_2P, 60,
-                        SA2_ANIM_MP_COMM_MSG_IT),
+        TextElementAlt2(LANG_DEFAULT, SA2_ANIM_VARIANT_MP_COMM_MSG_LETS_PLAY_WITH_2P, 66, SA2_ANIM_MP_MSG),
+        TextElementAlt2(LANG_JAPANESE, SA2_ANIM_VARIANT_MP_COMM_MSG_LETS_PLAY_WITH_2P, 66, SA2_ANIM_MP_MSG),
+        TextElementAlt2(LANG_ENGLISH, SA2_ANIM_VARIANT_MP_COMM_MSG_LETS_PLAY_WITH_2P, 68, SA2_ANIM_MP_COMM_MSG_EN),
+        TextElementAlt2(LANG_GERMAN, SA2_ANIM_VARIANT_MP_COMM_MSG_LETS_PLAY_WITH_2P, 88, SA2_ANIM_MP_COMM_MSG_DE),
+        TextElementAlt2(LANG_FRENCH, SA2_ANIM_VARIANT_MP_COMM_MSG_LETS_PLAY_WITH_2P, 60, SA2_ANIM_MP_COMM_MSG_FR),
+        TextElementAlt2(LANG_SPANISH, SA2_ANIM_VARIANT_MP_COMM_MSG_LETS_PLAY_WITH_2P, 68, SA2_ANIM_MP_COMM_MSG_ES),
+        TextElementAlt2(LANG_ITALIAN, SA2_ANIM_VARIANT_MP_COMM_MSG_LETS_PLAY_WITH_2P, 60, SA2_ANIM_MP_COMM_MSG_IT),
     },
 };
 
@@ -98,8 +82,7 @@ void CreateMultipackOutcomeScreen(u8 outcome)
     gBldRegs.bldCnt = 0xBF;
     gBldRegs.bldY = 0x10;
 
-    t = TaskCreate(sub_805BC40, sizeof(struct CommunicationOutcomeScreen), 0x2000, 0,
-                   NULL);
+    t = TaskCreate(sub_805BC40, sizeof(struct CommunicationOutcomeScreen), 0x2000, 0, NULL);
     outcomeScreen = TASK_DATA(t);
 
     outcomeScreen->unk203 = outcome;
@@ -238,9 +221,7 @@ static void sub_805BC40(void)
         gUnknown_03005390 = 0;
         PAUSE_GRAPHICS_QUEUE();
         if (outcome == OUTCOME_CONNECTION_SUCCESS) {
-            CreateCharacterSelectionScreen(gSelectedCharacter,
-                                           gMultiplayerUnlockedCharacters
-                                               & CHARACTER_BIT(CHARACTER_AMY));
+            CreateCharacterSelectionScreen(gSelectedCharacter, gMultiplayerUnlockedCharacters & CHARACTER_BIT(CHARACTER_AMY));
         } else {
             gMultiSioEnabled = FALSE;
             MultiSioStop();
diff --git a/src/game/multiplayer/finish.c b/src/game/multiplayer/finish.c
index 7ea9bf5df..d65742b96 100644
--- a/src/game/multiplayer/finish.c
+++ b/src/game/multiplayer/finish.c
@@ -24,42 +24,39 @@ typedef struct {
 void Task_8019E70(void);
 void TaskDestructor_8019EF4(struct Task *);
 
-const TileInfo gUnknown_080D5768[2][7]
-    = { {
-            // Japanese
-            { 0, SA2_ANIM_MP_RESULT_JP, SA2_ANIM_MP_RESULT_WIN },
-            { 0, SA2_ANIM_MP_RESULT_JP, SA2_ANIM_MP_RESULT_LOSE },
-            { 0, SA2_ANIM_MP_RESULT_JP, SA2_ANIM_MP_RESULT_DRAW },
-            { 0, SA2_ANIM_MP_RESULT_JP, SA2_ANIM_MP_RESULT_1ST },
-            { 0, SA2_ANIM_MP_RESULT_JP, SA2_ANIM_MP_RESULT_2ND },
-            { 0, SA2_ANIM_MP_RESULT_JP, SA2_ANIM_MP_RESULT_3RD },
-            { 0, SA2_ANIM_MP_RESULT_JP, SA2_ANIM_MP_RESULT_4TH },
-        },
-        {
-            // English
-            { 0, SA2_ANIM_MP_RESULT, SA2_ANIM_MP_RESULT_WIN },
-            { 0, SA2_ANIM_MP_RESULT, SA2_ANIM_MP_RESULT_LOSE },
-            { 0, SA2_ANIM_MP_RESULT, SA2_ANIM_MP_RESULT_DRAW },
-            { 0, SA2_ANIM_MP_RESULT, SA2_ANIM_MP_RESULT_1ST },
-            { 0, SA2_ANIM_MP_RESULT, SA2_ANIM_MP_RESULT_2ND },
-            { 0, SA2_ANIM_MP_RESULT, SA2_ANIM_MP_RESULT_3RD },
-            { 0, SA2_ANIM_MP_RESULT, SA2_ANIM_MP_RESULT_4TH },
-        } };
+const TileInfo gUnknown_080D5768[2][7] = { {
+                                               // Japanese
+                                               { 0, SA2_ANIM_MP_RESULT_JP, SA2_ANIM_MP_RESULT_WIN },
+                                               { 0, SA2_ANIM_MP_RESULT_JP, SA2_ANIM_MP_RESULT_LOSE },
+                                               { 0, SA2_ANIM_MP_RESULT_JP, SA2_ANIM_MP_RESULT_DRAW },
+                                               { 0, SA2_ANIM_MP_RESULT_JP, SA2_ANIM_MP_RESULT_1ST },
+                                               { 0, SA2_ANIM_MP_RESULT_JP, SA2_ANIM_MP_RESULT_2ND },
+                                               { 0, SA2_ANIM_MP_RESULT_JP, SA2_ANIM_MP_RESULT_3RD },
+                                               { 0, SA2_ANIM_MP_RESULT_JP, SA2_ANIM_MP_RESULT_4TH },
+                                           },
+                                           {
+                                               // English
+                                               { 0, SA2_ANIM_MP_RESULT, SA2_ANIM_MP_RESULT_WIN },
+                                               { 0, SA2_ANIM_MP_RESULT, SA2_ANIM_MP_RESULT_LOSE },
+                                               { 0, SA2_ANIM_MP_RESULT, SA2_ANIM_MP_RESULT_DRAW },
+                                               { 0, SA2_ANIM_MP_RESULT, SA2_ANIM_MP_RESULT_1ST },
+                                               { 0, SA2_ANIM_MP_RESULT, SA2_ANIM_MP_RESULT_2ND },
+                                               { 0, SA2_ANIM_MP_RESULT, SA2_ANIM_MP_RESULT_3RD },
+                                               { 0, SA2_ANIM_MP_RESULT, SA2_ANIM_MP_RESULT_4TH },
+                                           } };
 
-#define GET_MP_FINISH_RESULT_TILE_INFO(_id)                                             \
-    ({                                                                                  \
-        const TileInfo *source;                                                         \
-        u8 *info = (u8 *)gUnknown_080D5768;                                             \
-                                                                                        \
-        s32 index;                                                                      \
-                                                                                        \
-        index = ((gLoadedSaveGame->language == LANG_DEFAULT)                            \
-                 || (gLoadedSaveGame->language == LANG_JAPANESE))                       \
-            ? 0                                                                         \
-            : (7 * sizeof(TileInfo));                                                   \
-        source = (TileInfo *)(info + index);                                            \
-                                                                                        \
-        (source + (_id));                                                               \
+#define GET_MP_FINISH_RESULT_TILE_INFO(_id)                                                                                                \
+    ({                                                                                                                                     \
+        const TileInfo *source;                                                                                                            \
+        u8 *info = (u8 *)gUnknown_080D5768;                                                                                                \
+                                                                                                                                           \
+        s32 index;                                                                                                                         \
+                                                                                                                                           \
+        index                                                                                                                              \
+            = ((gLoadedSaveGame->language == LANG_DEFAULT) || (gLoadedSaveGame->language == LANG_JAPANESE)) ? 0 : (7 * sizeof(TileInfo));  \
+        source = (TileInfo *)(info + index);                                                                                               \
+                                                                                                                                           \
+        (source + (_id));                                                                                                                  \
     })
 
 void sub_8019CCC(u8 sioId, u8 count)
@@ -67,8 +64,7 @@ void sub_8019CCC(u8 sioId, u8 count)
     u32 i = 0;
 
     if (gUnknown_030054B4[sioId] == -1) {
-        struct Task *t = TaskCreate(Task_8019E70, sizeof(MpFinish1), 0x2010, 0,
-                                    TaskDestructor_8019EF4);
+        struct Task *t = TaskCreate(Task_8019E70, sizeof(MpFinish1), 0x2010, 0, TaskDestructor_8019EF4);
         MpFinish1 *finish = TASK_DATA(t);
         struct Task **mpt = &gMultiplayerPlayerTasks[0];
         Sprite *s;
@@ -345,8 +341,7 @@ void Task_TransitionToResultsScreen(void)
 
                 if (gUnknown_030054B4[SIO_MULTI_CNT->id] < gUnknown_030054B4[pid]) {
                     foeResult = 0;
-                } else if (gUnknown_030054B4[SIO_MULTI_CNT->id]
-                           > gUnknown_030054B4[pid]) {
+                } else if (gUnknown_030054B4[SIO_MULTI_CNT->id] > gUnknown_030054B4[pid]) {
                     foeResult = 1;
                     ownResult = 1;
                 } else {
@@ -357,8 +352,7 @@ void Task_TransitionToResultsScreen(void)
                     }
                 }
                 // _0801A2A8
-                RecordMultiplayerResult(gMultiplayerIds[pid], &gMultiplayerNames[pid][0],
-                                        foeResult);
+                RecordMultiplayerResult(gMultiplayerIds[pid], &gMultiplayerNames[pid][0], foeResult);
             }
 
             RecordOwnMultiplayerResult(ownResult);
diff --git a/src/game/multiplayer/indicators.c b/src/game/multiplayer/indicators.c
index 72da7ab84..a472c82bc 100644
--- a/src/game/multiplayer/indicators.c
+++ b/src/game/multiplayer/indicators.c
@@ -34,11 +34,9 @@ void CreateOpponentPositionIndicator(u8 sid)
     OpponentIndicator *pi;
 
     if (gGameMode != GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) {
-        t = TaskCreate(Task_801951C, sizeof(OpponentIndicator), 0x2001, 0,
-                       TaskDestructor_8019CC8);
+        t = TaskCreate(Task_801951C, sizeof(OpponentIndicator), 0x2001, 0, TaskDestructor_8019CC8);
     } else {
-        t = TaskCreate(Task_8019898, sizeof(OpponentIndicator), 0x2001, 0,
-                       TaskDestructor_8019CC8);
+        t = TaskCreate(Task_8019898, sizeof(OpponentIndicator), 0x2001, 0, TaskDestructor_8019CC8);
     }
 
     pi = TASK_DATA(t);
@@ -56,8 +54,7 @@ void CreateOpponentPositionIndicator(u8 sid)
     spr->animSpeed = SPRITE_ANIM_SPEED(1.0);
     spr->palId = sid;
     spr->hitboxes[0].index = -1;
-    spr->frameFlags = SPRITE_FLAG(19, 1) | SPRITE_FLAG(18, 1)
-        | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE | SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE;
+    spr->frameFlags = SPRITE_FLAG(19, 1) | SPRITE_FLAG(18, 1) | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE | SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE;
 
     spr->graphics.anim = SA2_ANIM_INDICATOR_SONIC;
     spr->variant = 0;
@@ -94,8 +91,7 @@ void CreateSelfPositionIndicator(void)
 }
 
 // (79.22%) https://decomp.me/scratch/SKNlg
-NONMATCH("asm/non_matching/game/multiplayer/indicators__Task_801951C.inc",
-         void Task_801951C(void))
+NONMATCH("asm/non_matching/game/multiplayer/indicators__Task_801951C.inc", void Task_801951C(void))
 {
     s32 opponentX, opponentY;
     s32 opponentDistSq;
@@ -168,8 +164,7 @@ NONMATCH("asm/non_matching/game/multiplayer/indicators__Task_801951C.inc",
     opponentDistSq = SQUARE(opponentX2) + SQUARE(opponentY2);
 
     if (opponentDistSq < 0x10000) {
-        spr->animSpeed
-            = opponentDistSq < 0x10000 ? SPRITE_ANIM_SPEED(1.5) : SPRITE_ANIM_SPEED(1.0);
+        spr->animSpeed = opponentDistSq < 0x10000 ? SPRITE_ANIM_SPEED(1.5) : SPRITE_ANIM_SPEED(1.0);
     } else {
         spr->animSpeed = SPRITE_ANIM_SPEED(1.0);
     }
@@ -236,8 +231,7 @@ NONMATCH("asm/non_matching/game/multiplayer/indicators__Task_801951C.inc",
             // _08019818
         } else {
             // _0801977C
-            s16 divRes = Div((SIN_24_8((r4 - (SIN_PERIOD / 2)) & ONE_CYCLE)) * 0x100,
-                             (COS_24_8((r4 - (SIN_PERIOD / 2)) & ONE_CYCLE)));
+            s16 divRes = Div((SIN_24_8((r4 - (SIN_PERIOD / 2)) & ONE_CYCLE)) * 0x100, (COS_24_8((r4 - (SIN_PERIOD / 2)) & ONE_CYCLE)));
             tfy = (DISPLAY_HEIGHT / 2) - ((divRes * 15) >> 5);
 
             if (opponentY2 > 0) {
diff --git a/src/game/multiplayer/mode_select.c b/src/game/multiplayer/mode_select.c
index 1de05c7d2..b115312dc 100644
--- a/src/game/multiplayer/mode_select.c
+++ b/src/game/multiplayer/mode_select.c
@@ -51,34 +51,20 @@ static void Task_FadeOutAndExitToTitleScreen(void);
 static void Task_ExitAndInitSelectedPakMode(void);
 
 static const TileInfo sMultiplayerModeSelectScreenText[] = {
-    TextElementAlt(4, LANG_DEFAULT, 1, 38, 1073),
-    TextElementAlt(4, LANG_DEFAULT, 2, 32, 1073),
-    TextElementAlt(4, LANG_DEFAULT, 3, 168, 1073),
-    TextElementAlt(4, LANG_DEFAULT, 4, 168, 1073),
-    TextElementAlt(4, LANG_JAPANESE, 1, 38, 1073),
-    TextElementAlt(4, LANG_JAPANESE, 2, 32, 1073),
-    TextElementAlt(4, LANG_JAPANESE, 3, 168, 1073),
-    TextElementAlt(4, LANG_JAPANESE, 4, 168, 1073),
-    TextElement(4, LANG_ENGLISH, 0, 36, 1094),
-    TextElement(4, LANG_ENGLISH, 1, 38, 1094),
-    TextElement(4, LANG_ENGLISH, 2, 168, 1094),
-    TextElement(4, LANG_ENGLISH, 3, 168, 1094),
-    TextElement(4, LANG_GERMAN, 0, 34, 1095),
-    TextElement(4, LANG_GERMAN, 1, 28, 1095),
-    TextElement(4, LANG_GERMAN, 2, 168, 1095),
-    TextElement(4, LANG_GERMAN, 3, 168, 1095),
-    TextElement(4, LANG_FRENCH, 0, 36, 1096),
-    TextElement(4, LANG_FRENCH, 1, 32, 1096),
-    TextElement(4, LANG_FRENCH, 2, 168, 1096),
-    TextElement(4, LANG_FRENCH, 3, 168, 1096),
-    TextElement(4, LANG_SPANISH, 0, 36, 1097),
-    TextElement(4, LANG_SPANISH, 1, 36, 1097),
-    TextElement(4, LANG_SPANISH, 2, 168, 1097),
-    TextElement(4, LANG_SPANISH, 3, 168, 1097),
-    TextElement(4, LANG_ITALIAN, 0, 36, 1098),
-    TextElement(4, LANG_ITALIAN, 1, 36, 1098),
-    TextElement(4, LANG_ITALIAN, 2, 168, 1098),
-    TextElement(4, LANG_ITALIAN, 3, 168, 1098),
+    TextElementAlt(4, LANG_DEFAULT, 1, 38, 1073),   TextElementAlt(4, LANG_DEFAULT, 2, 32, 1073),
+    TextElementAlt(4, LANG_DEFAULT, 3, 168, 1073),  TextElementAlt(4, LANG_DEFAULT, 4, 168, 1073),
+    TextElementAlt(4, LANG_JAPANESE, 1, 38, 1073),  TextElementAlt(4, LANG_JAPANESE, 2, 32, 1073),
+    TextElementAlt(4, LANG_JAPANESE, 3, 168, 1073), TextElementAlt(4, LANG_JAPANESE, 4, 168, 1073),
+    TextElement(4, LANG_ENGLISH, 0, 36, 1094),      TextElement(4, LANG_ENGLISH, 1, 38, 1094),
+    TextElement(4, LANG_ENGLISH, 2, 168, 1094),     TextElement(4, LANG_ENGLISH, 3, 168, 1094),
+    TextElement(4, LANG_GERMAN, 0, 34, 1095),       TextElement(4, LANG_GERMAN, 1, 28, 1095),
+    TextElement(4, LANG_GERMAN, 2, 168, 1095),      TextElement(4, LANG_GERMAN, 3, 168, 1095),
+    TextElement(4, LANG_FRENCH, 0, 36, 1096),       TextElement(4, LANG_FRENCH, 1, 32, 1096),
+    TextElement(4, LANG_FRENCH, 2, 168, 1096),      TextElement(4, LANG_FRENCH, 3, 168, 1096),
+    TextElement(4, LANG_SPANISH, 0, 36, 1097),      TextElement(4, LANG_SPANISH, 1, 36, 1097),
+    TextElement(4, LANG_SPANISH, 2, 168, 1097),     TextElement(4, LANG_SPANISH, 3, 168, 1097),
+    TextElement(4, LANG_ITALIAN, 0, 36, 1098),      TextElement(4, LANG_ITALIAN, 1, 36, 1098),
+    TextElement(4, LANG_ITALIAN, 2, 168, 1098),     TextElement(4, LANG_ITALIAN, 3, 168, 1098),
 };
 
 void CreateMultiplayerModeSelectScreen(void)
@@ -102,8 +88,7 @@ void CreateMultiplayerModeSelectScreen(void)
     gBgScrollRegs[1][0] = 0;
     gBgScrollRegs[1][1] = 0;
 
-    t = TaskCreate(Task_FadeInAndStartEnterAnim,
-                   sizeof(struct MultiplayerModeSelectScreen), 0x2000, 0,
+    t = TaskCreate(Task_FadeInAndStartEnterAnim, sizeof(struct MultiplayerModeSelectScreen), 0x2000, 0,
                    MultiplayerModeSelectScreenOnDestroy);
     modeScreen = TASK_DATA(t);
     modeScreen->animFrame = 0;
diff --git a/src/game/multiplayer/mp_player.c b/src/game/multiplayer/mp_player.c
index ef3b15366..43e12cd59 100644
--- a/src/game/multiplayer/mp_player.c
+++ b/src/game/multiplayer/mp_player.c
@@ -46,8 +46,7 @@ void CreateMultiplayerPlayer(u8 id)
 {
     u16 *p;
     Sprite *s;
-    struct Task *t = TaskCreate(Task_CreateMultiplayerPlayer, sizeof(MultiplayerPlayer),
-                                0x2000, 0, TaskDestructor_MultiplayerPlayer);
+    struct Task *t = TaskCreate(Task_CreateMultiplayerPlayer, sizeof(MultiplayerPlayer), 0x2000, 0, TaskDestructor_MultiplayerPlayer);
     MultiplayerPlayer *mpp = TASK_DATA(t);
     mpp->unk56 = id;
     mpp->unk54 = 0x40;
@@ -134,8 +133,7 @@ void CreateMultiplayerPlayer(u8 id)
 }
 
 // around 70%: https://decomp.me/scratch/KNjEN
-NONMATCH("asm/non_matching/game/multiplayer/mp_player__Task_CreateMultiplayerPlayer.inc",
-         void Task_CreateMultiplayerPlayer())
+NONMATCH("asm/non_matching/game/multiplayer/mp_player__Task_CreateMultiplayerPlayer.inc", void Task_CreateMultiplayerPlayer())
 {
     MultiplayerPlayer *mpp = TASK_DATA(gCurTask);
     Sprite *s = &mpp->s;
@@ -207,8 +205,7 @@ NONMATCH("asm/non_matching/game/multiplayer/mp_player__Task_CreateMultiplayerPla
                 mpp->unk64 = ((recv->pat4.unk8) & 0x600) >> 9;
             } else {
                 if (SIO_MULTI_CNT->id != mpp->unk64) {
-                    MultiplayerPlayer *mpp2
-                        = TASK_DATA(gMultiplayerPlayerTasks[mpp->unk64]);
+                    MultiplayerPlayer *mpp2 = TASK_DATA(gMultiplayerPlayerTasks[mpp->unk64]);
                     if (SIO_MULTI_CNT->id == mpp2->unk64) {
                         mpp2->unk64 = SIO_MULTI_CNT->id;
                         gPlayer.moveState &= ~MOVESTATE_8;
@@ -332,8 +329,7 @@ NONMATCH("asm/non_matching/game/multiplayer/mp_player__Task_CreateMultiplayerPla
             {
                 MultiplayerPlayer *mpp2 = TASK_DATA(gMultiplayerPlayerTasks[i]);
                 if ((gMultiplayerConnections & (0x10 << (i))) >> ((i + 4))
-                        != (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id)))
-                            >> (SIO_MULTI_CNT->id + 4)
+                        != (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id))) >> (SIO_MULTI_CNT->id + 4)
                     && !(mpp2->unk54 & 0x100)) {
 
                     someBool = FALSE;
@@ -349,8 +345,7 @@ NONMATCH("asm/non_matching/game/multiplayer/mp_player__Task_CreateMultiplayerPla
 
     if (!(gStageFlags & 1) && !(mpp->unk54 & 0x80000004)) {
         if (!(gPlayer.itemEffect & 0x80)) {
-            if (!(mpp->unk5C & 1) && (gPlayer.timerInvulnerability == 0)
-                && !(gPlayer.moveState & (MOVESTATE_400000 | MOVESTATE_DEAD))) {
+            if (!(mpp->unk5C & 1) && (gPlayer.timerInvulnerability == 0) && !(gPlayer.moveState & (MOVESTATE_400000 | MOVESTATE_DEAD))) {
                 if (gGameMode != GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) {
                     if (mpp->unk56 != SIO_MULTI_CNT->id) {
                         switch (gMultiplayerCharacters[mpp->unk56]) {
@@ -378,14 +373,11 @@ NONMATCH("asm/non_matching/game/multiplayer/mp_player__Task_CreateMultiplayerPla
             }
         }
     } else {
-        if ((gPlayer.itemEffect & PLAYER_ITEM_EFFECT__80) || (mpp->unk57 & 0x80)
-            || gPlayer.timerInvincibility == 0 || !PLAYER_IS_ALIVE
+        if ((gPlayer.itemEffect & PLAYER_ITEM_EFFECT__80) || (mpp->unk57 & 0x80) || gPlayer.timerInvincibility == 0 || !PLAYER_IS_ALIVE
             || gUnknown_030054B4[mpp->unk56] != -1) {
             if (gGameMode != GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) {
-                if (mpp->unk56 == SIO_MULTI_CNT->id
-                    && gMultiplayerCharacters[mpp->unk56] == CHARACTER_TAILS
-                    && gMultiplayerCharacters[mpp->unk56] == CHARACTER_KNUCKLES
-                    && mpp->unk5C & 4) {
+                if (mpp->unk56 == SIO_MULTI_CNT->id && gMultiplayerCharacters[mpp->unk56] == CHARACTER_TAILS
+                    && gMultiplayerCharacters[mpp->unk56] == CHARACTER_KNUCKLES && mpp->unk5C & 4) {
                     mpp->unk5C &= ~0x6;
                     if (!(gPlayer.itemEffect & PLAYER_ITEM_EFFECT__80)) {
                         gPlayer.moveState &= ~MOVESTATE_400000;
@@ -443,8 +435,7 @@ NONMATCH("asm/non_matching/game/multiplayer/mp_player__Task_CreateMultiplayerPla
     s->frameFlags |= (mpp->unk54 & 0x30) << 8;
 
     if (!(mpp->unk54 & 0x40)
-        && ((gStageTime & 2 || mpp->unk57 & 0x20 || mpp->unk5C & 1
-             || gUnknown_030054B4[mpp->unk56] != -1)
+        && ((gStageTime & 2 || mpp->unk57 & 0x20 || mpp->unk5C & 1 || gUnknown_030054B4[mpp->unk56] != -1)
             || (mpp->unk60 == 0 && !(mpp->unk54 & 4) && !(mpp->unk5C & 2)))) {
         s->oamFlags = SPRITE_OAM_ORDER(16);
         if (mpp->unk54 & 0x80) {
@@ -454,10 +445,8 @@ NONMATCH("asm/non_matching/game/multiplayer/mp_player__Task_CreateMultiplayerPla
         s->frameFlags &= ~(0x100 | 0x80);
         if (mpp->unk57 & 0x20
             && (gGameMode != GAME_MODE_TEAM_PLAY
-                || ((gMultiplayerConnections & (0x10 << (mpp->unk56)))
-                        >> ((mpp->unk56 + 4))
-                    != (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id)))
-                        >> (SIO_MULTI_CNT->id + 4)))
+                || ((gMultiplayerConnections & (0x10 << (mpp->unk56))) >> ((mpp->unk56 + 4))
+                    != (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id))) >> (SIO_MULTI_CNT->id + 4)))
             && mpp->unk60 == 0 && mpp->unk56 != SIO_MULTI_CNT->id) {
             s->frameFlags |= 0x100;
             gDispCnt |= 0x8000;
@@ -513,8 +502,7 @@ void sub_8016D20(void)
 
     if (gGameMode != GAME_MODE_TEAM_PLAY
         || ((gMultiplayerConnections & (0x10 << (mpp->unk56))) >> ((mpp->unk56 + 4))
-            != (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id)))
-                >> (SIO_MULTI_CNT->id + 4))) {
+            != (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id))) >> (SIO_MULTI_CNT->id + 4))) {
         if (!sub_8018300()) {
             return;
         }
@@ -535,8 +523,7 @@ void sub_8016D20(void)
                 mpp->unk4C = 0;
             }
 
-            if (s->graphics.anim
-                != SA2_ANIM_CHAR(SA2_CHAR_ANIM_SPIN_DASH, CHARACTER_SONIC)) {
+            if (s->graphics.anim != SA2_ANIM_CHAR(SA2_CHAR_ANIM_SPIN_DASH, CHARACTER_SONIC)) {
                 return;
             }
 
@@ -569,19 +556,15 @@ void sub_8016D20(void)
             }
             mpp->unk60 = 30;
         } else {
-            if (HITBOX_IS_ACTIVE(sprPlayer->hitboxes[1])
-                && HITBOX_IS_ACTIVE(s->hitboxes[1])) {
+            if (HITBOX_IS_ACTIVE(sprPlayer->hitboxes[1]) && HITBOX_IS_ACTIVE(s->hitboxes[1])) {
                 return;
             }
 
-            if (gPlayer.unk61 != 0
-                && (gPlayer.character == CHARACTER_TAILS
-                    || gPlayer.character == CHARACTER_KNUCKLES)) {
+            if (gPlayer.unk61 != 0 && (gPlayer.character == CHARACTER_TAILS || gPlayer.character == CHARACTER_KNUCKLES)) {
                 return;
             }
 
-            val = sub_800D0A0(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68,
-                              mpp->unk54 >> 7 & 1, 1);
+            val = sub_800D0A0(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68, mpp->unk54 >> 7 & 1, 1);
 
             if (mpp->unk4C & MOVESTATE_20 && !(val & MOVESTATE_20)) {
                 gPlayer.moveState &= ~MOVESTATE_20;
@@ -597,8 +580,7 @@ void sub_8016D20(void)
                 return;
             }
 
-            if (s->graphics.anim
-                != SA2_ANIM_CHAR(SA2_CHAR_ANIM_SPIN_DASH, CHARACTER_SONIC)) {
+            if (s->graphics.anim != SA2_ANIM_CHAR(SA2_CHAR_ANIM_SPIN_DASH, CHARACTER_SONIC)) {
                 return;
             }
             gPlayer.unk64 = SA2_CHAR_ANIM_WALK;
@@ -641,8 +623,7 @@ void sub_8016D20(void)
             return;
         }
 
-        val = sub_800D0A0(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68,
-                          mpp->unk54 >> 7 & 1, 0);
+        val = sub_800D0A0(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68, mpp->unk54 >> 7 & 1, 0);
 
         if ((mpp->unk4C & MOVESTATE_20) && !(val & MOVESTATE_20)) {
             gPlayer.moveState &= ~MOVESTATE_20;
@@ -653,9 +634,7 @@ void sub_8016D20(void)
     }
 }
 
-#define SOME_INVERTED_GRAVITY_MACRO                                                     \
-    (!GRAVITY_IS_INVERTED != !(mpp->unk54 & 8)                                          \
-     || !(mpp->unk5C & 0x100) != !GRAVITY_IS_INVERTED)
+#define SOME_INVERTED_GRAVITY_MACRO (!GRAVITY_IS_INVERTED != !(mpp->unk54 & 8) || !(mpp->unk5C & 0x100) != !GRAVITY_IS_INVERTED)
 
 void sub_801707C(void)
 {
@@ -681,8 +660,7 @@ void sub_801707C(void)
 
     if (gGameMode != GAME_MODE_TEAM_PLAY
         || ((gMultiplayerConnections & (0x10 << (mpp->unk56))) >> ((mpp->unk56 + 4))
-            != (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id)))
-                >> (SIO_MULTI_CNT->id + 4))) {
+            != (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id))) >> (SIO_MULTI_CNT->id + 4))) {
         if (sub_8018300() == 0) {
             return;
         }
@@ -721,15 +699,13 @@ void sub_801707C(void)
 
         if (s->graphics.anim != SA2_ANIM_CHAR(SA2_CHAR_ANIM_22, CHARACTER_TAILS)
             && s->graphics.anim != SA2_ANIM_CHAR(SA2_CHAR_ANIM_21, CHARACTER_TAILS)
-            && s->graphics.anim != SA2_ANIM_CHAR(SA2_CHAR_ANIM_20, CHARACTER_TAILS)
-            && HITBOX_IS_ACTIVE(playerSprite->hitboxes[1])
+            && s->graphics.anim != SA2_ANIM_CHAR(SA2_CHAR_ANIM_20, CHARACTER_TAILS) && HITBOX_IS_ACTIVE(playerSprite->hitboxes[1])
             && HITBOX_IS_ACTIVE(s->hitboxes[1])) {
             return;
         }
 
         someOtherBool = (gPlayer.moveState >> 1) & 1;
-        val = sub_800D0A0(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68,
-                          mpp->unk54 >> 7 & 1, 1);
+        val = sub_800D0A0(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68, mpp->unk54 >> 7 & 1, 1);
 
         if ((mpp->unk4C & 0x20) && !(val & 0x20)) {
             gPlayer.moveState &= ~MOVESTATE_20;
@@ -744,22 +720,17 @@ void sub_801707C(void)
         if (!(mpp->unk5C & 4)) {
             if ((someOtherBool || someBool)
                 && (val & 0x10028
-                    && (s->graphics.anim
-                            == SA2_ANIM_CHAR(SA2_CHAR_ANIM_22, CHARACTER_TAILS)
-                        || s->graphics.anim
-                            == SA2_ANIM_CHAR(SA2_CHAR_ANIM_21, CHARACTER_TAILS)
-                        || s->graphics.anim
-                            == SA2_ANIM_CHAR(SA2_CHAR_ANIM_20, CHARACTER_TAILS))
+                    && (s->graphics.anim == SA2_ANIM_CHAR(SA2_CHAR_ANIM_22, CHARACTER_TAILS)
+                        || s->graphics.anim == SA2_ANIM_CHAR(SA2_CHAR_ANIM_21, CHARACTER_TAILS)
+                        || s->graphics.anim == SA2_ANIM_CHAR(SA2_CHAR_ANIM_20, CHARACTER_TAILS))
                     && (!!GRAVITY_IS_INVERTED != !(mpp->unk54 & 8)))) {
 
                 s32 y;
                 if (!GRAVITY_IS_INVERTED) {
-                    result = sub_801E4E4(MAX(I(gPlayer.y), mpp->pos.y) + gPlayer.unk17,
-                                         I(gPlayer.x), gPlayer.unk38, 8, &unusedByte,
+                    result = sub_801E4E4(MAX(I(gPlayer.y), mpp->pos.y) + gPlayer.unk17, I(gPlayer.x), gPlayer.unk38, 8, &unusedByte,
                                          sub_801EE64);
                 } else {
-                    result = sub_801E4E4(MIN(I(gPlayer.y), mpp->pos.y) - gPlayer.unk17,
-                                         I(gPlayer.x), gPlayer.unk38, -8, &unusedByte,
+                    result = sub_801E4E4(MIN(I(gPlayer.y), mpp->pos.y) - gPlayer.unk17, I(gPlayer.x), gPlayer.unk38, -8, &unusedByte,
                                          sub_801EE64);
                 }
 
@@ -807,8 +778,7 @@ void sub_801707C(void)
             if ((s->graphics.anim != SA2_ANIM_CHAR(SA2_CHAR_ANIM_22, CHARACTER_TAILS)
                  && s->graphics.anim != SA2_ANIM_CHAR(SA2_CHAR_ANIM_21, CHARACTER_TAILS)
                  && s->graphics.anim != SA2_ANIM_CHAR(SA2_CHAR_ANIM_20, CHARACTER_TAILS))
-                || I(gPlayer.x) <= gCamera.minX || I(gPlayer.x) >= gCamera.maxX
-                || SOME_INVERTED_GRAVITY_MACRO || moveStateVal != 0) {
+                || I(gPlayer.x) <= gCamera.minX || I(gPlayer.x) >= gCamera.maxX || SOME_INVERTED_GRAVITY_MACRO || moveStateVal != 0) {
                 gPlayer.moveState &= ~MOVESTATE_400000;
                 mpp->unk5C &= ~4;
                 gPlayer.unk64 = SA2_CHAR_ANIM_IDLE;
@@ -829,8 +799,7 @@ void sub_801707C(void)
                     // TODO: potential macro
                     if (!invertedGravity) {
                         y = Q(mpp->pos.y + (s->hitboxes[0].bottom) + 17);
-                        result = sub_801E4E4(I(gPlayer.y) + gPlayer.unk17, I(gPlayer.x),
-                                             gPlayer.unk38, 8, &unusedByte, sub_801EE64);
+                        result = sub_801E4E4(I(gPlayer.y) + gPlayer.unk17, I(gPlayer.x), gPlayer.unk38, 8, &unusedByte, sub_801EE64);
 
                         if (result < 0) {
                             y += Q(result);
@@ -841,9 +810,7 @@ void sub_801707C(void)
 
                     } else {
                         y = Q(mpp->pos.y + (s->hitboxes[0].top) - 17);
-                        result
-                            = sub_801E4E4(I(gPlayer.y) - gPlayer.unk17, I(gPlayer.x),
-                                          gPlayer.unk38, -8, &unusedByte, sub_801EE64);
+                        result = sub_801E4E4(I(gPlayer.y) - gPlayer.unk17, I(gPlayer.x), gPlayer.unk38, -8, &unusedByte, sub_801EE64);
 
                         if (result < 0) {
                             y -= Q(result);
@@ -901,8 +868,7 @@ void sub_801707C(void)
             return;
         }
 
-        val = sub_800D0A0(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68,
-                          mpp->unk54 >> 7 & 1, 0);
+        val = sub_800D0A0(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68, mpp->unk54 >> 7 & 1, 0);
 
         if ((mpp->unk4C & MOVESTATE_20) && !(val & MOVESTATE_20)) {
             gPlayer.moveState &= ~MOVESTATE_20;
@@ -932,8 +898,7 @@ void sub_8017670(void)
 
     if (gGameMode != GAME_MODE_TEAM_PLAY
         || ((gMultiplayerConnections & (0x10 << (mpp->unk56))) >> ((mpp->unk56 + 4))
-            != (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id)))
-                >> (SIO_MULTI_CNT->id + 4))) {
+            != (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id))) >> (SIO_MULTI_CNT->id + 4))) {
         if (!sub_8018300()) {
             return;
         }
@@ -966,21 +931,16 @@ void sub_8017670(void)
             }
 
             if ((s->graphics.anim != SA2_ANIM_CHAR(SA2_CHAR_ANIM_19, CHARACTER_KNUCKLES)
-                 && s->graphics.anim
-                     != SA2_ANIM_CHAR(SA2_CHAR_ANIM_20, CHARACTER_KNUCKLES)
-                 && s->graphics.anim
-                     != SA2_ANIM_CHAR(SA2_CHAR_ANIM_21, CHARACTER_KNUCKLES))
-                && HITBOX_IS_ACTIVE(playerSprite->hitboxes[1])
-                && HITBOX_IS_ACTIVE(s->hitboxes[1])) {
+                 && s->graphics.anim != SA2_ANIM_CHAR(SA2_CHAR_ANIM_20, CHARACTER_KNUCKLES)
+                 && s->graphics.anim != SA2_ANIM_CHAR(SA2_CHAR_ANIM_21, CHARACTER_KNUCKLES))
+                && HITBOX_IS_ACTIVE(playerSprite->hitboxes[1]) && HITBOX_IS_ACTIVE(s->hitboxes[1])) {
                 return;
             }
         }
 
         {
-            s8 rect[4]
-                = { -gPlayer.unk16, -gPlayer.unk17, gPlayer.unk16, gPlayer.unk17 };
-            val = sub_800D0A0(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68,
-                              mpp->unk54 >> 7 & 1, 1);
+            s8 rect[4] = { -gPlayer.unk16, -gPlayer.unk17, gPlayer.unk16, gPlayer.unk17 };
+            val = sub_800D0A0(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68, mpp->unk54 >> 7 & 1, 1);
 
             if (mpp->unk4C & 0x20 && !(val & 0x20)) {
                 gPlayer.moveState &= ~MOVESTATE_20;
@@ -992,19 +952,14 @@ void sub_8017670(void)
                 mpp->unk60 = 30;
             }
 
-            if (CheckRectCollision_SpritePlayer(s, mpp->pos.x, mpp->pos.y, &gPlayer,
-                                                (struct Rect8 *)rect)) {
+            if (CheckRectCollision_SpritePlayer(s, mpp->pos.x, mpp->pos.y, &gPlayer, (struct Rect8 *)rect)) {
                 u8 temp = ((mpp->unk54 >> 7) & 1);
                 if ((temp == gPlayer.unk38)
-                    && (s->graphics.anim
-                            == SA2_ANIM_CHAR(SA2_CHAR_ANIM_19, CHARACTER_KNUCKLES)
-                        || s->graphics.anim
-                            == SA2_ANIM_CHAR(SA2_CHAR_ANIM_20, CHARACTER_KNUCKLES)
-                        || s->graphics.anim
-                            == SA2_ANIM_CHAR(SA2_CHAR_ANIM_21, CHARACTER_KNUCKLES))
+                    && (s->graphics.anim == SA2_ANIM_CHAR(SA2_CHAR_ANIM_19, CHARACTER_KNUCKLES)
+                        || s->graphics.anim == SA2_ANIM_CHAR(SA2_CHAR_ANIM_20, CHARACTER_KNUCKLES)
+                        || s->graphics.anim == SA2_ANIM_CHAR(SA2_CHAR_ANIM_21, CHARACTER_KNUCKLES))
                     && !GRAVITY_IS_INVERTED == !(mpp->unk54 & 8)) {
-                    if ((!GRAVITY_IS_INVERTED && I(gPlayer.y) > mpp->pos.y)
-                        || (GRAVITY_IS_INVERTED && I(gPlayer.y) < mpp->pos.y)) {
+                    if ((!GRAVITY_IS_INVERTED && I(gPlayer.y) > mpp->pos.y) || (GRAVITY_IS_INVERTED && I(gPlayer.y) < mpp->pos.y)) {
                         gPlayer.moveState |= MOVESTATE_400000;
                         sub_8023B5C(&gPlayer, 14);
                         gPlayer.unk16 = 6;
@@ -1049,12 +1004,9 @@ void sub_8017670(void)
             }
 
             if ((s->graphics.anim != SA2_ANIM_CHAR(SA2_CHAR_ANIM_19, CHARACTER_KNUCKLES)
-                 && s->graphics.anim
-                     != SA2_ANIM_CHAR(SA2_CHAR_ANIM_20, CHARACTER_KNUCKLES)
-                 && s->graphics.anim
-                     != SA2_ANIM_CHAR(SA2_CHAR_ANIM_21, CHARACTER_KNUCKLES))
-                || I(gPlayer.x) <= gCamera.minX || I(gPlayer.x) >= gCamera.maxX
-                || SOME_INVERTED_GRAVITY_MACRO || moveStateVal != 0) {
+                 && s->graphics.anim != SA2_ANIM_CHAR(SA2_CHAR_ANIM_20, CHARACTER_KNUCKLES)
+                 && s->graphics.anim != SA2_ANIM_CHAR(SA2_CHAR_ANIM_21, CHARACTER_KNUCKLES))
+                || I(gPlayer.x) <= gCamera.minX || I(gPlayer.x) >= gCamera.maxX || SOME_INVERTED_GRAVITY_MACRO || moveStateVal != 0) {
                 gPlayer.moveState &= ~MOVESTATE_400000;
                 mpp->unk5C &= ~4;
                 gPlayer.unk64 = SA2_CHAR_ANIM_IDLE;
@@ -1074,9 +1026,7 @@ void sub_8017670(void)
                 // TODO: potential macro
                 if (!(gravityInverted)) {
                     y = QS((mpp->pos.y + (s->hitboxes[0].top)) - rect[3]);
-                    result = sub_801F100((mpp->pos.y + (s->hitboxes[0].top) - rect[3])
-                                             - playerUnk17,
-                                         I(x), gPlayer.unk38, -8, sub_801EC3C);
+                    result = sub_801F100((mpp->pos.y + (s->hitboxes[0].top) - rect[3]) - playerUnk17, I(x), gPlayer.unk38, -8, sub_801EC3C);
 
                     if (result < 0) {
                         y -= QS(result);
@@ -1086,9 +1036,8 @@ void sub_8017670(void)
                     }
                 } else {
                     y = QS(mpp->pos.y + (s->hitboxes[0].bottom) + rect[3]);
-                    result = sub_801F100(
-                        ((mpp->pos.y + (s->hitboxes[0].bottom) + rect[3]) + playerUnk17),
-                        I(x), gPlayer.unk38, 8, sub_801EC3C);
+                    result = sub_801F100(((mpp->pos.y + (s->hitboxes[0].bottom) + rect[3]) + playerUnk17), I(x), gPlayer.unk38, 8,
+                                         sub_801EC3C);
 
                     if (result < 0) {
                         y += QS(result);
@@ -1140,8 +1089,7 @@ void sub_8017670(void)
             return;
         }
 
-        val = sub_800D0A0(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68,
-                          mpp->unk54 >> 7 & 1, 0);
+        val = sub_800D0A0(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68, mpp->unk54 >> 7 & 1, 0);
 
         if ((mpp->unk4C & MOVESTATE_20) && !(val & MOVESTATE_20)) {
             gPlayer.moveState &= ~MOVESTATE_20;
@@ -1163,8 +1111,7 @@ void sub_8017C28(void)
 
     if (gGameMode != GAME_MODE_TEAM_PLAY
         || ((gMultiplayerConnections & (0x10 << (mpp->unk56))) >> ((mpp->unk56 + 4))
-            != (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id)))
-                >> (SIO_MULTI_CNT->id + 4))) {
+            != (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id))) >> (SIO_MULTI_CNT->id + 4))) {
         if (!sub_8018300()) {
             return;
         }
@@ -1180,14 +1127,11 @@ void sub_8017C28(void)
 
     if (mpp->unk60 == 0) {
         if (!HITBOX_IS_ACTIVE(s->hitboxes[1])) {
-            if (gPlayer.unk61 != 0
-                && (gPlayer.character == CHARACTER_TAILS
-                    || gPlayer.character == CHARACTER_KNUCKLES)) {
+            if (gPlayer.unk61 != 0 && (gPlayer.character == CHARACTER_TAILS || gPlayer.character == CHARACTER_KNUCKLES)) {
                 return;
             }
 
-            val = sub_800D0A0(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68,
-                              mpp->unk54 >> 7 & 1, 1);
+            val = sub_800D0A0(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68, mpp->unk54 >> 7 & 1, 1);
 
             if (mpp->unk4C & 0x20 && !(val & 0x20)) {
                 gPlayer.moveState &= ~MOVESTATE_20;
@@ -1195,15 +1139,11 @@ void sub_8017C28(void)
             mpp->unk4C = val;
             return;
         } else {
-            if (gPlayer.unk61 != 0
-                && (gPlayer.character == CHARACTER_TAILS
-                    || gPlayer.character == CHARACTER_KNUCKLES)) {
+            if (gPlayer.unk61 != 0 && (gPlayer.character == CHARACTER_TAILS || gPlayer.character == CHARACTER_KNUCKLES)) {
                 return;
             }
-            val = sub_800DA4C(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68,
-                              (mpp->unk54 >> 7) & 1);
-            if ((val & 2) && !(gPlayer.moveState & MOVESTATE_IN_AIR)
-                && gPlayer.rotation == 0) {
+            val = sub_800DA4C(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68, (mpp->unk54 >> 7) & 1);
+            if ((val & 2) && !(gPlayer.moveState & MOVESTATE_IN_AIR) && gPlayer.rotation == 0) {
                 if (s->graphics.anim == SA2_ANIM_CHAR(SA2_CHAR_ANIM_14, CHARACTER_AMY)) {
                     LaunchPlayer(-Q_8_8(7.5));
 #ifndef NON_MATCHING
@@ -1247,8 +1187,7 @@ void sub_8017C28(void)
                 mpp->unk60 = 30;
                 return;
             } else {
-                val = sub_800D0A0(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68,
-                                  mpp->unk54 >> 7 & 1, 1);
+                val = sub_800D0A0(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68, mpp->unk54 >> 7 & 1, 1);
 
                 if (mpp->unk4C & 0x20 && !(val & 0x20)) {
                     gPlayer.moveState &= ~MOVESTATE_20;
@@ -1270,8 +1209,7 @@ void sub_8017C28(void)
             return;
         }
 
-        val = sub_800D0A0(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68,
-                          mpp->unk54 >> 7 & 1, 0);
+        val = sub_800D0A0(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68, mpp->unk54 >> 7 & 1, 0);
 
         if (mpp->unk4C & 0x20 && !(val & 0x20)) {
             gPlayer.moveState &= ~MOVESTATE_20;
@@ -1309,8 +1247,7 @@ void sub_8017F34(void)
     }
 
     if (mpp->unk48 < 0) {
-        result = sub_801F100(I(gPlayer.y) - gPlayer.unk17, I(gPlayer.x), gPlayer.unk38,
-                             -8, sub_801EC3C);
+        result = sub_801F100(I(gPlayer.y) - gPlayer.unk17, I(gPlayer.x), gPlayer.unk38, -8, sub_801EC3C);
         if (result < 0) {
             gPlayer.y -= Q(result);
             gPlayer.moveState &= ~MOVESTATE_8;
@@ -1318,8 +1255,7 @@ void sub_8017F34(void)
             mpp->unk60 = 30;
         }
     } else if (mpp->unk48 > 0) {
-        result = sub_801F100(I(gPlayer.y) + gPlayer.unk17, I(gPlayer.x), gPlayer.unk38,
-                             8, sub_801EC3C);
+        result = sub_801F100(I(gPlayer.y) + gPlayer.unk17, I(gPlayer.x), gPlayer.unk38, 8, sub_801EC3C);
         if (result < 0) {
             gPlayer.y += Q(result);
             gPlayer.moveState &= ~MOVESTATE_8;
@@ -1329,15 +1265,13 @@ void sub_8017F34(void)
     }
 
     if (mpp->unk44 < 0) {
-        result = sub_801F100(I(gPlayer.x) - gPlayer.unk16, I(gPlayer.y), gPlayer.unk38,
-                             -8, sub_801EB44);
+        result = sub_801F100(I(gPlayer.x) - gPlayer.unk16, I(gPlayer.y), gPlayer.unk38, -8, sub_801EB44);
         if (result < 0) {
             gPlayer.x -= Q(result);
         }
         return;
     } else if (mpp->unk44 > 0) {
-        result = sub_801F100(I(gPlayer.x) + gPlayer.unk16, I(gPlayer.y), gPlayer.unk38,
-                             8, sub_801EB44);
+        result = sub_801F100(I(gPlayer.x) + gPlayer.unk16, I(gPlayer.y), gPlayer.unk38, 8, sub_801EB44);
         if (result < 0) {
             gPlayer.x += Q(result);
         }
@@ -1377,8 +1311,7 @@ bool32 sub_80181E0(void)
     u32 val;
 
     if (HITBOX_IS_ACTIVE(sprPlayer->hitboxes[1]) && HITBOX_IS_ACTIVE(s->hitboxes[1])) {
-        val = sub_800DA4C(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68,
-                          (mpp->unk54 >> 7) & 1);
+        val = sub_800DA4C(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68, (mpp->unk54 >> 7) & 1);
 
         if ((val & 1)) {
             if (gPlayer.unk61 == 0 && (val & 0x20000)) {
@@ -1419,15 +1352,12 @@ bool32 sub_8018300(void)
     s = &mpp->s;
 
     if (mpp->unk60 == 0) {
-        u32 val2 = sub_800DA4C(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68,
-                               (mpp->unk54 >> 7) & 1);
+        u32 val2 = sub_800DA4C(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68, (mpp->unk54 >> 7) & 1);
         if (gGameMode == GAME_MODE_MULTI_PLAYER_COLLECT_RINGS && !(val2 & 3)) {
             if (mpp->pos.x > 960) {
-                val2 = sub_800DA4C(s, mpp->pos.x - 1440, mpp->pos.y - 864, mpp->unk66,
-                                   mpp->unk68, (mpp->unk54 >> 7) & 1);
+                val2 = sub_800DA4C(s, mpp->pos.x - 1440, mpp->pos.y - 864, mpp->unk66, mpp->unk68, (mpp->unk54 >> 7) & 1);
             } else {
-                val2 = sub_800DA4C(s, mpp->pos.x + 1440, mpp->pos.y + 864, mpp->unk66,
-                                   mpp->unk68, (mpp->unk54 >> 7) & 1);
+                val2 = sub_800DA4C(s, mpp->pos.x + 1440, mpp->pos.y + 864, mpp->unk66, mpp->unk68, (mpp->unk54 >> 7) & 1);
             }
         }
 
@@ -1474,25 +1404,21 @@ bool32 sub_8018300(void)
             return TRUE;
         }
 
-        if (!HITBOX_IS_ACTIVE(sprPlayer->hitboxes[1])
-            && !HITBOX_IS_ACTIVE(s->hitboxes[1])) {
+        if (!HITBOX_IS_ACTIVE(sprPlayer->hitboxes[1]) && !HITBOX_IS_ACTIVE(s->hitboxes[1])) {
             u32 existingMoveState = gPlayer.moveState;
             Sprite *existingS = gPlayer.unk3C;
             s16 x, y;
 
-            val = sub_800D0A0(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68,
-                              (mpp->unk54 >> 7) & 1, val2 & 2);
+            val = sub_800D0A0(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68, (mpp->unk54 >> 7) & 1, val2 & 2);
 
             if (gGameMode == GAME_MODE_MULTI_PLAYER_COLLECT_RINGS && val == 0) {
                 gPlayer.moveState = existingMoveState;
                 gPlayer.unk3C = existingS;
 
                 if (mpp->pos.x > 960) {
-                    val = sub_800D0A0(s, mpp->pos.x - 1440, mpp->pos.y - 864, mpp->unk66,
-                                      mpp->unk68, (mpp->unk54 >> 7) & 1, val);
+                    val = sub_800D0A0(s, mpp->pos.x - 1440, mpp->pos.y - 864, mpp->unk66, mpp->unk68, (mpp->unk54 >> 7) & 1, val);
                 } else {
-                    val = sub_800D0A0(s, mpp->pos.x + 1440, mpp->pos.y + 864, mpp->unk66,
-                                      mpp->unk68, (mpp->unk54 >> 7) & 1, val);
+                    val = sub_800D0A0(s, mpp->pos.x + 1440, mpp->pos.y + 864, mpp->unk66, mpp->unk68, (mpp->unk54 >> 7) & 1, val);
                 }
             }
 
@@ -1526,16 +1452,13 @@ bool32 sub_8018300(void)
         return FALSE;
     }
 
-    val = sub_800D0A0(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68,
-                      mpp->unk54 >> 7 & 1, 0);
+    val = sub_800D0A0(s, mpp->pos.x, mpp->pos.y, mpp->unk66, mpp->unk68, mpp->unk54 >> 7 & 1, 0);
 
     if (gGameMode == GAME_MODE_MULTI_PLAYER_COLLECT_RINGS && val == 0) {
         if (mpp->pos.x > 960) {
-            val = sub_800D0A0(s, mpp->pos.x - 1440, mpp->pos.y - 864, mpp->unk66,
-                              mpp->unk68, (mpp->unk54 >> 7) & 1, val);
+            val = sub_800D0A0(s, mpp->pos.x - 1440, mpp->pos.y - 864, mpp->unk66, mpp->unk68, (mpp->unk54 >> 7) & 1, val);
         } else {
-            val = sub_800D0A0(s, mpp->pos.x + 1440, mpp->pos.y + 864, mpp->unk66,
-                              mpp->unk68, (mpp->unk54 >> 7) & 1, val);
+            val = sub_800D0A0(s, mpp->pos.x + 1440, mpp->pos.y + 864, mpp->unk66, mpp->unk68, (mpp->unk54 >> 7) & 1, val);
         }
     }
 
diff --git a/src/game/multiplayer/multipak_connection.c b/src/game/multiplayer/multipak_connection.c
index af2de5317..5540f783c 100644
--- a/src/game/multiplayer/multipak_connection.c
+++ b/src/game/multiplayer/multipak_connection.c
@@ -54,12 +54,9 @@ static void sub_805B4C0(void);
 static void sub_805B454(void);
 
 static const TileInfo gUnknown_080D9050[] = {
-    TextElement(1, LANG_DEFAULT, 0, 90, SA2_ANIM_MP_MSG),
-    TextElement(1, LANG_JAPANESE, 0, 90, SA2_ANIM_MP_MSG),
-    TextElement(1, LANG_ENGLISH, 0, 84, SA2_ANIM_MP_COMM_MSG_EN),
-    TextElement(1, LANG_GERMAN, 0, 90, SA2_ANIM_MP_COMM_MSG_DE),
-    TextElement(1, LANG_FRENCH, 0, 90, SA2_ANIM_MP_COMM_MSG_FR),
-    TextElement(1, LANG_SPANISH, 0, 90, SA2_ANIM_MP_COMM_MSG_ES),
+    TextElement(1, LANG_DEFAULT, 0, 90, SA2_ANIM_MP_MSG),         TextElement(1, LANG_JAPANESE, 0, 90, SA2_ANIM_MP_MSG),
+    TextElement(1, LANG_ENGLISH, 0, 84, SA2_ANIM_MP_COMM_MSG_EN), TextElement(1, LANG_GERMAN, 0, 90, SA2_ANIM_MP_COMM_MSG_DE),
+    TextElement(1, LANG_FRENCH, 0, 90, SA2_ANIM_MP_COMM_MSG_FR),  TextElement(1, LANG_SPANISH, 0, 90, SA2_ANIM_MP_COMM_MSG_ES),
     TextElement(1, LANG_ITALIAN, 0, 45, SA2_ANIM_MP_COMM_MSG_IT),
 };
 
@@ -235,8 +232,7 @@ static void sub_805ADAC(void)
     }
 
     recv = &gMultiSioRecv[0].pat0;
-    if (gMultiSioStatusFlags & MULTI_SIO_HARD_ERROR
-        || (r4 && !(gMultiSioStatusFlags & MULTI_SIO_RECV_ID0) && recv->unk0 != 0)) {
+    if (gMultiSioStatusFlags & MULTI_SIO_HARD_ERROR || (r4 && !(gMultiSioStatusFlags & MULTI_SIO_RECV_ID0) && recv->unk0 != 0)) {
         if (++connectScreen->unkFD >= 9) {
             TasksDestroyAll();
             gUnknown_03002AE4 = gUnknown_0300287C;
@@ -253,8 +249,7 @@ static void sub_805ADAC(void)
         data = &gMultiSioRecv[i].pat0;
         connectScreen->unkEE[i] <<= 1;
         connectScreen->unkF2[i] <<= 1;
-        if (i == SIO_MULTI_CNT->id
-            || (gMultiSioStatusFlags & MULTI_SIO_RECV_ID(i) && data->unk0 > 0x400F)) {
+        if (i == SIO_MULTI_CNT->id || (gMultiSioStatusFlags & MULTI_SIO_RECV_ID(i) && data->unk0 > 0x400F)) {
             connectScreen->unkEE[i] |= 1;
             var1++;
             var3 |= MULTI_SIO_RECV_ID(i);
@@ -283,9 +278,7 @@ static void sub_805ADAC(void)
                     bool3 = FALSE;
                 }
             } else {
-                if (connectScreen->unkF2[i] != 0
-                    || (gMultiSioStatusFlags & MULTI_SIO_RECV_ID(i)
-                        && data->unk0 < 0x4010)) {
+                if (connectScreen->unkF2[i] != 0 || (gMultiSioStatusFlags & MULTI_SIO_RECV_ID(i) && data->unk0 < 0x4010)) {
                     bool2 = TRUE;
                     bool3 = FALSE;
                 }
@@ -301,8 +294,7 @@ static void sub_805ADAC(void)
     }
 
     if (connectScreen->unkFA == 0) {
-        if (!(gMultiSioStatusFlags & MULTI_SIO_PARENT)
-            && gMultiSioStatusFlags & MULTI_SIO_RECV_ID0 && recv->unk0 > 0x4010) {
+        if (!(gMultiSioStatusFlags & MULTI_SIO_PARENT) && gMultiSioStatusFlags & MULTI_SIO_RECV_ID0 && recv->unk0 > 0x4010) {
             TasksDestroyAll();
             gUnknown_03002AE4 = gUnknown_0300287C;
             gUnknown_03005390 = 0;
@@ -415,8 +407,7 @@ static void sub_805ADAC(void)
     DisplaySprite(r4p);
 
     if (gMultiSioStatusFlags & MULTI_SIO_PARENT) {
-        if ((!bool2 && var1 > 1 && gPressedKeys & START_BUTTON)
-            || (connectScreen->unkF6 != 0 && !bool2 && var1 > 1)) {
+        if ((!bool2 && var1 > 1 && gPressedKeys & START_BUTTON) || (connectScreen->unkF6 != 0 && !bool2 && var1 > 1)) {
             send = &gMultiSioSend.pat0;
             send->unk0 = 0x4011;
             send->unk2 = var3;
diff --git a/src/game/multiplayer/player_unk_1.c b/src/game/multiplayer/player_unk_1.c
index 839efac0b..e5ab505d4 100644
--- a/src/game/multiplayer/player_unk_1.c
+++ b/src/game/multiplayer/player_unk_1.c
@@ -28,9 +28,7 @@ void sub_8019240(union MultiSioData *msioData, u8 someId)
         ias++; // skip v_regionCount
         r2 = msioData->pat0.unkF;
 
-        offset = *(u32 *)(((u8 *)ias)
-                          + ((h_regionCount * msioData->pat4.unk10) * sizeof(u32))
-                          + (r2 * sizeof(u32)));
+        offset = *(u32 *)(((u8 *)ias) + ((h_regionCount * msioData->pat4.unk10) * sizeof(u32)) + (r2 * sizeof(u32)));
         if (offset != 0) {
             MapEntity *cursor;
 
@@ -39,9 +37,7 @@ void sub_8019240(union MultiSioData *msioData, u8 someId)
             cursor = (MapEntity *)((u8 *)ias + offset);
             cursor += msioData->pat4.unk11;
 
-            if ((msioData->pat4.unk12 == 0)
-                || ((msioData->pat4.unk12 == 1)
-                    && ((s8)cursor->x == MAP_ENTITY_STATE_INITIALIZED))) {
+            if ((msioData->pat4.unk12 == 0) || ((msioData->pat4.unk12 == 1) && ((s8)cursor->x == MAP_ENTITY_STATE_INITIALIZED))) {
                 *(s8 *)(&cursor->x) = MAP_ENTITY_STATE_MINUS_THREE;
             }
         }
@@ -67,9 +63,7 @@ void sub_80192A8(union MultiSioData *msioData, u8 UNUSED someId)
 #else
             register u32 offset asm("r1")
 #endif
-                = *(u32 *)(((u8 *)items)
-                           + ((h_regionCount * msioData->pat4.unk10) * sizeof(u32))
-                           + (r2 * sizeof(u32)));
+                = *(u32 *)(((u8 *)items) + ((h_regionCount * msioData->pat4.unk10) * sizeof(u32)) + (r2 * sizeof(u32)));
             if (offset != 0) {
                 MapEntity_Itembox *cursor;
 
@@ -103,9 +97,7 @@ void sub_80192FC(union MultiSioData *msioData, u8 UNUSED someId)
 #else
             register u32 offset asm("r1")
 #endif
-                = *(u32 *)(((u8 *)enemies)
-                           + ((h_regionCount * msioData->pat4.unk10) * sizeof(u32))
-                           + (r2 * sizeof(u32)));
+                = *(u32 *)(((u8 *)enemies) + ((h_regionCount * msioData->pat4.unk10) * sizeof(u32)) + (r2 * sizeof(u32)));
             if (offset != 0) {
                 MapEntity *cursor;
 
@@ -144,9 +136,7 @@ void sub_8019368(union MultiSioData *msioData, u8 UNUSED someId)
 #else
             register u32 offset asm("r1")
 #endif
-                = *(u32 *)(((u8 *)ias)
-                           + ((h_regionCount * msioData->pat4.unk10) * sizeof(u32))
-                           + (r2 * sizeof(u32)));
+                = *(u32 *)(((u8 *)ias) + ((h_regionCount * msioData->pat4.unk10) * sizeof(u32)) + (r2 * sizeof(u32)));
             if (offset != 0) {
                 MapEntity *cursor;
 
@@ -162,7 +152,4 @@ void sub_8019368(union MultiSioData *msioData, u8 UNUSED someId)
 }
 
 // Type of this is determined by it being referenced in a C func-array
-void VoidReturnSIOControl32(union MultiSioData *msioData, u8 UNUSED someId)
-{
-    REG_SIOCNT_32;
-}
+void VoidReturnSIOControl32(union MultiSioData *msioData, u8 UNUSED someId) { REG_SIOCNT_32; }
diff --git a/src/game/multiplayer/player_unk_2.c b/src/game/multiplayer/player_unk_2.c
index 134884589..6c29ee04a 100644
--- a/src/game/multiplayer/player_unk_2.c
+++ b/src/game/multiplayer/player_unk_2.c
@@ -16,16 +16,13 @@ void TaskDestructor_PlayerMPUnk2(struct Task *);
 void sub_801A384(void)
 {
     if ((IS_MULTI_PLAYER) && (ACT_INDEX(gCurrentLevel) != ACT_BOSS)
-        && ((gCurrentLevel != LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE))
-            || (gUnknown_030054B0 > 0))
+        && ((gCurrentLevel != LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE)) || (gUnknown_030054B0 > 0))
         && (gCurrentLevel != LEVEL_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53))) {
         if (gUnknown_03005840 != NULL) {
             gUnknown_03005840->unk2 = 600;
         } else {
             // _0801A3D0
-            struct Task *t
-                = TaskCreate(Task_PlayerMPUnk2, (sizeof(MultiPlayerBgCtrlRegs)), 0xE000,
-                             0, TaskDestructor_PlayerMPUnk2);
+            struct Task *t = TaskCreate(Task_PlayerMPUnk2, (sizeof(MultiPlayerBgCtrlRegs)), 0xE000, 0, TaskDestructor_PlayerMPUnk2);
             MultiPlayerBgCtrlRegs *regs = TASK_DATA(t);
 
             gUnknown_03005840 = regs;
diff --git a/src/game/multiplayer/results.c b/src/game/multiplayer/results.c
index f37f1ea01..6bd57f255 100644
--- a/src/game/multiplayer/results.c
+++ b/src/game/multiplayer/results.c
@@ -113,12 +113,9 @@ static const TileInfo sResultsScreenPlayerCursor[MULTI_SIO_PLAYERS_MAX] = {
 };
 
 static const u16 sResultsScreenBgSelectedCharacters[] = {
-    [LANG_DEFAULT] = TM_MP_CHARACTERS_SELECTED_JP,
-    [LANG_JAPANESE] = TM_MP_CHARACTERS_SELECTED_JP,
-    [LANG_ENGLISH] = TM_MP_CHARACTERS_SELECTED_EN,
-    [LANG_GERMAN] = TM_MP_CHARACTERS_SELECTED_DE,
-    [LANG_FRENCH] = TM_MP_CHARACTERS_SELECTED_FR,
-    [LANG_SPANISH] = TM_MP_CHARACTERS_SELECTED_ES,
+    [LANG_DEFAULT] = TM_MP_CHARACTERS_SELECTED_JP, [LANG_JAPANESE] = TM_MP_CHARACTERS_SELECTED_JP,
+    [LANG_ENGLISH] = TM_MP_CHARACTERS_SELECTED_EN, [LANG_GERMAN] = TM_MP_CHARACTERS_SELECTED_DE,
+    [LANG_FRENCH] = TM_MP_CHARACTERS_SELECTED_FR,  [LANG_SPANISH] = TM_MP_CHARACTERS_SELECTED_ES,
     [LANG_ITALIAN] = TM_MP_CHARACTERS_SELECTED_IT,
 };
 
@@ -156,8 +153,7 @@ void CreateMultiplayerResultsScreen(u8 mode)
     gUnknown_03002280[3][3] = 0x40;
 
     DmaFill32(3, 0, (void *)VRAM + 0x9fe0, 0x40);
-    t = TaskCreate(sub_805C0F0, sizeof(struct MultiplayerResultsScreen), 0x2000, 0,
-                   NULL);
+    t = TaskCreate(sub_805C0F0, sizeof(struct MultiplayerResultsScreen), 0x2000, 0, NULL);
     resultsScreen = TASK_DATA(t);
 
     resultsScreen->animStep = 0;
@@ -369,11 +365,9 @@ static void sub_805C3D0(void)
 #ifdef TEAMPLAY_AVAILABLE
                 CreateMultiplayerResultsScreen();
 #else
-                CreateCourseSelectionScreen(0, gMultiplayerUnlockedLevels,
-                                            COURSE_SELECT_CUT_SCENE_NONE);
+                CreateCourseSelectionScreen(0, gMultiplayerUnlockedLevels, COURSE_SELECT_CUT_SCENE_NONE);
 #endif
-            } else if (gGameMode == GAME_MODE_SINGLE_PLAYER
-                       && gLoadedSaveGame->unlockedLevels[gSelectedCharacter] == 0) {
+            } else if (gGameMode == GAME_MODE_SINGLE_PLAYER && gLoadedSaveGame->unlockedLevels[gSelectedCharacter] == 0) {
                 gCurrentLevel = 0;
                 GameStageStart();
                 return;
@@ -381,9 +375,7 @@ static void sub_805C3D0(void)
 #ifdef TEAMPLAY_AVAILABLE
                 CreateMultiplayerResultsScreen();
 #else
-                CreateCourseSelectionScreen(
-                    0, gLoadedSaveGame->unlockedLevels[gSelectedCharacter],
-                    COURSE_SELECT_CUT_SCENE_NONE);
+                CreateCourseSelectionScreen(0, gLoadedSaveGame->unlockedLevels[gSelectedCharacter], COURSE_SELECT_CUT_SCENE_NONE);
 #endif
             }
         }
diff --git a/src/game/multiplayer/team_play.c b/src/game/multiplayer/team_play.c
index c854eb80d..c96c9fb24 100644
--- a/src/game/multiplayer/team_play.c
+++ b/src/game/multiplayer/team_play.c
@@ -53,41 +53,18 @@ static const TileInfo gUnknown_080D92BC[] = {
 };
 
 static const TileInfo gUnknown_080D92DC[] = {
-    TextElement(5, LANG_DEFAULT, 0, 46, 1076),
-    TextElement(5, LANG_DEFAULT, 1, 42, 1076),
-    TextElement(5, LANG_DEFAULT, 2, 12, 1076),
-    TextElement(5, LANG_DEFAULT, 3, 18, 1076),
-    TextElement(5, LANG_DEFAULT, 4, 6, 1076),
-    TextElement(5, LANG_JAPANESE, 0, 46, 1076),
-    TextElement(5, LANG_JAPANESE, 1, 42, 1076),
-    TextElement(5, LANG_JAPANESE, 2, 12, 1076),
-    TextElement(5, LANG_JAPANESE, 3, 18, 1076),
-    TextElement(5, LANG_JAPANESE, 4, 6, 1076),
-    TextElement(5, LANG_ENGLISH, 0, 38, 1084),
-    TextElement(5, LANG_ENGLISH, 1, 46, 1084),
-    TextElement(5, LANG_ENGLISH, 2, 14, 1084),
-    TextElement(5, LANG_ENGLISH, 3, 10, 1084),
-    TextElement(5, LANG_ENGLISH, 4, 6, 1076),
-    TextElement(5, LANG_GERMAN, 0, 57, 1085),
-    TextElement(5, LANG_GERMAN, 1, 46, 1085),
-    TextElement(5, LANG_GERMAN, 2, 10, 1085),
-    TextElement(5, LANG_GERMAN, 3, 14, 1085),
-    TextElement(5, LANG_GERMAN, 4, 6, 1076),
-    TextElement(5, LANG_FRENCH, 0, 51, 1086),
-    TextElement(5, LANG_FRENCH, 1, 72, 1086),
-    TextElement(5, LANG_FRENCH, 2, 10, 1086),
-    TextElement(5, LANG_FRENCH, 3, 14, 1086),
-    TextElement(5, LANG_FRENCH, 4, 6, 1076),
-    TextElement(5, LANG_SPANISH, 0, 75, 1087),
-    TextElement(5, LANG_SPANISH, 1, 69, 1087),
-    TextElement(5, LANG_SPANISH, 2, 9, 1087),
-    TextElement(5, LANG_SPANISH, 3, 15, 1087),
-    TextElement(5, LANG_SPANISH, 4, 6, 1076),
-    TextElement(5, LANG_ITALIAN, 0, 72, 1088),
-    TextElement(5, LANG_ITALIAN, 1, 75, 1088),
-    TextElement(5, LANG_ITALIAN, 2, 6, 1088),
-    TextElement(5, LANG_ITALIAN, 3, 10, 1088),
-    TextElement(5, LANG_ITALIAN, 4, 6, 1076),
+    TextElement(5, LANG_DEFAULT, 0, 46, 1076),  TextElement(5, LANG_DEFAULT, 1, 42, 1076),  TextElement(5, LANG_DEFAULT, 2, 12, 1076),
+    TextElement(5, LANG_DEFAULT, 3, 18, 1076),  TextElement(5, LANG_DEFAULT, 4, 6, 1076),   TextElement(5, LANG_JAPANESE, 0, 46, 1076),
+    TextElement(5, LANG_JAPANESE, 1, 42, 1076), TextElement(5, LANG_JAPANESE, 2, 12, 1076), TextElement(5, LANG_JAPANESE, 3, 18, 1076),
+    TextElement(5, LANG_JAPANESE, 4, 6, 1076),  TextElement(5, LANG_ENGLISH, 0, 38, 1084),  TextElement(5, LANG_ENGLISH, 1, 46, 1084),
+    TextElement(5, LANG_ENGLISH, 2, 14, 1084),  TextElement(5, LANG_ENGLISH, 3, 10, 1084),  TextElement(5, LANG_ENGLISH, 4, 6, 1076),
+    TextElement(5, LANG_GERMAN, 0, 57, 1085),   TextElement(5, LANG_GERMAN, 1, 46, 1085),   TextElement(5, LANG_GERMAN, 2, 10, 1085),
+    TextElement(5, LANG_GERMAN, 3, 14, 1085),   TextElement(5, LANG_GERMAN, 4, 6, 1076),    TextElement(5, LANG_FRENCH, 0, 51, 1086),
+    TextElement(5, LANG_FRENCH, 1, 72, 1086),   TextElement(5, LANG_FRENCH, 2, 10, 1086),   TextElement(5, LANG_FRENCH, 3, 14, 1086),
+    TextElement(5, LANG_FRENCH, 4, 6, 1076),    TextElement(5, LANG_SPANISH, 0, 75, 1087),  TextElement(5, LANG_SPANISH, 1, 69, 1087),
+    TextElement(5, LANG_SPANISH, 2, 9, 1087),   TextElement(5, LANG_SPANISH, 3, 15, 1087),  TextElement(5, LANG_SPANISH, 4, 6, 1076),
+    TextElement(5, LANG_ITALIAN, 0, 72, 1088),  TextElement(5, LANG_ITALIAN, 1, 75, 1088),  TextElement(5, LANG_ITALIAN, 2, 6, 1088),
+    TextElement(5, LANG_ITALIAN, 3, 10, 1088),  TextElement(5, LANG_ITALIAN, 4, 6, 1076),
 };
 
 void CreateMultiplayerTeamPlayScreen(void)
@@ -137,8 +114,7 @@ void CreateMultiplayerTeamPlayScreen(void)
     gUnknown_03002280[2][2] = 0xff;
     gUnknown_03002280[2][3] = 32;
 
-    t = TaskCreate(sub_805CB34, sizeof(struct MultiplayerTeamPlayScreen), 0x3000, 0,
-                   NULL);
+    t = TaskCreate(sub_805CB34, sizeof(struct MultiplayerTeamPlayScreen), 0x3000, 0, NULL);
     teamPlayScreen = TASK_DATA(t);
     teamPlayScreen->unk310 = 0;
     teamPlayScreen->unk312 = 0;
@@ -171,8 +147,7 @@ void CreateMultiplayerTeamPlayScreen(void)
         s->x = 0;
         s->y = 0;
         s->graphics.dest = (void *)vram;
-        vram += gUnknown_080D92DC[TextElementOffset(lang, 5, i)].numTiles
-            * TILE_SIZE_4BPP;
+        vram += gUnknown_080D92DC[TextElementOffset(lang, 5, i)].numTiles * TILE_SIZE_4BPP;
         s->oamFlags = SPRITE_OAM_ORDER(3);
         s->graphics.size = 0;
         s->graphics.anim = gUnknown_080D92DC[TextElementOffset(lang, 5, i)].anim;
@@ -386,8 +361,7 @@ static void sub_805CC34(void)
                     TaskDestroy(gCurTask);
                     gFlags &= ~0x4;
                     gGameMode = GAME_MODE_MULTI_PLAYER;
-                    CreateCourseSelectionScreen(0, gMultiplayerUnlockedLevels,
-                                                COURSE_SELECT_CUT_SCENE_NONE);
+                    CreateCourseSelectionScreen(0, gMultiplayerUnlockedLevels, COURSE_SELECT_CUT_SCENE_NONE);
                     gMultiSioSend.pat0.unk0 = 0x4035;
                     return;
                 }
@@ -432,8 +406,7 @@ static void sub_805CC34(void)
                 TaskDestroy(gCurTask);
                 gFlags &= ~0x4;
                 gGameMode = GAME_MODE_MULTI_PLAYER;
-                CreateCourseSelectionScreen(0, gMultiplayerUnlockedLevels,
-                                            COURSE_SELECT_CUT_SCENE_NONE);
+                CreateCourseSelectionScreen(0, gMultiplayerUnlockedLevels, COURSE_SELECT_CUT_SCENE_NONE);
                 return;
             }
         }
@@ -500,8 +473,7 @@ static void sub_805D118(struct MultiplayerTeamPlayScreen *teamPlayScreen)
 
     for (i = 0; i < 160; i++) {
         *unk1884++ = (gSineTable[(gFrameCount + i * 4) & 1023] >> 0xB) + unk310;
-        *unk1884++
-            = (gSineTable[((gFrameCount + i * 2) & 1023) + 0x100] >> 0xB) + unk312;
+        *unk1884++ = (gSineTable[((gFrameCount + i * 2) & 1023) + 0x100] >> 0xB) + unk312;
     }
 }
 
@@ -600,8 +572,7 @@ static void sub_805D1F8(void)
     }
 
     if (((!(gInput & (DPAD_LEFT | DPAD_RIGHT)) && (gPressedKeys & A_BUTTON))
-         && ((teamPlayScreen->unk31E == 0 && (count - 1) != pos[0])
-             || (teamPlayScreen->unk31E == 1 && (count - 1) != pos[1])))
+         && ((teamPlayScreen->unk31E == 0 && (count - 1) != pos[0]) || (teamPlayScreen->unk31E == 1 && (count - 1) != pos[1])))
         || teamPlayScreen->unk31F != 0) {
         if (teamPlayScreen->unk31F == 0) {
             m4aSongNumStart(SE_SELECT);
@@ -644,8 +615,7 @@ static void sub_805D610(void)
 {
     TaskDestroy(gCurTask);
     gFlags &= ~0x4;
-    CreateCourseSelectionScreen(0, gMultiplayerUnlockedLevels,
-                                COURSE_SELECT_CUT_SCENE_NONE);
+    CreateCourseSelectionScreen(0, gMultiplayerUnlockedLevels, COURSE_SELECT_CUT_SCENE_NONE);
 }
 
 static void sub_805D644(struct MultiplayerTeamPlayScreen *teamPlayScreen)
diff --git a/src/game/multiplayer/unknown_task.c b/src/game/multiplayer/unknown_task.c
index 3e847a09f..b135f37a3 100644
--- a/src/game/multiplayer/unknown_task.c
+++ b/src/game/multiplayer/unknown_task.c
@@ -20,9 +20,7 @@ void sub_8018AD8(union MultiSioData *recv, u8 i);
 typedef void (*UnknownFunction)(union MultiSioData *recv, u8 i);
 
 const UnknownFunction gUnknown_080D5744[] = {
-    sub_8019240, sub_80192A8, sub_80192FC, sub_8019350,
-    sub_8019368, sub_8018AD8, sub_8018E00, VoidReturnSIOControl32,
-    NULL,
+    sub_8019240, sub_80192A8, sub_80192FC, sub_8019350, sub_8019368, sub_8018AD8, sub_8018E00, VoidReturnSIOControl32, NULL,
 };
 
 void Task_80188FC(void)
@@ -39,8 +37,7 @@ void Task_80188FC(void)
             return;
         } else {
             recv = &gMultiSioRecv[i].pat0;
-            if (0x5000 == recv->unk0
-                && (something == 0) != (!(recv->unk8[0] & (0x1000 << id)))) {
+            if (0x5000 == recv->unk0 && (something == 0) != (!(recv->unk8[0] & (0x1000 << id)))) {
                 return;
             }
         }
@@ -49,8 +46,7 @@ void Task_80188FC(void)
     if (gUnknown_03005438 == gUnknown_03005420) {
         DmaFill16(3, 0, &gMultiSioSend.pat0.unk8[3], sizeof(struct UNK_3005510) - 1);
     } else {
-        DmaCopy16(3, &gUnknown_03005510[gUnknown_03005420], &gMultiSioSend.pat0.unk8[3],
-                  sizeof(struct UNK_3005510) - 1);
+        DmaCopy16(3, &gUnknown_03005510[gUnknown_03005420], &gMultiSioSend.pat0.unk8[3], sizeof(struct UNK_3005510) - 1);
         gUnknown_03005420 = (gUnknown_03005420 + 1) & 0xF;
         send->unk8[0] ^= (0x1000 << id);
     }
@@ -77,8 +73,7 @@ void Task_8018A28(void)
         }
 
         recv = &gMultiSioRecv[i];
-        if (recv->pat0.unk0 == 0x5000
-            && (recv->pat0.unk8[0] & (0x1000 << i)) != (send->unk8[0] & (0x1000 << i))) {
+        if (recv->pat0.unk0 == 0x5000 && (recv->pat0.unk8[0] & (0x1000 << i)) != (send->unk8[0] & (0x1000 << i))) {
             if ((u8)(recv->pat0.unkE - 1) < 8) {
 
                 gUnknown_080D5744[recv->pat0.unkE - 1](recv, i);
@@ -93,14 +88,12 @@ void sub_8018AD8(union MultiSioData *recv, u8 i)
     MultiplayerPlayer *mpp = TASK_DATA(gMultiplayerPlayerTasks[i]);
     MultiplayerPlayer *us = TASK_DATA(gMultiplayerPlayerTasks[SIO_MULTI_CNT->id]);
 
-    if (!(us->unk5C & 1) && PLAYER_IS_ALIVE
-        && gUnknown_030054B4[SIO_MULTI_CNT->id] == -1) {
+    if (!(us->unk5C & 1) && PLAYER_IS_ALIVE && gUnknown_030054B4[SIO_MULTI_CNT->id] == -1) {
         switch (recv->pat0.unkF) {
             case 0: {
                 if (gGameMode != GAME_MODE_TEAM_PLAY
                     || ((gMultiplayerConnections & (0x10 << (i))) >> ((i + 4))
-                        != (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id)))
-                            >> (SIO_MULTI_CNT->id + 4))) {
+                        != (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id))) >> (SIO_MULTI_CNT->id + 4))) {
                     gPlayer.itemEffect |= PLAYER_ITEM_EFFECT__40;
                     gPlayer.unk32 = 600;
                     CreateItemTask_Confusion(gPlayer.character);
@@ -109,11 +102,8 @@ void sub_8018AD8(union MultiSioData *recv, u8 i)
                 break;
             }
             case 1: {
-                if ((u8)recv->pat0.unk10 == SIO_MULTI_CNT->id
-                    && !(gPlayer.itemEffect & PLAYER_ITEM_EFFECT__80)) {
-                    u32 prevMoveState = gPlayer.moveState
-                        & (MOVESTATE_IN_SCRIPTED | MOVESTATE_IGNORE_INPUT
-                           | MOVESTATE_400000);
+                if ((u8)recv->pat0.unk10 == SIO_MULTI_CNT->id && !(gPlayer.itemEffect & PLAYER_ITEM_EFFECT__80)) {
+                    u32 prevMoveState = gPlayer.moveState & (MOVESTATE_IN_SCRIPTED | MOVESTATE_IGNORE_INPUT | MOVESTATE_400000);
                     if (!(prevMoveState)) {
                         InitializePlayer(&gPlayer);
                         gPlayer.x = QS(mpp->pos.x);
@@ -142,8 +132,7 @@ void sub_8018AD8(union MultiSioData *recv, u8 i)
                 if (!(gPlayer.moveState & MOVESTATE_IN_SCRIPTED)
                     && (gGameMode != GAME_MODE_TEAM_PLAY
                         || ((gMultiplayerConnections & (0x10 << (i))) >> ((i + 4))
-                            != (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id)))
-                                >> (SIO_MULTI_CNT->id + 4)))) {
+                            != (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id))) >> (SIO_MULTI_CNT->id + 4)))) {
                     gPlayer.itemEffect |= 0x10;
 
                     gPlayer.timerSpeedup = 600;
@@ -157,8 +146,7 @@ void sub_8018AD8(union MultiSioData *recv, u8 i)
             case 3: {
                 if (gGameMode != GAME_MODE_TEAM_PLAY
                     || ((gMultiplayerConnections & (0x10 << (i))) >> ((i + 4))
-                        != (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id)))
-                            >> (SIO_MULTI_CNT->id + 4))) {
+                        != (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id))) >> (SIO_MULTI_CNT->id + 4))) {
                     gUnknown_03005B7C = 1;
                     m4aSongNumStart(SE_219);
                 }
@@ -167,8 +155,7 @@ void sub_8018AD8(union MultiSioData *recv, u8 i)
             case 4: {
                 if (gGameMode != GAME_MODE_TEAM_PLAY
                     || ((gMultiplayerConnections & (0x10 << (i))) >> ((i + 4))
-                        != (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id)))
-                            >> (SIO_MULTI_CNT->id + 4))) {
+                        != (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id))) >> (SIO_MULTI_CNT->id + 4))) {
                     gUnknown_0300583C = 1;
                     m4aSongNumStart(SE_216);
                 }
@@ -205,8 +192,7 @@ void sub_8018E00(union MultiSioData *recv, u8 i)
             }
         } else {
             if ((gMultiplayerConnections & (0x10 << (j))) >> ((j + 4))
-                    != (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id)))
-                        >> (SIO_MULTI_CNT->id + 4)
+                    != (gMultiplayerConnections & (0x10 << (SIO_MULTI_CNT->id))) >> (SIO_MULTI_CNT->id + 4)
                 && (s8)gUnknown_030054B4[j] == 0) {
                 count2 = 1;
             }
@@ -222,8 +208,7 @@ void sub_8018E00(union MultiSioData *recv, u8 i)
     if (gGameMode == GAME_MODE_TEAM_PLAY) {
         for (j = 0; j < 4 && gMultiplayerPlayerTasks[j] != NULL; j++) {
             if (j != i && gUnknown_030054B4[j] == -1
-                && (gMultiplayerConnections & (0x10 << (j))) >> ((j + 4))
-                    == (gMultiplayerConnections & (0x10 << (i))) >> (i + 4)) {
+                && (gMultiplayerConnections & (0x10 << (j))) >> ((j + 4)) == (gMultiplayerConnections & (0x10 << (i))) >> (i + 4)) {
                 sub_8019CCC(j, count2);
                 if (j == SIO_MULTI_CNT->id) {
                     Player_TransitionCancelFlyingAndBoost(&gPlayer);
diff --git a/src/game/multiplayer_lobby.c b/src/game/multiplayer_lobby.c
index ef2388ff9..fb8f34a21 100644
--- a/src/game/multiplayer_lobby.c
+++ b/src/game/multiplayer_lobby.c
@@ -50,36 +50,32 @@ static const TileInfo sUiText[] = {
     [TextElementOffset(LanguageIndex(LANG_JAPANESE), 3, ELEMENT_NO)]
     = TextElementAlt4(SA2_ANIM_VARIANT_MP_MSG_JAPANESE_9, 18, SA2_ANIM_MP_MSG),
 
-    [TextElementOffset(LanguageIndex(LANG_ENGLISH), 3, ELEMENT_TITLE)] = TextElementAlt4(
-        SA2_ANIM_VARIANT_MP_COMM_MSG_PLAY_AGAIN, 48, SA2_ANIM_MP_COMM_MSG_EN),
+    [TextElementOffset(LanguageIndex(LANG_ENGLISH), 3, ELEMENT_TITLE)]
+    = TextElementAlt4(SA2_ANIM_VARIANT_MP_COMM_MSG_PLAY_AGAIN, 48, SA2_ANIM_MP_COMM_MSG_EN),
     [TextElementOffset(LanguageIndex(LANG_ENGLISH), 3, ELEMENT_YES)]
     = TextElementAlt4(SA2_ANIM_VARIANT_MP_COMM_MSG_YES, 10, SA2_ANIM_MP_COMM_MSG_EN),
     [TextElementOffset(LanguageIndex(LANG_ENGLISH), 3, ELEMENT_NO)]
     = TextElementAlt4(SA2_ANIM_VARIANT_MP_COMM_MSG_NO, 10, SA2_ANIM_MP_COMM_MSG_EN),
 
-    [TextElementOffset(LanguageIndex(LANG_GERMAN), 3, ELEMENT_TITLE)]
-    = TextElementAlt4(2, 69, SA2_ANIM_MP_COMM_MSG_DE),
+    [TextElementOffset(LanguageIndex(LANG_GERMAN), 3, ELEMENT_TITLE)] = TextElementAlt4(2, 69, SA2_ANIM_MP_COMM_MSG_DE),
     [TextElementOffset(LanguageIndex(LANG_GERMAN), 3, ELEMENT_YES)]
     = TextElementAlt4(SA2_ANIM_VARIANT_MP_COMM_MSG_YES, 15, SA2_ANIM_MP_COMM_MSG_DE),
     [TextElementOffset(LanguageIndex(LANG_GERMAN), 3, ELEMENT_NO)]
     = TextElementAlt4(SA2_ANIM_VARIANT_MP_COMM_MSG_NO, 21, SA2_ANIM_MP_COMM_MSG_DE),
 
-    [TextElementOffset(LanguageIndex(LANG_FRENCH), 3, ELEMENT_TITLE)]
-    = TextElementAlt4(2, 39, SA2_ANIM_MP_COMM_MSG_FR),
+    [TextElementOffset(LanguageIndex(LANG_FRENCH), 3, ELEMENT_TITLE)] = TextElementAlt4(2, 39, SA2_ANIM_MP_COMM_MSG_FR),
     [TextElementOffset(LanguageIndex(LANG_FRENCH), 3, ELEMENT_YES)]
     = TextElementAlt4(SA2_ANIM_VARIANT_MP_COMM_MSG_YES, 18, SA2_ANIM_MP_COMM_MSG_FR),
     [TextElementOffset(LanguageIndex(LANG_FRENCH), 3, ELEMENT_NO)]
     = TextElementAlt4(SA2_ANIM_VARIANT_MP_COMM_MSG_NO, 18, SA2_ANIM_MP_COMM_MSG_FR),
 
-    [TextElementOffset(LanguageIndex(LANG_SPANISH), 3, ELEMENT_TITLE)]
-    = TextElementAlt4(2, 69, SA2_ANIM_MP_COMM_MSG_ES),
+    [TextElementOffset(LanguageIndex(LANG_SPANISH), 3, ELEMENT_TITLE)] = TextElementAlt4(2, 69, SA2_ANIM_MP_COMM_MSG_ES),
     [TextElementOffset(LanguageIndex(LANG_SPANISH), 3, ELEMENT_YES)]
     = TextElementAlt4(SA2_ANIM_VARIANT_MP_COMM_MSG_YES, 9, SA2_ANIM_MP_COMM_MSG_ES),
     [TextElementOffset(LanguageIndex(LANG_SPANISH), 3, ELEMENT_NO)]
     = TextElementAlt4(SA2_ANIM_VARIANT_MP_COMM_MSG_NO, 15, SA2_ANIM_MP_COMM_MSG_ES),
 
-    [TextElementOffset(LanguageIndex(LANG_ITALIAN), 3, ELEMENT_TITLE)]
-    = TextElementAlt4(2, 69, SA2_ANIM_MP_COMM_MSG_IT),
+    [TextElementOffset(LanguageIndex(LANG_ITALIAN), 3, ELEMENT_TITLE)] = TextElementAlt4(2, 69, SA2_ANIM_MP_COMM_MSG_IT),
     [TextElementOffset(LanguageIndex(LANG_ITALIAN), 3, ELEMENT_YES)]
     = TextElementAlt4(SA2_ANIM_VARIANT_MP_COMM_MSG_YES, 9, SA2_ANIM_MP_COMM_MSG_IT),
     [TextElementOffset(LanguageIndex(LANG_ITALIAN), 3, ELEMENT_NO)]
@@ -102,9 +98,7 @@ static void StartMultiplayerExitAnim(struct MultiplayerLobbyScreen *);
 
 void CreateMultiplayerLobbyScreen(void)
 {
-    struct Task *t
-        = TaskCreate(Task_FadeInOrHandleExit, sizeof(struct MultiplayerLobbyScreen),
-                     0x1000, 0, MultiplayerLobbyScreenOnDestroy);
+    struct Task *t = TaskCreate(Task_FadeInOrHandleExit, sizeof(struct MultiplayerLobbyScreen), 0x1000, 0, MultiplayerLobbyScreenOnDestroy);
     struct MultiplayerLobbyScreen *lobbyScreen = TASK_DATA(t);
 
     lobbyScreen->fadeInComplete = FALSE;
@@ -195,8 +189,7 @@ static void CreateUI(struct MultiplayerLobbyScreen *lobbyScreen)
 
     for (i = 0; i < ARRAY_COUNT(lobbyScreen->uiElements); i++) {
         s = &lobbyScreen->uiElements[i];
-        s->graphics.dest
-            = VramMalloc(sUiText[TextElementOffsetAlt(lang, 3, i)].numTiles);
+        s->graphics.dest = VramMalloc(sUiText[TextElementOffsetAlt(lang, 3, i)].numTiles);
         s->graphics.anim = sUiText[TextElementOffsetAlt(lang, 3, i)].anim;
         s->variant = sUiText[TextElementOffsetAlt(lang, 3, i)].variant;
         s->prevVariant = -1;
@@ -259,9 +252,7 @@ static void Task_FadeInOrHandleExit(void)
                         gMultiplayerMissingHeartbeats[i] = 0;
                     }
                 } else {
-                    CreateCharacterSelectionScreen(0,
-                                                   gMultiplayerUnlockedCharacters
-                                                       & CHARACTER_BIT(CHARACTER_AMY));
+                    CreateCharacterSelectionScreen(0, gMultiplayerUnlockedCharacters & CHARACTER_BIT(CHARACTER_AMY));
                 }
                 return;
             } else {
@@ -301,8 +292,7 @@ static void ScreenMain(void)
     }
 
     if (!(gMultiSioStatusFlags & MULTI_SIO_PARENT)
-        && (recv->pat0.unk0 == MSG_VS_LOBBY_CURSOR_POS
-            || recv->pat0.unk0 == MSG_VS_LOBBY_CURSOR_MOVE)) {
+        && (recv->pat0.unk0 == MSG_VS_LOBBY_CURSOR_POS || recv->pat0.unk0 == MSG_VS_LOBBY_CURSOR_MOVE)) {
         lobbyScreen->cursor = recv->pat0.unk2;
         // cursor moved
         if (recv->pat0.unk3 != 0) {
@@ -490,8 +480,7 @@ static void RenderUI(struct MultiplayerLobbyScreen *lobbyScreen)
     Sprite *s = &lobbyScreen->chao;
     // Chao anim finished
     if (!UpdateSpriteAnimation(s)) {
-        if (lobbyScreen->cursor != CURSOR_YES
-            && s->graphics.anim == SA2_ANIM_MP_CHEESE_WAVING) {
+        if (lobbyScreen->cursor != CURSOR_YES && s->graphics.anim == SA2_ANIM_MP_CHEESE_WAVING) {
             s->variant = 1;
         } else {
             if (s->variant == 6) {
@@ -560,8 +549,7 @@ static void ExitToCharacterSelect(struct MultiplayerLobbyScreen *lobbyScreen)
 
 static bool8 CatchInvalidPacket(union MultiSioData *packet)
 {
-    if (packet->pat0.unk0 <= MSG_VS_LOBBY_EXIT
-        && packet->pat0.unk0 >= MSG_VS_LOBBY_CURSOR_POS) {
+    if (packet->pat0.unk0 <= MSG_VS_LOBBY_EXIT && packet->pat0.unk0 >= MSG_VS_LOBBY_CURSOR_POS) {
         return FALSE;
     }
 
diff --git a/src/game/mystery_item_box.c b/src/game/mystery_item_box.c
index 003cfd968..01087d6f0 100644
--- a/src/game/mystery_item_box.c
+++ b/src/game/mystery_item_box.c
@@ -48,27 +48,22 @@ static const u8 sRingBonuses[] = { 1, 5, 10, 30, 50 };
 
 static const u16 gUnknown_080E029A[] = { 0, 1, 1, 0, 1, 1, 0, 1 };
 
-static const u16 gUnknown_080E02AA[][3]
-    = { { SA2_ANIM_ITEMBOX_TYPE, 9, 4 }, { SA2_ANIM_ITEMBOX_TYPE, 12, 4 } };
+static const u16 gUnknown_080E02AA[][3] = { { SA2_ANIM_ITEMBOX_TYPE, 9, 4 }, { SA2_ANIM_ITEMBOX_TYPE, 12, 4 } };
 
 static const u16 unused = 0;
 
 #define ITEM_ICON_DISPLAY_TIME  (1 * GBA_FRAMES_PER_SECOND)
 #define ITEM_ICON_DISPLAY_DELAY (int)(0.5 * GBA_FRAMES_PER_SECOND)
 
-void CreateEntity_MysteryItemBox(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                 u8 spriteY)
+void CreateEntity_MysteryItemBox(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     Sprite *s;
     Sprite_MysteryItemBox *itemBox;
     struct Task *t;
-    if ((gRandomItemBox & 7) == me->d.sData[0]
-        && me->d.sData[1] <= (gRandomItemBox >> 4)) {
-        t = TaskCreate(sub_80865E4, sizeof(Sprite_MysteryItemBox), 0x2000, 0,
-                       sub_80867E8);
+    if ((gRandomItemBox & 7) == me->d.sData[0] && me->d.sData[1] <= (gRandomItemBox >> 4)) {
+        t = TaskCreate(sub_80865E4, sizeof(Sprite_MysteryItemBox), 0x2000, 0, sub_80867E8);
     } else {
-        t = TaskCreate(sub_808673C, sizeof(Sprite_MysteryItemBox), 0x2000, 0,
-                       sub_80867E8);
+        t = TaskCreate(sub_808673C, sizeof(Sprite_MysteryItemBox), 0x2000, 0, sub_80867E8);
     }
 
     if (me->d.sData[1] <= (gRandomItemBox >> 4)) {
@@ -124,8 +119,7 @@ static void sub_808616C(void)
     SpriteTransform *transform;
     Sprite *identifier;
 
-    itemBox->unk82
-        = gUnknown_080E029A[gMultiplayerPseudoRandom % ARRAY_COUNT(gUnknown_080E029A)];
+    itemBox->unk82 = gUnknown_080E029A[gMultiplayerPseudoRandom % ARRAY_COUNT(gUnknown_080E029A)];
 
     identifier = &itemBox->identifier;
     identifier->graphics.anim = gUnknown_080E02AA[gUnknown_080E029A[itemBox->unk82]][0];
@@ -213,8 +207,7 @@ static inline void sub_808673C_inline(void)
     Sprite_MysteryItemBox *itemBox = TASK_DATA(gCurTask);
     MapEntity *me = itemBox->base.me;
 
-    if (me->d.sData[0] == (gRandomItemBox & 7)
-        && me->d.sData[1] <= (gRandomItemBox >> 4)) {
+    if (me->d.sData[0] == (gRandomItemBox & 7) && me->d.sData[1] <= (gRandomItemBox >> 4)) {
         me->d.sData[1] = gRandomItemBox >> 4;
         gCurTask->main = sub_808616C;
         return;
@@ -392,8 +385,7 @@ static void sub_808673C(void)
     Sprite_MysteryItemBox *itemBox = TASK_DATA(gCurTask);
     MapEntity *me = itemBox->base.me;
 
-    if (me->d.sData[0] == (gRandomItemBox & 7)
-        && me->d.sData[1] <= (gRandomItemBox >> 4)) {
+    if (me->d.sData[0] == (gRandomItemBox & 7) && me->d.sData[1] <= (gRandomItemBox >> 4)) {
         me->d.sData[1] = gRandomItemBox >> 4;
         gCurTask->main = sub_808616C;
         return;
@@ -500,8 +492,7 @@ static bool32 sub_808693C(Sprite_MysteryItemBox *itemBox)
         if (sub_800C944(&itemBox->box, itemBox->x, itemBox->y) != 0) {
             itemBox->unk84 = 1;
             return TRUE;
-        } else if (sub_800C204(&itemBox->box, itemBox->x, itemBox->y, 0, &gPlayer, 0)
-                   == 0) {
+        } else if (sub_800C204(&itemBox->box, itemBox->x, itemBox->y, 0, &gPlayer, 0) == 0) {
 #ifndef NON_MATCHING
         ret0:
 #endif
diff --git a/src/game/options_screen.c b/src/game/options_screen.c
index 47a288631..55d64f338 100644
--- a/src/game/options_screen.c
+++ b/src/game/options_screen.c
@@ -347,8 +347,7 @@ static void TimeRecordsScreenHandleReturn(void);
 
 static void Task_MultiplayerRecordsScreenCreateNextTableRowUI(void);
 static void MultiplayerRecordsScreenInitRegisters(void);
-static void
-MultiplayerRecordsScreenCreateBackgroundsUI(struct MultiplayerRecordsScreen *);
+static void MultiplayerRecordsScreenCreateBackgroundsUI(struct MultiplayerRecordsScreen *);
 static void MultiplayerRecordsScreenCreatePlayerRowUI(struct MultiplayerRecordsScreen *);
 
 static void Task_MultiplayerRecordsScreenScrollAnim(void);
@@ -409,12 +408,10 @@ static bool16 sub_806B988(u16 *);
 #define PLAYER_DATA_MENU_STATE_ACTIVE      0
 #define PLAYER_DATA_MENU_STATE_SCREEN_OPEN 1
 
-#define NAME_CHAR_MATRIX_NUM_COLS      11
-#define NAME_CHAR_MATRIX_NUM_ROWS      22
-#define NAME_CHAR_MATRIX_ROWS_PER_PAGE 7
-#define NAME_CHAR_MATRIX_LAST_PAGE_START_INDEX                                          \
-    NAME_CHAR_MATRIX_NUM_COLS *(NAME_CHAR_MATRIX_NUM_ROWS                               \
-                                - NAME_CHAR_MATRIX_ROWS_PER_PAGE)
+#define NAME_CHAR_MATRIX_NUM_COLS                11
+#define NAME_CHAR_MATRIX_NUM_ROWS                22
+#define NAME_CHAR_MATRIX_ROWS_PER_PAGE           7
+#define NAME_CHAR_MATRIX_LAST_PAGE_START_INDEX   NAME_CHAR_MATRIX_NUM_COLS *(NAME_CHAR_MATRIX_NUM_ROWS - NAME_CHAR_MATRIX_ROWS_PER_PAGE)
 #define NAME_CHAR_MATRIX_BACKGROUND_ROW_HEIGHT   16
 #define NAME_CHAR_MATRIX_BACKGROUND_COLUMN_WIDTH 16
 
@@ -449,8 +446,7 @@ static bool16 sub_806B988(u16 *);
 #define DELETE_SCREEN_CONFIRMATION_NO  1
 
 #define MULTIPLAYER_RECORDS_SCREEN_NUM_VISIBLE_ROWS 4
-#define MULTIPLAYER_RECORDS_SCREEN_MAX_SCROLL_INDEX                                     \
-    (NUM_MULTIPLAYER_SCORES - MULTIPLAYER_RECORDS_SCREEN_NUM_VISIBLE_ROWS)
+#define MULTIPLAYER_RECORDS_SCREEN_MAX_SCROLL_INDEX (NUM_MULTIPLAYER_SCORES - MULTIPLAYER_RECORDS_SCREEN_NUM_VISIBLE_ROWS)
 
 #define BUTTON_CONFIG_MENU_A_BUTTON          0
 #define BUTTON_CONFIG_MENU_B_BUTTON          1
@@ -460,21 +456,19 @@ static bool16 sub_806B988(u16 *);
 #define BUTTON_CONFIG_MENU_ACTION_ATTACK 1
 #define BUTTON_CONFIG_MENU_ACTION_TRICK  2
 
-#define SetupOptionScreenBackgrounds(background, subMenuBackground)                     \
-    ({                                                                                  \
-        OptionsInitBackground(&(background), 0, 7, TM_OPTIONS_BG0, 0x1E, 0x14, 0, 0, 0, \
-                              0);                                                       \
-        OptionsInitBackground(&(subMenuBackground), 1, 0xE, TM_OPTIONS_LANGUAGE_SELECT, \
-                              0x1E, 0x14, 0, 1, 0, 0);                                  \
+#define SetupOptionScreenBackgrounds(background, subMenuBackground)                                                                        \
+    ({                                                                                                                                     \
+        OptionsInitBackground(&(background), 0, 7, TM_OPTIONS_BG0, 0x1E, 0x14, 0, 0, 0, 0);                                                \
+        OptionsInitBackground(&(subMenuBackground), 1, 0xE, TM_OPTIONS_LANGUAGE_SELECT, 0x1E, 0x14, 0, 1, 0, 0);                           \
     })
 
-#define ReadAvailableCharacters(i, unlockedCharacters)                                  \
-    ({                                                                                  \
-        for (i = 1; i < NUM_CHARACTERS; i++) {                                          \
-            if (!GetBit((unlockedCharacters), i)) {                                     \
-                break;                                                                  \
-            }                                                                           \
-        };                                                                              \
+#define ReadAvailableCharacters(i, unlockedCharacters)                                                                                     \
+    ({                                                                                                                                     \
+        for (i = 1; i < NUM_CHARACTERS; i++) {                                                                                             \
+            if (!GetBit((unlockedCharacters), i)) {                                                                                        \
+                break;                                                                                                                     \
+            }                                                                                                                              \
+        };                                                                                                                                 \
     })
 
 // Required for match in all uses
@@ -486,8 +480,7 @@ static const s8 sMenuCursorMoveAnims[2][8] = {
 };
 
 static const s16 sSubMenuOpenAnim[16] = {
-    -16,  -41,  -66,  -91,  -116, -141, -166, -186,
-    -201, -216, -228, -219, -210, -214, -217, -216,
+    -16, -41, -66, -91, -116, -141, -166, -186, -201, -216, -228, -219, -210, -214, -217, -216,
 };
 
 static const s16 sSubMenuCloseAnim[16] = {
@@ -496,19 +489,14 @@ static const s16 sSubMenuCloseAnim[16] = {
 
 static const u16 sTimeRecordsCharacterAssets[NUM_CHARACTERS][2] = {
     [CHARACTER_SONIC]
-    = { [ASSET_CHARACTER_BACKGROUND] = TM_MP_CHARACTER_SELECTED_SONIC_BG,
-        [ASSET_CHARACTER] = TM_MP_CHARACTER_SELECTED_SONIC },
+    = { [ASSET_CHARACTER_BACKGROUND] = TM_MP_CHARACTER_SELECTED_SONIC_BG, [ASSET_CHARACTER] = TM_MP_CHARACTER_SELECTED_SONIC },
     [CHARACTER_CREAM]
-    = { [ASSET_CHARACTER_BACKGROUND] = TM_MP_CHARACTER_SELECTED_CREAM_BG,
-        [ASSET_CHARACTER] = TM_MP_CHARACTER_SELECTED_CREAM },
+    = { [ASSET_CHARACTER_BACKGROUND] = TM_MP_CHARACTER_SELECTED_CREAM_BG, [ASSET_CHARACTER] = TM_MP_CHARACTER_SELECTED_CREAM },
     [CHARACTER_TAILS]
-    = { [ASSET_CHARACTER_BACKGROUND] = TM_MP_CHARACTER_SELECTED_TAILS_BG,
-        [ASSET_CHARACTER] = TM_MP_CHARACTER_SELECTED_TAILS },
+    = { [ASSET_CHARACTER_BACKGROUND] = TM_MP_CHARACTER_SELECTED_TAILS_BG, [ASSET_CHARACTER] = TM_MP_CHARACTER_SELECTED_TAILS },
     [CHARACTER_KNUCKLES]
-    = { [ASSET_CHARACTER_BACKGROUND] = TM_MP_CHARACTER_SELECTED_KNUCKLES_BG,
-        [ASSET_CHARACTER] = TM_MP_CHARACTER_SELECTED_KNUCKLES },
-    [CHARACTER_AMY] = { [ASSET_CHARACTER_BACKGROUND] = TM_MP_CHARACTER_SELECTED_AMY_BG,
-                        [ASSET_CHARACTER] = TM_MP_CHARACTER_SELECTED_AMY },
+    = { [ASSET_CHARACTER_BACKGROUND] = TM_MP_CHARACTER_SELECTED_KNUCKLES_BG, [ASSET_CHARACTER] = TM_MP_CHARACTER_SELECTED_KNUCKLES },
+    [CHARACTER_AMY] = { [ASSET_CHARACTER_BACKGROUND] = TM_MP_CHARACTER_SELECTED_AMY_BG, [ASSET_CHARACTER] = TM_MP_CHARACTER_SELECTED_AMY },
 };
 
 const u16 gUnknown_080D95A4[] = {
@@ -978,11 +966,10 @@ const struct UNK_080D95E8 sMultiplayerRecordsTitleAndColumnHeadersText[NUM_LANGU
 };
 
 const struct UNK_080D95E8 sMultiplayerScoreDigitTiles[10] = {
-    { .unk0 = 1119, .unk2 = 16, .unk4 = 2 }, { .unk0 = 1119, .unk2 = 17, .unk4 = 2 },
-    { .unk0 = 1119, .unk2 = 18, .unk4 = 2 }, { .unk0 = 1119, .unk2 = 19, .unk4 = 2 },
-    { .unk0 = 1119, .unk2 = 20, .unk4 = 2 }, { .unk0 = 1119, .unk2 = 21, .unk4 = 2 },
-    { .unk0 = 1119, .unk2 = 22, .unk4 = 2 }, { .unk0 = 1119, .unk2 = 23, .unk4 = 2 },
-    { .unk0 = 1119, .unk2 = 24, .unk4 = 2 }, { .unk0 = 1119, .unk2 = 25, .unk4 = 2 },
+    { .unk0 = 1119, .unk2 = 16, .unk4 = 2 }, { .unk0 = 1119, .unk2 = 17, .unk4 = 2 }, { .unk0 = 1119, .unk2 = 18, .unk4 = 2 },
+    { .unk0 = 1119, .unk2 = 19, .unk4 = 2 }, { .unk0 = 1119, .unk2 = 20, .unk4 = 2 }, { .unk0 = 1119, .unk2 = 21, .unk4 = 2 },
+    { .unk0 = 1119, .unk2 = 22, .unk4 = 2 }, { .unk0 = 1119, .unk2 = 23, .unk4 = 2 }, { .unk0 = 1119, .unk2 = 24, .unk4 = 2 },
+    { .unk0 = 1119, .unk2 = 25, .unk4 = 2 },
 };
 
 const struct UNK_080D95E8 sTimeRecordsChoiceViewTitles[NUM_LANGUAGES] = {
@@ -1021,9 +1008,8 @@ const struct UNK_080D95E8 sTimeRecordsScreenChoices[NUM_LANGUAGES][2] = {
 };
 
 const struct UNK_080D95E8 sTimeRecordsZoneActTitleDigits[7] = {
-    { .unk0 = 1048, .unk2 = 2, .unk4 = 4 }, { .unk0 = 1048, .unk2 = 3, .unk4 = 6 },
-    { .unk0 = 1048, .unk2 = 4, .unk4 = 6 }, { .unk0 = 1048, .unk2 = 5, .unk4 = 6 },
-    { .unk0 = 1048, .unk2 = 6, .unk4 = 6 }, { .unk0 = 1048, .unk2 = 7, .unk4 = 6 },
+    { .unk0 = 1048, .unk2 = 2, .unk4 = 4 }, { .unk0 = 1048, .unk2 = 3, .unk4 = 6 }, { .unk0 = 1048, .unk2 = 4, .unk4 = 6 },
+    { .unk0 = 1048, .unk2 = 5, .unk4 = 6 }, { .unk0 = 1048, .unk2 = 6, .unk4 = 6 }, { .unk0 = 1048, .unk2 = 7, .unk4 = 6 },
     { .unk0 = 1048, .unk2 = 8, .unk4 = 6 },
 };
 
@@ -1162,8 +1148,7 @@ void CreateOptionsScreen(u16 p1)
 
     m4aSongNumStart(MUS_OPTIONS);
 
-    t = TaskCreate(Task_OptionsScreenShow, sizeof(struct OptionsScreen), 0x1000,
-                   TASK_x0004, OptionsScreenTaskDestroyHandler);
+    t = TaskCreate(Task_OptionsScreenShow, sizeof(struct OptionsScreen), 0x1000, TASK_x0004, OptionsScreenTaskDestroyHandler);
     optionsScreen = TASK_DATA(t);
 
     ReadProfileData(optionsScreen);
@@ -1187,12 +1172,9 @@ void CreateOptionsScreen(u16 p1)
 // and selecting a time attack course is the same,
 // except the mode is TIME_ATTACK
 // so this is within the profile source.
-void CreateTimeAttackLevelSelectScreen(bool16 isBossView, s16 selectedCharacter,
-                                       s8 unused_currentLevel)
+void CreateTimeAttackLevelSelectScreen(bool16 isBossView, s16 selectedCharacter, s8 unused_currentLevel)
 {
-    struct Task *t
-        = TaskCreate(Task_TimeRecordsScreenCreateTimesUI,
-                     sizeof(struct TimeRecordsScreen), 0x2000, TASK_x0004, NULL);
+    struct Task *t = TaskCreate(Task_TimeRecordsScreenCreateTimesUI, sizeof(struct TimeRecordsScreen), 0x2000, TASK_x0004, NULL);
     struct TimeRecordsScreen *timeRecordsScreen = TASK_DATA(t);
     s16 i;
 
@@ -1219,8 +1201,7 @@ void CreateTimeAttackLevelSelectScreen(bool16 isBossView, s16 selectedCharacter,
         timeRecordsScreen->language = LanguageIndex(LANG_ENGLISH);
     }
 
-    memcpy(timeRecordsScreen->timeRecords, &gLoadedSaveGame->timeRecords,
-           sizeof(struct TimeRecords));
+    memcpy(timeRecordsScreen->timeRecords, &gLoadedSaveGame->timeRecords, sizeof(struct TimeRecords));
 
     ResetProfileScreensVram();
 
@@ -1237,8 +1218,7 @@ void CreateNewProfileScreen(void)
 
     ShuffleRngSeed();
 
-    t = TaskCreate(Task_LanguageScreenFadeIn, sizeof(struct LanguageScreen), 0x2000,
-                   TASK_x0004, NULL);
+    t = TaskCreate(Task_LanguageScreenFadeIn, sizeof(struct LanguageScreen), 0x2000, TASK_x0004, NULL);
     languageScreen = TASK_DATA(t);
 
     languageScreen->optionsScreen = NULL;
@@ -1258,18 +1238,15 @@ void CreateNewProfileScreen(void)
 
 void CreateNewProfileNameScreen(s16 mode)
 {
-    struct Task *t
-        = TaskCreate(Task_ProfileNameScreenFadeIn, sizeof(struct ProfileNameScreen),
-                     0x2000, TASK_x0004, NULL);
+    struct Task *t = TaskCreate(Task_ProfileNameScreenFadeIn, sizeof(struct ProfileNameScreen), 0x2000, TASK_x0004, NULL);
     struct ProfileNameScreen *profileNameScreen = TASK_DATA(t);
     s16 i;
 
     profileNameScreen->playerDataMenu = NULL;
     profileNameScreen->language = LanguageIndex(gLoadedSaveGame->language);
 
-    profileNameScreen->onCompleteAction = mode == NEW_PROFILE_NAME_START_GAME
-        ? NAME_SCREEN_COMPLETE_ACTION_START_GAME
-        : NAME_SCREEN_COMPLETE_ACTION_MULTIPLAYER;
+    profileNameScreen->onCompleteAction
+        = mode == NEW_PROFILE_NAME_START_GAME ? NAME_SCREEN_COMPLETE_ACTION_START_GAME : NAME_SCREEN_COMPLETE_ACTION_MULTIPLAYER;
     profileNameScreen->cursorCol = 0;
 
     if (profileNameScreen->language == LanguageIndex(LANG_JAPANESE)) {
@@ -1309,8 +1286,7 @@ static void ReadProfileData(struct OptionsScreen *optionsScreen)
 
     memcpy(profile->playerName, saveGame->playerName, sizeof(saveGame->playerName));
     memcpy(&profile->timeRecords, &saveGame->timeRecords, sizeof(saveGame->timeRecords));
-    memcpy(profile->multiplayerScores, saveGame->multiplayerScores,
-           sizeof(saveGame->multiplayerScores));
+    memcpy(profile->multiplayerScores, saveGame->multiplayerScores, sizeof(saveGame->multiplayerScores));
 
     profile->multiplayerWins = saveGame->multiplayerWins;
     profile->multiplayerLoses = saveGame->multiplayerLoses;
@@ -1364,8 +1340,7 @@ static void StoreProfileData(struct OptionsScreen *optionsScreen)
     memcpy(saveGame->playerName, profile->playerName, sizeof(profile->playerName));
     saveGame->timeRecords = profile->timeRecords;
 
-    memcpy(saveGame->multiplayerScores, profile->multiplayerScores,
-           sizeof(struct MultiplayerScore));
+    memcpy(saveGame->multiplayerScores, profile->multiplayerScores, sizeof(struct MultiplayerScore));
 
     saveGame->multiplayerWins = profile->multiplayerWins;
     saveGame->multiplayerLoses = profile->multiplayerLoses;
@@ -1432,14 +1407,12 @@ static void OptionsScreenCreateUI(struct OptionsScreen *optionsScreen, s16 state
 
     {
         const struct UNK_080D95E8 *titleText = &sOptionsScreenTitleText[language];
-        sub_806A568(title, RENDER_TARGET_SCREEN, titleText->unk4, titleText->unk0,
-                    0x3000, 0, 0xF, 0xF, titleText->unk2, 0);
+        sub_806A568(title, RENDER_TARGET_SCREEN, titleText->unk4, titleText->unk0, 0x3000, 0, 0xF, 0xF, titleText->unk2, 0);
     }
 
     for (i = 0, yPos = 30; i < NUM_OPTIONS_MENU_ITEMS; i++, menuItem++) {
         if (optionsScreen->soundTestUnlocked || i != OPTIONS_MENU_ITEM_SOUND_TEST) {
-            const struct UNK_080D95E8 *itemText
-                = &sOptionsScreenMenuItemsText[language][i];
+            const struct UNK_080D95E8 *itemText = &sOptionsScreenMenuItemsText[language][i];
 
             if (optionsScreen->menuCursor == i) {
                 xPos = 32;
@@ -1447,12 +1420,10 @@ static void OptionsScreenCreateUI(struct OptionsScreen *optionsScreen, s16 state
                 xPos = 40;
             }
 
-            if (state == OPTIONS_SCREEN_STATE_SUB_MENU_OPEN
-                && i == OPTIONS_MENU_ITEM_PLAYER_DATA) {
+            if (state == OPTIONS_SCREEN_STATE_SUB_MENU_OPEN && i == OPTIONS_MENU_ITEM_PLAYER_DATA) {
                 xPos = -184;
             }
-            sub_806A568(menuItem, RENDER_TARGET_SCREEN, itemText->unk4, itemText->unk0,
-                        0x3000, xPos, yPos, 0xD, itemText->unk2, 0);
+            sub_806A568(menuItem, RENDER_TARGET_SCREEN, itemText->unk4, itemText->unk0, 0x3000, xPos, yPos, 0xD, itemText->unk2, 0);
             yPos += 15;
         }
     }
@@ -1462,40 +1433,33 @@ static void OptionsScreenCreateUI(struct OptionsScreen *optionsScreen, s16 state
         if (state == OPTIONS_SCREEN_STATE_SUB_MENU_OPEN) {
             xPos = -64;
         }
-        sub_806A568(metaItem, RENDER_TARGET_SCREEN, 0x12, 0x3BA, 0x3000, xPos, 30, 0xC,
-                    0, 0);
+        sub_806A568(metaItem, RENDER_TARGET_SCREEN, 0x12, 0x3BA, 0x3000, xPos, 30, 0xC, 0, 0);
         ++metaItem;
     }
 
     {
-        const struct UNK_080D95E8 *difficultyLevelText
-            = &sDifficultyLevelSwitchText[language][optionsScreen->difficultyLevel];
+        const struct UNK_080D95E8 *difficultyLevelText = &sDifficultyLevelSwitchText[language][optionsScreen->difficultyLevel];
         xPos = optionsScreen->menuCursor == OPTIONS_MENU_ITEM_DIFFICULTY ? 152 : 160;
 
-        sub_806A568(metaItem, RENDER_TARGET_SCREEN, difficultyLevelText->unk4,
-                    difficultyLevelText->unk0, 0x3000, xPos, 45, 10,
+        sub_806A568(metaItem, RENDER_TARGET_SCREEN, difficultyLevelText->unk4, difficultyLevelText->unk0, 0x3000, xPos, 45, 10,
                     difficultyLevelText->unk2, 0);
         ++metaItem;
     }
 
     {
-        const struct UNK_080D95E8 *timeLimitSwitchText
-            = &sTimeLimitMenuSwitchText[language][optionsScreen->timeLimitDisabled];
+        const struct UNK_080D95E8 *timeLimitSwitchText = &sTimeLimitMenuSwitchText[language][optionsScreen->timeLimitDisabled];
         xPos = optionsScreen->menuCursor == OPTIONS_MENU_ITEM_TIME_LIMIT ? 152 : 160;
 
-        sub_806A568(metaItem, RENDER_TARGET_SCREEN, timeLimitSwitchText->unk4,
-                    timeLimitSwitchText->unk0, 0x3000, xPos, 0x3C, 10,
+        sub_806A568(metaItem, RENDER_TARGET_SCREEN, timeLimitSwitchText->unk4, timeLimitSwitchText->unk0, 0x3000, xPos, 0x3C, 10,
                     timeLimitSwitchText->unk2, 0);
         ++metaItem;
     }
 
     {
-        const struct UNK_080D95E8 *languageText
-            = &sOptionsScreenSelectedLanguageText[language];
+        const struct UNK_080D95E8 *languageText = &sOptionsScreenSelectedLanguageText[language];
         xPos = optionsScreen->menuCursor == OPTIONS_MENU_ITEM_LANGUAGE ? 152 : 160;
 
-        sub_806A568(metaItem, RENDER_TARGET_SCREEN, languageText->unk4,
-                    languageText->unk0, 0x3000, xPos, 0x4B, 10, languageText->unk2, 0);
+        sub_806A568(metaItem, RENDER_TARGET_SCREEN, languageText->unk4, languageText->unk0, 0x3000, xPos, 0x4B, 10, languageText->unk2, 0);
     }
     {
         bool32 finishedReadingName;
@@ -1506,8 +1470,7 @@ static void OptionsScreenCreateUI(struct OptionsScreen *optionsScreen, s16 state
             xPos = -53;
         }
 
-        for (i = 0, yPos = 38, finishedReadingName = FALSE; i < MAX_PLAYER_NAME_LENGTH;
-             i++, playerNameDisplayChar++, xPos += 10) {
+        for (i = 0, yPos = 38, finishedReadingName = FALSE; i < MAX_PLAYER_NAME_LENGTH; i++, playerNameDisplayChar++, xPos += 10) {
             if (finishedReadingName) {
                 nameChar = 0x11;
             } else {
@@ -1520,8 +1483,8 @@ static void OptionsScreenCreateUI(struct OptionsScreen *optionsScreen, s16 state
             }
 
             nameCharTile = sub_806B908(nameChar);
-            sub_806A568(playerNameDisplayChar, RENDER_TARGET_SCREEN, nameCharTile.unk0,
-                        nameCharTile.unk4, 0x3000, xPos, yPos, 10, nameCharTile.unk6, 0);
+            sub_806A568(playerNameDisplayChar, RENDER_TARGET_SCREEN, nameCharTile.unk0, nameCharTile.unk4, 0x3000, xPos, yPos, 10,
+                        nameCharTile.unk6, 0);
             playerNameDisplayChar->palId = optionsScreen->menuCursor == 0 ? 7 : 8;
         }
     }
@@ -1598,8 +1561,7 @@ static void Task_OptionsScreenMain(void)
         }
 
         // Skip the soundtest menu index if not available
-        if (!optionsScreen->soundTestUnlocked
-            && optionsScreen->menuCursor == OPTIONS_MENU_ITEM_SOUND_TEST) {
+        if (!optionsScreen->soundTestUnlocked && optionsScreen->menuCursor == OPTIONS_MENU_ITEM_SOUND_TEST) {
             optionsScreen->menuCursor++;
         }
         optionsScreen->subMenuAnimFrame = 0;
@@ -1617,8 +1579,7 @@ static void Task_OptionsScreenMain(void)
             optionsScreen->menuCursor--;
         }
 
-        if (!optionsScreen->soundTestUnlocked
-            && optionsScreen->menuCursor == OPTIONS_MENU_ITEM_SOUND_TEST) {
+        if (!optionsScreen->soundTestUnlocked && optionsScreen->menuCursor == OPTIONS_MENU_ITEM_SOUND_TEST) {
             optionsScreen->menuCursor--;
         }
 
@@ -1627,8 +1588,7 @@ static void Task_OptionsScreenMain(void)
     }
 }
 
-static inline void NextMenuCursorAnimFrame(struct OptionsScreen *optionsScreen,
-                                           s8 subMenuAnimPos)
+static inline void NextMenuCursorAnimFrame(struct OptionsScreen *optionsScreen, s8 subMenuAnimPos)
 {
     s16 baseXPos;
     Sprite *item;
@@ -1660,8 +1620,7 @@ static inline void NextMenuCursorAnimFrame(struct OptionsScreen *optionsScreen,
     gBgScrollRegs[2][0] = baseXPos;
 }
 
-static inline void PrevMenuCursorAnimFrame(struct OptionsScreen *optionsScreen,
-                                           s8 baseXPos)
+static inline void PrevMenuCursorAnimFrame(struct OptionsScreen *optionsScreen, s8 baseXPos)
 {
     Sprite *item = &optionsScreen->menuItems[optionsScreen->prevCursorPosition];
 
@@ -1689,12 +1648,8 @@ static void Task_OptionsScreenMenuCursorMoveAnim(void)
     struct OptionsScreen *optionsScreen = TASK_DATA(gCurTask);
     s16 animFrame = optionsScreen->subMenuAnimFrame;
 
-    NextMenuCursorAnimFrame(
-        optionsScreen,
-        sMenuCursorMoveAnims[OPTIONS_SCREEN_NEXT_CURSOR_MOVE_ANIMS][animFrame]);
-    PrevMenuCursorAnimFrame(
-        optionsScreen,
-        sMenuCursorMoveAnims[OPTIONS_SCREEN_PREV_CURSOR_MOVE_ANIMS][animFrame]);
+    NextMenuCursorAnimFrame(optionsScreen, sMenuCursorMoveAnims[OPTIONS_SCREEN_NEXT_CURSOR_MOVE_ANIMS][animFrame]);
+    PrevMenuCursorAnimFrame(optionsScreen, sMenuCursorMoveAnims[OPTIONS_SCREEN_PREV_CURSOR_MOVE_ANIMS][animFrame]);
 
     OptionsScreenRenderUI();
 
@@ -1703,11 +1658,9 @@ static void Task_OptionsScreenMenuCursorMoveAnim(void)
     }
 }
 
-static inline void SubMenuAnimFrame(struct OptionsScreen *optionsScreen,
-                                    const s16 *animFrames)
+static inline void SubMenuAnimFrame(struct OptionsScreen *optionsScreen, const s16 *animFrames)
 {
-    s16 baseXPos = optionsScreen->subMenuXPos
-        = animFrames[optionsScreen->subMenuAnimFrame];
+    s16 baseXPos = optionsScreen->subMenuXPos = animFrames[optionsScreen->subMenuAnimFrame];
     Sprite *item = &optionsScreen->menuItems[optionsScreen->menuCursor];
 
     item->x = baseXPos + 32;
@@ -1771,8 +1724,7 @@ static void Task_OptionsScreenWaitForLanguageScreenExit(void)
     ResetProfileScreensVram();
 
     OptionsScreenInitRegisters(optionsScreen, OPTIONS_SCREEN_STATE_ACTIVE);
-    SetupOptionScreenBackgrounds(optionsScreen->background,
-                                 optionsScreen->subMenuBackground);
+    SetupOptionScreenBackgrounds(optionsScreen->background, optionsScreen->subMenuBackground);
     OptionsScreenCreateUI(optionsScreen, OPTIONS_SCREEN_STATE_ACTIVE);
 
     fade->window = 0;
@@ -1797,8 +1749,7 @@ static void Task_OptionsScreenWaitForSoundTestExit(void)
     ResetProfileScreensVram();
 
     OptionsScreenInitRegisters(optionsScreen, OPTIONS_SCREEN_STATE_ACTIVE);
-    SetupOptionScreenBackgrounds(optionsScreen->background,
-                                 optionsScreen->subMenuBackground);
+    SetupOptionScreenBackgrounds(optionsScreen->background, optionsScreen->subMenuBackground);
     OptionsScreenCreateUI(optionsScreen, OPTIONS_SCREEN_STATE_ACTIVE);
 
     fade->window = 0;
@@ -1831,8 +1782,7 @@ static void Task_OptionsScreenWaitForDeleteScreenExit(void)
     optionsScreen->language = language;
 
     OptionsScreenInitRegisters(optionsScreen, OPTIONS_SCREEN_STATE_ACTIVE);
-    SetupOptionScreenBackgrounds(optionsScreen->background,
-                                 optionsScreen->subMenuBackground);
+    SetupOptionScreenBackgrounds(optionsScreen->background, optionsScreen->subMenuBackground);
     OptionsScreenCreateUI(optionsScreen, OPTIONS_SCREEN_STATE_ACTIVE);
 
     fade->window = 0;
@@ -1878,8 +1828,7 @@ static void OptionsScreenRenderUI(void)
 
 static void CreatePlayerDataMenu(struct OptionsScreen *optionsScreen)
 {
-    struct Task *t = TaskCreate(Task_PlayerDataMenuOpenAnimWait,
-                                sizeof(struct PlayerDataMenu), 0x2000, TASK_x0004, NULL);
+    struct Task *t = TaskCreate(Task_PlayerDataMenuOpenAnimWait, sizeof(struct PlayerDataMenu), 0x2000, TASK_x0004, NULL);
     struct PlayerDataMenu *playerDataMenu = TASK_DATA(t);
 
     s16 initialCursorPos;
@@ -1903,12 +1852,9 @@ static void PlayerDataMenuCreateUI(struct PlayerDataMenu *playerDataMenu)
     Sprite *menuItem = playerDataMenu->menuItems;
     Sprite *menuItemOutline = &playerDataMenu->menuItemOutline;
 
-    const struct UNK_080D95E8 *titleText
-        = &sPlayerDataMenuTitleText[playerDataMenu->language];
-    const struct UNK_080D95E8 *footerText
-        = &sPlayerDataMenuControlsText[playerDataMenu->language];
-    const struct UNK_080D95E8 *menuItemText
-        = sPlayerDataMenuItemsText[playerDataMenu->language];
+    const struct UNK_080D95E8 *titleText = &sPlayerDataMenuTitleText[playerDataMenu->language];
+    const struct UNK_080D95E8 *footerText = &sPlayerDataMenuControlsText[playerDataMenu->language];
+    const struct UNK_080D95E8 *menuItemText = sPlayerDataMenuItemsText[playerDataMenu->language];
 
     s16 baseXPos = playerDataMenu->optionsScreen->subMenuXPos;
     s16 menuCursor = playerDataMenu->menuCursor;
@@ -1916,18 +1862,16 @@ static void PlayerDataMenuCreateUI(struct PlayerDataMenu *playerDataMenu)
     s16 i, yPos;
 
     // Title
-    sub_806A568(&headerFooter[0], RENDER_TARGET_SUB_MENU, titleText->unk4,
-                titleText->unk0, 0x1000, baseXPos + 336, 32, 8, titleText->unk2, 0);
+    sub_806A568(&headerFooter[0], RENDER_TARGET_SUB_MENU, titleText->unk4, titleText->unk0, 0x1000, baseXPos + 336, 32, 8, titleText->unk2,
+                0);
 
     // Controls
-    sub_806A568(&headerFooter[1], RENDER_TARGET_SUB_MENU, footerText->unk4,
-                footerText->unk0, 0x1000, baseXPos + 336, 132, 8, footerText->unk2, 0);
+    sub_806A568(&headerFooter[1], RENDER_TARGET_SUB_MENU, footerText->unk4, footerText->unk0, 0x1000, baseXPos + 336, 132, 8,
+                footerText->unk2, 0);
 
     // Menu items
-    for (i = 0, yPos = 46; i < NUM_PLAYER_DATA_MENU_ITEMS;
-         i++, menuItem++, menuItemText++, yPos += 19) {
-        sub_806A568(menuItem, RENDER_TARGET_SUB_MENU, menuItemText->unk4,
-                    menuItemText->unk0, 0x1000, baseXPos + 256, yPos, 8,
+    for (i = 0, yPos = 46; i < NUM_PLAYER_DATA_MENU_ITEMS; i++, menuItem++, menuItemText++, yPos += 19) {
+        sub_806A568(menuItem, RENDER_TARGET_SUB_MENU, menuItemText->unk4, menuItemText->unk0, 0x1000, baseXPos + 256, yPos, 8,
                     menuItemText->unk2, 0);
 
         // Interesting to note that gcc
@@ -1936,8 +1880,7 @@ static void PlayerDataMenuCreateUI(struct PlayerDataMenu *playerDataMenu)
         menuItem->palId = (menuCursor ^ i) ? 1 : 0;
     }
 
-    sub_806A568(menuItemOutline, RENDER_TARGET_SUB_MENU, 0x3f, 0x3bd, 0x1000,
-                baseXPos + 254, menuCursor * 19 + 46, 7, 5, 0);
+    sub_806A568(menuItemOutline, RENDER_TARGET_SUB_MENU, 0x3f, 0x3bd, 0x1000, baseXPos + 254, menuCursor * 19 + 46, 7, 5, 0);
 }
 
 static void Task_PlayerDataMenuOpenAnimWait(void)
@@ -2058,20 +2001,16 @@ static void Task_PlayerDataMenuCloseAnim(void)
     }
 }
 
-static inline void
-OptionsScreenRecreateUIForPlayerDataMenu(struct PlayerDataMenu *playerDataMenu,
-                                         ScreenFade *fade)
+static inline void OptionsScreenRecreateUIForPlayerDataMenu(struct PlayerDataMenu *playerDataMenu, ScreenFade *fade)
 {
     struct OptionsScreen *optionsScreen;
 
     ResetProfileScreensVram();
 
-    OptionsScreenInitRegisters(playerDataMenu->optionsScreen,
-                               OPTIONS_SCREEN_STATE_SUB_MENU_OPEN);
+    OptionsScreenInitRegisters(playerDataMenu->optionsScreen, OPTIONS_SCREEN_STATE_SUB_MENU_OPEN);
 
     optionsScreen = playerDataMenu->optionsScreen;
-    SetupOptionScreenBackgrounds(optionsScreen->background,
-                                 optionsScreen->subMenuBackground);
+    SetupOptionScreenBackgrounds(optionsScreen->background, optionsScreen->subMenuBackground);
     OptionsScreenCreateUI(playerDataMenu->optionsScreen, 1);
     PlayerDataMenuCreateUI(playerDataMenu);
 
@@ -2145,41 +2084,33 @@ static void DifficultyMenuCreateUI(struct SwitchMenu *difficultyMenu)
     Sprite *difficultyOption = difficultyMenu->options;
     Sprite *switchValueOutline = &difficultyMenu->switchValueOutline;
 
-    const struct UNK_080D95E8 *titleText
-        = &sDifficultyMenuTitleText[difficultyMenu->language];
-    const struct UNK_080D95E8 *footerText
-        = &sDifficultyMenuControlsText[difficultyMenu->language];
-    const struct UNK_080D95E8 *difficultyLevelText
-        = sDifficultyLevelSwitchText[difficultyMenu->language];
+    const struct UNK_080D95E8 *titleText = &sDifficultyMenuTitleText[difficultyMenu->language];
+    const struct UNK_080D95E8 *footerText = &sDifficultyMenuControlsText[difficultyMenu->language];
+    const struct UNK_080D95E8 *difficultyLevelText = sDifficultyLevelSwitchText[difficultyMenu->language];
 
     s16 baseXPos = difficultyMenu->optionsScreen->subMenuXPos;
     s16 difficultyLevel = difficultyMenu->switchValue;
     s16 i;
 
-    sub_806A568(headerFooter, RENDER_TARGET_SUB_MENU, titleText->unk4, titleText->unk0,
-                0x1000, baseXPos + 336, 50, 8, titleText->unk2, 0);
+    sub_806A568(headerFooter, RENDER_TARGET_SUB_MENU, titleText->unk4, titleText->unk0, 0x1000, baseXPos + 336, 50, 8, titleText->unk2, 0);
 
     headerFooter++;
-    sub_806A568(headerFooter, RENDER_TARGET_SUB_MENU, footerText->unk4, footerText->unk0,
-                0x1000, baseXPos + 336, 116, 8, footerText->unk2, 0);
+    sub_806A568(headerFooter, RENDER_TARGET_SUB_MENU, footerText->unk4, footerText->unk0, 0x1000, baseXPos + 336, 116, 8, footerText->unk2,
+                0);
 
     // Normal
-    sub_806A568(difficultyOption, RENDER_TARGET_SUB_MENU, difficultyLevelText->unk4,
-                difficultyLevelText->unk0, 0x1000, baseXPos + 274, 76, 8,
-                difficultyLevelText->unk2, 0);
+    sub_806A568(difficultyOption, RENDER_TARGET_SUB_MENU, difficultyLevelText->unk4, difficultyLevelText->unk0, 0x1000, baseXPos + 274, 76,
+                8, difficultyLevelText->unk2, 0);
 
     difficultyOption++;
     difficultyLevelText++;
     // Easy
-    sub_806A568(difficultyOption, RENDER_TARGET_SUB_MENU, difficultyLevelText->unk4,
-                difficultyLevelText->unk0, 0x1000, baseXPos + 334, 76, 8,
-                difficultyLevelText->unk2, 0);
+    sub_806A568(difficultyOption, RENDER_TARGET_SUB_MENU, difficultyLevelText->unk4, difficultyLevelText->unk0, 0x1000, baseXPos + 334, 76,
+                8, difficultyLevelText->unk2, 0);
 
-    sub_806A568(switchValueOutline, RENDER_TARGET_SUB_MENU, 0x12, 0x3b8, 0x1000,
-                difficultyLevel * 60 + 272, 76, 7, 3, 0);
+    sub_806A568(switchValueOutline, RENDER_TARGET_SUB_MENU, 0x12, 0x3b8, 0x1000, difficultyLevel * 60 + 272, 76, 7, 3, 0);
 
-    for (i = 0, difficultyOption = difficultyMenu->options; i < 2;
-         i++, difficultyOption++) {
+    for (i = 0, difficultyOption = difficultyMenu->options; i < 2; i++, difficultyOption++) {
         difficultyOption->palId = (difficultyLevel ^ i) ? 1 : 0;
     }
 }
@@ -2230,8 +2161,7 @@ static void Task_DifficultyMenuMain(void)
             difficultyOption->palId = (difficultyMenu->switchValue ^ i) ? 1 : 0;
         }
 
-        switchValueOutline->x
-            = baseXPos + 272 + UI_COLUMN(difficultyMenu->switchValue, 60);
+        switchValueOutline->x = baseXPos + 272 + UI_COLUMN(difficultyMenu->switchValue, 60);
     }
 
     DifficultyMenuRenderUI();
@@ -2241,8 +2171,7 @@ static void Task_DifficultyMenuMain(void)
     }
 
     if (gPressedKeys & A_BUTTON) {
-        const struct UNK_080D95E8 *difficultyLevelText
-            = &sDifficultyLevelSwitchText[language][difficultyMenu->switchValue];
+        const struct UNK_080D95E8 *difficultyLevelText = &sDifficultyLevelSwitchText[language][difficultyMenu->switchValue];
 
         difficultyOption = &optionsScreen->metaItems[OPTIONS_META_ITEM_DIFFICULTY_LEVEL];
         difficultyOption->variant = difficultyLevelText->unk2;
@@ -2297,42 +2226,34 @@ static void TimeLimitMenuCreateUI(struct SwitchMenu *timeLimitMenu)
     Sprite *timeLimitOption = timeLimitMenu->options;
     Sprite *switchValueOutline = &timeLimitMenu->switchValueOutline;
 
-    const struct UNK_080D95E8 *titleText
-        = &sTimeLimitMenuTitleText[timeLimitMenu->language];
-    const struct UNK_080D95E8 *footerText
-        = &sTimeLimitMenuControlsText[timeLimitMenu->language];
-    const struct UNK_080D95E8 *timeLimitSwitchText
-        = sTimeLimitMenuSwitchText[timeLimitMenu->language];
+    const struct UNK_080D95E8 *titleText = &sTimeLimitMenuTitleText[timeLimitMenu->language];
+    const struct UNK_080D95E8 *footerText = &sTimeLimitMenuControlsText[timeLimitMenu->language];
+    const struct UNK_080D95E8 *timeLimitSwitchText = sTimeLimitMenuSwitchText[timeLimitMenu->language];
 
     s16 baseXPos = timeLimitMenu->optionsScreen->subMenuXPos;
     s16 timeLimitDisabled = timeLimitMenu->switchValue;
     s16 i;
 
     // TODO: can these be a macro?
-    sub_806A568(headerFooter, RENDER_TARGET_SUB_MENU, titleText->unk4, titleText->unk0,
-                0x1000, baseXPos + 336, 50, 8, titleText->unk2, 0);
+    sub_806A568(headerFooter, RENDER_TARGET_SUB_MENU, titleText->unk4, titleText->unk0, 0x1000, baseXPos + 336, 50, 8, titleText->unk2, 0);
 
     headerFooter++;
-    sub_806A568(headerFooter, RENDER_TARGET_SUB_MENU, footerText->unk4, footerText->unk0,
-                0x1000, baseXPos + 336, 116, 8, footerText->unk2, 0);
+    sub_806A568(headerFooter, RENDER_TARGET_SUB_MENU, footerText->unk4, footerText->unk0, 0x1000, baseXPos + 336, 116, 8, footerText->unk2,
+                0);
 
     // On
-    sub_806A568(timeLimitOption, RENDER_TARGET_SUB_MENU, timeLimitSwitchText->unk4,
-                timeLimitSwitchText->unk0, 0x1000, baseXPos + 274, 76, 8,
-                timeLimitSwitchText->unk2, 0);
+    sub_806A568(timeLimitOption, RENDER_TARGET_SUB_MENU, timeLimitSwitchText->unk4, timeLimitSwitchText->unk0, 0x1000, baseXPos + 274, 76,
+                8, timeLimitSwitchText->unk2, 0);
 
     timeLimitOption++;
     timeLimitSwitchText++;
     // Off
-    sub_806A568(timeLimitOption, RENDER_TARGET_SUB_MENU, timeLimitSwitchText->unk4,
-                timeLimitSwitchText->unk0, 0x1000, baseXPos + 334, 76, 8,
-                timeLimitSwitchText->unk2, 0);
+    sub_806A568(timeLimitOption, RENDER_TARGET_SUB_MENU, timeLimitSwitchText->unk4, timeLimitSwitchText->unk0, 0x1000, baseXPos + 334, 76,
+                8, timeLimitSwitchText->unk2, 0);
 
-    sub_806A568(switchValueOutline, RENDER_TARGET_SUB_MENU, 0x12, 0x3b8, 0x1000,
-                timeLimitDisabled * 60 + 272, 76, 7, 3, 0);
+    sub_806A568(switchValueOutline, RENDER_TARGET_SUB_MENU, 0x12, 0x3b8, 0x1000, timeLimitDisabled * 60 + 272, 76, 7, 3, 0);
 
-    for (i = 0, timeLimitOption = timeLimitMenu->options; i < 2;
-         i++, timeLimitOption++) {
+    for (i = 0, timeLimitOption = timeLimitMenu->options; i < 2; i++, timeLimitOption++) {
         timeLimitOption->palId = (timeLimitDisabled ^ i) ? 1 : 0;
     }
 }
@@ -2384,8 +2305,7 @@ static void Task_TimeLimitMenuMain(void)
             timeLimitOption->palId = (timeLimitMenu->switchValue ^ i) ? 1 : 0;
         }
 
-        switchValueOutline->x
-            = baseXPos + 272 + UI_COLUMN(timeLimitMenu->switchValue, 60);
+        switchValueOutline->x = baseXPos + 272 + UI_COLUMN(timeLimitMenu->switchValue, 60);
     }
 
     TimeLimitMenuRenderUI();
@@ -2395,8 +2315,7 @@ static void Task_TimeLimitMenuMain(void)
     }
 
     if (gPressedKeys & A_BUTTON) {
-        const struct UNK_080D95E8 *itemText3
-            = &sTimeLimitMenuSwitchText[language][timeLimitMenu->switchValue];
+        const struct UNK_080D95E8 *itemText3 = &sTimeLimitMenuSwitchText[language][timeLimitMenu->switchValue];
         // Except this is different
         timeLimitOption = &optionsScreen->metaItems[OPTIONS_META_ITEM_TIME_LIMIT];
 
@@ -2446,8 +2365,7 @@ static void Task_TimeLimitMenuCloseAnim(void)
 
 static void CreateButtonConfigMenu(struct OptionsScreen *optionsScreen)
 {
-    struct Task *t = TaskCreate(Task_ButtonConfigMenuOpenAnimWait,
-                                sizeof(struct ButtonConfigMenu), 0x2000, 4, NULL);
+    struct Task *t = TaskCreate(Task_ButtonConfigMenuOpenAnimWait, sizeof(struct ButtonConfigMenu), 0x2000, 4, NULL);
     struct ButtonConfigMenu *buttonConfigMenu = TASK_DATA(t);
 
     buttonConfigMenu->optionsScreen = optionsScreen;
@@ -2501,80 +2419,66 @@ static void ButtonConfigMenuCreateUI(struct ButtonConfigMenu *buttonConfigMenu)
     Sprite *scrollArrow = buttonConfigMenu->scrollArrows;
     Sprite *controlFocus = &buttonConfigMenu->controlFocus;
 
-    const struct UNK_080D95E8 *titleControlsText
-        = sButtonConfigTitleAndControlsText[buttonConfigMenu->language];
+    const struct UNK_080D95E8 *titleControlsText = sButtonConfigTitleAndControlsText[buttonConfigMenu->language];
     const struct UNK_080D95E8 *buttonIcon = sButtonConfigButtonIcons;
-    const struct UNK_080D95E8 *actionsText
-        = sButtonConfigActionsText[buttonConfigMenu->language];
+    const struct UNK_080D95E8 *actionsText = sButtonConfigActionsText[buttonConfigMenu->language];
 
     s16 baseXPos = buttonConfigMenu->optionsScreen->subMenuXPos;
 
     s16 i;
 
     // title
-    sub_806A568(uiElement, RENDER_TARGET_SUB_MENU, titleControlsText->unk4,
-                titleControlsText->unk0, 0x1000, baseXPos + 336, 0x1C, 8,
+    sub_806A568(uiElement, RENDER_TARGET_SUB_MENU, titleControlsText->unk4, titleControlsText->unk0, 0x1000, baseXPos + 336, 0x1C, 8,
                 titleControlsText->unk2, 0);
 
     // controls line 1
     uiElement++;
     titleControlsText++;
-    sub_806A568(uiElement, RENDER_TARGET_SUB_MENU, titleControlsText->unk4,
-                titleControlsText->unk0, 0x1000, baseXPos + 336, 0x7A, 8,
+    sub_806A568(uiElement, RENDER_TARGET_SUB_MENU, titleControlsText->unk4, titleControlsText->unk0, 0x1000, baseXPos + 336, 0x7A, 8,
                 titleControlsText->unk2, 0);
     // controls line 2
     uiElement++;
     titleControlsText++;
-    sub_806A568(uiElement, RENDER_TARGET_SUB_MENU, titleControlsText->unk4,
-                titleControlsText->unk0, 0x1000, baseXPos + 336, 0x87, 8,
+    sub_806A568(uiElement, RENDER_TARGET_SUB_MENU, titleControlsText->unk4, titleControlsText->unk0, 0x1000, baseXPos + 336, 0x87, 8,
                 titleControlsText->unk2, 0);
 
     // A button
     uiElement++;
-    sub_806A568(uiElement, RENDER_TARGET_SUB_MENU, buttonIcon->unk4, buttonIcon->unk0,
-                0x1000, baseXPos + 264, 0x35, 8, buttonIcon->unk2, 0);
+    sub_806A568(uiElement, RENDER_TARGET_SUB_MENU, buttonIcon->unk4, buttonIcon->unk0, 0x1000, baseXPos + 264, 0x35, 8, buttonIcon->unk2,
+                0);
     // B Button
     uiElement++;
     buttonIcon++;
-    sub_806A568(uiElement, RENDER_TARGET_SUB_MENU, buttonIcon->unk4, buttonIcon->unk0,
-                0x1000, baseXPos + 264, 0x4D, 8, buttonIcon->unk2, 0);
+    sub_806A568(uiElement, RENDER_TARGET_SUB_MENU, buttonIcon->unk4, buttonIcon->unk0, 0x1000, baseXPos + 264, 0x4D, 8, buttonIcon->unk2,
+                0);
     // R Shoulder button
     uiElement++;
     buttonIcon++;
-    sub_806A568(uiElement, RENDER_TARGET_SUB_MENU, buttonIcon->unk4, buttonIcon->unk0,
-                0x1000, baseXPos + 264, 0x65, 8, buttonIcon->unk2, 0);
+    sub_806A568(uiElement, RENDER_TARGET_SUB_MENU, buttonIcon->unk4, buttonIcon->unk0, 0x1000, baseXPos + 264, 0x65, 8, buttonIcon->unk2,
+                0);
 
     // Selected A Button
-    sub_806A568(buttonAction, RENDER_TARGET_SUB_MENU,
-                actionsText[buttonConfigMenu->aButtonAction].unk4,
-                actionsText[buttonConfigMenu->aButtonAction].unk0, 0x1000,
-                baseXPos + 0x14C, 0x2D, 8,
+    sub_806A568(buttonAction, RENDER_TARGET_SUB_MENU, actionsText[buttonConfigMenu->aButtonAction].unk4,
+                actionsText[buttonConfigMenu->aButtonAction].unk0, 0x1000, baseXPos + 0x14C, 0x2D, 8,
                 actionsText[buttonConfigMenu->aButtonAction].unk2, 0);
 
     // Selected B Button
     buttonAction++;
-    sub_806A568(buttonAction, RENDER_TARGET_SUB_MENU,
-                actionsText[buttonConfigMenu->bButtonAction].unk4,
-                actionsText[buttonConfigMenu->bButtonAction].unk0, 0x1000,
-                baseXPos + 0x14C, 0x45, 8,
+    sub_806A568(buttonAction, RENDER_TARGET_SUB_MENU, actionsText[buttonConfigMenu->bButtonAction].unk4,
+                actionsText[buttonConfigMenu->bButtonAction].unk0, 0x1000, baseXPos + 0x14C, 0x45, 8,
                 actionsText[buttonConfigMenu->bButtonAction].unk2, 0);
 
     // Selected R Shoulder button
     buttonAction++;
-    sub_806A568(buttonAction, RENDER_TARGET_SUB_MENU,
-                actionsText[buttonConfigMenu->rShoulderAction].unk4,
-                actionsText[buttonConfigMenu->rShoulderAction].unk0, 0x1000,
-                baseXPos + 0x14C, 0x5D, 8,
+    sub_806A568(buttonAction, RENDER_TARGET_SUB_MENU, actionsText[buttonConfigMenu->rShoulderAction].unk4,
+                actionsText[buttonConfigMenu->rShoulderAction].unk0, 0x1000, baseXPos + 0x14C, 0x5D, 8,
                 actionsText[buttonConfigMenu->rShoulderAction].unk2, 0);
 
-    sub_806A568(controlFocus, RENDER_TARGET_SUB_MENU, 0x42, 0x3B6, 0x1000,
-                baseXPos + 0xFC, 0x2A, 6, 7, 0);
+    sub_806A568(controlFocus, RENDER_TARGET_SUB_MENU, 0x42, 0x3B6, 0x1000, baseXPos + 0xFC, 0x2A, 6, 7, 0);
 
-    sub_806A568(scrollArrow, RENDER_TARGET_SUB_MENU, 2, 0x3B6, 0x1000, baseXPos + 0x143,
-                0x35, 6, 8, 0);
+    sub_806A568(scrollArrow, RENDER_TARGET_SUB_MENU, 2, 0x3B6, 0x1000, baseXPos + 0x143, 0x35, 6, 8, 0);
     scrollArrow++;
-    sub_806A568(scrollArrow, RENDER_TARGET_SUB_MENU, 2, 0x3B6, 0x1000, baseXPos + 0x19D,
-                0x35, 6, 9, 0);
+    sub_806A568(scrollArrow, RENDER_TARGET_SUB_MENU, 2, 0x3B6, 0x1000, baseXPos + 0x19D, 0x35, 6, 9, 0);
 }
 
 static void Task_ButtonConfigMenuOpenAnimWait(void)
@@ -2617,8 +2521,7 @@ static void Task_ButtonConfigMenuAButtonMain(void)
 {
     struct ButtonConfigMenu *buttonConfigMenu = TASK_DATA(gCurTask);
     Sprite *buttonAction = buttonConfigMenu->buttonActions;
-    const struct UNK_080D95E8 *actionsText
-        = sButtonConfigActionsText[buttonConfigMenu->language];
+    const struct UNK_080D95E8 *actionsText = sButtonConfigActionsText[buttonConfigMenu->language];
     const struct UNK_080D95E8 *actionText;
 
     ButtonConfigMenuRenderUI();
@@ -2649,8 +2552,7 @@ static void Task_ButtonConfigMenuAButtonMain(void)
     if (gPressedKeys & A_BUTTON) {
         if (buttonConfigMenu->aButtonAction == buttonConfigMenu->bButtonAction) {
             while (buttonConfigMenu->aButtonAction == buttonConfigMenu->bButtonAction
-                   || buttonConfigMenu->aButtonAction
-                       == buttonConfigMenu->rShoulderAction) {
+                   || buttonConfigMenu->aButtonAction == buttonConfigMenu->rShoulderAction) {
                 if (buttonConfigMenu->bButtonAction < 2) {
                     buttonConfigMenu->bButtonAction++;
                 } else {
@@ -2658,8 +2560,7 @@ static void Task_ButtonConfigMenuAButtonMain(void)
                 }
             }
             buttonAction = &buttonConfigMenu->buttonActions[BUTTON_CONFIG_MENU_B_BUTTON];
-            buttonAction->graphics.anim
-                = actionsText[buttonConfigMenu->bButtonAction].unk0;
+            buttonAction->graphics.anim = actionsText[buttonConfigMenu->bButtonAction].unk0;
             buttonAction->variant = actionsText[buttonConfigMenu->bButtonAction].unk2;
 
             UpdateSpriteAnimation(buttonAction);
@@ -2667,8 +2568,7 @@ static void Task_ButtonConfigMenuAButtonMain(void)
 
         if (buttonConfigMenu->aButtonAction == buttonConfigMenu->rShoulderAction) {
             while (buttonConfigMenu->aButtonAction == buttonConfigMenu->rShoulderAction
-                   || buttonConfigMenu->bButtonAction
-                       == buttonConfigMenu->rShoulderAction) {
+                   || buttonConfigMenu->bButtonAction == buttonConfigMenu->rShoulderAction) {
                 if (buttonConfigMenu->rShoulderAction < 2) {
                     buttonConfigMenu->rShoulderAction++;
                 } else {
@@ -2676,10 +2576,8 @@ static void Task_ButtonConfigMenuAButtonMain(void)
                 }
             }
 
-            buttonAction
-                = &buttonConfigMenu->buttonActions[BUTTON_CONFIG_MENU_R_SHOULDER_BUTTON];
-            buttonAction->graphics.anim
-                = actionsText[buttonConfigMenu->rShoulderAction].unk0;
+            buttonAction = &buttonConfigMenu->buttonActions[BUTTON_CONFIG_MENU_R_SHOULDER_BUTTON];
+            buttonAction->graphics.anim = actionsText[buttonConfigMenu->rShoulderAction].unk0;
             buttonAction->variant = actionsText[buttonConfigMenu->rShoulderAction].unk2;
             UpdateSpriteAnimation(buttonAction);
         }
@@ -2708,8 +2606,7 @@ static void Task_ButtonConfigMenuBButtonMain(void)
 {
     struct ButtonConfigMenu *buttonConfigMenu = TASK_DATA(gCurTask);
     Sprite *buttonAction;
-    const struct UNK_080D95E8 *actionsText
-        = sButtonConfigActionsText[buttonConfigMenu->language];
+    const struct UNK_080D95E8 *actionsText = sButtonConfigActionsText[buttonConfigMenu->language];
     const struct UNK_080D95E8 *itemText4;
     u8 unk245;
 
@@ -2750,18 +2647,15 @@ static void Task_ButtonConfigMenuBButtonMain(void)
         if (buttonConfigMenu->aButtonAction == buttonConfigMenu->rShoulderAction
             || buttonConfigMenu->bButtonAction == buttonConfigMenu->rShoulderAction) {
             while (buttonConfigMenu->aButtonAction == buttonConfigMenu->rShoulderAction
-                   || buttonConfigMenu->bButtonAction
-                       == buttonConfigMenu->rShoulderAction) {
+                   || buttonConfigMenu->bButtonAction == buttonConfigMenu->rShoulderAction) {
                 if (buttonConfigMenu->rShoulderAction < 2) {
                     buttonConfigMenu->rShoulderAction++;
                 } else {
                     buttonConfigMenu->rShoulderAction = 0;
                 }
             }
-            buttonAction
-                = &buttonConfigMenu->buttonActions[BUTTON_CONFIG_MENU_R_SHOULDER_BUTTON];
-            buttonAction->graphics.anim
-                = actionsText[buttonConfigMenu->rShoulderAction].unk0;
+            buttonAction = &buttonConfigMenu->buttonActions[BUTTON_CONFIG_MENU_R_SHOULDER_BUTTON];
+            buttonAction->graphics.anim = actionsText[buttonConfigMenu->rShoulderAction].unk0;
             buttonAction->variant = actionsText[buttonConfigMenu->rShoulderAction].unk2;
 
             UpdateSpriteAnimation(buttonAction);
@@ -2777,8 +2671,7 @@ static void Task_ButtonConfigMenuBButtonMain(void)
         if (buttonConfigMenu->aButtonAction == buttonConfigMenu->bButtonAction
             || buttonConfigMenu->bButtonAction == buttonConfigMenu->rShoulderAction) {
             while (buttonConfigMenu->aButtonAction == buttonConfigMenu->bButtonAction
-                   || buttonConfigMenu->bButtonAction
-                       == buttonConfigMenu->rShoulderAction) {
+                   || buttonConfigMenu->bButtonAction == buttonConfigMenu->rShoulderAction) {
                 if (buttonConfigMenu->bButtonAction < 2) {
                     buttonConfigMenu->bButtonAction++;
                 } else {
@@ -2786,8 +2679,7 @@ static void Task_ButtonConfigMenuBButtonMain(void)
                 }
             }
             buttonAction = &buttonConfigMenu->buttonActions[BUTTON_CONFIG_MENU_B_BUTTON];
-            buttonAction->graphics.anim
-                = actionsText[buttonConfigMenu->bButtonAction].unk0;
+            buttonAction->graphics.anim = actionsText[buttonConfigMenu->bButtonAction].unk0;
             buttonAction->variant = actionsText[buttonConfigMenu->bButtonAction].unk2;
 
             UpdateSpriteAnimation(buttonAction);
@@ -2804,8 +2696,7 @@ static void Task_ButtonConfigMenuBButtonMain(void)
     }
 }
 
-static inline void CommitButtonConfig(struct ButtonConfigMenu *buttonConfigMenu,
-                                      struct OptionsScreen *optionsScreen)
+static inline void CommitButtonConfig(struct ButtonConfigMenu *buttonConfigMenu, struct OptionsScreen *optionsScreen)
 {
     switch (buttonConfigMenu->aButtonAction) {
         case BUTTON_CONFIG_MENU_ACTION_JUMP:
@@ -2880,8 +2771,7 @@ static void ButtonConfigMenuStartOver(void)
     struct ButtonConfigMenu *buttonConfigMenu = TASK_DATA(gCurTask);
     struct OptionsScreen *optionsScreen = buttonConfigMenu->optionsScreen;
     Sprite *buttonAction = buttonConfigMenu->buttonActions;
-    const struct UNK_080D95E8 *actionsText
-        = sButtonConfigActionsText[buttonConfigMenu->language];
+    const struct UNK_080D95E8 *actionsText = sButtonConfigActionsText[buttonConfigMenu->language];
     s16 i;
 
     buttonConfigMenu->aButtonAction = BUTTON_CONFIG_MENU_ACTION_JUMP;
@@ -3013,22 +2903,17 @@ static void LanguageScreenCreateUI(struct LanguageScreen *languageScreen)
     languageScreenTitles = &languageScreenTitles[selectedLanguage];
     controlsText = &controlsText[selectedLanguage];
 
-    sub_806A568(headerFooter, RENDER_TARGET_SCREEN, titleSize,
-                languageScreenTitles->unk0, 0x3000, 0x78, 0x1A, 0xD,
+    sub_806A568(headerFooter, RENDER_TARGET_SCREEN, titleSize, languageScreenTitles->unk0, 0x3000, 0x78, 0x1A, 0xD,
                 languageScreenTitles->unk2, 0);
     headerFooter++;
-    sub_806A568(headerFooter, RENDER_TARGET_SCREEN, controlsTextSize, controlsText->unk0,
-                0x3000, 0x78, 0x8A, 0xD, controlsText->unk2, 0);
+    sub_806A568(headerFooter, RENDER_TARGET_SCREEN, controlsTextSize, controlsText->unk0, 0x3000, 0x78, 0x8A, 0xD, controlsText->unk2, 0);
 
-    for (i = 0, yPos = 40; i < NUM_LANGUAGES;
-         i++, languageOption++, optionText++, yPos += 15) {
-        sub_806A568(languageOption, RENDER_TARGET_SCREEN, optionText->unk4,
-                    optionText->unk0, 0x3000, 0x28, yPos, 0xD, optionText->unk2, 0);
+    for (i = 0, yPos = 40; i < NUM_LANGUAGES; i++, languageOption++, optionText++, yPos += 15) {
+        sub_806A568(languageOption, RENDER_TARGET_SCREEN, optionText->unk4, optionText->unk0, 0x3000, 0x28, yPos, 0xD, optionText->unk2, 0);
         languageOption->palId = (selectedLanguage ^ i) ? 1 : 0;
     }
 
-    sub_806A568(optionOutline, RENDER_TARGET_SCREEN, 0x3F, 0x3BD, 0x3000, 0x26,
-                (selectedLanguage * 15) + 40, 0xC, 5, 0);
+    sub_806A568(optionOutline, RENDER_TARGET_SCREEN, 0x3F, 0x3BD, 0x3000, 0x26, (selectedLanguage * 15) + 40, 0xC, 5, 0);
 
     sub_806A568(NULL, RENDER_TARGET_SCREEN, 0, 0x3C4, 0, 0, 0, 0, 0, 0);
     sub_806A568(NULL, RENDER_TARGET_SCREEN, 0, 0x3C4, 0, 0, 0, 0, 1, 0);
@@ -3092,8 +2977,7 @@ static void LanguageScreenHandleLanguageChanged(void)
     Sprite *menuItems = languageScreen->languageOptions;
     Sprite *menuItemOutline = &languageScreen->optionOutline;
 
-    const struct UNK_080D95E8 *titleText
-        = &sLanguageScreenTitles[languageScreen->menuCursor];
+    const struct UNK_080D95E8 *titleText = &sLanguageScreenTitles[languageScreen->menuCursor];
     const struct UNK_080D95E8 *controlsText;
     s16 i;
 
@@ -3121,8 +3005,7 @@ static void LanguageScreenHandleLanguageChanged(void)
 
 static void CreateDeleteScreen(struct OptionsScreen *optionsScreen)
 {
-    struct Task *t = TaskCreate(Task_DeleteScreenFadeIn, sizeof(struct DeleteScreen),
-                                0x2000, TASK_x0004, NULL);
+    struct Task *t = TaskCreate(Task_DeleteScreenFadeIn, sizeof(struct DeleteScreen), 0x2000, TASK_x0004, NULL);
     struct DeleteScreen *deleteScreen = TASK_DATA(t);
 
     deleteScreen->optionsScreen = optionsScreen;
@@ -3178,21 +3061,18 @@ static void DeleteScreenCreateUI(struct DeleteScreen *deleteScreen)
 
     s16 confirmationCursor = deleteScreen->confirmationCursor;
 
-    sub_806A568(&deleteScreen->headerFooter[0], RENDER_TARGET_SCREEN, titleText->unk4,
-                titleText->unk0, 0x3000, 0x78, 0x32, 0xD, titleText->unk2, 0);
-    sub_806A568(&deleteScreen->headerFooter[1], RENDER_TARGET_SCREEN, controlsText->unk4,
-                controlsText->unk0, 0x3000, 0x78, 0x74, 0xD, controlsText->unk2, 0);
-    sub_806A568(option, RENDER_TARGET_SCREEN, optionText->unk4, optionText->unk0, 0x3000,
-                0x3A, 0x4C, 0xD, optionText->unk2, 0);
+    sub_806A568(&deleteScreen->headerFooter[0], RENDER_TARGET_SCREEN, titleText->unk4, titleText->unk0, 0x3000, 0x78, 0x32, 0xD,
+                titleText->unk2, 0);
+    sub_806A568(&deleteScreen->headerFooter[1], RENDER_TARGET_SCREEN, controlsText->unk4, controlsText->unk0, 0x3000, 0x78, 0x74, 0xD,
+                controlsText->unk2, 0);
+    sub_806A568(option, RENDER_TARGET_SCREEN, optionText->unk4, optionText->unk0, 0x3000, 0x3A, 0x4C, 0xD, optionText->unk2, 0);
 
     option->palId = 1;
     option++;
     optionText++;
-    sub_806A568(option, RENDER_TARGET_SCREEN, optionText->unk4, optionText->unk0, 0x3000,
-                0x76, 0x4C, 0xD, optionText->unk2, 0);
+    sub_806A568(option, RENDER_TARGET_SCREEN, optionText->unk4, optionText->unk0, 0x3000, 0x76, 0x4C, 0xD, optionText->unk2, 0);
 
-    sub_806A568(optionOutline, RENDER_TARGET_SCREEN, 0x12, 0x3B8, 0x3000,
-                (confirmationCursor * 60) + 56, 0x4C, 0xC, 3, 0);
+    sub_806A568(optionOutline, RENDER_TARGET_SCREEN, 0x12, 0x3B8, 0x3000, (confirmationCursor * 60) + 56, 0x4C, 0xC, 3, 0);
 
     sub_806A568(NULL, RENDER_TARGET_SCREEN, 0, 0x3C4, 0, 0, 0, 0, 0, 0);
     sub_806A568(NULL, RENDER_TARGET_SCREEN, 0, 0x3C4, 0, 0, 0, 0, 1, 0);
@@ -3245,8 +3125,7 @@ static void Task_DeleteScreenCreateAbsoluteConfirmation(void)
     Sprite *headerFooter = deleteScreen->headerFooter;
     Sprite *option = deleteScreen->options;
     Sprite *optionOutline = &deleteScreen->optionOutline;
-    const struct UNK_080D95E8 *titleText
-        = &sDeleteScreenAbsoluteConfirmTitleText[deleteScreen->language];
+    const struct UNK_080D95E8 *titleText = &sDeleteScreenAbsoluteConfirmTitleText[deleteScreen->language];
     s16 i;
 
     headerFooter->variant = titleText->unk2;
@@ -3328,8 +3207,7 @@ static void Task_DeleteScreenFadeOutAndExit(void)
 
 static void CreateEditProfileNameScreen(struct PlayerDataMenu *playerDataMenu)
 {
-    struct Task *t = TaskCreate(Task_ProfileNameScreenFadeIn,
-                                sizeof(struct ProfileNameScreen), 0x2000, 4, NULL);
+    struct Task *t = TaskCreate(Task_ProfileNameScreenFadeIn, sizeof(struct ProfileNameScreen), 0x2000, 4, NULL);
     struct ProfileNameScreen *profileNameScreen = TASK_DATA(t);
     s16 i;
 
@@ -3349,8 +3227,7 @@ static void CreateEditProfileNameScreen(struct PlayerDataMenu *playerDataMenu)
     }
 
     for (i = 0; i < MAX_PLAYER_NAME_LENGTH; i++) {
-        profileNameScreen->nameInput.buffer[i]
-            = playerDataMenu->optionsScreen->profileData.playerName[i];
+        profileNameScreen->nameInput.buffer[i] = playerDataMenu->optionsScreen->profileData.playerName[i];
         if (profileNameScreen->nameInput.buffer[i] == PLAYER_NAME_END_CHAR) {
             break;
         }
@@ -3394,8 +3271,7 @@ static void ProfileNameScreenInitRegisters(s16 language)
     gBgScrollRegs[3][1] = 0;
 }
 
-static void
-ProfileNameScreenCreateUIBackgrounds(struct ProfileNameScreen *profileNameScreen)
+static void ProfileNameScreenCreateUIBackgrounds(struct ProfileNameScreen *profileNameScreen)
 {
     ScreenFade *fade = &profileNameScreen->fade;
 
@@ -3406,12 +3282,9 @@ ProfileNameScreenCreateUIBackgrounds(struct ProfileNameScreen *profileNameScreen
     fade->bldAlpha = 0;
     fade->bldCnt = (BLDCNT_TGT1_ALL | BLDCNT_EFFECT_DARKEN);
 
-    OptionsInitBackground(&profileNameScreen->background, 0, 7, TM_OPTIONS_ENTER_NAME,
-                          0x1E, 0x14, 0, 0, 0, 0);
-    OptionsInitBackground(&profileNameScreen->charMatrixBackground, 3, 0x1F,
-                          TM_OPTIONS_TIME_RECORD_BG0, 0x1E, 0x14, 0, 2, 0, 0);
-    OptionsInitBackground(&profileNameScreen->charMatrix, 1, 0x16,
-                          TM_OPTIONS_ENTER_NAME_CHARACTERS, 0x16, 0x2C, 0, 1, 0, 0);
+    OptionsInitBackground(&profileNameScreen->background, 0, 7, TM_OPTIONS_ENTER_NAME, 0x1E, 0x14, 0, 0, 0, 0);
+    OptionsInitBackground(&profileNameScreen->charMatrixBackground, 3, 0x1F, TM_OPTIONS_TIME_RECORD_BG0, 0x1E, 0x14, 0, 2, 0, 0);
+    OptionsInitBackground(&profileNameScreen->charMatrix, 1, 0x16, TM_OPTIONS_ENTER_NAME_CHARACTERS, 0x16, 0x2C, 0, 1, 0, 0);
 }
 
 static void ProfileNameScreenCreateUIText(struct ProfileNameScreen *profileNameScreen)
@@ -3421,8 +3294,7 @@ static void ProfileNameScreenCreateUIText(struct ProfileNameScreen *profileNameS
 
     u8 *language = &profileNameScreen->language;
     const struct UNK_080D95E8 *arrowTile = sProfileNameScreenArrowTiles;
-    const struct UNK_080D95E8 *endButtonText
-        = &sProfileNameScreenEndButtonText[*language];
+    const struct UNK_080D95E8 *endButtonText = &sProfileNameScreenEndButtonText[*language];
     const struct UNK_080D95E8 *titleText;
 
     if (profileNameScreen->nameInput.cursor > 0) {
@@ -3431,27 +3303,22 @@ static void ProfileNameScreenCreateUIText(struct ProfileNameScreen *profileNameS
         titleText = &sProfileNameScreenNewTitleText[*language];
     }
 
-    sub_806A568(title, RENDER_TARGET_SCREEN, titleText->unk4, titleText->unk0, 0x1000, 3,
-                0x15, 0xD, titleText->unk2, 0);
+    sub_806A568(title, RENDER_TARGET_SCREEN, titleText->unk4, titleText->unk0, 0x1000, 3, 0x15, 0xD, titleText->unk2, 0);
 
     // Left arrow
-    sub_806A568(control, RENDER_TARGET_SCREEN, arrowTile->unk4, arrowTile->unk0, 0x1000,
-                0xDB, 0x70, 0xD, arrowTile->unk2, 0);
+    sub_806A568(control, RENDER_TARGET_SCREEN, arrowTile->unk4, arrowTile->unk0, 0x1000, 0xDB, 0x70, 0xD, arrowTile->unk2, 0);
     control++;
     arrowTile++;
 
     // Right arrow
-    sub_806A568(control, RENDER_TARGET_SCREEN, arrowTile->unk4, arrowTile->unk0, 0x1000,
-                0xDB, 0x80, 0xD, arrowTile->unk2, 0);
+    sub_806A568(control, RENDER_TARGET_SCREEN, arrowTile->unk4, arrowTile->unk0, 0x1000, 0xDB, 0x80, 0xD, arrowTile->unk2, 0);
     control++;
 
     // End button
-    sub_806A568(control, RENDER_TARGET_SCREEN, endButtonText->unk4, endButtonText->unk0,
-                0x1000, 0xDB, 0x8F, 0xD, endButtonText->unk2, 0);
+    sub_806A568(control, RENDER_TARGET_SCREEN, endButtonText->unk4, endButtonText->unk0, 0x1000, 0xDB, 0x8F, 0xD, endButtonText->unk2, 0);
 }
 
-static void
-ProfileNameScreenCreateUIContextElements(struct ProfileNameScreen *profileNameScreen)
+static void ProfileNameScreenCreateUIContextElements(struct ProfileNameScreen *profileNameScreen)
 {
     Sprite *focusedCell = profileNameScreen->focusedCell;
     Sprite *scrollArrow = profileNameScreen->scrollArrows;
@@ -3459,25 +3326,22 @@ ProfileNameScreenCreateUIContextElements(struct ProfileNameScreen *profileNameSc
     struct UNK_806B908 nameCharTile;
 
     // background
-    sub_806A568(focusedCell, RENDER_TARGET_SCREEN, 10, 0x3BA, 0x1000, 0x21, 0x2F, 8, 7,
-                0);
+    sub_806A568(focusedCell, RENDER_TARGET_SCREEN, 10, 0x3BA, 0x1000, 0x21, 0x2F, 8, 7, 0);
     focusedCell++;
 
     // foreground
     nameCharTile = sub_806B908(profileNameScreen->matrixCursorIndex);
-    sub_806A568(focusedCell, RENDER_TARGET_SCREEN, nameCharTile.unk0, nameCharTile.unk4,
-                0x1000, 0x21, 0x2F, 7, nameCharTile.unk6, 0);
+    sub_806A568(focusedCell, RENDER_TARGET_SCREEN, nameCharTile.unk0, nameCharTile.unk4, 0x1000, 0x21, 0x2F, 7, nameCharTile.unk6, 0);
 
-    sub_806A568(scrollArrow, RENDER_TARGET_SCREEN, scrollArrowTile->unk4,
-                scrollArrowTile->unk0, 0x1000, 8, 0x2C, 0xD, scrollArrowTile->unk2, 0);
+    sub_806A568(scrollArrow, RENDER_TARGET_SCREEN, scrollArrowTile->unk4, scrollArrowTile->unk0, 0x1000, 8, 0x2C, 0xD,
+                scrollArrowTile->unk2, 0);
     scrollArrow++;
     scrollArrowTile++;
-    sub_806A568(scrollArrow, RENDER_TARGET_SCREEN, scrollArrowTile->unk4,
-                scrollArrowTile->unk0, 0x1000, 8, 0x82, 0xD, scrollArrowTile->unk2, 0);
+    sub_806A568(scrollArrow, RENDER_TARGET_SCREEN, scrollArrowTile->unk4, scrollArrowTile->unk0, 0x1000, 8, 0x82, 0xD,
+                scrollArrowTile->unk2, 0);
 }
 
-static void
-ProfileNameScreenCreateInputDisplayUI(struct ProfileNameScreen *profileNameScreen)
+static void ProfileNameScreenCreateInputDisplayUI(struct ProfileNameScreen *profileNameScreen)
 {
     struct UNK_806B908 nameCharTile;
     Sprite *inputDisplayChar = profileNameScreen->nameInput.characterDisplay;
@@ -3488,22 +3352,19 @@ ProfileNameScreenCreateInputDisplayUI(struct ProfileNameScreen *profileNameScree
 
     // Required for match
     u32 yPos = 22;
-    for (i = 0, xPos = 160; i < MAX_PLAYER_NAME_LENGTH;
-         i++, inputDisplayChar++, xPos += 12) {
+    for (i = 0, xPos = 160; i < MAX_PLAYER_NAME_LENGTH; i++, inputDisplayChar++, xPos += 12) {
         nameChar = profileNameScreen->nameInput.buffer[i];
         if (nameChar == PLAYER_NAME_END_CHAR) {
             nameChar = 0x11;
         }
 
         nameCharTile = sub_806B908(nameChar);
-        sub_806A568(inputDisplayChar, RENDER_TARGET_SCREEN, nameCharTile.unk0,
-                    nameCharTile.unk4, 0x1000, xPos, yPos, 8, nameCharTile.unk6, 0);
+        sub_806A568(inputDisplayChar, RENDER_TARGET_SCREEN, nameCharTile.unk0, nameCharTile.unk4, 0x1000, xPos, yPos, 8, nameCharTile.unk6,
+                    0);
     }
 
     sub_806A568(inputDisplayCursor, RENDER_TARGET_SCREEN, 2, 0x3BA, 0x1000,
-                profileNameScreen->nameInput.cursor * NAME_INPUT_DISPLAY_CHAR_WIDTH
-                    + 161,
-                21, 5, 6, 0);
+                profileNameScreen->nameInput.cursor * NAME_INPUT_DISPLAY_CHAR_WIDTH + 161, 21, 5, 6, 0);
 }
 
 static void Task_ProfileNameScreenMain(void)
@@ -3531,51 +3392,41 @@ static void Task_ProfileNameScreenMain(void)
         if (profileNameScreen->cursorCol < PROFILE_NAME_SCREEN_CONTROLS_COLUMN) {
             // If we are at the end of the first 2 rows of the matrix
             if (profileNameScreen->matrixCursorIndex == NAME_CHAR_MATRIX_NUM_COLS - 1
-                || profileNameScreen->matrixCursorIndex
-                    == NAME_CHAR_MATRIX_NUM_COLS * 2 - 1) {
+                || profileNameScreen->matrixCursorIndex == NAME_CHAR_MATRIX_NUM_COLS * 2 - 1) {
                 s16 mode = 2;
-                if (profileNameScreen->matrixCursorIndex
-                    == NAME_CHAR_MATRIX_NUM_COLS - 1) {
+                if (profileNameScreen->matrixCursorIndex == NAME_CHAR_MATRIX_NUM_COLS - 1) {
                     mode = 1;
                 }
 
                 if (nameInput->cursor < MAX_PLAYER_NAME_LENGTH) {
                     if (nameInput->buffer[nameInput->cursor] == PLAYER_NAME_END_CHAR) {
                         m4aSongNumStart(SE_SELECT);
-                        if (sub_806BA14(mode,
-                                        nameInput->buffer[nameInput->cursor - 1])) {
-                            nameInput->buffer[nameInput->cursor - 1] = sub_806A664(
-                                mode, nameInput->buffer[nameInput->cursor - 1]);
+                        if (sub_806BA14(mode, nameInput->buffer[nameInput->cursor - 1])) {
+                            nameInput->buffer[nameInput->cursor - 1] = sub_806A664(mode, nameInput->buffer[nameInput->cursor - 1]);
                         } else {
-                            nameInput->buffer[nameInput->cursor]
-                                = profileNameScreen->matrixCursorIndex;
+                            nameInput->buffer[nameInput->cursor] = profileNameScreen->matrixCursorIndex;
                             if (nameInput->cursor < MAX_PLAYER_NAME_LENGTH - 1) {
                                 nameInput->cursor++;
                             } else {
                                 nameInput->cursor = MAX_PLAYER_NAME_LENGTH;
                                 // Once we reach the end, set the cusor to the end button
-                                profileNameScreen->cursorCol
-                                    = PROFILE_NAME_SCREEN_CONTROLS_COLUMN;
-                                profileNameScreen->cursorRow
-                                    = PROFILE_NAME_SCREEN_END_BUTTON;
+                                profileNameScreen->cursorCol = PROFILE_NAME_SCREEN_CONTROLS_COLUMN;
+                                profileNameScreen->cursorRow = PROFILE_NAME_SCREEN_END_BUTTON;
                             }
                         }
                     } else {
                         if (sub_806BA14(mode, nameInput->buffer[nameInput->cursor])) {
                             m4aSongNumStart(SE_SELECT);
-                            nameInput->buffer[nameInput->cursor] = sub_806A664(
-                                mode, nameInput->buffer[nameInput->cursor]);
+                            nameInput->buffer[nameInput->cursor] = sub_806A664(mode, nameInput->buffer[nameInput->cursor]);
                         } else {
                             m4aSongNumStart(SE_SELECT);
-                            nameInput->buffer[nameInput->cursor]
-                                = profileNameScreen->matrixCursorIndex;
+                            nameInput->buffer[nameInput->cursor] = profileNameScreen->matrixCursorIndex;
                         }
                     }
                 } else {
                     if (sub_806BA14(mode, nameInput->buffer[nameInput->cursor - 1])) {
                         m4aSongNumStart(SE_SELECT);
-                        nameInput->buffer[nameInput->cursor - 1] = sub_806A664(
-                            mode, nameInput->buffer[nameInput->cursor - 1]);
+                        nameInput->buffer[nameInput->cursor - 1] = sub_806A664(mode, nameInput->buffer[nameInput->cursor - 1]);
                     }
                     nameInput->cursor = MAX_PLAYER_NAME_LENGTH;
                     profileNameScreen->cursorCol = PROFILE_NAME_SCREEN_CONTROLS_COLUMN;
@@ -3585,11 +3436,9 @@ static void Task_ProfileNameScreenMain(void)
 
             if (nameInput->cursor < MAX_PLAYER_NAME_LENGTH) {
                 if (profileNameScreen->matrixCursorIndex != NAME_CHAR_MATRIX_NUM_COLS - 1
-                    && profileNameScreen->matrixCursorIndex
-                        != NAME_CHAR_MATRIX_NUM_COLS * 2 - 1) {
+                    && profileNameScreen->matrixCursorIndex != NAME_CHAR_MATRIX_NUM_COLS * 2 - 1) {
                     m4aSongNumStart(SE_SELECT);
-                    nameInput->buffer[nameInput->cursor]
-                        = profileNameScreen->matrixCursorIndex;
+                    nameInput->buffer[nameInput->cursor] = profileNameScreen->matrixCursorIndex;
                     if (nameInput->cursor < MAX_PLAYER_NAME_LENGTH - 1) {
                         nameInput->cursor++;
                     }
@@ -3653,8 +3502,7 @@ static void Task_ProfileNameScreenMain(void)
     if (gRepeatedKeys & B_BUTTON) {
         s16 i;
         m4aSongNumStart(SE_RETURN);
-        if ((nameInput->cursor > 0
-             && nameInput->buffer[nameInput->cursor] == PLAYER_NAME_END_CHAR)
+        if ((nameInput->cursor > 0 && nameInput->buffer[nameInput->cursor] == PLAYER_NAME_END_CHAR)
             || nameInput->cursor > MAX_PLAYER_NAME_LENGTH - 1) {
             nameInput->cursor--;
         }
@@ -3674,14 +3522,9 @@ static bool16 ProfileNameScreenHandleShoulderInput(void)
         if (profileNameScreen->nameInput.cursor > 0) {
             profileNameScreen->nameInput.cursor--;
             if (profileNameScreen->nameInput.cursor < MAX_PLAYER_NAME_LENGTH - 1) {
-                if (profileNameScreen->nameInput
-                            .buffer[profileNameScreen->nameInput.cursor + 1]
-                        == PLAYER_NAME_END_CHAR
-                    && !sub_806B9C8(profileNameScreen->nameInput
-                                        .buffer[profileNameScreen->nameInput.cursor])) {
-                    profileNameScreen->nameInput
-                        .buffer[profileNameScreen->nameInput.cursor]
-                        = PLAYER_NAME_END_CHAR;
+                if (profileNameScreen->nameInput.buffer[profileNameScreen->nameInput.cursor + 1] == PLAYER_NAME_END_CHAR
+                    && !sub_806B9C8(profileNameScreen->nameInput.buffer[profileNameScreen->nameInput.cursor])) {
+                    profileNameScreen->nameInput.buffer[profileNameScreen->nameInput.cursor] = PLAYER_NAME_END_CHAR;
                 }
             }
             m4aSongNumStart(SE_MENU_CURSOR_MOVE);
@@ -3691,10 +3534,8 @@ static bool16 ProfileNameScreenHandleShoulderInput(void)
 
     if (gRepeatedKeys & R_BUTTON) {
         if (profileNameScreen->nameInput.cursor < MAX_PLAYER_NAME_LENGTH - 1) {
-            if (profileNameScreen->nameInput.buffer[profileNameScreen->nameInput.cursor]
-                == PLAYER_NAME_END_CHAR) {
-                profileNameScreen->nameInput.buffer[profileNameScreen->nameInput.cursor]
-                    = 0x11;
+            if (profileNameScreen->nameInput.buffer[profileNameScreen->nameInput.cursor] == PLAYER_NAME_END_CHAR) {
+                profileNameScreen->nameInput.buffer[profileNameScreen->nameInput.cursor] = 0x11;
             }
             profileNameScreen->nameInput.cursor++;
             m4aSongNumStart(SE_MENU_CURSOR_MOVE);
@@ -3728,8 +3569,7 @@ static bool16 ProfileNameScreenHandleDpadInput(void)
             } else {
                 profileNameScreen->cursorRow = NAME_CHAR_MATRIX_ROWS_PER_PAGE - 1;
                 gBgScrollRegs[1][1] = 201;
-                profileNameScreen->matrixPageIndex
-                    = NAME_CHAR_MATRIX_LAST_PAGE_START_INDEX;
+                profileNameScreen->matrixPageIndex = NAME_CHAR_MATRIX_LAST_PAGE_START_INDEX;
             }
         } else {
             // handle controls input column
@@ -3747,8 +3587,7 @@ static bool16 ProfileNameScreenHandleDpadInput(void)
             if (profileNameScreen->cursorRow < MAX_PLAYER_NAME_LENGTH) {
                 profileNameScreen->cursorRow++;
             } else {
-                if (profileNameScreen->matrixPageIndex
-                    < NAME_CHAR_MATRIX_LAST_PAGE_START_INDEX) {
+                if (profileNameScreen->matrixPageIndex < NAME_CHAR_MATRIX_LAST_PAGE_START_INDEX) {
                     gBgScrollRegs[1][1] += NAME_CHAR_MATRIX_BACKGROUND_ROW_HEIGHT;
                     profileNameScreen->matrixPageIndex += NAME_CHAR_MATRIX_NUM_COLS;
                 } else {
@@ -3814,8 +3653,7 @@ static void ProfileNameScreenInputComplete(void)
 
     // Copy name from input into profile data on the options screen
     if (profileNameScreen->onCompleteAction == 0) {
-        struct OptionsScreenProfileData *profileData
-            = &profileNameScreen->playerDataMenu->optionsScreen->profileData;
+        struct OptionsScreenProfileData *profileData = &profileNameScreen->playerDataMenu->optionsScreen->profileData;
         for (i = 0; i < MAX_PLAYER_NAME_LENGTH; i++) {
             profileData->playerName[i] = nameInput->buffer[i];
         }
@@ -3896,29 +3734,22 @@ static void ProfileNameScreenRenderUI(void)
         // background
         focusedCell->graphics.anim = 0x3BA;
         focusedCell->variant = 7;
-        focusedCell->x
-            = profileNameScreen->cursorCol * NAME_CHAR_MATRIX_BACKGROUND_COLUMN_WIDTH
-            + 32;
-        focusedCell->y
-            = profileNameScreen->cursorRow * NAME_CHAR_MATRIX_BACKGROUND_ROW_HEIGHT + 47;
+        focusedCell->x = profileNameScreen->cursorCol * NAME_CHAR_MATRIX_BACKGROUND_COLUMN_WIDTH + 32;
+        focusedCell->y = profileNameScreen->cursorRow * NAME_CHAR_MATRIX_BACKGROUND_ROW_HEIGHT + 47;
         UpdateSpriteAnimation(focusedCell);
         DisplaySprite(focusedCell);
         focusedCell++;
 
         // Interesting that this is calculated here, feels like the wrong place
-        profileNameScreen->matrixCursorIndex = profileNameScreen->matrixPageIndex
-            + profileNameScreen->cursorRow * NAME_CHAR_MATRIX_NUM_COLS
-            + profileNameScreen->cursorCol;
+        profileNameScreen->matrixCursorIndex
+            = profileNameScreen->matrixPageIndex + profileNameScreen->cursorRow * NAME_CHAR_MATRIX_NUM_COLS + profileNameScreen->cursorCol;
 
         // foreground
         charMatrixCursorTile = sub_806B908(profileNameScreen->matrixCursorIndex);
         focusedCell->graphics.anim = charMatrixCursorTile.unk4;
         focusedCell->variant = charMatrixCursorTile.unk6;
-        focusedCell->x
-            = profileNameScreen->cursorCol * NAME_CHAR_MATRIX_BACKGROUND_COLUMN_WIDTH
-            + 32;
-        focusedCell->y
-            = profileNameScreen->cursorRow * NAME_CHAR_MATRIX_BACKGROUND_ROW_HEIGHT + 47;
+        focusedCell->x = profileNameScreen->cursorCol * NAME_CHAR_MATRIX_BACKGROUND_COLUMN_WIDTH + 32;
+        focusedCell->y = profileNameScreen->cursorRow * NAME_CHAR_MATRIX_BACKGROUND_ROW_HEIGHT + 47;
         UpdateSpriteAnimation(focusedCell);
         DisplaySprite(focusedCell);
     } else {
@@ -3926,8 +3757,7 @@ static void ProfileNameScreenRenderUI(void)
         focusedCell->graphics.anim = 0x3BA;
         focusedCell->variant = 8;
         focusedCell->x = 0xCB;
-        focusedCell->y
-            = profileNameScreen->cursorRow * NAME_CHAR_MATRIX_BACKGROUND_ROW_HEIGHT + 39;
+        focusedCell->y = profileNameScreen->cursorRow * NAME_CHAR_MATRIX_BACKGROUND_ROW_HEIGHT + 39;
         UpdateSpriteAnimation(focusedCell);
         DisplaySprite(focusedCell);
     }
@@ -3947,21 +3777,18 @@ static void ProfileNameScreenRenderUI(void)
         scrollArrow++;
 
         // Show the bottom arrow if we are not on the last row
-        if (profileNameScreen->matrixCursorIndex
-            < NAME_CHAR_MATRIX_NUM_COLS * (NAME_CHAR_MATRIX_NUM_ROWS - 1)) {
+        if (profileNameScreen->matrixCursorIndex < NAME_CHAR_MATRIX_NUM_COLS * (NAME_CHAR_MATRIX_NUM_ROWS - 1)) {
             DisplaySprite(scrollArrow);
         }
     }
 
     if (profileNameScreen->nameInput.cursor < MAX_PLAYER_NAME_LENGTH) {
-        inputDisplayCursor->x
-            = profileNameScreen->nameInput.cursor * NAME_INPUT_DISPLAY_CHAR_WIDTH + 161;
+        inputDisplayCursor->x = profileNameScreen->nameInput.cursor * NAME_INPUT_DISPLAY_CHAR_WIDTH + 161;
         DisplaySprite(inputDisplayCursor);
     }
 
     // render the inputted name into the display
-    for (i = 0, nameChar = profileNameScreen->nameInput.buffer;
-         i < MAX_PLAYER_NAME_LENGTH && *nameChar != PLAYER_NAME_END_CHAR;
+    for (i = 0, nameChar = profileNameScreen->nameInput.buffer; i < MAX_PLAYER_NAME_LENGTH && *nameChar != PLAYER_NAME_END_CHAR;
          i++, inputDisplayChar++, nameChar++) {
         nameCharTile = sub_806B908(*nameChar);
         inputDisplayChar->graphics.anim = nameCharTile.unk4;
@@ -3973,8 +3800,7 @@ static void ProfileNameScreenRenderUI(void)
 
 static void CreateTimeRecordsScreen(struct PlayerDataMenu *playerDataMenu)
 {
-    struct Task *t = TaskCreate(Task_TimeRecordsScreenChoiceViewFadeIn,
-                                sizeof(struct TimeRecordsScreen), 0x2000, 4, NULL);
+    struct Task *t = TaskCreate(Task_TimeRecordsScreenChoiceViewFadeIn, sizeof(struct TimeRecordsScreen), 0x2000, 4, NULL);
     struct TimeRecordsScreen *timeRecordsScreen = TASK_DATA(t);
     s16 availableCharacters;
 
@@ -3988,10 +3814,8 @@ static void CreateTimeRecordsScreen(struct PlayerDataMenu *playerDataMenu)
     timeRecordsScreen->unusedUnk708 = FALSE;
     timeRecordsScreen->availableCharacters = availableCharacters;
 
-    for (availableCharacters = 0; availableCharacters < NUM_CHARACTERS;
-         availableCharacters++) {
-        timeRecordsScreen->unlockedCourses[availableCharacters]
-            = gLoadedSaveGame->unlockedLevels[availableCharacters];
+    for (availableCharacters = 0; availableCharacters < NUM_CHARACTERS; availableCharacters++) {
+        timeRecordsScreen->unlockedCourses[availableCharacters] = gLoadedSaveGame->unlockedLevels[availableCharacters];
     }
 
     timeRecordsScreen->language = playerDataMenu->language;
@@ -4021,8 +3845,7 @@ static void TimeRecordScreenInitRegisters(void)
     gBgScrollRegs[3][1] = 0;
 }
 
-static void TimeRecordsScreenCreateChoiceViewBackgroundsUI(
-    struct TimeRecordsScreen *timeRecordsScreen)
+static void TimeRecordsScreenCreateChoiceViewBackgroundsUI(struct TimeRecordsScreen *timeRecordsScreen)
 {
     ScreenFade *fade = &timeRecordsScreen->fade;
     fade->window = SCREEN_FADE_USE_WINDOW_0;
@@ -4032,22 +3855,17 @@ static void TimeRecordsScreenCreateChoiceViewBackgroundsUI(
     fade->bldAlpha = 0;
     fade->bldCnt = (BLDCNT_TGT1_ALL | BLDCNT_EFFECT_DARKEN);
 
-    OptionsInitBackground(&timeRecordsScreen->coursesViewCharacterBackground, 0, 7,
-                          TM_OPTIONS_TIME_RECORD_BG0, 0x1e, 0x14, 0, 0, 0, 0);
-    OptionsInitBackground(&timeRecordsScreen->coursesViewCharacter, 1, 0xF,
-                          TM_OPTIONS_TIME_RECORD_BG1, 0x1e, 0x14, 0, 1, 0, 0);
+    OptionsInitBackground(&timeRecordsScreen->coursesViewCharacterBackground, 0, 7, TM_OPTIONS_TIME_RECORD_BG0, 0x1e, 0x14, 0, 0, 0, 0);
+    OptionsInitBackground(&timeRecordsScreen->coursesViewCharacter, 1, 0xF, TM_OPTIONS_TIME_RECORD_BG1, 0x1e, 0x14, 0, 1, 0, 0);
 }
 
-static void
-TimeRecordsScreenCreateChoiceViewUI(struct TimeRecordsScreen *timeRecordsScreen)
+static void TimeRecordsScreenCreateChoiceViewUI(struct TimeRecordsScreen *timeRecordsScreen)
 {
     Sprite *title = &timeRecordsScreen->choiceViewTitleOrZoneSubtitle;
     Sprite *scrollArrow = timeRecordsScreen->choiceViewScrollArrows;
     Sprite *choiceItem = timeRecordsScreen->choiceViewItemsOrZoneTitle;
-    const struct UNK_080D95E8 *titleText
-        = &sTimeRecordsChoiceViewTitles[timeRecordsScreen->language];
-    const struct UNK_080D95E8 *choiceText
-        = sTimeRecordsScreenChoices[timeRecordsScreen->language];
+    const struct UNK_080D95E8 *titleText = &sTimeRecordsChoiceViewTitles[timeRecordsScreen->language];
+    const struct UNK_080D95E8 *choiceText = sTimeRecordsScreenChoices[timeRecordsScreen->language];
 
     // TODO: This X is a fake match, the compiler wants to use 0
     // from a register but won't do it without this
@@ -4141,8 +3959,7 @@ static void Task_TimeRecordsScreenModeChoiceMain(void)
 
 static void CreateTimeRecordsScreenAtCoursesView(struct PlayerDataMenu *playerDataMenu)
 {
-    struct Task *t = TaskCreate(Task_TimeRecordsScreenCreateTimesUI,
-                                sizeof(struct TimeRecordsScreen), 0x2000, 4, NULL);
+    struct Task *t = TaskCreate(Task_TimeRecordsScreenCreateTimesUI, sizeof(struct TimeRecordsScreen), 0x2000, 4, NULL);
     struct TimeRecordsScreen *timeRecordsScreen = TASK_DATA(t);
     s16 i;
 
@@ -4205,8 +4022,7 @@ static void TimeRecordsScreenInitRegisters(void)
     DmaFill32(3, 0, (void *)BG_CHAR_ADDR(2), 0x40);
 }
 
-static void TimeRecordsScreenCreateCoursesViewBackgroundsUI(
-    struct TimeRecordsScreen *timeRecordsScreen)
+static void TimeRecordsScreenCreateCoursesViewBackgroundsUI(struct TimeRecordsScreen *timeRecordsScreen)
 {
     ScreenFade *fade = &timeRecordsScreen->fade;
     u8 character;
@@ -4223,19 +4039,14 @@ static void TimeRecordsScreenCreateCoursesViewBackgroundsUI(
     fade->bldAlpha = 0;
     fade->bldCnt = (BLDCNT_TGT1_ALL | BLDCNT_EFFECT_DARKEN);
 
-    OptionsInitBackground(&timeRecordsScreen->coursesViewBackground, 0, 7,
-                          TM_TILEMAP_139, 0x1e, 0x14, 0, 0, 0, 0);
-    OptionsInitBackground(
-        &timeRecordsScreen->coursesViewCharacterBackground, 1, 0x16,
-        sTimeRecordsCharacterAssets[character][ASSET_CHARACTER_BACKGROUND], 9, 0x14, 0,
-        1, 0, 0);
-    OptionsInitBackground(&timeRecordsScreen->coursesViewCharacter, 2, 0x1E,
-                          sTimeRecordsCharacterAssets[character][ASSET_CHARACTER], 9,
+    OptionsInitBackground(&timeRecordsScreen->coursesViewBackground, 0, 7, TM_TILEMAP_139, 0x1e, 0x14, 0, 0, 0, 0);
+    OptionsInitBackground(&timeRecordsScreen->coursesViewCharacterBackground, 1, 0x16,
+                          sTimeRecordsCharacterAssets[character][ASSET_CHARACTER_BACKGROUND], 9, 0x14, 0, 1, 0, 0);
+    OptionsInitBackground(&timeRecordsScreen->coursesViewCharacter, 2, 0x1E, sTimeRecordsCharacterAssets[character][ASSET_CHARACTER], 9,
                           0x14, 0, 2, 0, 0);
 }
 
-static void
-TimeRecordsScreenCreateCoursesViewUI(struct TimeRecordsScreen *timeRecordsScreen)
+static void TimeRecordsScreenCreateCoursesViewUI(struct TimeRecordsScreen *timeRecordsScreen)
 {
     Sprite *unk284 = timeRecordsScreen->timeRecordDisplays;
     Sprite *zoneText = timeRecordsScreen->choiceViewItemsOrZoneTitle;
@@ -4253,29 +4064,24 @@ TimeRecordsScreenCreateCoursesViewUI(struct TimeRecordsScreen *timeRecordsScreen
 
     sub_806A568(scrollArrow, RENDER_TARGET_SCREEN, 2, 0x41A, 0x1400, 0xE, 0x20, 2, 0, 0);
     scrollArrow++;
-    sub_806A568(scrollArrow, RENDER_TARGET_SCREEN, 2, 0x41A, 0x1000, 0x9C, 0x20, 2, 0,
-                0);
+    sub_806A568(scrollArrow, RENDER_TARGET_SCREEN, 2, 0x41A, 0x1000, 0x9C, 0x20, 2, 0, 0);
     scrollArrow++;
-    sub_806A568(scrollArrow, RENDER_TARGET_SCREEN, 2, 0x41A, 0x1000, 0xD0, 0x18, 3, 1,
-                0);
+    sub_806A568(scrollArrow, RENDER_TARGET_SCREEN, 2, 0x41A, 0x1000, 0xD0, 0x18, 3, 1, 0);
     scrollArrow++;
-    sub_806A568(scrollArrow, RENDER_TARGET_SCREEN, 2, 0x41A, 0x1800, 0xD0, 0x8C, 3, 1,
-                0);
+    sub_806A568(scrollArrow, RENDER_TARGET_SCREEN, 2, 0x41A, 0x1800, 0xD0, 0x8C, 3, 1, 0);
 
     sub_806A568(unk284, RENDER_TARGET_SCREEN, 0x10, 0x417, 0x1000, 4, 0x50, 5, 0xB, 0);
     unk284++;
     sub_806A568(unk284, RENDER_TARGET_SCREEN, 0x10, 0x417, 0x1000, 0xC, 0x68, 5, 0xC, 0);
     unk284++;
-    sub_806A568(unk284, RENDER_TARGET_SCREEN, 0x10, 0x417, 0x1000, 0x14, 0x80, 5, 0xD,
-                0);
+    sub_806A568(unk284, RENDER_TARGET_SCREEN, 0x10, 0x417, 0x1000, 0x14, 0x80, 5, 0xD, 0);
 
 // Might not be matching because of something to do with the data
 #ifndef NON_MATCHING
     r0 = sTimeRecordsZoneActTitleDigits;
     spriteSize = MaxSpriteSize(r0, ARRAY_COUNT(sTimeRecordsZoneActTitleDigits));
 #else
-    spriteSize = MaxSpriteSize(sTimeRecordsZoneActTitleDigits,
-                               ARRAY_COUNT(sTimeRecordsZoneActTitleDigits));
+    spriteSize = MaxSpriteSize(sTimeRecordsZoneActTitleDigits, ARRAY_COUNT(sTimeRecordsZoneActTitleDigits));
 #endif
     // render "ZONE"
     sub_806A568(zoneText, RENDER_TARGET_SCREEN, 0x14, 0x418, 0x1000, 0x10, 0xC, 3, 0, 0);
@@ -4289,23 +4095,19 @@ TimeRecordsScreenCreateCoursesViewUI(struct TimeRecordsScreen *timeRecordsScreen
     asm("" ::: "sl");
 #endif
     // render zone number
-    sub_806A568(zoneText, RENDER_TARGET_SCREEN, spriteSize, titleDigit->unk0, 0x1000,
-                0x5E, 0xC, 3, titleDigit->unk2, 0);
+    sub_806A568(zoneText, RENDER_TARGET_SCREEN, spriteSize, titleDigit->unk0, 0x1000, 0x5E, 0xC, 3, titleDigit->unk2, 0);
 
     if (!timeRecordsScreen->isBossMode) {
         // render "ACT"
-        sub_806A568(actText, RENDER_TARGET_SCREEN, 0x10, 0x418, 0x1000, 0x4E, 0x20, 3, 1,
-                    0);
+        sub_806A568(actText, RENDER_TARGET_SCREEN, 0x10, 0x418, 0x1000, 0x4E, 0x20, 3, 1, 0);
         actText++;
 
         titleDigit = &sTimeRecordsZoneActTitleDigits[act];
         // render act number
-        sub_806A568(actText, RENDER_TARGET_SCREEN, spriteSize, titleDigit->unk0, 0x1000,
-                    0x88, 0x20, 3, titleDigit->unk2, 0);
+        sub_806A568(actText, RENDER_TARGET_SCREEN, spriteSize, titleDigit->unk0, 0x1000, 0x88, 0x20, 3, titleDigit->unk2, 0);
     } else {
         // render "BOSS"
-        sub_806A568(actText, RENDER_TARGET_SCREEN, 0x14, 0x418, 0x1000, 0x4e, 0x20, 3, 9,
-                    0);
+        sub_806A568(actText, RENDER_TARGET_SCREEN, 0x14, 0x418, 0x1000, 0x4e, 0x20, 3, 9, 0);
     }
 
     if (!timeRecordsScreen->isBossMode) {
@@ -4317,8 +4119,7 @@ TimeRecordsScreenCreateCoursesViewUI(struct TimeRecordsScreen *timeRecordsScreen
     // Seems like a bug, this will potentially overflow when reading
     // 7 zones, as we could already be further
     spriteSize = MaxSpriteSize(zoneSubText, 7);
-    sub_806A568(zoneSubTitle, RENDER_TARGET_SCREEN, spriteSize, zoneSubText->unk0,
-                0x1000, 0x9a, 0x44, 3, zoneSubText->unk2, 0);
+    sub_806A568(zoneSubTitle, RENDER_TARGET_SCREEN, spriteSize, zoneSubText->unk0, 0x1000, 0x9a, 0x44, 3, zoneSubText->unk2, 0);
 }
 
 static inline u16 *LoadCourseTimes(struct TimeRecordsScreen *timeRecordsScreen)
@@ -4337,8 +4138,7 @@ static inline u16 *LoadCourseTimes(struct TimeRecordsScreen *timeRecordsScreen)
         return timeRecordsScreen->playerDataMenu->optionsScreen->profileData.timeRecords
             .table[timeRecordsScreen->character][timeRecordsScreen->zone][act];
     } else {
-        return timeRecordsScreen->timeRecords
-            ->table[timeRecordsScreen->character][timeRecordsScreen->zone][act];
+        return timeRecordsScreen->timeRecords->table[timeRecordsScreen->character][timeRecordsScreen->zone][act];
     }
 }
 
@@ -4378,34 +4178,27 @@ static void TimeRecordsScreenCreateTimesUI(struct TimeRecordsScreen *timeRecords
         }
 
         digit = &sTimeRecordDigitTiles[DELIMINATOR_DIGIT];
-        sub_806A568(deliminator, RENDER_TARGET_SCREEN, digitSize, digit->unk0, 0x3000,
-                    (i * 8 + 48), (i * 24 + 84), 8, digit->unk2, 0);
+        sub_806A568(deliminator, RENDER_TARGET_SCREEN, digitSize, digit->unk0, 0x3000, (i * 8 + 48), (i * 24 + 84), 8, digit->unk2, 0);
 
         deliminator++;
-        sub_806A568(deliminator, RENDER_TARGET_SCREEN, digitSize, digit->unk0, 0x3000,
-                    (i * 8 + 96), (i * 24 + 84), 8, digit->unk2, 0);
+        sub_806A568(deliminator, RENDER_TARGET_SCREEN, digitSize, digit->unk0, 0x3000, (i * 8 + 96), (i * 24 + 84), 8, digit->unk2, 0);
 
         digit = &sTimeRecordDigitTiles[minutes];
-        sub_806A568(minuteDigit, RENDER_TARGET_SCREEN, digitSize, digit->unk0, 0x3000,
-                    (i * 8 + 0x20), (i * 24 + 84), 8, digit->unk2, 0);
+        sub_806A568(minuteDigit, RENDER_TARGET_SCREEN, digitSize, digit->unk0, 0x3000, (i * 8 + 0x20), (i * 24 + 84), 8, digit->unk2, 0);
 
         digit = &sTimeRecordDigitTiles[TENS_DIGIT(seconds)];
-        sub_806A568(secondDigit, RENDER_TARGET_SCREEN, digitSize, digit->unk0, 0x3000,
-                    (i * 8 + 0x40), (i * 24 + 84), 8, digit->unk2, 0);
+        sub_806A568(secondDigit, RENDER_TARGET_SCREEN, digitSize, digit->unk0, 0x3000, (i * 8 + 0x40), (i * 24 + 84), 8, digit->unk2, 0);
 
         secondDigit++;
         digit = &sTimeRecordDigitTiles[UNITS_DIGIT(seconds)];
-        sub_806A568(secondDigit, RENDER_TARGET_SCREEN, digitSize, digit->unk0, 0x3000,
-                    (i * 8 + 0x50), (i * 24 + 84), 8, digit->unk2, 0);
+        sub_806A568(secondDigit, RENDER_TARGET_SCREEN, digitSize, digit->unk0, 0x3000, (i * 8 + 0x50), (i * 24 + 84), 8, digit->unk2, 0);
 
         digit = &sTimeRecordDigitTiles[TENS_DIGIT(millis)];
-        sub_806A568(milliDigit, RENDER_TARGET_SCREEN, digitSize, digit->unk0, 0x3000,
-                    (i * 8 + 0x70), (i * 24 + 84), 8, digit->unk2, 0);
+        sub_806A568(milliDigit, RENDER_TARGET_SCREEN, digitSize, digit->unk0, 0x3000, (i * 8 + 0x70), (i * 24 + 84), 8, digit->unk2, 0);
 
         milliDigit++;
         digit = &sTimeRecordDigitTiles[UNITS_DIGIT(millis)];
-        sub_806A568(milliDigit, RENDER_TARGET_SCREEN, digitSize, digit->unk0, 0x3000,
-                    (i * 8 + 0x80), (i * 24 + 84), 8, digit->unk2, 0);
+        sub_806A568(milliDigit, RENDER_TARGET_SCREEN, digitSize, digit->unk0, 0x3000, (i * 8 + 0x80), (i * 24 + 84), 8, digit->unk2, 0);
     }
 }
 
@@ -4501,11 +4294,9 @@ static void Task_TimeRecordsScreenHandleCharacterChange(void)
     gBgScrollRegs[2][0] = 0xFF10;
     gBgScrollRegs[2][1] = 0x10;
 
-    OptionsInitBackground(&timeRecordsScreen->coursesViewCharacterBackground, 1, 0x16,
-                          sTimeRecordsCharacterAssets[character][0], 9, 0x14, 0, 1, 0,
-                          0);
-    OptionsInitBackground(&timeRecordsScreen->coursesViewCharacter, 2, 0x1E,
-                          sTimeRecordsCharacterAssets[character][1], 9, 0x14, 0, 2, 0,
+    OptionsInitBackground(&timeRecordsScreen->coursesViewCharacterBackground, 1, 0x16, sTimeRecordsCharacterAssets[character][0], 9, 0x14,
+                          0, 1, 0, 0);
+    OptionsInitBackground(&timeRecordsScreen->coursesViewCharacter, 2, 0x1E, sTimeRecordsCharacterAssets[character][1], 9, 0x14, 0, 2, 0,
                           0);
 
     gCurTask->main = Task_TimeRecordsScreenCharacterChangeAnimIn;
@@ -4539,8 +4330,7 @@ static void Task_TimeRecordsScreenCourseChangeAnim(void)
     timeRecordsScreen->animFrame++;
 
     for (i = 0; i < 3; i++) {
-        TimeRecordsScreenRenderTimeRowAnimFrame(i,
-                                                timeRecordsScreen->animFrame + i * -8);
+        TimeRecordsScreenRenderTimeRowAnimFrame(i, timeRecordsScreen->animFrame + i * -8);
     }
 
     TimeRecordsScreenRenderCoursesViewUI(0);
@@ -4556,10 +4346,8 @@ static void TimeRecordsScreenRenderTimeRowAnimFrame(s16 rowIndex, s16 frame)
     // Not sure why but the struct has to be loaded like this
 #ifndef NON_MATCHING
     u32 offsetA = gCurTask->data + (rowIndex * sizeof(struct TimeRecordDisplay));
-    register u32 offsetB asm("r2")
-        = IWRAM_START + offsetof(struct TimeRecordsScreen, timeDisplays);
-    struct TimeRecordDisplay *timeDisplay
-        = (struct TimeRecordDisplay *)(offsetA + offsetB);
+    register u32 offsetB asm("r2") = IWRAM_START + offsetof(struct TimeRecordsScreen, timeDisplays);
+    struct TimeRecordDisplay *timeDisplay = (struct TimeRecordDisplay *)(offsetA + offsetB);
 #else
     struct TimeRecordsScreen *trs = TASK_DATA(gCurTask);
     struct TimeRecordDisplay *timeDisplay = &trs->timeDisplays[rowIndex];
@@ -4590,8 +4378,7 @@ static void TimeRecordsScreenRenderTimeRowAnimFrame(s16 rowIndex, s16 frame)
 static void Task_TimeRecordsScreenCoursesViewMain(void)
 {
     struct TimeRecordsScreen *timeRecordsScreen = TASK_DATA(gCurTask);
-    s16 availableCourses
-        = timeRecordsScreen->unlockedCourses[timeRecordsScreen->character];
+    s16 availableCourses = timeRecordsScreen->unlockedCourses[timeRecordsScreen->character];
     s32 temp;
     if (availableCourses == 0) {
         availableCourses = 1;
@@ -4604,8 +4391,7 @@ static void Task_TimeRecordsScreenCoursesViewMain(void)
     TimeRecordsScreenRenderCoursesViewUI(0);
 
     if (gRepeatedKeys & (DPAD_LEFT | DPAD_RIGHT)) {
-        if (timeRecordsScreen->view == TIME_RECORDS_SCREEN_VIEW_TIME_ATTACK
-            && availableCourses == 1) {
+        if (timeRecordsScreen->view == TIME_RECORDS_SCREEN_VIEW_TIME_ATTACK && availableCourses == 1) {
             return;
         }
 
@@ -4671,8 +4457,7 @@ static void Task_TimeRecordsScreenCoursesViewMain(void)
                         }
                     } else {
                         timeRecordsScreen->act++;
-                        if (timeRecordsScreen->zone >= availableCourses
-                            && timeRecordsScreen->act > r5) {
+                        if (timeRecordsScreen->zone >= availableCourses && timeRecordsScreen->act > r5) {
                             timeRecordsScreen->zone = 0;
                             timeRecordsScreen->act = 0;
                             gCurTask->main = Task_TimeRecordsScreenHandleCourseChange;
@@ -4782,8 +4567,7 @@ static void Task_TimeRecordsScreenHandleCourseChange(void)
 
     u16 language = timeRecordsScreen->language;
     // zone number
-    const struct UNK_080D95E8 *zoneTitleText
-        = &sTimeRecordsZoneActTitleDigits[timeRecordsScreen->zone];
+    const struct UNK_080D95E8 *zoneTitleText = &sTimeRecordsZoneActTitleDigits[timeRecordsScreen->zone];
     zoneNumber->graphics.anim = zoneTitleText->unk0;
     zoneNumber->variant = zoneTitleText->unk2;
 
@@ -4854,8 +4638,7 @@ static void Task_TimeRecordsScreenFadeToPrevious(void)
             gUnknown_03002AE4 = gUnknown_0300287C;
             gUnknown_03005390 = 0;
             PAUSE_GRAPHICS_QUEUE();
-            CreateCharacterSelectionScreen(timeRecordsScreen->character,
-                                           allCharactersUnlocked);
+            CreateCharacterSelectionScreen(timeRecordsScreen->character, allCharactersUnlocked);
             break;
     }
 }
@@ -4873,8 +4656,7 @@ static void TimeRecordsScreenRenderCoursesViewUI(u16 a)
     Sprite *minute, *secondDigit, *milliDigit, *deliminator;
 
     s16 visibleScrollArrows, i, j;
-    s16 availableCourses
-        = timeRecordsScreen->unlockedCourses[timeRecordsScreen->character];
+    s16 availableCourses = timeRecordsScreen->unlockedCourses[timeRecordsScreen->character];
     if (availableCourses == 0) {
         availableCourses = 1;
     }
@@ -4888,14 +4670,8 @@ static void TimeRecordsScreenRenderCoursesViewUI(u16 a)
     }
 
     // No idea why j is reused here
-    j = timeRecordsScreen->view != TIME_RECORDS_SCREEN_VIEW_TIME_ATTACK && !a
-            && timeRecordsScreen->availableCharacters > 1
-        ? 4
-        : 2;
-    visibleScrollArrows = timeRecordsScreen->view == TIME_RECORDS_SCREEN_VIEW_TIME_ATTACK
-            && availableCourses < 2
-        ? 0
-        : j;
+    j = timeRecordsScreen->view != TIME_RECORDS_SCREEN_VIEW_TIME_ATTACK && !a && timeRecordsScreen->availableCharacters > 1 ? 4 : 2;
+    visibleScrollArrows = timeRecordsScreen->view == TIME_RECORDS_SCREEN_VIEW_TIME_ATTACK && availableCourses < 2 ? 0 : j;
 
     for (i = 0; i < visibleScrollArrows; i++, scrollArrows++) {
         UpdateSpriteAnimation(scrollArrows);
@@ -4937,16 +4713,14 @@ static void TimeRecordsScreenRenderCoursesViewUI(u16 a)
 static void CreateMultiplayerRecordsScreen(struct PlayerDataMenu *playerDataMenu)
 {
     struct Task *t
-        = TaskCreate(Task_MultiplayerRecordsScreenCreateNextTableRowUI,
-                     sizeof(struct MultiplayerRecordsScreen), 0x2000, 4, NULL);
+        = TaskCreate(Task_MultiplayerRecordsScreenCreateNextTableRowUI, sizeof(struct MultiplayerRecordsScreen), 0x2000, 4, NULL);
     struct MultiplayerRecordsScreen *multiplayerRecordsScreen = TASK_DATA(t);
 
     struct MultiplayerRecordRow *rows;
     struct OptionsScreenProfileData *profileData;
     s16 i, j;
 
-    multiplayerRecordsScreen->table
-        = EwramMalloc(sizeof(struct MultiplayerRecordsTable));
+    multiplayerRecordsScreen->table = EwramMalloc(sizeof(struct MultiplayerRecordsTable));
     multiplayerRecordsScreen->playerDataMenu = playerDataMenu;
 
     multiplayerRecordsScreen->scrollAnimFrame = 0;
@@ -4956,8 +4730,7 @@ static void CreateMultiplayerRecordsScreen(struct PlayerDataMenu *playerDataMenu
     multiplayerRecordsScreen->language = playerDataMenu->language;
 
     profileData = &playerDataMenu->optionsScreen->profileData;
-    memcpy(multiplayerRecordsScreen->playerName, profileData->playerName,
-           sizeof(profileData->playerName));
+    memcpy(multiplayerRecordsScreen->playerName, profileData->playerName, sizeof(profileData->playerName));
     multiplayerRecordsScreen->playerWins = profileData->multiplayerWins;
     multiplayerRecordsScreen->playerLoses = profileData->multiplayerLoses;
     multiplayerRecordsScreen->playerDraws = profileData->multiplayerDraws;
@@ -5005,8 +4778,7 @@ static void MultiplayerRecordsScreenInitRegisters(void)
     gBgScrollRegs[3][1] = 0;
 }
 
-static void MultiplayerRecordsScreenCreateBackgroundsUI(
-    struct MultiplayerRecordsScreen *multiplayerRecordsScreen)
+static void MultiplayerRecordsScreenCreateBackgroundsUI(struct MultiplayerRecordsScreen *multiplayerRecordsScreen)
 {
     ScreenFade *fade = &multiplayerRecordsScreen->fade;
     fade->window = 0;
@@ -5016,14 +4788,11 @@ static void MultiplayerRecordsScreenCreateBackgroundsUI(
     fade->bldAlpha = 0;
     fade->bldCnt = (BLDCNT_TGT1_ALL | BLDCNT_EFFECT_DARKEN);
 
-    OptionsInitBackground(&multiplayerRecordsScreen->backgroundTrims, 0, 7,
-                          TM_OPTIONS_VS_RECORD_BG1, 0x1E, 0x14, 0, 0, 0, 0);
-    OptionsInitBackground(&multiplayerRecordsScreen->background, 1, 0x16,
-                          TM_OPTIONS_TIME_RECORD_BG0, 0x1E, 0x14, 0, 1, 0, 0);
+    OptionsInitBackground(&multiplayerRecordsScreen->backgroundTrims, 0, 7, TM_OPTIONS_VS_RECORD_BG1, 0x1E, 0x14, 0, 0, 0, 0);
+    OptionsInitBackground(&multiplayerRecordsScreen->background, 1, 0x16, TM_OPTIONS_TIME_RECORD_BG0, 0x1E, 0x14, 0, 1, 0, 0);
 }
 
-static void MultiplayerRecordsScreenCreatePlayerRowUI(
-    struct MultiplayerRecordsScreen *multiplayerRecordsScreen)
+static void MultiplayerRecordsScreenCreatePlayerRowUI(struct MultiplayerRecordsScreen *multiplayerRecordsScreen)
 {
     s16 i, xPos, yPos;
     struct UNK_806B908 nameCharTile;
@@ -5037,42 +4806,37 @@ static void MultiplayerRecordsScreenCreatePlayerRowUI(
     Sprite *playerLossesDigit = multiplayerRecordsScreen->playerLossesDigits;
     Sprite *playerDrawsDigit = multiplayerRecordsScreen->playerDrawsDigits;
 
-    const struct UNK_080D95E8 *titleAndColumnHeadersText
-        = sMultiplayerRecordsTitleAndColumnHeadersText[multiplayerRecordsScreen
-                                                           ->language];
+    const struct UNK_080D95E8 *titleAndColumnHeadersText = sMultiplayerRecordsTitleAndColumnHeadersText[multiplayerRecordsScreen->language];
     const struct UNK_080D95E8 *scrollArrowTile = sProfileNameScreenScrollArrowTiles;
     // The data is made into a pointer here but then another pointer is used for
     // the actual reference
     const struct UNK_080D95E8 *digitTile, *digitTiles = sMultiplayerScoreDigitTiles;
 
     // title
-    sub_806A568(title, RENDER_TARGET_SCREEN, titleAndColumnHeadersText->unk4,
-                titleAndColumnHeadersText->unk0, 0x1000, 9, 18, 5,
+    sub_806A568(title, RENDER_TARGET_SCREEN, titleAndColumnHeadersText->unk4, titleAndColumnHeadersText->unk0, 0x1000, 9, 18, 5,
                 titleAndColumnHeadersText->unk2, 0);
 
     // column headers
     titleAndColumnHeadersText++;
-    sub_806A568(columnHeaders, RENDER_TARGET_SCREEN, titleAndColumnHeadersText->unk4,
-                titleAndColumnHeadersText->unk0, 0x1000, 118, 38, 5,
+    sub_806A568(columnHeaders, RENDER_TARGET_SCREEN, titleAndColumnHeadersText->unk4, titleAndColumnHeadersText->unk0, 0x1000, 118, 38, 5,
                 titleAndColumnHeadersText->unk2, 0);
 
-    sub_806A568(scrollArrows, RENDER_TARGET_SCREEN, scrollArrowTile->unk4,
-                scrollArrowTile->unk0, 0x1000, 8, 0x4E, 0xD, scrollArrowTile->unk2, 0);
+    sub_806A568(scrollArrows, RENDER_TARGET_SCREEN, scrollArrowTile->unk4, scrollArrowTile->unk0, 0x1000, 8, 0x4E, 0xD,
+                scrollArrowTile->unk2, 0);
     scrollArrows++;
     scrollArrowTile++;
-    sub_806A568(scrollArrows, RENDER_TARGET_SCREEN, scrollArrowTile->unk4,
-                scrollArrowTile->unk0, 0x1000, 8, 0x88, 0xD, scrollArrowTile->unk2, 0);
+    sub_806A568(scrollArrows, RENDER_TARGET_SCREEN, scrollArrowTile->unk4, scrollArrowTile->unk0, 0x1000, 8, 0x88, 0xD,
+                scrollArrowTile->unk2, 0);
 
-    for (i = 0, xPos = 34, yPos = 58; i < MAX_PLAYER_NAME_LENGTH;
-         i++, playerNameDisplayChar++, xPos += 12) {
+    for (i = 0, xPos = 34, yPos = 58; i < MAX_PLAYER_NAME_LENGTH; i++, playerNameDisplayChar++, xPos += 12) {
         u16 nameChar = multiplayerRecordsScreen->playerName[i];
         if (nameChar == PLAYER_NAME_END_CHAR) {
             nameChar = 0x11;
         }
 
         nameCharTile = sub_806B908(nameChar);
-        sub_806A568(playerNameDisplayChar, RENDER_TARGET_SCREEN, nameCharTile.unk0,
-                    nameCharTile.unk4, 0x1000, xPos, yPos, 5, nameCharTile.unk6, 0);
+        sub_806A568(playerNameDisplayChar, RENDER_TARGET_SCREEN, nameCharTile.unk0, nameCharTile.unk4, 0x1000, xPos, yPos, 5,
+                    nameCharTile.unk6, 0);
     }
 
     wins = multiplayerRecordsScreen->playerWins;
@@ -5080,31 +4844,25 @@ static void MultiplayerRecordsScreenCreatePlayerRowUI(
     draws = multiplayerRecordsScreen->playerDraws;
 
     digitTile = &digitTiles[TENS_DIGIT(wins)];
-    sub_806A568(playerWinsDigit, RENDER_TARGET_SCREEN, digitTile->unk4, digitTile->unk0,
-                0x2000, 0x7C, 0x40, 0xD, digitTile->unk2, 0);
+    sub_806A568(playerWinsDigit, RENDER_TARGET_SCREEN, digitTile->unk4, digitTile->unk0, 0x2000, 0x7C, 0x40, 0xD, digitTile->unk2, 0);
 
     playerWinsDigit++;
     digitTile = &digitTiles[UNITS_DIGIT(wins)];
-    sub_806A568(playerWinsDigit, RENDER_TARGET_SCREEN, digitTile->unk4, digitTile->unk0,
-                0x2000, 0x84, 0x40, 0xD, digitTile->unk2, 0);
+    sub_806A568(playerWinsDigit, RENDER_TARGET_SCREEN, digitTile->unk4, digitTile->unk0, 0x2000, 0x84, 0x40, 0xD, digitTile->unk2, 0);
 
     digitTile = &digitTiles[TENS_DIGIT(loses)];
-    sub_806A568(playerLossesDigit, RENDER_TARGET_SCREEN, digitTile->unk4,
-                digitTile->unk0, 0x2000, 0xA4, 0x40, 0xD, digitTile->unk2, 0);
+    sub_806A568(playerLossesDigit, RENDER_TARGET_SCREEN, digitTile->unk4, digitTile->unk0, 0x2000, 0xA4, 0x40, 0xD, digitTile->unk2, 0);
 
     playerLossesDigit++;
     digitTile = &digitTiles[UNITS_DIGIT(loses)];
-    sub_806A568(playerLossesDigit, RENDER_TARGET_SCREEN, digitTile->unk4,
-                digitTile->unk0, 0x2000, 0xAC, 0x40, 0xD, digitTile->unk2, 0);
+    sub_806A568(playerLossesDigit, RENDER_TARGET_SCREEN, digitTile->unk4, digitTile->unk0, 0x2000, 0xAC, 0x40, 0xD, digitTile->unk2, 0);
 
     digitTile = &digitTiles[TENS_DIGIT(draws)];
-    sub_806A568(playerDrawsDigit, RENDER_TARGET_SCREEN, digitTile->unk4, digitTile->unk0,
-                0x2000, 0xCC, 0x40, 0xD, digitTile->unk2, 0);
+    sub_806A568(playerDrawsDigit, RENDER_TARGET_SCREEN, digitTile->unk4, digitTile->unk0, 0x2000, 0xCC, 0x40, 0xD, digitTile->unk2, 0);
 
     playerDrawsDigit++;
     digitTile = &digitTiles[UNITS_DIGIT(draws)];
-    sub_806A568(playerDrawsDigit, RENDER_TARGET_SCREEN, digitTile->unk4, digitTile->unk0,
-                0x2000, 0xD4, 0x40, 0xD, digitTile->unk2, 0);
+    sub_806A568(playerDrawsDigit, RENDER_TARGET_SCREEN, digitTile->unk4, digitTile->unk0, 0x2000, 0xD4, 0x40, 0xD, digitTile->unk2, 0);
 }
 
 static void MultiplayerRecordsScreenCreateTableRowUI(s16 rowIndex)
@@ -5125,16 +4883,15 @@ static void MultiplayerRecordsScreenCreateTableRowUI(s16 rowIndex)
     yPos = rowIndex * 18 + 90;
     nameDisplayChar = row->nameDisplay;
 
-    for (j = 0, xPos = 34; j < MAX_PLAYER_NAME_LENGTH;
-         j++, nameDisplayChar++, xPos += 12) {
+    for (j = 0, xPos = 34; j < MAX_PLAYER_NAME_LENGTH; j++, nameDisplayChar++, xPos += 12) {
         u16 nameChar = row->playerName[j];
         if (nameChar == PLAYER_NAME_END_CHAR) {
             nameChar = 17;
         }
 
         nameCharTile = sub_806B908(nameChar);
-        sub_806A568(nameDisplayChar, RENDER_TARGET_SCREEN, nameCharTile.unk0,
-                    nameCharTile.unk4, 0x2000, xPos, yPos, 5, nameCharTile.unk6, 0);
+        sub_806A568(nameDisplayChar, RENDER_TARGET_SCREEN, nameCharTile.unk0, nameCharTile.unk4, 0x2000, xPos, yPos, 5, nameCharTile.unk6,
+                    0);
     }
 
     wins = row->wins;
@@ -5143,28 +4900,24 @@ static void MultiplayerRecordsScreenCreateTableRowUI(s16 rowIndex)
     yPos += 6;
 
     digitTile = &digitTiles[TENS_DIGIT(wins)];
-    sub_806A568(&row->winsDigits[0], RENDER_TARGET_SCREEN, digitTile->unk4,
-                digitTile->unk0, 0x2000, 0x7C, yPos, 0xD, digitTile->unk2, 0);
+    sub_806A568(&row->winsDigits[0], RENDER_TARGET_SCREEN, digitTile->unk4, digitTile->unk0, 0x2000, 0x7C, yPos, 0xD, digitTile->unk2, 0);
 
     digitTile = &digitTiles[UNITS_DIGIT(wins)];
-    sub_806A568(&row->winsDigits[1], RENDER_TARGET_SCREEN, digitTile->unk4,
-                digitTile->unk0, 0x2000, 0x84, yPos, 0xD, digitTile->unk2, 0);
+    sub_806A568(&row->winsDigits[1], RENDER_TARGET_SCREEN, digitTile->unk4, digitTile->unk0, 0x2000, 0x84, yPos, 0xD, digitTile->unk2, 0);
 
     digitTile = &digitTiles[TENS_DIGIT(loses)];
-    sub_806A568(&row->losesDigits[0], RENDER_TARGET_SCREEN, digitTile->unk4,
-                digitTile->unk0, 0x2000, 0xA4, yPos, 0xD, digitTile->unk2, 0);
+    sub_806A568(&row->losesDigits[0], RENDER_TARGET_SCREEN, digitTile->unk4, digitTile->unk0, 0x2000, 0xA4, yPos, 0xD, digitTile->unk2, 0);
 
     digitTile = &digitTiles[UNITS_DIGIT(loses)];
-    sub_806A568(&row->losesDigits[1], RENDER_TARGET_SCREEN, digitTile->unk4,
-                digitTile->unk0, 0x2000, 0xAC, yPos, 0xD, digitTile->unk2, 0);
+    sub_806A568(&row->losesDigits[1], RENDER_TARGET_SCREEN, digitTile->unk4, digitTile->unk0, 0x2000, 0xAC, yPos, 0xD, digitTile->unk2, 0);
 
     digitTile = &digitTiles[TENS_DIGIT(draws)];
-    sub_806A568(&row->defeatsDigits[0], RENDER_TARGET_SCREEN, digitTile->unk4,
-                digitTile->unk0, 0x2000, 0xCC, yPos, 0xD, digitTile->unk2, 0);
+    sub_806A568(&row->defeatsDigits[0], RENDER_TARGET_SCREEN, digitTile->unk4, digitTile->unk0, 0x2000, 0xCC, yPos, 0xD, digitTile->unk2,
+                0);
 
     digitTile = &digitTiles[UNITS_DIGIT(draws)];
-    sub_806A568(&row->defeatsDigits[1], RENDER_TARGET_SCREEN, digitTile->unk4,
-                digitTile->unk0, 0x2000, 0xD4, yPos, 0xD, digitTile->unk2, 0);
+    sub_806A568(&row->defeatsDigits[1], RENDER_TARGET_SCREEN, digitTile->unk4, digitTile->unk0, 0x2000, 0xD4, yPos, 0xD, digitTile->unk2,
+                0);
 }
 
 static void Task_MultiplayerRecordsScreenMain(void)
@@ -5178,29 +4931,23 @@ static void Task_MultiplayerRecordsScreenMain(void)
         if (gRepeatedKeys & DPAD_UP) {
             if (multiplayerRecordsScreen->scrollIndex > 0) {
                 m4aSongNumStart(SE_MENU_CURSOR_MOVE);
-                multiplayerRecordsScreen->currentFirstVisibleRowIndex
-                    = multiplayerRecordsScreen->scrollIndex;
-                multiplayerRecordsScreen->targetFirstVisibleRowIndex
-                    = --multiplayerRecordsScreen->scrollIndex;
+                multiplayerRecordsScreen->currentFirstVisibleRowIndex = multiplayerRecordsScreen->scrollIndex;
+                multiplayerRecordsScreen->targetFirstVisibleRowIndex = --multiplayerRecordsScreen->scrollIndex;
 
                 gCurTask->main = Task_MultiplayerRecordsScreenScrollAnim;
                 return;
             }
         } else if (gRepeatedKeys & DPAD_DOWN) {
-            if (multiplayerRecordsScreen->scrollIndex
-                >= MULTIPLAYER_RECORDS_SCREEN_MAX_SCROLL_INDEX) {
+            if (multiplayerRecordsScreen->scrollIndex >= MULTIPLAYER_RECORDS_SCREEN_MAX_SCROLL_INDEX) {
                 return;
             }
 
             // next row to show
-            rows = &rows[multiplayerRecordsScreen->scrollIndex
-                         + MULTIPLAYER_RECORDS_SCREEN_NUM_VISIBLE_ROWS];
+            rows = &rows[multiplayerRecordsScreen->scrollIndex + MULTIPLAYER_RECORDS_SCREEN_NUM_VISIBLE_ROWS];
             if (rows->slotFilled) {
                 m4aSongNumStart(SE_MENU_CURSOR_MOVE);
-                multiplayerRecordsScreen->targetFirstVisibleRowIndex
-                    = multiplayerRecordsScreen->scrollIndex;
-                multiplayerRecordsScreen->currentFirstVisibleRowIndex
-                    = multiplayerRecordsScreen->scrollIndex;
+                multiplayerRecordsScreen->targetFirstVisibleRowIndex = multiplayerRecordsScreen->scrollIndex;
+                multiplayerRecordsScreen->currentFirstVisibleRowIndex = multiplayerRecordsScreen->scrollIndex;
                 multiplayerRecordsScreen->scrollIndex++;
 
                 gCurTask->main = Task_MultiplayerRecordsScreenScrollAnim;
@@ -5226,8 +4973,7 @@ static void Task_MultiplayerRecordsScreenScrollAnim(void)
 
     multiplayerRecordsScreen->scrollAnimFrame++;
 
-    if (multiplayerRecordsScreen->scrollIndex
-        < multiplayerRecordsScreen->currentFirstVisibleRowIndex) {
+    if (multiplayerRecordsScreen->scrollIndex < multiplayerRecordsScreen->currentFirstVisibleRowIndex) {
         temp = multiplayerRecordsScreen->scrollAnimFrame * 2 + 72;
     } else {
         temp = 90 - (multiplayerRecordsScreen->scrollAnimFrame * 2);
@@ -5236,17 +4982,14 @@ static void Task_MultiplayerRecordsScreenScrollAnim(void)
 
     if (multiplayerRecordsScreen->scrollAnimFrame > 8) {
         yPos = 90;
-        multiplayerRecordsScreen->targetFirstVisibleRowIndex
-            = multiplayerRecordsScreen->scrollIndex;
+        multiplayerRecordsScreen->targetFirstVisibleRowIndex = multiplayerRecordsScreen->scrollIndex;
     }
 
-    if (multiplayerRecordsScreen->targetFirstVisibleRowIndex
-        == MULTIPLAYER_RECORDS_SCREEN_MAX_SCROLL_INDEX) {
+    if (multiplayerRecordsScreen->targetFirstVisibleRowIndex == MULTIPLAYER_RECORDS_SCREEN_MAX_SCROLL_INDEX) {
         numVisibleRows--;
     }
 
-    row = &multiplayerRecordsScreen->table
-               ->rows[multiplayerRecordsScreen->targetFirstVisibleRowIndex];
+    row = &multiplayerRecordsScreen->table->rows[multiplayerRecordsScreen->targetFirstVisibleRowIndex];
 
     for (i = 0; i < numVisibleRows; i++, yPos += 18, row++) {
         Sprite *unk10, *unk130, *unk190, *unk1F0;
@@ -5313,12 +5056,8 @@ static void MultiplayerRecordsScreenRenderUI(void)
     scrollArrow++;
 
     // Maybe they meant to use the assignment here
-    row = &multiplayerRecordsScreen->table
-               ->rows[multiplayerRecordsScreen->scrollIndex
-                      + MULTIPLAYER_RECORDS_SCREEN_NUM_VISIBLE_ROWS];
-    if (multiplayerRecordsScreen->scrollIndex
-            < MULTIPLAYER_RECORDS_SCREEN_MAX_SCROLL_INDEX
-        && row->slotFilled) {
+    row = &multiplayerRecordsScreen->table->rows[multiplayerRecordsScreen->scrollIndex + MULTIPLAYER_RECORDS_SCREEN_NUM_VISIBLE_ROWS];
+    if (multiplayerRecordsScreen->scrollIndex < MULTIPLAYER_RECORDS_SCREEN_MAX_SCROLL_INDEX && row->slotFilled) {
         DisplaySprite(scrollArrow);
     }
 
@@ -5338,13 +5077,11 @@ static void MultiplayerRecordsScreenRenderUI(void)
         DisplaySprite(playerDrawsDigit);
     }
 
-    if (multiplayerRecordsScreen->targetFirstVisibleRowIndex
-        == MULTIPLAYER_RECORDS_SCREEN_MAX_SCROLL_INDEX) {
+    if (multiplayerRecordsScreen->targetFirstVisibleRowIndex == MULTIPLAYER_RECORDS_SCREEN_MAX_SCROLL_INDEX) {
         numVisibleRows--;
     }
 
-    row = &multiplayerRecordsScreen->table
-               ->rows[multiplayerRecordsScreen->targetFirstVisibleRowIndex];
+    row = &multiplayerRecordsScreen->table->rows[multiplayerRecordsScreen->targetFirstVisibleRowIndex];
 
     for (i = 0; i < numVisibleRows; i++, row++) {
         if (!row->slotFilled) {
@@ -5377,8 +5114,7 @@ static void MultiplayerRecordsScreenRenderUI(void)
 
 // Some sort of register menu item function
 // used in sound test, but wonder why it wasn't split out
-void sub_806A568(Sprite *obj, s8 target, u32 size, u16 c, u32 assetId, s16 xPos,
-                 s16 yPos, u16 oamOrder, u8 variant, u8 palId)
+void sub_806A568(Sprite *obj, s8 target, u32 size, u16 c, u32 assetId, s16 xPos, s16 yPos, u16 oamOrder, u8 variant, u8 palId)
 {
     Sprite newObj;
     Sprite *s;
@@ -5509,8 +5245,7 @@ static void Task_OptionsScreenShow(void)
 
 static void SetupOptionScreenBackgroundsUI(struct OptionsScreen *optionsScreen)
 {
-    SetupOptionScreenBackgrounds(optionsScreen->background,
-                                 optionsScreen->subMenuBackground);
+    SetupOptionScreenBackgrounds(optionsScreen->background, optionsScreen->subMenuBackground);
 }
 
 static void Task_OptionScreenFadeIn(void)
@@ -5852,8 +5587,7 @@ static void PlayerDataMenuRenderUI(void)
 
 static void CreateDifficultyMenu(struct OptionsScreen *optionsScreen)
 {
-    struct Task *t = TaskCreate(Task_DifficultyMenuOpenAnimWait,
-                                sizeof(struct SwitchMenu), 0x2000, 4, NULL);
+    struct Task *t = TaskCreate(Task_DifficultyMenuOpenAnimWait, sizeof(struct SwitchMenu), 0x2000, 4, NULL);
     struct SwitchMenu *difficultyMenu = TASK_DATA(t);
 
     difficultyMenu->optionsScreen = optionsScreen;
@@ -5886,8 +5620,7 @@ static void DifficultyMenuRenderUI(void)
 
 static void CreateTimeLimitMenu(struct OptionsScreen *optionsScreen)
 {
-    struct Task *t = TaskCreate(Task_TimeLimitMenuOpenAnimWait,
-                                sizeof(struct SwitchMenu), 0x2000, 4, 0);
+    struct Task *t = TaskCreate(Task_TimeLimitMenuOpenAnimWait, sizeof(struct SwitchMenu), 0x2000, 4, 0);
     struct SwitchMenu *timeLimitMenu = TASK_DATA(t);
 
     timeLimitMenu->optionsScreen = optionsScreen;
@@ -5969,8 +5702,7 @@ static void Task_ButtonConfigMenuHandleBButtonComplete(void)
 
 static void CreateEditLanguageScreen(struct OptionsScreen *optionScreen)
 {
-    struct Task *t = TaskCreate(Task_LanguageScreenFadeIn, sizeof(struct LanguageScreen),
-                                0x2000, 4, NULL);
+    struct Task *t = TaskCreate(Task_LanguageScreenFadeIn, sizeof(struct LanguageScreen), 0x2000, 4, NULL);
     struct LanguageScreen *languageScreen = TASK_DATA(t);
 
     languageScreen->optionsScreen = optionScreen;
@@ -5986,8 +5718,7 @@ static void CreateEditLanguageScreen(struct OptionsScreen *optionScreen)
 
 static void LanguageScreenCreateBackgroundsUI(struct LanguageScreen *languageScreen)
 {
-    OptionsInitBackground(&languageScreen->unk1B0, 0, 7, TM_OPTIONS_LANGUAGE_SELECT,
-                          0x1E, 0x14, 0, 0, 0, 0);
+    OptionsInitBackground(&languageScreen->unk1B0, 0, 7, TM_OPTIONS_LANGUAGE_SELECT, 0x1E, 0x14, 0, 0, 0, 0);
 }
 
 static void Task_LanguageScreenFadeIn(void)
@@ -6064,8 +5795,7 @@ static void LanguageScreenRenderUI(void)
 
 static void DeleteScreenCreateBackgroundsUI(struct DeleteScreen *deleteScreen)
 {
-    OptionsInitBackground(&deleteScreen->background, 0, 7, TM_OPTIONS_LANGUAGE_SELECT,
-                          0x1e, 0x14, 0, 0, 0, 0);
+    OptionsInitBackground(&deleteScreen->background, 0, 7, TM_OPTIONS_LANGUAGE_SELECT, 0x1e, 0x14, 0, 0, 0, 0);
 }
 
 static void Task_DeleteScreenFadeIn(void)
@@ -6130,8 +5860,7 @@ static void Task_ProfileNameScreenFadeIn(void)
     }
 }
 
-UNUSED static void
-TimeRecordsScreenShowChoiceView(struct TimeRecordsScreen *timeRecordsScreen)
+UNUSED static void TimeRecordsScreenShowChoiceView(struct TimeRecordsScreen *timeRecordsScreen)
 {
     timeRecordsScreen->animFrame = 0;
     timeRecordsScreen->isBossMode = FALSE;
@@ -6236,8 +5965,7 @@ static void TimeRecordsScreenRenderModeChoiceUI(void)
     }
 }
 
-static void
-TimeRecordsScreenCreateCoursesView(struct TimeRecordsScreen *timeRecordsScreen)
+static void TimeRecordsScreenCreateCoursesView(struct TimeRecordsScreen *timeRecordsScreen)
 {
     timeRecordsScreen->view = TIME_RECORDS_SCREEN_VIEW_MODE_CHOICE;
     ResetProfileScreensVram();
@@ -6274,8 +6002,7 @@ static void Task_TimeRecordsScreenHandleActChange(void)
     struct TimeRecordsScreen *timeRecordsScreen = TASK_DATA(gCurTask);
     Sprite *unkDC = &timeRecordsScreen->actTitle[1];
 
-    const struct UNK_080D95E8 *unk5E8
-        = &sTimeRecordsZoneActTitleDigits[timeRecordsScreen->act];
+    const struct UNK_080D95E8 *unk5E8 = &sTimeRecordsZoneActTitleDigits[timeRecordsScreen->act];
 
     unkDC->graphics.anim = unk5E8->unk0;
     unkDC->variant = unk5E8->unk2;
@@ -6312,9 +6039,7 @@ static void Task_TimeRecordsScreenFadeOutToSelectedCourse(void)
         return;
     }
 
-    gCurrentLevel
-        = LEVEL_INDEX(timeRecordsScreen->zone,
-                      timeRecordsScreen->isBossMode ? ACT_BOSS : timeRecordsScreen->act);
+    gCurrentLevel = LEVEL_INDEX(timeRecordsScreen->zone, timeRecordsScreen->isBossMode ? ACT_BOSS : timeRecordsScreen->act);
 
     EwramFree(timeRecordsScreen->timeRecords);
     TaskDestroy(gCurTask);
@@ -6388,8 +6113,7 @@ static void Task_MultiplayerRecordsScreenFadeOutAndExit(void)
     TaskDestroy(gCurTask);
 }
 
-void OptionsInitBackground(Background *background, u32 a, u32 b, u8 tilemapId, u16 d,
-                           u16 e, u16 f, u8 bg_id, u16 scrollX, u16 scrollY)
+void OptionsInitBackground(Background *background, u32 a, u32 b, u8 tilemapId, u16 d, u16 e, u16 f, u8 bg_id, u16 scrollX, u16 scrollY)
 {
     background->graphics.dest = (void *)BG_CHAR_ADDR(a);
     background->graphics.anim = 0;
diff --git a/src/game/player_callbacks.c b/src/game/player_callbacks.c
index 3ab3dd379..98a83c8a9 100644
--- a/src/game/player_callbacks.c
+++ b/src/game/player_callbacks.c
@@ -79,8 +79,7 @@ const ALIGNED(4) u16 gUnknown_080D5518[3][3] = {
     { 16, SA2_ANIM_CHAR(SA2_CHAR_ANIM_51, CHARACTER_SONIC), 3 },
 };
 
-const ALIGNED(4) s16 gUnknown_080D552C[6]
-    = { Q(2.0), Q(4.0), Q(6.0), Q(8.0), Q(10.0), 0 };
+const ALIGNED(4) s16 gUnknown_080D552C[6] = { Q(2.0), Q(4.0), Q(6.0), Q(8.0), Q(10.0), 0 };
 
 static const s8 gUnknown_080D5538[4] = { 96, 97, 98, 99 };
 
@@ -137,8 +136,7 @@ struct Task *sub_8011C98(s32 x, s32 y)
     if (IS_MULTI_PLAYER) {
         return NULL;
     } else {
-        struct Task *t = TaskCreate(Task_8012034, sizeof(TaskStrc_8011C98), 0x4001, 0,
-                                    TaskDestructor_80124B8);
+        struct Task *t = TaskCreate(Task_8012034, sizeof(TaskStrc_8011C98), 0x4001, 0, TaskDestructor_80124B8);
 
         TaskStrc_8011C98 *strc = TASK_DATA(t);
         Sprite *s = &strc->s;
@@ -334,8 +332,7 @@ void Task_8012034(void)
     Sprite *s = &strc->s;
     Vec2_32 pos;
 
-    if ((gPlayer.moveState & MOVESTATE_DEAD) || (gPlayer.speedAirY < Q(2.0))
-        || (gPlayer.unk64 != 36)) {
+    if ((gPlayer.moveState & MOVESTATE_DEAD) || (gPlayer.speedAirY < Q(2.0)) || (gPlayer.unk64 != 36)) {
         TaskDestroy(gCurTask);
     } else {
         UpdateSpriteAnimation(s);
@@ -458,8 +455,7 @@ void Player_UpdateHomingPosition(s32 qX, s32 qY)
     if (gPlayer.character == CHARACTER_SONIC) {
         if (sqDistance < gHomingTarget.squarePlayerDistance) {
             if (gPlayer.moveState & MOVESTATE_FACING_LEFT) {
-                u16 angle = CLAMP_SIN_PERIOD(sub_8004418(vecTargetX, vecTargetY)
-                                             - (SIN_PERIOD / 4));
+                u16 angle = CLAMP_SIN_PERIOD(sub_8004418(vecTargetX, vecTargetY) - (SIN_PERIOD / 4));
                 if (angle <= DEG_TO_SIN(110)) {
                     angle = CLAMP_SIN_PERIOD((SIN_PERIOD / 2) - angle);
 
@@ -479,8 +475,7 @@ void Player_UpdateHomingPosition(s32 qX, s32 qY)
 
         if (sqDistance < gCheeseTarget.squarePlayerDistance) {
             if (((gPlayer.moveState & MOVESTATE_FACING_LEFT) && (vecTargetX >= 0))
-                || ((!(gPlayer.moveState & MOVESTATE_FACING_LEFT))
-                    && (vecTargetX <= 0))) {
+                || ((!(gPlayer.moveState & MOVESTATE_FACING_LEFT)) && (vecTargetX <= 0))) {
                 gCheeseTarget.squarePlayerDistance = sqDistance;
                 gCheeseTarget.task = t;
             }
@@ -663,8 +658,7 @@ void PlayerCB_80126B0(Player *p)
             p->unk61 = 1;
         }
     } else {
-        if ((p->unk5E & gPlayerControls.jump) && (p->speedAirY >= -Q(0.75))
-            && (p->w.cf.flyingDuration != 0)) {
+        if ((p->unk5E & gPlayerControls.jump) && (p->speedAirY >= -Q(0.75)) && (p->w.cf.flyingDuration != 0)) {
             p->unk61 = 2;
         }
 
@@ -776,8 +770,7 @@ void PlayerCB_8012938(Player *p)
 void PlayerCB_8012978(Player *p)
 {
     if (p->unk90->s.frameFlags & SPRITE_FLAG_MASK_ANIM_OVER) {
-        if ((p->anim == SA2_ANIM_CHAR(SA2_CHAR_ANIM_INSTA_SHIELD_1, CHARACTER_CREAM))
-            && p->variant == 0) {
+        if ((p->anim == SA2_ANIM_CHAR(SA2_CHAR_ANIM_INSTA_SHIELD_1, CHARACTER_CREAM)) && p->variant == 0) {
             p->variant++;
         }
     }
@@ -918,8 +911,7 @@ void PlayerCB_8012C2C(Player *p)
             p->unk61 = 1;
         }
     } else {
-        if ((p->unk5E & gPlayerControls.jump) && (p->speedAirY >= -Q(0.75))
-            && (p->w.tf.flyingDuration != 0)) {
+        if ((p->unk5E & gPlayerControls.jump) && (p->speedAirY >= -Q(0.75)) && (p->w.tf.flyingDuration != 0)) {
             p->unk61 = 2;
         }
 
@@ -1258,9 +1250,7 @@ void sub_80131B4(Player *p)
                             playerBottomX -= 1;
                             playerBottomX -= p->unk16;
 
-                            if (sub_801E4E4(playerBottomY, playerBottomX, p->unk38, -8,
-                                            NULL, sub_801EE64)
-                                < 0) {
+                            if (sub_801E4E4(playerBottomY, playerBottomX, p->unk38, -8, NULL, sub_801EE64) < 0) {
                                 PLAYERFN_SET(PlayerCB_8013BD4);
                                 p->unk64 = 93;
                                 p->unk16 = 6;
@@ -1278,9 +1268,7 @@ void sub_80131B4(Player *p)
                             playerBottomX -= 1;
                             playerBottomX -= p->unk16;
 
-                            if (sub_801E4E4(playerBottomY, playerBottomX, p->unk38, +8,
-                                            NULL, sub_801EE64)
-                                < 0) {
+                            if (sub_801E4E4(playerBottomY, playerBottomX, p->unk38, +8, NULL, sub_801EE64) < 0) {
 
                                 PLAYERFN_SET(PlayerCB_8013BD4);
                                 p->unk64 = 93;
@@ -1316,8 +1304,7 @@ void sub_80131B4(Player *p)
                             playerBottomX += p->unk16;
 
                             if (sub_801E4E4(playerBottomY, // fmt
-                                            playerBottomX, p->unk38, +8, NULL,
-                                            sub_801EE64)
+                                            playerBottomX, p->unk38, +8, NULL, sub_801EE64)
                                 < 0) {
                                 PLAYERFN_SET(PlayerCB_8013BD4);
                                 p->unk64 = 93;
diff --git a/src/game/race_progress.c b/src/game/race_progress.c
index 98ec2199e..4441025a5 100644
--- a/src/game/race_progress.c
+++ b/src/game/race_progress.c
@@ -59,8 +59,7 @@ void CreateRaceProgressIndicator(void)
 {
     u8 i;
     struct Task *t
-        = TaskCreate(Task_UpdateAvatarPositions, sizeof(struct RaceProgressIndicator),
-                     0x1000, 0, RaceProgressIndicatorOnDestroy);
+        = TaskCreate(Task_UpdateAvatarPositions, sizeof(struct RaceProgressIndicator), 0x1000, 0, RaceProgressIndicatorOnDestroy);
     struct RaceProgressIndicator *progressIndicator = TASK_DATA(t);
 
     progressIndicator->course = COURSE_LEVEL_TO_COURSE_INDEX(gCurrentLevel);
@@ -151,8 +150,7 @@ static void Task_UpdateAvatarPositions(void)
     for (i = 0; i < progressIndicator->numPlayers; i++) {
         avatar = &progressIndicator->avatars[i];
         mpp = TASK_DATA(gMultiplayerPlayerTasks[i]);
-        avatar->x
-            = ((mpp->pos.x * sCourseStepSizes[progressIndicator->course]) >> 0x10) + 6;
+        avatar->x = ((mpp->pos.x * sCourseStepSizes[progressIndicator->course]) >> 0x10) + 6;
     }
 
     RenderUI(progressIndicator);
diff --git a/src/game/save.c b/src/game/save.c
index c59f42853..942973794 100644
--- a/src/game/save.c
+++ b/src/game/save.c
@@ -56,25 +56,22 @@ struct SaveSectorData *gSaveSectorDataBuffer = NULL;
 static s16 FindNewestSaveGameSector(void);
 static s16 FindOldestSaveGameSector(void);
 
-static bool16 UnpackSaveSectorData(struct SaveGame *gameState,
-                                   struct SaveSectorData *save);
-static bool16 PackSaveSectorData(struct SaveSectorData *save,
-                                 struct SaveGame *gameState);
+static bool16 UnpackSaveSectorData(struct SaveGame *gameState, struct SaveSectorData *save);
+static bool16 PackSaveSectorData(struct SaveSectorData *save, struct SaveGame *gameState);
 
-static bool16 ReadSaveSectorAndVerifyChecksum(struct SaveSectorData *save,
-                                              s16 sectorNum);
+static bool16 ReadSaveSectorAndVerifyChecksum(struct SaveSectorData *save, s16 sectorNum);
 static u16 WriteToSaveSector(struct SaveSectorData *data, s16 sectorNum);
 static u16 EraseSaveSector(s16 sectorNum);
 static bool16 HasChangesToSave(void);
 static bool16 StringEquals(u16 *string1, u16 *string2, s16 length);
 
-#define CalcChecksum(save)                                                              \
-    ({                                                                                  \
-        u32 j, checksum = 0;                                                            \
-        for (j = 0; j < SECTOR_CHECKSUM_OFFSET; j += sizeof(uintptr_t)) {               \
-            checksum += *(uintptr_t *)((void *)(save) + j);                             \
-        }                                                                               \
-        checksum;                                                                       \
+#define CalcChecksum(save)                                                                                                                 \
+    ({                                                                                                                                     \
+        u32 j, checksum = 0;                                                                                                               \
+        for (j = 0; j < SECTOR_CHECKSUM_OFFSET; j += sizeof(uintptr_t)) {                                                                  \
+            checksum += *(uintptr_t *)((void *)(save) + j);                                                                                \
+        }                                                                                                                                  \
+        checksum;                                                                                                                          \
     })
 
 #define UNLOCK_FLAG_CREAM       1 << 0
@@ -104,25 +101,21 @@ void InsertMultiplayerProfile(u32 playerId, u16 *name)
 
     for (i = 0; i < 10; i++) {
         struct MultiplayerScore *score = &gLoadedSaveGame->multiplayerScores[i];
-        if (playerId == score->playerId
-            && StringEquals(name, score->playerName, MAX_PLAYER_NAME_LENGTH)) {
+        if (playerId == score->playerId && StringEquals(name, score->playerName, MAX_PLAYER_NAME_LENGTH)) {
             struct MultiplayerScore scoreCopy;
             memcpy(&scoreCopy, score, sizeof(struct MultiplayerScore));
 
             for (j = i; j > 0; j--) {
-                gLoadedSaveGame->multiplayerScores[j]
-                    = gLoadedSaveGame->multiplayerScores[j - 1];
+                gLoadedSaveGame->multiplayerScores[j] = gLoadedSaveGame->multiplayerScores[j - 1];
             }
-            memcpy(&gLoadedSaveGame->multiplayerScores[0], &scoreCopy,
-                   sizeof(struct MultiplayerScore));
+            memcpy(&gLoadedSaveGame->multiplayerScores[0], &scoreCopy, sizeof(struct MultiplayerScore));
             return;
         }
     }
 
     // otherwise, insert the score at the beginning
     for (i = 9; i > 0; i--) {
-        gLoadedSaveGame->multiplayerScores[i]
-            = gLoadedSaveGame->multiplayerScores[i - 1];
+        gLoadedSaveGame->multiplayerScores[i] = gLoadedSaveGame->multiplayerScores[i - 1];
     }
 
     gLoadedSaveGame->multiplayerScores[0].playerId = playerId;
@@ -162,8 +155,7 @@ void RecordMultiplayerResult(u32 id, u16 *name, s16 result)
 
     for (i = 0; i < NUM_MULTIPLAYER_SCORES; i++) {
         struct MultiplayerScore *score = &gLoadedSaveGame->multiplayerScores[i];
-        if (id == score->playerId
-            && StringEquals(name, score->playerName, MAX_PLAYER_NAME_LENGTH)) {
+        if (id == score->playerId && StringEquals(name, score->playerName, MAX_PLAYER_NAME_LENGTH)) {
             switch (result) {
                 case MULTIPLAYER_RESULT_WIN:
                     if (score->wins < MAX_MULTIPLAYER_SCORE) {
@@ -432,8 +424,7 @@ static bool16 PackSaveSectorData(struct SaveSectorData *save, struct SaveGame *g
     save->multiplayerDraws = gameState->multiplayerDraws;
 
     memcpy(&save->timeRecords, &gameState->timeRecords, sizeof(gameState->timeRecords));
-    memcpy(save->multiplayerScores, gameState->multiplayerScores,
-           sizeof(gameState->multiplayerScores));
+    memcpy(save->multiplayerScores, gameState->multiplayerScores, sizeof(gameState->multiplayerScores));
 
     save->id = Random32();
     save->score = gameState->score;
@@ -514,8 +505,7 @@ static u16 WriteToSaveSector(struct SaveSectorData *data, s16 sectorNum)
     DmaStop(2);
     DmaStop(3);
 
-    result = ProgramFlashSectorAndVerifyNBytes(sectorNum, data,
-                                               sizeof(struct SaveSectorData));
+    result = ProgramFlashSectorAndVerifyNBytes(sectorNum, data, sizeof(struct SaveSectorData));
 
     REG_IE = preIE;
     REG_IME = preIME;
@@ -623,8 +613,7 @@ static s16 FindNewestSaveGameSector(void)
     return bestSector;
 }
 
-static bool16 UnpackSaveSectorData(struct SaveGame *gameState,
-                                   struct SaveSectorData *save)
+static bool16 UnpackSaveSectorData(struct SaveGame *gameState, struct SaveSectorData *save)
 {
     s16 i;
 
@@ -744,8 +733,7 @@ static bool16 UnpackSaveSectorData(struct SaveGame *gameState,
     gameState->multiplayerDraws = save->multiplayerDraws;
     gameState->timeRecords = save->timeRecords;
 
-    memcpy(gameState->multiplayerScores, save->multiplayerScores,
-           sizeof(save->multiplayerScores));
+    memcpy(gameState->multiplayerScores, save->multiplayerScores, sizeof(save->multiplayerScores));
     gameState->score = save->score;
     return TRUE;
 }
@@ -843,9 +831,8 @@ static void GenerateCompletedSaveGame(struct SaveGame *gameState)
     gameState->score = 0;
 
     for (i = 0; i < 5; i++) {
-        gameState->unlockedLevels[i] = i == CHARACTER_SONIC
-            ? LEVEL_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53) + 1
-            : LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE) + 1;
+        gameState->unlockedLevels[i]
+            = i == CHARACTER_SONIC ? LEVEL_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53) + 1 : LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE) + 1;
         gameState->chaosEmeralds[i] = ALL_ZONE_CHAOS_EMERALDS | CHAOS_EMERALDS_COMPLETED;
     }
 
diff --git a/src/game/sound_test.c b/src/game/sound_test.c
index 480d74678..b61e2100c 100644
--- a/src/game/sound_test.c
+++ b/src/game/sound_test.c
@@ -102,35 +102,28 @@ static void SoundTestScreenSetNameDisplayPos(u8, s16, s16);
 #define CREAM_DANCE_STEP_LEFT          2
 #define CREAM_DANCE_STEP_SECOND_MIDDLE 3
 
-#define LangOffset(lang) ((lang)*3)
-#define TextOffset(langOffset, offset, segment, numSegments)                            \
-    (langOffset * numSegments + (segment * 3) + offset)
-#define Text(language, a, b, segment, numSegments)                                      \
-    [TextOffset(LangOffset(LanguageIndex(language)), 0, segment, numSegments)]          \
-        = a,                                                                            \
-        [TextOffset(LangOffset(LanguageIndex(language)), 1, segment, numSegments)]      \
-        = b,                                                                            \
-        [TextOffset(LangOffset(LanguageIndex(language)), 2, segment, numSegments)]      \
-        = segment
+#define LangOffset(lang)                                     ((lang)*3)
+#define TextOffset(langOffset, offset, segment, numSegments) (langOffset * numSegments + (segment * 3) + offset)
+#define Text(language, a, b, segment, numSegments)                                                                                         \
+    [TextOffset(LangOffset(LanguageIndex(language)), 0, segment, numSegments)]                                                             \
+        = a,                                                                                                                               \
+        [TextOffset(LangOffset(LanguageIndex(language)), 1, segment, numSegments)]                                                         \
+        = b,                                                                                                                               \
+        [TextOffset(LangOffset(LanguageIndex(language)), 2, segment, numSegments)] = segment
 
 static const char sSoundNames[68][MAX_SOUND_NAME_LENGTH] = {
-    "OPENING         ", "TITLE           ", "CHARACTER SELECT", "ZONE SELECT     ",
-    "ZONE SELECT 2   ", "ZONE SELECT 3   ", "TIMEATTACK 1    ", "OPTIONS         ",
-    "ZONE 1-1        ", "ZONE 1-2        ", "ZONE 2-1        ", "ZONE 2-2        ",
-    "ZONE 3-1        ", "ZONE 3-2        ", "ZONE 4-1        ", "ZONE 4-2        ",
-    "ZONE 5-1        ", "ZONE 5-2        ", "ZONE 6-1        ", "ZONE 6-2        ",
-    "ZONE 7-1        ", "ZONE 7-2        ", "FINAL ZONE      ", "EXTRA ZONE      ",
-    "UNRIVAL         ", "DROWN           ", "BOSS            ", "BOSS-PINCH      ",
-    "KNUCKLES BOSS   ", "7-BOSS          ", "7-BOSS-PINCH    ", "FINAL BOSS      ",
-    "FINAL BOSS-PINCH", "GAME OVER       ", "FINAL ENDING    ", "EXTRA ENDING    ",
-    "STAFF ROLL      ", "DEMO 1          ", "DEMO 2          ", "EXTRA DEMO 1    ",
-    "EXTRA DEMO 2    ", "IN SP STAGE     ", "SP STAGE        ", "SP STAGE-PINCH  ",
-    "ACHIEVEMENT     ", "SP CLEAR        ", "SP RESULT 1     ", "SP RESULT 2     ",
-    "SP RESULT 3     ", "VS 1            ", "VS 2            ", "VS 4            ",
-    "VS 3            ", "VS WAIT         ", "ACT CLEAR       ", "BOSS CLEAR      ",
-    "FINAL CLEAR     ", "EXTRA CLEAR     ", "TIMEATTACK 2    ", "TIMEATTACK 3    ",
-    "1_UP            ", "CHARACTER       ", "VS END          ", "VS WAIT         ",
-    "VS WAIT         ", "CAOS EMERALD 7  ", "MESSAGE         ", "FANFARE         ",
+    "OPENING         ", "TITLE           ", "CHARACTER SELECT", "ZONE SELECT     ", "ZONE SELECT 2   ", "ZONE SELECT 3   ",
+    "TIMEATTACK 1    ", "OPTIONS         ", "ZONE 1-1        ", "ZONE 1-2        ", "ZONE 2-1        ", "ZONE 2-2        ",
+    "ZONE 3-1        ", "ZONE 3-2        ", "ZONE 4-1        ", "ZONE 4-2        ", "ZONE 5-1        ", "ZONE 5-2        ",
+    "ZONE 6-1        ", "ZONE 6-2        ", "ZONE 7-1        ", "ZONE 7-2        ", "FINAL ZONE      ", "EXTRA ZONE      ",
+    "UNRIVAL         ", "DROWN           ", "BOSS            ", "BOSS-PINCH      ", "KNUCKLES BOSS   ", "7-BOSS          ",
+    "7-BOSS-PINCH    ", "FINAL BOSS      ", "FINAL BOSS-PINCH", "GAME OVER       ", "FINAL ENDING    ", "EXTRA ENDING    ",
+    "STAFF ROLL      ", "DEMO 1          ", "DEMO 2          ", "EXTRA DEMO 1    ", "EXTRA DEMO 2    ", "IN SP STAGE     ",
+    "SP STAGE        ", "SP STAGE-PINCH  ", "ACHIEVEMENT     ", "SP CLEAR        ", "SP RESULT 1     ", "SP RESULT 2     ",
+    "SP RESULT 3     ", "VS 1            ", "VS 2            ", "VS 4            ", "VS 3            ", "VS WAIT         ",
+    "ACT CLEAR       ", "BOSS CLEAR      ", "FINAL CLEAR     ", "EXTRA CLEAR     ", "TIMEATTACK 2    ", "TIMEATTACK 3    ",
+    "1_UP            ", "CHARACTER       ", "VS END          ", "VS WAIT         ", "VS WAIT         ", "CAOS EMERALD 7  ",
+    "MESSAGE         ", "FANFARE         ",
 };
 
 static const u16 sSoundNumberToSongMap[68] = {
@@ -205,41 +198,28 @@ static const u16 sSoundNumberToSongMap[68] = {
 };
 
 static const u32 sSoundTempos[67] = {
-    Q_20_12(17.5),           Q_20_12(17.5),           Q_20_12(16.0),
-    Q_20_12(16.0625),        Q_20_12(16.6875),        Q_20_12(16.25),
-    Q_20_12(15.25),          Q_20_12(15.0),           Q_20_12(20.75),
-    Q_20_12(20.75),          Q_20_12(21.0234375),     Q_20_12(20.4375),
-    Q_20_12(16.84228515625), Q_20_12(16.84228515625), Q_20_12(19.0),
-    Q_20_12(27.0),           Q_20_12(17.8125),        Q_20_12(20.0),
-    Q_20_12(20.5),           Q_20_12(21.5),           Q_20_12(20.125),
-    Q_20_12(21.5),           Q_20_12(20.75),          Q_20_12(21.5),
-    Q_20_12(16.8203125),     Q_20_12(19.25),          Q_20_12(21.25),
-    Q_20_12(20.0),           Q_20_12(20.5),           Q_20_12(22.5),
-    Q_20_12(23.6875),        Q_20_12(18.0),           Q_20_12(19.125),
-    Q_20_12(16.0),           Q_20_12(17.0),           Q_20_12(22.5),
-    Q_20_12(19.0),           Q_20_12(16.0),           Q_20_12(14.75),
-    Q_20_12(18.875),         Q_20_12(19.0625),        Q_20_12(16.0),
-    Q_20_12(21.0),           Q_20_12(22.0),           Q_20_12(21.0),
-    Q_20_12(20.0),           Q_20_12(26.3125),        Q_20_12(18.0),
-    Q_20_12(23.75),          Q_20_12(20.8125),        Q_20_12(20.0),
-    Q_20_12(21.0),           Q_20_12(16.875),         Q_20_12(20.0),
-    Q_20_12(18.0),           Q_20_12(19.0),           Q_20_12(21.0),
-    Q_20_12(18.0),           Q_20_12(18.0),           Q_20_12(21.0),
-    Q_20_12(16.0),           Q_20_12(16.0),           Q_20_12(16.0),
-    Q_20_12(16.0),           Q_20_12(18.0),           Q_20_12(16.0),
+    Q_20_12(17.5),           Q_20_12(17.5),           Q_20_12(16.0),   Q_20_12(16.0625), Q_20_12(16.6875),    Q_20_12(16.25),
+    Q_20_12(15.25),          Q_20_12(15.0),           Q_20_12(20.75),  Q_20_12(20.75),   Q_20_12(21.0234375), Q_20_12(20.4375),
+    Q_20_12(16.84228515625), Q_20_12(16.84228515625), Q_20_12(19.0),   Q_20_12(27.0),    Q_20_12(17.8125),    Q_20_12(20.0),
+    Q_20_12(20.5),           Q_20_12(21.5),           Q_20_12(20.125), Q_20_12(21.5),    Q_20_12(20.75),      Q_20_12(21.5),
+    Q_20_12(16.8203125),     Q_20_12(19.25),          Q_20_12(21.25),  Q_20_12(20.0),    Q_20_12(20.5),       Q_20_12(22.5),
+    Q_20_12(23.6875),        Q_20_12(18.0),           Q_20_12(19.125), Q_20_12(16.0),    Q_20_12(17.0),       Q_20_12(22.5),
+    Q_20_12(19.0),           Q_20_12(16.0),           Q_20_12(14.75),  Q_20_12(18.875),  Q_20_12(19.0625),    Q_20_12(16.0),
+    Q_20_12(21.0),           Q_20_12(22.0),           Q_20_12(21.0),   Q_20_12(20.0),    Q_20_12(26.3125),    Q_20_12(18.0),
+    Q_20_12(23.75),          Q_20_12(20.8125),        Q_20_12(20.0),   Q_20_12(21.0),    Q_20_12(16.875),     Q_20_12(20.0),
+    Q_20_12(18.0),           Q_20_12(19.0),           Q_20_12(21.0),   Q_20_12(18.0),    Q_20_12(18.0),       Q_20_12(21.0),
+    Q_20_12(16.0),           Q_20_12(16.0),           Q_20_12(16.0),   Q_20_12(16.0),    Q_20_12(18.0),       Q_20_12(16.0),
     Q_20_12(20.0),
 };
 
 static const u8 sCompletedGameSoundsOrder[63] = {
-    0,  1,  2,  3,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 26, 27,
-    28, 29, 30, 31, 32, 54, 55, 56, 33, 24, 25, 60, 37, 38, 4,  41, 42, 43, 44, 45, 46,
-    47, 48, 34, 36, 66, 6,  58, 59, 7,  53, 49, 50, 52, 51, 62, 5,  39, 40, 23, 57, 35,
+    0,  1,  2,  3, 8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 26, 27, 28, 29, 30, 31, 32, 54, 55, 56, 33, 24, 25,
+    60, 37, 38, 4, 41, 42, 43, 44, 45, 46, 47, 48, 34, 36, 66, 6,  58, 59, 7,  53, 49, 50, 52, 51, 62, 5,  39, 40, 23, 57, 35,
 };
 
 static const u8 sSoundsOrder[57] = {
-    0,  1,  2,  3,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
-    26, 27, 28, 29, 30, 31, 32, 54, 55, 56, 33, 24, 25, 60, 37, 38, 4,  41, 42,
-    43, 44, 45, 46, 47, 48, 34, 36, 66, 6,  58, 59, 7,  53, 49, 50, 52, 51, 62,
+    0,  1,  2,  3,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 26, 27, 28, 29, 30, 31, 32, 54, 55, 56,
+    33, 24, 25, 60, 37, 38, 4,  41, 42, 43, 44, 45, 46, 47, 48, 34, 36, 66, 6,  58, 59, 7,  53, 49, 50, 52, 51, 62,
 };
 
 static const u8 sDigitTransitionAnim[8] = {
@@ -251,31 +231,26 @@ static const u8 gUnknown_080E0C38[12] = {
 };
 
 static const u32 sTitleText[NUM_LANGUAGES * 3] = {
-    Text(LANG_JAPANESE, 42, 967, 0, 1), Text(LANG_ENGLISH, 32, 1030, 0, 1),
-    Text(LANG_GERMAN, 32, 1030, 0, 1),  Text(LANG_FRENCH, 26, 1031, 0, 1),
-    Text(LANG_SPANISH, 48, 1032, 0, 1), Text(LANG_ITALIAN, 34, 1033, 0, 1),
+    Text(LANG_JAPANESE, 42, 967, 0, 1), Text(LANG_ENGLISH, 32, 1030, 0, 1), Text(LANG_GERMAN, 32, 1030, 0, 1),
+    Text(LANG_FRENCH, 26, 1031, 0, 1),  Text(LANG_SPANISH, 48, 1032, 0, 1), Text(LANG_ITALIAN, 34, 1033, 0, 1),
 };
 
 static const u32 sControlsText[NUM_LANGUAGES * 3] = {
-    Text(LANG_JAPANESE, 20, 966, 0, 1), Text(LANG_ENGLISH, 20, 1039, 0, 1),
-    Text(LANG_GERMAN, 20, 1040, 0, 1),  Text(LANG_FRENCH, 20, 1041, 0, 1),
-    Text(LANG_SPANISH, 20, 1042, 0, 1), Text(LANG_ITALIAN, 20, 1043, 0, 1),
+    Text(LANG_JAPANESE, 20, 966, 0, 1), Text(LANG_ENGLISH, 20, 1039, 0, 1), Text(LANG_GERMAN, 20, 1040, 0, 1),
+    Text(LANG_FRENCH, 20, 1041, 0, 1),  Text(LANG_SPANISH, 20, 1042, 0, 1), Text(LANG_ITALIAN, 20, 1043, 0, 1),
 };
 
 static const u32 sBackButtonText[NUM_LANGUAGES * 3 * 2] = {
-    Text(LANG_JAPANESE, 10, 965, 0, 2), Text(LANG_JAPANESE, 10, 965, 1, 2),
-    Text(LANG_ENGLISH, 8, 1034, 0, 2),  Text(LANG_ENGLISH, 8, 1034, 1, 2),
-    Text(LANG_GERMAN, 8, 1035, 0, 2),   Text(LANG_GERMAN, 12, 1035, 1, 2),
-    Text(LANG_FRENCH, 8, 1036, 0, 2),   Text(LANG_FRENCH, 12, 1036, 1, 2),
-    Text(LANG_SPANISH, 10, 1037, 0, 2), Text(LANG_SPANISH, 10, 1037, 1, 2),
-    Text(LANG_ITALIAN, 8, 1038, 0, 2),  Text(LANG_ITALIAN, 12, 1038, 1, 2),
+    Text(LANG_JAPANESE, 10, 965, 0, 2), Text(LANG_JAPANESE, 10, 965, 1, 2), Text(LANG_ENGLISH, 8, 1034, 0, 2),
+    Text(LANG_ENGLISH, 8, 1034, 1, 2),  Text(LANG_GERMAN, 8, 1035, 0, 2),   Text(LANG_GERMAN, 12, 1035, 1, 2),
+    Text(LANG_FRENCH, 8, 1036, 0, 2),   Text(LANG_FRENCH, 12, 1036, 1, 2),  Text(LANG_SPANISH, 10, 1037, 0, 2),
+    Text(LANG_SPANISH, 10, 1037, 1, 2), Text(LANG_ITALIAN, 8, 1038, 0, 2),  Text(LANG_ITALIAN, 12, 1038, 1, 2),
 };
 
 void CreateSoundTestScreen(struct OptionsScreen *optionsScreen)
 {
     struct Task *t
-        = TaskCreate(Task_SoundTestScreenInOutTransition, sizeof(struct SoundTestScreen),
-                     0x1800, TASK_x0004, SoundTestScreenOnDestroy);
+        = TaskCreate(Task_SoundTestScreenInOutTransition, sizeof(struct SoundTestScreen), 0x1800, TASK_x0004, SoundTestScreenOnDestroy);
     struct SoundTestScreen *soundTestScreen = TASK_DATA(t);
     ScreenFade *fade;
     struct UNK_3005B80_UNK4 *unk10;
@@ -353,41 +328,32 @@ static void SoundTestScreenCreateUI(struct Task *t)
     const u32 *r6 = sTitleText;
     s32 langOffset = LangOffset(*language);
 
-    sub_806A568(title, RENDER_TARGET_SCREEN, r6[TextOffset(langOffset, 0, 0, 1)],
-                sTitleText[TextOffset(langOffset, 1, 0, 1)], 0x1000, 10, 0x10, 5,
-                sTitleText[TextOffset(langOffset, 2, 0, 1)], 0);
+    sub_806A568(title, RENDER_TARGET_SCREEN, r6[TextOffset(langOffset, 0, 0, 1)], sTitleText[TextOffset(langOffset, 1, 0, 1)], 0x1000, 10,
+                0x10, 5, sTitleText[TextOffset(langOffset, 2, 0, 1)], 0);
     // Trim
-    sub_806A568(titleTrimAndControls, RENDER_TARGET_SCREEN, 0x60, 0x3C9, 0x1000, 0, 0, 6,
-                0, 0);
+    sub_806A568(titleTrimAndControls, RENDER_TARGET_SCREEN, 0x60, 0x3C9, 0x1000, 0, 0, 6, 0, 0);
 
     titleTrimAndControls++;
     // Controls (play and buttons)
-    sub_806A568(titleTrimAndControls, RENDER_TARGET_SCREEN,
-                sControlsText[TextOffset(langOffset, 0, 0, 1)],
-                sControlsText[TextOffset(langOffset, 1, 0, 1)], 0x1000, 10, 0x86, 5,
-                sControlsText[TextOffset(langOffset, 2, 0, 1)], 0);
+    sub_806A568(titleTrimAndControls, RENDER_TARGET_SCREEN, sControlsText[TextOffset(langOffset, 0, 0, 1)],
+                sControlsText[TextOffset(langOffset, 1, 0, 1)], 0x1000, 10, 0x86, 5, sControlsText[TextOffset(langOffset, 2, 0, 1)], 0);
 
     // back button name
-    sub_806A568(backControlName, RENDER_TARGET_SCREEN,
-                sBackButtonText[TextOffset(langOffset, 0, 1, 2)],
-                sBackButtonText[TextOffset(langOffset, 1, 1, 2)], 0x1000, 0x5A, 0x86, 5,
-                sBackButtonText[TextOffset(langOffset, 2, 1, 2)], 0);
-    sub_806A568(scrollArrows, RENDER_TARGET_SCREEN, 1, 0x3C5, 0x1000, 0x5A, 0x5A, 5, 2,
+    sub_806A568(backControlName, RENDER_TARGET_SCREEN, sBackButtonText[TextOffset(langOffset, 0, 1, 2)],
+                sBackButtonText[TextOffset(langOffset, 1, 1, 2)], 0x1000, 0x5A, 0x86, 5, sBackButtonText[TextOffset(langOffset, 2, 1, 2)],
                 0);
+    sub_806A568(scrollArrows, RENDER_TARGET_SCREEN, 1, 0x3C5, 0x1000, 0x5A, 0x5A, 5, 2, 0);
 
     for (i = 0, xPos = 80, yPos = 96; i < 3; i++, songNumDisplayElement++, xPos -= 8) {
         if (i == 0) {
-            sub_806A568(songNumDisplayElement, RENDER_TARGET_SCREEN, 2, 0x45f, 0x1000,
-                        xPos, yPos, 5, 0x11, 0);
+            sub_806A568(songNumDisplayElement, RENDER_TARGET_SCREEN, 2, 0x45f, 0x1000, xPos, yPos, 5, 0x11, 0);
         } else {
-            sub_806A568(songNumDisplayElement, RENDER_TARGET_SCREEN, 2, 0x45f, 0x1000,
-                        xPos, yPos, 5, 0x10, 0);
+            sub_806A568(songNumDisplayElement, RENDER_TARGET_SCREEN, 2, 0x45f, 0x1000, xPos, yPos, 5, 0x10, 0);
         }
     }
 
     for (i = 0; i < 4; i++) {
-        sub_806A568(&speakerCone[i], RENDER_TARGET_SCREEN, 0x40, 0x3ce, i | 0x1060, 0x4c,
-                    0x5a, 6, 0, 0);
+        sub_806A568(&speakerCone[i], RENDER_TARGET_SCREEN, 0x40, 0x3ce, i | 0x1060, 0x4c, 0x5a, 6, 0, 0);
     }
 
     // Transforms static circle
@@ -404,18 +370,14 @@ static void SoundTestScreenCreateUI(struct Task *t)
     transforms[2].x--;
     transforms[3].y--;
 
-    sub_806A568(danceStage, RENDER_TARGET_SCREEN, 0x14, 0x3CC, 0x1000, 0xB4, 0x8C, 6, 0,
-                4);
-    sub_806A568(animatedCream, RENDER_TARGET_SCREEN, 0x40, 0x3CA, 0x1000, 0xB4, 0x74, 5,
-                0, 0);
+    sub_806A568(danceStage, RENDER_TARGET_SCREEN, 0x14, 0x3CC, 0x1000, 0xB4, 0x8C, 6, 0, 4);
+    sub_806A568(animatedCream, RENDER_TARGET_SCREEN, 0x40, 0x3CA, 0x1000, 0xB4, 0x74, 5, 0, 0);
     animatedCream++;
-    sub_806A568(animatedCream, RENDER_TARGET_SCREEN, 0x48, 0x3C8, 0x1000, 0xB4, 0x74, 5,
-                0, 0);
+    sub_806A568(animatedCream, RENDER_TARGET_SCREEN, 0x48, 0x3C8, 0x1000, 0xB4, 0x74, 5, 0, 0);
 
     for (i = 0; i < MAX_SOUND_NAME_LENGTH; i++) {
-        sub_806A568(&soundTestScreen->nameDisplay[i], RENDER_TARGET_SCREEN, 2, 0x45F,
-                    0x1000, 0, 0, 5, sSoundNames[sCompletedGameSoundsOrder[0]][i] - 0x20,
-                    0);
+        sub_806A568(&soundTestScreen->nameDisplay[i], RENDER_TARGET_SCREEN, 2, 0x45F, 0x1000, 0, 0, 5,
+                    sSoundNames[sCompletedGameSoundsOrder[0]][i] - 0x20, 0);
     }
 }
 
@@ -484,8 +446,7 @@ static void Task_SoundTestScreenMain(void)
         // tens
         if ((soundTestScreen->soundNumber / 10) % 10 > (prevSongNumber / 10) % 10) {
             soundTestScreen->soundNumAnimSteps[1] = -7;
-        } else if ((soundTestScreen->soundNumber / 10) % 10
-                   < (prevSongNumber / 10) % 10) {
+        } else if ((soundTestScreen->soundNumber / 10) % 10 < (prevSongNumber / 10) % 10) {
             soundTestScreen->soundNumAnimSteps[1] = 7;
         }
 
@@ -502,8 +463,7 @@ static void Task_SoundTestScreenMain(void)
         }
     }
 
-    if (soundTestScreen->state == SOUND_TEST_SCREEN_PLAYING
-        && gMPlayTable[0].info->status == MUSICPLAYER_STATUS_PAUSE) {
+    if (soundTestScreen->state == SOUND_TEST_SCREEN_PLAYING && gMPlayTable[0].info->status == MUSICPLAYER_STATUS_PAUSE) {
         soundTestScreen->state = SOUND_TEST_SCREEN_STOPPED;
         backControlName->variant = 1;
         UpdateSpriteAnimation(backControlName);
@@ -515,16 +475,11 @@ static void Task_SoundTestScreenMain(void)
 
     if (gPressedKeys & A_BUTTON) {
         u32 songTempo;
-        soundTestScreen->songTempo = songTempo
-            = sSoundTempos[soundsList[soundTestScreen->soundNumber - 1]];
+        soundTestScreen->songTempo = songTempo = sSoundTempos[soundsList[soundTestScreen->soundNumber - 1]];
         soundTestScreen->creams[DANCING_CREAM].animSpeed = Q_20_12_TO_INT(songTempo);
         m4aMPlayAllStop();
 
-        MPlayStart(
-            &gMPlayInfo_BGM,
-            gSongTable
-                [sSoundNumberToSongMap[soundsList[soundTestScreen->soundNumber - 1]]]
-                    .header);
+        MPlayStart(&gMPlayInfo_BGM, gSongTable[sSoundNumberToSongMap[soundsList[soundTestScreen->soundNumber - 1]]].header);
 
         soundTestScreen->state = SOUND_TEST_SCREEN_PLAYING;
         backControlName->variant = 0;
@@ -569,8 +524,7 @@ static void Task_SoundTestScreenMain(void)
         soundTestScreen->nameTickerPos = 0;
     }
 
-    SoundTestScreenSetNameDisplayPos(soundsList[soundTestScreen->soundNumber - 1],
-                                     0x100 - soundTestScreen->nameTickerPos, 0x9E);
+    SoundTestScreenSetNameDisplayPos(soundsList[soundTestScreen->soundNumber - 1], 0x100 - soundTestScreen->nameTickerPos, 0x9E);
     SoundTestScreenRenderUI();
 }
 
@@ -605,14 +559,12 @@ static void SoundTestScreenRenderUI(void)
 
         if (soundTestScreen->soundNumAnimSteps[i] != 0) {
             if (soundTestScreen->soundNumAnimSteps[i] > 0) {
-                numberDisplayDigit->y
-                    = sDigitTransitionAnim[soundTestScreen->soundNumAnimSteps[i]] + 96;
+                numberDisplayDigit->y = sDigitTransitionAnim[soundTestScreen->soundNumAnimSteps[i]] + 96;
                 soundTestScreen->soundNumAnimSteps[i]--;
             }
 
             if (soundTestScreen->soundNumAnimSteps[i] < 0) {
-                numberDisplayDigit->y
-                    = 96 - sDigitTransitionAnim[-soundTestScreen->soundNumAnimSteps[i]];
+                numberDisplayDigit->y = 96 - sDigitTransitionAnim[-soundTestScreen->soundNumAnimSteps[i]];
                 soundTestScreen->soundNumAnimSteps[i]++;
             }
         }
@@ -635,9 +587,7 @@ static void SoundTestScreenRenderUI(void)
         u8 numChangeElements = 0;
         u16 amplification = 0;
         u32 testVal;
-        testVal = (u32)(*(s16 *)REG_ADDR_SOUND1CNT_H
-                        & (SOUND_B_RIGHT_OUTPUT | SOUND_B_LEFT_OUTPUT | SOUND_B_TIMER_1
-                           | SOUND_B_FIFO_RESET))
+        testVal = (u32)(*(s16 *)REG_ADDR_SOUND1CNT_H & (SOUND_B_RIGHT_OUTPUT | SOUND_B_LEFT_OUTPUT | SOUND_B_TIMER_1 | SOUND_B_FIFO_RESET))
             >> 0xC;
         if (soundTestScreen->measurementSound1H != testVal) {
             amplification += 32;
@@ -656,9 +606,7 @@ static void SoundTestScreenRenderUI(void)
             numChangeElements++;
         }
 
-        testVal = (u32)(*(s16 *)REG_ADDR_SOUND3CNT_H
-                        & (SOUND_B_RIGHT_OUTPUT | SOUND_B_LEFT_OUTPUT | SOUND_B_TIMER_1
-                           | SOUND_B_FIFO_RESET))
+        testVal = (u32)(*(s16 *)REG_ADDR_SOUND3CNT_H & (SOUND_B_RIGHT_OUTPUT | SOUND_B_LEFT_OUTPUT | SOUND_B_TIMER_1 | SOUND_B_FIFO_RESET))
             >> 0xC;
         if (soundTestScreen->measurementSound3H != testVal) {
             amplification += 32;
@@ -667,9 +615,7 @@ static void SoundTestScreenRenderUI(void)
             numChangeElements++;
         }
 
-        testVal = (u32)(*(s16 *)REG_ADDR_SOUND4CNT_L
-                        & (SOUND_B_RIGHT_OUTPUT | SOUND_B_LEFT_OUTPUT | SOUND_B_TIMER_1
-                           | SOUND_B_FIFO_RESET))
+        testVal = (u32)(*(s16 *)REG_ADDR_SOUND4CNT_L & (SOUND_B_RIGHT_OUTPUT | SOUND_B_LEFT_OUTPUT | SOUND_B_TIMER_1 | SOUND_B_FIFO_RESET))
             >> 0xC;
         if (soundTestScreen->measurementSound3L != testVal) {
             amplification += 32;
@@ -709,15 +655,13 @@ static void SoundTestScreenRenderUI(void)
     for (i = 0; i < 4; i++) {
         if (sprCream->graphics.anim != SA2_ANIM_SOUNDTEST_CREAM_BOW) {
             speakerConeEffects[i].rotation = DEG_TO_SIN(90) * i;
-            speakerConeEffects[i].height = speakerConeEffects[i].width
-                = soundTestScreen->speakerSize + 0x100;
+            speakerConeEffects[i].height = speakerConeEffects[i].width = soundTestScreen->speakerSize + 0x100;
         }
 
         TransformSprite(&speakerConeElement[i], &speakerConeEffects[i]);
     }
 
-    soundTestScreen->speakerSize
-        -= SIN(0x100 - (soundTestScreen->speakerAnimFrame * 4)) >> 8;
+    soundTestScreen->speakerSize -= SIN(0x100 - (soundTestScreen->speakerAnimFrame * 4)) >> 8;
 
     if (soundTestScreen->speakerAnimFrame > 0) {
         soundTestScreen->speakerAnimFrame--;
@@ -733,12 +677,9 @@ static void SoundTestScreenRenderUI(void)
 
     DisplaySprite(sprCream);
 
-    scrollArrows->x
-        = ((COS((soundTestScreen->scrollArrowAnimFrame & 15) * 0x10) >> 6) * 5 >> 7)
-        + 94;
+    scrollArrows->x = ((COS((soundTestScreen->scrollArrowAnimFrame & 15) * 0x10) >> 6) * 5 >> 7) + 94;
     DisplaySprite(scrollArrows);
-    scrollArrows->x = 58
-        - ((COS((soundTestScreen->scrollArrowAnimFrame & 15) * 0x10) >> 6) * 5 >> 7);
+    scrollArrows->x = 58 - ((COS((soundTestScreen->scrollArrowAnimFrame & 15) * 0x10) >> 6) * 5 >> 7);
     scrollArrows->frameFlags |= 0x400;
     DisplaySprite(scrollArrows);
     scrollArrows->frameFlags &= ~0x400;
@@ -855,30 +796,24 @@ static void SoundTestScreenUpdateCreamAnim(void)
             soundTestScreen->animFrame = soundTestScreen->barBeat >> 16;
             UpdateSpriteAnimation(animatedCream);
 
-            if (soundTestScreen->animFrame >= 55
-                && soundTestScreen->creamDanceAnimStep == CREAM_DANCE_STEP_RIGHT) {
+            if (soundTestScreen->animFrame >= 55 && soundTestScreen->creamDanceAnimStep == CREAM_DANCE_STEP_RIGHT) {
                 soundTestScreen->creamDanceAnimStep = CREAM_DANCE_STEP_FIRST_MIDDLE;
                 SoundTestScreenSetCreamAnim(CREAM_ANIM_DANCE_MIDDLE);
                 break;
             }
-            if (soundTestScreen->animFrame >= 60
-                && soundTestScreen->creamDanceAnimStep
-                    == CREAM_DANCE_STEP_FIRST_MIDDLE) {
+            if (soundTestScreen->animFrame >= 60 && soundTestScreen->creamDanceAnimStep == CREAM_DANCE_STEP_FIRST_MIDDLE) {
                 soundTestScreen->creamDanceAnimStep = CREAM_DANCE_STEP_LEFT;
                 SoundTestScreenSetCreamAnim(CREAM_ANIM_DANCE_LEFT);
                 break;
             }
 
-            if (soundTestScreen->animFrame >= 115
-                && soundTestScreen->creamDanceAnimStep == CREAM_DANCE_STEP_LEFT) {
+            if (soundTestScreen->animFrame >= 115 && soundTestScreen->creamDanceAnimStep == CREAM_DANCE_STEP_LEFT) {
                 soundTestScreen->creamDanceAnimStep = CREAM_DANCE_STEP_SECOND_MIDDLE;
                 SoundTestScreenSetCreamAnim(CREAM_ANIM_DANCE_MIDDLE);
                 break;
             }
 
-            if (soundTestScreen->animFrame > 119
-                && soundTestScreen->creamDanceAnimStep
-                    == CREAM_DANCE_STEP_SECOND_MIDDLE) {
+            if (soundTestScreen->animFrame > 119 && soundTestScreen->creamDanceAnimStep == CREAM_DANCE_STEP_SECOND_MIDDLE) {
                 soundTestScreen->creamDanceAnimStep = 0;
                 SoundTestScreenSetCreamAnim(CREAM_ANIM_DANCE_RIGHT);
                 soundTestScreen->barBeat = 0;
@@ -910,8 +845,7 @@ static void SoundTestScreenInitRegistersAndBackground(struct Task *t)
     gBgScrollRegs[1][0] = 0;
     gBgScrollRegs[1][1] = 0;
 
-    OptionsInitBackground(soundTestScreen->background, 0, 7, TM_SOUND_TEST_BG, 0x20,
-                          0x20, 0, 0, 0, 0);
+    OptionsInitBackground(soundTestScreen->background, 0, 7, TM_SOUND_TEST_BG, 0x20, 0x20, 0, 0, 0, 0);
 }
 
 static void SoundTestScreenSetNameDisplayPos(u8 unused_, s16 x, s16 y)
diff --git a/src/game/special_stage/collectables.c b/src/game/special_stage/collectables.c
index 3b705ffdf..ea4f0b2d6 100644
--- a/src/game/special_stage/collectables.c
+++ b/src/game/special_stage/collectables.c
@@ -37,8 +37,7 @@ s16 sub_806E038(s16 acc, const struct UNK_8C878E8 *, struct UNK_806DEA4 *);
 void sub_806E1AC(s16, struct UNK_806DEA4 *);
 
 const s16 gUnknown_080DF6CC[NUM_COURSE_ZONES] = {
-    [ZONE_1] = 0x130, [ZONE_2] = 0x128, [ZONE_3] = 0x110, [ZONE_4] = 0x128,
-    [ZONE_5] = 0x143, [ZONE_6] = 0x11C, [ZONE_7] = 0x10B,
+    [ZONE_1] = 0x130, [ZONE_2] = 0x128, [ZONE_3] = 0x110, [ZONE_4] = 0x128, [ZONE_5] = 0x143, [ZONE_6] = 0x11C, [ZONE_7] = 0x10B,
 };
 
 void SpecialStageHandleCollectRings(struct SpecialStage *stage, s16 num)
@@ -119,24 +118,15 @@ void Task_InitObjects(void)
 
     collectables->animFrame = 0;
 
-    sub_806CA88(&collectables->unk4, RENDER_TARGET_SCREEN, 4, 0x372, 0x3000, 0x14, 0x14,
-                0xe, 1, 0);
-    sub_806CA88(&collectables->unk34, RENDER_TARGET_SCREEN, 0x10, 0x372, 0x3000, 0x14,
-                0x14, 0xe, 0, 0);
-    sub_806CA88(&collectables->unk64, RENDER_TARGET_SCREEN, 4, 0x374, 0x3000, 0x14, 0x1e,
-                0xf, 1, 0);
-    sub_806CA88(&collectables->unk94, RENDER_TARGET_SCREEN, 4, 0x372, 0x3000, 0x14, 0x14,
-                0xe, 6, 0);
-    sub_806CA88(&collectables->unkC4, RENDER_TARGET_SCREEN, 4, 0x372, 0x3000, 0x14, 0x14,
-                0xe, 5, 0);
-    sub_806CA88(&collectables->unkF4[0], RENDER_TARGET_SCREEN, 4, 0x37b, 0x3000, 0x14,
-                0x14, 0xe, 0, 0);
-    sub_806CA88(&collectables->unkF4[1], RENDER_TARGET_SCREEN, 4, 0x37b, 0x3000, 0x14,
-                0x14, 0xe, 1, 0);
-    sub_806CA88(&collectables->unkF4[2], RENDER_TARGET_SCREEN, 4, 0x37b, 0x3000, 0x14,
-                0x14, 0xe, 2, 0);
-    sub_806CA88(&collectables->unkF4[3], RENDER_TARGET_SCREEN, 4, 0x37b, 0x3000, 0x14,
-                0x14, 0xe, 3, 0);
+    sub_806CA88(&collectables->unk4, RENDER_TARGET_SCREEN, 4, 0x372, 0x3000, 0x14, 0x14, 0xe, 1, 0);
+    sub_806CA88(&collectables->unk34, RENDER_TARGET_SCREEN, 0x10, 0x372, 0x3000, 0x14, 0x14, 0xe, 0, 0);
+    sub_806CA88(&collectables->unk64, RENDER_TARGET_SCREEN, 4, 0x374, 0x3000, 0x14, 0x1e, 0xf, 1, 0);
+    sub_806CA88(&collectables->unk94, RENDER_TARGET_SCREEN, 4, 0x372, 0x3000, 0x14, 0x14, 0xe, 6, 0);
+    sub_806CA88(&collectables->unkC4, RENDER_TARGET_SCREEN, 4, 0x372, 0x3000, 0x14, 0x14, 0xe, 5, 0);
+    sub_806CA88(&collectables->unkF4[0], RENDER_TARGET_SCREEN, 4, 0x37b, 0x3000, 0x14, 0x14, 0xe, 0, 0);
+    sub_806CA88(&collectables->unkF4[1], RENDER_TARGET_SCREEN, 4, 0x37b, 0x3000, 0x14, 0x14, 0xe, 1, 0);
+    sub_806CA88(&collectables->unkF4[2], RENDER_TARGET_SCREEN, 4, 0x37b, 0x3000, 0x14, 0x14, 0xe, 2, 0);
+    sub_806CA88(&collectables->unkF4[3], RENDER_TARGET_SCREEN, 4, 0x37b, 0x3000, 0x14, 0x14, 0xe, 3, 0);
 
     gCurTask->main = sub_806DB48;
 }
@@ -187,8 +177,7 @@ void sub_806DC98(void)
     s32 playerX = Q_16_16_TO_INT(player->x);
     s32 playerY = Q_16_16_TO_INT(player->y);
     s32 val3 = player->unkB0 >> 4;
-    u32 cell = ((Q_16_16_TO_INT(player->x) >> 7) * SPECIAL_STAGE_ZONE_SIZE)
-        + (Q_16_16_TO_INT(player->y) >> 7);
+    u32 cell = ((Q_16_16_TO_INT(player->x) >> 7) * SPECIAL_STAGE_ZONE_SIZE) + (Q_16_16_TO_INT(player->y) >> 7);
     const struct UNK_8C878E8 *object = unk78E8_vals[cell];
 
     while (object->id != -1) {
@@ -196,8 +185,8 @@ void sub_806DC98(void)
             s16 temp2 = object->y;
             s16 temp = object->unk6 << 4;
             s16 temp3 = object->x;
-            if (temp3 > (playerX - 5) && temp3 < (playerX + 5) && temp2 > (playerY - 5)
-                && temp2 < (playerY + 5) && temp >= (val3 - 12) && temp <= (val3 + 20)) {
+            if (temp3 > (playerX - 5) && temp3 < (playerX + 5) && temp2 > (playerY - 5) && temp2 < (playerY + 5) && temp >= (val3 - 12)
+                && temp <= (val3 + 20)) {
                 s16 prevMultiplier = player->multiplier;
                 if (object->unk7 == 0) {
                     SpecialStageHandleCollectRings(stage, player->multiplier);
@@ -331,8 +320,7 @@ void sub_806DEA4(void)
     }
 }
 
-s16 sub_806E038(s16 acc, const struct UNK_8C878E8 *unk78E8,
-                struct UNK_806DEA4 *unkDEA4Arr)
+s16 sub_806E038(s16 acc, const struct UNK_8C878E8 *unk78E8, struct UNK_806DEA4 *unkDEA4Arr)
 {
     s16 i, result;
 
@@ -368,8 +356,7 @@ s16 sub_806E038(s16 acc, const struct UNK_8C878E8 *unk78E8,
                     s16 min;
                     struct UNK_806DEA4 *unkDEA4;
 
-                    for (i = 0, unkDEA4 = unkDEA4Arr, min = 0x7FFF; i < 0x10;
-                         i++, unkDEA4++) {
+                    for (i = 0, unkDEA4 = unkDEA4Arr, min = 0x7FFF; i < 0x10; i++, unkDEA4++) {
                         if (unkDEA4->unk4 < min) {
                             min = unkDEA4->unk4;
                             found = unkDEA4;
@@ -409,9 +396,7 @@ void sub_806E1AC(s16 index, struct UNK_806DEA4 *unkDEA4)
         element1->frameFlags = index | 0x1060 | 0xC0000;
         element1->x = unkDEA4->unk2;
         element1->y = unkDEA4->unk4 - unkDEA4->unk6;
-        element1->oamFlags = (unkDEA4->unk4 < (stage->unk5CC - 0xF))
-            ? SPRITE_OAM_ORDER(13)
-            : SPRITE_OAM_ORDER(6);
+        element1->oamFlags = (unkDEA4->unk4 < (stage->unk5CC - 0xF)) ? SPRITE_OAM_ORDER(13) : SPRITE_OAM_ORDER(6);
     } else {
         s16 x, y;
         Sprite *reference;
@@ -424,9 +409,7 @@ void sub_806E1AC(s16 index, struct UNK_806DEA4 *unkDEA4)
             element2->frameFlags = index | 0x1060 | 0xC0000;
             element2->x = unkDEA4->unk2;
             element2->y = ((0xD - ((0x78 - unkDEA4->unk4) >> 5)) >> 1) + unkDEA4->unk4;
-            element2->oamFlags = (unkDEA4->unk4 < (stage->unk5CC - 0xF))
-                ? SPRITE_OAM_ORDER(14)
-                : SPRITE_OAM_ORDER(7);
+            element2->oamFlags = (unkDEA4->unk4 < (stage->unk5CC - 0xF)) ? SPRITE_OAM_ORDER(14) : SPRITE_OAM_ORDER(7);
             sub_806CD68(element2);
 
             reference = unkDEA4->unk0 == 1 ? &collectables->unk34 : &collectables->unkC4;
@@ -437,9 +420,7 @@ void sub_806E1AC(s16 index, struct UNK_806DEA4 *unkDEA4)
         element1->frameFlags = index | 0x1060 | 0xC0000;
         element1->x = x;
         element1->y = y;
-        element1->oamFlags = (unkDEA4->unk4 < (stage->unk5CC - 0xF))
-            ? SPRITE_OAM_ORDER(13)
-            : SPRITE_OAM_ORDER(6);
+        element1->oamFlags = (unkDEA4->unk4 < (stage->unk5CC - 0xF)) ? SPRITE_OAM_ORDER(13) : SPRITE_OAM_ORDER(6);
     }
 
     sub_806CD68(element1);
@@ -562,9 +543,7 @@ void sub_806E584(s16 index, struct SpecialStageCollectables_UNK874 *unk874)
         unk7B4->frameFlags = (index + 0x10) | 0x1060 | 0xC0000;
         unk7B4->x = screenX;
         unk7B4->y = screenY;
-        unk7B4->oamFlags = (new_unkCB84.screenY < (stage->unk5CC - 15))
-            ? SPRITE_OAM_ORDER(13)
-            : SPRITE_OAM_ORDER(6);
+        unk7B4->oamFlags = (new_unkCB84.screenY < (stage->unk5CC - 15)) ? SPRITE_OAM_ORDER(13) : SPRITE_OAM_ORDER(6);
         sub_806CD68(unk7B4);
 
         affine = &gOamBuffer[(index + 0x10) * 4].all.affineParam;
@@ -585,8 +564,7 @@ struct Task *CreateSpecialStageCollectables(struct SpecialStage *stage)
     struct SpecialStageCollectables *collectables;
     memcpy(unkF6CC, gUnknown_080DF6CC, 0xE);
 
-    t = TaskCreate(Task_InitObjects, sizeof(struct SpecialStageCollectables), 0xB000, 0,
-                   NULL);
+    t = TaskCreate(Task_InitObjects, sizeof(struct SpecialStageCollectables), 0xB000, 0, NULL);
     collectables = TASK_DATA(t);
     collectables->stage = stage;
     collectables->unkA58 = unkF6CC[stage->zone];
diff --git a/src/game/special_stage/data.c b/src/game/special_stage/data.c
index 5ef9f96ca..32a039c9e 100644
--- a/src/game/special_stage/data.c
+++ b/src/game/special_stage/data.c
@@ -9,9 +9,9 @@
  * TODO: use incbin here to the compiled data
  **/
 
-#define ARRAY_END                                                                       \
-    {                                                                                   \
-        -1, 0, 0, 0, -1,                                                                \
+#define ARRAY_END                                                                                                                          \
+    {                                                                                                                                      \
+        -1, 0, 0, 0, -1,                                                                                                                   \
     }
 
 const struct UNK_8C878E8 gUnknown_080DA270[] = {
diff --git a/src/game/special_stage/guard_robo.c b/src/game/special_stage/guard_robo.c
index 736da103a..b22ae2bb6 100644
--- a/src/game/special_stage/guard_robo.c
+++ b/src/game/special_stage/guard_robo.c
@@ -17,19 +17,16 @@
 void sub_80714C4(void);
 void sub_80710B0(void);
 void sub_80714C8(void);
-void sub_8071380(Sprite *s, void *vram, s16 a1, s16 a, u8 b,
-                 const struct UNK_80DF670 *c4);
-static void RenderGuardRobo(Sprite *s, s16 a1, s16 a, u8 b,
-                            const struct UNK_80DF670 *c4);
+void sub_8071380(Sprite *s, void *vram, s16 a1, s16 a, u8 b, const struct UNK_80DF670 *c4);
+static void RenderGuardRobo(Sprite *s, s16 a1, s16 a, u8 b, const struct UNK_80DF670 *c4);
 void sub_8071478(void);
 void sub_80714F4(struct SpecialStageGuardRobo *);
 void sub_807120C(struct SpecialStageGuardRobo *);
 static void SpecialStageGuardRoboOnDestroy(struct Task *);
 
 static const struct UNK_80DF670 gUnknown_080DF914[9] = {
-    { 883, 4, 64, 16, 0 }, { 883, 5, 64, 16, 0 }, { 883, 6, 64, 16, 0 },
-    { 883, 7, 64, 16, 0 }, { 883, 0, 64, 16, 0 }, { 883, 1, 64, 16, 0 },
-    { 883, 2, 64, 16, 0 }, { 883, 3, 64, 16, 0 }, SPRITE_ARRAY_END,
+    { 883, 4, 64, 16, 0 }, { 883, 5, 64, 16, 0 }, { 883, 6, 64, 16, 0 }, { 883, 7, 64, 16, 0 }, { 883, 0, 64, 16, 0 },
+    { 883, 1, 64, 16, 0 }, { 883, 2, 64, 16, 0 }, { 883, 3, 64, 16, 0 }, SPRITE_ARRAY_END,
 };
 
 typedef void (*GuardRoboStateHandler)(void);
@@ -110,8 +107,7 @@ void Task_GuardRoboMain(void)
         }
 
         if (stage->paused == FALSE) {
-            RenderGuardRobo(&guardRobo->sprite, unkCBB4.screenX, unkCBB4.screenY, temp,
-                            &guardRobo->sprites[angle >> 7]);
+            RenderGuardRobo(&guardRobo->sprite, unkCBB4.screenX, unkCBB4.screenY, temp, &guardRobo->sprites[angle >> 7]);
         }
 
         if (guardRobo->state != 2 || !(guardRobo->animFrame & 2) || stage->paused != 0) {
@@ -267,8 +263,7 @@ void sub_8071380(Sprite *s, void *vram, s16 x, s16 y, u8 b, const struct UNK_80D
 
 struct Task *CreateSpecialStageGuardRobo(struct SpecialStage *stage)
 {
-    struct Task *t = TaskCreate(Task_GuardRoboMain, sizeof(struct SpecialStageGuardRobo),
-                                0xA000, 0, SpecialStageGuardRoboOnDestroy);
+    struct Task *t = TaskCreate(Task_GuardRoboMain, sizeof(struct SpecialStageGuardRobo), 0xA000, 0, SpecialStageGuardRoboOnDestroy);
     struct SpecialStageGuardRobo *guardRobo = TASK_DATA(t);
     guardRobo->stage = stage;
     GuardRoboInit(guardRobo);
@@ -327,8 +322,7 @@ void sub_80714F4(struct SpecialStageGuardRobo *guardRobo)
     }
 }
 
-static void RenderGuardRobo(Sprite *s, s16 x, s16 y, u8 b,
-                            const struct UNK_80DF670 *spriteConfig)
+static void RenderGuardRobo(Sprite *s, s16 x, s16 y, u8 b, const struct UNK_80DF670 *spriteConfig)
 {
     u32 flags = 0x107F;
     if (spriteConfig->unk7 & 1) {
diff --git a/src/game/special_stage/main.c b/src/game/special_stage/main.c
index 7956bf650..75fce0342 100644
--- a/src/game/special_stage/main.c
+++ b/src/game/special_stage/main.c
@@ -65,8 +65,7 @@ void CreateSpecialStage(s16 selectedCharacter, s16 level)
 
     InitSpecialStageScreenVram();
 
-    t = TaskCreate(Task_ShowIntroScreen, sizeof(struct SpecialStage), 0x2000, 0,
-                   SpecialStageOnDestroy);
+    t = TaskCreate(Task_ShowIntroScreen, sizeof(struct SpecialStage), 0x2000, 0, SpecialStageOnDestroy);
     stage = TASK_DATA(t);
     stage->cameraX = Q_16_16(256);
     stage->cameraY = Q_16_16(256);
@@ -102,8 +101,7 @@ void CreateSpecialStage(s16 selectedCharacter, s16 level)
     stage->ringsUnits = 0;
 
     stage->ringsTargetHundreds = Div(stage->ringsTarget, 100);
-    stage->ringsTargetTens
-        = Div(stage->ringsTarget, 10) - (stage->ringsTargetHundreds * 10);
+    stage->ringsTargetTens = Div(stage->ringsTarget, 10) - (stage->ringsTargetHundreds * 10);
     stage->ringsTargetUnits = Mod(stage->ringsTarget, 10);
 
     stage->targetReached = 0;
@@ -278,8 +276,7 @@ void Task_SpecialStageMain(void)
                 }
             }
         } else {
-            if (stage->timeHundreds == 0 && stage->timeTens == 3 && stage->timeUnits == 0
-                && stage->timeTicks == 0) {
+            if (stage->timeHundreds == 0 && stage->timeTens == 3 && stage->timeUnits == 0 && stage->timeTicks == 0) {
                 m4aSongNumStart(MUS_SPECIAL_STAGE_PINCH);
             }
         }
@@ -556,10 +553,8 @@ void sub_806C560(void)
         stage->animFrame = 12;
     }
 
-    if ((gLoadedSaveGame->chaosEmeralds[character] & ALL_ZONE_CHAOS_EMERALDS)
-        == ALL_ZONE_CHAOS_EMERALDS) {
-        gLoadedSaveGame->chaosEmeralds[character]
-            = ALL_ZONE_CHAOS_EMERALDS | CHAOS_EMERALDS_COMPLETED;
+    if ((gLoadedSaveGame->chaosEmeralds[character] & ALL_ZONE_CHAOS_EMERALDS) == ALL_ZONE_CHAOS_EMERALDS) {
+        gLoadedSaveGame->chaosEmeralds[character] = ALL_ZONE_CHAOS_EMERALDS | CHAOS_EMERALDS_COMPLETED;
     }
 
     gCurTask->main = sub_806C638;
@@ -721,8 +716,7 @@ static void Task_ShowIntroScreen(void)
 {
     struct SpecialStage *stage = TASK_DATA(gCurTask);
     SetupIntroScreenRegisters();
-    sub_806CA88(&stage->introText, RENDER_TARGET_SCREEN, 0x28, 0x37C, 0, 0x78, 0x50, 0,
-                0, 0);
+    sub_806CA88(&stage->introText, RENDER_TARGET_SCREEN, 0x28, 0x37C, 0, 0x78, 0x50, 0, 0, 0);
 
     stage->state = 1;
     m4aSongNumStart(MUS_SPECIAL_STAGE_INTRO);
diff --git a/src/game/special_stage/physics.c b/src/game/special_stage/physics.c
index 83e094c31..4cadbd046 100644
--- a/src/game/special_stage/physics.c
+++ b/src/game/special_stage/physics.c
@@ -48,15 +48,9 @@ static const struct UNK_8C87920_SWAPPED gUnknown_080DF794[3] = {
 typedef void (*PlayerStatePhysicsHandler)(void);
 
 static PlayerStatePhysicsHandler const sPlayerStatePhysicsHandlers[18] = {
-    NULL,        sub_806F9CC,
-    sub_806F9CC, sub_806F9CC,
-    sub_806F9CC, sub_806EFB4,
-    sub_806F034, sub_806F3C4,
-    sub_806F36C, sub_806F9E4,
-    sub_806F0C4, sub_806F154,
-    sub_806F1E8, PlayerStatePhysics_SlowToStop,
-    sub_806FB00, sub_806F300,
-    sub_806F300, NULL,
+    NULL,        sub_806F9CC, sub_806F9CC, sub_806F9CC, sub_806F9CC, sub_806EFB4, sub_806F034,
+    sub_806F3C4, sub_806F36C, sub_806F9E4, sub_806F0C4, sub_806F154, sub_806F1E8, PlayerStatePhysics_SlowToStop,
+    sub_806FB00, sub_806F300, sub_806F300, NULL,
 };
 
 static void Task_PhysicsMain(void)
@@ -66,8 +60,7 @@ static void Task_PhysicsMain(void)
     struct SpecialStagePlayer *player = TASK_DATA(stage->playerTask);
 
     PlayerStatePhysicsHandler stateHandlers[18];
-    memcpy(stateHandlers, sPlayerStatePhysicsHandlers,
-           sizeof(sPlayerStatePhysicsHandlers));
+    memcpy(stateHandlers, sPlayerStatePhysicsHandlers, sizeof(sPlayerStatePhysicsHandlers));
 
     switch (stage->state) {
         case 4:
@@ -442,10 +435,8 @@ void sub_806F468(void)
     s16 playerY = Q_16_16_TO_INT(player->y);
 
     while (worldElements->type != -1) {
-        if (playerX >= worldElements->x
-            && playerX < (worldElements->x + worldElements->width)) {
-            if (playerY >= worldElements->y
-                && playerY < (worldElements->y + worldElements->length)) {
+        if (playerX >= worldElements->x && playerX < (worldElements->x + worldElements->width)) {
+            if (playerY >= worldElements->y && playerY < (worldElements->y + worldElements->length)) {
                 switch (worldElements->type) {
                     case 0:
                         player->speed = player->unkE8;
@@ -454,9 +445,7 @@ void sub_806F468(void)
                         m4aSongNumStart(SE_DASH_RING);
                         return;
                     case 1:
-                        player->speed = player->speed < MIN_BOUNCE_SPEED
-                            ? MIN_BOUNCE_SPEED
-                            : player->speed;
+                        player->speed = player->speed < MIN_BOUNCE_SPEED ? MIN_BOUNCE_SPEED : player->speed;
 
                         // BOUNCING
                         player->state = 9;
@@ -671,8 +660,7 @@ s16 sub_806F84C(s32 dX, s32 dY)
 
 struct Task *CreateSpecialStagePhysics(struct SpecialStage *stage)
 {
-    struct Task *t = TaskCreate(Task_PhysicsMain, sizeof(struct SpecialStagePhysics),
-                                0x4000, 0, NULL);
+    struct Task *t = TaskCreate(Task_PhysicsMain, sizeof(struct SpecialStagePhysics), 0x4000, 0, NULL);
     struct SpecialStagePhysics *physics = TASK_DATA(t);
 
     physics->stage = stage;
diff --git a/src/game/special_stage/player.c b/src/game/special_stage/player.c
index 29f4308ed..63c8d01e1 100644
--- a/src/game/special_stage/player.c
+++ b/src/game/special_stage/player.c
@@ -45,19 +45,15 @@ static const struct UNK_80DF670 gUnknown_080DF668 = {
 
 // character sprites
 static const struct UNK_80DF670 *const gUnknown_080DF670[5] = {
-    [CHARACTER_SONIC] = &gUnknown_080DF2F8[0],
-    [CHARACTER_CREAM] = &gUnknown_080DF2F8[22],
-    [CHARACTER_TAILS] = &gUnknown_080DF2F8[44],
-    [CHARACTER_KNUCKLES] = &gUnknown_080DF2F8[66],
-    [CHARACTER_AMY] = &gUnknown_080DF2F8[88],
+    [CHARACTER_SONIC] = &gUnknown_080DF2F8[0],     [CHARACTER_CREAM] = &gUnknown_080DF2F8[22], [CHARACTER_TAILS] = &gUnknown_080DF2F8[44],
+    [CHARACTER_KNUCKLES] = &gUnknown_080DF2F8[66], [CHARACTER_AMY] = &gUnknown_080DF2F8[88],
 };
 
 typedef void (*PlayerStateHandler)(void);
 
 static PlayerStateHandler const sPlayerStateHandlers[] = {
-    sub_806D5CC, sub_806D388, sub_806D424, sub_806D484, sub_806D4E4, sub_806D5D0,
-    sub_806D5D0, sub_806D634, sub_806D698, sub_806D388, sub_806D5D0, sub_806D5D0,
-    sub_806D5D0, sub_806D4E4, sub_806D388, sub_806D6DC, sub_806D5CC, sub_806D740,
+    sub_806D5CC, sub_806D388, sub_806D424, sub_806D484, sub_806D4E4, sub_806D5D0, sub_806D5D0, sub_806D634, sub_806D698,
+    sub_806D388, sub_806D5D0, sub_806D5D0, sub_806D5D0, sub_806D4E4, sub_806D388, sub_806D6DC, sub_806D5CC, sub_806D740,
 };
 
 struct Task *CreateSpecialStagePlayer(struct SpecialStage *stage)
@@ -340,8 +336,7 @@ void sub_806D5D0(void)
     const struct UNK_80DF670 *unkC4 = &player->sprites[12];
     player->unkB0 += player->unkB8 >> 4;
 
-    sub_806D7D0(&player->unk8, -1, stage->unk5CC - Macro_806D4E(player->unkB0, 0xF),
-                unkC4);
+    sub_806D7D0(&player->unk8, -1, stage->unk5CC - Macro_806D4E(player->unkB0, 0xF), unkC4);
 }
 
 void sub_806D634(void)
@@ -352,8 +347,7 @@ void sub_806D634(void)
 
     player->unkB0 += player->unkB8 >> 4;
 
-    sub_806D7D0(&player->unk8, -1, stage->unk5CC - Macro_806D4E(player->unkB0, 10),
-                unkC4);
+    sub_806D7D0(&player->unk8, -1, stage->unk5CC - Macro_806D4E(player->unkB0, 10), unkC4);
 }
 
 void sub_806D698(void)
@@ -373,8 +367,7 @@ void sub_806D6DC(void)
 
     player->unkB0 += player->unkB8 >> 4;
 
-    sub_806D7D0(&player->unk8, -1, stage->unk5CC - Macro_806D4E(player->unkB0, 10),
-                unkC4);
+    sub_806D7D0(&player->unk8, -1, stage->unk5CC - Macro_806D4E(player->unkB0, 10), unkC4);
 }
 
 void sub_806D740(void)
diff --git a/src/game/special_stage/tables.c b/src/game/special_stage/tables.c
index 2c2ff74cb..526c157ff 100644
--- a/src/game/special_stage/tables.c
+++ b/src/game/special_stage/tables.c
@@ -4,9 +4,8 @@
 
 // bearing, acceleration, rotateSpeed, maxSpeed
 const u16 gUnknown_080DF968[][4] = {
-    { 128, 16, 12, 256 }, { 0, 32, 12, 304 },   { 768, 32, 12, 352 },
-    { 512, 48, 12, 400 }, { 256, 48, 12, 448 }, { 900, 48, 12, 496 },
-    { 256, 64, 12, 544 },
+    { 128, 16, 12, 256 }, { 0, 32, 12, 304 },   { 768, 32, 12, 352 }, { 512, 48, 12, 400 },
+    { 256, 48, 12, 448 }, { 900, 48, 12, 496 }, { 256, 64, 12, 544 },
 };
 
 const s32 gSpecialStageGuardRoboStartPositions[][2] = {
@@ -41,8 +40,7 @@ const s32 gSpecialStageGuardRoboStartPositions[][2] = {
 };
 
 const s16 gUnknown_080DF9D8[][3] = {
-    { 96, 96, 640 },   { 300, 300, 512 }, { 230, 230, 640 }, { 220, 220, 900 },
-    { 540, 540, 256 }, { 100, 400, 768 }, { 960, 800, 0 },
+    { 96, 96, 640 }, { 300, 300, 512 }, { 230, 230, 640 }, { 220, 220, 900 }, { 540, 540, 256 }, { 100, 400, 768 }, { 960, 800, 0 },
 };
 
 const s16 gSpecialStageScoreTargets[] = {
diff --git a/src/game/special_stage/ui.c b/src/game/special_stage/ui.c
index 7eb1a54e6..e3cf32a71 100644
--- a/src/game/special_stage/ui.c
+++ b/src/game/special_stage/ui.c
@@ -23,9 +23,8 @@ static void HandleUnpaused(struct SpecialStageUI *);
 static void RenderPauseMenu(struct SpecialStageUI *);
 
 static const struct UNK_80DF670 sDigitSprites[] = {
-    { 1119, 16, 2, 0, 0 }, { 1119, 17, 2, 0, 0 }, { 1119, 18, 2, 0, 0 },
-    { 1119, 19, 2, 0, 0 }, { 1119, 20, 2, 0, 0 }, { 1119, 21, 2, 0, 0 },
-    { 1119, 22, 2, 0, 0 }, { 1119, 23, 2, 0, 0 }, { 1119, 24, 2, 0, 0 },
+    { 1119, 16, 2, 0, 0 }, { 1119, 17, 2, 0, 0 }, { 1119, 18, 2, 0, 0 }, { 1119, 19, 2, 0, 0 }, { 1119, 20, 2, 0, 0 },
+    { 1119, 21, 2, 0, 0 }, { 1119, 22, 2, 0, 0 }, { 1119, 23, 2, 0, 0 }, { 1119, 24, 2, 0, 0 },
 };
 
 static const struct UNK_80DF670 gUnknown_080DF830[] = {
@@ -39,8 +38,7 @@ static const struct UNK_80DF670 gUnknown_080DF840[] = {
 };
 
 static const struct UNK_80DF670 gUnknown_080DF880[] = {
-    { 1121, 0, 24, 0, 0 }, { 1121, 4, 27, 0, 0 }, { 1121, 1, 24, 0, 0 },
-    { 1121, 2, 27, 0, 0 }, { 1121, 3, 18, 0, 0 },
+    { 1121, 0, 24, 0, 0 }, { 1121, 4, 27, 0, 0 }, { 1121, 1, 24, 0, 0 }, { 1121, 2, 27, 0, 0 }, { 1121, 3, 18, 0, 0 },
 };
 
 static const struct UNK_80DF670 sChaosEmeraldUnlockedSprites[] = {
@@ -57,8 +55,7 @@ static const struct UNK_80DF670 sChaosEmeraldUnlockedSprites[] = {
 };
 
 static const u16 sPauseMenuVariants[][3] = {
-    { 40, 1066, 0 }, { 40, 1067, 0 }, { 40, 1068, 0 },
-    { 40, 1069, 0 }, { 40, 1070, 0 }, { 40, 1071, 0 },
+    { 40, 1066, 0 }, { 40, 1067, 0 }, { 40, 1068, 0 }, { 40, 1069, 0 }, { 40, 1070, 0 }, { 40, 1071, 0 },
 };
 
 void sub_806FB04(void)
@@ -111,20 +108,16 @@ static void CreateStageTime(struct SpecialStageUI *ui)
     s16 timeTens = stage->timeTens;
     s16 timeUnits = stage->timeUnits;
 
-    sub_806CA88(&ui->timeSymbol, RENDER_TARGET_SCREEN, 1, 0x377, 0x1000, 0xC0, 0xE, 1, 0,
-                0);
+    sub_806CA88(&ui->timeSymbol, RENDER_TARGET_SCREEN, 1, 0x377, 0x1000, 0xC0, 0xE, 1, 0, 0);
 
     unkF7E8 = &sDigitSprites[timeHundreds];
-    sub_806CA88(&ui->timeHundreds, RENDER_TARGET_SCREEN, unkF7E8->unk4, unkF7E8->anim,
-                0x1000, 0xCC, 0x12, 1, unkF7E8->variant, 0);
+    sub_806CA88(&ui->timeHundreds, RENDER_TARGET_SCREEN, unkF7E8->unk4, unkF7E8->anim, 0x1000, 0xCC, 0x12, 1, unkF7E8->variant, 0);
 
     unkF7E8 = &sDigitSprites[timeTens];
-    sub_806CA88(&ui->timeTens, RENDER_TARGET_SCREEN, unkF7E8->unk4, unkF7E8->anim,
-                0x1000, 0xD4, 0x12, 1, unkF7E8->variant, 0);
+    sub_806CA88(&ui->timeTens, RENDER_TARGET_SCREEN, unkF7E8->unk4, unkF7E8->anim, 0x1000, 0xD4, 0x12, 1, unkF7E8->variant, 0);
 
     unkF7E8 = &sDigitSprites[timeUnits];
-    sub_806CA88(&ui->timeUnits, RENDER_TARGET_SCREEN, unkF7E8->unk4, unkF7E8->anim,
-                0x1000, 0xDC, 0x12, 1, unkF7E8->variant, 0);
+    sub_806CA88(&ui->timeUnits, RENDER_TARGET_SCREEN, unkF7E8->unk4, unkF7E8->anim, 0x1000, 0xDC, 0x12, 1, unkF7E8->variant, 0);
 
     sub_806CA88(&newElement, RENDER_TARGET_SCREEN, 0, 0x379, 0, 0, 0, 0, 0, 0);
 }
@@ -197,30 +190,24 @@ static void CreateRingCounter(struct SpecialStageUI *ui)
     const struct UNK_80DF670 *sprite;
 
     sprite = &sDigitSprites[stage->ringsHundreds];
-    sub_806CA88(&ui->ringsHundredsDigit, RENDER_TARGET_SCREEN, sprite->unk4,
-                sprite->anim, 0x1000, 100, 0x10, 1, sprite->variant, 0);
+    sub_806CA88(&ui->ringsHundredsDigit, RENDER_TARGET_SCREEN, sprite->unk4, sprite->anim, 0x1000, 100, 0x10, 1, sprite->variant, 0);
 
     sprite = &sDigitSprites[stage->ringsTens];
-    sub_806CA88(&ui->ringsTENS_DIGIT, RENDER_TARGET_SCREEN, sprite->unk4, sprite->anim,
-                0x1000, 0x6C, 0x10, 1, sprite->variant, 0);
+    sub_806CA88(&ui->ringsTENS_DIGIT, RENDER_TARGET_SCREEN, sprite->unk4, sprite->anim, 0x1000, 0x6C, 0x10, 1, sprite->variant, 0);
 
     sprite = &sDigitSprites[stage->ringsUnits];
-    sub_806CA88(&ui->ringsUNITS_DIGIT, RENDER_TARGET_SCREEN, sprite->unk4, sprite->anim,
-                0x1000, 0x74, 0x10, 1, sprite->variant, 0);
+    sub_806CA88(&ui->ringsUNITS_DIGIT, RENDER_TARGET_SCREEN, sprite->unk4, sprite->anim, 0x1000, 0x74, 0x10, 1, sprite->variant, 0);
 
     sub_806CA88(&ui->unk154, RENDER_TARGET_SCREEN, 8, 0x378, 0x1000, 0x78, 0xE, 2, 0, 0);
 
     sprite = &sDigitSprites[stage->ringsTargetHundreds];
-    sub_806CA88(&ui->ringsTargetHundredsDigit, RENDER_TARGET_SCREEN, sprite->unk4,
-                sprite->anim, 0x1000, 0x7C, 0x18, 1, sprite->variant, 0);
+    sub_806CA88(&ui->ringsTargetHundredsDigit, RENDER_TARGET_SCREEN, sprite->unk4, sprite->anim, 0x1000, 0x7C, 0x18, 1, sprite->variant, 0);
 
     sprite = &sDigitSprites[stage->ringsTargetTens];
-    sub_806CA88(&ui->ringsTargetTENS_DIGIT, RENDER_TARGET_SCREEN, sprite->unk4,
-                sprite->anim, 0x1000, 0x84, 0x18, 1, sprite->variant, 0);
+    sub_806CA88(&ui->ringsTargetTENS_DIGIT, RENDER_TARGET_SCREEN, sprite->unk4, sprite->anim, 0x1000, 0x84, 0x18, 1, sprite->variant, 0);
 
     sprite = &sDigitSprites[stage->ringsTargetUnits];
-    sub_806CA88(&ui->ringsTargetUNITS_DIGIT, RENDER_TARGET_SCREEN, sprite->unk4,
-                sprite->anim, 0x1000, 0x8C, 0x18, 1, sprite->variant, 0);
+    sub_806CA88(&ui->ringsTargetUNITS_DIGIT, RENDER_TARGET_SCREEN, sprite->unk4, sprite->anim, 0x1000, 0x8C, 0x18, 1, sprite->variant, 0);
 }
 
 void sub_8070078(void);
@@ -318,8 +305,7 @@ static void HandlePaused(struct SpecialStageUI *ui)
     const u16 pauseMenuSprites[6][3];
     memcpy((void *)&pauseMenuSprites, sPauseMenuVariants, 0x24);
 
-    sub_806CA88(s, 1, pauseMenuSprites[lang][0], pauseMenuSprites[lang][1], 0x1000, 0x78,
-                0x50, 0, pauseMenuSprites[lang][2], 0);
+    sub_806CA88(s, 1, pauseMenuSprites[lang][0], pauseMenuSprites[lang][1], 0x1000, 0x78, 0x50, 0, pauseMenuSprites[lang][2], 0);
 
     DmaCopy16(3, &gObjPalette[249], ui->pauseMenuPalette1, 6);
     DmaCopy16(3, &gObjPalette[252], ui->pauseMenuPalette2, 6);
@@ -330,8 +316,7 @@ static void HandlePaused(struct SpecialStageUI *ui)
 
 #define SomeMacro807028C(i) ({ ((i)*8) + 0x100; })
 
-static void
-SpecialStageResultsScreenCreateUI(struct SpecialStageResultsScreen *resultsScreen)
+static void SpecialStageResultsScreenCreateUI(struct SpecialStageResultsScreen *resultsScreen)
 {
     const struct UNK_80DF670 *sprite;
     struct SpecialStage *stage = resultsScreen->stage;
@@ -347,8 +332,7 @@ SpecialStageResultsScreenCreateUI(struct SpecialStageResultsScreen *resultsScree
 
     if (stage->targetReached) {
         sub_806CA88(&resultsScreen->unk4, 1, 0x28, 0x37d, 0, 0x100 + a, 0x20, 0, 1, 0);
-        sub_806CA88(&resultsScreen->unk34, 1, gUnknown_080DF880[character].unk4,
-                    gUnknown_080DF880[character].anim, 0, 0x100 + a, 0x18, 0,
+        sub_806CA88(&resultsScreen->unk34, 1, gUnknown_080DF880[character].unk4, gUnknown_080DF880[character].anim, 0, 0x100 + a, 0x18, 0,
                     gUnknown_080DF880[character].variant, 0);
     } else {
         sub_806CA88(&resultsScreen->unk4, 1, 0x20, 0x37d, 0, 0x100 + a, 0x20, 0, 0, 0);
@@ -359,20 +343,17 @@ SpecialStageResultsScreenCreateUI(struct SpecialStageResultsScreen *resultsScree
     sub_806CA88(&resultsScreen->unk214, 1, 0x16, 0x37E, 0, 0x100 + c, 0x70, 0, 2, 0);
 
     for (i = 0; i < 5; i++) {
-        sub_806CA88(&resultsScreen->unk244[i], 1, sDigitSprites[0].unk4,
-                    sDigitSprites[0].anim, 0, d + SomeMacro807028C(i), 0x58, 0,
+        sub_806CA88(&resultsScreen->unk244[i], 1, sDigitSprites[0].unk4, sDigitSprites[0].anim, 0, d + SomeMacro807028C(i), 0x58, 0,
                     sDigitSprites[0].variant, 0);
     }
 
     for (i = 0; i < 5; i++) {
-        sub_806CA88(&resultsScreen->unk334[i], 1, sDigitSprites[0].unk4,
-                    sDigitSprites[0].anim, 0, e + SomeMacro807028C(i), 0x6C, 0,
+        sub_806CA88(&resultsScreen->unk334[i], 1, sDigitSprites[0].unk4, sDigitSprites[0].anim, 0, e + SomeMacro807028C(i), 0x6C, 0,
                     sDigitSprites[0].variant, 0);
     }
 
     for (i = 0; i < 5; i++) {
-        sub_806CA88(&resultsScreen->unk424[i], 1, sDigitSprites[0].unk4,
-                    sDigitSprites[0].anim, 0, f + SomeMacro807028C(i), 0x80, 0,
+        sub_806CA88(&resultsScreen->unk424[i], 1, sDigitSprites[0].unk4, sDigitSprites[0].anim, 0, f + SomeMacro807028C(i), 0x80, 0,
                     sDigitSprites[0].variant, 0);
     }
 
@@ -383,8 +364,7 @@ SpecialStageResultsScreenCreateUI(struct SpecialStageResultsScreen *resultsScree
             sprite = &sChaosEmeraldUnlockedSprites[7];
         }
 
-        sub_806CA88(&resultsScreen->chaosEmerald[i], 1, 9, sprite->anim, 0, i * 24 + 292,
-                    0x34, 0, sprite->variant, 0);
+        sub_806CA88(&resultsScreen->chaosEmerald[i], 1, 9, sprite->anim, 0, i * 24 + 292, 0x34, 0, sprite->variant, 0);
     }
 
     resultsScreen->animFrame = 0;
@@ -654,8 +634,7 @@ static void CreateDisplays(struct SpecialStageUI *);
 
 struct Task *CreateSpecialStageUI(struct SpecialStage *stage)
 {
-    struct Task *t
-        = TaskCreate(sub_806FB04, sizeof(struct SpecialStageUI), 0xD000, 0, sub_8070BEC);
+    struct Task *t = TaskCreate(sub_806FB04, sizeof(struct SpecialStageUI), 0xD000, 0, sub_8070BEC);
     struct SpecialStageUI *ui = TASK_DATA(t);
     ui->stage = stage;
     ui->unk2A4 = NULL;
@@ -676,8 +655,7 @@ void SpecialStageResultsScreenOnDestroy(struct Task *);
 
 struct Task *CreateSpecialStageResultsScreen(struct SpecialStage *stage)
 {
-    struct Task *t = TaskCreate(Task_ResultsScreenSequencePart1,
-                                sizeof(struct SpecialStageResultsScreen), 0xD000, 0,
+    struct Task *t = TaskCreate(Task_ResultsScreenSequencePart1, sizeof(struct SpecialStageResultsScreen), 0xD000, 0,
                                 SpecialStageResultsScreenOnDestroy);
     struct SpecialStageResultsScreen *resultsScreen = TASK_DATA(t);
     resultsScreen->stage = stage;
@@ -732,8 +710,7 @@ void sub_8070C58(void)
 static void CreateMultiplierValue(struct SpecialStageUI *ui)
 {
     const struct UNK_80DF670 *unkF840 = &gUnknown_080DF840[0];
-    sub_806CA88(&ui->multiplier, 0, unkF840->unk4, unkF840->anim, 0x1000, 0x70, 100, 2,
-                unkF840->variant, 0);
+    sub_806CA88(&ui->multiplier, 0, unkF840->unk4, unkF840->anim, 0x1000, 0x70, 100, 2, unkF840->variant, 0);
 }
 
 void sub_8070D14(void)
diff --git a/src/game/special_stage/utils.c b/src/game/special_stage/utils.c
index bffdc3ab9..d10825856 100644
--- a/src/game/special_stage/utils.c
+++ b/src/game/special_stage/utils.c
@@ -10,8 +10,7 @@
 void *gUnknown_03005B58 = NULL;
 void *gUnknown_03005B5C = NULL;
 
-void sub_806CA88(Sprite *obj, s8 target, u32 size, u16 anim, u32 unk10, s16 xPos,
-                 s16 yPos, u16 oamOrder, u8 variant, u8 palId)
+void sub_806CA88(Sprite *obj, s8 target, u32 size, u16 anim, u32 unk10, s16 xPos, s16 yPos, u16 oamOrder, u8 variant, u8 palId)
 {
     Sprite newObj;
     Sprite *s;
@@ -59,9 +58,7 @@ void sub_806CA88(Sprite *obj, s8 target, u32 size, u16 anim, u32 unk10, s16 xPos
 }
 
 // TODO: SpecialStageCollectables_UNK874 is probably it's own type
-bool16 sub_806CB84(struct UNK_806CB84 *a,
-                   struct SpecialStageCollectables_UNK874_2 *unk874,
-                   struct SpecialStage *stage)
+bool16 sub_806CB84(struct UNK_806CB84 *a, struct SpecialStageCollectables_UNK874_2 *unk874, struct SpecialStage *stage)
 {
     struct SpecialStageWorld *world = TASK_DATA(stage->worldTask);
     s32 r9;
@@ -114,8 +111,7 @@ bool16 sub_806CB84(struct UNK_806CB84 *a,
             return FALSE;
         }
         a->unkA = val;
-        a->screenY
-            = (a->unkA - unk874->unkE) - (Q_16_16(unk874->unk12) / world->unkC[val]);
+        a->screenY = (a->unkA - unk874->unkE) - (Q_16_16(unk874->unk12) / world->unkC[val]);
         a->unk8 = (0x78 - ((r9 * 0x87) / r8));
         a->screenX = a->unk8 - unk874->unkC;
         if (unk874->unk8 != 0) {
@@ -185,8 +181,7 @@ void InitSpecialStageScreenVram(void)
     gUnknown_03005B58 = NULL;
 }
 
-void sub_806CEC4(Background *background, u32 a, u32 b, u8 assetId, u16 d, u16 e,
-                 u16 palOffset, u8 bg_id, u16 scrollX, u16 scrollY)
+void sub_806CEC4(Background *background, u32 a, u32 b, u8 assetId, u16 d, u16 e, u16 palOffset, u8 bg_id, u16 scrollX, u16 scrollY)
 {
     background->graphics.dest = (void *)BG_CHAR_ADDR(a);
     background->graphics.anim = 0;
diff --git a/src/game/special_stage/world.c b/src/game/special_stage/world.c
index 359fac589..18acd1796 100644
--- a/src/game/special_stage/world.c
+++ b/src/game/special_stage/world.c
@@ -24,8 +24,7 @@ void sub_806EB74(void);
 // No idea why this has to be specified as, should be by default
 ALIGNED(4)
 static const s16 gUnknown_080DF6DC[8] = {
-    [ZONE_1] = 1, [ZONE_2] = 7, [ZONE_3] = 5, [ZONE_4] = 1,
-    [ZONE_5] = 7, [ZONE_6] = 5, [ZONE_7] = 5,
+    [ZONE_1] = 1, [ZONE_2] = 7, [ZONE_3] = 5, [ZONE_4] = 1, [ZONE_5] = 7, [ZONE_6] = 5, [ZONE_7] = 5,
 };
 
 // used in gUnknown_08C87920, maybe incbinned?
@@ -97,8 +96,7 @@ struct Task *CreateSpecialStageWorld(struct SpecialStage *stage)
     memcpy(unkF768, gUnknown_080DF768, sizeof(gUnknown_080DF768));
     memcpy(unkF776, gUnknown_080DF776, sizeof(gUnknown_080DF776));
 
-    t = TaskCreate(sub_806EA04, sizeof(struct SpecialStageWorld), 0x8000, 0,
-                   sub_806EBF4);
+    t = TaskCreate(sub_806EA04, sizeof(struct SpecialStageWorld), 0x8000, 0, sub_806EBF4);
     world = TASK_DATA(t);
     world->stage = stage;
 
@@ -238,10 +236,8 @@ void sub_806EA04(void)
         *unk1884++ = (Q_16_16_TO_INT(temp) * -sin1) >> 0x10;
         *unk1884++ = (Q_16_16_TO_INT(temp) * sin2) >> 0x10;
 
-        temp6 = (Q_16_16_TO_INT(temp5) * sin1) + (Q_16_16_TO_INT(temp4) * sin2)
-            + stage->cameraX;
-        temp7 = (Q_16_16_TO_INT(temp4) * -sin1) + (Q_16_16_TO_INT(temp5) * sin2)
-            + stage->cameraY;
+        temp6 = (Q_16_16_TO_INT(temp5) * sin1) + (Q_16_16_TO_INT(temp4) * sin2) + stage->cameraX;
+        temp7 = (Q_16_16_TO_INT(temp4) * -sin1) + (Q_16_16_TO_INT(temp5) * sin2) + stage->cameraY;
 
         footer = (s32 *)unk1884;
         *footer++ = temp6 >> 8;
diff --git a/src/game/stage/background/zone_1.c b/src/game/stage/background/zone_1.c
index ef15a95ad..688692e42 100644
--- a/src/game/stage/background/zone_1.c
+++ b/src/game/stage/background/zone_1.c
@@ -59,8 +59,7 @@ void StageBgUpdate_Zone1Acts12(s32 UNUSED a, s32 UNUSED b)
     u16 *cursor;
 
     if (gGameMode != GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) {
-        if ((gPlayer.moveState & MOVESTATE_8000000)
-            && gSpecialRingCount >= SPECIAL_STAGE_REQUIRED_SP_RING_COUNT) {
+        if ((gPlayer.moveState & MOVESTATE_8000000) && gSpecialRingCount >= SPECIAL_STAGE_REQUIRED_SP_RING_COUNT) {
             s32 temp, val;
             temp = (gPlayer.moveState & MOVESTATE_4000000) ? 7 : 0xF;
 
@@ -82,8 +81,7 @@ void StageBgUpdate_Zone1Acts12(s32 UNUSED a, s32 UNUSED b)
         cursor = gBgOffsetsHBlank;
         initial1 = 0;
 
-        if ((gPlayer.moveState & MOVESTATE_8000000)
-            && gSpecialRingCount >= SPECIAL_STAGE_REQUIRED_SP_RING_COUNT) {
+        if ((gPlayer.moveState & MOVESTATE_8000000) && gSpecialRingCount >= SPECIAL_STAGE_REQUIRED_SP_RING_COUNT) {
             s32 temp, val;
             temp = (gPlayer.moveState & MOVESTATE_4000000) ? 0xF : 0x1F;
 
diff --git a/src/game/stage/background/zone_2.c b/src/game/stage/background/zone_2.c
index 6affb03ec..fe3e949d7 100644
--- a/src/game/stage/background/zone_2.c
+++ b/src/game/stage/background/zone_2.c
@@ -9,8 +9,7 @@
 
 // (88.05%) https://decomp.me/scratch/ekyaq
 // (91.40%) https://decomp.me/scratch/vapLV
-NONMATCH("asm/non_matching/game/stage/background/StageBgUpdate_Zone2Acts12.inc",
-         void StageBgUpdate_Zone2Acts12(s32 cameraX, s32 cameraY))
+NONMATCH("asm/non_matching/game/stage/background/StageBgUpdate_Zone2Acts12.inc", void StageBgUpdate_Zone2Acts12(s32 cameraX, s32 cameraY))
 {
     s16 something;
     u8 i, j;
@@ -58,13 +57,11 @@ NONMATCH("asm/non_matching/game/stage/background/StageBgUpdate_Zone2Acts12.inc",
             if ((u32)((camFracY + i) - 111) < 10) {
                 camFracX = ((((camFracY + i) - 110) * cameraX) >> 5) & 0xFF;
             } else {
-                camFracX
-                    = (camFracY + i) > 120 ? ((cameraX * 10) >> 5) & 0xFF : camFracX;
+                camFracX = (camFracY + i) > 120 ? ((cameraX * 10) >> 5) & 0xFF : camFracX;
             }
             *cursor++ = camFracX;
             *cursor++ = camFracY;
-            if ((camFracY + i) + (SIN(((i * 8) + (camFracY << 3)) & ONE_CYCLE) >> 12)
-                >= 178) {
+            if ((camFracY + i) + (SIN(((i * 8) + (camFracY << 3)) & ONE_CYCLE) >> 12) >= 178) {
                 break;
             }
         }
@@ -73,11 +70,9 @@ NONMATCH("asm/non_matching/game/stage/background/StageBgUpdate_Zone2Acts12.inc",
         something = (cameraX >> 3);
         for (j = 0; i < 159; i++, j++) {
             x0 = CLAMP_SIN_PERIOD(x0 + 8);
-            *cursor++ = something + (SIN(x0) >> 13)
-                + (COS(CLAMP_SIN_PERIOD((gStageTime * 2) + x0)) >> 11)
+            *cursor++ = something + (SIN(x0) >> 13) + (COS(CLAMP_SIN_PERIOD((gStageTime * 2) + x0)) >> 11)
                 + (SIN(CLAMP_SIN_PERIOD(unk5590_1 + (i * 0x40))) >> 13);
-            *cursor++ = (j / 2) + camFracY + (SIN(x0) >> 12)
-                + (COS((gStageTime + (i * 8)) & ONE_CYCLE) >> 10);
+            *cursor++ = (j / 2) + camFracY + (SIN(x0) >> 12) + (COS((gStageTime + (i * 8)) & ONE_CYCLE) >> 10);
         };
     }
 }
diff --git a/src/game/stage/background/zone_3.c b/src/game/stage/background/zone_3.c
index 4bf5e46e3..76958b505 100644
--- a/src/game/stage/background/zone_3.c
+++ b/src/game/stage/background/zone_3.c
@@ -124,8 +124,7 @@ void CreateStageBg_Zone3(void)
 
 // (85.02%) https://decomp.me/scratch/Esyzr
 #if 01
-NONMATCH("asm/non_matching/game/stage/background/StageBgUpdate_Zone3Acts12.inc",
-         void StageBgUpdate_Zone3Acts12(s32 a, s32 b))
+NONMATCH("asm/non_matching/game/stage/background/StageBgUpdate_Zone3Acts12.inc", void StageBgUpdate_Zone3Acts12(s32 a, s32 b))
 #else
 void StageBgUpdate_Zone3Acts12(s32 a, s32 b)
 #endif
@@ -151,8 +150,7 @@ void StageBgUpdate_Zone3Acts12(s32 a, s32 b)
     gBgScrollRegs[3][1] = r3;
 
     if (IS_SINGLE_PLAYER) {
-        if ((gPlayer.moveState & MOVESTATE_8000000)
-            && (gSpecialRingCount >= SPECIAL_STAGE_REQUIRED_SP_RING_COUNT)) {
+        if ((gPlayer.moveState & MOVESTATE_8000000) && (gSpecialRingCount >= SPECIAL_STAGE_REQUIRED_SP_RING_COUNT)) {
             if (sUnknown_03000408 == 0) {
                 sUnknown_03000408 = a;
             }
diff --git a/src/game/stage/background/zone_4.c b/src/game/stage/background/zone_4.c
index 3205b1639..42dcdee26 100644
--- a/src/game/stage/background/zone_4.c
+++ b/src/game/stage/background/zone_4.c
@@ -45,8 +45,7 @@ void StageBgUpdate_Zone4Acts12(s32 camX, s32 camY)
 {
     Player *player = &gPlayer;
 
-    if ((player->moveState & MOVESTATE_8000000)
-        && gSpecialRingCount >= SPECIAL_STAGE_REQUIRED_SP_RING_COUNT) {
+    if ((player->moveState & MOVESTATE_8000000) && gSpecialRingCount >= SPECIAL_STAGE_REQUIRED_SP_RING_COUNT) {
         if (sCameraShiftX == 0) {
             sCameraShiftX = camX;
         }
diff --git a/src/game/stage/background/zone_6.c b/src/game/stage/background/zone_6.c
index 5797da8e0..6ba43864b 100644
--- a/src/game/stage/background/zone_6.c
+++ b/src/game/stage/background/zone_6.c
@@ -16,8 +16,7 @@ extern const Background gStageCameraBgTemplates[4];
 void CreateStageBg_Zone6_Boss(void);
 
 const s16 gUnknown_080D5BF0[] = {
-    Q_8_8(0.00),  Q_8_8(0.25),  Q_8_8(2.25), Q_8_8(2.50), Q_8_8(3.50),
-    Q_8_8(3.625), Q_8_8(5.625), Q_8_8(5.75), Q_8_8(6.75),
+    Q_8_8(0.00), Q_8_8(0.25), Q_8_8(2.25), Q_8_8(2.50), Q_8_8(3.50), Q_8_8(3.625), Q_8_8(5.625), Q_8_8(5.75), Q_8_8(6.75),
 };
 
 // TODO: Make static and Rename to sBlendColors
@@ -112,8 +111,7 @@ void CreateStageBg_Zone6_Boss(void)
 }
 
 // (82.58%) https://decomp.me/scratch/tB3Bs
-NONMATCH("asm/non_matching/game/stage/background/sub_801D24C.inc",
-         void sub_801D24C(u8 p0, s32 p1, u8 p2))
+NONMATCH("asm/non_matching/game/stage/background/sub_801D24C.inc", void sub_801D24C(u8 p0, s32 p1, u8 p2))
 {
     s16 r6;
     u16 *hOffsets;
@@ -241,8 +239,7 @@ END_NONMATCH
 
 // (84.63%) https://decomp.me/scratch/W9B0j
 // (82.95%) https://decomp.me/scratch/ZEtCx (newer)
-NONMATCH("asm/non_matching/game/stage/background/StageBgUpdate_Zone6Acts12.inc",
-         void StageBgUpdate_Zone6Acts12(s32 x, s32 UNUSED y))
+NONMATCH("asm/non_matching/game/stage/background/StageBgUpdate_Zone6Acts12.inc", void StageBgUpdate_Zone6Acts12(s32 x, s32 UNUSED y))
 {
     u16 r6;
     u8 r5;
@@ -345,8 +342,7 @@ NONMATCH("asm/non_matching/game/stage/background/StageBgUpdate_Zone6Acts12.inc",
             s32 v;
 
             if (r6 == 897) {
-                memcpy(&gStageBackgroundsRam.unk0, &gStageCameraBgTemplates[3],
-                       sizeof(Background));
+                memcpy(&gStageBackgroundsRam.unk0, &gStageCameraBgTemplates[3], sizeof(Background));
                 gStageBackgroundsRam.unk0.tilemapId = TM_TECHNO_BASE_BG_CIRCUIT_MASK;
                 bg->graphics.dest = (void *)BG_CHAR_ADDR(3);
                 bg->layoutVram = (void *)BG_SCREEN_ADDR(26);
diff --git a/src/game/stage/background/zone_7_1.c b/src/game/stage/background/zone_7_1.c
index b20ae2665..39ab4215e 100644
--- a/src/game/stage/background/zone_7_1.c
+++ b/src/game/stage/background/zone_7_1.c
@@ -32,11 +32,9 @@ void CreateStageBg_Zone7(void)
 {
     Background *bg = &gStageBackgroundsRam.unk0;
     const Background *src;
-    gDispCnt = DISPCNT_OBJ_ON | DISPCNT_BG2_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_1D_MAP
-        | DISPCNT_MODE_0;
+    gDispCnt = DISPCNT_OBJ_ON | DISPCNT_BG2_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_1D_MAP | DISPCNT_MODE_0;
 
-    gBgCntRegs[0]
-        = (BGCNT_TXT256x256 | BGCNT_SCREENBASE(22) | BGCNT_16COLOR | BGCNT_PRIORITY(15));
+    gBgCntRegs[0] = (BGCNT_TXT256x256 | BGCNT_SCREENBASE(22) | BGCNT_16COLOR | BGCNT_PRIORITY(15));
 
     src = gStageCameraBgTemplates;
     memcpy(bg, &src[3], sizeof(Background));
@@ -55,8 +53,7 @@ void CreateStageBg_Zone7(void)
 }
 
 // (98.52%) https://decomp.me/scratch/DUPkY
-NONMATCH("asm/non_matching/game/stage/background/Zone7BgUpdate_Inside.inc",
-         void Zone7BgUpdate_Inside(s32 x, s32 y))
+NONMATCH("asm/non_matching/game/stage/background/Zone7BgUpdate_Inside.inc", void Zone7BgUpdate_Inside(s32 x, s32 y))
 {
     u16 *dst;
     s32 someX;
@@ -67,8 +64,7 @@ NONMATCH("asm/non_matching/game/stage/background/Zone7BgUpdate_Inside.inc",
     u8 r2;
     u8 r5;
 
-    if ((gPlayer.moveState & MOVESTATE_8000000)
-        && (gSpecialRingCount >= SPECIAL_STAGE_REQUIRED_SP_RING_COUNT)) {
+    if ((gPlayer.moveState & MOVESTATE_8000000) && (gSpecialRingCount >= SPECIAL_STAGE_REQUIRED_SP_RING_COUNT)) {
         if (gBgScrollRegs[3][0] == 0)
             gBgScrollRegs[3][0] = x;
 
@@ -131,8 +127,7 @@ NONMATCH("asm/non_matching/game/stage/background/Zone7BgUpdate_Inside.inc",
             dst = gBgOffsetsHBlank;
             dst = ((void *)dst) + (r5 * 4);
 
-            for (lineY = r5, r2 = 0; ((lineY < DISPLAY_HEIGHT) && (r2 < 16));
-                 lineY++, r2++) {
+            for (lineY = r5, r2 = 0; ((lineY < DISPLAY_HEIGHT) && (r2 < 16)); lineY++, r2++) {
                 *dst++ = ip;
                 *dst++ = (240 - r5);
             }
@@ -187,15 +182,13 @@ NONMATCH("asm/non_matching/game/stage/background/Zone7BgUpdate_Inside.inc",
             dst = gBgOffsetsHBlank;
             dst = ((void *)dst) + (r5 * 4);
 
-            for (lineY = r5, r2 = 0; ((lineY < DISPLAY_HEIGHT) && (r2 < 32));
-                 lineY++, r2++) {
+            for (lineY = r5, r2 = 0; ((lineY < DISPLAY_HEIGHT) && (r2 < 32)); lineY++, r2++) {
                 *dst++ = ip;
                 *dst++ = 208 - r5;
             }
 
             if (lineY < 80) {
-                for (r1 = (80 - lineY) >> 4, r2 = 0; ((lineY < 160) && (r2 < r1));
-                     lineY++, r2++) {
+                for (r1 = (80 - lineY) >> 4, r2 = 0; ((lineY < 160) && (r2 < r1)); lineY++, r2++) {
                     *dst++ = 0;
                     *dst++ = 168 - r5;
                 }
@@ -247,8 +240,7 @@ END_NONMATCH
 
 // (98.95%) https://decomp.me/scratch/7KDXI
 // (only register alloc issues, logic works as intended)
-NONMATCH("asm/non_matching/game/stage/background/Zone7BgUpdate_Outside.inc",
-         void Zone7BgUpdate_Outside(s32 x, s32 y))
+NONMATCH("asm/non_matching/game/stage/background/Zone7BgUpdate_Outside.inc", void Zone7BgUpdate_Outside(s32 x, s32 y))
 {
     u16 *lineShiftX;
     u8 frameCount;
@@ -273,9 +265,7 @@ NONMATCH("asm/non_matching/game/stage/background/Zone7BgUpdate_Outside.inc",
 #endif
 
     for (i = 0; i < ARRAY_COUNT(sp); i++) {
-        sp[i] = 0xFF
-            & (I(gUnknown_080D5C62[(i & 0x7)][0] * gStageTime)
-               + gUnknown_080D5C62[(i & 0x7)][1]);
+        sp[i] = 0xFF & (I(gUnknown_080D5C62[(i & 0x7)][0] * gStageTime) + gUnknown_080D5C62[(i & 0x7)][1]);
     }
 
     {
@@ -292,8 +282,7 @@ NONMATCH("asm/non_matching/game/stage/background/Zone7BgUpdate_Outside.inc",
 
         for (; i < DISPLAY_HEIGHT - 1; i++) {
             sinVal = SIN_24_8(((gStageTime << 2) + i * 2) & ONE_CYCLE) >> 3;
-            cosVal = (COS_24_8((((DISPLAY_HEIGHT - i) * scrollSpeed) >> 5) & ONE_CYCLE)
-                      >> 4);
+            cosVal = (COS_24_8((((DISPLAY_HEIGHT - i) * scrollSpeed) >> 5) & ONE_CYCLE) >> 4);
             value = cosVal + sinVal;
             *lineShiftX++ = (value + sp[(i & 0x1F)]) & 0xFF;
         }
diff --git a/src/game/stage/background/zone_7_2.c b/src/game/stage/background/zone_7_2.c
index a65e6a6a3..32606f0ec 100644
--- a/src/game/stage/background/zone_7_2.c
+++ b/src/game/stage/background/zone_7_2.c
@@ -15,8 +15,7 @@ const u16 sZone7BgTransitionRegions[2][NUM_ZONE7_BG_TRANSITION_POSITIONS] = {
 };
 
 // (88.49) https://decomp.me/scratch/SuYje
-NONMATCH("asm/non_matching/game/stage/background/StageBgUpdate_Zone7Acts12.inc",
-         void StageBgUpdate_Zone7Acts12(s32 x, s32 y))
+NONMATCH("asm/non_matching/game/stage/background/StageBgUpdate_Zone7Acts12.inc", void StageBgUpdate_Zone7Acts12(s32 x, s32 y))
 {
     u32 act = (gCurrentLevel ^ (LEVEL_INDEX(ZONE_7, ACT_1))) ? ACT_2 : ACT_1;
     u32 bgId = 0;
diff --git a/src/game/stage/background/zone_final.c b/src/game/stage/background/zone_final.c
index 85cc726b5..eacf4bba9 100644
--- a/src/game/stage/background/zone_final.c
+++ b/src/game/stage/background/zone_final.c
@@ -24,8 +24,7 @@ void CreateStageBg_ZoneFinal_0(void)
     gUnknown_03002280[2][3] = 0x20;
 
     bgDst = &gStageBackgroundsRam.unk80;
-    gBgCntRegs[2]
-        = BGCNT_SCREENBASE(26) | BGCNT_256COLOR | BGCNT_CHARBASE(2) | BGCNT_PRIORITY(1);
+    gBgCntRegs[2] = BGCNT_SCREENBASE(26) | BGCNT_256COLOR | BGCNT_CHARBASE(2) | BGCNT_PRIORITY(1);
     bgSrc = gStageCameraBgTemplates;
     memcpy(bgDst, &bgSrc[2], sizeof(Background));
 
@@ -40,8 +39,7 @@ void CreateStageBg_ZoneFinal_0(void)
     DrawBackground(bgDst);
 
     bgDst = &gStageBackgroundsRam.unk0;
-    gBgCntRegs[0]
-        = BGCNT_SCREENBASE(30) | BGCNT_16COLOR | BGCNT_CHARBASE(1) | BGCNT_PRIORITY(3);
+    gBgCntRegs[0] = BGCNT_SCREENBASE(30) | BGCNT_16COLOR | BGCNT_CHARBASE(1) | BGCNT_PRIORITY(3);
 
     memcpy(bgDst, &bgSrc[3], sizeof(Background));
 
diff --git a/src/game/stage/boss_results_transition.c b/src/game/stage/boss_results_transition.c
index b40db5b24..c27de5609 100644
--- a/src/game/stage/boss_results_transition.c
+++ b/src/game/stage/boss_results_transition.c
@@ -18,8 +18,7 @@
 
 // Seven unknown x/y positions
 const u16 gUnknown_080D6DE4[][2] = {
-    { 3800, 177 },  { 11864, 145 }, { 16088, 177 }, { 21080, 153 },
-    { 27000, 150 }, { 36058, 201 }, { 40000, 225 },
+    { 3800, 177 }, { 11864, 145 }, { 16088, 177 }, { 21080, 153 }, { 27000, 150 }, { 36058, 201 }, { 40000, 225 },
 };
 
 typedef struct {
@@ -49,8 +48,7 @@ void Task_802ED98(void)
             return;
         }
 
-        if ((gSelectedCharacter == CHARACTER_SONIC)
-            && gLoadedSaveGame->unlockedLevels[CHARACTER_SONIC] <= gCurrentLevel) {
+        if ((gSelectedCharacter == CHARACTER_SONIC) && gLoadedSaveGame->unlockedLevels[CHARACTER_SONIC] <= gCurrentLevel) {
             switch (LEVEL_TO_ZONE(gCurrentLevel)) {
                 case ZONE_1: {
                     // This case is never executed.
diff --git a/src/game/stage/camera.c b/src/game/stage/camera.c
index 30af4289f..08a4f3869 100644
--- a/src/game/stage/camera.c
+++ b/src/game/stage/camera.c
@@ -175,8 +175,7 @@ const Background gStageCameraBgTemplates[4] = {
 };
 
 const u16 gUnknown_080D5964[][2]
-    = { { 32, 216 }, { 32, 204 }, { 32, 216 }, { 32, 208 }, { 32, 208 },
-        { 32, 232 }, { 32, 264 }, { 32, 264 }, { 32, 264 } };
+    = { { 32, 216 }, { 32, 204 }, { 32, 216 }, { 32, 208 }, { 32, 208 }, { 32, 232 }, { 32, 264 }, { 32, 264 }, { 32, 264 } };
 
 static const VoidFn sStageBgInitProcedures[] = {
     [LEVEL_INDEX(ZONE_1, ACT_1)] = CreateStageBg_Zone1,
@@ -315,23 +314,19 @@ void InitCamera(u32 level)
     struct Camera *camera = &gCamera;
     const s8 *unkA98 = gUnknown_080D5A98[level];
 
-    gDispCnt = (DISPCNT_OBJ_ON | DISPCNT_WIN0_ON | DISPCNT_BG1_ON | DISPCNT_BG2_ON
-                | DISPCNT_BG3_ON | DISPCNT_OBJ_1D_MAP);
+    gDispCnt = (DISPCNT_OBJ_ON | DISPCNT_WIN0_ON | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_BG3_ON | DISPCNT_OBJ_1D_MAP);
     if (level == LEVEL_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53)) {
-        gDispCnt = (DISPCNT_OBJ_ON | DISPCNT_WIN0_ON | DISPCNT_BG0_ON | DISPCNT_BG1_ON
-                    | DISPCNT_BG2_ON | DISPCNT_OBJ_1D_MAP | DISPCNT_MODE_1);
+        gDispCnt
+            = (DISPCNT_OBJ_ON | DISPCNT_WIN0_ON | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_1D_MAP | DISPCNT_MODE_1);
     }
 
-    gBgCntRegs[1]
-        = (BGCNT_SCREENBASE(30) | BGCNT_16COLOR | BGCNT_CHARBASE(0) | BGCNT_PRIORITY(1));
-    gBgCntRegs[2]
-        = (BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_CHARBASE(0) | BGCNT_PRIORITY(2));
+    gBgCntRegs[1] = (BGCNT_SCREENBASE(30) | BGCNT_16COLOR | BGCNT_CHARBASE(0) | BGCNT_PRIORITY(1));
+    gBgCntRegs[2] = (BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_CHARBASE(0) | BGCNT_PRIORITY(2));
     temp = ((unkA98[0] + 0x1F) >> 6 | ((unkA98[1] + 0x1F) >> 6) << 1) << 0xE;
     gBgCntRegs[3] = temp | 3 | (unkA98[3] << 8) | (unkA98[2] << 2);
 
     if (level == LEVEL_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53)) {
-        gDispCnt = (DISPCNT_OBJ_ON | DISPCNT_WIN0_ON | DISPCNT_BG1_ON | DISPCNT_BG2_ON
-                    | DISPCNT_OBJ_1D_MAP | DISPCNT_MODE_1);
+        gDispCnt = (DISPCNT_OBJ_ON | DISPCNT_WIN0_ON | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_1D_MAP | DISPCNT_MODE_1);
     }
 
     bgs = &gStageBackgroundsRam;
@@ -433,8 +428,7 @@ void InitCamera(u32 level)
     camera->unk60 = 0;
     camera->unk62 = 0;
 
-    camera->movementTask
-        = TaskCreate(Task_CallUpdateCamera, 0, 0xF00, 0, TaskDestructor_801E040);
+    camera->movementTask = TaskCreate(Task_CallUpdateCamera, 0, 0xF00, 0, TaskDestructor_801E040);
 
     camera->fnBgUpdate = sStageBgUpdateFuncs[level];
 
@@ -552,8 +546,7 @@ void UpdateCamera(void)
                     camera->unk64 = unk64;
                 }
 
-                camera->unk14 = I(player->y) + camera->shiftY - (DISPLAY_HEIGHT / 2)
-                    + camera->unk4C + unk64;
+                camera->unk14 = I(player->y) + camera->shiftY - (DISPLAY_HEIGHT / 2) + camera->unk4C + unk64;
             }
         }
 
@@ -580,8 +573,7 @@ void UpdateCamera(void)
             camera->unk8 += Q(0.125);
         }
 
-        if ((player->moveState & MOVESTATE_IN_AIR)
-            && (player->character != CHARACTER_KNUCKLES || player->unk61 != 9)) {
+        if ((player->moveState & MOVESTATE_IN_AIR) && (player->character != CHARACTER_KNUCKLES || player->unk61 != 9)) {
             camera->unk48 += 4;
             camera->unk48 = MIN(camera->unk48, 24);
         } else {
@@ -590,13 +582,9 @@ void UpdateCamera(void)
         }
 
         if ((camera->unk14 - newY) > camera->unk48) {
-            newY += (camera->unkC > ((camera->unk14 - newY) - camera->unk48))
-                ? ((camera->unk14 - newY) - camera->unk48)
-                : camera->unkC;
+            newY += (camera->unkC > ((camera->unk14 - newY) - camera->unk48)) ? ((camera->unk14 - newY) - camera->unk48) : camera->unkC;
         } else if ((camera->unk14 - newY) < -(camera->unk48)) {
-            newY += (-camera->unkC < (camera->unk14 - newY) + camera->unk48)
-                ? (camera->unk14 - newY) + camera->unk48
-                : -camera->unkC;
+            newY += (-camera->unkC < (camera->unk14 - newY) + camera->unk48) ? (camera->unk14 - newY) + camera->unk48 : -camera->unkC;
         }
 
         newY = CLAMP(newY, camera->minY, camera->maxY - DISPLAY_HEIGHT);
diff --git a/src/game/stage/camera_destroy.c b/src/game/stage/camera_destroy.c
index 3a6d01286..3f20ce083 100644
--- a/src/game/stage/camera_destroy.c
+++ b/src/game/stage/camera_destroy.c
@@ -27,8 +27,7 @@ void TaskDestructor_801E040(struct Task *unused)
         gBgScrollRegs[i][1] = 0;
     }
 
-    if (gCurrentLevel == LEVEL_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53)
-        && (gFlags & FLAGS_40)) {
+    if (gCurrentLevel == LEVEL_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53) && (gFlags & FLAGS_40)) {
         gIntrTable[INTR_INDEX_VCOUNT] = gIntrTableTemplate[INTR_INDEX_VCOUNT];
         gFlags &= ~FLAGS_40;
     }
diff --git a/src/game/stage/collision.c b/src/game/stage/collision.c
index e91555189..b4bf9a426 100644
--- a/src/game/stage/collision.c
+++ b/src/game/stage/collision.c
@@ -10,49 +10,49 @@ static ALIGNED(8) u32 gUnknown_3000420[3];
 
 s32 sub_801EF94(s32 p0, s32 p1, s32 layer);
 
-#define POS__NOT_MOD(i)                                                                 \
-    if (p3 > 0) {                                                                       \
-        return ~(p0 % 8u) + ((i)*TILE_WIDTH);                                           \
-    } else {                                                                            \
-        return (p0 % 8u) + ((i - 1) * TILE_WIDTH);                                      \
+#define POS__NOT_MOD(i)                                                                                                                    \
+    if (p3 > 0) {                                                                                                                          \
+        return ~(p0 % 8u) + ((i)*TILE_WIDTH);                                                                                              \
+    } else {                                                                                                                               \
+        return (p0 % 8u) + ((i - 1) * TILE_WIDTH);                                                                                         \
     }
 
 #define NEG__NOT_MOD(i) POS__NOT_MOD(-i)
 
-#define NEG__INV_NOT_MOD(i)                                                             \
-    if (p3 > 0) {                                                                       \
-        return ~(p0 % 8u) - ((i)*TILE_WIDTH);                                           \
-    } else {                                                                            \
-        return (p0 % 8u) - ((i + 1) * TILE_WIDTH);                                      \
+#define NEG__INV_NOT_MOD(i)                                                                                                                \
+    if (p3 > 0) {                                                                                                                          \
+        return ~(p0 % 8u) - ((i)*TILE_WIDTH);                                                                                              \
+    } else {                                                                                                                               \
+        return (p0 % 8u) - ((i + 1) * TILE_WIDTH);                                                                                         \
     }
 
-#define POS__RES_IF(i)                                                                  \
-    if (res > 0) {                                                                      \
-        res--;                                                                          \
-        res -= (p0 % 8u);                                                               \
-        return res + ((i)*TILE_WIDTH);                                                  \
-    } else {                                                                            \
-        return res + (p0 % 8u) + ((i)*TILE_WIDTH);                                      \
+#define POS__RES_IF(i)                                                                                                                     \
+    if (res > 0) {                                                                                                                         \
+        res--;                                                                                                                             \
+        res -= (p0 % 8u);                                                                                                                  \
+        return res + ((i)*TILE_WIDTH);                                                                                                     \
+    } else {                                                                                                                               \
+        return res + (p0 % 8u) + ((i)*TILE_WIDTH);                                                                                         \
     }
 
 #define NEG__RES_IF(i) POS__RES_IF(-i)
 
-#define POS__P3_IF(i)                                                                   \
-    if (p3 > 0) {                                                                       \
-        s32 v = (p0 % 8u);                                                              \
-        res = (((i) + 1) * TILE_WIDTH);                                                 \
-        return res - v;                                                                 \
-    } else {                                                                            \
-        return (p0 % 8u) + ((i)*TILE_WIDTH + 1);                                        \
+#define POS__P3_IF(i)                                                                                                                      \
+    if (p3 > 0) {                                                                                                                          \
+        s32 v = (p0 % 8u);                                                                                                                 \
+        res = (((i) + 1) * TILE_WIDTH);                                                                                                    \
+        return res - v;                                                                                                                    \
+    } else {                                                                                                                               \
+        return (p0 % 8u) + ((i)*TILE_WIDTH + 1);                                                                                           \
     }
 
-#define NEG__P3_IF(i)                                                                   \
-    if (p3 > 0) {                                                                       \
-        s32 v = (p0 % 8u);                                                              \
-        res = -(((i)-1) * TILE_WIDTH + 1);                                              \
-        return res - v;                                                                 \
-    } else {                                                                            \
-        return (p0 % 8u) - ((i)*TILE_WIDTH);                                            \
+#define NEG__P3_IF(i)                                                                                                                      \
+    if (p3 > 0) {                                                                                                                          \
+        s32 v = (p0 % 8u);                                                                                                                 \
+        res = -(((i)-1) * TILE_WIDTH + 1);                                                                                                 \
+        return res - v;                                                                                                                    \
+    } else {                                                                                                                               \
+        return (p0 % 8u) - ((i)*TILE_WIDTH);                                                                                               \
     }
 
 extern const Collision CollHeader_zone_1_act_1_fg;
@@ -82,21 +82,16 @@ extern const Collision CollHeader_zone_final_act_ta53_fg;
 extern const Collision CollHeader_zone_final_act_unused_fg;
 
 const Collision *const gCollisionTable[] = {
-    &CollHeader_zone_1_act_1_fg,          &CollHeader_zone_1_act_2_fg,
-    &CollHeader_zone_1_act_boss_fg,       &CollHeader_zone_1_act_dummy_fg,
-    &CollHeader_zone_2_act_1_fg,          &CollHeader_zone_2_act_2_fg,
-    &CollHeader_zone_2_act_boss_fg,       &CollHeader_zone_1_act_dummy_fg,
-    &CollHeader_zone_3_act_1_fg,          &CollHeader_zone_3_act_2_fg,
-    &CollHeader_zone_3_act_boss_fg,       &CollHeader_zone_1_act_dummy_fg,
-    &CollHeader_zone_4_act_1_fg,          &CollHeader_zone_4_act_2_fg,
-    &CollHeader_zone_4_act_boss_fg,       &CollHeader_zone_1_act_dummy_fg,
-    &CollHeader_zone_5_act_1_fg,          &CollHeader_zone_5_act_2_fg,
-    &CollHeader_zone_5_act_boss_fg,       &CollHeader_zone_1_act_dummy_fg,
-    &CollHeader_zone_6_act_1_fg,          &CollHeader_zone_6_act_2_fg,
-    &CollHeader_zone_6_act_boss_fg,       &CollHeader_zone_1_act_dummy_fg,
-    &CollHeader_zone_7_act_1_fg,          &CollHeader_zone_7_act_2_fg,
-    &CollHeader_zone_7_act_boss_fg,       &CollHeader_zone_1_act_dummy_fg,
-    &CollHeader_zone_final_act_xx_fg,     &CollHeader_zone_final_act_ta53_fg,
+    &CollHeader_zone_1_act_1_fg,          &CollHeader_zone_1_act_2_fg,      &CollHeader_zone_1_act_boss_fg,
+    &CollHeader_zone_1_act_dummy_fg,      &CollHeader_zone_2_act_1_fg,      &CollHeader_zone_2_act_2_fg,
+    &CollHeader_zone_2_act_boss_fg,       &CollHeader_zone_1_act_dummy_fg,  &CollHeader_zone_3_act_1_fg,
+    &CollHeader_zone_3_act_2_fg,          &CollHeader_zone_3_act_boss_fg,   &CollHeader_zone_1_act_dummy_fg,
+    &CollHeader_zone_4_act_1_fg,          &CollHeader_zone_4_act_2_fg,      &CollHeader_zone_4_act_boss_fg,
+    &CollHeader_zone_1_act_dummy_fg,      &CollHeader_zone_5_act_1_fg,      &CollHeader_zone_5_act_2_fg,
+    &CollHeader_zone_5_act_boss_fg,       &CollHeader_zone_1_act_dummy_fg,  &CollHeader_zone_6_act_1_fg,
+    &CollHeader_zone_6_act_2_fg,          &CollHeader_zone_6_act_boss_fg,   &CollHeader_zone_1_act_dummy_fg,
+    &CollHeader_zone_7_act_1_fg,          &CollHeader_zone_7_act_2_fg,      &CollHeader_zone_7_act_boss_fg,
+    &CollHeader_zone_1_act_dummy_fg,      &CollHeader_zone_final_act_xx_fg, &CollHeader_zone_final_act_ta53_fg,
     &CollHeader_zone_final_act_unused_fg,
 };
 
diff --git a/src/game/stage/debug_text_printer.c b/src/game/stage/debug_text_printer.c
index 4784ca643..878bf0a19 100644
--- a/src/game/stage/debug_text_printer.c
+++ b/src/game/stage/debug_text_printer.c
@@ -15,15 +15,13 @@ static struct Task *sDebugUITask = NULL;
 void Task_802D4B4(void);
 void TaskDestructor_802D4B8(struct Task *);
 
-#define DBG_UI_REQUIRED_TILES (2 * SA2_ANIM_NUM_ASCII_CHARS)
-#define DBG_UI_CHAR_SIZE      (2 * TILE_SIZE_4BPP)
-#define DGB_UI_GET_CHAR_FROM_TASK(task, ascii)                                          \
-    (Sprite *)&(((DebugTextPrinter *)TASK_DATA(task))->chars[(ascii) - '!'])
+#define DBG_UI_REQUIRED_TILES                  (2 * SA2_ANIM_NUM_ASCII_CHARS)
+#define DBG_UI_CHAR_SIZE                       (2 * TILE_SIZE_4BPP)
+#define DGB_UI_GET_CHAR_FROM_TASK(task, ascii) (Sprite *)&(((DebugTextPrinter *)TASK_DATA(task))->chars[(ascii) - '!'])
 
 struct Task *Debug_CreateAsciiTask(s16 x, s16 y)
 {
-    struct Task *t = TaskCreate(Task_802D4B4, sizeof(DebugTextPrinter), 0xE100, 0,
-                                TaskDestructor_802D4B8);
+    struct Task *t = TaskCreate(Task_802D4B4, sizeof(DebugTextPrinter), 0xE100, 0, TaskDestructor_802D4B8);
     DebugTextPrinter *printer = TASK_DATA(t);
     u32 i;
 
@@ -36,8 +34,7 @@ struct Task *Debug_CreateAsciiTask(s16 x, s16 y)
         if (i == 0) {
             s->graphics.dest = VramMalloc(DBG_UI_REQUIRED_TILES);
         } else {
-            s->graphics.dest
-                = (printer->chars[0].graphics.dest + (i * DBG_UI_CHAR_SIZE));
+            s->graphics.dest = (printer->chars[0].graphics.dest + (i * DBG_UI_CHAR_SIZE));
         }
 
         s->oamFlags = SPRITE_OAM_ORDER(0);
diff --git a/src/game/stage/dust_effect_braking.c b/src/game/stage/dust_effect_braking.c
index 4e19d4ba7..f0d6603d5 100644
--- a/src/game/stage/dust_effect_braking.c
+++ b/src/game/stage/dust_effect_braking.c
@@ -37,8 +37,7 @@ struct Task *CreateBrakingDustEffect(s32 x, s32 y)
 
         gUnknown_030059D0.unk0--;
 
-        t = TaskCreate(Task_801F6E0, sizeof(BrakeDustEffect), 0x4001, 0,
-                       TaskDestructor_801F7B8);
+        t = TaskCreate(Task_801F6E0, sizeof(BrakeDustEffect), 0x4001, 0, TaskDestructor_801F7B8);
 
         bde = TASK_DATA(t);
         bde->x = x;
@@ -61,8 +60,7 @@ struct Task *CreateBrakingDustEffect(s32 x, s32 y)
             s->variant = 0;
             s->frameFlags = SPRITE_FLAG(PRIORITY, 2);
 
-            s->frameFlags |= ((u32)PseudoRandom32()
-                              & (SPRITE_FLAG_MASK_Y_FLIP | SPRITE_FLAG_MASK_X_FLIP));
+            s->frameFlags |= ((u32)PseudoRandom32() & (SPRITE_FLAG_MASK_Y_FLIP | SPRITE_FLAG_MASK_X_FLIP));
         }
 
         s->graphics.size = 0;
diff --git a/src/game/stage/dust_effect_spindash.c b/src/game/stage/dust_effect_spindash.c
index ef238d61d..b422a9a7c 100644
--- a/src/game/stage/dust_effect_spindash.c
+++ b/src/game/stage/dust_effect_spindash.c
@@ -21,8 +21,7 @@ void TaskDestructor_SpindashDustEffect(struct Task *);
 
 struct Task *CreateSpindashDustEffect()
 {
-    struct Task *t = TaskCreate(Task_SpindashDustEffect, sizeof(DustEffect), 0x4001, 0,
-                                TaskDestructor_SpindashDustEffect);
+    struct Task *t = TaskCreate(Task_SpindashDustEffect, sizeof(DustEffect), 0x4001, 0, TaskDestructor_SpindashDustEffect);
 
     DustEffect *sde = TASK_DATA(t);
     Sprite *s = &sde->s;
@@ -46,8 +45,7 @@ void Task_SpindashDustEffect(void)
     Player *p = &gPlayer;
     s32 offY;
 
-    if (p->spriteTask == NULL
-        || (p->moveState & (MOVESTATE_400 | MOVESTATE_DEAD)) != MOVESTATE_400) {
+    if (p->spriteTask == NULL || (p->moveState & (MOVESTATE_400 | MOVESTATE_DEAD)) != MOVESTATE_400) {
         TaskDestroy(gCurTask);
         return;
     } else {
@@ -101,8 +99,7 @@ void Task_SpindashDustEffectBig(void)
     Player *p = &gPlayer;
     s32 offY;
 
-    if (p->spriteTask == NULL
-        || (p->moveState & (MOVESTATE_400 | MOVESTATE_DEAD)) != MOVESTATE_400) {
+    if (p->spriteTask == NULL || (p->moveState & (MOVESTATE_400 | MOVESTATE_DEAD)) != MOVESTATE_400) {
         TaskDestroy(gCurTask);
         return;
     } else {
diff --git a/src/game/stage/game_2.c b/src/game/stage/game_2.c
index 49dbe2de8..96caeb942 100644
--- a/src/game/stage/game_2.c
+++ b/src/game/stage/game_2.c
@@ -17,15 +17,11 @@
 #include "constants/animations.h"
 
 const u16 sAnimData_StageGoalScoreBonus[][3] = {
-    { 36, SA2_ANIM_STAGE_GOAL_SCORE_BONUS, 1 },
-    { 36, SA2_ANIM_STAGE_GOAL_SCORE_BONUS, 2 },
-    { 36, SA2_ANIM_STAGE_GOAL_SCORE_BONUS, 3 },
-    { 36, SA2_ANIM_STAGE_GOAL_SCORE_BONUS, 4 },
-    { 36, SA2_ANIM_STAGE_GOAL_SCORE_BONUS, 5 },
+    { 36, SA2_ANIM_STAGE_GOAL_SCORE_BONUS, 1 }, { 36, SA2_ANIM_STAGE_GOAL_SCORE_BONUS, 2 }, { 36, SA2_ANIM_STAGE_GOAL_SCORE_BONUS, 3 },
+    { 36, SA2_ANIM_STAGE_GOAL_SCORE_BONUS, 4 }, { 36, SA2_ANIM_STAGE_GOAL_SCORE_BONUS, 5 },
 };
 
-struct Task *sub_801F15C(s16 x, s16 y, u8 param2, s8 param3, TaskMain main,
-                         TaskDestructor dtor)
+struct Task *sub_801F15C(s16 x, s16 y, u8 param2, s8 param3, TaskMain main, TaskDestructor dtor)
 {
     struct Task *t = TaskCreate(main, sizeof(TaskStrc_801F15C), 0x4001, 0, dtor);
 
@@ -62,9 +58,7 @@ void Task_801F214(void)
         TaskDestroy(gCurTask);
         return;
     }
-    if ((ts->unk14 & 0x8)
-        && ((ts->playerAnim != gPlayer.anim)
-            || (ts->playerVariant != gPlayer.variant))) {
+    if ((ts->unk14 & 0x8) && ((ts->playerAnim != gPlayer.anim) || (ts->playerVariant != gPlayer.variant))) {
         TaskDestroy(gCurTask);
         return;
     } else {
@@ -136,8 +130,7 @@ void Task_801F214(void)
 
 struct Task *CreateStageGoalBonusPointsAnim(s32 x, s32 y, u16 score)
 {
-    if ((score != 100) && (score != 200) && (score != 300) && (score != 500)
-        && (score != 800)) {
+    if ((score != 100) && (score != 200) && (score != 300) && (score != 500) && (score != 800)) {
         return NULL;
     } else {
         struct Task *t;
diff --git a/src/game/stage/game_7.c b/src/game/stage/game_7.c
index 0e1b9d6ce..bad2cd8a0 100644
--- a/src/game/stage/game_7.c
+++ b/src/game/stage/game_7.c
@@ -521,8 +521,7 @@ void sub_802E1EC(s32 p0, u16 p1)
 
 // (99.77%) https://decomp.me/scratch/BhinB
 // (addendum by Ollie https://decomp.me/scratch/qyFAO )
-NONMATCH("asm/non_matching/game/stage/sub_802E278.inc",
-         void sub_802E278(Vec2_16 *p0, u8 pairCount))
+NONMATCH("asm/non_matching/game/stage/sub_802E278.inc", void sub_802E278(Vec2_16 *p0, u8 pairCount))
 {
     s16 i;
     s16 sp[STGINTRO_SP_SIZE][2];
@@ -581,8 +580,7 @@ END_NONMATCH
 
 // like sub_802E278
 // (99.78%) https://decomp.me/scratch/soFiq
-NONMATCH("asm/non_matching/game/stage/sub_802E384.inc",
-         void sub_802E384(Vec2_16 *p0, u16 pairCount))
+NONMATCH("asm/non_matching/game/stage/sub_802E384.inc", void sub_802E384(Vec2_16 *p0, u16 pairCount))
 {
     s16 i;
     s16 sp[STGINTRO_SP_SIZE][2];
diff --git a/src/game/stage/intro.c b/src/game/stage/intro.c
index 5984d5dc7..d0a1a9471 100644
--- a/src/game/stage/intro.c
+++ b/src/game/stage/intro.c
@@ -48,67 +48,63 @@
 
 // The colored logo next to the stage name
 static const u16 zoneLoadingCharacterLogos[NUM_CHARACTERS][3] = {
-    [CHARACTER_SONIC] = { 9, SA2_ANIM_STAGE_INTRO_CHARACTER_LOGO, 0 },
-    [CHARACTER_CREAM] = { 9, SA2_ANIM_STAGE_INTRO_CHARACTER_LOGO, 3 },
-    [CHARACTER_TAILS] = { 9, SA2_ANIM_STAGE_INTRO_CHARACTER_LOGO, 1 },
-    [CHARACTER_KNUCKLES] = { 9, SA2_ANIM_STAGE_INTRO_CHARACTER_LOGO, 2 },
+    [CHARACTER_SONIC] = { 9, SA2_ANIM_STAGE_INTRO_CHARACTER_LOGO, 0 }, [CHARACTER_CREAM] = { 9, SA2_ANIM_STAGE_INTRO_CHARACTER_LOGO, 3 },
+    [CHARACTER_TAILS] = { 9, SA2_ANIM_STAGE_INTRO_CHARACTER_LOGO, 1 }, [CHARACTER_KNUCKLES] = { 9, SA2_ANIM_STAGE_INTRO_CHARACTER_LOGO, 2 },
     [CHARACTER_AMY] = { 9, SA2_ANIM_STAGE_INTRO_CHARACTER_LOGO, 4 },
 };
 
-static const u16
-    zoneLoadingZoneNames[NUM_INTRO_UNLOCKED_STAGES_ICONS * NUM_ZONE_NAME_PARTS][3]
-    = {
-          // LEAF FOREST
-          { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 0 },
-          { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 1 },
-          { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 2 },
-          { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 3 },
-          // HOT CRATER
-          { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 4 },
-          { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 5 },
-          { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 6 },
-          { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 7 },
-          // MUSIC PLANT
-          { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 8 },
-          { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 9 },
-          { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 10 },
-          { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 11 },
-          // ICE PARADISE
-          { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 12 },
-          { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 13 },
-          { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 14 },
-          { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 15 },
-          // SKY CANYON
-          { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 16 },
-          { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 17 },
-          { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 18 },
-          { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 19 },
-          // TECHNO BASE
-          { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 20 },
-          { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 21 },
-          { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 22 },
-          { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 23 },
-          // EGG UTOPIA
-          { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 24 },
-          { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 25 },
-          { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 26 },
-          { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 27 },
-          // XX
-          { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 28 },
-          { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 29 }, // (empty image)
-          { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 30 }, // (empty image)
-          { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 31 }, // (empty image)
-                                                       // TRUE AREA 53
-          { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 32 },
-          { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 33 },
-          { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 34 },
-          { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 35 },
-          // BOSS ATTACK!
-          { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 36 },
-          { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 37 },
-          { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 38 },
-          { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 39 },
-      };
+static const u16 zoneLoadingZoneNames[NUM_INTRO_UNLOCKED_STAGES_ICONS * NUM_ZONE_NAME_PARTS][3] = {
+    // LEAF FOREST
+    { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 0 },
+    { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 1 },
+    { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 2 },
+    { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 3 },
+    // HOT CRATER
+    { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 4 },
+    { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 5 },
+    { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 6 },
+    { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 7 },
+    // MUSIC PLANT
+    { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 8 },
+    { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 9 },
+    { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 10 },
+    { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 11 },
+    // ICE PARADISE
+    { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 12 },
+    { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 13 },
+    { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 14 },
+    { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 15 },
+    // SKY CANYON
+    { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 16 },
+    { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 17 },
+    { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 18 },
+    { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 19 },
+    // TECHNO BASE
+    { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 20 },
+    { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 21 },
+    { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 22 },
+    { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 23 },
+    // EGG UTOPIA
+    { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 24 },
+    { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 25 },
+    { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 26 },
+    { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 27 },
+    // XX
+    { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 28 },
+    { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 29 }, // (empty image)
+    { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 30 }, // (empty image)
+    { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 31 }, // (empty image)
+    // TRUE AREA 53
+    { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 32 },
+    { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 33 },
+    { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 34 },
+    { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 35 },
+    // BOSS ATTACK!
+    { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 36 },
+    { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 37 },
+    { 20, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 38 },
+    { 35, SA2_ANIM_STAGE_INTRO_ZONE_NAMES, 39 },
+};
 
 // Big icon showing the current zone during the stage loading screen.
 // It is positioned inside the rotating wheel displayed in the upper left screen corner.
@@ -150,75 +146,47 @@ static const u16 sZoneLoadingActLetters[5][3] = {
 };
 
 static const TileInfo characterAnimsGettingReady[NUM_CHARACTERS] = {
-    [CHARACTER_SONIC]
-    = { 0, SA2_ANIM_CHAR(SA2_CHAR_ANIM_BEFORE_COUNTDOWN, CHARACTER_SONIC), 0 },
-    [CHARACTER_CREAM]
-    = { 0, SA2_ANIM_CHAR(SA2_CHAR_ANIM_BEFORE_COUNTDOWN, CHARACTER_CREAM), 0 },
-    [CHARACTER_TAILS]
-    = { 0, SA2_ANIM_CHAR(SA2_CHAR_ANIM_BEFORE_COUNTDOWN, CHARACTER_TAILS), 0 },
-    [CHARACTER_KNUCKLES]
-    = { 0, SA2_ANIM_CHAR(SA2_CHAR_ANIM_BEFORE_COUNTDOWN, CHARACTER_KNUCKLES), 0 },
-    [CHARACTER_AMY]
-    = { 0, SA2_ANIM_CHAR(SA2_CHAR_ANIM_BEFORE_COUNTDOWN, CHARACTER_AMY), 0 },
+    [CHARACTER_SONIC] = { 0, SA2_ANIM_CHAR(SA2_CHAR_ANIM_BEFORE_COUNTDOWN, CHARACTER_SONIC), 0 },
+    [CHARACTER_CREAM] = { 0, SA2_ANIM_CHAR(SA2_CHAR_ANIM_BEFORE_COUNTDOWN, CHARACTER_CREAM), 0 },
+    [CHARACTER_TAILS] = { 0, SA2_ANIM_CHAR(SA2_CHAR_ANIM_BEFORE_COUNTDOWN, CHARACTER_TAILS), 0 },
+    [CHARACTER_KNUCKLES] = { 0, SA2_ANIM_CHAR(SA2_CHAR_ANIM_BEFORE_COUNTDOWN, CHARACTER_KNUCKLES), 0 },
+    [CHARACTER_AMY] = { 0, SA2_ANIM_CHAR(SA2_CHAR_ANIM_BEFORE_COUNTDOWN, CHARACTER_AMY), 0 },
 };
 
 // TODO: static
 // Colored triangles used for each character (bottom-right)
 const TileInfo sColoredTriangle[NUM_CHARACTERS] = {
-    [CHARACTER_SONIC] = { 0x54, SA2_ANIM_STAGE_INTRO_TRIANGLES, 0 },
-    [CHARACTER_CREAM] = { 0x54, SA2_ANIM_STAGE_INTRO_TRIANGLES, 4 },
-    [CHARACTER_TAILS] = { 0x54, SA2_ANIM_STAGE_INTRO_TRIANGLES, 1 },
-    [CHARACTER_KNUCKLES] = { 0x54, SA2_ANIM_STAGE_INTRO_TRIANGLES, 2 },
+    [CHARACTER_SONIC] = { 0x54, SA2_ANIM_STAGE_INTRO_TRIANGLES, 0 }, [CHARACTER_CREAM] = { 0x54, SA2_ANIM_STAGE_INTRO_TRIANGLES, 4 },
+    [CHARACTER_TAILS] = { 0x54, SA2_ANIM_STAGE_INTRO_TRIANGLES, 1 }, [CHARACTER_KNUCKLES] = { 0x54, SA2_ANIM_STAGE_INTRO_TRIANGLES, 2 },
     [CHARACTER_AMY] = { 0x54, SA2_ANIM_STAGE_INTRO_TRIANGLES, 3 },
 };
 
 static const u8 sGettingReadyAnimationDuration[NUM_CHARACTERS]
-    = { [CHARACTER_SONIC] = 40,
-        [CHARACTER_CREAM] = 55,
-        [CHARACTER_TAILS] = 52,
-        [CHARACTER_KNUCKLES] = 40,
-        [CHARACTER_AMY] = 40 };
+    = { [CHARACTER_SONIC] = 40, [CHARACTER_CREAM] = 55, [CHARACTER_TAILS] = 52, [CHARACTER_KNUCKLES] = 40, [CHARACTER_AMY] = 40 };
 
 // Each byte represents one RGB channel (0-31)
 static const u8 gUnknown_080D6FF5[][3] = {
-    { 0x00, 0x17, 0x06 }, { 0x16, 0x16, 0x16 }, { 0x00, 0x04, 0x13 },
-    { 0x00, 0x08, 0x1D }, { 0x00, 0x00, 0x0C }, { 0x00, 0x13, 0x00 },
-    { 0x1F, 0x1F, 0x13 }, { 0x1F, 0x1B, 0x00 }, { 0x13, 0x0A, 0x02 },
-    { 0x1F, 0x15, 0x0A }, { 0x15, 0x00, 0x00 }, { 0x1F, 0x04, 0x04 },
-    { 0x04, 0x04, 0x04 }, { 0x1F, 0x1F, 0x1F }, { 0x0E, 0x0E, 0x0E },
-    { 0x00, 0x13, 0x1F }, { 0x00, 0x19, 0x14 }, { 0x19, 0x19, 0x19 },
-    { 0x1F, 0x0B, 0x00 }, { 0x1F, 0x12, 0x00 }, { 0x19, 0x05, 0x00 },
-    { 0x1C, 0x0B, 0x00 }, { 0x13, 0x00, 0x00 }, { 0x1F, 0x1C, 0x17 },
-    { 0x1D, 0x18, 0x10 }, { 0x13, 0x0F, 0x08 }, { 0x1F, 0x1E, 0x00 },
-    { 0x08, 0x11, 0x1F }, { 0x02, 0x02, 0x02 }, { 0x1F, 0x1F, 0x1F },
-    { 0x0E, 0x0E, 0x0E }, { 0x1F, 0x00, 0x1F }, { 0x00, 0x17, 0x06 },
-    { 0x1F, 0x00, 0x1F }, { 0x1D, 0x11, 0x04 }, { 0x1F, 0x17, 0x04 },
-    { 0x17, 0x0A, 0x02 }, { 0x15, 0x19, 0x1B }, { 0x00, 0x13, 0x1F },
-    { 0x04, 0x08, 0x1F }, { 0x13, 0x13, 0x13 }, { 0x0E, 0x0E, 0x0E },
-    { 0x15, 0x00, 0x00 }, { 0x1F, 0x04, 0x04 }, { 0x02, 0x02, 0x02 },
-    { 0x1F, 0x1F, 0x1F }, { 0x1F, 0x00, 0x1F }, { 0x1F, 0x00, 0x1F },
-    { 0x00, 0x16, 0x14 }, { 0x16, 0x16, 0x16 }, { 0x17, 0x00, 0x00 },
-    { 0x1F, 0x04, 0x00 }, { 0x0E, 0x00, 0x00 }, { 0x04, 0x08, 0x1F },
-    { 0x1F, 0x1F, 0x13 }, { 0x1F, 0x1B, 0x00 }, { 0x13, 0x0A, 0x00 },
-    { 0x1F, 0x15, 0x0A }, { 0x00, 0x15, 0x02 }, { 0x0E, 0x1F, 0x00 },
-    { 0x04, 0x04, 0x04 }, { 0x1F, 0x1F, 0x1F }, { 0x0E, 0x0E, 0x0E },
-    { 0x1F, 0x13, 0x00 }, { 0x00, 0x17, 0x06 }, { 0x15, 0x19, 0x1B },
-    { 0x1D, 0x08, 0x13 }, { 0x1F, 0x13, 0x17 }, { 0x17, 0x04, 0x0A },
-    { 0x00, 0x15, 0x00 }, { 0x0E, 0x0E, 0x0E }, { 0x13, 0x13, 0x13 },
-    { 0x13, 0x0A, 0x00 }, { 0x1F, 0x15, 0x0A }, { 0x15, 0x00, 0x00 },
-    { 0x1F, 0x00, 0x00 }, { 0x00, 0x00, 0x00 }, { 0x1F, 0x1F, 0x1F },
-    { 0x1F, 0x1F, 0x13 }, { 0x1F, 0x1F, 0x00 }, { 0x00, 0x12, 0x0B },
-    { 0x04, 0x06, 0x0A }, { 0x00, 0x1F, 0x00 }, { 0x1F, 0x1F, 0x1F },
-    { 0x14, 0x1F, 0x1F }, { 0x10, 0x1C, 0x1E }, { 0x0C, 0x18, 0x19 },
-    { 0x09, 0x14, 0x15 }, { 0x00, 0x0E, 0x10 }, { 0x00, 0x1F, 0x00 },
-    { 0x1F, 0x16, 0x18 }, { 0x1F, 0x0A, 0x10 }, { 0x1F, 0x1E, 0x00 },
-    { 0x19, 0x18, 0x00 }, { 0x13, 0x0A, 0x00 }, { 0x1F, 0x00, 0x00 },
+    { 0x00, 0x17, 0x06 }, { 0x16, 0x16, 0x16 }, { 0x00, 0x04, 0x13 }, { 0x00, 0x08, 0x1D }, { 0x00, 0x00, 0x0C }, { 0x00, 0x13, 0x00 },
+    { 0x1F, 0x1F, 0x13 }, { 0x1F, 0x1B, 0x00 }, { 0x13, 0x0A, 0x02 }, { 0x1F, 0x15, 0x0A }, { 0x15, 0x00, 0x00 }, { 0x1F, 0x04, 0x04 },
+    { 0x04, 0x04, 0x04 }, { 0x1F, 0x1F, 0x1F }, { 0x0E, 0x0E, 0x0E }, { 0x00, 0x13, 0x1F }, { 0x00, 0x19, 0x14 }, { 0x19, 0x19, 0x19 },
+    { 0x1F, 0x0B, 0x00 }, { 0x1F, 0x12, 0x00 }, { 0x19, 0x05, 0x00 }, { 0x1C, 0x0B, 0x00 }, { 0x13, 0x00, 0x00 }, { 0x1F, 0x1C, 0x17 },
+    { 0x1D, 0x18, 0x10 }, { 0x13, 0x0F, 0x08 }, { 0x1F, 0x1E, 0x00 }, { 0x08, 0x11, 0x1F }, { 0x02, 0x02, 0x02 }, { 0x1F, 0x1F, 0x1F },
+    { 0x0E, 0x0E, 0x0E }, { 0x1F, 0x00, 0x1F }, { 0x00, 0x17, 0x06 }, { 0x1F, 0x00, 0x1F }, { 0x1D, 0x11, 0x04 }, { 0x1F, 0x17, 0x04 },
+    { 0x17, 0x0A, 0x02 }, { 0x15, 0x19, 0x1B }, { 0x00, 0x13, 0x1F }, { 0x04, 0x08, 0x1F }, { 0x13, 0x13, 0x13 }, { 0x0E, 0x0E, 0x0E },
+    { 0x15, 0x00, 0x00 }, { 0x1F, 0x04, 0x04 }, { 0x02, 0x02, 0x02 }, { 0x1F, 0x1F, 0x1F }, { 0x1F, 0x00, 0x1F }, { 0x1F, 0x00, 0x1F },
+    { 0x00, 0x16, 0x14 }, { 0x16, 0x16, 0x16 }, { 0x17, 0x00, 0x00 }, { 0x1F, 0x04, 0x00 }, { 0x0E, 0x00, 0x00 }, { 0x04, 0x08, 0x1F },
+    { 0x1F, 0x1F, 0x13 }, { 0x1F, 0x1B, 0x00 }, { 0x13, 0x0A, 0x00 }, { 0x1F, 0x15, 0x0A }, { 0x00, 0x15, 0x02 }, { 0x0E, 0x1F, 0x00 },
+    { 0x04, 0x04, 0x04 }, { 0x1F, 0x1F, 0x1F }, { 0x0E, 0x0E, 0x0E }, { 0x1F, 0x13, 0x00 }, { 0x00, 0x17, 0x06 }, { 0x15, 0x19, 0x1B },
+    { 0x1D, 0x08, 0x13 }, { 0x1F, 0x13, 0x17 }, { 0x17, 0x04, 0x0A }, { 0x00, 0x15, 0x00 }, { 0x0E, 0x0E, 0x0E }, { 0x13, 0x13, 0x13 },
+    { 0x13, 0x0A, 0x00 }, { 0x1F, 0x15, 0x0A }, { 0x15, 0x00, 0x00 }, { 0x1F, 0x00, 0x00 }, { 0x00, 0x00, 0x00 }, { 0x1F, 0x1F, 0x1F },
+    { 0x1F, 0x1F, 0x13 }, { 0x1F, 0x1F, 0x00 }, { 0x00, 0x12, 0x0B }, { 0x04, 0x06, 0x0A }, { 0x00, 0x1F, 0x00 }, { 0x1F, 0x1F, 0x1F },
+    { 0x14, 0x1F, 0x1F }, { 0x10, 0x1C, 0x1E }, { 0x0C, 0x18, 0x19 }, { 0x09, 0x14, 0x15 }, { 0x00, 0x0E, 0x10 }, { 0x00, 0x1F, 0x00 },
+    { 0x1F, 0x16, 0x18 }, { 0x1F, 0x0A, 0x10 }, { 0x1F, 0x1E, 0x00 }, { 0x19, 0x18, 0x00 }, { 0x13, 0x0A, 0x00 }, { 0x1F, 0x00, 0x00 },
 };
 
 const u16 sZoneLoadingCharacterColors[NUM_CHARACTERS] = {
-    [CHARACTER_SONIC] = RGB16(0, 0, 31),  [CHARACTER_CREAM] = RGB16(31, 18, 0),
-    [CHARACTER_TAILS] = RGB16(31, 27, 0), [CHARACTER_KNUCKLES] = RGB16(31, 3, 0),
-    [CHARACTER_AMY] = RGB16(31, 17, 21),
+    [CHARACTER_SONIC] = RGB16(0, 0, 31),    [CHARACTER_CREAM] = RGB16(31, 18, 0), [CHARACTER_TAILS] = RGB16(31, 27, 0),
+    [CHARACTER_KNUCKLES] = RGB16(31, 3, 0), [CHARACTER_AMY] = RGB16(31, 17, 21),
 };
 
 const u16 sScreenPositions_ZoneLoadingActLetters[4][2] = {
@@ -293,16 +261,14 @@ struct Task *SetupStageIntro(void)
 
     gActiveBossTask = NULL;
 
-    t = TaskCreate(Task_802F75C, sizeof(SITaskA), 0x2200, 0,
-                   TaskDestructor_StageIntroParent);
+    t = TaskCreate(Task_802F75C, sizeof(SITaskA), 0x2200, 0, TaskDestructor_StageIntroParent);
     sit_a = TASK_DATA(t);
     sit_a->counter = 2;
     sit_a->skippedIntro = FALSE;
 
     gPlayer.moveState |= MOVESTATE_100000;
 
-    t2 = TaskCreate(Task_802F9F8, sizeof(SITaskB), 0x2210, 0,
-                    TaskDestructor_nop_8030458);
+    t2 = TaskCreate(Task_802F9F8, sizeof(SITaskB), 0x2210, 0, TaskDestructor_nop_8030458);
     sit_b = TASK_DATA(t2);
     sit_b->parent = sit_a;
 
@@ -315,8 +281,7 @@ struct Task *SetupStageIntro(void)
     fade->bldAlpha = 0;
     UpdateScreenFade(fade);
 
-    t2 = TaskCreate(Task_IntroColorAnimation, sizeof(SITaskB), 0x2220, 0,
-                    TaskDestructor_nop_8030458);
+    t2 = TaskCreate(Task_IntroColorAnimation, sizeof(SITaskB), 0x2220, 0, TaskDestructor_nop_8030458);
     sit_b = TASK_DATA(t2);
     sit_b->parent = sit_a;
 
@@ -328,28 +293,22 @@ struct Task *SetupStageIntro(void)
     vec->x = 0;
     vec->y = 0;
 
-    t2 = TaskCreate(Task_IntroZoneNameAndIconAnimations, sizeof(SITaskD), 0x2230, 0,
-                    TaskDestructor_803045C);
+    t2 = TaskCreate(Task_IntroZoneNameAndIconAnimations, sizeof(SITaskD), 0x2230, 0, TaskDestructor_803045C);
     sit_d = TASK_DATA(t2);
     sit_d->parent = sit_a;
 
     if (IS_SINGLE_PLAYER) {
         tilesCursor = VramMalloc(
-            zoneLoadingCharacterLogos[gSelectedCharacter][0]
-            + zoneLoadingZoneNames[LEVEL_TO_ZONE(gCurrentLevel) * 4 + 0][0]
-            + zoneLoadingZoneNames[LEVEL_TO_ZONE(gCurrentLevel) * 4 + 1][0]
-            + zoneLoadingZoneNames[LEVEL_TO_ZONE(gCurrentLevel) * 4 + 2][0]
+            zoneLoadingCharacterLogos[gSelectedCharacter][0] + zoneLoadingZoneNames[LEVEL_TO_ZONE(gCurrentLevel) * 4 + 0][0]
+            + zoneLoadingZoneNames[LEVEL_TO_ZONE(gCurrentLevel) * 4 + 1][0] + zoneLoadingZoneNames[LEVEL_TO_ZONE(gCurrentLevel) * 4 + 2][0]
             + zoneLoadingZoneNames[LEVEL_TO_ZONE(gCurrentLevel) * 4 + 3][0]
-            + ({ zoneLoadingIcons[LEVEL_TO_ZONE(gCurrentLevel)][0] + 0x24; })
-            + (sZoneUnlockedIcons[0][0] * NUM_ZONE_UNLOCKED_ICONS));
+            + ({ zoneLoadingIcons[LEVEL_TO_ZONE(gCurrentLevel)][0] + 0x24; }) + (sZoneUnlockedIcons[0][0] * NUM_ZONE_UNLOCKED_ICONS));
     } else {
         // _0802F260
 
         tilesCursor = VramMalloc(
-            zoneLoadingCharacterLogos[gSelectedCharacter][0]
-            + zoneLoadingZoneNames[LEVEL_TO_ZONE(gCurrentLevel) * 4 + 0][0]
-            + zoneLoadingZoneNames[LEVEL_TO_ZONE(gCurrentLevel) * 4 + 1][0]
-            + zoneLoadingZoneNames[LEVEL_TO_ZONE(gCurrentLevel) * 4 + 2][0]
+            zoneLoadingCharacterLogos[gSelectedCharacter][0] + zoneLoadingZoneNames[LEVEL_TO_ZONE(gCurrentLevel) * 4 + 0][0]
+            + zoneLoadingZoneNames[LEVEL_TO_ZONE(gCurrentLevel) * 4 + 1][0] + zoneLoadingZoneNames[LEVEL_TO_ZONE(gCurrentLevel) * 4 + 2][0]
             + zoneLoadingZoneNames[LEVEL_TO_ZONE(gCurrentLevel) * 4 + 3][0]
             + ({ zoneLoadingIcons[LEVEL_TO_ZONE(gCurrentLevel)][0] + 0x24; }));
     }
@@ -409,10 +368,8 @@ struct Task *SetupStageIntro(void)
             // _0802F446
             s->graphics.dest = tilesCursor;
 
-            tilesCursor += zoneLoadingZoneNames[LEVEL_TO_ZONE(gCurrentLevel) * 4 + i][0]
-                * TILE_SIZE_4BPP;
-            s->graphics.anim
-                = zoneLoadingZoneNames[LEVEL_TO_ZONE(gCurrentLevel) * 4 + i][1];
+            tilesCursor += zoneLoadingZoneNames[LEVEL_TO_ZONE(gCurrentLevel) * 4 + i][0] * TILE_SIZE_4BPP;
+            s->graphics.anim = zoneLoadingZoneNames[LEVEL_TO_ZONE(gCurrentLevel) * 4 + i][1];
             s->variant = zoneLoadingZoneNames[LEVEL_TO_ZONE(gCurrentLevel) * 4 + i][2];
         }
         // _0802F47E
@@ -519,8 +476,7 @@ struct Task *SetupStageIntro(void)
     // _0802F652
 
     /*    Act Names    */
-    t2 = TaskCreate(Task_IntroActLettersAnimations, sizeof(SITaskE), 0x2240, 0,
-                    TaskDestructor_8030474);
+    t2 = TaskCreate(Task_IntroActLettersAnimations, sizeof(SITaskE), 0x2240, 0, TaskDestructor_8030474);
     sit_e = TASK_DATA(t2);
     sit_e->parent = sit_a;
     tilesCursor = VramMalloc(sZoneLoadingActLetters[0][0] * 4);
@@ -554,8 +510,7 @@ struct Task *SetupStageIntro(void)
         UpdateSpriteAnimation(s);
     }
 
-    t2 = TaskCreate(Task_UpdateStageLoadingScreen, sizeof(SITaskB), 0x22F0, 0,
-                    TaskDestructor_nop_8030458);
+    t2 = TaskCreate(Task_UpdateStageLoadingScreen, sizeof(SITaskB), 0x22F0, 0, TaskDestructor_nop_8030458);
     sit_b = TASK_DATA(t2);
     sit_b->parent = sit_a;
 
@@ -591,8 +546,8 @@ static void Task_802F75C(void)
     }
 
     /*    Set player animation to "Getting Ready" and delay until it is finished    */
-    if ((frameCounter == (200 - sGettingReadyAnimationDuration[gSelectedCharacter]))
-        && (gBossIndex == 0) && (ACT_INDEX(gCurrentLevel) != ACT_BOSS)) {
+    if ((frameCounter == (200 - sGettingReadyAnimationDuration[gSelectedCharacter])) && (gBossIndex == 0)
+        && (ACT_INDEX(gCurrentLevel) != ACT_BOSS)) {
         Player *p = &gPlayer;
         p->anim = characterAnimsGettingReady[gSelectedCharacter].anim;
         p->variant = characterAnimsGettingReady[gSelectedCharacter].variant;
@@ -760,16 +715,12 @@ NONMATCH("asm/non_matching/game/stage/intro/Task_802F9F8.inc", void Task_802F9F8
             gDispCnt &= ~(DISPCNT_WIN0_ON | DISPCNT_WIN1_ON | DISPCNT_OBJWIN_ON);
         } else {
             // Level: True Area 53
-            gDispCnt &= ~(DISPCNT_WIN0_ON | DISPCNT_WIN1_ON | DISPCNT_BG1_ON
-                          | DISPCNT_BG2_ON);
-            gWinRegs[WINREG_WINOUT]
-                = (WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR | WINOUT_WINOBJ_BG0
-                   | WINOUT_WINOBJ_BG1 | WINOUT_WINOBJ_BG2 | WINOUT_WIN01_OBJ
-                   | WINOUT_WIN01_CLR | WINOUT_WIN01_BG0 | WINOUT_WIN01_BG2);
+            gDispCnt &= ~(DISPCNT_WIN0_ON | DISPCNT_WIN1_ON | DISPCNT_BG1_ON | DISPCNT_BG2_ON);
+            gWinRegs[WINREG_WINOUT] = (WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR | WINOUT_WINOBJ_BG0 | WINOUT_WINOBJ_BG1 | WINOUT_WINOBJ_BG2
+                                       | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR | WINOUT_WIN01_BG0 | WINOUT_WIN01_BG2);
 
             gBldRegs.bldCnt
-                = (BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1
-                   | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2);
+                = (BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2);
             gBldRegs.bldAlpha = 0x404;
             gBldRegs.bldY = 0x404;
         }
@@ -922,8 +873,7 @@ static void StageIntroUpdateIcons(void)
 }
 
 // (88.38%) https://decomp.me/scratch/la7O4
-NONMATCH("asm/non_matching/game/stage/intro/Task_IntroZoneNameAndIconAnimations.inc",
-         void Task_IntroZoneNameAndIconAnimations(void))
+NONMATCH("asm/non_matching/game/stage/intro/Task_IntroZoneNameAndIconAnimations.inc", void Task_IntroZoneNameAndIconAnimations(void))
 {
     SITaskD *sit_d = TASK_DATA(gCurTask);
     u32 counter = sit_d->parent->counter;
@@ -1086,8 +1036,7 @@ END_NONMATCH
 
 static inline void sub_8030488_inline()
 {
-    if ((ACT_INDEX(gCurrentLevel) != ACT_BOSS)
-        && (LEVEL_TO_ZONE(gCurrentLevel) != ZONE_FINAL)) {
+    if ((ACT_INDEX(gCurrentLevel) != ACT_BOSS) && (LEVEL_TO_ZONE(gCurrentLevel) != ZONE_FINAL)) {
         SITaskE *sit_e = TASK_DATA(gCurTask);
         u8 i;
 
@@ -1201,8 +1150,7 @@ static void TaskDestructor_8030474(struct Task *t)
 //       defined above for some reason...
 static void sub_8030488(void)
 {
-    if ((ACT_INDEX(gCurrentLevel) != ACT_BOSS)
-        && (LEVEL_TO_ZONE(gCurrentLevel) != ZONE_FINAL)) {
+    if ((ACT_INDEX(gCurrentLevel) != ACT_BOSS) && (LEVEL_TO_ZONE(gCurrentLevel) != ZONE_FINAL)) {
         SITaskE *sit_e = TASK_DATA(gCurTask);
         u8 i;
 
diff --git a/src/game/stage/item_tasks.c b/src/game/stage/item_tasks.c
index 410ecc043..b7cb730be 100644
--- a/src/game/stage/item_tasks.c
+++ b/src/game/stage/item_tasks.c
@@ -26,16 +26,15 @@ void Task_Item_Shield_Magnetic(void);
 void Task_Item_Confusion(void);
 void TaskDestructor_ItemTasks(struct Task *);
 
-#define ITEMTASK_GET_PLAYER_NUM()                                                       \
-    ({                                                                                  \
-        ItemTask *it = TASK_DATA(gCurTask);                                             \
-        it->unk30;                                                                      \
+#define ITEMTASK_GET_PLAYER_NUM()                                                                                                          \
+    ({                                                                                                                                     \
+        ItemTask *it = TASK_DATA(gCurTask);                                                                                                \
+        it->unk30;                                                                                                                         \
     })
 
 struct Task *CreateItemTask_Shield_Normal(s8 p0)
 {
-    struct Task *t = TaskCreate(Task_Item_Shield_Normal, sizeof(ItemTask), 0x4001, 0,
-                                TaskDestructor_ItemTasks);
+    struct Task *t = TaskCreate(Task_Item_Shield_Normal, sizeof(ItemTask), 0x4001, 0, TaskDestructor_ItemTasks);
     ItemTask *item = TASK_DATA(t);
     Sprite *s = &item->s;
 
@@ -59,8 +58,7 @@ struct Task *CreateItemTask_Shield_Normal(s8 p0)
 
 struct Task *CreateItemTask_Invincibility(s8 p0)
 {
-    struct Task *t = TaskCreate(Task_Item_Invincibility, sizeof(ItemTask), 0x4001, 0,
-                                TaskDestructor_ItemTasks);
+    struct Task *t = TaskCreate(Task_Item_Invincibility, sizeof(ItemTask), 0x4001, 0, TaskDestructor_ItemTasks);
     ItemTask *item = TASK_DATA(t);
     Sprite *s = &item->s;
 
@@ -82,8 +80,7 @@ struct Task *CreateItemTask_Invincibility(s8 p0)
 
 struct Task *CreateItemTask_Shield_Magnetic(s8 p0)
 {
-    struct Task *t = TaskCreate(Task_Item_Shield_Magnetic, sizeof(ItemTask), 0x4001, 0,
-                                TaskDestructor_ItemTasks);
+    struct Task *t = TaskCreate(Task_Item_Shield_Magnetic, sizeof(ItemTask), 0x4001, 0, TaskDestructor_ItemTasks);
     ItemTask *item = (ItemTask *)TASK_DATA(t);
 
     item->unk30 = p0;
@@ -111,8 +108,7 @@ struct Task *CreateItemTask_Shield_Magnetic(s8 p0)
 
 struct Task *CreateItemTask_Confusion(s8 p0)
 {
-    struct Task *t = TaskCreate(Task_Item_Confusion, sizeof(ItemTask), 0x4001, 0,
-                                TaskDestructor_ItemTasks);
+    struct Task *t = TaskCreate(Task_Item_Confusion, sizeof(ItemTask), 0x4001, 0, TaskDestructor_ItemTasks);
     ItemTask *item = TASK_DATA(t);
 
     item->unk30 = p0;
@@ -144,9 +140,7 @@ void Task_Item_Shield_Normal(void)
     ItemTask *item = TASK_DATA(gCurTask);
     struct Camera *cam = &gCamera;
 
-    u32 itemEffect
-        = (gPlayer.itemEffect
-           & (PLAYER_ITEM_EFFECT__INVINCIBILITY | PLAYER_ITEM_EFFECT__SHIELD_NORMAL));
+    u32 itemEffect = (gPlayer.itemEffect & (PLAYER_ITEM_EFFECT__INVINCIBILITY | PLAYER_ITEM_EFFECT__SHIELD_NORMAL));
     if (itemEffect != PLAYER_ITEM_EFFECT__SHIELD_NORMAL) {
         TaskDestroy(gCurTask);
         return;
@@ -178,8 +172,7 @@ void Task_Item_Shield_Normal(void)
 #else
         b = (param & 0x1);
 #endif
-        if (((gStageTime & 0x2) && (b != itemEffect))
-            || (!(gStageTime & 0x2) && (b != 0))) {
+        if (((gStageTime & 0x2) && (b != itemEffect)) || (!(gStageTime & 0x2) && (b != 0))) {
             DisplaySprite(&item->s);
         }
     }
@@ -195,9 +188,7 @@ void Task_Item_Shield_Magnetic(void)
     bool32 b;
 
     if (IS_SINGLE_PLAYER) {
-        u32 itemEffect = (gPlayer.itemEffect
-                          & (PLAYER_ITEM_EFFECT__SHIELD_MAGNETIC
-                             | PLAYER_ITEM_EFFECT__INVINCIBILITY));
+        u32 itemEffect = (gPlayer.itemEffect & (PLAYER_ITEM_EFFECT__SHIELD_MAGNETIC | PLAYER_ITEM_EFFECT__INVINCIBILITY));
 
         if (itemEffect != PLAYER_ITEM_EFFECT__SHIELD_MAGNETIC) {
             TaskDestroy(gCurTask);
@@ -214,8 +205,7 @@ void Task_Item_Shield_Magnetic(void)
             item->s.y = screenY;
 
             item->s.frameFlags &= ~SPRITE_FLAG_MASK_PRIORITY;
-            item->s.frameFlags
-                |= gPlayer.unk90->s.frameFlags & SPRITE_FLAG_MASK_PRIORITY;
+            item->s.frameFlags |= gPlayer.unk90->s.frameFlags & SPRITE_FLAG_MASK_PRIORITY;
         } else {
             return;
         }
@@ -361,8 +351,7 @@ void Task_Item_Confusion(void)
             u32 one = 1;
 #endif
             b &= one;
-            if (((gStageTime & 0x2) && (b != one))
-                || (!(gStageTime & 0x2) && (b != 0))) {
+            if (((gStageTime & 0x2) && (b != one)) || (!(gStageTime & 0x2) && (b != 0))) {
                 DisplaySprite(s);
             }
         }
diff --git a/src/game/stage/player.c b/src/game/stage/player.c
index 204b64ac4..ad983ea19 100644
--- a/src/game/stage/player.c
+++ b/src/game/stage/player.c
@@ -142,146 +142,133 @@ void PlayerCB_802A714(Player *);
 
 // TODO: Match this without ASM!
 #ifndef NON_MATCHING
-#define PLAYERFN_UPDATE_AIR_FALL_SPEED_B(player)                                        \
-    {                                                                                   \
-        s16 speed = (player->moveState & MOVESTATE_40)                                  \
-            ? Q_8_8(PLAYER_GRAVITY_UNDER_WATER)                                         \
-            : Q_8_8(PLAYER_GRAVITY);                                                    \
-                                                                                        \
-        if (player->speedAirY < 0) {                                                    \
-            asm("lsl r0, %0, #16\n"                                                     \
-                "\tasr r0, r0, #17\n"                                                   \
-                "\tlsl r0, r0, #16\n"                                                   \
-                "\tlsr %0, r0, #16\n"                                                   \
-                : "=r"(speed)                                                           \
-                : "r"(speed)                                                            \
-                : "r0");                                                                \
-        }                                                                               \
-                                                                                        \
-        player->speedAirY += speed;                                                     \
+#define PLAYERFN_UPDATE_AIR_FALL_SPEED_B(player)                                                                                           \
+    {                                                                                                                                      \
+        s16 speed = (player->moveState & MOVESTATE_40) ? Q_8_8(PLAYER_GRAVITY_UNDER_WATER) : Q_8_8(PLAYER_GRAVITY);                        \
+                                                                                                                                           \
+        if (player->speedAirY < 0) {                                                                                                       \
+            asm("lsl r0, %0, #16\n"                                                                                                        \
+                "\tasr r0, r0, #17\n"                                                                                                      \
+                "\tlsl r0, r0, #16\n"                                                                                                      \
+                "\tlsr %0, r0, #16\n"                                                                                                      \
+                : "=r"(speed)                                                                                                              \
+                : "r"(speed)                                                                                                               \
+                : "r0");                                                                                                                   \
+        }                                                                                                                                  \
+                                                                                                                                           \
+        player->speedAirY += speed;                                                                                                        \
     }
 #else
-#define PLAYERFN_UPDATE_AIR_FALL_SPEED_B(player)                                        \
-    {                                                                                   \
-        s16 speed = (player->moveState & MOVESTATE_40)                                  \
-            ? Q_8_8(PLAYER_GRAVITY_UNDER_WATER)                                         \
-            : Q_8_8(PLAYER_GRAVITY);                                                    \
-                                                                                        \
-        if (player->speedAirY < 0) {                                                    \
-            speed /= 2;                                                                 \
-        }                                                                               \
-                                                                                        \
-        player->speedAirY += speed;                                                     \
+#define PLAYERFN_UPDATE_AIR_FALL_SPEED_B(player)                                                                                           \
+    {                                                                                                                                      \
+        s16 speed = (player->moveState & MOVESTATE_40) ? Q_8_8(PLAYER_GRAVITY_UNDER_WATER) : Q_8_8(PLAYER_GRAVITY);                        \
+                                                                                                                                           \
+        if (player->speedAirY < 0) {                                                                                                       \
+            speed /= 2;                                                                                                                    \
+        }                                                                                                                                  \
+                                                                                                                                           \
+        player->speedAirY += speed;                                                                                                        \
     }
 #endif
 
-#define PLAYERFN_UPDATE_UNK2A(player)                                                   \
-    {                                                                                   \
-        if (player->unk2A) {                                                            \
-            player->unk2A -= 1;                                                         \
-        } else if ((player->rotation + 32) & 0xC0) {                                    \
-            s32 absGroundSpeed = ABS(player->speedGroundX);                             \
-            if (absGroundSpeed < Q(1.875)) {                                            \
-                player->speedGroundX = 0;                                               \
-                                                                                        \
-                player->moveState |= MOVESTATE_IN_AIR;                                  \
-                player->unk2A = GBA_FRAMES_PER_SECOND / 2;                              \
-            }                                                                           \
-        }                                                                               \
+#define PLAYERFN_UPDATE_UNK2A(player)                                                                                                      \
+    {                                                                                                                                      \
+        if (player->unk2A) {                                                                                                               \
+            player->unk2A -= 1;                                                                                                            \
+        } else if ((player->rotation + 32) & 0xC0) {                                                                                       \
+            s32 absGroundSpeed = ABS(player->speedGroundX);                                                                                \
+            if (absGroundSpeed < Q(1.875)) {                                                                                               \
+                player->speedGroundX = 0;                                                                                                  \
+                                                                                                                                           \
+                player->moveState |= MOVESTATE_IN_AIR;                                                                                     \
+                player->unk2A = GBA_FRAMES_PER_SECOND / 2;                                                                                 \
+            }                                                                                                                              \
+        }                                                                                                                                  \
     }
 
-#define PLAYERFN_UPDATE_ROTATION(player)                                                \
-    {                                                                                   \
-        s32 rot = (s8)player->rotation;                                                 \
-        if (rot < 0) {                                                                  \
-            rot = MIN((rot + 2), 0);                                                    \
-        } else if (rot > 0) {                                                           \
-            rot = MAX((rot - 2), 0);                                                    \
-        }                                                                               \
-        player->rotation = rot;                                                         \
+#define PLAYERFN_UPDATE_ROTATION(player)                                                                                                   \
+    {                                                                                                                                      \
+        s32 rot = (s8)player->rotation;                                                                                                    \
+        if (rot < 0) {                                                                                                                     \
+            rot = MIN((rot + 2), 0);                                                                                                       \
+        } else if (rot > 0) {                                                                                                              \
+            rot = MAX((rot - 2), 0);                                                                                                       \
+        }                                                                                                                                  \
+        player->rotation = rot;                                                                                                            \
     }
 
-#define PLAYERFN_UPDATE_POSITION(player)                                                \
-    {                                                                                   \
-        player->x += player->speedAirX;                                                 \
-                                                                                        \
-        if ((gStageFlags ^ gUnknown_0300544C) & STAGE_FLAG__GRAVITY_INVERTED) {         \
-            player->speedAirY = -player->speedAirY;                                     \
-        }                                                                               \
-                                                                                        \
-        player->speedAirY = MIN(player->speedAirY, Q(PLAYER_AIR_SPEED_MAX));            \
-                                                                                        \
-        player->y = GRAVITY_IS_INVERTED ? player->y - player->speedAirY                 \
-                                        : player->y + player->speedAirY;                \
+#define PLAYERFN_UPDATE_POSITION(player)                                                                                                   \
+    {                                                                                                                                      \
+        player->x += player->speedAirX;                                                                                                    \
+                                                                                                                                           \
+        if ((gStageFlags ^ gUnknown_0300544C) & STAGE_FLAG__GRAVITY_INVERTED) {                                                            \
+            player->speedAirY = -player->speedAirY;                                                                                        \
+        }                                                                                                                                  \
+                                                                                                                                           \
+        player->speedAirY = MIN(player->speedAirY, Q(PLAYER_AIR_SPEED_MAX));                                                               \
+                                                                                                                                           \
+        player->y = GRAVITY_IS_INVERTED ? player->y - player->speedAirY : player->y + player->speedAirY;                                   \
     }
 
 // TODO(Jace): This name is speculative right now, check for accuracy!
-#define PLAYERFN_MAYBE_TRANSITION_TO_GROUND_BASE(player)                                \
-    if ((player->moveState & (MOVESTATE_8 | MOVESTATE_IN_AIR)) == MOVESTATE_8) {        \
-        gPlayer.callback = PlayerCB_8025318;                                            \
-                                                                                        \
-        player->speedGroundX = player->speedAirX;                                       \
-        player->rotation = 0;                                                           \
+#define PLAYERFN_MAYBE_TRANSITION_TO_GROUND_BASE(player)                                                                                   \
+    if ((player->moveState & (MOVESTATE_8 | MOVESTATE_IN_AIR)) == MOVESTATE_8) {                                                           \
+        gPlayer.callback = PlayerCB_8025318;                                                                                               \
+                                                                                                                                           \
+        player->speedGroundX = player->speedAirX;                                                                                          \
+        player->rotation = 0;                                                                                                              \
     }
 
 // TODO(Jace): This name is speculative right now, check for accuracy!
-#define PLAYERFN_MAYBE_TRANSITION_TO_GROUND(player)                                     \
-    {                                                                                   \
-        sub_8022190(player);                                                            \
-        PLAYERFN_MAYBE_TRANSITION_TO_GROUND_BASE(player);                               \
+#define PLAYERFN_MAYBE_TRANSITION_TO_GROUND(player)                                                                                        \
+    {                                                                                                                                      \
+        sub_8022190(player);                                                                                                               \
+        PLAYERFN_MAYBE_TRANSITION_TO_GROUND_BASE(player);                                                                                  \
     }
 
-#define PLAYERFN_UPDATE_AIR_FALL_SPEED(player)                                          \
-    if (player->moveState & MOVESTATE_40) {                                             \
-        player->speedAirY += Q(PLAYER_GRAVITY_UNDER_WATER);                             \
-    } else {                                                                            \
-        player->speedAirY += Q(PLAYER_GRAVITY);                                         \
+#define PLAYERFN_UPDATE_AIR_FALL_SPEED(player)                                                                                             \
+    if (player->moveState & MOVESTATE_40) {                                                                                                \
+        player->speedAirY += Q(PLAYER_GRAVITY_UNDER_WATER);                                                                                \
+    } else {                                                                                                                               \
+        player->speedAirY += Q(PLAYER_GRAVITY);                                                                                            \
     }
 
-#define PLAYERFN_SET_ANIM_SPEED(_p, _s)                                                 \
-    {                                                                                   \
-        s32 speed = _p->speedGroundX;                                                   \
-        speed = (speed >> 5) + (speed >> 6);                                            \
-                                                                                        \
-        /* TODO: Try ABS macro */                                                       \
-        speed = ABS(speed);                                                             \
-                                                                                        \
-        if (speed >= SPRITE_ANIM_SPEED(0.5)) {                                          \
-            if (speed > SPRITE_ANIM_SPEED(8.0)) {                                       \
-                speed = SPRITE_ANIM_SPEED(8.0);                                         \
-            }                                                                           \
-        } else {                                                                        \
-            speed = SPRITE_ANIM_SPEED(0.5);                                             \
-        }                                                                               \
-        _s->animSpeed = speed;                                                          \
+#define PLAYERFN_SET_ANIM_SPEED(_p, _s)                                                                                                    \
+    {                                                                                                                                      \
+        s32 speed = _p->speedGroundX;                                                                                                      \
+        speed = (speed >> 5) + (speed >> 6);                                                                                               \
+                                                                                                                                           \
+        /* TODO: Try ABS macro */                                                                                                          \
+        speed = ABS(speed);                                                                                                                \
+                                                                                                                                           \
+        if (speed >= SPRITE_ANIM_SPEED(0.5)) {                                                                                             \
+            if (speed > SPRITE_ANIM_SPEED(8.0)) {                                                                                          \
+                speed = SPRITE_ANIM_SPEED(8.0);                                                                                            \
+            }                                                                                                                              \
+        } else {                                                                                                                           \
+            speed = SPRITE_ANIM_SPEED(0.5);                                                                                                \
+        }                                                                                                                                  \
+        _s->animSpeed = speed;                                                                                                             \
     }
 
 const AnimId gPlayerCharacterIdleAnims[NUM_CHARACTERS] = {
-    SA2_ANIM_CHAR(SA2_CHAR_ANIM_IDLE, CHARACTER_SONIC),
-    SA2_ANIM_CHAR(SA2_CHAR_ANIM_IDLE, CHARACTER_CREAM),
-    SA2_ANIM_CHAR(SA2_CHAR_ANIM_IDLE, CHARACTER_TAILS),
-    SA2_ANIM_CHAR(SA2_CHAR_ANIM_IDLE, CHARACTER_KNUCKLES),
+    SA2_ANIM_CHAR(SA2_CHAR_ANIM_IDLE, CHARACTER_SONIC), SA2_ANIM_CHAR(SA2_CHAR_ANIM_IDLE, CHARACTER_CREAM),
+    SA2_ANIM_CHAR(SA2_CHAR_ANIM_IDLE, CHARACTER_TAILS), SA2_ANIM_CHAR(SA2_CHAR_ANIM_IDLE, CHARACTER_KNUCKLES),
     SA2_ANIM_CHAR(SA2_CHAR_ANIM_IDLE, CHARACTER_AMY),
 };
 
 const u16 gUnknown_080D6736[][2] = {
-    { 0, 0 },   { 1, 0 },   { 2, 0 },   { 3, 0 },   { 4, 0 },   { 5, 0 },   { 6, 0 },
-    { 7, 0 },   { 8, 0 },   { 9, 0 },   { 10, 0 },  { 11, 0 },  { 12, 0 },  { 13, 0 },
-    { 13, 0 },  { 14, 0 },  { 15, 0 },  { 16, 0 },  { 17, 0 },  { 18, 0 },  { 28, 0 },
-    { 28, 1 },  { 29, 0 },  { 1, 0 },   { 1, 0 },   { 31, 0 },  { 31, 1 },  { 31, 2 },
-    { 32, 0 },  { 33, 0 },  { 34, 0 },  { 1, 0 },   { 35, 0 },  { 48, 0 },  { 49, 0 },
-    { 50, 0 },  { 51, 0 },  { 65, 0 },  { 52, 0 },  { 53, 0 },  { 54, 0 },  { 55, 0 },
-    { 56, 0 },  { 57, 0 },  { 58, 0 },  { 59, 0 },  { 60, 0 },  { 68, 0 },  { 69, 0 },
-    { 69, 1 },  { 70, 0 },  { 62, 0 },  { 62, 1 },  { 63, 0 },  { 63, 1 },  { 61, 0 },
-    { 64, 0 },  { 66, 0 },  { 67, 0 },  { 73, 0 },  { 73, 1 },  { 73, 2 },  { 75, 0 },
-    { 9, 2 },   { 71, 0 },  { 71, 1 },  { 72, 0 },  { 36, 0 },  { 36, 1 },  { 36, 2 },
-    { 36, 3 },  { 1, 0 },   { 1, 0 },   { 1, 0 },   { 1, 0 },   { 1, 0 },   { 1, 0 },
-    { 1, 0 },   { 1, 0 },   { 1, 0 },   { 19, 0 },  { 37, 0 },  { 37, 1 },  { 110, 0 },
-    { 110, 1 }, { 112, 0 }, { 111, 0 }, { 113, 0 }, { 202, 0 }, { 203, 0 }, { 204, 0 },
-    { 201, 0 }, { 292, 0 }, { 295, 0 }, { 295, 1 }, { 294, 0 }, { 293, 0 }, { 293, 1 },
-    { 293, 2 }, { 293, 3 }, { 296, 0 }, { 297, 2 }, { 297, 0 }, { 297, 1 }, { 297, 3 },
-    { 297, 4 }, { 324, 0 }, { 324, 1 }, { 324, 2 }, { 416, 0 }, { 1, 0 },   { 378, 0 },
-    { 383, 0 }, { 1, 0 },   { 382, 0 },
+    { 0, 0 },   { 1, 0 },   { 2, 0 },   { 3, 0 },   { 4, 0 },   { 5, 0 },   { 6, 0 },   { 7, 0 },   { 8, 0 },   { 9, 0 },   { 10, 0 },
+    { 11, 0 },  { 12, 0 },  { 13, 0 },  { 13, 0 },  { 14, 0 },  { 15, 0 },  { 16, 0 },  { 17, 0 },  { 18, 0 },  { 28, 0 },  { 28, 1 },
+    { 29, 0 },  { 1, 0 },   { 1, 0 },   { 31, 0 },  { 31, 1 },  { 31, 2 },  { 32, 0 },  { 33, 0 },  { 34, 0 },  { 1, 0 },   { 35, 0 },
+    { 48, 0 },  { 49, 0 },  { 50, 0 },  { 51, 0 },  { 65, 0 },  { 52, 0 },  { 53, 0 },  { 54, 0 },  { 55, 0 },  { 56, 0 },  { 57, 0 },
+    { 58, 0 },  { 59, 0 },  { 60, 0 },  { 68, 0 },  { 69, 0 },  { 69, 1 },  { 70, 0 },  { 62, 0 },  { 62, 1 },  { 63, 0 },  { 63, 1 },
+    { 61, 0 },  { 64, 0 },  { 66, 0 },  { 67, 0 },  { 73, 0 },  { 73, 1 },  { 73, 2 },  { 75, 0 },  { 9, 2 },   { 71, 0 },  { 71, 1 },
+    { 72, 0 },  { 36, 0 },  { 36, 1 },  { 36, 2 },  { 36, 3 },  { 1, 0 },   { 1, 0 },   { 1, 0 },   { 1, 0 },   { 1, 0 },   { 1, 0 },
+    { 1, 0 },   { 1, 0 },   { 1, 0 },   { 19, 0 },  { 37, 0 },  { 37, 1 },  { 110, 0 }, { 110, 1 }, { 112, 0 }, { 111, 0 }, { 113, 0 },
+    { 202, 0 }, { 203, 0 }, { 204, 0 }, { 201, 0 }, { 292, 0 }, { 295, 0 }, { 295, 1 }, { 294, 0 }, { 293, 0 }, { 293, 1 }, { 293, 2 },
+    { 293, 3 }, { 296, 0 }, { 297, 2 }, { 297, 0 }, { 297, 1 }, { 297, 3 }, { 297, 4 }, { 324, 0 }, { 324, 1 }, { 324, 2 }, { 416, 0 },
+    { 1, 0 },   { 378, 0 }, { 383, 0 }, { 1, 0 },   { 382, 0 },
 };
 
 static const s16 gUnknown_080D6902[5][2] = {
@@ -311,10 +298,8 @@ static const s16 sSpinDashSpeeds[9] = {
 // NOTE(Jace): It appears that they originally planned
 //             to give the player a different amount of score points
 //             depending on the direction of the trick.
-static const u16 sTrickPoints[NUM_TRICK_DIRS] = { [TRICK_DIR_UP] = 100,
-                                                  [TRICK_DIR_DOWN] = 100,
-                                                  [TRICK_DIR_FORWARD] = 100,
-                                                  [TRICK_DIR_BACKWARD] = 100 };
+static const u16 sTrickPoints[NUM_TRICK_DIRS]
+    = { [TRICK_DIR_UP] = 100, [TRICK_DIR_DOWN] = 100, [TRICK_DIR_FORWARD] = 100, [TRICK_DIR_BACKWARD] = 100 };
 
 static const s16 sTrickAccel[NUM_TRICK_DIRS][NUM_CHARACTERS][2] = {
     [TRICK_DIR_UP] = {
@@ -387,10 +372,8 @@ static const u8 sTrickMasks[NUM_TRICK_DIRS][NUM_CHARACTERS] = {
 };
 
 static const u16 gUnknown_080D69A6[2][3] = {
-    [0] = { 32, SA2_ANIM_CHAR(SA2_CHAR_ANIM_TRICK_SIDE, CHARACTER_SONIC),
-            SA2_CHAR_ANIM_VARIANT_TRICK_SIDE_PARTICLE_FX },
-    [1] = { 24, SA2_ANIM_CHAR(SA2_CHAR_ANIM_TRICK_UP, CHARACTER_KNUCKLES),
-            SA2_CHAR_ANIM_VARIANT_TRICK_UP_PARTICLE_FX },
+    [0] = { 32, SA2_ANIM_CHAR(SA2_CHAR_ANIM_TRICK_SIDE, CHARACTER_SONIC), SA2_CHAR_ANIM_VARIANT_TRICK_SIDE_PARTICLE_FX },
+    [1] = { 24, SA2_ANIM_CHAR(SA2_CHAR_ANIM_TRICK_UP, CHARACTER_KNUCKLES), SA2_CHAR_ANIM_VARIANT_TRICK_UP_PARTICLE_FX },
 };
 
 static const s16 sSpringAccelY[4] = {
@@ -455,8 +438,7 @@ void sub_80213C0(u32 UNUSED characterId, u32 UNUSED levelId, Player *player)
     struct Task *t;
     player_0_Task *gt;
 
-    t = TaskCreate(Task_8023FC0, sizeof(player_0_Task), 0x3000, 0,
-                   TaskDestructor_802A07C);
+    t = TaskCreate(Task_8023FC0, sizeof(player_0_Task), 0x3000, 0, TaskDestructor_802A07C);
     p->spriteTask = t;
     gt = TASK_DATA(t);
     gt->unk0 = unk60;
@@ -572,8 +554,7 @@ void AllocateCharacterMidAirGfx(Player *p, PlayerSpriteInfo *param2)
         s->palId = 0;
     }
 
-    s->frameFlags = (SPRITE_FLAG_MASK_18 | SPRITE_FLAG(PRIORITY, 2)
-                     | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE | SPRITE_FLAG(ROT_SCALE, 4));
+    s->frameFlags = (SPRITE_FLAG_MASK_18 | SPRITE_FLAG(PRIORITY, 2) | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE | SPRITE_FLAG(ROT_SCALE, 4));
 
     extraSprite->transform.rotation = 0;
     extraSprite->transform.width = 0x100;
@@ -607,8 +588,7 @@ void SetStageSpawnPos(u32 character, u32 level, u32 p2, Player *p)
 // (99.91%) https://decomp.me/scratch/UT9dt
 NONMATCH("asm/non_matching/game/InitializePlayer.inc", void InitializePlayer(Player *p))
 {
-    if ((gGameMode == GAME_MODE_MULTI_PLAYER_COLLECT_RINGS)
-        && (((p->x & p->y) + 1) != 0)) {
+    if ((gGameMode == GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) && (((p->x & p->y) + 1) != 0)) {
         p->x = Q(460);
     } else {
         p->x = Q(p->checkPointX);
@@ -740,10 +720,9 @@ void Player_TransitionCancelFlyingAndBoost(Player *p)
         m4aSongNumStop(SE_281);
     }
 
-    p->moveState &= ~(MOVESTATE_20000000 | MOVESTATE_10000000 | MOVESTATE_1000000
-                      | MOVESTATE_80000 | MOVESTATE_40000 | MOVESTATE_20000
-                      | MOVESTATE_8000 | MOVESTATE_4000 | MOVESTATE_2000 | MOVESTATE_400
-                      | MOVESTATE_200 | MOVESTATE_100 | MOVESTATE_20 | MOVESTATE_10);
+    p->moveState &= ~(MOVESTATE_20000000 | MOVESTATE_10000000 | MOVESTATE_1000000 | MOVESTATE_80000 | MOVESTATE_40000 | MOVESTATE_20000
+                      | MOVESTATE_8000 | MOVESTATE_4000 | MOVESTATE_2000 | MOVESTATE_400 | MOVESTATE_200 | MOVESTATE_100 | MOVESTATE_20
+                      | MOVESTATE_10);
 
     p->unk61 = 0;
     p->unk62 = 0;
@@ -1717,8 +1696,7 @@ void sub_80228C0(Player *p)
     u32 mask = p->unk38;
     s32 py = I(playerY);
 
-    resultA = sub_801E4E4(py + p->unk17, (playerX = I(playerX)) - (2 + p->unk16), mask,
-                          8, &p->unk28, sub_801EE64);
+    resultA = sub_801E4E4(py + p->unk17, (playerX = I(playerX)) - (2 + p->unk16), mask, 8, &p->unk28, sub_801EE64);
 
     py = py + (p->unk17);
     playerX += 2;
@@ -1830,8 +1808,7 @@ void sub_80229EC(Player *p)
     mask = p->unk38;
     py = I(playerY);
 
-    resultA = sub_801E4E4(py - p->unk17, (playerX = I(playerX)) + (2 + p->unk16), mask,
-                          -8, &p->unk28, sub_801EE64);
+    resultA = sub_801E4E4(py - p->unk17, (playerX = I(playerX)) + (2 + p->unk16), mask, -8, &p->unk28, sub_801EE64);
 
     py = py - (p->unk17);
     playerX -= 2;
@@ -1943,8 +1920,7 @@ void sub_8022B18(Player *p)
     mask = p->unk38;
     py = I(playerX);
 
-    resultA = sub_801E4E4(py - p->unk17, (playerY = I(playerY)) - (2 + p->unk16), mask,
-                          -8, &p->unk28, sub_801ED24);
+    resultA = sub_801E4E4(py - p->unk17, (playerY = I(playerY)) - (2 + p->unk16), mask, -8, &p->unk28, sub_801ED24);
 
     py = py - (p->unk17);
     playerY += 2;
@@ -2055,8 +2031,7 @@ void sub_8022C44(Player *p)
     mask = p->unk38;
     py = I(playerX);
 
-    resultA = sub_801E4E4(py + p->unk17, (playerY = I(playerY)) + (2 + p->unk16), mask,
-                          +8, &p->unk28, sub_801ED24);
+    resultA = sub_801E4E4(py + p->unk17, (playerY = I(playerY)) + (2 + p->unk16), mask, +8, &p->unk28, sub_801ED24);
 
     py = py + (p->unk17);
     playerY -= 2;
@@ -2157,8 +2132,7 @@ void sub_8022D6C(Player *p)
         s16 r0 = (unk4 - offsetY) & mask;
         r5 &= mask;
 
-        if ((r5 == (r0)) && (p->speedAirY >= 0) && ((u8)(p->rotation + 0x18) <= 0x30)
-            && (!(p->moveState & MOVESTATE_IN_AIR))
+        if ((r5 == (r0)) && (p->speedAirY >= 0) && ((u8)(p->rotation + 0x18) <= 0x30) && (!(p->moveState & MOVESTATE_IN_AIR))
             && (ABS(p->speedGroundX) >= Q(6.0))) {
             sub_80228C0(p);
 
@@ -2364,8 +2338,7 @@ s32 sub_8022F58(u8 param0, Player *p)
 }
 
 // (98.07%) https://decomp.me/scratch/xgjsf
-NONMATCH("asm/non_matching/game/player__sub_802302C.inc",
-         s32 sub_802302C(u8 param0, Player *p))
+NONMATCH("asm/non_matching/game/player__sub_802302C.inc", s32 sub_802302C(u8 param0, Player *p))
 {
     s32 r3;
     s32 result;
@@ -2607,8 +2580,7 @@ void sub_80232D0(Player *p)
                     cam->unk14 += iy;
                 }
             }
-        } else if ((gPlayer.moveState & MOVESTATE_8000000)
-                   && (gSpecialRingCount >= SPECIAL_STAGE_REQUIRED_SP_RING_COUNT)) {
+        } else if ((gPlayer.moveState & MOVESTATE_8000000) && (gSpecialRingCount >= SPECIAL_STAGE_REQUIRED_SP_RING_COUNT)) {
             ox = gUnknown_080D650C[gCurrentLevel].x;
             if ((ox >= 0) && (qPX >= Q(ox)) && (cam->unk8 != 0)) {
                 if (!(cam->unk50 & 0x1)) {
@@ -2862,8 +2834,7 @@ void sub_8023748(Player *p)
         p->itemEffect &= ~PLAYER_ITEM_EFFECT__10;
     }
 
-    if ((p->itemEffect & PLAYER_ITEM_EFFECT__INVINCIBILITY)
-        && (--p->timerInvincibility == 0)) {
+    if ((p->itemEffect & PLAYER_ITEM_EFFECT__INVINCIBILITY) && (--p->timerInvincibility == 0)) {
         p->itemEffect &= ~PLAYER_ITEM_EFFECT__INVINCIBILITY;
 
         if (p->itemEffect & PLAYER_ITEM_EFFECT__SHIELD_NORMAL) {
@@ -2888,8 +2859,7 @@ void sub_8023748(Player *p)
 void sub_8023878(Player *p)
 {
     p->moveState &= ~MOVESTATE_1000;
-    if (gWater.isActive == 1 && gWater.currentWaterLevel > -1
-        && (I(p->y) - 4) >= gWater.currentWaterLevel) {
+    if (gWater.isActive == 1 && gWater.currentWaterLevel > -1 && (I(p->y) - 4) >= gWater.currentWaterLevel) {
         if (!(p->moveState & MOVESTATE_40)) {
             p->moveState |= MOVESTATE_40;
             p->moveState |= MOVESTATE_1000;
@@ -2955,8 +2925,7 @@ void sub_8023878(Player *p)
         p->unk87 = 60;
         p->unk86 = 30;
 
-        if (gMPlayTable[0].info->songHeader == gSongTable[MUS_DROWNING].header
-            && p->unk60 == 0) {
+        if (gMPlayTable[0].info->songHeader == gSongTable[MUS_DROWNING].header && p->unk60 == 0) {
             m4aSongNumStartOrContinue(gLevelSongs[gCurrentLevel]);
         }
     }
@@ -3078,11 +3047,8 @@ void Task_8023D08(void)
         if (IS_SINGLE_PLAYER) {
             TaskDestroy(gCurTask);
             if ((!gLoadedSaveGame->timeLimitDisabled
-                 && (gCourseTime > MAX_COURSE_TIME
-                     || (gStageFlags & STAGE_FLAG__4 && gCourseTime == 0)))
-                || ((gGameMode == GAME_MODE_TIME_ATTACK
-                     || gGameMode == GAME_MODE_BOSS_TIME_ATTACK)
-                    && gCourseTime > MAX_COURSE_TIME)) {
+                 && (gCourseTime > MAX_COURSE_TIME || (gStageFlags & STAGE_FLAG__4 && gCourseTime == 0)))
+                || ((gGameMode == GAME_MODE_TIME_ATTACK || gGameMode == GAME_MODE_BOSS_TIME_ATTACK) && gCourseTime > MAX_COURSE_TIME)) {
                 HandleDeath();
             } else {
                 gRingCount = 0;
@@ -3311,9 +3277,7 @@ void CallPlayerTransition(Player *p)
                     gStageFlags |= STAGE_FLAG__TURN_OFF_TIMER;
                 }
 
-                if (p->moveState
-                    & (MOVESTATE_20000000 | MOVESTATE_10000000 | MOVESTATE_2000
-                       | MOVESTATE_8 | MOVESTATE_IN_AIR)) {
+                if (p->moveState & (MOVESTATE_20000000 | MOVESTATE_10000000 | MOVESTATE_2000 | MOVESTATE_8 | MOVESTATE_IN_AIR)) {
                     p->moveState |= (MOVESTATE_8000000 | MOVESTATE_IGNORE_INPUT);
                     p->unk5C = 0;
                     p->unk5E = 0;
@@ -3470,17 +3434,14 @@ void sub_80246DC(Player *p)
     r3 = (u16)(r3 - baseAnim);
 
     if ((charAnim == 10) || (charAnim == 11)) {
-        if (variant == 0 && (s->frameFlags & SPRITE_FLAG_MASK_ANIM_OVER)
-            && (((u16)r3 - 10) == 0 || ((u16)r3 - 10) == 1)) {
+        if (variant == 0 && (s->frameFlags & SPRITE_FLAG_MASK_ANIM_OVER) && (((u16)r3 - 10) == 0 || ((u16)r3 - 10) == 1)) {
             p->variant = 1;
             p->moveState |= MOVESTATE_4;
 
             PLAYERFN_CHANGE_SHIFT_OFFSETS(p, 6, 9);
         } else {
-            if ((p->speedAirY > 0) && (p->variant == 1)
-                && ((((u16)r3 - 10) == 0) || (((u16)r3 - 10) == 1))) {
-                s32 newY = sub_801E6D4(I(p->y) + p->unk17, I(p->x), p->unk38, 8, NULL,
-                                       sub_801EE64);
+            if ((p->speedAirY > 0) && (p->variant == 1) && ((((u16)r3 - 10) == 0) || (((u16)r3 - 10) == 1))) {
+                s32 newY = sub_801E6D4(I(p->y) + p->unk17, I(p->x), p->unk38, 8, NULL, sub_801EE64);
 
                 if (gGameMode != GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) {
                     if (newY <= 32) {
@@ -3506,8 +3467,7 @@ void sub_80246DC(Player *p)
             if (r3 == SA2_CHAR_ANIM_53) {
                 if (variant == 0) {
                     if (s->frameFlags & SPRITE_FLAG_MASK_ANIM_OVER) {
-                        p->anim = (gPlayerCharacterIdleAnims[p->character]
-                                   + SA2_CHAR_ANIM_52);
+                        p->anim = (gPlayerCharacterIdleAnims[p->character] + SA2_CHAR_ANIM_52);
                         p->variant = 2;
                     }
                 }
@@ -3639,36 +3599,35 @@ void sub_802486C(Player *p, PlayerSpriteInfo *p2)
     p->unk66 = p->unk64;
 }
 
-#define MACRO_8024B10_PSI_UPDATE(p, psi)                                                \
-    ({                                                                                  \
-        s32 x, y;                                                                       \
-        if (!(p->moveState & MOVESTATE_FACING_LEFT)) {                                  \
-            psi->transform.width = -Q(1.0);                                             \
-        } else {                                                                        \
-            psi->transform.width = Q(1.0);                                              \
-        }                                                                               \
-        if (GRAVITY_IS_INVERTED) {                                                      \
-            psi->transform.width = -psi->transform.width;                               \
-        }                                                                               \
-                                                                                        \
-        if (psi->transform.width < 0) {                                                 \
-            psi->transform.x--;                                                         \
-        }                                                                               \
-                                                                                        \
-        if (GRAVITY_IS_INVERTED) {                                                      \
-            psi->transform.height = Q(1.0);                                             \
-            /* requires double clamp to match */                                        \
-            psi->transform.rotation = CLAMP_SIN_PERIOD(CLAMP_SIN_PERIOD(                \
-                -Q(1.0) - (psi->transform.rotation + psi->transform.height)));          \
-        } else {                                                                        \
-            psi->transform.height = Q(1.0);                                             \
-        }                                                                               \
-                                                                                        \
-        x = I(psi->transform.width * p->unk80);                                         \
-        y = I(psi->transform.height * p->unk82);                                        \
-        psi->transform.width = x;                                                       \
-        psi->transform.height = y;                                                      \
-        UpdateSpriteAnimation(s);                                                       \
+#define MACRO_8024B10_PSI_UPDATE(p, psi)                                                                                                   \
+    ({                                                                                                                                     \
+        s32 x, y;                                                                                                                          \
+        if (!(p->moveState & MOVESTATE_FACING_LEFT)) {                                                                                     \
+            psi->transform.width = -Q(1.0);                                                                                                \
+        } else {                                                                                                                           \
+            psi->transform.width = Q(1.0);                                                                                                 \
+        }                                                                                                                                  \
+        if (GRAVITY_IS_INVERTED) {                                                                                                         \
+            psi->transform.width = -psi->transform.width;                                                                                  \
+        }                                                                                                                                  \
+                                                                                                                                           \
+        if (psi->transform.width < 0) {                                                                                                    \
+            psi->transform.x--;                                                                                                            \
+        }                                                                                                                                  \
+                                                                                                                                           \
+        if (GRAVITY_IS_INVERTED) {                                                                                                         \
+            psi->transform.height = Q(1.0);                                                                                                \
+            /* requires double clamp to match */                                                                                           \
+            psi->transform.rotation = CLAMP_SIN_PERIOD(CLAMP_SIN_PERIOD(-Q(1.0) - (psi->transform.rotation + psi->transform.height)));     \
+        } else {                                                                                                                           \
+            psi->transform.height = Q(1.0);                                                                                                \
+        }                                                                                                                                  \
+                                                                                                                                           \
+        x = I(psi->transform.width * p->unk80);                                                                                            \
+        y = I(psi->transform.height * p->unk82);                                                                                           \
+        psi->transform.width = x;                                                                                                          \
+        psi->transform.height = y;                                                                                                         \
+        UpdateSpriteAnimation(s);                                                                                                          \
     })
 
 void sub_8024B10(Player *p, PlayerSpriteInfo *inPsi)
@@ -3695,8 +3654,7 @@ void sub_8024B10(Player *p, PlayerSpriteInfo *inPsi)
     psi->transform.x = I(p->x) - camX;
     psi->transform.y = I(p->y) - camY;
 
-    if (p->unk64 == SA2_CHAR_ANIM_WALK || p->unk64 == SA2_CHAR_ANIM_41
-        || p->unk64 == SA2_CHAR_ANIM_62 || p->unk64 == 63
+    if (p->unk64 == SA2_CHAR_ANIM_WALK || p->unk64 == SA2_CHAR_ANIM_41 || p->unk64 == SA2_CHAR_ANIM_62 || p->unk64 == 63
         || (p->unk64 == SA2_CHAR_ANIM_87 && p->character == CHARACTER_CREAM)) {
         psi->transform.rotation = p->rotation << 2;
         s->frameFlags &= ~(SPRITE_FLAG_MASK_X_FLIP | SPRITE_FLAG_MASK_Y_FLIP);
@@ -3709,8 +3667,7 @@ void sub_8024B10(Player *p, PlayerSpriteInfo *inPsi)
         }
     } else {
         psi->transform.rotation = 0;
-        s->frameFlags
-            &= ~(SPRITE_FLAG_MASK_ROT_SCALE_ENABLE | SPRITE_FLAG_MASK_ROT_SCALE);
+        s->frameFlags &= ~(SPRITE_FLAG_MASK_ROT_SCALE_ENABLE | SPRITE_FLAG_MASK_ROT_SCALE);
 
         if (!(p->moveState & MOVESTATE_FACING_LEFT)) {
             s->frameFlags |= SPRITE_FLAG_MASK_X_FLIP;
@@ -3730,8 +3687,7 @@ void sub_8024B10(Player *p, PlayerSpriteInfo *inPsi)
     }
     if (IS_SINGLE_PLAYER) {
         if (p->moveState & MOVESTATE_DEAD
-            || (!(p->moveState & MOVESTATE_100000)
-                && (p->timerInvulnerability == 0 || (gStageTime & 2) == 0))) {
+            || (!(p->moveState & MOVESTATE_100000) && (p->timerInvulnerability == 0 || (gStageTime & 2) == 0))) {
             DisplaySprite(s);
         }
 
@@ -3773,8 +3729,7 @@ void sub_8024B10(Player *p, PlayerSpriteInfo *inPsi)
         send->unk8 &= ~8;
     }
 
-    if (p->moveState & MOVESTATE_DEAD || mpp->unk5C & 1
-        || p->moveState & MOVESTATE_IN_SCRIPTED || p->timerInvulnerability != 0) {
+    if (p->moveState & MOVESTATE_DEAD || mpp->unk5C & 1 || p->moveState & MOVESTATE_IN_SCRIPTED || p->timerInvulnerability != 0) {
         send->unk8 |= 4;
     } else {
         send->unk8 &= ~4;
@@ -3829,10 +3784,9 @@ void sub_8024B10(Player *p, PlayerSpriteInfo *inPsi)
     send->unk8 |= (mpp->unk64 << 9);
 }
 
-#define MACRO_8024F74_ANIM_CHECK(anim, variant)                                         \
-    (((anim == SA2_CHAR_ANIM_JUMP_1 || anim == SA2_CHAR_ANIM_JUMP_2) && variant == 1)   \
-     || (anim == SA2_CHAR_ANIM_SPIN_ATTACK && variant == 0)                             \
-     || (anim == SA2_CHAR_ANIM_70 && variant == 0))
+#define MACRO_8024F74_ANIM_CHECK(anim, variant)                                                                                            \
+    (((anim == SA2_CHAR_ANIM_JUMP_1 || anim == SA2_CHAR_ANIM_JUMP_2) && variant == 1)                                                      \
+     || (anim == SA2_CHAR_ANIM_SPIN_ATTACK && variant == 0) || (anim == SA2_CHAR_ANIM_70 && variant == 0))
 
 void sub_8024F74(Player *p, PlayerSpriteInfo *inPsi)
 {
@@ -3881,8 +3835,7 @@ void sub_8024F74(Player *p, PlayerSpriteInfo *inPsi)
                 TransformSprite(s, &psi->transform);
 
                 if (p->moveState & MOVESTATE_DEAD
-                    || (!(p->moveState & MOVESTATE_100000)
-                        && (p->timerInvulnerability == 0 || (gStageTime & 2) == 0))) {
+                    || (!(p->moveState & MOVESTATE_100000) && (p->timerInvulnerability == 0 || (gStageTime & 2) == 0))) {
                     DisplaySprite(s);
                 }
             }
@@ -3912,8 +3865,7 @@ void sub_8024F74(Player *p, PlayerSpriteInfo *inPsi)
                 TransformSprite(s, &psi->transform);
 
                 if (p->moveState & MOVESTATE_DEAD
-                    || (!(p->moveState & MOVESTATE_100000)
-                        && (p->timerInvulnerability == 0 || (gStageTime & 2) == 0))) {
+                    || (!(p->moveState & MOVESTATE_100000) && (p->timerInvulnerability == 0 || (gStageTime & 2) == 0))) {
                     DisplaySprite(s);
                 }
             }
@@ -3955,14 +3907,11 @@ void PlayerCB_8025318(Player *p)
 // TODO/NAME: Not only used for idling...
 void PlayerCB_Idle(Player *p)
 {
-    if ((p->moveState & (MOVESTATE_8000000 | MOVESTATE_8 | MOVESTATE_IN_AIR))
-        == MOVESTATE_8000000) {
+    if ((p->moveState & (MOVESTATE_8000000 | MOVESTATE_8 | MOVESTATE_IN_AIR)) == MOVESTATE_8000000) {
         PlayerCB_80273D0(p);
-    } else if ((p->moveState & (MOVESTATE_800 | MOVESTATE_8 | MOVESTATE_IN_AIR))
-               == MOVESTATE_800) {
+    } else if ((p->moveState & (MOVESTATE_800 | MOVESTATE_8 | MOVESTATE_IN_AIR)) == MOVESTATE_800) {
         Player_InitIceSlide(p);
-    } else if (!sub_802A0C8(p) && !sub_802A0FC(p) && !sub_8029E6C(p)
-               && !sub_802A2A8(p)) {
+    } else if (!sub_802A0C8(p) && !sub_802A0FC(p) && !sub_8029E6C(p) && !sub_802A2A8(p)) {
         sub_802966C(p);
 
         if (((p->rotation + Q(0.375)) & 0xFF) < 0xC0) {
@@ -3992,8 +3941,7 @@ void PlayerCB_Idle(Player *p)
 
 void PlayerCB_8025548(Player *p)
 {
-    if (!sub_802A0FC(p) && !sub_8029E6C(p)
-        && ((gGameMode == GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) || !sub_802A2A8(p))) {
+    if (!sub_802A0FC(p) && !sub_8029E6C(p) && ((gGameMode == GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) || !sub_802A2A8(p))) {
         if (p->unk90->s.frameFlags & SPRITE_FLAG_MASK_ANIM_OVER) {
             PLAYERFN_SET(PlayerCB_8025318);
         }
@@ -4036,8 +3984,7 @@ void PlayerCB_802569C(Player *p)
             PLAYERFN_SET(PlayerCB_8025318);
         }
 
-        if ((characterAnim == SA2_CHAR_ANIM_TAUNT) && (p->variant == 1)
-            && (s->frameFlags & 0x4000)) {
+        if ((characterAnim == SA2_CHAR_ANIM_TAUNT) && (p->variant == 1) && (s->frameFlags & 0x4000)) {
             PLAYERFN_SET(PlayerCB_8025318);
         }
 
@@ -4079,8 +4026,7 @@ void PlayerCB_8025854(Player *p)
             PLAYERFN_SET(PlayerCB_8025318);
         }
 
-        if ((characterAnim == SA2_CHAR_ANIM_CROUCH) && (p->variant == 1)
-            && (s->frameFlags & 0x4000)) {
+        if ((characterAnim == SA2_CHAR_ANIM_CROUCH) && (p->variant == 1) && (s->frameFlags & 0x4000)) {
             PLAYERFN_SET(PlayerCB_8025318);
         }
 
@@ -4115,8 +4061,7 @@ void PlayerCB_8025A0C(Player *p)
         }
     }
 
-    if ((p->moveState & (MOVESTATE_800 | MOVESTATE_8 | MOVESTATE_IN_AIR))
-        == MOVESTATE_800) {
+    if ((p->moveState & (MOVESTATE_800 | MOVESTATE_8 | MOVESTATE_IN_AIR)) == MOVESTATE_800) {
         Player_InitIceSlide(p);
     } else {
         p->unk90->s.frameFlags &= ~SPRITE_FLAG_MASK_ANIM_OVER;
@@ -4132,11 +4077,9 @@ void PlayerCB_8025A0C(Player *p)
 
 void PlayerCB_8025AB8(Player *p)
 {
-    if ((p->moveState & (MOVESTATE_8000000 | MOVESTATE_8 | MOVESTATE_IN_AIR))
-        == MOVESTATE_8000000) {
+    if ((p->moveState & (MOVESTATE_8000000 | MOVESTATE_8 | MOVESTATE_IN_AIR)) == MOVESTATE_8000000) {
         PlayerCB_80273D0(p);
-    } else if ((p->moveState & (MOVESTATE_800 | MOVESTATE_8 | MOVESTATE_IN_AIR))
-               == MOVESTATE_800) {
+    } else if ((p->moveState & (MOVESTATE_800 | MOVESTATE_8 | MOVESTATE_IN_AIR)) == MOVESTATE_800) {
         Player_InitIceSlide(p);
     } else {
         if (p->unk99[0] != 0) {
@@ -4252,8 +4195,7 @@ void PlayerCB_Jump(Player *p)
 
     p->unk70 = 1;
 
-    jumpHeight = (p->moveState & MOVESTATE_40) ? Q(PLAYER_JUMP_HEIGHT_UNDER_WATER)
-                                               : Q(PLAYER_JUMP_HEIGHT);
+    jumpHeight = (p->moveState & MOVESTATE_40) ? Q(PLAYER_JUMP_HEIGHT_UNDER_WATER) : Q(PLAYER_JUMP_HEIGHT);
 
     rot = p->rotation - 64;
 
@@ -4320,8 +4262,8 @@ void PlayerCB_8025F84(Player *p)
     if ((p->unk16 < 6) || (p->unk17 < 9)) {
         u16 chAnim = GET_CHARACTER_ANIM(p);
 
-        if ((chAnim == SA2_CHAR_ANIM_SPIN_ATTACK) || (chAnim == SA2_CHAR_ANIM_JUMP_1)
-            || (chAnim == SA2_CHAR_ANIM_JUMP_2) || (chAnim == SA2_CHAR_ANIM_70)) {
+        if ((chAnim == SA2_CHAR_ANIM_SPIN_ATTACK) || (chAnim == SA2_CHAR_ANIM_JUMP_1) || (chAnim == SA2_CHAR_ANIM_JUMP_2)
+            || (chAnim == SA2_CHAR_ANIM_70)) {
             PLAYERFN_CHANGE_SHIFT_OFFSETS(p, 6, 9);
         } else {
             PLAYERFN_CHANGE_SHIFT_OFFSETS(p, 6, 14);
@@ -4352,8 +4294,8 @@ void PlayerCB_8026060(Player *p)
     if ((p->unk16 < 6) || (p->unk17 < 9)) {
         u16 chAnim = GET_CHARACTER_ANIM(p);
 
-        if ((chAnim == SA2_CHAR_ANIM_SPIN_ATTACK) || (chAnim == SA2_CHAR_ANIM_JUMP_1)
-            || (chAnim == SA2_CHAR_ANIM_JUMP_2) || (chAnim == SA2_CHAR_ANIM_70)) {
+        if ((chAnim == SA2_CHAR_ANIM_SPIN_ATTACK) || (chAnim == SA2_CHAR_ANIM_JUMP_1) || (chAnim == SA2_CHAR_ANIM_JUMP_2)
+            || (chAnim == SA2_CHAR_ANIM_70)) {
             PLAYERFN_CHANGE_SHIFT_OFFSETS(p, 6, 9);
         } else {
             PLAYERFN_CHANGE_SHIFT_OFFSETS(p, 6, 14);
@@ -4380,8 +4322,8 @@ void PlayerCB_802611C(Player *p)
     if ((p->unk16 < 6) || (p->unk17 < 9)) {
         u16 chAnim = GET_CHARACTER_ANIM(p);
 
-        if ((chAnim == SA2_CHAR_ANIM_SPIN_ATTACK) || (chAnim == SA2_CHAR_ANIM_JUMP_1)
-            || (chAnim == SA2_CHAR_ANIM_JUMP_2) || (chAnim == SA2_CHAR_ANIM_70)) {
+        if ((chAnim == SA2_CHAR_ANIM_SPIN_ATTACK) || (chAnim == SA2_CHAR_ANIM_JUMP_1) || (chAnim == SA2_CHAR_ANIM_JUMP_2)
+            || (chAnim == SA2_CHAR_ANIM_70)) {
             PLAYERFN_CHANGE_SHIFT_OFFSETS(p, 6, 9);
         } else {
             PLAYERFN_CHANGE_SHIFT_OFFSETS(p, 6, 14);
@@ -4405,8 +4347,7 @@ void PlayerCB_80261D8(Player *p)
     if ((p->unk6E != 1) || (p->speedAirY > 0)) {
         sub_8023610(p);
 
-        if ((gGameMode != GAME_MODE_MULTI_PLAYER_COLLECT_RINGS)
-            && (p->moveState & MOVESTATE_100)) {
+        if ((gGameMode != GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) && (p->moveState & MOVESTATE_100)) {
             if (sub_801251C(p) || sub_80294F4(p))
                 return;
         }
@@ -4493,8 +4434,7 @@ void PlayerCB_Spindash(Player *p)
         }
         p->spindashAccel = pitch;
 
-        if ((cAnim == SA2_CHAR_ANIM_SPIN_DASH) && (p->variant == 1)
-            && (s->frameFlags & SPRITE_FLAG_MASK_ANIM_OVER)) {
+        if ((cAnim == SA2_CHAR_ANIM_SPIN_DASH) && (p->variant == 1) && (s->frameFlags & SPRITE_FLAG_MASK_ANIM_OVER)) {
             p->variant = 0;
         }
     }
@@ -4724,8 +4664,7 @@ void PlayerCB_8026A4C(Player *p)
 
     PLAYERFN_CHANGE_SHIFT_OFFSETS(p, 6, 14);
 
-    if ((gGameMode != GAME_MODE_MULTI_PLAYER_COLLECT_RINGS)
-        && (p->unk5C & gPlayerControls.jump)
+    if ((gGameMode != GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) && (p->unk5C & gPlayerControls.jump)
         && (p->character == CHARACTER_SONIC || p->character == CHARACTER_AMY)) {
         p->unk64 = 42;
         p->speedAirY = -Q(7.5);
@@ -4883,8 +4822,7 @@ void PlayerCB_8026E24(Player *p)
 
 void PlayerCB_8026F10(Player *p)
 {
-    if ((p->moveState & (MOVESTATE_800 | MOVESTATE_8 | MOVESTATE_IN_AIR))
-        == MOVESTATE_800) {
+    if ((p->moveState & (MOVESTATE_800 | MOVESTATE_8 | MOVESTATE_IN_AIR)) == MOVESTATE_800) {
         Player_InitIceSlide_inline(p);
     } else {
         //_08026F74
@@ -5062,8 +5000,7 @@ void PlayerCB_80273D0(Player *p)
         if (gGameMode == GAME_MODE_TIME_ATTACK)
             gSpecialRingCount = SPECIAL_STAGE_REQUIRED_SP_RING_COUNT;
 
-        if ((gPlayer.moveState & MOVESTATE_8000000)
-            && (gSpecialRingCount >= SPECIAL_STAGE_REQUIRED_SP_RING_COUNT)) {
+        if ((gPlayer.moveState & MOVESTATE_8000000) && (gSpecialRingCount >= SPECIAL_STAGE_REQUIRED_SP_RING_COUNT)) {
             sub_802A40C(p);
         } else {
             Player_TransitionCancelFlyingAndBoost(p);
@@ -5634,8 +5571,7 @@ void PlayerCB_802890C(Player *p)
     PLAYERFN_UPDATE_ROTATION(p);
     PLAYERFN_MAYBE_TRANSITION_TO_GROUND(p);
 
-    if (!(p->moveState & MOVESTATE_IN_AIR) && (p->character == CHARACTER_KNUCKLES)
-        && (p->unk5B == 2)) {
+    if (!(p->moveState & MOVESTATE_IN_AIR) && (p->character == CHARACTER_KNUCKLES) && (p->unk5B == 2)) {
         p->variant++;
         PLAYERFN_SET(PlayerCB_802A3C4);
     }
@@ -5643,8 +5579,7 @@ void PlayerCB_802890C(Player *p)
 
 void DoTrickIfButtonPressed(Player *p)
 {
-    if ((gGameMode != GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) && (p->unk36 == 0)
-        && (p->unk5E & gPlayerControls.trick)) {
+    if ((gGameMode != GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) && (p->unk36 == 0) && (p->unk5E & gPlayerControls.trick)) {
 
         if (p->unk5C & DPAD_UP) {
             INCREMENT_SCORE(sTrickPoints[0]);
@@ -5675,8 +5610,7 @@ void DoTrickIfButtonPressed(Player *p)
                 } break;
             }
         } else if ((!(p->moveState & MOVESTATE_FACING_LEFT) && (p->unk5C & DPAD_RIGHT))
-                   || ((p->moveState & MOVESTATE_FACING_LEFT)
-                       && (p->unk5C & DPAD_LEFT))) {
+                   || ((p->moveState & MOVESTATE_FACING_LEFT) && (p->unk5C & DPAD_LEFT))) {
             INCREMENT_SCORE(sTrickPoints[2]);
             p->unk5B = TRICK_DIR_FORWARD;
 
@@ -5700,8 +5634,8 @@ void PlayerCB_8028D74(Player *p)
     if ((p->unk16 < 6) || (p->unk17 < 9)) {
         u16 cAnim = GET_CHARACTER_ANIM(p);
 
-        if ((cAnim == SA2_CHAR_ANIM_SPIN_ATTACK) || (cAnim == SA2_CHAR_ANIM_JUMP_1)
-            || (cAnim == SA2_CHAR_ANIM_JUMP_2) || (cAnim == SA2_CHAR_ANIM_70)) {
+        if ((cAnim == SA2_CHAR_ANIM_SPIN_ATTACK) || (cAnim == SA2_CHAR_ANIM_JUMP_1) || (cAnim == SA2_CHAR_ANIM_JUMP_2)
+            || (cAnim == SA2_CHAR_ANIM_70)) {
             PLAYERFN_CHANGE_SHIFT_OFFSETS(p, 6, 9);
         } else {
             PLAYERFN_CHANGE_SHIFT_OFFSETS(p, 6, 14);
@@ -5731,8 +5665,7 @@ void PlayerCB_TouchNormalSpring(Player *p)
     p->moveState &= ~(MOVESTATE_1000000 | MOVESTATE_20);
     PLAYERFN_CHANGE_SHIFT_OFFSETS(p, 6, 14);
 
-    if ((gCurrentLevel == LEVEL_INDEX(ZONE_3, ACT_1))
-        || (gCurrentLevel == LEVEL_INDEX(ZONE_3, ACT_2))) {
+    if ((gCurrentLevel == LEVEL_INDEX(ZONE_3, ACT_1)) || (gCurrentLevel == LEVEL_INDEX(ZONE_3, ACT_2))) {
         p->unk64 = 37;
     } else if (ABS(p->speedAirX) < Q(2.5)) {
         p->unk64 = 38;
@@ -5790,8 +5723,7 @@ void PlayerCB_TouchNormalSpring(Player *p)
 
     p->unk36 = gUnknown_080D69C2[r6];
 
-    if ((gCurrentLevel == LEVEL_INDEX(ZONE_3, ACT_1))
-        || (gCurrentLevel == LEVEL_INDEX(ZONE_3, ACT_2))) {
+    if ((gCurrentLevel == LEVEL_INDEX(ZONE_3, ACT_1)) || (gCurrentLevel == LEVEL_INDEX(ZONE_3, ACT_2))) {
         {
             s32 speed = (p->speedAirX * 5);
             if (speed < 0) {
@@ -6000,8 +5932,7 @@ bool32 sub_80294F4(Player *p)
         if (p->unk5E & gPlayerControls.jump) {
             switch (p->character) {
                 case CHARACTER_SONIC: {
-                    if (!IS_BOSS_STAGE(gCurrentLevel)
-                        && gHomingTarget.squarePlayerDistance < 0x4000) {
+                    if (!IS_BOSS_STAGE(gCurrentLevel) && gHomingTarget.squarePlayerDistance < 0x4000) {
                         sub_8012194(p);
                         return TRUE;
                     } else {
@@ -6125,8 +6056,7 @@ void sub_802966C(Player *p)
                 } else {
                     p->speedGroundX += u4C;
 
-                    if ((p->speedGroundX < 0)
-                        && (p->moveState & MOVESTATE_FACING_LEFT)) {
+                    if ((p->speedGroundX < 0) && (p->moveState & MOVESTATE_FACING_LEFT)) {
                         if ((p->unk64 == 7) || (p->unk64 == 8)) {
                             r6 = 7;
                         }
@@ -6135,8 +6065,7 @@ void sub_802966C(Player *p)
                 }
             }
         } else {
-            if ((p->moveState & MOVESTATE_FACING_LEFT)
-                != ((p->unk5C & DPAD_RIGHT) >> 4)) {
+            if ((p->moveState & MOVESTATE_FACING_LEFT) != ((p->unk5C & DPAD_RIGHT) >> 4)) {
                 if (p->moveState & MOVESTATE_FACING_LEFT) {
                     p->speedGroundX -= u48;
                 } else {
@@ -6221,8 +6150,7 @@ void sub_80298DC(Player *p)
             }
         }
     } else {
-        if ((!(p->moveState & MOVESTATE_IN_AIR))
-            && ((ABS(p->speedGroundX) >= p->unk44))) {
+        if ((!(p->moveState & MOVESTATE_IN_AIR)) && ((ABS(p->speedGroundX) >= p->unk44))) {
             if (p->unk58 >= gUnknown_080D6916[p->unk52]) {
                 p->unk5A = TRUE;
                 gCamera.unk8 = 0x400;
@@ -6256,10 +6184,7 @@ void sub_8029990(Player *p)
     }
 }
 
-void CallSetStageSpawnPos(u32 character, u32 level, u32 p2, Player *p)
-{
-    SetStageSpawnPos(character, level, p2, p);
-}
+void CallSetStageSpawnPos(u32 character, u32 level, u32 p2, Player *p) { SetStageSpawnPos(character, level, p2, p); }
 
 void sub_80299FC(Player *p)
 {
@@ -6623,21 +6548,14 @@ void sub_8029FA4(Player *p)
     }
 }
 
-void Player_SetMovestate_IsInScriptedSequence(void)
-{
-    gPlayer.moveState |= MOVESTATE_IN_SCRIPTED;
-}
+void Player_SetMovestate_IsInScriptedSequence(void) { gPlayer.moveState |= MOVESTATE_IN_SCRIPTED; }
 
-void Player_ClearMovestate_IsInScriptedSequence(void)
-{
-    gPlayer.moveState &= ~MOVESTATE_IN_SCRIPTED;
-}
+void Player_ClearMovestate_IsInScriptedSequence(void) { gPlayer.moveState &= ~MOVESTATE_IN_SCRIPTED; }
 
 void Player_DisableInputAndBossTimer(void)
 {
     gPlayer.transition = PLTRANS_PT10;
-    gStageFlags
-        |= (STAGE_FLAG__DISABLE_PAUSE_MENU | STAGE_FLAG__2 | STAGE_FLAG__ACT_START);
+    gStageFlags |= (STAGE_FLAG__DISABLE_PAUSE_MENU | STAGE_FLAG__2 | STAGE_FLAG__ACT_START);
 
     if (gGameMode == GAME_MODE_BOSS_TIME_ATTACK) {
         gStageFlags |= STAGE_FLAG__TURN_OFF_TIMER;
@@ -6646,8 +6564,7 @@ void Player_DisableInputAndBossTimer(void)
 
 void Player_DisableInputAndBossTimer_FinalBoss(void)
 {
-    gStageFlags
-        |= (STAGE_FLAG__DISABLE_PAUSE_MENU | STAGE_FLAG__2 | STAGE_FLAG__ACT_START);
+    gStageFlags |= (STAGE_FLAG__DISABLE_PAUSE_MENU | STAGE_FLAG__2 | STAGE_FLAG__ACT_START);
 
     if (gGameMode == GAME_MODE_BOSS_TIME_ATTACK) {
         gStageFlags |= STAGE_FLAG__TURN_OFF_TIMER;
@@ -6685,8 +6602,7 @@ bool32 sub_802A0FC(Player *p)
             PLAYERFN_SET(PlayerCB_802A228);
             return TRUE;
         } else if (((u16)(p->speedGroundX + (Q(0.5) - 1)) > Q(1.0) - 2)
-                   && !(p->moveState
-                        & (MOVESTATE_1000000 | MOVESTATE_4 | MOVESTATE_IN_AIR))) {
+                   && !(p->moveState & (MOVESTATE_1000000 | MOVESTATE_4 | MOVESTATE_IN_AIR))) {
             PLAYERFN_SET(PlayerCB_8025A0C);
             m4aSongNumStart(SE_SPIN_ATTACK);
             return TRUE;
@@ -6753,8 +6669,7 @@ void PlayerCB_802A258(Player *p)
 
 bool32 sub_802A2A8(Player *p)
 {
-    if ((gGameMode == GAME_MODE_MULTI_PLAYER_COLLECT_RINGS)
-        || (p->moveState & (MOVESTATE_8000 | MOVESTATE_400))
+    if ((gGameMode == GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) || (p->moveState & (MOVESTATE_8000 | MOVESTATE_400))
         || ((p->rotation + Q(0.25)) << 24 <= 0)) {
         return FALSE;
     } else if (p->unk5E & gPlayerControls.attack) {
diff --git a/src/game/stage/player_super_sonic.c b/src/game/stage/player_super_sonic.c
index cd950815c..8828d81e7 100644
--- a/src/game/stage/player_super_sonic.c
+++ b/src/game/stage/player_super_sonic.c
@@ -42,28 +42,17 @@ static void sub_802C988(struct SuperSonic *sonic);
 struct Task *sSuperSonicTask = NULL;
 
 const TileInfo gAnims_SuperSonic_080D69C8[23] = {
-    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 2 },
-    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 1 },
-    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 3 },
-    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 0 },
-    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 4 },
-    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 5 },
-    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 12 },
-    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 13 },
-    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 16 },
-    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 17 },
-    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 8 },
-    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 9 },
-    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 10 },
-    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 11 },
-    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 6 },
-    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 7 },
-    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 14 },
-    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 15 },
-    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 18 },
-    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 19 },
-    { 0, SA2_ANIM_SUPER_SONIC_FROZEN, 0 },
-    { 0, SA2_ANIM_CHAR(SA2_CHAR_ANIM_29, CHARACTER_SONIC), 0 },
+    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 2 },  { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 1 },
+    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 3 },  { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 0 },
+    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 4 },  { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 5 },
+    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 12 }, { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 13 },
+    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 16 }, { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 17 },
+    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 8 },  { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 9 },
+    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 10 }, { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 11 },
+    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 6 },  { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 7 },
+    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 14 }, { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 15 },
+    { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 18 }, { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 19 },
+    { 0, SA2_ANIM_SUPER_SONIC_FROZEN, 0 },           { 0, SA2_ANIM_CHAR(SA2_CHAR_ANIM_29, CHARACTER_SONIC), 0 },
     { 0, SA2_ANIM_SUPER_SONIC_STOPPING_ROCKET, 2 },
 };
 
@@ -353,8 +342,7 @@ static void Task_802BC10(void)
 }
 
 // (99.25%) https://decomp.me/scratch/2dbbE
-NONMATCH("asm/non_matching/game/super_sonic__sub_802BCCC.inc",
-         static void sub_802BCCC(struct SuperSonic *sonic))
+NONMATCH("asm/non_matching/game/super_sonic__sub_802BCCC.inc", static void sub_802BCCC(struct SuperSonic *sonic))
 {
     s32 ssx, ssx2;
     u8 i;
@@ -425,8 +413,7 @@ static void sub_802BE1C(struct SuperSonic *sonic)
         return;
     }
 
-    if (((sonic->flags & (SUPER_FLAG__80 | SUPER_FLAG__2)) == SUPER_FLAG__80)
-        && (gStageTime & 0x4)) {
+    if (((sonic->flags & (SUPER_FLAG__80 | SUPER_FLAG__2)) == SUPER_FLAG__80) && (gStageTime & 0x4)) {
         return;
     }
     if ((sonic->flags & SUPER_FLAG__4) && ((gStageTime & 0x4) != 0)) {
@@ -442,8 +429,8 @@ static void sub_802BE1C(struct SuperSonic *sonic)
     prio = (sonic->flags & SUPER_FLAG__200) ? 3 : 0;
 
     if (sonic->flags & 0x4) {
-        spr->frameFlags = SPRITE_FLAG(PRIORITY, prio) | gUnknown_030054B8++
-            | SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE;
+        spr->frameFlags = SPRITE_FLAG(PRIORITY, prio) | gUnknown_030054B8++ | SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE
+            | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE;
     } else {
         spr->frameFlags = SPRITE_FLAG(PRIORITY, prio) | SPRITE_FLAG_MASK_X_FLIP;
     }
@@ -605,8 +592,7 @@ static void sub_802C358(struct SuperSonic *sonic)
     }
 
     if (sonic->unkC == 8) {
-        sonic->spr.graphics.anim
-            = gAnims_SuperSonic_080D69C8[sonic->tileInfoId + 1].anim;
+        sonic->spr.graphics.anim = gAnims_SuperSonic_080D69C8[sonic->tileInfoId + 1].anim;
         sonic->spr.variant = gAnims_SuperSonic_080D69C8[sonic->tileInfoId + 1].variant;
         sonic->spr.prevVariant = -1;
         sonic->flags &= ~SUPER_FLAG__80;
diff --git a/src/game/stage/results.c b/src/game/stage/results.c
index 6901d8322..147da36aa 100644
--- a/src/game/stage/results.c
+++ b/src/game/stage/results.c
@@ -53,16 +53,11 @@ const u16 sStageResultsHeadlineTexts[5][3] = {
 };
 
 const u16 sAnimsGotThroughZoneAndActNames[11][3] = {
-    { 14, SA2_ANIM_STAGE, SA2_ANIM_VARIANT_STAGE_ACT_1 },
-    { 14, SA2_ANIM_STAGE, SA2_ANIM_VARIANT_STAGE_ACT_2 },
-    { 18, SA2_ANIM_STAGE, SA2_ANIM_VARIANT_STAGE_ZONE(ZONE_1) },
-    { 18, SA2_ANIM_STAGE, SA2_ANIM_VARIANT_STAGE_ZONE(ZONE_2) },
-    { 18, SA2_ANIM_STAGE, SA2_ANIM_VARIANT_STAGE_ZONE(ZONE_3) },
-    { 18, SA2_ANIM_STAGE, SA2_ANIM_VARIANT_STAGE_ZONE(ZONE_4) },
-    { 18, SA2_ANIM_STAGE, SA2_ANIM_VARIANT_STAGE_ZONE(ZONE_5) },
-    { 18, SA2_ANIM_STAGE, SA2_ANIM_VARIANT_STAGE_ZONE(ZONE_6) },
-    { 18, SA2_ANIM_STAGE, SA2_ANIM_VARIANT_STAGE_ZONE(ZONE_7) },
-    { 16, SA2_ANIM_STAGE, SA2_ANIM_VARIANT_STAGE_FINAL },
+    { 14, SA2_ANIM_STAGE, SA2_ANIM_VARIANT_STAGE_ACT_1 },        { 14, SA2_ANIM_STAGE, SA2_ANIM_VARIANT_STAGE_ACT_2 },
+    { 18, SA2_ANIM_STAGE, SA2_ANIM_VARIANT_STAGE_ZONE(ZONE_1) }, { 18, SA2_ANIM_STAGE, SA2_ANIM_VARIANT_STAGE_ZONE(ZONE_2) },
+    { 18, SA2_ANIM_STAGE, SA2_ANIM_VARIANT_STAGE_ZONE(ZONE_3) }, { 18, SA2_ANIM_STAGE, SA2_ANIM_VARIANT_STAGE_ZONE(ZONE_4) },
+    { 18, SA2_ANIM_STAGE, SA2_ANIM_VARIANT_STAGE_ZONE(ZONE_5) }, { 18, SA2_ANIM_STAGE, SA2_ANIM_VARIANT_STAGE_ZONE(ZONE_6) },
+    { 18, SA2_ANIM_STAGE, SA2_ANIM_VARIANT_STAGE_ZONE(ZONE_7) }, { 16, SA2_ANIM_STAGE, SA2_ANIM_VARIANT_STAGE_FINAL },
     { 16, SA2_ANIM_STAGE, SA2_ANIM_VARIANT_STAGE_EXTRA },
 };
 
@@ -96,8 +91,7 @@ u16 CreateStageResults(u32 courseTime, u16 ringCount, u8 spRingCount)
 
     gLoadedSaveGame->score += (s16)gRingCount;
 
-    t = TaskCreate(Task_UpdateStageResults, sizeof(StageResults), 0xC100, 0,
-                   TaskDestructor_StageResults);
+    t = TaskCreate(Task_UpdateStageResults, sizeof(StageResults), 0xC100, 0, TaskDestructor_StageResults);
     outro = TASK_DATA(t);
     outro->counter = zero;
     outro->isCountingDone = zero;
@@ -109,8 +103,7 @@ u16 CreateStageResults(u32 courseTime, u16 ringCount, u8 spRingCount)
     outro->fade.bldCnt = 0x3FFF;
     outro->fade.bldAlpha = zero;
 
-    if ((gPlayer.moveState & MOVESTATE_8000000)
-        && (gSpecialRingCount >= SPECIAL_STAGE_REQUIRED_SP_RING_COUNT)) {
+    if ((gPlayer.moveState & MOVESTATE_8000000) && (gSpecialRingCount >= SPECIAL_STAGE_REQUIRED_SP_RING_COUNT)) {
         outro->fade.speed = Q(0.25);
         outro->fade.bldCnt = 0x3FBF;
     } else if (IS_FINAL_OR_EXTRA_STAGE(gCurrentLevel)) {
@@ -310,9 +303,8 @@ void Task_UpdateStageResults(void)
     outro->counter = counter;
 
     if (IS_EXTRA_STAGE(gCurrentLevel)) {
-        gBldRegs.bldCnt
-            = (BLDCNT_TGT2_ALL | BLDCNT_EFFECT_LIGHTEN | BLDCNT_TGT1_BD | BLDCNT_TGT1_BG0
-               | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3);
+        gBldRegs.bldCnt = (BLDCNT_TGT2_ALL | BLDCNT_EFFECT_LIGHTEN | BLDCNT_TGT1_BD | BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2
+                           | BLDCNT_TGT1_BG3);
     }
 
     if (counter >= 150) {
@@ -350,8 +342,7 @@ void Task_UpdateStageResults(void)
         }
 
         if ((gStageTime % 4u) == 0) {
-            if ((outro->ringBonusScore != 0) || (outro->spRingBonusScore != 0)
-                || (outro->timeBonusScore != 0)) {
+            if ((outro->ringBonusScore != 0) || (outro->spRingBonusScore != 0) || (outro->timeBonusScore != 0)) {
                 m4aSongNumStart(SE_STAGE_RESULT_COUNTER);
             } else if (!outro->isCountingDone) {
                 outro->isCountingDone = TRUE;
@@ -363,8 +354,7 @@ void Task_UpdateStageResults(void)
     if (counter > outro->unk16C + 309) {
         if (IS_FINAL_STAGE(gCurrentLevel)) {
             if ((gMPlayInfo_BGM.status & 0xFFFF) == 0) {
-                gLoadedSaveGame->unlockedLevels[gSelectedCharacter]
-                    = LEVEL_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53);
+                gLoadedSaveGame->unlockedLevels[gSelectedCharacter] = LEVEL_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53);
                 WriteSaveGame();
 
                 TasksDestroyAll();
@@ -412,61 +402,45 @@ void Task_UpdateStageResults(void)
 
                     gCurrentLevel++;
 
-                    if (gCurrentLevel
-                        > gLoadedSaveGame->unlockedLevels[gSelectedCharacter]) {
-                        gLoadedSaveGame->unlockedLevels[gSelectedCharacter]
-                            = gCurrentLevel;
+                    if (gCurrentLevel > gLoadedSaveGame->unlockedLevels[gSelectedCharacter]) {
+                        gLoadedSaveGame->unlockedLevels[gSelectedCharacter] = gCurrentLevel;
 
                         if (gSelectedCharacter == CHARACTER_SONIC) {
                             switch (LEVEL_TO_ZONE(gCurrentLevel - 1)) {
                                 case ZONE_1: {
-                                    gLoadedSaveGame->unlockedCharacters
-                                        |= CHARACTER_BIT(CHARACTER_CREAM);
+                                    gLoadedSaveGame->unlockedCharacters |= CHARACTER_BIT(CHARACTER_CREAM);
                                     CreateCharacterUnlockCutScene(0);
                                 } break;
 
                                 case ZONE_3: {
-                                    gLoadedSaveGame->unlockedCharacters
-                                        |= CHARACTER_BIT(CHARACTER_TAILS);
+                                    gLoadedSaveGame->unlockedCharacters |= CHARACTER_BIT(CHARACTER_TAILS);
                                     CreateCharacterUnlockCutScene(2);
                                 } break;
 
                                 case ZONE_5: {
-                                    gLoadedSaveGame->unlockedCharacters
-                                        |= CHARACTER_BIT(CHARACTER_KNUCKLES);
+                                    gLoadedSaveGame->unlockedCharacters |= CHARACTER_BIT(CHARACTER_KNUCKLES);
                                     CreateCharacterUnlockCutScene(1);
                                 } break;
 
                                 default: {
-                                    CreateCourseSelectionScreen(
-                                        gCurrentLevel,
-                                        gLoadedSaveGame
-                                            ->unlockedLevels[gSelectedCharacter],
-                                        1);
+                                    CreateCourseSelectionScreen(gCurrentLevel, gLoadedSaveGame->unlockedLevels[gSelectedCharacter], 1);
                                 }
                             }
                         } else {
-                            CreateCourseSelectionScreen(
-                                gCurrentLevel,
-                                gLoadedSaveGame->unlockedLevels[gSelectedCharacter], 1);
+                            CreateCourseSelectionScreen(gCurrentLevel, gLoadedSaveGame->unlockedLevels[gSelectedCharacter], 1);
                         }
                     } else {
-                        CreateCourseSelectionScreen(
-                            gCurrentLevel,
-                            gLoadedSaveGame->unlockedLevels[gSelectedCharacter], 4);
+                        CreateCourseSelectionScreen(gCurrentLevel, gLoadedSaveGame->unlockedLevels[gSelectedCharacter], 4);
                     }
                     WriteSaveGame();
                     return;
                 } else {
                     gCurrentLevel++;
-                    if (gCurrentLevel
-                        > gLoadedSaveGame->unlockedLevels[gSelectedCharacter]) {
-                        gLoadedSaveGame->unlockedLevels[gSelectedCharacter]
-                            = gCurrentLevel;
+                    if (gCurrentLevel > gLoadedSaveGame->unlockedLevels[gSelectedCharacter]) {
+                        gLoadedSaveGame->unlockedLevels[gSelectedCharacter] = gCurrentLevel;
                     }
 
-                    if ((gPlayer.moveState & MOVESTATE_8000000)
-                        && (gSpecialRingCount >= SPECIAL_STAGE_REQUIRED_SP_RING_COUNT)) {
+                    if ((gPlayer.moveState & MOVESTATE_8000000) && (gSpecialRingCount >= SPECIAL_STAGE_REQUIRED_SP_RING_COUNT)) {
                         TasksDestroyAll();
 
                         { // TODO: This is a macro!
@@ -481,11 +455,9 @@ void Task_UpdateStageResults(void)
                         gWinRegs[WINREG_WIN0H] = WIN_RANGE(0, DISPLAY_WIDTH);
                         gWinRegs[WINREG_WIN0V] = WIN_RANGE(0, DISPLAY_HEIGHT);
                         gWinRegs[WINREG_WININ] |= WININ_WIN0_ALL;
-                        gWinRegs[WINREG_WINOUT]
-                            |= (WINOUT_WIN01_ALL & ~WINOUT_WIN01_CLR);
+                        gWinRegs[WINREG_WINOUT] |= (WINOUT_WIN01_ALL & ~WINOUT_WIN01_CLR);
 
-                        gBldRegs.bldCnt = (BLDCNT_EFFECT_LIGHTEN | BLDCNT_TGT1_ALL
-                                           | BLDCNT_TGT2_ALL);
+                        gBldRegs.bldCnt = (BLDCNT_EFFECT_LIGHTEN | BLDCNT_TGT1_ALL | BLDCNT_TGT2_ALL);
                         gBldRegs.bldY = 0x10;
 
                         WriteSaveGame();
@@ -508,8 +480,7 @@ void Task_UpdateStageResults(void)
             }
         }
 
-        if ((gPlayer.moveState & MOVESTATE_8000000)
-            && gSpecialRingCount >= SPECIAL_STAGE_REQUIRED_SP_RING_COUNT) {
+        if ((gPlayer.moveState & MOVESTATE_8000000) && gSpecialRingCount >= SPECIAL_STAGE_REQUIRED_SP_RING_COUNT) {
             DestroyStageResultsGfx();
             gPlayer.moveState |= MOVESTATE_4000000;
             return;
@@ -604,8 +575,7 @@ void sub_8031138(u16 p0)
         {
             s16 r4_2 = r4;
             s16 pp = p0;
-            StageUI_PrintIntegerAt(outro->timeBonusScore, r4_2 + 144 - pp,
-                                   OUTRO_TIME_BONUS_Y_POS, 0);
+            StageUI_PrintIntegerAt(outro->timeBonusScore, r4_2 + 144 - pp, OUTRO_TIME_BONUS_Y_POS, 0);
         }
     }
 
@@ -624,14 +594,11 @@ void sub_8031138(u16 p0)
         {
             s16 r4_2 = r4;
             s16 pp = p0;
-            StageUI_PrintIntegerAt(outro->ringBonusScore, r4_2 + 144 - pp,
-                                   OUTRO_RING_BONUS_Y_POS, 0);
+            StageUI_PrintIntegerAt(outro->ringBonusScore, r4_2 + 144 - pp, OUTRO_RING_BONUS_Y_POS, 0);
         }
     }
 
-    if ((ACT_INDEX(gCurrentLevel) != ACT_BOSS)
-        && (gCurrentLevel < LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE))
-        && (counter >= 59)) {
+    if ((ACT_INDEX(gCurrentLevel) != ACT_BOSS) && (gCurrentLevel < LEVEL_INDEX(ZONE_FINAL, ACT_XX_FINAL_ZONE)) && (counter >= 59)) {
         s = &outro->sprScores[2];
 
         if (counter <= 75) {
@@ -647,8 +614,7 @@ void sub_8031138(u16 p0)
         {
             s16 r4_2 = r4;
             s16 pp = p0;
-            StageUI_PrintIntegerAt(outro->spRingBonusScore, r4_2 + 144 - pp,
-                                   OUTRO_SP_RING_BONUS_Y_POS, 0);
+            StageUI_PrintIntegerAt(outro->spRingBonusScore, r4_2 + 144 - pp, OUTRO_SP_RING_BONUS_Y_POS, 0);
         }
     }
 }
diff --git a/src/game/stage/rings_scatter.c b/src/game/stage/rings_scatter.c
index 6f9983dac..30511dcf3 100644
--- a/src/game/stage/rings_scatter.c
+++ b/src/game/stage/rings_scatter.c
@@ -97,8 +97,7 @@ void InitPlayerHitRingsScatter(void)
     s->prevVariant = -1;
     s->animSpeed = SPRITE_ANIM_SPEED(2.0);
     s->palId = 0;
-    s->frameFlags
-        = (SPRITE_FLAG(PRIORITY, 2) | SPRITE_FLAG_MASK_18 | SPRITE_FLAG_MASK_MOSAIC);
+    s->frameFlags = (SPRITE_FLAG(PRIORITY, 2) | SPRITE_FLAG_MASK_18 | SPRITE_FLAG_MASK_MOSAIC);
     rs->unk2B6 = 0;
     rs->unk2B4 = 0x94;
     rs->unk2B0 = 0x12;
@@ -258,16 +257,11 @@ NONMATCH("asm/non_matching/game/stage/rings_scatter/RingsScatterSingleplayer_Fli
 #else
         hb = &p->unk90->s.hitboxes[0];
 #endif
-        if ((ring->unkC <= sp0C)
-            && ((p->unk64 != SA2_CHAR_ANIM_20) || (p->timerInvulnerability == 0))
-            && (IS_ALIVE(p))
-            && ((((ringIntX - TILE_WIDTH) > HB_LEFT(p, hb))
-                 && (HB_RIGHT(p, hb) > (ringIntX - TILE_WIDTH)))
+        if ((ring->unkC <= sp0C) && ((p->unk64 != SA2_CHAR_ANIM_20) || (p->timerInvulnerability == 0)) && (IS_ALIVE(p))
+            && ((((ringIntX - TILE_WIDTH) > HB_LEFT(p, hb)) && (HB_RIGHT(p, hb) > (ringIntX - TILE_WIDTH)))
                 || ((ringIntX + TILE_WIDTH) >= HB_LEFT(p, hb))
-                || (((ringIntX - TILE_WIDTH) >= HB_LEFT(p, hb))
-                    && (HB_RIGHT(p, hb) >= (ringIntX - TILE_WIDTH))))
-            && ((((ringIntY - 16) > HB_TOP(p, hb)) || (ringIntY < HB_TOP(p, hb)))
-                && ((ringIntY - 16) >= HB_TOP(p, hb)))
+                || (((ringIntX - TILE_WIDTH) >= HB_LEFT(p, hb)) && (HB_RIGHT(p, hb) >= (ringIntX - TILE_WIDTH))))
+            && ((((ringIntY - 16) > HB_TOP(p, hb)) || (ringIntY < HB_TOP(p, hb))) && ((ringIntY - 16) >= HB_TOP(p, hb)))
             && (HB_BOTTOM(p, hb) >= (ringIntY - 16))) {
             s32 oldRingCount;
             // _0801FF70
@@ -288,8 +282,7 @@ NONMATCH("asm/non_matching/game/stage/rings_scatter/RingsScatterSingleplayer_Fli
             // _08020008
 
             if ((ring->velY < 0) && ((ring->unk10 & 0x7) == 0)) {
-                s32 res = sub_801F100((ringIntY - 16), ringIntX, ring->unkE, -8,
-                                      sub_801EC3C);
+                s32 res = sub_801F100((ringIntY - 16), ringIntX, ring->unkE, -8, sub_801EC3C);
                 if (res <= 0) {
                     ring->y -= Q(res);
                     ring->velY = (ring->velY >> 2) - ring->velY;
@@ -306,8 +299,7 @@ NONMATCH("asm/non_matching/game/stage/rings_scatter/RingsScatterSingleplayer_Fli
 
             ring->velY -= sp08;
 
-            if ((((unsigned)screenX + TILE_WIDTH - 1) < 255) && (screenY > -8)
-                && (screenY < (DISPLAY_HEIGHT + 8))) {
+            if ((((unsigned)screenX + TILE_WIDTH - 1) < 255) && (screenY > -8) && (screenY < (DISPLAY_HEIGHT + 8))) {
                 if ((ring->unkC >= 32) || ((gStageTime & 0x2) == 0)) {
                     // _080200C0
                     if ((!sp10) || (s->oamBaseIndex == 0xFF)) {
@@ -398,16 +390,11 @@ NONMATCH("asm/non_matching/game/stage/rings_scatter/RingsScatterSingleplayer_Nor
 #else
         hb = &p->unk90->s.hitboxes[0];
 #endif
-        if ((ring->unkC <= sp0C)
-            && ((p->unk64 != SA2_CHAR_ANIM_20) || (p->timerInvulnerability == 0))
-            && (IS_ALIVE(p))
-            && ((((ringIntX - TILE_WIDTH) > HB_LEFT(p, hb))
-                 && (HB_RIGHT(p, hb) > (ringIntX - TILE_WIDTH)))
+        if ((ring->unkC <= sp0C) && ((p->unk64 != SA2_CHAR_ANIM_20) || (p->timerInvulnerability == 0)) && (IS_ALIVE(p))
+            && ((((ringIntX - TILE_WIDTH) > HB_LEFT(p, hb)) && (HB_RIGHT(p, hb) > (ringIntX - TILE_WIDTH)))
                 || ((ringIntX + TILE_WIDTH) >= HB_LEFT(p, hb))
-                || (((ringIntX - TILE_WIDTH) >= HB_LEFT(p, hb))
-                    && (HB_RIGHT(p, hb) >= (ringIntX - TILE_WIDTH))))
-            && ((((ringIntY - 16) > HB_TOP(p, hb)) || (ringIntY >= HB_TOP(p, hb)))
-                && ((ringIntY - 16) >= HB_TOP(p, hb)))
+                || (((ringIntX - TILE_WIDTH) >= HB_LEFT(p, hb)) && (HB_RIGHT(p, hb) >= (ringIntX - TILE_WIDTH))))
+            && ((((ringIntY - 16) > HB_TOP(p, hb)) || (ringIntY >= HB_TOP(p, hb))) && ((ringIntY - 16) >= HB_TOP(p, hb)))
             && (HB_BOTTOM(p, hb) >= (ringIntY - 16))) {
             s32 oldRingCount;
 
@@ -433,8 +420,7 @@ NONMATCH("asm/non_matching/game/stage/rings_scatter/RingsScatterSingleplayer_Nor
             }
 
             if ((rs->unk2B6 & 0x1) && (ring->velY > 0) && ((ring->unk10 & 0x7) == 0)) {
-                s32 res = sub_801F100((ringIntY - 16), ringIntX, ring->unkE, -8,
-                                      sub_801EC3C);
+                s32 res = sub_801F100((ringIntY - 16), ringIntX, ring->unkE, -8, sub_801EC3C);
                 if (res <= 0) {
                     ring->y += Q(res);
                     ring->velY = (ring->velY >> 2) - ring->velY;
@@ -443,8 +429,7 @@ NONMATCH("asm/non_matching/game/stage/rings_scatter/RingsScatterSingleplayer_Nor
 
             ring->velY -= sp08;
 
-            if ((((unsigned)screenX + TILE_WIDTH - 1) < 255) && (screenY > -8)
-                && (screenY < (DISPLAY_HEIGHT + 8))) {
+            if ((((unsigned)screenX + TILE_WIDTH - 1) < 255) && (screenY > -8) && (screenY < (DISPLAY_HEIGHT + 8))) {
                 if ((ring->unkC >= 32) || ((gStageTime & 0x2) == 0)) {
                     if ((!sp10) || (s->oamBaseIndex == 0xFF)) {
                         s->oamBaseIndex = 0xFF;
@@ -491,9 +476,8 @@ END_NONMATCH
 //       A ton of code is missing here.
 //       (Basically a copy-paste of RingsScatterSingleplayer_FlippedGravity)
 // (66.09%) https://decomp.me/scratch/qHlN9
-NONMATCH(
-    "asm/non_matching/game/stage/rings_scatter/RingsScatterMultipak_FlippedGravity.inc",
-    void RingsScatterMultipak_FlippedGravity(void))
+NONMATCH("asm/non_matching/game/stage/rings_scatter/RingsScatterMultipak_FlippedGravity.inc",
+         void RingsScatterMultipak_FlippedGravity(void))
 {
     RingsScatter *rs = TASK_DATA(gCurTask);
     ScatterRing *ring = &rs->rings[0];
@@ -535,16 +519,11 @@ NONMATCH(
 #else
         hb = &p->unk90->s.hitboxes[0];
 #endif
-        if ((ring->unkC <= sp0C)
-            && ((p->unk64 != SA2_CHAR_ANIM_20) || (p->timerInvulnerability == 0))
-            && (IS_ALIVE(p))
-            && ((((ringIntX - TILE_WIDTH) > HB_LEFT(p, hb))
-                 && (HB_RIGHT(p, hb) > (ringIntX - TILE_WIDTH)))
+        if ((ring->unkC <= sp0C) && ((p->unk64 != SA2_CHAR_ANIM_20) || (p->timerInvulnerability == 0)) && (IS_ALIVE(p))
+            && ((((ringIntX - TILE_WIDTH) > HB_LEFT(p, hb)) && (HB_RIGHT(p, hb) > (ringIntX - TILE_WIDTH)))
                 || ((ringIntX + TILE_WIDTH) >= HB_LEFT(p, hb))
-                || (((ringIntX - TILE_WIDTH) >= HB_LEFT(p, hb))
-                    && (HB_RIGHT(p, hb) >= (ringIntX - TILE_WIDTH))))
-            && ((((ringIntY - 16) > HB_TOP(p, hb)) || (ringIntY < HB_TOP(p, hb)))
-                && ((ringIntY - 16) >= HB_TOP(p, hb)))
+                || (((ringIntX - TILE_WIDTH) >= HB_LEFT(p, hb)) && (HB_RIGHT(p, hb) >= (ringIntX - TILE_WIDTH))))
+            && ((((ringIntY - 16) > HB_TOP(p, hb)) || (ringIntY < HB_TOP(p, hb))) && ((ringIntY - 16) >= HB_TOP(p, hb)))
             && (HB_BOTTOM(p, hb) >= (ringIntY - 16))) {
             s32 oldRingCount;
 
@@ -561,8 +540,7 @@ NONMATCH(
             ring->unkC = 0;
         } else {
             if ((ring->velY < 0) && ((ring->unk10 & 0x7) == 0)) {
-                s32 res = sub_801F100((ringIntY - 16), ringIntX, ring->unkE, -8,
-                                      sub_801EC3C);
+                s32 res = sub_801F100((ringIntY - 16), ringIntX, ring->unkE, -8, sub_801EC3C);
                 if (res <= 0) {
                     ring->y -= Q(res);
                     ring->velY = (ring->velY >> 2) - ring->velY;
@@ -579,8 +557,7 @@ NONMATCH(
 
             ring->velY -= sp08;
 
-            if ((((unsigned)screenX + TILE_WIDTH - 1) < 255) && (screenY > -8)
-                && (screenY < (DISPLAY_HEIGHT + 8))) {
+            if ((((unsigned)screenX + TILE_WIDTH - 1) < 255) && (screenY > -8) && (screenY < (DISPLAY_HEIGHT + 8))) {
                 if ((ring->unkC >= 32) || ((gStageTime & 0x2) == 0)) {
                     if ((!sp10) || (s->oamBaseIndex == 0xFF)) {
                         s->oamBaseIndex = 0xFF;
@@ -626,9 +603,7 @@ END_NONMATCH
 //       A ton of code is missing here.
 //       (Basically a copy-paste of RingsScatterSingleplayer_NormalGravity)
 // (64.03%) https://decomp.me/scratch/KBtBo
-NONMATCH(
-    "asm/non_matching/game/stage/rings_scatter/RingsScatterMultipak_NormalGravity.inc",
-    void RingsScatterMultipak_NormalGravity(void))
+NONMATCH("asm/non_matching/game/stage/rings_scatter/RingsScatterMultipak_NormalGravity.inc", void RingsScatterMultipak_NormalGravity(void))
 {
     RingsScatter *rs = TASK_DATA(gCurTask);
     ScatterRing *ring = &rs->rings[0];
@@ -670,16 +645,11 @@ NONMATCH(
 #else
         hb = &p->unk90->s.hitboxes[0];
 #endif
-        if ((ring->unkC <= sp0C)
-            && ((p->unk64 != SA2_CHAR_ANIM_20) || (p->timerInvulnerability == 0))
-            && (IS_ALIVE(p))
-            && ((((ringIntX - TILE_WIDTH) > HB_LEFT(p, hb))
-                 && (HB_RIGHT(p, hb) > (ringIntX - TILE_WIDTH)))
+        if ((ring->unkC <= sp0C) && ((p->unk64 != SA2_CHAR_ANIM_20) || (p->timerInvulnerability == 0)) && (IS_ALIVE(p))
+            && ((((ringIntX - TILE_WIDTH) > HB_LEFT(p, hb)) && (HB_RIGHT(p, hb) > (ringIntX - TILE_WIDTH)))
                 || ((ringIntX + TILE_WIDTH) >= HB_LEFT(p, hb))
-                || (((ringIntX - TILE_WIDTH) >= HB_LEFT(p, hb))
-                    && (HB_RIGHT(p, hb) >= (ringIntX - TILE_WIDTH))))
-            && ((((ringIntY - 16) > HB_TOP(p, hb)) || (ringIntY >= HB_TOP(p, hb)))
-                && ((ringIntY - 16) >= HB_TOP(p, hb)))
+                || (((ringIntX - TILE_WIDTH) >= HB_LEFT(p, hb)) && (HB_RIGHT(p, hb) >= (ringIntX - TILE_WIDTH))))
+            && ((((ringIntY - 16) > HB_TOP(p, hb)) || (ringIntY >= HB_TOP(p, hb))) && ((ringIntY - 16) >= HB_TOP(p, hb)))
             && (HB_BOTTOM(p, hb) >= (ringIntY - 16))) {
             s32 oldRingCount;
 
@@ -705,8 +675,7 @@ NONMATCH(
             }
 
             if ((rs->unk2B6 & 0x1) && (ring->velY > 0) && ((ring->unk10 & 0x7) == 0)) {
-                s32 res = sub_801F100((ringIntY - 16), ringIntX, ring->unkE, -8,
-                                      sub_801EC3C);
+                s32 res = sub_801F100((ringIntY - 16), ringIntX, ring->unkE, -8, sub_801EC3C);
                 if (res <= 0) {
                     ring->y += Q(res);
                     ring->velY = (ring->velY >> 2) - ring->velY;
@@ -715,8 +684,7 @@ NONMATCH(
 
             ring->velY -= sp08;
 
-            if ((((unsigned)screenX + TILE_WIDTH - 1) < 255) && (screenY > -8)
-                && (screenY < (DISPLAY_HEIGHT + 8))) {
+            if ((((unsigned)screenX + TILE_WIDTH - 1) < 255) && (screenY > -8) && (screenY < (DISPLAY_HEIGHT + 8))) {
                 if ((ring->unkC >= 32) || ((gStageTime & 0x2) == 0)) {
                     if ((!sp10) || (s->oamBaseIndex == 0xFF)) {
                         s->oamBaseIndex = 0xFF;
@@ -764,8 +732,7 @@ END_NONMATCH
 //       A ton of code is missing here.
 //       (Basically a copy-paste of RingsScatterSingleplayer_NormalGravity)
 // (54.61%) https://decomp.me/scratch/v9rXO
-NONMATCH("asm/non_matching/game/stage/rings_scatter/RingsScatterSinglepakMain.inc",
-         void RingsScatterSinglepakMain(void))
+NONMATCH("asm/non_matching/game/stage/rings_scatter/RingsScatterSinglepakMain.inc", void RingsScatterSinglepakMain(void))
 {
     RingsScatter *rs = TASK_DATA(gCurTask);
     ScatterRing *ring = &rs->rings[0];
@@ -807,16 +774,11 @@ NONMATCH("asm/non_matching/game/stage/rings_scatter/RingsScatterSinglepakMain.in
 #else
         hb = &p->unk90->s.hitboxes[0];
 #endif
-        if ((ring->unkC <= sp0C)
-            && ((p->unk64 != SA2_CHAR_ANIM_20) || (p->timerInvulnerability == 0))
-            && (IS_ALIVE(p))
-            && ((((ringIntX - TILE_WIDTH) > HB_LEFT(p, hb))
-                 && (HB_RIGHT(p, hb) > (ringIntX - TILE_WIDTH)))
+        if ((ring->unkC <= sp0C) && ((p->unk64 != SA2_CHAR_ANIM_20) || (p->timerInvulnerability == 0)) && (IS_ALIVE(p))
+            && ((((ringIntX - TILE_WIDTH) > HB_LEFT(p, hb)) && (HB_RIGHT(p, hb) > (ringIntX - TILE_WIDTH)))
                 || ((ringIntX + TILE_WIDTH) >= HB_LEFT(p, hb))
-                || (((ringIntX - TILE_WIDTH) >= HB_LEFT(p, hb))
-                    && (HB_RIGHT(p, hb) >= (ringIntX - TILE_WIDTH))))
-            && ((((ringIntY - 16) > HB_TOP(p, hb)) || (ringIntY >= HB_TOP(p, hb)))
-                && ((ringIntY - 16) >= HB_TOP(p, hb)))
+                || (((ringIntX - TILE_WIDTH) >= HB_LEFT(p, hb)) && (HB_RIGHT(p, hb) >= (ringIntX - TILE_WIDTH))))
+            && ((((ringIntY - 16) > HB_TOP(p, hb)) || (ringIntY >= HB_TOP(p, hb))) && ((ringIntY - 16) >= HB_TOP(p, hb)))
             && (HB_BOTTOM(p, hb) >= (ringIntY - 16))) {
             s32 oldRingCount;
 
@@ -842,8 +804,7 @@ NONMATCH("asm/non_matching/game/stage/rings_scatter/RingsScatterSinglepakMain.in
             }
 
             if ((rs->unk2B6 & 0x1) && (ring->velY > 0) && ((ring->unk10 & 0x7) == 0)) {
-                s32 res = sub_801F100((ringIntY - 16), ringIntX, ring->unkE, -8,
-                                      sub_801EC3C);
+                s32 res = sub_801F100((ringIntY - 16), ringIntX, ring->unkE, -8, sub_801EC3C);
                 if (res <= 0) {
                     ring->y += Q(res);
                     ring->velY = (ring->velY >> 2) - ring->velY;
@@ -852,8 +813,7 @@ NONMATCH("asm/non_matching/game/stage/rings_scatter/RingsScatterSinglepakMain.in
 
             ring->velY -= sp08;
 
-            if ((((unsigned)screenX + TILE_WIDTH - 1) < 255) && (screenY > -8)
-                && (screenY < (DISPLAY_HEIGHT + 8))) {
+            if ((((unsigned)screenX + TILE_WIDTH - 1) < 255) && (screenY > -8) && (screenY < (DISPLAY_HEIGHT + 8))) {
                 if ((ring->unkC >= 32) || ((gStageTime & 0x2) == 0)) {
                     if ((!sp10) || (s->oamBaseIndex == 0xFF)) {
                         s->oamBaseIndex = 0xFF;
diff --git a/src/game/stage/screen_fade.c b/src/game/stage/screen_fade.c
index d1ab815d4..b36b4ac0e 100644
--- a/src/game/stage/screen_fade.c
+++ b/src/game/stage/screen_fade.c
@@ -47,7 +47,4 @@ u8 UpdateScreenFade(ScreenFade *fade)
     }
 }
 
-static void ScreenFadeUpdateValues(ScreenFade *fade)
-{
-    ScreenFadeUpdateValues_inline(fade);
-}
+static void ScreenFadeUpdateValues(ScreenFade *fade) { ScreenFadeUpdateValues_inline(fade); }
diff --git a/src/game/stage/screen_shake.c b/src/game/stage/screen_shake.c
index eae13a599..7e7dc97ae 100644
--- a/src/game/stage/screen_shake.c
+++ b/src/game/stage/screen_shake.c
@@ -72,8 +72,7 @@ void Task_ScreenShake(void)
 
 struct Task *CreateScreenShake(u32 p0, u32 p1, u32 p2, u32 p3, u32 flags)
 {
-    struct Task *t = TaskCreate(Task_ScreenShake, sizeof(ScreenShake), 0xEFF, 0,
-                                TaskDestructor_ScreenShake);
+    struct Task *t = TaskCreate(Task_ScreenShake, sizeof(ScreenShake), 0xEFF, 0, TaskDestructor_ScreenShake);
 
     ScreenShake *shake = TASK_DATA(t);
     shake->p0 = p0;
diff --git a/src/game/stage/spark_effect.c b/src/game/stage/spark_effect.c
index 0da2a7413..47ac27d5c 100644
--- a/src/game/stage/spark_effect.c
+++ b/src/game/stage/spark_effect.c
@@ -17,8 +17,7 @@ void TaskDestructor_SparkEffect(struct Task *);
 // NOTE: This effect appears to be unused
 struct Task *CreateSparkEffect()
 {
-    struct Task *t = TaskCreate(Task_SparkEffect, sizeof(SparkEffect), 0x2001, 0,
-                                TaskDestructor_SparkEffect);
+    struct Task *t = TaskCreate(Task_SparkEffect, sizeof(SparkEffect), 0x2001, 0, TaskDestructor_SparkEffect);
 
     SparkEffect *spark = TASK_DATA(t);
     Sprite *s = &spark->s;
diff --git a/src/game/stage/spawn_positions.c b/src/game/stage/spawn_positions.c
index 96014f7d0..f01ce2f75 100644
--- a/src/game/stage/spawn_positions.c
+++ b/src/game/stage/spawn_positions.c
@@ -14,30 +14,23 @@ const s16 gSpawnPositions[][2] = {
 };
 
 const u32 gUnknown_080D63FC[][2] = {
-    { 8882, 1809 },  { 8206, 1233 },  { 0, 0 },        { 0, 0 },        { 14618, 2577 },
-    { 11065, 2769 }, { 0, 0 },        { 0, 0 },        { 13645, 3105 }, { 13450, 1953 },
-    { 0, 0 },        { 0, 0 },        { 11952, 2289 }, { 10320, 1474 }, { 0, 0 },
-    { 0, 0 },        { 5784, 2673 },  { 10296, 1713 }, { 0, 0 },        { 0, 0 },
-    { 14064, 1809 }, { 11280, 1041 }, { 0, 0 },        { 0, 0 },        { 20667, 3489 },
-    { 18456, 3441 }, { 0, 0 },        { 0, 0 },        { 96, 849 },     { 96, 96 },
-    { 0, 0 },        { 0, 0 },        { 0, 0 },        { 0, 0 },
+    { 8882, 1809 },  { 8206, 1233 },  { 0, 0 },        { 0, 0 },        { 14618, 2577 }, { 11065, 2769 }, { 0, 0 },
+    { 0, 0 },        { 13645, 3105 }, { 13450, 1953 }, { 0, 0 },        { 0, 0 },        { 11952, 2289 }, { 10320, 1474 },
+    { 0, 0 },        { 0, 0 },        { 5784, 2673 },  { 10296, 1713 }, { 0, 0 },        { 0, 0 },        { 14064, 1809 },
+    { 11280, 1041 }, { 0, 0 },        { 0, 0 },        { 20667, 3489 }, { 18456, 3441 }, { 0, 0 },        { 0, 0 },
+    { 96, 849 },     { 96, 96 },      { 0, 0 },        { 0, 0 },        { 0, 0 },        { 0, 0 },
 };
 
 const Vec2_32 gUnknown_080D650C[] = {
-    { 19488, -1 }, { 18816, -1 }, { 5376, -1 },  { -1, -1 },    { 27073, -1 },
-    { 24193, -1 }, { 6816, -1 },  { -1, -1 },    { 24961, -1 }, { 26401, -1 },
-    { 3552, -1 },  { -1, -1 },    { 27552, -1 }, { 21312, -1 }, { 4416, -1 },
-    { -1, -1 },    { 16224, -1 }, { 20064, -1 }, { 5376, -1 },  { -1, -1 },
-    { 29760, -1 }, { 21120, -1 }, { 8258, -1 },  { -1, -1 },    { 33505, -1 },
-    { 32449, -1 }, { 4512, -1 },  { -1, -1 },    { -1, -1 },    { 8000, -1 },
-    { 0, 0 },      { 0, 0 },      { 0, 0 },      { 0, 0 },
+    { 19488, -1 }, { 18816, -1 }, { 5376, -1 },  { -1, -1 },    { 27073, -1 }, { 24193, -1 }, { 6816, -1 },  { -1, -1 },    { 24961, -1 },
+    { 26401, -1 }, { 3552, -1 },  { -1, -1 },    { 27552, -1 }, { 21312, -1 }, { 4416, -1 },  { -1, -1 },    { 16224, -1 }, { 20064, -1 },
+    { 5376, -1 },  { -1, -1 },    { 29760, -1 }, { 21120, -1 }, { 8258, -1 },  { -1, -1 },    { 33505, -1 }, { 32449, -1 }, { 4512, -1 },
+    { -1, -1 },    { -1, -1 },    { 8000, -1 },  { 0, 0 },      { 0, 0 },      { 0, 0 },      { 0, 0 },
 };
 
 const Vec2_32 gUnknown_080D661C[] = {
-    { -960, 0 },  { -960, 0 }, { -4512, 0 }, { 0, 0 },    { -960, 0 },  { -960, 0 },
-    { -5952, 0 }, { 0, 0 },    { -960, 0 },  { -959, 0 }, { -2688, 0 }, { 0, 0 },
-    { -960, 0 },  { -960, 0 }, { -3552, 0 }, { 0, 0 },    { -960, 0 },  { -960, 0 },
-    { -4512, 0 }, { 0, 0 },    { -960, 0 },  { -960, 0 }, { -7394, 0 }, { 0, 0 },
-    { -960, 0 },  { -960, 0 }, { -3648, 0 }, { 0, 0 },    { 0, 0 },     { -6000, 0 },
-    { 0, 0 },     { 0, 0 },    { 0, 0 },     { 0, 0 },
+    { -960, 0 },  { -960, 0 },  { -4512, 0 }, { 0, 0 },    { -960, 0 },  { -960, 0 },  { -5952, 0 }, { 0, 0 },    { -960, 0 },
+    { -959, 0 },  { -2688, 0 }, { 0, 0 },     { -960, 0 }, { -960, 0 },  { -3552, 0 }, { 0, 0 },     { -960, 0 }, { -960, 0 },
+    { -4512, 0 }, { 0, 0 },     { -960, 0 },  { -960, 0 }, { -7394, 0 }, { 0, 0 },     { -960, 0 },  { -960, 0 }, { -3648, 0 },
+    { 0, 0 },     { 0, 0 },     { -6000, 0 }, { 0, 0 },    { 0, 0 },     { 0, 0 },     { 0, 0 },
 };
diff --git a/src/game/stage/stage.c b/src/game/stage/stage.c
index fdd097eef..b9d4151ed 100644
--- a/src/game/stage/stage.c
+++ b/src/game/stage/stage.c
@@ -138,8 +138,8 @@ void ApplyGameStageSettings(void)
         gNumLives = 1;
     }
 
-    if ((gGameMode == GAME_MODE_TIME_ATTACK || gGameMode == GAME_MODE_BOSS_TIME_ATTACK
-         || gGameMode == GAME_MODE_MULTI_PLAYER || gGameMode == GAME_MODE_TEAM_PLAY)
+    if ((gGameMode == GAME_MODE_TIME_ATTACK || gGameMode == GAME_MODE_BOSS_TIME_ATTACK || gGameMode == GAME_MODE_MULTI_PLAYER
+         || gGameMode == GAME_MODE_TEAM_PLAY)
         || (gStageFlags & STAGE_FLAG__DEMO_RUNNING)) {
         gDifficultyLevel = 0;
     } else {
@@ -149,9 +149,7 @@ void ApplyGameStageSettings(void)
     if ((gStageFlags & STAGE_FLAG__DEMO_RUNNING)) {
         SetPlayerControls(A_BUTTON, B_BUTTON, R_BUTTON);
     } else {
-        SetPlayerControls(gLoadedSaveGame->buttonConfig.jump,
-                          gLoadedSaveGame->buttonConfig.attack,
-                          gLoadedSaveGame->buttonConfig.trick);
+        SetPlayerControls(gLoadedSaveGame->buttonConfig.jump, gLoadedSaveGame->buttonConfig.attack, gLoadedSaveGame->buttonConfig.trick);
     }
 }
 
@@ -308,9 +306,7 @@ void Task_GameStage(void)
     u32 timeStep;
 
     if (IS_SINGLE_PLAYER) {
-        if (!(gStageFlags & STAGE_FLAG__DISABLE_PAUSE_MENU)
-            && (gPressedKeys & START_BUTTON)
-            && !(gStageFlags & STAGE_FLAG__DEMO_RUNNING)) {
+        if (!(gStageFlags & STAGE_FLAG__DISABLE_PAUSE_MENU) && (gPressedKeys & START_BUTTON) && !(gStageFlags & STAGE_FLAG__DEMO_RUNNING)) {
             CreatePauseMenu();
         }
         gStageTime++;
@@ -321,13 +317,11 @@ void Task_GameStage(void)
         gStageTime = framesSinceStageStart;
 
         if (gGameMode == GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) {
-            if ((framesSinceStageStart & ~(0x1FF))
-                != ((framesSinceStageStart - timeStep) & ~(0x1FF))) {
+            if ((framesSinceStageStart & ~(0x1FF)) != ((framesSinceStageStart - timeStep) & ~(0x1FF))) {
                 u32 mask, rand;
                 u32 temp = MultiplayerPseudoRandom32();
 
-                if ((framesSinceStageStart & ~(0xFFF))
-                    != ((framesSinceStageStart - timeStep) & ~(0xFFF))) {
+                if ((framesSinceStageStart & ~(0xFFF)) != ((framesSinceStageStart - timeStep) & ~(0xFFF))) {
                     u32 value = (gRandomItemBox >> 4) + 1;
                     gRandomItemBox = ((gRandomItemBox & 0xF) | (value * 16));
                 }
@@ -336,8 +330,7 @@ void Task_GameStage(void)
                 gRandomItemBox = (gRandomItemBox & 0xF8) | (rand & mask);
             }
 
-        } else if ((framesSinceStageStart & ~(0x3F))
-                   != ((framesSinceStageStart - timeStep) & ~(0x3F))) {
+        } else if ((framesSinceStageStart & ~(0x3F)) != ((framesSinceStageStart - timeStep) & ~(0x3F))) {
             u32 temp = MultiplayerPseudoRandom32();
         }
 
@@ -407,9 +400,7 @@ void Task_GameStage(void)
             }
 
             if (gCurrentLevel == LEVEL_INDEX(ZONE_3, ACT_BOSS)) {
-                CreateScreenShake(0x800, 8, 16, -1,
-                                  (SCREENSHAKE_VERTICAL | SCREENSHAKE_HORIZONTAL
-                                   | SCREENSHAKE_RANDOM_VALUE));
+                CreateScreenShake(0x800, 8, 16, -1, (SCREENSHAKE_VERTICAL | SCREENSHAKE_HORIZONTAL | SCREENSHAKE_RANDOM_VALUE));
             }
             gPlayer.moveState |= MOVESTATE_DEAD;
             m4aSongNumStart(SE_TIME_UP);
@@ -426,8 +417,7 @@ void Task_GameStage(void)
         if (IS_SINGLE_PLAYER) {
             gStageFlags |= STAGE_FLAG__ACT_START;
 
-            if (gLoadedSaveGame->timeLimitDisabled
-                && (gGameMode == GAME_MODE_SINGLE_PLAYER || IS_MULTI_PLAYER)) {
+            if (gLoadedSaveGame->timeLimitDisabled && (gGameMode == GAME_MODE_SINGLE_PLAYER || IS_MULTI_PLAYER)) {
                 return;
             }
 
@@ -480,8 +470,7 @@ void HandleLifeLost(void)
 static inline void StageInit_SetMusic_inline(u16 level)
 {
     if (gGameMode != GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) {
-        if (gSelectedCharacter == CHARACTER_SONIC
-            && gLoadedSaveGame->unlockedLevels[CHARACTER_SONIC] <= gCurrentLevel
+        if (gSelectedCharacter == CHARACTER_SONIC && gLoadedSaveGame->unlockedLevels[CHARACTER_SONIC] <= gCurrentLevel
             && gCurrentLevel == LEVEL_INDEX(ZONE_5, ACT_BOSS)) {
             gUnknown_030054A8.unk1 = 0x1E;
         } else {
diff --git a/src/game/stage/tilemap_table.c b/src/game/stage/tilemap_table.c
index d734e408b..91f890dcb 100644
--- a/src/game/stage/tilemap_table.c
+++ b/src/game/stage/tilemap_table.c
@@ -214,16 +214,14 @@ const Tilemap *const gTilemaps[] = {
     [TM_UNLOCKED_AMY_ES] = &unlocked_amy_es,
     [TM_CUTSCENE_FINAL_ENDING_LAND_FG] = &cutscene_final_ending_land_fg,
     [TM_CUTSCENE_FINAL_ENDING_LAND_BG] = &cutscene_final_ending_land_bg,
-    [TM_CUTSCENE_FINAL_ENDING_LAND_FLOWER_FIELD]
-    = &cutscene_final_ending_land_flower_field,
+    [TM_CUTSCENE_FINAL_ENDING_LAND_FLOWER_FIELD] = &cutscene_final_ending_land_flower_field,
     [TM_CUTSCENE_FINAL_ENDING_LAND_BG_ALT] = &cutscene_final_ending_land_bg_alt,
     [TM_UNK_SPACE_BG] = &unk_space_bg,
     [TM_STORYFRAME_SONIC_CATCHES_VANILLA] = &storyframe_sonic_catches_vanilla,
     [TM_STORYFRAME_SONIC_FINDS_FRIENDS] = &storyframe_sonic_finds_friends,
     [TM_STORYFRAME_SONIC_PATS_TAILS] = &storyframe_sonic_pats_tails,
     [TM_STORYFRAME_CREAM_HUGS_VANILLA] = &storyframe_cream_hugs_vanilla,
-    [TM_STORYFRAME_CREAM_TAILS_VANILLA_LOOK_AROUND]
-    = &storyframe_cream_tails_vanilla_look_around,
+    [TM_STORYFRAME_CREAM_TAILS_VANILLA_LOOK_AROUND] = &storyframe_cream_tails_vanilla_look_around,
     [TM_STORYFRAME_CREAM_CHEESE_VANILLA_HAPPY] = &storyframe_cream_cheese_vanilla_happy,
     [TM_STORYFRAME_SONIC_LEAVES_0] = &storyframe_sonic_leaves_0,
     [TM_STORYFRAME_SONIC_LEAVES_1] = &storyframe_sonic_leaves_1,
@@ -387,9 +385,7 @@ const Tilemap *const gTilemaps[] = {
     [TM_EXTRA_BOSS_COCKPIT] = &extra_boss_cockpit,
     [TM_EXTRA_BOSS_BACKGROUND_COPY] = &extra_boss_background_copy,
     [TM_CUTSCENE_VANILLA_KIDNAPPED_FULL_MAP] = &cutscene_vanilla_kidnapped_full_map,
-    [TM_CUTSCENE_VANILLA_KIDNAPPED_FULL_MAP_COPY]
-    = &cutscene_vanilla_kidnapped_full_map_copy,
-    [TM_CUTSCENE_VANILLA_KIDNAPPED_SUPER_SONIC_ART]
-    = &cutscene_vanilla_kidnapped_super_sonic_art,
+    [TM_CUTSCENE_VANILLA_KIDNAPPED_FULL_MAP_COPY] = &cutscene_vanilla_kidnapped_full_map_copy,
+    [TM_CUTSCENE_VANILLA_KIDNAPPED_SUPER_SONIC_ART] = &cutscene_vanilla_kidnapped_super_sonic_art,
     [TM_REGULAR_FINAL_BOSS_BUILDING_BG] = &zone_7_act_1_bg,
 };
diff --git a/src/game/stage/trapped_animals.c b/src/game/stage/trapped_animals.c
index 2b2a5690f..b6b985200 100644
--- a/src/game/stage/trapped_animals.c
+++ b/src/game/stage/trapped_animals.c
@@ -122,8 +122,7 @@ static TrappedAnimalsFunc const sTrappedAnimalSpawnFunctions[] = {
 
 static void CreateFlyingAnimal(SpawnOptions *init)
 {
-    struct Task *t
-        = TaskCreate(Task_FlyingAnimal, sizeof(FlyingAnimal), 0x2000, 0, NULL);
+    struct Task *t = TaskCreate(Task_FlyingAnimal, sizeof(FlyingAnimal), 0x2000, 0, NULL);
     FlyingAnimal *animal = TASK_DATA(t);
     Sprite *s;
     animal->x = Q(init->x);
@@ -188,8 +187,7 @@ static void Task_FlyingAnimal(void)
 
 static void CreateBouncingAnimal(SpawnOptions *init)
 {
-    struct Task *t
-        = TaskCreate(Task_BouncingAnimal, sizeof(BouncingAnimal), 0x2000, 0, NULL);
+    struct Task *t = TaskCreate(Task_BouncingAnimal, sizeof(BouncingAnimal), 0x2000, 0, NULL);
     BouncingAnimal *animal = TASK_DATA(t);
     Sprite *s;
     animal->x = Q(init->x);
@@ -229,8 +227,7 @@ static void Task_BouncingAnimal(void)
     if (animal->inAirTimer > 0) {
         animal->inAirTimer--;
     } else {
-        s32 clampedY
-            = y + Q(sub_801F07C(I(animal->y), I(animal->x), 1, 8, NULL, sub_801EE64));
+        s32 clampedY = y + Q(sub_801F07C(I(animal->y), I(animal->x), 1, 8, NULL, sub_801EE64));
 
         // if hit floor
         if (clampedY <= animal->y) {
@@ -257,8 +254,7 @@ static void Task_BouncingAnimal(void)
 
 static void CreateStaticAnimal(SpawnOptions *init)
 {
-    struct Task *t
-        = TaskCreate(Task_StaticAnimalMain, sizeof(StaticAnimal), 0x2000, 0, NULL);
+    struct Task *t = TaskCreate(Task_StaticAnimalMain, sizeof(StaticAnimal), 0x2000, 0, NULL);
     StaticAnimal *animal = TASK_DATA(t);
     Sprite *s;
     animal->x = Q(init->x);
@@ -299,8 +295,7 @@ static void Task_StaticAnimalMain(void)
     if (animal->inAirTimer > 0) {
         animal->inAirTimer--;
     } else {
-        s32 clampedY
-            = y + Q(sub_801F07C(I(animal->y), I(animal->x), 1, 8, NULL, sub_801EE64));
+        s32 clampedY = y + Q(sub_801F07C(I(animal->y), I(animal->x), 1, 8, NULL, sub_801EE64));
 
         // if collided with floor
         if (clampedY <= animal->y) {
diff --git a/src/game/stage/ui.c b/src/game/stage/ui.c
index 2b8835c89..dd1963006 100644
--- a/src/game/stage/ui.c
+++ b/src/game/stage/ui.c
@@ -22,31 +22,18 @@
 struct Task *gStageUITask = NULL;
 
 const u16 sAnimsAsciiDigits[12][2] = {
-    { SA2_ANIM_ASCII, '0' - 32 },
-    { SA2_ANIM_ASCII, '1' - 32 },
-    { SA2_ANIM_ASCII, '2' - 32 },
-    { SA2_ANIM_ASCII, '3' - 32 },
-    { SA2_ANIM_ASCII, '4' - 32 },
-    { SA2_ANIM_ASCII, '5' - 32 },
-    { SA2_ANIM_ASCII, '6' - 32 },
-    { SA2_ANIM_ASCII, '7' - 32 },
-    { SA2_ANIM_ASCII, '8' - 32 },
-    { SA2_ANIM_ASCII, '9' - 32 },
-    { SA2_ANIM_ASCII, ':' - 32 },
-    { SA2_ANIM_UI_SPECIAL_RING_ICON, 0 }, // Icon - Special Ring collected
+    { SA2_ANIM_ASCII, '0' - 32 }, { SA2_ANIM_ASCII, '1' - 32 }, { SA2_ANIM_ASCII, '2' - 32 },
+    { SA2_ANIM_ASCII, '3' - 32 }, { SA2_ANIM_ASCII, '4' - 32 }, { SA2_ANIM_ASCII, '5' - 32 },
+    { SA2_ANIM_ASCII, '6' - 32 }, { SA2_ANIM_ASCII, '7' - 32 }, { SA2_ANIM_ASCII, '8' - 32 },
+    { SA2_ANIM_ASCII, '9' - 32 }, { SA2_ANIM_ASCII, ':' - 32 }, { SA2_ANIM_UI_SPECIAL_RING_ICON, 0 }, // Icon - Special Ring collected
 };
 
 const u16 sAnims1UpIcons[][3]
-    = { [CHARACTER_SONIC] = { ONE_UP_ICON_TILE_COUNT, SA2_ANIM_LIFE_COUNTER,
-                              SA2_ANIM_VARIANT_LIFE_COUNTER_SONIC },
-        [CHARACTER_CREAM] = { ONE_UP_ICON_TILE_COUNT, SA2_ANIM_LIFE_COUNTER,
-                              SA2_ANIM_VARIANT_LIFE_COUNTER_CREAM },
-        [CHARACTER_TAILS] = { ONE_UP_ICON_TILE_COUNT, SA2_ANIM_LIFE_COUNTER,
-                              SA2_ANIM_VARIANT_LIFE_COUNTER_TAILS },
-        [CHARACTER_KNUCKLES] = { ONE_UP_ICON_TILE_COUNT, SA2_ANIM_LIFE_COUNTER,
-                                 SA2_ANIM_VARIANT_LIFE_COUNTER_KNUCKLES },
-        [CHARACTER_AMY] = { ONE_UP_ICON_TILE_COUNT, SA2_ANIM_LIFE_COUNTER,
-                            SA2_ANIM_VARIANT_LIFE_COUNTER_AMY } };
+    = { [CHARACTER_SONIC] = { ONE_UP_ICON_TILE_COUNT, SA2_ANIM_LIFE_COUNTER, SA2_ANIM_VARIANT_LIFE_COUNTER_SONIC },
+        [CHARACTER_CREAM] = { ONE_UP_ICON_TILE_COUNT, SA2_ANIM_LIFE_COUNTER, SA2_ANIM_VARIANT_LIFE_COUNTER_CREAM },
+        [CHARACTER_TAILS] = { ONE_UP_ICON_TILE_COUNT, SA2_ANIM_LIFE_COUNTER, SA2_ANIM_VARIANT_LIFE_COUNTER_TAILS },
+        [CHARACTER_KNUCKLES] = { ONE_UP_ICON_TILE_COUNT, SA2_ANIM_LIFE_COUNTER, SA2_ANIM_VARIANT_LIFE_COUNTER_KNUCKLES },
+        [CHARACTER_AMY] = { ONE_UP_ICON_TILE_COUNT, SA2_ANIM_LIFE_COUNTER, SA2_ANIM_VARIANT_LIFE_COUNTER_AMY } };
 
 // This palette might be used for the 1-Up icons
 const u16 sPalette_080D6ACE[] = INCBIN_U16("graphics/80D6ACE.gbapal");
@@ -56,56 +43,41 @@ const u32 sOrdersOfMagnitude[6] = {
 };
 
 const u8 gSecondsTable[60][2] = {
-    { 0, 0 }, { 0, 1 }, { 0, 2 }, { 0, 3 }, { 0, 4 }, { 0, 5 }, { 0, 6 }, { 0, 7 },
-    { 0, 8 }, { 0, 9 }, { 1, 0 }, { 1, 1 }, { 1, 2 }, { 1, 3 }, { 1, 4 }, { 1, 5 },
-    { 1, 6 }, { 1, 7 }, { 1, 8 }, { 1, 9 }, { 2, 0 }, { 2, 1 }, { 2, 2 }, { 2, 3 },
-    { 2, 4 }, { 2, 5 }, { 2, 6 }, { 2, 7 }, { 2, 8 }, { 2, 9 }, { 3, 0 }, { 3, 1 },
-    { 3, 2 }, { 3, 3 }, { 3, 4 }, { 3, 5 }, { 3, 6 }, { 3, 7 }, { 3, 8 }, { 3, 9 },
-    { 4, 0 }, { 4, 1 }, { 4, 2 }, { 4, 3 }, { 4, 4 }, { 4, 5 }, { 4, 6 }, { 4, 7 },
-    { 4, 8 }, { 4, 9 }, { 5, 0 }, { 5, 1 }, { 5, 2 }, { 5, 3 }, { 5, 4 }, { 5, 5 },
-    { 5, 6 }, { 5, 7 }, { 5, 8 }, { 5, 9 },
+    { 0, 0 }, { 0, 1 }, { 0, 2 }, { 0, 3 }, { 0, 4 }, { 0, 5 }, { 0, 6 }, { 0, 7 }, { 0, 8 }, { 0, 9 }, { 1, 0 }, { 1, 1 },
+    { 1, 2 }, { 1, 3 }, { 1, 4 }, { 1, 5 }, { 1, 6 }, { 1, 7 }, { 1, 8 }, { 1, 9 }, { 2, 0 }, { 2, 1 }, { 2, 2 }, { 2, 3 },
+    { 2, 4 }, { 2, 5 }, { 2, 6 }, { 2, 7 }, { 2, 8 }, { 2, 9 }, { 3, 0 }, { 3, 1 }, { 3, 2 }, { 3, 3 }, { 3, 4 }, { 3, 5 },
+    { 3, 6 }, { 3, 7 }, { 3, 8 }, { 3, 9 }, { 4, 0 }, { 4, 1 }, { 4, 2 }, { 4, 3 }, { 4, 4 }, { 4, 5 }, { 4, 6 }, { 4, 7 },
+    { 4, 8 }, { 4, 9 }, { 5, 0 }, { 5, 1 }, { 5, 2 }, { 5, 3 }, { 5, 4 }, { 5, 5 }, { 5, 6 }, { 5, 7 }, { 5, 8 }, { 5, 9 },
 };
 
 const u8 gMillisUnpackTable[60][2] = {
-    { 0, 0 }, { 0, 2 }, { 0, 3 }, { 0, 5 }, { 0, 7 }, { 0, 8 }, { 1, 0 }, { 1, 2 },
-    { 1, 3 }, { 1, 5 }, { 1, 7 }, { 1, 8 }, { 2, 0 }, { 2, 2 }, { 2, 3 }, { 2, 5 },
-    { 2, 7 }, { 2, 8 }, { 3, 0 }, { 3, 2 }, { 3, 3 }, { 3, 5 }, { 3, 7 }, { 3, 8 },
-    { 4, 0 }, { 4, 2 }, { 4, 3 }, { 4, 5 }, { 4, 7 }, { 4, 8 }, { 5, 0 }, { 5, 2 },
-    { 5, 3 }, { 5, 5 }, { 5, 7 }, { 5, 8 }, { 6, 0 }, { 6, 2 }, { 6, 3 }, { 6, 5 },
-    { 6, 7 }, { 6, 8 }, { 7, 0 }, { 7, 2 }, { 7, 3 }, { 7, 5 }, { 7, 7 }, { 7, 8 },
-    { 8, 0 }, { 8, 2 }, { 8, 3 }, { 8, 5 }, { 8, 7 }, { 8, 8 }, { 9, 0 }, { 9, 2 },
-    { 9, 3 }, { 9, 5 }, { 9, 7 }, { 9, 9 },
+    { 0, 0 }, { 0, 2 }, { 0, 3 }, { 0, 5 }, { 0, 7 }, { 0, 8 }, { 1, 0 }, { 1, 2 }, { 1, 3 }, { 1, 5 }, { 1, 7 }, { 1, 8 },
+    { 2, 0 }, { 2, 2 }, { 2, 3 }, { 2, 5 }, { 2, 7 }, { 2, 8 }, { 3, 0 }, { 3, 2 }, { 3, 3 }, { 3, 5 }, { 3, 7 }, { 3, 8 },
+    { 4, 0 }, { 4, 2 }, { 4, 3 }, { 4, 5 }, { 4, 7 }, { 4, 8 }, { 5, 0 }, { 5, 2 }, { 5, 3 }, { 5, 5 }, { 5, 7 }, { 5, 8 },
+    { 6, 0 }, { 6, 2 }, { 6, 3 }, { 6, 5 }, { 6, 7 }, { 6, 8 }, { 7, 0 }, { 7, 2 }, { 7, 3 }, { 7, 5 }, { 7, 7 }, { 7, 8 },
+    { 8, 0 }, { 8, 2 }, { 8, 3 }, { 8, 5 }, { 8, 7 }, { 8, 8 }, { 9, 0 }, { 9, 2 }, { 9, 3 }, { 9, 5 }, { 9, 7 }, { 9, 9 },
 };
 
 const s16 sZoneTimeSecondsTable[] = {
-    ZONE_TIME_TO_INT(0, 0),  ZONE_TIME_TO_INT(0, 1),  ZONE_TIME_TO_INT(0, 2),
-    ZONE_TIME_TO_INT(0, 3),  ZONE_TIME_TO_INT(0, 4),  ZONE_TIME_TO_INT(0, 5),
-    ZONE_TIME_TO_INT(0, 6),  ZONE_TIME_TO_INT(0, 7),  ZONE_TIME_TO_INT(0, 8),
-    ZONE_TIME_TO_INT(0, 9),  ZONE_TIME_TO_INT(0, 10), ZONE_TIME_TO_INT(0, 11),
-    ZONE_TIME_TO_INT(0, 12), ZONE_TIME_TO_INT(0, 13), ZONE_TIME_TO_INT(0, 14),
-    ZONE_TIME_TO_INT(0, 15), ZONE_TIME_TO_INT(0, 16), ZONE_TIME_TO_INT(0, 17),
-    ZONE_TIME_TO_INT(0, 18), ZONE_TIME_TO_INT(0, 19), ZONE_TIME_TO_INT(0, 20),
-    ZONE_TIME_TO_INT(0, 21), ZONE_TIME_TO_INT(0, 22), ZONE_TIME_TO_INT(0, 23),
-    ZONE_TIME_TO_INT(0, 24), ZONE_TIME_TO_INT(0, 25), ZONE_TIME_TO_INT(0, 26),
-    ZONE_TIME_TO_INT(0, 27), ZONE_TIME_TO_INT(0, 28), ZONE_TIME_TO_INT(0, 29),
-    ZONE_TIME_TO_INT(0, 30), ZONE_TIME_TO_INT(0, 31), ZONE_TIME_TO_INT(0, 32),
-    ZONE_TIME_TO_INT(0, 33), ZONE_TIME_TO_INT(0, 34), ZONE_TIME_TO_INT(0, 35),
-    ZONE_TIME_TO_INT(0, 36), ZONE_TIME_TO_INT(0, 37), ZONE_TIME_TO_INT(0, 38),
-    ZONE_TIME_TO_INT(0, 39), ZONE_TIME_TO_INT(0, 40), ZONE_TIME_TO_INT(0, 41),
-    ZONE_TIME_TO_INT(0, 42), ZONE_TIME_TO_INT(0, 43), ZONE_TIME_TO_INT(0, 44),
-    ZONE_TIME_TO_INT(0, 45), ZONE_TIME_TO_INT(0, 46), ZONE_TIME_TO_INT(0, 47),
-    ZONE_TIME_TO_INT(0, 48), ZONE_TIME_TO_INT(0, 49), ZONE_TIME_TO_INT(0, 50),
-    ZONE_TIME_TO_INT(0, 51), ZONE_TIME_TO_INT(0, 52), ZONE_TIME_TO_INT(0, 53),
-    ZONE_TIME_TO_INT(0, 54), ZONE_TIME_TO_INT(0, 55), ZONE_TIME_TO_INT(0, 56),
-    ZONE_TIME_TO_INT(0, 57), ZONE_TIME_TO_INT(0, 58), ZONE_TIME_TO_INT(0, 59),
+    ZONE_TIME_TO_INT(0, 0),  ZONE_TIME_TO_INT(0, 1),  ZONE_TIME_TO_INT(0, 2),  ZONE_TIME_TO_INT(0, 3),  ZONE_TIME_TO_INT(0, 4),
+    ZONE_TIME_TO_INT(0, 5),  ZONE_TIME_TO_INT(0, 6),  ZONE_TIME_TO_INT(0, 7),  ZONE_TIME_TO_INT(0, 8),  ZONE_TIME_TO_INT(0, 9),
+    ZONE_TIME_TO_INT(0, 10), ZONE_TIME_TO_INT(0, 11), ZONE_TIME_TO_INT(0, 12), ZONE_TIME_TO_INT(0, 13), ZONE_TIME_TO_INT(0, 14),
+    ZONE_TIME_TO_INT(0, 15), ZONE_TIME_TO_INT(0, 16), ZONE_TIME_TO_INT(0, 17), ZONE_TIME_TO_INT(0, 18), ZONE_TIME_TO_INT(0, 19),
+    ZONE_TIME_TO_INT(0, 20), ZONE_TIME_TO_INT(0, 21), ZONE_TIME_TO_INT(0, 22), ZONE_TIME_TO_INT(0, 23), ZONE_TIME_TO_INT(0, 24),
+    ZONE_TIME_TO_INT(0, 25), ZONE_TIME_TO_INT(0, 26), ZONE_TIME_TO_INT(0, 27), ZONE_TIME_TO_INT(0, 28), ZONE_TIME_TO_INT(0, 29),
+    ZONE_TIME_TO_INT(0, 30), ZONE_TIME_TO_INT(0, 31), ZONE_TIME_TO_INT(0, 32), ZONE_TIME_TO_INT(0, 33), ZONE_TIME_TO_INT(0, 34),
+    ZONE_TIME_TO_INT(0, 35), ZONE_TIME_TO_INT(0, 36), ZONE_TIME_TO_INT(0, 37), ZONE_TIME_TO_INT(0, 38), ZONE_TIME_TO_INT(0, 39),
+    ZONE_TIME_TO_INT(0, 40), ZONE_TIME_TO_INT(0, 41), ZONE_TIME_TO_INT(0, 42), ZONE_TIME_TO_INT(0, 43), ZONE_TIME_TO_INT(0, 44),
+    ZONE_TIME_TO_INT(0, 45), ZONE_TIME_TO_INT(0, 46), ZONE_TIME_TO_INT(0, 47), ZONE_TIME_TO_INT(0, 48), ZONE_TIME_TO_INT(0, 49),
+    ZONE_TIME_TO_INT(0, 50), ZONE_TIME_TO_INT(0, 51), ZONE_TIME_TO_INT(0, 52), ZONE_TIME_TO_INT(0, 53), ZONE_TIME_TO_INT(0, 54),
+    ZONE_TIME_TO_INT(0, 55), ZONE_TIME_TO_INT(0, 56), ZONE_TIME_TO_INT(0, 57), ZONE_TIME_TO_INT(0, 58), ZONE_TIME_TO_INT(0, 59),
     ZONE_TIME_TO_INT(0, 60),
 };
 
 const u16 sZoneTimeMinutesTable[] = {
-    ZONE_TIME_TO_INT(0, 0), ZONE_TIME_TO_INT(1, 0),  ZONE_TIME_TO_INT(2, 0),
-    ZONE_TIME_TO_INT(3, 0), ZONE_TIME_TO_INT(4, 0),  ZONE_TIME_TO_INT(5, 0),
-    ZONE_TIME_TO_INT(6, 0), ZONE_TIME_TO_INT(7, 0),  ZONE_TIME_TO_INT(8, 0),
-    ZONE_TIME_TO_INT(9, 0), ZONE_TIME_TO_INT(10, 0),
+    ZONE_TIME_TO_INT(0, 0), ZONE_TIME_TO_INT(1, 0), ZONE_TIME_TO_INT(2, 0),  ZONE_TIME_TO_INT(3, 0),
+    ZONE_TIME_TO_INT(4, 0), ZONE_TIME_TO_INT(5, 0), ZONE_TIME_TO_INT(6, 0),  ZONE_TIME_TO_INT(7, 0),
+    ZONE_TIME_TO_INT(8, 0), ZONE_TIME_TO_INT(9, 0), ZONE_TIME_TO_INT(10, 0),
 };
 
 typedef struct {
@@ -136,8 +108,7 @@ struct Task *CreateStageUI(void)
     StageUI *ui;
     Sprite *s;
 
-    struct Task *t = TaskCreate(Task_CreateStageUIMain, sizeof(StageUI), 0x2102, 0,
-                                TaskDestructor_CreateStageUI);
+    struct Task *t = TaskCreate(Task_CreateStageUIMain, sizeof(StageUI), 0x2102, 0, TaskDestructor_CreateStageUI);
     gStageUITask = t;
     ui = TASK_DATA(t);
 
@@ -280,9 +251,7 @@ void Task_CreateStageUIMain(void)
                 }
             }
             // _0802CD74
-            if ((!gLoadedSaveGame->timeLimitDisabled)
-                && (gCourseTime >= ZONE_TIME_TO_INT(9, 40))
-                && (Mod(gCourseTime, 60) == 0)) {
+            if ((!gLoadedSaveGame->timeLimitDisabled) && (gCourseTime >= ZONE_TIME_TO_INT(9, 40)) && (Mod(gCourseTime, 60) == 0)) {
                 m4aSongNumStart(SE_TIMER);
             }
 
diff --git a/src/game/stage/underwater_effects.c b/src/game/stage/underwater_effects.c
index a2b8f46ea..0a37ad608 100644
--- a/src/game/stage/underwater_effects.c
+++ b/src/game/stage/underwater_effects.c
@@ -49,8 +49,7 @@ static void Task_DrowningCountdown(void)
     if (ts->unk14 & 0x2)
         transform->height = -transform->height;
 
-    if ((transform->x < -32 || transform->x > DISPLAY_WIDTH + 32)
-        || (transform->y < -32 || transform->y > DISPLAY_HEIGHT + 32)
+    if ((transform->x < -32 || transform->x > DISPLAY_WIDTH + 32) || (transform->y < -32 || transform->y > DISPLAY_HEIGHT + 32)
         || (ts->unk10 > 0x80)) {
         TaskDestroy(gCurTask);
         return;
@@ -71,8 +70,7 @@ static void Task_DrowningCountdown(void)
 struct Task *SpawnDrowningCountdownNum(Player *p, s32 countdown)
 {
     struct Camera *cam = &gCamera;
-    struct Task *t
-        = sub_801F15C(0, 0, 0, 0, Task_DrowningCountdown, TaskDestructor_801F550);
+    struct Task *t = sub_801F15C(0, 0, 0, 0, Task_DrowningCountdown, TaskDestructor_801F550);
     TaskStrc_801F15C *ts = TASK_DATA(t);
     Sprite *s;
     SpriteTransform *transform;
@@ -116,8 +114,7 @@ struct Task *SpawnAirBubbles(s32 p0, s32 p1, s32 p2, s32 p3)
 
         gSmallAirBubbleCount++;
 
-        t = sub_801F15C(0, 0, 0, 0, Task_SpawnAirBubbles,
-                        TaskDestructor_SpawnAirBubbles);
+        t = sub_801F15C(0, 0, 0, 0, Task_SpawnAirBubbles, TaskDestructor_SpawnAirBubbles);
 
         ts = TASK_DATA(t);
         s = &ts->s;
@@ -171,8 +168,7 @@ bool32 RandomlySpawnAirBubbles(Player *p)
             if (!(p->moveState & MOVESTATE_FACING_LEFT))
                 randX = -randX;
 
-            SpawnAirBubbles(p->x - randX, p->y - randY, p->speedAirX,
-                            ((u32)PseudoRandom32() & 0x100) >> 8);
+            SpawnAirBubbles(p->x - randX, p->y - randY, p->speedAirX, ((u32)PseudoRandom32() & 0x100) >> 8);
 
             result = TRUE;
         }
@@ -211,10 +207,8 @@ static void Task_SpawnAirBubbles(void)
     if (ts->unk14 & 0x2)
         transform->height = -transform->height;
 
-    if ((transform->x < -32 || transform->x > DISPLAY_WIDTH + 32)
-        || (transform->y < -32 || transform->y > DISPLAY_HEIGHT + 32)
-        || (gWater.isActive != TRUE) || (gWater.currentWaterLevel < 0)
-        || (I(r4) - 3 < gWater.currentWaterLevel) || (ts->unk10 > 0x1E0)) {
+    if ((transform->x < -32 || transform->x > DISPLAY_WIDTH + 32) || (transform->y < -32 || transform->y > DISPLAY_HEIGHT + 32)
+        || (gWater.isActive != TRUE) || (gWater.currentWaterLevel < 0) || (I(r4) - 3 < gWater.currentWaterLevel) || (ts->unk10 > 0x1E0)) {
         TaskDestroy(gCurTask);
         return;
     } else {
@@ -263,8 +257,7 @@ static void Task_SpawnBubblesAfterDrowning(void)
 
 struct Task *SpawnBubblesAfterDrowning(Player *p)
 {
-    struct Task *t
-        = TaskCreate(Task_SpawnBubblesAfterDrowning, sizeof(Player **), 0x4001, 0, NULL);
+    struct Task *t = TaskCreate(Task_SpawnBubblesAfterDrowning, sizeof(Player **), 0x4001, 0, NULL);
 
     DrownBubbles *db = TASK_DATA(t);
     db->p = p;
diff --git a/src/game/time_attack/lobby.c b/src/game/time_attack/lobby.c
index 2741865b2..56073844e 100644
--- a/src/game/time_attack/lobby.c
+++ b/src/game/time_attack/lobby.c
@@ -30,10 +30,8 @@ struct TimeAttackLobbyScreen {
 };
 
 const TileInfo gUnknown_080E0474[] = {
-    TextElementAlt4(0, 20, 0),   TextElementAlt4(0, 16, 91),
-    TextElementAlt4(0, 30, 182), TextElementAlt4(0, 20, 273),
-    TextElementAlt4(0, 20, 364), TextElementAlt4(3, 64, 9),
-    TextElementAlt4(3, 64, 100), TextElementAlt4(3, 64, 191),
+    TextElementAlt4(0, 20, 0),   TextElementAlt4(0, 16, 91),  TextElementAlt4(0, 30, 182), TextElementAlt4(0, 20, 273),
+    TextElementAlt4(0, 20, 364), TextElementAlt4(3, 64, 9),   TextElementAlt4(3, 64, 100), TextElementAlt4(3, 64, 191),
     TextElementAlt4(3, 64, 282), TextElementAlt4(3, 64, 373),
 };
 
@@ -43,20 +41,13 @@ const TileInfo gUnknown_080E04C4[] = {
 };
 
 const TileInfo gUnknown_080E04D4[] = {
-    TextElementAlt4(0, 22, 1051), TextElementAlt4(1, 32, 1051),
-    TextElementAlt4(2, 22, 1051), TextElementAlt4(3, 22, 1051),
-    TextElementAlt4(4, 10, 1051), TextElementAlt4(0, 24, 1052),
-    TextElementAlt4(1, 42, 1052), TextElementAlt4(2, 36, 1052),
-    TextElementAlt4(3, 30, 1052), TextElementAlt4(4, 8, 1052),
-    TextElementAlt4(0, 24, 1053), TextElementAlt4(1, 36, 1053),
-    TextElementAlt4(2, 42, 1053), TextElementAlt4(3, 36, 1053),
-    TextElementAlt4(4, 20, 1053), TextElementAlt4(0, 24, 1054),
-    TextElementAlt4(1, 48, 1054), TextElementAlt4(2, 36, 1054),
-    TextElementAlt4(3, 32, 1054), TextElementAlt4(4, 8, 1054),
-    TextElementAlt4(0, 44, 1055), TextElementAlt4(1, 44, 1055),
-    TextElementAlt4(2, 38, 1055), TextElementAlt4(3, 32, 1055),
-    TextElementAlt4(4, 8, 1055),  TextElementAlt4(0, 20, 1056),
-    TextElementAlt4(1, 44, 1056), TextElementAlt4(2, 40, 1056),
+    TextElementAlt4(0, 22, 1051), TextElementAlt4(1, 32, 1051), TextElementAlt4(2, 22, 1051), TextElementAlt4(3, 22, 1051),
+    TextElementAlt4(4, 10, 1051), TextElementAlt4(0, 24, 1052), TextElementAlt4(1, 42, 1052), TextElementAlt4(2, 36, 1052),
+    TextElementAlt4(3, 30, 1052), TextElementAlt4(4, 8, 1052),  TextElementAlt4(0, 24, 1053), TextElementAlt4(1, 36, 1053),
+    TextElementAlt4(2, 42, 1053), TextElementAlt4(3, 36, 1053), TextElementAlt4(4, 20, 1053), TextElementAlt4(0, 24, 1054),
+    TextElementAlt4(1, 48, 1054), TextElementAlt4(2, 36, 1054), TextElementAlt4(3, 32, 1054), TextElementAlt4(4, 8, 1054),
+    TextElementAlt4(0, 44, 1055), TextElementAlt4(1, 44, 1055), TextElementAlt4(2, 38, 1055), TextElementAlt4(3, 32, 1055),
+    TextElementAlt4(4, 8, 1055),  TextElementAlt4(0, 20, 1056), TextElementAlt4(1, 44, 1056), TextElementAlt4(2, 40, 1056),
     TextElementAlt4(3, 28, 1056), TextElementAlt4(4, 12, 1056),
 };
 
@@ -280,14 +271,11 @@ void sub_8088D60(void)
                 GameStageStart();
                 break;
             case 1:
-                CreateCharacterSelectionScreen(gSelectedCharacter,
-                                               gLoadedSaveGame->unlockedCharacters
-                                                   & CHARACTER_BIT(CHARACTER_AMY));
+                CreateCharacterSelectionScreen(gSelectedCharacter, gLoadedSaveGame->unlockedCharacters & CHARACTER_BIT(CHARACTER_AMY));
                 gCurrentLevel = LEVEL_INDEX(ZONE_1, ACT_1);
                 break;
             case 2:
-                CreateTimeAttackLevelSelectScreen(IsBossTimeAttack(), gSelectedCharacter,
-                                                  gCurrentLevel);
+                CreateTimeAttackLevelSelectScreen(IsBossTimeAttack(), gSelectedCharacter, gCurrentLevel);
                 break;
             case 3:
                 CreateTitleScreenAndSkipIntro();
@@ -371,8 +359,7 @@ void sub_8088EB4(void)
         if (lobbyScreen->unk1AD != 3) {
             s = &lobbyScreen->unk80;
             VramFree(s->graphics.dest);
-            s->graphics.dest
-                = VramMalloc(gUnknown_080E0474[gSelectedCharacter + 5].numTiles);
+            s->graphics.dest = VramMalloc(gUnknown_080E0474[gSelectedCharacter + 5].numTiles);
             s->graphics.anim = gUnknown_080E0474[gSelectedCharacter + 5].anim;
             s->variant = gUnknown_080E0474[gSelectedCharacter + 5].variant;
             s->prevVariant = -1;
@@ -411,8 +398,7 @@ void sub_8089104(struct Task *);
 
 void CreateTimeAttackLobbyScreen()
 {
-    struct Task *t = TaskCreate(sub_8088CC4, sizeof(struct TimeAttackLobbyScreen),
-                                0x1000, 0, sub_8089104);
+    struct Task *t = TaskCreate(sub_8088CC4, sizeof(struct TimeAttackLobbyScreen), 0x1000, 0, sub_8089104);
     struct TimeAttackLobbyScreen *lobbyScreen = TASK_DATA(t);
 
     lobbyScreen->unk1AD = 0;
diff --git a/src/game/time_attack/mode_select.c b/src/game/time_attack/mode_select.c
index a8bc06c7f..b7ed96954 100644
--- a/src/game/time_attack/mode_select.c
+++ b/src/game/time_attack/mode_select.c
@@ -53,36 +53,31 @@ const TileInfo gUnknown_080E0384[30] = {
     TextElementAlt4(SA2_ANIM_VARIANT_TA_BOSS, 12, SA2_ANIM_TIME_ATTACK_EN),
     TextElementAlt4(SA2_ANIM_VARIANT_TA_CLEAR_ZONE_ASAP, 168, SA2_ANIM_TIME_ATTACK_EN),
     TextElementAlt4(SA2_ANIM_VARIANT_TA_DEFEAT_BOSS_ASAP, 168, SA2_ANIM_TIME_ATTACK_EN),
-    TextElementAlt4(SA2_ANIM_VARIANT_TA_CANT_PLAY_THIS_YET, 168,
-                    SA2_ANIM_TIME_ATTACK_EN),
+    TextElementAlt4(SA2_ANIM_VARIANT_TA_CANT_PLAY_THIS_YET, 168, SA2_ANIM_TIME_ATTACK_EN),
 
     TextElementAlt4(SA2_ANIM_VARIANT_TA_ZONE, 12, SA2_ANIM_TIME_ATTACK_EN),
     TextElementAlt4(SA2_ANIM_VARIANT_TA_BOSS, 12, SA2_ANIM_TIME_ATTACK_EN),
     TextElementAlt4(SA2_ANIM_VARIANT_TA_CLEAR_ZONE_ASAP, 168, SA2_ANIM_TIME_ATTACK_DE),
     TextElementAlt4(SA2_ANIM_VARIANT_TA_DEFEAT_BOSS_ASAP, 168, SA2_ANIM_TIME_ATTACK_DE),
-    TextElementAlt4(SA2_ANIM_VARIANT_TA_CANT_PLAY_THIS_YET, 168,
-                    SA2_ANIM_TIME_ATTACK_DE),
+    TextElementAlt4(SA2_ANIM_VARIANT_TA_CANT_PLAY_THIS_YET, 168, SA2_ANIM_TIME_ATTACK_DE),
 
     TextElementAlt4(SA2_ANIM_VARIANT_TA_ZONE, 12, SA2_ANIM_TIME_ATTACK_EN),
     TextElementAlt4(SA2_ANIM_VARIANT_TA_BOSS, 12, SA2_ANIM_TIME_ATTACK_EN),
     TextElementAlt4(SA2_ANIM_VARIANT_TA_CLEAR_ZONE_ASAP, 168, SA2_ANIM_TIME_ATTACK_FR),
     TextElementAlt4(SA2_ANIM_VARIANT_TA_DEFEAT_BOSS_ASAP, 168, SA2_ANIM_TIME_ATTACK_FR),
-    TextElementAlt4(SA2_ANIM_VARIANT_TA_CANT_PLAY_THIS_YET, 168,
-                    SA2_ANIM_TIME_ATTACK_FR),
+    TextElementAlt4(SA2_ANIM_VARIANT_TA_CANT_PLAY_THIS_YET, 168, SA2_ANIM_TIME_ATTACK_FR),
 
     TextElementAlt4(SA2_ANIM_VARIANT_TA_ZONE, 12, SA2_ANIM_TIME_ATTACK_EN),
     TextElementAlt4(SA2_ANIM_VARIANT_TA_BOSS, 12, SA2_ANIM_TIME_ATTACK_EN),
     TextElementAlt4(SA2_ANIM_VARIANT_TA_CLEAR_ZONE_ASAP, 168, SA2_ANIM_TIME_ATTACK_ES),
     TextElementAlt4(SA2_ANIM_VARIANT_TA_DEFEAT_BOSS_ASAP, 168, SA2_ANIM_TIME_ATTACK_ES),
-    TextElementAlt4(SA2_ANIM_VARIANT_TA_CANT_PLAY_THIS_YET, 168,
-                    SA2_ANIM_TIME_ATTACK_ES),
+    TextElementAlt4(SA2_ANIM_VARIANT_TA_CANT_PLAY_THIS_YET, 168, SA2_ANIM_TIME_ATTACK_ES),
 
     TextElementAlt4(SA2_ANIM_VARIANT_TA_ZONE, 12, SA2_ANIM_TIME_ATTACK_EN),
     TextElementAlt4(SA2_ANIM_VARIANT_TA_BOSS, 12, SA2_ANIM_TIME_ATTACK_EN),
     TextElementAlt4(SA2_ANIM_VARIANT_TA_CLEAR_ZONE_ASAP, 168, SA2_ANIM_TIME_ATTACK_IT),
     TextElementAlt4(SA2_ANIM_VARIANT_TA_DEFEAT_BOSS_ASAP, 168, SA2_ANIM_TIME_ATTACK_IT),
-    TextElementAlt4(SA2_ANIM_VARIANT_TA_CANT_PLAY_THIS_YET, 168,
-                    SA2_ANIM_TIME_ATTACK_IT),
+    TextElementAlt4(SA2_ANIM_VARIANT_TA_CANT_PLAY_THIS_YET, 168, SA2_ANIM_TIME_ATTACK_IT),
 };
 
 void CreateTimeAttackModeSelectionScreen(void)
@@ -111,8 +106,7 @@ void CreateTimeAttackModeSelectionScreen(void)
     gBgScrollRegs[1][0] = 0;
     gBgScrollRegs[1][1] = 0;
 
-    t = TaskCreate(Task_FadeInAndStartIntro,
-                   sizeof(struct TimeAttackModeSelectionScreen), 0x2000, 0,
+    t = TaskCreate(Task_FadeInAndStartIntro, sizeof(struct TimeAttackModeSelectionScreen), 0x2000, 0,
                    TimeAttackModeSelectionScreenOnDestroy);
     modeScreen = TASK_DATA(t);
 
@@ -148,8 +142,7 @@ void CreateTimeAttackModeSelectionScreen(void)
     UpdateSpriteAnimation(s);
 
     s = &modeScreen->unkB0;
-    s->graphics.dest
-        = VramMalloc(gUnknown_080E0384[TextElementOffset(lang, 5, 0)].numTiles);
+    s->graphics.dest = VramMalloc(gUnknown_080E0384[TextElementOffset(lang, 5, 0)].numTiles);
     s->graphics.anim = gUnknown_080E0384[TextElementOffset(lang, 5, 0)].anim;
     s->variant = gUnknown_080E0384[TextElementOffset(lang, 5, 0)].variant;
     s->prevVariant = -1;
@@ -166,8 +159,7 @@ void CreateTimeAttackModeSelectionScreen(void)
     UpdateSpriteAnimation(s);
 
     s = &modeScreen->unkE0;
-    s->graphics.dest
-        = VramMalloc(gUnknown_080E0384[TextElementOffset(lang, 5, 1)].numTiles);
+    s->graphics.dest = VramMalloc(gUnknown_080E0384[TextElementOffset(lang, 5, 1)].numTiles);
     s->graphics.anim = gUnknown_080E0384[TextElementOffset(lang, 5, 1)].anim;
     s->variant = gUnknown_080E0384[TextElementOffset(lang, 5, 1)].variant;
     s->prevVariant = -1;
@@ -184,8 +176,7 @@ void CreateTimeAttackModeSelectionScreen(void)
     UpdateSpriteAnimation(s);
 
     s = &modeScreen->infoText;
-    s->graphics.dest
-        = VramMalloc(gUnknown_080E0384[TextElementOffset(lang, 5, 2)].numTiles);
+    s->graphics.dest = VramMalloc(gUnknown_080E0384[TextElementOffset(lang, 5, 2)].numTiles);
     s->graphics.anim = gUnknown_080E0384[TextElementOffset(lang, 5, 2)].anim;
     s->variant = gUnknown_080E0384[TextElementOffset(lang, 5, 2)].variant;
     s->prevVariant = -1;
diff --git a/src/game/time_attack/results.c b/src/game/time_attack/results.c
index 69d06b72a..9a11c03db 100644
--- a/src/game/time_attack/results.c
+++ b/src/game/time_attack/results.c
@@ -53,8 +53,7 @@ u32 CreateTimeAttackResults(u32 finishTime)
     u8 level;
     gLoadedSaveGame->score += (s16)gRingCount;
 
-    t = TaskCreate(sub_8089AEC, sizeof(struct TimeAttackResultsCutScene), 0xC100, 0,
-                   sub_8089BB0);
+    t = TaskCreate(sub_8089AEC, sizeof(struct TimeAttackResultsCutScene), 0xC100, 0, sub_8089BB0);
     resultsCutScene = TASK_DATA(t);
     fade = &resultsCutScene->unk0;
 
@@ -277,8 +276,7 @@ u32 CreateTimeAttackResults(u32 finishTime)
 }
 
 const s8 gUnknown_080E05C4[] = {
-    3, 2, 1, 0, 0, -1, -2, -3, -4, -4, -3, -2, 1, 2, 3, 0,
-    0, 0, 0, 0, 0, 0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0,
+    3, 2, 1, 0, 0, -1, -2, -3, -4, -4, -3, -2, 1, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 };
 
 void sub_80897E8(void)
@@ -335,8 +333,7 @@ void sub_80897E8(void)
         if (temp > 16) {
             if (resultsCutScene->unk2D8) {
                 s = &resultsCutScene->unk9C[1];
-                resultsCutScene->transform.width
-                    = gSineTable[(((u16)resultsCutScene->unk2D6 >> 8) * 4) + 0x100] >> 6;
+                resultsCutScene->transform.width = gSineTable[(((u16)resultsCutScene->unk2D6 >> 8) * 4) + 0x100] >> 6;
                 resultsCutScene->unk2D6 += resultsCutScene->unk2D4;
 
                 if (resultsCutScene->unk2D6 == 0) {
@@ -401,8 +398,7 @@ u8 sub_80899B8(u32 finishTime)
     }
 
     for (; i < 3; i++) {
-        gLoadedSaveGame->timeRecords.table[character][zone][act][i]
-            = existingRecords[i - 1];
+        gLoadedSaveGame->timeRecords.table[character][zone][act][i] = existingRecords[i - 1];
     }
 
     return rank;
@@ -421,8 +417,7 @@ void sub_8089AEC(void)
     sub_8031314();
     sub_80897E8();
 
-    if (((unk168 > 160) && (gPressedKeys & (A_BUTTON | START_BUTTON)))
-        || (unk168 > 600)) {
+    if (((unk168 > 160) && (gPressedKeys & (A_BUTTON | START_BUTTON))) || (unk168 > 600)) {
         gCurTask->main = sub_8089B40;
     }
 }
diff --git a/src/game/title_screen.c b/src/game/title_screen.c
index 90c6ef311..3f199bb80 100644
--- a/src/game/title_screen.c
+++ b/src/game/title_screen.c
@@ -176,9 +176,8 @@ static void BirdAnimEnd(void);
 #define MenuTextIdx(language, menuItemId) menuItemId + language *NUM_LANGUAGES
 
 const TileInfo gPressStartTiles[] = {
-    [LANG_DEFAULT] = { 0x2E, 0x364, 0 }, [LANG_JAPANESE] = { 0x2E, 0x364, 0 },
-    [LANG_ENGLISH] = { 0x26, 0x36A, 0 }, [LANG_GERMAN] = { 0x26, 0x36B, 0 },
-    [LANG_FRENCH] = { 0x2E, 0x36C, 0 },  [LANG_SPANISH] = { 0x1E, 0x36D, 0 },
+    [LANG_DEFAULT] = { 0x2E, 0x364, 0 }, [LANG_JAPANESE] = { 0x2E, 0x364, 0 }, [LANG_ENGLISH] = { 0x26, 0x36A, 0 },
+    [LANG_GERMAN] = { 0x26, 0x36B, 0 },  [LANG_FRENCH] = { 0x2E, 0x36C, 0 },   [LANG_SPANISH] = { 0x1E, 0x36D, 0 },
     [LANG_ITALIAN] = { 0x1E, 0x36E, 0 },
 };
 
@@ -247,11 +246,9 @@ static const u8 sWavesVerticalBrightnessGradiant[] = {
 static const u8 sPanUpNextVelocityChangeFrame[] = { 60, 19, 10, 10, 255 };
 
 static const u8 sMenuItemTransitionKeyFrames[] = {
-    1, 2, 3, 4, 5, 6, 8, 10, 11, 13, 14, 16, 16, 16, 16, 16, 16, 16, 16, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 3, 3,  3,  3,  3,  3,  3,  2,  2,  2,  2,  2,  1,  1, 1, 1, 1,
-    0, 1, 0, 1, 0, 0, 1, 0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0,
+    1, 2, 3, 4, 5, 6, 8, 10, 11, 13, 14, 16, 16, 16, 16, 16, 16, 16, 16, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 2, 2,
+    2, 2, 2, 1, 1, 1, 1, 1,  0,  1,  0,  1,  0,  0,  1,  0,  0,  1,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 };
 
 static const u8 sBirdAnimModeSequence[] = {
@@ -278,8 +275,7 @@ static const u16 sLensFlareSizes[] = {
 };
 
 static const u16 sLensFlareStartPositions[][2] = {
-    { 20, 10 }, { 36, 26 },   { 52, 42 },   { 68, 58 },
-    { 92, 82 }, { 124, 114 }, { 148, 138 }, { 180, 170 },
+    { 20, 10 }, { 36, 26 }, { 52, 42 }, { 68, 58 }, { 92, 82 }, { 124, 114 }, { 148, 138 }, { 180, 170 },
 };
 
 void CreateTitleScreen(void)
@@ -379,15 +375,11 @@ static void CreateTitleScreenWithoutIntro(TitleScreen *titleScreen)
 
     // Possibly a macro, why would this be set to 0 first
     gDispCnt = 0;
-    gDispCnt |= DISPCNT_MODE_1 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG1_ON | DISPCNT_BG2_ON
-        | DISPCNT_OBJ_ON;
+    gDispCnt |= DISPCNT_MODE_1 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_ON;
 
-    gBgCntRegs[0]
-        = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(1) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR;
-    gBgCntRegs[1] = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(2) | BGCNT_SCREENBASE(29)
-        | BGCNT_AFF512x512 | BGCNT_16COLOR;
-    gBgCntRegs[2] = BGCNT_PRIORITY(1) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(26)
-        | BGCNT_AFF256x256 | BGCNT_256COLOR;
+    gBgCntRegs[0] = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(1) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR;
+    gBgCntRegs[1] = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(2) | BGCNT_SCREENBASE(29) | BGCNT_AFF512x512 | BGCNT_16COLOR;
+    gBgCntRegs[2] = BGCNT_PRIORITY(1) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(26) | BGCNT_AFF256x256 | BGCNT_256COLOR;
 
     DmaFill32(3, 0, (void *)BG_VRAM, BG_VRAM_SIZE);
     gUnknown_03004D80[0] = 0;
@@ -588,13 +580,11 @@ static void InitTitleScreenUI(TitleScreen *titleScreen)
     s->frameFlags = 0;
     UpdateSpriteAnimation(s);
 
-    for (menuItemId = 0; menuItemId < ARRAY_COUNT(titleScreen->menuItems);
-         menuItemId++) {
+    for (menuItemId = 0; menuItemId < ARRAY_COUNT(titleScreen->menuItems); menuItemId++) {
         s = &titleScreen->menuItems[menuItemId];
 
         s->graphics.dest = objAddr;
-        objAddr
-            += (sMenuTiles[MenuTextIdx(language, menuItemId)].numTiles * TILE_SIZE_4BPP);
+        objAddr += (sMenuTiles[MenuTextIdx(language, menuItemId)].numTiles * TILE_SIZE_4BPP);
 
         s->graphics.anim = sMenuTiles[MenuTextIdx(language, menuItemId)].anim;
         s->variant = sMenuTiles[MenuTextIdx(language, menuItemId)].variant;
@@ -821,8 +811,7 @@ static void Task_IntroPanSkyAnim(void)
 
     // Increase the pan up velocity once the correct
     // frame is reached
-    if (titleScreen->animFrame
-        == sPanUpNextVelocityChangeFrame[titleScreen->introTransitionStep]) {
+    if (titleScreen->animFrame == sPanUpNextVelocityChangeFrame[titleScreen->introTransitionStep]) {
         titleScreen->animFrame = 0;
         titleScreen->introPanUpVelocity++;
         titleScreen->introTransitionStep++;
@@ -898,8 +887,7 @@ static void Task_IntroSkyAnim(void)
     }
 
     // transition step is always > 2 to be here
-    if (titleScreen->introTransitionStep > 2
-        && (u16)(titleScreen->animFrame - 20) < 119) {
+    if (titleScreen->introTransitionStep > 2 && (u16)(titleScreen->animFrame - 20) < 119) {
         gDispCnt &= 0xFEFF;
         gDispCnt |= 0x4000;
 
@@ -1046,12 +1034,8 @@ static void Task_StartPressedTransitionAnim(void)
 
     // Start showing the next menu items after 1/6 of a second (10 frames)
     if (titleScreen->animFrame == 10) {
-        CreateMenuItemTransition(
-            &titleScreen->menuItems[PlayModeMenuIndex(MENU_ITEM_SINGLE_PLAYER)],
-            TRANSITION_IN);
-        CreateMenuItemTransition(
-            &titleScreen->menuItems[PlayModeMenuIndex(MENU_ITEM_MULTI_PLAYER)],
-            TRANSITION_IN);
+        CreateMenuItemTransition(&titleScreen->menuItems[PlayModeMenuIndex(MENU_ITEM_SINGLE_PLAYER)], TRANSITION_IN);
+        CreateMenuItemTransition(&titleScreen->menuItems[PlayModeMenuIndex(MENU_ITEM_MULTI_PLAYER)], TRANSITION_IN);
     }
 
     if (titleScreen->animFrame > 16) {
@@ -1102,16 +1086,14 @@ static void Task_PlayModeMenuMain(void)
 
         if (titleScreen->menuCursor == PlayModeMenuIndex(MENU_ITEM_SINGLE_PLAYER)) {
             titleScreen->menuItems[MENU_ITEM_MULTI_PLAYER].x = (DISPLAY_WIDTH / 2);
-            CreateMenuItemTransition(&titleScreen->menuItems[MENU_ITEM_MULTI_PLAYER],
-                                     TRANSITION_OUT);
+            CreateMenuItemTransition(&titleScreen->menuItems[MENU_ITEM_MULTI_PLAYER], TRANSITION_OUT);
 
             titleScreen->animFrame = SinglePlayerMenuIndex(MENU_ITEM_GAME_START);
 
             gCurTask->main = Task_SinglePlayerSelectedTransitionAnim;
         } else {
             fade = &titleScreen->unk270;
-            CreateMenuItemTransition(&titleScreen->menuItems[MENU_ITEM_SINGLE_PLAYER],
-                                     TRANSITION_OUT);
+            CreateMenuItemTransition(&titleScreen->menuItems[MENU_ITEM_SINGLE_PLAYER], TRANSITION_OUT);
 
             fade->bldCnt = (BLDCNT_EFFECT_DARKEN | BLDCNT_TGT1_ALL | BLDCNT_TGT2_ALL);
             fade->brightness = 0;
@@ -1160,8 +1142,7 @@ static void Task_SinglePlayerSelectedTransitionAnim(void)
         CreateMenuItemTransition(&menuItems[MENU_ITEM_OPTIONS], TRANSITION_IN);
 
         if (gLoadedSaveGame->chaoGardenUnlocked) {
-            CreateMenuItemTransition(&menuItems[MENU_ITEM_TINY_CHAO_GARDEN],
-                                     TRANSITION_IN);
+            CreateMenuItemTransition(&menuItems[MENU_ITEM_TINY_CHAO_GARDEN], TRANSITION_IN);
         }
     }
 
@@ -1175,8 +1156,7 @@ static void Task_SinglePlayerSelectedTransitionAnim(void)
     ShowGameLogo(titleScreen);
 }
 
-static inline void SinglePlayerMenuHighlightFocused(TitleScreen *titleScreen,
-                                                    u8 numMenuItems)
+static inline void SinglePlayerMenuHighlightFocused(TitleScreen *titleScreen, u8 numMenuItems)
 {
     Sprite *menuItem;
     u8 menuIndex;
@@ -1235,8 +1215,7 @@ static void Task_SinglePlayerMenuMain(void)
     if (gPressedKeys & A_BUTTON) {
         fade = &titleScreen->unk270;
         fade->bldCnt = (BLDCNT_EFFECT_DARKEN | BLDCNT_TGT1_ALL | BLDCNT_TGT2_ALL);
-        if (titleScreen->menuCursor
-            == SinglePlayerMenuIndex(MENU_ITEM_TINY_CHAO_GARDEN)) {
+        if (titleScreen->menuCursor == SinglePlayerMenuIndex(MENU_ITEM_TINY_CHAO_GARDEN)) {
             fade->bldCnt = (BLDCNT_EFFECT_LIGHTEN | BLDCNT_TGT1_ALL | BLDCNT_TGT2_ALL);
         }
         fade->speed = 0x100;
@@ -1245,9 +1224,7 @@ static void Task_SinglePlayerMenuMain(void)
 
         for (menuIndex = 0; menuIndex < numMenuItems; menuIndex++) {
             if (menuIndex != titleScreen->menuCursor) {
-                CreateMenuItemTransition(
-                    &titleScreen->menuItems[SinglePlayerMenuItem(menuIndex)],
-                    TRANSITION_OUT);
+                CreateMenuItemTransition(&titleScreen->menuItems[SinglePlayerMenuItem(menuIndex)], TRANSITION_OUT);
             }
         }
 
@@ -1320,8 +1297,7 @@ static void Task_HandleTitleScreenExit(void)
             }
             DisplaySprite(&titleScreen->unkC0);
         } else {
-            menuItem
-                = &titleScreen->menuItems[SinglePlayerMenuItem(titleScreen->menuCursor)];
+            menuItem = &titleScreen->menuItems[SinglePlayerMenuItem(titleScreen->menuCursor)];
             menuItem->palId = 1;
             if ((++titleScreen->animFrame & 7) > 3) {
                 DisplaySprite(menuItem);
@@ -1451,8 +1427,7 @@ static void WavesBackgroundAnim(TitleScreen *titleScreen)
     REG_SIOCNT &= ~SIO_INTR_ENABLE;
     gDispCnt |= 0x4000;
     gWinRegs[WINREG_WIN1H] = WIN_RANGE(0, DISPLAY_WIDTH);
-    gWinRegs[WINREG_WIN1V]
-        = WIN_RANGE((titleScreen->wavesTopOffset - 2), DISPLAY_HEIGHT);
+    gWinRegs[WINREG_WIN1V] = WIN_RANGE((titleScreen->wavesTopOffset - 2), DISPLAY_HEIGHT);
     gWinRegs[WINREG_WININ] |= 0x3F00;
     gWinRegs[WINREG_WINOUT] &= 0x13;
 
@@ -1485,9 +1460,7 @@ static void WavesBackgroundAnim(TitleScreen *titleScreen)
             *pointer++ = 0;
 
             // * DISPLAY_WIDTH
-            temp = (titleScreen->wavesTranslationY[i - titleScreen->wavesTopOffset]
-                    * 0xF000)
-                >> 8;
+            temp = (titleScreen->wavesTranslationY[i - titleScreen->wavesTopOffset] * 0xF000) >> 8;
             temp = (0xF000 - (temp)) >> 1;
             temp = ((temp)*r3) >> 8;
 
@@ -1692,9 +1665,7 @@ static void CreateLensFlareAnimation(void)
         s->timeUntilNextFrame = 0;
         s->animSpeed = SPRITE_ANIM_SPEED(1.0);
         s->palId = 0;
-        s->frameFlags = i
-            | (SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE
-               | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE);
+        s->frameFlags = i | (SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE);
 
         transform->rotation = 0;
         transform->height = transform->width = posX * 2 + 0xB0;
@@ -1720,9 +1691,8 @@ static void Task_LensFlareAnim(void)
     lensFlare->unk202 += 3;
     gBgScrollRegs[0][1] -= 3;
 
-    gBldRegs.bldCnt = BLDCNT_TGT2_BD | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BG3
-        | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG0 | BLDCNT_EFFECT_BLEND
-        | BLDCNT_TGT1_OBJ;
+    gBldRegs.bldCnt = BLDCNT_TGT2_BD | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG0
+        | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_OBJ;
     gBldRegs.bldAlpha = BLDALPHA_BLEND(7, 31);
 
     // Show the flares every other frame
@@ -1732,13 +1702,10 @@ static void Task_LensFlareAnim(void)
             transform = &lensFlare->transforms[i];
 
             // Potentially a macro
-            transform->x = sub_8085654(lensFlare->posSequenceX[i], -0x14,
-                                       lensFlare->animFrame * 16, 8, 0);
+            transform->x = sub_8085654(lensFlare->posSequenceX[i], -0x14, lensFlare->animFrame * 16, 8, 0);
 
-            transform->y = sub_8085654(lensFlare->posSequenceY[i] + lensFlare->unk202
-                                           - gBgScrollRegs[1][1],
-                                       -0x14 + lensFlare->unk202 - gBgScrollRegs[1][1],
-                                       lensFlare->animFrame * 16, 8, 0);
+            transform->y = sub_8085654(lensFlare->posSequenceY[i] + lensFlare->unk202 - gBgScrollRegs[1][1],
+                                       -0x14 + lensFlare->unk202 - gBgScrollRegs[1][1], lensFlare->animFrame * 16, 8, 0);
 
             TransformSprite(s, transform);
             DisplaySprite(s);
@@ -1953,11 +1920,9 @@ static void CreateMenuItemTransition(Sprite *s, u8 type)
     MenuItemTransition *miTransition;
 
     if (type == TRANSITION_OUT) {
-        t = TaskCreate(Task_MenuItemTransitionOutAnim, sizeof(MenuItemTransition),
-                       0x2000, 0, 0);
+        t = TaskCreate(Task_MenuItemTransitionOutAnim, sizeof(MenuItemTransition), 0x2000, 0, 0);
     } else if (type == TRANSITION_IN) {
-        t = TaskCreate(Task_MenuItemTransitionInAnim, sizeof(MenuItemTransition), 0x2000,
-                       0, 0);
+        t = TaskCreate(Task_MenuItemTransitionInAnim, sizeof(MenuItemTransition), 0x2000, 0, 0);
     } else {
         return;
     }
diff --git a/src/game/unknown_effect.c b/src/game/unknown_effect.c
index 90f420036..04f106d99 100644
--- a/src/game/unknown_effect.c
+++ b/src/game/unknown_effect.c
@@ -50,8 +50,7 @@ void sub_8087088(void)
 }
 
 static const ALIGNED(4) s8 gUnknown_080E02DC[8][2] = {
-    { 0, 0 },   { 3, -1 }, { -2, -4 }, { 0, 3 },
-    { -4, -2 }, { 3, -4 }, { 1, 3 },   { -2, 2 },
+    { 0, 0 }, { 3, -1 }, { -2, -4 }, { 0, 3 }, { -4, -2 }, { 3, -4 }, { 1, 3 }, { -2, 2 },
 };
 
 void sub_80870E8(void)
@@ -60,18 +59,14 @@ void sub_80870E8(void)
     s16 b = I(gPlayer.y) - gCamera.y;
     struct UnknownEffect87028 *effect = TASK_DATA(gCurTask);
 
-    sub_80871C4(a + gUnknown_080E02DC[effect->unk0 & 7][0],
-                b + gUnknown_080E02DC[effect->unk0 & 7][1], 160 - effect->unk0);
+    sub_80871C4(a + gUnknown_080E02DC[effect->unk0 & 7][0], b + gUnknown_080E02DC[effect->unk0 & 7][1], 160 - effect->unk0);
 
     gBldRegs.bldY = (effect->unk0 >> 4) + 4;
 
     effect->unk0 += 1;
     if (effect->unk0 > 160) {
-        if (!(gPlayer.moveState
-              & (MOVESTATE_IN_SCRIPTED | MOVESTATE_400000 | MOVESTATE_IGNORE_INPUT))
-            && !(gPlayer.itemEffect
-                 & (PLAYER_ITEM_EFFECT__INVINCIBILITY | PLAYER_ITEM_EFFECT__80))
-            && sub_800CBA4(&gPlayer) != 0) {
+        if (!(gPlayer.moveState & (MOVESTATE_IN_SCRIPTED | MOVESTATE_400000 | MOVESTATE_IGNORE_INPUT))
+            && !(gPlayer.itemEffect & (PLAYER_ITEM_EFFECT__INVINCIBILITY | PLAYER_ITEM_EFFECT__80)) && sub_800CBA4(&gPlayer) != 0) {
             m4aSongNumStart(SE_SPIKES);
         }
         gBldRegs.bldY = 0;
@@ -166,8 +161,7 @@ void sub_80873A4(void);
 
 void sub_8087368(void)
 {
-    struct Task *t = TaskCreate(Task_UnknownEffect, sizeof(struct UnknownEffect87028),
-                                0x8000, 0, TaskDestructor_UnknownEffect);
+    struct Task *t = TaskCreate(Task_UnknownEffect, sizeof(struct UnknownEffect87028), 0x8000, 0, TaskDestructor_UnknownEffect);
     struct UnknownEffect87028 *effect = TASK_DATA(t);
     effect->unk0 = 0;
     sub_80873A4();
diff --git a/src/game/water_effects.c b/src/game/water_effects.c
index 31fc06b03..29a28ffa8 100644
--- a/src/game/water_effects.c
+++ b/src/game/water_effects.c
@@ -27,9 +27,8 @@
 Water gWater = {};
 
 static const u16 gUnknown_080D550C[NUM_CHARACTERS] = {
-    SA2_ANIM_UNDERWATER_1UP_SONIC, SA2_ANIM_UNDERWATER_1UP_CREAM,
-    SA2_ANIM_UNDERWATER_1UP_TAILS, SA2_ANIM_UNDERWATER_1UP_KNUCKLES,
-    SA2_ANIM_UNDERWATER_1UP_AMY,
+    SA2_ANIM_UNDERWATER_1UP_SONIC,    SA2_ANIM_UNDERWATER_1UP_CREAM, SA2_ANIM_UNDERWATER_1UP_TAILS,
+    SA2_ANIM_UNDERWATER_1UP_KNUCKLES, SA2_ANIM_UNDERWATER_1UP_AMY,
 };
 
 static void Task_StageWaterTask(void);
@@ -108,8 +107,7 @@ NONMATCH("asm/non_matching/game/sub_8011328.inc", void sub_8011328(void))
         animId = gUnknown_080D550C[playerChar];
         animation = gAnimations[animId];
         pal = animation[0]->pal.palId;
-        sub_8011B54_inline((u32 *)&wd->pal[0 * 16], (u32 *)&gSpritePalettes[pal * 16], 1,
-                           0);
+        sub_8011B54_inline((u32 *)&wd->pal[0 * 16], (u32 *)&gSpritePalettes[pal * 16], 1, 0);
 
         playerChar = gPlayer.character;
         animId = sCharacterPalettesBoostEffect[playerChar];
@@ -237,8 +235,7 @@ void CreateStageWaterTask(s32 waterLevel, u32 p1, u32 mask)
         s->frameFlags = SPRITE_FLAG(PRIORITY, 0);
         UpdateSpriteAnimation(s);
 
-        gWater.t = TaskCreate(Task_StageWaterTask, PLTT_SIZE, 0xFFFE, 0,
-                              TaskDestructor_WaterSurface);
+        gWater.t = TaskCreate(Task_StageWaterTask, PLTT_SIZE, 0xFFFE, 0, TaskDestructor_WaterSurface);
     }
 }
 
@@ -257,8 +254,7 @@ static void Task_StageWaterTask(void)
     u8 unk2_2;
 #endif
 
-    if ((gCurrentLevel == LEVEL_INDEX(ZONE_1, ACT_1)) && (I(gPlayer.x) > 6665)
-        && (I(gPlayer.x) <= 10650)) {
+    if ((gCurrentLevel == LEVEL_INDEX(ZONE_1, ACT_1)) && (I(gPlayer.x) > 6665) && (I(gPlayer.x) <= 10650)) {
         water->isActive = TRUE;
     } else {
         water->isActive = FALSE;
@@ -330,8 +326,7 @@ typedef struct {
 
 void CreateRunOnWaterEffect(void)
 {
-    struct Task *t = TaskCreate(Task_RunOnWaterEffect, sizeof(RunOnWaterEffect), 0x4001,
-                                0, TaskDestructor_8011B3C);
+    struct Task *t = TaskCreate(Task_RunOnWaterEffect, sizeof(RunOnWaterEffect), 0x4001, 0, TaskDestructor_8011B3C);
     RunOnWaterEffect *effect = TASK_DATA(t);
     Sprite *s = &effect->s;
     s->graphics.dest = VramMalloc(12);
@@ -406,50 +401,43 @@ void MaskPaletteWithUnderwaterColor(u32 *dst, u32 *src, u32 mask, s32 size)
         // TODO: Find a way to inline these!
         maskColors0 = *src++;
         maskColors1 = maskColors0;
-        maskColors1
-            = ((maskColors1 & maskA) + (((maskColors0 & maskB) + (maskB & mask)) >> 1));
+        maskColors1 = ((maskColors1 & maskA) + (((maskColors0 & maskB) + (maskB & mask)) >> 1));
         maskColors1 >>= 1;
         *dst++ = maskColors1;
 
         maskColors0 = *src++;
         maskColors1 = maskColors0;
-        maskColors1
-            = ((maskColors1 & maskA) + (((maskColors0 & maskB) + (maskB & mask)) >> 1));
+        maskColors1 = ((maskColors1 & maskA) + (((maskColors0 & maskB) + (maskB & mask)) >> 1));
         maskColors1 >>= 1;
         *dst++ = maskColors1;
 
         maskColors0 = *src++;
         maskColors1 = maskColors0;
-        maskColors1
-            = ((maskColors1 & maskA) + (((maskColors0 & maskB) + (maskB & mask)) >> 1));
+        maskColors1 = ((maskColors1 & maskA) + (((maskColors0 & maskB) + (maskB & mask)) >> 1));
         maskColors1 >>= 1;
         *dst++ = maskColors1;
 
         maskColors0 = *src++;
         maskColors1 = maskColors0;
-        maskColors1
-            = ((maskColors1 & maskA) + (((maskColors0 & maskB) + (maskB & mask)) >> 1));
+        maskColors1 = ((maskColors1 & maskA) + (((maskColors0 & maskB) + (maskB & mask)) >> 1));
         maskColors1 >>= 1;
         *dst++ = maskColors1;
 
         maskColors0 = *src++;
         maskColors1 = maskColors0;
-        maskColors1
-            = ((maskColors1 & maskA) + (((maskColors0 & maskB) + (maskB & mask)) >> 1));
+        maskColors1 = ((maskColors1 & maskA) + (((maskColors0 & maskB) + (maskB & mask)) >> 1));
         maskColors1 >>= 1;
         *dst++ = maskColors1;
 
         maskColors0 = *src++;
         maskColors1 = maskColors0;
-        maskColors1
-            = ((maskColors1 & maskA) + (((maskColors0 & maskB) + (maskB & mask)) >> 1));
+        maskColors1 = ((maskColors1 & maskA) + (((maskColors0 & maskB) + (maskB & mask)) >> 1));
         maskColors1 >>= 1;
         *dst++ = maskColors1;
 
         maskColors0 = *src++;
         maskColors1 = maskColors0;
-        maskColors1
-            = ((maskColors1 & maskA) + (((maskColors0 & maskB) + (maskB & mask)) >> 1));
+        maskColors1 = ((maskColors1 & maskA) + (((maskColors0 & maskB) + (maskB & mask)) >> 1));
         maskColors1 >>= 1;
         *dst++ = maskColors1;
 
@@ -513,7 +501,4 @@ void TaskDestructor_8011B3C(struct Task *t)
     VramFree(s->graphics.dest);
 }
 
-static void sub_8011B54(u32 *dst, u32 *src, s32 size)
-{
-    sub_8011B54_inline(dst, src, size, 4);
-}
+static void sub_8011B54(u32 *dst, u32 *src, s32 size) { sub_8011B54_inline(dst, src, size, 4); }
diff --git a/src/lib/agb_flash.c b/src/lib/agb_flash.c
index a03363b39..101b4b5e2 100644
--- a/src/lib/agb_flash.c
+++ b/src/lib/agb_flash.c
@@ -31,11 +31,11 @@ void SwitchFlashBank(u8 bankNum)
     FLASH_WRITE(0x0000, bankNum);
 }
 
-#define DELAY()                                                                         \
-    do {                                                                                \
-        vu16 i;                                                                         \
-        for (i = 20000; i != 0; i--)                                                    \
-            ;                                                                           \
+#define DELAY()                                                                                                                            \
+    do {                                                                                                                                   \
+        vu16 i;                                                                                                                            \
+        for (i = 20000; i != 0; i--)                                                                                                       \
+            ;                                                                                                                              \
     } while (0)
 
 u16 ReadFlashId(void)
@@ -206,8 +206,7 @@ u32 VerifyFlashSector(u16 sectorNum, u8 *src)
         i--;
     }
 
-    verifyFlashSector_Core
-        = (u32(*)(u8 *, u8 *, u32))((intptr_t)verifyFlashSector_Core_Buffer + 1);
+    verifyFlashSector_Core = (u32(*)(u8 *, u8 *, u32))((intptr_t)verifyFlashSector_Core_Buffer + 1);
 
     tgt = FLASH_BASE + (sectorNum << gFlash->sector.shift);
     size = gFlash->sector.size;
@@ -242,8 +241,7 @@ u32 VerifyFlashSectorNBytes(u16 sectorNum, u8 *src, u32 n)
         i--;
     }
 
-    verifyFlashSector_Core
-        = (u32(*)(u8 *, u8 *, u32))((intptr_t)verifyFlashSector_Core_Buffer + 1);
+    verifyFlashSector_Core = (u32(*)(u8 *, u8 *, u32))((intptr_t)verifyFlashSector_Core_Buffer + 1);
 
     tgt = FLASH_BASE + (sectorNum << gFlash->sector.shift);
 
diff --git a/src/lib/agb_flash_le_512k.c b/src/lib/agb_flash_le_512k.c
index a13d3facb..38488599c 100644
--- a/src/lib/agb_flash_le_512k.c
+++ b/src/lib/agb_flash_le_512k.c
@@ -2,10 +2,10 @@
 #include "gba/flash_internal.h"
 
 const u16 le512kMaxTime[] = {
-    10,  65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK,
-    10,  65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK,
-    40,  65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK,
-    200, 65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK,
+    10,  65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK, //
+    10,  65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK, //
+    40,  65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK, //
+    200, 65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK, //
 };
 
 const struct FlashSetupInfo DefaultFlash512K = {
@@ -139,8 +139,7 @@ u16 ProgramFlashSector_LE(u16 sectorNum, void *src)
 
     tryNum = 0;
     while ((result = EraseFlashSector_LE(sectorNum))
-           || (result = VerifyEraseSector(
-                   dest, (u8 *)((intptr_t)&VerifyEraseSector_Core_Buffer + 1)))) {
+           || (result = VerifyEraseSector(dest, (u8 *)((intptr_t)&VerifyEraseSector_Core_Buffer + 1)))) {
         tryNum++;
         if (tryNum == 0x51) {
             return result;
diff --git a/src/lib/agb_flash_mx_512k.c b/src/lib/agb_flash_mx_512k.c
index bcdc54f1a..48993d1b7 100644
--- a/src/lib/agb_flash_mx_512k.c
+++ b/src/lib/agb_flash_mx_512k.c
@@ -2,17 +2,17 @@
 #include "gba/flash_internal.h"
 
 const u16 mx512kMaxTime[] = {
-    10,   65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK,
-    10,   65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK,
-    2000, 65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK,
-    2000, 65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK,
+    10,   65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK, //
+    10,   65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK, //
+    2000, 65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK, //
+    2000, 65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK, //
 };
 
 const u16 paMaxTime[] = {
-    10,  65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK,
-    10,  65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK,
-    500, 65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK,
-    500, 65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK,
+    10,  65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK, //
+    10,  65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK, //
+    500, 65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK, //
+    500, 65469, TIMER_ENABLE | TIMER_INTR_ENABLE | TIMER_256CLK, //
 };
 
 const struct FlashSetupInfo MX29L512 = {
diff --git a/src/lib/m4a.c b/src/lib/m4a.c
index 525250423..c5e61e335 100644
--- a/src/lib/m4a.c
+++ b/src/lib/m4a.c
@@ -64,8 +64,7 @@ void m4aSoundInit(void)
 {
     s32 i;
 
-    CpuCopy32((void *)((intptr_t)SoundMainRAM & ~1), SoundMainRAM_Buffer,
-              sizeof(SoundMainRAM_Buffer));
+    CpuCopy32((void *)((intptr_t)SoundMainRAM & ~1), SoundMainRAM_Buffer, sizeof(SoundMainRAM_Buffer));
     SoundInit(&gSoundInfo);
     MPlayExtender(gCgbChans);
     m4aSoundMode(DEFAULT_SOUND_MODE);
@@ -100,8 +99,7 @@ void m4aSongNumStartOrChange(u16 n)
     if (mplay->info->songHeader != song->header) {
         MPlayStart(mplay->info, song->header);
     } else {
-        if ((mplay->info->status & MUSICPLAYER_STATUS_TRACK) == 0
-            || (mplay->info->status & MUSICPLAYER_STATUS_PAUSE)) {
+        if ((mplay->info->status & MUSICPLAYER_STATUS_TRACK) == 0 || (mplay->info->status & MUSICPLAYER_STATUS_PAUSE)) {
             MPlayStart(mplay->info, song->header);
         }
     }
@@ -162,10 +160,7 @@ void m4aMPlayAllContinue(void)
         MPlayContinue(gMPlayTable[i].info);
 }
 
-void m4aMPlayFadeOut(struct MusicPlayerInfo *mplayInfo, u16 speed)
-{
-    MPlayFadeOut(mplayInfo, speed);
-}
+void m4aMPlayFadeOut(struct MusicPlayerInfo *mplayInfo, u16 speed) { MPlayFadeOut(mplayInfo, speed); }
 
 void m4aMPlayFadeOutTemporarily(struct MusicPlayerInfo *mplayInfo, u16 speed)
 {
@@ -217,8 +212,7 @@ void MPlayExtender(struct CgbChannel *cgbChans)
     struct SoundInfo *soundInfo;
     u32 ident;
 
-    REG_SOUNDCNT_X
-        = SOUND_MASTER_ENABLE | SOUND_4_ON | SOUND_3_ON | SOUND_2_ON | SOUND_1_ON;
+    REG_SOUNDCNT_X = SOUND_MASTER_ENABLE | SOUND_4_ON | SOUND_3_ON | SOUND_2_ON | SOUND_1_ON;
     REG_SOUNDCNT_L = 0; // set master volume to zero
     REG_NR12 = 0x8;
     REG_NR22 = 0x8;
@@ -285,22 +279,14 @@ void SoundInit(struct SoundInfo *soundInfo)
 {
     soundInfo->ident = 0;
     if (REG_DMA1CNT & (DMA_REPEAT << 16))
-        REG_DMA1CNT
-            = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED)
-               << 16)
-            | 4;
+        REG_DMA1CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4;
     if (REG_DMA2CNT & (DMA_REPEAT << 16))
-        REG_DMA2CNT
-            = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED)
-               << 16)
-            | 4;
+        REG_DMA2CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4;
     REG_DMA1CNT_H = DMA_32BIT;
     REG_DMA2CNT_H = DMA_32BIT;
-    REG_SOUNDCNT_X
-        = SOUND_MASTER_ENABLE | SOUND_4_ON | SOUND_3_ON | SOUND_2_ON | SOUND_1_ON;
-    REG_SOUNDCNT_H = SOUND_B_FIFO_RESET | SOUND_B_TIMER_0 | SOUND_B_LEFT_OUTPUT
-        | SOUND_A_FIFO_RESET | SOUND_A_TIMER_0 | SOUND_A_RIGHT_OUTPUT
-        | SOUND_ALL_MIX_FULL;
+    REG_SOUNDCNT_X = SOUND_MASTER_ENABLE | SOUND_4_ON | SOUND_3_ON | SOUND_2_ON | SOUND_1_ON;
+    REG_SOUNDCNT_H = SOUND_B_FIFO_RESET | SOUND_B_TIMER_0 | SOUND_B_LEFT_OUTPUT | SOUND_A_FIFO_RESET | SOUND_A_TIMER_0
+        | SOUND_A_RIGHT_OUTPUT | SOUND_ALL_MIX_FULL;
     REG_SOUNDBIAS_H = (REG_SOUNDBIAS_H & 0x3F) | 0x40;
     REG_DMA1SAD = (intptr_t)soundInfo->pcmBuffer;
     REG_DMA1DAD = (intptr_t)&REG_FIFO_A;
@@ -425,15 +411,9 @@ void m4aSoundVSyncOff(void)
     if (soundInfo->ident >= ID_NUMBER && soundInfo->ident <= ID_NUMBER + 1) {
         soundInfo->ident += 10;
         if (REG_DMA1CNT & (DMA_REPEAT << 16))
-            REG_DMA1CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC
-                            | DMA_DEST_FIXED)
-                           << 16)
-                | 4;
+            REG_DMA1CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4;
         if (REG_DMA2CNT & (DMA_REPEAT << 16))
-            REG_DMA2CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC
-                            | DMA_DEST_FIXED)
-                           << 16)
-                | 4;
+            REG_DMA2CNT = ((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4;
         REG_DMA1CNT_H = DMA_32BIT;
         REG_DMA2CNT_H = DMA_32BIT;
         CpuFill32(0, soundInfo->pcmBuffer, sizeof(soundInfo->pcmBuffer));
@@ -453,8 +433,7 @@ void m4aSoundVSyncOn(void)
     soundInfo->ident = ident - 10;
 }
 
-void MPlayOpen(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *tracks,
-               u8 trackCount)
+void MPlayOpen(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *tracks, u8 trackCount)
 {
     struct SoundInfo *soundInfo;
 
@@ -497,8 +476,7 @@ void MPlayStart(struct MusicPlayerInfo *mplayInfo, struct SongHeader *songHeader
     unk_B = mplayInfo->unk_B;
     if (!unk_B
         || ((!mplayInfo->songHeader || !(mplayInfo->tracks[0].flags & MPT_FLG_START))
-            && ((mplayInfo->status & MUSICPLAYER_STATUS_TRACK) == 0
-                || (mplayInfo->status & MUSICPLAYER_STATUS_PAUSE)))
+            && ((mplayInfo->status & MUSICPLAYER_STATUS_TRACK) == 0 || (mplayInfo->status & MUSICPLAYER_STATUS_PAUSE)))
         || (mplayInfo->priority <= songHeader->priority)) {
         ++mplayInfo->ident;
         mplayInfo->status = 0;
@@ -570,8 +548,7 @@ void FadeOutBody(struct MusicPlayerInfo *mplayInfo)
     mplayInfo->fadeOC = mplayInfo->fadeOI;
 
     if (mplayInfo->fadeOV & FADE_IN) {
-        if ((u16)(mplayInfo->fadeOV += (4 << FADE_VOL_SHIFT))
-            >= (64 << FADE_VOL_SHIFT)) {
+        if ((u16)(mplayInfo->fadeOV += (4 << FADE_VOL_SHIFT)) >= (64 << FADE_VOL_SHIFT)) {
             mplayInfo->fadeOV = (64 << FADE_VOL_SHIFT);
             mplayInfo->fadeOI = 0;
         }
@@ -642,8 +619,7 @@ void TrkVolPitSet(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *tr
     }
     if (track->flags & MPT_FLG_PITSET) {
         s32 bend = track->bend * track->bendRange;
-        s32 x = (track->tune + bend) * 4 + (track->keyShift << 8)
-            + (track->keyShiftX << 8) + track->pitX;
+        s32 x = (track->tune + bend) * 4 + (track->keyShift << 8) + (track->keyShiftX << 8) + track->pitX;
 
         if (track->modT == 0)
             x += 16 * track->modM;
@@ -872,8 +848,7 @@ void CgbSound(void)
                     --channels->ev;
                     if ((s8)(channels->ev & mask) <= 0) {
                     loc_82E0F02:
-                        channels->ev
-                            = ((channels->eg * channels->echoVolume) + 0xFF) >> 8;
+                        channels->ev = ((channels->eg * channels->echoVolume) + 0xFF) >> 8;
                         if (channels->ev) {
                             channels->sf |= 0x4;
                             channels->mo |= 1;
@@ -1134,10 +1109,10 @@ void m4aMPlayLFOSpeedSet(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u8 lf
     mplayInfo->ident = ID_NUMBER;
 }
 
-#define MEMACC_COND_JUMP(cond)                                                          \
-    if (cond)                                                                           \
-        goto cond_true;                                                                 \
-    else                                                                                \
+#define MEMACC_COND_JUMP(cond)                                                                                                             \
+    if (cond)                                                                                                                              \
+        goto cond_true;                                                                                                                    \
+    else                                                                                                                                   \
         goto cond_false;
 
 void ply_memacc(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
@@ -1211,8 +1186,7 @@ void ply_memacc(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *trac
             return;
     }
 cond_true : {
-    void (*func)(struct MusicPlayerInfo *, struct MusicPlayerTrack *)
-        = *(&gMPlayJumpTable[1]);
+    void (*func)(struct MusicPlayerInfo *, struct MusicPlayerTrack *) = *(&gMPlayJumpTable[1]);
     func(mplayInfo, track);
     return;
 }
@@ -1230,18 +1204,17 @@ void ply_xcmd(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
 
 void ply_xxx(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
 {
-    void (*func)(struct MusicPlayerInfo *, struct MusicPlayerTrack *)
-        = *(&gMPlayJumpTable[0]);
+    void (*func)(struct MusicPlayerInfo *, struct MusicPlayerTrack *) = *(&gMPlayJumpTable[0]);
 
     func(mplayInfo, track);
 }
 
-#define READ_XCMD_BYTE(var, n)                                                          \
-    {                                                                                   \
-        u32 byte = track->cmdPtr[(n)];                                                  \
-        byte <<= n * 8;                                                                 \
-        (var) &= ~(0xFF << (n * 8));                                                    \
-        (var) |= byte;                                                                  \
+#define READ_XCMD_BYTE(var, n)                                                                                                             \
+    {                                                                                                                                      \
+        u32 byte = track->cmdPtr[(n)];                                                                                                     \
+        byte <<= n * 8;                                                                                                                    \
+        (var) &= ~(0xFF << (n * 8));                                                                                                       \
+        (var) |= byte;                                                                                                                     \
     }
 
 void ply_xwave(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track)
diff --git a/src/lib/m4a_tables.c b/src/lib/m4a_tables.c
index 55ea95586..c0d154fc7 100644
--- a/src/lib/m4a_tables.c
+++ b/src/lib/m4a_tables.c
@@ -4,28 +4,22 @@
 // an array of void pointers or a struct. It's simpler to just make it an array
 // for now.
 void *const gMPlayJumpTableTemplate[] = {
-    ply_fine,      ply_goto,  ply_patt,    ply_pend,     ply_rept,       ply_fine,
-    ply_fine,      ply_fine,  ply_fine,    ply_prio,     ply_tempo,      ply_keysh,
-    ply_voice,     ply_vol,   ply_pan,     ply_bend,     ply_bendr,      ply_lfos,
-    ply_lfodl,     ply_mod,   ply_modt,    ply_fine,     ply_fine,       ply_tune,
-    ply_fine,      ply_fine,  ply_fine,    ply_port,     ply_fine,       ply_endtie,
-    SampleFreqSet, TrackStop, FadeOutBody, TrkVolPitSet, RealClearChain, SoundMainBTM,
+    ply_fine,  ply_goto,  ply_patt,   ply_pend,      ply_rept,  ply_fine,    ply_fine,     ply_fine,       ply_fine,
+    ply_prio,  ply_tempo, ply_keysh,  ply_voice,     ply_vol,   ply_pan,     ply_bend,     ply_bendr,      ply_lfos,
+    ply_lfodl, ply_mod,   ply_modt,   ply_fine,      ply_fine,  ply_tune,    ply_fine,     ply_fine,       ply_fine,
+    ply_port,  ply_fine,  ply_endtie, SampleFreqSet, TrackStop, FadeOutBody, TrkVolPitSet, RealClearChain, SoundMainBTM,
 };
 
 const u8 gScaleTable[] = {
-    0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xD0, 0xD1,
-    0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xC0, 0xC1, 0xC2, 0xC3,
-    0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5,
-    0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7,
-    0xA8, 0xA9, 0xAA, 0xAB, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
-    0x9A, 0x9B, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B,
-    0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x60, 0x61,
-    0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x50, 0x51, 0x52, 0x53,
-    0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45,
-    0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
-    0x38, 0x39, 0x3A, 0x3B, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29,
-    0x2A, 0x2B, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B,
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B,
+    0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7,
+    0xD8, 0xD9, 0xDA, 0xDB, 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xB0, 0xB1, 0xB2, 0xB3,
+    0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB,
+    0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+    0x88, 0x89, 0x8A, 0x8B, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x60, 0x61, 0x62, 0x63,
+    0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B,
+    0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+    0x38, 0x39, 0x3A, 0x3B, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x10, 0x11, 0x12, 0x13,
+    0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B,
 };
 
 const u32 gFreqTable[] = {
@@ -38,16 +32,12 @@ const u16 gPcmSamplesPerVBlankTable[] = {
 };
 
 const u8 gCgbScaleTable[] = {
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x10, 0x11,
-    0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x20, 0x21, 0x22, 0x23,
-    0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35,
-    0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
-    0x48, 0x49, 0x4A, 0x4B, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
-    0x5A, 0x5B, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B,
-    0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x80, 0x81,
-    0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x90, 0x91, 0x92, 0x93,
-    0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5,
-    0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB,
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19,
+    0x1A, 0x1B, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+    0x38, 0x39, 0x3A, 0x3B, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55,
+    0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x70, 0x71, 0x72, 0x73,
+    0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x90, 0x91,
+    0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB,
 };
 
 const s16 gCgbFreqTable[] = {
@@ -55,26 +45,21 @@ const s16 gCgbFreqTable[] = {
 };
 
 const u8 gNoiseTable[] = {
-    0xD7, 0xD6, 0xD5, 0xD4, 0xC7, 0xC6, 0xC5, 0xC4, 0xB7, 0xB6, 0xB5, 0xB4,
-    0xA7, 0xA6, 0xA5, 0xA4, 0x97, 0x96, 0x95, 0x94, 0x87, 0x86, 0x85, 0x84,
-    0x77, 0x76, 0x75, 0x74, 0x67, 0x66, 0x65, 0x64, 0x57, 0x56, 0x55, 0x54,
-    0x47, 0x46, 0x45, 0x44, 0x37, 0x36, 0x35, 0x34, 0x27, 0x26, 0x25, 0x24,
-    0x17, 0x16, 0x15, 0x14, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
+    0xD7, 0xD6, 0xD5, 0xD4, 0xC7, 0xC6, 0xC5, 0xC4, 0xB7, 0xB6, 0xB5, 0xB4, 0xA7, 0xA6, 0xA5, 0xA4, 0x97, 0x96, 0x95, 0x94,
+    0x87, 0x86, 0x85, 0x84, 0x77, 0x76, 0x75, 0x74, 0x67, 0x66, 0x65, 0x64, 0x57, 0x56, 0x55, 0x54, 0x47, 0x46, 0x45, 0x44,
+    0x37, 0x36, 0x35, 0x34, 0x27, 0x26, 0x25, 0x24, 0x17, 0x16, 0x15, 0x14, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
 };
 
 const u8 gCgb3Vol[] = {
-    0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x40, 0x40,
-    0x40, 0x40, 0x80, 0x80, 0x80, 0x80, 0x20, 0x20,
+    0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80, 0x20, 0x20,
 };
 
 const u8 gClockTable[] = {
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C,
-    0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x1C,
-    0x1E, 0x20, 0x24, 0x28, 0x2A, 0x2C, 0x30, 0x34, 0x36, 0x38, 0x3C, 0x40, 0x42,
-    0x44, 0x48, 0x4C, 0x4E, 0x50, 0x54, 0x58, 0x5A, 0x5C, 0x60,
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10,
+    0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x1C, 0x1E, 0x20, 0x24, 0x28, 0x2A, 0x2C, 0x30, 0x34,
+    0x36, 0x38, 0x3C, 0x40, 0x42, 0x44, 0x48, 0x4C, 0x4E, 0x50, 0x54, 0x58, 0x5A, 0x5C, 0x60,
 };
 
 const XcmdFunc gXcmdTable[] = {
-    ply_xxx,   ply_xwave, ply_xtype, ply_xxx,   ply_xatta, ply_xdeca,
-    ply_xsust, ply_xrele, ply_xiecv, ply_xiecl, ply_xleng, ply_xswee,
+    ply_xxx, ply_xwave, ply_xtype, ply_xxx, ply_xatta, ply_xdeca, ply_xsust, ply_xrele, ply_xiecv, ply_xiecl, ply_xleng, ply_xswee,
 };
diff --git a/src/malloc_ewram.c b/src/malloc_ewram.c
index d5a24597f..e31d68055 100644
--- a/src/malloc_ewram.c
+++ b/src/malloc_ewram.c
@@ -55,8 +55,7 @@ void *EwramMalloc(u32 req)
                     addr->next = node->next;
                     ++node;
                     --node;
-                    addr->state = node->state
-                        - requestedSpace; // Surplus space belongs to the new node.
+                    addr->state = node->state - requestedSpace; // Surplus space belongs to the new node.
                     node->next = addr;
                     node->state = -requestedSpace; // busy
                     return node->space;
@@ -87,12 +86,10 @@ void EwramFree(void *p)
         node = p - offsetof(struct EwramNode, space);
 
         /* find parent of node */
-        for (fast = slow = (struct EwramNode *)gEwramHeap; node != fast;
-             fast = fast->next)
+        for (fast = slow = (struct EwramNode *)gEwramHeap; node != fast; fast = fast->next)
             slow = fast;
 
-        if (node->state
-            < 0) // It should always be true if the function is called properly.
+        if (node->state < 0) // It should always be true if the function is called properly.
             node->state = -node->state; // free
 
         /*
diff --git a/src/malloc_vram.c b/src/malloc_vram.c
index 18d11c1a1..893bb26ee 100644
--- a/src/malloc_vram.c
+++ b/src/malloc_vram.c
@@ -6,8 +6,7 @@ void *VramMalloc(u32 numTiles)
 {
     u16 i, j;
     u32 count = numTiles;
-    count = (count + (VRAM_TILE_SLOTS_PER_SEGMENT - 1))
-        / VRAM_TILE_SLOTS_PER_SEGMENT; // round up
+    count = (count + (VRAM_TILE_SLOTS_PER_SEGMENT - 1)) / VRAM_TILE_SLOTS_PER_SEGMENT; // round up
 
     for (i = 0; i < gVramHeapMaxTileSlots / VRAM_TILE_SLOTS_PER_SEGMENT; i++) {
         if (gVramHeapState[i] == 0) {
@@ -31,10 +30,7 @@ void *VramMalloc(u32 numTiles)
     return ewram_end;
 }
 
-void VramResetHeapState(void)
-{
-    DmaFill16(3, 0, gVramHeapState, sizeof(gVramHeapState));
-}
+void VramResetHeapState(void) { DmaFill16(3, 0, gVramHeapState, sizeof(gVramHeapState)); }
 
 void VramFree(void *addr)
 {
diff --git a/src/multi_boot.c b/src/multi_boot.c
index 1fae1ac2a..11e2f6015 100644
--- a/src/multi_boot.c
+++ b/src/multi_boot.c
@@ -8,15 +8,15 @@ static void MultiBootWaitSendDone(void);
 
 static u16 gMultiBootRequiredData[MULTIBOOT_NCHILD];
 
-#define MULTIBOOT_INIT(mp)                                                              \
-    (mp)->client_bit = 0;                                                               \
-    (mp)->probe_count = 0;                                                              \
-    (mp)->response_bit = 0;                                                             \
-    (mp)->check_wait = MULTIBOOT_CONNECTION_CHECK_WAIT;                                 \
-    (mp)->sendflag = 0;                                                                 \
-    (mp)->handshake_timeout = 0;                                                        \
-    REG_RCNT = 0;                                                                       \
-    REG_SIOCNT = SIO_MULTI_MODE | SIO_115200_BPS;                                       \
+#define MULTIBOOT_INIT(mp)                                                                                                                 \
+    (mp)->client_bit = 0;                                                                                                                  \
+    (mp)->probe_count = 0;                                                                                                                 \
+    (mp)->response_bit = 0;                                                                                                                \
+    (mp)->check_wait = MULTIBOOT_CONNECTION_CHECK_WAIT;                                                                                    \
+    (mp)->sendflag = 0;                                                                                                                    \
+    (mp)->handshake_timeout = 0;                                                                                                           \
+    REG_RCNT = 0;                                                                                                                          \
+    REG_SIOCNT = SIO_MULTI_MODE | SIO_115200_BPS;                                                                                          \
     REG_SIODATA8 = 0;
 
 /*------------------------------------------------------------------*/
@@ -46,8 +46,7 @@ output_burst:
          * When the connection ID is not 00 or there is a problem with the SD or
          * SI terminals an error occurs.
          */
-        i = REG_SIOCNT
-            & (SIO_MULTI_BUSY | SIO_ERROR | SIO_ID | SIO_MULTI_SD | SIO_MULTI_SI);
+        i = REG_SIOCNT & (SIO_MULTI_BUSY | SIO_ERROR | SIO_ID | SIO_MULTI_SD | SIO_MULTI_SI);
         if (i != SIO_MULTI_SD) {
             MULTIBOOT_INIT(mp);
             return i ^ SIO_MULTI_SD;
@@ -62,8 +61,7 @@ output_burst:
          * call If High speed recognition mode, handshake also high speed
          * communication.
          */
-        if (mp->server_type == MULTIBOOT_SERVER_TYPE_QUICK && mp->probe_count > 0xe1
-            && MultiBootCheckComplete(mp) == 0) {
+        if (mp->server_type == MULTIBOOT_SERVER_TYPE_QUICK && mp->probe_count > 0xe1 && MultiBootCheckComplete(mp) == 0) {
             MultiBootWaitSendDone();
             goto output_burst;
         }
@@ -86,9 +84,8 @@ output_burst:
              */
             k = 0x0e;
             for (i = MULTIBOOT_NCHILD; i != 0; --i) {
-                if (*(vu16 *)(REG_ADDR_SIOMULTI0 + i * 2)
-                    != 0xffff) { // braces are required to match on my machine,
-                                 // but works fine on SBird's CE :/
+                if (*(vu16 *)(REG_ADDR_SIOMULTI0 + i * 2) != 0xffff) { // braces are required to match on my machine,
+                                                                       // but works fine on SBird's CE :/
                     break;
                 }
                 k >>= 1;
@@ -145,8 +142,7 @@ output_burst:
                      * If 2P, 0x02
                      * If not so, invalid.
                      */
-                    gMultiBootRequiredData[i - 1]
-                        = j; /* During processing next time must be same value */
+                    gMultiBootRequiredData[i - 1] = j; /* During processing next time must be same value */
                     j &= 0xff;
                     if (j == (1 << i))
                         mp->probe_target_bit |= j; /* recognized */
@@ -160,8 +156,7 @@ output_burst:
              * If not possible that 000 or ccc, not recognized by master.
              */
             mp->probe_count = 2;
-            return MultiBootSend(
-                mp, (MULTIBOOT_MASTER_START_PROBE << 8) | mp->probe_target_bit);
+            return MultiBootSend(mp, (MULTIBOOT_MASTER_START_PROBE << 8) | mp->probe_target_bit);
         case 2:
             /* Must be CLIENT_INFO 000 0 ccc 0.
              * Output header +0, +1 bytes.
@@ -190,8 +185,7 @@ output_burst:
                  */
                 mp->client_data[i - 1] = j;
                 if (mp->probe_target_bit & (1 << i)) {
-                    if ((j >> 8) != MULTIBOOT_CLIENT_INFO
-                        && (j >> 8) != MULTIBOOT_CLIENT_DLREADY) {
+                    if ((j >> 8) != MULTIBOOT_CLIENT_INFO && (j >> 8) != MULTIBOOT_CLIENT_DLREADY) {
                         MULTIBOOT_INIT(mp);
                         return MULTIBOOT_ERROR_NO_DLREADY; /* No response saying
                                                               ready to do
@@ -209,8 +203,7 @@ output_burst:
                 /* Not start download yet.
                  * Send request for download preparation
                  */
-                return MultiBootSend(
-                    mp, (MULTIBOOT_MASTER_REQUEST_DLREADY << 8) | mp->palette_data);
+                return MultiBootSend(mp, (MULTIBOOT_MASTER_REQUEST_DLREADY << 8) | mp->palette_data);
             /* All machines ready to download */
             mp->probe_count = 0xd1;
             k = 0x11;
@@ -269,10 +262,7 @@ output_burst:
             for (i = MULTIBOOT_NCHILD; i != 0; --i) {
                 if (mp->probe_target_bit & (1 << i)) {
                     j = *(vu16 *)(REG_ADDR_SIOMULTI0 + i * 2);
-                    if ((j >> 8)
-                            != (MULTIBOOT_MASTER_START_PROBE + 1
-                                - (mp->probe_count >> 1))
-                        || ((j & 0xff) != (1 << i)))
+                    if ((j >> 8) != (MULTIBOOT_MASTER_START_PROBE + 1 - (mp->probe_count >> 1)) || ((j & 0xff) != (1 << i)))
                         /* Problem with client recognition */
                         mp->probe_target_bit ^= 1 << i;
                 }
@@ -298,9 +288,7 @@ output_burst:
                  * If do not problem with timing.
                  */
                 goto output_master_info;
-            i = MultiBootSend(mp,
-                              (mp->masterp[mp->probe_count - 4 + 1] << 8)
-                                  | mp->masterp[mp->probe_count - 4]);
+            i = MultiBootSend(mp, (mp->masterp[mp->probe_count - 4 + 1] << 8) | mp->masterp[mp->probe_count - 4]);
             if (i)
                 return i;
             /* If Low speed recognition mode, for each frame of call, 2 bytes of
@@ -366,8 +354,7 @@ void MultiBootStartProbe(struct MultiBootParam *mp)
 /*                   Start send from master server                  */
 /*------------------------------------------------------------------*/
 
-void MultiBootStartMaster(struct MultiBootParam *mp, const u8 *srcp, s32 length,
-                          u8 palette_color, s8 palette_speed)
+void MultiBootStartMaster(struct MultiBootParam *mp, const u8 *srcp, s32 length, u8 palette_color, s8 palette_speed)
 {
     s32 i;
 
diff --git a/src/multi_sio.c b/src/multi_sio.c
index 76b4a45a5..c580b3265 100644
--- a/src/multi_sio.c
+++ b/src/multi_sio.c
@@ -13,8 +13,7 @@ struct MultiSioArea gMultiSioArea = {};
 UNUSED u32 gUnusedMultiSioSpace[2] = {};
 
 #ifdef MULTI_SIO_DI_FUNC_FAST
-u32 gMultiSioRecvFuncBuf[0x40 / 4]
-    = {}; // Receive Data/Check Buffer Change Routine RAM Execution Buffer
+u32 gMultiSioRecvFuncBuf[0x40 / 4] = {}; // Receive Data/Check Buffer Change Routine RAM Execution Buffer
 #endif
 
 /*------------------------------------------------------------------*/
@@ -41,8 +40,7 @@ void MultiSioInit(u32 connectedFlags)
 #endif
     gMultiSioArea.connectedFlags = connectedFlags;
     gMultiSioArea.sendBufCounter = 13;
-    gMultiSioArea.nextSendBufp
-        = (u16 *)&gMultiSioArea.sendBuf[0]; // Set Send Buffer Pointer
+    gMultiSioArea.nextSendBufp = (u16 *)&gMultiSioArea.sendBuf[0]; // Set Send Buffer Pointer
     gMultiSioArea.currentSendBufp = (u16 *)&gMultiSioArea.sendBuf[1];
     for (i = 0; i < 4; ++i) { // Set Receive Buffer Pointer
         gMultiSioArea.currentRecvBufp[i] = (u16 *)&gMultiSioArea.recvBuf[i][0];
@@ -74,8 +72,7 @@ u32 MultiSioMain(void *sendp, void *recvp, u32 loadRequest)
                     REG_IE &= ~INTR_FLAG_SERIAL; // Disable SIO Interrupt
                     REG_IE |= MULTI_SIO_TIMER_INTR_FLAG; // Enable Timer Interrupt
                     REG_IME = 1;
-                    ((struct SioMultiCnt *)REG_ADDR_SIOCNT)->ifEnable
-                        = 0; // Reset SIO-IFE
+                    ((struct SioMultiCnt *)REG_ADDR_SIOCNT)->ifEnable = 0; // Reset SIO-IFE
                     REG_IF = INTR_FLAG_SERIAL | MULTI_SIO_TIMER_INTR_FLAG;
                     REG_MULTI_SIO_TIMER = MULTI_SIO_TIMER_COUNT; // Timer Initialization
                     gMultiSioArea.type = SIO_MULTI_PARENT;
@@ -90,11 +87,9 @@ u32 MultiSioMain(void *sendp, void *recvp, u32 loadRequest)
             break;
     }
     ++gMultiSioArea.sendFrameCounter;
-    return gMultiSioArea.recvSuccessFlags | gMultiSioArea.loadEnable << 4
-        | gMultiSioArea.loadRequest << 5 | gMultiSioArea.loadSuccessFlag << 6
-        | (gMultiSioArea.type == SIO_MULTI_PARENT) << 7
-        | gMultiSioArea.connectedFlags << 8 | (gMultiSioArea.hardError != 0) << 12
-        | (sioCntBak.id >= MULTI_SIO_PLAYERS_MAX) << 13;
+    return gMultiSioArea.recvSuccessFlags | gMultiSioArea.loadEnable << 4 | gMultiSioArea.loadRequest << 5
+        | gMultiSioArea.loadSuccessFlag << 6 | (gMultiSioArea.type == SIO_MULTI_PARENT) << 7 | gMultiSioArea.connectedFlags << 8
+        | (gMultiSioArea.hardError != 0) << 12 | (sioCntBak.id >= MULTI_SIO_PLAYERS_MAX) << 13;
 }
 
 /*------------------------------------------------------------------*/
@@ -107,27 +102,21 @@ void MultiSioSendDataSet(void *sendp, u32 loadRequest)
     s32 i;
 
     ((struct MultiSioPacket *)gMultiSioArea.nextSendBufp)->loadRequest = loadRequest;
-    ((struct MultiSioPacket *)gMultiSioArea.nextSendBufp)->downloadSuccessFlag
-        = gSio32MultiLoadArea.downloadSuccessFlag;
-    ((struct MultiSioPacket *)gMultiSioArea.nextSendBufp)->loadSuccessFlag
-        = gMultiSioArea.loadSuccessFlag;
-    ((struct MultiSioPacket *)gMultiSioArea.nextSendBufp)->frameCounter
-        = (u8)gMultiSioArea.sendFrameCounter;
-    ((struct MultiSioPacket *)gMultiSioArea.nextSendBufp)->recvErrorFlags
-        = gMultiSioArea.connectedFlags ^ gMultiSioArea.recvSuccessFlags;
+    ((struct MultiSioPacket *)gMultiSioArea.nextSendBufp)->downloadSuccessFlag = gSio32MultiLoadArea.downloadSuccessFlag;
+    ((struct MultiSioPacket *)gMultiSioArea.nextSendBufp)->loadSuccessFlag = gMultiSioArea.loadSuccessFlag;
+    ((struct MultiSioPacket *)gMultiSioArea.nextSendBufp)->frameCounter = (u8)gMultiSioArea.sendFrameCounter;
+    ((struct MultiSioPacket *)gMultiSioArea.nextSendBufp)->recvErrorFlags = gMultiSioArea.connectedFlags ^ gMultiSioArea.recvSuccessFlags;
     ((struct MultiSioPacket *)gMultiSioArea.nextSendBufp)->checkSum = 0;
     CpuCopy32(sendp, &gMultiSioArea.nextSendBufp[2],
               MULTI_SIO_BLOCK_SIZE); // Set Send Data
-    for (i = 0; i < sizeof(struct MultiSioPacket) / 2 - 2;
-         ++i) // Calculate Checksum Send Data
+    for (i = 0; i < sizeof(struct MultiSioPacket) / 2 - 2; ++i) // Calculate Checksum Send Data
         checkSum += gMultiSioArea.nextSendBufp[i];
     ((struct MultiSioPacket *)gMultiSioArea.nextSendBufp)->checkSum = ~checkSum;
     if (gMultiSioArea.type)
         REG_MULTI_SIO_TIMER_H = 0; // Stop Timer
     gMultiSioArea.sendBufCounter = -1;
     if (gMultiSioArea.type && gMultiSioArea.startFlag)
-        REG_MULTI_SIO_TIMER_H
-            = TIMER_1CLK | TIMER_INTR_ENABLE | TIMER_ENABLE; // Start Timer
+        REG_MULTI_SIO_TIMER_H = TIMER_1CLK | TIMER_INTR_ENABLE | TIMER_ENABLE; // Start Timer
 }
 
 /*------------------------------------------------------------------*/
@@ -147,8 +136,7 @@ u32 MultiSioRecvDataCheck(void *recvp)
 #else
     REG_IME = 0; // Disable Interrupt (Approx. 80 Clocks)
     for (i = 0; i < 4; ++i) {
-        u16 *bufpTmp
-            = gMultiSioArea.recvCheckBufp[i]; // Update Receive Data/Check Buffer
+        u16 *bufpTmp = gMultiSioArea.recvCheckBufp[i]; // Update Receive Data/Check Buffer
         gMultiSioArea.recvCheckBufp[i] = gMultiSioArea.lastRecvBufp[i];
         gMultiSioArea.lastRecvBufp[i] = bufpTmp;
     }
@@ -162,34 +150,23 @@ u32 MultiSioRecvDataCheck(void *recvp)
         if (syncRecvFlagBak[i]) // Receive Success Confirmation
             if ((s16)checkSum == -1) {
                 gMultiSioArea.recvSuccessFlags |= 1 << i;
-                gMultiSioArea.downloadSuccessFlags
-                    |= ((struct MultiSioPacket *)gMultiSioArea.recvCheckBufp[i])
-                           ->downloadSuccessFlag
-                    << i;
-                CpuCopy32(&((u8 *)gMultiSioArea.recvCheckBufp[i])[4],
-                          &((u8 *)recvp)[i * MULTI_SIO_BLOCK_SIZE],
-                          MULTI_SIO_BLOCK_SIZE);
+                gMultiSioArea.downloadSuccessFlags |= ((struct MultiSioPacket *)gMultiSioArea.recvCheckBufp[i])->downloadSuccessFlag << i;
+                CpuCopy32(&((u8 *)gMultiSioArea.recvCheckBufp[i])[4], &((u8 *)recvp)[i * MULTI_SIO_BLOCK_SIZE], MULTI_SIO_BLOCK_SIZE);
             }
         CpuFill32(0, &((u8 *)gMultiSioArea.recvCheckBufp[i])[4], MULTI_SIO_BLOCK_SIZE);
     }
-    gMultiSioArea.connectedFlags
-        |= gMultiSioArea.recvSuccessFlags; // Set Connect Complete Flag
+    gMultiSioArea.connectedFlags |= gMultiSioArea.recvSuccessFlags; // Set Connect Complete Flag
     if (gMultiSioArea.recvSuccessFlags & 1) {
 
         if (gMultiSioArea.type == SIO_MULTI_PARENT) {
             if (gMultiSioArea.recvSuccessFlags & 0x3) // Enable Load
                 if (gMultiSioArea.recvSuccessFlags == gMultiSioArea.connectedFlags)
                     gMultiSioArea.loadEnable = 1;
-            if ((gMultiSioArea.downloadSuccessFlags & 0xe)
-                == (gMultiSioArea.connectedFlags & 0xe)) // Check Load
+            if ((gMultiSioArea.downloadSuccessFlags & 0xe) == (gMultiSioArea.connectedFlags & 0xe)) // Check Load
                 gMultiSioArea.loadSuccessFlag = 1;
         } else
-            gMultiSioArea.loadSuccessFlag
-                |= ((struct MultiSioPacket *)gMultiSioArea.recvCheckBufp[0])
-                       ->loadSuccessFlag;
-        gMultiSioArea.loadRequest
-            |= ((struct MultiSioPacket *)gMultiSioArea.recvCheckBufp[0])
-                   ->loadRequest; // Request Load
+            gMultiSioArea.loadSuccessFlag |= ((struct MultiSioPacket *)gMultiSioArea.recvCheckBufp[0])->loadSuccessFlag;
+        gMultiSioArea.loadRequest |= ((struct MultiSioPacket *)gMultiSioArea.recvCheckBufp[0])->loadRequest; // Request Load
     }
     return gMultiSioArea.recvSuccessFlags;
 }
@@ -211,8 +188,7 @@ void MultiSioStart(void)
 void MultiSioStop(void)
 {
     REG_IME = 0;
-    REG_IE &= ~(INTR_FLAG_SERIAL
-                | MULTI_SIO_TIMER_INTR_FLAG); // Disable SIO & Timer Interrupt
+    REG_IE &= ~(INTR_FLAG_SERIAL | MULTI_SIO_TIMER_INTR_FLAG); // Disable SIO & Timer Interrupt
     REG_IME = 1;
     REG_SIOCNT = SIO_MULTI_MODE | MULTI_SIO_BAUD_RATE_NO; // Stop SIO
     REG_MULTI_SIO_TIMER = MULTI_SIO_TIMER_COUNT; // Stop Timer
@@ -243,39 +219,32 @@ void MultiSioIntr(void)
         gMultiSioArea.currentSendBufp = gMultiSioArea.nextSendBufp;
         gMultiSioArea.nextSendBufp = bufpTmp;
     } else if (gMultiSioArea.sendBufCounter >= 0) { // Set Send Data
-        ((struct SioMultiCnt *)REG_ADDR_SIOCNT)->data
-            = gMultiSioArea.currentSendBufp[gMultiSioArea.sendBufCounter];
+        ((struct SioMultiCnt *)REG_ADDR_SIOCNT)->data = gMultiSioArea.currentSendBufp[gMultiSioArea.sendBufCounter];
     }
     if (gMultiSioArea.sendBufCounter < (s32)(sizeof(struct MultiSioPacket) / 2 - 1))
         ++gMultiSioArea.sendBufCounter;
     // Receive Data Processing (Max. Approx. 350 Clocks/Included in wait period)
     for (i = 0; i < 4; ++i) {
-        if (recvTmp[i] == MULTI_SIO_SYNC_DATA
-            && gMultiSioArea.recvBufCounter[i]
-                > (s32)(sizeof(struct MultiSioPacket) / 2 - 3)) {
+        if (recvTmp[i] == MULTI_SIO_SYNC_DATA && gMultiSioArea.recvBufCounter[i] > (s32)(sizeof(struct MultiSioPacket) / 2 - 3)) {
             gMultiSioArea.recvBufCounter[i] = -1;
         } else {
-            gMultiSioArea.currentRecvBufp[i][gMultiSioArea.recvBufCounter[i]]
-                = recvTmp[i];
+            gMultiSioArea.currentRecvBufp[i][gMultiSioArea.recvBufCounter[i]] = recvTmp[i];
             // Store Receive Data
-            if (gMultiSioArea.recvBufCounter[i]
-                == (s32)(sizeof(struct MultiSioPacket) / 2 - 3)) {
+            if (gMultiSioArea.recvBufCounter[i] == (s32)(sizeof(struct MultiSioPacket) / 2 - 3)) {
                 bufpTmp = gMultiSioArea.lastRecvBufp[i]; // Change Receive Buffer
                 gMultiSioArea.lastRecvBufp[i] = gMultiSioArea.currentRecvBufp[i];
                 gMultiSioArea.currentRecvBufp[i] = bufpTmp;
                 gMultiSioArea.syncRecvFlag[i] = 1; // Receive Complete Flag
             }
         }
-        if (gMultiSioArea.recvBufCounter[i]
-            < (s32)(sizeof(struct MultiSioPacket) / 2 - 1))
+        if (gMultiSioArea.recvBufCounter[i] < (s32)(sizeof(struct MultiSioPacket) / 2 - 1))
             ++gMultiSioArea.recvBufCounter[i];
     }
     // Start Master Send
     if (gMultiSioArea.type == SIO_MULTI_PARENT) {
         REG_MULTI_SIO_TIMER_H = 0; // Stop Timer
         REG_SIOCNT |= SIO_ENABLE; // Restart Send
-        REG_MULTI_SIO_TIMER_H
-            = TIMER_1CLK | TIMER_INTR_ENABLE | TIMER_ENABLE; // Restart Timer
+        REG_MULTI_SIO_TIMER_H = TIMER_1CLK | TIMER_INTR_ENABLE | TIMER_ENABLE; // Restart Timer
     }
 }
 #endif
diff --git a/src/platform/pret_sdl/sdl2.c b/src/platform/pret_sdl/sdl2.c
index c686fc0ea..cb1aa534c 100644
--- a/src/platform/pret_sdl/sdl2.c
+++ b/src/platform/pret_sdl/sdl2.c
@@ -143,9 +143,8 @@ int main(int argc, char **argv)
     const char *title = "SAT-R sa2";
 #endif
 
-    sdlWindow = SDL_CreateWindow(title, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
-                                 DISPLAY_WIDTH * videoScale, DISPLAY_HEIGHT * videoScale,
-                                 SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE);
+    sdlWindow = SDL_CreateWindow(title, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, DISPLAY_WIDTH * videoScale,
+                                 DISPLAY_HEIGHT * videoScale, SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE);
     if (sdlWindow == NULL) {
         fprintf(stderr, "Window could not be created! SDL_Error: %s\n", SDL_GetError());
         return 1;
@@ -153,8 +152,7 @@ int main(int argc, char **argv)
 
     sdlRenderer = SDL_CreateRenderer(sdlWindow, -1, SDL_RENDERER_PRESENTVSYNC);
     if (sdlRenderer == NULL) {
-        fprintf(stderr, "Renderer could not be created! SDL_Error: %s\n",
-                SDL_GetError());
+        fprintf(stderr, "Renderer could not be created! SDL_Error: %s\n", SDL_GetError());
         return 1;
     }
 
@@ -163,9 +161,7 @@ int main(int argc, char **argv)
     SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "0");
     SDL_RenderSetLogicalSize(sdlRenderer, DISPLAY_WIDTH, DISPLAY_HEIGHT);
 
-    sdlTexture
-        = SDL_CreateTexture(sdlRenderer, SDL_PIXELFORMAT_ABGR1555,
-                            SDL_TEXTUREACCESS_STREAMING, DISPLAY_WIDTH, DISPLAY_HEIGHT);
+    sdlTexture = SDL_CreateTexture(sdlRenderer, SDL_PIXELFORMAT_ABGR1555, SDL_TEXTUREACCESS_STREAMING, DISPLAY_WIDTH, DISPLAY_HEIGHT);
     if (sdlTexture == NULL) {
         fprintf(stderr, "Texture could not be created! SDL_Error: %s\n", SDL_GetError());
         return 1;
@@ -176,8 +172,7 @@ int main(int argc, char **argv)
     isFrameAvailable.value = 0;
     vBlankSemaphore = SDL_CreateSemaphore(0);
     if (vBlankSemaphore == NULL) {
-        SDL_LogError(SDL_LOG_CATEGORY_ERROR, "Failed to create Semaphore:\n  %s",
-                     SDL_GetError());
+        SDL_LogError(SDL_LOG_CATEGORY_ERROR, "Failed to create Semaphore:\n  %s", SDL_GetError());
     }
 
 #if ENABLE_AUDIO
@@ -221,8 +216,7 @@ int main(int argc, char **argv)
             double dt = fixedTimestep / timeScale; // TODO: Fix speedup
 
             curGameTime = SDL_GetPerformanceCounter();
-            double deltaTime = (double)((curGameTime - lastGameTime)
-                                        / (double)SDL_GetPerformanceFrequency());
+            double deltaTime = (double)((curGameTime - lastGameTime) / (double)SDL_GetPerformanceFrequency());
             if (deltaTime > (dt * 5))
                 deltaTime = dt;
             lastGameTime = curGameTime;
@@ -253,8 +247,7 @@ int main(int argc, char **argv)
         }
 
         if (videoScaleChanged) {
-            SDL_SetWindowSize(sdlWindow, DISPLAY_WIDTH * videoScale,
-                              DISPLAY_HEIGHT * videoScale);
+            SDL_SetWindowSize(sdlWindow, DISPLAY_WIDTH * videoScale, DISPLAY_HEIGHT * videoScale);
             videoScaleChanged = false;
         }
 
@@ -322,14 +315,14 @@ static void CloseSaveFile()
 #define KEY_DPAD_LEFT     SDLK_LEFT
 #define KEY_DPAD_RIGHT    SDLK_RIGHT
 
-#define HANDLE_KEYUP(key)                                                               \
-    case KEY_##key:                                                                     \
-        keys &= ~key;                                                                   \
+#define HANDLE_KEYUP(key)                                                                                                                  \
+    case KEY_##key:                                                                                                                        \
+        keys &= ~key;                                                                                                                      \
         break;
 
-#define HANDLE_KEYDOWN(key)                                                             \
-    case KEY_##key:                                                                     \
-        keys |= key;                                                                    \
+#define HANDLE_KEYDOWN(key)                                                                                                                \
+    case KEY_##key:                                                                                                                        \
+        keys |= key;                                                                                                                       \
         break;
 
 static u16 keys;
@@ -383,8 +376,7 @@ void ProcessEvents(void)
                     }
                     SDL_SetWindowFullscreen(sdlWindow, fullScreenFlags);
 
-                    SDL_SetWindowSize(sdlWindow, DISPLAY_WIDTH * videoScale,
-                                      DISPLAY_HEIGHT * videoScale);
+                    SDL_SetWindowSize(sdlWindow, DISPLAY_WIDTH * videoScale, DISPLAY_HEIGHT * videoScale);
                     videoScaleChanged = FALSE;
                 } else
                     switch (event.key.keysym.sym) {
@@ -452,17 +444,12 @@ u16 GetXInputKeys()
         /* B */ xinputKeys |= (state.Gamepad.wButtons & XINPUT_GAMEPAD_X) >> 13;
         /* Start */ xinputKeys |= (state.Gamepad.wButtons & XINPUT_GAMEPAD_START) >> 1;
         /* Select */ xinputKeys |= (state.Gamepad.wButtons & XINPUT_GAMEPAD_BACK) >> 3;
-        /* L */ xinputKeys |= (state.Gamepad.wButtons & XINPUT_GAMEPAD_LEFT_SHOULDER)
-            << 1;
-        /* R */ xinputKeys
-            |= (state.Gamepad.wButtons & XINPUT_GAMEPAD_RIGHT_SHOULDER) >> 1;
+        /* L */ xinputKeys |= (state.Gamepad.wButtons & XINPUT_GAMEPAD_LEFT_SHOULDER) << 1;
+        /* R */ xinputKeys |= (state.Gamepad.wButtons & XINPUT_GAMEPAD_RIGHT_SHOULDER) >> 1;
         /* Up */ xinputKeys |= (state.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_UP) << 6;
-        /* Down */ xinputKeys |= (state.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_DOWN)
-            << 6;
-        /* Left */ xinputKeys |= (state.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_LEFT)
-            << 3;
-        /* Right */ xinputKeys |= (state.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_RIGHT)
-            << 1;
+        /* Down */ xinputKeys |= (state.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_DOWN) << 6;
+        /* Left */ xinputKeys |= (state.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_LEFT) << 3;
+        /* Right */ xinputKeys |= (state.Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_RIGHT) << 1;
 
         /* Control Stick */
         float xAxis = (float)state.Gamepad.sThumbLX / (float)SHRT_MAX;
@@ -535,8 +522,7 @@ static void RunDMAs(u32 type)
             dma->control &= ~DMA_ENABLE;
         }
 
-        if ((dma->control & DMA_ENABLE)
-            && (((dma->control & DMA_START_MASK) >> 12) == type)) {
+        if ((dma->control & DMA_ENABLE) && (((dma->control & DMA_START_MASK) >> 12) == type)) {
             // printf("DMA%d src=%p, dest=%p, control=%d\n", dmaNum, dma->src, dma->dest,
             // dma->control);
             for (int i = 0; i < (dma->size); i++) {
@@ -622,10 +608,7 @@ int MultiBoot(struct MultiBootParam *mp) { return 0; }
 void DmaSet(int dmaNum, const void *src, void *dest, u32 control)
 {
     if (dmaNum >= DMA_COUNT) {
-        fprintf(
-            stderr,
-            "DmaSet with invalid DMA number: dmaNum=%d, src=%p, dest=%p, control=%d\n",
-            dmaNum, src, dest, control);
+        fprintf(stderr, "DmaSet with invalid DMA number: dmaNum=%d, src=%p, dest=%p, control=%d\n", dmaNum, src, dest, control);
         return;
     }
 
@@ -654,8 +637,7 @@ void DmaSet(int dmaNum, const void *src, void *dest, u32 control)
 
 void DmaStop(int dmaNum)
 {
-    (&REG_DMA0CNT)[dmaNum]
-        &= ~((DMA_ENABLE | DMA_START_MASK | DMA_DREQ_ON | DMA_REPEAT) << 16);
+    (&REG_DMA0CNT)[dmaNum] &= ~((DMA_ENABLE | DMA_START_MASK | DMA_DREQ_ON | DMA_REPEAT) << 16);
 
     struct DMATransfer *dma = &DMAList[dmaNum];
     dma->control &= ~(DMA_ENABLE | DMA_START_MASK | DMA_DREQ_ON | DMA_REPEAT);
@@ -952,49 +934,32 @@ void RLUnCompVram(const void *src, void *dest)
 }
 
 const s16 sineTable[256]
-    = { (s16)0x0000, (s16)0x0192, (s16)0x0323, (s16)0x04B5, (s16)0x0645, (s16)0x07D5,
-        (s16)0x0964, (s16)0x0AF1, (s16)0x0C7C, (s16)0x0E05, (s16)0x0F8C, (s16)0x1111,
-        (s16)0x1294, (s16)0x1413, (s16)0x158F, (s16)0x1708, (s16)0x187D, (s16)0x19EF,
-        (s16)0x1B5D, (s16)0x1CC6, (s16)0x1E2B, (s16)0x1F8B, (s16)0x20E7, (s16)0x223D,
-        (s16)0x238E, (s16)0x24DA, (s16)0x261F, (s16)0x275F, (s16)0x2899, (s16)0x29CD,
-        (s16)0x2AFA, (s16)0x2C21, (s16)0x2D41, (s16)0x2E5A, (s16)0x2F6B, (s16)0x3076,
-        (s16)0x3179, (s16)0x3274, (s16)0x3367, (s16)0x3453, (s16)0x3536, (s16)0x3612,
-        (s16)0x36E5, (s16)0x37AF, (s16)0x3871, (s16)0x392A, (s16)0x39DA, (s16)0x3A82,
-        (s16)0x3B20, (s16)0x3BB6, (s16)0x3C42, (s16)0x3CC5, (s16)0x3D3E, (s16)0x3DAE,
-        (s16)0x3E14, (s16)0x3E71, (s16)0x3EC5, (s16)0x3F0E, (s16)0x3F4E, (s16)0x3F84,
-        (s16)0x3FB1, (s16)0x3FD3, (s16)0x3FEC, (s16)0x3FFB, (s16)0x4000, (s16)0x3FFB,
-        (s16)0x3FEC, (s16)0x3FD3, (s16)0x3FB1, (s16)0x3F84, (s16)0x3F4E, (s16)0x3F0E,
-        (s16)0x3EC5, (s16)0x3E71, (s16)0x3E14, (s16)0x3DAE, (s16)0x3D3E, (s16)0x3CC5,
-        (s16)0x3C42, (s16)0x3BB6, (s16)0x3B20, (s16)0x3A82, (s16)0x39DA, (s16)0x392A,
-        (s16)0x3871, (s16)0x37AF, (s16)0x36E5, (s16)0x3612, (s16)0x3536, (s16)0x3453,
-        (s16)0x3367, (s16)0x3274, (s16)0x3179, (s16)0x3076, (s16)0x2F6B, (s16)0x2E5A,
-        (s16)0x2D41, (s16)0x2C21, (s16)0x2AFA, (s16)0x29CD, (s16)0x2899, (s16)0x275F,
-        (s16)0x261F, (s16)0x24DA, (s16)0x238E, (s16)0x223D, (s16)0x20E7, (s16)0x1F8B,
-        (s16)0x1E2B, (s16)0x1CC6, (s16)0x1B5D, (s16)0x19EF, (s16)0x187D, (s16)0x1708,
-        (s16)0x158F, (s16)0x1413, (s16)0x1294, (s16)0x1111, (s16)0x0F8C, (s16)0x0E05,
-        (s16)0x0C7C, (s16)0x0AF1, (s16)0x0964, (s16)0x07D5, (s16)0x0645, (s16)0x04B5,
-        (s16)0x0323, (s16)0x0192, (s16)0x0000, (s16)0xFE6E, (s16)0xFCDD, (s16)0xFB4B,
-        (s16)0xF9BB, (s16)0xF82B, (s16)0xF69C, (s16)0xF50F, (s16)0xF384, (s16)0xF1FB,
-        (s16)0xF074, (s16)0xEEEF, (s16)0xED6C, (s16)0xEBED, (s16)0xEA71, (s16)0xE8F8,
-        (s16)0xE783, (s16)0xE611, (s16)0xE4A3, (s16)0xE33A, (s16)0xE1D5, (s16)0xE075,
-        (s16)0xDF19, (s16)0xDDC3, (s16)0xDC72, (s16)0xDB26, (s16)0xD9E1, (s16)0xD8A1,
-        (s16)0xD767, (s16)0xD633, (s16)0xD506, (s16)0xD3DF, (s16)0xD2BF, (s16)0xD1A6,
-        (s16)0xD095, (s16)0xCF8A, (s16)0xCE87, (s16)0xCD8C, (s16)0xCC99, (s16)0xCBAD,
-        (s16)0xCACA, (s16)0xC9EE, (s16)0xC91B, (s16)0xC851, (s16)0xC78F, (s16)0xC6D6,
-        (s16)0xC626, (s16)0xC57E, (s16)0xC4E0, (s16)0xC44A, (s16)0xC3BE, (s16)0xC33B,
-        (s16)0xC2C2, (s16)0xC252, (s16)0xC1EC, (s16)0xC18F, (s16)0xC13B, (s16)0xC0F2,
-        (s16)0xC0B2, (s16)0xC07C, (s16)0xC04F, (s16)0xC02D, (s16)0xC014, (s16)0xC005,
-        (s16)0xC000, (s16)0xC005, (s16)0xC014, (s16)0xC02D, (s16)0xC04F, (s16)0xC07C,
-        (s16)0xC0B2, (s16)0xC0F2, (s16)0xC13B, (s16)0xC18F, (s16)0xC1EC, (s16)0xC252,
-        (s16)0xC2C2, (s16)0xC33B, (s16)0xC3BE, (s16)0xC44A, (s16)0xC4E0, (s16)0xC57E,
-        (s16)0xC626, (s16)0xC6D6, (s16)0xC78F, (s16)0xC851, (s16)0xC91B, (s16)0xC9EE,
-        (s16)0xCACA, (s16)0xCBAD, (s16)0xCC99, (s16)0xCD8C, (s16)0xCE87, (s16)0xCF8A,
-        (s16)0xD095, (s16)0xD1A6, (s16)0xD2BF, (s16)0xD3DF, (s16)0xD506, (s16)0xD633,
-        (s16)0xD767, (s16)0xD8A1, (s16)0xD9E1, (s16)0xDB26, (s16)0xDC72, (s16)0xDDC3,
-        (s16)0xDF19, (s16)0xE075, (s16)0xE1D5, (s16)0xE33A, (s16)0xE4A3, (s16)0xE611,
-        (s16)0xE783, (s16)0xE8F8, (s16)0xEA71, (s16)0xEBED, (s16)0xED6C, (s16)0xEEEF,
-        (s16)0xF074, (s16)0xF1FB, (s16)0xF384, (s16)0xF50F, (s16)0xF69C, (s16)0xF82B,
-        (s16)0xF9BB, (s16)0xFB4B, (s16)0xFCDD, (s16)0xFE6E };
+    = { (s16)0x0000, (s16)0x0192, (s16)0x0323, (s16)0x04B5, (s16)0x0645, (s16)0x07D5, (s16)0x0964, (s16)0x0AF1, (s16)0x0C7C, (s16)0x0E05,
+        (s16)0x0F8C, (s16)0x1111, (s16)0x1294, (s16)0x1413, (s16)0x158F, (s16)0x1708, (s16)0x187D, (s16)0x19EF, (s16)0x1B5D, (s16)0x1CC6,
+        (s16)0x1E2B, (s16)0x1F8B, (s16)0x20E7, (s16)0x223D, (s16)0x238E, (s16)0x24DA, (s16)0x261F, (s16)0x275F, (s16)0x2899, (s16)0x29CD,
+        (s16)0x2AFA, (s16)0x2C21, (s16)0x2D41, (s16)0x2E5A, (s16)0x2F6B, (s16)0x3076, (s16)0x3179, (s16)0x3274, (s16)0x3367, (s16)0x3453,
+        (s16)0x3536, (s16)0x3612, (s16)0x36E5, (s16)0x37AF, (s16)0x3871, (s16)0x392A, (s16)0x39DA, (s16)0x3A82, (s16)0x3B20, (s16)0x3BB6,
+        (s16)0x3C42, (s16)0x3CC5, (s16)0x3D3E, (s16)0x3DAE, (s16)0x3E14, (s16)0x3E71, (s16)0x3EC5, (s16)0x3F0E, (s16)0x3F4E, (s16)0x3F84,
+        (s16)0x3FB1, (s16)0x3FD3, (s16)0x3FEC, (s16)0x3FFB, (s16)0x4000, (s16)0x3FFB, (s16)0x3FEC, (s16)0x3FD3, (s16)0x3FB1, (s16)0x3F84,
+        (s16)0x3F4E, (s16)0x3F0E, (s16)0x3EC5, (s16)0x3E71, (s16)0x3E14, (s16)0x3DAE, (s16)0x3D3E, (s16)0x3CC5, (s16)0x3C42, (s16)0x3BB6,
+        (s16)0x3B20, (s16)0x3A82, (s16)0x39DA, (s16)0x392A, (s16)0x3871, (s16)0x37AF, (s16)0x36E5, (s16)0x3612, (s16)0x3536, (s16)0x3453,
+        (s16)0x3367, (s16)0x3274, (s16)0x3179, (s16)0x3076, (s16)0x2F6B, (s16)0x2E5A, (s16)0x2D41, (s16)0x2C21, (s16)0x2AFA, (s16)0x29CD,
+        (s16)0x2899, (s16)0x275F, (s16)0x261F, (s16)0x24DA, (s16)0x238E, (s16)0x223D, (s16)0x20E7, (s16)0x1F8B, (s16)0x1E2B, (s16)0x1CC6,
+        (s16)0x1B5D, (s16)0x19EF, (s16)0x187D, (s16)0x1708, (s16)0x158F, (s16)0x1413, (s16)0x1294, (s16)0x1111, (s16)0x0F8C, (s16)0x0E05,
+        (s16)0x0C7C, (s16)0x0AF1, (s16)0x0964, (s16)0x07D5, (s16)0x0645, (s16)0x04B5, (s16)0x0323, (s16)0x0192, (s16)0x0000, (s16)0xFE6E,
+        (s16)0xFCDD, (s16)0xFB4B, (s16)0xF9BB, (s16)0xF82B, (s16)0xF69C, (s16)0xF50F, (s16)0xF384, (s16)0xF1FB, (s16)0xF074, (s16)0xEEEF,
+        (s16)0xED6C, (s16)0xEBED, (s16)0xEA71, (s16)0xE8F8, (s16)0xE783, (s16)0xE611, (s16)0xE4A3, (s16)0xE33A, (s16)0xE1D5, (s16)0xE075,
+        (s16)0xDF19, (s16)0xDDC3, (s16)0xDC72, (s16)0xDB26, (s16)0xD9E1, (s16)0xD8A1, (s16)0xD767, (s16)0xD633, (s16)0xD506, (s16)0xD3DF,
+        (s16)0xD2BF, (s16)0xD1A6, (s16)0xD095, (s16)0xCF8A, (s16)0xCE87, (s16)0xCD8C, (s16)0xCC99, (s16)0xCBAD, (s16)0xCACA, (s16)0xC9EE,
+        (s16)0xC91B, (s16)0xC851, (s16)0xC78F, (s16)0xC6D6, (s16)0xC626, (s16)0xC57E, (s16)0xC4E0, (s16)0xC44A, (s16)0xC3BE, (s16)0xC33B,
+        (s16)0xC2C2, (s16)0xC252, (s16)0xC1EC, (s16)0xC18F, (s16)0xC13B, (s16)0xC0F2, (s16)0xC0B2, (s16)0xC07C, (s16)0xC04F, (s16)0xC02D,
+        (s16)0xC014, (s16)0xC005, (s16)0xC000, (s16)0xC005, (s16)0xC014, (s16)0xC02D, (s16)0xC04F, (s16)0xC07C, (s16)0xC0B2, (s16)0xC0F2,
+        (s16)0xC13B, (s16)0xC18F, (s16)0xC1EC, (s16)0xC252, (s16)0xC2C2, (s16)0xC33B, (s16)0xC3BE, (s16)0xC44A, (s16)0xC4E0, (s16)0xC57E,
+        (s16)0xC626, (s16)0xC6D6, (s16)0xC78F, (s16)0xC851, (s16)0xC91B, (s16)0xC9EE, (s16)0xCACA, (s16)0xCBAD, (s16)0xCC99, (s16)0xCD8C,
+        (s16)0xCE87, (s16)0xCF8A, (s16)0xD095, (s16)0xD1A6, (s16)0xD2BF, (s16)0xD3DF, (s16)0xD506, (s16)0xD633, (s16)0xD767, (s16)0xD8A1,
+        (s16)0xD9E1, (s16)0xDB26, (s16)0xDC72, (s16)0xDDC3, (s16)0xDF19, (s16)0xE075, (s16)0xE1D5, (s16)0xE33A, (s16)0xE4A3, (s16)0xE611,
+        (s16)0xE783, (s16)0xE8F8, (s16)0xEA71, (s16)0xEBED, (s16)0xED6C, (s16)0xEEEF, (s16)0xF074, (s16)0xF1FB, (s16)0xF384, (s16)0xF50F,
+        (s16)0xF69C, (s16)0xF82B, (s16)0xF9BB, (s16)0xFB4B, (s16)0xFCDD, (s16)0xFE6E };
 
 void BgAffineSet(struct BgAffineSrcData *src, struct BgAffineDstData *dest, s32 count)
 {
@@ -1073,8 +1038,7 @@ static const uint16_t bgMapSizes[][2] = {
 #define applySpriteHorizontalMosaicEffect(x) (x - (x % (mosaicSpriteEffectX + 1)))
 #define applySpriteVerticalMosaicEffect(y)   (y - (y % (mosaicSpriteEffectY + 1)))
 
-static void RenderBGScanline(int bgNum, uint16_t control, uint16_t hoffs, uint16_t voffs,
-                             int lineNum, uint16_t *line)
+static void RenderBGScanline(int bgNum, uint16_t control, uint16_t hoffs, uint16_t voffs, int lineNum, uint16_t *line)
 {
     unsigned int charBaseBlock = (control >> 2) & 3;
     unsigned int screenBaseBlock = (control >> 8) & 0x1F;
@@ -1223,8 +1187,7 @@ static inline uint16_t getBgPD(int bgNumber)
     return 0;
 }
 
-static void RenderRotScaleBGScanline(int bgNum, uint16_t control, uint16_t x, uint16_t y,
-                                     int lineNum, uint16_t *line)
+static void RenderRotScaleBGScanline(int bgNum, uint16_t control, uint16_t x, uint16_t y, int lineNum, uint16_t *line)
 {
     vBgCnt *bgcnt = (vBgCnt *)&control;
     unsigned int charBaseBlock = bgcnt->charBaseBlock;
@@ -1360,12 +1323,9 @@ static uint16_t alphaBlendColor(uint16_t targetA, uint16_t targetB)
     unsigned int eva = REG_BLDALPHA & 0x1F;
     unsigned int evb = (REG_BLDALPHA >> 8) & 0x1F;
     // shift right by 4 = division by 16
-    unsigned int r
-        = ((getRedChannel(targetA) * eva) + (getRedChannel(targetB) * evb)) >> 4;
-    unsigned int g
-        = ((getGreenChannel(targetA) * eva) + (getGreenChannel(targetB) * evb)) >> 4;
-    unsigned int b
-        = ((getBlueChannel(targetA) * eva) + (getBlueChannel(targetB) * evb)) >> 4;
+    unsigned int r = ((getRedChannel(targetA) * eva) + (getRedChannel(targetB) * evb)) >> 4;
+    unsigned int g = ((getGreenChannel(targetA) * eva) + (getGreenChannel(targetB) * evb)) >> 4;
+    unsigned int b = ((getBlueChannel(targetA) * eva) + (getBlueChannel(targetB) * evb)) >> 4;
 
     if (r > 31)
         r = 31;
@@ -1381,8 +1341,7 @@ static uint16_t alphaBrightnessIncrease(uint16_t targetA)
 {
     unsigned int evy = (REG_BLDY & 0x1F);
     unsigned int r = getRedChannel(targetA) + (31 - getRedChannel(targetA)) * evy / 16;
-    unsigned int g
-        = getGreenChannel(targetA) + (31 - getGreenChannel(targetA)) * evy / 16;
+    unsigned int g = getGreenChannel(targetA) + (31 - getGreenChannel(targetA)) * evy / 16;
     unsigned int b = getBlueChannel(targetA) + (31 - getBlueChannel(targetA)) * evy / 16;
 
     if (r > 31)
@@ -1414,31 +1373,26 @@ static uint16_t alphaBrightnessDecrease(uint16_t targetA)
 
 // outputs the blended pixel in colorOutput, the prxxx are the bg priority and
 // subpriority, pixelpos is pixel offset in scanline
-static bool alphaBlendSelectTargetB(struct scanlineData *scanline, uint16_t *colorOutput,
-                                    char prnum, char prsub, int pixelpos,
+static bool alphaBlendSelectTargetB(struct scanlineData *scanline, uint16_t *colorOutput, char prnum, char prsub, int pixelpos,
                                     bool spriteBlendEnabled)
 {
     // iterate trough every possible bg to blend with, starting from specified priorities
     // from arguments
     for (unsigned int blndprnum = prnum; blndprnum <= 3; blndprnum++) {
         // check if sprite is available to blend with, if sprite blending is enabled
-        if (spriteBlendEnabled == true
-            && getAlphaBit(scanline->spriteLayers[blndprnum][pixelpos]) == 1) {
+        if (spriteBlendEnabled == true && getAlphaBit(scanline->spriteLayers[blndprnum][pixelpos]) == 1) {
             *colorOutput = scanline->spriteLayers[blndprnum][pixelpos];
             return true;
         }
 
-        for (unsigned int blndprsub = prsub;
-             blndprsub < scanline->prioritySortedBgsCount[blndprnum]; blndprsub++) {
+        for (unsigned int blndprsub = prsub; blndprsub < scanline->prioritySortedBgsCount[blndprnum]; blndprsub++) {
             char currLayer = scanline->prioritySortedBgs[blndprnum][blndprsub];
-            if (getAlphaBit(scanline->layers[currLayer][pixelpos]) == 1
-                && REG_BLDCNT & (1 << (8 + currLayer)) && isbgEnabled(currLayer)) {
+            if (getAlphaBit(scanline->layers[currLayer][pixelpos]) == 1 && REG_BLDCNT & (1 << (8 + currLayer)) && isbgEnabled(currLayer)) {
                 *colorOutput = scanline->layers[currLayer][pixelpos];
                 return true;
             }
             // if we hit a non target layer we should bail
-            if (getAlphaBit(scanline->layers[currLayer][pixelpos]) == 1
-                && isbgEnabled(currLayer) && prnum != blndprnum) {
+            if (getAlphaBit(scanline->layers[currLayer][pixelpos]) == 1 && isbgEnabled(currLayer) && prnum != blndprnum) {
                 return false;
             }
         }
@@ -1472,8 +1426,7 @@ static bool winCheckHorizontalBounds(u16 left, u16 right, u16 xpos)
 }
 
 // Parts of this code heavily borrowed from NanoboyAdvance.
-static void DrawSprites(struct scanlineData *scanline, uint16_t vcount,
-                        bool windowsEnabled)
+static void DrawSprites(struct scanlineData *scanline, uint16_t vcount, bool windowsEnabled)
 {
     int i;
     unsigned int x;
@@ -1569,9 +1522,7 @@ static void DrawSprites(struct scanlineData *scanline, uint16_t vcount,
 
         // Does this sprite actually draw on this scanline?
         if (vcount >= (y - half_height) && vcount < (y + half_height)) {
-            int local_y = (oam->split.mosaic == 1)
-                ? applySpriteVerticalMosaicEffect(vcount) - y
-                : vcount - y;
+            int local_y = (oam->split.mosaic == 1) ? applySpriteVerticalMosaicEffect(vcount) - y : vcount - y;
             int number = oam->split.tileNum;
             int palette = oam->split.paletteNum;
             bool flipX = !isAffine && ((oam->split.matrixNum >> 3) & 1);
@@ -1594,17 +1545,11 @@ static void DrawSprites(struct scanlineData *scanline, uint16_t vcount,
                     // mosaic effect has to be applied to global coordinates otherwise
                     // the mosaic will scroll
                     local_mosaicX = applySpriteHorizontalMosaicEffect(global_x) - x;
-                    tex_x
-                        = ((matrix[0][0] * local_mosaicX + matrix[0][1] * local_y) >> 8)
-                        + (width / 2);
-                    tex_y
-                        = ((matrix[1][0] * local_mosaicX + matrix[1][1] * local_y) >> 8)
-                        + (height / 2);
+                    tex_x = ((matrix[0][0] * local_mosaicX + matrix[0][1] * local_y) >> 8) + (width / 2);
+                    tex_y = ((matrix[1][0] * local_mosaicX + matrix[1][1] * local_y) >> 8) + (height / 2);
                 } else {
-                    tex_x = ((matrix[0][0] * local_x + matrix[0][1] * local_y) >> 8)
-                        + (width / 2);
-                    tex_y = ((matrix[1][0] * local_x + matrix[1][1] * local_y) >> 8)
-                        + (height / 2);
+                    tex_x = ((matrix[0][0] * local_x + matrix[0][1] * local_y) >> 8) + (width / 2);
+                    tex_y = ((matrix[1][0] * local_x + matrix[1][1] * local_y) >> 8) + (height / 2);
                 }
 
                 /* Check if transformed coordinates are inside bounds. */
@@ -1621,21 +1566,18 @@ static void DrawSprites(struct scanlineData *scanline, uint16_t vcount,
                 int tile_y = tex_y % 8;
                 int block_x = tex_x / 8;
                 int block_y = tex_y / 8;
-                int block_offset
-                    = ((block_y * (REG_DISPCNT & 0x40 ? (width / 8) : 16)) + block_x);
+                int block_offset = ((block_y * (REG_DISPCNT & 0x40 ? (width / 8) : 16)) + block_x);
                 uint16_t pixel = 0;
 
                 if (!is8BPP) {
-                    pixel = tiledata[(block_offset + oam->split.tileNum) * 32
-                                     + (tile_y * 4) + (tile_x / 2)];
+                    pixel = tiledata[(block_offset + oam->split.tileNum) * 32 + (tile_y * 4) + (tile_x / 2)];
                     if (tile_x & 1)
                         pixel >>= 4;
                     else
                         pixel &= 0xF;
                     palette += oam->split.paletteNum * 16;
                 } else {
-                    pixel = tiledata[(block_offset * 2 + oam->split.tileNum) * 32
-                                     + (tile_y * 8) + tile_x];
+                    pixel = tiledata[(block_offset * 2 + oam->split.tileNum) * 32 + (tile_y * 8) + tile_x];
                 }
 
                 if (pixel != 0) {
@@ -1651,20 +1593,14 @@ static void DrawSprites(struct scanlineData *scanline, uint16_t vcount,
                     // this code runs if pixel is to be drawn
                     if (global_x < DISPLAY_WIDTH && global_x >= 0) {
                         // check if its enabled in the window (if window is enabled)
-                        winShouldBlendPixel
-                            = (windowsEnabled == false
-                               || scanline->winMask[global_x] & WINMASK_CLR);
+                        winShouldBlendPixel = (windowsEnabled == false || scanline->winMask[global_x] & WINMASK_CLR);
 
                         // has to be separated from the blend mode switch statement
                         // because of OBJ semi transparancy feature
-                        if ((blendMode == 1 && REG_BLDCNT & BLDCNT_TGT1_OBJ
-                             && winShouldBlendPixel)
-                            || isSemiTransparent) {
+                        if ((blendMode == 1 && REG_BLDCNT & BLDCNT_TGT1_OBJ && winShouldBlendPixel) || isSemiTransparent) {
                             uint16_t targetA = color;
                             uint16_t targetB = 0;
-                            if (alphaBlendSelectTargetB(scanline, &targetB,
-                                                        oam->split.priority, 0, global_x,
-                                                        false)) {
+                            if (alphaBlendSelectTargetB(scanline, &targetB, oam->split.priority, 0, global_x, false)) {
                                 color = alphaBlendColor(targetA, targetB);
                             }
                         } else if (REG_BLDCNT & BLDCNT_TGT1_OBJ && winShouldBlendPixel) {
@@ -1721,8 +1657,7 @@ static void DrawScanline(uint16_t *pixels, uint16_t vcount)
                     uint16_t bghoffs = *(uint16_t *)(REG_ADDR_BG0HOFS + bgnum * 4);
                     uint16_t bgvoffs = *(uint16_t *)(REG_ADDR_BG0VOFS + bgnum * 4);
 
-                    RenderBGScanline(bgnum, scanline.bgcnts[bgnum], bghoffs, bgvoffs,
-                                     vcount, scanline.layers[bgnum]);
+                    RenderBGScanline(bgnum, scanline.bgcnts[bgnum], bghoffs, bgvoffs, vcount, scanline.layers[bgnum]);
                 }
             }
 
@@ -1731,8 +1666,7 @@ static void DrawScanline(uint16_t *pixels, uint16_t vcount)
             // BG2 is affine
             bgnum = 2;
             if (isbgEnabled(bgnum)) {
-                RenderRotScaleBGScanline(bgnum, scanline.bgcnts[bgnum], REG_BG2X,
-                                         REG_BG2Y, vcount, scanline.layers[bgnum]);
+                RenderRotScaleBGScanline(bgnum, scanline.bgcnts[bgnum], REG_BG2X, REG_BG2Y, vcount, scanline.layers[bgnum]);
             }
             // BG0 and BG1 are text mode
             for (bgnum = 1; bgnum >= 0; bgnum--) {
@@ -1740,8 +1674,7 @@ static void DrawScanline(uint16_t *pixels, uint16_t vcount)
                     uint16_t bghoffs = *(uint16_t *)(REG_ADDR_BG0HOFS + bgnum * 4);
                     uint16_t bgvoffs = *(uint16_t *)(REG_ADDR_BG0VOFS + bgnum * 4);
 
-                    RenderBGScanline(bgnum, scanline.bgcnts[bgnum], bghoffs, bgvoffs,
-                                     vcount, scanline.layers[bgnum]);
+                    RenderBGScanline(bgnum, scanline.bgcnts[bgnum], bghoffs, bgvoffs, vcount, scanline.layers[bgnum]);
                 }
             }
             break;
@@ -1817,8 +1750,7 @@ static void DrawScanline(uint16_t *pixels, uint16_t vcount)
 
     // iterate trough every priority in order
     for (prnum = 3; prnum >= 0; prnum--) {
-        for (char prsub = scanline.prioritySortedBgsCount[prnum] - 1; prsub >= 0;
-             prsub--) {
+        for (char prsub = scanline.prioritySortedBgsCount[prnum] - 1; prsub >= 0; prsub--) {
             char bgnum = scanline.prioritySortedBgs[prnum][prsub];
             // if background is enabled then draw it
             if (isbgEnabled(bgnum)) {
@@ -1846,12 +1778,9 @@ static void DrawScanline(uint16_t *pixels, uint16_t vcount)
 
                         switch (blendMode) {
                             case 1:
-                                isSpriteBlendingEnabled
-                                    = REG_BLDCNT & BLDCNT_TGT2_OBJ ? 1 : 0;
+                                isSpriteBlendingEnabled = REG_BLDCNT & BLDCNT_TGT2_OBJ ? 1 : 0;
                                 // find targetB and blend it
-                                if (alphaBlendSelectTargetB(&scanline, &targetB, prnum,
-                                                            prsub + 1, xpos,
-                                                            isSpriteBlendingEnabled)) {
+                                if (alphaBlendSelectTargetB(&scanline, &targetB, prnum, prsub + 1, xpos, isSpriteBlendingEnabled)) {
                                     color = alphaBlendColor(targetA, targetB);
                                 }
                                 break;
diff --git a/src/platform/shared/common.c b/src/platform/shared/common.c
index 72411ae08..ff840fb41 100644
--- a/src/platform/shared/common.c
+++ b/src/platform/shared/common.c
@@ -15,13 +15,13 @@ IntrFunc INTR_VECTOR = IntrMain;
 
 void IntrMain(void)
 {
-#define CHECK_INTR(res, input, flags)                                                   \
-    {                                                                                   \
-        res = input & flags;                                                            \
-        if (res) {                                                                      \
-            goto found_instr;                                                           \
-        }                                                                               \
-        index++;                                                                        \
+#define CHECK_INTR(res, input, flags)                                                                                                      \
+    {                                                                                                                                      \
+        res = input & flags;                                                                                                               \
+        if (res) {                                                                                                                         \
+            goto found_instr;                                                                                                              \
+        }                                                                                                                                  \
+        index++;                                                                                                                           \
     }
 
     u16 flags = REG_IE & REG_IF;
diff --git a/src/platform/shared/m4a_stub.c b/src/platform/shared/m4a_stub.c
index 798bb443d..8846b45a9 100644
--- a/src/platform/shared/m4a_stub.c
+++ b/src/platform/shared/m4a_stub.c
@@ -6,10 +6,7 @@
 struct SoundInfo sSoundInfo = { 0 };
 struct SoundInfo *SOUND_INFO_PTR = &sSoundInfo;
 
-u32 umul3232H32(u32 multiplier, u32 multiplicand)
-{
-    return ((u64)multiplier * (u64)multiplicand) >> 32;
-}
+u32 umul3232H32(u32 multiplier, u32 multiplicand) { return ((u64)multiplier * (u64)multiplicand) >> 32; }
 
 void TrackStop(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track) { }
 void SoundMain(void) { }
diff --git a/src/platform/shared/stub.c b/src/platform/shared/stub.c
index 886fe8654..480c7ffe4 100644
--- a/src/platform/shared/stub.c
+++ b/src/platform/shared/stub.c
@@ -14,20 +14,14 @@ char gNumMusicPlayers = 4;
 int gMaxLines = 0;
 
 // collision
-u32 sub_800D0A0(Sprite *s, s16 x, s16 y, s16 param3, s16 param4, u8 param5, u32 param6)
-{
-    return 0;
-}
+u32 sub_800D0A0(Sprite *s, s16 x, s16 y, s16 param3, s16 param4, u8 param5, u32 param6) { return 0; }
 
 // boss_5
 void sub_802E784(u16 p0, u16 p1, u16 p2, s16 x, s16 y, s16 p5) { }
 
 // math
 void sub_80835E0(struct UNK_8085F1C *p0, s32 *p1) { }
-void sub_8083B88(struct UNK_8085F1C_1 *p0, struct UNK_8085F1C_1 *p1,
-                 struct UNK_8085F1C_1 *p2)
-{
-}
+void sub_8083B88(struct UNK_8085F1C_1 *p0, struct UNK_8085F1C_1 *p1, struct UNK_8085F1C_1 *p2) { }
 void sub_8084B54(struct UNK_8085F1C_1 *p0, u16 p1, u16 p2, u16 p3) { }
 
 // TEMP
diff --git a/src/platform/win32/win32.c b/src/platform/win32/win32.c
index bd8bd774f..195863db4 100644
--- a/src/platform/win32/win32.c
+++ b/src/platform/win32/win32.c
@@ -12,8 +12,7 @@ extern void GameLoop(void);
 
 DWORD WINAPI GameThread(void *pThreadParam);
 
-int WINAPI WinMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR lpCmdLine,
-                   int nShowCmd)
+int WINAPI WinMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR lpCmdLine, int nShowCmd)
 {
     // Allocate a console.
     // This is necessary for using print functions when using an application with the
diff --git a/src/sakit/collect_ring_effect.c b/src/sakit/collect_ring_effect.c
index e83cf3769..f98cb12a5 100644
--- a/src/sakit/collect_ring_effect.c
+++ b/src/sakit/collect_ring_effect.c
@@ -24,8 +24,7 @@ extern struct SongHeader se_ring_copy;
 void CreateCollectRingEffect(s16 x, s16 y)
 {
     if (gActiveCollectRingEffectCount < 8) {
-        struct Task *t
-            = TaskCreate(Task_CollectRingEffect, sizeof(RingEffect), 0x2000, 0, NULL);
+        struct Task *t = TaskCreate(Task_CollectRingEffect, sizeof(RingEffect), 0x2000, 0, NULL);
         RingEffect *re = TASK_DATA(t);
         Sprite *s = &re->s;
 
diff --git a/src/sakit/collision.c b/src/sakit/collision.c
index 088702be4..d4f604bd5 100644
--- a/src/sakit/collision.c
+++ b/src/sakit/collision.c
@@ -17,8 +17,7 @@
 #include "constants/player_transitions.h"
 #include "constants/songs.h"
 
-u32 CheckRectCollision_SpritePlayer(Sprite *s, s32 sx, s32 sy, Player *p,
-                                    struct Rect8 *rectPlayer)
+u32 CheckRectCollision_SpritePlayer(Sprite *s, s32 sx, s32 sy, Player *p, struct Rect8 *rectPlayer)
 {
     u32 result = 0;
 
@@ -51,8 +50,7 @@ u32 sub_800C060(Sprite *s, s32 sx, s32 sy, Player *p)
         ip = TRUE;
     }
 
-    if (RECT_COLLISION_2(sx, sy, &s->hitboxes[0], p->x, p->y, (struct Rect8 *)rectPlayer)
-        && (p->speedAirY >= 0)) {
+    if (RECT_COLLISION_2(sx, sy, &s->hitboxes[0], p->x, p->y, (struct Rect8 *)rectPlayer) && (p->speedAirY >= 0)) {
 
 #ifndef NON_MATCHING
         register s32 y asm("r1");
@@ -108,8 +106,7 @@ bool32 sub_800C204(Sprite *s, s32 sx, s32 sy, s16 hbIndex, Player *p, s16 hbInde
         return FALSE;
     }
 
-    if ((HB_COLLISION(sx, sy, s->hitboxes[hbIndex], I(p->x), I(p->y),
-                      sprPlayer->hitboxes[hbIndexPlayer]))) {
+    if ((HB_COLLISION(sx, sy, s->hitboxes[hbIndex], I(p->x), I(p->y), sprPlayer->hitboxes[hbIndexPlayer]))) {
         return TRUE;
     }
 
@@ -133,8 +130,7 @@ bool32 sub_800C320(Sprite *s, s32 sx, s32 sy, s16 hbIndex, Player *p)
         return FALSE;
     }
 
-    if ((HB_COLLISION(sx, sy, s->hitboxes[hbIndex], I(p->x), I(p->y),
-                      sprPlayer->hitboxes[1]))) {
+    if ((HB_COLLISION(sx, sy, s->hitboxes[hbIndex], I(p->x), I(p->y), sprPlayer->hitboxes[1]))) {
         Collision_AdjustPlayerSpeed(p);
         return TRUE;
     }
@@ -159,8 +155,7 @@ bool32 IsColliding_Cheese(Sprite *sprTarget, s32 sx, s32 sy, s16 hbIndex, Player
             return FALSE;
         }
 
-        if ((HB_COLLISION(sx, sy, sprTarget->hitboxes[hbIndex], I(cheese->posX),
-                          I(cheese->posY), cheese->s.hitboxes[1]))) {
+        if ((HB_COLLISION(sx, sy, sprTarget->hitboxes[hbIndex], I(cheese->posX), I(cheese->posY), cheese->s.hitboxes[1]))) {
             return TRUE;
         }
     }
@@ -169,8 +164,7 @@ bool32 IsColliding_Cheese(Sprite *sprTarget, s32 sx, s32 sy, s16 hbIndex, Player
 }
 
 // (92.68%) https://decomp.me/scratch/CcZm5
-NONMATCH("asm/non_matching/sakit/coll__sub_800C4FC.inc",
-         bool32 sub_800C4FC(Sprite *s, s32 sx, s32 sy, u8 hbIndex))
+NONMATCH("asm/non_matching/sakit/coll__sub_800C4FC.inc", bool32 sub_800C4FC(Sprite *s, s32 sx, s32 sy, u8 hbIndex))
 {
     PlayerSpriteInfo *psi = gPlayer.unk90;
     Sprite *sprPlayer = &psi->s;
@@ -185,8 +179,7 @@ NONMATCH("asm/non_matching/sakit/coll__sub_800C4FC.inc",
 
     movestate = gPlayer.moveState;
     if (PLAYER_IS_ALIVE) {
-        if (IS_MULTI_PLAYER
-            && ((s8)eb->base.me->x == (s8)MAP_ENTITY_STATE_MINUS_THREE)) {
+        if (IS_MULTI_PLAYER && ((s8)eb->base.me->x == (s8)MAP_ENTITY_STATE_MINUS_THREE)) {
             // _0800C550 + 0x1C
             CreateDustCloud(sx, sy);
             CreateTrappedAnimal(sx, sy);
@@ -197,8 +190,7 @@ NONMATCH("asm/non_matching/sakit/coll__sub_800C4FC.inc",
             if (HITBOX_IS_ACTIVE(sprPlayer->hitboxes[1])) {
                 // _0800C5A4 + 0xC
 
-                if (HB_COLLISION(sx, sy, s->hitboxes[hbIndex], I(gPlayer.x),
-                                 I(gPlayer.y), sprPlayer->hitboxes[1])) {
+                if (HB_COLLISION(sx, sy, s->hitboxes[hbIndex], I(gPlayer.x), I(gPlayer.y), sprPlayer->hitboxes[1])) {
                     // _0800C648
                     if (IS_MULTI_PLAYER) {
                         struct UNK_3005510 *v = sub_8019224();
@@ -220,8 +212,7 @@ NONMATCH("asm/non_matching/sakit/coll__sub_800C4FC.inc",
             // _0800C674:
 
             if (HITBOX_IS_ACTIVE(sprPlayer->hitboxes[0])
-                && (HB_COLLISION(sx, sy, s->hitboxes[hbIndex], I(gPlayer.x),
-                                 I(gPlayer.y), sprPlayer->hitboxes[0]))) {
+                && (HB_COLLISION(sx, sy, s->hitboxes[hbIndex], I(gPlayer.x), I(gPlayer.y), sprPlayer->hitboxes[0]))) {
                 if (!(gPlayer.itemEffect & PLAYER_ITEM_EFFECT__INVINCIBILITY)) {
                     sub_800CBA4(&gPlayer);
                 } else {
@@ -245,8 +236,7 @@ NONMATCH("asm/non_matching/sakit/coll__sub_800C4FC.inc",
         if (gCheese != NULL) {
             Cheese *cheese = gCheese;
             if (cheese->s.hitboxes[1].index != -1
-                && ((HB_COLLISION(sx, sy, s->hitboxes[hbIndex], I(cheese->posX),
-                                  I(cheese->posY), cheese->s.hitboxes[1])))) {
+                && ((HB_COLLISION(sx, sy, s->hitboxes[hbIndex], I(cheese->posX), I(cheese->posY), cheese->s.hitboxes[1])))) {
                 if (IS_MULTI_PLAYER) {
                     struct UNK_3005510 *v = sub_8019224();
                     v->unk0 = 3;
@@ -286,8 +276,7 @@ bool32 sub_800C84C(Sprite *s, s32 sx, s32 sy)
             return result;
         }
 
-        if ((HB_COLLISION(sx, sy, s->hitboxes[0], I(p->x), I(p->y),
-                          sprPlayer->hitboxes[0]))) {
+        if ((HB_COLLISION(sx, sy, s->hitboxes[0], I(p->x), I(p->y), sprPlayer->hitboxes[0]))) {
             sub_800CBA4(p);
             result = TRUE;
         }
@@ -304,10 +293,8 @@ bool32 sub_800C944(Sprite *s, s32 sx, s32 sy)
     PlayerSpriteInfo *psi = p->unk90;
     Sprite *sprPlayer = &psi->s;
 
-    if (PLAYER_IS_ALIVE && HITBOX_IS_ACTIVE(sprPlayer->hitboxes[1])
-        && (HITBOX_IS_ACTIVE(s->hitboxes[0]))) {
-        if (HB_COLLISION(sx, sy, s->hitboxes[0], I(p->x), I(p->y),
-                         sprPlayer->hitboxes[1])) {
+    if (PLAYER_IS_ALIVE && HITBOX_IS_ACTIVE(sprPlayer->hitboxes[1]) && (HITBOX_IS_ACTIVE(s->hitboxes[0]))) {
+        if (HB_COLLISION(sx, sy, s->hitboxes[0], I(p->x), I(p->y), sprPlayer->hitboxes[1])) {
             result = TRUE;
         }
     }
@@ -320,11 +307,8 @@ bool32 sub_800CA20(Sprite *s, s32 sx, s32 sy, s16 hbIndex, Player *p)
     PlayerSpriteInfo *psi = p->unk90;
     Sprite *sprPlayer = &psi->s;
 
-    if (IS_ALIVE(p)
-        && (HITBOX_IS_ACTIVE(s->hitboxes[hbIndex])
-            && HITBOX_IS_ACTIVE(sprPlayer->hitboxes[0]))) {
-        if (HB_COLLISION(sx, sy, s->hitboxes[hbIndex], I(p->x), I(p->y),
-                         sprPlayer->hitboxes[0])) {
+    if (IS_ALIVE(p) && (HITBOX_IS_ACTIVE(s->hitboxes[hbIndex]) && HITBOX_IS_ACTIVE(sprPlayer->hitboxes[0]))) {
+        if (HB_COLLISION(sx, sy, s->hitboxes[hbIndex], I(p->x), I(p->y), sprPlayer->hitboxes[0])) {
             sub_800CBA4(p);
             return TRUE;
         }
@@ -411,8 +395,7 @@ bool32 sub_800CBA4(Player *p)
         }
     } else {
         m4aSongNumStart(SE_LIFE_LOST);
-        p->itemEffect &= ~(PLAYER_ITEM_EFFECT__SHIELD_MAGNETIC
-                           | PLAYER_ITEM_EFFECT__SHIELD_NORMAL);
+        p->itemEffect &= ~(PLAYER_ITEM_EFFECT__SHIELD_MAGNETIC | PLAYER_ITEM_EFFECT__SHIELD_NORMAL);
     }
 
     return TRUE;
diff --git a/src/sakit/collision_1.c b/src/sakit/collision_1.c
index 8a1ae9f16..531908019 100644
--- a/src/sakit/collision_1.c
+++ b/src/sakit/collision_1.c
@@ -18,8 +18,7 @@
 #include "constants/songs.h"
 
 // TODO: Maybe wrap sub_800DD54 and sub_800DE44 in a macro(?)
-u32 sub_800DA4C(Sprite *opponent, s16 oppX, s16 oppY, UNUSED s32 param3,
-                UNUSED s32 param4, u8 layer)
+u32 sub_800DA4C(Sprite *opponent, s16 oppX, s16 oppY, UNUSED s32 param3, UNUSED s32 param4, u8 layer)
 {
     MultiplayerPlayer *mpp;
     Sprite *mpPlayerSprite;
@@ -43,19 +42,15 @@ u32 sub_800DA4C(Sprite *opponent, s16 oppX, s16 oppY, UNUSED s32 param3,
     }
     // _0800DABC
 
-    if ((p->speedAirX == 0 && p->speedAirY == 0)
-        && HITBOX_IS_ACTIVE(opponent->hitboxes[1])) {
-        if (HB_COLLISION(oppX, oppY, opponent->hitboxes[1], mpp->pos.x, mpp->pos.y,
-                         mpPlayerSprite->hitboxes[0])) {
+    if ((p->speedAirX == 0 && p->speedAirY == 0) && HITBOX_IS_ACTIVE(opponent->hitboxes[1])) {
+        if (HB_COLLISION(oppX, oppY, opponent->hitboxes[1], mpp->pos.x, mpp->pos.y, mpPlayerSprite->hitboxes[0])) {
             // _0800DB68
             result |= COLL_FLAG_2;
         }
     }
     // _0800DB70
-    if (HITBOX_IS_ACTIVE(mpPlayerSprite->hitboxes[1])
-        && HITBOX_IS_ACTIVE(opponent->hitboxes[0])
-        && HB_COLLISION(oppX, oppY, opponent->hitboxes[0], mpp->pos.x, mpp->pos.y,
-                        mpPlayerSprite->hitboxes[1])) {
+    if (HITBOX_IS_ACTIVE(mpPlayerSprite->hitboxes[1]) && HITBOX_IS_ACTIVE(opponent->hitboxes[0])
+        && HB_COLLISION(oppX, oppY, opponent->hitboxes[0], mpp->pos.x, mpp->pos.y, mpPlayerSprite->hitboxes[1])) {
         // _0800DC34
         if (mpp->pos.x > oppX) {
             result |= COLL_FLAG_40000;
@@ -71,10 +66,8 @@ u32 sub_800DA4C(Sprite *opponent, s16 oppX, s16 oppY, UNUSED s32 param3,
         }
 
         result |= COLL_FLAG_1;
-    } else if (HITBOX_IS_ACTIVE(mpPlayerSprite->hitboxes[0])
-               && HITBOX_IS_ACTIVE(opponent->hitboxes[1])
-               && HB_COLLISION(oppX, oppY, opponent->hitboxes[1], mpp->pos.x, mpp->pos.y,
-                               mpPlayerSprite->hitboxes[0])) {
+    } else if (HITBOX_IS_ACTIVE(mpPlayerSprite->hitboxes[0]) && HITBOX_IS_ACTIVE(opponent->hitboxes[1])
+               && HB_COLLISION(oppX, oppY, opponent->hitboxes[1], mpp->pos.x, mpp->pos.y, mpPlayerSprite->hitboxes[0])) {
         result |= COLL_FLAG_2;
     }
 
diff --git a/src/sakit/demo_manager.c b/src/sakit/demo_manager.c
index 5dc6b868e..f900c0506 100644
--- a/src/sakit/demo_manager.c
+++ b/src/sakit/demo_manager.c
@@ -40,8 +40,7 @@ void CreateDemoManager(void)
 {
     u8 blendCtrl = gBldRegs.bldCnt & 0xC0;
     s8 lang = gLoadedSaveGame->language;
-    struct Task *t = TaskCreate(Task_DemoManagerMain, sizeof(DemoManager), 1, 0,
-                                TaskDestructor_DemoManagerMain);
+    struct Task *t = TaskCreate(Task_DemoManagerMain, sizeof(DemoManager), 1, 0, TaskDestructor_DemoManagerMain);
     DemoManager *dm = TASK_DATA(t);
     Sprite *s;
 
@@ -201,8 +200,7 @@ void TaskDestructor_DemoManagerMain(struct Task *t)
 
 void CreateMusicFadeoutTask(u16 factor)
 {
-    struct Task *t = TaskCreate(Task_DemoManagerMusicFadeout, sizeof(DemoMusicFadeout),
-                                0xFFFE, 0, NULL);
+    struct Task *t = TaskCreate(Task_DemoManagerMusicFadeout, sizeof(DemoMusicFadeout), 0xFFFE, 0, NULL);
     DemoMusicFadeout *mf = TASK_DATA(t);
     mf->volume = 0x100;
     mf->unk2 = (s32)mf->volume / factor;
diff --git a/src/sakit/enemy_defeat_score.c b/src/sakit/enemy_defeat_score.c
index 725201d08..2d25b7e5d 100644
--- a/src/sakit/enemy_defeat_score.c
+++ b/src/sakit/enemy_defeat_score.c
@@ -19,8 +19,7 @@ typedef struct {
 void CreateEnemyDefeatScore(s16 x, s16 y)
 {
     struct Task *t
-        = TaskCreate(Task_CreateEnemyDefeatScore_MoveUp, sizeof(EnemyDefeatScore),
-                     0x2000, 0, TaskDestructor_CreateEnemyDefeatScore);
+        = TaskCreate(Task_CreateEnemyDefeatScore_MoveUp, sizeof(EnemyDefeatScore), 0x2000, 0, TaskDestructor_CreateEnemyDefeatScore);
     EnemyDefeatScore *score = TASK_DATA(t);
     Sprite *s = &score->s;
 
diff --git a/src/sakit/entities_manager.c b/src/sakit/entities_manager.c
index 6d7269c16..65a805eba 100644
--- a/src/sakit/entities_manager.c
+++ b/src/sakit/entities_manager.c
@@ -369,14 +369,11 @@ const MapEntityInit gSpriteInits_Interactables[] = {
 };
 
 const MapEntityInit gSpriteInits_Enemies[] = {
-    CreateEntity_Mon,      CreateEntity_Kiki,         CreateEntity_Buzzer,
-    CreateEntity_Gohla,    CreateEntity_KuraKura,     CreateEntity_Kubinaga,
-    CreateEntity_PikoPiko, CreateEntity_Bell,         CreateEntity_Yado,
-    CreateEntity_Circus,   CreateEntity_Koura,        CreateEntity_Madillo,
-    CreateEntity_Straw,    CreateEntity_Hammerhead,   CreateEntity_Spinner,
-    CreateEntity_Mouse,    CreateEntity_Pen,          CreateEntity_GejiGeji,
-    CreateEntity_Balloon,  CreateEntity_Flickey,      CreateEntity_Kyura,
-    CreateEntity_Star,     CreateEntity_BulletBuzzer,
+    CreateEntity_Mon,      CreateEntity_Kiki,     CreateEntity_Buzzer,       CreateEntity_Gohla,      CreateEntity_KuraKura,
+    CreateEntity_Kubinaga, CreateEntity_PikoPiko, CreateEntity_Bell,         CreateEntity_Yado,       CreateEntity_Circus,
+    CreateEntity_Koura,    CreateEntity_Madillo,  CreateEntity_Straw,        CreateEntity_Hammerhead, CreateEntity_Spinner,
+    CreateEntity_Mouse,    CreateEntity_Pen,      CreateEntity_GejiGeji,     CreateEntity_Balloon,    CreateEntity_Flickey,
+    CreateEntity_Kyura,    CreateEntity_Star,     CreateEntity_BulletBuzzer,
 };
 
 #define NUM_ENEMY_DEFEAT_SCORES 5
@@ -570,10 +567,8 @@ NONMATCH("asm/non_matching/game/stage/SpawnMapEntities.inc", void SpawnMapEntiti
                             if ((s8)me->x >= -2) {
                                 s32 x = TO_WORLD_POS(me->x, regionX);
                                 s32 y = TO_WORLD_POS(me->y, regionY);
-                                if (x >= range.xLow && x <= range.xHigh
-                                    && y >= range.yLow && y <= range.yHigh) {
-                                    gSpriteInits_Interactables[me->index](me, regionX,
-                                                                          regionY, i);
+                                if (x >= range.xLow && x <= range.xHigh && y >= range.yLow && y <= range.yHigh) {
+                                    gSpriteInits_Interactables[me->index](me, regionX, regionY, i);
                                 }
                             }
                         }
@@ -588,16 +583,13 @@ NONMATCH("asm/non_matching/game/stage/SpawnMapEntities.inc", void SpawnMapEntiti
                     });
 
                     if (r6 != 0) {
-                        MapEntity_Itembox *me
-                            = (MapEntity_Itembox *)ReadMapEntity(itemBoxPositions, r6);
+                        MapEntity_Itembox *me = (MapEntity_Itembox *)ReadMapEntity(itemBoxPositions, r6);
                         for (i = 0; (s8)me->x != -1; me++, i++) {
                             if ((s8)me->x >= -2) {
                                 s32 x = TO_WORLD_POS(me->x, regionX);
                                 s32 y = TO_WORLD_POS(me->y, regionY);
-                                if (x >= range.xLow && x <= range.xHigh
-                                    && y >= range.yLow && y <= range.yHigh) {
-                                    CreateEntity_ItemBox((void *)me, regionX, regionY,
-                                                         i);
+                                if (x >= range.xLow && x <= range.xHigh && y >= range.yLow && y <= range.yHigh) {
+                                    CreateEntity_ItemBox((void *)me, regionX, regionY, i);
                                 }
                             }
                         }
@@ -618,10 +610,8 @@ NONMATCH("asm/non_matching/game/stage/SpawnMapEntities.inc", void SpawnMapEntiti
                             if ((s8)me->x >= -2) {
                                 s32 x = TO_WORLD_POS(me->x, regionX);
                                 s32 y = TO_WORLD_POS(me->y, regionY);
-                                if (x >= range.xLow && x <= range.xHigh
-                                    && y >= range.yLow && y <= range.yHigh) {
-                                    gSpriteInits_Enemies[me->index](me, regionX, regionY,
-                                                                    i);
+                                if (x >= range.xLow && x <= range.xHigh && y >= range.yLow && y <= range.yHigh) {
+                                    gSpriteInits_Enemies[me->index](me, regionX, regionY, i);
                                 }
                             }
                         }
@@ -635,10 +625,8 @@ NONMATCH("asm/non_matching/game/stage/SpawnMapEntities.inc", void SpawnMapEntiti
                             if ((s8)me->x >= -2) {
                                 s32 x = TO_WORLD_POS(me->x, regionX);
                                 s32 y = TO_WORLD_POS(me->y, regionY);
-                                if (x >= range.xLow && x <= range.xHigh
-                                    && y >= range.yLow && y <= range.yHigh) {
-                                    gSpriteInits_InteractablesMultiplayer[me->index](
-                                        me, regionX, regionY, i);
+                                if (x >= range.xLow && x <= range.xHigh && y >= range.yLow && y <= range.yHigh) {
+                                    gSpriteInits_InteractablesMultiplayer[me->index](me, regionX, regionY, i);
                                 }
                             }
                         }
@@ -677,15 +665,11 @@ NONMATCH("asm/non_matching/game/stage/Task_8008DCC.inc", void Task_8008DCC(void)
             SpawnMapEntities();
             return;
         }
-        if ((gCamera.x - em->prevCamX >= 0 ? gCamera.x - em->prevCamX
-                                           : em->prevCamX - gCamera.x)
-            > 248) {
+        if ((gCamera.x - em->prevCamX >= 0 ? gCamera.x - em->prevCamX : em->prevCamX - gCamera.x) > 248) {
             SpawnMapEntities();
             return;
         }
-        if ((gCamera.y - em->prevCamY >= 0 ? gCamera.y - em->prevCamY
-                                           : em->prevCamY - gCamera.y)
-            > 208) {
+        if ((gCamera.y - em->prevCamY >= 0 ? gCamera.y - em->prevCamY : em->prevCamY - gCamera.y) > 208) {
             SpawnMapEntities();
             return;
         }
@@ -798,8 +782,7 @@ NONMATCH("asm/non_matching/game/stage/Task_8008DCC.inc", void Task_8008DCC(void)
                 range2.yHigh = temp4 - 1;
             }
 
-            if (gCamera.x != em->prevCamX && range1.xLow != range1.xHigh
-                && range1.yLow != range1.yHigh) {
+            if (gCamera.x != em->prevCamX && range1.xLow != range1.xHigh && range1.yLow != range1.yHigh) {
                 regionY = I(range1.yLow);
 
                 while (Q(regionY) < range1.yHigh && regionY < v_regionCount) {
@@ -810,9 +793,7 @@ NONMATCH("asm/non_matching/game/stage/Task_8008DCC.inc", void Task_8008DCC(void)
                         MapEntity *me;
 
                         if (gGameMode != GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) {
-                            r6 = *(u32 *)(((u8 *)interactables)
-                                          + ((h_regionCount * regionY) * sizeof(u32))
-                                          + (regionX * sizeof(u32)));
+                            r6 = *(u32 *)(((u8 *)interactables) + ((h_regionCount * regionY) * sizeof(u32)) + (regionX * sizeof(u32)));
                             if (r6 != 0) {
                                 MapEntity *me;
                                 me = ReadMapEntity(interactables, r6);
@@ -820,43 +801,32 @@ NONMATCH("asm/non_matching/game/stage/Task_8008DCC.inc", void Task_8008DCC(void)
                                     if ((s8)me->x >= -2) {
                                         s32 x = TO_WORLD_POS(me->x, regionX);
                                         s32 y = TO_WORLD_POS(me->y, regionY);
-                                        if (x >= (s32)range1.xLow
-                                            && x <= (s32)range1.xHigh
-                                            && y >= (s32)range1.yLow
+                                        if (x >= (s32)range1.xLow && x <= (s32)range1.xHigh && y >= (s32)range1.yLow
                                             && y <= (s32)range1.yHigh) {
-                                            gSpriteInits_Interactables[me->index](
-                                                me, regionX, regionY, i);
+                                            gSpriteInits_Interactables[me->index](me, regionX, regionY, i);
                                         }
                                     }
                                 }
                             }
 
-                            r6 = *(u32 *)(((u8 *)itemBoxPositions)
-                                          + ((h_regionCount * regionY) * sizeof(u32))
-                                          + (regionX * sizeof(u32)));
+                            r6 = *(u32 *)(((u8 *)itemBoxPositions) + ((h_regionCount * regionY) * sizeof(u32)) + (regionX * sizeof(u32)));
 
                             if (r6 != 0) {
                                 MapEntity_Itembox *me;
-                                me = (MapEntity_Itembox *)ReadMapEntity(itemBoxPositions,
-                                                                        r6);
+                                me = (MapEntity_Itembox *)ReadMapEntity(itemBoxPositions, r6);
                                 for (i = 0; (s8)me->x != -1; me++, i++) {
                                     if ((s8)me->x >= -2) {
                                         s32 x = TO_WORLD_POS(me->x, regionX);
                                         s32 y = TO_WORLD_POS(me->y, regionY);
-                                        if (x >= (s32)range1.xLow
-                                            && x <= (s32)range1.xHigh
-                                            && y >= (s32)range1.yLow
+                                        if (x >= (s32)range1.xLow && x <= (s32)range1.xHigh && y >= (s32)range1.yLow
                                             && y <= (s32)range1.yHigh) {
-                                            CreateEntity_ItemBox((MapEntity *)me,
-                                                                 regionX, regionY, i);
+                                            CreateEntity_ItemBox((MapEntity *)me, regionX, regionY, i);
                                         }
                                     }
                                 }
                             }
 
-                            r6 = *(u32 *)(((u8 *)enemyPositions)
-                                          + ((h_regionCount * regionY) * sizeof(u32))
-                                          + (regionX * sizeof(u32)));
+                            r6 = *(u32 *)(((u8 *)enemyPositions) + ((h_regionCount * regionY) * sizeof(u32)) + (regionX * sizeof(u32)));
                             if (r6 != 0) {
                                 MapEntity *me;
                                 me = ReadMapEntity(enemyPositions, r6);
@@ -864,21 +834,16 @@ NONMATCH("asm/non_matching/game/stage/Task_8008DCC.inc", void Task_8008DCC(void)
                                     if ((s8)me->x >= -2) {
                                         s32 x = TO_WORLD_POS(me->x, regionX);
                                         s32 y = TO_WORLD_POS(me->y, regionY);
-                                        if (x >= (s32)range1.xLow
-                                            && x <= (s32)range1.xHigh
-                                            && y >= (s32)range1.yLow
+                                        if (x >= (s32)range1.xLow && x <= (s32)range1.xHigh && y >= (s32)range1.yLow
                                             && y <= (s32)range1.yHigh) {
-                                            gSpriteInits_Enemies[me->index](me, regionX,
-                                                                            regionY, i);
+                                            gSpriteInits_Enemies[me->index](me, regionX, regionY, i);
                                         }
                                     }
                                 }
                             }
 
                         } else {
-                            r6 = *(u32 *)(((u8 *)interactables)
-                                          + ((h_regionCount * regionY) * sizeof(u32))
-                                          + (regionX * sizeof(u32)));
+                            r6 = *(u32 *)(((u8 *)interactables) + ((h_regionCount * regionY) * sizeof(u32)) + (regionX * sizeof(u32)));
                             if (r6 != 0) {
                                 MapEntity *me;
                                 me = ReadMapEntity(interactables, r6);
@@ -886,12 +851,9 @@ NONMATCH("asm/non_matching/game/stage/Task_8008DCC.inc", void Task_8008DCC(void)
                                     if ((s8)me->x >= -2) {
                                         s32 x = TO_WORLD_POS(me->x, regionX);
                                         s32 y = TO_WORLD_POS(me->y, regionY);
-                                        if (x >= (s32)range1.xLow
-                                            && x <= (s32)range1.xHigh
-                                            && y >= (s32)range1.yLow
+                                        if (x >= (s32)range1.xLow && x <= (s32)range1.xHigh && y >= (s32)range1.yLow
                                             && y <= (s32)range1.yHigh) {
-                                            gSpriteInits_InteractablesMultiplayer
-                                                [me->index](me, regionX, regionY, i);
+                                            gSpriteInits_InteractablesMultiplayer[me->index](me, regionX, regionY, i);
                                         }
                                     }
                                 }
@@ -902,8 +864,7 @@ NONMATCH("asm/non_matching/game/stage/Task_8008DCC.inc", void Task_8008DCC(void)
                     regionY++;
                 }
             }
-            if (((gCamera.y != em->prevCamY) && (range2.yLow != range2.yHigh))
-                && (range2.xLow != range2.xHigh)) {
+            if (((gCamera.y != em->prevCamY) && (range2.yLow != range2.yHigh)) && (range2.xLow != range2.xHigh)) {
                 regionY = I((s32)range2.yLow);
 
                 while (Q(regionY) < range2.yHigh && regionY < v_regionCount) {
@@ -915,9 +876,7 @@ NONMATCH("asm/non_matching/game/stage/Task_8008DCC.inc", void Task_8008DCC(void)
                         MapEntity *me;
 
                         if (gGameMode != GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) {
-                            r6 = *(u32 *)(((u8 *)interactables)
-                                          + ((h_regionCount * regionY) * sizeof(u32))
-                                          + (regionX * sizeof(u32)));
+                            r6 = *(u32 *)(((u8 *)interactables) + ((h_regionCount * regionY) * sizeof(u32)) + (regionX * sizeof(u32)));
                             if (r6 != 0) {
                                 MapEntity *me;
                                 me = ReadMapEntity(interactables, r6);
@@ -925,43 +884,32 @@ NONMATCH("asm/non_matching/game/stage/Task_8008DCC.inc", void Task_8008DCC(void)
                                     if ((s8)me->x >= -2) {
                                         s32 x = TO_WORLD_POS(me->x, regionX);
                                         s32 y = TO_WORLD_POS(me->y, regionY);
-                                        if (x >= (s32)range2.xLow
-                                            && x <= (s32)range2.xHigh
-                                            && y >= (s32)range2.yLow
+                                        if (x >= (s32)range2.xLow && x <= (s32)range2.xHigh && y >= (s32)range2.yLow
                                             && y <= (s32)range2.yHigh) {
-                                            gSpriteInits_Interactables[me->index](
-                                                me, regionX, regionY, i);
+                                            gSpriteInits_Interactables[me->index](me, regionX, regionY, i);
                                         }
                                     }
                                 }
                             }
 
-                            r6 = *(u32 *)(((u8 *)itemBoxPositions)
-                                          + ((h_regionCount * regionY) * sizeof(u32))
-                                          + (regionX * sizeof(u32)));
+                            r6 = *(u32 *)(((u8 *)itemBoxPositions) + ((h_regionCount * regionY) * sizeof(u32)) + (regionX * sizeof(u32)));
 
                             if (r6 != 0) {
                                 MapEntity_Itembox *me;
-                                me = (MapEntity_Itembox *)ReadMapEntity(itemBoxPositions,
-                                                                        r6);
+                                me = (MapEntity_Itembox *)ReadMapEntity(itemBoxPositions, r6);
                                 for (i = 0; (s8)me->x != -1; me++, i++) {
                                     if ((s8)me->x >= -2) {
                                         s32 x = TO_WORLD_POS(me->x, regionX);
                                         s32 y = TO_WORLD_POS(me->y, regionY);
-                                        if (x >= (s32)range2.xLow
-                                            && x <= (s32)range2.xHigh
-                                            && y >= (s32)range2.yLow
+                                        if (x >= (s32)range2.xLow && x <= (s32)range2.xHigh && y >= (s32)range2.yLow
                                             && y <= (s32)range2.yHigh) {
-                                            CreateEntity_ItemBox((MapEntity *)me,
-                                                                 regionX, regionY, i);
+                                            CreateEntity_ItemBox((MapEntity *)me, regionX, regionY, i);
                                         }
                                     }
                                 }
                             }
 
-                            r6 = *(u32 *)(((u8 *)enemyPositions)
-                                          + ((h_regionCount * regionY) * sizeof(u32))
-                                          + (regionX * sizeof(u32)));
+                            r6 = *(u32 *)(((u8 *)enemyPositions) + ((h_regionCount * regionY) * sizeof(u32)) + (regionX * sizeof(u32)));
                             if (r6 != 0) {
                                 MapEntity *me;
                                 me = ReadMapEntity(enemyPositions, r6);
@@ -969,21 +917,16 @@ NONMATCH("asm/non_matching/game/stage/Task_8008DCC.inc", void Task_8008DCC(void)
                                     if ((s8)me->x >= -2) {
                                         s32 x = TO_WORLD_POS(me->x, regionX);
                                         s32 y = TO_WORLD_POS(me->y, regionY);
-                                        if (x >= (s32)range2.xLow
-                                            && x <= (s32)range2.xHigh
-                                            && y >= (s32)range2.yLow
+                                        if (x >= (s32)range2.xLow && x <= (s32)range2.xHigh && y >= (s32)range2.yLow
                                             && y <= (s32)range2.yHigh) {
-                                            gSpriteInits_Enemies[me->index](me, regionX,
-                                                                            regionY, i);
+                                            gSpriteInits_Enemies[me->index](me, regionX, regionY, i);
                                         }
                                     }
                                 }
                             }
 
                         } else {
-                            r6 = *(u32 *)(((u8 *)interactables)
-                                          + ((h_regionCount * regionY) * sizeof(u32))
-                                          + (regionX * sizeof(u32)));
+                            r6 = *(u32 *)(((u8 *)interactables) + ((h_regionCount * regionY) * sizeof(u32)) + (regionX * sizeof(u32)));
                             if (r6 != 0) {
                                 MapEntity *me;
                                 me = ReadMapEntity(interactables, r6);
@@ -991,12 +934,9 @@ NONMATCH("asm/non_matching/game/stage/Task_8008DCC.inc", void Task_8008DCC(void)
                                     if ((s8)me->x >= -2) {
                                         s32 x = TO_WORLD_POS(me->x, regionX);
                                         s32 y = TO_WORLD_POS(me->y, regionY);
-                                        if (x >= (s32)range2.xLow
-                                            && x <= (s32)range2.xHigh
-                                            && y >= (s32)range2.yLow
+                                        if (x >= (s32)range2.xLow && x <= (s32)range2.xHigh && y >= (s32)range2.yLow
                                             && y <= (s32)range2.yHigh) {
-                                            gSpriteInits_InteractablesMultiplayer
-                                                [me->index](me, regionX, regionY, i);
+                                            gSpriteInits_InteractablesMultiplayer[me->index](me, regionX, regionY, i);
                                         }
                                     }
                                 }
diff --git a/src/sakit/input_buffer.c b/src/sakit/input_buffer.c
index d1cc8d58f..8342e46e9 100644
--- a/src/sakit/input_buffer.c
+++ b/src/sakit/input_buffer.c
@@ -10,24 +10,15 @@
 // const u8 gUnknown_080D5254[] = { 0x04, 0x01, 0x00, 0xF0, 0x08, 0x10, 0xF0, 0x08, 0x00,
 // 0xF0, 0x08, 0x10, 0xF0, 0x01 };
 extern const u8 gUnknown_080D5254[];
-const u8 gUnknown_080D5262[] = { 0x04, 0x01, 0x00, 0xF0, 0x08, 0x20, 0xF0,
-                                 0x08, 0x00, 0xF0, 0x08, 0x20, 0xF0, 0x01 };
-const u8 gUnknown_080D5270[] = { 0x04, 0x01, 0x10, 0xF0, 0x0F, 0x00, 0xF0,
-                                 0x0F, 0x10, 0xF0, 0x0F, 0x03, 0x07, 0x0F };
-const u8 gUnknown_080D527E[] = { 0x04, 0x02, 0x10, 0xF0, 0x0F, 0x00, 0xF0,
-                                 0x0F, 0x10, 0xF0, 0x0F, 0x03, 0x07, 0x0F };
-const u8 gUnknown_080D528C[] = { 0x04, 0x01, 0x10, 0xF0, 0x0F, 0x00, 0xF0,
-                                 0x0F, 0x10, 0xF0, 0x0F, 0x03, 0x07, 0x0F };
-const u8 gUnknown_080D529A[] = { 0x04, 0x02, 0x10, 0xF0, 0x0F, 0x00, 0xF0,
-                                 0x0F, 0x10, 0xF0, 0x0F, 0x03, 0x07, 0x0F };
-const u8 gUnknown_080D52A8[] = { 0x04, 0x01, 0x10, 0xF0, 0x0F, 0x00, 0xF0,
-                                 0x0F, 0x10, 0xF0, 0x0F, 0x03, 0x07, 0x0F };
-const u8 gUnknown_080D52B6[] = { 0x04, 0x02, 0x10, 0xF0, 0x0F, 0x00, 0xF0,
-                                 0x0F, 0x10, 0xF0, 0x0F, 0x03, 0x07, 0x0F };
-const u8 gUnknown_080D52C4[] = { 0x04, 0x01, 0x10, 0xF0, 0x0F, 0x00, 0xF0,
-                                 0x0F, 0x10, 0xF0, 0x0F, 0x03, 0x07, 0x0F };
-const u8 gUnknown_080D52D2[] = { 0x04, 0x02, 0x10, 0xF0, 0x0F, 0x00, 0xF0,
-                                 0x0F, 0x10, 0xF0, 0x0F, 0x03, 0x07, 0x0F };
+const u8 gUnknown_080D5262[] = { 0x04, 0x01, 0x00, 0xF0, 0x08, 0x20, 0xF0, 0x08, 0x00, 0xF0, 0x08, 0x20, 0xF0, 0x01 };
+const u8 gUnknown_080D5270[] = { 0x04, 0x01, 0x10, 0xF0, 0x0F, 0x00, 0xF0, 0x0F, 0x10, 0xF0, 0x0F, 0x03, 0x07, 0x0F };
+const u8 gUnknown_080D527E[] = { 0x04, 0x02, 0x10, 0xF0, 0x0F, 0x00, 0xF0, 0x0F, 0x10, 0xF0, 0x0F, 0x03, 0x07, 0x0F };
+const u8 gUnknown_080D528C[] = { 0x04, 0x01, 0x10, 0xF0, 0x0F, 0x00, 0xF0, 0x0F, 0x10, 0xF0, 0x0F, 0x03, 0x07, 0x0F };
+const u8 gUnknown_080D529A[] = { 0x04, 0x02, 0x10, 0xF0, 0x0F, 0x00, 0xF0, 0x0F, 0x10, 0xF0, 0x0F, 0x03, 0x07, 0x0F };
+const u8 gUnknown_080D52A8[] = { 0x04, 0x01, 0x10, 0xF0, 0x0F, 0x00, 0xF0, 0x0F, 0x10, 0xF0, 0x0F, 0x03, 0x07, 0x0F };
+const u8 gUnknown_080D52B6[] = { 0x04, 0x02, 0x10, 0xF0, 0x0F, 0x00, 0xF0, 0x0F, 0x10, 0xF0, 0x0F, 0x03, 0x07, 0x0F };
+const u8 gUnknown_080D52C4[] = { 0x04, 0x01, 0x10, 0xF0, 0x0F, 0x00, 0xF0, 0x0F, 0x10, 0xF0, 0x0F, 0x03, 0x07, 0x0F };
+const u8 gUnknown_080D52D2[] = { 0x04, 0x02, 0x10, 0xF0, 0x0F, 0x00, 0xF0, 0x0F, 0x10, 0xF0, 0x0F, 0x03, 0x07, 0x0F };
 
 const u8 *gUnknown_08c87098_unused[64] = { 0 };
 
@@ -57,8 +48,7 @@ typedef struct {
 // (This might be used for timing in multiplayer?)
 //
 // (91%) https://decomp.me/scratch/zFRhq
-NONMATCH("asm/non_matching/sakit/input_buf__sub_800DF8C.inc",
-         void sub_800DF8C(Player *p))
+NONMATCH("asm/non_matching/sakit/input_buf__sub_800DF8C.inc", void sub_800DF8C(Player *p))
 {
     struct struc_800DF8C sp00;
 #ifndef NON_MATCHING
@@ -186,8 +176,7 @@ void sub_800E0C0(u16 param0, u16 param1)
         : "r"(r5));
 #endif
 
-    if ((gNewInputCounters[gNewInputCountersIndex].unk0 == r5)
-        && (gNewInputCounters[gNewInputCountersIndex].unk1 != 0xFF)) {
+    if ((gNewInputCounters[gNewInputCountersIndex].unk0 == r5) && (gNewInputCounters[gNewInputCountersIndex].unk1 != 0xFF)) {
         gNewInputCounters[gNewInputCountersIndex].unk1++;
     } else {
         gNewInputCountersIndex = (gNewInputCountersIndex + 1) % 32u;
diff --git a/src/sakit/interactables/044.c b/src/sakit/interactables/044.c
index 9ba5938c7..6777500b7 100644
--- a/src/sakit/interactables/044.c
+++ b/src/sakit/interactables/044.c
@@ -45,15 +45,12 @@ void Task_Interactable_044(void)
 
         if ((top <= playerY) && sBottom >= playerY) {
             u32 moveState = gPlayer.moveState;
-            if (((moveState & (MOVESTATE_40000 | MOVESTATE_IN_AIR)) == MOVESTATE_IN_AIR)
-                && (gPlayer.speedAirY < 0)) {
+            if (((moveState & (MOVESTATE_40000 | MOVESTATE_IN_AIR)) == MOVESTATE_IN_AIR) && (gPlayer.speedAirY < 0)) {
                 if (moveState & MOVESTATE_10000000) {
                     object->spriteY = 1;
                 }
 
-                if ((!(moveState & MOVESTATE_10000000)
-                     || !(gPlayer.moveState & MOVESTATE_10000000))
-                    && object->spriteY == 0) {
+                if ((!(moveState & MOVESTATE_10000000) || !(gPlayer.moveState & MOVESTATE_10000000)) && object->spriteY == 0) {
                     gPlayer.transition = PLTRANS_PT23;
                     gPlayer.unk6E = 0;
 
@@ -85,8 +82,7 @@ void Task_Interactable_044(void)
 
 void CreateEntity_044(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t
-        = TaskCreate(Task_Interactable_044, sizeof(Sprite_IA044), 0x2010, 0, NULL);
+    struct Task *t = TaskCreate(Task_Interactable_044, sizeof(Sprite_IA044), 0x2010, 0, NULL);
     Sprite_IA044 *ia044 = TASK_DATA(t);
 
     ia044->base.regionX = spriteRegionX;
diff --git a/src/sakit/interactables/grind_rail.c b/src/sakit/interactables/grind_rail.c
index 62806e1c6..a22e234ca 100644
--- a/src/sakit/interactables/grind_rail.c
+++ b/src/sakit/interactables/grind_rail.c
@@ -24,25 +24,20 @@ typedef struct {
 #define RAIL_KIND_2  0x2
 #define RAIL_KIND_80 0x80
 
-#define INITIALIZE_RAIL(type)                                                           \
-    CreateEntity_GrindRail(me, spriteRegionX, spriteRegionY, spriteY, type)
-#define INITIALIZE_RAIL_AIR(type)                                                       \
-    CreateEntity_GrindRail_Air(me, spriteRegionX, spriteRegionY, spriteY, type)
+#define INITIALIZE_RAIL(type)     CreateEntity_GrindRail(me, spriteRegionX, spriteRegionY, spriteY, type)
+#define INITIALIZE_RAIL_AIR(type) CreateEntity_GrindRail_Air(me, spriteRegionX, spriteRegionY, spriteY, type)
 
-static void CreateEntity_GrindRail(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                   u8 spriteY, u8 railType);
+static void CreateEntity_GrindRail(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY, u8 railType);
 
 void Task_GrindRail(void);
 void sub_8010464(void);
 
 // (79.90%) https://decomp.me/scratch/ncgh4
-NONMATCH("asm/non_matching/sakit/interactables/Task_GrindRail.inc",
-         void Task_GrindRail(void))
+NONMATCH("asm/non_matching/sakit/interactables/Task_GrindRail.inc", void Task_GrindRail(void))
 {
     Player *player = &gPlayer;
 
-    s32 r7 = GRAVITY_IS_INVERTED ? I(player->y) - player->unk17
-                                 : I(player->y) + player->unk17;
+    s32 r7 = GRAVITY_IS_INVERTED ? I(player->y) - player->unk17 : I(player->y) + player->unk17;
 
     // _0800FE78
     Sprite_GrindRail *rail = TASK_DATA(gCurTask);
@@ -61,11 +56,8 @@ NONMATCH("asm/non_matching/sakit/interactables/Task_GrindRail.inc",
     if (!(player->moveState & MOVESTATE_DEAD)) {
         void *newRail; // for matching
         s32 left = posX + me->d.sData[0] * TILE_WIDTH;
-        if ((left <= I(player->x))
-            && (left + me->d.uData[2] * TILE_WIDTH >= I(player->x))
-            && ((posY + me->d.sData[1] * TILE_WIDTH) <= r7)
-            && (((posY + me->d.sData[1] * TILE_WIDTH) + me->d.uData[3] * TILE_WIDTH)
-                >= r7)) {
+        if ((left <= I(player->x)) && (left + me->d.uData[2] * TILE_WIDTH >= I(player->x)) && ((posY + me->d.sData[1] * TILE_WIDTH) <= r7)
+            && (((posY + me->d.sData[1] * TILE_WIDTH) + me->d.uData[3] * TILE_WIDTH) >= r7)) {
             bool32 r6 = FALSE;
 
             if (GRAVITY_IS_INVERTED) {
@@ -85,9 +77,7 @@ NONMATCH("asm/non_matching/sakit/interactables/Task_GrindRail.inc",
                             s32 left = me->d.sData[0] * TILE_WIDTH;
                             s32 middle = left + me->d.uData[2] * 4;
                             if (newPlayerX >= middle) {
-                                if ((!(player->unk5C & gPlayerControls.jump)
-                                     || !(railKind & RAIL_KIND_2))
-                                    && !(railKind & RAIL_KIND_1))
+                                if ((!(player->unk5C & gPlayerControls.jump) || !(railKind & RAIL_KIND_2)) && !(railKind & RAIL_KIND_1))
                                     goto _080100B0;
                             }
                             // _0800FFB8
@@ -114,8 +104,7 @@ NONMATCH("asm/non_matching/sakit/interactables/Task_GrindRail.inc",
                         s32 middle = posX + me->d.sData[0] * TILE_WIDTH;
                         middle += me->d.uData[2] * 4;
                         if (playerX <= middle) {
-                            if ((!(player->unk5C & gPlayerControls.jump))
-                                || !(railKind & RAIL_KIND_2))
+                            if ((!(player->unk5C & gPlayerControls.jump)) || !(railKind & RAIL_KIND_2))
                                 goto _080100B0;
                         }
                         // _08010028
@@ -187,8 +176,7 @@ NONMATCH("asm/non_matching/sakit/interactables/Task_GrindRail.inc",
 END_NONMATCH
 
 // (94.19%) https://decomp.me/scratch/mrRim
-NONMATCH("asm/non_matching/sakit/interactables/Task_GrindRail_Air.inc",
-         void Task_GrindRail_Air(void))
+NONMATCH("asm/non_matching/sakit/interactables/Task_GrindRail_Air.inc", void Task_GrindRail_Air(void))
 {
     Player *player = &gPlayer;
     Sprite_GrindRail *rail = TASK_DATA(gCurTask);
@@ -243,8 +231,7 @@ NONMATCH("asm/non_matching/sakit/interactables/Task_GrindRail_Air.inc",
                             if (kind & RAIL_KIND_1) {
                                 if ((gPlayer.moveState & 1)) {
                                     if (left < ((someWidth >> 1) + right)
-                                        || ((player->unk5C & gPlayerControls.jump)
-                                            && (kind & RAIL_KIND_2))) {
+                                        || ((player->unk5C & gPlayerControls.jump) && (kind & RAIL_KIND_2))) {
                                         if ((kind & RAIL_KIND_2)) {
                                             player->transition = 13;
                                             goto set13;
@@ -261,9 +248,7 @@ NONMATCH("asm/non_matching/sakit/interactables/Task_GrindRail_Air.inc",
                                     newLeft += me->d.uData[0] * 8;
                                     newLeft += me->d.uData[2] * 4;
 
-                                    if (playerX > newLeft
-                                        || ((player->unk5C & gPlayerControls.jump)
-                                            && (kind & RAIL_KIND_2))) {
+                                    if (playerX > newLeft || ((player->unk5C & gPlayerControls.jump) && (kind & RAIL_KIND_2))) {
                                         if ((kind & RAIL_KIND_2)) {
                                             player->transition = 13;
                                         set13:;
@@ -290,12 +275,10 @@ NONMATCH("asm/non_matching/sakit/interactables/Task_GrindRail_Air.inc",
 }
 END_NONMATCH
 
-void CreateEntity_GrindRail(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                            u8 spriteY, u8 railType)
+void CreateEntity_GrindRail(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY, u8 railType)
 {
 #ifdef NON_MATCHING
-    struct Task *t
-        = TaskCreate(Task_GrindRail, sizeof(Sprite_GrindRail), 0x2010, 0, NULL);
+    struct Task *t = TaskCreate(Task_GrindRail, sizeof(Sprite_GrindRail), 0x2010, 0, NULL);
     Sprite_GrindRail *rail = TASK_DATA(t);
     rail->kind = railType;
     rail->regionX = spriteRegionX;
@@ -335,8 +318,7 @@ void CreateEntity_GrindRail(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
     SET_MAP_ENTITY_INITIALIZED(me);
 }
 
-void CreateEntity_GrindRail_Air(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                u8 spriteY, u8 railType)
+void CreateEntity_GrindRail_Air(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY, u8 railType)
 {
 #ifdef NON_MATCHING
     struct Task *t = TaskCreate(Task_GrindRail_Air, 10, 0x2010, 0, NULL);
@@ -397,51 +379,19 @@ void sub_8010464(void)
 }
 
 // Enables not only from air, but when running on water aswell
-void CreateEntity_GrindRail_StartAir(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                     u8 spriteY)
-{
-    INITIALIZE_RAIL(2);
-}
+void CreateEntity_GrindRail_StartAir(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY) { INITIALIZE_RAIL(2); }
 
-void CreateEntity_GrindRail_End_ForcedJump(MapEntity *me, u16 spriteRegionX,
-                                           u16 spriteRegionY, u8 spriteY)
-{
-    INITIALIZE_RAIL(3);
-}
+void CreateEntity_GrindRail_End_ForcedJump(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY) { INITIALIZE_RAIL(3); }
 
-void CreateEntity_GrindRail_Start(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                  u8 spriteY)
-{
-    INITIALIZE_RAIL(0);
-}
+void CreateEntity_GrindRail_Start(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY) { INITIALIZE_RAIL(0); }
 
-void CreateEntity_GrindRail_EndGround(MapEntity *me, u16 spriteRegionX,
-                                      u16 spriteRegionY, u8 spriteY)
-{
-    INITIALIZE_RAIL(1);
-}
+void CreateEntity_GrindRail_EndGround(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY) { INITIALIZE_RAIL(1); }
 
-void CreateEntity_GrindRail_EndAir(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                   u8 spriteY)
-{
-    INITIALIZE_RAIL_AIR(2);
-}
+void CreateEntity_GrindRail_EndAir(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY) { INITIALIZE_RAIL_AIR(2); }
 
-void CreateEntity_GrindRail_EndAir_Left(MapEntity *me, u16 spriteRegionX,
-                                        u16 spriteRegionY, u8 spriteY)
-{
-    INITIALIZE_RAIL_AIR(3);
-}
+void CreateEntity_GrindRail_EndAir_Left(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY) { INITIALIZE_RAIL_AIR(3); }
 
 // Might be called "CreateEntity_GrindRail_StartAir" instead?
-void CreateEntity_GrindRail_EndAlternate(MapEntity *me, u16 spriteRegionX,
-                                         u16 spriteRegionY, u8 spriteY)
-{
-    INITIALIZE_RAIL_AIR(0);
-}
+void CreateEntity_GrindRail_EndAlternate(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY) { INITIALIZE_RAIL_AIR(0); }
 
-void CreateEntity_GrindRail_EndGround_Left(MapEntity *me, u16 spriteRegionX,
-                                           u16 spriteRegionY, u8 spriteY)
-{
-    INITIALIZE_RAIL_AIR(1);
-}
+void CreateEntity_GrindRail_EndGround_Left(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY) { INITIALIZE_RAIL_AIR(1); }
diff --git a/src/sakit/interactables/pipe.c b/src/sakit/interactables/pipe.c
index c09672b48..ca713420c 100644
--- a/src/sakit/interactables/pipe.c
+++ b/src/sakit/interactables/pipe.c
@@ -49,10 +49,8 @@ static void Task_Pipe_Start(void)
     screenX = TO_WORLD_POS(spriteX, regionX);
     screenY = TO_WORLD_POS(me->y, regionY);
 
-    if (!(gPlayer.moveState & MOVESTATE_DEAD) && (screenX <= I(gPlayer.x))
-        && ((screenX + 24) >= I(gPlayer.x)) && (screenY <= I(gPlayer.y))
-        && ((screenY + 24) >= I(gPlayer.y))
-        && (!(gPlayer.moveState & MOVESTATE_80000))) {
+    if (!(gPlayer.moveState & MOVESTATE_DEAD) && (screenX <= I(gPlayer.x)) && ((screenX + 24) >= I(gPlayer.x)) && (screenY <= I(gPlayer.y))
+        && ((screenY + 24) >= I(gPlayer.y)) && (!(gPlayer.moveState & MOVESTATE_80000))) {
         u8 flag;
 
         gPlayer.transition = PLTRANS_PT25;
@@ -95,8 +93,7 @@ static void Task_Pipe_End(void)
     screenX = TO_WORLD_POS(spriteX, regionX);
     screenY = TO_WORLD_POS(me->y, regionY);
 
-    if (!(gPlayer.moveState & MOVESTATE_DEAD) && (screenX <= I(gPlayer.x))
-        && ((screenX + 24) >= I(gPlayer.x)) && (screenY <= I(gPlayer.y))
+    if (!(gPlayer.moveState & MOVESTATE_DEAD) && (screenX <= I(gPlayer.x)) && ((screenX + 24) >= I(gPlayer.x)) && (screenY <= I(gPlayer.y))
         && ((screenY + 24) >= I(gPlayer.y)) && (gPlayer.moveState & MOVESTATE_80000)) {
         gPlayer.moveState &= ~(MOVESTATE_80000 | MOVESTATE_200 | MOVESTATE_IN_AIR);
 
@@ -125,11 +122,9 @@ static void Task_Pipe_End(void)
     }
 }
 
-void CreateEntity_Pipe_Start(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                             u8 spriteY)
+void CreateEntity_Pipe_Start(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t
-        = TaskCreate(Task_Pipe_Start, sizeof(Sprite_ClearPipe), 0x2010, 0, NULL);
+    struct Task *t = TaskCreate(Task_Pipe_Start, sizeof(Sprite_ClearPipe), 0x2010, 0, NULL);
 
     Sprite_ClearPipe *pipe = TASK_DATA(t);
     pipe->base.regionX = spriteRegionX;
@@ -139,11 +134,9 @@ void CreateEntity_Pipe_Start(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY
     SET_MAP_ENTITY_INITIALIZED(me);
 }
 
-void CreateEntity_Pipe_End(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                           u8 spriteY)
+void CreateEntity_Pipe_End(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t
-        = TaskCreate(Task_Pipe_End, sizeof(Sprite_ClearPipe), 0x2010, 0, NULL);
+    struct Task *t = TaskCreate(Task_Pipe_End, sizeof(Sprite_ClearPipe), 0x2010, 0, NULL);
 
     Sprite_ClearPipe *pipe = TASK_DATA(t);
     pipe->base.regionX = spriteRegionX;
diff --git a/src/sakit/interactables/platform.c b/src/sakit/interactables/platform.c
index 3d49f87db..f3221b4f1 100644
--- a/src/sakit/interactables/platform.c
+++ b/src/sakit/interactables/platform.c
@@ -86,11 +86,9 @@ const AnimId sPlatformLevelAnims[38] = {
     [LEVEL_INDEX(9, ACT_2)] = SA2_ANIM_PLATFORM_LEA_FOR,
 };
 
-void CreateEntity_Platform_A(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                             u8 spriteY)
+void CreateEntity_Platform_A(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_800E89C, sizeof(Sprite_Platform), 0x2010, 0,
-                                TaskDestructor_800F19C);
+    struct Task *t = TaskCreate(Task_800E89C, sizeof(Sprite_Platform), 0x2010, 0, TaskDestructor_800F19C);
     Sprite_Platform *platform = TASK_DATA(t);
     Sprite *s = &platform->s;
 
@@ -169,11 +167,7 @@ void Task_800E89C(void)
 #endif
         s32 meUdata2 = (me->d.uData[2] << 11);
 
-        platform->unk40
-            = (SIN((platform->unk48 * ((gStageTime + platform->unk3C) & 0xFF))
-                   & ONE_CYCLE)
-               * meUdata2)
-            >> 14;
+        platform->unk40 = (SIN((platform->unk48 * ((gStageTime + platform->unk3C) & 0xFF)) & ONE_CYCLE) * meUdata2) >> 14;
         r5 = platform->unk40 - r5;
 #ifndef NON_MATCHING
         asm("" ::"r"(r5));
@@ -188,11 +182,7 @@ void Task_800E89C(void)
         register s32 r5 asm("r5") = platform->unk44;
 #endif
         s32 meUdata3 = (me->d.uData[3] << 11);
-        platform->unk44
-            = (SIN(((platform->unk4A * ((gStageTime + platform->unk3C) & 0xFF)))
-                   & ONE_CYCLE)
-               * meUdata3)
-            >> 14;
+        platform->unk44 = (SIN(((platform->unk4A * ((gStageTime + platform->unk3C) & 0xFF))) & ONE_CYCLE) * meUdata3) >> 14;
         r5 = platform->unk44 - r5;
 #ifndef NON_MATCHING
         asm("" ::"r"(r5));
@@ -254,11 +244,9 @@ void Task_800E89C(void)
     }
 }
 
-void CreateEntity_Platform_B(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                             u8 spriteY)
+void CreateEntity_Platform_B(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_800EC58, sizeof(Sprite_Platform), 0x2010, 0,
-                                TaskDestructor_800F19C);
+    struct Task *t = TaskCreate(Task_800EC58, sizeof(Sprite_Platform), 0x2010, 0, TaskDestructor_800F19C);
     Sprite_Platform *platform = TASK_DATA(t);
     Sprite *s = &platform->s;
 
@@ -340,8 +328,8 @@ void Task_800EC58(void)
         gCurTask->main = Task_800EFD0;
     }
 
-    if (((posX > gCamera.x + (DISPLAY_WIDTH + 128)) || (posX < (gCamera.x - 128))
-         || (posY > (gCamera.y + (DISPLAY_HEIGHT + 128))) || ((posY < gCamera.y - 128)))
+    if (((posX > gCamera.x + (DISPLAY_WIDTH + 128)) || (posX < (gCamera.x - 128)) || (posY > (gCamera.y + (DISPLAY_HEIGHT + 128)))
+         || ((posY < gCamera.y - 128)))
         && (IS_OUT_OF_CAM_RANGE(s->x, s->y))) {
         SET_MAP_ENTITY_NOT_INITIALIZED(me, platform->base.spriteX);
         TaskDestroy(gCurTask);
@@ -413,8 +401,8 @@ void Task_800EDF8(void)
         }
     }
 
-    if (((posX > gCamera.x + (DISPLAY_WIDTH + 128)) || (posX < (gCamera.x - 128))
-         || (posY > (gCamera.y + (DISPLAY_HEIGHT + 128))) || ((posY < gCamera.y - 128)))
+    if (((posX > gCamera.x + (DISPLAY_WIDTH + 128)) || (posX < (gCamera.x - 128)) || (posY > (gCamera.y + (DISPLAY_HEIGHT + 128)))
+         || ((posY < gCamera.y - 128)))
         && (IS_OUT_OF_CAM_RANGE(s->x, s->y))) {
         SET_MAP_ENTITY_NOT_INITIALIZED(me, platform->base.spriteX);
         TaskDestroy(gCurTask);
diff --git a/src/sakit/interactables/platform_square.c b/src/sakit/interactables/platform_square.c
index 171a01821..5df7e3355 100644
--- a/src/sakit/interactables/platform_square.c
+++ b/src/sakit/interactables/platform_square.c
@@ -35,22 +35,14 @@ static void Platform_Square_KillPlayer(void);
 static void sub_800F990(Sprite_PlatformSquare *);
 
 static const u16 sAnimsPlatformSquare[9][3] = {
-    { 36, SA2_ANIM_PLATFORM_SQUARE_COMMON, 0 },
-    { 36, SA2_ANIM_PLATFORM_SQUARE_COMMON, 0 },
-    { 36, SA2_ANIM_PLATFORM_SQUARE_MUS_PLA, 1 },
-    { 36, SA2_ANIM_PLATFORM_ICE_PAR, 2 },
-    { 36, SA2_ANIM_PLATFORM_SQUARE_SKY_CAN, 0 },
-    { 36, SA2_ANIM_PLATFORM_TEC_BAS, 2 },
-    { 36, SA2_ANIM_PLATFORM_SQUARE_COMMON, 0 },
-    { 36, SA2_ANIM_PLATFORM_SQUARE_COMMON, 0 },
-    { 36, SA2_ANIM_PLATFORM_SQUARE_COMMON, 0 },
+    { 36, SA2_ANIM_PLATFORM_SQUARE_COMMON, 0 }, { 36, SA2_ANIM_PLATFORM_SQUARE_COMMON, 0 },  { 36, SA2_ANIM_PLATFORM_SQUARE_MUS_PLA, 1 },
+    { 36, SA2_ANIM_PLATFORM_ICE_PAR, 2 },       { 36, SA2_ANIM_PLATFORM_SQUARE_SKY_CAN, 0 }, { 36, SA2_ANIM_PLATFORM_TEC_BAS, 2 },
+    { 36, SA2_ANIM_PLATFORM_SQUARE_COMMON, 0 }, { 36, SA2_ANIM_PLATFORM_SQUARE_COMMON, 0 },  { 36, SA2_ANIM_PLATFORM_SQUARE_COMMON, 0 },
 };
 
-void CreateEntity_Platform_Square(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                  u8 spriteY)
+void CreateEntity_Platform_Square(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_Platform_Square, sizeof(Sprite_PlatformSquare),
-                                0x2010, 0, TaskDestructor_Platform_Square);
+    struct Task *t = TaskCreate(Task_Platform_Square, sizeof(Sprite_PlatformSquare), 0x2010, 0, TaskDestructor_Platform_Square);
     Sprite_PlatformSquare *platform = TASK_DATA(t);
     Sprite *s = &platform->s;
 
@@ -141,11 +133,7 @@ static void Task_Platform_Square(void)
         s32 oldUnk40 = platform->unk40;
         s32 meUdata2 = (me->d.uData[2] << 11);
 
-        platform->unk40
-            = (SIN((platform->unk48 * ((gStageTime + platform->unk3C) & 0xFF))
-                   & ONE_CYCLE)
-               * meUdata2)
-            >> 14;
+        platform->unk40 = (SIN((platform->unk48 * ((gStageTime + platform->unk3C) & 0xFF)) & ONE_CYCLE) * meUdata2) >> 14;
         deltaX = platform->unk40 - oldUnk40;
     }
 
@@ -156,11 +144,7 @@ static void Task_Platform_Square(void)
         register s32 r5 asm("r5") = platform->unk44;
 #endif
         s32 meUdata3 = (me->d.uData[3] << 11);
-        platform->unk44
-            = (SIN(((platform->unk4A * ((gStageTime + platform->unk3C) & 0xFF)))
-                   & ONE_CYCLE)
-               * meUdata3)
-            >> 14;
+        platform->unk44 = (SIN(((platform->unk4A * ((gStageTime + platform->unk3C) & 0xFF))) & ONE_CYCLE) * meUdata3) >> 14;
         r5 = platform->unk44 - r5;
 #ifndef NON_MATCHING
         asm("" ::"r"(r5));
@@ -189,8 +173,7 @@ static void Task_Platform_Square(void)
             p->y += deltaY - Q(2.0);
         }
 
-        res = sub_801F100(I(gPlayer.y) + gPlayer.unk17, I(gPlayer.x) + gPlayer.unk16,
-                          gPlayer.unk38, +8, sub_801EC3C);
+        res = sub_801F100(I(gPlayer.y) + gPlayer.unk17, I(gPlayer.x) + gPlayer.unk16, gPlayer.unk38, +8, sub_801EC3C);
         if (res < 0) {
             gPlayer.y += Q(res);
 
@@ -213,8 +196,7 @@ static void Task_Platform_Square(void)
             p->x -= Q(res);
         }
 
-        res = sub_801F100(I(p->y) + p->unk17, I(p->x) - p->unk16, p->unk38, +8,
-                          sub_801EC3C);
+        res = sub_801F100(I(p->y) + p->unk17, I(p->x) - p->unk16, p->unk38, +8, sub_801EC3C);
 
         if (res < 0) {
             p->y += Q(res);
@@ -237,8 +219,7 @@ static void Task_Platform_Square(void)
         result = sub_800CCB8(s, x, y, p);
 
         if (result & 0x30000) {
-            if (gPlayer.character == CHARACTER_KNUCKLES && gPlayer.unk64 > 99
-                && gPlayer.unk64 <= 105) {
+            if (gPlayer.character == CHARACTER_KNUCKLES && gPlayer.unk64 > 99 && gPlayer.unk64 <= 105) {
                 p->transition = PLTRANS_PT4;
             }
 
@@ -268,8 +249,7 @@ static void Task_Platform_Square(void)
                     s->hitboxes[0].left += 16;
                     s->hitboxes[0].right -= 16;
 
-                    otherRes = sub_800CCB8(s, posX + I(platform->unk40),
-                                           posY + I(platform->unk44), p);
+                    otherRes = sub_800CCB8(s, posX + I(platform->unk40), posY + I(platform->unk44), p);
 
                     s->hitboxes[0].left -= 16;
                     s->hitboxes[0].right += 16;
@@ -293,8 +273,7 @@ static void Task_Platform_Square(void)
                     }
 
                     if (otherRes & 0x10000) {
-                        s32 newRes = sub_801F100(I(p->y) - p->unk17, I(p->x), p->unk38,
-                                                 -8, sub_801EC3C);
+                        s32 newRes = sub_801F100(I(p->y) - p->unk17, I(p->x), p->unk38, -8, sub_801EC3C);
 
                         if (newRes < 0) {
                             if (deltaY < 0) {
@@ -315,8 +294,7 @@ static void Task_Platform_Square(void)
                 } else {
                     s32 newRes;
                     p->speedAirY = 0;
-                    newRes = sub_801F100(I(p->y) - p->unk17, I(p->x), p->unk38, -8,
-                                         sub_801EC3C);
+                    newRes = sub_801F100(I(p->y) - p->unk17, I(p->x), p->unk38, -8, sub_801EC3C);
 
                     if ((newRes < 0) && (deltaY < 0)) {
                         Platform_Square_KillPlayer();
@@ -334,16 +312,14 @@ static void Task_Platform_Square(void)
 
             if (result & 0x40000) {
                 s32 tempXVal = I(p->x) + 2;
-                if (sub_801F100(tempXVal + p->unk16, I(p->y), p->unk38, -8, sub_801EB44)
-                    < 0) {
+                if (sub_801F100(tempXVal + p->unk16, I(p->y), p->unk38, -8, sub_801EB44) < 0) {
                     Platform_Square_KillPlayer();
                 }
             }
 
             if (result & 0x80000) {
                 s32 tempXVal = I(p->x) - 2;
-                if (sub_801F100(tempXVal - p->unk16, I(p->y), p->unk38, +8, sub_801EB44)
-                    < 0) {
+                if (sub_801F100(tempXVal - p->unk16, I(p->y), p->unk38, +8, sub_801EB44) < 0) {
                     Platform_Square_KillPlayer();
                 }
             }
diff --git a/src/sakit/interactables/platform_thin.c b/src/sakit/interactables/platform_thin.c
index 976048852..693e9e819 100644
--- a/src/sakit/interactables/platform_thin.c
+++ b/src/sakit/interactables/platform_thin.c
@@ -77,11 +77,9 @@ static const u16 sPlatformBreakAnimations[][6] = {
 };
 static const u16 unused = 0;
 
-void CreateEntity_PlatformThin(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                               u8 spriteY)
+void CreateEntity_PlatformThin(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
-    struct Task *t = TaskCreate(Task_PlatformThinMain, sizeof(Sprite_CommonThinPlatform),
-                                0x2010, 0, TaskDestructor_PlatformThin);
+    struct Task *t = TaskCreate(Task_PlatformThinMain, sizeof(Sprite_CommonThinPlatform), 0x2010, 0, TaskDestructor_PlatformThin);
     Sprite_CommonThinPlatform *platform = TASK_DATA(t);
     Sprite *s = &platform->s;
 
@@ -98,8 +96,7 @@ void CreateEntity_PlatformThin(MapEntity *me, u16 spriteRegionX, u16 spriteRegio
     s->y = TO_WORLD_POS(me->y, spriteRegionY);
     SET_MAP_ENTITY_INITIALIZED(me);
 
-    s->graphics.dest
-        = VramMalloc(sPlatformThinAnimations[LEVEL_TO_ZONE(gCurrentLevel)][0]);
+    s->graphics.dest = VramMalloc(sPlatformThinAnimations[LEVEL_TO_ZONE(gCurrentLevel)][0]);
     s->graphics.anim = sPlatformThinAnimations[LEVEL_TO_ZONE(gCurrentLevel)][1];
     s->variant = sPlatformThinAnimations[LEVEL_TO_ZONE(gCurrentLevel)][2];
 
@@ -177,8 +174,7 @@ static void Task_PlatformThinMain(void)
                 case CHARACTER_SONIC:
                 case CHARACTER_AMY: {
                     anim -= gPlayerCharacterIdleAnims[player->character];
-                    if (unk64 == 0x24 && anim == 0x33 && variant == 1
-                        && player->speedAirY > 0) {
+                    if (unk64 == 0x24 && anim == 0x33 && variant == 1 && player->speedAirY > 0) {
                         player->moveState &= ~MOVESTATE_8;
                         CreatePlatformBreakParticles(x, y);
                         something = TRUE;
@@ -214,11 +210,9 @@ static void Task_PlatformThinMain(void)
     return;
 }
 // (95.35%) https://decomp.me/scratch/8xD3v
-NONMATCH("asm/non_matching/sakit/interactables/CreatePlatformBreakParticles.inc",
-         static void CreatePlatformBreakParticles(s16 x, s16 y))
+NONMATCH("asm/non_matching/sakit/interactables/CreatePlatformBreakParticles.inc", static void CreatePlatformBreakParticles(s16 x, s16 y))
 {
-    struct Task *t = TaskCreate(Task_PlatformBreakParticlesMain, sizeof(Platform_D1C),
-                                0x2011, 0, TaskDestructor_PlatformBreakParticles);
+    struct Task *t = TaskCreate(Task_PlatformBreakParticlesMain, sizeof(Platform_D1C), 0x2011, 0, TaskDestructor_PlatformBreakParticles);
     Platform_D1C *platform = TASK_DATA(t);
 
     // Hack for better match
@@ -237,8 +231,7 @@ NONMATCH("asm/non_matching/sakit/interactables/CreatePlatformBreakParticles.inc"
         y -= 50;
 
         // Init base 1
-        s->graphics.dest
-            = VramMalloc(sPlatformBreakAnimations[LEVEL_TO_ZONE(gCurrentLevel)][0]);
+        s->graphics.dest = VramMalloc(sPlatformBreakAnimations[LEVEL_TO_ZONE(gCurrentLevel)][0]);
         s->graphics.anim = sPlatformBreakAnimations[LEVEL_TO_ZONE(gCurrentLevel)][1];
         s->variant = sPlatformBreakAnimations[LEVEL_TO_ZONE(gCurrentLevel)][2];
 
@@ -283,8 +276,7 @@ NONMATCH("asm/non_matching/sakit/interactables/CreatePlatformBreakParticles.inc"
         // Copy the transform
         DmaCopy16(3, &platform->unkC0, &platform->unkD8, 0xC);
 
-        s->graphics.dest
-            = VramMalloc(sPlatformBreakAnimations[LEVEL_TO_ZONE(gCurrentLevel)][3]);
+        s->graphics.dest = VramMalloc(sPlatformBreakAnimations[LEVEL_TO_ZONE(gCurrentLevel)][3]);
         s->graphics.anim = sPlatformBreakAnimations[LEVEL_TO_ZONE(gCurrentLevel)][4];
         s->variant = sPlatformBreakAnimations[LEVEL_TO_ZONE(gCurrentLevel)][5];
         s->oamFlags = SPRITE_OAM_ORDER(8);
diff --git a/src/sakit/interactables/ramp.c b/src/sakit/interactables/ramp.c
index a31b4dbba..2b48ce6dc 100644
--- a/src/sakit/interactables/ramp.c
+++ b/src/sakit/interactables/ramp.c
@@ -28,8 +28,7 @@ void CreateEntity_Ramp(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 s
 {
     u8 temp;
     s32 temp2;
-    struct Task *t
-        = TaskCreate(Task_Ramp, sizeof(Sprite_Ramp), 0x2010, 0, TaskDestructor_Ramp);
+    struct Task *t = TaskCreate(Task_Ramp, sizeof(Sprite_Ramp), 0x2010, 0, TaskDestructor_Ramp);
     Sprite_Ramp *ramp = TASK_DATA(t);
     Sprite *s = &ramp->s;
 
@@ -117,8 +116,7 @@ static void Task_Ramp(void)
                 s32 temp9 = I(player->x) - temp8;
                 if (temp9 > 0) {
                     if (temp9 > temp2) {
-                        if (!(player->moveState & MOVESTATE_IN_AIR)
-                            && (player->speedGroundX > Q(4))) {
+                        if (!(player->moveState & MOVESTATE_IN_AIR) && (player->speedGroundX > Q(4))) {
                             player->transition = PLTRANS_PT22;
                             player->unk6E = (ramp->unk3C & 1) * 3;
                         }
@@ -130,8 +128,7 @@ static void Task_Ramp(void)
                         s32 temp6 = I(s->hitboxes[0].top * (Q(temp9) / temp2));
 
                         if (temp4 >= temp6) {
-                            if (!(player->moveState & MOVESTATE_IN_AIR)
-                                && (player->speedGroundX > Q(4))
+                            if (!(player->moveState & MOVESTATE_IN_AIR) && (player->speedGroundX > Q(4))
                                 && (player->unk5E & gPlayerControls.jump)) {
                                 if (temp9 < (temp2 / 2)) {
                                     player->transition = PLTRANS_PT22;
@@ -159,15 +156,12 @@ static void Task_Ramp(void)
             }
         } else {
             if (var) {
-                if (((ramp->unk3C & 2) != 0 && I(player->x) < s->x)
-                    || ((ramp->unk3C & 2) == 0 && I(player->x) > s->x)) {
-                    if (!(player->moveState & MOVESTATE_IN_AIR)
-                        && player->speedGroundX > Q(4)) {
+                if (((ramp->unk3C & 2) != 0 && I(player->x) < s->x) || ((ramp->unk3C & 2) == 0 && I(player->x) > s->x)) {
+                    if (!(player->moveState & MOVESTATE_IN_AIR) && player->speedGroundX > Q(4)) {
                         player->transition = PLTRANS_PT22;
                         player->unk6E = (ramp->unk3C & 1) * 3;
                     }
-                } else if (((ramp->unk3C & 2) != 0 && I(player->x) > s->x)
-                           || ((ramp->unk3C & 2) == 0 && I(player->x) < s->x)) {
+                } else if (((ramp->unk3C & 2) != 0 && I(player->x) > s->x) || ((ramp->unk3C & 2) == 0 && I(player->x) < s->x)) {
                     player->moveState &= ~MOVESTATE_8;
                     player->unk3C = NULL;
                 }
diff --git a/src/sakit/interactables/slidy_ice.c b/src/sakit/interactables/slidy_ice.c
index b550700ca..beafd0093 100644
--- a/src/sakit/interactables/slidy_ice.c
+++ b/src/sakit/interactables/slidy_ice.c
@@ -37,12 +37,10 @@ void Task_SlidyIce(void)
     if (!(gPlayer.moveState & MOVESTATE_DEAD)) {
         s32 posX = (screenX + me->offsetX * TILE_WIDTH);
 
-        if ((posX <= I(gPlayer.x))
-            && ((posX + me->width * TILE_WIDTH) >= I(gPlayer.x))) {
+        if ((posX <= I(gPlayer.x)) && ((posX + me->width * TILE_WIDTH) >= I(gPlayer.x))) {
             s32 posY = screenY + me->offsetY * TILE_WIDTH;
 
-            if ((posY <= I(gPlayer.y))
-                && ((posY + me->height * TILE_WIDTH) >= I(gPlayer.y))) {
+            if ((posY <= I(gPlayer.y)) && ((posY + me->height * TILE_WIDTH) >= I(gPlayer.y))) {
                 gPlayer.moveState |= MOVESTATE_800;
             }
         }
@@ -58,8 +56,7 @@ void Task_SlidyIce(void)
     }
 }
 
-void CreateEntity_SlidyIce(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                           u8 spriteY)
+void CreateEntity_SlidyIce(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     struct Task *t = TaskCreate(Task_SlidyIce, sizeof(Sprite_SlidyIce), 0x2010, 0, NULL);
 
diff --git a/src/sakit/interactables/spring.c b/src/sakit/interactables/spring.c
index 1cc08735d..8081172e6 100644
--- a/src/sakit/interactables/spring.c
+++ b/src/sakit/interactables/spring.c
@@ -34,14 +34,12 @@ typedef struct {
 #define SPRING_KIND_TECHNO_BASE 2
 #define NUM_SPRING_KINDS        3
 
-#define INITIALIZE_SPRING(springType)                                                   \
-    CreateEntity_Spring(springType, me, spriteRegionX, spriteRegionY, param3)
+#define INITIALIZE_SPRING(springType) CreateEntity_Spring(springType, me, spriteRegionX, spriteRegionY, param3)
 
 static void CreateEntity_Spring(u8, MapEntity *, u16, u16, u8);
 static void Task_Spring(void);
 static void sub_800E3D0(void);
-static bool32 sub_800E490(Sprite *p0, MapEntity *me, Sprite_Spring *spring,
-                          Player *player);
+static bool32 sub_800E490(Sprite *p0, MapEntity *me, Sprite_Spring *spring, Player *player);
 static void TaskDestructor_Spring(struct Task *t);
 
 static const u16 sSpringAnimationData[NUM_SPRING_KINDS][SPRINGTYPE_COUNT][4] = {
@@ -86,21 +84,16 @@ static const u16 sSpringAnimationData[NUM_SPRING_KINDS][SPRINGTYPE_COUNT][4] = {
 // Effects applied onto the player-state.
 // These trigger the player acceleration when touching each of the spring directions
 static const u8 gUnknown_080D53D0[SPRINGTYPE_COUNT]
-    = { PLTRANS_SPRING_UP,        PLTRANS_SPRING_DOWN,       PLTRANS_SPRING_LEFT,
-        PLTRANS_SPRING_RIGHT,     PLTRANS_SPRING_UP_LEFT,    PLTRANS_SPRING_UP_RIGHT,
-        PLTRANS_SPRING_DOWN_LEFT, PLTRANS_SPRING_DOWN_RIGHT, PLTRANS_SPRING_UP_LEFT,
-        PLTRANS_SPRING_UP_RIGHT };
+    = { PLTRANS_SPRING_UP,       PLTRANS_SPRING_DOWN,      PLTRANS_SPRING_LEFT,       PLTRANS_SPRING_RIGHT,   PLTRANS_SPRING_UP_LEFT,
+        PLTRANS_SPRING_UP_RIGHT, PLTRANS_SPRING_DOWN_LEFT, PLTRANS_SPRING_DOWN_RIGHT, PLTRANS_SPRING_UP_LEFT, PLTRANS_SPRING_UP_RIGHT };
 
 static const u16 sSpring_MusicPlant_Soundeffects[5]
-    = { SE_MUSIC_PLANT_SPRING_1, SE_MUSIC_PLANT_SPRING_2, SE_MUSIC_PLANT_SPRING_3,
-        SE_MUSIC_PLANT_SPRING_4, MUS_DUMMY };
+    = { SE_MUSIC_PLANT_SPRING_1, SE_MUSIC_PLANT_SPRING_2, SE_MUSIC_PLANT_SPRING_3, SE_MUSIC_PLANT_SPRING_4, MUS_DUMMY };
 
-static void CreateEntity_Spring(u8 springType, MapEntity *me, u16 spriteRegionX,
-                                u16 spriteRegionY, u8 spriteY)
+static void CreateEntity_Spring(u8 springType, MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     s16 springKind = SPRING_KIND_NORMAL;
-    struct Task *t = TaskCreate(Task_Spring, sizeof(Sprite_Spring), 0x2010, 0,
-                                TaskDestructor_Spring);
+    struct Task *t = TaskCreate(Task_Spring, sizeof(Sprite_Spring), 0x2010, 0, TaskDestructor_Spring);
     Sprite_Spring *spring = TASK_DATA(t);
     Sprite *s = &spring->s;
 
@@ -196,16 +189,14 @@ static void sub_800E3D0(void)
     }
 }
 
-static bool32 sub_800E490(Sprite *s, MapEntity *me, Sprite_Spring *spring,
-                          Player *player)
+static bool32 sub_800E490(Sprite *s, MapEntity *me, Sprite_Spring *spring, Player *player)
 {
     s16 xPos = TO_WORLD_POS(spring->base.spriteX, spring->base.regionX);
     s16 yPos = TO_WORLD_POS(me->y, spring->base.regionY);
     s->x = xPos - gCamera.x;
     s->y = yPos - gCamera.y;
 
-    if (((player->moveState & MOVESTATE_400000) == 0)
-        && sub_800CDBC(s, xPos, yPos, player) != 0) {
+    if (((player->moveState & MOVESTATE_400000) == 0) && sub_800CDBC(s, xPos, yPos, player) != 0) {
 
         player->transition = gUnknown_080D53D0[spring->unk3D];
         player->unk6E = spring->unk3E;
@@ -231,62 +222,28 @@ static void TaskDestructor_Spring(struct Task *t)
     }
 }
 
-void CreateEntity_Spring_Big_DownLeft(MapEntity *me, u16 spriteRegionX,
-                                      u16 spriteRegionY, u8 param3)
-{
-    INITIALIZE_SPRING(6);
-}
+void CreateEntity_Spring_Big_DownLeft(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 param3) { INITIALIZE_SPRING(6); }
 
-void CreateEntity_Spring_Normal_Down(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                     u8 param3)
+void CreateEntity_Spring_Normal_Down(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 param3)
 {
     INITIALIZE_SPRING(SPRINGTYPE_NORMAL_DOWN);
 }
 
-void CreateEntity_Spring_Big_DownRight(MapEntity *me, u16 spriteRegionX,
-                                       u16 spriteRegionY, u8 param3)
-{
-    INITIALIZE_SPRING(7);
-}
+void CreateEntity_Spring_Big_DownRight(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 param3) { INITIALIZE_SPRING(7); }
 
-void CreateEntity_Spring_Normal_Left(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                     u8 param3)
-{
-    INITIALIZE_SPRING(2);
-}
+void CreateEntity_Spring_Normal_Left(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 param3) { INITIALIZE_SPRING(2); }
 
-void CreateEntity_Spring_Normal_Right(MapEntity *me, u16 spriteRegionX,
-                                      u16 spriteRegionY, u8 param3)
-{
-    INITIALIZE_SPRING(3);
-}
+void CreateEntity_Spring_Normal_Right(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 param3) { INITIALIZE_SPRING(3); }
 
-void CreateEntity_Spring_Big_UpLeft(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                    u8 param3)
-{
-    INITIALIZE_SPRING(4);
-}
+void CreateEntity_Spring_Big_UpLeft(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 param3) { INITIALIZE_SPRING(4); }
 
-void CreateEntity_Spring_Normal_Up(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                   u8 param3)
+void CreateEntity_Spring_Normal_Up(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 param3)
 {
     INITIALIZE_SPRING(SPRINGTYPE_NORMAL_UP);
 }
 
-void CreateEntity_Spring_Big_UpRight(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                                     u8 param3)
-{
-    INITIALIZE_SPRING(5);
-}
+void CreateEntity_Spring_Big_UpRight(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 param3) { INITIALIZE_SPRING(5); }
 
-void CreateEntity_Spring_Small_UpLeft(MapEntity *me, u16 spriteRegionX,
-                                      u16 spriteRegionY, u8 param3)
-{
-    INITIALIZE_SPRING(8);
-}
+void CreateEntity_Spring_Small_UpLeft(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 param3) { INITIALIZE_SPRING(8); }
 
-void CreateEntity_Spring_Small_UpRight(MapEntity *me, u16 spriteRegionX,
-                                       u16 spriteRegionY, u8 param3)
-{
-    INITIALIZE_SPRING(9);
-}
+void CreateEntity_Spring_Small_UpRight(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 param3) { INITIALIZE_SPRING(9); }
diff --git a/src/sakit/item_box.c b/src/sakit/item_box.c
index 05f4f3cd1..d63eb2dca 100644
--- a/src/sakit/item_box.c
+++ b/src/sakit/item_box.c
@@ -52,20 +52,15 @@ void Task_800B950(void);
 void sub_800B9A0(Entity_ItemBox *);
 
 const u16 ItemBox_MysteryIcons[13][3] = {
-    { SA2_ANIM_ITEMBOX_TYPE, 0, 4 },  { SA2_ANIM_ITEMBOX_TYPE, 5, 4 },
-    { SA2_ANIM_ITEMBOX_TYPE, 6, 4 },  { SA2_ANIM_ITEMBOX_TYPE, 7, 4 },
-    { SA2_ANIM_ITEMBOX_TYPE, 8, 4 },  { SA2_ANIM_ITEMBOX_TYPE, 9, 4 },
-    { SA2_ANIM_ITEMBOX_TYPE, 10, 4 }, { SA2_ANIM_ITEMBOX_TYPE, 11, 4 },
-    { SA2_ANIM_ITEMBOX_TYPE, 13, 4 }, { SA2_ANIM_ITEMBOX_TYPE, 14, 4 },
-    { SA2_ANIM_ITEMBOX_TYPE, 15, 4 }, { SA2_ANIM_ITEMBOX_TYPE, 16, 4 },
+    { SA2_ANIM_ITEMBOX_TYPE, 0, 4 },  { SA2_ANIM_ITEMBOX_TYPE, 5, 4 },  { SA2_ANIM_ITEMBOX_TYPE, 6, 4 },  { SA2_ANIM_ITEMBOX_TYPE, 7, 4 },
+    { SA2_ANIM_ITEMBOX_TYPE, 8, 4 },  { SA2_ANIM_ITEMBOX_TYPE, 9, 4 },  { SA2_ANIM_ITEMBOX_TYPE, 10, 4 }, { SA2_ANIM_ITEMBOX_TYPE, 11, 4 },
+    { SA2_ANIM_ITEMBOX_TYPE, 13, 4 }, { SA2_ANIM_ITEMBOX_TYPE, 14, 4 }, { SA2_ANIM_ITEMBOX_TYPE, 15, 4 }, { SA2_ANIM_ITEMBOX_TYPE, 16, 4 },
     { SA2_ANIM_ITEMBOX_TYPE, 12, 4 },
 };
 
 const u16 ItemBox_1UpIcons[5][3] = {
-    { SA2_ANIM_ITEMBOX_TYPE, CHARACTER_SONIC, 4 },
-    { SA2_ANIM_ITEMBOX_TYPE, CHARACTER_CREAM, 4 },
-    { SA2_ANIM_ITEMBOX_TYPE, CHARACTER_TAILS, 4 },
-    { SA2_ANIM_ITEMBOX_TYPE, CHARACTER_KNUCKLES, 4 },
+    { SA2_ANIM_ITEMBOX_TYPE, CHARACTER_SONIC, 4 }, { SA2_ANIM_ITEMBOX_TYPE, CHARACTER_CREAM, 4 },
+    { SA2_ANIM_ITEMBOX_TYPE, CHARACTER_TAILS, 4 }, { SA2_ANIM_ITEMBOX_TYPE, CHARACTER_KNUCKLES, 4 },
     { SA2_ANIM_ITEMBOX_TYPE, CHARACTER_AMY, 4 },
 };
 
@@ -74,8 +69,7 @@ const u16 gUnknown_080D51E4[8] = { 5, 13, 4, 13, 3, 13, 6, 13 };
 const u16 gUnknown_080D51F4[] = { 8, 9, 10, 11 };
 const u8 gUnknown_080D51FC[] = { 1, 5, 10, 30, 50, 0, 0, 0 };
 
-void CreateEntity_ItemBox(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
-                          u8 spriteY)
+void CreateEntity_ItemBox(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY, u8 spriteY)
 {
     struct Task *t;
     Entity_ItemBox *itembox;
@@ -91,8 +85,7 @@ void CreateEntity_ItemBox(MapEntity *me, u16 spriteRegionX, u16 spriteRegionY,
         }
     }
 
-    t = TaskCreate(Task_ItemBoxMain, sizeof(Entity_ItemBox), 0x2000, 0,
-                   TaskDestructor_ItemBox);
+    t = TaskCreate(Task_ItemBoxMain, sizeof(Entity_ItemBox), 0x2000, 0, TaskDestructor_ItemBox);
     itembox = TASK_DATA(t);
     itembox->kind = me->index;
     itembox->unk74 = 0;
@@ -161,31 +154,30 @@ void sub_800B1AC(Entity_ItemBox *itembox)
     gCurTask->main = Task_800B780;
 }
 
-#define ITEMBOX_ADD_NEW_RINGS(oldRingCount, newRingCount)                               \
-    {                                                                                   \
-        gRingCount = newRingCount;                                                      \
-        if (gCurrentLevel != LEVEL_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53)) {               \
-            s32 newLivesCount = Div(gRingCount, 100);                                   \
-                                                                                        \
-            if (newLivesCount != Div(oldRingCount, 100)                                 \
-                && (gGameMode == GAME_MODE_SINGLE_PLAYER)) {                            \
-                u32 newLives = gNumLives;                                               \
-                if (++newLives > 255) {                                                 \
-                    newLives = 255;                                                     \
-                }                                                                       \
-                gNumLives = newLives;                                                   \
-                                                                                        \
-                gUnknown_030054A8.unk3 = 16;                                            \
-            }                                                                           \
-        }                                                                               \
-                                                                                        \
-        if (gGameMode == GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) {                        \
-            if (gRingCount > 255) {                                                     \
-                gRingCount = 255;                                                       \
-            }                                                                           \
-        }                                                                               \
-                                                                                        \
-        m4aSongNumStart(SE_RING_COPY);                                                  \
+#define ITEMBOX_ADD_NEW_RINGS(oldRingCount, newRingCount)                                                                                  \
+    {                                                                                                                                      \
+        gRingCount = newRingCount;                                                                                                         \
+        if (gCurrentLevel != LEVEL_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53)) {                                                                  \
+            s32 newLivesCount = Div(gRingCount, 100);                                                                                      \
+                                                                                                                                           \
+            if (newLivesCount != Div(oldRingCount, 100) && (gGameMode == GAME_MODE_SINGLE_PLAYER)) {                                       \
+                u32 newLives = gNumLives;                                                                                                  \
+                if (++newLives > 255) {                                                                                                    \
+                    newLives = 255;                                                                                                        \
+                }                                                                                                                          \
+                gNumLives = newLives;                                                                                                      \
+                                                                                                                                           \
+                gUnknown_030054A8.unk3 = 16;                                                                                               \
+            }                                                                                                                              \
+        }                                                                                                                                  \
+                                                                                                                                           \
+        if (gGameMode == GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) {                                                                           \
+            if (gRingCount > 255) {                                                                                                        \
+                gRingCount = 255;                                                                                                          \
+            }                                                                                                                              \
+        }                                                                                                                                  \
+                                                                                                                                           \
+        m4aSongNumStart(SE_RING_COPY);                                                                                                     \
     }
 
 void ApplyItemboxEffect(Entity_ItemBox *itembox)
@@ -232,8 +224,7 @@ void ApplyItemboxEffect(Entity_ItemBox *itembox)
         case ITEM__INVINCIBILITY: {
             gPlayer.timerInvincibility = ITEM_DURATION_INVINCIBILITY;
 
-            if (IS_SINGLE_PLAYER
-                || !(gPlayer.itemEffect & PLAYER_ITEM_EFFECT__INVINCIBILITY)) {
+            if (IS_SINGLE_PLAYER || !(gPlayer.itemEffect & PLAYER_ITEM_EFFECT__INVINCIBILITY)) {
                 gPlayer.itemEffect |= PLAYER_ITEM_EFFECT__INVINCIBILITY;
                 CreateItemTask_Invincibility(gPlayer.unk60);
                 gUnknown_030054A8.unk2 = 16;
@@ -279,9 +270,7 @@ void ApplyItemboxEffect(Entity_ItemBox *itembox)
             u8 playerId;
 
             // Find the player that's closest to you
-            for (playerId = 0; playerId < MULTI_SIO_PLAYERS_MAX
-                 && gMultiplayerPlayerTasks[playerId] != NULL;
-                 playerId++) {
+            for (playerId = 0; playerId < MULTI_SIO_PLAYERS_MAX && gMultiplayerPlayerTasks[playerId] != NULL; playerId++) {
                 MultiplayerPlayer *mpp;
                 s32 boxToPlayerX, boxToPlayerY;
                 s32 boxToPlayerMagnitude;
@@ -353,8 +342,7 @@ void sub_800B580(Entity_ItemBox *itembox, bool32 p1)
         case GAME_MODE_BOSS_TIME_ATTACK: {
             if (p1) {
                 if (itembox->kind == 0) {
-                    itembox->item.graphics.anim
-                        = ItemBox_1UpIcons[gSelectedCharacter][0];
+                    itembox->item.graphics.anim = ItemBox_1UpIcons[gSelectedCharacter][0];
                     itembox->item.variant = ItemBox_1UpIcons[gSelectedCharacter][1];
                 } else {
                     itembox->item.graphics.anim = ItemBox_MysteryIcons[itembox->kind][0];
diff --git a/src/sakit/music_manager.c b/src/sakit/music_manager.c
index 64075ab8c..b37934e98 100644
--- a/src/sakit/music_manager.c
+++ b/src/sakit/music_manager.c
@@ -76,8 +76,7 @@ void Task_StageMusicManager(void)
             gUnknown_030054A8.unk0 = 0xFF;
             gUnknown_030054A8.unk6 = 0;
             gUnknown_030054A8.unk5 = 1;
-        } else if ((songHeader == gSongTable[MUS_DROWNING].header)
-                   && (gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_TRACK)
+        } else if ((songHeader == gSongTable[MUS_DROWNING].header) && (gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_TRACK)
                    && !(gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_PAUSE)) {
             gUnknown_030054A8.unk5 = 1;
             gUnknown_030054A8.unk2 = 0;
@@ -87,16 +86,12 @@ void Task_StageMusicManager(void)
             gUnknown_030054A8.unk5 = 1;
 
             m4aSongNumStart(MUS_DROWNING);
-        } else if ((songHeader == gSongTable[MUS_INVINCIBILITY].header)
-                   && (gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_TRACK)
-                   && !(gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_PAUSE)
-                   && !(gPlayer.itemEffect & PLAYER_ITEM_EFFECT__INVINCIBILITY)) {
+        } else if ((songHeader == gSongTable[MUS_INVINCIBILITY].header) && (gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_TRACK)
+                   && !(gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_PAUSE) && !(gPlayer.itemEffect & PLAYER_ITEM_EFFECT__INVINCIBILITY)) {
             gUnknown_030054A8.unk5 = 1;
             m4aSongNumStop(MUS_INVINCIBILITY);
-        } else if ((songHeader != gSongTable[MUS_1_UP].header)
-                   && (songHeader != gSongTable[MUS_INVINCIBILITY].header)
-                   && (gPlayer.itemEffect & PLAYER_ITEM_EFFECT__INVINCIBILITY)
-                   && (gUnknown_030054A8.unk2 == 0)) {
+        } else if ((songHeader != gSongTable[MUS_1_UP].header) && (songHeader != gSongTable[MUS_INVINCIBILITY].header)
+                   && (gPlayer.itemEffect & PLAYER_ITEM_EFFECT__INVINCIBILITY) && (gUnknown_030054A8.unk2 == 0)) {
             gUnknown_030054A8.unk2 = 0;
             gUnknown_030054A8.unk5 = 1;
             m4aSongNumStart(MUS_INVINCIBILITY);
@@ -113,15 +108,13 @@ void Task_StageMusicManager(void)
             u32 unk1 = gUnknown_030054A8.unk1 &= 0x0F;
 
             m4aSongNumStart(gLevelSongs[gCurrentLevel + unk1]);
-        } else if (((gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_TRACK) == 0)
-                   || (gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_PAUSE)) {
+        } else if (((gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_TRACK) == 0) || (gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_PAUSE)) {
             if ((gUnknown_030054A8.unk1 & 0xF0) == 0x20) {
                 m4aSongNumStart(gUnknown_080D5254[gUnknown_030054A8.unk1]);
 
                 MusManager_UpdateBgmParams();
             } else {
-                m4aSongNumStartOrContinue(
-                    gLevelSongs[gCurrentLevel + (gUnknown_030054A8.unk1 & 0x0F)]);
+                m4aSongNumStartOrContinue(gLevelSongs[gCurrentLevel + (gUnknown_030054A8.unk1 & 0x0F)]);
 
                 if (gUnknown_030054A8.unk5 != 0) {
                     gUnknown_030054A8.unk5 = 0;
diff --git a/src/sakit/palette_loader.c b/src/sakit/palette_loader.c
index 5213bbd33..be4351f33 100644
--- a/src/sakit/palette_loader.c
+++ b/src/sakit/palette_loader.c
@@ -11,11 +11,9 @@ static void Task_StagePaletteLoader(void);
  * but only ever called with animations which load a palette
  */
 
-struct Task *CreatePaletteLoaderTask(u16 priority, AnimId anim, u8 variant,
-                                     TaskDestructor dtor)
+struct Task *CreatePaletteLoaderTask(u16 priority, AnimId anim, u8 variant, TaskDestructor dtor)
 {
-    struct Task *t
-        = TaskCreate(Task_StagePaletteLoader, sizeof(Sprite), priority, 0, dtor);
+    struct Task *t = TaskCreate(Task_StagePaletteLoader, sizeof(Sprite), priority, 0, dtor);
 
     Sprite *s = TASK_DATA(t);
 
diff --git a/src/sakit/pause_menu.c b/src/sakit/pause_menu.c
index b2fb4ed02..f11c6b0e1 100644
--- a/src/sakit/pause_menu.c
+++ b/src/sakit/pause_menu.c
@@ -34,9 +34,8 @@ typedef struct {
 } AnimInfoPauseMenu;
 
 const AnimInfoPauseMenu sAnimInfoPauseMenu[] = {
-    { 40, SA2_ANIM_PAUSE_MENU_JP, 0 }, { 40, SA2_ANIM_PAUSE_MENU_EN, 0 },
-    { 40, SA2_ANIM_PAUSE_MENU_DE, 0 }, { 40, SA2_ANIM_PAUSE_MENU_FR, 0 },
-    { 40, SA2_ANIM_PAUSE_MENU_ES, 0 }, { 40, SA2_ANIM_PAUSE_MENU_IT, 0 },
+    { 40, SA2_ANIM_PAUSE_MENU_JP, 0 }, { 40, SA2_ANIM_PAUSE_MENU_EN, 0 }, { 40, SA2_ANIM_PAUSE_MENU_DE, 0 },
+    { 40, SA2_ANIM_PAUSE_MENU_FR, 0 }, { 40, SA2_ANIM_PAUSE_MENU_ES, 0 }, { 40, SA2_ANIM_PAUSE_MENU_IT, 0 },
 };
 
 #define PMCURSOR_CONTINUE 0
@@ -59,8 +58,7 @@ void CreatePauseMenu(void)
         void *vramTiles = VramMalloc(sAnimInfoPauseMenu[lang].size);
 
         if (vramTiles != ewram_end) {
-            struct Task *t = TaskCreate(Task_PauseMenuInit, sizeof(PauseMenu), 0xFFFE, 4,
-                                        TaskDestructor_PauseMenu);
+            struct Task *t = TaskCreate(Task_PauseMenuInit, sizeof(PauseMenu), 0xFFFE, 4, TaskDestructor_PauseMenu);
             PauseMenu *pm = TASK_DATA(t);
             Sprite *s = &pm->s;
 
@@ -99,13 +97,10 @@ void Task_PauseMenuUpdate(void)
     PauseMenu *pm = TASK_DATA(gCurTask);
 
     /* Handle A-/B-Button */
-    if ((gReleasedKeys & A_BUTTON)
-        && (pm->unk63 & PMFLAG_HOLDING_A_BUTTON_SINCE_CREATION)) {
+    if ((gReleasedKeys & A_BUTTON) && (pm->unk63 & PMFLAG_HOLDING_A_BUTTON_SINCE_CREATION)) {
         pm->unk63 = PMFLAG_A_BUTTON_RELEASED;
-    } else if ((gPressedKeys & START_BUTTON)
-               || ((pm->cursor == PMCURSOR_CONTINUE) && (gReleasedKeys & A_BUTTON))
-               || ((gGameMode != GAME_MODE_SINGLE_PLAYER)
-                   && (gPressedKeys & B_BUTTON))) {
+    } else if ((gPressedKeys & START_BUTTON) || ((pm->cursor == PMCURSOR_CONTINUE) && (gReleasedKeys & A_BUTTON))
+               || ((gGameMode != GAME_MODE_SINGLE_PLAYER) && (gPressedKeys & B_BUTTON))) {
         // Close the Pause Menu
         gFlags &= ~FLAGS_PAUSE_GAME;
         m4aMPlayContinue(gMPlayTable[0].info);
@@ -121,8 +116,7 @@ void Task_PauseMenuUpdate(void)
         PAUSE_GRAPHICS_QUEUE();
         CreateTimeAttackLobbyScreen();
         return;
-    } else if ((gGameMode == GAME_MODE_SINGLE_PLAYER)
-               && (pm->cursor != PMCURSOR_CONTINUE) && (gReleasedKeys & A_BUTTON)) {
+    } else if ((gGameMode == GAME_MODE_SINGLE_PLAYER) && (pm->cursor != PMCURSOR_CONTINUE) && (gReleasedKeys & A_BUTTON)) {
         gFlags &= ~FLAGS_PAUSE_GAME;
         m4aSongNumStart(SE_SELECT);
 
@@ -205,8 +199,7 @@ extern u8 Tileset_zone_1_act_1_fg[];
 
 void sub_800AE58(void)
 {
-    DmaCopy16(3, &Tileset_zone_1_act_1_fg[(4 * 16 * TILE_SIZE_4BPP) / sizeof(u16)],
-              (void *)(OBJ_VRAM1 + 0x3EC0), 0x140);
+    DmaCopy16(3, &Tileset_zone_1_act_1_fg[(4 * 16 * TILE_SIZE_4BPP) / sizeof(u16)], (void *)(OBJ_VRAM1 + 0x3EC0), 0x140);
 
     gObjPalette[1] = RGB_WHITE;
     gFlags |= FLAGS_UPDATE_SPRITE_PALETTES;
diff --git a/src/sakit/ring.c b/src/sakit/ring.c
index 2204c3182..a536b2923 100644
--- a/src/sakit/ring.c
+++ b/src/sakit/ring.c
@@ -41,13 +41,11 @@ void CreateMagneticRing(s16 x, s16 y)
     s->prevVariant = -1;
     s->animSpeed = 0x10;
     s->palId = 0;
-    s->frameFlags
-        = (SPRITE_FLAG_MASK_19 | SPRITE_FLAG_MASK_18 | SPRITE_FLAG(PRIORITY, 2));
+    s->frameFlags = (SPRITE_FLAG_MASK_19 | SPRITE_FLAG_MASK_18 | SPRITE_FLAG(PRIORITY, 2));
 }
 
 // (88.87%) https://decomp.me/scratch/EmhmV
-NONMATCH("asm/non_matching/game/stage/Task_MagneticRing.inc",
-         void Task_MagneticRing(void))
+NONMATCH("asm/non_matching/game/stage/Task_MagneticRing.inc", void Task_MagneticRing(void))
 {
     StageRing *ring = TASK_DATA(gCurTask);
     Player *p = &gPlayer;
@@ -71,22 +69,18 @@ NONMATCH("asm/non_matching/game/stage/Task_MagneticRing.inc",
     lvalue = ring->s.x - 8;
     rvalue = I(p->x) + gUnknown_03005AF0.s.hitboxes[0].left;
 
-    if (((lvalue <= rvalue) && (ring->s.x + 8 < rvalue))
-        || ((ringY - 16 > I(gPlayer.y) + gUnknown_03005AF0.s.hitboxes[0].top))
-        || ((I(p->y) >= gUnknown_03005AF0.s.hitboxes[0].top)
-            || ringY - 16 < gUnknown_03005AF0.s.hitboxes[0].top)) {
+    if (((lvalue <= rvalue) && (ring->s.x + 8 < rvalue)) || ((ringY - 16 > I(gPlayer.y) + gUnknown_03005AF0.s.hitboxes[0].top))
+        || ((I(p->y) >= gUnknown_03005AF0.s.hitboxes[0].top) || ringY - 16 < gUnknown_03005AF0.s.hitboxes[0].top)) {
 
     }
 
-    else if (gUnknown_03005AF0.s.hitboxes[0].bottom - gUnknown_03005AF0.s.hitboxes[0].top
-             >= I(gPlayer.y) + ringY) {
+    else if (gUnknown_03005AF0.s.hitboxes[0].bottom - gUnknown_03005AF0.s.hitboxes[0].top >= I(gPlayer.y) + ringY) {
         // _0800BC36
         if (PLAYER_IS_ALIVE) {
             u16 oldRings = gRingCount;
             gRingCount++;
 
-            if ((gCurrentLevel != COURSE_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53))
-                && (Div(gRingCount, 100) != Div(oldRings, 100))
+            if ((gCurrentLevel != COURSE_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53)) && (Div(gRingCount, 100) != Div(oldRings, 100))
                 && (gGameMode == GAME_MODE_SINGLE_PLAYER)) {
                 u32 lives = gNumLives;
                 if (lives + 1 > 255)
diff --git a/src/sakit/rings_manager.c b/src/sakit/rings_manager.c
index d18cfe60c..596494f0d 100644
--- a/src/sakit/rings_manager.c
+++ b/src/sakit/rings_manager.c
@@ -78,8 +78,7 @@ void CreateStageRingsManager(void)
     u32 dataSize;
 
     if (gGameMode != GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) {
-        t = TaskCreate(Task_RingsMgrMain, sizeof(RingsManager), 0x2000, 0,
-                       TaskDestructor_8007F1C);
+        t = TaskCreate(Task_RingsMgrMain, sizeof(RingsManager), 0x2000, 0, TaskDestructor_8007F1C);
 
         compressedRingPosData = gSpritePosData_rings[gCurrentLevel];
         dataSize = (*(u32 *)compressedRingPosData) >> 8;
@@ -115,15 +114,13 @@ void CreateStageRingsManager(void)
     s->prevVariant = -1;
     s->animSpeed = 0x10;
     s->palId = 0;
-    s->frameFlags
-        = (SPRITE_FLAG_MASK_18 | SPRITE_FLAG(PRIORITY, 2) | SPRITE_FLAG_MASK_MOSAIC);
+    s->frameFlags = (SPRITE_FLAG_MASK_18 | SPRITE_FLAG(PRIORITY, 2) | SPRITE_FLAG_MASK_MOSAIC);
 }
 
 // TODO: Create GET_OFFSET macro!
 //
 // (76.80%) https://decomp.me/scratch/pbchb
-NONMATCH("asm/non_matching/game/stage/Task_RingsMgrMain.inc",
-         void Task_RingsMgrMain(void))
+NONMATCH("asm/non_matching/game/stage/Task_RingsMgrMain.inc", void Task_RingsMgrMain(void))
 {
     // oam sub-frame ID?
     u8 sp1C = 0;
@@ -160,8 +157,7 @@ NONMATCH("asm/non_matching/game/stage/Task_RingsMgrMain.inc",
         // _08007FBE
         sp08 = FALSE;
         if (gCurrentLevel == LEVEL_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53)) {
-            u32 res = SuperSonicGetFlags()
-                & (SUPER_FLAG__200 | SUPER_FLAG__10 | SUPER_FLAG__8 | SUPER_FLAG__4);
+            u32 res = SuperSonicGetFlags() & (SUPER_FLAG__200 | SUPER_FLAG__10 | SUPER_FLAG__8 | SUPER_FLAG__4);
             sp08 = TRUE;
 
             if (res) {
@@ -215,38 +211,26 @@ NONMATCH("asm/non_matching/game/stage/Task_RingsMgrMain.inc",
                             s32 rx = TO_WORLD_POS(meRing->x, sb);
                             s32 ry = TO_WORLD_POS(meRing->y, sl);
 
-                            if ((sp08 != FALSE)
-                                || (gCurrentLevel
-                                        != LEVEL_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53)
-                                    && PLAYER_IS_ALIVE)) {
+                            if ((sp08 != FALSE) || (gCurrentLevel != LEVEL_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53) && PLAYER_IS_ALIVE)) {
                                 // _0800810A
                                 s32 ringLeft = rx - 8;
 
                                 // Player touches ring(?)
-                                if (((ringLeft <= RM_PLAYER_LEFT)
-                                     && ((rx + 8) >= RM_PLAYER_LEFT))
-                                    || ((RM_PLAYER_RIGHT >= ringLeft))) {
+                                if (((ringLeft <= RM_PLAYER_LEFT) && ((rx + 8) >= RM_PLAYER_LEFT)) || ((RM_PLAYER_RIGHT >= ringLeft))) {
                                     // _0800813A
                                     s32 ringTop = ry - 16;
 
-                                    if (((ringTop <= RM_PLAYER_TOP)
-                                         && (RM_PLAYER_TOP >= ringTop))
-                                        || (ry >= RM_PLAYER_TOP)
-                                        || (((ringTop >= RM_PLAYER_TOP)
-                                             && (((ry + 16) <= RM_PLAYER_BOTTOM))))) {
+                                    if (((ringTop <= RM_PLAYER_TOP) && (RM_PLAYER_TOP >= ringTop)) || (ry >= RM_PLAYER_TOP)
+                                        || (((ringTop >= RM_PLAYER_TOP) && (((ry + 16) <= RM_PLAYER_BOTTOM))))) {
                                         // _08008166
                                         u16 prevRingCount = gRingCount;
                                         gRingCount++;
 
-                                        if (gCurrentLevel
-                                            != LEVEL_INDEX(ZONE_FINAL,
-                                                           ACT_TRUE_AREA_53)) {
+                                        if (gCurrentLevel != LEVEL_INDEX(ZONE_FINAL, ACT_TRUE_AREA_53)) {
                                             s32 lives = Div(gRingCount, 100);
                                             s32 prevLives = Div(prevRingCount, 100);
 
-                                            if ((lives != prevLives)
-                                                && (gGameMode
-                                                    == GAME_MODE_SINGLE_PLAYER)) {
+                                            if ((lives != prevLives) && (gGameMode == GAME_MODE_SINGLE_PLAYER)) {
                                                 if ((gNumLives + 1) > 255u)
                                                     gNumLives = 255;
                                                 else
@@ -257,8 +241,7 @@ NONMATCH("asm/non_matching/game/stage/Task_RingsMgrMain.inc",
                                         }
                                         // _080081AC
 
-                                        if (gGameMode
-                                            == GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) {
+                                        if (gGameMode == GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) {
                                             if (gRingCount > 0xFF)
                                                 gRingCount = 0xFF;
                                         }
@@ -306,8 +289,7 @@ NONMATCH("asm/non_matching/game/stage/Task_RingsMgrMain.inc",
                         hbRight = Q((px + mpp->s.hitboxes[0].right) + 16);
                         // hbLeft = Q((px + mpp->s.hitboxes[0].left) + 16);
 
-                        while (((sb << 8) < (gCamera.x + DISPLAY_WIDTH))
-                               && (sb < regions_x)) {
+                        while (((sb << 8) < (gCamera.x + DISPLAY_WIDTH)) && (sb < regions_x)) {
                             // _080086E8
                             s32 yPos = sl * regions_x;
                             s32 xPos = sb * 4;
@@ -325,22 +307,13 @@ NONMATCH("asm/non_matching/game/stage/Task_RingsMgrMain.inc",
                                         s32 rx = TO_WORLD_POS(meRing->x, sb);
                                         s32 ry = TO_WORLD_POS(meRing->y, sl);
 
-                                        if ((((rx - 8)
-                                              <= (mpp->pos.x + mpp->s.hitboxes[0].left))
-                                             && ((rx + 8) > mpp->s.hitboxes[0].right))
-                                            && (((ry - 8) >= (mpp->pos.y
-                                                              + mpp->s.hitboxes[0].top))
-                                                && ((rx + 8)
-                                                    <= mpp->s.hitboxes[0].bottom))) {
-                                            u8 anim = rm->s.graphics.anim
-                                                - gPlayerCharacterIdleAnims
-                                                    [gMultiplayerCharacters[mpp->unk56]];
-                                            if ((anim != SA2_CHAR_ANIM_28
-                                                 && anim != SA2_CHAR_ANIM_29)
-                                                || !(mpp->unk54 & 0x4)) {
+                                        if ((((rx - 8) <= (mpp->pos.x + mpp->s.hitboxes[0].left)) && ((rx + 8) > mpp->s.hitboxes[0].right))
+                                            && (((ry - 8) >= (mpp->pos.y + mpp->s.hitboxes[0].top))
+                                                && ((rx + 8) <= mpp->s.hitboxes[0].bottom))) {
+                                            u8 anim = rm->s.graphics.anim - gPlayerCharacterIdleAnims[gMultiplayerCharacters[mpp->unk56]];
+                                            if ((anim != SA2_CHAR_ANIM_28 && anim != SA2_CHAR_ANIM_29) || !(mpp->unk54 & 0x4)) {
                                                 CreateCollectRingEffect(rx, ry);
-                                                meRing->x
-                                                    = (u8)MAP_ENTITY_STATE_INITIALIZED;
+                                                meRing->x = (u8)MAP_ENTITY_STATE_INITIALIZED;
                                             }
                                         }
                                     }
@@ -360,15 +333,13 @@ NONMATCH("asm/non_matching/game/stage/Task_RingsMgrMain.inc",
         {
             sl = Q(gCamera.y) >> 16;
 
-            if ((gPlayer.itemEffect & PLAYER_ITEM_EFFECT__SHIELD_MAGNETIC)
-                && (gGameMode != GAME_MODE_MULTI_PLAYER_COLLECT_RINGS)) {
+            if ((gPlayer.itemEffect & PLAYER_ITEM_EFFECT__SHIELD_MAGNETIC) && (gGameMode != GAME_MODE_MULTI_PLAYER_COLLECT_RINGS)) {
 
                 while (((sl << 8) < gCamera.y + DISPLAY_HEIGHT) && (sl < regions_y)) {
                     // _080086CC
                     sb = Q(gCamera.x) >> 16;
 
-                    while (((sb << 8) < (gCamera.x + DISPLAY_WIDTH))
-                           && (sb < regions_x)) {
+                    while (((sb << 8) < (gCamera.x + DISPLAY_WIDTH)) && (sb < regions_x)) {
                         // _080086E8
                         s32 yPos = sl * regions_x;
                         s32 xPos = sb * 4;
@@ -387,15 +358,10 @@ NONMATCH("asm/non_matching/game/stage/Task_RingsMgrMain.inc",
                                     s32 rx = TO_WORLD_POS(meRing->x, sb);
                                     s32 ry = TO_WORLD_POS(meRing->y, sl);
 
-                                    if (((u32)(rx - gCamera.x) + TILE_WIDTH)
-                                            <= (DISPLAY_WIDTH + 2 * TILE_WIDTH)
-                                        && (((ry - gCamera.y)) >= 0)
-                                        && (((ry - gCamera.y) - 2 * TILE_WIDTH)
-                                            > DISPLAY_HEIGHT)) {
+                                    if (((u32)(rx - gCamera.x) + TILE_WIDTH) <= (DISPLAY_WIDTH + 2 * TILE_WIDTH)
+                                        && (((ry - gCamera.y)) >= 0) && (((ry - gCamera.y) - 2 * TILE_WIDTH) > DISPLAY_HEIGHT)) {
                                         meRing++;
-                                    } else if (((rx - 64) <= I(gPlayer.x))
-                                               && ((rx + 64) >= I(gPlayer.x))
-                                               && ((ry - 72) <= I(gPlayer.y))
+                                    } else if (((rx - 64) <= I(gPlayer.x)) && ((rx + 64) >= I(gPlayer.x)) && ((ry - 72) <= I(gPlayer.y))
                                                && ((ry + 56 >= I(gPlayer.y)))) {
                                         CreateMagneticRing(rx, ry);
                                         meRing->x = (u8)MAP_ENTITY_STATE_INITIALIZED;
@@ -413,28 +379,19 @@ NONMATCH("asm/non_matching/game/stage/Task_RingsMgrMain.inc",
                                             DisplaySprite(s);
                                         } else {
                                             // _08008788
-                                            OamData *oamDat
-                                                = &gOamBuffer2[s->oamBaseIndex];
-                                            OamData *oamAllocated
-                                                = OamMalloc(GET_SPRITE_OAM_ORDER(s));
+                                            OamData *oamDat = &gOamBuffer2[s->oamBaseIndex];
+                                            OamData *oamAllocated = OamMalloc(GET_SPRITE_OAM_ORDER(s));
 
                                             if (iwram_end == oamAllocated)
                                                 return;
 
-                                            DmaCopy16(3, oamDat, oamAllocated,
-                                                      sizeof(OamDataShort));
+                                            DmaCopy16(3, oamDat, oamAllocated, sizeof(OamDataShort));
 
                                             // TODO: Can these be done more explicitly?
                                             oamAllocated->all.attr1 &= 0xFE00;
                                             oamAllocated->all.attr0 &= 0xFF00;
-                                            oamAllocated->all.attr0
-                                                += ((ry - gCamera.y)
-                                                    - dimensions->offsetY)
-                                                & 0xFF;
-                                            oamAllocated->all.attr1
-                                                += ((rx - gCamera.x)
-                                                    - dimensions->offsetX)
-                                                & 0x1FF;
+                                            oamAllocated->all.attr0 += ((ry - gCamera.y) - dimensions->offsetY) & 0xFF;
+                                            oamAllocated->all.attr1 += ((rx - gCamera.x) - dimensions->offsetX) & 0x1FF;
                                         }
                                         sp1C++;
                                     }
@@ -455,8 +412,7 @@ NONMATCH("asm/non_matching/game/stage/Task_RingsMgrMain.inc",
                     // _080086CC
                     sb = Q(gCamera.x) >> 16;
 
-                    while (((sb << 8) < (gCamera.x + DISPLAY_WIDTH))
-                           && (sb < regions_x)) {
+                    while (((sb << 8) < (gCamera.x + DISPLAY_WIDTH)) && (sb < regions_x)) {
                         // _080086E8
                         s32 yPos = sl * regions_x;
                         s32 xPos = sb * 4;
@@ -477,11 +433,8 @@ NONMATCH("asm/non_matching/game/stage/Task_RingsMgrMain.inc",
                                     s32 rx = TO_WORLD_POS(meRing->x, sb);
                                     s32 ry = TO_WORLD_POS(meRing->y, sl);
 
-                                    if ((unsigned)((rx - gCamera.x) + TILE_WIDTH)
-                                            <= (DISPLAY_WIDTH + 2 * TILE_WIDTH)
-                                        && (((ry - gCamera.y)) >= 0)
-                                        && (((ry - gCamera.y) - 2 * TILE_WIDTH)
-                                            > DISPLAY_HEIGHT)) {
+                                    if ((unsigned)((rx - gCamera.x) + TILE_WIDTH) <= (DISPLAY_WIDTH + 2 * TILE_WIDTH)
+                                        && (((ry - gCamera.y)) >= 0) && (((ry - gCamera.y) - 2 * TILE_WIDTH) > DISPLAY_HEIGHT)) {
                                         meRing++;
                                     } else {
                                         meRing++;
@@ -495,28 +448,19 @@ NONMATCH("asm/non_matching/game/stage/Task_RingsMgrMain.inc",
                                             DisplaySprite(s);
                                         } else {
                                             // _08008788
-                                            OamData *oamDat
-                                                = &gOamBuffer2[s->oamBaseIndex];
-                                            OamData *oamAllocated
-                                                = OamMalloc(GET_SPRITE_OAM_ORDER(s));
+                                            OamData *oamDat = &gOamBuffer2[s->oamBaseIndex];
+                                            OamData *oamAllocated = OamMalloc(GET_SPRITE_OAM_ORDER(s));
 
                                             if (iwram_end == oamAllocated)
                                                 return;
 
-                                            DmaCopy16(3, oamDat, oamAllocated,
-                                                      sizeof(OamDataShort));
+                                            DmaCopy16(3, oamDat, oamAllocated, sizeof(OamDataShort));
 
                                             // TODO: Can these be done more explicitly?
                                             oamAllocated->all.attr1 &= 0xFE00;
                                             oamAllocated->all.attr0 &= 0xFF00;
-                                            oamAllocated->all.attr0
-                                                += ((ry - gCamera.y)
-                                                    - dimensions->offsetY)
-                                                & 0xFF;
-                                            oamAllocated->all.attr1
-                                                += ((rx - gCamera.x)
-                                                    - dimensions->offsetX)
-                                                & 0x1FF;
+                                            oamAllocated->all.attr0 += ((ry - gCamera.y) - dimensions->offsetY) & 0xFF;
+                                            oamAllocated->all.attr1 += ((rx - gCamera.x) - dimensions->offsetX) & 0x1FF;
                                         }
                                         sp1C++;
                                     }
diff --git a/src/sakit/spot_light.c b/src/sakit/spot_light.c
index 2581a74b1..0686b492e 100644
--- a/src/sakit/spot_light.c
+++ b/src/sakit/spot_light.c
@@ -24,8 +24,7 @@ void TaskDestructor_SpotLightMain(struct Task *);
 
 bool32 CreateSpotLightBeams(void)
 {
-    struct Task *t = TaskCreate(Task_SpotLightMain, sizeof(StageSpotLight), 0x2000, 0,
-                                TaskDestructor_SpotLightMain);
+    struct Task *t = TaskCreate(Task_SpotLightMain, sizeof(StageSpotLight), 0x2000, 0, TaskDestructor_SpotLightMain);
     StageSpotLight *spotLight = TASK_DATA(t);
     StageUnkTask *ut;
 
@@ -66,8 +65,7 @@ void Task_SpotLightMain(void)
     if (!(gStageFlags & STAGE_FLAG__100)) {
         ut = TASK_DATA(spotLight->t0);
 
-        if (((gStageTime & 0x7) == 0) && (ut->unkB != 0)
-            && (gDispCnt & DISPCNT_BG0_ON)) {
+        if (((gStageTime & 0x7) == 0) && (ut->unkB != 0) && (gDispCnt & DISPCNT_BG0_ON)) {
 
             if (ut->unkB < 32)
                 ut->unkB++;
@@ -98,8 +96,7 @@ void Task_SpotLightMain(void)
 
         gWinRegs[WINREG_WININ] = (WININ_WIN0_ALL | WININ_WIN1_ALL);
 
-        gWinRegs[WINREG_WINOUT]
-            = (WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ) & ~WINOUT_WIN01_BG0;
+        gWinRegs[WINREG_WINOUT] = (WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ) & ~WINOUT_WIN01_BG0;
 
         spotLight->unk8 -= 0x40;
         if (spotLight->unk8 < 0x600) {
diff --git a/src/sakit/unknown_sprite.c b/src/sakit/unknown_sprite.c
index 214568ae4..abf9780e1 100644
--- a/src/sakit/unknown_sprite.c
+++ b/src/sakit/unknown_sprite.c
@@ -20,11 +20,9 @@ void sub_800A5F8(void);
 
 // Seems to create the given animation on the screen in a fixed position
 // and despawns once it leaves player range?
-struct Task *sub_800A544(u16 taskPrio, void *vramTiles, AnimId anim, u8 variant,
-                         TaskDestructor dtor)
+struct Task *sub_800A544(u16 taskPrio, void *vramTiles, AnimId anim, u8 variant, TaskDestructor dtor)
 {
-    struct Task *t
-        = TaskCreate(sub_800A5F8, sizeof(Sprite_StageSprUnknown), taskPrio, 0, dtor);
+    struct Task *t = TaskCreate(sub_800A5F8, sizeof(Sprite_StageSprUnknown), taskPrio, 0, dtor);
 
     Sprite_StageSprUnknown *su = TASK_DATA(t);
     su->x = 0;
@@ -69,8 +67,7 @@ void sub_800A5F8(void)
         su->unk40--;
     }
 
-    if (((u16)(su->s.x + 32) > (DISPLAY_WIDTH + 2 * 32))
-        || (((su->s.y - 32) > DISPLAY_HEIGHT))) {
+    if (((u16)(su->s.x + 32) > (DISPLAY_WIDTH + 2 * 32)) || (((su->s.y - 32) > DISPLAY_HEIGHT))) {
         TaskDestroy(gCurTask);
     } else if (UpdateSpriteAnimation(&su->s) == 0 && su->unk40 == 0) {
         TaskDestroy(gCurTask);
diff --git a/src/sakit/unknown_task.c b/src/sakit/unknown_task.c
index f298b6b49..91e64ad70 100644
--- a/src/sakit/unknown_task.c
+++ b/src/sakit/unknown_task.c
@@ -15,8 +15,7 @@ void TaskDestructor_CreateStageUnknownTask(struct Task *);
 
 struct Task *CreateStageUnknownTask(void)
 {
-    struct Task *t = TaskCreate(Task_CreateStageUnknownTask, sizeof(StageUnkTask),
-                                0x2000, 0, TaskDestructor_CreateStageUnknownTask);
+    struct Task *t = TaskCreate(Task_CreateStageUnknownTask, sizeof(StageUnkTask), 0x2000, 0, TaskDestructor_CreateStageUnknownTask);
     StageUnkTask *ut = TASK_DATA(t);
 
     ut->unk6 = 120;
@@ -39,8 +38,7 @@ typedef struct {
 
 // (68.53%) https://decomp.me/scratch/NchTb
 // (66.79%) https://decomp.me/scratch/PmbTP
-NONMATCH("asm/non_matching/game/stage/Task_CreateStageUnknownTask.inc",
-         void Task_CreateStageUnknownTask(void))
+NONMATCH("asm/non_matching/game/stage/Task_CreateStageUnknownTask.inc", void Task_CreateStageUnknownTask(void))
 {
     u32 sinIndex;
     s32 someCos;
@@ -113,8 +111,7 @@ NONMATCH("asm/non_matching/game/stage/Task_CreateStageUnknownTask.inc",
 
             // __08009AF4
 
-            divRes = Div((SIN_24_8(sinIndex & ONE_CYCLE) << 8),
-                         COS_24_8(sinIndex & ONE_CYCLE));
+            divRes = Div((SIN_24_8(sinIndex & ONE_CYCLE) << 8), COS_24_8(sinIndex & ONE_CYCLE));
             sp08[2] = Q_24_8((ut->unk8 * divRes) - DISPLAY_HEIGHT);
             sp08[3] = DISPLAY_HEIGHT;
 
@@ -133,8 +130,7 @@ NONMATCH("asm/non_matching/game/stage/Task_CreateStageUnknownTask.inc",
                     sinIndex = 256 - r5;
                 }
 
-                divRes = Div((SIN_24_8(sinIndex & ONE_CYCLE) << 8),
-                             COS_24_8(sinIndex & ONE_CYCLE));
+                divRes = Div((SIN_24_8(sinIndex & ONE_CYCLE) << 8), COS_24_8(sinIndex & ONE_CYCLE));
                 sp14[1] = ut->unk8 - ((ut->unk6 * divRes) >> 8);
             } else if (sp14[0] >= DISPLAY_WIDTH) {
                 // _08009BD8
@@ -147,8 +143,7 @@ NONMATCH("asm/non_matching/game/stage/Task_CreateStageUnknownTask.inc",
                     sinIndex = 256 - r5;
                 }
                 // _08009BF6
-                divRes = Div((SIN_24_8(sinIndex & ONE_CYCLE) << 8),
-                             COS_24_8(sinIndex & ONE_CYCLE));
+                divRes = Div((SIN_24_8(sinIndex & ONE_CYCLE) << 8), COS_24_8(sinIndex & ONE_CYCLE));
                 sp14[1] = ut->unk8 - (((sb - ut->unk6) * divRes) >> 8);
 
             } else {
diff --git a/src/sakit/unused_level_select.c b/src/sakit/unused_level_select.c
index 7d17337b7..8a85fa19a 100644
--- a/src/sakit/unused_level_select.c
+++ b/src/sakit/unused_level_select.c
@@ -36,8 +36,7 @@ void CreateUnusedLevelSelect(void)
         LevelSelect *levelSelect = TASK_DATA(t);
 
         gDispCnt = (DISPCNT_BG0_ON | DISPCNT_OBJ_1D_MAP | DISPCNT_MODE_0);
-        gBgCntRegs[0] = (BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_CHARBASE(1)
-                         | BGCNT_PRIORITY(2));
+        gBgCntRegs[0] = (BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_CHARBASE(1) | BGCNT_PRIORITY(2));
 
         levelSelect->unk4 = 0;
         levelSelect->levelId = 0;
@@ -104,8 +103,7 @@ static void Task_8009854(void)
     gBgPalette[1] = RGB_WHITE;
     gFlags |= 0x1;
 
-    levelSelect->vram
-        += RenderText(levelSelect->vram, Tileset_Language, 0x6, 0xE, 0, "STAGE", 0);
+    levelSelect->vram += RenderText(levelSelect->vram, Tileset_Language, 0x6, 0xE, 0, "STAGE", 0);
 
     gCurTask->main = Task_Poll;
     gCurTask->main();
diff --git a/src/sakit/unused_unknown_task.c b/src/sakit/unused_unknown_task.c
index 8c7213b9d..9f432bbe5 100644
--- a/src/sakit/unused_unknown_task.c
+++ b/src/sakit/unused_unknown_task.c
@@ -7,8 +7,7 @@
 #include "data/tileset_language.h"
 
 const u8 ALIGNED(4) gUnknown_080D5130[]
-    = { 'F',  'L',  'A',  'S',  'H',  0xC5, 0xB2, 0xC4, 0x2C, 0xBE, 0xB0,
-        0xCC, 0xDE, 0xC3, 0xDE, 0xB7, 0xC5, 0xB2, 0xC3, 0xDE, 0xBD };
+    = { 'F', 'L', 'A', 'S', 'H', 0xC5, 0xB2, 0xC4, 0x2C, 0xBE, 0xB0, 0xCC, 0xDE, 0xC3, 0xDE, 0xB7, 0xC5, 0xB2, 0xC3, 0xDE, 0xBD };
 
 void Task_800A4CC(void);
 void sub_800A510(void);
@@ -16,8 +15,7 @@ void sub_800A510(void);
 void sub_800A43C(void)
 {
     gDispCnt = (DISPCNT_BG2_ON | DISPCNT_OBJ_1D_MAP | DISPCNT_MODE_0);
-    gBgCntRegs[2]
-        = (BGCNT_SCREENBASE(30) | BGCNT_16COLOR | BGCNT_CHARBASE(0) | BGCNT_PRIORITY(1));
+    gBgCntRegs[2] = (BGCNT_SCREENBASE(30) | BGCNT_16COLOR | BGCNT_CHARBASE(0) | BGCNT_PRIORITY(1));
     DmaFill32(3, 0, VRAM, 2 * TILE_SIZE_4BPP);
 
     gUnknown_03004D80[2] = 0;
@@ -35,8 +33,7 @@ void sub_800A43C(void)
 
 void Task_800A4CC(void)
 {
-    RenderText((void *)(VRAM + 1 * TILE_SIZE_4BPP), &Tileset_Language, 1, 10, 2,
-               gUnknown_080D5130, 0);
+    RenderText((void *)(VRAM + 1 * TILE_SIZE_4BPP), &Tileset_Language, 1, 10, 2, gUnknown_080D5130, 0);
 
     if (gPressedKeys & A_BUTTON) {
         sub_800A510();
diff --git a/src/sio32_multi_load.c b/src/sio32_multi_load.c
index d4fd480e1..7c7832bd9 100644
--- a/src/sio32_multi_load.c
+++ b/src/sio32_multi_load.c
@@ -19,14 +19,12 @@ u32 Sio32MultiLoadMain(u32 *progressCounterp)
 
     switch (gSio32MultiLoadArea.state) {
         case 0:
-            if (gSio32MultiLoadArea.type
-                || gSio32MultiLoadArea.frameCounter) // Slave SIO Mode switch delay wait
+            if (gSio32MultiLoadArea.type || gSio32MultiLoadArea.frameCounter) // Slave SIO Mode switch delay wait
                 gSio32MultiLoadArea.state = 1;
             break;
         case 1:
             if (gSio32MultiLoadArea.type == SIO_SCK_IN) {
-                if (gSio32MultiLoadArea.frameCounter
-                    < SIO32ML_MODE_WAIT_FRAMES) // Master wait
+                if (gSio32MultiLoadArea.frameCounter < SIO32ML_MODE_WAIT_FRAMES) // Master wait
                     break;
             } else // Slave
                 REG_SIOCNT = SIO_32BIT_MODE; // Switches to SIO mode
@@ -34,9 +32,7 @@ u32 Sio32MultiLoadMain(u32 *progressCounterp)
             REG_IF = INTR_FLAG_SERIAL | SIO32ML_TIMER_INTR_FLAG; // Resets IF
             if (gSio32MultiLoadArea.type == SIO_SCK_IN) { // Sets Master
                 REG_SIOCNT |= SIO_ENABLE; // Starts communication
-                REG_SIO32ML_TIMER = SIO32ML_TIMER_COUNT
-                    | ((TIMER_1CLK | TIMER_INTR_ENABLE | TIMER_ENABLE)
-                       << 16); // Starts timer
+                REG_SIO32ML_TIMER = SIO32ML_TIMER_COUNT | ((TIMER_1CLK | TIMER_INTR_ENABLE | TIMER_ENABLE) << 16); // Starts timer
                 REG_IME = 0;
                 REG_IE |= SIO32ML_TIMER_INTR_FLAG; // Enables timer interrupt
                 REG_IME = 1;
@@ -59,25 +55,19 @@ u32 Sio32MultiLoadMain(u32 *progressCounterp)
             if (progressCounterp)
                 *progressCounterp = dataCounter; // Set progress counter
             if (gSio32MultiLoadArea.type != SIO_SCK_IN) { // Slave
-                while (gSio32MultiLoadArea.checkSumCounter
-                       < dataCounter) // Receiving data sum check
-                    gSio32MultiLoadArea.checkSumTmp
-                        += ((s32 *)gSio32MultiLoadArea
-                                .datap)[gSio32MultiLoadArea.checkSumCounter++];
+                while (gSio32MultiLoadArea.checkSumCounter < dataCounter) // Receiving data sum check
+                    gSio32MultiLoadArea.checkSumTmp += ((s32 *)gSio32MultiLoadArea.datap)[gSio32MultiLoadArea.checkSumCounter++];
                 if (dataCounterBak > SIO32ML_BLOCK_SIZE / 4)
-                    if ((gSio32MultiLoadArea.checkSum += gSio32MultiLoadArea.checkSumTmp)
-                        == -1)
+                    if ((gSio32MultiLoadArea.checkSum += gSio32MultiLoadArea.checkSumTmp) == -1)
                         gSio32MultiLoadArea.downloadSuccessFlag = 1; // Succeeds download
             }
             if (dataCounterBak > SIO32ML_BLOCK_SIZE / 4 // Complete communication
-                || gSio32MultiLoadArea.frameCounter
-                    == 0x8C) // SIO32ML_LD_TIMEOUT_FRAMES in SDK doesn't match
+                || gSio32MultiLoadArea.frameCounter == 0x8C) // SIO32ML_LD_TIMEOUT_FRAMES in SDK doesn't match
                 gSio32MultiLoadArea.state = 3; // Load time out
             break;
         case 3:
             REG_IME = 0;
-            REG_IE &= ~(INTR_FLAG_SERIAL
-                        | SIO32ML_TIMER_INTR_FLAG); // Disables SIO and timer interrupt
+            REG_IE &= ~(INTR_FLAG_SERIAL | SIO32ML_TIMER_INTR_FLAG); // Disables SIO and timer interrupt
             REG_IME = 1;
             REG_SIOCNT = SIO_32BIT_MODE; // Stops SIO32
             *(vu32 *)REG_ADDR_SIOCNT = SIO_MULTI_MODE; // Switches to SIO mode
@@ -116,9 +106,8 @@ void Sio32MultiLoadIntr(void)
         // Process sending data
         if (gSio32MultiLoadArea.dataCounter < 0) // Sets synchronous data
             REG_SIODATA32 = SIO32ML_SYNC_DATA;
-        else if (gSio32MultiLoadArea.dataCounter
-                 < SIO32ML_BLOCK_SIZE / 4) // Sets sending
-                                           // data
+        else if (gSio32MultiLoadArea.dataCounter < SIO32ML_BLOCK_SIZE / 4) // Sets sending
+                                                                           // data
             REG_SIODATA32 = gSio32MultiLoadArea.datap[gSio32MultiLoadArea.dataCounter];
         else
             REG_SIODATA32 = gSio32MultiLoadArea.checkSum; // Sets check sum
@@ -139,8 +128,7 @@ void Sio32MultiLoadIntr(void)
         // Master starts to sending
         if (gSio32MultiLoadArea.type == SIO_SCK_IN) {
             REG_SIOCNT |= SIO_ENABLE; // Restarts sending
-            REG_SIO32ML_TIMER_H
-                = TIMER_1CLK | TIMER_INTR_ENABLE | TIMER_ENABLE; // Restarts timer
+            REG_SIO32ML_TIMER_H = TIMER_1CLK | TIMER_INTR_ENABLE | TIMER_ENABLE; // Restarts timer
         }
     }
 }
@@ -155,8 +143,7 @@ void Sio32MultiLoadInit(u32 type, void *datap)
     UNUSED s32 i; // declared in SDK
 
     REG_IME = 0;
-    REG_IE &= ~(INTR_FLAG_SERIAL
-                | SIO32ML_TIMER_INTR_FLAG); // Disables SIO and timer interrupt
+    REG_IE &= ~(INTR_FLAG_SERIAL | SIO32ML_TIMER_INTR_FLAG); // Disables SIO and timer interrupt
     REG_IME = 1;
     CpuFill32(0, &gSio32MultiLoadArea,
               sizeof(gSio32MultiLoadArea)); // Clears 32bit serial
@@ -164,8 +151,7 @@ void Sio32MultiLoadInit(u32 type, void *datap)
 #ifdef SIO32ML_DI_FUNC_FAST // Copies function
     CpuCopy32(Sio32MultiLoadIntr, gMultiSioIntrFuncBuf, sizeof(gMultiSioIntrFuncBuf));
 #endif
-    *(vu32 *)REG_ADDR_SIOCNT
-        = SIO_MULTI_MODE | MULTI_SIO_BAUD_RATE_NO; // Stops multi-play communication
+    *(vu32 *)REG_ADDR_SIOCNT = SIO_MULTI_MODE | MULTI_SIO_BAUD_RATE_NO; // Stops multi-play communication
     gSio32MultiLoadArea.datap = datap; // Sets data pointer
     gSio32MultiLoadArea.dataCounter = -1;
     if (type) { // Sets Master
diff --git a/src/sprite.c b/src/sprite.c
index 1f62e3410..b0d35f7c1 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -39,12 +39,8 @@ static const u8 unkFractions[8] = {
 // TODO: Make static
 const AnimationCommandFunc animCmdTable[] = {
     // 0x080984AC
-    animCmd_GetTiles,          animCmd_GetPalette,
-    animCmd_JumpBack,          animCmd_End,
-    animCmd_PlaySoundEffect,   animCmd_AddHitbox,
-    animCmd_TranslateSprite,   animCmd_8,
-    animCmd_SetIdAndVariant,   animCmd_10,
-    animCmd_SetSpritePriority, animCmd_SetOamOrder,
+    animCmd_GetTiles,        animCmd_GetPalette, animCmd_JumpBack,        animCmd_End, animCmd_PlaySoundEffect,   animCmd_AddHitbox,
+    animCmd_TranslateSprite, animCmd_8,          animCmd_SetIdAndVariant, animCmd_10,  animCmd_SetSpritePriority, animCmd_SetOamOrder,
 };
 
 const u8 gOamShapesSizes[12][2] = {
@@ -266,8 +262,7 @@ static AnimCmdResult animCmd_AddHitbox(void *cursor, Sprite *s)
 
     DmaCopy32(3, &cmd->hitbox, &s->hitboxes[hitboxId].index, 8);
 
-    if ((cmd->hitbox.left == 0) && (cmd->hitbox.top == 0) && (cmd->hitbox.right == 0)
-        && (cmd->hitbox.bottom == 0)) {
+    if ((cmd->hitbox.left == 0) && (cmd->hitbox.top == 0) && (cmd->hitbox.right == 0) && (cmd->hitbox.bottom == 0)) {
         s->hitboxes[hitboxId].index = -1;
     } else {
         if (s->frameFlags & SPRITE_FLAG_MASK_Y_FLIP) {
@@ -303,8 +298,7 @@ void sub_80047A0(u16 angle, s16 p1, s16 p2, u16 affineIndex)
 // Similar to sub_8004ABC and sub_8004E14
 // (53.42%) https://decomp.me/scratch/llwGy
 // (56.74%) https://decomp.me/scratch/rXgtp
-NONMATCH("asm/non_matching/engine/TransformSprite.inc",
-         void TransformSprite(Sprite *s, SpriteTransform *transform))
+NONMATCH("asm/non_matching/engine/TransformSprite.inc", void TransformSprite(Sprite *s, SpriteTransform *transform))
 {
     // sp24 = s
     UnkSpriteStruct big;
@@ -422,8 +416,7 @@ NONMATCH("asm/non_matching/engine/TransformSprite.inc",
 END_NONMATCH
 
 // (0.00%)
-NONMATCH("asm/non_matching/engine/unused_transform.inc",
-         void UnusedTransform(Sprite *sprite, SpriteTransform *transform))
+NONMATCH("asm/non_matching/engine/unused_transform.inc", void UnusedTransform(Sprite *sprite, SpriteTransform *transform))
 {
     // TODO
 }
@@ -431,8 +424,7 @@ END_NONMATCH
 
 // VERY similar to TransformSprite and sub_8004ABC
 // (41.14%) https://decomp.me/scratch/n3NXz
-NONMATCH("asm/non_matching/engine/sub_8004E14.inc",
-         void sub_8004E14(Sprite *sprite, SpriteTransform *transform))
+NONMATCH("asm/non_matching/engine/sub_8004E14.inc", void sub_8004E14(Sprite *sprite, SpriteTransform *transform))
 {
     UnkSpriteStruct us;
     if (sprite->dimensions != (void *)-1) {
@@ -470,19 +462,13 @@ NONMATCH("asm/non_matching/engine/sub_8004E14.inc",
         // 2D Rotation matrix:
         // { +cos(a), -sin(a) }
         // { +sin(a), +cos(a) }
-        us.unk18[0][0] = I((Q(+COS_24_8(gUnknown_03001944) * gUnknown_030017F0) >> 16)
-                           * (Q(us.unkC[0] * gUnknown_03005398) >> 16));
-        us.unk18[0][1] = I((Q(-SIN_24_8(gUnknown_03001944) * gUnknown_030017F0) >> 16)
-                           * (Q(us.unkC[0] * gUnknown_03005398) >> 16));
-        us.unk18[1][0] = I((Q(+SIN_24_8(gUnknown_03001944) * gUnknown_03005394) >> 16)
-                           * (Q(us.unkC[1] * gUnknown_03005398) >> 16));
-        us.unk18[1][1] = I((Q(+COS_24_8(gUnknown_03001944) * gUnknown_03005394) >> 16)
-                           * (Q(us.unkC[1] * gUnknown_03005398) >> 16));
+        us.unk18[0][0] = I((Q(+COS_24_8(gUnknown_03001944) * gUnknown_030017F0) >> 16) * (Q(us.unkC[0] * gUnknown_03005398) >> 16));
+        us.unk18[0][1] = I((Q(-SIN_24_8(gUnknown_03001944) * gUnknown_030017F0) >> 16) * (Q(us.unkC[0] * gUnknown_03005398) >> 16));
+        us.unk18[1][0] = I((Q(+SIN_24_8(gUnknown_03001944) * gUnknown_03005394) >> 16) * (Q(us.unkC[1] * gUnknown_03005398) >> 16));
+        us.unk18[1][1] = I((Q(+COS_24_8(gUnknown_03001944) * gUnknown_03005394) >> 16) * (Q(us.unkC[1] * gUnknown_03005398) >> 16));
 
-        us.posX = I(transform->x * us.unk18[0][0] + transform->y * us.unk18[0][1]
-                    + Q(gUnknown_0300194C));
-        us.posY = I(transform->x * us.unk18[1][0] + transform->y * us.unk18[1][1]
-                    + Q(gUnknown_03002820));
+        us.posX = I(transform->x * us.unk18[0][0] + transform->y * us.unk18[0][1] + Q(gUnknown_0300194C));
+        us.posY = I(transform->x * us.unk18[1][0] + transform->y * us.unk18[1][1] + Q(gUnknown_03002820));
 
         {
             u16 width, height;
@@ -603,8 +589,7 @@ void DisplaySprite(Sprite *sprite)
                     if (sprite->frameFlags & SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE) {
                         oam->all.attr0 |= 0x200;
                     }
-                    oam->all.attr1 |= (sprite->frameFlags & SPRITE_FLAG_MASK_ROT_SCALE)
-                        << 9;
+                    oam->all.attr1 |= (sprite->frameFlags & SPRITE_FLAG_MASK_ROT_SCALE) << 9;
                 } else {
                     u32 shapeAndSize = ((oam->all.attr0 & 0xC000) >> 12);
                     u32 flipY;
@@ -621,8 +606,7 @@ void DisplaySprite(Sprite *sprite)
                     }
 
                     // x-flip
-                    if (((sprite->frameFlags >> SPRITE_FLAG_SHIFT_X_FLIP) & r6)
-                        != (sprDims->flip & 1)) {
+                    if (((sprite->frameFlags >> SPRITE_FLAG_SHIFT_X_FLIP) & r6) != (sprDims->flip & 1)) {
                         oam->all.attr1 ^= 0x1000;
                         r7 = sprWidth - gOamShapesSizes[shapeAndSize][0] - r7;
                     }
@@ -690,8 +674,7 @@ void sub_081569A0(Sprite *sprite, u16 *sp08, u8 sp0C)
 
         sp24 = x - sprite->x;
         sp28 = y - sprite->y;
-        if (x + sprWidth >= 0 && x <= DISPLAY_WIDTH && y + sprHeight >= 0
-            && y <= DISPLAY_HEIGHT) {
+        if (x + sprWidth >= 0 && x <= DISPLAY_WIDTH && y + sprHeight >= 0 && y <= DISPLAY_HEIGHT) {
             for (sp18 = 0; sp18 < sprDims->numSubframes; ++sp18) {
                 const u16 *oamData = gRefSpriteTables->oamData[sprite->graphics.anim];
                 OamData *oam = OamMalloc(GET_SPRITE_OAM_ORDER(sprite));
@@ -712,8 +695,7 @@ void sub_081569A0(Sprite *sprite, u16 *sp08, u8 sp0C)
                     if (sprite->frameFlags & SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE) {
                         oam->all.attr0 |= 0x200;
                     }
-                    oam->all.attr1 |= (sprite->frameFlags & SPRITE_FLAG_MASK_ROT_SCALE)
-                        << 9;
+                    oam->all.attr1 |= (sprite->frameFlags & SPRITE_FLAG_MASK_ROT_SCALE) << 9;
                 } else {
                     u32 shapeAndSize = ((oam->all.attr0 & 0xC000) >> 12);
                     u32 flipY;
@@ -882,8 +864,7 @@ static AnimCmdResult animCmd_GetPalette(void *cursor, Sprite *s)
     if (!(s->frameFlags & SPRITE_FLAG_MASK_18)) {
         s32 paletteIndex = cmd->palId;
 
-        DmaCopy32(3, &gRefSpriteTables->palettes[paletteIndex * 16],
-                  &gObjPalette[s->palId * 16 + cmd->insertOffset], cmd->numColors * 2);
+        DmaCopy32(3, &gRefSpriteTables->palettes[paletteIndex * 16], &gObjPalette[s->palId * 16 + cmd->insertOffset], cmd->numColors * 2);
 
         gFlags |= FLAGS_UPDATE_SPRITE_PALETTES;
     }
diff --git a/src/task.c b/src/task.c
index 2d07f6c84..5724151df 100644
--- a/src/task.c
+++ b/src/task.c
@@ -82,11 +82,9 @@ u32 TasksInit(void)
 #endif
 
 #if ENABLE_TASK_LOGGING
-struct Task *TaskCreate(TaskMain taskMain, u16 structSize, u16 priority, u16 flags,
-                        TaskDestructor taskDestructor, const char *name)
+struct Task *TaskCreate(TaskMain taskMain, u16 structSize, u16 priority, u16 flags, TaskDestructor taskDestructor, const char *name)
 #else
-struct Task *TaskCreate(TaskMain taskMain, u16 structSize, u16 priority, u16 flags,
-                        TaskDestructor taskDestructor)
+struct Task *TaskCreate(TaskMain taskMain, u16 structSize, u16 priority, u16 flags, TaskDestructor taskDestructor)
 #endif
 {
     struct Task *slow;
@@ -344,8 +342,7 @@ static void UNUSED sub_80028DC(void)
                 cur->state += ((struct IwramNode *)IWRAM_PTR(cur->next))->state;
                 cur->next = ((struct IwramNode *)IWRAM_PTR(cur->next))->next;
             } else {
-                nextNodeSpace
-                    = (void *)(cur->next + IWRAM_PTR(offsetof(struct IwramNode, space)));
+                nextNodeSpace = (void *)(cur->next + IWRAM_PTR(offsetof(struct IwramNode, space)));
 
                 space = cur->space;
                 curStateBackup = cur->state;
@@ -363,11 +360,9 @@ static void UNUSED sub_80028DC(void)
                     }
                 }
 
-                DmaCopy32(3, nextNodeSpace, space,
-                          cur->state + sizeof(struct IwramNode));
+                DmaCopy32(3, nextNodeSpace, space, cur->state + sizeof(struct IwramNode));
                 {
-                    struct IwramNode *newLoc
-                        = (struct IwramNode *)((u8 *)cur + cur->state);
+                    struct IwramNode *newLoc = (struct IwramNode *)((u8 *)cur + cur->state);
                     newLoc->next = cur->next;
                     newLoc->state = curStateBackup;
                     cur = newLoc;