Fixed more errors, we are rendering the logo, Yay

7 files changed, 35 insertions, 35 deletions

diff --git a/courses/koopa_troopa_beach/course_data.c b/courses/koopa_troopa_beach/course_data.c
index bf7843779..90b502ffc 100644
--- a/courses/koopa_troopa_beach/course_data.c
+++ b/courses/koopa_troopa_beach/course_data.c
@@ -8099,7 +8099,7 @@ u8 d_course_koopa_troopa_beach_crab_frames[][4096] = {
 
 // 0x06014828
 // animations? lights?
-u32 d_course_koopa_troopa_beach_unk_data1[] = {
+uintptr_t d_course_koopa_troopa_beach_unk_data1[] = {
     0x00000000,
     0x00000001,
     0x00000000,
@@ -8107,7 +8107,7 @@ u32 d_course_koopa_troopa_beach_unk_data1[] = {
 };
 
 // 0x06014838
-s16 d_course_koopa_troopa_beach_unk_data2[] = {
+uintptr_t d_course_koopa_troopa_beach_unk_data2[] = {
     0x0000, 0x0000,
     0x0000, 0x0001,
     0x0002, 0x0003,
@@ -8539,7 +8539,7 @@ Gfx d_course_koopa_troopa_beach_dl_16990[] =
 };
 
 //! 0x60169b
-u32 d_course_koopa_troopa_beach_unk4[] = {
+uintptr_t d_course_koopa_troopa_beach_unk4[] = {
     0x00000001,
     0x00000002,
 
@@ -8557,7 +8557,7 @@ u32 d_course_koopa_troopa_beach_unk4[] = {
     0x00000000,
     0x00000007,
     0x00000000,
-    (u32) d_course_koopa_troopa_beach_dl_16630,
+    (uintptr_t) d_course_koopa_troopa_beach_dl_16630,
     0x00000000,
     0x00000000,
     0x00000000,
@@ -8579,7 +8579,7 @@ u32 d_course_koopa_troopa_beach_unk4[] = {
     0x00000000,
     0x00000007,
     0x00000000,
-    (u32) d_course_koopa_troopa_beach_dl_16850,
+    (uintptr_t) d_course_koopa_troopa_beach_dl_16850,
     0x00000000,
     0x00000000,
     0x00000000,
@@ -8590,7 +8590,7 @@ u32 d_course_koopa_troopa_beach_unk4[] = {
     0x00000000,
     0x00000007,
     0x00000000,
-    (u32) d_course_koopa_troopa_beach_dl_168F0,
+    (uintptr_t) d_course_koopa_troopa_beach_dl_168F0,
     0x00000024,
     0x00000000,
     0x00000000,
@@ -8601,7 +8601,7 @@ u32 d_course_koopa_troopa_beach_unk4[] = {
     0x00000000,
     0x00000007,
     0x00000000,
-    (u32) d_course_koopa_troopa_beach_dl_16990,
+    (uintptr_t) d_course_koopa_troopa_beach_dl_16990,
     0x00000019,
     0x00000000,
     0x00000000,
@@ -8629,7 +8629,7 @@ u32 d_course_koopa_troopa_beach_unk4[] = {
     0x00000000,
     0x00000007,
     0x00000000,
-    (u32) d_course_koopa_troopa_beach_dl_16850,
+    (uintptr_t) d_course_koopa_troopa_beach_dl_16850,
     0x00000000,
     0x00000000,
     0x00000000,
@@ -8640,7 +8640,7 @@ u32 d_course_koopa_troopa_beach_unk4[] = {
     0x00000000,
     0x00000007,
     0x00000000,
-    (u32) d_course_koopa_troopa_beach_dl_168F0,
+    (uintptr_t) d_course_koopa_troopa_beach_dl_168F0,
     0x00000024,
     0x00000000,
     0x00000000,
@@ -8651,7 +8651,7 @@ u32 d_course_koopa_troopa_beach_unk4[] = {
     0x00000000,
     0x00000007,
     0x00000000,
-    (u32) d_course_koopa_troopa_beach_dl_16990,
+    (uintptr_t) d_course_koopa_troopa_beach_dl_16990,
     0x00000019,
     0x00000000,
     0x00000000,
@@ -8684,7 +8684,7 @@ animation_type_2 *d_course_koopa_troopa_beach_unk_data5[] = {
 };
 
 // No idea what this stuff is
-u32 d_course_koopa_troopa_beach_unk_data6[] = {
+uintptr_t d_course_koopa_troopa_beach_unk_data6[] = {
     0x00000000,
     0x00000000,
     0x00000001,
diff --git a/courses/koopa_troopa_beach/course_data.h b/courses/koopa_troopa_beach/course_data.h
index e6e41c3e6..8fee5c3b3 100644
--- a/courses/koopa_troopa_beach/course_data.h
+++ b/courses/koopa_troopa_beach/course_data.h
@@ -312,7 +312,7 @@ extern TrackWaypoint d_course_koopa_troopa_beach_track_waypoints[];
 extern TrackWaypoint d_course_koopa_troopa_beach_track_waypoints_2[];
 extern u8 d_course_koopa_troopa_beach_crab_tlut[];
 extern u8 d_course_koopa_troopa_beach_crab_frames[][4096];
-extern u32 d_course_koopa_troopa_beach_unk_data1[];
+extern uintptr_t d_course_koopa_troopa_beach_unk_data1[];
 extern s16 d_course_koopa_troopa_beach_unk_data2[];
 extern animation_type_3_triplet d_course_koopa_troopa_beach_unk_data3[];
 extern animation_type_2 d_course_koopa_troopa_beach_unk_data4;
@@ -331,9 +331,9 @@ extern Vtx d_course_koopa_troopa_beach_bird_wing_2_model[];
 extern Gfx d_course_koopa_troopa_beach_dl_168F0[];
 extern Vtx d_course_koopa_troopa_beach_bird_wing_3_model[];
 extern Gfx d_course_koopa_troopa_beach_dl_16990[];
-extern u32 d_course_koopa_troopa_beach_unk4[];
+extern uintptr_t d_course_koopa_troopa_beach_unk4[];
 extern animation_type_2 *d_course_koopa_troopa_beach_unk_data5[];
-extern u32 d_course_koopa_troopa_beach_unk_data6[];
+extern uintptr_t d_course_koopa_troopa_beach_unk_data6[];
 extern Lights1 d_course_koopa_troopa_beach_light2;
 extern Vtx d_course_koopa_troopa_beach_tree_model[];
 extern Vtx d_course_koopa_troopa_beach_unknown_model4[];
diff --git a/courses/rainbow_road/course_data.c b/courses/rainbow_road/course_data.c
index fcf90217c..96831f8fd 100644
--- a/courses/rainbow_road/course_data.c
+++ b/courses/rainbow_road/course_data.c
@@ -3529,7 +3529,7 @@ animation_type_2 *d_rainbow_road_unk3[] = {
 };
 
 // 0x06016110
-u32 d_rainbow_road_unk4[] = {
+uintptr_t d_rainbow_road_unk4[] = {
     0x00000001,
     0x00000002,
 
@@ -3547,7 +3547,7 @@ u32 d_rainbow_road_unk4[] = {
     0x00000000,
     0x00000007,
     0x00000000,
-    (u32) d_course_rainbow_road_dl_15550,
+    (uintptr_t) d_course_rainbow_road_dl_15550,
     0x00000000,
     0x00000000,
     0x00000000,
@@ -3555,7 +3555,7 @@ u32 d_rainbow_road_unk4[] = {
     0x00000000,
     0x00000007,
     0x00000000,
-    (u32) d_course_rainbow_road_dl_151A8,
+    (uintptr_t) d_course_rainbow_road_dl_151A8,
     0x00000000,
     0x00000000,
     0x00000000,
@@ -3577,7 +3577,7 @@ u32 d_rainbow_road_unk4[] = {
     0x00000000,
     0x00000007,
     0x00000000,
-    (u32) d_course_rainbow_road_dl_15C68,
+    (uintptr_t) d_course_rainbow_road_dl_15C68,
     0x00000000,
     0x00000000,
     0x00000000,
@@ -3585,7 +3585,7 @@ u32 d_rainbow_road_unk4[] = {
     0x00000000,
     0x00000007,
     0x00000000,
-    (u32) d_course_rainbow_road_dl_158C0,
+    (uintptr_t) d_course_rainbow_road_dl_158C0,
     0x00000000,
     0x00000000,
     0x00000000,
@@ -3593,7 +3593,7 @@ u32 d_rainbow_road_unk4[] = {
     0x00000000,
     0x00000007,
     0x00000000,
-    (u32) d_course_rainbow_road_dl_15F18,
+    (uintptr_t) d_course_rainbow_road_dl_15F18,
     0x00000000,
     0x00000000,
     0x00000000,
@@ -3609,7 +3609,7 @@ u32 d_rainbow_road_unk4[] = {
 };
 
 // No idea what this stuff is
-u32 d_rainbow_road_unk5[] = {
+uintptr_t d_rainbow_road_unk5[] = {
     0x00000000,
     0x00000000,
     0x00000002,
diff --git a/courses/sherbet_land/course_data.c b/courses/sherbet_land/course_data.c
index 1f6318cf9..eb0cf4104 100644
--- a/courses/sherbet_land/course_data.c
+++ b/courses/sherbet_land/course_data.c
@@ -4288,7 +4288,7 @@ Gfx d_course_sherbet_land_dl_8E00[] =
 };
 
 // 0x06008EB0
-u32 d_course_sherbet_land_unk_data1[] = {
+uintptr_t d_course_sherbet_land_unk_data1[] = {
     0x00000001,
     0x00000002,
 
@@ -5209,7 +5209,7 @@ animation_type_2 *d_course_sherbet_land_unk_data11[] = {
 };
 
 // No idea what this stuff is
-u32 d_course_sherbet_land_unk_data12[] = {
+uintptr_t d_course_sherbet_land_unk_data12[] = {
     0x00000000,
     0x00000000,
     0x00000001,
diff --git a/courses/sherbet_land/course_data.h b/courses/sherbet_land/course_data.h
index 6c1c6d9dc..1421ae7c9 100644
--- a/courses/sherbet_land/course_data.h
+++ b/courses/sherbet_land/course_data.h
@@ -194,7 +194,7 @@ extern Vtx d_course_sherbet_land_penguin_body_model1[];
 extern Vtx d_course_sherbet_land_penguin_body_model2[];
 extern Gfx d_course_sherbet_land_dl_8D00[];
 extern Gfx d_course_sherbet_land_dl_8E00[];
-extern u32 d_course_sherbet_land_unk_data1[];
+extern uintptr_t d_course_sherbet_land_unk_data1[];
 extern s16 d_course_sherbet_land_unk_data2[];
 extern animation_type_3_triplet d_course_sherbet_land_unk_data3[];
 extern animation_type_2 d_course_sherbet_land_unk_data4;
@@ -205,7 +205,7 @@ extern s16 d_course_sherbet_land_unk_data8[];
 extern animation_type_3_triplet d_course_sherbet_land_unk_data9[];
 extern animation_type_2 d_course_sherbet_land_unk_data10;
 extern animation_type_2 *d_course_sherbet_land_unk_data11[];
-extern u32 d_course_sherbet_land_unk_data12[];
+extern uintptr_t d_course_sherbet_land_unk_data12[];
 extern Gfx d_course_sherbet_land_dl_9AE8[];
 extern struct ActorSpawnData d_course_sherbet_land_item_box_spawns[];
 extern TrackSections d_course_sherbet_land_addr[];
diff --git a/courses/yoshi_valley/course_data.c b/courses/yoshi_valley/course_data.c
index 7ef8ac917..d18007a68 100644
--- a/courses/yoshi_valley/course_data.c
+++ b/courses/yoshi_valley/course_data.c
@@ -10868,7 +10868,7 @@ animation_type_2 *d_course_yoshi_valley_unk4[] = {
 };
 
 //! 0x06014798
-u32 d_course_yoshi_valley_unk5[] = {
+uintptr_t d_course_yoshi_valley_unk5[] = {
     0x00000001,
     0x00000002,
 
@@ -10886,7 +10886,7 @@ u32 d_course_yoshi_valley_unk5[] = {
     0x00000000,
     0x00000007,
     0x00000000,
-    (u32) d_course_yoshi_valley_dl_142C0,
+    (uintptr_t) d_course_yoshi_valley_dl_142C0,
     0x00000000,
     0x00000000,
     0x00000000,
@@ -10908,7 +10908,7 @@ u32 d_course_yoshi_valley_unk5[] = {
     0x00000000,
     0x00000007,
     0x00000000,
-    (u32) d_course_yoshi_valley_dl_143C8,
+    (uintptr_t) d_course_yoshi_valley_dl_143C8,
     0x00000000,
     0x00000000,
     0x00000000,
@@ -10919,7 +10919,7 @@ u32 d_course_yoshi_valley_unk5[] = {
     0x00000000,
     0x00000007,
     0x00000000,
-    (u32) d_course_yoshi_valley_dl_144A8,
+    (uintptr_t) d_course_yoshi_valley_dl_144A8,
     0x000001cc,
     0x00000000,
     0x00000000,
@@ -10930,7 +10930,7 @@ u32 d_course_yoshi_valley_unk5[] = {
     0x00000000,
     0x00000007,
     0x00000000,
-    (u32) d_course_yoshi_valley_dl_14500,
+    (uintptr_t) d_course_yoshi_valley_dl_14500,
     0x000001cc,
     0x00000000,
     0x00000000,
@@ -10941,7 +10941,7 @@ u32 d_course_yoshi_valley_unk5[] = {
     0x00000000,
     0x00000007,
     0x00000000,
-    (u32) d_course_yoshi_valley_dl_14558,
+    (uintptr_t) d_course_yoshi_valley_dl_14558,
     0x00000158,
     0x00000000,
     0x00000000,
@@ -10952,7 +10952,7 @@ u32 d_course_yoshi_valley_unk5[] = {
     0x00000000,
     0x00000007,
     0x00000000,
-    (u32) d_course_yoshi_valley_dl_145D0,
+    (uintptr_t) d_course_yoshi_valley_dl_145D0,
     0x00000120,
     0x00000000,
     0x00000000,
@@ -10986,7 +10986,7 @@ u32 d_course_yoshi_valley_unk5[] = {
 };
 
 // No idea what this stuff is
-u32 d_course_yoshi_valley_unk6[] = {
+uintptr_t d_course_yoshi_valley_unk6[] = {
     0x00000000,
     0x00000001,
 };
diff --git a/courses/yoshi_valley/course_data.h b/courses/yoshi_valley/course_data.h
index 299e9ca8b..92823f67f 100644
--- a/courses/yoshi_valley/course_data.h
+++ b/courses/yoshi_valley/course_data.h
@@ -165,8 +165,8 @@ extern s16 d_course_yoshi_valley_unk1[];
 extern animation_type_3_triplet d_course_yoshi_valley_unk2[];
 extern animation_type_2 d_course_yoshi_valley_unk3;
 extern animation_type_2 *d_course_yoshi_valley_unk4[];
-extern u32 d_course_yoshi_valley_unk5[];
-extern u32 d_course_yoshi_valley_unk6[];
+extern uintptr_t d_course_yoshi_valley_unk5[];
+extern uintptr_t d_course_yoshi_valley_unk6[];
 extern u8 d_course_yoshi_valley_hedgehog_tlut[];
 extern u8 d_course_yoshi_valley_hedgehog[];
 extern Vtx d_course_yoshi_valley_tree_model[];