mirror
/
SpaghettiKart
mirror of https://github.com/HarbourMasters/SpaghettiKart
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Jungle (#52) 

* castle and stadium

* castle

* boardwalk & snowland

* turnpike

* jungle

---------

Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>
This commit is contained in:
MegaMech 2024-08-14 14:17:45 -06:00 committed by GitHub
parent 33154e1d32
commit 258892c6c9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 102 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
courses/all_course_data.h
View File

@ -8,6 +8,7 @@
#include "courses/yoshi_valley/course_data.h"
#include "courses/sherbet_land/course_data.h"
#include <assets/dks_jungle_parkway_data.h>
#include <assets/toads_turnpike_data.h>
#include <assets/banshee_boardwalk_data.h>
#include <assets/mario_raceway_data.h>

2
courses/all_course_model.h
View File

@ -26,9 +26,9 @@
#include <assets/block_fort_vertices.h>
#include <assets/double_deck_vertices.h>
#include <assets/banshee_boardwalk_vertices.h>
#include <assets/dks_jungle_parkway_vertices.h>
extern CourseVtx d_course_koopa_troopa_beach_vertex[];
extern CourseVtx d_course_dks_jungle_parkway_vertex[];
extern CourseVtx d_course_rainbow_road_vertex[];
extern CourseVtx d_course_yoshi_valley_vertex[];
extern CourseVtx d_course_sherbet_land_vertex[];

3
courses/all_course_offsets.h
View File

@ -16,7 +16,7 @@ extern const char *royal_raceway_dls[];
extern Gfx *sherbet_land_dls[];
extern Gfx *sherbet_land_dls_2[];
extern Gfx *wario_stadium_dls[];
extern const char *d_course_dks_jungle_parkway_unknown_dl_list[];
extern const char *dks_jungle_parkway_dls[];
extern Gfx toads_turnpike_dl_0[];
extern Gfx toads_turnpike_dl_1[];
@ -36,7 +36,6 @@ extern course_texture big_donut_textures[];
extern course_texture block_fort_textures[];
extern course_texture bowsers_castle_textures[];
extern course_texture choco_mountain_textures[];
extern course_texture dks_jungle_parkway_textures[];
extern course_texture double_deck_textures[];
extern course_texture frappe_snowland_textures[];
extern course_texture kalimari_desert_textures[];

3
courses/all_course_packed.h
View File

@ -8,13 +8,12 @@
* incorrect
**/
#include "courses/mario_raceway/course_displaylists.h"
#include "courses/koopa_troopa_beach/course_displaylists.h"
#include "courses/luigi_raceway/course_displaylists.h"
#include "courses/rainbow_road/course_displaylists.h"
#include "courses/yoshi_valley/course_displaylists.h"
#include "courses/sherbet_land/course_displaylists.h"
#include <assets/dks_jungle_parkway_displaylists.h>
#include <assets/toads_turnpike_displaylists.h>
#include <assets/banshee_boardwalk_displaylists.h>
#include <assets/mario_raceway_displaylists.h>

104
courses/dks_jungle_parkway/course_offsets.c
View File

@ -3,58 +3,58 @@
#include <assets/dks_jungle_parkway_data.h>
const course_texture dks_jungle_parkway_textures[] = {
{gTexture648508, 0x01FE, 0x1000, 0x0},
{gTexture6684F8, 0x010D, 0x0800, 0x0},
{gTextureWoodBridgeSlats, 0x0DAB, 0x1000, 0x0},
{gTexture654460, 0x0B12, 0x1000, 0x0},
{gTexture654F74, 0x0A24, 0x1000, 0x0},
{gTexture655998, 0x059F, 0x0800, 0x0},
{gTexture655F38, 0x0BB9, 0x1000, 0x0},
{gTexture656AF4, 0x0AD3, 0x1000, 0x0},
{gTexture6575C8, 0x0DA7, 0x1000, 0x0},
{gTexture658370, 0x0DBA, 0x1000, 0x0},
{gTexture65912C, 0x0DBC, 0x1000, 0x0},
{gTexture659EE8, 0x0EF5, 0x1000, 0x0},
{gTexture65ADE0, 0x0D5A, 0x1000, 0x0},
{gTexture65BB3C, 0x0D9E, 0x1000, 0x0},
{gTexture65C8DC, 0x0CF5, 0x1000, 0x0},
{gTexture65D5D4, 0x0D18, 0x1000, 0x0},
{gTexture65E2EC, 0x02B0, 0x0800, 0x0},
{gTexture65EAEC, 0x034A, 0x0800, 0x0},
{gTexture65E59C, 0x054F, 0x1000, 0x0},
{gTexture65EE38, 0x0CDE, 0x1000, 0x0},
{gTexture65FB18, 0x03EE, 0x0800, 0x0},
{gTextureSignPinkArrow, 0x0198, 0x0800, 0x0},
{gTextureWaves0, 0x04D0, 0x0800, 0x0},
{gTexture683844, 0x0655, 0x0800, 0x0},
{0x00000000, 0x0000, 0x0000, 0x0},
{gTexture648508, 0x01FE, 0x1000, 0x0},
{gTexture6684F8, 0x010D, 0x0800, 0x0},
{gTextureWoodBridgeSlats, 0x0DAB, 0x1000, 0x0},
{gTexture654460, 0x0B12, 0x1000, 0x0},
{gTexture654F74, 0x0A24, 0x1000, 0x0},
{gTexture655998, 0x059F, 0x0800, 0x0},
{gTexture655F38, 0x0BB9, 0x1000, 0x0},
{gTexture656AF4, 0x0AD3, 0x1000, 0x0},
{gTexture6575C8, 0x0DA7, 0x1000, 0x0},
{gTexture658370, 0x0DBA, 0x1000, 0x0},
{gTexture65912C, 0x0DBC, 0x1000, 0x0},
{gTexture659EE8, 0x0EF5, 0x1000, 0x0},
{gTexture65ADE0, 0x0D5A, 0x1000, 0x0},
{gTexture65BB3C, 0x0D9E, 0x1000, 0x0},
{gTexture65C8DC, 0x0CF5, 0x1000, 0x0},
{gTexture65D5D4, 0x0D18, 0x1000, 0x0},
{gTexture65E2EC, 0x02B0, 0x0800, 0x0},
{gTexture65EAEC, 0x034A, 0x0800, 0x0},
{gTexture65E59C, 0x054F, 0x1000, 0x0},
{gTexture65EE38, 0x0CDE, 0x1000, 0x0},
{gTexture65FB18, 0x03EE, 0x0800, 0x0},
{gTextureSignPinkArrow, 0x0198, 0x0800, 0x0},
{gTextureWaves0, 0x04D0, 0x0800, 0x0},
{gTexture683844, 0x0655, 0x0800, 0x0},
{0x00000000, 0x0000, 0x0000, 0x0},
};
const char *d_course_dks_jungle_parkway_unknown_dl_list[] = {
d_course_dks_jungle_parkway_dl_20, d_course_dks_jungle_parkway_dl_210, d_course_dks_jungle_parkway_dl_180, d_course_dks_jungle_parkway_dl_310,
d_course_dks_jungle_parkway_dl_400, d_course_dks_jungle_parkway_dl_628, d_course_dks_jungle_parkway_dl_560, d_course_dks_jungle_parkway_dl_750,
d_course_dks_jungle_parkway_dl_888, d_course_dks_jungle_parkway_dl_B00, d_course_dks_jungle_parkway_dl_A10, d_course_dks_jungle_parkway_dl_C30,
d_course_dks_jungle_parkway_dl_D98, d_course_dks_jungle_parkway_dl_1028, d_course_dks_jungle_parkway_dl_EF0, d_course_dks_jungle_parkway_dl_1160,
d_course_dks_jungle_parkway_dl_12E8, d_course_dks_jungle_parkway_dl_15E0, d_course_dks_jungle_parkway_dl_1478, d_course_dks_jungle_parkway_dl_1718,
d_course_dks_jungle_parkway_dl_1890, d_course_dks_jungle_parkway_dl_1B20, d_course_dks_jungle_parkway_dl_1A00, d_course_dks_jungle_parkway_dl_1C20,
d_course_dks_jungle_parkway_dl_1DB8, d_course_dks_jungle_parkway_dl_1FD8, d_course_dks_jungle_parkway_dl_1F20, d_course_dks_jungle_parkway_dl_20A0,
d_course_dks_jungle_parkway_dl_2200, d_course_dks_jungle_parkway_dl_2398, d_course_dks_jungle_parkway_dl_2328, d_course_dks_jungle_parkway_dl_2480,
d_course_dks_jungle_parkway_dl_2558, d_course_dks_jungle_parkway_dl_2810, d_course_dks_jungle_parkway_dl_2728, d_course_dks_jungle_parkway_dl_2928,
d_course_dks_jungle_parkway_dl_2AC0, d_course_dks_jungle_parkway_dl_2D70, d_course_dks_jungle_parkway_dl_2B88, d_course_dks_jungle_parkway_dl_2E30,
d_course_dks_jungle_parkway_dl_3010, d_course_dks_jungle_parkway_dl_3338, d_course_dks_jungle_parkway_dl_3100, d_course_dks_jungle_parkway_dl_3498,
d_course_dks_jungle_parkway_dl_36A0, d_course_dks_jungle_parkway_dl_3988, d_course_dks_jungle_parkway_dl_3790, d_course_dks_jungle_parkway_dl_3B28,
d_course_dks_jungle_parkway_dl_3CC8, d_course_dks_jungle_parkway_dl_3F78, d_course_dks_jungle_parkway_dl_3D88, d_course_dks_jungle_parkway_dl_4100,
d_course_dks_jungle_parkway_dl_4250, d_course_dks_jungle_parkway_dl_4470, d_course_dks_jungle_parkway_dl_42F8, d_course_dks_jungle_parkway_dl_45C0,
d_course_dks_jungle_parkway_dl_4658, d_course_dks_jungle_parkway_dl_4848, d_course_dks_jungle_parkway_dl_4710, d_course_dks_jungle_parkway_dl_4980,
d_course_dks_jungle_parkway_dl_4A38, d_course_dks_jungle_parkway_dl_4C18, d_course_dks_jungle_parkway_dl_4AE8, d_course_dks_jungle_parkway_dl_4D10,
d_course_dks_jungle_parkway_dl_4E10, d_course_dks_jungle_parkway_dl_51B0, d_course_dks_jungle_parkway_dl_4FB0, d_course_dks_jungle_parkway_dl_53F8,
d_course_dks_jungle_parkway_dl_5580, d_course_dks_jungle_parkway_dl_57A0, d_course_dks_jungle_parkway_dl_5650, d_course_dks_jungle_parkway_dl_5920,
d_course_dks_jungle_parkway_dl_59B8, d_course_dks_jungle_parkway_dl_5B90, d_course_dks_jungle_parkway_dl_5A50, d_course_dks_jungle_parkway_dl_5CB0,
d_course_dks_jungle_parkway_dl_5D70, d_course_dks_jungle_parkway_dl_5EC8, d_course_dks_jungle_parkway_dl_5DF8, d_course_dks_jungle_parkway_dl_5FA8,
d_course_dks_jungle_parkway_dl_6048, d_course_dks_jungle_parkway_dl_62D0, d_course_dks_jungle_parkway_dl_6178, d_course_dks_jungle_parkway_dl_6468,
d_course_dks_jungle_parkway_dl_6588, d_course_dks_jungle_parkway_dl_6740, d_course_dks_jungle_parkway_dl_6680, d_course_dks_jungle_parkway_dl_67C0,
d_course_dks_jungle_parkway_dl_68D0, d_course_dks_jungle_parkway_dl_6A70, d_course_dks_jungle_parkway_dl_69C8, d_course_dks_jungle_parkway_dl_6AD8,
d_course_dks_jungle_parkway_dl_6BE8, d_course_dks_jungle_parkway_dl_6CB8, d_course_dks_jungle_parkway_dl_6C70, d_course_dks_jungle_parkway_dl_6D10,
d_course_dks_jungle_parkway_dl_6D88, d_course_dks_jungle_parkway_dl_6E48, d_course_dks_jungle_parkway_dl_6E00, d_course_dks_jungle_parkway_dl_6EB0,
d_course_dks_jungle_parkway_dl_6F10, d_course_dks_jungle_parkway_dl_7080, d_course_dks_jungle_parkway_dl_7008, d_course_dks_jungle_parkway_dl_7108,
const Gfx *dks_jungle_parkway_dls[] = {
d_course_dks_jungle_parkway_dl_20, d_course_dks_jungle_parkway_dl_210, d_course_dks_jungle_parkway_dl_180, d_course_dks_jungle_parkway_dl_310,
d_course_dks_jungle_parkway_dl_400, d_course_dks_jungle_parkway_dl_628, d_course_dks_jungle_parkway_dl_560, d_course_dks_jungle_parkway_dl_750,
d_course_dks_jungle_parkway_dl_888, d_course_dks_jungle_parkway_dl_B00, d_course_dks_jungle_parkway_dl_A10, d_course_dks_jungle_parkway_dl_C30,
d_course_dks_jungle_parkway_dl_D98, d_course_dks_jungle_parkway_dl_1028, d_course_dks_jungle_parkway_dl_EF0, d_course_dks_jungle_parkway_dl_1160,
d_course_dks_jungle_parkway_dl_12E8, d_course_dks_jungle_parkway_dl_15E0, d_course_dks_jungle_parkway_dl_1478, d_course_dks_jungle_parkway_dl_1718,
d_course_dks_jungle_parkway_dl_1890, d_course_dks_jungle_parkway_dl_1B20, d_course_dks_jungle_parkway_dl_1A00, d_course_dks_jungle_parkway_dl_1C20,
d_course_dks_jungle_parkway_dl_1DB8, d_course_dks_jungle_parkway_dl_1FD8, d_course_dks_jungle_parkway_dl_1F20, d_course_dks_jungle_parkway_dl_20A0,
d_course_dks_jungle_parkway_dl_2200, d_course_dks_jungle_parkway_dl_2398, d_course_dks_jungle_parkway_dl_2328, d_course_dks_jungle_parkway_dl_2480,
d_course_dks_jungle_parkway_dl_2558, d_course_dks_jungle_parkway_dl_2810, d_course_dks_jungle_parkway_dl_2728, d_course_dks_jungle_parkway_dl_2928,
d_course_dks_jungle_parkway_dl_2AC0, d_course_dks_jungle_parkway_dl_2D70, d_course_dks_jungle_parkway_dl_2B88, d_course_dks_jungle_parkway_dl_2E30,
d_course_dks_jungle_parkway_dl_3010, d_course_dks_jungle_parkway_dl_3338, d_course_dks_jungle_parkway_dl_3100, d_course_dks_jungle_parkway_dl_3498,
d_course_dks_jungle_parkway_dl_36A0, d_course_dks_jungle_parkway_dl_3988, d_course_dks_jungle_parkway_dl_3790, d_course_dks_jungle_parkway_dl_3B28,
d_course_dks_jungle_parkway_dl_3CC8, d_course_dks_jungle_parkway_dl_3F78, d_course_dks_jungle_parkway_dl_3D88, d_course_dks_jungle_parkway_dl_4100,
d_course_dks_jungle_parkway_dl_4250, d_course_dks_jungle_parkway_dl_4470, d_course_dks_jungle_parkway_dl_42F8, d_course_dks_jungle_parkway_dl_45C0,
d_course_dks_jungle_parkway_dl_4658, d_course_dks_jungle_parkway_dl_4848, d_course_dks_jungle_parkway_dl_4710, d_course_dks_jungle_parkway_dl_4980,
d_course_dks_jungle_parkway_dl_4A38, d_course_dks_jungle_parkway_dl_4C18, d_course_dks_jungle_parkway_dl_4AE8, d_course_dks_jungle_parkway_dl_4D10,
d_course_dks_jungle_parkway_dl_4E10, d_course_dks_jungle_parkway_dl_51B0, d_course_dks_jungle_parkway_dl_4FB0, d_course_dks_jungle_parkway_dl_53F8,
d_course_dks_jungle_parkway_dl_5580, d_course_dks_jungle_parkway_dl_57A0, d_course_dks_jungle_parkway_dl_5650, d_course_dks_jungle_parkway_dl_5920,
d_course_dks_jungle_parkway_dl_59B8, d_course_dks_jungle_parkway_dl_5B90, d_course_dks_jungle_parkway_dl_5A50, d_course_dks_jungle_parkway_dl_5CB0,
d_course_dks_jungle_parkway_dl_5D70, d_course_dks_jungle_parkway_dl_5EC8, d_course_dks_jungle_parkway_dl_5DF8, d_course_dks_jungle_parkway_dl_5FA8,
d_course_dks_jungle_parkway_dl_6048, d_course_dks_jungle_parkway_dl_62D0, d_course_dks_jungle_parkway_dl_6178, d_course_dks_jungle_parkway_dl_6468,
d_course_dks_jungle_parkway_dl_6588, d_course_dks_jungle_parkway_dl_6740, d_course_dks_jungle_parkway_dl_6680, d_course_dks_jungle_parkway_dl_67C0,
d_course_dks_jungle_parkway_dl_68D0, d_course_dks_jungle_parkway_dl_6A70, d_course_dks_jungle_parkway_dl_69C8, d_course_dks_jungle_parkway_dl_6AD8,
d_course_dks_jungle_parkway_dl_6BE8, d_course_dks_jungle_parkway_dl_6CB8, d_course_dks_jungle_parkway_dl_6C70, d_course_dks_jungle_parkway_dl_6D10,
d_course_dks_jungle_parkway_dl_6D88, d_course_dks_jungle_parkway_dl_6E48, d_course_dks_jungle_parkway_dl_6E00, d_course_dks_jungle_parkway_dl_6EB0,
d_course_dks_jungle_parkway_dl_6F10, d_course_dks_jungle_parkway_dl_7080, d_course_dks_jungle_parkway_dl_7008, d_course_dks_jungle_parkway_dl_7108,
};

4
src/actors/kiwano_fruit/render.inc.c
View File

@ -1,7 +1,7 @@
#include <actors.h>
#include <libultra/gbi.h>
#include <main.h>
#include <assets/dks_jungle_parkway_data.h>
//#include <assets/dks_jungle_parkway_data.h>
/**
* @brief Renders the kiwano fruit actor.
@ -24,7 +24,7 @@ void render_actor_kiwano_fruit(UNUSED Camera *camera, Mat4 arg1, struct Actor *a
maxObjectsReached = render_set_position(arg1, 0) == 0;
if (maxObjectsReached) { return; }
addr = (actor->rot[0] << 0xA) + 0x03009000; // Can this be a real symbol? Doesn't match.
addr = segmented_texture_to_virtual((actor->rot[0] << 0xA) + 0x03009000);
gDPLoadTextureBlock(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(addr),
G_IM_FMT_CI, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP,
G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);

8
src/actors/paddle_boat/render.inc.c
View File

@ -5,7 +5,7 @@
#include "main.h"
#include "actors.h"
#include "courses/all_course_data.h"
#include <assets/dks_jungle_parkway_data.h>
//#include <assets/dks_jungle_parkway_data.h>
#include <libultra/gbi.h>
/**
@ -38,8 +38,8 @@ void render_actor_paddle_boat(Camera *arg0, struct PaddleWheelBoat *boat, UNUSED
if (render_set_position(spE0, 1) != 0) {
// Render the boat
gSPDisplayList(gDisplayListHead++, &d_course_dks_jungle_parkway_boat_dl);
gSPDisplayList(gDisplayListHead++, &d_course_dks_jungle_parkway_railings_dl);
gSPDisplayList(gDisplayListHead++, d_course_dks_jungle_parkway_boat_dl);
gSPDisplayList(gDisplayListHead++, d_course_dks_jungle_parkway_railings_dl);
mtxf_rotate_x(spE0, boat->wheelRot);
vec3f_set(sp120, 0, 16.0f, -255.0f);
@ -48,7 +48,7 @@ void render_actor_paddle_boat(Camera *arg0, struct PaddleWheelBoat *boat, UNUSED
if (render_set_position(sp60, 3) != 0) {
// Render the paddle wheel
gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
gSPDisplayList(gDisplayListHead++, &d_course_dks_jungle_parkway_paddle_wheel_dl);
gSPDisplayList(gDisplayListHead++, d_course_dks_jungle_parkway_paddle_wheel_dl);
gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
}

3
src/code_80005FD0.c
View File

@ -35,6 +35,7 @@
#include "data/path_spawn_metadata.h"
#include <assets/kalimari_desert_data.h>
#include <assets/frappe_snowland_data.h>
#include <assets/dks_jungle_parkway_data.h>
s32 unk_code_80005FD0_pad[24];
Collision D_80162E70;
@ -4325,7 +4326,7 @@ void func_800120C8(void) {
}
void func_80012190(void) {
TrackWaypoint *tree = NULL; // LOAD_ASSET(d_course_dks_jungle_parkway_unknown_waypoints2);
TrackWaypoint *tree = (TrackWaypoint *) LOAD_ASSET(d_course_dks_jungle_parkway_unknown_waypoints2);
s32 i;
for (i = 0; ; i++) {

2
src/data/path_spawn_metadata.c
View File

@ -7,10 +7,10 @@
#include <assets/kalimari_desert_data.h>
#include <assets/moo_moo_farm_data.h>
#include <assets/choco_mountain_data.h>
#include <assets/dks_jungle_parkway_data.h>
#include <assets/wario_stadium_data.h>
#include <assets/bowsers_castle_data.h>
#include <assets/frappe_snowland_data.h>
#include <assets/dks_jungle_parkway_data.h>
// @warning Array contains an extra zero element at the end.
KartAIBehaviour *gKartAIBehaviourLUT[] = {

3
src/port/Engine.cpp
View File

@ -12,6 +12,7 @@
#include "resource/importers/TrackSectionsFactory.h"
#include "resource/importers/TrackWaypointFactory.h"
#include "resource/importers/ActorSpawnDataFactory.h"
#include "resource/importers/UnkActorSpawnDataFactory.h"
#include "resource/importers/ArrayFactory.h"
#include <Fast3D/Fast3dWindow.h>
@ -74,7 +75,7 @@ GameEngine::GameEngine() {
loader->RegisterResourceFactory(std::make_shared<MK64::ResourceFactoryBinaryTrackSectionsV0>(), RESOURCE_FORMAT_BINARY, "TrackSections", static_cast<uint32_t>(MK64::ResourceType::TrackSection), 0);
loader->RegisterResourceFactory(std::make_shared<MK64::ResourceFactoryBinaryTrackWaypointsV0>(), RESOURCE_FORMAT_BINARY, "Waypoints", static_cast<uint32_t>(MK64::ResourceType::Waypoints), 0);
loader->RegisterResourceFactory(std::make_shared<MK64::ResourceFactoryBinaryActorSpawnDataV0>(), RESOURCE_FORMAT_BINARY, "SpawnData", static_cast<uint32_t>(MK64::ResourceType::SpawnData), 0);
loader->RegisterResourceFactory(std::make_shared<MK64::ResourceFactoryBinaryActorSpawnDataV0>(), RESOURCE_FORMAT_BINARY, "UnkSpawnData", static_cast<uint32_t>(MK64::ResourceType::UnkSpawnData), 0);
loader->RegisterResourceFactory(std::make_shared<MK64::ResourceFactoryBinaryUnkActorSpawnDataV0>(), RESOURCE_FORMAT_BINARY, "UnkSpawnData", static_cast<uint32_t>(MK64::ResourceType::UnkSpawnData), 0);
}

15
src/racing/memory.c
View File

@ -18,9 +18,6 @@
#include "courses/all_course_model.h"
#include "defines.h"
#include <assets/dks_jungle_parkway_displaylists.h>
#include <assets/dks_jungle_parkway_vertices.h>
#include <assets/dks_jungle_parkway_data.h>
#include <assert.h>
#include <course_offsets.h>
@ -121,12 +118,18 @@ void *segment_vtx_to_virtual(size_t offset) {
return (void *) (gSegmentTable[0x04] + (offset));
}
void *segmented_texture_to_virtual(size_t offset) {
void *segment5_to_virtual(size_t offset) {
//printf("seg_texture_to_virt: 0x%llX to 0x%llX\n", offset, (gSegmentTable[0x05] + offset));
return (void *) (gSegmentTable[0x05] + (offset));
}
void *segmented_texture_to_virtual(uintptr_t addr) {
uint32_t segment = SEGMENT_NUMBER(addr);
size_t offset = SEGMENT_OFFSET(addr);
//printf("seg_texture_to_virt: 0x%llX to 0x%llX\n", offset, (gSegmentTable[segment] + offset));
return (void *) (gSegmentTable[segment] + (offset));
}
void *segmented_uintptr_t_to_virtual(uintptr_t addr) {
uint32_t newAddr = (uint32_t) addr;
size_t segment = (uintptr_t) newAddr >> 24;
@ -861,7 +864,7 @@ void unpack_tile_load_sync(Gfx *gfx, u8 *args, s8 opcode) {
lo = ((uintptr_t)(uint8_t)G_SETTIMG << 24) | (fmt << 21) | (siz << 19);
gfx[sGfxSeekPosition].words.w0 = lo;
gfx[sGfxSeekPosition].words.w1 = segmented_texture_to_virtual(offset);
gfx[sGfxSeekPosition].words.w1 = segment5_to_virtual(offset);
sGfxSeekPosition++;
gfx[sGfxSeekPosition].words.w0 = tileSync->words.w0;

2
src/racing/memory.h
View File

@ -49,7 +49,7 @@ void *get_segment_base_addr(s32);
void *segmented_to_virtual(const void *);
void *segment_offset_to_virtual(uint32_t, uint32_t);
void *segment_vtx_to_virtual(size_t offset);
void *segmented_texture_to_virtual(size_t offset);
void *segmented_texture_to_virtual(uintptr_t addr);
void *segmented_uintptr_t_to_virtual(uintptr_t);
void *segmented_gfx_to_virtual(const void *);
void move_segment_table_to_dmem(void);

8
src/racing/render_courses.c
View File

@ -1220,7 +1220,7 @@ void render_double_deck(UNUSED struct UnkStruct_800DC5EC *arg0) {
gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
// d_course_double_deck_packed_dl_738
gSPDisplayList(gDisplayListHead++, ((uintptr_t)segmented_gfx_to_virtual(0x07000738)));
gSPDisplayList(gDisplayListHead++, (segmented_gfx_to_virtual(0x07000738)));
gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
}
@ -1237,13 +1237,13 @@ void render_dks_jungle_parkway(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_dks_jungle_parkway_packed_dl_92D8
gSPDisplayList(gDisplayListHead++, ((uintptr_t)segmented_gfx_to_virtual(0x070092D8)));
gSPDisplayList(gDisplayListHead++, (segmented_gfx_to_virtual(0x070092D8)));
}
gSPTexture(gDisplayListHead++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA);
gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2);
render_course_segments((uintptr_t) d_course_dks_jungle_parkway_unknown_dl_list, arg0);
render_course_segments(dks_jungle_parkway_dls, arg0);
gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
}
@ -1664,7 +1664,7 @@ void func_80295D88(void) {
func_80295C6C();
D_8015F8E4 = -475.0f;
// d_course_dks_jungle_parkway_packed_dl_3FA8
find_vtx_and_set_colours((uintptr_t)segmented_gfx_to_virtual(0x07003FA8), 120, 255, 255, 255);
find_vtx_and_set_colours(segmented_gfx_to_virtual(0x07003FA8), 120, 255, 255, 255);
break;
case COURSE_BIG_DONUT:
// d_course_big_donut_packed_dl_1018

37
yamls/us/dks_jungle_parkway_data.yml
View File

@ -543,7 +543,7 @@ d_course_dks_jungle_parkway_mario_sign:
width: 64
height: 32
format: rgba16
ctype: u8
ctype: u16
d_course_dks_jungle_parkway_tree:
symbol: d_course_dks_jungle_parkway_tree
type: texture
@ -551,7 +551,7 @@ d_course_dks_jungle_parkway_tree:
width: 32
height: 32
format: rgba16
ctype: u8
ctype: u16
d_course_dks_jungle_parkway_boat_window_upper:
symbol: d_course_dks_jungle_parkway_boat_window_upper
type: texture
@ -559,7 +559,7 @@ d_course_dks_jungle_parkway_boat_window_upper:
width: 32
height: 64
format: rgba16
ctype: u8
ctype: u16
d_course_dks_jungle_parkway_boat_window_lower:
symbol: d_course_dks_jungle_parkway_boat_window_lower
type: texture
@ -567,7 +567,7 @@ d_course_dks_jungle_parkway_boat_window_lower:
width: 32
height: 64
format: rgba16
ctype: u8
ctype: u16
d_course_dks_jungle_parkway_boat_railing:
symbol: d_course_dks_jungle_parkway_boat_railing
type: texture
@ -575,7 +575,7 @@ d_course_dks_jungle_parkway_boat_railing:
width: 32
height: 32
format: rgba16
ctype: u8
ctype: u16
d_course_dks_jungle_parkway_dl_DE48:
symbol: d_course_dks_jungle_parkway_dl_DE48
type: gfx
@ -674,7 +674,7 @@ d_course_dks_jungle_parkway_boat_paddle:
width: 32
height: 32
format: rgba16
ctype: u8
ctype: u16
d_course_dks_jungle_parkway_boat_paddle2:
symbol: d_course_dks_jungle_parkway_boat_paddle2
type: texture
@ -682,7 +682,7 @@ d_course_dks_jungle_parkway_boat_paddle2:
width: 32
height: 32
format: rgba16
ctype: u8
ctype: u16
d_course_dks_jungle_parkway_dl_FAE0:
symbol: d_course_dks_jungle_parkway_dl_FAE0
type: gfx
@ -715,7 +715,7 @@ d_course_dks_jungle_parkway_tree2_top:
width: 32
height: 32
format: rgba16
ctype: u8
ctype: u16
d_course_dks_jungle_parkway_tree2_trunk:
symbol: d_course_dks_jungle_parkway_tree2_trunk
type: texture
@ -723,7 +723,7 @@ d_course_dks_jungle_parkway_tree2_trunk:
width: 32
height: 32
format: rgba16
ctype: u8
ctype: u16
d_course_dks_jungle_parkway_dl_tree1:
symbol: d_course_dks_jungle_parkway_dl_tree1
type: gfx
@ -740,7 +740,7 @@ d_course_dks_jungle_parkway_tree3:
width: 32
height: 32
format: rgba16
ctype: u8
ctype: u16
d_course_dks_jungle_parkway_tree4:
symbol: d_course_dks_jungle_parkway_tree4
type: texture
@ -748,7 +748,7 @@ d_course_dks_jungle_parkway_tree4:
width: 32
height: 32
format: rgba16
ctype: u8
ctype: u16
d_course_dks_jungle_parkway_dl_tree2:
symbol: d_course_dks_jungle_parkway_dl_tree2
type: gfx
@ -765,7 +765,7 @@ d_course_dks_jungle_parkway_tree_trunk:
width: 32
height: 32
format: rgba16
ctype: u8
ctype: u16
d_course_dks_jungle_parkway_tree5:
symbol: d_course_dks_jungle_parkway_tree5
type: texture
@ -773,7 +773,7 @@ d_course_dks_jungle_parkway_tree5:
width: 32
height: 32
format: rgba16
ctype: u8
ctype: u16
d_course_dks_jungle_parkway_dl_tree3:
symbol: d_course_dks_jungle_parkway_dl_tree3
type: gfx
@ -785,9 +785,12 @@ d_course_dks_jungle_parkway_palm_tree_model:
count: 16
d_course_dks_jungle_parkway_palm_tree:
symbol: d_course_dks_jungle_parkway_palm_tree
type: vtx
type: texture
offset: 0x13078
count: 16
ctype: u16
width: 32
height: 32
format: rgba16
d_course_dks_jungle_parkway_dl_13878:
symbol: d_course_dks_jungle_parkway_dl_13878
type: gfx
@ -803,7 +806,7 @@ d_course_dks_jungle_parkway_kiwano_tlut:
width: 16
height: 16
format: rgba16
ctype: u8
ctype: u16
d_course_dks_jungle_parkway_kiwano_model:
symbol: d_course_dks_jungle_parkway_kiwano_model
type: vtx
@ -826,7 +829,7 @@ d_course_dks_jungle_parkway_tree_spawn:
symbol: d_course_dks_jungle_parkway_tree_spawn
type: mk64:unk_spawn_data
offset: 0x13F78
count: 31
count: 96
d_course_dks_jungle_parkway_addr:
symbol: d_course_dks_jungle_parkway_addr
type: mk64:track_sections

2
yamls/us/other_textures.yml
View File

@ -3354,7 +3354,7 @@ texture_69C9C4:
symbol: gTexture69C9C4
type: texture
mio0: true
ctype: u16
ctype: u8
width: 16
height: 16
offset: 0x5AA54