mirror of
https://github.com/zeldaret/st
synced 2026-10-14 15:57:49 -04:00
Decompile overlay 1 (Part 3) (#95)
* ZeldaArrangeBinary OK * ZeldaMapBinary 26% * UnkStruct_SceneChange1 -> EntranceInfo * cleanup EntranceInfo ctors * fix regressions * ZeldaMapBinary 47% * fix regressions * ZeldaMapBinary 73% * ZeldaMapBinary 89% * ZeldaMapBinary 99%
This commit is contained in:
@@ -458,7 +458,7 @@ bool AdventureModeManager::func_ov024_020c5dac() {
|
||||
|
||||
bool AdventureModeManager::func_ov024_020c5ecc() {
|
||||
if (data_ov026_02138d10->func_ov026_020e13f4() != 0 && data_027e09b8->func_01ffd420() == 0 &&
|
||||
func_ov024_020d5304(data_027e09a4->mUnk_00.mSceneIndex) &&
|
||||
func_ov024_020d5304(data_027e09a4->mUnk_00.sceneIndex) &&
|
||||
(data_ov024_020d8660 == NULL || data_ov024_020d8660->mUnk_00 == NULL) && this->func_ov024_020c6a20() != 0 &&
|
||||
data_ov026_0213f590.func_ov026_020f7cc0() == 0) {
|
||||
return true;
|
||||
@@ -515,7 +515,7 @@ bool AdventureModeManager::func_ov024_020c60f4() {
|
||||
}
|
||||
|
||||
bool AdventureModeManager::func_ov024_020c623c() {
|
||||
u32 scene = data_027e09a4->mUnk_00.mSceneIndex;
|
||||
u32 scene = data_027e09a4->mUnk_00.sceneIndex;
|
||||
|
||||
if ((gOverlayManager.IsMapA6() && ActorUnkTUTO::func_ov037_02120a64() != 0) ||
|
||||
(data_027e09a4->GetCurrentCourseEntry()->unk_10 == 6 && scene == SceneIndex_f_trnnpc) ||
|
||||
@@ -911,7 +911,7 @@ void AdventureModeManager::func_ov024_020c6d2c(unk32 param1) {
|
||||
|
||||
bool AdventureModeManager::func_ov024_020c6d64() {
|
||||
if (data_027e09a4 != NULL && data_ov000_020b64f8 != NULL) {
|
||||
if (data_027e09a4->IsCutscene() && Cutscene_GetParamEntry(data_027e09a4->mUnk_00.mCutsceneIndex)->mUnk_18 == 1) {
|
||||
if (data_027e09a4->IsCutscene() && Cutscene_GetParamEntry(data_027e09a4->mUnk_00.csIndex)->mUnk_18 == 1) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -928,8 +928,8 @@ void AdventureModeManager::func_ov024_020c6db8(unk32 param1) {
|
||||
}
|
||||
|
||||
bool AdventureModeManager::func_ov024_020c6dec() {
|
||||
if (this->mUnk_1CC.sceneIndex == data_027e09a4->mUnk_00.mSceneIndex) {
|
||||
if (this->mUnk_1CC.sceneIndex == data_027e09a4->mUnk_00.mSceneIndex) {
|
||||
if (this->mUnk_1CC.sceneIndex == data_027e09a4->mUnk_00.sceneIndex) {
|
||||
if (this->mUnk_1CC.sceneIndex == data_027e09a4->mUnk_00.sceneIndex) {
|
||||
if (this->mUnk_1CC.unk_04 == data_027e0cd8->func_ov000_02081d5c()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user