Merge pull request #264 from DavidSM64/gen_ctx

Improved generate_ctx.sh

generate_ctx.sh

@@ -1,6 +1,3 @@
 #!/bin/bash
+python3 tools/python/m2ctx.py
 
-find include/ src/ -type f -name "*.h" | sed -e 's/.*/#include "\0"/' > ctx_includes.c
-python3 tools/python/m2ctx.py ctx_includes.c
-
-echo '#define NULL (void *)0' >> ctx.c

src/racer.c

@@ -3390,7 +3390,7 @@ void update_camera_finish_race(UNUSED f32 updateRate, Object *obj, Object_Racer
  * Stops the camera in place when set, while still pointing in the direction of the player.
  * Used when entering doors.
  */
-void update_camera_fixed(f32 updateRate, struct Object *obj, struct Object_Racer *racer) {
+void update_camera_fixed(f32 updateRate, Object *obj, Object_Racer *racer) {
     s32 delta;
     f32 xDiff;
     f32 zDiff;

src/racer.h

@@ -251,7 +251,7 @@ void update_camera_loop(f32 updateRate, Object *obj, Object_Racer *racer);
 void update_camera_car(f32 updateRate, Object *obj, Object_Racer *racer);
 void update_camera_finish_challenge(f32 arg0, Object *obj, Object_Racer *racer);
 void update_camera_finish_race(f32 arg0, Object *obj, Object_Racer *racer);
-void update_camera_fixed(f32 arg0, struct Object *obj, Object_Racer *racer);
+void update_camera_fixed(f32 arg0, Object *obj, Object_Racer *racer);
 void func_800521C4(Object *obj, Object_Racer *racer, s32 arg2);
 void func_80050754(Object *obj, Object_Racer *racer, f32 divisor);
 void obj_init_racer(Object *obj, LevelObjectEntry_CharacterFlag *racer);

src/unknown_008C40.c

@@ -141,7 +141,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_005740/func_800095E8.s")
 #if 0
 // I think this function is used to update the world position of any sound associated with the given soundmask.
 //This matches, but it breaks update_player_racer
-void update_spatial_audio_position(Vec3f *arg0, f32 arg1, f32 arg2, f32 arg3) {
+void update_spatial_audio_position(s32 arg0, f32 arg1, f32 arg2, f32 arg3) {
     arg0->x = arg1;
     arg0->y = arg2;
     arg0->z = arg3;