mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-07-08 13:46:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decompile MapManager::GetCourseData_Unk_25c

Browse Source 
Decompile MapManager::func_ov00_02083328

Decompile MapManager::GetCourseMainGridSizeX

Decompile MapManager::GetCourseMainGridSizeY

Decompile MapManager::func_ov00_02083524
This commit is contained in:
SammygoodTunes
2025-01-12 00:27:33 +01:00
parent d11cc4a573
commit 1d2124ce9d
4 changed files with 64 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/eur/arm9/overlays/ov000/symbols.txt
+3 -3
View File
@@ -530,7 +530,7 @@ _ZN10MapManager18func_ov00_02082accEv kind:function(arm,size=0x10) addr:0x2082ac
_ZN10MapManager18func_ov00_02082adcEv kind:function(arm,size=0x18) addr:0x2082adc
_ZN10MapManager18func_ov00_02082af4Ev kind:function(arm,size=0x48) addr:0x2082af4
_ZN10MapManager18func_ov00_02082b3cEi kind:function(arm,size=0x1cc) addr:0x2082b3c
_ZN10MapManager18func_ov00_02082d08Ev kind:function(arm,size=0x20) addr:0x2082d08
_ZN10MapManager13UpdateMapGridEv kind:function(arm,size=0x20) addr:0x2082d08
_ZN10MapManager20GetCourseData_Unk_1cEv kind:function(arm,size=0xc) addr:0x2082d28
_ZN10MapManager20GetCourseData_Unk_1dEv kind:function(arm,size=0xc) addr:0x2082d34
_ZN10MapManager18func_ov00_02082d40Ev kind:function(arm,size=0x34) addr:0x2082d40
@@ -544,8 +544,8 @@ _ZN10MapManager18func_ov00_02083298EjPiS0_S0_ kind:function(arm,size=0x74) addr:
_ZN10MapManager21GetCourseData_Unk_25cEv kind:function(arm,size=0xc) addr:0x208330c
_ZN10MapManager18func_ov00_02083318Ei kind:function(arm,size=0x10) addr:0x2083318
_ZN10MapManager18func_ov00_02083328Ev kind:function(arm,size=0x1c) addr:0x2083328
_ZN10MapManager20GetCourseData_Unk_86Ev kind:function(arm,size=0xc) addr:0x2083344
_ZN10MapManager20GetCourseData_Unk_87Ev kind:function(arm,size=0xc) addr:0x2083350
_ZN10MapManager22GetCourseMainGridSizeXEv kind:function(arm,size=0xc) addr:0x2083344
_ZN10MapManager22GetCourseMainGridSizeYEv kind:function(arm,size=0xc) addr:0x2083350
_ZN10MapManager11GetMapWidthEv kind:function(arm,size=0xc) addr:0x208335c
_ZN10MapManager12GetMapHeightEv kind:function(arm,size=0xc) addr:0x2083368
_ZN10MapManager18func_ov00_02083374Ev kind:function(arm,size=0x10) addr:0x2083374
config/usa/arm9/overlays/ov000/symbols.txt
+3 -3
View File
@@ -530,7 +530,7 @@ _ZN10MapManager18func_ov00_02082accEv kind:function(arm,size=0x10) addr:0x2082a6
_ZN10MapManager18func_ov00_02082adcEv kind:function(arm,size=0x18) addr:0x2082a7c
_ZN10MapManager18func_ov00_02082af4Ev kind:function(arm,size=0x48) addr:0x2082a94
_ZN10MapManager18func_ov00_02082b3cEi kind:function(arm,size=0x1cc) addr:0x2082adc
_ZN10MapManager18func_ov00_02082d08Ev kind:function(arm,size=0x20) addr:0x2082ca8
_ZN10MapManager13UpdateMapGridEv kind:function(arm,size=0x20) addr:0x2082ca8
_ZN10MapManager20GetCourseData_Unk_1cEv kind:function(arm,size=0xc) addr:0x2082cc8
_ZN10MapManager20GetCourseData_Unk_1dEv kind:function(arm,size=0xc) addr:0x2082cd4
_ZN10MapManager18func_ov00_02082d40Ev kind:function(arm,size=0x34) addr:0x2082ce0
@@ -544,8 +544,8 @@ _ZN10MapManager18func_ov00_02083298EjPiS0_S0_ kind:function(arm,size=0x74) addr:
_ZN10MapManager21GetCourseData_Unk_25cEv kind:function(arm,size=0xc) addr:0x20832ac
_ZN10MapManager18func_ov00_02083318Ei kind:function(arm,size=0x10) addr:0x20832b8
_ZN10MapManager18func_ov00_02083328Ev kind:function(arm,size=0x1c) addr:0x20832c8
_ZN10MapManager20GetCourseData_Unk_86Ev kind:function(arm,size=0xc) addr:0x20832e4
_ZN10MapManager20GetCourseData_Unk_87Ev kind:function(arm,size=0xc) addr:0x20832f0
_ZN10MapManager22GetCourseMainGridSizeXEv kind:function(arm,size=0xc) addr:0x20832e4
_ZN10MapManager22GetCourseMainGridSizeYEv kind:function(arm,size=0xc) addr:0x20832f0
_ZN10MapManager11GetMapWidthEv kind:function(arm,size=0xc) addr:0x20832fc
_ZN10MapManager12GetMapHeightEv kind:function(arm,size=0xc) addr:0x2083308
_ZN10MapManager18func_ov00_02083374Ev kind:function(arm,size=0x10) addr:0x2083314
include/Map/MapManager.hpp
+6 -6
View File
@@ -82,7 +82,7 @@ public:
unk32 *func_ov00_02082adc();
unk8 func_ov00_02082af4();
bool func_ov00_02082b3c(s32 param_2);
unk8 func_ov00_02082d08();
u8 UpdateMapGrid();
unk8 GetCourseData_Unk_1c();
unk8 GetCourseData_Unk_1d();
unk8 func_ov00_02082d40();
@@ -93,11 +93,11 @@ public:
void func_ov00_0208315c(s32 *param_2, s32 *param_3);
void func_ov00_02083244(u32 param_2, s32 *param_3, s32 *param_4, s32 *param_5);
void func_ov00_02083298(u32 param_2, s32 *param_3, s32 *param_4, s32 *param_5);
unk8 GetCourseData_Unk_25c();
bool GetCourseData_Unk_25c();
bool func_ov00_02083318(unk32 param_2);
static unk8 func_ov00_02083328();
unk8 GetCourseData_Unk_86();
unk8 GetCourseData_Unk_87();
bool func_ov00_02083328();
u8 GetCourseMainGridSizeX();
u8 GetCourseMainGridSizeY();
u16 GetMapWidth();
u16 GetMapHeight();
s32 func_ov00_02083374();
@@ -117,7 +117,7 @@ public:
void GetMapCenter(Vec3p *param_2);
void func_ov00_0208346c(AABB *param_2);
void func_ov00_020834bc(Vec3p *param_2, unk32 param_3, unk32 param_4);
unk8 func_ov00_02083524(Vec3p *param_2, unk32 param_3, unk32 param_4);
void func_ov00_02083524(Vec3p *param_2, unk32 param_3, unk32 param_4);
static void func_ov00_02083560(unk32 param_1, MapManager *param_2, u32 param_3);
unk8 func_ov00_02083570(unk32 param_2, unk32 param_3);
unk32 func_ov00_02083588();
src/00_Core/Map/MapManager.cpp
+52 -27
View File
@@ -42,7 +42,12 @@ unk8 MapManager::func_ov00_02082acc() {}
unk32 *MapManager::func_ov00_02082adc() {}
unk8 MapManager::func_ov00_02082af4() {}
bool MapManager::func_ov00_02082b3c(s32 param_2) {}
unk8 MapManager::func_ov00_02082d08() {}
ARM u8 MapManager::UpdateMapGrid() {
Course *course = this->mCourse;
return course->mMapGrid[(u8) course->mCurrMapPos.x][(u8) course->mCurrMapPos.y];
}
unk8 MapManager::GetCourseData_Unk_1c() {}
unk8 MapManager::GetCourseData_Unk_1d() {}
unk8 MapManager::func_ov00_02082d40() {}
@@ -53,11 +58,25 @@ unk8 MapManager::func_ov00_0208306c() {}
void MapManager::func_ov00_0208315c(s32 *param_2, s32 *param_3) {}
void MapManager::func_ov00_02083244(u32 param_2, s32 *param_3, s32 *param_4, s32 *param_5) {}
void MapManager::func_ov00_02083298(u32 param_2, s32 *param_3, s32 *param_4, s32 *param_5) {}
unk8 MapManager::GetCourseData_Unk_25c() {}
bool MapManager::func_ov00_02083318(unk32 param_2) {}
unk8 MapManager::func_ov00_02083328() {}
unk8 MapManager::GetCourseData_Unk_86() {}
unk8 MapManager::GetCourseData_Unk_87() {}
ARM bool MapManager::GetCourseData_Unk_25c() {
return this->mCourse->mUnk_25c;
}
ARM bool MapManager::func_ov00_02083318(unk32 param_2) {}
ARM bool MapManager::func_ov00_02083328() {
u32 map = (u32) this->UpdateMapGrid();
return this->mCourse->IsMapInMainGrid(map);
}
ARM u8 MapManager::GetCourseMainGridSizeX() {
return (u8) this->mCourse->mMainGridSize.x;
}
ARM u8 MapManager::GetCourseMainGridSizeY() {
return (u8) this->mCourse->mMainGridSize.y;
}
ARM u16 MapManager::GetMapWidth() {
return this->mMap->mWidth;
@@ -76,64 +95,64 @@ ARM s32 MapManager::func_ov00_02083384() {
}
ARM q20 MapManager::GetCourseMinX() {
return (this->mCourse->mBounds).min.x;
return this->mCourse->mBounds.min.x;
}
ARM q20 MapManager::GetCourseMinZ() {
return (this->mCourse->mBounds).min.z;
return this->mCourse->mBounds.min.z;
}
ARM q20 MapManager::GetCourseMaxX() {
return (this->mCourse->mBounds).max.x;
return this->mCourse->mBounds.max.x;
}
ARM q20 MapManager::GetCourseMaxZ() {
return (this->mCourse->mBounds).max.z;
return this->mCourse->mBounds.max.z;
}
ARM q20 MapManager::GetMapMinX() {
return (this->mMap->mBounds).min.x;
return this->mMap->mBounds.min.x;
}
ARM q20 MapManager::GetMapMinZ() {
return (this->mMap->mBounds).min.z;
return this->mMap->mBounds.min.z;
}
ARM q20 MapManager::GetMapMaxX() {
return (this->mMap->mBounds).max.x;
return this->mMap->mBounds.max.x;
}
ARM q20 MapManager::GetMapMaxZ() {
return (this->mMap->mBounds).max.z;
return this->mMap->mBounds.max.z;
}
ARM q20 MapManager::GetMapCenterX() {
return (this->mMap->mCenter).x;
return this->mMap->mCenter.x;
}
ARM q20 MapManager::GetMapCenterZ() {
return (this->mMap->mCenter).z;
return this->mMap->mCenter.z;
}
ARM void MapManager::GetMapMinBounds(Vec3p *param_2) {
MapBase *mapBase = this->mMap;
param_2->x = (mapBase->mBounds).min.x;
param_2->y = (mapBase->mBounds).min.y;
param_2->z = (mapBase->mBounds).min.z;
param_2->x = mapBase->mBounds.min.x;
param_2->y = mapBase->mBounds.min.y;
param_2->z = mapBase->mBounds.min.z;
}
ARM void MapManager::GetMapMaxBounds(Vec3p *param_2) {
MapBase *mapBase = this->mMap;
param_2->x = (mapBase->mBounds).max.x;
param_2->y = (mapBase->mBounds).max.y;
param_2->z = (mapBase->mBounds).max.z;
param_2->x = mapBase->mBounds.max.x;
param_2->y = mapBase->mBounds.max.y;
param_2->z = mapBase->mBounds.max.z;
}
ARM void MapManager::GetMapCenter(Vec3p *param_2) {
MapBase *mapBase = this->mMap;
param_2->x = (mapBase->mCenter).x;
param_2->y = (mapBase->mCenter).y;
param_2->z = (mapBase->mCenter).z;
param_2->x = mapBase->mCenter.x;
param_2->y = mapBase->mCenter.y;
param_2->z = mapBase->mCenter.z;
}
ARM void MapManager::func_ov00_0208346c(AABB *param_2) {
@@ -157,8 +176,14 @@ ARM void MapManager::func_ov00_020834bc(Vec3p *param_2, unk32 param_3, unk32 par
param_2->z = param_2->z - (iVar2 >> 1);
}
unk8 MapManager::func_ov00_02083524(Vec3p *param_2, unk32 param_3, unk32 param_4) {}
void MapManager::func_ov00_02083560(unk32 param_1, MapManager *param_2, u32 param_3) {}
ARM void MapManager::func_ov00_02083524(Vec3p *param_2, unk32 param_3, unk32 param_4) {
Vec3p *mapCenter = this->mCourse->FindMapCenter((u32) (u8) this->mCourse->mMapGrid[param_3][param_4]);
param_2->x = mapCenter->x;
param_2->y = mapCenter->y;
param_2->z = mapCenter->z;
}
void MapManager::func_ov00_02083560(Vec2b pos, MapManager *param_2, u32 param_3) {}
unk8 MapManager::func_ov00_02083570(unk32 param_2, unk32 param_3) {}
unk32 MapManager::func_ov00_02083588() {}
unk32 MapManager::func_ov00_020835a4() {}