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

Compare commits

base: falso:85923ec415f8abea7583e2f7a53fb13d126bcd2c
Branches Tags
falso:main
falso:dol2asm
...
compare: falso:da06869248cded804c4724a24cb29eaddf068e0c
Branches Tags
falso:main
falso:dol2asm

3 Commits
85923ec415 ... da06869248

Author SHA1 Message Date
hatal175 da06869248
Merge ba63374b33 into 585670f2b1 2025-07-25 16:38:49 +00:00
hatal175 ba63374b33 d_a_obj_volcbom OK 2025-07-25 19:38:41 +03:00
Carco_21 585670f2b1
d_a_e_sw equivalent (#2554) 
* starting work

* Almost all functions worked on

* TU is equivalent

* Enums added

* padding cleanup

* PR cleanup
 2025-07-25 16:09:12 +03:00
19 changed files with 3669 additions and 2623 deletions
Show Stats Expand all files Collapse all files

34
config/GZ2E01/rels/d_a_obj_volcbom/symbols.txt
View File

@ -1,7 +1,7 @@
_prolog = .text:0x00000000; // type:function size:0x2C scope:global _prolog = .text:0x00000000; // type:function size:0x2C scope:global
_epilog = .text:0x0000002C; // type:function size:0x2C scope:global _epilog = .text:0x0000002C; // type:function size:0x2C scope:global
_unresolved = .text:0x00000058; // type:function size:0x20 scope:global _unresolved = .text:0x00000058; // type:function size:0x20 scope:global
eventCallBack__FPvi = .text:0x00000078; // type:function size:0x48 scope:global eventCallBack__FPvi = .text:0x00000078; // type:function size:0x48 scope:local
initBaseMtx__14daObjVolcBom_cFv = .text:0x000000C0; // type:function size:0x58 scope:global initBaseMtx__14daObjVolcBom_cFv = .text:0x000000C0; // type:function size:0x58 scope:global
setBaseMtx__14daObjVolcBom_cFv = .text:0x00000118; // type:function size:0x70 scope:global setBaseMtx__14daObjVolcBom_cFv = .text:0x00000118; // type:function size:0x70 scope:global
Create__14daObjVolcBom_cFv = .text:0x00000188; // type:function size:0x238 scope:global Create__14daObjVolcBom_cFv = .text:0x00000188; // type:function size:0x238 scope:global
@ -43,15 +43,15 @@ demoProc__14daObjVolcBom_cFv = .text:0x00001DC8; // type:function size:0x580 sco
calcObjPos__14daObjVolcBom_cFv = .text:0x00002348; // type:function size:0x80 scope:global calcObjPos__14daObjVolcBom_cFv = .text:0x00002348; // type:function size:0x80 scope:global
Draw__14daObjVolcBom_cFv = .text:0x000023C8; // type:function size:0x214 scope:global Draw__14daObjVolcBom_cFv = .text:0x000023C8; // type:function size:0x214 scope:global
Delete__14daObjVolcBom_cFv = .text:0x000025DC; // type:function size:0x78 scope:global Delete__14daObjVolcBom_cFv = .text:0x000025DC; // type:function size:0x78 scope:global
daObjVolcBom_create1st__FP14daObjVolcBom_c = .text:0x00002654; // type:function size:0x134 scope:global daObjVolcBom_create1st__FP14daObjVolcBom_c = .text:0x00002654; // type:function size:0x134 scope:local
__dt__8cM3dGCylFv = .text:0x00002788; // type:function size:0x48 scope:global __dt__8cM3dGCylFv = .text:0x00002788; // type:function size:0x48 scope:global
__dt__8cM3dGAabFv = .text:0x000027D0; // type:function size:0x48 scope:global __dt__8cM3dGAabFv = .text:0x000027D0; // type:function size:0x48 scope:global
__dt__10dCcD_GSttsFv = .text:0x00002818; // type:function size:0x5C scope:global __dt__10dCcD_GSttsFv = .text:0x00002818; // type:function size:0x5C scope:global
__dt__12dBgS_AcchCirFv = .text:0x00002874; // type:function size:0x70 scope:global __dt__12dBgS_AcchCirFv = .text:0x00002874; // type:function size:0x70 scope:global
__dt__12dBgS_ObjAcchFv = .text:0x000028E4; // type:function size:0x70 scope:global __dt__12dBgS_ObjAcchFv = .text:0x000028E4; // type:function size:0x70 scope:global
daObjVolcBom_MoveBGDelete__FP14daObjVolcBom_c = .text:0x00002954; // type:function size:0x20 scope:global daObjVolcBom_MoveBGDelete__FP14daObjVolcBom_c = .text:0x00002954; // type:function size:0x20 scope:local
daObjVolcBom_MoveBGExecute__FP14daObjVolcBom_c = .text:0x00002974; // type:function size:0x20 scope:global daObjVolcBom_MoveBGExecute__FP14daObjVolcBom_c = .text:0x00002974; // type:function size:0x20 scope:local
daObjVolcBom_MoveBGDraw__FP14daObjVolcBom_c = .text:0x00002994; // type:function size:0x2C scope:global daObjVolcBom_MoveBGDraw__FP14daObjVolcBom_c = .text:0x00002994; // type:function size:0x2C scope:local
__dt__10cCcD_GSttsFv = .text:0x000029C0; // type:function size:0x48 scope:global __dt__10cCcD_GSttsFv = .text:0x000029C0; // type:function size:0x48 scope:global
cLib_calcTimer<Uc>__FPUc = .text:0x00002A08; // type:function size:0x1C scope:global cLib_calcTimer<Uc>__FPUc = .text:0x00002A08; // type:function size:0x1C scope:global
@36@__dt__12dBgS_ObjAcchFv = .text:0x00002A24; // type:function size:0x8 scope:local @36@__dt__12dBgS_ObjAcchFv = .text:0x00002A24; // type:function size:0x8 scope:local
@ -59,10 +59,10 @@ cLib_calcTimer<Uc>__FPUc = .text:0x00002A08; // type:function size:0x1C scope:gl
_ctors = .ctors:0x00000000; // type:label scope:global _ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global
...rodata.0 = .rodata:0x00000000; // type:label scope:local ...rodata.0 = .rodata:0x00000000; // type:label scope:local
l_midna_offset = .rodata:0x00000000; // type:object size:0xC scope:global l_midna_offset = .rodata:0x00000000; // type:object size:0xC scope:local
l_disapp_eff = .rodata:0x0000000C; // type:object size:0x2 scope:global l_disapp_eff = .rodata:0x0000000C; // type:object size:0x2 scope:local
l_start_eff = .rodata:0x00000010; // type:object size:0x6 scope:global l_start_eff = .rodata:0x00000010; // type:object size:0x6 scope:local
l_bind_eff = .rodata:0x00000018; // type:object size:0x8 scope:global l_bind_eff = .rodata:0x00000018; // type:object size:0x8 scope:local
@3785 = .rodata:0x00000020; // type:object size:0x4 scope:local align:4 data:float @3785 = .rodata:0x00000020; // type:object size:0x4 scope:local align:4 data:float
@3786 = .rodata:0x00000024; // type:object size:0x4 scope:local @3786 = .rodata:0x00000024; // type:object size:0x4 scope:local
@3787 = .rodata:0x00000028; // type:object size:0x4 scope:local @3787 = .rodata:0x00000028; // type:object size:0x4 scope:local
@ -93,13 +93,13 @@ l_effect_id$4032 = .rodata:0x00000054; // type:object size:0xE scope:local
@4828 = .rodata:0x000000AC; // type:object size:0x4 scope:local @4828 = .rodata:0x000000AC; // type:object size:0x4 scope:local
@stringBase0 = .rodata:0x000000B0; // type:object size:0x48 scope:local data:string_table @stringBase0 = .rodata:0x000000B0; // type:object size:0x48 scope:local data:string_table
...data.0 = .data:0x00000000; // type:label scope:local ...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 @1787 = .data:0x0000000C; // type:object size:0x4 scope:local
lbl_676_data_10 = .data:0x00000010; // type:object size:0x10 lbl_676_data_10 = .data:0x00000010; // type:object size:0x10
l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte
l_portal_warp_name = .data:0x00000024; // type:object size:0x4 scope:global l_portal_warp_name = .data:0x00000024; // type:object size:0x4 scope:local
l_staff_name = .data:0x00000028; // type:object size:0x4 scope:global data:4byte l_staff_name = .data:0x00000028; // type:object size:0x4 scope:local data:4byte
l_cyl_src = .data:0x0000002C; // type:object size:0x44 scope:global l_cyl_src = .data:0x0000002C; // type:object size:0x44 scope:local
@3933 = .data:0x00000070; // type:object size:0xC scope:local @3933 = .data:0x00000070; // type:object size:0xC scope:local
@3934 = .data:0x0000007C; // type:object size:0xC scope:local @3934 = .data:0x0000007C; // type:object size:0xC scope:local
@3935 = .data:0x00000088; // type:object size:0xC scope:local @3935 = .data:0x00000088; // type:object size:0xC scope:local
@ -113,7 +113,7 @@ mode_proc$3932 = .data:0x000000A0; // type:object size:0x30 scope:local
@4371 = .data:0x0000010C; // type:object size:0xC scope:local @4371 = .data:0x0000010C; // type:object size:0xC scope:local
l_func$4365 = .data:0x00000118; // type:object size:0x48 scope:local l_func$4365 = .data:0x00000118; // type:object size:0x48 scope:local
action_table$4540 = .data:0x00000160; // type:object size:0x10 scope:local action_table$4540 = .data:0x00000160; // type:object size:0x10 scope:local
daObjVolcBom_METHODS = .data:0x00000170; // type:object size:0x20 scope:global daObjVolcBom_METHODS = .data:0x00000170; // type:object size:0x20 scope:local
g_profile_Obj_VolcanicBomb = .data:0x00000190; // type:object size:0x30 scope:global g_profile_Obj_VolcanicBomb = .data:0x00000190; // type:object size:0x30 scope:global
__vt__12dBgS_AcchCir = .data:0x000001C0; // type:object size:0xC scope:global __vt__12dBgS_AcchCir = .data:0x000001C0; // type:object size:0xC scope:global
__vt__10cCcD_GStts = .data:0x000001CC; // type:object size:0xC scope:global __vt__10cCcD_GStts = .data:0x000001CC; // type:object size:0xC scope:global
@ -123,5 +123,5 @@ __vt__8cM3dGAab = .data:0x000001F0; // type:object size:0xC scope:global
__vt__12dBgS_ObjAcch = .data:0x000001FC; // type:object size:0x24 scope:global __vt__12dBgS_ObjAcch = .data:0x000001FC; // type:object size:0x24 scope:global
__vt__12J3DFrameCtrl = .data:0x00000220; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x00000220; // type:object size:0xC scope:global
__vt__14daObjVolcBom_c = .data:0x0000022C; // type:object size:0x28 scope:global __vt__14daObjVolcBom_c = .data:0x0000022C; // type:object size:0x28 scope:global
lbl_676_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte init$1712 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte
lbl_676_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte init$2146 = .bss:0x00000001; // type:object size:0x1 scope:local data:byte

34
config/GZ2J01/rels/d_a_obj_volcbom/symbols.txt
View File

@ -1,7 +1,7 @@
_prolog = .text:0x00000000; // type:function size:0x2C scope:global _prolog = .text:0x00000000; // type:function size:0x2C scope:global
_epilog = .text:0x0000002C; // type:function size:0x2C scope:global _epilog = .text:0x0000002C; // type:function size:0x2C scope:global
_unresolved = .text:0x00000058; // type:function size:0x20 scope:global _unresolved = .text:0x00000058; // type:function size:0x20 scope:global
eventCallBack__FPvi = .text:0x00000078; // type:function size:0x48 scope:global eventCallBack__FPvi = .text:0x00000078; // type:function size:0x48 scope:local
initBaseMtx__14daObjVolcBom_cFv = .text:0x000000C0; // type:function size:0x58 scope:global initBaseMtx__14daObjVolcBom_cFv = .text:0x000000C0; // type:function size:0x58 scope:global
setBaseMtx__14daObjVolcBom_cFv = .text:0x00000118; // type:function size:0x70 scope:global setBaseMtx__14daObjVolcBom_cFv = .text:0x00000118; // type:function size:0x70 scope:global
Create__14daObjVolcBom_cFv = .text:0x00000188; // type:function size:0x238 scope:global Create__14daObjVolcBom_cFv = .text:0x00000188; // type:function size:0x238 scope:global
@ -43,15 +43,15 @@ demoProc__14daObjVolcBom_cFv = .text:0x00001DC8; // type:function size:0x580 sco
calcObjPos__14daObjVolcBom_cFv = .text:0x00002348; // type:function size:0x80 scope:global calcObjPos__14daObjVolcBom_cFv = .text:0x00002348; // type:function size:0x80 scope:global
Draw__14daObjVolcBom_cFv = .text:0x000023C8; // type:function size:0x214 scope:global Draw__14daObjVolcBom_cFv = .text:0x000023C8; // type:function size:0x214 scope:global
Delete__14daObjVolcBom_cFv = .text:0x000025DC; // type:function size:0x78 scope:global Delete__14daObjVolcBom_cFv = .text:0x000025DC; // type:function size:0x78 scope:global
daObjVolcBom_create1st__FP14daObjVolcBom_c = .text:0x00002654; // type:function size:0x134 scope:global daObjVolcBom_create1st__FP14daObjVolcBom_c = .text:0x00002654; // type:function size:0x134 scope:local
__dt__8cM3dGCylFv = .text:0x00002788; // type:function size:0x48 scope:global __dt__8cM3dGCylFv = .text:0x00002788; // type:function size:0x48 scope:global
__dt__8cM3dGAabFv = .text:0x000027D0; // type:function size:0x48 scope:global __dt__8cM3dGAabFv = .text:0x000027D0; // type:function size:0x48 scope:global
__dt__10dCcD_GSttsFv = .text:0x00002818; // type:function size:0x5C scope:global __dt__10dCcD_GSttsFv = .text:0x00002818; // type:function size:0x5C scope:global
__dt__12dBgS_AcchCirFv = .text:0x00002874; // type:function size:0x70 scope:global __dt__12dBgS_AcchCirFv = .text:0x00002874; // type:function size:0x70 scope:global
__dt__12dBgS_ObjAcchFv = .text:0x000028E4; // type:function size:0x70 scope:global __dt__12dBgS_ObjAcchFv = .text:0x000028E4; // type:function size:0x70 scope:global
daObjVolcBom_MoveBGDelete__FP14daObjVolcBom_c = .text:0x00002954; // type:function size:0x20 scope:global daObjVolcBom_MoveBGDelete__FP14daObjVolcBom_c = .text:0x00002954; // type:function size:0x20 scope:local
daObjVolcBom_MoveBGExecute__FP14daObjVolcBom_c = .text:0x00002974; // type:function size:0x20 scope:global daObjVolcBom_MoveBGExecute__FP14daObjVolcBom_c = .text:0x00002974; // type:function size:0x20 scope:local
daObjVolcBom_MoveBGDraw__FP14daObjVolcBom_c = .text:0x00002994; // type:function size:0x2C scope:global daObjVolcBom_MoveBGDraw__FP14daObjVolcBom_c = .text:0x00002994; // type:function size:0x2C scope:local
__dt__10cCcD_GSttsFv = .text:0x000029C0; // type:function size:0x48 scope:global __dt__10cCcD_GSttsFv = .text:0x000029C0; // type:function size:0x48 scope:global
cLib_calcTimer<Uc>__FPUc = .text:0x00002A08; // type:function size:0x1C scope:global cLib_calcTimer<Uc>__FPUc = .text:0x00002A08; // type:function size:0x1C scope:global
@36@__dt__12dBgS_ObjAcchFv = .text:0x00002A24; // type:function size:0x8 scope:local @36@__dt__12dBgS_ObjAcchFv = .text:0x00002A24; // type:function size:0x8 scope:local
@ -59,10 +59,10 @@ cLib_calcTimer<Uc>__FPUc = .text:0x00002A08; // type:function size:0x1C scope:gl
_ctors = .ctors:0x00000000; // type:label scope:global _ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global
...rodata.0 = .rodata:0x00000000; // type:label scope:local ...rodata.0 = .rodata:0x00000000; // type:label scope:local
l_midna_offset = .rodata:0x00000000; // type:object size:0xC scope:global l_midna_offset = .rodata:0x00000000; // type:object size:0xC scope:local
l_disapp_eff = .rodata:0x0000000C; // type:object size:0x2 scope:global l_disapp_eff = .rodata:0x0000000C; // type:object size:0x2 scope:local
l_start_eff = .rodata:0x00000010; // type:object size:0x6 scope:global l_start_eff = .rodata:0x00000010; // type:object size:0x6 scope:local
l_bind_eff = .rodata:0x00000018; // type:object size:0x8 scope:global l_bind_eff = .rodata:0x00000018; // type:object size:0x8 scope:local
@3785 = .rodata:0x00000020; // type:object size:0x4 scope:local align:4 data:float @3785 = .rodata:0x00000020; // type:object size:0x4 scope:local align:4 data:float
@3786 = .rodata:0x00000024; // type:object size:0x4 scope:local @3786 = .rodata:0x00000024; // type:object size:0x4 scope:local
@3787 = .rodata:0x00000028; // type:object size:0x4 scope:local @3787 = .rodata:0x00000028; // type:object size:0x4 scope:local
@ -92,13 +92,13 @@ l_effect_id$4032 = .rodata:0x00000054; // type:object size:0xE scope:local
@4718 = .rodata:0x000000A8; // type:object size:0x4 scope:local @4718 = .rodata:0x000000A8; // type:object size:0x4 scope:local
@4828 = .rodata:0x000000AC; // type:object size:0x4 scope:local @4828 = .rodata:0x000000AC; // type:object size:0x4 scope:local
@stringBase0 = .rodata:0x000000B0; // type:object size:0x48 scope:local data:string_table @stringBase0 = .rodata:0x000000B0; // type:object size:0x48 scope:local data:string_table
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 @1787 = .data:0x0000000C; // type:object size:0x4 scope:local
lbl_676_data_10 = .data:0x00000010; // type:object size:0x10 lbl_676_data_10 = .data:0x00000010; // type:object size:0x10
l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte
l_portal_warp_name = .data:0x00000024; // type:object size:0x4 scope:global l_portal_warp_name = .data:0x00000024; // type:object size:0x4 scope:local
l_staff_name = .data:0x00000028; // type:object size:0x4 scope:global data:4byte l_staff_name = .data:0x00000028; // type:object size:0x4 scope:local data:4byte
l_cyl_src = .data:0x0000002C; // type:object size:0x44 scope:global l_cyl_src = .data:0x0000002C; // type:object size:0x44 scope:local
@3933 = .data:0x00000070; // type:object size:0xC scope:local @3933 = .data:0x00000070; // type:object size:0xC scope:local
@3934 = .data:0x0000007C; // type:object size:0xC scope:local @3934 = .data:0x0000007C; // type:object size:0xC scope:local
@3935 = .data:0x00000088; // type:object size:0xC scope:local @3935 = .data:0x00000088; // type:object size:0xC scope:local
@ -112,7 +112,7 @@ mode_proc$3932 = .data:0x000000A0; // type:object size:0x30 scope:local
@4371 = .data:0x0000010C; // type:object size:0xC scope:local @4371 = .data:0x0000010C; // type:object size:0xC scope:local
l_func$4365 = .data:0x00000118; // type:object size:0x48 scope:local l_func$4365 = .data:0x00000118; // type:object size:0x48 scope:local
action_table$4540 = .data:0x00000160; // type:object size:0x10 scope:local action_table$4540 = .data:0x00000160; // type:object size:0x10 scope:local
daObjVolcBom_METHODS = .data:0x00000170; // type:object size:0x20 scope:global daObjVolcBom_METHODS = .data:0x00000170; // type:object size:0x20 scope:local
g_profile_Obj_VolcanicBomb = .data:0x00000190; // type:object size:0x30 scope:global g_profile_Obj_VolcanicBomb = .data:0x00000190; // type:object size:0x30 scope:global
__vt__12dBgS_AcchCir = .data:0x000001C0; // type:object size:0xC scope:global __vt__12dBgS_AcchCir = .data:0x000001C0; // type:object size:0xC scope:global
__vt__10cCcD_GStts = .data:0x000001CC; // type:object size:0xC scope:global __vt__10cCcD_GStts = .data:0x000001CC; // type:object size:0xC scope:global
@ -122,5 +122,5 @@ __vt__8cM3dGAab = .data:0x000001F0; // type:object size:0xC scope:global
__vt__12dBgS_ObjAcch = .data:0x000001FC; // type:object size:0x24 scope:global __vt__12dBgS_ObjAcch = .data:0x000001FC; // type:object size:0x24 scope:global
__vt__12J3DFrameCtrl = .data:0x00000220; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x00000220; // type:object size:0xC scope:global
__vt__14daObjVolcBom_c = .data:0x0000022C; // type:object size:0x28 scope:global __vt__14daObjVolcBom_c = .data:0x0000022C; // type:object size:0x28 scope:global
lbl_676_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte init$1712 = .bss:0x00000000; // type:object size:0x1 data:byte scope:local
lbl_676_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte init$2146 = .bss:0x00000001; // type:object size:0x1 data:byte scope:local

32
config/GZ2P01/rels/d_a_obj_volcbom/symbols.txt
View File

@ -43,15 +43,15 @@ demoProc__14daObjVolcBom_cFv = .text:0x00001DC8; // type:function size:0x580 sco
calcObjPos__14daObjVolcBom_cFv = .text:0x00002348; // type:function size:0x80 scope:global calcObjPos__14daObjVolcBom_cFv = .text:0x00002348; // type:function size:0x80 scope:global
Draw__14daObjVolcBom_cFv = .text:0x000023C8; // type:function size:0x214 scope:global Draw__14daObjVolcBom_cFv = .text:0x000023C8; // type:function size:0x214 scope:global
Delete__14daObjVolcBom_cFv = .text:0x000025DC; // type:function size:0x78 scope:global Delete__14daObjVolcBom_cFv = .text:0x000025DC; // type:function size:0x78 scope:global
daObjVolcBom_create1st__FP14daObjVolcBom_c = .text:0x00002654; // type:function size:0x134 scope:global daObjVolcBom_create1st__FP14daObjVolcBom_c = .text:0x00002654; // type:function size:0x134 scope:local
__dt__8cM3dGCylFv = .text:0x00002788; // type:function size:0x48 scope:global __dt__8cM3dGCylFv = .text:0x00002788; // type:function size:0x48 scope:global
__dt__8cM3dGAabFv = .text:0x000027D0; // type:function size:0x48 scope:global __dt__8cM3dGAabFv = .text:0x000027D0; // type:function size:0x48 scope:global
__dt__10dCcD_GSttsFv = .text:0x00002818; // type:function size:0x5C scope:global __dt__10dCcD_GSttsFv = .text:0x00002818; // type:function size:0x5C scope:global
__dt__12dBgS_AcchCirFv = .text:0x00002874; // type:function size:0x70 scope:global __dt__12dBgS_AcchCirFv = .text:0x00002874; // type:function size:0x70 scope:global
__dt__12dBgS_ObjAcchFv = .text:0x000028E4; // type:function size:0x70 scope:global __dt__12dBgS_ObjAcchFv = .text:0x000028E4; // type:function size:0x70 scope:global
daObjVolcBom_MoveBGDelete__FP14daObjVolcBom_c = .text:0x00002954; // type:function size:0x20 scope:global daObjVolcBom_MoveBGDelete__FP14daObjVolcBom_c = .text:0x00002954; // type:function size:0x20 scope:local
daObjVolcBom_MoveBGExecute__FP14daObjVolcBom_c = .text:0x00002974; // type:function size:0x20 scope:global daObjVolcBom_MoveBGExecute__FP14daObjVolcBom_c = .text:0x00002974; // type:function size:0x20 scope:local
daObjVolcBom_MoveBGDraw__FP14daObjVolcBom_c = .text:0x00002994; // type:function size:0x2C scope:global daObjVolcBom_MoveBGDraw__FP14daObjVolcBom_c = .text:0x00002994; // type:function size:0x2C scope:local
__dt__10cCcD_GSttsFv = .text:0x000029C0; // type:function size:0x48 scope:global __dt__10cCcD_GSttsFv = .text:0x000029C0; // type:function size:0x48 scope:global
cLib_calcTimer<Uc>__FPUc = .text:0x00002A08; // type:function size:0x1C scope:global cLib_calcTimer<Uc>__FPUc = .text:0x00002A08; // type:function size:0x1C scope:global
@36@__dt__12dBgS_ObjAcchFv = .text:0x00002A24; // type:function size:0x8 scope:local @36@__dt__12dBgS_ObjAcchFv = .text:0x00002A24; // type:function size:0x8 scope:local
@ -59,10 +59,10 @@ cLib_calcTimer<Uc>__FPUc = .text:0x00002A08; // type:function size:0x1C scope:gl
_ctors = .ctors:0x00000000; // type:label scope:global _ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global
...rodata.0 = .rodata:0x00000000; // type:label scope:local ...rodata.0 = .rodata:0x00000000; // type:label scope:local
l_midna_offset = .rodata:0x00000000; // type:object size:0xC scope:global l_midna_offset = .rodata:0x00000000; // type:object size:0xC scope:local
l_disapp_eff = .rodata:0x0000000C; // type:object size:0x2 scope:global l_disapp_eff = .rodata:0x0000000C; // type:object size:0x2 scope:local
l_start_eff = .rodata:0x00000010; // type:object size:0x6 scope:global l_start_eff = .rodata:0x00000010; // type:object size:0x6 scope:local
l_bind_eff = .rodata:0x00000018; // type:object size:0x8 scope:global l_bind_eff = .rodata:0x00000018; // type:object size:0x8 scope:local
@3785 = .rodata:0x00000020; // type:object size:0x4 scope:local align:4 data:float @3785 = .rodata:0x00000020; // type:object size:0x4 scope:local align:4 data:float
@3786 = .rodata:0x00000024; // type:object size:0x4 scope:local @3786 = .rodata:0x00000024; // type:object size:0x4 scope:local
@3787 = .rodata:0x00000028; // type:object size:0x4 scope:local @3787 = .rodata:0x00000028; // type:object size:0x4 scope:local
@ -92,13 +92,13 @@ l_effect_id$4032 = .rodata:0x00000054; // type:object size:0xE scope:local
@4718 = .rodata:0x000000A8; // type:object size:0x4 scope:local @4718 = .rodata:0x000000A8; // type:object size:0x4 scope:local
@4828 = .rodata:0x000000AC; // type:object size:0x4 scope:local @4828 = .rodata:0x000000AC; // type:object size:0x4 scope:local
@stringBase0 = .rodata:0x000000B0; // type:object size:0x48 scope:local data:string_table @stringBase0 = .rodata:0x000000B0; // type:object size:0x48 scope:local data:string_table
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 @1787 = .data:0x0000000C; // type:object size:0x4 scope:local
lbl_676_data_10 = .data:0x00000010; // type:object size:0x10 lbl_676_data_10 = .data:0x00000010; // type:object size:0x10
l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte
l_portal_warp_name = .data:0x00000024; // type:object size:0x4 scope:global l_portal_warp_name = .data:0x00000024; // type:object size:0x4 scope:local
l_staff_name = .data:0x00000028; // type:object size:0x4 scope:global data:4byte l_staff_name = .data:0x00000028; // type:object size:0x4 scope:local data:4byte
l_cyl_src = .data:0x0000002C; // type:object size:0x44 scope:global l_cyl_src = .data:0x0000002C; // type:object size:0x44 scope:local
@3933 = .data:0x00000070; // type:object size:0xC scope:local @3933 = .data:0x00000070; // type:object size:0xC scope:local
@3934 = .data:0x0000007C; // type:object size:0xC scope:local @3934 = .data:0x0000007C; // type:object size:0xC scope:local
@3935 = .data:0x00000088; // type:object size:0xC scope:local @3935 = .data:0x00000088; // type:object size:0xC scope:local
@ -112,7 +112,7 @@ mode_proc$3932 = .data:0x000000A0; // type:object size:0x30 scope:local
@4371 = .data:0x0000010C; // type:object size:0xC scope:local @4371 = .data:0x0000010C; // type:object size:0xC scope:local
l_func$4365 = .data:0x00000118; // type:object size:0x48 scope:local l_func$4365 = .data:0x00000118; // type:object size:0x48 scope:local
action_table$4540 = .data:0x00000160; // type:object size:0x10 scope:local action_table$4540 = .data:0x00000160; // type:object size:0x10 scope:local
daObjVolcBom_METHODS = .data:0x00000170; // type:object size:0x20 scope:global daObjVolcBom_METHODS = .data:0x00000170; // type:object size:0x20 scope:local
g_profile_Obj_VolcanicBomb = .data:0x00000190; // type:object size:0x30 scope:global g_profile_Obj_VolcanicBomb = .data:0x00000190; // type:object size:0x30 scope:global
__vt__12dBgS_AcchCir = .data:0x000001C0; // type:object size:0xC scope:global __vt__12dBgS_AcchCir = .data:0x000001C0; // type:object size:0xC scope:global
__vt__10cCcD_GStts = .data:0x000001CC; // type:object size:0xC scope:global __vt__10cCcD_GStts = .data:0x000001CC; // type:object size:0xC scope:global
@ -122,5 +122,5 @@ __vt__8cM3dGAab = .data:0x000001F0; // type:object size:0xC scope:global
__vt__12dBgS_ObjAcch = .data:0x000001FC; // type:object size:0x24 scope:global __vt__12dBgS_ObjAcch = .data:0x000001FC; // type:object size:0x24 scope:global
__vt__12J3DFrameCtrl = .data:0x00000220; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x00000220; // type:object size:0xC scope:global
__vt__14daObjVolcBom_c = .data:0x0000022C; // type:object size:0x28 scope:global __vt__14daObjVolcBom_c = .data:0x0000022C; // type:object size:0x28 scope:global
lbl_676_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte init$1712 = .bss:0x00000000; // type:object size:0x1 data:byte scope:local
lbl_676_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte init$2146 = .bss:0x00000001; // type:object size:0x1 data:byte scope:local

24
config/RZDE01_00/rels/d_a_obj_volcbom/symbols.txt
View File

@ -39,18 +39,18 @@ demoProc__14daObjVolcBom_cFv = .text:0x000019BC; // type:function size:0x408 sco
calcObjPos__14daObjVolcBom_cFv = .text:0x00001DC4; // type:function size:0x7C scope:global calcObjPos__14daObjVolcBom_cFv = .text:0x00001DC4; // type:function size:0x7C scope:global
Draw__14daObjVolcBom_cFv = .text:0x00001E40; // type:function size:0x204 scope:global Draw__14daObjVolcBom_cFv = .text:0x00001E40; // type:function size:0x204 scope:global
Delete__14daObjVolcBom_cFv = .text:0x00002044; // type:function size:0x74 scope:global Delete__14daObjVolcBom_cFv = .text:0x00002044; // type:function size:0x74 scope:global
daObjVolcBom_create1st__FP14daObjVolcBom_c = .text:0x000020B8; // type:function size:0x104 scope:global daObjVolcBom_create1st__FP14daObjVolcBom_c = .text:0x000020B8; // type:function size:0x104 scope:local
daObjVolcBom_MoveBGDelete__FP14daObjVolcBom_c = .text:0x000021BC; // type:function size:0x4 scope:global daObjVolcBom_MoveBGDelete__FP14daObjVolcBom_c = .text:0x000021BC; // type:function size:0x4 scope:local
daObjVolcBom_MoveBGExecute__FP14daObjVolcBom_c = .text:0x000021C0; // type:function size:0x4 scope:global daObjVolcBom_MoveBGExecute__FP14daObjVolcBom_c = .text:0x000021C0; // type:function size:0x4 scope:local
daObjVolcBom_MoveBGDraw__FP14daObjVolcBom_c = .text:0x000021C4; // type:function size:0x10 scope:global daObjVolcBom_MoveBGDraw__FP14daObjVolcBom_c = .text:0x000021C4; // type:function size:0x10 scope:local
entry__13mDoExt_btkAnmFP12J3DModelData = .text:0x000021D4; // type:function size:0xC scope:global entry__13mDoExt_btkAnmFP12J3DModelData = .text:0x000021D4; // type:function size:0xC scope:global
entry__13mDoExt_brkAnmFP12J3DModelData = .text:0x000021E0; // type:function size:0xC scope:global entry__13mDoExt_brkAnmFP12J3DModelData = .text:0x000021E0; // type:function size:0xC scope:global
_ctors = .ctors:0x00000000; // type:label scope:global _ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global
...rodata.0 = .rodata:0x00000000; // type:label scope:local ...rodata.0 = .rodata:0x00000000; // type:label scope:local
l_disapp_eff = .rodata:0x00000000; // type:object size:0x2 scope:global l_disapp_eff = .rodata:0x00000000; // type:object size:0x2 scope:local
l_start_eff = .rodata:0x00000002; // type:object size:0x6 scope:global l_start_eff = .rodata:0x00000002; // type:object size:0x6 scope:local
l_bind_eff = .rodata:0x00000008; // type:object size:0x8 scope:global l_bind_eff = .rodata:0x00000008; // type:object size:0x8 scope:local
@96867 = .rodata:0x00000010; // type:object size:0x4 scope:local align:4 data:float @96867 = .rodata:0x00000010; // type:object size:0x4 scope:local align:4 data:float
@96868 = .rodata:0x00000014; // type:object size:0x4 scope:local @96868 = .rodata:0x00000014; // type:object size:0x4 scope:local
@96869 = .rodata:0x00000018; // type:object size:0x4 scope:local @96869 = .rodata:0x00000018; // type:object size:0x4 scope:local
@ -78,12 +78,12 @@ l_effect_id$94323 = .rodata:0x00000074; // type:object size:0xE scope:local
@97547 = .rodata:0x000000B0; // type:object size:0x4 scope:local @97547 = .rodata:0x000000B0; // type:object size:0x4 scope:local
@97608 = .rodata:0x000000B4; // type:object size:0x4 scope:local @97608 = .rodata:0x000000B4; // type:object size:0x4 scope:local
lbl_677_data_0 = .data:0x00000000; // type:object size:0xC data:4byte lbl_677_data_0 = .data:0x00000000; // type:object size:0xC data:4byte
l_arcName = .data:0x0000000C; // type:object size:0x4 scope:global data:4byte l_arcName = .data:0x0000000C; // type:object size:0x4 scope:local data:4byte
lbl_677_data_10 = .data:0x00000010; // type:object size:0x14 data:string lbl_677_data_10 = .data:0x00000010; // type:object size:0x14 data:string
l_portal_warp_name = .data:0x00000024; // type:object size:0x4 scope:global l_portal_warp_name = .data:0x00000024; // type:object size:0x4 scope:local
lbl_677_data_28 = .data:0x00000028; // type:object size:0x8 data:string lbl_677_data_28 = .data:0x00000028; // type:object size:0x8 data:string
l_staff_name = .data:0x00000030; // type:object size:0x4 scope:global data:4byte l_staff_name = .data:0x00000030; // type:object size:0x4 scope:local data:4byte
l_cyl_src = .data:0x00000034; // type:object size:0x44 scope:global l_cyl_src = .data:0x00000034; // type:object size:0x44 scope:local
lbl_677_data_78 = .data:0x00000078; // type:object size:0xC lbl_677_data_78 = .data:0x00000078; // type:object size:0xC
l_func$94537 = .data:0x00000084; // type:object size:0x48 scope:local l_func$94537 = .data:0x00000084; // type:object size:0x48 scope:local
lbl_677_data_CC = .data:0x000000CC; // type:object size:0x14 data:string lbl_677_data_CC = .data:0x000000CC; // type:object size:0x14 data:string
@ -93,7 +93,7 @@ lbl_677_data_E9 = .data:0x000000E9; // type:object size:0x5 data:string
lbl_677_data_EE = .data:0x000000EE; // type:object size:0x6 lbl_677_data_EE = .data:0x000000EE; // type:object size:0x6
action_table$94648 = .data:0x000000F4; // type:object size:0x10 scope:local action_table$94648 = .data:0x000000F4; // type:object size:0x10 scope:local
lbl_677_data_104 = .data:0x00000104; // type:object size:0x8 lbl_677_data_104 = .data:0x00000104; // type:object size:0x8
daObjVolcBom_METHODS = .data:0x0000010C; // type:object size:0x20 scope:global daObjVolcBom_METHODS = .data:0x0000010C; // type:object size:0x20 scope:local
g_profile_Obj_VolcanicBomb = .data:0x0000012C; // type:object size:0x30 scope:global g_profile_Obj_VolcanicBomb = .data:0x0000012C; // type:object size:0x30 scope:global
__vt__14daObjVolcBom_c = .data:0x0000015C; // type:object size:0x28 scope:global __vt__14daObjVolcBom_c = .data:0x0000015C; // type:object size:0x28 scope:global
lbl_677_data_184 = .data:0x00000184; // type:object size:0x10 lbl_677_data_184 = .data:0x00000184; // type:object size:0x10

28
config/ShieldD/rels/d_a_obj_volcbomD/symbols.txt
View File

@ -62,21 +62,21 @@ calcObjPos__14daObjVolcBom_cFv = .text:0x00002C60; // type:function size:0xBC sc
Draw__14daObjVolcBom_cFv = .text:0x00002D20; // type:function size:0x258 scope:global Draw__14daObjVolcBom_cFv = .text:0x00002D20; // type:function size:0x258 scope:global
mDoExt_bckAnmRemove__FP12J3DModelData = .text:0x00002F80; // type:function size:0x38 scope:global mDoExt_bckAnmRemove__FP12J3DModelData = .text:0x00002F80; // type:function size:0x38 scope:global
Delete__14daObjVolcBom_cFv = .text:0x00002FC0; // type:function size:0x9C scope:global Delete__14daObjVolcBom_cFv = .text:0x00002FC0; // type:function size:0x9C scope:global
daObjVolcBom_create1st__FP14daObjVolcBom_c = .text:0x00003060; // type:function size:0x7C scope:global daObjVolcBom_create1st__FP14daObjVolcBom_c = .text:0x00003060; // type:function size:0x7C scope:local
__ct__14daObjVolcBom_cFv = .text:0x000030E0; // type:function size:0x88 scope:global __ct__14daObjVolcBom_cFv = .text:0x000030E0; // type:function size:0x88 scope:global
daObjVolcBom_MoveBGDelete__FP14daObjVolcBom_c = .text:0x00003170; // type:function size:0x28 scope:global daObjVolcBom_MoveBGDelete__FP14daObjVolcBom_c = .text:0x00003170; // type:function size:0x28 scope:local
daObjVolcBom_MoveBGExecute__FP14daObjVolcBom_c = .text:0x000031A0; // type:function size:0x28 scope:global daObjVolcBom_MoveBGExecute__FP14daObjVolcBom_c = .text:0x000031A0; // type:function size:0x28 scope:local
daObjVolcBom_MoveBGDraw__FP14daObjVolcBom_c = .text:0x000031D0; // type:function size:0x28 scope:global daObjVolcBom_MoveBGDraw__FP14daObjVolcBom_c = .text:0x000031D0; // type:function size:0x28 scope:local
__dt__18daObjVolcBom_HIO_cFv = .text:0x00003200; // type:function size:0x6C scope:global __dt__18daObjVolcBom_HIO_cFv = .text:0x00003200; // type:function size:0x6C scope:global
__sinit_\d_a_obj_volcbom_cpp = .text:0x00003270; // type:function size:0x44 scope:local __sinit_\d_a_obj_volcbom_cpp = .text:0x00003270; // type:function size:0x44 scope:local
_ctors = .ctors:0x00000000; // type:label scope:global _ctors = .ctors:0x00000000; // type:label scope:global
__destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global
_dtors = .dtors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global
...rodata.0 = .rodata:0x00000000; // type:label scope:local ...rodata.0 = .rodata:0x00000000; // type:label scope:local
l_midna_offset = .rodata:0x00000000; // type:object size:0xC scope:global l_midna_offset = .rodata:0x00000000; // type:object size:0xC scope:local
l_disapp_eff = .rodata:0x0000000C; // type:object size:0x2 scope:global l_disapp_eff = .rodata:0x0000000C; // type:object size:0x2 scope:local
l_start_eff = .rodata:0x00000010; // type:object size:0x6 scope:global l_start_eff = .rodata:0x00000010; // type:object size:0x6 scope:local
l_bind_eff = .rodata:0x00000018; // type:object size:0x8 scope:global l_bind_eff = .rodata:0x00000018; // type:object size:0x8 scope:local
@119031 = .rodata:0x00000020; // type:object size:0x4 scope:local align:4 data:float @119031 = .rodata:0x00000020; // type:object size:0x4 scope:local align:4 data:float
@119032 = .rodata:0x00000024; // type:object size:0x4 scope:local @119032 = .rodata:0x00000024; // type:object size:0x4 scope:local
@119048 = .rodata:0x00000028; // type:object size:0x4 scope:local align:4 data:float @119048 = .rodata:0x00000028; // type:object size:0x4 scope:local align:4 data:float
@ -110,12 +110,12 @@ cNullVec__6Z2Calc = .rodata:0x000000D4; // type:object size:0xC scope:global
@46916 = .rodata:0x000000E0; // type:object size:0x4 scope:local @46916 = .rodata:0x000000E0; // type:object size:0x4 scope:local
lbl_667_rodata_E4 = .rodata:0x000000E4; // type:object size:0x18 lbl_667_rodata_E4 = .rodata:0x000000E4; // type:object size:0x18
@119014 = .data:0x00000000; // type:object size:0xA scope:local data:string @119014 = .data:0x00000000; // type:object size:0xA scope:local data:string
l_arcName = .data:0x0000000C; // type:object size:0x4 scope:global data:4byte l_arcName = .data:0x0000000C; // type:object size:0x4 scope:local data:4byte
@119015 = .data:0x00000010; // type:object size:0x14 scope:local data:string @119015 = .data:0x00000010; // type:object size:0x14 scope:local data:string
l_portal_warp_name = .data:0x00000024; // type:object size:0x4 scope:global l_portal_warp_name = .data:0x00000024; // type:object size:0x4 scope:local
@119016 = .data:0x00000028; // type:object size:0x8 scope:local data:string @119016 = .data:0x00000028; // type:object size:0x8 scope:local data:string
l_staff_name = .data:0x00000030; // type:object size:0x4 scope:global data:4byte l_staff_name = .data:0x00000030; // type:object size:0x4 scope:local data:4byte
l_cyl_src = .data:0x00000034; // type:object size:0x44 scope:global l_cyl_src = .data:0x00000034; // type:object size:0x44 scope:local
@119045 = .data:0x00000078; // type:object size:0x9 scope:local @119045 = .data:0x00000078; // type:object size:0x9 scope:local
@119046 = .data:0x00000084; // type:object size:0x9 scope:local @119046 = .data:0x00000084; // type:object size:0x9 scope:local
@119047 = .data:0x00000090; // type:object size:0xF scope:local @119047 = .data:0x00000090; // type:object size:0xF scope:local
@ -152,7 +152,7 @@ l_cyl_src = .data:0x00000034; // type:object size:0x44 scope:global
@LOCAL@demoProc__14daObjVolcBom_cFv@action_table = .data:0x000002E8; // type:object size:0x10 scope:local @LOCAL@demoProc__14daObjVolcBom_cFv@action_table = .data:0x000002E8; // type:object size:0x10 scope:local
@119785 = .data:0x000002F8; // type:object size:0x6 scope:local data:string @119785 = .data:0x000002F8; // type:object size:0x6 scope:local data:string
@119787 = .data:0x00000300; // type:object size:0x16 scope:local @119787 = .data:0x00000300; // type:object size:0x16 scope:local
daObjVolcBom_METHODS = .data:0x00000318; // type:object size:0x20 scope:global daObjVolcBom_METHODS = .data:0x00000318; // type:object size:0x20 scope:local
g_profile_Obj_VolcanicBomb = .data:0x00000338; // type:object size:0x30 scope:global g_profile_Obj_VolcanicBomb = .data:0x00000338; // type:object size:0x30 scope:global
__vt__18daObjVolcBom_HIO_c = .data:0x00000368; // type:object size:0x20 scope:global __vt__18daObjVolcBom_HIO_c = .data:0x00000368; // type:object size:0x20 scope:global
@119991 = .data:0x00000388; // type:object size:0x13 scope:local data:string @119991 = .data:0x00000388; // type:object size:0x13 scope:local data:string
@ -190,4 +190,4 @@ lbl_667_data_438 = .data:0x00000438; // type:object size:0x2C
lbl_667_data_6C1 = .data:0x000006C1; // type:object size:0xBB lbl_667_data_6C1 = .data:0x000006C1; // type:object size:0xBB
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
@119025 = .bss:0x00000008; // type:object size:0xC scope:local @119025 = .bss:0x00000008; // type:object size:0xC scope:local
l_HIO = .bss:0x00000018; // type:object size:0x38 scope:global data:byte l_HIO = .bss:0x00000018; // type:object size:0x38 scope:local data:byte

2
config/ShieldD/rels/d_a_obj_web1D/symbols.txt
View File

@ -69,5 +69,5 @@ __RTTI__16daObj_Web1_HIO_c = .data:0x00000220; // type:object size:0x8 scope:glo
@117165 = .data:0x0000029C; // type:object size:0x11 scope:local data:string @117165 = .data:0x0000029C; // type:object size:0x11 scope:local data:string
@117166 = .data:0x000002C4; // type:object size:0xD scope:local data:string @117166 = .data:0x000002C4; // type:object size:0xD scope:local data:string
lbl_676_data_2D1 = .data:0x000002D1; // type:object size:0x13 lbl_676_data_2D1 = .data:0x000002D1; // type:object size:0x13
lbl_676_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte init$1712 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte
l_HIO = .bss:0x00000008; // type:object size:0x8 scope:global data:byte l_HIO = .bss:0x00000008; // type:object size:0x8 scope:global data:byte

4
configure.py
View File

@ -1712,7 +1712,7 @@ config.libs = [
ActorRel(Equivalent, "d_a_e_sm2"), # weak func order ActorRel(Equivalent, "d_a_e_sm2"), # weak func order
ActorRel(NonMatching, "d_a_e_st"), ActorRel(NonMatching, "d_a_e_st"),
ActorRel(MatchingFor("GZ2E01"), "d_a_e_st_line"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_st_line"),
ActorRel(NonMatching, "d_a_e_sw"), ActorRel(Equivalent, "d_a_e_sw"), # weak func order
ActorRel(Equivalent, "d_a_e_th"), # weak func order ActorRel(Equivalent, "d_a_e_th"), # weak func order
ActorRel(MatchingFor("GZ2E01"), "d_a_e_th_ball"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_th_ball"),
ActorRel(MatchingFor("GZ2E01"), "d_a_e_tk"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_tk"),
@ -2153,7 +2153,7 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_usaku"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_usaku"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_vground"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_vground"),
ActorRel(NonMatching, "d_a_obj_volcball"), ActorRel(NonMatching, "d_a_obj_volcball"),
ActorRel(NonMatching, "d_a_obj_volcbom"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_volcbom"),
ActorRel(NonMatching, "d_a_obj_warp_kbrg"), ActorRel(NonMatching, "d_a_obj_warp_kbrg"),
ActorRel(NonMatching, "d_a_obj_warp_obrg"), ActorRel(NonMatching, "d_a_obj_warp_obrg"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_waterGate"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_waterGate"),

117
include/d/actor/d_a_e_sw.h
View File

@ -1,6 +1,9 @@
#ifndef D_A_E_SW_H #ifndef D_A_E_SW_H
#define D_A_E_SW_H #define D_A_E_SW_H
#include "d/d_bg_s_acch.h"
#include "d/d_cc_d.h"
#include "d/d_cc_uty.h"
#include "f_op/f_op_actor_mng.h" #include "f_op/f_op_actor_mng.h"
/** /**
@ -12,21 +15,24 @@
* *
*/ */
class daE_SW_c : public fopEn_enemy_c { class daE_SW_c : public fopEn_enemy_c {
public:
typedef void (daE_SW_c::*actionFunc)();
/* 807A7460 */ void bckSet(int, f32, u8, f32); /* 807A7460 */ void bckSet(int, f32, u8, f32);
/* 807A7504 */ void draw(); /* 807A7504 */ int draw();
/* 807A76E4 */ void setBeforeJumpEffect(); /* 807A76E4 */ void setBeforeJumpEffect();
/* 807A77CC */ void setJumpEffect(); /* 807A77CC */ void setJumpEffect();
/* 807A78B4 */ void setSmokeEffect(); /* 807A78B4 */ void setSmokeEffect();
/* 807A7A08 */ void setDiveEffect(); /* 807A7A08 */ void setDiveEffect();
/* 807A7AC0 */ void setHideEffect(); /* 807A7AC0 */ void setHideEffect();
/* 807A7B64 */ void setActionMode(s16, s16); /* 807A7B64 */ void setActionMode(s16, s16);
/* 807A7C50 */ void search_bomb(); /* 807A7C50 */ fopAc_ac_c* search_bomb();
/* 807A7CD0 */ void bomb_check(); /* 807A7CD0 */ BOOL bomb_check();
/* 807A7D48 */ void setModeBack(); /* 807A7D48 */ bool setModeBack();
/* 807A7DAC */ void checkFall(); /* 807A7DAC */ void checkFall();
/* 807A7EFC */ void checkBeforeWall(); /* 807A7EFC */ bool checkBeforeWall();
/* 807A7F88 */ void executeWait(); /* 807A7F88 */ void executeWait();
/* 807A8290 */ void checkRunChase(); /* 807A8290 */ int checkRunChase();
/* 807A831C */ void executeChaseSlow(); /* 807A831C */ void executeChaseSlow();
/* 807A8B98 */ void executeChaseFast(); /* 807A8B98 */ void executeChaseFast();
/* 807A9580 */ void executeBomb(); /* 807A9580 */ void executeBomb();
@ -38,7 +44,7 @@ class daE_SW_c : public fopEn_enemy_c {
/* 807AA91C */ void executeDamage(); /* 807AA91C */ void executeDamage();
/* 807AAB7C */ void executeDie(); /* 807AAB7C */ void executeDie();
/* 807AADCC */ void executeMaster(); /* 807AADCC */ void executeMaster();
/* 807AAF70 */ void checkSuddenAttack(int); /* 807AAF70 */ bool checkSuddenAttack(int);
/* 807AB310 */ void executeSuddenAttack(); /* 807AB310 */ void executeSuddenAttack();
/* 807AB5C4 */ void executeFall(); /* 807AB5C4 */ void executeFall();
/* 807AB6C4 */ void action(); /* 807AB6C4 */ void action();
@ -46,18 +52,18 @@ class daE_SW_c : public fopEn_enemy_c {
/* 807AB930 */ void cc_set(); /* 807AB930 */ void cc_set();
/* 807ABAB0 */ void damage_check(); /* 807ABAB0 */ void damage_check();
/* 807ABD28 */ void checkGroundSand(); /* 807ABD28 */ void checkGroundSand();
/* 807ABE50 */ void execute(); /* 807ABE50 */ int execute();
/* 807AC170 */ void _delete(); /* 807AC170 */ int _delete();
/* 807AC204 */ void CreateHeap(); /* 807AC204 */ int CreateHeap();
/* 807AC31C */ void create(); /* 807AC31C */ cPhs__Step create();
/* 807ACA40 */ void d_setAction(void (daE_SW_c::*)()); /* 807ACA40 */ void d_setAction(void (daE_SW_c::*)());
/* 807ACAE4 */ void d_checkFall(); /* 807ACAE4 */ void d_checkFall();
/* 807ACCB0 */ void d_damage_check(); /* 807ACCB0 */ void d_damage_check();
/* 807ACFF8 */ void d_action(); /* 807ACFF8 */ void d_action();
/* 807AD10C */ void d_bomb_check(); /* 807AD10C */ bool d_bomb_check();
/* 807AD17C */ void d_bm_chase(); /* 807AD17C */ void d_bm_chase();
/* 807AD4A8 */ void d_wait(); /* 807AD4A8 */ void d_wait();
/* 807AD7C0 */ void d_chaseCheck(); /* 807AD7C0 */ bool d_chaseCheck();
/* 807ADA08 */ void d_chase(); /* 807ADA08 */ void d_chase();
/* 807ADE50 */ void d_attk(); /* 807ADE50 */ void d_attk();
/* 807AE4B4 */ void d_chance(); /* 807AE4B4 */ void d_chance();
@ -67,16 +73,95 @@ class daE_SW_c : public fopEn_enemy_c {
/* 807AEE44 */ void d_die(); /* 807AEE44 */ void d_die();
/* 807AF01C */ void d_hook(); /* 807AF01C */ void d_hook();
/* 807AF4B4 */ void d_fall(); /* 807AF4B4 */ void d_fall();
/* 807AF57C */ void d_execute(); /* 807AF57C */ int d_execute();
bool d_checkAction(void (daE_SW_c::*action)()) {
return field_0xafc == action;
}
bool d_checkOldAction(void (daE_SW_c::*action)()) {
return field_0xb0c == action;
}
private: private:
/* 0x5ac */ u8 field_0x5ac[0xb18 - 0x5ac]; /* 0x5AC */ request_of_phase_process_class mPhase;
/* 0x5B4 */ mDoExt_McaMorfSO* mpModelMorf;
/* 0x5B8 */ Z2CreatureEnemy mSound;
/* 0x65C */ cXyz field_0x65c;
/* 0x668 */ cXyz field_0x668;
/* 0x674 */ cXyz field_0x674;
/* 0x680 */ s16 mMoveMode;
/* 0x682 */ s16 mActionMode;
/* 0x684 */ u8 field_0x684;
/* 0x688 */ fpc_ProcID field_0x688;
/* 0x68C */ u8 field_0x68c;
/* 0x690 */ f32 field_0x690;
/* 0x694 */ u8 field_0x694;
/* 0x695 */ u8 field_0x695;
/* 0x696 */ u8 field_0x696;
/* 0x697 */ u8 field_0x697;
/* 0x698 */ int field_0x698;
/* 0x69C */ s16 field_0x69c;
/* 0x69E */ s16 field_0x69e;
/* 0x6A0 */ s16 field_0x6a0;
/* 0x6A2 */ s16 field_0x6a2;
/* 0x6A4 */ s16 field_0x6a4;
/* 0x6A8 */ cXyz field_0x6a8;
/* 0x6B4 */ f32 field_0x6b4;
/* 0x6B8 */ f32 field_0x6b8;
/* 0x6BC */ s16 field_0x6bc;
/* 0x6BE */ u8 field_0x6be[0x6c8 - 0x6be];
/* 0x6C8 */ f32 field_0x6c8;
/* 0x6CC */ s16 field_0x6cc;
/* 0x6D0 */ f32 field_0x6d0;
/* 0x6D4 */ f32 field_0x6d4;
/* 0x6D8 */ f32 field_0x6d8;
/* 0x6DC */ f32 field_0x6dc;
/* 0x6E0 */ u32 mShadowKey;
/* 0x6E4 */ u8 field_0x6e4;
/* 0x6E5 */ u8 field_0x6e5;
/* 0x6E6 */ u8 field_0x6e6;
/* 0x6E7 */ u8 field_0x6e7;
/* 0x6E8 */ u8 field_0x6e8;
/* 0x6E9 */ u8 field_0x6e9;
/* 0x6EA */ s16 field_0x6ea;
/* 0x6EC */ s16 field_0x6ec;
/* 0x6EE */ s16 field_0x6ee;
/* 0x6F0 */ s16 field_0x6f0;
/* 0x6F2 */ s16 field_0x6f2;
/* 0x6F4 */ u8 field_0x6f4[0x6f6 - 0x6f4];
/* 0x6F6 */ s16 field_0x6f6;
/* 0x6F8 */ dBgS_AcchCir field_0x6f8[2];
/* 0x778 */ dBgS_ObjAcch mBgc;
/* 0x950 */ dCcD_Stts mStts;
/* 0x98C */ dCcD_Sph field_0x98c;
/* 0xAC4 */ dCcU_AtInfo mAtInfo;
/* 0xAE8 */ u32 field_0xae8;
/* 0xAEC */ u32 field_0xaec;
/* 0xAF0 */ u32 field_0xaf0;
/* 0xAF4 */ u32 field_0xaf4;
/* 0xAF8 */ u8 field_0xaf8;
/* 0xAF9 */ u8 field_0xaf9;
/* 0xAFC */ actionFunc field_0xafc;
/* 0xB0C */ actionFunc field_0xb0c;
/* 0xB14 */ bool field_0xb14;
}; };
STATIC_ASSERT(sizeof(daE_SW_c) == 0xb18); STATIC_ASSERT(sizeof(daE_SW_c) == 0xb18);
class daE_SW_HIO_c { class daE_SW_HIO_c {
public:
/* サンドワーム (Sandworm) */
/* 807A740C */ daE_SW_HIO_c(); /* 807A740C */ daE_SW_HIO_c();
/* 807AF870 */ ~daE_SW_HIO_c(); /* 807AF870 */ virtual ~daE_SW_HIO_c() {}
/* 0x04 */ s8 field_0x4;
/* 0x08 */ f32 basic_size; // 基本サイズ (Basic Size)
/* 0x0C */ f32 bomb_notice_dist; // 爆弾認識距離 (Bomb Recognition Distance)
/* 0x10 */ f32 bomb_attack_start_range; // 爆弾攻撃開始範囲 (Bomb Attack Start Range)
/* 0x14 */ f32 human_attack_init_range; // 人用攻撃開始範囲 (Human Attack Initiation Range)
/* 0x18 */ f32 horse_attack_init_range; // 馬用攻撃開始範囲 (Horse Attack Initiation Range)
/* 0x1C */ f32 character_notice_dist; // 人認識距離(ダンジョン用) (Character Recognition Distance (For Dungeon))
/* 0x20 */ u8 movement_range_debug_display; // 移動範囲デバック表示 (Movement Range Debug Display)
}; };

6
include/d/actor/d_a_midna.h
View File

@ -136,6 +136,7 @@ public:
FLG0_UNK_4 = 4, FLG0_UNK_4 = 4,
FLG0_UNK_2 = 2, FLG0_UNK_2 = 2,
FLG0_UNK_1 = 1, FLG0_UNK_1 = 1,
FLG0_TAG_PORTAL = FLG0_TAG_WAIT | FLG0_PORTAL_OBJ_CALL,
}; };
enum daMidna_FLG1 { enum daMidna_FLG1 {
@ -298,6 +299,11 @@ public:
onEndResetStateFlg0(ERFLG0_UNK_2); onEndResetStateFlg0(ERFLG0_UNK_2);
} }
void onTagWaitPosPortalObj(const cXyz& i_pos) {
mTagWaitPos = i_pos;
onStateFlg0(FLG0_TAG_PORTAL);
}
void onTagWaitPos(const cXyz* param_0) { void onTagWaitPos(const cXyz* param_0) {
mTagWaitPos = *param_0; mTagWaitPos = *param_0;
onStateFlg0(FLG0_TAG_WAIT); onStateFlg0(FLG0_TAG_WAIT);

107
include/d/actor/d_a_obj_volcbom.h
View File

@ -1,6 +1,10 @@
#ifndef D_A_OBJ_VOLCBOM_H #ifndef D_A_OBJ_VOLCBOM_H
#define D_A_OBJ_VOLCBOM_H #define D_A_OBJ_VOLCBOM_H
#include "d/d_bg_s_acch.h"
#include "d/d_bg_s_movebg_actor.h"
#include "d/d_cc_d.h"
#include "d/d_msg_flow.h"
#include "f_op/f_op_actor_mng.h" #include "f_op/f_op_actor_mng.h"
/** /**
@ -11,14 +15,33 @@
* @details * @details
* *
*/ */
class daObjVolcBom_c : public fopAc_ac_c { class daObjVolcBom_c : public dBgS_MoveBgActor {
public: public:
typedef void (daObjVolcBom_c::*modeFunc)();
typedef void (daObjVolcBom_c::*actionFunc)();
enum Mode {
MODE_WAIT_APPEAR,
MODE_FALL,
MODE_WAIT_END_FALL_DEMO,
MODE_WAIT,
};
enum Action {
ACTION_WAIT,
ACTION_ORDER_EVENT,
ACTION_TALK_EVENT,
ACTION_WARP_EVENT,
ACTION_ORDER_A_TALK_EVENT,
ACTION_DEAD,
};
/* 80D241E0 */ void initBaseMtx(); /* 80D241E0 */ void initBaseMtx();
/* 80D24238 */ void setBaseMtx(); /* 80D24238 */ void setBaseMtx();
/* 80D242A8 */ void Create(); /* 80D242A8 */ int Create();
/* 80D244E0 */ void CreateHeap(); /* 80D244E0 */ int CreateHeap();
/* 80D248F4 */ void create1st(); /* 80D248F4 */ int create1st();
/* 80D249D0 */ void Execute(f32 (**)[3][4]); /* 80D249D0 */ int Execute(Mtx**);
/* 80D24A2C */ void mode_proc_call(); /* 80D24A2C */ void mode_proc_call();
/* 80D24B18 */ void init_modeWaitAppear(); /* 80D24B18 */ void init_modeWaitAppear();
/* 80D24B6C */ void modeWaitAppear(); /* 80D24B6C */ void modeWaitAppear();
@ -33,7 +56,7 @@ public:
/* 80D25224 */ void appear(); /* 80D25224 */ void appear();
/* 80D25230 */ void disappear(); /* 80D25230 */ void disappear();
/* 80D2523C */ void setSmoke(); /* 80D2523C */ void setSmoke();
/* 80D252C8 */ void checkTalkDistance(); /* 80D252C8 */ bool checkTalkDistance();
/* 80D25364 */ void calcMidnaWaitPos(); /* 80D25364 */ void calcMidnaWaitPos();
/* 80D253FC */ void setSrcEffect(); /* 80D253FC */ void setSrcEffect();
/* 80D25528 */ void setBindEffect(); /* 80D25528 */ void setBindEffect();
@ -51,20 +74,82 @@ public:
/* 80D25EE4 */ void actionDead(); /* 80D25EE4 */ void actionDead();
/* 80D25EE8 */ void demoProc(); /* 80D25EE8 */ void demoProc();
/* 80D26468 */ void calcObjPos(); /* 80D26468 */ void calcObjPos();
/* 80D264E8 */ void Draw(); /* 80D264E8 */ int Draw();
/* 80D266FC */ void Delete(); /* 80D266FC */ int Delete();
void startFall() { field_0x95f = 1; } void startFall() { field_0x95f = 1; }
void startSearch() { field_0x960 = 1; } void startSearch() { field_0x960 = 1; }
void setAction(u8 action) { mAction = action; }
u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
u8 getArg0() { return fopAcM_GetParamBit(this, 16, 8); }
u16 getMsgID() { return mMsgID; }
private: private:
/* 0x568 */ u8 field_0x568[0x95F - 0x568]; /* 0x5A0 */ request_of_phase_process_class mPhase;
/* 0x5A8 */ J3DModel* mModel1;
/* 0x5AC */ mDoExt_btkAnm* mBtk1;
/* 0x5B0 */ mDoExt_brkAnm* mBrk1;
/* 0x5B4 */ mDoExt_bckAnm* mBck1;
/* 0x5B8 */ J3DModel* mModel2;
/* 0x5BC */ mDoExt_btkAnm* mBtk2;
/* 0x5C0 */ mDoExt_brkAnm* mBrk2;
/* 0x5C4 */ JPABaseEmitter* mSmokeEmitter;
/* 0x5C8 */ u8 mSmokeTimer;
/* 0x5C9 */ bool field_0x5c9;
/* 0x5CA */ u8 mAction;
/* 0x5CB */ bool field_0x5cb;
/* 0x5CC */ dBgS_ObjAcch mAcch;
/* 0x7A4 */ dBgS_AcchCir mAcchCir;
/* 0x7E4 */ dCcD_Stts mStts;
/* 0x820 */ dCcD_Cyl mCyl;
/* 0x95C */ u8 mDemoTimer;
/* 0x95D */ u8 mWaitAppearState;
/* 0x95E */ bool field_0x95e;
/* 0x95F */ u8 field_0x95f; /* 0x95F */ u8 field_0x95f;
/* 0x960 */ u8 field_0x960; /* 0x960 */ bool field_0x960;
/* 0x961 */ u8 field_0x961[0xA1C - 0x961]; /* 0x961 */ u8 mMode;
/* 0x962 */ bool misAppearing;
/* 0x963 */ bool mIsMsgIDInit;
/* 0x964 */ u16 mMsgID;
/* 0x968 */ cXyz mLightPosWorld;
/* 0x974 */ u32 mShadowID;
/* 0x978 */ f32 field_0x978;
/* 0x97C */ f32 mBaseScale;
/* 0x980 */ cXyz mWarpSEPos;
/* 0x98C */ cXyz mWaitSEPos;
/* 0x998 */ cXyz mMidnaWaitPos;
/* 0x9A4 */ dMsgFlow_c mMsgFlow;
/* 0x9F0 */ s16 mEventId;
/* 0x9F4 */ int mStaffId;
/* 0x9F8 */ JPABaseEmitter* mStartEmitters[3];
/* 0xA04 */ JPABaseEmitter* mDisappearEmitters[1];
/* 0xA08 */ JPABaseEmitter* mBindEmitters[4];
/* 0xA18 */ u16 mEffectJntNo;
/* 0xA1A */ bool field_0xa1a;
/* 0xA1B */ u8 mNaviTimer;
}; };
STATIC_ASSERT(sizeof(daObjVolcBom_c) == 0xa1c); STATIC_ASSERT(sizeof(daObjVolcBom_c) == 0xa1c);
#ifdef DEBUG
class daObjVolcBom_HIO_c : public mDoHIO_entry_c {
public:
daObjVolcBom_HIO_c();
void genMessage(JORMContext* ctx);
/* 0x04 */ u8 field_0x04;
/* 0x08 */ f32 field_0x08;
/* 0x0C */ u8 field_0x0c[0x14 - 0x0c];
/* 0x14 */ u8 field_0x14;
/* 0x15 */ u8 field_0x15;
/* 0x18 */ f32 field_0x18;
/* 0x1C */ f32 field_0x1c;
/* 0x20 */ f32 field_0x20;
/* 0x24 */ f32 field_0x24;
/* 0x28 */ u8 field_0x28[0x34 - 0x28];
/* 0x34 */ u8 field_0x34;
};
#endif
#endif /* D_A_OBJ_VOLCBOM_H */ #endif /* D_A_OBJ_VOLCBOM_H */

3
include/d/actor/d_a_player.h
View File

@ -437,7 +437,7 @@ public:
FLG3_COPY_ROD_ATN_KEEP = 0x10000000, FLG3_COPY_ROD_ATN_KEEP = 0x10000000,
FLG3_BOOMERANG_ATN_KEEP = 0x8000000, FLG3_BOOMERANG_ATN_KEEP = 0x8000000,
FLG3_UNK_4000000 = 0x4000000, FLG3_UNK_4000000 = 0x4000000,
FLG3_UNK_2000000 = 0x2000000, FLG3_WARP_OBJ_DEMO = 0x2000000,
FLG3_UNK_1000000 = 0x1000000, FLG3_UNK_1000000 = 0x1000000,
FLG3_UNK_800000 = 0x800000, FLG3_UNK_800000 = 0x800000,
FLG3_UNK_400000 = 0x400000, FLG3_UNK_400000 = 0x400000,
@ -963,6 +963,7 @@ public:
} }
} }
void onMidnaTalkPolySpeed() { onNoResetFlg3(FLG3_MIDNA_TALK_POLY_SPEED); } void onMidnaTalkPolySpeed() { onNoResetFlg3(FLG3_MIDNA_TALK_POLY_SPEED); }
void onWarpObjDemo() { onNoResetFlg3(FLG3_WARP_OBJ_DEMO); }
void offCargoCarry() { void offCargoCarry() {
if (checkCargoCarry()) { if (checkCargoCarry()) {

4
include/d/d_com_inf_game.h
View File

@ -3517,6 +3517,10 @@ inline BOOL dComIfGp_evmng_startCheck(char const* i_event) {
return g_dComIfG_gameInfo.play.getEvtManager().startCheckOld(i_event); return g_dComIfG_gameInfo.play.getEvtManager().startCheckOld(i_event);
} }
inline BOOL dComIfGp_evmng_startCheck(s16 i_eventId) {
return g_dComIfG_gameInfo.play.getEvtManager().startCheck(i_eventId);
}
inline BOOL dComIfGp_evmng_endCheck(const char* event) { inline BOOL dComIfGp_evmng_endCheck(const char* event) {
return g_dComIfG_gameInfo.play.getEvtManager().endCheckOld(event); return g_dComIfG_gameInfo.play.getEvtManager().endCheckOld(event);
} }

2
src/d/actor/d_a_alink_demo.inc
View File

@ -4229,7 +4229,7 @@ void daAlink_c::skipPortalObjWarp() {
return; return;
} }
if (checkNoResetFlg3(FLG3_UNK_2000000) && if (checkNoResetFlg3(FLG3_WARP_OBJ_DEMO) &&
(dComIfGp_TargetWarpPt_get() == 9 && dComIfGp_TransportWarp_check())) (dComIfGp_TargetWarpPt_get() == 9 && dComIfGp_TransportWarp_check()))
{ {
dStage_changeScene(2, 0.0f, 0, fopAcM_GetRoomNo(this), shape_angle.y, -1); dStage_changeScene(2, 0.0f, 0, fopAcM_GetRoomNo(this), shape_angle.y, -1);

4063
src/d/actor/d_a_e_sw.cpp
View File

File diff suppressed because it is too large Load Diff

2
src/d/actor/d_a_npc_jagar.cpp
View File

@ -1314,7 +1314,7 @@ int daNpc_Jagar_c::wait(void* param_0) {
if (chkSitMotion() || field_0x1002 != 0) { if (chkSitMotion() || field_0x1002 != 0) {
if (!daNpcT_chkEvtBit(0x235) && !daNpcT_chkEvtBit(0x87) && if (!daNpcT_chkEvtBit(0x235) && !daNpcT_chkEvtBit(0x87) &&
daNpcT_chkTmpBit(0x10)) { daNpcT_chkTmpBit(0x10)) {
if (daPy_getPlayerActorClass()->eventInfo.chkCondition(1) != 0 ? 1 : 0) { if (daPy_getPlayerActorClass()->eventInfo.chkCondition(dEvtCnd_CANTALK_e) != 0 ? 1 : 0) {
mEvtNo = 3; mEvtNo = 3;
} }
} }

2
src/d/actor/d_a_npc_maro.cpp
View File

@ -3316,7 +3316,7 @@ int daNpc_Maro_c::arrowTutorial(void* ) {
field_0xe33 = 1; field_0xe33 = 1;
} else { } else {
actor_p = (daTag_EvtArea_c*) mActorMngr[6].getActorP(); actor_p = (daTag_EvtArea_c*) mActorMngr[6].getActorP();
if (actor_p != NULL && !(daPy_getPlayerActorClass()->eventInfo.chkCondition(1) == 0)) { if (actor_p != NULL && !(daPy_getPlayerActorClass()->eventInfo.chkCondition(dEvtCnd_CANTALK_e) == 0)) {
if (actor_p->chkPointInArea(daPy_getPlayerActorClass()->current.pos) == 0) { if (actor_p->chkPointInArea(daPy_getPlayerActorClass()->current.pos) == 0) {
mEvtNo = 9; mEvtNo = 9;
} }

2
src/d/actor/d_a_npc_moi.cpp
View File

@ -1894,7 +1894,7 @@ int daNpc_Moi_c::walkOnEggshell(void* param_1) {
if (field_0x1658) { if (field_0x1658) {
field_0x1658 = injuryCheck(); field_0x1658 = injuryCheck();
if (field_0x1658) { if (field_0x1658) {
if (daPy_getPlayerActorClass()->eventInfo.chkCondition(1) != 0) { if (daPy_getPlayerActorClass()->eventInfo.chkCondition(dEvtCnd_CANTALK_e) != 0) {
f32 fVar = daPy_getPlayerActorClass()->attention_info.position.absXZ( f32 fVar = daPy_getPlayerActorClass()->attention_info.position.absXZ(
attention_info.position); attention_info.position);
} }

4
src/d/actor/d_a_npc_uri.cpp
View File

@ -1491,7 +1491,7 @@ int daNpc_Uri_c::wait(void* param_0) {
if (chkPointInArea(acStack_70, attention_info.position, 200.0f, fVar2, fVar3, if (chkPointInArea(acStack_70, attention_info.position, 200.0f, fVar2, fVar3,
0)) 0))
{ {
if (daPy_getPlayerActorClass()->eventInfo.chkCondition(1) != 0 && if (daPy_getPlayerActorClass()->eventInfo.chkCondition(dEvtCnd_CANTALK_e) != 0 &&
chkPlayerCarryBasket()) chkPlayerCarryBasket())
{ {
mEvtNo = 5; mEvtNo = 5;
@ -1511,7 +1511,7 @@ int daNpc_Uri_c::wait(void* param_0) {
daNpc_Uri_Param_c::m.field_0x5c, mCurAngle.y)) daNpc_Uri_Param_c::m.field_0x5c, mCurAngle.y))
{ {
if (!daPy_getPlayerActorClass()->checkPlayerFly()) { if (!daPy_getPlayerActorClass()->checkPlayerFly()) {
if (daPy_getPlayerActorClass()->eventInfo.chkCondition(1) != 0) { if (daPy_getPlayerActorClass()->eventInfo.chkCondition(dEvtCnd_CANTALK_e) != 0) {
if (chkActorInSight(daPy_getPlayerActorClass(), mAttnFovY, if (chkActorInSight(daPy_getPlayerActorClass(), mAttnFovY,
home.angle.y)) home.angle.y))
{ {

1822
src/d/actor/d_a_obj_volcbom.cpp
View File

File diff suppressed because it is too large Load Diff