PlayerBase OK (#126)

* Map symbol in Game

* PlayerBase OK

* Fix ActorRefill

* Fix MapManager

* Mark PlayerBase as complete

* Fix MapManager
This commit is contained in:
Aetias
2025-07-22 17:54:33 +02:00
committed by GitHub
parent cf8f5a80b1
commit d45ea18bf4
18 changed files with 264 additions and 102 deletions
+11
View File
@@ -0,0 +1,11 @@
#pragma once
#include "global.h"
#include "types.h"
struct UnkStruct_027e0e58 {
void func_ov000_0207c5d4(unk32 param1, bool param2);
void func_ov000_0207c1b0(unk32 param1, Vec3p *param2, unk32 param3, unk32 param4, unk32 param5);
};
extern UnkStruct_027e0e58 *data_027e0e58;
+2
View File
@@ -12,6 +12,8 @@ public:
/* 8 */ void *mUnk_8;
/* c */
void func_ov000_0208ae94();
void func_ov000_0208b13c();
unk32 func_ov000_0208b180();
};
+10
View File
@@ -15,4 +15,14 @@ public:
/* 0f */ // unk8 mUnk_0f;
/* 10 */ s32 mUnk_10;
/* 14 */
inline Entrance() :
mId(0xff),
mUnk_10(0) {}
inline Entrance(const Entrance &other) :
mPos(other.mPos),
mAngle(other.mAngle),
mId(other.mId),
mUnk_10(other.mUnk_10) {}
};
+1
View File
@@ -19,4 +19,5 @@ struct Cylinder {
}
bool Overlaps(Cylinder *other);
bool func_ov000_0208f030(Vec3p *param1, Vec3p *param2, s32 param3);
};
+4 -3
View File
@@ -4,10 +4,11 @@
#include "Player/EquipItem.hpp"
class EquipShield {
private:
class EquipShield : public EquipItem {
public:
/* 00 (base) */
/* 09 */ unk8 mUnk_09[7];
/* 09 */ unk8 mUnk_09[5];
/* 0e */ unk16 mUnk_0e;
/* 10 */ void *mUnk_10;
/* 14 */ void *mUnk_14;
/* 18 */ unk8 mUnk_18[4];
+1 -1
View File
@@ -6,7 +6,7 @@
#include "Player/EquipRope.hpp"
class EquipSword : public EquipItem {
private:
public:
/* 00 (base) */
/* 09 */ unk8 mUnk_09[3]; // padding?
/* 0c */ void *mUnk_0c;
+1 -1
View File
@@ -17,7 +17,7 @@ public:
/* 08 */ s16 mInvincibleFrames;
/* 0a */ s16 mHealth;
/* 0c */ unk8 mUnk_0c[2];
/* 0e */ s16 mEntranceId;
/* 0e */ u16 mEntranceId;
/* 10 */ bool mUpdatePos;
/* 11 */ bool mVisible;
/* 12 */ bool mInvincible;