Porting over from previous repo

This commit is contained in:
elijah-thomas774
2023-08-09 14:55:49 -04:00
parent 5e2c18896d
commit caa88a3705
9 changed files with 2383 additions and 2371 deletions
+3 -13
View File
@@ -18,23 +18,13 @@ public:
protected:
/* 80501544 */ // vtable
/* 0x08 */ virtual int create();
/* 0x0C */ // virtual int preCreate(); // uses fBase_c::preCreate()
/* 0x10 */ virtual void postCreate(MAIN_STATE_e state);
/* 0x14 */ // virtual int doDelete(); / uses fBase_c::doDelete
/* 0x18 */ virtual int preDelete();
/* 0x1C */ // virtual void postDelete(MAIN_STATE_e state); // uses fBase_c::postDelete
/* 0x20 */ virtual int execute(); // calls either actorExecute/executeInEvent
/* 0x24 */ virtual int preExecute(); // looks at some actor properties
/* 0x28 */ virtual void postExecute(MAIN_STATE_e state); // not fully understood
/* 0x2C */ // virtual int draw(); // uses fBase_c::draw
/* 0x30 */ // virtual int preDraw(); // uses dBase_c::preDraw
/* 0x34 */ // virtual void postDraw(MAIN_STATE_e state); // uses dBase_c::postDraw
/* 0x38 */ // virtual void deleteReady(); // uses fBase_c::deleteReady
/* 0x3C */ // virtual bool entryFrmHeap(unsigned long size, EGG::Heap *parentHeap); // uses fBase_c::entryFrmHeap
/* 0x40 */ // virtual bool entryFrmHeapNonAdjust(unsigned long size, EGG::Heap *parentHeap); // uses fBase_c::entryFrmHeapNonAdjust
/* 0x44 */ virtual bool createHeap();
/* 0x48 */ virtual ~dAcBase_c();
// Start of dAcBase_c vtable additions (after dBase_c)
/* 0x48 */ virtual ~dAcBase_c();
/* 0x4C */ virtual int actorCreate(); // name is assumed
/* 0x50 */ virtual int actorReCreate(); // name is assumed
/* 0x54 */ virtual int actorExecute(); // name is assumed
@@ -58,8 +48,8 @@ public:
ObjInfoPtr* objInfo );
void* FUN_8002c690();
int initAllocatorWork1Heap(int size, char* name);
int initAllocator(int size, char* name, EGG::Heap* heap);
int initAllocatorWork1Heap(int size, char* name, int align);
int initAllocator(int size, char* name, EGG::Heap* heap, int align);
bool addActorToRoom(s32 roomId);
void setBit_field_0xE8(s32);
u32 itemDroppingAndGivingRelated(Vec3f* spawnPos, int subtype);
+2 -2
View File
@@ -120,11 +120,11 @@ public:
// 0x80009AB0
s16* getPlayerName(); // using Shift JIS i assume
// 0x80009AC0
void setAreaT1();
void setAreaT1(char* name);
// 0x80009BE0
s8* getAreaT1();
// 0x80009BF0
void setAreaT2();
void setAreaT2(char* name);
// lbl_80009D10
s8* getAreaT2();
// lbl_80009D20