mirror of
https://github.com/HarbourMasters/SpaghettiKart
synced 2026-08-03 00:56:53 -04:00
Some error fixing
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
#include <libultraship.h>
|
||||
#include <macros.h>
|
||||
#include <PR/ucode.h>
|
||||
|
||||
#include "audio/synthesis.h"
|
||||
#include "audio/seqplayer.h"
|
||||
|
||||
+11
-11
@@ -378,7 +378,7 @@ Acmd *synthesis_process_note(s32 noteIndex, struct NoteSubEu *noteSubEu, struct
|
||||
curLoadedBook = NULL;
|
||||
note = &gNotes[noteIndex];
|
||||
flags = 0;
|
||||
if (noteSubEu->needsInit == TRUE) {
|
||||
if (noteSubEu->needsInit == true) {
|
||||
flags = A_INIT;
|
||||
synthesisState->restart = 0;
|
||||
synthesisState->samplePosInt = 0;
|
||||
@@ -434,13 +434,13 @@ Acmd *synthesis_process_note(s32 noteIndex, struct NoteSubEu *noteSubEu, struct
|
||||
s32 samplesRemaining;
|
||||
s32 s1;
|
||||
|
||||
noteFinished = FALSE;
|
||||
restart = FALSE;
|
||||
noteFinished = false;
|
||||
restart = false;
|
||||
|
||||
s3 = synthesisState->samplePosInt & 0xF;
|
||||
samplesRemaining = endPos - synthesisState->samplePosInt;
|
||||
nSamplesToProcess = samplesLenAdjusted - nAdpcmSamplesProcessed;
|
||||
if ((s3 == 0) && (synthesisState->restart == FALSE)) {
|
||||
if ((s3 == 0) && (synthesisState->restart == false)) {
|
||||
s3 = 16;
|
||||
}
|
||||
|
||||
@@ -485,11 +485,11 @@ Acmd *synthesis_process_note(s32 noteIndex, struct NoteSubEu *noteSubEu, struct
|
||||
var_t2 = 0;
|
||||
}
|
||||
|
||||
if (synthesisState->restart != FALSE) {
|
||||
if (synthesisState->restart != false) {
|
||||
aSetLoop(cmd++, VIRTUAL_TO_PHYSICAL2(audioBookSample->loop->state));
|
||||
|
||||
flags = A_LOOP;
|
||||
synthesisState->restart = FALSE;
|
||||
synthesisState->restart = false;
|
||||
}
|
||||
nSamplesInThisIteration = (s1 + a1) - var_s6;
|
||||
s5Aligned = ALIGN(s4 + 16, 4);
|
||||
@@ -541,7 +541,7 @@ Acmd *synthesis_process_note(s32 noteIndex, struct NoteSubEu *noteSubEu, struct
|
||||
func_800B6FB4(updateIndex, noteIndex);
|
||||
} else {
|
||||
if (restart) {
|
||||
synthesisState->restart = TRUE;
|
||||
synthesisState->restart = true;
|
||||
synthesisState->samplePosInt = loopInfo->start;
|
||||
} else {
|
||||
synthesisState->samplePosInt += nSamplesToProcess;
|
||||
@@ -559,7 +559,7 @@ Acmd *synthesis_process_note(s32 noteIndex, struct NoteSubEu *noteSubEu, struct
|
||||
aDownsampleHalf(cmd++, ALIGN(samplesLenAdjusted / 2, 3), 0x1A0 + spFC, DMEM_ADDR_RESAMPLED);
|
||||
resampledTempLen = samplesLenAdjusted;
|
||||
noteSamplesDmemAddrBeforeResampling = DMEM_ADDR_RESAMPLED;
|
||||
if (noteSubEu->finished != FALSE) {
|
||||
if (noteSubEu->finished != false) {
|
||||
aClearBuffer(cmd++, noteSamplesDmemAddrBeforeResampling + resampledTempLen, samplesLenAdjusted + 0x10);
|
||||
}
|
||||
break;
|
||||
@@ -570,15 +570,15 @@ Acmd *synthesis_process_note(s32 noteIndex, struct NoteSubEu *noteSubEu, struct
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (noteSubEu->finished != FALSE) {
|
||||
if (noteSubEu->finished != false) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
flags = 0;
|
||||
if (noteSubEu->needsInit == TRUE) {
|
||||
if (noteSubEu->needsInit == true) {
|
||||
flags = A_INIT;
|
||||
noteSubEu->needsInit = FALSE;
|
||||
noteSubEu->needsInit = false;
|
||||
}
|
||||
|
||||
cmd = final_resample(cmd, synthesisState, inBuf * 2, resamplingRateFixedPoint, noteSamplesDmemAddrBeforeResampling, flags);
|
||||
|
||||
@@ -16,7 +16,7 @@ void func_802B0648(struct BananaBunchParent*);
|
||||
void func_802B0788(s16, struct BananaBunchParent*, Player*);
|
||||
s32 func_802B09C0(s16);
|
||||
void update_actor_banana_bunch(struct BananaBunchParent*);
|
||||
s32 is_shell_exist(s16);
|
||||
bool is_shell_exist(s16);
|
||||
void update_actor_triple_shell(TripleShellParent*, s16);
|
||||
s32 use_banana_bunch_item(Player*);
|
||||
s32 use_triple_shell_item(Player*, s16);
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
#include <math_util.h>
|
||||
#include <main.h>
|
||||
#include "buffers.h"
|
||||
#include <PR/rcp.h>
|
||||
#include "buffers/trig_tables.h"
|
||||
#include "math.h"
|
||||
#include "memory.h"
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
#ifndef MATH_UTIL_H
|
||||
#define MATH_UTIL_H
|
||||
|
||||
#include <libultra/types.h>
|
||||
|
||||
#include <libultraship.h>
|
||||
|
||||
//#define sins(x) gSineTable[(u16) (x) >> 4]
|
||||
//#define coss(x) gCosineTable[(u16) (x) >> 4]
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#include <libultraship.h>
|
||||
#include <libultra/gbi.h>
|
||||
#include <macros.h>
|
||||
#include <mk64.h>
|
||||
#include <common_structs.h>
|
||||
@@ -73,7 +74,7 @@ void load_surface_map(uintptr_t addr, struct UnkStruct_800DC5EC *arg1) {
|
||||
Player *player = arg1->player;
|
||||
Camera *camera = arg1->camera;
|
||||
//! @todo Should be Gfx*
|
||||
Gfx* gfx = (Gfx*) addr;
|
||||
Gfx** gfx = (Gfx**) &addr;
|
||||
s16 var_a3;
|
||||
s16 temp_v1;
|
||||
s16 sp1E;
|
||||
@@ -177,7 +178,7 @@ void load_surface_map(uintptr_t addr, struct UnkStruct_800DC5EC *arg1) {
|
||||
arg1->pathCounter = temp_v1;
|
||||
temp_v1 = ((temp_v1 - 1) * 4) + var_a3;
|
||||
|
||||
gSPDisplayList(gDisplayListHead++, gfx[temp_v1]);
|
||||
gSPDisplayList(gDisplayListHead++, (Gfx *)gfx[temp_v1]);
|
||||
}
|
||||
|
||||
void func_80291198(void) {
|
||||
|
||||
Reference in New Issue
Block a user