Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions config/GZ2E01/rels/d_a_obj_kita/symbols.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ _unresolved = .text:0x00000058; // type:function size:0x20 scope:global
__register_global_object = .text:0x00000078; // type:function size:0x1C scope:global
__destroy_global_chain = .text:0x00000094; // type:function size:0x58 scope:global
__ct__16daObj_Kita_HIO_cFv = .text:0x000000EC; // type:function size:0x40 scope:global
daObj_Kita_Draw__FP14obj_kita_class = .text:0x0000012C; // type:function size:0x98 scope:global
ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c = .text:0x000001C4; // type:function size:0xC scope:global
ita_control__FP14obj_kita_class = .text:0x000001D0; // type:function size:0x4A8 scope:global
action__FP14obj_kita_class = .text:0x00000678; // type:function size:0x138 scope:global
daObj_Kita_Execute__FP14obj_kita_class = .text:0x000007B0; // type:function size:0x5C scope:global
daObj_Kita_IsDelete__FP14obj_kita_class = .text:0x0000080C; // type:function size:0x8 scope:global
daObj_Kita_Delete__FP14obj_kita_class = .text:0x00000814; // type:function size:0x9C scope:global
useHeapInit__FP10fopAc_ac_c = .text:0x000008B0; // type:function size:0x13C scope:global
daObj_Kita_Create__FP10fopAc_ac_c = .text:0x000009EC; // type:function size:0x1F8 scope:global
daObj_Kita_Draw__FP14obj_kita_class = .text:0x0000012C; // type:function size:0x98 scope:local
ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c = .text:0x000001C4; // type:function size:0xC scope:local
ita_control__FP14obj_kita_class = .text:0x000001D0; // type:function size:0x4A8 scope:local
action__FP14obj_kita_class = .text:0x00000678; // type:function size:0x138 scope:local
daObj_Kita_Execute__FP14obj_kita_class = .text:0x000007B0; // type:function size:0x5C scope:local
daObj_Kita_IsDelete__FP14obj_kita_class = .text:0x0000080C; // type:function size:0x8 scope:local
daObj_Kita_Delete__FP14obj_kita_class = .text:0x00000814; // type:function size:0x9C scope:local
useHeapInit__FP10fopAc_ac_c = .text:0x000008B0; // type:function size:0x13C scope:local
daObj_Kita_Create__FP10fopAc_ac_c = .text:0x000009EC; // type:function size:0x1F8 scope:local
__dt__6kita_sFv = .text:0x00000BE4; // type:function size:0x3C scope:global
__ct__6kita_sFv = .text:0x00000C20; // type:function size:0x4 scope:global
__dt__16daObj_Kita_HIO_cFv = .text:0x00000C24; // type:function size:0x48 scope:global
Expand Down Expand Up @@ -46,10 +46,10 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@4084 = .rodata:0x0000005C; // type:object size:0x4 scope:local
@4085 = .rodata:0x00000060; // type:object size:0x4 scope:local
@stringBase0 = .rodata:0x00000064; // type:object size:0x9 scope:local data:string_table
l_daObj_Kita_Method = .data:0x00000000; // type:object size:0x20 scope:global
l_daObj_Kita_Method = .data:0x00000000; // type:object size:0x20 scope:local
g_profile_OBJ_KITA = .data:0x00000020; // type:object size:0x30 scope:global
__vt__16daObj_Kita_HIO_c = .data:0x00000050; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_502_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte
@3764 = .bss:0x0000000C; // type:object size:0xC scope:local
l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte
l_HIO = .bss:0x00000018; // type:object size:0x18 scope:local data:byte
24 changes: 12 additions & 12 deletions config/GZ2J01/rels/d_a_obj_kita/symbols.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ _unresolved = .text:0x00000058; // type:function size:0x20 scope:global
__register_global_object = .text:0x00000078; // type:function size:0x1C scope:global
__destroy_global_chain = .text:0x00000094; // type:function size:0x58 scope:global
__ct__16daObj_Kita_HIO_cFv = .text:0x000000EC; // type:function size:0x40 scope:global
daObj_Kita_Draw__FP14obj_kita_class = .text:0x0000012C; // type:function size:0x98 scope:global
ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c = .text:0x000001C4; // type:function size:0xC scope:global
ita_control__FP14obj_kita_class = .text:0x000001D0; // type:function size:0x4A8 scope:global
action__FP14obj_kita_class = .text:0x00000678; // type:function size:0x138 scope:global
daObj_Kita_Execute__FP14obj_kita_class = .text:0x000007B0; // type:function size:0x5C scope:global
daObj_Kita_IsDelete__FP14obj_kita_class = .text:0x0000080C; // type:function size:0x8 scope:global
daObj_Kita_Delete__FP14obj_kita_class = .text:0x00000814; // type:function size:0x9C scope:global
useHeapInit__FP10fopAc_ac_c = .text:0x000008B0; // type:function size:0x13C scope:global
daObj_Kita_Create__FP10fopAc_ac_c = .text:0x000009EC; // type:function size:0x1F8 scope:global
daObj_Kita_Draw__FP14obj_kita_class = .text:0x0000012C; // type:function size:0x98 scope:local
ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c = .text:0x000001C4; // type:function size:0xC scope:local
ita_control__FP14obj_kita_class = .text:0x000001D0; // type:function size:0x4A8 scope:local
action__FP14obj_kita_class = .text:0x00000678; // type:function size:0x138 scope:local
daObj_Kita_Execute__FP14obj_kita_class = .text:0x000007B0; // type:function size:0x5C scope:local
daObj_Kita_IsDelete__FP14obj_kita_class = .text:0x0000080C; // type:function size:0x8 scope:local
daObj_Kita_Delete__FP14obj_kita_class = .text:0x00000814; // type:function size:0x9C scope:local
useHeapInit__FP10fopAc_ac_c = .text:0x000008B0; // type:function size:0x13C scope:local
daObj_Kita_Create__FP10fopAc_ac_c = .text:0x000009EC; // type:function size:0x1F8 scope:local
__dt__6kita_sFv = .text:0x00000BE4; // type:function size:0x3C scope:global
__ct__6kita_sFv = .text:0x00000C20; // type:function size:0x4 scope:global
__dt__16daObj_Kita_HIO_cFv = .text:0x00000C24; // type:function size:0x48 scope:global
Expand Down Expand Up @@ -46,10 +46,10 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@4084 = .rodata:0x0000005C; // type:object size:0x4 scope:local
@4085 = .rodata:0x00000060; // type:object size:0x4 scope:local
@stringBase0 = .rodata:0x00000064; // type:object size:0x9 scope:local data:string_table
l_daObj_Kita_Method = .data:0x00000000; // type:object size:0x20 scope:global
l_daObj_Kita_Method = .data:0x00000000; // type:object size:0x20 scope:local
g_profile_OBJ_KITA = .data:0x00000020; // type:object size:0x30 scope:global
__vt__16daObj_Kita_HIO_c = .data:0x00000050; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_502_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte scope:local
@3764 = .bss:0x0000000C; // type:object size:0xC scope:local
l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte
l_HIO = .bss:0x00000018; // type:object size:0x18 scope:local data:byte
24 changes: 12 additions & 12 deletions config/GZ2P01/rels/d_a_obj_kita/symbols.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ _unresolved = .text:0x00000058; // type:function size:0x20 scope:global
__register_global_object = .text:0x00000078; // type:function size:0x1C scope:global
__destroy_global_chain = .text:0x00000094; // type:function size:0x58 scope:global
__ct__16daObj_Kita_HIO_cFv = .text:0x000000EC; // type:function size:0x40 scope:global
daObj_Kita_Draw__FP14obj_kita_class = .text:0x0000012C; // type:function size:0x98 scope:global
ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c = .text:0x000001C4; // type:function size:0xC scope:global
ita_control__FP14obj_kita_class = .text:0x000001D0; // type:function size:0x4A8 scope:global
action__FP14obj_kita_class = .text:0x00000678; // type:function size:0x138 scope:global
daObj_Kita_Execute__FP14obj_kita_class = .text:0x000007B0; // type:function size:0x5C scope:global
daObj_Kita_IsDelete__FP14obj_kita_class = .text:0x0000080C; // type:function size:0x8 scope:global
daObj_Kita_Delete__FP14obj_kita_class = .text:0x00000814; // type:function size:0x9C scope:global
useHeapInit__FP10fopAc_ac_c = .text:0x000008B0; // type:function size:0x13C scope:global
daObj_Kita_Create__FP10fopAc_ac_c = .text:0x000009EC; // type:function size:0x1F8 scope:global
daObj_Kita_Draw__FP14obj_kita_class = .text:0x0000012C; // type:function size:0x98 scope:local
ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c = .text:0x000001C4; // type:function size:0xC scope:local
ita_control__FP14obj_kita_class = .text:0x000001D0; // type:function size:0x4A8 scope:local
action__FP14obj_kita_class = .text:0x00000678; // type:function size:0x138 scope:local
daObj_Kita_Execute__FP14obj_kita_class = .text:0x000007B0; // type:function size:0x5C scope:local
daObj_Kita_IsDelete__FP14obj_kita_class = .text:0x0000080C; // type:function size:0x8 scope:local
daObj_Kita_Delete__FP14obj_kita_class = .text:0x00000814; // type:function size:0x9C scope:local
useHeapInit__FP10fopAc_ac_c = .text:0x000008B0; // type:function size:0x13C scope:local
daObj_Kita_Create__FP10fopAc_ac_c = .text:0x000009EC; // type:function size:0x1F8 scope:local
__dt__6kita_sFv = .text:0x00000BE4; // type:function size:0x3C scope:global
__ct__6kita_sFv = .text:0x00000C20; // type:function size:0x4 scope:global
__dt__16daObj_Kita_HIO_cFv = .text:0x00000C24; // type:function size:0x48 scope:global
Expand Down Expand Up @@ -46,10 +46,10 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@4084 = .rodata:0x0000005C; // type:object size:0x4 scope:local
@4085 = .rodata:0x00000060; // type:object size:0x4 scope:local
@stringBase0 = .rodata:0x00000064; // type:object size:0x9 scope:local data:string_table
l_daObj_Kita_Method = .data:0x00000000; // type:object size:0x20 scope:global
l_daObj_Kita_Method = .data:0x00000000; // type:object size:0x20 scope:local
g_profile_OBJ_KITA = .data:0x00000020; // type:object size:0x30 scope:global
__vt__16daObj_Kita_HIO_c = .data:0x00000050; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_502_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte scope:local
@3764 = .bss:0x0000000C; // type:object size:0xC scope:local
l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte
l_HIO = .bss:0x00000018; // type:object size:0x18 scope:local data:byte
18 changes: 9 additions & 9 deletions config/RZDE01_00/rels/d_a_obj_kita/symbols.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ _unresolved = .text:0x00000058; // type:function size:0x4 scope:global
__register_global_object = .text:0x0000005C; // type:function size:0x1C scope:global
__destroy_global_chain = .text:0x00000078; // type:function size:0x54 scope:global
__ct__16daObj_Kita_HIO_cFv = .text:0x000000CC; // type:function size:0x40 scope:global
daObj_Kita_Draw__FP14obj_kita_class = .text:0x0000010C; // type:function size:0x90 scope:global
ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c = .text:0x0000019C; // type:function size:0xC scope:global
daObj_Kita_Execute__FP14obj_kita_class = .text:0x000001A8; // type:function size:0x66C scope:global
daObj_Kita_IsDelete__FP14obj_kita_class = .text:0x00000814; // type:function size:0x8 scope:global
daObj_Kita_Delete__FP14obj_kita_class = .text:0x0000081C; // type:function size:0x98 scope:global
useHeapInit__FP10fopAc_ac_c = .text:0x000008B4; // type:function size:0x12C scope:global
daObj_Kita_Create__FP10fopAc_ac_c = .text:0x000009E0; // type:function size:0x1EC scope:global
daObj_Kita_Draw__FP14obj_kita_class = .text:0x0000010C; // type:function size:0x90 scope:local
ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c = .text:0x0000019C; // type:function size:0xC scope:local
daObj_Kita_Execute__FP14obj_kita_class = .text:0x000001A8; // type:function size:0x66C scope:local
daObj_Kita_IsDelete__FP14obj_kita_class = .text:0x00000814; // type:function size:0x8 scope:local
daObj_Kita_Delete__FP14obj_kita_class = .text:0x0000081C; // type:function size:0x98 scope:local
useHeapInit__FP10fopAc_ac_c = .text:0x000008B4; // type:function size:0x12C scope:local
daObj_Kita_Create__FP10fopAc_ac_c = .text:0x000009E0; // type:function size:0x1EC scope:local
__ct__6kita_sFv = .text:0x00000BCC; // type:function size:0x4 scope:global
__dt__16daObj_Kita_HIO_cFv = .text:0x00000BD0; // type:function size:0x40 scope:global
__sinit_d_a_obj_kita_cpp = .text:0x00000C10; // type:function size:0x48 scope:local
Expand Down Expand Up @@ -44,7 +44,7 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@94543 = .rodata:0x0000005C; // type:object size:0x4 scope:local
@94544 = .rodata:0x00000060; // type:object size:0x4 scope:local
lbl_503_data_0 = .data:0x00000000; // type:object size:0xC
l_daObj_Kita_Method = .data:0x0000000C; // type:object size:0x20 scope:global
l_daObj_Kita_Method = .data:0x0000000C; // type:object size:0x20 scope:glolocalal
g_profile_OBJ_KITA = .data:0x0000002C; // type:object size:0x30 scope:global
__vt__16daObj_Kita_HIO_c = .data:0x0000005C; // type:object size:0xC scope:global
lbl_503_data_68 = .data:0x00000068; // type:object size:0x14
Expand All @@ -53,4 +53,4 @@ __RTTI__16daObj_Kita_HIO_c = .data:0x00000088; // type:object size:0x8 scope:glo
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_503_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
@93316 = .bss:0x0000000C; // type:object size:0xC scope:local
l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte
l_HIO = .bss:0x00000018; // type:object size:0x18 scope:local data:byte
22 changes: 11 additions & 11 deletions config/ShieldD/rels/d_a_obj_kitaD/symbols.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ _unresolved = .text:0x00000060; // type:function size:0x20 scope:global
__dt__16daObj_Kita_HIO_cFv = .text:0x00000080; // type:function size:0x4C scope:global
__ct__16daObj_Kita_HIO_cFv = .text:0x000000D0; // type:function size:0x78 scope:global
genMessage__16daObj_Kita_HIO_cFP11JORMContext = .text:0x00000150; // type:function size:0x1CC scope:global
daObj_Kita_Draw__FP14obj_kita_class = .text:0x00000320; // type:function size:0xB4 scope:global
ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c = .text:0x000003E0; // type:function size:0x20 scope:global
ita_control__FP14obj_kita_class = .text:0x00000400; // type:function size:0x5CC scope:global
action__FP14obj_kita_class = .text:0x000009D0; // type:function size:0x1CC scope:global
daObj_Kita_Execute__FP14obj_kita_class = .text:0x00000BA0; // type:function size:0xA4 scope:global
daObj_Kita_IsDelete__FP14obj_kita_class = .text:0x00000C50; // type:function size:0x8 scope:global
daObj_Kita_Delete__FP14obj_kita_class = .text:0x00000C60; // type:function size:0xBC scope:global
useHeapInit__FP10fopAc_ac_c = .text:0x00000D20; // type:function size:0x1BC scope:global
daObj_Kita_Create__FP10fopAc_ac_c = .text:0x00000EE0; // type:function size:0x260 scope:global
daObj_Kita_Draw__FP14obj_kita_class = .text:0x00000320; // type:function size:0xB4 scope:local
ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c = .text:0x000003E0; // type:function size:0x20 scope:local
ita_control__FP14obj_kita_class = .text:0x00000400; // type:function size:0x5CC scope:local
action__FP14obj_kita_class = .text:0x000009D0; // type:function size:0x1CC scope:local
daObj_Kita_Execute__FP14obj_kita_class = .text:0x00000BA0; // type:function size:0xA4 scope:local
daObj_Kita_IsDelete__FP14obj_kita_class = .text:0x00000C50; // type:function size:0x8 scope:local
daObj_Kita_Delete__FP14obj_kita_class = .text:0x00000C60; // type:function size:0xBC scope:local
useHeapInit__FP10fopAc_ac_c = .text:0x00000D20; // type:function size:0x1BC scope:local
daObj_Kita_Create__FP10fopAc_ac_c = .text:0x00000EE0; // type:function size:0x260 scope:local
__ct__14obj_kita_classFv = .text:0x00001140; // type:function size:0x54 scope:global
__dt__6kita_sFv = .text:0x000011A0; // type:function size:0x7C scope:global
__ct__6kita_sFv = .text:0x00001220; // type:function size:0x44 scope:global
Expand Down Expand Up @@ -63,7 +63,7 @@ lbl_490_rodata_7C = .rodata:0x0000007C; // type:object size:0x18
@118617 = .data:0x000000D8; // type:object size:0x23 scope:local data:string
@118618 = .data:0x000000FC; // type:object size:0x21 scope:local data:string
@118621 = .data:0x00000120; // type:object size:0xF scope:local
l_daObj_Kita_Method = .data:0x00000130; // type:object size:0x20 scope:global
l_daObj_Kita_Method = .data:0x00000130; // type:object size:0x20 scope:local
g_profile_OBJ_KITA = .data:0x00000150; // type:object size:0x30 scope:global
__vt__16daObj_Kita_HIO_c = .data:0x00000180; // type:object size:0x20 scope:global
@118643 = .data:0x000001A0; // type:object size:0x11 scope:local data:string
Expand All @@ -74,4 +74,4 @@ __RTTI__16daObj_Kita_HIO_c = .data:0x000001C8; // type:object size:0x8 scope:glo
@118647 = .data:0x00000204; // type:object size:0x11 scope:local data:string
lbl_490_data_215 = .data:0x00000215; // type:object size:0xF
lbl_490_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
l_HIO = .bss:0x00000008; // type:object size:0x18 scope:global data:byte
l_HIO = .bss:0x00000008; // type:object size:0x18 scope:local data:byte
2 changes: 1 addition & 1 deletion configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -1979,7 +1979,7 @@ def MatchingFor(*versions) -> bool:
ActorRel(NonMatching, "d_a_obj_keyhole"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_ki"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_kiPot"),
ActorRel(NonMatching, "d_a_obj_kita"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_kita"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_kjgjs"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_kkanban"),
ActorRel(NonMatching, "d_a_obj_knBullet"),
Expand Down
59 changes: 48 additions & 11 deletions include/d/actor/d_a_obj_kita.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,24 @@

#include "f_op/f_op_actor_mng.h"

struct kita_s {
public:
/* 80C45E44 */ ~kita_s() {}
/* 80C45E80 */ kita_s() {}

/* 0x00 */ J3DModel* mModel;
/* 0x04 */ cXyz mPos;
/* 0x10 */ cXyz field_0x10;
/* 0x1C */ csXyz mAngle;
/* 0x24 */ f32 mScaleX;
/* 0x28 */ s16 field_0x28;
/* 0x2C */ Mtx mMtx;
/* 0x5C */ dBgW* mBgW;
};

STATIC_ASSERT(sizeof(kita_s) == 0x60);


/**
* @ingroup actors-objects
* @class obj_kita_class
Expand All @@ -11,23 +29,42 @@
* @details
*
*/
class obj_kita_class : public fopAc_ac_c {
private:
/* 0x568 */ u8 field_0x568[0xd78 - 0x568];
class obj_kita_class {
public:
/* 0x000 */ fopAc_ac_c mActor;
/* 0x569 */ request_of_phase_process_class mPhase;
/* 0x570 */ u8 field_0x570;
/* 0x572 */ s16 field_0x572;
/* 0x574 */ s16 field_0x574;
/* 0x576 */ s16 field_0x576;
/* 0x578 */ s16 field_0x578[2];
/* 0x57C */ int mNumKitas;
/* 0x580 */ f32 field_0x580;
/* 0x584 */ s16 field_0x584;
/* 0x586 */ s16 field_0x586;
/* 0x588 */ s16 field_0x588;
/* 0x58A */ s16 field_0x58a;
/* 0x58C */ s16 field_0x58c;
/* 0x58E */ s16 field_0x58e;
/* 0x590 */ s8 field_0x590;
/* 0x594 */ kita_s mKitas[21];
/* 0xD74 */ bool mIsHIOOwner;
};

STATIC_ASSERT(sizeof(obj_kita_class) == 0xd78);

struct kita_s {
public:
/* 80C45E44 */ ~kita_s();
/* 80C45E80 */ kita_s();
};

class daObj_Kita_HIO_c {
class daObj_Kita_HIO_c : public JORReflexible {
public:
/* 80C4534C */ daObj_Kita_HIO_c();
/* 80C45E84 */ ~daObj_Kita_HIO_c();
/* 80C45E84 */ virtual ~daObj_Kita_HIO_c() {}

void genMessage(JORMContext*);

/* 0x04 */ s8 mId;
/* 0x08 */ f32 mModelSizeX;
/* 0x0C */ f32 mModelSizeZ;
/* 0x10 */ f32 mGap;
/* 0x14 */ f32 mSwingRange;
};


Expand Down
Loading