summaryrefslogtreecommitdiff
path: root/courses
diff options
context:
space:
mode:
authorTyler McGavran <tyler.taggerung@gmail.com>2023-10-28 00:18:20 -0400
committerGitHub <noreply@github.com>2023-10-27 22:18:20 -0600
commitc17d5c76c988ae0072ad71097e1e280b9c1c4bd8 (patch)
tree6babdbb5a22197ca9bbf09602a1a7b381bdb3a93 /courses
parent716b92626025c092da3a65ff4e66d83a2510d906 (diff)
Linkage for the ceremony_data file (#478)
* Linkage for the ceremony_data file Cleaned up all but 1 undefined symbol from the 0x0B range. The one leftover may be something from texture_tkmk00. Or atleast, that's what I think. Can't say for certain * Startup logo linkage Cleaned up a bunch of unused items from assets.json too Signed-off-by: Taggerung <tyler.taggerung@email.com>
Diffstat (limited to 'courses')
-rw-r--r--courses/all_course_offsets.h52
-rw-r--r--courses/courseTable.h19
-rw-r--r--courses/courseTable.inc.c2
-rw-r--r--courses/sherbet_land/course_offsets.inc.c3
4 files changed, 75 insertions, 1 deletions
diff --git a/courses/all_course_offsets.h b/courses/all_course_offsets.h
new file mode 100644
index 000000000..5136da6ff
--- /dev/null
+++ b/courses/all_course_offsets.h
@@ -0,0 +1,52 @@
+#ifndef ALL_COURSE_OFFSETS_H
+#define ALL_COURSE_OFFSETS_H
+
+#include "course_offsets.h"
+
+extern Gfx *banshee_boardwalk_dls[];
+extern Gfx *bowsers_castle_dls[];
+extern Gfx *choco_mountain_dls[];
+extern Gfx *kalimari_desert_dls[];
+extern Gfx *luigi_raceway_dls[];
+extern Gfx *mario_raceway_dls[];
+extern Gfx *moo_moo_farm_dls[];
+extern Gfx *royal_raceway_dls[];
+extern Gfx *sherbet_land_dls[];
+extern Gfx *sherbet_land_dls_2[];
+extern Gfx *wario_stadium_dls[];
+
+extern Gfx toads_turnpike_dl_0[];
+extern Gfx toads_turnpike_dl_1[];
+extern Gfx toads_turnpike_dl_2[];
+extern Gfx toads_turnpike_dl_3[];
+extern Gfx toads_turnpike_dl_4[];
+extern Gfx toads_turnpike_dl_5[];
+extern Gfx toads_turnpike_dl_6[];
+extern Gfx toads_turnpike_dl_7[];
+extern Gfx toads_turnpike_dl_8[];
+extern Gfx toads_turnpike_dl_9[];
+extern Gfx toads_turnpike_dl_10[];
+extern Gfx toads_turnpike_dl_11[];
+
+extern course_texture banshee_boardwalk_textures[];
+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[];
+extern course_texture koopa_troopa_beach_textures[];
+extern course_texture luigi_raceway_textures[];
+extern course_texture mario_raceway_textures[];
+extern course_texture moo_moo_farm_textures[];
+extern course_texture rainbow_road_textures[];
+extern course_texture royal_raceway_textures[];
+extern course_texture sherbet_land_textures[];
+extern course_texture skyscraper_textures[];
+extern course_texture toads_turnpike_textures[];
+extern course_texture wario_stadium_textures[];
+extern course_texture yoshi_valley_textures[];
+
+#endif
diff --git a/courses/courseTable.h b/courses/courseTable.h
index 98e2248ef..cd6b380bf 100644
--- a/courses/courseTable.h
+++ b/courses/courseTable.h
@@ -5,6 +5,25 @@
#include <macros.h>
#include "types.h"
+// dlRomStart, vertexRomStart, & vertexStart, are u8* because mio0 compressed.
+struct CourseTable {
+ u8 *dlRomStart; // 0x00 ROM start for segment 6 DL data
+ u8 *dlRomEnd; // 0x04 ROM end for segment 6 DL data
+ u8 *vertexRomStart; // 0x08 ROM start for segment 4 vertex data
+ u8 *vertexRomEnd; // 0x0C ROM end for segment 7?
+ u8 *offsetRomStart; // 0x10 ROM start for uncompressed segment 9 texture and DL addresses
+ u8 *offsetRomEnd; // 0x14 ROM end for uncompressed segment 9 texture and DL addresses
+ mk64_Vtx *vertexStart; // 0x18 segmented address of vertex data
+ u32 vertexCount; // 0x1C number of vertices in vertex data
+ u8 *packedStart; // 0x20 packed display list start address
+ uintptr_t finalDisplaylistOffset; // 0x24
+ u32 *textures; // 0x20 segmented address of textures table
+ u16 unknown1; // 0x2C
+ u16 padding; // 0x2E
+};
+
+extern struct CourseTable gCourseTable[];
+
// todo: These should probably be ptr's instead of array's?
extern u8 _course_mario_raceway_dl_mio0SegmentRomStart[];
extern u8 _course_mario_raceway_dl_mio0SegmentRomEnd[];
diff --git a/courses/courseTable.inc.c b/courses/courseTable.inc.c
index 6b3fd8bff..b4b59a453 100644
--- a/courses/courseTable.inc.c
+++ b/courses/courseTable.inc.c
@@ -5,7 +5,7 @@
#include "all_course_model.h"
#include "all_course_packed.h"
-struct courseTable gCourseTable[] = {{
+struct CourseTable gCourseTable[] = {{
_course_mario_raceway_dl_mio0SegmentRomStart, _course_mario_raceway_dl_mio0SegmentRomEnd,
_mario_raceway_vertexSegmentRomStart, _mario_raceway_vertexSegmentRomEnd,
_course_mario_raceway_offsetsSegmentRomStart, _course_mario_raceway_offsetsSegmentRomEnd,
diff --git a/courses/sherbet_land/course_offsets.inc.c b/courses/sherbet_land/course_offsets.inc.c
index 2026dfb1e..c77ce3dd1 100644
--- a/courses/sherbet_land/course_offsets.inc.c
+++ b/courses/sherbet_land/course_offsets.inc.c
@@ -100,6 +100,9 @@ const Gfx *sherbet_land_dls[] = {
d_course_sherbet_land_dl_25A0,
d_course_sherbet_land_dl_2530,
d_course_sherbet_land_dl_25F8,
+};
+
+const Gfx *sherbet_land_dls_2[] = {
d_course_sherbet_land_dl_26D0,
d_course_sherbet_land_dl_28A0,
d_course_sherbet_land_dl_27F0,