izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #177 from AntonioCastelli/master

Browse Source 
Fixed some broken NON_MATCHING functions.
This commit is contained in:
David Benepe
2021-10-31 14:02:36 -04:00
committed by GitHub
parent 50e5f77b8c 8addf34622
commit 24d14bfd88
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/src/libc/ll.c
+1 -2
View File
@@ -4,7 +4,7 @@
#include "types.h"
#include "macros.h"
#ifdef NON_MATCHING
#if 0
//Thse need to be compiled with -mips3, and linked differently
unsigned long long __ull_rshift(unsigned long long a0, unsigned long long a1)
{
@@ -49,7 +49,6 @@ long long __ll_mod(long long a0, long long a1)
long long tmp = a0 % a1;
if ((tmp < 0 && a1 > 0) || (tmp > 0 && a1 < 0))
{
tmp += a1;
}
return tmp;
lib/src/libc/llcvt.c
+1 -2
View File
@@ -1,7 +1,7 @@
/* The comment below is needed for this file to be picked up by generate_ld */
/* RAM_POS: 0x800C9B30 */
#ifdef NON_MATCHING
#if 0
//This needs to be compiled with mips3, which isn't yet supported
long long __d_to_ll(double d) {
return d;
@@ -30,7 +30,6 @@ float __ull_to_f(unsigned long long u) {
#else
#include "types.h"
#include "macros.h"
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA730/__d_to_ll.s")
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA730/__f_to_ll.s")
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA730/__ll_to_f.s")
lib/src/mips1/al/alSynAllocFX.c
+4 -4
View File
@@ -6,16 +6,16 @@
#include "audio_internal.h"
#ifdef NON_MATCHING
void alFxNew(ALFx *r, ALSynConfig *c, ALHeap *hp);
void alFxNew(ALFx *r, ALSynConfig *c, s16 bus);
s32 alFxParam(void *filter, s32 paramID, void *param);
s32 alMainBusParam(void *filter, s32 paramID, void *param);
// This is very close to matching.
ALFxRef *alSynAllocFX(ALSynth *s, s16 bus, ALSynConfig *c, ALHeap *hp)
{
alFxNew(&s->auxBus[bus].fx[0], c, hp);
alFxParam(&s->auxBus[bus].fx[0], AL_FILTER_SET_SOURCE,
alFxNew(s->auxBus[bus].fx, c, bus);
alFxParam(s->auxBus[bus].fx, AL_FILTER_SET_SOURCE,
&s->auxBus[bus]);
alMainBusParam(s->mainBus, AL_FILTER_ADD_SOURCE,&s->auxBus[bus].fx[0]);
alMainBusParam(s->mainBus, AL_FILTER_ADD_SOURCE, s->auxBus[bus].fx);
return (ALFxRef)(&s->auxBus[bus].fx[0]);
}
src/camera.c
+1 -1
View File
@@ -166,7 +166,7 @@ void func_80065EA0(void) {
if ((D_B0000578 & 0xFFFF) != 0x8965) {
D_800DD060 = 1;
}
guPerspectiveF(D_80120EE0, perspNorm[5], CAMERA_DEFAULT_FOV, CAMERA_ASPECT, CAMERA_NEAR, CAMERA_FAR, CAMERA_SCALE);
guPerspectiveF(D_80120EE0, &perspNorm[5], CAMERA_DEFAULT_FOV, CAMERA_ASPECT, CAMERA_NEAR, CAMERA_FAR, CAMERA_SCALE);
func_8006F870(D_80120EE0, D_80120FE0);
gCurCamFOV = CAMERA_DEFAULT_FOV;
}