summaryrefslogtreecommitdiff
path: root/src/engine/courses/RoyalRaceway.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine/courses/RoyalRaceway.cpp')
-rw-r--r--src/engine/courses/RoyalRaceway.cpp88
1 files changed, 21 insertions, 67 deletions
diff --git a/src/engine/courses/RoyalRaceway.cpp b/src/engine/courses/RoyalRaceway.cpp
index 1fc6a10b9..6362a2c15 100644
--- a/src/engine/courses/RoyalRaceway.cpp
+++ b/src/engine/courses/RoyalRaceway.cpp
@@ -7,7 +7,8 @@
#include "World.h"
#include "engine/actors/Finishline.h"
#include "engine/objects/BombKart.h"
-#include "assets/royal_raceway_data.h"
+#include "assets/models/tracks/royal_raceway/royal_raceway_data.h"
+#include "assets/other/tracks/royal_raceway/royal_raceway_data.h"
#include "engine/objects/GrandPrixBalloons.h"
extern "C" {
@@ -24,7 +25,7 @@ extern "C" {
#include "code_80005FD0.h"
#include "spawn_players.h"
#include "render_objects.h"
- #include "assets/common_data.h"
+ #include "assets/models/common_data.h"
#include "save.h"
#include "replays.h"
#include "actors.h"
@@ -32,61 +33,10 @@ extern "C" {
#include "memory.h"
#include "courses/staff_ghost_data.h"
#include "course.h"
- extern const char *royal_raceway_dls[];
+ extern const char *royal_raceway_dls[132];
}
-const course_texture royal_raceway_textures[] = {
- { gTexture64619C, 0x0124, 0x0800, 0x0 },
- { gTexture645134, 0x052C, 0x0800, 0x0 },
- { gTextureWoodDoor1, 0x0903, 0x1000, 0x0 },
- { gTexture64BB60, 0x0169, 0x0800, 0x0 },
- { gTextureGrass3, 0x0372, 0x0800, 0x0 },
- { gTexture64F9E8, 0x020B, 0x1000, 0x0 },
- { gTextureFlagRed, 0x019E, 0x0800, 0x0 },
- { gTextureCrownJewelBlue, 0x0301, 0x0800, 0x0 },
- { gTextureCrown, 0x0106, 0x0800, 0x0 },
- { gTextureCrownJewelPink, 0x0313, 0x0800, 0x0 },
- { gTextureSignKoopaAir0, 0x0360, 0x1000, 0x0 },
- { gTextureSignKoopaAir1, 0x0304, 0x1000, 0x0 },
- { gTexture6684F8, 0x010D, 0x0800, 0x0 },
- { gTextureSignLuigis0, 0x0287, 0x1000, 0x0 },
- { gTextureSignLuigis1, 0x02AF, 0x1000, 0x0 },
- { gTextureSignMarioStar0, 0x02D2, 0x1000, 0x0 },
- { gTextureSignMarioStar1, 0x02B1, 0x1000, 0x0 },
- { gTexture66CA98, 0x02C9, 0x0800, 0x0 },
- { gTextureCheckerboardPink, 0x0157, 0x0800, 0x0 },
- { gTexture670AC8, 0x0FBF, 0x1000, 0x0 },
- { gTextureRoad0, 0x0300, 0x1000, 0x0 },
- { gTextureRoadFinish0, 0x0338, 0x1000, 0x0 },
- { gTextureSignYoshi, 0x04DF, 0x1000, 0x0 },
- { gTextureCheckerboardBlueGray, 0x04A1, 0x1000, 0x0 },
- { gTextureCastleBricks, 0x0B33, 0x1000, 0x0 },
- { gTextureCastleBridge, 0x0428, 0x0800, 0x0 },
- { gTextureGrass8, 0x02CB, 0x0800, 0x0 },
- { gTextureGrass9, 0x0421, 0x0800, 0x0 },
- { gTexture6646B8, 0x0298, 0x1000, 0x0 },
- { gTexture664408, 0x02AE, 0x1000, 0x0 },
- { gTextureBricksRed, 0x0C55, 0x1000, 0x0 },
- { gTexture665C0C, 0x059D, 0x0800, 0x0 },
- { gTexture6661AC, 0x01F7, 0x0800, 0x0 },
- { gTexture6663A4, 0x05F6, 0x0800, 0x0 },
- { gTexture667BAC, 0x067A, 0x0800, 0x0 },
- { gTextureFlagRed2, 0x0186, 0x0800, 0x0 },
- { gTexture66DB60, 0x01D6, 0x0800, 0x0 },
- { gTextureStainglassPeach0, 0x0ED1, 0x1000, 0x0 },
- { gTextureStainglassPeach1, 0x0DA9, 0x1000, 0x0 },
- { gTextureFencePostWooden, 0x083D, 0x1000, 0x0 },
- { gTexture648508, 0x01FE, 0x1000, 0x0 },
- { gTexture6449D4, 0x075D, 0x0800, 0x0 },
- { gTexture67FE0C, 0x02DE, 0x0800, 0x0 },
- { 0x00000000, 0x0000, 0x0000, 0x0 },
-};
-
RoyalRaceway::RoyalRaceway() {
- this->vtx = d_course_royal_raceway_vertex;
- this->gfx = d_course_royal_raceway_packed_dls;
- this->gfxSize = 5670;
- Props.textures = royal_raceway_textures;
Props.Minimap.Texture = minimap_royal_raceway;
Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture);
Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture);
@@ -158,21 +108,25 @@ RoyalRaceway::RoyalRaceway() {
Props.Sequence = MusicSeq::MUSIC_SEQ_ROYAL_RACEWAY;
Props.WaterLevel = -60.0f;
- for (size_t i = 0; i < 132; i++) {
- replace_segmented_textures_with_o2r_textures((Gfx*) royal_raceway_dls[i], Props.textures);
- }
}
void RoyalRaceway::Load() {
Course::Load();
-
+ if (gIsMirrorMode != 0) {
+ for (size_t i = 0; i < ARRAY_COUNT(royal_raceway_dls); i++) {
+ InvertTriangleWindingByName(royal_raceway_dls[i]);
+ }
+ InvertTriangleWindingByName(d_course_royal_raceway_packed_dl_B030);
+ InvertTriangleWindingByName(d_course_royal_raceway_packed_dl_A648);
+ InvertTriangleWindingByName(d_course_royal_raceway_packed_dl_11A8);
+ InvertTriangleWindingByName(d_course_royal_raceway_packed_dl_8A0);
+ }
parse_course_displaylists((TrackSections*)LOAD_ASSET_RAW(d_course_royal_raceway_addr));
func_80295C6C();
}
-void RoyalRaceway::LoadTextures() {
- dma_textures(gTextureTrees3, 0x000003E8U, 0x00000800U); // 0x03009000
- dma_textures(gTextureTrees7, 0x000003E8U, 0x00000800U); // 0x03009800
+void RoyalRaceway::UnLoad() {
+ RestoreTriangleWinding();
}
void RoyalRaceway::BeginPlay() {
@@ -255,23 +209,23 @@ void RoyalRaceway::Render(struct UnkStruct_800DC5EC* arg0) {
gDPSetCombineMode(gDisplayListHead++, G_CC_SHADE, G_CC_SHADE);
gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2);
// d_course_royal_raceway_packed_dl_B030
- gSPDisplayList(gDisplayListHead++, (segmented_gfx_to_virtual(reinterpret_cast<void*>(0x0700B030))));
+ gSPDisplayList(gDisplayListHead++, (Gfx*) d_course_royal_raceway_packed_dl_B030);
}
gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIA, G_CC_MODULATEIA);
gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2);
// d_course_royal_raceway_packed_dl_A648
- gSPDisplayList(gDisplayListHead++, (segmented_gfx_to_virtual(reinterpret_cast<void*>(0x0700A648))));
+ gSPDisplayList(gDisplayListHead++, (Gfx*) d_course_royal_raceway_packed_dl_A648);
render_course_segments(royal_raceway_dls, arg0);
// d_course_royal_raceway_packed_dl_11A8
- gSPDisplayList(gDisplayListHead++, (segmented_gfx_to_virtual(reinterpret_cast<void*>(0x070011A8))));
+ gSPDisplayList(gDisplayListHead++, (Gfx*) d_course_royal_raceway_packed_dl_11A8);
gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA);
gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2);
gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
// d_course_royal_raceway_packed_dl_8A0
- gSPDisplayList(gDisplayListHead++, (segmented_gfx_to_virtual(reinterpret_cast<void*>(0x070008A0))));
+ gSPDisplayList(gDisplayListHead++, (Gfx*) d_course_royal_raceway_packed_dl_8A0);
gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
}
@@ -297,7 +251,7 @@ void RoyalRaceway::ScrollingTextures() {
D_802B87BC = 0xFF;
}
// d_course_royal_raceway_packed_dl_A6A8
- find_and_set_tile_size((uintptr_t) segmented_gfx_to_virtual((void*)0x0700A6A8), 0, D_802B87BC);
+ find_and_set_tile_size((uintptr_t) d_course_royal_raceway_packed_dl_A6A8, 0, D_802B87BC);
// d_course_royal_raceway_packed_dl_A648
- find_and_set_tile_size((uintptr_t) segmented_gfx_to_virtual((void*)0x0700A648), 0, D_802B87BC);
+ find_and_set_tile_size((uintptr_t) d_course_royal_raceway_packed_dl_A648, 0, D_802B87BC);
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 07:16:53 +0000