mirror of
https://github.com/HarbourMasters/SpaghettiKart
synced 2026-07-07 14:13:58 -04:00
Kalimari desert continuation (#40)
* wip kalimari desert * fix offset * Update kalimari_desert_data.yml * Update kalimari_desert_data.yml * fix issue * Update kalimari_desert_data.yml * add missing vtx and texture * fix error of size * Update kalimari_desert_displaylists.yml --------- Co-authored-by: coco875 <pereira.jannin@gmail.com> Co-authored-by: coco875 <59367621+coco875@users.noreply.github.com>
This commit is contained in:
@@ -25,12 +25,12 @@ void render_actor_railroad_crossing(Camera *arg0, struct RailroadCrossing *rr_cr
|
||||
if (isCrossingTriggeredByIndex[rr_crossing->crossingId]) {
|
||||
|
||||
if (rr_crossing->someTimer < 20) {
|
||||
gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_crossing_right_active);
|
||||
gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x10ae8));
|
||||
} else {
|
||||
gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_crossing_left_active);
|
||||
gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x10c10));
|
||||
}
|
||||
} else {
|
||||
gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_crossing_both_inactive);
|
||||
gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x10d38));
|
||||
}
|
||||
gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
|
||||
}
|
||||
|
||||
+2
-1
@@ -1530,7 +1530,7 @@ NewCourseTable gNewCourseTable[] = {
|
||||
.vtxSize = 6393,
|
||||
.textures = kalimari_desert_textures,
|
||||
.displaylists = d_course_kalimari_desert_packed_dls,
|
||||
.dlSize = 5670
|
||||
.dlSize = 5328
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1599,6 +1599,7 @@ void load_course(s32 courseId) {
|
||||
// Extract packed DLs
|
||||
u8 *packed = (u8 *) LOAD_ASSET(displaylists);
|
||||
Gfx *gfx = (Gfx *) allocate_memory(sizeof(Gfx) * dlSize); // Size of unpacked DLs
|
||||
assert(gfx != NULL);
|
||||
gSegmentTable[7] = &gfx[0];
|
||||
displaylist_unpack(gfx, packed, 0);
|
||||
dlSegEnd = &gfx[dlSize];
|
||||
|
||||
+818
-133
File diff suppressed because it is too large
Load Diff
@@ -14,4 +14,4 @@ d_course_kalimari_desert_packed_dls:
|
||||
symbol: d_course_kalimari_desert_packed_dls
|
||||
type: blob
|
||||
offset: 0x934004
|
||||
size: 0x2fbd
|
||||
size: 0x2FC6
|
||||
Reference in New Issue
Block a user