mirror of
https://github.com/zeldaret/st
synced 2026-10-07 13:25:33 -04:00
Decompiling MapObjectUnkMTJR (#151)
* feat: Decompile ctors, vfuncs and funcs * feat: Decompile funcs * feat: Add data and deal with bss etc * feat: Sync jp * feat: Add content to empty class * feat: Match vfunc_00 * fix: Actor/MapObject Profile macro access cleanup * feat: Overlay 63 cleanup * fix: Add "non-matching" comments on functions * fix: Remove comment
This commit is contained in:
@@ -1,36 +1,41 @@
|
||||
//! TODO: This file was generated automatically and might contain errors
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "MapObject/MapObject.hpp"
|
||||
#include "MapObject/MapObjectProfile.hpp"
|
||||
#include "global.h"
|
||||
#include "MapObject/MapObjectUnkSTAT.hpp"
|
||||
#include "Render/ModelRender.hpp"
|
||||
#include "Unknown/Common.hpp"
|
||||
#include "types.h"
|
||||
|
||||
class MapObjectUnkMTJR : public MapObject {
|
||||
public:
|
||||
/* 00 (base) */
|
||||
/* 40 */
|
||||
/* 40 */ ModelRender mUnk_40;
|
||||
/* A0 */ unk32 mUnk_A0;
|
||||
/* A4 */ volatile u16 mUnk_A4; // Probably a counter
|
||||
/* A6 */ u16 mUnk_A6; // Counter (mUnk_A4) bound
|
||||
/* A8 */ UnkSystem7 mUnk_A8;
|
||||
/* AC */ unk32 mUnk_AC;
|
||||
/* B0 */ unk32 mUnk_B0;
|
||||
|
||||
MapObjectUnkMTJR();
|
||||
|
||||
/* 30 */ virtual ~MapObjectUnkMTJR() override;
|
||||
/* 00 */ virtual bool vfunc_00() override;
|
||||
/* 08 */ virtual void vfunc_08() override;
|
||||
/* 0C */ virtual void vfunc_0C() override;
|
||||
/* 14 */ virtual void vfunc_14() override;
|
||||
/* 1C */ virtual bool vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) override;
|
||||
|
||||
void func_ov063_02160ffc(void);
|
||||
void func_ov063_02161070(void);
|
||||
void func_ov063_021611ac(void);
|
||||
void func_ov063_021611c0(void);
|
||||
void func_ov063_02161254(void);
|
||||
void func_ov063_02161254(unk32 param1);
|
||||
void func_ov063_02161288(void);
|
||||
void func_ov063_02161380(void);
|
||||
};
|
||||
|
||||
class MapObjectProfileUnkMTJR : public MapObjectProfile {
|
||||
class MapObjectProfileUnkMTJR : public MapObjectProfileUnkSTAT_Base {
|
||||
public:
|
||||
/* 00 (base) */
|
||||
/* F8 */
|
||||
|
||||
MapObjectProfileUnkMTJR();
|
||||
~MapObjectProfileUnkMTJR();
|
||||
|
||||
/* 0C */ virtual MapObject *Create();
|
||||
|
||||
|
||||
@@ -40,6 +40,10 @@ public:
|
||||
|
||||
class MapObjectProfileUnkSTAT_Base_D4 : public MapObject_10 {
|
||||
public:
|
||||
/* 00 (vtable) */
|
||||
/* 24 */
|
||||
|
||||
MapObjectProfileUnkSTAT_Base_D4() {}
|
||||
};
|
||||
|
||||
class MapObjectProfileUnkSTAT_Base : public MapObjectProfile_Derived2 {
|
||||
|
||||
Reference in New Issue
Block a user