1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-14 21:40:03 +00:00

Match z_select.c (#2076)

This commit is contained in:
Dragorn421 2024-08-24 02:38:50 +02:00 committed by GitHub
parent 614c411058
commit 9b409f5ff4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -8,6 +8,13 @@
#include "global.h" #include "global.h"
#include "terminal.h" #include "terminal.h"
#include "alloca.h" #include "alloca.h"
#include "z64.h"
#if PLATFORM_N64
#include "n64dd.h"
// TODO n64dd functions
void n64dd_SetDiskVersion(s32);
#endif
void MapSelect_LoadTitle(MapSelectState* this) { void MapSelect_LoadTitle(MapSelectState* this) {
this->state.running = false; this->state.running = false;
@ -44,6 +51,20 @@ void MapSelect_LoadGame(MapSelectState* this, s32 entranceIndex) {
SET_NEXT_GAMESTATE(&this->state, Play_Init, PlayState); SET_NEXT_GAMESTATE(&this->state, Play_Init, PlayState);
} }
#if PLATFORM_N64
void func_80800AD0_unknown(MapSelectState* this, s32 arg1) {
if (B_80121AE2 != 0) {
n64dd_SetDiskVersion(1);
}
}
void func_80800B08_unknown(MapSelectState* this, s32 arg1) {
if (B_80121AE2 != 0) {
n64dd_SetDiskVersion(0);
}
}
#endif
// "Translation" (Actual name) // "Translation" (Actual name)
static SceneSelectEntry sScenes[] = { static SceneSelectEntry sScenes[] = {
{ " 1:SPOT00", MapSelect_LoadGame, ENTR_HYRULE_FIELD_0 }, { " 1:SPOT00", MapSelect_LoadGame, ENTR_HYRULE_FIELD_0 },
@ -288,6 +309,10 @@ static SceneSelectEntry sScenes[] = {
#endif #endif
// "title" (Title Screen) // "title" (Title Screen)
{ "title", (void*)MapSelect_LoadTitle, 0 }, { "title", (void*)MapSelect_LoadTitle, 0 },
#if PLATFORM_N64
{ "64DD TEST n64dd_SetDiskVersion(1)", (void*)func_80800AD0_unknown, 0 },
{ "64DD TEST2 n64dd_SetDiskVersion(0)", (void*)func_80800B08_unknown, 0 },
#endif
}; };
void MapSelect_UpdateMenu(MapSelectState* this) { void MapSelect_UpdateMenu(MapSelectState* this) {