Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'bd0a02c45630d6b3666b079593e787de263d0a17' into pret-merge

Browse Source 
Conflicts:
	Makefile
This commit is contained in:
Hedara 2025-05-24 20:42:01 +02:00
commit 3ecd8afab0
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/gba/m4a_internal.h
View File

@ -170,7 +170,7 @@ struct SoundChannel
struct MusicPlayerInfo; struct MusicPlayerInfo;
#if !MODERN #if __STDC_VERSION__ < 202311L
typedef void (*MPlayFunc)(); typedef void (*MPlayFunc)();
#else #else
typedef void (*MPlayFunc)(...); typedef void (*MPlayFunc)(...);

2
include/librfu.h
View File

@ -316,7 +316,7 @@ struct STWIStatus
u8 recoveryCount; u8 recoveryCount;
u8 unk_16; u8 unk_16;
u8 unk_17; u8 unk_17;
#if !MODERN #if __STDC_VERSION__ < 202311L
void (*callbackM)(); void (*callbackM)();
#else #else
void (*callbackM)(...); void (*callbackM)(...);

6
src/librfu_intr.c
View File

@ -7,7 +7,7 @@ static u16 handshake_wait(u16 slot);
static void STWI_set_timer_in_RAM(u8 count); static void STWI_set_timer_in_RAM(u8 count);
static void STWI_stop_timer_in_RAM(void); static void STWI_stop_timer_in_RAM(void);
static void STWI_init_slave(void); static void STWI_init_slave(void);
#if !MODERN #if __STDC_VERSION__ < 202311L
static void Callback_Dummy_M(int reqCommandId, int error, void (*callbackM)()); static void Callback_Dummy_M(int reqCommandId, int error, void (*callbackM)());
#else #else
static void Callback_Dummy_M(int reqCommandId, int error, void (*callbackM)(...)); static void Callback_Dummy_M(int reqCommandId, int error, void (*callbackM)(...));
@ -139,7 +139,7 @@ static void sio32intr_clock_master(void)
} }
gSTWIStatus->sending = 0; gSTWIStatus->sending = 0;
if (gSTWIStatus->callbackM != NULL) if (gSTWIStatus->callbackM != NULL)
#if !MODERN #if __STDC_VERSION__ < 202311L
Callback_Dummy_M(gSTWIStatus->reqActiveCommand, gSTWIStatus->error, gSTWIStatus->callbackM); Callback_Dummy_M(gSTWIStatus->reqActiveCommand, gSTWIStatus->error, gSTWIStatus->callbackM);
#else #else
Callback_Dummy_M(gSTWIStatus->reqActiveCommand, gSTWIStatus->error, (void (*)(...))gSTWIStatus->callbackM); Callback_Dummy_M(gSTWIStatus->reqActiveCommand, gSTWIStatus->error, (void (*)(...))gSTWIStatus->callbackM);
@ -396,7 +396,7 @@ static void STWI_init_slave(void)
} }
NAKED NAKED
#if !MODERN #if __STDC_VERSION__ < 202311L
static void Callback_Dummy_M(int reqCommandId, int error, void (*callbackM)()) static void Callback_Dummy_M(int reqCommandId, int error, void (*callbackM)())
#else #else
static void Callback_Dummy_M(int reqCommandId, int error, void (*callbackM)(...)) static void Callback_Dummy_M(int reqCommandId, int error, void (*callbackM)(...))

6
src/m4a.c
View File

@ -280,7 +280,7 @@ void MPlayExtender(struct CgbChannel *cgbChans)
soundInfo->ident++; soundInfo->ident++;
#if !MODERN #if __STDC_VERSION__ < 202311L
gMPlayJumpTable[8] = ply_memacc; gMPlayJumpTable[8] = ply_memacc;
gMPlayJumpTable[17] = ply_lfos; gMPlayJumpTable[17] = ply_lfos;
gMPlayJumpTable[19] = ply_mod; gMPlayJumpTable[19] = ply_mod;
@ -329,7 +329,7 @@ void MusicPlayerJumpTableCopy(void)
void ClearChain(void *x) void ClearChain(void *x)
{ {
#if !MODERN #if __STDC_VERSION__ < 202311L
void (*func)(void *) = *(&gMPlayJumpTable[34]); void (*func)(void *) = *(&gMPlayJumpTable[34]);
#else #else
void (*func)(...) = *(&gMPlayJumpTable[34]); void (*func)(...) = *(&gMPlayJumpTable[34]);
@ -339,7 +339,7 @@ void ClearChain(void *x)
void Clear64byte(void *x) void Clear64byte(void *x)
{ {
#if !MODERN #if __STDC_VERSION__ < 202311L
void (*func)(void *) = *(&gMPlayJumpTable[35]); void (*func)(void *) = *(&gMPlayJumpTable[35]);
#else #else
void (*func)(...) = *(&gMPlayJumpTable[35]); void (*func)(...) = *(&gMPlayJumpTable[35]);