From 49134b4c96324d1b9d324615a18c2cac729c3ce7 Mon Sep 17 00:00:00 2001 From: Amber Brault Date: Sun, 6 Oct 2024 14:55:40 -0400 Subject: [PATCH] CBattleManager.cpp progress --- config/jp/symbols.txt | 2 +- src/kyoshin/appgame/cf/CBattleManager.cpp | 90 +++++ src/kyoshin/appgame/cf/CBattleManager.hpp | 12 +- src/kyoshin/appgame/cf/CfSoundMan.hpp | 10 + src/kyoshin/appgame/cf/object/CAIAction.hpp | 4 +- src/kyoshin/appgame/cf/object/CActorParam.hpp | 378 +++++++++--------- src/kyoshin/appgame/cf/object/CActorState.hpp | 2 +- .../appgame/cf/object/CBattleState.hpp | 72 ++-- .../appgame/cf/object/CObjectParam.hpp | 12 +- .../appgame/cf/object/CObjectState.hpp | 26 +- src/kyoshin/appgame/cf/object/CfObject.hpp | 154 +++---- .../appgame/cf/object/CfObjectActor.hpp | 30 +- src/kyoshin/appgame/cf/object/CfObjectEne.hpp | 4 +- .../appgame/cf/object/CfObjectModel.hpp | 44 +- .../appgame/cf/object/CfObjectMove.hpp | 50 +-- src/kyoshin/appgame/cf/object/CfObjectPc.hpp | 28 +- 16 files changed, 518 insertions(+), 400 deletions(-) create mode 100644 src/kyoshin/appgame/cf/CfSoundMan.hpp diff --git a/config/jp/symbols.txt b/config/jp/symbols.txt index a3577d4b..448c34b3 100644 --- a/config/jp/symbols.txt +++ b/config/jp/symbols.txt @@ -22288,7 +22288,7 @@ func_801BFABC = .text:0x801BFABC; // type:function size:0x28 scope:global align: func_801BFAE4 = .text:0x801BFAE4; // type:function size:0x4 scope:global align:4 func_801BFAE8 = .text:0x801BFAE8; // type:function size:0x4C scope:global align:4 func_801BFB34 = .text:0x801BFB34; // type:function size:0x104 scope:global align:4 -func_801BFC38 = .text:0x801BFC38; // type:function size:0x1B0 scope:global align:4 +func_801BFC38__Q22cf10CfSoundManFUlUlUlUlf = .text:0x801BFC38; // type:function size:0x1B0 scope:global align:4 func_801BFDE8 = .text:0x801BFDE8; // type:function size:0x38 scope:global align:4 func_801BFE20 = .text:0x801BFE20; // type:function size:0x38 scope:global align:4 func_801BFE58 = .text:0x801BFE58; // type:function size:0x34 scope:global align:4 diff --git a/src/kyoshin/appgame/cf/CBattleManager.cpp b/src/kyoshin/appgame/cf/CBattleManager.cpp index 51556d03..8b3f0235 100644 --- a/src/kyoshin/appgame/cf/CBattleManager.cpp +++ b/src/kyoshin/appgame/cf/CBattleManager.cpp @@ -1,9 +1,99 @@ #include "kyoshin/appgame/cf/CBattleManager.hpp" #include "kyoshin/appgame/UnkClass_805764CC.hpp" +#include "kyoshin/appgame/cf/object/CfObjectPc.hpp" +#include "kyoshin/appgame/cf/object/CfObjectEne.hpp" +#include "kyoshin/appgame/cf/CfSoundMan.hpp" #include "monolib/MemManager.hpp" #include "monolib/work/CWorkSystem.hpp" +extern UNKTYPE* func_8009EC9C(u16 r3); +extern void func_8009D7E4(UNKTYPE* r3, u32 r4); + namespace cf{ + u32 CBattleManager::lbl_804F8228[] = { + 0, + 0x1AD, + 0x1AA, + 0x1B0, + 0x1B6, + 0x1BA, + 0x1B5, + 0x1B7, + 0x1B8, + 0x1B9 + }; + + void func_800D7A04(CfObjectPc* pObjectPc, CfObjectEne* pObjectEne){ + CActorParam_UnkStruct1* r3 = pObjectPc->CActorParam_vtableFunc129(); + u32 flags = r3->unk74; + + if(flags & 0x2){ + CfSoundMan::func_801BFC38(0, 0x192, 0, 0, 0.6f); + CfSoundMan::func_801BFC38(0, 0x191, 0, 0, 0.6f); + }else if(flags & 0x2000){ + CfSoundMan::func_801BFC38(0, 0x1C5, 0, 0, 0.6f); + }else{ + CActorParam_UnkStruct2* r30 = r3->unk50; + + if(r30 != nullptr){ + if(r30->unk78 & 0x1000000){ + if(pObjectEne->CActorParam_vtableFunc19() == 1 || + pObjectEne->CActorParam_vtableFunc19() == 2){ + if(!(r30->unk78 & 0x200)){ + CfSoundMan::func_801BFC38(0, 0x1B4, 0, 0, 0.6f); + return; + } + }else if(!(r30->unk78 & 0x200)){ + CfSoundMan::func_801BFC38(0, 0x1B5, 0, 0, 0.6f); + return; + } + }else if((r30->unk78 & 0x2000000) && !(r30->unk78 & 0x200)){ + CfSoundMan::func_801BFC38(0, 0x1B5, 0, 0, 0.6f); + return; + } + + if((s32)r30->unk40 == 1){ + if(flags & 0x100){ + CfSoundMan::func_801BFC38(0, 0x1AF, 0, 0, 0.6f); + }else{ + //likely an inline + if(pObjectEne != nullptr && pObjectEne->unk64 & 0x2){ + UNKTYPE* r3_1 = func_8009EC9C(pObjectEne->unk8C_3); + func_8009D7E4((UNKTYPE*)((u32)r3_1 + 0x1C), 1); + } + + if(pObjectEne->CActorParam_vtableFunc19() == 1 || + pObjectEne->CActorParam_vtableFunc19() == 2){ + CfSoundMan::func_801BFC38(0, 0x1AE, 0, 0, 0.6f); + }else{ + CfSoundMan::func_801BFC38(0, 0x1AD, 0, 0, 0.6f); + } + } + }else if((s32)r30->unk40 == 2){ + if(flags & 0x100){ + CfSoundMan::func_801BFC38(0, 0x1AC, 0, 0, 0.6f); + }else{ + //likely an inline + if(pObjectEne != nullptr && pObjectEne->unk64 & 0x2){ + UNKTYPE* r3_1 = func_8009EC9C(pObjectEne->unk8C_3); + func_8009D7E4((UNKTYPE*)((u32)r3_1 + 0x1C), 1); + } + + if(pObjectEne->CActorParam_vtableFunc19() == 1 || + pObjectEne->CActorParam_vtableFunc19() == 2){ + CfSoundMan::func_801BFC38(0, 0x1AB, 0, 0, 0.6f); + }else{ + CfSoundMan::func_801BFC38(0, 0x1AA, 0, 0, 0.6f); + } + } + }else{ + u32 r4 = CBattleManager::lbl_804F8228[r30->unk40]; + CfSoundMan::func_801BFC38(0, r4, 0, 0, 0.6f); + } + } + } + } + CBattleManager::CBattleManager() : unk84(0) { int heapIndex = WorkThreadSystem::getHeapIndex(); mActorList1.initList(64, heapIndex); diff --git a/src/kyoshin/appgame/cf/CBattleManager.hpp b/src/kyoshin/appgame/cf/CBattleManager.hpp index 40d51be4..fea74c29 100644 --- a/src/kyoshin/appgame/cf/CBattleManager.hpp +++ b/src/kyoshin/appgame/cf/CBattleManager.hpp @@ -28,14 +28,14 @@ namespace cf{ }; struct CBattleManager_Struct1 { - u8 unk0[0x100]; + u32 unk0[64]; CBattleManager_Struct1(){ - u8* r30 = unk0; - u8* r31 = unk0 + 0x100; + u32* r31 = (u32*)((u32)unk0 + sizeof(unk0)); + u32* r30 = unk0; do{ - std::memset(r30, 0, 8); - r30 += 8; + std::memset(r30, 0, sizeof(u32) * 2); + r30 += 2; } while(r30 < r31); std::memset(unk0, 0, sizeof(unk0)); } @@ -80,6 +80,8 @@ namespace cf{ CSuddenCommu mSuddenCommu; //0x216C CVision mVision; //0x219C + static u32 lbl_804F8228[]; + protected: static CBattleManager* instance; }; diff --git a/src/kyoshin/appgame/cf/CfSoundMan.hpp b/src/kyoshin/appgame/cf/CfSoundMan.hpp new file mode 100644 index 00000000..9763efaf --- /dev/null +++ b/src/kyoshin/appgame/cf/CfSoundMan.hpp @@ -0,0 +1,10 @@ +#pragma once + +#include "types.h" + +namespace cf { + class CfSoundMan { + public: + static void func_801BFC38(u32 r3, u32 r4, u32 r5, u32 r6, float f1); + }; +} diff --git a/src/kyoshin/appgame/cf/object/CAIAction.hpp b/src/kyoshin/appgame/cf/object/CAIAction.hpp index 33c034d0..5bcc002a 100644 --- a/src/kyoshin/appgame/cf/object/CAIAction.hpp +++ b/src/kyoshin/appgame/cf/object/CAIAction.hpp @@ -5,8 +5,8 @@ namespace cf{ class CAIAction{ public: - virtual void CAIAction_vtableFunc1(); - virtual void CAIAction_vtableFunc2(); + virtual void CAIAction_vtableFunc1(); //0x8 + virtual void CAIAction_vtableFunc2(); //0xC u8 unk3384[0xB18]; //temporary }; diff --git a/src/kyoshin/appgame/cf/object/CActorParam.hpp b/src/kyoshin/appgame/cf/object/CActorParam.hpp index 0d2ba04c..cfe4299a 100644 --- a/src/kyoshin/appgame/cf/object/CActorParam.hpp +++ b/src/kyoshin/appgame/cf/object/CActorParam.hpp @@ -6,190 +6,204 @@ #include "kyoshin/appgame/cf/object/CActorState.hpp" namespace cf{ + struct CActorParam_UnkStruct2 { + u8 unk0[0x40]; + u16 unk40; + u8 unk42[0x78 - 0x42]; + u32 unk78; + }; + + struct CActorParam_UnkStruct1 { + u8 unk0[0x50]; + CActorParam_UnkStruct2* unk50; + u8 unk54[0x74 - 0x54]; + u32 unk74; + }; + class CActorParam : public CActorState, public CBattleState, public CDebugState{ public: - virtual void CActorParam_vtableFunc1(); - virtual void CActorParam_vtableFunc2(); - virtual void CActorParam_vtableFunc3(); - virtual void CActorParam_vtableFunc4(); - virtual void CActorParam_vtableFunc5(); - virtual void CActorParam_vtableFunc6(); - virtual void CActorParam_vtableFunc7(); - virtual void CActorParam_vtableFunc8(); - virtual void CActorParam_vtableFunc9(); - virtual void CActorParam_vtableFunc10(); - virtual void CActorParam_vtableFunc11(); - virtual void CActorParam_vtableFunc12(); - virtual void CActorParam_vtableFunc13(); - virtual void CActorParam_vtableFunc14(); - virtual void CActorParam_vtableFunc15(); - virtual void CActorParam_vtableFunc16(); - virtual void CActorParam_vtableFunc17(); - virtual void CActorParam_vtableFunc18(); - virtual void CActorParam_vtableFunc19(); - virtual void CActorParam_vtableFunc20(); - virtual void CActorParam_vtableFunc21(); - virtual void CActorParam_vtableFunc22(); - virtual void CActorParam_vtableFunc23(); - virtual void CActorParam_vtableFunc24(); - virtual void CActorParam_vtableFunc25(); - virtual void CActorParam_vtableFunc26(); - virtual void CActorParam_vtableFunc27(); - virtual void CActorParam_vtableFunc28(); - virtual void CActorParam_vtableFunc29(); - virtual void CActorParam_vtableFunc30(); - virtual void CActorParam_vtableFunc31(); - virtual void CActorParam_vtableFunc32(); - virtual void CActorParam_vtableFunc33(); - virtual void CActorParam_vtableFunc34(); - virtual void CActorParam_vtableFunc35(); - virtual void CActorParam_vtableFunc36(); - virtual void CActorParam_vtableFunc37(); - virtual void CActorParam_vtableFunc38(); - virtual void CActorParam_vtableFunc39(); - virtual void CActorParam_vtableFunc40(); - virtual void CActorParam_vtableFunc41(); - virtual void CActorParam_vtableFunc42(); - virtual void CActorParam_vtableFunc43(); - virtual void CActorParam_vtableFunc44(); - virtual void CActorParam_vtableFunc45(); - virtual void CActorParam_vtableFunc46(); - virtual void CActorParam_vtableFunc47(); - virtual void CActorParam_vtableFunc48(); - virtual void CActorParam_vtableFunc49(); - virtual void CActorParam_vtableFunc50(); - virtual void CActorParam_vtableFunc51(); - virtual void CActorParam_vtableFunc52(); - virtual void CActorParam_vtableFunc53(); - virtual void CActorParam_vtableFunc54(); - virtual void CActorParam_vtableFunc55(); - virtual void CActorParam_vtableFunc56(); - virtual void CActorParam_vtableFunc57(); - virtual void CActorParam_vtableFunc58(); - virtual void CActorParam_vtableFunc59(); - virtual void CActorParam_vtableFunc60(); - virtual void CActorParam_vtableFunc61(); - virtual void CActorParam_vtableFunc62(); - virtual void CActorParam_vtableFunc63(); - virtual void CActorParam_vtableFunc64(); - virtual void CActorParam_vtableFunc65(); - virtual void CActorParam_vtableFunc66(); - virtual void CActorParam_vtableFunc67(); - virtual void CActorParam_vtableFunc68(); - virtual void CActorParam_vtableFunc69(); - virtual void CActorParam_vtableFunc70(); - virtual void CActorParam_vtableFunc71(); - virtual void CActorParam_vtableFunc72(); - virtual void CActorParam_vtableFunc73(); - virtual void CActorParam_vtableFunc74(); - virtual void CActorParam_vtableFunc75(); - virtual void CActorParam_vtableFunc76(); - virtual void CActorParam_vtableFunc77(); - virtual void CActorParam_vtableFunc78(); - virtual void CActorParam_vtableFunc79(); - virtual void CActorParam_vtableFunc80(); - virtual void CActorParam_vtableFunc81(); - virtual void CActorParam_vtableFunc82(); - virtual void CActorParam_vtableFunc83(); - virtual void CActorParam_vtableFunc84(); - virtual void CActorParam_vtableFunc85(); - virtual void CActorParam_vtableFunc86(); - virtual void CActorParam_vtableFunc87(); - virtual void CActorParam_vtableFunc88(); - virtual void CActorParam_vtableFunc89(); - virtual void CActorParam_vtableFunc90(); - virtual void CActorParam_vtableFunc91(); - virtual void CActorParam_vtableFunc92(); - virtual void CActorParam_vtableFunc93(); - virtual void CActorParam_vtableFunc94(); - virtual void CActorParam_vtableFunc95(); - virtual void CActorParam_vtableFunc96(); - virtual void CActorParam_vtableFunc97(); - virtual void CActorParam_vtableFunc98(); - virtual void CActorParam_vtableFunc99(); - virtual void CActorParam_vtableFunc100(); - virtual void CActorParam_vtableFunc101(); - virtual void CActorParam_vtableFunc102(); - virtual void CActorParam_vtableFunc103(); - virtual void CActorParam_vtableFunc104(); - virtual void CActorParam_vtableFunc105(); - virtual void CActorParam_vtableFunc106(); - virtual void CActorParam_vtableFunc107(); - virtual void CActorParam_vtableFunc108(); - virtual void CActorParam_vtableFunc109(); - virtual void CActorParam_vtableFunc110(); - virtual void CActorParam_vtableFunc111(); - virtual void CActorParam_vtableFunc112(); - virtual void CActorParam_vtableFunc113(); - virtual void CActorParam_vtableFunc114(); - virtual void CActorParam_vtableFunc115(); - virtual void CActorParam_vtableFunc116(); - virtual void CActorParam_vtableFunc117(); - virtual void CActorParam_vtableFunc118(); - virtual void CActorParam_vtableFunc119(); - virtual void CActorParam_vtableFunc120(); - virtual void CActorParam_vtableFunc121(); - virtual void CActorParam_vtableFunc122(); - virtual void CActorParam_vtableFunc123(); - virtual void CActorParam_vtableFunc124(); - virtual void CActorParam_vtableFunc125(); - virtual void CActorParam_vtableFunc126(); - virtual void CActorParam_vtableFunc127(); - virtual void CActorParam_vtableFunc128(); - virtual void CActorParam_vtableFunc129(); - virtual void CActorParam_vtableFunc130(); - virtual void CActorParam_vtableFunc131(); - virtual void CActorParam_vtableFunc132(); - virtual void CActorParam_vtableFunc133(); - virtual void CActorParam_vtableFunc134(); - virtual void CActorParam_vtableFunc135(); - virtual void CActorParam_vtableFunc136(); - virtual void CActorParam_vtableFunc137(); - virtual bool CActorParam_vtableFunc138(); - virtual void CActorParam_vtableFunc139(); - virtual void CActorParam_vtableFunc140(); - virtual void CActorParam_vtableFunc141(); - virtual void CActorParam_vtableFunc142(); - virtual void CActorParam_vtableFunc143(); - virtual void CActorParam_vtableFunc144(); - virtual void CActorParam_vtableFunc145(); - virtual void CActorParam_vtableFunc146(); - virtual void CActorParam_vtableFunc147(); - virtual void CActorParam_vtableFunc148(); - virtual void CActorParam_vtableFunc149(); - virtual void CActorParam_vtableFunc150(); - virtual void CActorParam_vtableFunc151(); - virtual void CActorParam_vtableFunc152(); - virtual void CActorParam_vtableFunc153(); - virtual void CActorParam_vtableFunc154(); - virtual void CActorParam_vtableFunc155(); - virtual void CActorParam_vtableFunc156(); - virtual void CActorParam_vtableFunc157(); - virtual void CActorParam_vtableFunc158(); - virtual void CActorParam_vtableFunc159(); - virtual void CActorParam_vtableFunc160(); - virtual void CActorParam_vtableFunc161(); - virtual void CActorParam_vtableFunc162(); - virtual void CActorParam_vtableFunc163(); - virtual void CActorParam_vtableFunc164(); - virtual void CActorParam_vtableFunc165(); - virtual void CActorParam_vtableFunc166(); - virtual void CActorParam_vtableFunc167(); - virtual void CActorParam_vtableFunc168(); - virtual void CActorParam_vtableFunc169(); - virtual void CActorParam_vtableFunc170(); - virtual void CActorParam_vtableFunc171(); - virtual void CActorParam_vtableFunc172(); - virtual void CActorParam_vtableFunc173(); - virtual void CActorParam_vtableFunc174(); - virtual void CActorParam_vtableFunc175(); - virtual void CActorParam_vtableFunc176(); - virtual void CActorParam_vtableFunc177(); - virtual void CActorParam_vtableFunc178(); - virtual void CActorParam_vtableFunc179(); - virtual void CActorParam_vtableFunc180(); - virtual void CActorParam_vtableFunc181(); + virtual void CActorParam_vtableFunc1(); //0x98 + virtual void CActorParam_vtableFunc2(); //0x9C + virtual void CActorParam_vtableFunc3(); //0xA0 + virtual void CActorParam_vtableFunc4(); //0xA4 + virtual void CActorParam_vtableFunc5(); //0xA8 + virtual void CActorParam_vtableFunc6(); //0xAC + virtual void CActorParam_vtableFunc7(); //0xB0 + virtual void CActorParam_vtableFunc8(); //0xB4 + virtual void CActorParam_vtableFunc9(); //0xB8 + virtual void CActorParam_vtableFunc10(); //0xBC + virtual void CActorParam_vtableFunc11(); //0xC0 + virtual void CActorParam_vtableFunc12(); //0xC4 + virtual void CActorParam_vtableFunc13(); //0xC8 + virtual void CActorParam_vtableFunc14(); //0xCC + virtual void CActorParam_vtableFunc15(); //0xD0 + virtual void CActorParam_vtableFunc16(); //0xD4 + virtual void CActorParam_vtableFunc17(); //0xD8 + virtual void CActorParam_vtableFunc18(); //0xDC + virtual int CActorParam_vtableFunc19(); //0xE0 + virtual void CActorParam_vtableFunc20(); //0xE4 + virtual void CActorParam_vtableFunc21(); //0xE8 + virtual void CActorParam_vtableFunc22(); //0xEC + virtual void CActorParam_vtableFunc23(); //0xF0 + virtual void CActorParam_vtableFunc24(); //0xF4 + virtual void CActorParam_vtableFunc25(); //0xF8 + virtual void CActorParam_vtableFunc26(); //0xFC + virtual void CActorParam_vtableFunc27(); //0x100 + virtual void CActorParam_vtableFunc28(); //0x104 + virtual void CActorParam_vtableFunc29(); //0x108 + virtual void CActorParam_vtableFunc30(); //0x10C + virtual void CActorParam_vtableFunc31(); //0x110 + virtual void CActorParam_vtableFunc32(); //0x114 + virtual void CActorParam_vtableFunc33(); //0x118 + virtual void CActorParam_vtableFunc34(); //0x11C + virtual void CActorParam_vtableFunc35(); //0x120 + virtual void CActorParam_vtableFunc36(); //0x124 + virtual void CActorParam_vtableFunc37(); //0x128 + virtual void CActorParam_vtableFunc38(); //0x12C + virtual void CActorParam_vtableFunc39(); //0x130 + virtual void CActorParam_vtableFunc40(); //0x134 + virtual void CActorParam_vtableFunc41(); //0x138 + virtual void CActorParam_vtableFunc42(); //0x13C + virtual void CActorParam_vtableFunc43(); //0x140 + virtual void CActorParam_vtableFunc44(); //0x144 + virtual void CActorParam_vtableFunc45(); //0x148 + virtual void CActorParam_vtableFunc46(); //0x14C + virtual void CActorParam_vtableFunc47(); //0x150 + virtual void CActorParam_vtableFunc48(); //0x154 + virtual void CActorParam_vtableFunc49(); //0x158 + virtual void CActorParam_vtableFunc50(); //0x15C + virtual void CActorParam_vtableFunc51(); //0x160 + virtual void CActorParam_vtableFunc52(); //0x164 + virtual void CActorParam_vtableFunc53(); //0x168 + virtual void CActorParam_vtableFunc54(); //0x16C + virtual void CActorParam_vtableFunc55(); //0x170 + virtual void CActorParam_vtableFunc56(); //0x174 + virtual void CActorParam_vtableFunc57(); //0x178 + virtual void CActorParam_vtableFunc58(); //0x17C + virtual void CActorParam_vtableFunc59(); //0x180 + virtual void CActorParam_vtableFunc60(); //0x184 + virtual void CActorParam_vtableFunc61(); //0x188 + virtual void CActorParam_vtableFunc62(); //0x18C + virtual void CActorParam_vtableFunc63(); //0x190 + virtual void CActorParam_vtableFunc64(); //0x194 + virtual void CActorParam_vtableFunc65(); //0x198 + virtual void CActorParam_vtableFunc66(); //0x19C + virtual void CActorParam_vtableFunc67(); //0x1A0 + virtual void CActorParam_vtableFunc68(); //0x1A4 + virtual void CActorParam_vtableFunc69(); //0x1A8 + virtual void CActorParam_vtableFunc70(); //0x1AC + virtual void CActorParam_vtableFunc71(); //0x1B0 + virtual void CActorParam_vtableFunc72(); //0x1B4 + virtual void CActorParam_vtableFunc73(); //0x1B8 + virtual void CActorParam_vtableFunc74(); //0x1BC + virtual void CActorParam_vtableFunc75(); //0x1C0 + virtual void CActorParam_vtableFunc76(); //0x1C4 + virtual void CActorParam_vtableFunc77(); //0x1C8 + virtual void CActorParam_vtableFunc78(); //0x1CC + virtual void CActorParam_vtableFunc79(); //0x1D0 + virtual void CActorParam_vtableFunc80(); //0x1D4 + virtual void CActorParam_vtableFunc81(); //0x1D8 + virtual void CActorParam_vtableFunc82(); //0x1DC + virtual void CActorParam_vtableFunc83(); //0x1E0 + virtual void CActorParam_vtableFunc84(); //0x1E4 + virtual void CActorParam_vtableFunc85(); //0x1E8 + virtual void CActorParam_vtableFunc86(); //0x1EC + virtual void CActorParam_vtableFunc87(); //0x1F0 + virtual void CActorParam_vtableFunc88(); //0x1F4 + virtual void CActorParam_vtableFunc89(); //0x1F8 + virtual void CActorParam_vtableFunc90(); //0x1FC + virtual void CActorParam_vtableFunc91(); //0x200 + virtual void CActorParam_vtableFunc92(); //0x204 + virtual void CActorParam_vtableFunc93(); //0x208 + virtual void CActorParam_vtableFunc94(); //0x20C + virtual void CActorParam_vtableFunc95(); //0x210 + virtual void CActorParam_vtableFunc96(); //0x214 + virtual void CActorParam_vtableFunc97(); //0x218 + virtual void CActorParam_vtableFunc98(); //0x21C + virtual void CActorParam_vtableFunc99(); //0x220 + virtual void CActorParam_vtableFunc100(); //0x224 + virtual void CActorParam_vtableFunc101(); //0x228 + virtual void CActorParam_vtableFunc102(); //0x22C + virtual void CActorParam_vtableFunc103(); //0x230 + virtual void CActorParam_vtableFunc104(); //0x234 + virtual void CActorParam_vtableFunc105(); //0x238 + virtual void CActorParam_vtableFunc106(); //0x23C + virtual void CActorParam_vtableFunc107(); //0x240 + virtual void CActorParam_vtableFunc108(); //0x244 + virtual void CActorParam_vtableFunc109(); //0x248 + virtual void CActorParam_vtableFunc110(); //0x24C + virtual void CActorParam_vtableFunc111(); //0x250 + virtual void CActorParam_vtableFunc112(); //0x254 + virtual void CActorParam_vtableFunc113(); //0x258 + virtual void CActorParam_vtableFunc114(); //0x25C + virtual void CActorParam_vtableFunc115(); //0x260 + virtual void CActorParam_vtableFunc116(); //0x264 + virtual void CActorParam_vtableFunc117(); //0x268 + virtual void CActorParam_vtableFunc118(); //0x26C + virtual void CActorParam_vtableFunc119(); //0x270 + virtual void CActorParam_vtableFunc120(); //0x274 + virtual void CActorParam_vtableFunc121(); //0x278 + virtual void CActorParam_vtableFunc122(); //0x27C + virtual void CActorParam_vtableFunc123(); //0x280 + virtual void CActorParam_vtableFunc124(); //0x284 + virtual void CActorParam_vtableFunc125(); //0x288 + virtual void CActorParam_vtableFunc126(); //0x28C + virtual void CActorParam_vtableFunc127(); //0x290 + virtual void CActorParam_vtableFunc128(); //0x294 + virtual CActorParam_UnkStruct1* CActorParam_vtableFunc129(); //0x298 + virtual void CActorParam_vtableFunc130(); //0x29C + virtual void CActorParam_vtableFunc131(); //0x2A0 + virtual void CActorParam_vtableFunc132(); //0x2A4 + virtual void CActorParam_vtableFunc133(); //0x2A8 + virtual void CActorParam_vtableFunc134(); //0x2AC + virtual void CActorParam_vtableFunc135(); //0x2B0 + virtual void CActorParam_vtableFunc136(); //0x2B4 + virtual void CActorParam_vtableFunc137(); //0x2B8 + virtual bool CActorParam_vtableFunc138(); //0x2BC + virtual void CActorParam_vtableFunc139(); //0x2C0 + virtual void CActorParam_vtableFunc140(); //0x2C4 + virtual void CActorParam_vtableFunc141(); //0x2C8 + virtual void CActorParam_vtableFunc142(); //0x2CC + virtual void CActorParam_vtableFunc143(); //0x2D0 + virtual void CActorParam_vtableFunc144(); //0x2D4 + virtual void CActorParam_vtableFunc145(); //0x2D8 + virtual void CActorParam_vtableFunc146(); //0x2DC + virtual void CActorParam_vtableFunc147(); //0x2E0 + virtual void CActorParam_vtableFunc148(); //0x2E4 + virtual void CActorParam_vtableFunc149(); //0x2E8 + virtual void CActorParam_vtableFunc150(); //0x2EC + virtual void CActorParam_vtableFunc151(); //0x2F0 + virtual void CActorParam_vtableFunc152(); //0x2F4 + virtual void CActorParam_vtableFunc153(); //0x2F8 + virtual void CActorParam_vtableFunc154(); //0x2FC + virtual void CActorParam_vtableFunc155(); //0x300 + virtual void CActorParam_vtableFunc156(); //0x304 + virtual void CActorParam_vtableFunc157(); //0x308 + virtual void CActorParam_vtableFunc158(); //0x30C + virtual void CActorParam_vtableFunc159(); //0x310 + virtual void CActorParam_vtableFunc160(); //0x314 + virtual void CActorParam_vtableFunc161(); //0x318 + virtual void CActorParam_vtableFunc162(); //0x31C + virtual void CActorParam_vtableFunc163(); //0x320 + virtual void CActorParam_vtableFunc164(); //0x324 + virtual void CActorParam_vtableFunc165(); //0x328 + virtual void CActorParam_vtableFunc166(); //0x32C + virtual void CActorParam_vtableFunc167(); //0x330 + virtual void CActorParam_vtableFunc168(); //0x334 + virtual void CActorParam_vtableFunc169(); //0x338 + virtual void CActorParam_vtableFunc170(); //0x33C + virtual void CActorParam_vtableFunc171(); //0x340 + virtual void CActorParam_vtableFunc172(); //0x344 + virtual void CActorParam_vtableFunc173(); //0x348 + virtual void CActorParam_vtableFunc174(); //0x34C + virtual void CActorParam_vtableFunc175(); //0x350 + virtual void CActorParam_vtableFunc176(); //0x354 + virtual void CActorParam_vtableFunc177(); //0x358 + virtual void CActorParam_vtableFunc178(); //0x35C + virtual void CActorParam_vtableFunc179(); //0x360 + virtual void CActorParam_vtableFunc180(); //0x364 + virtual void CActorParam_vtableFunc181(); //0x368 - u8 unk15E0[0x1DA4]; //temporary + u8 unk15E0[0x3384 - 0x15E0]; //temporary }; } diff --git a/src/kyoshin/appgame/cf/object/CActorState.hpp b/src/kyoshin/appgame/cf/object/CActorState.hpp index e9736d63..57c8f75d 100644 --- a/src/kyoshin/appgame/cf/object/CActorState.hpp +++ b/src/kyoshin/appgame/cf/object/CActorState.hpp @@ -5,7 +5,7 @@ namespace cf{ class CActorState{ public: - virtual void CActorState_vtableFunc1(); + virtual void CActorState_vtableFunc1(); //0x8 u32 unk4; }; diff --git a/src/kyoshin/appgame/cf/object/CBattleState.hpp b/src/kyoshin/appgame/cf/object/CBattleState.hpp index 7bb3e316..4a7198b1 100644 --- a/src/kyoshin/appgame/cf/object/CBattleState.hpp +++ b/src/kyoshin/appgame/cf/object/CBattleState.hpp @@ -2,43 +2,43 @@ #include "types.h" -namespace cf{ - class CBattleState{ +namespace cf { + class CBattleState { public: - virtual void CBattleState_vtableFunc1(); - virtual void CBattleState_vtableFunc2(); - virtual void CBattleState_vtableFunc3(); - virtual void CBattleState_vtableFunc4(); - virtual void CBattleState_vtableFunc5(); - virtual void CBattleState_vtableFunc6(); - virtual void CBattleState_vtableFunc7(); - virtual void CBattleState_vtableFunc8(); - virtual void CBattleState_vtableFunc9(); - virtual void CBattleState_vtableFunc10(); - virtual void CBattleState_vtableFunc11(); - virtual void CBattleState_vtableFunc12(); - virtual void CBattleState_vtableFunc13(); - virtual void CBattleState_vtableFunc14(); - virtual void CBattleState_vtableFunc15(); - virtual void CBattleState_vtableFunc16(); - virtual void CBattleState_vtableFunc17(); - virtual void CBattleState_vtableFunc18(); - virtual void CBattleState_vtableFunc19(); - virtual void CBattleState_vtableFunc20(); - virtual void CBattleState_vtableFunc21(); - virtual void CBattleState_vtableFunc22(); - virtual void CBattleState_vtableFunc23(); - virtual void CBattleState_vtableFunc24(); - virtual void CBattleState_vtableFunc25(); - virtual void CBattleState_vtableFunc26(); - virtual void CBattleState_vtableFunc27(); - virtual void CBattleState_vtableFunc28(); - virtual void CBattleState_vtableFunc29(); - virtual void CBattleState_vtableFunc30(); - virtual void CBattleState_vtableFunc31(); - virtual void CBattleState_vtableFunc32(); - virtual void CBattleState_vtableFunc33(); + virtual void CBattleState_vtableFunc1(); //0x8 + virtual void CBattleState_vtableFunc2(); //0xC + virtual void CBattleState_vtableFunc3(); //0x10 + virtual void CBattleState_vtableFunc4(); //0x14 + virtual void CBattleState_vtableFunc5(); //0x18 + virtual void CBattleState_vtableFunc6(); //0x1C + virtual void CBattleState_vtableFunc7(); //0x20 + virtual void CBattleState_vtableFunc8(); //0x24 + virtual void CBattleState_vtableFunc9(); //0x28 + virtual void CBattleState_vtableFunc10(); //0x2C + virtual void CBattleState_vtableFunc11(); //0x30 + virtual void CBattleState_vtableFunc12(); //0x34 + virtual void CBattleState_vtableFunc13(); //0x38 + virtual void CBattleState_vtableFunc14(); //0x3C + virtual void CBattleState_vtableFunc15(); //0x40 + virtual void CBattleState_vtableFunc16(); //0x44 + virtual void CBattleState_vtableFunc17(); //0x48 + virtual void CBattleState_vtableFunc18(); //0x4C + virtual void CBattleState_vtableFunc19(); //0x50 + virtual void CBattleState_vtableFunc20(); //0x54 + virtual void CBattleState_vtableFunc21(); //0x58 + virtual void CBattleState_vtableFunc22(); //0x5C + virtual void CBattleState_vtableFunc23(); //0x60 + virtual void CBattleState_vtableFunc24(); //0x64 + virtual void CBattleState_vtableFunc25(); //0x68 + virtual void CBattleState_vtableFunc26(); //0x6C + virtual void CBattleState_vtableFunc27(); //0x70 + virtual void CBattleState_vtableFunc28(); //0x74 + virtual void CBattleState_vtableFunc29(); //0x78 + virtual void CBattleState_vtableFunc30(); //0x7C + virtual void CBattleState_vtableFunc31(); //0x80 + virtual void CBattleState_vtableFunc32(); //0x84 + virtual void CBattleState_vtableFunc33(); //0x88 - u8 unkC[0x15D0]; + u8 unkC[0x15DC - 0xC]; }; } diff --git a/src/kyoshin/appgame/cf/object/CObjectParam.hpp b/src/kyoshin/appgame/cf/object/CObjectParam.hpp index 35b9c581..c733cb3a 100644 --- a/src/kyoshin/appgame/cf/object/CObjectParam.hpp +++ b/src/kyoshin/appgame/cf/object/CObjectParam.hpp @@ -7,12 +7,12 @@ namespace cf{ //min size: 0x38 class CObjectParam : public CObjectState{ public: - virtual void CObjectParam_vtableFunc1(); - virtual void CObjectParam_vtableFunc2(); - virtual void CObjectParam_vtableFunc3(); - virtual void CObjectParam_vtableFunc4(); - virtual BOOL CObjectParam_vtableFunc5(); - virtual void CObjectParam_vtableFunc6(); + virtual void CObjectParam_vtableFunc1(); //0x3C + virtual void CObjectParam_vtableFunc2(); //0x40 + virtual void CObjectParam_vtableFunc3(); //0x44 + virtual void CObjectParam_vtableFunc4(); //0x48 + virtual BOOL CObjectParam_vtableFunc5(); //0x4C + virtual void CObjectParam_vtableFunc6(); //0x50 //0x0: vtable //0x0-10: CObjectState diff --git a/src/kyoshin/appgame/cf/object/CObjectState.hpp b/src/kyoshin/appgame/cf/object/CObjectState.hpp index 1cb41fa1..5d862b04 100644 --- a/src/kyoshin/appgame/cf/object/CObjectState.hpp +++ b/src/kyoshin/appgame/cf/object/CObjectState.hpp @@ -6,19 +6,19 @@ namespace cf{ //min size: 0x10 class CObjectState{ public: - virtual void CObjectState_vtableFunc1(); - virtual void CObjectState_vtableFunc2(); - virtual void CObjectState_vtableFunc3(); - virtual void CObjectState_vtableFunc4(); - virtual void CObjectState_vtableFunc5(); - virtual void CObjectState_vtableFunc6(); - virtual void CObjectState_vtableFunc7(); - virtual void CObjectState_vtableFunc8(); - virtual void CObjectState_vtableFunc9(); - virtual void CObjectState_vtableFunc10(); - virtual void CObjectState_vtableFunc11(); - virtual void CObjectState_vtableFunc12(); - virtual void CObjectState_vtableFunc13(); + virtual void CObjectState_vtableFunc1(); //0x8 + virtual void CObjectState_vtableFunc2(); //0xC + virtual void CObjectState_vtableFunc3(); //0x10 + virtual void CObjectState_vtableFunc4(); //0x14 + virtual void CObjectState_vtableFunc5(); //0x18 + virtual void CObjectState_vtableFunc6(); //0x1C + virtual void CObjectState_vtableFunc7(); //0x20 + virtual void CObjectState_vtableFunc8(); //0x24 + virtual void CObjectState_vtableFunc9(); //0x28 + virtual void CObjectState_vtableFunc10(); //0x2C + virtual void CObjectState_vtableFunc11(); //0x30 + virtual void CObjectState_vtableFunc12(); //0x34 + virtual void CObjectState_vtableFunc13(); //0x38 //0x0: vtable u8 unk4_3[0xC]; diff --git a/src/kyoshin/appgame/cf/object/CfObject.hpp b/src/kyoshin/appgame/cf/object/CfObject.hpp index d72bb79f..4cd35523 100644 --- a/src/kyoshin/appgame/cf/object/CfObject.hpp +++ b/src/kyoshin/appgame/cf/object/CfObject.hpp @@ -3,84 +3,84 @@ #include "types.h" #include "kyoshin/appgame/cf/object/CObjectParam.hpp" -namespace cf{ +namespace cf { //min size: 0x70 - class CfObject : public CObjectParam{ + class CfObject : public CObjectParam { public: //vtable 1 (CfObject) - virtual ~CfObject(); //0x54 - virtual void CfObject_vtableFunc2() = 0; - virtual void CfObject_vtableFunc3(); - virtual void CfObject_vtableFunc4() = 0; - virtual void CfObject_vtableFunc5(); - virtual void CfObject_vtableFunc6(); - virtual void CfObject_vtableFunc7() = 0; - virtual void CfObject_vtableFunc8() = 0; - virtual void CfObject_vtableFunc9(); - virtual void CfObject_vtableFunc10(); - virtual void CfObject_vtableFunc11(); - virtual void CfObject_vtableFunc12(); - virtual void CfObject_vtableFunc13(); - virtual void CfObject_vtableFunc14(); - virtual void CfObject_vtableFunc15(); - virtual void CfObject_vtableFunc16(); - virtual void CfObject_vtableFunc17(); - virtual void CfObject_vtableFunc18(); - virtual void CfObject_vtableFunc19(); - virtual void CfObject_vtableFunc20(); - virtual void CfObject_vtableFunc21(); - virtual void CfObject_vtableFunc22(); - virtual void CfObject_vtableFunc23(); - virtual void CfObject_vtableFunc24(); - virtual void CfObject_vtableFunc25(); - virtual void CfObject_vtableFunc26(); - virtual void CfObject_vtableFunc27(); - virtual void CfObject_vtableFunc28(); - virtual void CfObject_vtableFunc29(); - virtual void CfObject_vtableFunc30(); - virtual void CfObject_vtableFunc31(); - virtual void CfObject_vtableFunc32(); - virtual void CfObject_vtableFunc33(); - virtual void CfObject_vtableFunc34(); - virtual void CfObject_vtableFunc35(); - virtual void CfObject_vtableFunc36(); - virtual void CfObject_vtableFunc37(); - virtual void CfObject_vtableFunc38(); - virtual void CfObject_vtableFunc39(); - virtual void CfObject_vtableFunc40(); - virtual void CfObject_vtableFunc41(); - virtual void CfObject_vtableFunc42(); - virtual void CfObject_vtableFunc43(); - virtual void CfObject_vtableFunc44(); - virtual void CfObject_vtableFunc45(); - virtual void CfObject_vtableFunc46(); - virtual void CfObject_vtableFunc47(); - virtual void CfObject_vtableFunc48(); - virtual void CfObject_vtableFunc49(); - virtual void CfObject_vtableFunc50(); - virtual void CfObject_vtableFunc51(); - virtual void CfObject_vtableFunc52(); - virtual void CfObject_vtableFunc53(); - virtual void CfObject_vtableFunc54(); - virtual void CfObject_vtableFunc55(); - virtual void CfObject_vtableFunc56(); - virtual void CfObject_vtableFunc57(); - virtual void CfObject_vtableFunc58(); - virtual void CfObject_vtableFunc59(); - virtual void CfObject_vtableFunc60(); - virtual void CfObject_vtableFunc61(); - virtual void CfObject_vtableFunc62(); - virtual void CfObject_vtableFunc63(); - virtual void CfObject_vtableFunc64(); - virtual void CfObject_vtableFunc65(); - virtual void CfObject_vtableFunc66() = 0; - virtual void CfObject_vtableFunc67(); - virtual void CfObject_vtableFunc68() = 0; - virtual void CfObject_vtableFunc69(); - virtual void CfObject_vtableFunc70(); - virtual void CfObject_vtableFunc71(); - virtual void CfObject_vtableFunc72(); - virtual void CfObject_vtableFunc73(); + virtual ~CfObject(); //0x54 + virtual void CfObject_vtableFunc2() = 0; //0x58 + virtual void CfObject_vtableFunc3(); //0x5C + virtual void CfObject_vtableFunc4() = 0; //0x60 + virtual void CfObject_vtableFunc5(); //0x64 + virtual void CfObject_vtableFunc6(); //0x68 + virtual void CfObject_vtableFunc7() = 0; //0x6C + virtual void CfObject_vtableFunc8() = 0; //0x70 + virtual void CfObject_vtableFunc9(); //0x74 + virtual void CfObject_vtableFunc10(); //0x78 + virtual void CfObject_vtableFunc11(); //0x7C + virtual void CfObject_vtableFunc12(); //0x80 + virtual void CfObject_vtableFunc13(); //0x84 + virtual void CfObject_vtableFunc14(); //0x88 + virtual void CfObject_vtableFunc15(); //0x8C + virtual void CfObject_vtableFunc16(); //0x90 + virtual void CfObject_vtableFunc17(); //0x94 + virtual void CfObject_vtableFunc18(); //0x98 + virtual void CfObject_vtableFunc19(); //0x9C + virtual void CfObject_vtableFunc20(); //0xA0 + virtual void CfObject_vtableFunc21(); //0xA4 + virtual void CfObject_vtableFunc22(); //0xA8 + virtual void CfObject_vtableFunc23(); //0xAC + virtual void CfObject_vtableFunc24(); //0xB0 + virtual void CfObject_vtableFunc25(); //0xB4 + virtual void CfObject_vtableFunc26(); //0xB8 + virtual void CfObject_vtableFunc27(); //0xBC + virtual void CfObject_vtableFunc28(); //0xC0 + virtual void CfObject_vtableFunc29(); //0xC4 + virtual void CfObject_vtableFunc30(); //0xC8 + virtual void CfObject_vtableFunc31(); //0xCC + virtual void CfObject_vtableFunc32(); //0xD0 + virtual void CfObject_vtableFunc33(); //0xD4 + virtual void CfObject_vtableFunc34(); //0xD8 + virtual void CfObject_vtableFunc35(); //0xDC + virtual void CfObject_vtableFunc36(); //0xE0 + virtual void CfObject_vtableFunc37(); //0xE4 + virtual void CfObject_vtableFunc38(); //0xE8 + virtual void CfObject_vtableFunc39(); //0xEC + virtual void CfObject_vtableFunc40(); //0xF0 + virtual void CfObject_vtableFunc41(); //0xF4 + virtual void CfObject_vtableFunc42(); //0xF8 + virtual void CfObject_vtableFunc43(); //0xFC + virtual void CfObject_vtableFunc44(); //0x100 + virtual void CfObject_vtableFunc45(); //0x104 + virtual void CfObject_vtableFunc46(); //0x108 + virtual void CfObject_vtableFunc47(); //0x10C + virtual void CfObject_vtableFunc48(); //0x110 + virtual void CfObject_vtableFunc49(); //0x114 + virtual void CfObject_vtableFunc50(); //0x118 + virtual void CfObject_vtableFunc51(); //0x11C + virtual void CfObject_vtableFunc52(); //0x120 + virtual void CfObject_vtableFunc53(); //0x124 + virtual void CfObject_vtableFunc54(); //0x128 + virtual void CfObject_vtableFunc55(); //0x12C + virtual void CfObject_vtableFunc56(); //0x130 + virtual void CfObject_vtableFunc57(); //0x134 + virtual void CfObject_vtableFunc58(); //0x138 + virtual void CfObject_vtableFunc59(); //0x13C + virtual void CfObject_vtableFunc60(); //0x140 + virtual void CfObject_vtableFunc61(); //0x144 + virtual void CfObject_vtableFunc62(); //0x148 + virtual void CfObject_vtableFunc63(); //0x14C + virtual void CfObject_vtableFunc64(); //0x150 + virtual void CfObject_vtableFunc65(); //0x154 + virtual void CfObject_vtableFunc66() = 0; //0x158 + virtual void CfObject_vtableFunc67(); //0x15C + virtual void CfObject_vtableFunc68() = 0; //0x160 + virtual void CfObject_vtableFunc69(); //0x164 + virtual void CfObject_vtableFunc70(); //0x168 + virtual void CfObject_vtableFunc71(); //0x16C + virtual void CfObject_vtableFunc72(); //0x170 + virtual void CfObject_vtableFunc73(); //0x174 //not sure if belongs here? (can be in any class from CObjectState to CfObjectMove) void func_800BE898(int, u32, float, float); @@ -88,6 +88,8 @@ namespace cf{ //0x0: vtable //0x0-38: CObjectParam - u8 unk38_3[0x38]; + u8 unk38_3[0x64 - 0x38]; + u32 unk64; + u8 unk68[0x70 - 0x68]; }; } diff --git a/src/kyoshin/appgame/cf/object/CfObjectActor.hpp b/src/kyoshin/appgame/cf/object/CfObjectActor.hpp index e51cba06..de862c0e 100644 --- a/src/kyoshin/appgame/cf/object/CfObjectActor.hpp +++ b/src/kyoshin/appgame/cf/object/CfObjectActor.hpp @@ -5,24 +5,24 @@ #include "kyoshin/appgame/cf/object/CAIAction.hpp" #include "kyoshin/appgame/cf/object/CActorParam.hpp" -namespace cf{ +namespace cf { //min size: 0x45BC - class CfObjectActor : public CActorParam, public CAIAction, public CfObjectMove{ + class CfObjectActor : public CActorParam, public CAIAction, public CfObjectMove { public: //vtable 4 (CfObjectActor) - virtual ~CfObjectActor(); - virtual void CfObjectActor_vtableFunc2(); - virtual void CfObjectActor_vtableFunc3(); - virtual void CfObjectActor_vtableFunc4(); - virtual void CfObjectActor_vtableFunc5(); - virtual void CfObjectActor_vtableFunc6(); - virtual void CfObjectActor_vtableFunc7(); - virtual void CfObjectActor_vtableFunc8(); - virtual void CfObjectActor_vtableFunc9(); - virtual void CfObjectActor_vtableFunc10(); - virtual void CfObjectActor_vtableFunc11(); - virtual void CfObjectActor_vtableFunc12(); - virtual void CfObjectActor_vtableFunc13(); + virtual ~CfObjectActor(); //0x5A0 + virtual void CfObjectActor_vtableFunc2(); //0x5A4 + virtual void CfObjectActor_vtableFunc3(); //0x5A8 + virtual void CfObjectActor_vtableFunc4(); //0x5AC + virtual void CfObjectActor_vtableFunc5(); //0x5B0 + virtual void CfObjectActor_vtableFunc6(); //0x5B4 + virtual void CfObjectActor_vtableFunc7(); //0x5B8 + virtual void CfObjectActor_vtableFunc8(); //0x5BC + virtual void CfObjectActor_vtableFunc9(); //0x5C0 + virtual void CfObjectActor_vtableFunc10(); //0x5C4 + virtual void CfObjectActor_vtableFunc11(); //0x5C8 + virtual void CfObjectActor_vtableFunc12(); //0x5CC + virtual void CfObjectActor_vtableFunc13(); //0x5D0 //0x0: vtable 1 //0x0-3e98: CActorParam/CAIAction diff --git a/src/kyoshin/appgame/cf/object/CfObjectEne.hpp b/src/kyoshin/appgame/cf/object/CfObjectEne.hpp index 653b4709..476058fe 100644 --- a/src/kyoshin/appgame/cf/object/CfObjectEne.hpp +++ b/src/kyoshin/appgame/cf/object/CfObjectEne.hpp @@ -3,9 +3,9 @@ #include "types.h" #include "kyoshin/appgame/cf/object/CfObjectActor.hpp" -namespace cf{ +namespace cf { //size: 0x45CC - class CfObjectEne : public CfObjectActor{ + class CfObjectEne : public CfObjectActor { public: virtual ~CfObjectEne(); virtual void func_800ADB2C(); diff --git a/src/kyoshin/appgame/cf/object/CfObjectModel.hpp b/src/kyoshin/appgame/cf/object/CfObjectModel.hpp index 28305dcd..60c3ff5f 100644 --- a/src/kyoshin/appgame/cf/object/CfObjectModel.hpp +++ b/src/kyoshin/appgame/cf/object/CfObjectModel.hpp @@ -3,33 +3,33 @@ #include "types.h" #include "kyoshin/appgame/cf/object/CfObject.hpp" -namespace cf{ +namespace cf { //min size: 0xbe - class CfObjectModel : public CfObject{ + class CfObjectModel : public CfObject { public: //vtable 1 (CfObject) virtual ~CfObjectModel(); //vtable 1 (CfObjectModel) - virtual void CfObjectModel_vtableFunc1(); - virtual void CfObjectModel_vtableFunc2(); - virtual void CfObjectModel_vtableFunc3(); - virtual void CfObjectModel_vtableFunc4(); - virtual void CfObjectModel_vtableFunc5(); - virtual void CfObjectModel_vtableFunc6(); - virtual void CfObjectModel_vtableFunc7(); - virtual void CfObjectModel_vtableFunc8(); - virtual void CfObjectModel_vtableFunc9(); - virtual void CfObjectModel_vtableFunc10(); - virtual void CfObjectModel_vtableFunc11(); - virtual void CfObjectModel_vtableFunc12(); - virtual void CfObjectModel_vtableFunc13(); - virtual void CfObjectModel_vtableFunc14(); - virtual void CfObjectModel_vtableFunc15(); - virtual void CfObjectModel_vtableFunc16(); - virtual void CfObjectModel_vtableFunc17(); - virtual void CfObjectModel_vtableFunc18(); - virtual void CfObjectModel_vtableFunc19(); - virtual void CfObjectModel_vtableFunc20(); + virtual void CfObjectModel_vtableFunc1(); //0x178 + virtual void CfObjectModel_vtableFunc2(); //0x17C + virtual void CfObjectModel_vtableFunc3(); //0x180 + virtual void CfObjectModel_vtableFunc4(); //0x184 + virtual void CfObjectModel_vtableFunc5(); //0x188 + virtual void CfObjectModel_vtableFunc6(); //0x18C + virtual void CfObjectModel_vtableFunc7(); //0x190 + virtual void CfObjectModel_vtableFunc8(); //0x194 + virtual void CfObjectModel_vtableFunc9(); //0x198 + virtual void CfObjectModel_vtableFunc10(); //0x19C + virtual void CfObjectModel_vtableFunc11(); //0x1A0 + virtual void CfObjectModel_vtableFunc12(); //0x1A4 + virtual void CfObjectModel_vtableFunc13(); //0x1A8 + virtual void CfObjectModel_vtableFunc14(); //0x1AC + virtual void CfObjectModel_vtableFunc15(); //0x1B0 + virtual void CfObjectModel_vtableFunc16(); //0x1B4 + virtual void CfObjectModel_vtableFunc17(); //0x1B8 + virtual void CfObjectModel_vtableFunc18(); //0x1BC + virtual void CfObjectModel_vtableFunc19(); //0x1C0 + virtual void CfObjectModel_vtableFunc20(); //0x1C4 //0x0: vtable //0x0-70: CfObject diff --git a/src/kyoshin/appgame/cf/object/CfObjectMove.hpp b/src/kyoshin/appgame/cf/object/CfObjectMove.hpp index 8eb2c74e..5041af09 100644 --- a/src/kyoshin/appgame/cf/object/CfObjectMove.hpp +++ b/src/kyoshin/appgame/cf/object/CfObjectMove.hpp @@ -3,36 +3,36 @@ #include "types.h" #include "kyoshin/appgame/cf/object/CfObjectModel.hpp" -namespace cf{ +namespace cf { //min size: 0x715 - class CfObjectMove : public CfObjectModel{ + class CfObjectMove : public CfObjectModel { public: //vtable 1 (CfObject) virtual ~CfObjectMove(); //vtable 1 (CfObjectMove) - virtual void CfObjectMove_vtableFunc1(); - virtual void CfObjectMove_vtableFunc2(); - virtual void CfObjectMove_vtableFunc3(); - virtual void CfObjectMove_vtableFunc4(); - virtual void CfObjectMove_vtableFunc5(); - virtual void CfObjectMove_vtableFunc6(); - virtual void CfObjectMove_vtableFunc7(); - virtual void CfObjectMove_vtableFunc8(); - virtual void CfObjectMove_vtableFunc9(); - virtual void CfObjectMove_vtableFunc10(); - virtual void CfObjectMove_vtableFunc11(); - virtual void CfObjectMove_vtableFunc12(); - virtual void CfObjectMove_vtableFunc13(); - virtual void CfObjectMove_vtableFunc14(); - virtual void CfObjectMove_vtableFunc15(); - virtual void CfObjectMove_vtableFunc16(); - virtual void CfObjectMove_vtableFunc17(); - virtual void CfObjectMove_vtableFunc18(); - virtual void CfObjectMove_vtableFunc19(); - virtual void CfObjectMove_vtableFunc20(); - virtual void CfObjectMove_vtableFunc21(); - virtual void CfObjectMove_vtableFunc22(); - virtual void CfObjectMove_vtableFunc23(); + virtual void CfObjectMove_vtableFunc1(); //0x1C8 + virtual void CfObjectMove_vtableFunc2(); //0x1CC + virtual void CfObjectMove_vtableFunc3(); //0x1D0 + virtual void CfObjectMove_vtableFunc4(); //0x1D4 + virtual void CfObjectMove_vtableFunc5(); //0x1D8 + virtual void CfObjectMove_vtableFunc6(); //0x1DC + virtual void CfObjectMove_vtableFunc7(); //0x1E0 + virtual void CfObjectMove_vtableFunc8(); //0x1E4 + virtual void CfObjectMove_vtableFunc9(); //0x1E8 + virtual void CfObjectMove_vtableFunc10(); //0x1EC + virtual void CfObjectMove_vtableFunc11(); //0x1F0 + virtual void CfObjectMove_vtableFunc12(); //0x1F4 + virtual void CfObjectMove_vtableFunc13(); //0x1F8 + virtual void CfObjectMove_vtableFunc14(); //0x1FC + virtual void CfObjectMove_vtableFunc15(); //0x200 + virtual void CfObjectMove_vtableFunc16(); //0x204 + virtual void CfObjectMove_vtableFunc17(); //0x208 + virtual void CfObjectMove_vtableFunc18(); //0x20C + virtual void CfObjectMove_vtableFunc19(); //0x210 + virtual void CfObjectMove_vtableFunc20(); //0x214 + virtual void CfObjectMove_vtableFunc21(); //0x218 + virtual void CfObjectMove_vtableFunc22(); //0x21C + virtual void CfObjectMove_vtableFunc23(); //0x220 //0x0: vtable //0x0-BE: CfObjectModel diff --git a/src/kyoshin/appgame/cf/object/CfObjectPc.hpp b/src/kyoshin/appgame/cf/object/CfObjectPc.hpp index a1985d36..54e491f0 100644 --- a/src/kyoshin/appgame/cf/object/CfObjectPc.hpp +++ b/src/kyoshin/appgame/cf/object/CfObjectPc.hpp @@ -12,20 +12,20 @@ namespace cf{ class CfObjectPc : public CfObjectActor{ public: virtual ~CfObjectPc(); - virtual void func_800BFF20(); - virtual void func_800C0080(); - virtual void func_800C0524(); - virtual void func_800BFFEC(); - virtual void func_800C00C0(); - virtual void func_800C0174(); - virtual void func_800C02C4(); - virtual void func_800C02EC(); - virtual void func_800C032C(); - virtual void func_800C03A8(); - virtual void func_800C0474(); - virtual void func_800C0504(); - virtual void func_800C0514(); - virtual void func_800C11CC(); + virtual void func_800BFF20(); //0x5D4 + virtual void func_800C0080(); //0x5D8 + virtual void func_800C0524(); //0x5DC + virtual void func_800BFFEC(); //0x5E0 + virtual void func_800C00C0(); //0x5E4 + virtual void func_800C0174(); //0x5E8 + virtual void func_800C02C4(); //0x5EC + virtual void func_800C02EC(); //0x5F0 + virtual void func_800C032C(); //0x5F4 + virtual void func_800C03A8(); //0x5F8 + virtual void func_800C0474(); //0x5FC + virtual void func_800C0504(); //0x600 + virtual void func_800C0514(); //0x604 + virtual void func_800C11CC(); //0x608 inline UNKTYPE* unkInline1(){ BOOL thing = CObjectParam_vtableFunc5();