diff options
Diffstat (limited to 'src/engine/courses/YoshiValley.cpp')
| -rw-r--r-- | src/engine/courses/YoshiValley.cpp | 44 |
1 files changed, 12 insertions, 32 deletions
diff --git a/src/engine/courses/YoshiValley.cpp b/src/engine/courses/YoshiValley.cpp index 4576b53ca..c2506e568 100644 --- a/src/engine/courses/YoshiValley.cpp +++ b/src/engine/courses/YoshiValley.cpp @@ -10,8 +10,8 @@ #include "engine/objects/BombKart.h" #include "engine/objects/Hedgehog.h" #include "engine/objects/Flagpole.h" -#include "assets/yoshi_valley_data.h" -#include "assets/boo_frames.h" +#include "assets/models/tracks/yoshi_valley/yoshi_valley_data.h" +#include "assets/other/tracks/yoshi_valley/yoshi_valley_data.h" extern "C" { #include "main.h" @@ -27,40 +27,17 @@ 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" #include "collision.h" #include "memory.h" #include "course.h" - extern const char *d_course_yoshi_valley_dl_list[]; + extern const char *d_course_yoshi_valley_dl_list[124]; } -const course_texture yoshi_valley_textures[] = { - { gTexture66EBF0, 0x0146, 0x0800, 0x0 }, - { gTextureWoodBridgeSlats, 0x0DAB, 0x1000, 0x0 }, - { gTexture65E2EC, 0x02B0, 0x0800, 0x0 }, - { gTexture6846DC, 0x04EA, 0x0800, 0x0 }, - { gTextureFenceRope, 0x0540, 0x0800, 0x0 }, - { gTexture685108, 0x04D4, 0x0800, 0x0 }, - { gTexture64CC20, 0x0EC3, 0x1000, 0x0 }, - { gTextureGrass4, 0x05C3, 0x0800, 0x0 }, - { gTexture6775EC, 0x0233, 0x1000, 0x0 }, - { gTexture68E2D0, 0x087F, 0x0800, 0x0 }, - { gTextureCheckerboardBlackWhite, 0x0107, 0x0800, 0x0 }, - { gTexture643B3C, 0x0798, 0x0800, 0x0 }, - { gTextureSignWoodRedArrow, 0x04E1, 0x1000, 0x0 }, - { gTexture68DEC0, 0x0410, 0x0800, 0x0 }, - { 0x00000000, 0x0000, 0x0000, 0x0 }, -}; - YoshiValley::YoshiValley() { - this->vtx = d_course_yoshi_valley_vertex; - this->gfx = d_course_yoshi_valley_packed_dls; - this->gfxSize = 4140; - Props.textures = yoshi_valley_textures; - Props.Minimap.Texture = minimap_yoshi_valley; Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture); Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture); @@ -128,14 +105,17 @@ YoshiValley::YoshiValley() { Props.Skybox.FloorBottomLeft = {0, 0, 0}; Props.Skybox.FloorTopLeft = {95, 40, 15}; Props.Sequence = MusicSeq::MUSIC_SEQ_YOSHI_VALLEY; - for (size_t i = 0; i < 124; i++) { - replace_segmented_textures_with_o2r_textures((Gfx*) d_course_yoshi_valley_dl_list[i], Props.textures); - } } void YoshiValley::Load() { Course::Load(); + if (gIsMirrorMode != 0) { + for (size_t i = 0; i < ARRAY_COUNT(d_course_yoshi_valley_dl_list); i++) { + InvertTriangleWindingByName(d_course_yoshi_valley_dl_list[i]); + } + } + Lights1 lights4 = gdSPDefLights1(100, 100, 100, 255, 254, 254, 0, 0, 120); set_track_light_direction(&lights4, -0x38F0, 0x1C70, 1); parse_course_displaylists((TrackSections*)LOAD_ASSET_RAW(d_course_yoshi_valley_addr)); @@ -143,8 +123,8 @@ void YoshiValley::Load() { Props.WaterLevel = gCourseMinY - 10.0f; } -void YoshiValley::LoadTextures() { - dma_textures(gTextureTrees2, 0x000003E8U, 0x00000800U); // 0x03009000 +void YoshiValley::UnLoad() { + RestoreTriangleWinding(); } void YoshiValley::BeginPlay() { |