falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

d_a_npc_moir almost equivalent (#2569) 

* initial work

* more work

* got to waittype0

* All functions worked on

* cleanup

* took out unneeded nonmatching comments

* PR Cleanup

* Use actor enum

---------

Co-authored-by: hatal175 <hatal175@users.noreply.github.com>
This commit is contained in:
Carco_21 2025-08-09 13:48:35 -04:00 committed by GitHub
parent 0759e31e84
commit cc9325cea2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 2168 additions and 2663 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.py
View File

@ -1815,7 +1815,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_npc_midp"),
ActorRel(MatchingFor("GZ2E01"), "d_a_npc_mk"),
ActorRel(NonMatching, "d_a_npc_moi"),
ActorRel(NonMatching, "d_a_npc_moir"),
ActorRel(NonMatching, "d_a_npc_moir", extra_cflags=[DANPCF_C_HACK]),
ActorRel(NonMatching, "d_a_npc_myna2"),
ActorRel(NonMatching, "d_a_npc_ne"),
ActorRel(MatchingFor("GZ2E01"), "d_a_npc_p2"),
@ -1836,7 +1836,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_npc_seira"),
ActorRel(NonMatching, "d_a_npc_seira2"),
ActorRel(NonMatching, "d_a_npc_seirei"),
ActorRel(NonMatching, "d_a_npc_shad", extra_cflags=[DANPCF_C_HACK]),
ActorRel(Equivalent, "d_a_npc_shad", extra_cflags=[DANPCF_C_HACK]),
ActorRel(NonMatching, "d_a_npc_shaman"),
ActorRel(NonMatching, "d_a_npc_shoe", extra_cflags=[DANPCF_C_HACK]),
ActorRel(MatchingFor("GZ2E01"), "d_a_npc_shop0"),

12
include/d/actor/d_a_ni.h
View File

@ -16,16 +16,6 @@
#define BCK_WALK_A 12
#define BCK_WALK_B 13
#define JNT_WAIST 0
#define JNT_LEGL 1
#define JNT_FOOTL 2
#define JNT_LEGR 3
#define JNT_FOOTR 4
#define JNT_NECK 5
#define JNT_HEAD 6
#define JNT_WINGL 7
#define JNT_WINGR 8
enum daNi_color {
COLOR_WHITE,
COLOR_BLACK,
@ -73,6 +63,8 @@ public:
mpMorf->getModel()->setBaseTRMtx(mtx);
}
void changeMode() { field_0x5fe = 1; }
/* 0x5AC */ request_of_phase_process_class mPhase;
/* 0x5B4 */ u8 field_0x5b4;
/* 0x5B5 */ u8 mType;

231
include/d/actor/d_a_npc_moir.h
View File

@ -11,63 +11,212 @@
* @details
*
*/
class daNpcMoiR_c : public fopAc_ac_c {
struct daNpcMoiR_HIOParam {
/* 0x00 */ daNpcF_HIOParam common;
/* 0x6C */ f32 demo_start_dist; // デモ開始距離 - Demo Start Distance
/* 0x70 */ s16 horizontal_eye_movement_range; // 目玉横可動範囲 - Horizontal Eye Movement Range
/* 0x72 */ u8 demo_start_area; // デモ開始エリア - Demo Start Area
};
class daNpcMoiR_Param_c {
public:
/* 80A7C16C */ daNpcMoiR_c();
/* 80A83240 */ virtual ~daNpcMoiR_Param_c() {}
static daNpcMoiR_HIOParam const m;
};
class daNpcMoiR_c : public daNpcF_c {
public:
typedef bool (daNpcMoiR_c::*ActionFn)(void*);
typedef BOOL (daNpcMoiR_c::*EventFn)(int);
enum Animation {
/* 0x00 */ ANM_NONE,
/* 0x01 */ ANM_F_TALK_A,
/* 0x02 */ ANM_F_HOLD_S,
/* 0x03 */ ANM_3,
/* 0x04 */ ANM_F_SURPRISED,
/* 0x05 */ ANM_F_HOLD_S_LOOP,
/* 0x06 */ ANM_F_TAKAJO_HI,
/* 0x07 */ ANM_FH_HOLD_S,
/* 0x08 */ ANM_FH_SERIOUS,
/* 0x09 */ ANM_FH_HOLD_S_2,
/* 0x0A */ ANM_FH_TAKAJO_HI,
/* 0x0B */ ANM_WAIT_A,
/* 0x0C */ ANM_WAIT_B,
/* 0x0D */ ANM_WAIT_C,
/* 0x0E */ ANM_TALK_A,
/* 0x0F */ ANM_STEP,
/* 0x10 */ ANM_LOOK_AROUND,
/* 0x11 */ ANM_FUE,
/* 0x12 */ ANM_TAKAJO_NI,
/* 0x13 */ ANM_TAKAJO_WAIT_NI,
/* 0x14 */ ANM_SURPRISED,
/* 0x15 */ ANM_SQUAREUP,
/* 0x16 */ ANM_SQUAREUP_STEP,
/* 0x17 */ ANM_DRIVEAWAY,
/* 0x18 */ ANM_TAKEOFF,
/* 0x19 */ ANM_TAKING_OFF,
/* 0x1A */ ANM_TAKING_OFF_TALK,
/* 0x1B */ ANM_TAKE_MET,
/* 0x1C */ ANM_SIT,
/* 0x1D */ ANM_SIT_TALK,
/* 0x1E */ ANM_TAKEOFF_SIT,
/* 0x1F */ ANM_TAKING_OFF_SIT,
/* 0x20 */ ANM_TAKING_OFF_SIT_TALK,
/* 0x21 */ ANM_TAKE_MET_SIT,
/* 0x22 */ ANM_TAKAJO,
/* 0x23 */ ANM_TAKAJO_WAIT,
/* 0x24 */ ANM_TAKAJO_HI,
/* 0x25 */ ANM_TAKAJO_HI_WAIT,
/* 0x26 */ ANM_RUN,
};
enum Expression {
/* 0x00 */ EXPR_F_TALK_A,
/* 0x03 */ EXPR_F_HOLD_S_LOOP = 0x3,
/* 0x0A */ EXPR_ANM_3 = 0xA,
/* 0x0B */ EXPR_FH_SERIOUS,
/* 0x0C */ EXPR_F_TAKAJO_HI,
/* 0x0D */ EXPR_FH_TAKAJO_HI,
/* 0x0E */ EXPR_FH_HOLD_S,
/* 0x0F */ EXPR_F_SURPRISED,
/* 0x10 */ EXPR_F_HOLD_S,
/* 0x11 */ EXPR_FH_HOLD_S_LOOP,
/* 0x12 */ EXPR_NONE,
};
enum Expression_BTP {
/* 0x0 */ EXPR_BTP_MOIR,
/* 0x1 */ EXPR_BTP_FH_SERIOUS
};
enum Motion {
/* 0x00 */ MOT_WAIT_A,
/* 0x01 */ MOT_TALK_A,
/* 0x02 */ MOT_WAIT_B,
/* 0x07 */ MOT_WAIT_C = 0x7,
/* 0x14 */ MOT_LOOK_AROUND_LOOP = 0x14,
/* 0x15 */ MOT_TAKAJO_WAIT_NI,
/* 0x16 */ MOT_SIT,
/* 0x17 */ MOT_SIT_TALK,
/* 0x18 */ MOT_SQUAREUP,
/* 0x19 */ MOT_DRIVEAWAY,
/* 0x1A */ MOT_TAKEOFF,
/* 0x1B */ MOT_TAKING_OFF,
/* 0x1C */ MOT_TAKING_OFF_TALK,
/* 0x1D */ MOT_TAKE_MET,
/* 0x1E */ MOT_TAKEOFF_SIT,
/* 0x1F */ MOT_TAKING_OFF_SIT,
/* 0x20 */ MOT_TAKING_OFF_SIT_TALK,
/* 0x21 */ MOT_TAKE_MET_SIT,
/* 0x22 */ MOT_RUN,
/* 0x23 */ MOT_TAKAJO_HI_WAIT,
/* 0x24 */ MOT_TAKAJO_HI,
/* 0x25 */ MOT_SURPRISED,
/* 0x26 */ MOT_SQUAREUP_STEP,
/* 0x27 */ MOT_TAKAJO_NI,
/* 0x28 */ MOT_FUE,
/* 0x29 */ MOT_LOOK_AROUND,
/* 0x2A */ MOT_STEP,
};
enum Mode {
/* 0x0 */ MODE_SIT,
/* 0x1 */ MODE_STAND,
/* 0x2 */ MODE_2,
};
/* 80A7C16C */ daNpcMoiR_c() {}
/* 80A7C380 */ ~daNpcMoiR_c();
/* 80A7C580 */ void Create();
/* 80A7C978 */ void CreateHeap();
/* 80A7CE48 */ void Delete();
/* 80A7CE7C */ void Execute();
/* 80A7CEA0 */ void Draw();
/* 80A7CEFC */ void ctrlJoint(J3DJoint*, J3DModel*);
/* 80A7D0CC */ void createHeapCallBack(fopAc_ac_c*);
/* 80A7D0EC */ void ctrlJointCallBack(J3DJoint*, int);
/* 80A7D138 */ void setExpressionAnm(int, bool);
/* 80A7D394 */ void setExpressionBtp(int);
/* 80A7D474 */ bool setMotionAnm(int, f32);
/* 80A7C580 */ cPhs__Step Create();
/* 80A7C978 */ int CreateHeap();
/* 80A7CE48 */ int Delete();
/* 80A7CE7C */ int Execute();
/* 80A7CEA0 */ int Draw();
/* 80A7CEFC */ int ctrlJoint(J3DJoint*, J3DModel*);
/* 80A7D0CC */ static int createHeapCallBack(fopAc_ac_c*);
/* 80A7D0EC */ static int ctrlJointCallBack(J3DJoint*, int);
/* 80A7D138 */ bool setExpressionAnm(int, bool);
/* 80A7D394 */ bool setExpressionBtp(int);
/* 80A7D474 */ void setMotionAnm(int, f32);
/* 80A7D5C4 */ void reset();
/* 80A7D73C */ void setWaitAction();
/* 80A7D934 */ void wait_type0(void*);
/* 80A7D73C */ inline void setWaitAction();
/* 80A7D934 */ bool wait_type0(void*);
/* 80A7DD94 */ void setMotion(int, f32, int);
/* 80A7DDD8 */ void setExpression(int, f32);
/* 80A7DE04 */ void wait_type1(void*);
/* 80A7E668 */ void wait_type2(void*);
/* 80A7E8C0 */ void talk(void*);
/* 80A7EFBC */ void multiTalk(void*);
/* 80A7F40C */ void fight(void*);
/* 80A7F9AC */ void demo(void*);
/* 80A7FEE8 */ void leave(void*);
/* 80A802C4 */ void EvCut_Introduction(int);
/* 80A803A0 */ void EvCut_Appear(int);
/* 80A8081C */ void EvCut_Appear2(int);
/* 80A7DE04 */ bool wait_type1(void*);
/* 80A7E668 */ bool wait_type2(void*);
/* 80A7E8C0 */ bool talk(void*);
/* 80A7EFBC */ BOOL multiTalk(void*);
/* 80A7F40C */ bool fight(void*);
/* 80A7F9AC */ bool demo(void*);
/* 80A7FEE8 */ bool leave(void*);
/* 80A802C4 */ BOOL EvCut_Introduction(int);
/* 80A803A0 */ BOOL EvCut_Appear(int);
/* 80A8081C */ BOOL EvCut_Appear2(int);
/* 80A810FC */ void setParam();
/* 80A81274 */ void main();
/* 80A81274 */ BOOL main();
/* 80A815D4 */ void checkHeadGear();
/* 80A818B4 */ void playMotion();
/* 80A8210C */ void ctrlBtk();
/* 80A821E0 */ void setAttnPos();
/* 80A825A0 */ void lookat();
/* 80A8210C */ inline BOOL ctrlBtk();
/* 80A821E0 */ inline void setAttnPos();
/* 80A825A0 */ inline void lookat();
/* 80A82878 */ void drawOtherMdls();
/* 80A82900 */ bool drawDbgInfo();
/* 80A82900 */ BOOL drawDbgInfo();
MtxP getHandRMtx() { return mpMorf->getModel()->getAnmMtx(17); }
static u8 mEvtSeqList[48];
u16 getMessageNo() { return fopAcM_GetParam(this) >> 8; }
inline void setAction(ActionFn action) {
field_0xe08 = 3;
if (mAction) {
(this->*mAction)(NULL);
}
field_0xe08 = 0;
mAction = action;
if (mAction) {
(this->*mAction)(NULL);
}
}
inline void playExpression();
inline BOOL step(s16, int);
inline void setExpressionTalkAfter();
inline BOOL chkFindPlayer();
inline bool chkAction(ActionFn action) {
return action == mAction;
}
inline void setLookMode(int i_lookMode);
inline void searchActors();
static EventFn mEvtSeqList[4];
private:
/* 0x568 */ mDoExt_McaMorfSO* mpMorf;
/* 0x56C */ u8 field_0x56c[0xe0c - 0x56c];
/* 0xB48 */ Z2Creature mSound;
/* 0xBD8 */ J3DModel* mpHeadgearModel;
/* 0xBDC */ daNpcF_MatAnm_c* mpMatAnm;
/* 0xBE0 */ daNpcF_Lookat_c mLookat;
/* 0xC7C */ daNpcF_ActorMngr_c mActorMngr[4];
/* 0xC9C */ u8 field_0xc9c[0xca0 - 0xc9c];
/* 0xCA0 */ dCcD_Cyl field_0xca0;
/* 0xDDC */ ActionFn mAction;
/* 0xDE8 */ request_of_phase_process_class mPhase[2];
/* 0xDF8 */ fpc_ProcID field_0xdf8;
/* 0xDFC */ int field_0xdfc;
/* 0xE00 */ int field_0xe00;
/* 0xE04 */ s16 mMsgNo;
/* 0xE06 */ s16 mLookMode;
/* 0xE08 */ u16 field_0xe08;
/* 0xE0A */ bool mWearHelmet;
/* 0xE0B */ u8 mMode;
};
STATIC_ASSERT(sizeof(daNpcMoiR_c) == 0xe0c);
class daNpcMoiR_Param_c {
public:
/* 80A83240 */ ~daNpcMoiR_Param_c();
static u8 const m[116];
};
#endif /* D_A_NPC_MOIR_H */

310
src/d/actor/d_a_ni.cpp
View File

@ -15,9 +15,23 @@
#include "m_Do/m_Do_graphic.h"
#include "d/d_com_inf_game.h"
#include "d/actor/d_a_ni.h"
#include "d/actor/d_a_npc_moir.h"
#include "d/actor/d_a_player.h"
#include "SSystem/SComponent/c_math.h"
#include "c/c_damagereaction.h"
#include "Z2AudioLib/Z2Instances.h"
enum Joint {
/* 0x0 */ JNT_WAIST,
/* 0x1 */ JNT_LEGL,
/* 0x2 */ JNT_FOOTL,
/* 0x3 */ JNT_LEGR,
/* 0x4 */ JNT_FOOTR,
/* 0x5 */ JNT_NECK,
/* 0x6 */ JNT_HEAD,
/* 0x7 */ JNT_WINGL,
/* 0x8 */ JNT_WINGR,
};
//
// Forward References:
@ -204,23 +218,7 @@ extern "C" void __register_global_object();
// Declarations:
//
/* 80951330-8095133C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 8095133C-80951350 00000C 0004+10 0/0 0/0 0/0 .data @1787 */
#pragma push
#pragma force_active on
SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = {
0x02000201,
/* padding */
0x40080000,
0x00000000,
0x3FE00000,
0x00000000,
};
#pragma pop
UNK_REL_DATA
/* 8094BC2C-8094BCA8 0000EC 007C+00 1/1 0/0 0/0 .text __ct__10daNi_HIO_cFv */
daNi_HIO_c::daNi_HIO_c() {
@ -405,101 +403,7 @@ static void damage_check(ni_class* i_this) {
}
}
/* ############################################################################################## */
/* 80951550-80951554 000008 0001+03 1/1 0/0 0/0 .bss @1109 */
static u8 lit_1109[1 + 3 /* padding */];
/* 80951554-80951558 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */
#pragma push
#pragma force_active on
static u8 lit_1107[1 + 3 /* padding */];
#pragma pop
/* 80951558-8095155C 000010 0001+03 0/0 0/0 0/0 .bss @1105 */
#pragma push
#pragma force_active on
static u8 lit_1105[1 + 3 /* padding */];
#pragma pop
/* 8095155C-80951560 000014 0001+03 0/0 0/0 0/0 .bss @1104 */
#pragma push
#pragma force_active on
static u8 lit_1104[1 + 3 /* padding */];
#pragma pop
/* 80951560-80951564 000018 0001+03 0/0 0/0 0/0 .bss @1099 */
#pragma push
#pragma force_active on
static u8 lit_1099[1 + 3 /* padding */];
#pragma pop
/* 80951564-80951568 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */
#pragma push
#pragma force_active on
static u8 lit_1097[1 + 3 /* padding */];
#pragma pop
/* 80951568-8095156C 000020 0001+03 0/0 0/0 0/0 .bss @1095 */
#pragma push
#pragma force_active on
static u8 lit_1095[1 + 3 /* padding */];
#pragma pop
/* 8095156C-80951570 000024 0001+03 0/0 0/0 0/0 .bss @1094 */
#pragma push
#pragma force_active on
static u8 lit_1094[1 + 3 /* padding */];
#pragma pop
/* 80951570-80951574 000028 0001+03 0/0 0/0 0/0 .bss @1057 */
#pragma push
#pragma force_active on
static u8 lit_1057[1 + 3 /* padding */];
#pragma pop
/* 80951574-80951578 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */
#pragma push
#pragma force_active on
static u8 lit_1055[1 + 3 /* padding */];
#pragma pop
/* 80951578-8095157C 000030 0001+03 0/0 0/0 0/0 .bss @1053 */
#pragma push
#pragma force_active on
static u8 lit_1053[1 + 3 /* padding */];
#pragma pop
/* 8095157C-80951580 000034 0001+03 0/0 0/0 0/0 .bss @1052 */
#pragma push
#pragma force_active on
static u8 lit_1052[1 + 3 /* padding */];
#pragma pop
/* 80951580-80951584 000038 0001+03 0/0 0/0 0/0 .bss @1014 */
#pragma push
#pragma force_active on
static u8 lit_1014[1 + 3 /* padding */];
#pragma pop
/* 80951584-80951588 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */
#pragma push
#pragma force_active on
static u8 lit_1012[1 + 3 /* padding */];
#pragma pop
/* 80951588-8095158C 000040 0001+03 0/0 0/0 0/0 .bss @1010 */
#pragma push
#pragma force_active on
static u8 lit_1010[1 + 3 /* padding */];
#pragma pop
/* 8095158C-80951590 -00001 0004+00 2/2 0/0 0/0 .bss None */
/* 8095158C 0001+00 data_8095158C @1009 */
/* 8095158D 0003+00 data_8095158D None */
#pragma push
#pragma force_active on
static u8 struct_8095158C;
#pragma pop
UNK_REL_BSS;
static u8 data_8095158d;
@ -1120,13 +1024,6 @@ static void ni_windspin(ni_class* i_this) {
i_this->speed.y = 0.0f;
}
class daNpcMoiR_c : public fopAc_ac_c {
public:
MtxP getHandRMtx() { return mpMorf->getModel()->getAnmMtx(0x11); }
/* 0x568 */ mDoExt_McaMorfSO* mpMorf;
};
/* 8094DED0-8094E2B0 002390 03E0+00 1/2 0/0 0/0 .text ni_demo0__FP8ni_class */
static int ni_demo0(ni_class* i_this) {
cXyz sp28;
@ -2289,7 +2186,7 @@ static int daNi_Create(fopAc_ac_c* i_this) {
a_this->mCcSph.OffTgSetBit();
}
i_this->attention_info.distances[fopAc_attn_SPEAK_e] = 7;
i_this->attention_info.distances[fopAc_attn_CARRY_e] = 7;
a_this->mCounter = cM_rndF(0x10000);
cXyz sp34(i_this->current.pos);
@ -2316,178 +2213,7 @@ static int daNi_Create(fopAc_ac_c* i_this) {
return phase_state;
}
/* 80951620-80951624 0000D8 0004+00 0/0 0/0 0/0 .bss
* sInstance__40JASGlobalInstance<19JASDefaultBankTable> */
#pragma push
#pragma force_active on
static u8 data_80951620[4];
#pragma pop
/* 80951624-80951628 0000DC 0004+00 0/0 0/0 0/0 .bss
* sInstance__35JASGlobalInstance<14JASAudioThread> */
#pragma push
#pragma force_active on
static u8 data_80951624[4];
#pragma pop
/* 80951628-8095162C 0000E0 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */
#pragma push
#pragma force_active on
static u8 data_80951628[4];
#pragma pop
/* 8095162C-80951630 0000E4 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */
#pragma push
#pragma force_active on
static u8 data_8095162C[4];
#pragma pop
/* 80951630-80951634 0000E8 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80951630[4];
#pragma pop
/* 80951634-80951638 0000EC 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80951634[4];
#pragma pop
/* 80951638-8095163C 0000F0 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys>
*/
#pragma push
#pragma force_active on
static u8 data_80951638[4];
#pragma pop
/* 8095163C-80951640 0000F4 0004+00 0/0 0/0 0/0 .bss
* sInstance__36JASGlobalInstance<15JAISoundStarter> */
#pragma push
#pragma force_active on
static u8 data_8095163C[4];
#pragma pop
/* 80951640-80951644 0000F8 0004+00 0/0 0/0 0/0 .bss
* sInstance__35JASGlobalInstance<14Z2SoundStarter> */
#pragma push
#pragma force_active on
static u8 data_80951640[4];
#pragma pop
/* 80951644-80951648 0000FC 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */
#pragma push
#pragma force_active on
static u8 data_80951644[4];
#pragma pop
/* 80951648-8095164C 000100 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */
#pragma push
#pragma force_active on
static u8 data_80951648[4];
#pragma pop
/* 8095164C-80951650 000104 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */
#pragma push
#pragma force_active on
static u8 data_8095164C[4];
#pragma pop
/* 80951650-80951654 000108 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12JAIStreamMgr> */
#pragma push
#pragma force_active on
static u8 data_80951650[4];
#pragma pop
/* 80951654-80951658 00010C 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80951654[4];
#pragma pop
/* 80951658-8095165C 000110 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12JAISoundInfo> */
#pragma push
#pragma force_active on
static u8 data_80951658[4];
#pragma pop
/* 8095165C-80951660 000114 0004+00 0/0 0/0 0/0 .bss
* sInstance__34JASGlobalInstance<13JAUSoundTable> */
#pragma push
#pragma force_active on
static u8 data_8095165C[4];
#pragma pop
/* 80951660-80951664 000118 0004+00 0/0 0/0 0/0 .bss
* sInstance__38JASGlobalInstance<17JAUSoundNameTable> */
#pragma push
#pragma force_active on
static u8 data_80951660[4];
#pragma pop
/* 80951664-80951668 00011C 0004+00 0/0 0/0 0/0 .bss
* sInstance__33JASGlobalInstance<12JAUSoundInfo> */
#pragma push
#pragma force_active on
static u8 data_80951664[4];
#pragma pop
/* 80951668-8095166C 000120 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo>
*/
#pragma push
#pragma force_active on
static u8 data_80951668[4];
#pragma pop
/* 8095166C-80951670 000124 0004+00 0/0 0/0 0/0 .bss
* sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */
#pragma push
#pragma force_active on
static u8 data_8095166C[4];
#pragma pop
/* 80951670-80951674 000128 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience>
*/
#pragma push
#pragma force_active on
static u8 data_80951670[4];
#pragma pop
/* 80951674-80951678 00012C 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80951674[4];
#pragma pop
/* 80951678-8095167C 000130 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr>
*/
#pragma push
#pragma force_active on
static u8 data_80951678[4];
#pragma pop
/* 8095167C-80951680 000134 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr>
*/
#pragma push
#pragma force_active on
static u8 data_8095167C[4];
#pragma pop
/* 80951680-80951684 000138 0004+00 0/0 0/0 0/0 .bss
* sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */
#pragma push
#pragma force_active on
static u8 data_80951680[4];
#pragma pop
/* 8095131C-8095131C 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
AUDIO_INSTANCES;
/* 80951480-809514A0 -00001 0020+00 1/0 0/0 0/0 .data l_daNi_Method */
SECTION_DATA static void* l_daNi_Method[8] = {

4274
src/d/actor/d_a_npc_moir.cpp
View File

File diff suppressed because it is too large Load Diff