Merge branch 'main' into d_lyt_shop

This commit is contained in:
robojumper
2026-02-01 20:46:00 +01:00
committed by GitHub
623 changed files with 5693 additions and 1345 deletions
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcBAsura_c : public dAcEnBase_c {
public:
dAcBAsura_c() : mStateMgr(*this, sStateID::null) {}
dAcBAsura_c() : mStateMgr(*this) {}
virtual ~dAcBAsura_c() {}
STATE_FUNC_DECLARE(dAcBAsura_c, Attack);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcAsuraArm_c : public dAcObjBase_c {
public:
dAcAsuraArm_c() : mStateMgr(*this, sStateID::null) {}
dAcAsuraArm_c() : mStateMgr(*this) {}
virtual ~dAcAsuraArm_c() {}
STATE_FUNC_DECLARE(dAcAsuraArm_c, Pulled);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcAsuraFoot_c : public dAcObjBase_c {
public:
dAcAsuraFoot_c() : mStateMgr(*this, sStateID::null) {}
dAcAsuraFoot_c() : mStateMgr(*this) {}
virtual ~dAcAsuraFoot_c() {}
STATE_FUNC_DECLARE(dAcAsuraFoot_c, Pulled);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcBBigBoss_c : public dAcEnBase_c {
public:
dAcBBigBoss_c() : mStateMgr(*this, sStateID::null) {}
dAcBBigBoss_c() : mStateMgr(*this) {}
virtual ~dAcBBigBoss_c() {}
STATE_FUNC_DECLARE(dAcBBigBoss_c, AppearWait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcBBigBoss2_c : public dAcEnBase_c {
public:
dAcBBigBoss2_c() : mStateMgr(*this, sStateID::null) {}
dAcBBigBoss2_c() : mStateMgr(*this) {}
virtual ~dAcBBigBoss2_c() {}
STATE_FUNC_DECLARE(dAcBBigBoss2_c, AppearWait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcBBigBoss3_c : public dAcEnBase_c {
public:
dAcBBigBoss3_c() : mStateMgr(*this, sStateID::null) {}
dAcBBigBoss3_c() : mStateMgr(*this) {}
virtual ~dAcBBigBoss3_c() {}
STATE_FUNC_DECLARE(dAcBBigBoss3_c, AppearWait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcGirahimu_c : public dAcEnBase_c {
public:
dAcGirahimu_c() : mStateMgr(*this, sStateID::null) {}
dAcGirahimu_c() : mStateMgr(*this) {}
virtual ~dAcGirahimu_c() {}
private:
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcGirahimu2_c : public dAcEnBase_c {
public:
dAcGirahimu2_c() : mStateMgr(*this, sStateID::null) {}
dAcGirahimu2_c() : mStateMgr(*this) {}
virtual ~dAcGirahimu2_c() {}
private:
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcGirahimu3Base_c : public dAcEnBase_c {
public:
dAcGirahimu3Base_c() : mStateMgr(*this, sStateID::null) {}
dAcGirahimu3Base_c() : mStateMgr(*this) {}
virtual ~dAcGirahimu3Base_c() {}
private:
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcGirahimu3Second_c : public dAcEnBase_c {
public:
dAcGirahimu3Second_c() : mStateMgr(*this, sStateID::null) {}
dAcGirahimu3Second_c() : mStateMgr(*this) {}
virtual ~dAcGirahimu3Second_c() {}
STATE_FUNC_DECLARE(dAcGirahimu3Second_c, Demo);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcGirahimu3Third_c : public dAcEnBase_c {
public:
dAcGirahimu3Third_c() : mStateMgr(*this, sStateID::null) {}
dAcGirahimu3Third_c() : mStateMgr(*this) {}
virtual ~dAcGirahimu3Third_c() {}
STATE_FUNC_DECLARE(dAcGirahimu3Third_c, Demo);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcGirahimuBase_c : public dAcEnBase_c {
public:
dAcGirahimuBase_c() : mStateMgr(*this, sStateID::null) {}
dAcGirahimuBase_c() : mStateMgr(*this) {}
virtual ~dAcGirahimuBase_c() {}
private:
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcBkr_c : public dAcEnBase_c {
public:
dAcBkr_c() : mStateMgr(*this, sStateID::null) {}
dAcBkr_c() : mStateMgr(*this) {}
virtual ~dAcBkr_c() {}
STATE_FUNC_DECLARE(dAcBkr_c, StartDemo);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcBkra_c : public dAcEnBase_c {
public:
dAcBkra_c() : mStateMgr(*this, sStateID::null) {}
dAcBkra_c() : mStateMgr(*this) {}
virtual ~dAcBkra_c() {}
STATE_FUNC_DECLARE(dAcBkra_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcBkrh_c : public dAcEnBase_c {
public:
dAcBkrh_c() : mStateMgr(*this, sStateID::null) {}
dAcBkrh_c() : mStateMgr(*this) {}
virtual ~dAcBkrh_c() {}
STATE_FUNC_DECLARE(dAcBkrh_c, Normal);
+425 -3
View File
@@ -2,14 +2,286 @@
#define D_A_B_LASTBOSS_H
#include "d/a/e/d_a_en_base.h"
#include "d/d_cc.h"
#include "d/d_light_env.h"
#include "m/m3d/m_anmmatclr.h"
#include "m/m3d/m_anmtexsrt.h"
#include "m/m3d/m_mdl.h"
#include "m/m3d/m_smdl.h"
#include "m/m_angle.h"
#include "m/m_vec.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
#include "toBeSorted/d_emitter.h"
#include "toBeSorted/d_enemy_sword_mdl.h"
#include "toBeSorted/stage_render_stuff.h"
class dTgSwordBattleGame_c;
// TODO this might be a template but what about the offset?
struct UnkLastBossCcSph1 {
/* 0x000 */ u8 _0x000[0x002 - 0x000];
/* 0x002 */ s16 field_0x002;
/* 0x004 */ s16 field_0x004;
/* 0x006 */ s16 field_0x006;
/* 0x008 */ mVec3_c field_0x008[5];
/* 0x044 */ mVec3_c field_0x044[5];
/* 0x080 */ mVec3_c field_0x080[5];
/* 0x0BC */ dCcD_Linked_Sph mCc;
};
struct UnkLastBossCcSph2 {
/* 0x000 */ s16 field_0x000;
/* 0x002 */ s16 field_0x002;
/* 0x004 */ s16 field_0x004;
/* 0x006 */ s16 field_0x006;
/* 0x008 */ s16 field_0x008;
/* 0x00A */ s16 field_0x00A;
/* 0x00C */ f32 field_0x00C;
/* 0x010 */ f32 field_0x010;
/* 0x014 */ mVec3_c field_0x014[10];
/* 0x08C */ mVec3_c field_0x08C[10];
/* 0x104 */ mVec3_c field_0x104[10];
/* 0x17C */ dCcD_Linked_Sph mCc;
};
class dAcBlastboss_c : public dAcEnBase_c {
class callback_c : public m3d::callback_c {
public:
virtual void timingB(u32, nw4r::g3d::WorldMtxManip *, nw4r::g3d::ResMdl) override;
/* 0x04 */ mAng field_0x04;
/* 0x06 */ mAng field_0x06;
/* 0x08 */ mAng field_0x08;
/* 0x0A */ mAng field_0x0A;
/* 0x0C */ mAng field_0x0C;
/* 0x0E */ mAng field_0x0E;
/* 0x10 */ mAng field_0x10;
/* 0x12 */ mAng field_0x12;
/* 0x14 */ mAng field_0x14;
/* 0x16 */ mAng field_0x16;
/* 0x18 */ mAng field_0x18;
/* 0x1A */ mAng field_0x1A;
/* 0x1C */ mAng field_0x1C[9];
/* 0x2E */ mAng field_0x2E;
/* 0x30 */ f32 field_0x30;
/* 0x34 */ dAcBlastboss_c *mpOwner;
};
friend class callback_c;
// BLastBoss.arc > g3d > model.brres > 3DModels(NW4R) > LastBoss > Bones > ...
enum BLastBossModelNode_e {
B_LAST_BOSS_NODE_center = 0,
B_LAST_BOSS_NODE_backbone1 = 1,
B_LAST_BOSS_NODE_backbone2 = 2,
B_LAST_BOSS_NODE_chest = 3,
B_LAST_BOSS_NODE_neck = 4,
B_LAST_BOSS_NODE_head = 5,
B_LAST_BOSS_NODE_browL = 6,
B_LAST_BOSS_NODE_browR = 7,
B_LAST_BOSS_NODE_chin = 8,
B_LAST_BOSS_NODE_hairA1 = 9,
B_LAST_BOSS_NODE_hairA2 = 10,
B_LAST_BOSS_NODE_hairA3 = 11,
B_LAST_BOSS_NODE_hairA4 = 12,
B_LAST_BOSS_NODE_hairBL1 = 13,
B_LAST_BOSS_NODE_hairBL2 = 14,
B_LAST_BOSS_NODE_hairBL3 = 15,
B_LAST_BOSS_NODE_hairBR1 = 16,
B_LAST_BOSS_NODE_hairBR2 = 17,
B_LAST_BOSS_NODE_hairBR3 = 18,
B_LAST_BOSS_NODE_hairC1 = 19,
B_LAST_BOSS_NODE_hairC2 = 20,
B_LAST_BOSS_NODE_hairC3 = 21,
B_LAST_BOSS_NODE_mouthL = 22,
B_LAST_BOSS_NODE_mouthR = 23,
B_LAST_BOSS_NODE_shoulderL = 24,
B_LAST_BOSS_NODE_armL1 = 25,
B_LAST_BOSS_NODE_armL2 = 26,
B_LAST_BOSS_NODE_assistanceL = 27,
B_LAST_BOSS_NODE_wristL = 28,
B_LAST_BOSS_NODE_indexL1 = 29,
B_LAST_BOSS_NODE_indexL2 = 30,
B_LAST_BOSS_NODE_littleL1 = 31,
B_LAST_BOSS_NODE_littleL2 = 32,
B_LAST_BOSS_NODE_middleL1 = 33,
B_LAST_BOSS_NODE_middleL2 = 34,
B_LAST_BOSS_NODE_ringL1 = 35,
B_LAST_BOSS_NODE_ringL2 = 36,
B_LAST_BOSS_NODE_thumbL1 = 37,
B_LAST_BOSS_NODE_thumbL2 = 38,
B_LAST_BOSS_NODE_shoulderR = 39,
B_LAST_BOSS_NODE_armR1 = 40,
B_LAST_BOSS_NODE_armR2 = 41,
B_LAST_BOSS_NODE_assistanceR = 42,
B_LAST_BOSS_NODE_wristR = 43,
B_LAST_BOSS_NODE_indexR1 = 44,
B_LAST_BOSS_NODE_indexR2 = 45,
B_LAST_BOSS_NODE_littleR1 = 46,
B_LAST_BOSS_NODE_littleR2 = 47,
B_LAST_BOSS_NODE_loc_sword01 = 48,
B_LAST_BOSS_NODE_middleR1 = 49,
B_LAST_BOSS_NODE_middleR2 = 50,
B_LAST_BOSS_NODE_ringR1 = 51,
B_LAST_BOSS_NODE_ringR2 = 52,
B_LAST_BOSS_NODE_thumbR1 = 53,
B_LAST_BOSS_NODE_thumbR2 = 54,
B_LAST_BOSS_NODE_belly = 55,
B_LAST_BOSS_NODE_waist = 56,
B_LAST_BOSS_NODE_legL1 = 57,
B_LAST_BOSS_NODE_legL2 = 58,
B_LAST_BOSS_NODE_ankleL = 59,
B_LAST_BOSS_NODE_toeL = 60,
B_LAST_BOSS_NODE_legR1 = 61,
B_LAST_BOSS_NODE_legR2 = 62,
B_LAST_BOSS_NODE_ankleR = 63,
B_LAST_BOSS_NODE_toeR = 64,
B_LAST_BOSS_NODE_skirtA1 = 65,
B_LAST_BOSS_NODE_skirtA2 = 66,
B_LAST_BOSS_NODE_skirtAU1 = 67,
B_LAST_BOSS_NODE_skirtB1 = 68,
B_LAST_BOSS_NODE_skirtB2 = 69,
B_LAST_BOSS_NODE_skirtB3 = 70,
B_LAST_BOSS_NODE_skirtB4 = 71,
B_LAST_BOSS_NODE_skirtB5 = 72,
B_LAST_BOSS_NODE_skirtB6 = 73,
B_LAST_BOSS_NODE_skirtB7 = 74,
B_LAST_BOSS_NODE_skirtB8 = 75,
B_LAST_BOSS_NODE_skirtB9 = 76,
B_LAST_BOSS_NODE_skirtBU1 = 77,
B_LAST_BOSS_NODE_skirtC1 = 78,
B_LAST_BOSS_NODE_skirtC2 = 79,
B_LAST_BOSS_NODE_skirtC3 = 80,
B_LAST_BOSS_NODE_skirtC4 = 81,
B_LAST_BOSS_NODE_skirtC5 = 82,
B_LAST_BOSS_NODE_skirtC6 = 83,
B_LAST_BOSS_NODE_skirtC7 = 84,
B_LAST_BOSS_NODE_skirtC8 = 85,
B_LAST_BOSS_NODE_skirtC9 = 86,
B_LAST_BOSS_NODE_skirtCU1 = 87,
B_LAST_BOSS_NODE_skirtD1 = 88,
B_LAST_BOSS_NODE_skirtD2 = 89,
B_LAST_BOSS_NODE_skirtD3 = 90,
B_LAST_BOSS_NODE_skirtD4 = 91,
B_LAST_BOSS_NODE_skirtD5 = 92,
B_LAST_BOSS_NODE_skirtD6 = 93,
B_LAST_BOSS_NODE_skirtD7 = 94,
B_LAST_BOSS_NODE_skirtD8 = 95,
B_LAST_BOSS_NODE_skirtD9 = 96,
B_LAST_BOSS_NODE_skirtDU1 = 97,
B_LAST_BOSS_NODE_skirtE1 = 98,
B_LAST_BOSS_NODE_skirtE2 = 99,
B_LAST_BOSS_NODE_skirtE3 = 100,
B_LAST_BOSS_NODE_skirtE4 = 101,
B_LAST_BOSS_NODE_skirtE5 = 102,
B_LAST_BOSS_NODE_skirtE6 = 103,
B_LAST_BOSS_NODE_skirtE7 = 104,
B_LAST_BOSS_NODE_skirtE8 = 105,
B_LAST_BOSS_NODE_skirtE9 = 106,
B_LAST_BOSS_NODE_skirtEU1 = 107,
B_LAST_BOSS_NODE_skirtEU2 = 108,
B_LAST_BOSS_NODE_skirtF1 = 109,
B_LAST_BOSS_NODE_skirtF2 = 110,
B_LAST_BOSS_NODE_skirtF3 = 111,
B_LAST_BOSS_NODE_skirtF4 = 112,
B_LAST_BOSS_NODE_skirtF5 = 113,
B_LAST_BOSS_NODE_skirtF6 = 114,
B_LAST_BOSS_NODE_skirtF7 = 115,
B_LAST_BOSS_NODE_skirtF8 = 116,
B_LAST_BOSS_NODE_skirtF9 = 117,
B_LAST_BOSS_NODE_skirtFU1 = 118,
B_LAST_BOSS_NODE_skirtG1 = 119,
B_LAST_BOSS_NODE_skirtG2 = 120,
B_LAST_BOSS_NODE_skirtG3 = 121,
B_LAST_BOSS_NODE_skirtG4 = 122,
B_LAST_BOSS_NODE_skirtG5 = 123,
B_LAST_BOSS_NODE_skirtG6 = 124,
B_LAST_BOSS_NODE_skirtG7 = 125,
B_LAST_BOSS_NODE_skirtG8 = 126,
B_LAST_BOSS_NODE_skirtG9 = 127,
B_LAST_BOSS_NODE_skirtGU1 = 128,
B_LAST_BOSS_NODE_skirtH1 = 129,
B_LAST_BOSS_NODE_skirtH2 = 130,
B_LAST_BOSS_NODE_skirtH3 = 131,
B_LAST_BOSS_NODE_skirtH4 = 132,
B_LAST_BOSS_NODE_skirtH5 = 133,
B_LAST_BOSS_NODE_skirtHU1 = 134,
};
// TODO: mFightState probably means different things in
// different states, so maybe we need to either remove
// this again or split this up further.
enum SubState_e {
SUB_STATE_0 = 0,
SUB_STATE_1,
SUB_STATE_2,
SUB_STATE_3,
SUB_STATE_4,
SUB_STATE_5,
SUB_STATE_6,
SUB_STATE_10 = 10,
SUB_STATE_11,
SUB_STATE_20 = 20,
SUB_STATE_21,
SUB_STATE_50 = 50,
};
enum Timer_e {
TIMER_0,
TIMER_1,
TIMER_2,
TIMER_3,
TIMER_4,
TIMER_5,
TIMER_MAX,
};
// TODO: Maybe reused in other sword fight bosses?
// Names taken from the string array
enum GuardDirection_e {
GUARD_RIGHT,
GUARD_UPRIGHT,
GUARD_DOWNRIGHT,
GUARD_LEFT,
GUARD_UPLEFT,
GUARD_DOWNLEFT,
GUARD_UP,
GUARD_DOWN,
GUARD_CENTER,
GUARD_BT, // not sure
};
enum LightningState_e {
LIGHTNING_STRIKE_STATE_NONE = 0,
LIGHTNING_STRIKE_START_DEMO = 1,
LIGHTNING_STRIKE_DEMO,
LIGHTNING_STRIKE_WAIT,
LIGHTNING_STRIKE_TRIGGER_END = 100,
LIGHTNING_STRIKE_ENDING,
LIGHTNING_STRIKE_TRIGGER_START = 200,
LIGHTNING_STRIKE_START,
LIGHTNING_STRIKE_START_LAST = 299,
LIGHTNING_STRIKE_FINISH = 1000,
};
public:
dAcBlastboss_c() : mStateMgr(*this, sStateID::null) {}
dAcBlastboss_c() : mStateMgr(*this), mScnCallback(this) {}
virtual ~dAcBlastboss_c() {}
virtual bool createHeap() override;
int create() override;
int doDelete() override;
int actorExecute() override;
int draw() override;
STATE_FUNC_DECLARE(dAcBlastboss_c, Fight);
STATE_FUNC_DECLARE(dAcBlastboss_c, Guard);
STATE_FUNC_DECLARE(dAcBlastboss_c, GuardBreak);
@@ -26,7 +298,157 @@ public:
STATE_FUNC_DECLARE(dAcBlastboss_c, ThunderWait);
private:
/* 0x??? */ STATE_MGR_DECLARE(dAcBlastboss_c);
void setAnm(const char *anim, f32 blend);
void forceSetAnm(const char *anim, f32 blend);
void setAnmRate(f32 rate);
bool checkDamage();
bool checkForCloseRangeAttack();
bool checkForRangeAttack();
bool checkForCounter();
void updateMainNodeTransforms();
void updateSkirtHairTransforms();
void updateSkirtTransform(s32 level);
void updateHairTransform(s32 level);
bool checkForLinkSwordBySwordHit();
u8 classifyAttackDirection(s32 attackDir);
void executeLightningStrike();
void setLightningTimerMaybe(s32);
/* 0x0378 */ d3d::AnmMdlWrapper mMdl;
/* 0x03E8 */ m3d::anmTexSrt_c mAnmTexSrt;
/* 0x0414 */ m3d::anmMatClr_c mAnmMatClr1;
/* 0x0440 */ m3d::smdl_c mThunderMdl;
/* 0x045C */ m3d::anmMatClr_c mThunderAnmMatClr;
/* 0x0488 */ callback_c mMdlCallback;
/* 0x04C0 */ dCcD_Linked_Cyl mCc1;
/* 0x0620 */ dCcD_Linked_Cyl mCc2;
/* 0x0780 */ dCcD_Linked_Cyl mCc3;
/* 0x08E0 */ dCcD_Linked_Sph mCc4;
/* 0x0A40 */ dCcD_Linked_Sph mLightningCc;
/* 0x0BA0 */ dScnCallback_c mScnCallback;
/* 0x0BAC */ STATE_MGR_DECLARE(dAcBlastboss_c);
/* 0x0BE8 */ dColliderLinkedList mCcList;
/* 0x0BF4 */ dEnemySwordMdl_c mSwordMdl;
/* 0x1130 */ u8 mThunderWaitSceneFlag;
/* 0x1131 */ u8 field_0x1131;
/* 0x1132 */ bool field_0x1132;
/* 0x1133 */ u8 field_0x1133;
/* 0x1134 */ u8 field_0x1134;
/* 0x1135 */ s8 mNumConsecutiveOppositeDirectionAttacks;
/* 0x1136 */ s8 mNumConsecutiveSameDirectionAttacks;
/* 0x1137 */ u8 field_0x1137;
/* 0x1138 */ u8 field_0x1138;
/* 0x1139 */ u8 field_0x1139;
/* 0x113A */ u8 mChanceAttackCounter;
/* 0x113B */ u8 field_0x113B;
/* 0x113C */ u8 mChanceCounter;
/* 0x113D */ u8 field_0x113D;
/* 0x113E */ u8 field_0x113E;
/* 0x113F */ u8 field_0x113F;
/* 0x1140 */ bool field_0x1140;
/* 0x1141 */ bool mIsDown;
/* 0x1142 */ u8 field_0x1142;
/* 0x1143 */ u8 mInvulnerabilityTimerMaybe;
/* 0x1144 */ s8 mGuardDirection;
/* 0x1145 */ s8 mLinkCloseRangeShieldTime;
/* 0x1146 */ bool mIsSwordEmpowered;
/* 0x1147 */ bool mIsThunderBeamAttackActive;
/* 0x1148 */ u8 mThunderBeamTimer;
/* 0x1149 */ s8 mIsPhaseTwo;
/* 0x114A */ u8 mLightingFallSwordTimer;
/* 0x114B */ u8 mStunState;
/* 0x114C */ u8 field_0x114C;
/* 0x114D */ bool mInBossRush;
/* 0x114E */ u8 field_0x114E;
/* 0x114F */ bool mIsDead;
/* 0x1150 */ bool mThunderBeamReflected;
/* 0x1152 */ u16 field_0x1152;
/* 0x1154 */ u16 mStunCounter;
/* 0x1156 */ u16 mTimers[TIMER_MAX];
/* 0x1162 */ u16 field_0x1162;
/* 0x1164 */ s16 mCounter;
/* 0x1166 */ s16 mSubState;
/* 0x1168 */ u8 _0x1168[0x116A - 0x1168];
/* 0x116A */ s16 mYAngleToLink;
/* 0x116C */ u8 _0x116C[0x1170 - 0x116C];
/* 0x1170 */ s16 field_0x1170;
/* 0x1172 */ s16 field_0x1172;
/* 0x1174 */ s16 field_0x1174;
/* 0x1176 */ u8 _0x1176[0x1178 - 0x1176];
/* 0x1178 */ s16 field_0x1178;
/* 0x117A */ s16 field_0x117A;
/* 0x117C */ s16 field_0x117C;
/* 0x117E */ s16 field_0x117E;
/* 0x1180 */ s16 field_0x1180;
/* 0x1182 */ s16 field_0x1182;
/* 0x1184 */ s16 mLightningTimerMaybe;
/* 0x1186 */ s16 mYRotationRelativeToLink;
/* 0x1188 */ s16 field_0x1188;
/* 0x118A */ mAng field_0x118A;
/* 0x118C */ mAng field_0x118C;
/* 0x118E */ u8 _0x118E[0x1190 - 0x118E];
/* 0x1190 */ f32 mXZDistanceToLink;
/* 0x1194 */ u8 _0x1194[0x119C - 0x1194];
/* 0x119C */ f32 mAttackKnockbackX;
/* 0x11A0 */ f32 mAttackKnockbackZ;
/* 0x11A4 */ f32 field_0x11A4;
/* 0x11A8 */ f32 mAnmRate;
/* 0x11AC */ f32 field_0x11AC;
/* 0x11B0 */ f32 field_0x11B0;
/* 0x11B0 */ f32 field_0x11B4;
/* 0x11B8 */ f32 field_0x11B8;
/* 0x11BC */ f32 field_0x11BC;
/* 0x11C0 */ f32 field_0x11C0;
/* 0x11C4 */ f32 field_0x11C4;
/* 0x11C8 */ f32 field_0x11C8;
/* 0x11CC */ f32 field_0x11CC;
/* 0x11D0 */ f32 field_0x11D0;
/* 0x11D4 */ s32 mLastAttackDir;
/* 0x11D8 */ s32 mSecondLastAttackDirection;
/* 0x11DC */ mAng3_c mThunderBeamRotation;
/* 0x11E4 */ mVec3_c mThumbL2Translation;
/* 0x11F0 */ mVec3_c mBackbone1Translation;
/* 0x11FC */ mVec3_c mChestTranslation;
/* 0x1208 */ mVec3_c mSwordPosition;
/* 0x1214 */ mVec3_c mBugNetPos;
/* 0x1220 */ mVec3_c mThunderBeamPosition;
/* 0x122C */ mVec3_c mThunderBeamVelocity;
/* 0x1238 */ mVec3_c mToeTranslation[2];
/* 0x1250 */ mVec3_c field_0x1250[2];
/* 0x1268 */ UnkLastBossCcSph2 field_0x1268[8];
/* 0x2948 */ UnkLastBossCcSph1 field_0x2948[1];
/* 0x2B64 */ dEmitter_c mWaterEmitter;
/* 0x2B98 */ dEmitter_c mEmitter2;
/* 0x2BCC */ dEmitter_c mEmitter3;
/* 0x2C00 */ dEmitter_c mEmitter4;
/* 0x2C34 */ dEmitter_c mEmitter5;
/* 0x2C68 */ dEmitter_c mEmitter6;
/* 0x2C9C */ dEmitter_c mEmitter7;
/* 0x2CD0 */ LIGHT_INFLUENCE mLightInfo;
/* 0x2CEC */ s16 mLightingStrikeState;
/* 0x2CEE */ s16 field_0x2CEE;
/* 0x2CF0 */ s16 field_0x2CF0;
/* 0x2CF4 */ f32 field_0x2CF4;
/* 0x2CF8 */ u8 _0x2CF8[0x2CFC - 0x2CF8];
/* 0x2CFC */ f32 field_0x2CFC;
/* 0x2D00 */ f32 field_0x2D00;
/* 0x2D04 */ mVec3_c field_0x2D04;
/* 0x2D10 */ mVec3_c field_0x2D10;
/* 0x2D1C */ const char *mpCurrentAnm;
/* 0x2D20 */ dTgSwordBattleGame_c *mpSwordBattleGame;
};
#endif
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcBmg_c : public dAcEnBase_c {
public:
dAcBmg_c() : mStateMgr(*this, sStateID::null) {}
dAcBmg_c() : mStateMgr(*this) {}
virtual ~dAcBmg_c() {}
STATE_FUNC_DECLARE(dAcBmg_c, Start);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcNusi_c : public dAcEnBase_c {
public:
dAcNusi_c() : mStateMgr(*this, sStateID::null) {}
dAcNusi_c() : mStateMgr(*this) {}
virtual ~dAcNusi_c() {}
private:
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcNusi_Bullet_c : public dAcEnBase_c {
public:
dAcNusi_Bullet_c() : mStateMgr(*this, sStateID::null) {}
dAcNusi_Bullet_c() : mStateMgr(*this) {}
virtual ~dAcNusi_Bullet_c() {}
STATE_FUNC_DECLARE(dAcNusi_Bullet_c, Move);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcNusiTentakle_c : public dAcEnBase_c {
public:
dAcNusiTentakle_c() : mStateMgr(*this, sStateID::null) {}
dAcNusiTentakle_c() : mStateMgr(*this) {}
virtual ~dAcNusiTentakle_c() {}
STATE_FUNC_DECLARE(dAcNusiTentakle_c, Hide);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcBvd_c : public dAcEnBase_c {
public:
dAcBvd_c() : mStateMgr(*this, sStateID::null) {}
dAcBvd_c() : mStateMgr(*this) {}
virtual ~dAcBvd_c() {}
STATE_FUNC_DECLARE(dAcBvd_c, Opening);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcAsuraBullet_c : public dAcObjBase_c {
public:
dAcAsuraBullet_c() : mStateMgr(*this, sStateID::null) {}
dAcAsuraBullet_c() : mStateMgr(*this) {}
virtual ~dAcAsuraBullet_c() {}
STATE_FUNC_DECLARE(dAcAsuraBullet_c, Attack);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcAvater_Bullet_c : public dAcObjBase_c {
public:
dAcAvater_Bullet_c() : mStateMgr(*this, sStateID::null) {}
dAcAvater_Bullet_c() : mStateMgr(*this) {}
virtual ~dAcAvater_Bullet_c() {}
STATE_FUNC_DECLARE(dAcAvater_Bullet_c, Move);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/d_a_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAvater_Race_Mng_c : public dAcBase_c {
public:
dAvater_Race_Mng_c() : mStateMgr(*this, sStateID::null) {}
dAvater_Race_Mng_c() : mStateMgr(*this) {}
virtual ~dAvater_Race_Mng_c() {}
STATE_FUNC_DECLARE(dAvater_Race_Mng_c, StartWait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dBird_c : public dAcObjBase_c {
public:
dBird_c() : mStateMgr(*this, sStateID::null) {}
dBird_c() : mStateMgr(*this) {}
virtual ~dBird_c() {}
STATE_FUNC_DECLARE(dBird_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dBird_KobunA_c : public dAcObjBase_c {
public:
dBird_KobunA_c() : mStateMgr(*this, sStateID::null) {}
dBird_KobunA_c() : mStateMgr(*this) {}
virtual ~dBird_KobunA_c() {}
STATE_FUNC_DECLARE(dBird_KobunA_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dBird_KobunB_c : public dAcObjBase_c {
public:
dBird_KobunB_c() : mStateMgr(*this, sStateID::null) {}
dBird_KobunB_c() : mStateMgr(*this) {}
virtual ~dBird_KobunB_c() {}
STATE_FUNC_DECLARE(dBird_KobunB_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcBirdMob_c : public dAcObjBase_c {
public:
dAcBirdMob_c() : mStateMgr(*this, sStateID::null) {}
dAcBirdMob_c() : mStateMgr(*this) {}
virtual ~dAcBirdMob_c() {}
STATE_FUNC_DECLARE(dAcBirdMob_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dBird_Npc_c : public dAcObjBase_c {
public:
dBird_Npc_c() : mStateMgr(*this, sStateID::null) {}
dBird_Npc_c() : mStateMgr(*this) {}
virtual ~dBird_Npc_c() {}
STATE_FUNC_DECLARE(dBird_Npc_c, Hide);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dBird_Rival_c : public dAcObjBase_c {
public:
dBird_Rival_c() : mStateMgr(*this, sStateID::null) {}
dBird_Rival_c() : mStateMgr(*this) {}
virtual ~dBird_Rival_c() {}
STATE_FUNC_DECLARE(dBird_Rival_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dBird_Target_c : public dAcObjBase_c {
public:
dBird_Target_c() : mStateMgr(*this, sStateID::null) {}
dBird_Target_c() : mStateMgr(*this) {}
virtual ~dBird_Target_c() {}
STATE_FUNC_DECLARE(dBird_Target_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dBird_ZeldaTraining_c : public dAcObjBase_c {
public:
dBird_ZeldaTraining_c() : mStateMgr(*this, sStateID::null) {}
dBird_ZeldaTraining_c() : mStateMgr(*this) {}
virtual ~dBird_ZeldaTraining_c() {}
STATE_FUNC_DECLARE(dBird_ZeldaTraining_c, Wait);
+1 -1
View File
@@ -9,7 +9,7 @@
class dAcBombf_c : public dAcObjBase_c {
public:
dAcBombf_c() : mStateMgr(*this, sStateID::null) {}
dAcBombf_c() : mStateMgr(*this) {}
virtual ~dAcBombf_c() {}
virtual bool createHeap() override;
virtual int create() override;
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcBulletGue_c : public dAcObjBase_c {
public:
dAcBulletGue_c() : mStateMgr(*this, sStateID::null) {}
dAcBulletGue_c() : mStateMgr(*this) {}
virtual ~dAcBulletGue_c() {}
STATE_FUNC_DECLARE(dAcBulletGue_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcBulletMaguppo_c : public dAcObjBase_c {
public:
dAcBulletMaguppo_c() : mStateMgr(*this, sStateID::null) {}
dAcBulletMaguppo_c() : mStateMgr(*this) {}
virtual ~dAcBulletMaguppo_c() {}
STATE_FUNC_DECLARE(dAcBulletMaguppo_c, Move);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcCoTest : public dAcObjBase_c {
public:
dAcCoTest() : mStateMgr(*this, sStateID::null) {}
dAcCoTest() : mStateMgr(*this) {}
virtual ~dAcCoTest() {}
STATE_FUNC_DECLARE(dAcCoTest, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEnCl_c : public dAcObjBase_c {
public:
dAcEnCl_c() : mStateMgr(*this, sStateID::null) {}
dAcEnCl_c() : mStateMgr(*this) {}
virtual ~dAcEnCl_c() {}
STATE_FUNC_DECLARE(dAcEnCl_c, pathMove);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcDemoNpcBird_c : public dAcObjBase_c {
public:
dAcDemoNpcBird_c() : mStateMgr(*this, sStateID::null) {}
dAcDemoNpcBird_c() : mStateMgr(*this) {}
virtual ~dAcDemoNpcBird_c() {}
STATE_FUNC_DECLARE(dAcDemoNpcBird_c, Hide);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcFlySlb_c : public dAcObjBase_c {
public:
dAcFlySlb_c() : mStateMgr(*this, sStateID::null) {}
dAcFlySlb_c() : mStateMgr(*this) {}
virtual ~dAcFlySlb_c() {}
STATE_FUNC_DECLARE(dAcFlySlb_c, Fly);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcGirahimuSwordBeam_c : public dAcObjBase_c {
public:
dAcGirahimuSwordBeam_c() : mStateMgr(*this, sStateID::null) {}
dAcGirahimuSwordBeam_c() : mStateMgr(*this) {}
virtual ~dAcGirahimuSwordBeam_c() {}
STATE_FUNC_DECLARE(dAcGirahimuSwordBeam_c, BulletMove);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcHeartf_c : public dAcObjBase_c {
public:
dAcHeartf_c() : mStateMgr(*this, sStateID::null) {}
dAcHeartf_c() : mStateMgr(*this) {}
virtual ~dAcHeartf_c() {}
STATE_FUNC_DECLARE(dAcHeartf_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcHidoryFire_c : public dAcObjBase_c {
public:
dAcHidoryFire_c() : mStateMgr(*this, sStateID::null) {}
dAcHidoryFire_c() : mStateMgr(*this) {}
virtual ~dAcHidoryFire_c() {}
STATE_FUNC_DECLARE(dAcHidoryFire_c, BulletMove);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcInsectAnt_c : public dAcObjBase_c {
public:
dAcInsectAnt_c() : mStateMgr(*this, sStateID::null) {}
dAcInsectAnt_c() : mStateMgr(*this) {}
virtual ~dAcInsectAnt_c() {}
STATE_FUNC_DECLARE(dAcInsectAnt_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcInsectBeetle_c : public dAcObjBase_c {
public:
dAcInsectBeetle_c() : mStateMgr(*this, sStateID::null) {}
dAcInsectBeetle_c() : mStateMgr(*this) {}
virtual ~dAcInsectBeetle_c() {}
STATE_FUNC_DECLARE(dAcInsectBeetle_c, Wait);
+1 -2
View File
@@ -3,12 +3,11 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
#include "d/a/d_a_insect.h"
class dAcInsectButterfly_c : public dAcOInsect_c {
public:
dAcInsectButterfly_c() : mStateMgr(*this, sStateID::null) {}
dAcInsectButterfly_c() : mStateMgr(*this) {}
virtual ~dAcInsectButterfly_c() {}
STATE_FUNC_DECLARE(dAcInsectButterfly_c, Move);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcInsectCicada_c : public dAcObjBase_c {
public:
dAcInsectCicada_c() : mStateMgr(*this, sStateID::null) {}
dAcInsectCicada_c() : mStateMgr(*this) {}
virtual ~dAcInsectCicada_c() {}
STATE_FUNC_DECLARE(dAcInsectCicada_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcInsectDragonfly_c : public dAcObjBase_c {
public:
dAcInsectDragonfly_c() : mStateMgr(*this, sStateID::null) {}
dAcInsectDragonfly_c() : mStateMgr(*this) {}
virtual ~dAcInsectDragonfly_c() {}
STATE_FUNC_DECLARE(dAcInsectDragonfly_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcInsectFirefly_c : public dAcObjBase_c {
public:
dAcInsectFirefly_c() : mStateMgr(*this, sStateID::null) {}
dAcInsectFirefly_c() : mStateMgr(*this) {}
virtual ~dAcInsectFirefly_c() {}
STATE_FUNC_DECLARE(dAcInsectFirefly_c, Move);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcInsectGrasshopper_c : public dAcObjBase_c {
public:
dAcInsectGrasshopper_c() : mStateMgr(*this, sStateID::null) {}
dAcInsectGrasshopper_c() : mStateMgr(*this) {}
virtual ~dAcInsectGrasshopper_c() {}
STATE_FUNC_DECLARE(dAcInsectGrasshopper_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcInsectLadybug_c : public dAcObjBase_c {
public:
dAcInsectLadybug_c() : mStateMgr(*this, sStateID::null) {}
dAcInsectLadybug_c() : mStateMgr(*this) {}
virtual ~dAcInsectLadybug_c() {}
STATE_FUNC_DECLARE(dAcInsectLadybug_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcInsectScarab_c : public dAcObjBase_c {
public:
dAcInsectScarab_c() : mStateMgr(*this, sStateID::null) {}
dAcInsectScarab_c() : mStateMgr(*this) {}
virtual ~dAcInsectScarab_c() {}
STATE_FUNC_DECLARE(dAcInsectScarab_c, Wait);
+1 -1
View File
@@ -8,7 +8,7 @@
class dAcInvisible : public dAcObjBase_c {
public:
dAcInvisible() : mStateMgr(*this, sStateID::null) {}
dAcInvisible() : mStateMgr(*this) {}
virtual ~dAcInvisible() {}
virtual int create() override;
-1
View File
@@ -3,7 +3,6 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcKanban_c : public dAcObjBase_c {
public:
+1 -1
View File
@@ -9,7 +9,7 @@
class dAcKnightLeaderBird_c : public dAcBirdBase_c {
public:
dAcKnightLeaderBird_c() : mStateMgr(*this, sStateID::null) {}
dAcKnightLeaderBird_c() : mStateMgr(*this) {}
virtual ~dAcKnightLeaderBird_c() {}
virtual bool createHeap() override;
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcLittleBird_c : public dAcObjBase_c {
public:
dAcLittleBird_c() : mStateMgr(*this, sStateID::null) {}
dAcLittleBird_c() : mStateMgr(*this) {}
virtual ~dAcLittleBird_c() {}
STATE_FUNC_DECLARE(dAcLittleBird_c, Init);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/d_a_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcLittleBirdMgr_c : public dAcBase_c {
public:
dAcLittleBirdMgr_c() : mStateMgr(*this, sStateID::null) {}
dAcLittleBirdMgr_c() : mStateMgr(*this) {}
virtual ~dAcLittleBirdMgr_c() {}
STATE_FUNC_DECLARE(dAcLittleBirdMgr_c, Set);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcJtest_c : public dAcEnBase_c {
public:
dAcJtest_c() : mStateMgr(*this, sStateID::null) {}
dAcJtest_c() : mStateMgr(*this) {}
virtual ~dAcJtest_c() {}
STATE_FUNC_DECLARE(dAcJtest_c, FishNormalSwim);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcNusiBase_c : public dAcEnBase_c {
public:
dAcNusiBase_c() : mStateMgr(*this, sStateID::null) {}
dAcNusiBase_c() : mStateMgr(*this) {}
virtual ~dAcNusiBase_c() {}
private:
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcNusiNpc_c : public dAcEnBase_c {
public:
dAcNusiNpc_c() : mStateMgr(*this, sStateID::null) {}
dAcNusiNpc_c() : mStateMgr(*this) {}
virtual ~dAcNusiNpc_c() {}
private:
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcOrCannBullet_c : public dAcObjBase_c {
public:
dAcOrCannBullet_c() : mStateMgr(*this, sStateID::null) {}
dAcOrCannBullet_c() : mStateMgr(*this) {}
virtual ~dAcOrCannBullet_c() {}
STATE_FUNC_DECLARE(dAcOrCannBullet_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcPumpkin_c : public dAcObjBase_c {
public:
dAcPumpkin_c() : mStateMgr(*this, sStateID::null) {}
dAcPumpkin_c() : mStateMgr(*this) {}
virtual ~dAcPumpkin_c() {}
STATE_FUNC_DECLARE(dAcPumpkin_c, Stick);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcShopSample_c : public dAcObjBase_c {
public:
dAcShopSample_c() : mStateMgr(*this, sStateID::null) {}
dAcShopSample_c() : mStateMgr(*this) {}
virtual ~dAcShopSample_c() {}
STATE_FUNC_DECLARE(dAcShopSample_c, Wait);
+1 -2
View File
@@ -4,11 +4,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "f/f_list_nd.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcTWoodArea_c : public dAcObjBase_c {
public:
dAcTWoodArea_c() : mStateMgr(*this, sStateID::null) {}
dAcTWoodArea_c() : mStateMgr(*this) {}
virtual ~dAcTWoodArea_c() {}
virtual int actorCreate() override;
virtual int actorPostCreate() override;
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEAm_c : public dAcEnBase_c {
public:
dAcEAm_c() : mStateMgr(*this, sStateID::null) {}
dAcEAm_c() : mStateMgr(*this) {}
virtual ~dAcEAm_c() {}
STATE_FUNC_DECLARE(dAcEAm_c, Stop);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEbfish_c : public dAcEnBase_c {
public:
dAcEbfish_c() : mStateMgr(*this, sStateID::null) {}
dAcEbfish_c() : mStateMgr(*this) {}
virtual ~dAcEbfish_c() {}
STATE_FUNC_DECLARE(dAcEbfish_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEbc_c : public dAcEnBase_c {
public:
dAcEbc_c() : mStateMgr(*this, sStateID::null) {}
dAcEbc_c() : mStateMgr(*this) {}
virtual ~dAcEbc_c() {}
STATE_FUNC_DECLARE(dAcEbc_c, Standby);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEbcarrow_c : public dAcEnBase_c {
public:
dAcEbcarrow_c() : mStateMgr(*this, sStateID::null) {}
dAcEbcarrow_c() : mStateMgr(*this) {}
virtual ~dAcEbcarrow_c() {}
STATE_FUNC_DECLARE(dAcEbcarrow_c, Move);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEbcaL_c : public dAcEnBase_c {
public:
dAcEbcaL_c() : mStateMgr(*this, sStateID::null) {}
dAcEbcaL_c() : mStateMgr(*this) {}
virtual ~dAcEbcaL_c() {}
STATE_FUNC_DECLARE(dAcEbcaL_c, Standby);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEbcalarrow_c : public dAcEnBase_c {
public:
dAcEbcalarrow_c() : mStateMgr(*this, sStateID::null) {}
dAcEbcalarrow_c() : mStateMgr(*this) {}
virtual ~dAcEbcalarrow_c() {}
STATE_FUNC_DECLARE(dAcEbcalarrow_c, Move);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEbce_c : public dAcEnBase_c {
public:
dAcEbce_c() : mStateMgr(*this, sStateID::null) {}
dAcEbce_c() : mStateMgr(*this) {}
virtual ~dAcEbce_c() {}
STATE_FUNC_DECLARE(dAcEbce_c, Standby);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEBcZ_c : public dAcEnBase_c {
public:
dAcEBcZ_c() : mStateMgr(*this, sStateID::null) {}
dAcEBcZ_c() : mStateMgr(*this) {}
virtual ~dAcEBcZ_c() {}
STATE_FUNC_DECLARE(dAcEBcZ_c, Arise);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEbeamos : public dAcEnBase_c {
public:
dAcEbeamos() : mStateMgr(*this, sStateID::null) {}
dAcEbeamos() : mStateMgr(*this) {}
virtual ~dAcEbeamos() {}
STATE_FUNC_DECLARE(dAcEbeamos, Attack);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEbs_c : public dAcEnBase_c {
public:
dAcEbs_c() : mStateMgr(*this, sStateID::null) {}
dAcEbs_c() : mStateMgr(*this) {}
virtual ~dAcEbs_c() {}
STATE_FUNC_DECLARE(dAcEbs_c, Standby);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEcaptain_c : public dAcEnBase_c {
public:
dAcEcaptain_c() : mStateMgr(*this, sStateID::null) {}
dAcEcaptain_c() : mStateMgr(*this) {}
virtual ~dAcEcaptain_c() {}
STATE_FUNC_DECLARE(dAcEcaptain_c, Opening);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEChb_c : public dAcEnBase_c {
public:
dAcEChb_c() : mStateMgr(*this, sStateID::null) {}
dAcEChb_c() : mStateMgr(*this) {}
virtual ~dAcEChb_c() {}
STATE_FUNC_DECLARE(dAcEChb_c, Standby);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEEye_c : public dAcObjBase_c {
public:
dAcEEye_c() : mStateMgr(*this, sStateID::null) {}
dAcEEye_c() : mStateMgr(*this) {}
virtual ~dAcEEye_c() {}
STATE_FUNC_DECLARE(dAcEEye_c, Open);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEge_c : public dAcEnBase_c {
public:
dAcEge_c() : mStateMgr(*this, sStateID::null) {}
dAcEge_c() : mStateMgr(*this) {}
virtual ~dAcEge_c() {}
STATE_FUNC_DECLARE(dAcEge_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEgeko_c : public dAcEnBase_c {
public:
dAcEgeko_c() : mStateMgr(*this, sStateID::null) {}
dAcEgeko_c() : mStateMgr(*this) {}
virtual ~dAcEgeko_c() {}
STATE_FUNC_DECLARE(dAcEgeko_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEgerock_c : public dAcEnBase_c {
public:
dAcEgerock_c() : mStateMgr(*this, sStateID::null) {}
dAcEgerock_c() : mStateMgr(*this) {}
virtual ~dAcEgerock_c() {}
STATE_FUNC_DECLARE(dAcEgerock_c, Attack);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEgue_c : public dAcEnBase_c {
public:
dAcEgue_c() : mStateMgr(*this, sStateID::null) {}
dAcEgue_c() : mStateMgr(*this) {}
virtual ~dAcEgue_c() {}
STATE_FUNC_DECLARE(dAcEgue_c, Attack);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcGumarm_c : public dAcEnBase_c {
public:
dAcGumarm_c() : mStateMgr(*this, sStateID::null) {}
dAcGumarm_c() : mStateMgr(*this) {}
virtual ~dAcGumarm_c() {}
STATE_FUNC_DECLARE(dAcGumarm_c, Hide);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEgunho_c : public dAcEnBase_c {
public:
dAcEgunho_c() : mStateMgr(*this, sStateID::null) {}
dAcEgunho_c() : mStateMgr(*this) {}
virtual ~dAcEgunho_c() {}
STATE_FUNC_DECLARE(dAcEgunho_c, OpenClose);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEgunhob_c : public dAcEnBase_c {
public:
dAcEgunhob_c() : mStateMgr(*this, sStateID::null) {}
dAcEgunhob_c() : mStateMgr(*this) {}
virtual ~dAcEgunhob_c() {}
STATE_FUNC_DECLARE(dAcEgunhob_c, BulletMove);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEhb_c : public dAcEnBase_c {
public:
dAcEhb_c() : mStateMgr(*this, sStateID::null) {}
dAcEhb_c() : mStateMgr(*this) {}
virtual ~dAcEhb_c() {}
STATE_FUNC_DECLARE(dAcEhb_c, Under);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEhidokari_c : public dAcEnBase_c {
public:
dAcEhidokari_c() : mStateMgr(*this, sStateID::null) {}
dAcEhidokari_c() : mStateMgr(*this) {}
virtual ~dAcEhidokari_c() {}
STATE_FUNC_DECLARE(dAcEhidokari_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEhidokaris_c : public dAcObjBase_c {
public:
dAcEhidokaris_c() : mStateMgr(*this, sStateID::null) {}
dAcEhidokaris_c() : mStateMgr(*this) {}
virtual ~dAcEhidokaris_c() {}
STATE_FUNC_DECLARE(dAcEhidokaris_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEHidory_c : public dAcEnBase_c {
public:
dAcEHidory_c() : mStateMgr(*this, sStateID::null) {}
dAcEHidory_c() : mStateMgr(*this) {}
virtual ~dAcEHidory_c() {}
STATE_FUNC_DECLARE(dAcEHidory_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEhoc_c : public dAcEnBase_c {
public:
dAcEhoc_c() : mStateMgr(*this, sStateID::null) {}
dAcEhoc_c() : mStateMgr(*this) {}
virtual ~dAcEhoc_c() {}
STATE_FUNC_DECLARE(dAcEhoc_c, Fight);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEHp_c : public dAcEnBase_c {
public:
dAcEHp_c() : mStateMgr(*this, sStateID::null) {}
dAcEHp_c() : mStateMgr(*this) {}
virtual ~dAcEHp_c() {}
STATE_FUNC_DECLARE(dAcEHp_c, BobUpAndDown);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEhydra_c : public dAcEnBase_c {
public:
dAcEhydra_c() : mStateMgr(*this, sStateID::null) {}
dAcEhydra_c() : mStateMgr(*this) {}
virtual ~dAcEhydra_c() {}
STATE_FUNC_DECLARE(dAcEhydra_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEkg_c : public dAcEnBase_c {
public:
dAcEkg_c() : mStateMgr(*this, sStateID::null) {}
dAcEkg_c() : mStateMgr(*this) {}
virtual ~dAcEkg_c() {}
STATE_FUNC_DECLARE(dAcEkg_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEKs_c : public dAcEnBase_c {
public:
dAcEKs_c() : mStateMgr(*this, sStateID::null) {}
dAcEKs_c() : mStateMgr(*this) {}
virtual ~dAcEKs_c() {}
STATE_FUNC_DECLARE(dAcEKs_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEKumiteGira_c : public dAcEnBase_c {
public:
dAcEKumiteGira_c() : mStateMgr(*this, sStateID::null) {}
dAcEKumiteGira_c() : mStateMgr(*this) {}
virtual ~dAcEKumiteGira_c() {}
STATE_FUNC_DECLARE(dAcEKumiteGira_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEliza_tail_c : public dAcEnBase_c {
public:
dAcEliza_tail_c() : mStateMgr(*this, sStateID::null) {}
dAcEliza_tail_c() : mStateMgr(*this) {}
virtual ~dAcEliza_tail_c() {}
STATE_FUNC_DECLARE(dAcEliza_tail_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcELizarufos_c : public dAcEnBase_c {
public:
dAcELizarufos_c() : mStateMgr(*this, sStateID::null) {}
dAcELizarufos_c() : mStateMgr(*this) {}
virtual ~dAcELizarufos_c() {}
STATE_FUNC_DECLARE(dAcELizarufos_c, Demo);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/obj/d_a_obj_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEmagma_c : public dAcObjBase_c {
public:
dAcEmagma_c() : mStateMgr(*this, sStateID::null) {}
dAcEmagma_c() : mStateMgr(*this) {}
virtual ~dAcEmagma_c() {}
STATE_FUNC_DECLARE(dAcEmagma_c, Birth);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEmaguppo_c : public dAcEnBase_c {
public:
dAcEmaguppo_c() : mStateMgr(*this, sStateID::null) {}
dAcEmaguppo_c() : mStateMgr(*this) {}
virtual ~dAcEmaguppo_c() {}
STATE_FUNC_DECLARE(dAcEmaguppo_c, Attack);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEmr_c : public dAcEnBase_c {
public:
dAcEmr_c() : mStateMgr(*this, sStateID::null) {}
dAcEmr_c() : mStateMgr(*this) {}
virtual ~dAcEmr_c() {}
STATE_FUNC_DECLARE(dAcEmr_c, Wait);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcE_Mr_Shield_c : public dAcEnBase_c {
public:
dAcE_Mr_Shield_c() : mStateMgr(*this, sStateID::null) {}
dAcE_Mr_Shield_c() : mStateMgr(*this) {}
virtual ~dAcE_Mr_Shield_c() {}
STATE_FUNC_DECLARE(dAcE_Mr_Shield_c, Move);
+1 -2
View File
@@ -3,11 +3,10 @@
#include "d/a/e/d_a_en_base.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dAcEoc_c : public dAcEnBase_c {
public:
dAcEoc_c() : mStateMgr(*this, sStateID::null) {}
dAcEoc_c() : mStateMgr(*this) {}
virtual ~dAcEoc_c() {}
STATE_FUNC_DECLARE(dAcEoc_c, Wait);

Some files were not shown because too many files have changed in this diff Show More