mirror of https://github.com/zeldaret/tp.git
d_a_npc_taro Matching (#2634)
* d_a_npc_maro Matching * mark npc_taro as equiv for JPN
This commit is contained in:
YunataSavior
GitHub
parent
52aa5f677f
commit
3d5108e4df
|
|
@ -68,11 +68,11 @@ talk_withMaro__12daNpc_Taro_cFPv = .text:0x00009678; // type:function size:0x3D0
|
|||
practice__12daNpc_Taro_cFPv = .text:0x00009A48; // type:function size:0x438 scope:global
|
||||
nurse__12daNpc_Taro_cFPv = .text:0x00009E80; // type:function size:0x1AC scope:global
|
||||
talk__12daNpc_Taro_cFPv = .text:0x0000A02C; // type:function size:0x3A4 scope:global
|
||||
daNpc_Taro_Create__FPv = .text:0x0000A3D0; // type:function size:0x20 scope:global
|
||||
daNpc_Taro_Delete__FPv = .text:0x0000A3F0; // type:function size:0x20 scope:global
|
||||
daNpc_Taro_Execute__FPv = .text:0x0000A410; // type:function size:0x20 scope:global
|
||||
daNpc_Taro_Draw__FPv = .text:0x0000A430; // type:function size:0x20 scope:global
|
||||
daNpc_Taro_IsDelete__FPv = .text:0x0000A450; // type:function size:0x8 scope:global
|
||||
daNpc_Taro_Create__FPv = .text:0x0000A3D0; // type:function size:0x20 scope:local
|
||||
daNpc_Taro_Delete__FPv = .text:0x0000A3F0; // type:function size:0x20 scope:local
|
||||
daNpc_Taro_Execute__FPv = .text:0x0000A410; // type:function size:0x20 scope:local
|
||||
daNpc_Taro_Draw__FPv = .text:0x0000A430; // type:function size:0x20 scope:local
|
||||
daNpc_Taro_IsDelete__FPv = .text:0x0000A450; // type:function size:0x8 scope:local
|
||||
calc__11J3DTexNoAnmCFPUs = .text:0x0000A458; // type:function size:0x30 scope:global
|
||||
__dt__10cCcD_GSttsFv = .text:0x0000A488; // type:function size:0x48 scope:global
|
||||
__dt__8daNpcT_cFv = .text:0x0000A4D0; // type:function size:0x388 scope:global
|
||||
|
|
@ -193,24 +193,24 @@ jointNo$5646 = .rodata:0x0000014C; // type:object size:0x8 scope:local
|
|||
@9434 = .rodata:0x00000230; // type:object size:0x10 scope:local
|
||||
@stringBase0 = .rodata:0x00000240; // type:object size:0x2C0 scope:local data:string_table
|
||||
...data.0 = .data:0x00000000; // type:label scope:local
|
||||
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
|
||||
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local
|
||||
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
|
||||
lbl_87_data_10 = .data:0x00000010; // type:object size:0x10
|
||||
@3931 = .data:0x00000020; // type:object size:0xC scope:local
|
||||
l_bmdData = .data:0x0000002C; // type:object size:0x28 scope:global data:4byte
|
||||
l_bmdData = .data:0x0000002C; // type:object size:0x28 scope:local data:4byte
|
||||
l_evtList = .data:0x00000054; // type:object size:0xD8 scope:global
|
||||
l_resNameList = .data:0x0000012C; // type:object size:0x2C scope:global
|
||||
l_loadResPtrn0 = .data:0x00000158; // type:object size:0x5 scope:global
|
||||
l_loadResPtrn1 = .data:0x00000160; // type:object size:0x4 scope:global
|
||||
l_loadResPtrn2 = .data:0x00000164; // type:object size:0x6 scope:global
|
||||
l_loadResPtrn3 = .data:0x0000016C; // type:object size:0x5 scope:global
|
||||
l_loadResPtrn4 = .data:0x00000174; // type:object size:0x4 scope:global
|
||||
l_loadResPtrn5 = .data:0x00000178; // type:object size:0x5 scope:global
|
||||
l_loadResPtrn6 = .data:0x00000180; // type:object size:0x6 scope:global
|
||||
l_loadResPtrn9 = .data:0x00000188; // type:object size:0x9 scope:global
|
||||
l_loadResPtrnList = .data:0x00000194; // type:object size:0x44 scope:global
|
||||
l_faceMotionAnmData = .data:0x000001D8; // type:object size:0x348 scope:global
|
||||
l_motionAnmData = .data:0x00000520; // type:object size:0x498 scope:global data:4byte
|
||||
l_resNameList = .data:0x0000012C; // type:object size:0x2C scope:local
|
||||
l_loadResPtrn0 = .data:0x00000158; // type:object size:0x5 scope:local
|
||||
l_loadResPtrn1 = .data:0x00000160; // type:object size:0x4 scope:local
|
||||
l_loadResPtrn2 = .data:0x00000164; // type:object size:0x6 scope:local
|
||||
l_loadResPtrn3 = .data:0x0000016C; // type:object size:0x5 scope:local
|
||||
l_loadResPtrn4 = .data:0x00000174; // type:object size:0x4 scope:local
|
||||
l_loadResPtrn5 = .data:0x00000178; // type:object size:0x5 scope:local
|
||||
l_loadResPtrn6 = .data:0x00000180; // type:object size:0x6 scope:local
|
||||
l_loadResPtrn9 = .data:0x00000188; // type:object size:0x9 scope:local
|
||||
l_loadResPtrnList = .data:0x00000194; // type:object size:0x44 scope:local
|
||||
l_faceMotionAnmData = .data:0x000001D8; // type:object size:0x348 scope:local
|
||||
l_motionAnmData = .data:0x00000520; // type:object size:0x498 scope:local data:4byte
|
||||
l_faceMotionSequenceData = .data:0x000009B8; // type:object size:0x200 scope:global
|
||||
l_motionSequenceData = .data:0x00000BB8; // type:object size:0x2A0 scope:global
|
||||
mCutNameList__12daNpc_Taro_c = .data:0x00000E58; // type:object size:0x44 scope:global
|
||||
|
|
@ -262,7 +262,7 @@ mCutList__12daNpc_Taro_c = .data:0x00000F5C; // type:object size:0xCC scope:glob
|
|||
@8839 = .data:0x00001728; // type:object size:0x38 scope:local
|
||||
@8838 = .data:0x00001760; // type:object size:0x3C scope:local
|
||||
@8837 = .data:0x0000179C; // type:object size:0x38 scope:local
|
||||
daNpc_Taro_MethodTable = .data:0x000017D4; // type:object size:0x20 scope:global
|
||||
daNpc_Taro_MethodTable = .data:0x000017D4; // type:object size:0x20 scope:local
|
||||
g_profile_NPC_TARO = .data:0x000017F4; // type:object size:0x30 scope:global
|
||||
__vt__11J3DTexNoAnm = .data:0x00001824; // type:object size:0xC scope:global
|
||||
__vt__12J3DFrameCtrl = .data:0x00001830; // type:object size:0xC scope:global
|
||||
|
|
@ -296,7 +296,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
|
|||
@1010 = .bss:0x00000040; // type:object size:0x1 scope:local
|
||||
@1009 = .bss:0x00000044; // type:object size:0x1 scope:local
|
||||
@4231 = .bss:0x00000048; // type:object size:0xC scope:local
|
||||
l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte
|
||||
l_HIO = .bss:0x00000054; // type:object size:0x4 scope:local data:4byte
|
||||
@5431 = .bss:0x00000058; // type:object size:0xC scope:local
|
||||
prtclScl$5430 = .bss:0x00000068; // type:object size:0xC scope:local
|
||||
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global
|
||||
|
|
|
|||
|
|
@ -1600,7 +1600,7 @@ config.libs = [
|
|||
ActorRel(NonMatching, "d_a_npc_kkri"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_kolin"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_maro"),
|
||||
ActorRel(NonMatching, "d_a_npc_taro"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_taro"),
|
||||
ActorRel(NonMatching, "d_a_npc_tkj"),
|
||||
ActorRel(NonMatching, "d_a_obj_bhashi"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_bkdoor"),
|
||||
|
|
|
|||
|
|
@ -21,21 +21,16 @@
|
|||
#include "f_op/f_op_camera_mng.h"
|
||||
#include "types.h"
|
||||
|
||||
daNpc_Maro_c::actionFunc dummy_lit_3931() {
|
||||
return &daNpc_Maro_c::choccai;
|
||||
}
|
||||
|
||||
enum TaroEvent {
|
||||
/* 0x8 */ EVENT_8 = 0x8,
|
||||
/* 0x17 */ EVENT_17 = 0x17,
|
||||
/* 0x18 */ EVENT_18 = 0x18,
|
||||
};
|
||||
|
||||
/* 805735AC-805735B0 000054 0004+00 1/1 0/0 0/0 .bss l_HIO */
|
||||
static daNpc_Taro_HIO_c l_HIO;
|
||||
|
||||
// /* 80571BE8-80571BF4 -00001 000C+00 0/0 0/0 0/0 .data @3931 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
static daNpc_Maro_c::actionFunc lit_3931 = &daNpc_Maro_c::choccai;
|
||||
#pragma pop
|
||||
|
||||
/* 80571BF4-80571C1C 00002C 0028+00 1/1 0/0 0/0 .data l_bmdData */
|
||||
static int l_bmdData[5][2] = {
|
||||
4, 1, 31, 4, 32, 4, 10, 2, 4, 9,
|
||||
|
|
@ -123,60 +118,37 @@ SECTION_DATA static s8* l_loadResPtrnList[17] = {
|
|||
};
|
||||
|
||||
/* 80571DA0-805720E8 0001D8 0348+00 0/1 0/0 0/0 .data l_faceMotionAnmData */
|
||||
static u8 l_faceMotionAnmData[840] = {
|
||||
0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07,
|
||||
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x07,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x02,
|
||||
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x2B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,
|
||||
0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x2D,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
|
||||
0x00, 0x00, 0x00, 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x2F,
|
||||
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07,
|
||||
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x02,
|
||||
0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x02,
|
||||
0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04,
|
||||
0x00, 0x00, 0x00, 0x2E, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x07,
|
||||
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x06,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
|
||||
0x00, 0x00, 0x00, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x20,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
|
||||
0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x1C,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x02,
|
||||
0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x07,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02,
|
||||
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1C,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C,
|
||||
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x02,
|
||||
0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08,
|
||||
0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1B,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07,
|
||||
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x02,
|
||||
0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
|
||||
static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[30] = {
|
||||
{-1, 0, 0, 7, 2, 1, 1},
|
||||
{7, 0, 3, 7, 2, 1, 1},
|
||||
{11, 0, 4, 43, 0, 4, 0},
|
||||
{5, 0, 6, 14, 0, 6, 0},
|
||||
{13, 0, 4, 45, 0, 4, 0},
|
||||
{9, 0, 4, 41, 0, 4, 0},
|
||||
{4, 0, 6, 13, 0, 6, 0},
|
||||
{12, 0, 4, 44, 0, 4, 0},
|
||||
{15, 2, 4, 47, 2, 4, 0},
|
||||
{7, 2, 6, 15, 2, 6, 0},
|
||||
{16, 2, 4, 48, 2, 4, 0},
|
||||
{14, 2, 4, 46, 2, 4, 0},
|
||||
{6, 2, 6, 7, 2, 1, 1},
|
||||
{6, 0, 3, 15, 0, 3, 0},
|
||||
{10, 0, 4, 42, 0, 4, 0},
|
||||
{7, 0, 5, 27, 0, 5, 0},
|
||||
{12, 0, 5, 32, 0, 5, 0},
|
||||
{11, 0, 5, 31, 0, 5, 0},
|
||||
{9, 0, 5, 29, 0, 5, 0},
|
||||
{10, 0, 5, 30, 0, 5, 0},
|
||||
{8, 0, 5, 28, 0, 5, 0},
|
||||
{4, 0, 7, 10, 0, 7, 0},
|
||||
{5, 2, 7, 11, 2, 7, 0},
|
||||
{7, 2, 2, 16, 2, 2, 0},
|
||||
{10, 0, 8, 28, 0, 8, 0},
|
||||
{12, 2, 8, 30, 2, 8, 0},
|
||||
{8, 0, 8, 26, 0, 8, 0},
|
||||
{11, 2, 8, 29, 2, 8, 0},
|
||||
{9, 0, 8, 27, 0, 8, 0},
|
||||
{7, 2, 8, 25, 2, 8, 0},
|
||||
};
|
||||
|
||||
/* 805720E8-80572580 000520 0498+00 1/2 0/0 0/0 .data l_motionAnmData */
|
||||
|
|
@ -198,85 +170,48 @@ static daNpcT_motionAnmData_c l_motionAnmData[42] = {
|
|||
};
|
||||
|
||||
/* 80572580-80572780 0009B8 0200+00 0/1 0/0 0/0 .data l_faceMotionSequenceData */
|
||||
static u8 l_faceMotionSequenceData[512] = {
|
||||
0x00, 0x01, 0xFF, 0x01, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x02, 0xFF, 0x01, 0x00, 0x08, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x03, 0xFF, 0x01, 0x00, 0x09, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x04, 0xFF, 0x01, 0x00, 0x0A, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x05, 0xFF, 0x01, 0x00, 0x0B, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x06, 0xFF, 0x01, 0x00, 0x0C, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x0F, 0xFF, 0x01, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x10, 0xFF, 0x01, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x12, 0xFF, 0x01, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x0E, 0xFF, 0x01, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x13, 0xFF, 0x01, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x14, 0xFF, 0x01, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x15, 0xFF, 0x01, 0x00, 0x16, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x18, 0xFF, 0x01, 0x00, 0x19, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x1A, 0xFF, 0x01, 0x00, 0x1B, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x03, 0xFF, 0x01, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x07, 0xFF, 0x01, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x0D, 0xFF, 0x01, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x08, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x09, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x0A, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x0B, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x0C, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x11, 0xFF, 0x01, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x16, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x17, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x19, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x1B, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x1C, 0xFF, 0x01, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x18, 0xFF, 0x01, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x1D, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[128] = {
|
||||
{1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {8, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{3, -1, 1}, {9, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {10, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{5, -1, 1}, {11, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 1}, {12, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{15, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {16, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{18, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {14, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{19, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {20, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{21, -1, 1}, {22, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {24, -1, 1}, {25, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{26, -1, 1}, {27, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{7, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {13, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{8, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {9, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{10, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {11, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{12, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {17, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{22, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {23, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{25, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {27, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{28, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {24, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{29, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
};
|
||||
|
||||
/* 80572780-80572A20 000BB8 02A0+00 0/1 0/0 0/0 .data l_motionSequenceData */
|
||||
static u8 l_motionSequenceData[672] = {
|
||||
0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x15, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x16, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x01, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x11, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x18, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x19, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x1A, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x02, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x06, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x1B, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x03, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x1C, 0xFF, 0x01, 0x00, 0x1D, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x0B, 0xFF, 0x01, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x0C, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x0D, 0xFF, 0x01, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x1D, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x1E, 0x0A, 0x01, 0x00, 0x02, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x20, 0xFF, 0x01, 0x00, 0x1F, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x1F, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x05, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x23, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x24, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x25, 0xFF, 0x01, 0x00, 0x24, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x26, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x12, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x27, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x0E, 0xFF, 0x01, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x0F, 0xFF, 0x01, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x13, 0xFF, 0x01, 0x00, 0x12, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x14, 0xFF, 0x01, 0x00, 0x12, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x10, 0xFF, 0x01, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x17, 0xFF, 0x01, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x21, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x22, 0x04, 0x01, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x08, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x0A, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x09, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x28, 0xFF, 0x01, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x28, 0xFF, 0x01, 0x00, 0x29, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
|
||||
static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[168] = {
|
||||
{0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {21, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{22, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{17, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {24, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{25, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {26, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{2, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, 0, 1}, {2, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{27, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{28, -1, 1}, {29, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {11, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{12, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {13, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{29, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {30, 10, 1}, {2, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{32, -1, 1}, {31, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {31, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{5, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {35, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{36, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {37, -1, 1}, {36, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{38, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {18, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{39, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {14, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{15, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {19, -1, 1}, {18, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{20, -1, 1}, {18, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {16, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{23, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {33, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{34, 4, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {8, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{10, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {9, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
{40, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {40, -1, 1}, {41, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
|
||||
};
|
||||
|
||||
/* 80572A20-80572A64 -00001 0044+00 1/1 0/0 0/0 .data mCutNameList__12daNpc_Taro_c */
|
||||
|
|
@ -302,6 +237,7 @@ char* daNpc_Taro_c::mCutNameList[17] = {
|
|||
|
||||
/* 80572B24-80572BF0 000F5C 00CC+00 1/2 0/0 0/0 .data mCutList__12daNpc_Taro_c */
|
||||
daNpc_Taro_c::cutFunc daNpc_Taro_c::mCutList[17] = {
|
||||
NULL,
|
||||
&daNpc_Taro_c::cutConversationAboutPachinko,
|
||||
&daNpc_Taro_c::cutConversationAboutWoodSwd,
|
||||
&daNpc_Taro_c::cutSwdTutorial,
|
||||
|
|
@ -320,6 +256,9 @@ daNpc_Taro_c::cutFunc daNpc_Taro_c::mCutList[17] = {
|
|||
&daNpc_Taro_c::cutTagPush4,
|
||||
};
|
||||
|
||||
/* 805735AC-805735B0 000054 0004+00 1/1 0/0 0/0 .bss l_HIO */
|
||||
static daNpc_Taro_Param_c l_HIO;
|
||||
|
||||
/* 80565E8C-8056604C 0000EC 01C0+00 1/0 0/0 0/0 .text __dt__12daNpc_Taro_cFv */
|
||||
daNpc_Taro_c::~daNpc_Taro_c() {
|
||||
OS_REPORT("|%06d:%x|daNpc_Taro_c -> デストラクト\n", g_Counter.mCounter0, this);
|
||||
|
|
@ -346,11 +285,10 @@ daNpc_Taro_HIOParam const daNpc_Taro_Param_c::m = {
|
|||
|
||||
/* 8056604C-80566340 0002AC 02F4+00 1/1 0/0 0/0 .text create__12daNpc_Taro_cFv */
|
||||
int daNpc_Taro_c::create() {
|
||||
fopAcM_SetupActor2(this, daNpc_Taro_c, (daNpcT_faceMotionAnmData_c const*)l_faceMotionAnmData,
|
||||
(const daNpcT_motionAnmData_c*)l_motionAnmData,
|
||||
(const daNpcT_MotionSeqMngr_c::sequenceStepData_c*)l_faceMotionSequenceData,
|
||||
4, (const daNpcT_MotionSeqMngr_c::sequenceStepData_c*)l_motionSequenceData,
|
||||
4, (const daNpcT_evtData_c*)l_evtList, (char**)l_resNameList);
|
||||
fopAcM_SetupActor2(this, daNpc_Taro_c, l_faceMotionAnmData,
|
||||
l_motionAnmData, l_faceMotionSequenceData,
|
||||
4, l_motionSequenceData,
|
||||
4, l_evtList, l_resNameList);
|
||||
|
||||
mType = getType();
|
||||
mFlowNodeNo = getFlowNodeNo();
|
||||
|
|
@ -385,11 +323,12 @@ int daNpc_Taro_c::create() {
|
|||
fopAcM_setCullSizeBox(this, -200.0f, -100.0f, -200.0f, 200.0f, 300.0f, 200.0f);
|
||||
mSound.init(¤t.pos, &eyePos, 3, 1);
|
||||
field_0x9c0.init(&mAcch, 0.0f, 0.0f);
|
||||
|
||||
#ifdef DEBUG
|
||||
field_0xe40 = &l_HIO;
|
||||
field_0xe40->entryHIO("タロ");
|
||||
#endif
|
||||
|
||||
#ifdef DEBUG
|
||||
// I'm unsure exactly how we're supposed to set + use the param ptr in the debug build...
|
||||
// field_0xe40 = &l_HIO;
|
||||
// field_0xe40->entryHIO("タロ");
|
||||
#endif
|
||||
|
||||
reset();
|
||||
mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1,
|
||||
|
|
@ -1093,7 +1032,6 @@ void daNpc_Taro_c::setAttnPos() {
|
|||
mDoMtx_stack_c::YrotS(mCurAngle.y);
|
||||
mDoMtx_stack_c::multVec(&eyeOffset, &eyeOffset);
|
||||
attention_info.position = current.pos + eyeOffset;
|
||||
|
||||
if (!checkHide()) {
|
||||
setSwingVoice();
|
||||
}
|
||||
|
|
@ -3182,13 +3120,13 @@ int daNpc_Taro_c::wait(void* param_0) {
|
|||
switch (mType) {
|
||||
case TYPE_4:
|
||||
case TYPE_5:
|
||||
if (dComIfGs_isTmpBit(0xe40))
|
||||
if (dComIfGs_isTmpBit(0xE40))
|
||||
{
|
||||
mJntAnm.lookPlayer(0);
|
||||
}
|
||||
break;
|
||||
case TYPE_10:
|
||||
if (daNpcT_chkTmpBit(100)) {
|
||||
if (daNpcT_chkTmpBit(0x64)) {
|
||||
field_0x11a7 = 1;
|
||||
home.angle.y = 0x8000;
|
||||
}
|
||||
|
|
@ -3208,7 +3146,7 @@ int daNpc_Taro_c::wait(void* param_0) {
|
|||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
switch (mType) {
|
||||
case TYPE_4:
|
||||
case TYPE_5:
|
||||
|
|
@ -3216,6 +3154,8 @@ int daNpc_Taro_c::wait(void* param_0) {
|
|||
case TYPE_11:
|
||||
attention_info.flags = 0;
|
||||
break;
|
||||
case TYPE_13:
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
|
|
|||
Loading…
Reference in New Issue