mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-22 06:45:31 +00:00
Code Issues Projects Releases Wiki Activity

Hopefully fix the N64DD issues

Browse source
This commit is contained in:
Pablo 2024-10-26 17:08:21 +02:00
parent 8eccba7846
commit 7230a2de6a
3 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
include/n64dd.h
View file

@ -19,9 +19,8 @@ struct RegEditor;
struct RoomContext; struct RoomContext;
struct SaveContext; struct SaveContext;
struct Scene; struct Scene;
struct MapMarkData; struct MapMarkIconData;
struct PauseMapMarksData; struct PauseMapMarkData;
struct SceneDrawConfigFunc;
struct DmaRequest; struct DmaRequest;
// TODO Use the specific pointer types instead of void* // TODO Use the specific pointer types instead of void*
@ -46,10 +45,10 @@ typedef struct n64ddStruct_80121220 {
s32 (*unk_20)(struct MapData*); s32 (*unk_20)(struct MapData*);
s32 (*unk_24)(void); s32 (*unk_24)(void);
s32 (*unk_28)(struct PlayState*); s32 (*unk_28)(struct PlayState*);
s32 (*unk_2C)(struct MapMarkData***); s32 (*unk_2C)(struct MapMarkIconData***[3]);
s32 (*unk_30)(struct MapMarkData***); s32 (*unk_30)(struct MapMarkIconData***[3]);
void (*unk_34)(struct PauseMapMarksData**); void (*unk_34)(struct PauseMapMarkData**[3]);
void (*unk_38)(struct PauseMapMarksData**); void (*unk_38)(struct PauseMapMarkData**[3]);
void (*unk_3C)(void); void (*unk_3C)(void);
void (*unk_40)(void); void (*unk_40)(void);
s32 (*unk_44)(struct PlayState*); s32 (*unk_44)(struct PlayState*);
@ -68,7 +67,7 @@ typedef struct n64ddStruct_80121220 {
#if OOT_PAL #if OOT_PAL
s32 (*unk_6C_PAL)(struct Font*); s32 (*unk_6C_PAL)(struct Font*);
#endif #endif
void (*unk_6C)(struct PlayState*, struct SceneDrawConfigFunc*); void (*unk_6C)(struct PlayState*, void(**)(struct PlayState*));
s32 (*unk_70)(struct DmaRequest* req, void* ram, uintptr_t vrom, size_t size, u32 unk, OSMesgQueue* queue, OSMesg msg); s32 (*unk_70)(struct DmaRequest* req, void* ram, uintptr_t vrom, size_t size, u32 unk, OSMesgQueue* queue, OSMesg msg);
void (*unk_74)(struct GameState*); void (*unk_74)(struct GameState*);
s32 (*unk_78)(struct PlayState*, void*, void*); s32 (*unk_78)(struct PlayState*, void*, void*);

4
src/code/z_map_mark.c
View file

@ -59,7 +59,7 @@ void MapMark_Init(PlayState* play) {
#if PLATFORM_N64 #if PLATFORM_N64
if ((B_80121220 != NULL) && (B_80121220->unk_2C != NULL)) { if ((B_80121220 != NULL) && (B_80121220->unk_2C != NULL)) {
B_80121220->unk_2C(&sLoadedMarkDataTable); B_80121220->unk_2C((MapMarkIconData****)&sLoadedMarkDataTable);
} }
#endif #endif
} }
@ -67,7 +67,7 @@ void MapMark_Init(PlayState* play) {
void MapMark_ClearPointers(PlayState* play) { void MapMark_ClearPointers(PlayState* play) {
#if PLATFORM_N64 #if PLATFORM_N64
if ((B_80121220 != NULL) && (B_80121220->unk_30 != NULL)) { if ((B_80121220 != NULL) && (B_80121220->unk_30 != NULL)) {
B_80121220->unk_30(&sLoadedMarkDataTable); B_80121220->unk_30((MapMarkIconData****)&sLoadedMarkDataTable);
} }
#endif #endif

4
src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c
View file

@ -32,7 +32,7 @@ void PauseMapMark_Init(PlayState* play) {
gLoadedPauseMarkDataTable = gPauseMapMarkDataTable; gLoadedPauseMarkDataTable = gPauseMapMarkDataTable;
#if PLATFORM_N64 #if PLATFORM_N64
if ((B_80121220 != NULL) && (B_80121220->unk_34 != NULL)) { if ((B_80121220 != NULL) && (B_80121220->unk_34 != NULL)) {
B_80121220->unk_34(&gLoadedPauseMarkDataTable); B_80121220->unk_34((PauseMapMarkData***)&gLoadedPauseMarkDataTable);
} }
#endif #endif
} }
@ -40,7 +40,7 @@ void PauseMapMark_Init(PlayState* play) {
void PauseMapMark_Clear(PlayState* play) { void PauseMapMark_Clear(PlayState* play) {
#if PLATFORM_N64 #if PLATFORM_N64
if ((B_80121220 != NULL) && (B_80121220->unk_38 != NULL)) { if ((B_80121220 != NULL) && (B_80121220->unk_38 != NULL)) {
B_80121220->unk_38(&gLoadedPauseMarkDataTable); B_80121220->unk_38((PauseMapMarkData***)&gLoadedPauseMarkDataTable);
} }
#endif #endif
gLoadedPauseMarkDataTable = NULL; gLoadedPauseMarkDataTable = NULL;