mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-05-25 07:22:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'decomp/MapManager' of github-aetias-hax:SammygoodTunes/ph into decomp/MapManager

Browse Source
This commit is contained in:
Aetias
2025-07-01 22:22:36 +02:00
parent 9bdae8e605 f3c7896c19
commit c1ec58c8b0
22 changed files with 858 additions and 957 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/00_Core/Actor/Actor.cpp
+1 -1
View File
@@ -860,7 +860,7 @@ ARM bool Actor::func_ov00_020c3094() {
Vec3p pos, prevPos;
Vec3p_Copy(&mPos, &pos);
Vec3p_Copy(&mPrevPos, &prevPos);
s32 unk1 = gMapManager->func_ov00_02083ef8(&pos, &prevPos);
s32 unk1 = gMapManager->func_ov00_02083ef8(&pos, &prevPos, false);
if (mPos.y <= unk1) {
result = true;
mPos.y = unk1;
src/00_Core/Map/Course.cpp
+2 -2
View File
@@ -15,7 +15,7 @@ void Course::GetMCSFilePath(unk32 buf, s32 fileIndex, unk32 fileType) {}
void Course::GetMRCFilePath(unk32 param_2, unk32 buf, unk32 param_4) {}
void Course::func_ov00_0207ce20(unk32 param_2, unk32 param_3, char *param_4, unk32 param_5) {}
void Course::func_ov00_0207ce4c(s32 param_2, s32 param_3, unk32 param_4, char *param_5, unk32 param_6) {}
bool Course::func_ov00_0207d404(s32 param_2, unk32 param_3, unk32 param_4) {}
bool Course::func_ov00_0207d404(s32 param_2, unk32 param_3, unk32 param_4, unk32 param_5) {}
bool Course::IsCurrentMapInMainGrid() {}
bool Course::IsInMainGrid(s32 x, s32 y) {}
bool Course::IsMapInMainGrid(u32 map) {}
@@ -45,7 +45,7 @@ void Course::SetMapDataFlag2(unk32 param_2, bool param_3) {}
bool Course::GetMapDataFlag2(unk32 param_2) {}
void Course::SetMapDataFlag3(unk32 param_2, bool param_3) {}
bool Course::GetMapDataFlag3(unk32 param_2) {}
void Course::SetMapDataFlag4(unk32 param_2, unk32 param_3) {}
void Course::SetMapDataFlag4(unk32 param_2, bool param_3) {}
bool Course::GetMapDataFlag4(unk32 param_2) {}
MapData *Course::FindMapData(u32 map) {}
MapData *Course::FindCurrentMapData() {}
src/00_Core/Map/MapBase.cpp
+6 -6
View File
@@ -21,15 +21,15 @@ unk32 MapBase::vfunc_50() {}
unk32 MapBase::vfunc_54(Vec2b *param_1) {}
unk32 MapBase::vfunc_58(Vec2b *param_1, int param_2) {}
unk32 MapBase::vfunc_5c() {}
unk32 MapBase::vfunc_60(u8 *param_1) {}
unk32 MapBase::vfunc_60(Vec2b *param_1) {}
unk32 MapBase::vfunc_64() {}
unk8 MapBase::vfunc_68(Vec3p *param_1, bool param_2) {}
unk32 MapBase::vfunc_68(Vec3p *param_1, bool param_2) {}
unk8 MapBase::func_ov00_0207e940(unk8 *param_1) {}
unk8 MapBase::func_ov00_0207e968() {}
unk8 MapBase::func_ov00_0207e96c() {}
unk8 MapBase::vfunc_6c(unk32 param_2, unk32 param_3, unk32 param_4) {}
unk32 MapBase::vfunc_70(Vec3p *param_2) {}
s32 MapBase::vfunc_74(Vec3p *param_2) {}
unk32 *MapBase::vfunc_74(Vec3p *param_2) {}
unk8 MapBase::func_ov00_0207f100() {}
bool MapBase::func_ov00_0207f104(unk32 param_2, unk32 param_3) {}
unk32 MapBase::func_ov00_0207f1f4(Vec3p *param_2, unk32 *param_3) {}
@@ -40,12 +40,12 @@ void MapBase::vfunc_a0() {}
unk32 MapBase::vfunc_a4(unk8 *param_1) {}
void MapBase::vfunc_a8() {}
void MapBase::vfunc_ac() {}
unk32 MapBase::vfunc_78(Vec2b *param_1) {}
unk32 *MapBase::vfunc_78(Vec2b *param_1) {}
s32 MapBase::vfunc_7c(s32 param_1, unk32 *param_2, s32 param_3, short param_4[4]) {}
unk32 MapBase::vfunc_80() {}
void MapBase::vfunc_84(unk32 param_2) {}
bool MapBase::func_ov00_0207f38c(s32 *param_2) {}
unk8 MapBase::vfunc_90(unk32 param_2, unk32 param_3, unk32 param_4) {}
unk8 MapBase::vfunc_90(Vec2b *param_2, unk32 param_3) {}
void MapBase::vfunc_94() {}
void MapBase::func_ov00_0207f4a4(Vec2s *param_2, unk32 param_3) {}
void MapBase::func_ov00_0207f53c(Vec2s *param_1, MapBase *param_2, Vec3p *param_3) {}
@@ -73,7 +73,7 @@ bool TriggerBase::GetBoundingBox(AABB *bbox) {}
s32 MapBase::GetTriggerBoundingBoxes(s32 param_2, AABB *param_3, s32 param_4) {}
bool MapBase::GetOverlappingTrigger(Vec3p *param_2) {}
bool TriggerBase::Overlaps(Vec3p *point) {}
unk8 MapBase::FindTrigger(unk32 type) {}
TriggerBase *MapBase::FindTrigger(unk32 type) {}
unk8 MapBase::GetOverlappingTriggers(Vec3p *param_2, TriggerBase **triggers, unk32 capacity) {}
bool MapBase::IsTriggerTypeOverlapped(unk32 type, Vec3p *param_3) {}
bool MapBase::AnyTrigger_func_0c(unk32 type) {}
src/00_Core/Map/MapManager.cpp
+682 -787
View File
File diff suppressed because it is too large Load Diff
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(s32 param1, unk32 param2, unk32 param3) {}
void MapManager::func_ov004_021024c4(unk32 *param1, unk32 param2, bool param3) {}
void MapManager::func_ov004_021025d8() {}
src/18_Overworld/Map/MapOverworld.cpp
+1 -1
View File
@@ -22,7 +22,7 @@ s32 MapOverworld::func_ov018_0215c380(u8 *param1) {}
void MapOverworld::vfunc_bc() {}
void MapOverworld::vfunc_98() {}
void MapOverworld::vfunc_c0() {}
unk32 MapOverworld::vfunc_78() {}
unk32 *MapOverworld::vfunc_78() {}
unk32 MapOverworld::vfunc_7c() {}
unk32 MapOverworld::vfunc_80() {}
void MapOverworld::vfunc_b0(unk32 param_2, unk32 param_3) {}