mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-07-11 06:34:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decomp src/00_Core/Map/MapManager.cpp (56%) (#101)

Browse Source 
* Fix

* Fix

* stupid typo

* Another dumb typo

* Fix

* Fix declaration

* Fix declaration

* Fix

* Fix symbols

* Corrections

* Fix regression in GetEntrancePos

---------

Co-authored-by: Aetias <aetias@outlook.com>
This commit is contained in:
SammygoodTunes
2025-07-24 19:23:29 +02:00
committed by GitHub
parent 2415d4899d
commit dda45d5574
23 changed files with 841 additions and 803 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/00_Core/Map/MapBase.cpp
+2 -2
View File
@@ -71,7 +71,7 @@ void TriggerBase::vfunc_08() {}
s32 MapBase::GetTriggerBoundingBox(unk32 param_2, AABB *param_3) {}
bool TriggerBase::GetBoundingBox(AABB *bbox) {}
s32 MapBase::GetTriggerBoundingBoxes(s32 param_2, AABB *param_3, s32 param_4) {}
bool MapBase::GetOverlappingTrigger(Vec3p *param_2) {}
unk8 MapBase::GetOverlappingTrigger(Vec3p *param_2) {}
bool TriggerBase::Overlaps(Vec3p *point) {}
TriggerBase *MapBase::FindTrigger(unk32 type) {}
unk8 MapBase::GetOverlappingTriggers(Vec3p *param_2, TriggerBase **triggers, unk32 capacity) {}
@@ -101,7 +101,7 @@ bool MapBase::func_ov00_020809b8(s32 param_2) {}
unk8 MapBase::func_ov00_02080a78(Vec3p *param_2) {}
void MapBase_Unk2::func_ov00_02080ad0(TriggerBase **param_2, TriggerBase **param_3) {}
unk8 MapBase::func_ov00_02080b24(Vec2b *param_2) {}
void MapBase::func_ov00_02080d08(unk32 param_2) {}
void MapBase::func_ov00_02080d08(Vec2b *param_2) {}
void MapBase::vfunc_bc() {}
void MapBase::vfunc_98(unk32 param_2, unk32 param_3, unk32 param_4) {}
void MapBase::vfunc_c0() {}
src/00_Core/Map/MapManager.cpp
+672 -686
View File
File diff suppressed because it is too large Load Diff
src/00_Core/Save/AdventureFlags.cpp
+28 -28
View File
@@ -87,16 +87,16 @@ ARM unk32 AdventureFlags::func_ov00_02097968(unk32 param1) {
aStack_c0.mUnk_16 = data_027e0db0.mUnk_04 > 0;
FlagsUnk2 FStack_d8;
FStack_d8.mUnk_00.mUnk_00 = 0x47;
FStack_d8.mUnk_04.mUnk_00 = 0;
FStack_d8.mUnk_04.mUnk_04 = 0;
FStack_d8.mUnk_04.mUnk_08 = -2;
FStack_d8.mUnk_04.mUnk_0c = 0;
FStack_d8.mUnk_04.mUnk_0e = -1;
FStack_d8.mUnk_04.mUnk_0f = 0;
FStack_d8.mUnk_04.mUnk_10 = 0;
FStack_d8.mUnk_04.mUnk_11 = 0;
aStack_c0.mUnk_00 = param1;
FStack_d8.mUnk_00.mUnk_00 = 0x47;
FStack_d8.mUnk_04.mUnk_00.x = 0;
FStack_d8.mUnk_04.mUnk_00.y = 0;
FStack_d8.mUnk_04.mUnk_00.z = -2;
FStack_d8.mUnk_04.mUnk_0c = 0;
FStack_d8.mUnk_04.mUnk_0e = -1;
FStack_d8.mUnk_04.mUnk_0f = 0;
FStack_d8.mUnk_04.mUnk_10 = 0;
FStack_d8.mUnk_04.mUnk_11 = 0;
aStack_c0.mUnk_00 = param1;
aStack_c0.mUnk_0c = AdventureFlags::Get_FlagsUnk_00(param1, &FStack_d8);
gMapManager->func_ov000_02098d34(&FStack_d8);
@@ -173,28 +173,28 @@ ARM unk32 AdventureFlags::Get_FlagsUnk_30(s32 index) {
}
ARM bool AdventureFlags::Get_FlagsUnk_00(s32 index, FlagsUnk2 *result) {
result->mUnk_00 = data_ov000_020e310c[index].mUnk_00.mUnk_00;
result->mUnk_04.mUnk_00 = data_ov000_020e310c[index].mUnk_00.mUnk_04.mUnk_00;
result->mUnk_04.mUnk_04 = data_ov000_020e310c[index].mUnk_00.mUnk_04.mUnk_04;
result->mUnk_04.mUnk_08 = data_ov000_020e310c[index].mUnk_00.mUnk_04.mUnk_08;
result->mUnk_04.mUnk_0c = data_ov000_020e310c[index].mUnk_00.mUnk_04.mUnk_0c;
result->mUnk_04.mUnk_0e = data_ov000_020e310c[index].mUnk_00.mUnk_04.mUnk_0e;
result->mUnk_04.mUnk_0f = data_ov000_020e310c[index].mUnk_00.mUnk_04.mUnk_0f;
result->mUnk_04.mUnk_10 = data_ov000_020e310c[index].mUnk_00.mUnk_04.mUnk_10;
result->mUnk_04.mUnk_11 = data_ov000_020e310c[index].mUnk_00.mUnk_04.mUnk_11;
result->mUnk_00 = data_ov000_020e310c[index].mUnk_00.mUnk_00;
result->mUnk_04.mUnk_00.x = data_ov000_020e310c[index].mUnk_00.mUnk_04.mUnk_00.x;
result->mUnk_04.mUnk_00.y = data_ov000_020e310c[index].mUnk_00.mUnk_04.mUnk_00.y;
result->mUnk_04.mUnk_00.z = data_ov000_020e310c[index].mUnk_00.mUnk_04.mUnk_00.z;
result->mUnk_04.mUnk_0c = data_ov000_020e310c[index].mUnk_00.mUnk_04.mUnk_0c;
result->mUnk_04.mUnk_0e = data_ov000_020e310c[index].mUnk_00.mUnk_04.mUnk_0e;
result->mUnk_04.mUnk_0f = data_ov000_020e310c[index].mUnk_00.mUnk_04.mUnk_0f;
result->mUnk_04.mUnk_10 = data_ov000_020e310c[index].mUnk_00.mUnk_04.mUnk_10;
result->mUnk_04.mUnk_11 = data_ov000_020e310c[index].mUnk_00.mUnk_04.mUnk_11;
return true;
}
ARM bool AdventureFlags::Get_FlagsUnk_18(s32 index, FlagsUnk2 *result) {
result->mUnk_00 = data_ov000_020e310c[index].mUnk_18.mUnk_00;
result->mUnk_04.mUnk_00 = data_ov000_020e310c[index].mUnk_18.mUnk_04.mUnk_00;
result->mUnk_04.mUnk_04 = data_ov000_020e310c[index].mUnk_18.mUnk_04.mUnk_04;
result->mUnk_04.mUnk_08 = data_ov000_020e310c[index].mUnk_18.mUnk_04.mUnk_08;
result->mUnk_04.mUnk_0c = data_ov000_020e310c[index].mUnk_18.mUnk_04.mUnk_0c;
result->mUnk_04.mUnk_0e = data_ov000_020e310c[index].mUnk_18.mUnk_04.mUnk_0e;
result->mUnk_04.mUnk_0f = data_ov000_020e310c[index].mUnk_18.mUnk_04.mUnk_0f;
result->mUnk_04.mUnk_10 = data_ov000_020e310c[index].mUnk_18.mUnk_04.mUnk_10;
result->mUnk_04.mUnk_11 = data_ov000_020e310c[index].mUnk_18.mUnk_04.mUnk_11;
result->mUnk_00 = data_ov000_020e310c[index].mUnk_18.mUnk_00;
result->mUnk_04.mUnk_00.x = data_ov000_020e310c[index].mUnk_18.mUnk_04.mUnk_00.x;
result->mUnk_04.mUnk_00.y = data_ov000_020e310c[index].mUnk_18.mUnk_04.mUnk_00.y;
result->mUnk_04.mUnk_00.z = data_ov000_020e310c[index].mUnk_18.mUnk_04.mUnk_00.z;
result->mUnk_04.mUnk_0c = data_ov000_020e310c[index].mUnk_18.mUnk_04.mUnk_0c;
result->mUnk_04.mUnk_0e = data_ov000_020e310c[index].mUnk_18.mUnk_04.mUnk_0e;
result->mUnk_04.mUnk_0f = data_ov000_020e310c[index].mUnk_18.mUnk_04.mUnk_0f;
result->mUnk_04.mUnk_10 = data_ov000_020e310c[index].mUnk_18.mUnk_04.mUnk_10;
result->mUnk_04.mUnk_11 = data_ov000_020e310c[index].mUnk_18.mUnk_04.mUnk_11;
return true;
}
src/00_Core/Save/FlagsUnk.cpp
+2 -1
View File
@@ -1,4 +1,5 @@
#include "Save/AdventureFlags.hpp"
FlagsUnk::~FlagsUnk() {}
FlagsUnk2::~FlagsUnk2() {}
// FlagsUnk2::~FlagsUnk2() {}
void FlagsUnk::func_ov000_020980f8() {}
src/04_Load/Map/MapManager.cpp
+1 -1
View File
@@ -7,5 +7,5 @@ void MapManager::Destroy() {}
void MapManager::LoadMapTexSprites(s32 param1) {}
void MapManager::func_ov004_02102260() {}
void MapManager::func_ov004_02102264(unk32 *param1, char *param2) {}
void MapManager::func_ov004_021024c4(unk32 *param1, unk32 param2, bool param3) {}
void MapManager::func_ov004_021024c4(FlagsUnk2 *param1, bool param2, bool param3) {}
void MapManager::func_ov004_021025d8() {}
src/09_Adventure/Game/GameModeAdventure.cpp
+9 -9
View File
@@ -46,15 +46,15 @@ THUMB GameModeAdventure::GameModeAdventure(unk32 param1) :
data_027e1044 = param1;
func_ov003_020f4510();
local_28.mUnk_00.mUnk_00 = 0x47;
local_28.mUnk_04.mUnk_00 = 0;
local_28.mUnk_04.mUnk_04 = 0;
local_28.mUnk_04.mUnk_08 = -2;
local_28.mUnk_04.mUnk_0c = 0;
local_28.mUnk_04.mUnk_0e = -1;
local_28.mUnk_04.mUnk_0f = 0;
local_28.mUnk_04.mUnk_10 = 0;
local_28.mUnk_04.mUnk_11 = 0;
local_28.mUnk_00.mUnk_00 = 0x47;
local_28.mUnk_04.mUnk_00.x = 0;
local_28.mUnk_04.mUnk_00.y = 0;
local_28.mUnk_04.mUnk_00.z = -2;
local_28.mUnk_04.mUnk_0c = 0;
local_28.mUnk_04.mUnk_0e = -1;
local_28.mUnk_04.mUnk_0f = 0;
local_28.mUnk_04.mUnk_10 = 0;
local_28.mUnk_04.mUnk_11 = 0;
if (gGame.mUnk_102 != 0) {
AdventureFlags::Get_FlagsUnk_00(0x17, &local_28);
src/Main/Unknown/UnkStruct_020397f8.cpp
+1 -1
View File
@@ -988,7 +988,7 @@ ARM bool UnkStruct_020397f8::func_0203c1a0() {
this->mUnk_584 = 1;
pVar1 = (s8 *) data_027e103c->func_ov000_020cef9c();
iVar3 = data_027e0f7c.func_ov000_0209d90c(pVar1[0x24F], 0);
iVar3 = data_027e0f7c->func_ov000_0209d90c(pVar1[0x24F], 0);
data_027e1054->func_ov003_020f4760(iVar3[1], 0);
data_ov000_020eec9c.func_ov000_020d77e4(6);
data_027e103c->func_ov000_020cfb58();