Header cleanup and some renames (#616)

* Place macros for addr conversions

* dl renames

* fixes

* changes ok

* Delete types.h

* move enums

src/racing/actors.c

@@ -1,12 +1,12 @@
 #include <ultra64.h>
 #include <macros.h>
 #include <PR/os.h>
+#include <mk64.h>
 #include <sounds.h>
 #include <common_structs.h>
 #include <actor_types.h>
 #include <defines.h>
 #include <PR/gbi.h>
-#include <types.h>
 
 #include "code_800029B0.h"
 #include "main.h"

src/racing/actors.h

@@ -1,8 +1,9 @@
 #ifndef ACTORS_H
 #define ACTORS_H
 
-#include "types.h"
 #include "actor_types.h"
+#include "code_800029B0.h"
+#include "camera.h"
 
 #define END_OF_SPAWN_DATA -0x8000
 

src/racing/math_util.c

@@ -421,8 +421,10 @@ void func_802B5D30(s16 arg0, s16 arg1, s32 arg2) {
     func_802B5D64(0x9000000, arg0, arg1, arg2);
 }
 
-void func_802B5D64(uintptr_t arg0, s16 arg1, s16 arg2, s32 arg3) {
-    UNUSED s32 pad[3];
+void func_802B5D64(uintptr_t addr, s16 arg1, s16 arg2, s32 arg3) {
+    u32 segment = SEGMENT_NUMBER2(addr);
+    u32 offset = SEGMENT_OFFSET(addr);
+    UNUSED s32 pad;
     f32 sp48;
     f32 sp44;
     f32 sp40;
@@ -432,7 +434,7 @@ void func_802B5D64(uintptr_t arg0, s16 arg1, s16 arg2, s32 arg3) {
     s8 sp2C[3];
     Lights1 *var_s0;
 
-    var_s0 = (Lights1 *) VIRTUAL_TO_PHYSICAL2(gSegmentTable[arg0 >> 0x18] + (arg0 & 0xFFFFFF));
+    var_s0 = (Lights1 *) VIRTUAL_TO_PHYSICAL2(gSegmentTable[segment] + offset);
     sp48 = sins(arg2);
     sp44 = coss(arg2);
     sp40 = sins(arg1);
@@ -1151,15 +1153,17 @@ f32 is_within_render_distance(Vec3f cameraPos, Vec3f objectPos, u16 orientationY
 
 // No idea if arg1 is actually a Mat4 or not, but since this function is unused
 // its impossible to know with certainty either way, very close of func_802B5D64
-UNUSED void func_802B8414(uintptr_t arg0, Mat4 arg1, s16 arg2, s16 arg3, s32 arg4) {
-    UNUSED s32 pad[3];
+UNUSED void func_802B8414(uintptr_t addr, Mat4 arg1, s16 arg2, s16 arg3, s32 arg4) {
+    u32 segment = SEGMENT_NUMBER2(addr);
+    u32 offset = SEGMENT_OFFSET(addr);
+    UNUSED s32 pad;
     Vec3f sp40;
     s8 sp3C[3];
     s32 var_v0;
     UNUSED s32 pad2[3];
     Lights1 *var_s0;
 
-    var_s0 = (Lights1 *) VIRTUAL_TO_PHYSICAL2(gSegmentTable[arg0 >> 0x18] + (arg0 & 0xFFFFFF));
+    var_s0 = (Lights1 *) VIRTUAL_TO_PHYSICAL2(gSegmentTable[segment] + offset);
     sins(arg3);
     coss(arg3);
     sins(arg2);

src/racing/math_util.h

@@ -3,7 +3,6 @@
 
 #include <PR/ultratypes.h>
 
-#include "types.h"
 
 //#define sins(x) gSineTable[(u16) (x) >> 4]
 //#define coss(x) gCosineTable[(u16) (x) >> 4]

src/racing/memory.c

@@ -1,7 +1,6 @@
 #include <ultra64.h>
 #include <PR/ultratypes.h>
 #include <macros.h>
-#include <types.h>
 #include <common_structs.h>
 #include <segments.h>
 #include <decode.h>

src/racing/memory.h

@@ -1,7 +1,6 @@
 #ifndef MEMORY_H
 #define MEMORY_H
 
-#include "types.h"
 
 struct MainPoolBlock {
     struct MainPoolBlock *prev;

src/racing/race_logic.c

@@ -1,8 +1,7 @@
 #include <ultra64.h>
 #include <macros.h>
-#include <types.h>
+#include <mk64.h>
 #include <common_structs.h>
-#include <config.h>
 #include <defines.h>
 #include <sounds.h>
 #include "camera.h"

src/racing/render_courses.c

@@ -1,8 +1,8 @@
 #include <ultra64.h>
 #include <macros.h>
+#include <mk64.h>
 #include <common_structs.h>
 #include <defines.h>
-#include <types.h>
 #include <course.h>
 
 #include "render_courses.h"

src/racing/render_courses.h

@@ -1,6 +1,8 @@
 #ifndef RENDER_COURSES_H
 #define RENDER_COURSES_H
 
+#include "code_800029B0.h"
+
 void func_8029122C(struct UnkStruct_800DC5EC*, s32);
 s32  func_80290C20(Camera*);
 void parse_course_displaylists(uintptr_t);

src/racing/skybox_and_splitscreen.c

@@ -1,8 +1,7 @@
 #include <ultra64.h>
 #include <macros.h>
 #include <PR/gbi.h>
-#include <types.h>
-#include <config.h>
+#include <mk64.h>
 
 #include "skybox_and_splitscreen.h"
 #include "code_800029B0.h"

src/racing/skybox_and_splitscreen.h

@@ -2,6 +2,7 @@
 #define SKYBOX_AND_SPLITSCREEN_H
 
 #include <PR/gbi.h>
+#include "code_800029B0.h"
 
 #define G_CLEAR_ALL_MODES 0xFFFFFFFF