link most of libultra.a

include/jaudio_NES/game64.h

@@ -60,6 +60,7 @@ extern u8 Na_CheckNeosBoot();
 extern void Na_RestartPrepare();
 extern u8 Na_CheckRestartReady();
 extern void Na_Restart();
+extern void Na_Reset();
 
 extern u8 sou_now_bgm_handle;
 extern u8 sou_chime_status;

include/libjsys/jsyswrapper.h

@@ -1,6 +1,7 @@
 #ifndef JSYSWRAPPER_H
 #define JSYSWRAPPER_H
 
+#include "dolphin/pad.h"
 #include "types.h"
 #include "JSystem/JKernel/JKREnum.h"
 #include "JSystem/JUtility/JUTEnum.h"
@@ -49,6 +50,8 @@ extern s32 JC_JKRHeap_getTotalFreeSize(void* heap);
 
 extern void JC_JKRExpHeap_changeGroupID(void* expheap, u8 groupId);
 
+extern void JC_JUTGamePad_getPadStatus(PADStatus* status, int padId);
+
 extern void* JC__JKRDvdToMainRam_byName(const char* name, u8* buf, JKRExpandSwitch expandSwitch);
 extern BOOL JC__JKRDetachResource(void* ptr);
 
@@ -137,6 +140,7 @@ extern void* JW_Alloc(size_t size, int align);
 extern void JW_Free(void* ptr);
 extern s32 JW_Resize(void* ptr, size_t new_size);
 extern size_t JW_GetMemBlockSize(void* ptr);
+extern void JW_JUTXfb_clearIndex(void);
 extern void JW_JUTReport(int x, int y, int show_count, const char* fmt, ...);
 
 extern int JC_JKRDecomp_checkCompressed(u8* bufp);

include/libultra/contreaddata.h

@@ -8,6 +8,7 @@ extern "C" {
 #endif
 
 extern u8 __osResetSwitchPressed;
+extern u8 __osResetKeyStep;
 
 #ifdef __cplusplus
 }

include/libultra/controller.h

@@ -0,0 +1,14 @@
+#ifndef LIBULTRA_CONTROLLER_H
+#define LIBULTRA_CONTROLLER_H
+
+#include "libultra/osContPad.h"
+#include "libultra/libultra.h"
+
+
+extern u8 __osMaxControllers;
+extern int __osContinitialized;
+
+void __osContGetInitData(u8* p, OSContStatus* s);
+
+
+#endif

include/libultra/gu.h

@@ -4,6 +4,17 @@
 #include "types.h"
 #include "libultra/ultratypes.h"
 
+#ifndef MAX
+#define MAX(a,b) (((a)>(b))?(a):(b))
+#endif
+#ifndef MIN
+#define MIN(a,b) (((a)<(b))?(a):(b))
+#endif
+
+#define	FTOFIX32(x)	(long)((x) * (float)0x00010000)
+#define	FIX32TOF(x)	((float)(x) * (1.0f / (float)0x00010000))
+#define	FTOFRAC8(x)	((int) MIN(((x) * (128.0f)), 127.0f) & 0xff)
+
 void guMtxIdentF(float mf[4][4]);
 
 inline void guTranslateF(float m[4][4], float x, float y, float z){
@@ -49,4 +60,7 @@ void guLookAtHilite (Mtx *m, LookAt *l, Hilite *h,
 		float xl2,  float yl2,  float zl2,   /* light 2 direction */
 		int twidth, int theight);	     /* highlight txtr size*/
 
+extern signed short sins (unsigned short angle);
+extern signed short coss (unsigned short angle);
+
 #endif

include/libultra/initialize.h

@@ -8,6 +8,7 @@ extern "C" {
 #endif
 
 extern void __osInitialize_common();
+extern BOOL osIsEnableShutdown(void);
 
 #ifdef __cplusplus
 }

include/libultra/osThread.h

@@ -8,7 +8,6 @@ typedef s32 OSPri;
 typedef s32 OSId;
 
 
-
 OSId osGetThreadId(OSThread*);
 
 #endif

include/libultra/os_thread.h

@@ -1,6 +1,7 @@
 #ifndef LIBULTRA_OS_THREAD_H
 #define LIBULTRA_OS_THREAD_H
 
+#include "libultra/osThread.h"
 #include "types.h"
 #include "dolphin/os/OSThread.h"
 
@@ -8,7 +9,7 @@
 extern "C" {
 #endif
 
-extern void osCreateThread2(OSThread* t, int id, void(*entry)(void*), void* arg, void* stack_pointer, size_t stack_size, OSPriority priority);
+extern void osCreateThread2(OSThread* t, OSId id, void(*entry)(void*), void* arg, void* stack_pointer, size_t stack_size, OSPriority priority);
 extern void osStartThread(OSThread* t);
 extern void osDestroyThread(OSThread* t);
 

include/libultra/os_timer.h

@@ -11,6 +11,9 @@ extern "C" {
 #endif
 
 extern int osSetTimer(OSTimer* t, OSTime countdown, OSTime interval, OSMessageQueue* mq, OSMessage msg);
+extern void osStopTimerAll(void);
+
+extern OSTimer* __osTimerList;
 
 #ifdef __cplusplus
 }

include/libultra/timerintr.h

@@ -0,0 +1,8 @@
+#ifndef LIBULTRA_TIMERINTR_H
+#define LIBULTRA_TIMERINTR_H
+
+#include "types.h"
+
+extern void __osTimerServicesInit(void);
+
+#endif

include/libultra/xprintf.h

@@ -35,8 +35,8 @@ typedef void* (*PrintCallback)(void*, const char*, int);
 #define FLAGS_HASH 8
 #define FLAGS_ZERO 16
 
-static void _Litob(_Pft* args, u8 type);
-static void _Ldtob(_Pft* args, u8 type);
+extern void _Litob(_Pft* args, u8 type);
+extern void _Ldtob(_Pft* args, u8 type);
 extern int _Printf(void* (*prout_func)(void*, const char*, int), void* arg,
                    const char* fmt, va_list ap);