diff --git a/src/engine/courses/LuigiRaceway.cpp b/src/engine/courses/LuigiRaceway.cpp index 004c3a33b..5f6a78f97 100644 --- a/src/engine/courses/LuigiRaceway.cpp +++ b/src/engine/courses/LuigiRaceway.cpp @@ -276,7 +276,7 @@ void LuigiRaceway::SetStaffGhost() { D_80162DE4 = 1; } -void render_LuigiRaceway_jumbotron() { +void LuigiRaceway::Jumbotron() { gSPTexture(gDisplayListHead++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); gDPTileSync(gDisplayListHead++); gDPSetTile(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, @@ -407,7 +407,7 @@ void LuigiRaceway::Render(struct UnkStruct_800DC5EC* arg0) { gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIA, G_CC_MODULATEIA); gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); - render_LuigiRaceway_jumbotron(); + LuigiRaceway::Jumbotron(); render_course_segments(luigi_raceway_dls, arg0); gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); diff --git a/src/engine/courses/LuigiRaceway.h b/src/engine/courses/LuigiRaceway.h index eb32e6c78..7166278c3 100644 --- a/src/engine/courses/LuigiRaceway.h +++ b/src/engine/courses/LuigiRaceway.h @@ -4,26 +4,28 @@ #include "Course.h" extern "C" { - #include "assets/luigi_raceway_vertices.h" - #include "assets/luigi_raceway_displaylists.h" - #include "assets/luigi_raceway_data.h" - #include "course_offsets.h" - #include "camera.h" - #include "data/some_data.h" - #include "objects.h" - #include "path_spawn_metadata.h" - extern const course_texture luigi_raceway_textures[]; +#include "assets/luigi_raceway_vertices.h" +#include "assets/luigi_raceway_displaylists.h" +#include "assets/luigi_raceway_data.h" +#include "course_offsets.h" +#include "camera.h" +#include "data/some_data.h" +#include "objects.h" +#include "path_spawn_metadata.h" +extern const course_texture luigi_raceway_textures[]; } class LuigiRaceway : public Course { -public: - virtual ~LuigiRaceway() = default; // Virtual destructor for proper cleanup in derived classes + void Jumbotron(); + + public: + virtual ~LuigiRaceway() = default; // Virtual destructor for proper cleanup in derived classes // Constructor explicit LuigiRaceway(); -// virtual void Load(const char* courseVtx, -// course_texture* textures, const char* displaylists, size_t dlSize); + // virtual void Load(const char* courseVtx, + // course_texture* textures, const char* displaylists, size_t dlSize); virtual void Load() override; virtual void LoadTextures() override; virtual void SpawnActors() override; @@ -40,6 +42,7 @@ public: virtual void Render(struct UnkStruct_800DC5EC*) override; virtual void RenderCredits() override; virtual void Collision() override; - virtual void SomeCollisionThing(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32* arg4, f32* arg5, f32* arg6, f32* arg7) override; + virtual void SomeCollisionThing(Player* player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32* arg4, f32* arg5, f32* arg6, + f32* arg7) override; virtual void Destroy() override; }; diff --git a/src/engine/courses/WarioStadium.cpp b/src/engine/courses/WarioStadium.cpp index fe009891e..3c68c662e 100644 --- a/src/engine/courses/WarioStadium.cpp +++ b/src/engine/courses/WarioStadium.cpp @@ -237,7 +237,7 @@ void WarioStadium::MinimapFinishlinePosition() { (u8*) common_texture_minimap_finish_line); } -void render_WarioStadium_jumbotron() { +void WarioStadium::Jumbotron() { gSPTexture(gDisplayListHead++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); gDPTileSync(gDisplayListHead++); gDPSetTile(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, @@ -329,7 +329,7 @@ void WarioStadium::Render(struct UnkStruct_800DC5EC* arg0) { gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATERGBA, G_CC_MODULATERGBA); gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); - render_WarioStadium_jumbotron(); + WarioStadium::Jumbotron(); render_course_segments(wario_stadium_dls, arg0); // d_course_wario_stadium_packed_dl_A228 diff --git a/src/engine/courses/WarioStadium.h b/src/engine/courses/WarioStadium.h index 14707876e..088e81b72 100644 --- a/src/engine/courses/WarioStadium.h +++ b/src/engine/courses/WarioStadium.h @@ -4,32 +4,34 @@ #include "Course.h" extern "C" { - #include "assets/wario_stadium_vertices.h" - #include "assets/wario_stadium_displaylists.h" - #include "assets/wario_stadium_data.h" - #include "course_offsets.h" - #include "camera.h" - #include "data/some_data.h" - #include "objects.h" - #include "path_spawn_metadata.h" - extern const course_texture wario_stadium_textures[]; +#include "assets/wario_stadium_vertices.h" +#include "assets/wario_stadium_displaylists.h" +#include "assets/wario_stadium_data.h" +#include "course_offsets.h" +#include "camera.h" +#include "data/some_data.h" +#include "objects.h" +#include "path_spawn_metadata.h" +extern const course_texture wario_stadium_textures[]; } class WarioStadium : public Course { -public: - virtual ~WarioStadium() = default; // Virtual destructor for proper cleanup in derived classes + void Jumbotron(); + + public: + virtual ~WarioStadium() = default; // Virtual destructor for proper cleanup in derived classes // Constructor explicit WarioStadium(); -// virtual void Load(const char* courseVtx, -// course_texture* textures, const char* displaylists, size_t dlSize); + // virtual void Load(const char* courseVtx, + // course_texture* textures, const char* displaylists, size_t dlSize); virtual void Load() override; virtual void LoadTextures() override; virtual void SpawnActors() override; virtual void SpawnVehicles() override; virtual void InitClouds() override; - virtual void UpdateClouds(s32,Camera*) override; + virtual void UpdateClouds(s32, Camera*) override; virtual void MinimapSettings() override; virtual void InitCourseObjects() override; virtual void SomeSounds() override; @@ -37,10 +39,12 @@ public: virtual void WhatDoesThisDoAI(Player* player, int8_t playerId) override; virtual void MinimapFinishlinePosition() override; virtual void Render(struct UnkStruct_800DC5EC*) override; - virtual void RenderCredits() override; + virtual void RenderCredits() override; virtual void Collision() override; - virtual void SomeCollisionThing(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32* arg4, f32* arg5, f32* arg6, f32* arg7) override; - virtual void DrawWater(struct UnkStruct_800DC5EC* screen, uint16_t pathCounter, uint16_t cameraRot, uint16_t playerDirection) override; + virtual void SomeCollisionThing(Player* player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32* arg4, f32* arg5, f32* arg6, + f32* arg7) override; + virtual void DrawWater(struct UnkStruct_800DC5EC* screen, uint16_t pathCounter, uint16_t cameraRot, + uint16_t playerDirection) override; virtual void CreditsSpawnActors() override; virtual void Destroy() override; };