ntsc-beta: Get lib .text segment matching excluding pointers

src/include/lib/controller.h

@@ -38,8 +38,15 @@ s8 contGetStickY(s8 contpadnum);
 u16 contGetButtons(s8 contpadnum, u16 mask);
 u16 contGetButtonsPressedThisFrame(s8 contpadnum, u16 mask);
 s32 func000150c4(void);
+
+#if VERSION >= VERSION_NTSC_1_0
 void func000150e8(void);
 void func00015144(void);
+#else
+void func000150e8(s32 line, char *file);
+void func00015144(s32 line, char *file);
+#endif
+
 void func0001519c(void);
 void func000152d0(s8 playernum, s32 *arg1, s32 *arg2);
 void func000153c4(s8 arg0, s32 arg1);

src/include/lib/init.h

@@ -3,7 +3,7 @@
 #include <ultra64.h>
 
 void init(void);
-s32 osGetMemSize(void);
+s32 initGetMemSize(void);
 void *allocateStack(s32 threadid, s32 size);
 void mainproc(void *arg);
 

src/include/lib/lib_16110.h

@@ -38,9 +38,5 @@ u32 func00017614(void);
 u32 func00017a78(void);
 u32 func00017c2c(void);
 u32 func00017cbc(void);
-u32 func00017ce0(void);
-u32 func00017dc4(void);
-bool func00017e30(s32 portalnum, struct coord *arg1, struct coord *arg2);
-u32 func00018148(void);
 
 #endif

src/include/lib/lib_17ce0.h

@@ -0,0 +1,12 @@
+#ifndef _IN_LIB_LIB_17CE0_H
+#define _IN_LIB_LIB_17CE0_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+u32 func00017ce0(void);
+u32 func00017dc4(void);
+bool func00017e30(s32 portalnum, struct coord *arg1, struct coord *arg2);
+u32 func00018148(void);
+
+#endif

src/include/lib/lib_513b0.h

@@ -5,6 +5,5 @@
 #include "types.h"
 
 s32 func000513b0(struct var800a3180 *arg0, bool arg1, u16 arg2, char *arg3, u16 arg4);
-u32 func00051778(void);
 
 #endif

src/include/lib/lib_51570.h

@@ -0,0 +1,9 @@
+#ifndef _IN_LIB_LIB_51570_H
+#define _IN_LIB_LIB_51570_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+u32 func00051778(void);
+
+#endif

src/include/types.h

@@ -5121,7 +5121,9 @@ struct var800a2380 {
 	/*0x2be*/ u8 unk2be;
 	/*0x2c0*/ void *unk2c0; // pointer to something with len 0x708
 	/*0x2c4*/ u8 *unk2c4; // len 4096
+#if VERSION >= VERSION_NTSC_1_0
 	/*0x2c8*/ u32 unk2c8;
+#endif
 };
 
 struct gecreditsdata {