diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2024-08-09 14:20:09 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-09 14:20:09 -0600 |
| commit | 9540a4b772ec6eeced2686d3981a5b4e45500408 (patch) | |
| tree | 7b887d9fab85e2d9d41d63ab826f052852f12e42 /src | |
| parent | 35bc5a58f970322ee3abddd109d984a24e0c5851 (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/actors/railroad_crossing/render.inc.c | 6 | ||||
| -rw-r--r-- | src/racing/memory.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/actors/railroad_crossing/render.inc.c b/src/actors/railroad_crossing/render.inc.c index 61ad5b667..d93ec5c98 100644 --- a/src/actors/railroad_crossing/render.inc.c +++ b/src/actors/railroad_crossing/render.inc.c @@ -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); } diff --git a/src/racing/memory.c b/src/racing/memory.c index cee544bde..102f14b5e 100644 --- a/src/racing/memory.c +++ b/src/racing/memory.c @@ -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]; |