pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-19 16:01:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Work on merge

Browse Source
This commit is contained in:
JoshDuMan 2020-09-28 00:38:21 -04:00
parent 84db54fce8
commit 4c4ce1a4e0
14 changed files with 4 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/os/code_39db0_len_8a0.c
View File

@ -1,25 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScCreateScheduler);
INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScExecuteAudio);
INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScAddClient);
INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScRemoveClient);
INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScResetClientMesgType);
INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScGetGfxMQ);
INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScGetAudioMQ);
INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScSetFrameBufferNum);
INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScGetFrameRate);
INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScEventHandler);
INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScEventBroadcast);
INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScWaitTaskReady);

3
src/os/code_3a650_len_40.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "os/code_3a650_len_40", nuGfxFuncSet);

3
src/os/code_3a690_len_40.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "os/code_3a690_len_40", nuGfxPreNMIFuncSet);

3
src/os/code_3a6d0_len_20.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "os/code_3a6d0_len_20", nuGfxTaskAllEndWait);

3
src/os/code_3a6f0_len_110.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "os/code_3a6f0_len_110", nuGfxSetCfb);

3
src/os/code_3a800_len_30.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "os/code_3a800_len_30", nuGfxDisplayOff);

3
src/os/code_3a830_len_20.c
View File

@ -1,3 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "os/code_3a830_len_20", nuGfxDisplayOn);

50
src/os/code_3a850_le_a40.c
View File

@ -1,50 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuPiInit);
INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuPiReadRom);
INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuGfxInit);
INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuContInit);
INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuContDataGet);
INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuContPakMgrInit);
INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuContPakMgrRemove);
INCLUDE_ASM(s32, "os/code_3a850_le_a40", contPakOpen);
INCLUDE_ASM(s32, "os/code_3a850_le_a40", contPakFree);
INCLUDE_ASM(s32, "os/code_3a850_le_a40", contPakFileReadWrite);
INCLUDE_ASM(s32, "os/code_3a850_le_a40", contPakFileOpen);
INCLUDE_ASM(s32, "os/code_3a850_le_a40", contPakFileDelete);
INCLUDE_ASM(s32, "os/code_3a850_le_a40", contPakFileState);
INCLUDE_ASM(s32, "os/code_3a850_le_a40", contPakFileNum);
INCLUDE_ASM(s32, "os/code_3a850_le_a40", contPakRepairId);
#undef osMotorStop
INCLUDE_ASM(s32, "os/code_3a850_le_a40", osMotorStop, OSPfs* unk);
INCLUDE_ASM(s32, "os/code_3a850_le_a40", contRmbControl);
INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuContRmbMgrInit);
INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuContRmbMgrRemove);
INCLUDE_ASM(s32, "os/code_3a850_le_a40", contRmbCheckMesg);
INCLUDE_ASM(s32, "os/code_3a850_le_a40", contRmbStartMesg);
INCLUDE_ASM(s32, "os/code_3a850_le_a40", func_8005FDE4);
INCLUDE_ASM(s32, "os/code_3a850_le_a40", func_8005FE0C);
INCLUDE_ASM(s32, "os/code_3a850_le_a40", func_8005FE54);

5
src/os/code_3b290_len_100.c
View File

@ -1,5 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "os/code_3b290_len_100", nuContRmbStart);
INCLUDE_ASM(s32, "os/code_3b290_len_100", nuContRmbCheck);

2
src/os/nusys/nuContRmbMgr.c
View File

@ -108,7 +108,7 @@ void nuContRmbMgrInit(void) {
nuSiCallBackAdd(&nuContRmbCallBack);
}
#else
void INCLUDE_ASM("os/nuContRmbMgr", nuContRmbMgrInit);
INCLUDE_ASM(void, "os/nuContRmbMgr", nuContRmbMgrInit);
#endif
void nuContRmbMgrRemove(void) {

2
src/os/nusys/nuGfxSetCfb.c
View File

@ -1,3 +1,3 @@
#include "common.h"
INCLUDE_API_ASM("os/nuGfxSetCfb", nuGfxSetCfb);
INCLUDE_ASM(void, "os/nuGfxSetCfb", nuGfxSetCfb);

4
src/os/nusys/nuSched.c
View File

@ -5,7 +5,7 @@ INCLUDE_ASM(void, "os/code_39db0_len_8a0", nuScCreateScheduler, u8 videoMode, u8
INCLUDE_ASM(void, "os/code_39db0_len_8a0", nuScExecuteAudio);
INCLUDE_ASM(void, "os/code_39db0_len_8a0", nuScExecuteGraphics);
// INCLUDE_ASM(void, "os/code_39db0_len_8a0", nuScExecuteGraphics);
INCLUDE_ASM(void, "os/code_39db0_len_8a0", nuScAddClient, NUScClient *c, OSMesgQueue *mq, NUScMsg msgType);
@ -71,7 +71,7 @@ s32 nuScGetFrameRate(void) {
return nusched.frameRate;
}
#else
(s32, "os/code_39db0_len_8a0", nuScGetFrameRate, void);
INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScGetFrameRate, void);
#endif
INCLUDE_ASM(void, "os/code_39db0_len_8a0", nuScEventHandler);

1
tools/n64splat

@ -1 +0,0 @@
Subproject commit e9d9a22063fb19d270829950f4b79a5670bd4bd4

1
tools/star-rod

@ -1 +0,0 @@
Subproject commit 3a32d3d6dda7374e4f32ae86530444e45956d803