diff options
| author | Aetias <144526980+AetiasHax@users.noreply.github.com> | 2025-07-25 15:59:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-25 15:59:54 +0200 |
| commit | 8ad6359c7d3c7afcbddd7d450b7fa4b9764255b6 (patch) | |
| tree | 09095f8f36375fe4bb358c163d614ebfbc8fe344 /include/Map/MapBase.hpp | |
| parent | dda45d5574798dc45a31437f473eaa55b9142e13 (diff) | |
ActorSwitchObject OK (#130)
* Map symbol in Game
* ActorSwitchObject OK
* Mark ActorSwitchObject as complete
* Document `mTrapActors`
* Fix FilterActorBase
* Fix regressions
Diffstat (limited to 'include/Map/MapBase.hpp')
| -rw-r--r-- | include/Map/MapBase.hpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/Map/MapBase.hpp b/include/Map/MapBase.hpp index f711dbbb..286e6156 100644 --- a/include/Map/MapBase.hpp +++ b/include/Map/MapBase.hpp @@ -135,22 +135,22 @@ public: /* 48 */ virtual void vfunc_48(); /* 4c */ virtual s32 vfunc_4c(); /* 50 */ virtual unk32 vfunc_50(); - /* 54 */ virtual unk32 vfunc_54(Vec2b *param_1); - /* 58 */ virtual unk32 vfunc_58(Vec2b *param_1, int param_2); + /* 54 */ virtual unk32 vfunc_54(TilePos *param_1); + /* 58 */ virtual unk32 vfunc_58(TilePos *param_1, int param_2); /* 5c */ virtual unk32 vfunc_5c(); - /* 60 */ virtual unk32 vfunc_60(Vec2b *param_1); + /* 60 */ virtual unk32 vfunc_60(TilePos *param_1); /* 64 */ virtual unk32 vfunc_64(); /* 68 */ virtual unk32 vfunc_68(Vec3p *param_1, bool param_2); /* 6c */ virtual unk8 vfunc_6c(unk32 param_2, unk32 param_3, unk32 param_4); /* 70 */ virtual unk32 vfunc_70(Vec3p *param_2); /* 74 */ virtual unk32 *vfunc_74(Vec3p *param_2); - /* 78 */ virtual unk32 *vfunc_78(Vec2b *param_1); + /* 78 */ virtual unk32 *vfunc_78(TilePos *param_1); /* 7c */ virtual s32 vfunc_7c(s32 param_1, unk32 *param_2, s32 param_3, short param_4[4]); /* 80 */ virtual unk32 vfunc_80(); /* 84 */ virtual void vfunc_84(unk32 param_2); /* 88 */ virtual unk32 vfunc_88(); /* 8c */ virtual unk32 vfunc_8c(); - /* 90 */ virtual unk8 vfunc_90(Vec2b *param_2, unk32 param_3); + /* 90 */ virtual unk8 vfunc_90(TilePos *param_2, unk32 param_3); /* 94 */ virtual void vfunc_94(); /* 98 */ virtual void vfunc_98(unk32 param_2, unk32 param_3, unk32 param_4); /* 9c */ virtual void vfunc_9c(); @@ -183,13 +183,13 @@ public: bool func_ov00_0207f38c(s32 *param_2); void func_ov00_0207f4a4(Vec2s *param_2, unk32 param_3); static void func_ov00_0207f53c(Vec2s *param_1, MapBase *param_2, Vec3p *param_3); - static void func_ov00_0207f588(Vec2s *param_1, MapBase *param_2, Vec2b *param_3, unk32 param_4); + static void func_ov00_0207f588(Vec2s *param_1, MapBase *param_2, TilePos *param_3, unk32 param_4); void func_ov00_0207f630(Vec2s *param_2, Vec3p *param_3); unk8 GetTileStartX(unk32 x); unk8 GetTileStartZ(unk32 z); s32 GetTileEndX(unk32 x); s32 GetTileEndZ(unk32 z); - void GetTileBounds(Vec2b *tilePos, AABB *bounds); + void GetTileBounds(TilePos *tilePos, AABB *bounds); s32 GetClampedTileX(s32 worldX); s32 GetClampedTileY(s32 worldZ); unk8 GetTileX(s32 worldX); @@ -227,8 +227,8 @@ public: bool AddUnk_130(s32 param_2); bool func_ov00_020809b8(s32 param_2); unk8 func_ov00_02080a78(Vec3p *param_2); - unk8 func_ov00_02080b24(Vec2b *param_2); - void func_ov00_02080d08(Vec2b *param_2); + unk8 func_ov00_02080b24(TilePos *param_2); + void func_ov00_02080d08(TilePos *param_2); bool TriggerOfType_vfunc_10(unk32 type); void func_ov00_02080de4(); unk8 func_ov00_02080de8(unk32 param_2); |