summaryrefslogtreecommitdiff
path: root/courses
diff options
context:
space:
mode:
authorMegaMech <MegaMech@users.noreply.github.com>2024-08-14 14:17:45 -0600
committerGitHub <noreply@github.com>2024-08-14 14:17:45 -0600
commit258892c6c9370a14d86140c7a8403a4b24be9f1d (patch)
tree7fc31a01db289cdccd258448293f45f9092c184a /courses
parent33154e1d32a6663bb87ca786a7b9abbf949351be (diff)
Fix Jungle (#52)
* castle and stadium * castle * boardwalk & snowland * turnpike * jungle --------- Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>
Diffstat (limited to 'courses')
-rw-r--r--courses/all_course_data.h1
-rw-r--r--courses/all_course_model.h2
-rw-r--r--courses/all_course_offsets.h3
-rw-r--r--courses/all_course_packed.h3
-rw-r--r--courses/dks_jungle_parkway/course_offsets.c104
5 files changed, 56 insertions, 57 deletions
diff --git a/courses/all_course_data.h b/courses/all_course_data.h
index 65f9b57a2..85981f69d 100644
--- a/courses/all_course_data.h
+++ b/courses/all_course_data.h
@@ -8,6 +8,7 @@
#include "courses/yoshi_valley/course_data.h"
#include "courses/sherbet_land/course_data.h"
+#include <assets/dks_jungle_parkway_data.h>
#include <assets/toads_turnpike_data.h>
#include <assets/banshee_boardwalk_data.h>
#include <assets/mario_raceway_data.h>
diff --git a/courses/all_course_model.h b/courses/all_course_model.h
index a711ba587..24b7561c7 100644
--- a/courses/all_course_model.h
+++ b/courses/all_course_model.h
@@ -26,9 +26,9 @@
#include <assets/block_fort_vertices.h>
#include <assets/double_deck_vertices.h>
#include <assets/banshee_boardwalk_vertices.h>
+#include <assets/dks_jungle_parkway_vertices.h>
extern CourseVtx d_course_koopa_troopa_beach_vertex[];
-extern CourseVtx d_course_dks_jungle_parkway_vertex[];
extern CourseVtx d_course_rainbow_road_vertex[];
extern CourseVtx d_course_yoshi_valley_vertex[];
extern CourseVtx d_course_sherbet_land_vertex[];
diff --git a/courses/all_course_offsets.h b/courses/all_course_offsets.h
index 4dace25c3..b6a2e2a81 100644
--- a/courses/all_course_offsets.h
+++ b/courses/all_course_offsets.h
@@ -16,7 +16,7 @@ extern const char *royal_raceway_dls[];
extern Gfx *sherbet_land_dls[];
extern Gfx *sherbet_land_dls_2[];
extern Gfx *wario_stadium_dls[];
-extern const char *d_course_dks_jungle_parkway_unknown_dl_list[];
+extern const char *dks_jungle_parkway_dls[];
extern Gfx toads_turnpike_dl_0[];
extern Gfx toads_turnpike_dl_1[];
@@ -36,7 +36,6 @@ extern course_texture big_donut_textures[];
extern course_texture block_fort_textures[];
extern course_texture bowsers_castle_textures[];
extern course_texture choco_mountain_textures[];
-extern course_texture dks_jungle_parkway_textures[];
extern course_texture double_deck_textures[];
extern course_texture frappe_snowland_textures[];
extern course_texture kalimari_desert_textures[];
diff --git a/courses/all_course_packed.h b/courses/all_course_packed.h
index c770721cb..7cdb0cb56 100644
--- a/courses/all_course_packed.h
+++ b/courses/all_course_packed.h
@@ -8,13 +8,12 @@
* incorrect
**/
-#include "courses/mario_raceway/course_displaylists.h"
#include "courses/koopa_troopa_beach/course_displaylists.h"
-#include "courses/luigi_raceway/course_displaylists.h"
#include "courses/rainbow_road/course_displaylists.h"
#include "courses/yoshi_valley/course_displaylists.h"
#include "courses/sherbet_land/course_displaylists.h"
+#include <assets/dks_jungle_parkway_displaylists.h>
#include <assets/toads_turnpike_displaylists.h>
#include <assets/banshee_boardwalk_displaylists.h>
#include <assets/mario_raceway_displaylists.h>
diff --git a/courses/dks_jungle_parkway/course_offsets.c b/courses/dks_jungle_parkway/course_offsets.c
index e7e37f206..d7ec97f41 100644
--- a/courses/dks_jungle_parkway/course_offsets.c
+++ b/courses/dks_jungle_parkway/course_offsets.c
@@ -3,58 +3,58 @@
#include <assets/dks_jungle_parkway_data.h>
const course_texture dks_jungle_parkway_textures[] = {
- {gTexture648508, 0x01FE, 0x1000, 0x0},
- {gTexture6684F8, 0x010D, 0x0800, 0x0},
- {gTextureWoodBridgeSlats, 0x0DAB, 0x1000, 0x0},
- {gTexture654460, 0x0B12, 0x1000, 0x0},
- {gTexture654F74, 0x0A24, 0x1000, 0x0},
- {gTexture655998, 0x059F, 0x0800, 0x0},
- {gTexture655F38, 0x0BB9, 0x1000, 0x0},
- {gTexture656AF4, 0x0AD3, 0x1000, 0x0},
- {gTexture6575C8, 0x0DA7, 0x1000, 0x0},
- {gTexture658370, 0x0DBA, 0x1000, 0x0},
- {gTexture65912C, 0x0DBC, 0x1000, 0x0},
- {gTexture659EE8, 0x0EF5, 0x1000, 0x0},
- {gTexture65ADE0, 0x0D5A, 0x1000, 0x0},
- {gTexture65BB3C, 0x0D9E, 0x1000, 0x0},
- {gTexture65C8DC, 0x0CF5, 0x1000, 0x0},
- {gTexture65D5D4, 0x0D18, 0x1000, 0x0},
- {gTexture65E2EC, 0x02B0, 0x0800, 0x0},
- {gTexture65EAEC, 0x034A, 0x0800, 0x0},
- {gTexture65E59C, 0x054F, 0x1000, 0x0},
- {gTexture65EE38, 0x0CDE, 0x1000, 0x0},
- {gTexture65FB18, 0x03EE, 0x0800, 0x0},
- {gTextureSignPinkArrow, 0x0198, 0x0800, 0x0},
- {gTextureWaves0, 0x04D0, 0x0800, 0x0},
- {gTexture683844, 0x0655, 0x0800, 0x0},
- {0x00000000, 0x0000, 0x0000, 0x0},
+ {gTexture648508, 0x01FE, 0x1000, 0x0},
+ {gTexture6684F8, 0x010D, 0x0800, 0x0},
+ {gTextureWoodBridgeSlats, 0x0DAB, 0x1000, 0x0},
+ {gTexture654460, 0x0B12, 0x1000, 0x0},
+ {gTexture654F74, 0x0A24, 0x1000, 0x0},
+ {gTexture655998, 0x059F, 0x0800, 0x0},
+ {gTexture655F38, 0x0BB9, 0x1000, 0x0},
+ {gTexture656AF4, 0x0AD3, 0x1000, 0x0},
+ {gTexture6575C8, 0x0DA7, 0x1000, 0x0},
+ {gTexture658370, 0x0DBA, 0x1000, 0x0},
+ {gTexture65912C, 0x0DBC, 0x1000, 0x0},
+ {gTexture659EE8, 0x0EF5, 0x1000, 0x0},
+ {gTexture65ADE0, 0x0D5A, 0x1000, 0x0},
+ {gTexture65BB3C, 0x0D9E, 0x1000, 0x0},
+ {gTexture65C8DC, 0x0CF5, 0x1000, 0x0},
+ {gTexture65D5D4, 0x0D18, 0x1000, 0x0},
+ {gTexture65E2EC, 0x02B0, 0x0800, 0x0},
+ {gTexture65EAEC, 0x034A, 0x0800, 0x0},
+ {gTexture65E59C, 0x054F, 0x1000, 0x0},
+ {gTexture65EE38, 0x0CDE, 0x1000, 0x0},
+ {gTexture65FB18, 0x03EE, 0x0800, 0x0},
+ {gTextureSignPinkArrow, 0x0198, 0x0800, 0x0},
+ {gTextureWaves0, 0x04D0, 0x0800, 0x0},
+ {gTexture683844, 0x0655, 0x0800, 0x0},
+ {0x00000000, 0x0000, 0x0000, 0x0},
};
-const char *d_course_dks_jungle_parkway_unknown_dl_list[] = {
- d_course_dks_jungle_parkway_dl_20, d_course_dks_jungle_parkway_dl_210, d_course_dks_jungle_parkway_dl_180, d_course_dks_jungle_parkway_dl_310,
- d_course_dks_jungle_parkway_dl_400, d_course_dks_jungle_parkway_dl_628, d_course_dks_jungle_parkway_dl_560, d_course_dks_jungle_parkway_dl_750,
- d_course_dks_jungle_parkway_dl_888, d_course_dks_jungle_parkway_dl_B00, d_course_dks_jungle_parkway_dl_A10, d_course_dks_jungle_parkway_dl_C30,
- d_course_dks_jungle_parkway_dl_D98, d_course_dks_jungle_parkway_dl_1028, d_course_dks_jungle_parkway_dl_EF0, d_course_dks_jungle_parkway_dl_1160,
- d_course_dks_jungle_parkway_dl_12E8, d_course_dks_jungle_parkway_dl_15E0, d_course_dks_jungle_parkway_dl_1478, d_course_dks_jungle_parkway_dl_1718,
- d_course_dks_jungle_parkway_dl_1890, d_course_dks_jungle_parkway_dl_1B20, d_course_dks_jungle_parkway_dl_1A00, d_course_dks_jungle_parkway_dl_1C20,
- d_course_dks_jungle_parkway_dl_1DB8, d_course_dks_jungle_parkway_dl_1FD8, d_course_dks_jungle_parkway_dl_1F20, d_course_dks_jungle_parkway_dl_20A0,
- d_course_dks_jungle_parkway_dl_2200, d_course_dks_jungle_parkway_dl_2398, d_course_dks_jungle_parkway_dl_2328, d_course_dks_jungle_parkway_dl_2480,
- d_course_dks_jungle_parkway_dl_2558, d_course_dks_jungle_parkway_dl_2810, d_course_dks_jungle_parkway_dl_2728, d_course_dks_jungle_parkway_dl_2928,
- d_course_dks_jungle_parkway_dl_2AC0, d_course_dks_jungle_parkway_dl_2D70, d_course_dks_jungle_parkway_dl_2B88, d_course_dks_jungle_parkway_dl_2E30,
- d_course_dks_jungle_parkway_dl_3010, d_course_dks_jungle_parkway_dl_3338, d_course_dks_jungle_parkway_dl_3100, d_course_dks_jungle_parkway_dl_3498,
- d_course_dks_jungle_parkway_dl_36A0, d_course_dks_jungle_parkway_dl_3988, d_course_dks_jungle_parkway_dl_3790, d_course_dks_jungle_parkway_dl_3B28,
- d_course_dks_jungle_parkway_dl_3CC8, d_course_dks_jungle_parkway_dl_3F78, d_course_dks_jungle_parkway_dl_3D88, d_course_dks_jungle_parkway_dl_4100,
- d_course_dks_jungle_parkway_dl_4250, d_course_dks_jungle_parkway_dl_4470, d_course_dks_jungle_parkway_dl_42F8, d_course_dks_jungle_parkway_dl_45C0,
- d_course_dks_jungle_parkway_dl_4658, d_course_dks_jungle_parkway_dl_4848, d_course_dks_jungle_parkway_dl_4710, d_course_dks_jungle_parkway_dl_4980,
- d_course_dks_jungle_parkway_dl_4A38, d_course_dks_jungle_parkway_dl_4C18, d_course_dks_jungle_parkway_dl_4AE8, d_course_dks_jungle_parkway_dl_4D10,
- d_course_dks_jungle_parkway_dl_4E10, d_course_dks_jungle_parkway_dl_51B0, d_course_dks_jungle_parkway_dl_4FB0, d_course_dks_jungle_parkway_dl_53F8,
- d_course_dks_jungle_parkway_dl_5580, d_course_dks_jungle_parkway_dl_57A0, d_course_dks_jungle_parkway_dl_5650, d_course_dks_jungle_parkway_dl_5920,
- d_course_dks_jungle_parkway_dl_59B8, d_course_dks_jungle_parkway_dl_5B90, d_course_dks_jungle_parkway_dl_5A50, d_course_dks_jungle_parkway_dl_5CB0,
- d_course_dks_jungle_parkway_dl_5D70, d_course_dks_jungle_parkway_dl_5EC8, d_course_dks_jungle_parkway_dl_5DF8, d_course_dks_jungle_parkway_dl_5FA8,
- d_course_dks_jungle_parkway_dl_6048, d_course_dks_jungle_parkway_dl_62D0, d_course_dks_jungle_parkway_dl_6178, d_course_dks_jungle_parkway_dl_6468,
- d_course_dks_jungle_parkway_dl_6588, d_course_dks_jungle_parkway_dl_6740, d_course_dks_jungle_parkway_dl_6680, d_course_dks_jungle_parkway_dl_67C0,
- d_course_dks_jungle_parkway_dl_68D0, d_course_dks_jungle_parkway_dl_6A70, d_course_dks_jungle_parkway_dl_69C8, d_course_dks_jungle_parkway_dl_6AD8,
- d_course_dks_jungle_parkway_dl_6BE8, d_course_dks_jungle_parkway_dl_6CB8, d_course_dks_jungle_parkway_dl_6C70, d_course_dks_jungle_parkway_dl_6D10,
- d_course_dks_jungle_parkway_dl_6D88, d_course_dks_jungle_parkway_dl_6E48, d_course_dks_jungle_parkway_dl_6E00, d_course_dks_jungle_parkway_dl_6EB0,
- d_course_dks_jungle_parkway_dl_6F10, d_course_dks_jungle_parkway_dl_7080, d_course_dks_jungle_parkway_dl_7008, d_course_dks_jungle_parkway_dl_7108,
+const Gfx *dks_jungle_parkway_dls[] = {
+ d_course_dks_jungle_parkway_dl_20, d_course_dks_jungle_parkway_dl_210, d_course_dks_jungle_parkway_dl_180, d_course_dks_jungle_parkway_dl_310,
+ d_course_dks_jungle_parkway_dl_400, d_course_dks_jungle_parkway_dl_628, d_course_dks_jungle_parkway_dl_560, d_course_dks_jungle_parkway_dl_750,
+ d_course_dks_jungle_parkway_dl_888, d_course_dks_jungle_parkway_dl_B00, d_course_dks_jungle_parkway_dl_A10, d_course_dks_jungle_parkway_dl_C30,
+ d_course_dks_jungle_parkway_dl_D98, d_course_dks_jungle_parkway_dl_1028, d_course_dks_jungle_parkway_dl_EF0, d_course_dks_jungle_parkway_dl_1160,
+ d_course_dks_jungle_parkway_dl_12E8, d_course_dks_jungle_parkway_dl_15E0, d_course_dks_jungle_parkway_dl_1478, d_course_dks_jungle_parkway_dl_1718,
+ d_course_dks_jungle_parkway_dl_1890, d_course_dks_jungle_parkway_dl_1B20, d_course_dks_jungle_parkway_dl_1A00, d_course_dks_jungle_parkway_dl_1C20,
+ d_course_dks_jungle_parkway_dl_1DB8, d_course_dks_jungle_parkway_dl_1FD8, d_course_dks_jungle_parkway_dl_1F20, d_course_dks_jungle_parkway_dl_20A0,
+ d_course_dks_jungle_parkway_dl_2200, d_course_dks_jungle_parkway_dl_2398, d_course_dks_jungle_parkway_dl_2328, d_course_dks_jungle_parkway_dl_2480,
+ d_course_dks_jungle_parkway_dl_2558, d_course_dks_jungle_parkway_dl_2810, d_course_dks_jungle_parkway_dl_2728, d_course_dks_jungle_parkway_dl_2928,
+ d_course_dks_jungle_parkway_dl_2AC0, d_course_dks_jungle_parkway_dl_2D70, d_course_dks_jungle_parkway_dl_2B88, d_course_dks_jungle_parkway_dl_2E30,
+ d_course_dks_jungle_parkway_dl_3010, d_course_dks_jungle_parkway_dl_3338, d_course_dks_jungle_parkway_dl_3100, d_course_dks_jungle_parkway_dl_3498,
+ d_course_dks_jungle_parkway_dl_36A0, d_course_dks_jungle_parkway_dl_3988, d_course_dks_jungle_parkway_dl_3790, d_course_dks_jungle_parkway_dl_3B28,
+ d_course_dks_jungle_parkway_dl_3CC8, d_course_dks_jungle_parkway_dl_3F78, d_course_dks_jungle_parkway_dl_3D88, d_course_dks_jungle_parkway_dl_4100,
+ d_course_dks_jungle_parkway_dl_4250, d_course_dks_jungle_parkway_dl_4470, d_course_dks_jungle_parkway_dl_42F8, d_course_dks_jungle_parkway_dl_45C0,
+ d_course_dks_jungle_parkway_dl_4658, d_course_dks_jungle_parkway_dl_4848, d_course_dks_jungle_parkway_dl_4710, d_course_dks_jungle_parkway_dl_4980,
+ d_course_dks_jungle_parkway_dl_4A38, d_course_dks_jungle_parkway_dl_4C18, d_course_dks_jungle_parkway_dl_4AE8, d_course_dks_jungle_parkway_dl_4D10,
+ d_course_dks_jungle_parkway_dl_4E10, d_course_dks_jungle_parkway_dl_51B0, d_course_dks_jungle_parkway_dl_4FB0, d_course_dks_jungle_parkway_dl_53F8,
+ d_course_dks_jungle_parkway_dl_5580, d_course_dks_jungle_parkway_dl_57A0, d_course_dks_jungle_parkway_dl_5650, d_course_dks_jungle_parkway_dl_5920,
+ d_course_dks_jungle_parkway_dl_59B8, d_course_dks_jungle_parkway_dl_5B90, d_course_dks_jungle_parkway_dl_5A50, d_course_dks_jungle_parkway_dl_5CB0,
+ d_course_dks_jungle_parkway_dl_5D70, d_course_dks_jungle_parkway_dl_5EC8, d_course_dks_jungle_parkway_dl_5DF8, d_course_dks_jungle_parkway_dl_5FA8,
+ d_course_dks_jungle_parkway_dl_6048, d_course_dks_jungle_parkway_dl_62D0, d_course_dks_jungle_parkway_dl_6178, d_course_dks_jungle_parkway_dl_6468,
+ d_course_dks_jungle_parkway_dl_6588, d_course_dks_jungle_parkway_dl_6740, d_course_dks_jungle_parkway_dl_6680, d_course_dks_jungle_parkway_dl_67C0,
+ d_course_dks_jungle_parkway_dl_68D0, d_course_dks_jungle_parkway_dl_6A70, d_course_dks_jungle_parkway_dl_69C8, d_course_dks_jungle_parkway_dl_6AD8,
+ d_course_dks_jungle_parkway_dl_6BE8, d_course_dks_jungle_parkway_dl_6CB8, d_course_dks_jungle_parkway_dl_6C70, d_course_dks_jungle_parkway_dl_6D10,
+ d_course_dks_jungle_parkway_dl_6D88, d_course_dks_jungle_parkway_dl_6E48, d_course_dks_jungle_parkway_dl_6E00, d_course_dks_jungle_parkway_dl_6EB0,
+ d_course_dks_jungle_parkway_dl_6F10, d_course_dks_jungle_parkway_dl_7080, d_course_dks_jungle_parkway_dl_7008, d_course_dks_jungle_parkway_dl_7108,
};