mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-03 01:58:44 -04:00
m_Do_MemCard/d_file_select wii/debug work (#2976)
* m_Do_MemCard/d_file_select wii/debug work * fix builds
This commit is contained in:
+2961
-1609
File diff suppressed because it is too large
Load Diff
@@ -7,6 +7,7 @@
|
||||
|
||||
#include "d/d_map.h"
|
||||
#include "JSystem/JHostIO/JORFile.h"
|
||||
#include "JSystem/JHostIO/JORServer.h"
|
||||
#include "JSystem/JUtility/JUTTexture.h"
|
||||
#include "SSystem/SComponent/c_counter.h"
|
||||
#include "SSystem/SComponent/c_math.h"
|
||||
|
||||
@@ -1030,7 +1030,7 @@ void dMenu_Option_c::confirm_open_init() {
|
||||
}
|
||||
|
||||
void dMenu_Option_c::confirm_open_move() {
|
||||
bool status = mpWarning->getStatus();
|
||||
u32 status = mpWarning->getStatus();
|
||||
bool yesNoMenuMove = yesnoMenuMoveAnm();
|
||||
|
||||
if (field_0x374 != 1.0f) {
|
||||
@@ -1113,7 +1113,7 @@ void dMenu_Option_c::confirm_close_init() {
|
||||
}
|
||||
|
||||
void dMenu_Option_c::confirm_close_move() {
|
||||
bool status = mpWarning->getStatus();
|
||||
u32 status = mpWarning->getStatus();
|
||||
yesnoMenuMoveAnm();
|
||||
if (field_0x374 != 0.0f) {
|
||||
cLib_addCalc2(&field_0x374, 0.0f, 0.4f, 0.5);
|
||||
|
||||
@@ -1296,7 +1296,7 @@ void dMenu_save_c::memCardCommandEnd2() {
|
||||
bool headerTxtChanged = headerTxtChangeAnm();
|
||||
bool ketteiDispAnm = ketteiTxtDispAnm();
|
||||
bool modoruDispAnm = modoruTxtDispAnm();
|
||||
u32 check = mWarning->getStatus() != 0;
|
||||
u32 check = mWarning->getStatus();
|
||||
|
||||
if (headerTxtChanged == true && ketteiDispAnm == true && modoruDispAnm == true && check == 1) {
|
||||
mpErrFunc = NULL;
|
||||
@@ -1388,7 +1388,7 @@ void dMenu_save_c::gameContinueDisp() {
|
||||
bool headerTxtChanged = headerTxtChangeAnm();
|
||||
bool moveAnm = yesnoMenuMoveAnm();
|
||||
bool ketteiDispAnm = ketteiTxtDispAnm();
|
||||
u32 check = mWarning->getStatus() != 0;
|
||||
u32 check = mWarning->getStatus();
|
||||
|
||||
if (headerTxtChanged == true && moveAnm == true && ketteiDispAnm == true && check == 1) {
|
||||
yesnoCursorShow();
|
||||
@@ -1466,7 +1466,7 @@ void dMenu_save_c::gameContinue3() {
|
||||
void dMenu_save_c::saveEnd() {
|
||||
bool headerTxtChanged = headerTxtChangeAnm();
|
||||
bool ketteiDispAnm = ketteiTxtDispAnm();
|
||||
u32 check = mWarning->getStatus() != 0;
|
||||
u32 check = mWarning->getStatus();
|
||||
|
||||
if (headerTxtChanged == true && ketteiDispAnm == true && check == 1) {
|
||||
if (mUseType == TYPE_BLACK_EVENT) {
|
||||
@@ -1938,7 +1938,7 @@ void dMenu_save_c::saveMoveDisp() {
|
||||
bool yesnoAnmComplete = yesnoMenuMoveAnm();
|
||||
bool ketteiAnmComplete = ketteiTxtDispAnm();
|
||||
bool modoruAnmComplete = modoruTxtDispAnm();
|
||||
u32 check = mWarning->getStatus() != 0;
|
||||
u32 check = mWarning->getStatus();
|
||||
|
||||
if (headerTxtChanged == true && yesnoAnmComplete == true && ketteiAnmComplete == true &&
|
||||
modoruAnmComplete == 1 && check == 1) {
|
||||
@@ -1956,7 +1956,7 @@ void dMenu_save_c::saveMoveDisp2() {
|
||||
bool wakuAnmComplete = selectWakuAlpahAnm(mSelectedFile);
|
||||
bool ketteiAnmComplete = ketteiTxtDispAnm();
|
||||
bool modoruAnmComplete = modoruTxtDispAnm();
|
||||
u32 check = mWarning->getStatus() != 0;
|
||||
u32 check = mWarning->getStatus();
|
||||
|
||||
if (headerTxtChanged == true && dataMoveAnm == true && wakuAnmComplete == true &&
|
||||
ketteiAnmComplete == true && modoruAnmComplete == 1 && check == 1) {
|
||||
|
||||
Reference in New Issue
Block a user