mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-03 17:02:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Anm enum work (#2511)

Browse Source 
* Added enums for b_gg, b_gos, and b_mgn

* Added enum for d_a_b_tn (might have more work for it)

* b_yo and b_zant enum work

* more enum work

* fixed mgn match break
This commit is contained in:
Carco_21
2025-06-29 18:50:11 -04:00
committed by GitHub
parent aff8180fce
commit 844a554a3b
21 changed files with 1514 additions and 1594 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_b_tn.h
+2 -2
View File
@@ -135,12 +135,12 @@ public:
private:
/* 0x05AC */ request_of_phase_process_class mPhaseReq1;
/* 0x05B4 */ request_of_phase_process_class mPhaseReq2;
/* 0x05BC */ J3DModel* mpModels[16];
/* 0x05BC */ J3DModel* mpPartModels[16];
/* 0x05FC */ mDoExt_McaMorfSO* mpModelMorf1;
/* 0x0600 */ mDoExt_McaMorfSO* mpModelMorf2;
/* 0x0604 */ mDoExt_brkAnm* mpBrkAnms[16];
/* 0x0644 */ mDoExt_brkAnm* mpBrkAnm;
/* 0x0648 */ J3DModel* mpModel;
/* 0x0648 */ J3DModel* swordEffectModel;
/* 0x064C */ Z2CreatureEnemy mSound;
/* 0x06F0 */ int mActionMode1;
/* 0x06F4 */ int mActionMode2;
include/d/actor/d_a_b_zant.h
+86 -1
View File
@@ -142,7 +142,7 @@ public:
/* 0x05BC */ J3DModel* mpSwordRModel;
/* 0x05C0 */ J3DModel* mpMahojinModel;
/* 0x05C4 */ J3DModel* mpMahojinModel2;
/* 0x05C8 */ mDoExt_brkAnm* mpMahojinBrk;
/* 0x05C8 */ mDoExt_brkAnm* mpMahojinEndBrk;
/* 0x05CC */ mDoExt_btkAnm* mpMahojinBtk;
/* 0x05D0 */ mDoExt_btkAnm* mpMahojinStartBtk;
/* 0x05D4 */ mDoExt_brkAnm* mpMahojinBrk2;
@@ -240,6 +240,91 @@ public:
/* 0x38AC */ u32 field_0x38ac[2];
/* 0x38B4 */ u32 field_0x38b4;
/* 0x38B8 */ u8 mInitHIO;
enum B_ZAN_RES_FILE_ID {
/* BCK */
/* 0x07 */ BCK_ZAN_DAMAGEL_A = 7,
/* 0x08 */ BCK_ZAN_DAMAGER_A,
/* 0x09 */ BCK_ZAN_DIE_DEMO,
/* 0x0A */ BCK_ZAN_FAINT,
/* 0x0B */ BCK_ZAN_FALL,
/* 0x0C */ BCK_ZAN_FLOAT_APPEAR,
/* 0x0D */ BCK_ZAN_FLOAT_APPEARSHORT,
/* 0x0E */ BCK_ZAN_FLOAT_APPEARWAIT,
/* 0x0F */ BCK_ZAN_FLOAT_DAMAGEL,
/* 0x10 */ BCK_ZAN_FLOAT_DAMAGER,
/* 0x11 */ BCK_ZAN_FLOAT_REACTION,
/* 0x12 */ BCK_ZAN_FLOAT_WAIT,
/* 0x13 */ BCK_ZAN_FLOAT_WAITRETURN,
/* 0x14 */ BCK_ZAN_GROUND_REACTION,
/* 0x15 */ BCK_ZAN_HOOK_HIT,
/* 0x16 */ BCK_ZAN_HOOK_RELEASE,
/* 0x17 */ BCK_ZAN_HOOK_WAIT,
/* 0x18 */ BCK_ZAN_HUGE,
/* 0x19 */ BCK_ZAN_HUGE_LANDING,
/* 0x1A */ BCK_ZAN_JUMP_A,
/* 0x1B */ BCK_ZAN_JUMP_B,
/* 0x1C */ BCK_ZAN_LANDING,
/* 0x1D */ BCK_ZAN_LANDING_DAMAGE,
/* 0x1E */ BCK_ZAN_LANDING_WAIT,
/* 0x1F */ BCK_ZAN_LAST_DEMO,
/* 0x20 */ BCK_ZAN_LV1_FATIGUE,
/* 0x21 */ BCK_ZAN_LV1_JUMP_A,
/* 0x22 */ BCK_ZAN_LV1_JUMP_B,
/* 0x23 */ BCK_ZAN_MAGICSHOOTA_A,
/* 0x24 */ BCK_ZAN_MAGICSHOOTA_B,
/* 0x25 */ BCK_ZAN_MAGICSHOOTA_B_A,
/* 0x26 */ BCK_ZAN_MAGICSHOOTA_B_B,
/* 0x27 */ BCK_ZAN_MAGICSHOOTA_B_C,
/* 0x28 */ BCK_ZAN_MAGICSHOOTA_C,
/* 0x29 */ BCK_ZAN_MAGICSHOOTA_D,
/* 0x2A */ BCK_ZAN_OP_1,
/* 0x2B */ BCK_ZAN_OP_2,
/* 0x2C */ BCK_ZAN_OP_3,
/* 0x2D */ BCK_ZAN_OP_RISE,
/* 0x2E */ BCK_ZAN_SHIND_L,
/* 0x2F */ BCK_ZAN_SHIND_R,
/* 0x30 */ BCK_ZAN_SPIN,
/* 0x31 */ BCK_ZAN_SWAMP_FALL_A,
/* 0x32 */ BCK_ZAN_SWAMP_FALL_B,
/* 0x33 */ BCK_ZAN_SWAMP_FALL_LOOP,
/* 0x34 */ BCK_ZAN_SWAMP_LANDING,
/* 0x35 */ BCK_ZAN_SWIM,
/* 0x36 */ BCK_ZAN_SW_ATTACK,
/* 0x37 */ BCK_ZAN_SW_ATTACKB,
/* 0x38 */ BCK_ZAN_SW_DAMAGEL,
/* 0x39 */ BCK_ZAN_SW_DAMAGER,
/* 0x3A */ BCK_ZAN_SW_FATIGUE,
/* 0x3B */ BCK_ZAN_SW_WAIT,
/* 0x3C */ BCK_ZAN_SW_WALK,
/* 0x3D */ BCK_ZAN_TRAMPLEA,
/* 0x3E */ BCK_ZAN_TRAMPLEB,
/* 0x3F */ BCK_ZAN_TRAMPLEC,
/* 0x40 */ BCK_ZAN_TRAMPLED,
/* 0x41 */ BCK_ZAN_WAIT,
/* 0x42 */ BCK_ZZ_APPEARANCE,
/* 0x43 */ BCK_ZZ_CLOSE,
/* 0x44 */ BCK_ZZ_OPEN,
/* BMDR */
/* 0x47 */ BMDR_EF_TK2BALL = 0x47,
/* 0x48 */ BMDR_ZAN,
/* 0x49 */ BMDR_ZAN_MAHOJIN,
/* 0x4A */ BMDR_ZAN_SWORD_L,
/* 0x4B */ BMDR_ZAN_SWORD_R,
/* 0x4C */ BMDR_ZZ,
/* BRK */
/* 0x4F */ BRK_ZAN_MAHOJIN_END = 0x4F,
/* 0x50 */ BRK_ZZ,
/* BTK */
/* 0x53 */ BTK_ZAN_MAHOJIN = 0x53,
/* 0x54 */ BTK_ZAN_MAHOJIN_START,
/* DZB */
/* 0x57 */ DZB_ZZ = 0x57,
};
};
STATIC_ASSERT(sizeof(daB_ZANT_c) == 0x38BC);
include/d/actor/d_a_npc_jagar.h
+23
View File
@@ -67,6 +67,29 @@ class daNpc_Jagar_Param_c {
class daNpc_Jagar_c : public daNpcT_c {
public:
enum JAGAR2_RES_FILE_ID {
/* BCK */
/* 0x05 */ BCK_JAGA_F_SURPRISE = 5,
/* 0x06 */ BCK_JAGA_F_SURPRISE_WAIT,
/* 0x07 */ BCK_JAGA_F_WORRY_TALK,
/* 0x08 */ BCK_JAGA_RUN_A,
/* 0x09 */ BCK_JAGA_SURPRISE,
/* 0x0A */ BCK_JAGA_SURPRISE_WAIT,
/* 0x0B */ BCK_JAGA_UNADUKI,
/* 0x0C */ BCK_JAGA_WORRY_TALK,
/* 0x0D */ BCK_JAGA_WORRY_WAIT,
/* 0x0E */ BCK_JAGA_WORRY_WALK,
/* BTP */
/* 0x11 */ BTP_JAGA_BLINK = 0x11,
/* 0x12 */ BTP_JAGA_F_SURPRISE,
/* 0x13 */ BTP_JAGA_F_SURPRISE_WAIT,
/* 0x14 */ BTP_JAGA_F_WORRY_TALK,
/* EVT */
/* 0x17 */ EVT_EVENT_LIST = 0x17,
};
typedef int (daNpc_Jagar_c::*cutFunc)(int);
typedef int (daNpc_Jagar_c::*actionFunc)(void*);
include/d/actor/d_a_obj_msima.h
+15
View File
@@ -54,6 +54,21 @@ public:
/* 0x600 */ Z2SoundObjSimple mSound;
/* 0x620 */ ms_chain_s mChains[4];
/* 0x8A0 */ u8 field_0x8a0;
enum MAGNESIMA_RES_FILE_ID {
/* BMDR */
/* 0x06 */ BMDR_KUSARI = 6,
/* 0x07 */ BMDR_S_MAGNE_SIMA,
/* BRK */
/* 0x0A */ BRK_S_MAGNE_SIMA = 0xA,
/* BTK */
/* 0x0D */ BTK_S_MAGNE_SIMA = 0xD,
/* DZB */
/* 0x10 */ DZB_S_MAGNE_SIMA = 0x10,
};
};
STATIC_ASSERT(sizeof(obj_msima_class) == 0x8a4);