mirror of
https://github.com/zeldaret/st
synced 2026-06-08 20:20:30 -04:00
Misc Stuff 2 (#33)
* match UnkStruct_ov000_020b4f84_00_Base * lots of random stuff * match other funcs from game.cpp * data_02049a2c -> gGame, UnkStruct_02049a2c -> Game * match operator new * fix regressions * fix some warnings * another round of random things * another round of random things 2 * complete slots column in overlays.md * add scene indices * gamemode stuff * misc stuff * fix build issues * document random things * fix regressions * final round of random things (for now)
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
#include "FileSelect/FileSelect.hpp"
|
||||
#include "Game/Game.hpp"
|
||||
#include "Game/GameModeFileSelect.hpp"
|
||||
#include "Save/SaveManager.hpp"
|
||||
#include "Unknown/UnkStruct_02049a2c.hpp"
|
||||
#include "Unknown/UnkStruct_0204a088.hpp"
|
||||
#include "Unknown/UnkStruct_0204a110.hpp"
|
||||
#include "Unknown/UnkStruct_0204af1c.hpp"
|
||||
@@ -1131,7 +1131,7 @@ ARM void FileSelectMain::vfunc_08(Input *pButtons, TouchControl *pTouchControl)
|
||||
}
|
||||
|
||||
ARM void FileSelectMain::func_ov019_020c8290() {
|
||||
if ((data_02049a2c.GetUnk00_FileSelect()->mUnk_04.mUnk_08 & 0xFFFF) == 0xFFFF) {
|
||||
if ((gGame.GetGameModeFileSelect()->mUnk_04.mUnk_08 & 0xFFFF) == 0xFFFF) {
|
||||
this->SetState(FileSelectState_Init);
|
||||
}
|
||||
}
|
||||
@@ -1342,7 +1342,7 @@ ARM void FileSelectMain::func_ov019_020c9c70() {
|
||||
break;
|
||||
case BTN_ID_FILE_SELECT_CONTACT_MODE:
|
||||
this->SetState(FileSelectState_ChooseModeToContactMode);
|
||||
data_02049a2c.GetUnk00_FileSelect()->LoadContactMode(this->mSaveSlotIndex);
|
||||
gGame.GetGameModeFileSelect()->LoadContactMode(this->mSaveSlotIndex);
|
||||
data_ov000_020b5214.func_ov000_0206db44(0x1C);
|
||||
break;
|
||||
case BTN_ID_FILE_SELECT_OPTIONS:
|
||||
@@ -1405,10 +1405,10 @@ ARM void FileSelectMain::func_ov019_020c9e08() {
|
||||
this->mUnk_155C.func_ov000_020609c4();
|
||||
|
||||
if (this->mExitMode == FileSelectExitMode_AdventureMode && this->mUnk_00BC.mUnk_0C) {
|
||||
data_02049a2c.GetUnk00_FileSelect()->LoadAdventureMode(this->mSaveSlotIndex);
|
||||
gGame.GetGameModeFileSelect()->LoadAdventureMode(this->mSaveSlotIndex);
|
||||
this->mExitMode = FileSelectExitMode_Unk_3;
|
||||
} else if (this->mExitMode == FileSelectExitMode_BattleMode && this->mUnk_00BC.mUnk_0C) {
|
||||
data_02049a2c.GetUnk00_FileSelect()->LoadBattleMode(this->mSaveSlotIndex);
|
||||
gGame.GetGameModeFileSelect()->LoadBattleMode(this->mSaveSlotIndex);
|
||||
this->mExitMode = FileSelectExitMode_Unk_3;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user