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

Match MapManager::func_ov00_02082594

Browse Source 
Match MapManager::func_ov00_020825ac

Refactor MapManager::func_ov00_020836bc to MapManager::GetTriggerBoundingBox
This commit is contained in:
SammygoodTunes
2025-01-18 00:07:56 +01:00
parent 93e1c58301
commit 11fcd1e4ea
4 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/eur/arm9/overlays/ov000/symbols.txt
+3 -3
View File
@@ -578,7 +578,7 @@ _ZN10MapManager18func_ov00_02083604Ei kind:function(arm,size=0x10) addr:0x208360
_ZN10MapManager18func_ov00_02083614Ei kind:function(arm,size=0x10) addr:0x2083614
_ZN10MapManager14GetEntrancePosEP5Vec3pi kind:function(arm,size=0x40) addr:0x2083624
_ZN10MapManager18func_ov00_02083664EP5Vec3pi kind:function(arm,size=0x58) addr:0x2083664
_ZN10MapManager18func_ov00_020836bcEiP4AABB kind:function(arm,size=0x10) addr:0x20836bc
_ZN10MapManager21GetTriggerBoundingBoxEiP4AABB kind:function(arm,size=0x10) addr:0x20836bc
_ZN10MapManager23GetTriggerBoundingBoxesEiP4AABBi kind:function(arm,size=0x10) addr:0x20836cc
_ZN10MapManager18func_ov00_020836dcEjj kind:function(arm,size=0x94) addr:0x20836dc
_ZN10MapManager23IsTriggerTypeOverlappedEjP5Vec3p kind:function(arm,size=0x10) addr:0x2083770
@@ -878,8 +878,8 @@ func_ov000_0208d310 kind:function(arm,size=0xec) addr:0x208d310
func_ov000_0208d3fc kind:function(arm,size=0x98) addr:0x208d3fc
func_ov000_0208d494 kind:function(arm,size=0x14c) addr:0x208d494
func_ov000_0208d5e0 kind:function(arm,size=0x40) addr:0x208d5e0
func_ov000_0208d620 kind:function(arm,size=0x60) addr:0x208d620
func_ov000_0208d680 kind:function(arm,size=0x60) addr:0x208d680
_Z19func_ov000_0208d620Pi kind:function(arm,size=0x60) addr:0x208d620
_Z19func_ov000_0208d680Pi kind:function(arm,size=0x60) addr:0x208d680
func_ov000_0208d6e0 kind:function(arm,size=0x140) addr:0x208d6e0
func_ov000_0208d820 kind:function(arm,size=0x110) addr:0x208d820
func_ov000_0208d930 kind:function(arm,size=0xb0) addr:0x208d930
config/usa/arm9/overlays/ov000/symbols.txt
+3 -3
View File
@@ -578,7 +578,7 @@ _ZN10MapManager18func_ov00_02083604Ei kind:function(arm,size=0x10) addr:0x20835a
_ZN10MapManager18func_ov00_02083614Ei kind:function(arm,size=0x10) addr:0x20835b4
_ZN10MapManager14GetEntrancePosEP5Vec3pi kind:function(arm,size=0x40) addr:0x20835c4
_ZN10MapManager18func_ov00_02083664EP5Vec3pi kind:function(arm,size=0x58) addr:0x2083604
_ZN10MapManager18func_ov00_020836bcEiP4AABB kind:function(arm,size=0x10) addr:0x208365c
_ZN10MapManager21GetTriggerBoundingBoxEiP4AABB kind:function(arm,size=0x10) addr:0x208365c
_ZN10MapManager23GetTriggerBoundingBoxesEiP4AABBi kind:function(arm,size=0x10) addr:0x208366c
_ZN10MapManager18func_ov00_020836dcEjj kind:function(arm,size=0x94) addr:0x208367c
_ZN10MapManager23IsTriggerTypeOverlappedEjP5Vec3p kind:function(arm,size=0x10) addr:0x2083710
@@ -878,8 +878,8 @@ func_ov000_0208d310 kind:function(arm,size=0xec) addr:0x208d2b0
func_ov000_0208d3fc kind:function(arm,size=0x98) addr:0x208d39c
func_ov000_0208d494 kind:function(arm,size=0x14c) addr:0x208d434
func_ov000_0208d5e0 kind:function(arm,size=0x40) addr:0x208d580
func_ov000_0208d620 kind:function(arm,size=0x60) addr:0x208d5c0
func_ov000_0208d680 kind:function(arm,size=0x60) addr:0x208d620
_Z19func_ov000_0208d620Pi kind:function(arm,size=0x60) addr:0x208d5c0
_Z19func_ov000_0208d680Pi kind:function(arm,size=0x60) addr:0x208d620
func_ov000_0208d6e0 kind:function(arm,size=0x140) addr:0x208d680
func_ov000_0208d820 kind:function(arm,size=0x110) addr:0x208d7c0
func_ov000_0208d930 kind:function(arm,size=0xb0) addr:0x208d8d0
include/Map/MapManager.hpp
+1 -1
View File
@@ -130,7 +130,7 @@ public:
unk8 func_ov00_02083614(s32 param_2);
bool GetEntrancePos(Vec3p *param_2, unk32 entranceId);
bool func_ov00_02083664(Vec3p *param_2, unk32 entranceId);
s32 func_ov00_020836bc(s32 param_2, AABB *param_3);
s32 GetTriggerBoundingBox(s32 param_2, AABB *param_3);
s32 GetTriggerBoundingBoxes(s32 param_2, AABB *param_3, s32 param_4);
bool func_ov00_020836dc(u32 param_2, u32 actorId);
bool IsTriggerTypeOverlapped(u32 param_2, Vec3p *param_3);
src/00_Core/Map/MapManager.cpp
+15 -13
View File
@@ -4,8 +4,12 @@
#include "Player/PlayerBase.hpp"
extern u32 func_ov000_02078bc4(unk32 param_1);
extern void func_ov00_02078bf0(s32 *param_1, unk32 param_2);
extern void func_ov000_0208cc88(s32 *param1);
extern void func_ov000_0208d620(s32 *param_1);
extern void func_ov000_0208d680(s32 *param_1);
extern s32 *func_ov000_02096418(s32 *param_1);
extern bool func_ov015_02129c44(s32 param_1);
extern s32 *data_027e0f68;
extern s32 *data_027e0f70;
@@ -114,13 +118,13 @@ ARM void MapManager::func_ov00_0208230c(s32 *param_2) {
}
ARM void MapManager::func_ov00_02082348(unk32 param_2) {
// s32 var[4];
// var[0] = 0x47;
// var[1] = 0;
// var[2] = 0;
// var[3] = 0xfffffffe;
// this->func_ov00_0208230c(var);
// func_ov00_02078bf0(var, param2) ???
s32 var[4];
var[0] = 0x47;
var[1] = 0;
var[2] = 0;
var[3] = 0xfffffffe;
this->func_ov00_0208230c(var);
func_ov00_02078bf0(var, param_2);
}
ARM void MapManager::func_ov00_020823a4(unk32 param_2) {
@@ -181,7 +185,7 @@ ARM bool MapManager::func_ov00_02082494(s32 param_2) {
ARM bool MapManager::func_ov00_020824cc(s32 param_2) {
s32 var = this->mMap->vfunc_4c();
if (var == 2) {
bool state;// = this->mMap->func_ov015_02129c44(param_2); // Does not exist.
bool state = func_ov015_02129c44(param_2);
return state;
}
return false;
@@ -206,13 +210,11 @@ ARM unk8 *MapManager::func_ov00_02082538() {
}
ARM void MapManager::func_ov00_02082594() {
// func_ov000_0208d620(DWORD_027e0f68) does not exist.
return;
func_ov000_0208d620(data_027e0f68);
}
ARM void MapManager::func_ov00_020825ac() {
// func_ov000_0208d680(DWORD_027e0f68) does not exist.
return;
func_ov000_0208d680(data_027e0f68);
}
ARM s32 MapManager::GetCourseFilePath(char *courseName, char *buf) {
@@ -885,7 +887,7 @@ ARM bool MapManager::func_ov00_02083664(Vec3p *param_2, unk32 entranceId) {
return false;
}
ARM s32 MapManager::func_ov00_020836bc(s32 param_2, AABB *param_3) {
ARM s32 MapManager::GetTriggerBoundingBox(s32 param_2, AABB *param_3) {
return this->mMap->GetTriggerBoundingBox(param_2, param_3);
}