WIP Compilation

16 files changed, 172 insertions, 164 deletions

diff --git a/src/audio/data.c b/src/audio/data.c
index 5efa7734a..eac2a10ff 100644
--- a/src/audio/data.c
+++ b/src/audio/data.c
@@ -1,4 +1,4 @@
-#include <PR/ultratypes.h>
+#include <libultra/types.h>
 #include <macros.h>
 
 #include "data.h"
diff --git a/src/audio/effects.c b/src/audio/effects.c
index d8003ef1a..2ebd60da3 100644
--- a/src/audio/effects.c
+++ b/src/audio/effects.c
@@ -1,4 +1,4 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
 
 #include "audio/seqplayer.h"
@@ -30,7 +30,7 @@ void sequence_channel_process_sound(struct SequenceChannel *seqChannel, s32 reca
                 layer->noteFreqScale = layer->freqScale * seqChannel->freqScale;
                 layer->noteVelocity = layer->velocitySquare * seqChannel->appliedVolume;
                 layer->notePan = (seqChannel->pan + layer->pan * (0x80 - seqChannel->panChannelWeight)) >> 7;
-                layer->notePropertiesNeedInit = FALSE;
+                layer->notePropertiesNeedInit = false;
             } else {
                 if (seqChannel->changes.as_bitfields.freqScale) {
                     layer->noteFreqScale = layer->freqScale * seqChannel->freqScale;
@@ -52,7 +52,7 @@ void sequence_player_process_sound(struct SequencePlayer *seqPlayer) {
 
     if (seqPlayer->fadeRemainingFrames != 0) {
         seqPlayer->fadeVolume += seqPlayer->fadeVelocity;
-        seqPlayer->recalculateVolume = TRUE;
+        seqPlayer->recalculateVolume = true;
 
         if (seqPlayer->fadeVolume > US_FLOAT2(1)) {
             seqPlayer->fadeVolume = US_FLOAT2(1);
@@ -75,13 +75,13 @@ void sequence_player_process_sound(struct SequencePlayer *seqPlayer) {
 
     // Process channels
     for (i = 0; i < CHANNELS_MAX; i++) {
-        if (IS_SEQUENCE_CHANNEL_VALID(seqPlayer->channels[i]) == TRUE
-            && seqPlayer->channels[i]->enabled == TRUE) {
+        if (IS_SEQUENCE_CHANNEL_VALID(seqPlayer->channels[i]) == true
+            && seqPlayer->channels[i]->enabled == true) {
             sequence_channel_process_sound(seqPlayer->channels[i], seqPlayer->recalculateVolume);
         }
     }
 
-    seqPlayer->recalculateVolume = FALSE;
+    seqPlayer->recalculateVolume = false;
 }
 
 f32 get_portamento_freq_scale(struct Portamento *p) {
@@ -176,7 +176,7 @@ void note_vibrato_init(struct Note *note) {
 
     vib = &note->vibratoState;
 
-    vib->active = TRUE;
+    vib->active = true;
     vib->time = 0;
 
     vib->curve = gWaveSamples[2];
diff --git a/src/audio/external.c b/src/audio/external.c
index a46e63712..ead0d88eb 100644
--- a/src/audio/external.c
+++ b/src/audio/external.c
@@ -1,4 +1,4 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
 #include <mk64.h>
 #include <defines.h>
@@ -12,6 +12,7 @@
 #include "code_800029B0.h"
 #include "code_80005FD0.h"
 #include "code_80091750.h"
+#include <stdbool.h>
 
 s8 D_8018EF10;
 UnkStruct8018EF18 D_8018EF18[16];
@@ -31,7 +32,7 @@ u8 sSoundBankFreeListFront[SOUND_BANK_COUNT];
 u8 sNumSoundsInBank[SOUND_BANK_COUNT];
 u8 D_80192AB8[SOUND_BANK_COUNT][8][8];
 u8 D_80192C38;
-ubool8 sSoundBankDisabled[SOUND_BANK_COUNT];
+bool sSoundBankDisabled[SOUND_BANK_COUNT];
 struct ChannelVolumeScaleFade D_80192C48[SOUND_BANK_COUNT];
 struct_D_80192CA8_entry D_80192CA8[3][5];
 u8 D_80192CC6[3];
@@ -244,7 +245,7 @@ void audio_reset_session_eu(OSMesg presetId) {
     osRecvMesg(D_800EA3B4, &mesg, 0);
     osSendMesg(D_800EA3B0, presetId, 0);
     osRecvMesg(D_800EA3B4, &mesg, 1);
-    if (mesg != presetId) {
+    if (mesg.data32 != presetId.data32) {
         osRecvMesg(D_800EA3B4, &mesg, 1);
     }
 }
@@ -931,7 +932,8 @@ void func_800C2A2C(u32 arg0) {
         break;
     case 15:
         D_800EA1C0 = (arg0 & 0xFF00) >> 8;
-        audio_reset_session_eu((void *) test);
+        // UTODO: Stubbed
+        // audio_reset_session_eu((void *) test);
         D_800EA1F4[0] = test;
         func_800CBBE8(0x46020000U, why);
         func_800C5C40();
@@ -963,14 +965,14 @@ u16 func_800C3508(u8 player) {
 }
 
 u8 func_800C357C(s32 arg0) {
-    u8 var_v1;
+    bool var_v1;
     u8 i;
 
     i = D_800EA1E8;
-    var_v1 = TRUE;
+    var_v1 = true;
     for(i = D_800EA1E8; i < (s32) D_800EA1E4; i++) {
         if ((u32) arg0 == D_80192CD0[i]) {
-            var_v1 = FALSE;
+            var_v1 = false;
             i = D_800EA1E4;
         }
     }
@@ -1237,9 +1239,9 @@ void func_800C4084(u16 bankMask) {
 
     for (bank = 0; bank < SOUND_BANK_COUNT; bank++) {
         if (bankMask & 1) {
-            sSoundBankDisabled[bank] = TRUE;
+            sSoundBankDisabled[bank] = true;
         } else {
-            sSoundBankDisabled[bank] = FALSE;
+            sSoundBankDisabled[bank] = false;
         }
         bankMask = bankMask >> 1;
     }
@@ -1258,7 +1260,7 @@ void play_sound(u32 soundBits, Vec3f *position, u8 cameraId, f32 *arg3, f32 *arg
     struct Sound *temp_v0;
 
     bank = soundBits >> 0x1C;
-    if (sSoundBankDisabled[bank] == FALSE) {
+    if (sSoundBankDisabled[bank] == false) {
         temp_v0 = &sSoundRequests[sSoundRequestCount];
         temp_v0->soundBits = soundBits;
         temp_v0->position = position;
@@ -1276,37 +1278,37 @@ void func_800C41CC(u8 arg0, struct SoundCharacteristics *arg1) {
     struct Sound *sound;
 
     for (soundId = sNumProcessedSoundRequests; soundId != sSoundRequestCount; soundId++) {
-        found = FALSE;
+        found = false;
         sound = &sSoundRequests[soundId];
         switch (arg0) {
             case 0:
                 if ((sound->soundBits & 0xF0000000) == (arg1->soundBits & 0xF0000000)) {
-                    found = TRUE;
+                    found = true;
                 }
                 break;
             case 1:
                 if (((sound->soundBits & 0xF0000000) == (arg1->soundBits & 0xF0000000)) && (sound->position == arg1->unk00)) {
-                    found = TRUE;
+                    found = true;
                 }
                 break;
             case 2:
                 if (sound->position == arg1->unk00) {
-                    found = TRUE;
+                    found = true;
                 }
                 break;
             case 3:
                 if ((sound->position == arg1->unk00) && (sound->soundBits == arg1->soundBits)) {
-                    found = TRUE;
+                    found = true;
                 }
                 break;
             case 4:
                 if ((sound->cameraId == arg1->cameraId) && (sound->soundBits == arg1->soundBits)) {
-                    found = TRUE;
+                    found = true;
                 }
                 break;
             case 5:
                 if (sound->soundBits == arg1->soundBits) {
-                    found = TRUE;
+                    found = true;
                 }
                 break;
         }
@@ -1806,7 +1808,7 @@ void sound_init(void) {
         sSoundBankUsedListBack[var_v0] = 0;
         sSoundBankFreeListFront[var_v0] = 1;
         sNumSoundsInBank[var_v0] = 0;
-        sSoundBankDisabled[var_v0] = FALSE;
+        sSoundBankDisabled[var_v0] = false;
         D_80192C48[var_v0].current = 1.0f;
         D_80192C48[var_v0].remainingFrames = 0;
     }
diff --git a/src/audio/external.h b/src/audio/external.h
index 6425b936a..42c8ab4c5 100644
--- a/src/audio/external.h
+++ b/src/audio/external.h
@@ -345,7 +345,7 @@ extern u8 sSoundBankFreeListFront[SOUND_BANK_COUNT];
 extern u8 sNumSoundsInBank[SOUND_BANK_COUNT];
 extern u8 D_80192AB8[SOUND_BANK_COUNT][8][8];
 extern u8 D_80192C38;
-extern u8 sSoundBankDisabled[SOUND_BANK_COUNT];
+extern bool sSoundBankDisabled[SOUND_BANK_COUNT];
 extern struct ChannelVolumeScaleFade D_80192C48[SOUND_BANK_COUNT];
 extern struct_D_80192CA8_entry D_80192CA8[3][5];
 extern u8  D_80192CC6[3];
diff --git a/src/audio/heap.c b/src/audio/heap.c
index 59eadb63b..53a104e06 100644
--- a/src/audio/heap.c
+++ b/src/audio/heap.c
@@ -1,4 +1,4 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
 
 #include "audio/data.h"
@@ -126,8 +126,8 @@ void discard_bank(s32 bankId) {
             if (note->priority >= NOTE_PRIORITY_MIN) {
                 // eu_stubbed_printf_3("Kill Voice %d (ID %d) %d\n", note->waveId, bankId, note->priority);
                 // eu_stubbed_printf_0("Warning: Running Sequence's data disappear!\n");
-                note->parentLayer->enabled = FALSE; // is 0x48, should be 0x44
-                note->parentLayer->finished = TRUE;
+                note->parentLayer->enabled = false; // is 0x48, should be 0x44
+                note->parentLayer->finished = true;
             }
             note_disable(note);
             audio_list_remove(&note->listItem);
@@ -380,7 +380,7 @@ void *alloc_bank_or_seq(struct SoundMultiPool *arg0, s32 arg1, s32 size, s32 arg
         pool = &arg0->temporary.pool;
         if (tp->entries[tp->nextSide].id != (s8)-1) {
             table[tp->entries[tp->nextSide].id] = SOUND_LOAD_STATUS_NOT_LOADED;
-            if (isSound == TRUE) {
+            if (isSound == true) {
                 discard_bank(tp->entries[tp->nextSide].id);
             }
         }
diff --git a/src/audio/heap.h b/src/audio/heap.h
index 6a8999396..533d598d1 100644
--- a/src/audio/heap.h
+++ b/src/audio/heap.h
@@ -1,7 +1,7 @@
 #ifndef AUDIO_HEAP_H
 #define AUDIO_HEAP_H
 
-#include <PR/ultratypes.h>
+#include <libultra/types.h>
 
 #include "internal.h"
 
diff --git a/src/audio/internal.h b/src/audio/internal.h
index 85ea368c9..ea67502fd 100644
--- a/src/audio/internal.h
+++ b/src/audio/internal.h
@@ -1,8 +1,8 @@
 #ifndef AUDIO_INTERNAL_H
 #define AUDIO_INTERNAL_H
 
-#include <ultra64.h>
-
+#include <libultraship.h>
+#include "common_structs.h"
 
 #define SEQUENCE_PLAYERS 4
 #define SEQUENCE_CHANNELS 48
@@ -226,7 +226,7 @@ struct SequencePlayer {
     /*0x11C, 0x124*/ OSIoMesg bankDmaIoMesg;
     /*0x130, 0x13C*/ u8 *bankDmaCurrMemAddr;
     /*0x138, 0x140*/ uintptr_t bankDmaCurrDevAddr;
-    /*0x13C, 0x144*/ ssize_t bankDmaRemaining;
+    /*0x13C, 0x144*/ size_t bankDmaRemaining;
 }; // size = 0x140, 0x148 on EU, 0x14C on SH
 
 struct AdsrSettings {
diff --git a/src/audio/load.c b/src/audio/load.c
index f6c60d17a..2c9e6fdfe 100644
--- a/src/audio/load.c
+++ b/src/audio/load.c
@@ -1,4 +1,4 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
 
 #include "audio/load.h"
@@ -126,8 +126,8 @@ void audio_dma_copy_async(uintptr_t devAddr, void *vAddr, size_t nbytes, OSMesgQ
  * Performs a partial asynchronous (normal priority) DMA copy. This is limited
  * to 0x1000 bytes transfer at once.
  */
-void audio_dma_partial_copy_async(uintptr_t *devAddr, u8 **vAddr, ssize_t *remaining, OSMesgQueue *queue, OSIoMesg *mesg) {
-    ssize_t transfer = (*remaining >= 0x1000 ? 0x1000 : *remaining);
+void audio_dma_partial_copy_async(uintptr_t *devAddr, u8 **vAddr, size_t *remaining, OSMesgQueue *queue, OSIoMesg *mesg) {
+    size_t transfer = (*remaining >= 0x1000 ? 0x1000 : *remaining);
     *remaining -= transfer;
     osInvalDCache(*vAddr, transfer);
     osPiStartDma(mesg, OS_MESG_PRI_NORMAL, OS_READ, *devAddr, *vAddr, transfer, queue);
@@ -164,13 +164,13 @@ void decrease_sample_dma_ttls() {
 }
 
 void *dma_sample_data(uintptr_t devAddr, u32 size, s32 arg2, u8 *dmaIndexRef) {
-    s32 hasDma = FALSE;
+    s32 hasDma = false;
     struct SharedDma *dma;
     uintptr_t dmaDevAddr;
     u32 transfer;
     u32 i;
     u32 dmaIndex;
-    ssize_t bufferPos;
+    size_t bufferPos;
     UNUSED u32 pad;
 
     if (arg2 != 0 || *dmaIndexRef >= sSampleDmaListSize1) {
@@ -199,7 +199,7 @@ void *dma_sample_data(uintptr_t devAddr, u32 size, s32 arg2, u8 *dmaIndexRef) {
             // TTL 60 is pretty large.
             dmaIndex = sSampleDmaReuseQueue2[sSampleDmaReuseQueueTail2++];
             dma = &sSampleDmas[dmaIndex];
-            hasDma = TRUE;
+            hasDma = true;
         }
     } else {
         dma = &sSampleDmas[*dmaIndexRef];
@@ -231,7 +231,7 @@ void *dma_sample_data(uintptr_t devAddr, u32 size, s32 arg2, u8 *dmaIndexRef) {
         // be empty, since TTL 2 is so small.
         dmaIndex = sSampleDmaReuseQueue1[sSampleDmaReuseQueueTail1++];
         dma = &sSampleDmas[dmaIndex];
-        hasDma = TRUE;
+        hasDma = true;
     }
 
     transfer = dma->bufSize;
@@ -539,7 +539,7 @@ struct AudioBank *bank_load_async(s32 bankId, s32 arg1, struct SequencePlayer *s
     seqPlayer->bankDmaRemaining = alloc;
     if (1) { }
     osCreateMesgQueue(&seqPlayer->bankDmaMesgQueue, &seqPlayer->bankDmaMesg, 1);
-    seqPlayer->bankDmaInProgress = TRUE;
+    seqPlayer->bankDmaInProgress = true;
     audio_dma_partial_copy_async(&seqPlayer->bankDmaCurrDevAddr, &seqPlayer->bankDmaCurrMemAddr, &seqPlayer->bankDmaRemaining, &seqPlayer->bankDmaMesgQueue, &seqPlayer->bankDmaIoMesg);
     if (gBankLoadStatus[bankId] != 5) {
         gBankLoadStatus[bankId] = 1;
@@ -590,7 +590,7 @@ void *sequence_dma_async(s32 seqId, s32 arg1, struct SequencePlayer *seqPlayer)
         audio_dma_copy_immediate(seqData, ptr, 0x00000040U);
         mesgQueue = &seqPlayer->seqDmaMesgQueue;
         osCreateMesgQueue(mesgQueue, &seqPlayer->seqDmaMesg, 1);
-        seqPlayer->seqDmaInProgress = TRUE;
+        seqPlayer->seqDmaInProgress = true;
         audio_dma_copy_async((uintptr_t) (seqData + 0x40), (u8*) ptr + 0x40, seqLength - 0x40, mesgQueue, &seqPlayer->seqDmaIoMesg);
         if (gSeqLoadStatus[seqId] != 5) {
             gSeqLoadStatus[seqId] = 1;
@@ -612,7 +612,7 @@ u8 get_missing_bank(u32 seqId, s32 *nonNullCount, s32 *nullCount) {
     for (i = gAlBankSets[offset++], ret = 0; i != 0; i--) {
         bankId = gAlBankSets[offset++];
 
-        if (IS_BANK_LOAD_COMPLETE(bankId) == TRUE) {
+        if (IS_BANK_LOAD_COMPLETE(bankId) == true) {
             temp = get_bank_or_seq(1, 2, bankId);
         } else {
             temp = NULL;
@@ -639,7 +639,7 @@ struct AudioBank *load_banks_immediate(s32 seqId, u8 *outDefaultBank) {
     for (i = gAlBankSets[offset++]; i != 0; i--) {
         bankId = gAlBankSets[offset++];
 
-        if (IS_BANK_LOAD_COMPLETE(bankId) == TRUE) {
+        if (IS_BANK_LOAD_COMPLETE(bankId) == true) {
             ret = get_bank_or_seq(1, 2, bankId);
         } else {
             ret = NULL;
@@ -672,7 +672,7 @@ void preload_sequence(u32 seqId, u8 preloadMask) {
 
     if (preloadMask & PRELOAD_SEQUENCE) {
         //! @bug should be IS_SEQ_LOAD_COMPLETE
-        if (IS_BANK_LOAD_COMPLETE(seqId) == TRUE) {
+        if (IS_BANK_LOAD_COMPLETE(seqId) == true) {
             sequenceData = get_bank_or_seq(0, 2, seqId);
         } else {
             sequenceData = NULL;
@@ -753,7 +753,7 @@ void load_sequence_internal(u32 player, u32 seqId, s32 loadAsync) {
     init_sequence_player(player);
     seqPlayer->scriptState.depth = 0;
     seqPlayer->delay = 0;
-    seqPlayer->enabled = TRUE;
+    seqPlayer->enabled = true;
     seqPlayer->seqData = sequenceData;
     seqPlayer->scriptState.pc = sequenceData;
 }
@@ -796,7 +796,8 @@ void audio_init(void) {
     }
 #endif
 
-    switch (osTvType) {                             /* irregular */
+    // UTODO: Which is the correct one?
+    switch (0) {                             /* irregular */
     case 0:
         D_803B7178 = 20.03042f;
         gRefreshRate = 0x00000032;
diff --git a/src/audio/load.h b/src/audio/load.h
index 4feedf970..24523bd1b 100644
--- a/src/audio/load.h
+++ b/src/audio/load.h
@@ -1,8 +1,9 @@
 #ifndef AUDIO_LOAD_H
 #define AUDIO_LOAD_H
 
-#include <PR/ultratypes.h>
+#include <libultra/types.h>
 #include "audio/internal.h"
+#include "PR/libaudio.h"
 
 #define AUDIO_FRAME_DMA_QUEUE_SIZE 0x40
 
@@ -23,7 +24,7 @@ struct SharedDma {
 
 void audio_dma_copy_immediate(u8* devAddr, void *vAddr, size_t nbytes);
 void audio_dma_copy_async(uintptr_t, void*, size_t, OSMesgQueue*, OSIoMesg*);
-void audio_dma_partial_copy_async(uintptr_t*, u8**, ssize_t*, OSMesgQueue*, OSIoMesg*);
+void audio_dma_partial_copy_async(uintptr_t*, u8**, size_t*, OSMesgQueue*, OSIoMesg*);
 void decrease_sample_dma_ttls(void);
 void *dma_sample_data(uintptr_t, u32, s32, u8*);
 void func_800BB030(s32);
diff --git a/src/audio/playback.c b/src/audio/playback.c
index 750f40873..6162c1f70 100644
--- a/src/audio/playback.c
+++ b/src/audio/playback.c
@@ -1,4 +1,4 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
 
 #include "audio/internal.h"
@@ -28,26 +28,26 @@ void note_set_vel_pan_reverb(struct Note *note, f32 velocity, u8 pan, u8 reverbV
 
         sub->headsetPanLeft = gHeadsetPanQuantization[smallPanIndex];
         sub->headsetPanRight = gHeadsetPanQuantization[ARRAY_COUNT(gHeadsetPanQuantization) - 1 - smallPanIndex];
-        sub->stereoStrongRight = FALSE;
-        sub->stereoStrongLeft = FALSE;
-        sub->usesHeadsetPanEffects = TRUE;
+        sub->stereoStrongRight = false;
+        sub->stereoStrongLeft = false;
+        sub->usesHeadsetPanEffects = true;
 
         volLeft = gHeadsetPanVolume[pan];
         volRight = gHeadsetPanVolume[127 - pan];
     } else if (sub->stereoHeadsetEffects && gAudioLibSoundMode == SOUND_MODE_STEREO) {
-        strongRight = FALSE;
-        strongLeft = FALSE;
+        strongRight = false;
+        strongLeft = false;
         sub->headsetPanRight = 0;
         sub->headsetPanLeft = 0;
 
-        sub->usesHeadsetPanEffects = FALSE;
+        sub->usesHeadsetPanEffects = false;
 
         volLeft = gStereoPanVolume[pan];
         volRight = gStereoPanVolume[127 - pan];
         if (pan < 0x20) {
-            strongLeft = TRUE;
+            strongLeft = true;
         } else if (pan > 0x60) {
-            strongRight = TRUE;
+            strongRight = true;
         }
 
         sub->stereoStrongRight = strongRight;
@@ -76,14 +76,14 @@ void note_set_vel_pan_reverb(struct Note *note, f32 velocity, u8 pan, u8 reverbV
     //! @bug for the change to UQ0.7, the if statement should also have been changed accordingly
     if (sub->reverbVol != reverbVol) {
         sub->reverbVol = reverbVol;
-        sub->envMixerNeedsInit = TRUE;
+        sub->envMixerNeedsInit = true;
         return;
     }
 
     if (sub->needsInit) {
-        sub->envMixerNeedsInit = TRUE;
+        sub->envMixerNeedsInit = true;
     } else {
-        sub->envMixerNeedsInit = FALSE;
+        sub->envMixerNeedsInit = false;
     }
 }
 
@@ -130,7 +130,7 @@ struct AudioBankSound *instrument_get_audio_bank_sound(struct Instrument *instru
 struct Instrument *get_instrument_inner(s32 bankId, s32 instId) {
     struct Instrument *inst;
 
-    if (IS_BANK_LOAD_COMPLETE(bankId) == FALSE) {
+    if (IS_BANK_LOAD_COMPLETE(bankId) == false) {
         stubbed_printf("Audio: voiceman: No bank error %d\n", bankId);
         gAudioErrorFlags = bankId + 0x10000000;
         return NULL;
@@ -155,7 +155,7 @@ struct Instrument *get_instrument_inner(s32 bankId, s32 instId) {
 struct Drum *get_drum(s32 bankId, s32 drumId) {
     struct Drum *drum;
 
-    if (IS_BANK_LOAD_COMPLETE(bankId) == FALSE) {
+    if (IS_BANK_LOAD_COMPLETE(bankId) == false) {
         stubbed_printf("Audio: voiceman: No bank error %d\n", bankId);
         gAudioErrorFlags = bankId + 0x10000000;
         return NULL;
@@ -196,16 +196,16 @@ void note_init(struct Note *note) {
 }
 
 void note_disable(struct Note *note) {
-    if (note->noteSubEu.needsInit == TRUE) {
-        note->noteSubEu.needsInit = FALSE;
+    if (note->noteSubEu.needsInit == true) {
+        note->noteSubEu.needsInit = false;
     } else {
         note_set_vel_pan_reverb(note, 0, 0x40, 0);
     }
     note->priority = NOTE_PRIORITY_DISABLED;
     note->parentLayer = NO_LAYER;
     note->prevParentLayer = NO_LAYER;
-    note->noteSubEu.enabled = FALSE;
-    note->noteSubEu.finished = FALSE;
+    note->noteSubEu.enabled = false;
+    note->noteSubEu.finished = false;
 }
 
 void process_notes(void) {
@@ -625,7 +625,7 @@ void note_init_for_layer(struct Note *note, struct SequenceChannelLayer *seqLaye
     note->prevParentLayer = NO_LAYER;
     note->parentLayer = seqLayer;
     note->priority = seqLayer->seqChannel->notePriority;
-    seqLayer->notePropertiesNeedInit = TRUE;
+    seqLayer->notePropertiesNeedInit = true;
     seqLayer->status = SOUND_LOAD_STATUS_DISCARDABLE; // "loaded"
     seqLayer->note = note;
     seqLayer->seqChannel->noteUnused = note;
@@ -639,9 +639,9 @@ void note_init_for_layer(struct Note *note, struct SequenceChannelLayer *seqLaye
     sub->sound.audioBankSound = seqLayer->sound;
 
     if (instId >= 0x80) {
-        sub->isSyntheticWave = TRUE;
+        sub->isSyntheticWave = true;
     } else {
-        sub->isSyntheticWave = FALSE;
+        sub->isSyntheticWave = false;
     }
 
     if (sub->isSyntheticWave) {
@@ -693,7 +693,7 @@ struct Note *alloc_note_from_active(struct NotePool *pool, struct SequenceChanne
         func_800BD8F4(aNote, seqLayer);
         audio_list_push_back(&pool->releasing, &aNote->listItem);
     }
-    
+
     return aNote;
 }
 
@@ -781,7 +781,7 @@ void note_init_all(void) {
         note->adsrVolScale = 0;
         note->adsr.state = ADSR_STATE_DISABLED;
         note->adsr.action = 0;
-        note->vibratoState.active = FALSE;
+        note->vibratoState.active = false;
         note->portamento.cur = 0.0f;
         note->portamento.speed = 0.0f;
         // This only works if NoteSynthesisBuffers are size 0xA0. See internal.h
diff --git a/src/audio/playback.h b/src/audio/playback.h
index e33422fe6..2c25be714 100644
--- a/src/audio/playback.h
+++ b/src/audio/playback.h
@@ -1,7 +1,7 @@
 #ifndef AUDIO_PLAYBACK_H
 #define AUDIO_PLAYBACK_H
 
-#include <PR/ultratypes.h>
+#include <libultra/types.h>
 
 #include "internal.h"
 
diff --git a/src/audio/port_eu.c b/src/audio/port_eu.c
index e5b3c7e01..eeb8e983c 100644
--- a/src/audio/port_eu.c
+++ b/src/audio/port_eu.c
@@ -1,4 +1,4 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
 #include <PR/ucode.h>
 
@@ -168,7 +168,7 @@ void eu_process_audio_cmd(struct EuAudioCmd *cmd) {
             break;
 
         case 0x83:
-            if (gSequencePlayers[cmd->u.s.bankId].enabled != FALSE) {
+            if (gSequencePlayers[cmd->u.s.bankId].enabled != false) {
                 if (cmd->u2.as_s32 == 0) {
                     sequence_player_disable(&gSequencePlayers[cmd->u.s.bankId]);
                 }
@@ -184,15 +184,15 @@ void eu_process_audio_cmd(struct EuAudioCmd *cmd) {
 
         case 0xf1:
             for (i = 0; i < 4; i++) {
-                gSequencePlayers[i].muted = TRUE;
-                gSequencePlayers[i].recalculateVolume = TRUE;
+                gSequencePlayers[i].muted = true;
+                gSequencePlayers[i].recalculateVolume = true;
             }
             break;
 
         case 0xf2:
             for (i = 0; i < 4; i++) {
-                gSequencePlayers[i].muted = FALSE;
-                gSequencePlayers[i].recalculateVolume = TRUE;
+                gSequencePlayers[i].muted = false;
+                gSequencePlayers[i].recalculateVolume = true;
             }
             break;
     case 0xF3:
@@ -297,7 +297,7 @@ void func_800CBCB0(u32 arg0) {
                 switch (cmd->u.s.op) {
                     case 0x41:
                         seqPlayer->fadeVolumeScale = cmd->u2.as_f32;
-                        seqPlayer->recalculateVolume = TRUE;
+                        seqPlayer->recalculateVolume = true;
                         break;
 
                     case 0x47:
@@ -313,25 +313,25 @@ void func_800CBCB0(u32 arg0) {
                         break;
                 }
             }
-            else if (seqPlayer->enabled != FALSE && cmd->u.s.arg2 < 0x10) {
+            else if (seqPlayer->enabled != false && cmd->u.s.arg2 < 0x10) {
                 chan = seqPlayer->channels[cmd->u.s.arg2];
                 if (IS_SEQUENCE_CHANNEL_VALID(chan)) {
                     switch (cmd->u.s.op) {
                         case 1:
                             chan->volumeScale = cmd->u2.as_f32;
-                            chan->changes.as_bitfields.volume = TRUE;
+                            chan->changes.as_bitfields.volume = true;
                             break;
                         case 2:
                             chan->volume = cmd->u2.as_f32;
-                            chan->changes.as_bitfields.volume = TRUE;
+                            chan->changes.as_bitfields.volume = true;
                             break;
                         case 3:
                             chan->newPan = cmd->u2.as_s8;
-                            chan->changes.as_bitfields.pan = TRUE;
+                            chan->changes.as_bitfields.pan = true;
                             break;
                         case 4:
                             chan->freqScale = cmd->u2.as_f32;
-                            chan->changes.as_bitfields.freqScale = TRUE;
+                            chan->changes.as_bitfields.freqScale = true;
                             break;
                         case 5:
                             chan->reverbVol = cmd->u2.as_s8;
diff --git a/src/audio/seqplayer.c b/src/audio/seqplayer.c
index 131c32984..6aca09dcf 100644
--- a/src/audio/seqplayer.c
+++ b/src/audio/seqplayer.c
@@ -1,4 +1,4 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
 
 #include "audio/data.h"
@@ -52,14 +52,14 @@ char seqplayer_unused_string25[] = "Group:Undefined Command\n";
 void sequence_channel_init(struct SequenceChannel *seqChannel) {
     s32 i;
 
-    seqChannel->enabled = FALSE;
-    seqChannel->finished = FALSE;
-    seqChannel->stopScript = FALSE;
-    seqChannel->stopSomething2 = FALSE;
-    seqChannel->hasInstrument = FALSE;
-    seqChannel->stereoHeadsetEffects = FALSE;
+    seqChannel->enabled = false;
+    seqChannel->finished = false;
+    seqChannel->stopScript = false;
+    seqChannel->stopSomething2 = false;
+    seqChannel->hasInstrument = false;
+    seqChannel->stereoHeadsetEffects = false;
     seqChannel->transposition = 0;
-    seqChannel->largeNotes = FALSE;
+    seqChannel->largeNotes = false;
     seqChannel->bookOffset = 0;
     seqChannel->changes.as_u8 = 0xff;
     seqChannel->scriptState.depth = 0;
@@ -86,7 +86,7 @@ void sequence_channel_init(struct SequenceChannel *seqChannel) {
     for (i = 0; i < 8; i++) {
         seqChannel->soundScriptIO[i] = -1;
     }
-    seqChannel->unused = FALSE;
+    seqChannel->unused = false;
     init_note_lists(&seqChannel->notePool);
 }
 
@@ -109,11 +109,11 @@ s32 seq_channel_set_layer(struct SequenceChannel *seqChannel, s32 layerIndex) {
     layer->seqChannel = seqChannel;
     layer->adsr = seqChannel->adsr;
     layer->adsr.releaseRate = 0;
-    layer->enabled = TRUE;
-    layer->stopSomething = FALSE;
-    layer->continuousNotes = FALSE;
-    layer->finished = FALSE;
-    layer->ignoreDrumPan = FALSE;
+    layer->enabled = true;
+    layer->stopSomething = false;
+    layer->continuousNotes = false;
+    layer->finished = false;
+    layer->ignoreDrumPan = false;
     layer->portamento.mode = 0;
     layer->scriptState.depth = 0;
     layer->status = SOUND_LOAD_STATUS_NOT_LOADED;
@@ -134,8 +134,8 @@ s32 seq_channel_set_layer(struct SequenceChannel *seqChannel, s32 layerIndex) {
 void seq_channel_layer_disable(struct SequenceChannelLayer *layer) {
     if (layer != NULL) {
         seq_channel_layer_note_decay(layer);
-        layer->enabled = FALSE;
-        layer->finished = TRUE;
+        layer->enabled = false;
+        layer->finished = true;
     }
 }
 
@@ -156,8 +156,8 @@ void sequence_channel_disable(struct SequenceChannel *seqChannel) {
     }
 
     note_pool_clear(&seqChannel->notePool);
-    seqChannel->enabled = FALSE;
-    seqChannel->finished = TRUE;
+    seqChannel->enabled = false;
+    seqChannel->finished = true;
 }
 
 struct SequenceChannel *allocate_sequence_channel(void) {
@@ -177,12 +177,12 @@ void sequence_player_init_channels(struct SequencePlayer *seqPlayer, u16 channel
     for (i = 0; i < CHANNELS_MAX; i++) {
         if (channelBits & 1) {
             seqChannel = seqPlayer->channels[i];
-            if (IS_SEQUENCE_CHANNEL_VALID(seqChannel) == TRUE && seqChannel->seqPlayer == seqPlayer) {
+            if (IS_SEQUENCE_CHANNEL_VALID(seqChannel) == true && seqChannel->seqPlayer == seqPlayer) {
                 sequence_channel_disable(seqChannel);
                 seqChannel->seqPlayer = NULL;
             }
             seqChannel = allocate_sequence_channel();
-            if (IS_SEQUENCE_CHANNEL_VALID(seqChannel) == FALSE) {
+            if (IS_SEQUENCE_CHANNEL_VALID(seqChannel) == false) {
                 //eu_stubbed_printf_0("Audio:Track:Warning: No Free Notetrack\n");
                 gAudioErrorFlags = i + 0x10000;
                 seqPlayer->channels[i] = seqChannel;
@@ -207,7 +207,7 @@ void sequence_player_disable_channels(struct SequencePlayer *seqPlayer, u16 chan
     for (i = 0; i < CHANNELS_MAX; i++) {
         if (channelBits & 1) {
             seqChannel = seqPlayer->channels[i];
-            if (IS_SEQUENCE_CHANNEL_VALID(seqChannel) == TRUE) {
+            if (IS_SEQUENCE_CHANNEL_VALID(seqChannel) == true) {
                 if (seqChannel->seqPlayer == seqPlayer) {
                     sequence_channel_disable(seqChannel);
                     seqChannel->seqPlayer = NULL;
@@ -225,12 +225,12 @@ void sequence_player_disable_channels(struct SequencePlayer *seqPlayer, u16 chan
 void sequence_channel_enable(struct SequencePlayer *seqPlayer, u8 channelIndex, void *script) {
     struct SequenceChannel *seqChannel = seqPlayer->channels[channelIndex];
     s32 i;
-    if (IS_SEQUENCE_CHANNEL_VALID(seqChannel) == FALSE) {
+    if (IS_SEQUENCE_CHANNEL_VALID(seqChannel) == false) {
         //stubbed_printf("SEQID %d,BANKID %d\n", seqPlayer->seqId, seqPlayer->defaultBank[0]);
         //stubbed_printf("ERR:SUBTRACK %d NOT ALLOCATED\n", channelIndex);
     } else {
-        seqChannel->enabled = TRUE;
-        seqChannel->finished = FALSE;
+        seqChannel->enabled = true;
+        seqChannel->finished = false;
         seqChannel->scriptState.depth = 0;
         seqChannel->scriptState.pc = script;
         seqChannel->delay = 0;
@@ -245,8 +245,8 @@ void sequence_channel_enable(struct SequencePlayer *seqPlayer, u8 channelIndex,
 void sequence_player_disable(struct SequencePlayer *seqPlayer) {
     sequence_player_disable_channels(seqPlayer, 0xffff);
     note_pool_clear(&seqPlayer->notePool);
-    seqPlayer->finished = TRUE;
-    seqPlayer->enabled = FALSE;
+    seqPlayer->finished = true;
+    seqPlayer->enabled = false;
 
     if (IS_SEQ_LOAD_COMPLETE(seqPlayer->seqId) && gSeqLoadStatus[seqPlayer->seqId] != 5) {
         gSeqLoadStatus[seqPlayer->seqId] = SOUND_LOAD_STATUS_DISCARDABLE;
@@ -347,8 +347,8 @@ void seq_channel_layer_process_script(struct SequenceChannelLayer *layer) {
     f32 temp_f12;
     f32 temp_f2;
 
-    sameSound = TRUE;
-    if (layer->enabled == FALSE) {
+    sameSound = true;
+    if (layer->enabled == false) {
         return;
     }
 
@@ -356,7 +356,7 @@ void seq_channel_layer_process_script(struct SequenceChannelLayer *layer) {
         layer->delay--;
         if (!layer->stopSomething && layer->delay <= layer->duration) {
             seq_channel_layer_note_decay(layer);
-            layer->stopSomething = TRUE;
+            layer->stopSomething = true;
         }
         return;
     }
@@ -379,7 +379,7 @@ void seq_channel_layer_process_script(struct SequenceChannelLayer *layer) {
 
     seqChannel = layer->seqChannel;
     seqPlayer = seqChannel->seqPlayer;
-    layer->notePropertiesNeedInit = TRUE;
+    layer->notePropertiesNeedInit = true;
 
     for (;;) {
         state = &layer->scriptState;
@@ -455,9 +455,9 @@ void seq_channel_layer_process_script(struct SequenceChannelLayer *layer) {
             case 0xc4: // layer_somethingon
             case 0xc5: // layer_somethingoff
                 if (cmd == 0xc4) {
-                    layer->continuousNotes = TRUE;
+                    layer->continuousNotes = true;
                 } else {
-                    layer->continuousNotes = FALSE;
+                    layer->continuousNotes = false;
                 }
                 seq_channel_layer_note_decay(layer);
                 break;
@@ -525,7 +525,7 @@ void seq_channel_layer_process_script(struct SequenceChannelLayer *layer) {
                 break;
 
             case 0xcc:
-                layer->ignoreDrumPan = TRUE;
+                layer->ignoreDrumPan = true;
                 break;
 
             default:
@@ -545,11 +545,11 @@ void seq_channel_layer_process_script(struct SequenceChannelLayer *layer) {
 
     if (cmd == 0xc0) { // layer_delay
         layer->delay = m64_read_compressed_u16(state);
-        layer->stopSomething = TRUE;
+        layer->stopSomething = true;
     } else {
-        layer->stopSomething = FALSE;
+        layer->stopSomething = false;
 
-        if (seqChannel->largeNotes == TRUE) {
+        if (seqChannel->largeNotes == true) {
             switch (cmd & 0xc0) {
                 case 0x00: // layer_note0 (play percentage, velocity, duration)
                     sp3A = m64_read_compressed_u16(state);
@@ -602,7 +602,7 @@ void seq_channel_layer_process_script(struct SequenceChannelLayer *layer) {
         if ((seqPlayer->muted && (seqChannel->muteBehavior & MUTE_BEHAVIOR_STOP_NOTES) != 0)
             || seqChannel->stopSomething2
         ) {
-            layer->stopSomething = TRUE;
+            layer->stopSomething = true;
 
         } else {
             s32 temp = layer->instOrWave;
@@ -617,7 +617,7 @@ void seq_channel_layer_process_script(struct SequenceChannelLayer *layer) {
 
                 drum = get_drum(seqChannel->bankId, cmd);
                 if (drum == NULL) {
-                    layer->stopSomething = TRUE;
+                    layer->stopSomething = true;
                     layer->delayUnused = layer->delay;
                     return;
                 } else {
@@ -634,7 +634,7 @@ void seq_channel_layer_process_script(struct SequenceChannelLayer *layer) {
                 cmd += seqPlayer->transposition + seqChannel->transposition + layer->transposition;
 
                 if (cmd >= 0x80) {
-                    layer->stopSomething = TRUE;
+                    layer->stopSomething = true;
                 } else {
                     if (layer->instOrWave == 0xffu) {
                         instrument = seqChannel->instrument;
@@ -706,30 +706,30 @@ void seq_channel_layer_process_script(struct SequenceChannelLayer *layer) {
         }
     }
 
-    if (layer->stopSomething == TRUE) {
+    if (layer->stopSomething == true) {
         if (layer->note != NULL || layer->continuousNotes) {
             seq_channel_layer_note_decay(layer);
         }
         return;
     }
 
-    cmd = FALSE;
+    cmd = false;
     if (!layer->continuousNotes) {
-        cmd = TRUE;
+        cmd = true;
     } else if (layer->note == NULL || layer->status == SOUND_LOAD_STATUS_NOT_LOADED) {
-        cmd = TRUE;
-    } else if (sameSound == FALSE) {
+        cmd = true;
+    } else if (sameSound == false) {
         seq_channel_layer_note_decay(layer);
-        cmd = TRUE;
+        cmd = true;
     }
     else if (layer != layer->note->parentLayer) {
-        cmd = TRUE;
+        cmd = true;
     }
     else if (layer->sound == NULL) {
         init_synthetic_wave(layer->note, layer);
     }
 
-    if (cmd != FALSE) {
+    if (cmd != false) {
         layer->note = alloc_note(layer);
     }
 
@@ -764,11 +764,11 @@ void set_instrument(struct SequenceChannel *seqChannel, u8 instId) {
     } else {
         if ((seqChannel->instOrWave = get_instrument(seqChannel, instId, &seqChannel->instrument, &seqChannel->adsr)) == 0)
         {
-            seqChannel->hasInstrument = FALSE;
+            seqChannel->hasInstrument = false;
             return;
         }
     }
-    seqChannel->hasInstrument = TRUE;
+    seqChannel->hasInstrument = true;
 }
 
 void sequence_channel_set_volume(struct SequenceChannel *seqChannel, u8 volume) {
@@ -1215,16 +1215,16 @@ void sequence_player_process_sequence(struct SequencePlayer *seqPlayer) {
     struct M64ScriptState *state;
     s32 temp32;
 
-    if (seqPlayer->enabled == FALSE) {
+    if (seqPlayer->enabled == false) {
         return;
     }
 
-    if (seqPlayer->bankDmaInProgress == TRUE) {
+    if (seqPlayer->bankDmaInProgress == true) {
         if (osRecvMesg(&seqPlayer->bankDmaMesgQueue, NULL, 0) == -1) {
             return;
         }
         if (seqPlayer->bankDmaRemaining == 0) {
-            seqPlayer->bankDmaInProgress = FALSE;
+            seqPlayer->bankDmaInProgress = false;
             func_800BB584(seqPlayer->loadingBankId);
             if (gBankLoadStatus[seqPlayer->loadingBankId] != 5) {
                 gBankLoadStatus[seqPlayer->loadingBankId] = 2;
@@ -1237,11 +1237,11 @@ void sequence_player_process_sequence(struct SequencePlayer *seqPlayer) {
         return;
     }
 
-    if (seqPlayer->seqDmaInProgress == TRUE) {
+    if (seqPlayer->seqDmaInProgress == true) {
         if (osRecvMesg(&seqPlayer->seqDmaMesgQueue, NULL, 0) == -1) {
             return;
         }
-        seqPlayer->seqDmaInProgress = FALSE;
+        seqPlayer->seqDmaInProgress = false;
         if (gSeqLoadStatus[seqPlayer->seqId] != 5) {
             gSeqLoadStatus[seqPlayer->seqId] = 2;
         }
@@ -1249,9 +1249,9 @@ void sequence_player_process_sequence(struct SequencePlayer *seqPlayer) {
 
     // If discarded, bail out.
     temp32 = 2; // I beg your pardon?
-    if (IS_SEQ_LOAD_COMPLETE(seqPlayer->seqId) == FALSE
+    if (IS_SEQ_LOAD_COMPLETE(seqPlayer->seqId) == false
         || (
-        IS_BANK_LOAD_COMPLETE(seqPlayer->defaultBank[0]) == FALSE)) {
+        IS_BANK_LOAD_COMPLETE(seqPlayer->defaultBank[0]) == false)) {
         sequence_player_disable(seqPlayer);
         return;
     }
@@ -1457,7 +1457,7 @@ void sequence_player_process_sequence(struct SequencePlayer *seqPlayer) {
                         break;
 
                     case 0xd4: // seq_mute
-                        seqPlayer->muted = TRUE;
+                        seqPlayer->muted = true;
                         break;
 
                     case 0xd3: // seq_setmutebhv
@@ -1534,7 +1534,7 @@ void sequence_player_process_sequence(struct SequencePlayer *seqPlayer) {
     }
 
     for (i = 0; i < CHANNELS_MAX; i++) {
-        if (IS_SEQUENCE_CHANNEL_VALID(seqPlayer->channels[i]) == TRUE) {
+        if (IS_SEQUENCE_CHANNEL_VALID(seqPlayer->channels[i]) == true) {
             sequence_channel_process_script(seqPlayer->channels[i]);
         }
     }
@@ -1543,7 +1543,7 @@ void sequence_player_process_sequence(struct SequencePlayer *seqPlayer) {
 void process_sequences(UNUSED s32 iterationsRemaining) {
     s32 i;
     for (i = 0; i < SEQUENCE_PLAYERS; i++) {
-        if (gSequencePlayers[i].enabled == TRUE) {
+        if (gSequencePlayers[i].enabled == true) {
             sequence_player_process_sequence(&gSequencePlayers[i]);
             sequence_player_process_sound(&gSequencePlayers[i]);
         }
@@ -1577,7 +1577,7 @@ void init_sequence_players(void) {
 
     for (i = 0; i < ARRAY_COUNT(gSequenceChannels); i++) {
         gSequenceChannels[i].seqPlayer = NULL;
-        gSequenceChannels[i].enabled = FALSE;
+        gSequenceChannels[i].enabled = false;
         /**
          * @bug Size of wrong array. Zeroes out second half of gSequenceChannels[0],
          * all of gSequenceChannels[1..31], and part of gSequenceLayers[0].
@@ -1597,7 +1597,7 @@ void init_sequence_players(void) {
 
     for (i = 0; i < ARRAY_COUNT(gSequenceLayers); i++) {
         gSequenceLayers[i].seqChannel = NULL;
-        gSequenceLayers[i].enabled = FALSE;
+        gSequenceLayers[i].enabled = false;
     }
 
     for (i = 0; i < SEQUENCE_PLAYERS; i++) {
@@ -1607,10 +1607,10 @@ void init_sequence_players(void) {
 
         gSequencePlayers[i].seqVariationEu[0] = -1;
         gSequencePlayers[i].muteBehavior = MUTE_BEHAVIOR_STOP_SCRIPT | MUTE_BEHAVIOR_STOP_NOTES | MUTE_BEHAVIOR_SOFTEN;
-        gSequencePlayers[i].enabled = FALSE;
-        gSequencePlayers[i].muted = FALSE;
-        gSequencePlayers[i].bankDmaInProgress = FALSE;
-        gSequencePlayers[i].seqDmaInProgress = FALSE;
+        gSequencePlayers[i].enabled = false;
+        gSequencePlayers[i].muted = false;
+        gSequencePlayers[i].bankDmaInProgress = false;
+        gSequencePlayers[i].seqDmaInProgress = false;
         init_note_lists(&gSequencePlayers[i].notePool);
         init_sequence_player(i);
     }
diff --git a/src/audio/seqplayer.h b/src/audio/seqplayer.h
index dc8cbe995..8c95a60d5 100644
--- a/src/audio/seqplayer.h
+++ b/src/audio/seqplayer.h
@@ -1,7 +1,7 @@
 #ifndef AUDIO_SEQPLAYER_H
 #define AUDIO_SEQPLAYER_H
 
-#include <PR/ultratypes.h>
+#include <libultra/types.h>
 
 #include "audio/internal.h"
 
diff --git a/src/audio/synthesis.c b/src/audio/synthesis.c
index c6e3e5360..f808e359c 100644
--- a/src/audio/synthesis.c
+++ b/src/audio/synthesis.c
@@ -1,4 +1,4 @@
-#include <ultra64.h>
+#include <libultraship.h>
 #include <macros.h>
 #include "audio/synthesis.h"
 #include "audio/heap.h"
@@ -7,7 +7,7 @@
 #include "audio/seqplayer.h"
 #include "audio/internal.h"
 //#include "audio/external.h"
-#include "PR/abi.h"
+#include <libultra/abi.h>
 
 #define aSetLoadBufferPair(pkt, c, off)                                                                \
     aSetBuffer(pkt, 0, c + DMEM_ADDR_WET_LEFT_CH, 0, DEFAULT_LEN_1CH - c);                             \
@@ -127,7 +127,7 @@ void func_800B6FB4(s32 updateIndexStart, s32 noteIndex) {
 
     for (i = updateIndexStart + 1; i < gAudioBufferParameters.updatesPerFrame; i++) {
         if (!gNoteSubsEu[gMaxSimultaneousNotes * i + noteIndex].needsInit) {
-            gNoteSubsEu[gMaxSimultaneousNotes * i + noteIndex].enabled = FALSE;
+            gNoteSubsEu[gMaxSimultaneousNotes * i + noteIndex].enabled = false;
         } else {
             break;
         }
@@ -144,9 +144,9 @@ void synthesis_load_note_subs_eu(s32 updateIndex) {
         dest = &gNoteSubsEu[gMaxSimultaneousNotes * updateIndex + i];
         if (src->enabled) {
             *dest = *src;
-            src->needsInit = FALSE;
+            src->needsInit = false;
         } else {
-            dest->enabled = FALSE;
+            dest->enabled = false;
         }
     }
 }
@@ -161,7 +161,8 @@ Acmd *synthesis_execute(Acmd *acmd, s32 *writtenCmds, s16 *aiBuf, s32 bufLen) {
         process_sequences(i - 1);
         synthesis_load_note_subs_eu(gAudioBufferParameters.updatesPerFrame - i);
     }
-    aSegment(cmd++, 0, 0);
+    // UTODO: Stubbed
+    // aSegment(cmd++, 0, 0);
     aiBufPtr = (u32 *) aiBuf;
     for (i = gAudioBufferParameters.updatesPerFrame; i > 0; i--) {
         if (i == 1) {
@@ -307,7 +308,7 @@ Acmd *synthesis_do_one_audio_update(s16 *aiBuf, s32 bufLen, Acmd *acmd, s32 upda
     }
     for (; i < notePos; i++) {
         temp = updateIndex * gMaxSimultaneousNotes;
-        if (IS_BANK_LOAD_COMPLETE(gNoteSubsEu[temp + noteIndices[i]].bankId) == TRUE) {
+        if (IS_BANK_LOAD_COMPLETE(gNoteSubsEu[temp + noteIndices[i]].bankId)) {
             acmd = synthesis_process_note(noteIndices[i],
                                  &gNoteSubsEu[temp + noteIndices[i]],
                                  &gNotes[noteIndices[i]].synthesisState,
@@ -319,7 +320,8 @@ Acmd *synthesis_do_one_audio_update(s16 *aiBuf, s32 bufLen, Acmd *acmd, s32 upda
 
     temp = bufLen * 2;
     aSetBuffer(acmd++, 0, 0, DMEM_ADDR_TEMP, temp);
-    aInterleave(acmd++, DMEM_ADDR_LEFT_CH, DMEM_ADDR_RIGHT_CH);
+    // UTODO: Stubbed
+    // aInterleave(acmd++, DMEM_ADDR_LEFT_CH, DMEM_ADDR_RIGHT_CH);
     aSaveBuffer(acmd++, DMEM_ADDR_TEMP, VIRTUAL_TO_PHYSICAL2(aiBuf), temp * 2);
     return acmd;
 }
@@ -603,14 +605,16 @@ GLOBAL_ASM("asm/non_matchings/audio/synthesis/synthesis_process_note.s")
 Acmd *load_wave_samples(Acmd *acmd, struct NoteSubEu *noteSubEu, struct NoteSynthesisState *synthesisState, s32 nSamplesToLoad) {
     s32 a3;
     s32 repeats;
-    aLoadBuffer(acmd++, VIRTUAL_TO_PHYSICAL2(noteSubEu->sound.samples), 0x1A0, 128);
+    // UTODO: Stubbed
+    // aLoadBuffer(acmd++, VIRTUAL_TO_PHYSICAL2(noteSubEu->sound.samples), 0x1A0, 128);
 
     synthesisState->samplePosInt &= 0x3f;
     a3 = 64 - synthesisState->samplePosInt;
     if (a3 < nSamplesToLoad) {
         repeats = (nSamplesToLoad - a3 + 63) / 64;
         if (repeats != 0) {
-            aDMEMMove2(acmd++, repeats, 0x1A0, 0x1A0 + 128, 128);
+            // UTODO: Stubbed
+            // aDMEMMove2(acmd++, repeats, 0x1A0, 0x1A0 + 128, 128);
         }
     }
     return acmd;
diff --git a/src/audio/synthesis.h b/src/audio/synthesis.h
index a1854442b..59f6bd43f 100644
--- a/src/audio/synthesis.h
+++ b/src/audio/synthesis.h
@@ -2,7 +2,7 @@
 #define AUDIO_SYNTHESIS_H
 
 #include "audio/internal.h"
-#include "PR/abi.h"
+#include <libultra/gbi.h>
 
 #define DEFAULT_LEN_1CH 0x180
 #define DEFAULT_LEN_2CH 0x300