encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

b_dr equivalent, update dtk-template (#2327)

Browse Source 
* d_a_tag_allmato almost done

* d_a_swhit0 done

* some SSystem cleanup

* treesh done

* swball done, some other rel cleanup

* b_dr equivalent

* update dtk-template

* rename j3dframectrl mode enum
This commit is contained in:
TakaRikka
2025-03-14 04:46:21 -04:00
committed by GitHub
parent 34c5d8272e
commit 60748d0924
70 changed files with 5468 additions and 4064 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+23 -4
View File
@@ -155,8 +155,8 @@ if not config.non_matching:
# Tool versions
config.binutils_tag = "2.42-1"
config.compilers_tag = "20240706"
config.dtk_tag = "v1.2.0"
config.objdiff_tag = "v2.3.4"
config.dtk_tag = "v1.3.0"
config.objdiff_tag = "v2.7.1"
config.sjiswrap_tag = "v1.2.0"
config.wibo_tag = "0.6.11"
@@ -183,6 +183,10 @@ if args.map:
# Use for any additional files that should cause a re-configure when modified
config.reconfig_deps = []
# Optional numeric ID for decomp.me preset
# Can be overridden in libraries or objects
config.scratch_preset_id = 69 # Twilight Princess (DOL)
# Base flags, common to most GC/Wii games.
# Generally leave untouched, with overrides added below.
cflags_base = [
@@ -352,7 +356,7 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
# Helper function for actor RELs
def ActorRel(status: bool, rel_name: str, extra_cflags: List[str]=[]) -> Dict[str, Any]:
return Rel(rel_name, [Object(status, f"d/actor/{rel_name}.cpp", extra_cflags=extra_cflags)])
return Rel(rel_name, [Object(status, f"d/actor/{rel_name}.cpp", extra_cflags=extra_cflags, scratch_preset_id=70)])
# Helper function for JSystem libraries
@@ -1572,7 +1576,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_L7op_demo_dr"),
ActorRel(MatchingFor("GZ2E01"), "d_a_b_bh"),
ActorRel(NonMatching, "d_a_b_bq"),
ActorRel(NonMatching, "d_a_b_dr"),
ActorRel(Equivalent, "d_a_b_dr"), # weak func order
ActorRel(Equivalent, "d_a_b_dre"), # weak func order
ActorRel(NonMatching, "d_a_b_ds"),
ActorRel(NonMatching, "d_a_b_gg"),
@@ -2245,6 +2249,21 @@ if config_path.exists():
for asset in module.get("extract", []):
emit_build_rule(asset)
# Optional callback to adjust link order. This can be used to add, remove, or reorder objects.
# This is called once per module, with the module ID and the current link order.
#
# For example, this adds "dummy.c" to the end of the DOL link order if configured with --non-matching.
# "dummy.c" *must* be configured as a Matching (or Equivalent) object in order to be linked.
def link_order_callback(module_id: int, objects: List[str]) -> List[str]:
# Don't modify the link order for matching builds
if not config.non_matching:
return objects
if module_id == 0: # DOL
return objects + ["dummy.c"]
return objects
# Uncomment to enable the link order callback.
# config.link_order_callback = link_order_callback
# Optional extra categories for progress tracking
config.progress_categories = [
include/JSystem/J3DGraphAnimator/J3DAnimation.h
+5 -5
View File
@@ -896,11 +896,11 @@ public:
class J3DFrameCtrl {
public:
enum Attribute_e {
LOOP_ONCE_e,
LOOP_ONCE_RESET_e,
LOOP_REPEAT_e,
LOOP_MIRROR_ONCE_e,
LOOP_MIRROR_REPEAT_e,
EMode_NONE,
EMode_RESET,
EMode_LOOP,
EMode_REVERSE,
EMode_LOOP_REVERSE,
};
J3DFrameCtrl() { this->init(0); }
include/d/actor/d_a_b_dr.h
+88 -50
View File
@@ -6,6 +6,7 @@
#include "d/d_cc_d.h"
#include "d/d_msg_flow.h"
#include "d/d_bg_s_acch.h"
#include "m_Do/m_Do_hostIO.h"
/**
* @ingroup actors-enemies
@@ -17,9 +18,9 @@
*/
class daB_DR_c : public fopEn_enemy_c {
public:
/* 805BAF80 */ void ctrlJoint(J3DJoint*, J3DModel*);
/* 805BB120 */ void JointCallBack(J3DJoint*, int);
/* 805BB16C */ void draw();
/* 805BAF80 */ int ctrlJoint(J3DJoint*, J3DModel*);
/* 805BB120 */ static int JointCallBack(J3DJoint*, int);
/* 805BB16C */ int draw();
/* 805BB408 */ void setBck(int, u8, f32, f32);
/* 805BB4B4 */ void setActionMode(int, int);
/* 805BB4CC */ void mGlider_WindPosSet();
@@ -37,25 +38,25 @@ public:
/* 805BCBF4 */ void mCountClr();
/* 805BCC18 */ void mAllClr();
/* 805BCC4C */ void mHeadAngleSet();
/* 805BCD7C */ void flapMove(bool);
/* 805BCEA4 */ void revolutionMove();
/* 805BD05C */ void mPlayerHighCheck();
/* 805BD15C */ void mBgFallGroundCheck();
/* 805BCD7C */ bool flapMove(bool);
/* 805BCEA4 */ bool revolutionMove();
/* 805BD05C */ bool mPlayerHighCheck();
/* 805BD15C */ bool mBgFallGroundCheck();
/* 805BD3E4 */ void normalHoverMove();
/* 805BD5FC */ void executeWait();
/* 805BD98C */ void executeFlyWait();
/* 805BDBC4 */ void executeTailHit();
/* 805BE9B4 */ void executeWeekHit();
/* 805BF4C8 */ void mBreathSet();
/* 805BF768 */ void mBreathHighSet(bool);
/* 805BFA6C */ void mFeintBreath();
/* 805BF768 */ bool mBreathHighSet(bool);
/* 805BFA6C */ bool mFeintBreath();
/* 805BFD88 */ void executeBreathAttack();
/* 805C062C */ void executeWindAttack();
/* 805C0CAC */ void mGliderMoveSub(f32);
/* 805C0CAC */ bool mGliderMoveSub(f32);
/* 805C0EF8 */ void executeGliderAttack();
/* 805C1E0C */ void executePillarSearch();
/* 805C24BC */ void executePillarWait();
/* 805C2BE8 */ void startDemoCheck();
/* 805C2BE8 */ bool startDemoCheck();
/* 805C2CD0 */ void executeDamageDemo();
/* 805C3558 */ void executeMiddleDemo();
/* 805C36A4 */ void executeDead();
@@ -69,38 +70,38 @@ public:
/* 805C46E0 */ void cc_set();
/* 805C4E14 */ void down_cc_set();
/* 805C4FB4 */ void demo_skip(int);
/* 805C50BC */ void DemoSkipCallBack(void*, int);
/* 805C50F0 */ void execute();
/* 805C55B0 */ void _delete();
/* 805C56A4 */ void CreateHeap();
/* 805C5974 */ void create();
/* 805C50BC */ static int DemoSkipCallBack(void*, int);
/* 805C50F0 */ int execute();
/* 805C55B0 */ int _delete();
/* 805C56A4 */ int CreateHeap();
/* 805C5974 */ int create();
/* 805C62B0 */ daB_DR_c();
MtxP getMtx() { return mpModelMorf->getModel()->getAnmMtx(15); }
void onTarget() { mTarget = true; }
bool isBack() { return mPrm0; }
bool isBack() { return arg0; }
private:
/* 0x05AC */ request_of_phase_process_class mPhase;
/* 0x05B4 */ mDoExt_McaMorfSO* mpModelMorf;
/* 0x05B8 */ J3DModel* mpPartModel;
/* 0x05BC */ mDoExt_brkAnm* mpCoreBrk;
/* 0x05C0 */ Z2CreatureEnemy field_0x5c0;
/* 0x0664 */ Z2CreatureEnemy field_0x664;
/* 0x0708 */ int mAction;
/* 0x070C */ int mMode;
/* 0x0710 */ int mAnmID;
/* 0x05C0 */ Z2CreatureEnemy mSound;
/* 0x0664 */ Z2CreatureEnemy mSound2;
/* 0x0708 */ int mActionMode;
/* 0x070C */ int mMoveMode;
/* 0x0710 */ int mAnm;
/* 0x0714 */ u8 field_0x714[0x0718 - 0x0714];
/* 0x0718 */ int field_0x718;
/* 0x071C */ u8 field_0x71C[0x0720 - 0x071C];
/* 0x0720 */ f32 field_0x720;
/* 0x071C */ u32 mShadowKey;
/* 0x0720 */ f32 mTargetHeight;
/* 0x0724 */ f32 field_0x724;
/* 0x0728 */ f32 field_0x728;
/* 0x072C */ f32 field_0x72c;
/* 0x0730 */ u8 field_0x730[0x0734 - 0x0730];
/* 0x0730 */ f32 field_0x730;
/* 0x0734 */ f32 field_0x734;
/* 0x0738 */ u8 field_0x738[0x073C - 0x0738];
/* 0x0738 */ f32 field_0x738;
/* 0x073C */ f32 field_0x73c;
/* 0x0740 */ f32 field_0x740;
/* 0x0744 */ f32 field_0x744;
@@ -111,44 +112,41 @@ private:
/* 0x0752 */ s16 field_0x752;
/* 0x0754 */ s16 field_0x754;
/* 0x0756 */ s16 field_0x756;
/* 0x0758 */ s16 field_0x758;
/* 0x075A */ s16 field_0x75a;
/* 0x075C */ u8 field_0x75C[0x0760 - 0x075C];
/* 0x0758 */ csXyz mHeadAngle;
/* 0x0760 */ cXyz field_0x760;
/* 0x076C */ cXyz field_0x76c;
/* 0x076C */ cXyz mBoot_c_trance;
/* 0x0778 */ cXyz field_0x778;
/* 0x0784 */ cXyz field_0x784;
/* 0x0790 */ cXyz field_0x790;
/* 0x079C */ cXyz field_0x79c;
/* 0x079C */ cXyz mGlider_WindPos;
/* 0x07A8 */ cXyz field_0x7a8;
/* 0x07B4 */ cXyz field_0x7b4;
/* 0x07C0 */ int mTimer[4];
/* 0x07D0 */ u8 field_0x7d0;
/* 0x07D1 */ u8 field_0x7d1;
/* 0x07D2 */ u8 field_0x7d2;
/* 0x07D2 */ u8 mBreakPartsNo;
/* 0x07D3 */ u8 field_0x7d3;
/* 0x07D4 */ u8 field_0x7d4;
/* 0x07D5 */ u8 field_0x7D5[0x07D6 - 0x07D5];
/* 0x07D5 */ u8 field_0x7d5;
/* 0x07D6 */ u8 field_0x7d6;
/* 0x07D7 */ u8 field_0x7d7;
/* 0x07D8 */ u8 field_0x7D8[0x07D9 - 0x07D8];
/* 0x07D8 */ u8 field_0x7d8;
/* 0x07D9 */ u8 mTarget;
/* 0x07DA */ u8 field_0x7DA[0x07DB - 0x07DA];
/* 0x07DA */ u8 field_0x7da;
/* 0x07DB */ u8 field_0x7db;
/* 0x07DC */ u8 field_0x7DC[0x07E0 - 0x07DC];
/* 0x07DC */ u8 field_0x7dc;
/* 0x07E0 */ int field_0x7e0;
/* 0x07E4 */ u8 field_0x7e4[4];
/* 0x07E4 */ u8 mCount[4];
/* 0x07E8 */ u8 field_0x7e8;
/* 0x07E9 */ u8 field_0x7E9[0x07EA - 0x07E9];
/* 0x07EA */ u8 mPrm0;
/* 0x07EB */ u8 field_0x7eb;
/* 0x07EC */ u8 mPrm1;
/* 0x07ED */ u8 mPrm2;
/* 0x07EE */ u8 mPrm3;
/* 0x07EF */ u8 field_0x7EF[0x07F0 - 0x07EF];
/* 0x07E9 */ u8 field_0x7e9;
/* 0x07EA */ u8 arg0;
/* 0x07EB */ u8 mPartNo;
/* 0x07EC */ u8 bitSw;
/* 0x07ED */ u8 bitSw2;
/* 0x07EE */ u8 bitSw3;
/* 0x07F0 */ dBgS_AcchCir mAcchCir;
/* 0x0830 */ dBgS_ObjAcch mAcch;
/* 0x0A08 */ dCcD_Stts field_0xa08;
/* 0x0A08 */ dCcD_Stts mColliderStts;
/* 0x0A44 */ dCcD_Cyl mWeekCc;
/* 0x0B80 */ dCcD_Sph mFootAtCc[2];
/* 0x0DF0 */ dCcD_Sph field_0xdf0;
@@ -162,14 +160,16 @@ private:
/* 0x2174 */ dCcD_Cyl mDownCc[5];
/* 0x27A0 */ u8 field_0x27A0[0x27A8 - 0x27A0];
/* 0x27A8 */ Z2CreatureEnemy* field_0x27a8;
/* 0x27AC */ u8 field_0x27AC[0x27C4 - 0x27AC];
/* 0x27C4 */ cXyz field_0x27c4;
/* 0x27D0 */ cXyz field_0x27d0;
/* 0x27AC */ u8 field_0x27AC[0x27BE - 0x27AC];
/* 0x27BE */ u8 field_0x27be;
/* 0x27BF */ u8 field_0x27bf[0x27C4 - 0x27BF];
/* 0x27C4 */ cXyz mDemoCamEye;
/* 0x27D0 */ cXyz mDemoCamCenter;
/* 0x27DC */ u32 field_0x27dc[4];
/* 0x27EC */ u32 field_0x27ec[4];
/* 0x27FC */ u32 field_0x27fc[4];
/* 0x280C */ u32 field_0x280c;
/* 0x2810 */ u8 field_0x2810[0x2814 - 0x2810];
/* 0x2810 */ u8 mInitHIO;
/* 0x2814 */ dMsgFlow_c mMsgFlow;
};
@@ -179,7 +179,45 @@ STATIC_ASSERT(sizeof(daB_DR_c) == 0x2860);
class daB_DR_HIO_c {
public:
/* 805BAE6C */ daB_DR_HIO_c();
/* 805C6B94 */ ~daB_DR_HIO_c();
/* 805C6B94 */ virtual ~daB_DR_HIO_c() {}
/* 0x04 */ s8 field_0x4;
/* 0x08 */ f32 model_size;
/* 0x0C */ f32 fall_accel;
/* 0x10 */ f32 fall_accel_max;
/* 0x14 */ f32 wind_large_attack_lockon_range;
/* 0x18 */ f32 unk_0x18;
/* 0x1C */ f32 wind_small_attack_power;
/* 0x20 */ f32 wind_attack_power;
/* 0x24 */ f32 glide_wind_power;
/* 0x28 */ f32 breath_attack_threshold;
/* 0x2C */ f32 unk_0x2c;
/* 0x30 */ f32 breath_move_speed_max;
/* 0x34 */ f32 breath_move_speed_min;
/* 0x38 */ s16 tail_hit_chance_time;
/* 0x3A */ s16 center_wind_time;
/* 0x3C */ s16 breath_continue_time;
/* 0x3E */ s16 breath_continue_no_armor_time;
/* 0x40 */ s16 breath_feint1_time;
/* 0x42 */ s16 breath_feint2_time;
/* 0x44 */ s16 breath_feint3_time;
/* 0x46 */ s16 no_attack_time;
/* 0x48 */ s16 unk_0x48;
/* 0x4A */ s16 no_attack_no_armor_time;
/* 0x4C */ s16 unk_0x4c;
/* 0x4E */ s16 back_hit_chance_time;
/* 0x50 */ s16 after_breath_chance_time;
/* 0x52 */ s16 neck_search_speed;
/* 0x54 */ s16 neck_search2_speed;
/* 0x56 */ s16 neck_search_speed_max;
/* 0x58 */ s16 body_search_speed;
/* 0x5A */ s16 body_search2_speed;
/* 0x5C */ s16 body_search_speed_max;
/* 0x5E */ s16 body_search_feint_speed_max;
/* 0x60 */ s16 feint_angle;
/* 0x62 */ s16 unk_0x62;
/* 0x64 */ u8 display_range;
/* 0x65 */ u8 breath_feint2_OFF;
};
#endif /* D_A_B_DR_H */
include/d/actor/d_a_player.h
+3
View File
@@ -932,6 +932,7 @@ public:
u32 getCutAtFlg() const { return checkNoResetFlg0(FLG0_UNK_40); }
u32 checkBoarSingleBattleFirst() const { return checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); }
u32 checkBoarSingleBattleSecond() const { return checkNoResetFlg2(FLG2_UNK_1000000); }
u32 getFootOnGround() const { return checkResetFlg1(daPy_RFLG1(RFLG1_UNK_10 | RFLG1_UNK_20)); }
void offWolfEnemyHangBite() { offNoResetFlg2(FLG2_WOLF_ENEMY_HANG_BITE); }
bool onWolfEnemyHangBite(fopAc_ac_c* param_0) { return onWolfEnemyBiteAll(param_0, FLG2_WOLF_ENEMY_HANG_BITE); }
@@ -1073,6 +1074,8 @@ public:
static int getLastSceneDamage() { return (dComIfGs_getLastSceneMode() >> 4) & 0x7F; }
static u8 getLastSceneSwordAtUpTime() { return (dComIfGs_getLastSceneMode() >> 11) & 0xFF; }
static BOOL checkNormalSwordEquip() { return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_SWORD; }
inline static u32 i_getLastSceneMode();
inline static u32 getLastSceneMode();
inline static bool checkWoodSwordEquip() {
include/d/d_menu_window.h
+5 -82
View File
@@ -28,86 +28,12 @@ BOOL dMw_A_TRIGGER();
BOOL dMw_B_TRIGGER();
BOOL dMw_Z_TRIGGER();
BOOL dMw_START_TRIGGER();
BOOL dMw_LEFT_TRIGGER();
BOOL dMw_RIGHT_TRIGGER();
void dMw_onPauseWindow();
void dMw_offPauseWindow();
class dDlst_MENU_CAPTURE_c : public dDlst_base_c {
public:
virtual void draw() {
if (getDrawFlag() == 1) {
setDrawFlag();
dComIfGp_onPauseFlag();
GXSetTexCopySrc(0, 0, 608, 448);
GXSetTexCopyDst(304, 224, (GXTexFmt)mDoGph_gInf_c::getFrameBufferTimg()->format, GX_ENABLE);
GXCopyTex(mDoGph_gInf_c::getFrameBufferTex(), GX_FALSE);
GXPixModeSync();
} else {
GXTexObj tex;
GXInitTexObj(&tex, mDoGph_gInf_c::getFrameBufferTex(), 304, 224,
(GXTexFmt)mDoGph_gInf_c::getFrameBufferTimg()->format, GX_CLAMP, GX_CLAMP, GX_FALSE);
GXInitTexObjLOD(&tex, GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1);
GXLoadTexObj(&tex, GX_TEXMAP0);
GXSetNumChans(0);
GXSetNumTexGens(1);
GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 60, GX_FALSE, 125);
GXSetNumTevStages(1);
GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR_NULL);
GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO, GX_CC_TEXC);
GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
const GXColor color = {0, 0, 0, mAlpha};
GXSetTevColor(GX_TEVREG0, color);
GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_A0);
GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
GXSetZCompLoc(GX_TRUE);
GXSetZMode(GX_FALSE, GX_ALWAYS, GX_FALSE);
GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_OR);
GXSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_OR, GX_ALWAYS, 0);
GXSetFog(GX_FOG_NONE, 0.0f, 0.0f, 0.0f, 0.0f, g_clearColor);
GXSetFogRangeAdj(GX_FALSE, 0, NULL);
GXSetCullMode(GX_CULL_NONE);
GXSetDither(GX_TRUE);
GXLoadPosMtxImm(g_mDoMtx_identity, GX_PNMTX0);
GXSetCurrentMtx(0);
GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_RGBA4, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGB8, 0);
GXBegin(GX_QUADS, GX_VTXFMT0, 4);
GXPosition3s16(mDoGph_gInf_c::getMinX(), mDoGph_gInf_c::getMinY(), 0);
GXTexCoord2s8(0, 0);
GXPosition3s16(mDoGph_gInf_c::getMaxX(), mDoGph_gInf_c::getMinY(), 0);
GXTexCoord2s8(1, 0);
GXPosition3s16(mDoGph_gInf_c::getMaxX(), mDoGph_gInf_c::getMaxY(), 0);
GXTexCoord2s8(1, 1);
GXPosition3s16(mDoGph_gInf_c::getMinX(), mDoGph_gInf_c::getMaxY(), 0);
GXTexCoord2s8(0, 1);
GXEnd();
}
}
virtual ~dDlst_MENU_CAPTURE_c() {}
dDlst_MENU_CAPTURE_c() {
mFlag = 0;
mAlpha = 255;
mTopFlag = 0;
}
void setCaptureFlag() { mFlag = 1; }
bool checkDraw() { return mFlag; }
u8 getAlpha() { return mAlpha; }
u8 getTopFlag() { return mTopFlag; }
u8 getDrawFlag() { return mFlag; }
void setDrawFlag() { mFlag = 3; }
private:
/* 0x4 */ u8 mFlag;
/* 0x5 */ u8 mAlpha;
/* 0x6 */ u8 mTopFlag;
};
class dDlst_MENU_CAPTURE_c;
class dMw_c : public msg_class {
public:
@@ -303,7 +229,4 @@ private:
/* 0x154 */ bool mPauseWindow;
};
BOOL dMw_LEFT_TRIGGER();
BOOL dMw_RIGHT_TRIGGER();
#endif /* D_MENU_D_MENU_WINDOW_H */
src/d/actor/d_a_alink.cpp
+2 -2
View File
@@ -5480,7 +5480,7 @@ int daAlink_c::createHeap() {
JKRReadIdxResource(mFaceBckHeap.getBuffer(), 0xC00, 0xE8, dComIfGp_getAnmArchive());
J3DAnmTransform* bck = (J3DAnmTransform*)J3DAnmLoaderDataBase::load(mFaceBckHeap.getBuffer());
if (!field_0x2164.init(bck, FALSE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false)) {
if (!field_0x2164.init(bck, FALSE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) {
return 0;
}
@@ -15273,7 +15273,7 @@ void daAlink_c::setBasAnime(daAlink_c::daAlink_UNDER param_0) {
void daAlink_c::initBasAnime() {
if (field_0x2d7c != NULL) {
f32 var_f31;
if (field_0x2d7c->getAttribute() == J3DFrameCtrl::LOOP_REPEAT_e) {
if (field_0x2d7c->getAttribute() == J3DFrameCtrl::EMode_LOOP) {
var_f31 = field_0x2d7c->getFrame() - field_0x2d7c->getRate();
if (var_f31 <= field_0x2d7c->getStart()) {
src/d/actor/d_a_alink_bottle.inc
+2 -2
View File
@@ -67,14 +67,14 @@ void daAlink_c::setBottleModel(u16 i_itemNo) {
if (i_itemNo == fpcNm_ITEM_FAIRY) {
J3DAnmTransform* bck = (J3DAnmTransform*)loadAram(0x1E8, 0xC00);
mpHookTipModel = initModel(loadAramBmd(0x31D, 0x1400), 0);
if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false)) {
if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) {
JUT_ASSERT(142, 0);
}
mHookTipBck.entry(mpHookTipModel->getModelData(), 0.0f);
} else if (i_itemNo == fpcNm_ITEM_WORM) {
J3DAnmTransform* bck = (J3DAnmTransform*)loadAram(0x1E9, 0xC00);
mpHookTipModel = initModel(loadAramBmd(0x31E, 0x2400), 0);
if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false)) {
if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) {
JUT_ASSERT(151, 0);
}
mHookTipBck.entry(mpHookTipModel->getModelData(), 0.0f);
src/d/actor/d_a_alink_demo.inc
+1 -1
View File
@@ -1680,7 +1680,7 @@ int daAlink_c::procCoToolDemo() {
if (field_0x0698 != blk_p) {
field_0x0698 = blk_p;
field_0x069c->init(mpDemoFCTmpBls, field_0x0698, FALSE,
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1);
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1);
field_0x069c->getBlkAnm()->setFrame(0.0f);
}
src/d/actor/d_a_b_bq.cpp
+20 -20
View File
@@ -456,7 +456,7 @@ static void damage_check(b_bq_class* i_this) {
}
def_se_set(&i_this->mSound, i_this->mAtInfo.mpCollider, 0x2D, NULL);
anm_init(i_this, ANM_NO_DAMAGE, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_NO_DAMAGE, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mSound.startCreatureVoice(Z2SE_EN_BQ_V_NODAMAGE, -1);
i_this->field_0x6de = 10;
}
@@ -501,7 +501,7 @@ static s8 b_bq_stay(b_bq_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_APPEAR, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 0.0f);
anm_init(i_this, ANM_APPEAR, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f);
i_this->mMode = 1;
break;
case 2:
@@ -523,7 +523,7 @@ static s8 b_bq_stay(b_bq_class* i_this) {
}
if (i_this->mTimers[0] == 0) {
anm_init(i_this, ANM_APPEAR, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_APPEAR, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 4;
i_this->mDisableDraw = false;
@@ -549,7 +549,7 @@ static s8 b_bq_stay(b_bq_class* i_this) {
if (i_this->mpMorf->isStop()) {
i_this->mAction = ACTION_WAIT;
anm_init(i_this, ANM_WAIT_01, 1.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT_01, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 1;
}
break;
@@ -562,7 +562,7 @@ static s8 b_bq_stay(b_bq_class* i_this) {
static void b_bq_wait(b_bq_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_WAIT_01, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT_01, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 1;
// fallthrough
case 1:
@@ -582,7 +582,7 @@ static void b_bq_wait(b_bq_class* i_this) {
}
if (i_this->mAnmID == ANM_NO_DAMAGE && i_this->mpMorf->isStop()) {
anm_init(i_this, ANM_WAIT_01, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT_01, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
if (i_this->field_0x11fc != 0 && i_this->mTimers[2] == 1) {
@@ -598,7 +598,7 @@ static void b_bq_damage(b_bq_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_BOMB_DAMAGE, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_BOMB_DAMAGE, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 1;
i_this->mTimers[0] = 1000;
a_this->health = 50;
@@ -629,7 +629,7 @@ static void b_bq_damage(b_bq_class* i_this) {
}
if (i_this->mpMorf->isStop()) {
anm_init(i_this, ANM_DAMAGE_WAIT, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_DAMAGE_WAIT, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 2;
i_this->mTimers[0] = l_HIO.mChanceTime;
}
@@ -641,12 +641,12 @@ static void b_bq_damage(b_bq_class* i_this) {
}
break;
case 10:
anm_init(i_this, ANM_CORE_DAMAGE, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_CORE_DAMAGE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 11;
break;
case 11:
if (i_this->mpMorf->isStop()) {
anm_init(i_this, ANM_DAMAGE_WAIT, JREG_F(15), J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_DAMAGE_WAIT, JREG_F(15), J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 2;
}
break;
@@ -661,7 +661,7 @@ static void b_bq_damage(b_bq_class* i_this) {
return;
}
anm_init(i_this, ANM_RETURN_01, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_RETURN_01, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 21;
i_this->mSound.startCreatureVoice(Z2SE_EN_BQ_V_DAMAGEBACK, -1);
break;
@@ -671,7 +671,7 @@ static void b_bq_damage(b_bq_class* i_this) {
}
break;
case 30:
anm_init(i_this, ANM_RETURN_02, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_RETURN_02, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 31;
i_this->mSound.startCreatureVoice(Z2SE_EN_BQ_V_BACK, -1);
break;
@@ -725,7 +725,7 @@ static void b_bq_damage(b_bq_class* i_this) {
i_this->setDownPos(&sp5C);
if (i_this->checkCutDownHitFlg()) {
anm_init(i_this, ANM_TODOME, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_TODOME, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mPlayTodomeBtk = true;
i_this->mMode = 40;
@@ -764,7 +764,7 @@ static s8 b_bq_attack(b_bq_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_ATTACK_A, 10.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_ATTACK_A, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 1;
if (cM_rndF(1.0f) < 0.5f) {
@@ -788,7 +788,7 @@ static s8 b_bq_attack(b_bq_class* i_this) {
}
if (i_this->mpMorf->isStop()) {
anm_init(i_this, ANM_ATTACK_B, 2.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_ATTACK_B, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 2;
i_this->mTimers[0] = l_HIO.mWaterSprayTime;
}
@@ -797,7 +797,7 @@ static s8 b_bq_attack(b_bq_class* i_this) {
set_dokuhaki = true;
if (i_this->mTimers[0] == 0) {
anm_init(i_this, ANM_ATTACK_B, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_ATTACK_B, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 3;
}
break;
@@ -901,7 +901,7 @@ static void b_bq_end(b_bq_class* i_this) {
case 0:
i_this->mSound.startCreatureVoice(Z2SE_EN_BQ_V_DEAD, -1);
anm_init(i_this, ANM_DEAD, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEAD, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mpDeadBrk->setPlaySpeed(1.0f);
i_this->mMode = 1;
@@ -2440,7 +2440,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
b_bq_class* a_this = (b_bq_class*)i_this;
a_this->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_bq", 0x1D), NULL,
NULL, NULL, J3DFrameCtrl::LOOP_REPEAT_e, 0.6f, 0, -1,
NULL, NULL, J3DFrameCtrl::EMode_LOOP, 0.6f, 0, -1,
&a_this->mSound, 0, 0x11000284);
if (a_this->mpMorf == NULL || a_this->mpMorf->getModel() == NULL) {
return false;
@@ -2460,7 +2460,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
if (!a_this->mpDeadBrk->init(a_this->mpMorf->getModel()->getModelData(),
(J3DAnmTevRegKey*)dComIfG_getObjectRes("B_bq", 0x20), TRUE,
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1))
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1))
{
return false;
}
@@ -2474,7 +2474,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
if (!a_this->mpTodomeBtk->init(a_this->mpMorf->getModel()->getModelData(),
(J3DAnmTextureSRTKey*)dComIfG_getObjectRes("B_bq", 0x23), TRUE,
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1))
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1))
{
return false;
}
src/d/actor/d_a_b_dr.cpp
+4260 -3015
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_b_ds.cpp
+8 -8
View File
@@ -1524,7 +1524,7 @@ void daB_DS_c::executeOpeningDemo() {
}
mpZantMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", 66)),
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 1.0f, 0.0f, -1.0f);
J3DFrameCtrl::EMode_LOOP, 1.0f, 1.0f, 0.0f, -1.0f);
mZantScale.set(0.0f, 5.0f, 0.0f);
mZantEyePos.set(mZantPos);
mZantEyePos.y += 200.0f;
@@ -1600,12 +1600,12 @@ void daB_DS_c::executeOpeningDemo() {
mCameraEye.set(mOpEyeDt[4]);
mpZantMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", 64)),
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 1.0f, 0.0f, -1.0f);
J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f);
mpSwordMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", 63)),
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 1.0f, 0.0f, -1.0f);
J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f);
mpSwordBrkAnm->init(mpSwordMorf->getModel()->getModelData(),
static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("B_DS", 81)), TRUE,
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1);
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1);
particle_angle.x = 0;
particle_angle.y = field_0x7ca + 5000;
@@ -1687,7 +1687,7 @@ void daB_DS_c::executeOpeningDemo() {
case 26:
if (!field_0x85e && mpZantMorf->isStop()) {
mpZantMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", 67)),
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 1.0f, 0.0f, -1.0f);
J3DFrameCtrl::EMode_LOOP, 1.0f, 1.0f, 0.0f, -1.0f);
field_0x85e = true;
}
@@ -1705,12 +1705,12 @@ void daB_DS_c::executeOpeningDemo() {
if (mModeTimer == 100) {
mpOpPatternBrkAnm->init(mpOpPatternModel->getModelData(),
static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("B_DS", 79)),
TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1);
TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1);
mpOpPatternBtkAnm->init(
mpOpPatternModel->getModelData(),
static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("B_DS", 85)), TRUE,
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1);
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1);
mPlayPatternAnm = true;
}
@@ -1722,7 +1722,7 @@ void daB_DS_c::executeOpeningDemo() {
}
mpZantMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", 65)),
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 1.0f, 0.0f, -1.0f);
J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f);
mSound.startCreatureSound(Z2SE_EN_ZAN_L4_2, 0, -1);
mMode = 30;
field_0x85e = false;
src/d/actor/d_a_b_gm.cpp
+17 -17
View File
@@ -372,7 +372,7 @@ static void b_gm_wait(b_gm_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_GOMA_WAIT, 20.0f, J3DFrameCtrl::LOOP_REPEAT_e, l_HIO.wait_anm_speed);
anm_init(i_this, ANM_GOMA_WAIT, 20.0f, J3DFrameCtrl::EMode_LOOP, l_HIO.wait_anm_speed);
i_this->mTimers[0] = 100.0f + cM_rndF(100.0f);
i_this->mMode = 1;
/* fallthrough */
@@ -405,7 +405,7 @@ static void b_gm_move(b_gm_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_GOMA_DASH, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, l_HIO.dash_anm_speed);
anm_init(i_this, ANM_GOMA_DASH, 10.0f, J3DFrameCtrl::EMode_LOOP, l_HIO.dash_anm_speed);
i_this->mMode = 1;
i_this->unk_0x5cc = 0;
/* fallthrough */
@@ -489,7 +489,7 @@ static void b_gm_move(b_gm_class* i_this) {
move_speed = 0.0f;
if (i_this->mTimers[0] == 0) {
if (i_this->mAnmID != ANM_GOMA_DASH) {
anm_init(i_this, ANM_GOMA_DASH, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, l_HIO.dash_anm_speed);
anm_init(i_this, ANM_GOMA_DASH, 10.0f, J3DFrameCtrl::EMode_LOOP, l_HIO.dash_anm_speed);
}
i_this->mMode = 3;
@@ -531,12 +531,12 @@ static void b_gm_beam(b_gm_class* i_this) {
case 0:
i_this->mMode = 2;
i_this->field_0x6f4 = 0;
anm_init(i_this, ANM_GOMA_ATTACK_A, 10.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_GOMA_ATTACK_A, 10.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
break;
case 2:
i_this->field_0x1ad6 = 1;
if (i_this->mpModelMorf->isStop()) {
anm_init(i_this, ANM_GOMA_ATTACK_B, 2.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_GOMA_ATTACK_B, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 3;
i_this->mTimers[0] = 200;
}
@@ -546,7 +546,7 @@ static void b_gm_beam(b_gm_class* i_this) {
cLib_addCalc2(&i_this->field_0x6c0, 1.0f, 1.0f, 0.1f);
if (i_this->mTimers[0] == 0) {
i_this->mMode = 4;
anm_init(i_this, ANM_GOMA_ATTACK_C, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_GOMA_ATTACK_C, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
}
break;
case 4:
@@ -586,7 +586,7 @@ static void b_gm_kogoma(b_gm_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_GOMA_DASH, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, l_HIO.dash_anm_speed);
anm_init(i_this, ANM_GOMA_DASH, 10.0f, J3DFrameCtrl::EMode_LOOP, l_HIO.dash_anm_speed);
i_this->mTargetMovePos.x = 0.0f;
i_this->mTargetMovePos.z = 0.0f;
i_this->mMode = 1;
@@ -601,7 +601,7 @@ static void b_gm_kogoma(b_gm_class* i_this) {
}
if (sp54.abs() < 200.0f) {
anm_init(i_this, ANM_GOMA_LAY_EGGS, 20.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_GOMA_LAY_EGGS, 20.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mTimers[0] = 200;
i_this->mMode = 2;
}
@@ -637,7 +637,7 @@ static void b_gm_damage(b_gm_class* i_this) {
switch (i_this->mMode) {
case 0:
i_this->mMode = 1;
anm_init(i_this, ANM_GOMA_ROOF_DAMAGE, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_GOMA_ROOF_DAMAGE, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
break;
case 1:
if (anm_frame >= 50) {
@@ -652,7 +652,7 @@ static void b_gm_damage(b_gm_class* i_this) {
if (i_this->mpModelMorf->isStop()) {
i_this->mAction = ACTION_DROP;
i_this->mMode = 0;
anm_init(i_this, ANM_GOMA_FALL_LOOP, 0.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_GOMA_FALL_LOOP, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
break;
}
@@ -683,7 +683,7 @@ static void b_gm_drop(b_gm_class* i_this) {
dComIfGp_getVibration().StartShock(VIBMODE_S_POWER8, 0x4F, cXyz(0.0f, 1.0f, 0.0f));
i_this->mMode = 2;
anm_init(i_this, ANM_GOMA_LANDING, 0.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_GOMA_LANDING, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mTimers[0] = 300;
fopAcM_effSmokeSet1(&i_this->field_0x1c84, &i_this->field_0x1c88, &a_this->current.pos, NULL, 15.0f, &a_this->tevStr, 1);
@@ -693,19 +693,19 @@ static void b_gm_drop(b_gm_class* i_this) {
break;
case 2:
if (i_this->mpModelMorf->isStop()) {
anm_init(i_this, ANM_GOMA_LANDING_WAIT, 0.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_GOMA_LANDING_WAIT, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
a_this->current.pos.y = 0.0f;
if (i_this->mTimers[0] == 0) {
i_this->mMode = 3;
anm_init(i_this, ANM_GOMA_RETURN, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_GOMA_RETURN, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
Z2GetAudioMgr()->changeBgmStatus(2);
}
break;
case 3:
if (i_this->mpModelMorf->isStop()) {
anm_init(i_this, ANM_GOMA_WAIT, 0.0f, J3DFrameCtrl::LOOP_REPEAT_e, l_HIO.wait_anm_speed);
anm_init(i_this, ANM_GOMA_WAIT, 0.0f, J3DFrameCtrl::EMode_LOOP, l_HIO.wait_anm_speed);
a_this->current.angle.x = 0;
a_this->shape_angle.x = 0;
i_this->mTimers[0] = 5;
@@ -730,17 +730,17 @@ static void b_gm_drop(b_gm_class* i_this) {
}
break;
case 10:
anm_init(i_this, ANM_GOMA_LANDING_DAMAGE, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_GOMA_LANDING_DAMAGE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 11;
case 11:
if (i_this->mpModelMorf->isStop()) {
i_this->mMode = 3;
anm_init(i_this, ANM_GOMA_RETURN, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_GOMA_RETURN, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mInvincibilityTimer = 200;
}
break;
case 20:
anm_init(i_this, ANM_GOMA_DEATH, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_GOMA_DEATH, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 21;
case 21:
if (i_this->mpModelMorf->getFrame() >= 160.0f) {
src/d/actor/d_a_b_go.cpp
+1 -1
View File
@@ -224,7 +224,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
a_this->mpMorf = new mDoExt_McaMorfSO(
(J3DModelData*)dComIfG_getObjectRes("B_go", RES_IS_MODEL), NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("B_go", ANM_WAIT_03), J3DFrameCtrl::LOOP_REPEAT_e,
(J3DAnmTransform*)dComIfG_getObjectRes("B_go", ANM_WAIT_03), J3DFrameCtrl::EMode_LOOP,
1.0f, 0, -1, &a_this->mSound, 0x80000, 0x11000084);
if (a_this->mpMorf == NULL || a_this->mpMorf->getModel() == NULL) {
src/d/actor/d_a_b_gos.cpp
+4 -4
View File
@@ -61,7 +61,7 @@ static void wait(b_gos_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, 6, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, 6, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 1;
i_this->mTimers[0] = cM_rndF(30) + 30.0f;
break;
@@ -89,7 +89,7 @@ static void walk(b_gos_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, 4, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, 4, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 1;
i_this->mTimers[0] = cM_rndF(60) + 60.0f;
i_this->mWalkDirection = cM_rndF(0x10000);
@@ -116,7 +116,7 @@ static void ball(b_gos_class* i_this) {
// fallthrough
case 1:
if (i_this->mTimers[0] == 0) {
anm_init(i_this, 5, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, 5, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 2;
i_this->mTimers[0] = cM_rndF(30) + 60.0f;
}
@@ -331,7 +331,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
a_this->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_gos", 9), NULL,
NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_gos", 6),
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, &a_this->mSound,
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, &a_this->mSound,
0x80000, 0x11000084);
if (a_this->mpMorf == NULL || a_this->mpMorf->getModel() == NULL) {
src/d/actor/d_a_b_ob.cpp
+23 -23
View File
@@ -979,7 +979,7 @@ static void bombfishset(b_ob_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, OB_ANM_WAIT, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f);
anm_init(i_this, OB_ANM_WAIT, 5.0f, J3DFrameCtrl::EMode_LOOP, 3.0f);
i_this->mMode = 1;
if (a_this->field_0x567 == 0 && i_this->mDemoAction == 0) {
@@ -1014,7 +1014,7 @@ static void bombfishset(b_ob_class* i_this) {
i_this->mAction = OB_ACTION_CORE_HAND_MOVE;
i_this->mMode = 0;
anm_init(i_this, OB_ANM_WAIT, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, OB_ANM_WAIT, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
break;
}
@@ -1152,7 +1152,7 @@ static void core_end(b_ob_class* i_this) {
a_this->gravity = 0.0f;
i_this->mDemoAction = 20;
i_this->field_0x479c = -1000.0f;
anm_init(i_this, OB_ANM_TENTACLE_END, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, OB_ANM_TENTACLE_END, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
particle_pos.set(0.0f, 0.0f, 0.0f);
dComIfGp_particle_set(0x880A, &particle_pos, NULL, NULL);
@@ -1211,7 +1211,7 @@ static void core_end(b_ob_class* i_this) {
i_this->mMoveAngle.x = -0x4000;
i_this->field_0x4750 = 0;
i_this->mTimers[0] = 110;
anm_init(i_this, OB_ANM_APPEAR_2, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, OB_ANM_APPEAR_2, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
fopAcM_OffStatus(a_this, 0x80000);
fopAcM_OnStatus(a_this, 0x200000);
@@ -1550,7 +1550,7 @@ static int fish_normal(b_ob_class* i_this) {
}
if (i_this->mAnmID != OB_ANM_SWIM_WAIT) {
anm_init(i_this, OB_ANM_SWIM_WAIT, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, OB_ANM_SWIM_WAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
if (dist_to_ground < l_HIO.mBodySize * (ZREG_F(8) + 1200.0f)) {
@@ -1701,7 +1701,7 @@ static int fish_normal(b_ob_class* i_this) {
}
if (i_this->mAnmID == OB_ANM_APPEAR_2 && i_this->mBodyParts[0].mpMorf->isStop()) {
anm_init(i_this, OB_ANM_SWIM_WAIT, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, OB_ANM_SWIM_WAIT, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
if (throw_player) {
@@ -1724,13 +1724,13 @@ static int fish_vacume(b_ob_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, OB_ANM_OPEN_MOUTH, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, OB_ANM_OPEN_MOUTH, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 1;
i_this->field_0x476a = 0;
break;
case 1:
if (i_this->mBodyParts[0].mpMorf->isStop()) {
anm_init(i_this, OB_ANM_OPEN_MOUTH_WAIT, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, OB_ANM_OPEN_MOUTH_WAIT, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 2;
i_this->mTimers[0] = 200;
}
@@ -1766,9 +1766,9 @@ static int fish_vacume(b_ob_class* i_this) {
if (i_this->mBodyParts[0].mpMorf->isStop()) {
if (i_this->mAnmID == OB_ANM_SWALLOW) {
anm_init(i_this, OB_ANM_EAT_2, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, OB_ANM_EAT_2, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else if (i_this->mAnmID == OB_ANM_EAT_2) {
anm_init(i_this, OB_ANM_THROWUP, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, OB_ANM_THROWUP, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mOISound.startCreatureVoice(Z2SE_EN_OI_V_THROWUP, -1);
} else if (i_this->mAnmID == OB_ANM_THROWUP) {
i_this->mAction = OB_ACTION_FISH_NORMAL;
@@ -1809,11 +1809,11 @@ static int fish_end(b_ob_class* i_this) {
i_this->field_0x5d04 = KREG_F(8) + 1.5f;
i_this->mBlureRateTarget = 150;
i_this->field_0x5dd8 = 3;
anm_init(i_this, OB_ANM_LAST_DAMAGE, 0.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, OB_ANM_LAST_DAMAGE, 0.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
break;
case 1:
if (i_this->mBodyParts[0].mpMorf->isStop()) {
anm_init(i_this, OB_ANM_SWIM_WAIT, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, OB_ANM_SWIM_WAIT, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
if (i_this->mTimers[0] == 0) {
@@ -1821,7 +1821,7 @@ static int fish_end(b_ob_class* i_this) {
i_this->mTargetMovePos.set(0.0f, -19000.0f, -6500.0f);
i_this->mTimers[0] = 150;
i_this->mDemoCamEye.set(-6000.0f, -22000.0f, 2000.0f);
anm_init(i_this, OB_ANM_LAST_DAMAGE, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, OB_ANM_LAST_DAMAGE, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
}
break;
case 2:
@@ -1836,12 +1836,12 @@ static int fish_end(b_ob_class* i_this) {
i_this->mDemoAction = 42;
i_this->mDemoActionTimer = 0;
i_this->mBlureRateTarget = 0;
anm_init(i_this, OB_ANM_LAST_DAMAGE, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, OB_ANM_LAST_DAMAGE, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
}
break;
case 3:
if (i_this->mAcch.ChkWallHit() && i_this->mTimers[0] == 0) {
anm_init(i_this, OB_ANM_DEAD, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, OB_ANM_DEAD, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
dComIfGp_getVibration().StartShock(8, 31, cXyz(0.0f, 1.0f, 0.0f));
mDoAud_seStart(Z2SE_OBJ_BOMB_EXPLODE, NULL, 0, 0);
@@ -2503,7 +2503,7 @@ static void demo_camera(b_ob_class* i_this) {
if (i_this->mBodyParts[0].mpMorf->isStop()) {
i_this->mDemoAction = 100;
i_this->mCoreAnm = OB_ANM_WAIT;
i_this->mCoreAnmMode = J3DFrameCtrl::LOOP_REPEAT_e;
i_this->mCoreAnmMode = J3DFrameCtrl::EMode_LOOP;
i_this->field_0x4794 = 100;
}
break;
@@ -2527,7 +2527,7 @@ static void demo_camera(b_ob_class* i_this) {
i_this->field_0x5cfc = 0;
i_this->field_0x5d00 = ZREG_F(3) + 1000.0;
anm_init(i_this, OB_ANM_OPEN_MOUTH_WAIT, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, OB_ANM_OPEN_MOUTH_WAIT, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
if (cM_rndF(1.0f) < 0.5f) {
i_this->field_0x5cd4 = 500.0f;
@@ -2582,7 +2582,7 @@ static void demo_camera(b_ob_class* i_this) {
if (i_this->mDemoActionTimer >= 15) {
if (i_this->mDemoActionTimer == 30) {
anm_init(i_this, OB_ANM_SWALLOW, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, OB_ANM_SWALLOW, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mOISound.startCreatureVoice(Z2SE_EN_OI_V_SWALLOW, -1);
}
@@ -2860,7 +2860,7 @@ static void demo_camera(b_ob_class* i_this) {
}
if (i_this->mBodyParts[0].mpMorf->isStop()) {
anm_init(i_this, OB_ANM_WAIT, 0.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, OB_ANM_WAIT, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
if (i_this->mDemoActionTimer == 120) {
@@ -3191,7 +3191,7 @@ static void demo_camera(b_ob_class* i_this) {
i_this->field_0x5cfc = 0;
i_this->field_0x5d00 = ZREG_F(3) + 300.0f;
anm_init(i_this, OB_ANM_EAT, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, OB_ANM_EAT, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mOISound.startCreatureVoice(Z2SE_EN_OI_V_EAT, -1);
@@ -3255,7 +3255,7 @@ static void demo_camera(b_ob_class* i_this) {
if (i_this->mDemoAction == 52 && i_this->mBodyParts[0].mpMorf->isStop()) {
i_this->mDemoAction = 100;
i_this->mCoreAnm = OB_ANM_WAIT;
i_this->mCoreAnmMode = J3DFrameCtrl::LOOP_REPEAT_e;
i_this->mCoreAnmMode = J3DFrameCtrl::EMode_LOOP;
i_this->field_0x4794 = 100;
}
break;
@@ -3833,7 +3833,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
if (!a_this->mpSuiBrk->init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("B_oh", 0x2E), TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) {
if (!a_this->mpSuiBrk->init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("B_oh", 0x2E), TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
return 0;
}
@@ -3842,7 +3842,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 0;
}
if (!a_this->mpSuiBtk->init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("B_oh", 0x35), TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) {
if (!a_this->mpSuiBtk->init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("B_oh", 0x35), TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
return 0;
}
src/d/actor/d_a_b_yo.cpp
+30 -30
View File
@@ -456,7 +456,7 @@ void daB_YO_c::setBck(int i_anm, u8 i_attr, f32 i_morf, f32 i_rate) {
brk_idx = 0x25;
}
J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("B_YO", brk_idx);
mpYetaBrkAnm->init(model_data, brk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1);
mpYetaBrkAnm->init(model_data, brk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1);
}
/* 8062FE0C-8062FE18 000A8C 000C+00 11/11 0/0 0/0 .text setActionMode__8daB_YO_cFii */
@@ -808,7 +808,7 @@ void daB_YO_c::executeOpening() {
Z2GetAudioMgr()->seStart(Z2SE_EN_YO_DEMO_OP1, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
fopAcM_OffStatus(this, 0x4000);
field_0xfb5 = 3;
setBck(ANM_WAIT_A, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_WAIT_A, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 1;
gravity = 0.0f;
current.pos.set(100.0f, 0.0f, 1000.0f);
@@ -834,7 +834,7 @@ void daB_YO_c::executeOpening() {
mCamCenter.y = 180.0f;
mCamEye.set(0.0f, 250.0f, 1450.0f);
if (doYoMessage() == 1) {
setBck(ANM_WALK, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_WALK, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 2;
mActionTimer = 90;
mActionTimer2 = 300;
@@ -883,7 +883,7 @@ void daB_YO_c::executeOpening() {
speedF = 0.0f;
shape_angle.y = field_0xf80;
player->changeDemoMode(20, 0, 0, 0);
setBck(ANM_WAIT_A, J3DFrameCtrl::LOOP_REPEAT_e, 10.0f, 1.0f);
setBck(ANM_WAIT_A, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
mMode = 4;
}
break;
@@ -935,7 +935,7 @@ void daB_YO_c::executeOpening() {
player->changeDemoMode(1, 0, 0, 0);
}
if (mActionTimer == 15) {
setBck(ANM_TALK_A, J3DFrameCtrl::LOOP_REPEAT_e, 10.0f, 1.0f);
setBck(ANM_TALK_A, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
}
if (mActionTimer == 0) {
setYoMessage(0x2350);
@@ -972,7 +972,7 @@ void daB_YO_c::executeOpening() {
case 10:
if (doYoMessage() == 1) {
mActionTimer = 150;
setBck(ANM_TO_TALK_B, J3DFrameCtrl::LOOP_ONCE_e, 15.0f, 1.0f);
setBck(ANM_TO_TALK_B, J3DFrameCtrl::EMode_NONE, 15.0f, 1.0f);
mMode = 11;
mActionTimer2 = 10;
mColorMode = 1;
@@ -982,7 +982,7 @@ void daB_YO_c::executeOpening() {
case 11:
if (mpYetaMorf->isStop()) {
setBck(ANM_TALK_B, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_TALK_B, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 12;
setYoMessage(0x235F);
}
@@ -1008,7 +1008,7 @@ void daB_YO_c::executeOpening() {
cam_pos.set(51.0f, 207.0f, -1562.0f);
cLib_chasePos(&mCamEye, cam_pos, mCamEyeSpeed);
if (mActionTimer == 0) {
setBck(ANM_ANGRY, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_ANGRY, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 15;
player->changeDemoMode(1, 0, 0, 0);
}
@@ -1030,7 +1030,7 @@ void daB_YO_c::executeOpening() {
if (mpYetaMorf->isStop()) {
mMode = 16;
setYoMessage(0x2352);
setBck(ANM_ANGRY_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_ANGRY_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
}
break;
@@ -1046,7 +1046,7 @@ void daB_YO_c::executeOpening() {
if (mActionTimer == 0) {
mColorMode = 3;
mColBlend = 1.0f;
setBck(ANM_WAIT_B, J3DFrameCtrl::LOOP_REPEAT_e, 16.0f, 1.0f);
setBck(ANM_WAIT_B, J3DFrameCtrl::EMode_LOOP, 16.0f, 1.0f);
shape_angle.y = 0;
current.angle.y = 0;
mMode = 20;
@@ -1089,7 +1089,7 @@ void daB_YO_c::executeOpening() {
if (mActionTimer == 0) {
dComIfGs_onSwitch(mSwNo, fopAcM_GetRoomNo(this));
mMode = 22;
setBck(ANM_FLOAT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_FLOAT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
current.pos.set(0.0f, 0.0f, -500.0f);
mCamEye.set(0.0f, 50.0f, 500.0f);
mCamCenter.set(0.0f, 500.0f, 400.0f);
@@ -1418,7 +1418,7 @@ void daB_YO_c::executeChase() {
mpBtkAnm->remove(mpModel[0]->getModelData());
J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("B_YO", 0x35);
mpBtkAnm->init(mpModel[1]->getModelData(), btk, FALSE,
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1);
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1);
} else if (mModelNo == 6) {
mpBtkAnm->setFrame(2.0f);
}
@@ -1583,7 +1583,7 @@ void daB_YO_c::executeSeriousDemo() {
Z2GetAudioMgr()->seStart(Z2SE_EN_YO_DEMO_MID, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
fpcM_Search(s_frizad_delete, this);
field_0xfb5 = 1;
setBck(ANM_WAIT_C2, J3DFrameCtrl::LOOP_REPEAT_e, 0.0f, 1.0f);
setBck(ANM_WAIT_C2, J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f);
mColorMode = 5;
mColBlend = 0.0f;
return;
@@ -1638,7 +1638,7 @@ void daB_YO_c::executeSeriousDemo() {
if (mActionTimer == 0) {
shape_angle.y = 0;
current.angle.y = 0;
setBck(ANM_FLOAT_B, J3DFrameCtrl::LOOP_REPEAT_e, 15.0f, 1.0f);
setBck(ANM_FLOAT_B, J3DFrameCtrl::EMode_LOOP, 15.0f, 1.0f);
mActionTimer = 90;
mMode = 5;
mCamCenterSpeed = 3.0f;
@@ -1675,12 +1675,12 @@ void daB_YO_c::executeSeriousDemo() {
cLib_chaseF(&speed.y, 5.0f, 0.2f);
} else {
if (cLib_chaseF(&speed.y, 0.0f, 0.2f)) {
setBck(ANM_WAIT_C, J3DFrameCtrl::LOOP_REPEAT_e, 10.0f, 1.0f);
setBck(ANM_WAIT_C, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
}
}
}
if (mActionTimer == 0) {
setBck(ANM_SCREAM, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_SCREAM, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
mMode = 11;
}
break;
@@ -1714,7 +1714,7 @@ void daB_YO_c::executeSeriousDemo() {
case 12:
mActionTimer = 120;
if (mpYetaMorf->isStop()) {
setBck(ANM_SCREAM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_SCREAM_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
mMode = 17;
}
// fallthrough
@@ -1736,7 +1736,7 @@ void daB_YO_c::executeSeriousDemo() {
current.pos.y -= 350.0f;
mIceCenterPos.y = current.pos.y - 30.0f;
mActionTimer = 90;
setBck(ANM_WAIT_D, J3DFrameCtrl::LOOP_REPEAT_e, 3.0f, 1.0f);
setBck(ANM_WAIT_D, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f);
}
break;
@@ -2393,7 +2393,7 @@ void daB_YO_c::executeDeath() {
speedF = 0.0f;
mMode = 3;
mActionTimer = 30;
setBck(ANM_DOWN_A, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_DOWN_A, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
setBreakIceEffect();
setWallHitEffect();
}
@@ -2420,7 +2420,7 @@ void daB_YO_c::executeDeath() {
pos1.y -= 200.0f;
cLib_addCalcPos2(&mCamCenter, pos1, 0.1f, 3.0f);
if (mpYetaMorf->isStop()) {
setBck(ANM_DOWN_C, J3DFrameCtrl::LOOP_ONCE_e, 15.0f, 1.0f);
setBck(ANM_DOWN_C, J3DFrameCtrl::EMode_NONE, 15.0f, 1.0f);
mMode = 110;
mBlureRate = 0.0f;
}
@@ -2453,7 +2453,7 @@ void daB_YO_c::executeDeath() {
pos1.set(0.0f, 1230.0f, -1400.0f);
cLib_addCalcPos2(&mCamEye, pos1, 0.1f, 60.0f);
if (mActionTimer == 0) {
setBck(ANM_DOWN_C, J3DFrameCtrl::LOOP_ONCE_e, 15.0f, 1.0f);
setBck(ANM_DOWN_C, J3DFrameCtrl::EMode_NONE, 15.0f, 1.0f);
mMode = 110;
mBlureRate = 0.0f;
}
@@ -2493,7 +2493,7 @@ void daB_YO_c::executeDeath() {
mpYetaMorf->setPlaySpeed(mIceCenterSpeed);
}
if (mActionTimer == 0) {
setBck(ANM_DOWN_C, J3DFrameCtrl::LOOP_ONCE_e, 15.0f, 1.0f);
setBck(ANM_DOWN_C, J3DFrameCtrl::EMode_NONE, 15.0f, 1.0f);
mMode = 110;
mBlureRate = 0.0f;
}
@@ -3179,7 +3179,7 @@ int daB_YO_c::CreateHeap() {
model_data = (J3DModelData*)dComIfG_getObjectRes("B_YO", 0x1c);
mpYetaMorf = new mDoExt_McaMorfSO(
model_data, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_YO", 0x14),
J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, &mCreatureSound, 0, 0x11020284
J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, &mCreatureSound, 0, 0x11020284
);
if (mpYetaMorf == NULL || mpYetaMorf->getModel() == NULL) {
return 0;
@@ -3191,7 +3191,7 @@ int daB_YO_c::CreateHeap() {
}
J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("B_YO", 0x35);
if (!mpBtkAnm->init(mpModel[0]->getModelData(), btk, FALSE,
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) {
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
return 0;
}
@@ -3201,7 +3201,7 @@ int daB_YO_c::CreateHeap() {
return 0;
}
btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("B_YO", 0x32);
if (!mpYetaBtkAnm->init(model_data, btk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1)) {
if (!mpYetaBtkAnm->init(model_data, btk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1)) {
return 0;
}
@@ -3210,7 +3210,7 @@ int daB_YO_c::CreateHeap() {
return 5;
}
J3DAnmTexPattern* btp = (J3DAnmTexPattern*)dComIfG_getObjectRes("B_YO", 0x3f);
if (!mpYetaBtpAnm->init(model_data, btp, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1)) {
if (!mpYetaBtpAnm->init(model_data, btp, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1)) {
return 5;
}
@@ -3219,7 +3219,7 @@ int daB_YO_c::CreateHeap() {
return 0;
}
J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("B_YO", 0x24);
if (!mpYetaBrkAnm->init(model_data, brk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) {
if (!mpYetaBrkAnm->init(model_data, brk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
return 0;
}
@@ -3228,7 +3228,7 @@ int daB_YO_c::CreateHeap() {
return 0;
}
brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("B_YO", 0x27);
if (!mpYetaWhiteBrkAnm->init(model_data, brk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 0, -1)) {
if (!mpYetaWhiteBrkAnm->init(model_data, brk, TRUE, J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1)) {
return 0;
}
@@ -3273,7 +3273,7 @@ int daB_YO_c::CreateHeap() {
model_data = (J3DModelData*)dComIfG_getObjectRes("ykW", 0xb);
mpYetaRevertedMorf = new mDoExt_McaMorfSO(
model_data, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("ykW1", 0x1a),
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, &mCreatureSound, 0, 0x11000084
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, &mCreatureSound, 0, 0x11000084
);
if (mpYetaRevertedMorf == NULL || mpYetaRevertedMorf->getModel() == NULL) {
return 0;
@@ -3431,7 +3431,7 @@ cPhs__Step daB_YO_c::create() {
if (cDmr_SkipInfo != 0) {
mScale = 1.0f;
setBck(ANM_ANGRY, J3DFrameCtrl::LOOP_ONCE_e, 3.0f, 1.0f);
setBck(ANM_ANGRY, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f);
cDmr_SkipInfo = 0;
field_0xfb5 = 0;
setActionMode(ACT_CHASE, 0);
src/d/actor/d_a_b_zant.cpp
+91 -91
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_b_zant_mobile.cpp
+10 -10
View File
@@ -126,13 +126,13 @@ void daB_ZANTZ_c::setMouthMode(u8 param_0) {
if (param_0 == 2) {
if (mMouthMode == 0 || mMouthMode == 1) {
mMouthMode = 2;
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x43), J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 1.0f, 0.0f, -1.0f);
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x43), J3DFrameCtrl::EMode_NONE, 0.0f, 1.0f, 0.0f, -1.0f);
Z2GetAudioMgr()->seStart(Z2SE_EN_ZZ_CLOSE, &current.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
} else if (param_0 == 0) {
if (mMouthMode == 2 || mMouthMode == 3) {
mMouthMode = 0;
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x44), J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 1.0f, 0.0f, -1.0f);
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x44), J3DFrameCtrl::EMode_NONE, 0.0f, 1.0f, 0.0f, -1.0f);
Z2GetAudioMgr()->seStart(Z2SE_EN_ZZ_OPEN, &current.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
}
}
@@ -145,14 +145,14 @@ void daB_ZANTZ_c::setAppearMode(u8 param_0) {
if (param_0 == 2) {
if (mAppearMode == 0 || mAppearMode == 1) {
mAppearMode = 2;
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x42), J3DFrameCtrl::LOOP_REPEAT_e, 0.0f, 1.0f, 0.0f, -1.0f);
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x42), J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f, 0.0f, -1.0f);
field_0x660 = 1.0f;
dComIfGp_getVibration().StartQuake(1, 31, cXyz(0.0f, 1.0f, 0.0f));
}
} else if (param_0 == 0) {
if (mAppearMode == 2 || mAppearMode == 3) {
mAppearMode = 0;
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x42), J3DFrameCtrl::LOOP_REPEAT_e, 0.0f, 1.0f, 0.0f, -1.0f);
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x42), J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f, 0.0f, -1.0f);
field_0x660 = 1.0f;
dComIfGp_getVibration().StartQuake(1, 31, cXyz(0.0f, 1.0f, 0.0f));
@@ -174,7 +174,7 @@ void daB_ZANTZ_c::setAppearMode(u8 param_0) {
if (mAppearMode == 1) {
if (abs((s16)(fopAcM_searchPlayerAngleY(this) - shape_angle.y)) > 0x1800) {
mAppearMode = 4;
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x42), J3DFrameCtrl::LOOP_REPEAT_e, 0.0f, 1.0f, 0.0f, -1.0f);
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x42), J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f, 0.0f, -1.0f);
field_0x660 = 1.0f;
dComIfGp_getVibration().StartQuake(1, 31, cXyz(0.0f, 1.0f, 0.0f));
}
@@ -183,7 +183,7 @@ void daB_ZANTZ_c::setAppearMode(u8 param_0) {
if (mAppearMode == 1) {
mAppearMode = 5;
mSearchContinue = true;
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x42), J3DFrameCtrl::LOOP_REPEAT_e, 0.0f, 1.0f, 0.0f, -1.0f);
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x42), J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f, 0.0f, -1.0f);
field_0x660 = 1.0f;
dComIfGp_getVibration().StartQuake(1, 31, cXyz(0.0f, 1.0f, 0.0f));
}
@@ -262,7 +262,7 @@ void daB_ZANTZ_c::action() {
if (!var_f31) {
dComIfGp_getVibration().StopQuake(0x1F);
mAppearMode++;
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x44), J3DFrameCtrl::LOOP_REPEAT_e, 0.0f, 0.0f, 0.0f, -1.0f);
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x44), J3DFrameCtrl::EMode_LOOP, 0.0f, 0.0f, 0.0f, -1.0f);
}
break;
}
@@ -285,7 +285,7 @@ void daB_ZANTZ_c::action() {
if (!var_f31) {
dComIfGp_getVibration().StopQuake(0x1F);
mAppearMode++;
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x44), J3DFrameCtrl::LOOP_REPEAT_e, 0.0f, 0.0f, 0.0f, -1.0f);
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x44), J3DFrameCtrl::EMode_LOOP, 0.0f, 0.0f, 0.0f, -1.0f);
}
break;
}
@@ -317,7 +317,7 @@ void daB_ZANTZ_c::action() {
if (!field_0x660) {
dComIfGp_getVibration().StopQuake(0x1F);
mAppearMode = 1;
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x44), J3DFrameCtrl::LOOP_REPEAT_e, 0.0f, 0.0f, 0.0f, -1.0f);
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x44), J3DFrameCtrl::EMode_LOOP, 0.0f, 0.0f, 0.0f, -1.0f);
}
} else {
cLib_chaseF(&field_0x660, 1.0f, 0.2f);
@@ -433,7 +433,7 @@ int daB_ZANTZ_c::CreateHeap() {
return 0;
}
if (!mpBrk->init(mpMorf->getModel()->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("B_zan", 0x50), TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) {
if (!mpBrk->init(mpMorf->getModel()->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("B_zan", 0x50), TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
return 0;
}
src/d/actor/d_a_b_zant_sima.cpp
+2 -2
View File
@@ -164,7 +164,7 @@ int daB_ZANTS_c::CreateHeap() {
}
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("MAGNESIMA", 13);
if (!mpBtkAnm->init(mpModel->getModelData(), pbtk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0,
if (!mpBtkAnm->init(mpModel->getModelData(), pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0,
-1))
{
return FALSE;
@@ -176,7 +176,7 @@ int daB_ZANTS_c::CreateHeap() {
}
J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("MAGNESIMA", 10);
if (!mpBrkAnm->init(mpModel->getModelData(), pbrk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0,
if (!mpBrkAnm->init(mpModel->getModelData(), pbrk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0,
-1))
{
return FALSE;
src/d/actor/d_a_door_mbossL1.cpp
+1 -1
View File
@@ -969,7 +969,7 @@ int daMBdoorL1_c::openInit() {
}
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm());
JUT_ASSERT(1550, anm != 0);
int rt = mBckAnms[0]->init(anm, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, true);
int rt = mBckAnms[0]->init(anm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true);
JUT_ASSERT(1552, rt == 0);
int level = getNowLevel(this);
u8 swBit3 = door_param2_c::getSwbit3(this);

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