mirror of
https://github.com/encounter/tp.git
synced 2026-07-11 06:18:46 -07:00
d_a_tag_* TUs mostly matching for debug (#3054)
* d_a_tag_event debug almost matching * d_a_tag_msg debug almost matching * d_a_tag_attention almost matching * d_a_tag_chkpoint debug almost matching (weak func order) * d_a_tag_evt debug almost matching (extra weak fns) * d_a_tag_evtarea debug almost matching (weak func order) * d_a_tag_evtmsg debug almost matching (weak func order) * d_a_tag_mist debug almost matching (weak func order) * d_a_tag_howl debug almost matching (weak func order) * d_a_tag_lantern debug almost matching (weak func order) * d_a_tag_push debug almost matching (weak func order) * d_a_tag_telop debug almost matching (weak func order) * d_a_tag_CstaSw debug almost matching (weak func order) * d_a_tag_ajnot debug almost matching (weak func order) * d_a_tag_attack_item debug almost matching (weak func order) * d_a_tag_gstart debug almost matching (weak func order) * d_a_tag_hinit debug almost matching (debug weak func order) * d_a_tag_hjump debug almost matching (weak func order) * d_a_tag_hstop debug almost matching (weak func order) * d_a_tag_lv2prchk debug almost matching (weak func order) * d_a_tag_magne debug almost matching (weak func order) * d_a_tag_mhint debug almost matching (weak func order) * d_a_tag_mstop debug almost matching (weak func order) * d_a_tag_spring debug almost matching (weak func order) * d_a_tag_statue_evt debug almost matching (weak func order) * d_a_tag_arena debug almost matching (weak func order) * d_a_tag_Lv6Gate debug almost matching (weak func order) * d_a_tag_Lv7Gate debug almost matching (weak func order) * d_a_tag_Lv8Gate debug almost matching (.data + weak func order) * d_a_tag_TWgate debug almost matching (weak func order) * d_a_tag_lv6CstaSw debug almost matching (weak func order) * d_a_tag_assistance debug almost matching (weak func order) * d_a_tag_bottle_item debug almost matching (weak func order) * d_a_tag_chgrestart debug almost matching (weak func order) * d_a_tag_csw debug almost matching (weak func order) * d_a_tag_escape debug almost matching (weak func order) * d_a_tag_firewall debug almost matching (weak func order) * d_a_tag_gra debug almost matching (weak func order) * d_a_tag_guard debug almost matching (weak func order) * d_a_tag_instruction debug almost matching (weak func order) * d_a_tag_kago_fall debug almost matching (weak func order) * d_a_tag_lightball debug almost matching (weak func order) * d_a_tag_lv5soup debug almost matching (weak func order) * d_a_tag_mmsg debug almost matching (weak func order) * d_a_tag_mwait debug almost matching (weak func order) * d_a_tag_myna2 debug almost matching (weak func order) * d_a_tag_myna_light debug almost matching (weak func order) * d_a_tag_pachi debug almost matching (weak func order) * d_a_tag_poFire debug almost matching (weak func order) * d_a_tag_qs debug almost matching (small mismatch in search) * d_a_tag_ret_room debug almost matching (weak func order) * d_a_tag_river_back debug almost matching (weak func order) * d_a_tag_rmbit_sw debug almost matching (weak func order) * d_a_tag_schedule debug almost matching (weak func order) * d_a_tag_setBall debug almost matching (weak func order) * d_a_tag_setrestart debug almost matching (weak func order) * d_a_tag_shop_item debug almost matching (weak func order) * d_a_tag_smk_emt debug almost matching (weak func order) * d_a_tag_spinner debug almost matching (weak func order) * d_a_tag_sspath debug almost matching (weak func order) * d_a_tag_ss_drink debug almost matching (weak func order) * d_a_tag_stream debug almost matching (weak func order) * d_a_tag_theB_hint debug almost matching (weak func order) * d_a_tag_watchge debug almost matching (weak func order) * d_a_tag_waterfall debug almost matching (weak func order) * d_a_tag_allmato debug almost matching (weak func order) * d_a_tag_camera debug almost matching (extra weak fns) * d_a_tag_wara_howl debug almost matching (RTTI mismatch?) * d_a_tag_yami debug almost matching (weak func order) * Fix Shield regressions related to d_a_tag_* debug work
This commit is contained in:
Max Roncace
@@ -26185,7 +26185,7 @@ lbl_80537A93 = .sdata:0x80537A93; // type:object size:0x8 data:string
|
||||
lbl_80537A9B = .sdata:0x80537A9B; // type:object size:0x7 data:string
|
||||
lbl_80537AA2 = .sdata:0x80537AA2; // type:object size:0x5 data:string
|
||||
lbl_80537AA7 = .sdata:0x80537AA7; // type:object size:0x8 data:string
|
||||
lbl_80537AAF = .sdata:0x80537AAF; // type:object size:0x1 data:byte
|
||||
g_blackColor = .sdata:0x80537AAF; // type:object size:0x1 data:byte
|
||||
lbl_80537AB0 = .sdata:0x80537AB0; // type:object size:0x1 data:byte
|
||||
lbl_80537AB1 = .sdata:0x80537AB1; // type:object size:0x1 data:byte
|
||||
lbl_80537AB2 = .sdata:0x80537AB2; // type:object size:0x1 data:byte
|
||||
|
||||
@@ -25761,7 +25761,7 @@ lbl_8051DB33 = .sdata:0x8051DB33; // type:object size:0x8 data:string
|
||||
lbl_8051DB3B = .sdata:0x8051DB3B; // type:object size:0x7 data:string
|
||||
lbl_8051DB42 = .sdata:0x8051DB42; // type:object size:0x5 data:string
|
||||
lbl_8051DB47 = .sdata:0x8051DB47; // type:object size:0x8 data:string
|
||||
lbl_8051DB4F = .sdata:0x8051DB4F; // type:object size:0x1 data:byte
|
||||
g_blackColor = .sdata:0x8051DB4F; // type:object size:0x1 data:byte
|
||||
lbl_8051DB50 = .sdata:0x8051DB50; // type:object size:0x1 data:byte
|
||||
lbl_8051DB51 = .sdata:0x8051DB51; // type:object size:0x1 data:byte
|
||||
lbl_8051DB52 = .sdata:0x8051DB52; // type:object size:0x1 data:byte
|
||||
|
||||
@@ -25762,7 +25762,7 @@ lbl_8051B9AB = .sdata:0x8051B9AB; // type:object size:0x8 data:string
|
||||
lbl_8051B9B3 = .sdata:0x8051B9B3; // type:object size:0x7 data:string
|
||||
lbl_8051B9BA = .sdata:0x8051B9BA; // type:object size:0x5 data:string
|
||||
lbl_8051B9BF = .sdata:0x8051B9BF; // type:object size:0x8 data:string
|
||||
lbl_8051B9C7 = .sdata:0x8051B9C7; // type:object size:0x1 data:byte
|
||||
g_blackColor = .sdata:0x8051B9C7; // type:object size:0x1 data:byte
|
||||
lbl_8051B9C8 = .sdata:0x8051B9C8; // type:object size:0x1 data:byte
|
||||
lbl_8051B9C9 = .sdata:0x8051B9C9; // type:object size:0x1 data:byte
|
||||
lbl_8051B9CA = .sdata:0x8051B9CA; // type:object size:0x1 data:byte
|
||||
@@ -27811,6 +27811,7 @@ mParticleTracePCB__13dPa_control_c = .sbss:0x8051E988; // type:object size:0x4 s
|
||||
mWipe__12dDlst_list_c = .sbss:0x8051E990; // type:object size:0x1 data:byte
|
||||
mWipeRate__12dDlst_list_c = .sbss:0x8051E994; // type:object size:0x4 scope:global align:4 data:float
|
||||
mWipeSpeed__12dDlst_list_c = .sbss:0x8051E998; // type:object size:0x4 scope:global align:4 data:float
|
||||
lbl_8051E99C = .sbss:0x8051E99C; // type:object size:0x4
|
||||
init$0000 = .sbss:0x8051E9A0; // type:object size:0x1 scope:local data:byte
|
||||
S_parcent_bak$99593 = .sbss:0x8051E9A8; // type:object size:0x4 scope:local align:4 data:float
|
||||
S_rot_work1$100794 = .sbss:0x8051E9AC; // type:object size:0x2 scope:local align:4 data:2byte
|
||||
|
||||
@@ -25757,7 +25757,7 @@ lbl_8051E433 = .sdata:0x8051E433; // type:object size:0x8 data:string
|
||||
lbl_8051E43B = .sdata:0x8051E43B; // type:object size:0x7 data:string
|
||||
lbl_8051E442 = .sdata:0x8051E442; // type:object size:0x5 data:string
|
||||
lbl_8051E447 = .sdata:0x8051E447; // type:object size:0x8 data:string
|
||||
lbl_8051E44F = .sdata:0x8051E44F; // type:object size:0x1 data:byte
|
||||
g_blackColor = .sdata:0x8051E44F; // type:object size:0x1 data:byte
|
||||
lbl_8051E450 = .sdata:0x8051E450; // type:object size:0x1 data:byte
|
||||
lbl_8051E451 = .sdata:0x8051E451; // type:object size:0x1 data:byte
|
||||
lbl_8051E452 = .sdata:0x8051E452; // type:object size:0x1 data:byte
|
||||
|
||||
@@ -270,5 +270,5 @@ lbl_88_data_1BD8 = .data:0x00001BD8; // type:object size:0x24
|
||||
@120156 = .data:0x00001DD4; // type:object size:0xC scope:local data:string
|
||||
@120184 = .data:0x00001DF4; // type:object size:0xD scope:local data:string
|
||||
l_HIO = .bss:0x00000000; // type:object size:0x4 scope:global
|
||||
lbl_88_bss_4 = .bss:0x00000004; // type:object size:0x1 data:byte
|
||||
@GUARD@setAttnPos__12daNpc_Taro_cFv@prtclScl = .bss:0x00000004; // type:object size:0x1 data:byte
|
||||
@LOCAL@setAttnPos__12daNpc_Taro_cFv@prtclScl = .bss:0x00000008; // type:object size:0xC scope:local align:4 data:float
|
||||
|
||||
@@ -30,4 +30,4 @@ game_over_eff_name__11Tag_FWall_n = .data:0x00000040; // type:object size:0x8 sc
|
||||
l_daTag_FWall_Method = .data:0x00000060; // type:object size:0x20 scope:global
|
||||
g_profile_Tag_FWall = .data:0x00000080; // type:object size:0x30 scope:global
|
||||
fire_leader = .bss:0x00000000; // type:object size:0x4 scope:global
|
||||
lbl_708_bss_4 = .bss:0x00000004; // type:object size:0x1 data:byte
|
||||
fire_num = .bss:0x00000004; // type:object size:0x1 data:byte
|
||||
|
||||
@@ -61,5 +61,5 @@ __RTTI__20daTagWaterFall_HIO_c = .data:0x000001A0; // type:object size:0x8 scope
|
||||
@118516 = .data:0x000001A8; // type:object size:0xE scope:local data:string
|
||||
@118517 = .data:0x000001B8; // type:object size:0xC scope:local
|
||||
@118518 = .data:0x000001DC; // type:object size:0x11 scope:local data:string
|
||||
lbl_743_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
|
||||
masterWaterfallTagExists = .bss:0x00000000; // type:object size:0x1 data:byte
|
||||
l_HIO = .bss:0x00000004; // type:object size:0x24 scope:global data:byte
|
||||
|
||||
+67
-67
@@ -2130,19 +2130,19 @@ config.libs = [
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_set_bgobj"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_swhit0"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_allmato"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_camera"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_chkpoint"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_event"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_evt"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_evtarea"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_evtmsg"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_howl"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_camera"), # debug extra weak fns
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_chkpoint"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_event"), # TODO: this is part of Rframework in ShieldD
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_evt"), # debug extra weak fns
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_evtarea"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_evtmsg"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_howl"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_kmsg"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_lantern"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mist"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_msg"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_push"),
|
||||
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_telop"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_lantern"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mist"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_msg"), # TODO: this is part of Rframework in ShieldD
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_push"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_telop"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tbox"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tbox2"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_vrbox"),
|
||||
@@ -2223,19 +2223,19 @@ config.libs = [
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_shop_item"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_sq"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_swc00"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_CstaSw"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_ajnot"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_attack_item"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_gstart"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_hinit"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_hjump"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_hstop"),
|
||||
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_lv2prchk"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_magne"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mhint"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mstop"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_spring"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_statue_evt"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_CstaSw"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_ajnot"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_attack_item"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_gstart"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_hinit"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_hjump"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_hstop"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_lv2prchk"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_magne"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mhint"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mstop"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_spring"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_statue_evt"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_ykgr"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_L7demo_dr"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_L7low_dr"),
|
||||
@@ -2805,7 +2805,7 @@ config.libs = [
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_obj_zra_freeze"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_obj_zra_rock"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_passer_mng"),
|
||||
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_arena"),
|
||||
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_arena"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_peru"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_ppolamp"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_skip_2D"),
|
||||
@@ -2813,49 +2813,49 @@ config.libs = [
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_swBall"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_swLBall"),
|
||||
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_swTime"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_Lv6Gate"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_Lv7Gate"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_Lv8Gate"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_TWgate"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_lv6CstaSw"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_assistance"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_bottle_item"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_chgrestart"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_csw"),
|
||||
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_escape"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_firewall"),
|
||||
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_gra"),
|
||||
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_guard"),
|
||||
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_instruction"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_kago_fall"),
|
||||
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_lightball"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_lv5soup"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mmsg"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mwait"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_myna2"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_myna_light"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_pachi"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_poFire"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_Lv6Gate"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_Lv7Gate"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_Lv8Gate"), # debug .data + weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_TWgate"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_lv6CstaSw"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_assistance"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_bottle_item"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_chgrestart"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_csw"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN, ALL_WII, "Shield"), "d_a_tag_escape"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_firewall"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN, ALL_WII, "Shield"), "d_a_tag_gra"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_guard"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN, ALL_WII, "Shield"), "d_a_tag_instruction"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_kago_fall"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_lightball"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_lv5soup"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mmsg"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mwait"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_myna2"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_myna_light"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_pachi"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_poFire"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_qs"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_ret_room"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_river_back"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_rmbit_sw"),
|
||||
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_schedule"),
|
||||
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_setBall"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_setrestart"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_shop_camera"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_shop_item"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_smk_emt"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_spinner"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_sppath"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_ss_drink"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_stream"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_theB_hint"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_wara_howl"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_watchge"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_waterfall"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_ret_room"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_river_back"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_rmbit_sw"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN, ALL_WII, "Shield"), "d_a_tag_schedule"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN, ALL_WII, "Shield"), "d_a_tag_setBall"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_setrestart"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_shop_camera"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_shop_item"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_smk_emt"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_spinner"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_sppath"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_ss_drink"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_stream"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_theB_hint"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_wara_howl"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_watchge"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_waterfall"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_wljump"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_yami"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_tag_yami"), # debug weak func order
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_talk"),
|
||||
ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tboxSw"),
|
||||
ActorRel(MatchingFor(ALL_GCN), "d_a_title"),
|
||||
|
||||
@@ -5,22 +5,6 @@
|
||||
#include "d/d_particle_copoly.h"
|
||||
#include "f_op/f_op_actor.h"
|
||||
|
||||
enum daCstatue_FLG0 {
|
||||
daCstatue_FLG0_1 = 0x1,
|
||||
daCstatue_FLG0_2 = 0x2,
|
||||
daCstatue_FLG0_4 = 0x4,
|
||||
daCstatue_FLG0_8 = 0x8,
|
||||
daCstatue_FLG0_10 = 0x10,
|
||||
daCstatue_FLG0_20 = 0x20,
|
||||
daCstatue_FLG0_Demo = 0x40,
|
||||
daCstatue_FLG0_80 = 0x80,
|
||||
daCstatue_FLG0_100 = 0x100,
|
||||
daCstatue_FLG0_200 = 0x200,
|
||||
daCstatue_FLG0_400 = 0x400,
|
||||
daCstatue_FLG0_800 = 0x800,
|
||||
daCstatue_FLG0_1000 = 0x1000,
|
||||
};
|
||||
|
||||
enum daCstatue_MoveMode {
|
||||
daCstatue_MoveMode_0,
|
||||
daCstatue_MoveMode_1,
|
||||
@@ -58,6 +42,22 @@ enum daCstatueType {
|
||||
*
|
||||
*/
|
||||
class daCstatue_c : public fopAc_ac_c {
|
||||
enum daCstatue_FLG0 {
|
||||
daCstatue_FLG0_1 = 0x1,
|
||||
daCstatue_FLG0_2 = 0x2,
|
||||
daCstatue_FLG0_4 = 0x4,
|
||||
daCstatue_FLG0_8 = 0x8,
|
||||
daCstatue_FLG0_10 = 0x10,
|
||||
daCstatue_FLG0_20 = 0x20,
|
||||
daCstatue_FLG0_Demo = 0x40,
|
||||
daCstatue_FLG0_80 = 0x80,
|
||||
daCstatue_FLG0_100 = 0x100,
|
||||
daCstatue_FLG0_200 = 0x200,
|
||||
daCstatue_FLG0_400 = 0x400,
|
||||
daCstatue_FLG0_800 = 0x800,
|
||||
daCstatue_FLG0_1000 = 0x1000,
|
||||
};
|
||||
|
||||
public:
|
||||
void atHitCallback(fopAc_ac_c*);
|
||||
int createHeap();
|
||||
|
||||
@@ -388,7 +388,7 @@ public:
|
||||
}
|
||||
BOOL checkHide() { return mHide || (mTwilight && !dComIfGs_wolfeye_effect_check()); }
|
||||
void setIntDemander(fopAc_ac_c* i_actor) { field_0x824.entry(i_actor); }
|
||||
void setIntFlowNodeNo(int i_flowNodeNo) { mFlowNodeNo = i_flowNodeNo; }
|
||||
void setIntFlowNodeNo(s32 i_flowNodeNo) { mFlowNodeNo = i_flowNodeNo; }
|
||||
void setCutType(int i_cutType) { mCutType = i_cutType; }
|
||||
void onInterrupt(u8 param_0) { field_0x9ef = param_0; }
|
||||
void onHide() { mHide = true; }
|
||||
|
||||
@@ -336,7 +336,7 @@ public:
|
||||
FLG0_FAST_SWORD_CUT = 0x80000,
|
||||
FLG0_UNK_40000 = 0x40000,
|
||||
FLG0_DK_CAUGHT2 = 0x20000,
|
||||
FLG0_UNK_10000 = 0x10000,
|
||||
FLG0_DEMO_STREAM_ACCEPT = 0x10000,
|
||||
FLG0_UNK_8000 = 0x8000,
|
||||
FLG0_UNK_4000 = 0x4000,
|
||||
FLG0_UNK_2000 = 0x2000,
|
||||
@@ -951,6 +951,8 @@ public:
|
||||
void onTraningCutLargeTurn() { onNoResetFlg3(FLG3_TRANING_CUT_LARGE_TURN); }
|
||||
void onTraningCutDown() { onNoResetFlg3(FLG3_TRANING_CUT_DOWN); }
|
||||
void onTraningShieldAttack() { onNoResetFlg3(FLG3_TRANING_SHIELD_ATTACK); }
|
||||
void onDemoStreamAccept() { onNoResetFlg0(FLG0_DEMO_STREAM_ACCEPT); }
|
||||
void offDemoStreamAccept() { offNoResetFlg0(FLG0_DEMO_STREAM_ACCEPT); }
|
||||
|
||||
BOOL checkStickArrowReset() const { return checkResetFlg0(RFLG0_STICK_ARROW_RESET); }
|
||||
BOOL getCutAtFlg() const { return checkNoResetFlg0(FLG0_CUT_AT_FLG); }
|
||||
|
||||
@@ -14,7 +14,7 @@ public:
|
||||
int Draw();
|
||||
int Delete();
|
||||
|
||||
u8 getSw() { return fopAcM_GetParamBit(this, 0, 8); }
|
||||
u32 getSw() { return fopAcM_GetParamBit(this, 0, 8); }
|
||||
|
||||
private:
|
||||
/* 0x568 */ u8 mSwitch;
|
||||
@@ -25,11 +25,11 @@ private:
|
||||
class daTagCstaSw_HIO_c : public mDoHIO_entry_c {
|
||||
public:
|
||||
daTagCstaSw_HIO_c();
|
||||
virtual ~daTagCstaSw_HIO_c();
|
||||
virtual ~daTagCstaSw_HIO_c() {}
|
||||
|
||||
void genMessage(JORMContext*);
|
||||
|
||||
u8 unk_0x4;
|
||||
u8 show_range;
|
||||
};
|
||||
|
||||
#endif /* D_A_TAG_CSTASW_H */
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
class daTagLv6Gate_c : public fopAc_ac_c {
|
||||
public:
|
||||
int createHeap();
|
||||
inline int createHeap();
|
||||
int create();
|
||||
inline int execute();
|
||||
int draw();
|
||||
|
||||
@@ -6,23 +6,23 @@
|
||||
class daTagLv7Gate_c : public fopAc_ac_c {
|
||||
public:
|
||||
int create();
|
||||
void create_init();
|
||||
int execute();
|
||||
inline void create_init();
|
||||
inline int execute();
|
||||
void calcFly();
|
||||
|
||||
inline ~daTagLv7Gate_c();
|
||||
|
||||
inline int createHeap();
|
||||
inline void setPath(u8 i_path_ID);
|
||||
inline int setPath(int i_path_ID);
|
||||
inline void initBaseMtx();
|
||||
inline void setBaseMtx();
|
||||
inline void flyAnime();
|
||||
inline bool checkPoint(f32 i_speed);
|
||||
inline bool checkPoint(cXyz& i_point, f32 i_speed);
|
||||
inline bool setNextPoint();
|
||||
inline int draw();
|
||||
|
||||
u8 getPathID() { return fopAcM_GetParam(this) >> 0x10; }
|
||||
u16 getFlowNodeNo() { return fopAcM_GetParam(this); }
|
||||
u8 getPathID() { return (fopAcM_GetParam(this) >> 16) & 0xFF; }
|
||||
s16 getFlowNodeNo() { return (u16)fopAcM_GetParam(this); }
|
||||
|
||||
/* 0x568 */ J3DModel* mpModel;
|
||||
/* 0x56C */ mDoExt_bckAnm* mpBck;
|
||||
|
||||
@@ -10,8 +10,8 @@ class daTagLv8Gate_c : public fopAc_ac_c {
|
||||
public:
|
||||
inline ~daTagLv8Gate_c();
|
||||
|
||||
int createHeap();
|
||||
int execute();
|
||||
inline int createHeap();
|
||||
inline int execute();
|
||||
|
||||
void initBaseMtx();
|
||||
void create_init();
|
||||
|
||||
@@ -8,6 +8,26 @@
|
||||
class daTagTWGate_c;
|
||||
typedef void (daTagTWGate_c::*actionFunc)();
|
||||
|
||||
struct daTagTWGate_Attr_c {
|
||||
/* 0x00 */ u8 show_range;
|
||||
};
|
||||
|
||||
class daTagTWGate_Hio_c : public mDoHIO_entry_c {
|
||||
public:
|
||||
daTagTWGate_Hio_c();
|
||||
|
||||
inline void ct();
|
||||
|
||||
inline void dt();
|
||||
|
||||
void default_set();
|
||||
|
||||
inline void genMessage(JORMContext*);
|
||||
|
||||
/* 0x08 */ int field_0x8;
|
||||
/* 0x0C */ daTagTWGate_Attr_c attr;
|
||||
};
|
||||
|
||||
class daTagTWGate_c : public fopAc_ac_c {
|
||||
public:
|
||||
enum EType {
|
||||
@@ -31,6 +51,7 @@ public:
|
||||
/* 0x0A */ ACT_DEMO_HYRAL_1,
|
||||
/* 0x0B */ ACT_DEMO_HYRAL_2,
|
||||
/* 0x0C */ ACT_DEMO_HYRAL_3,
|
||||
/* 0x0D */ MODE_MAX_e,
|
||||
};
|
||||
|
||||
inline ~daTagTWGate_c();
|
||||
@@ -62,65 +83,47 @@ public:
|
||||
void initDemoHyral3();
|
||||
void executeDemoHyral3();
|
||||
void initBaseMtx();
|
||||
int downloadModels();
|
||||
inline int downloadModels();
|
||||
void initTalk(int, fopAc_ac_c**);
|
||||
bool talkProc(int*, int, fopAc_ac_c**);
|
||||
static int createHeapCallBack(fopAc_ac_c*);
|
||||
int CreateHeap();
|
||||
|
||||
u8 getSwitch() { return fopAcM_GetParam(this) >> 8; }
|
||||
u8 getSwitch() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
|
||||
u8 getType() { return fopAcM_GetParam(this); }
|
||||
|
||||
inline int create();
|
||||
|
||||
void create_init() {
|
||||
field_0x5e0 = 0;
|
||||
mActionID = 0;
|
||||
mAction = &ActionTable[mActionID][0];
|
||||
(this->**mAction)();
|
||||
inline void create_init();
|
||||
|
||||
inline void callExecute();
|
||||
|
||||
inline int execute();
|
||||
|
||||
inline int draw();
|
||||
|
||||
#if DEBUG
|
||||
daTagTWGate_Attr_c& attr() const {
|
||||
return mHio.attr;
|
||||
}
|
||||
#endif
|
||||
|
||||
void callExecute() {
|
||||
(this->*mAction[1])();
|
||||
mDoAud_seStartLevel(Z2SE_OBJ_DARK_GATE, ¤t.pos, 0, 0);
|
||||
}
|
||||
inline void callInit();
|
||||
|
||||
int execute() {
|
||||
callExecute();
|
||||
inline void setAction(Mode_e i_action);
|
||||
|
||||
if (field_0x5e0 != 0) {
|
||||
mpMorf->play(0, 0);
|
||||
mpMorf->modelCalc();
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
int draw() {
|
||||
if (field_0x5e0 != 0) {
|
||||
mpMorf->entryDL();
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
void callInit() {
|
||||
(this->*(*mAction))();
|
||||
}
|
||||
|
||||
void setAction(Mode_e action) {
|
||||
mActionID = action;
|
||||
mAction = ActionTable[mActionID];
|
||||
callInit();
|
||||
}
|
||||
|
||||
static u8 const mAttr[1];
|
||||
static actionFunc ActionTable[13][2];
|
||||
static daTagTWGate_Attr_c const mAttr;
|
||||
#if DEBUG
|
||||
static daTagTWGate_Hio_c mHio;
|
||||
#endif
|
||||
static const actionFunc ActionTable[][2];
|
||||
|
||||
private:
|
||||
/* 0x568 */ mDoExt_McaMorfSO* mpMorf;
|
||||
/* 0x56C */ request_of_phase_process_class mPhaseZevArc;
|
||||
/* 0x574 */ request_of_phase_process_class mPhaseMdRes;
|
||||
/* 0x57C */ request_of_phase_process_class mPhasePyRes;
|
||||
/* 0x584 */ actionFunc* mAction;
|
||||
/* 0x584 */ const actionFunc* mAction;
|
||||
/* 0x588 */ int mActionID;
|
||||
/* 0x58C */ dMsgFlow_c mMsgFlow;
|
||||
/* 0x5D8 */ u8 field_0x5d8[4];
|
||||
|
||||
@@ -5,21 +5,9 @@
|
||||
|
||||
class daTagAssist_c : public fopAc_ac_c {
|
||||
public:
|
||||
void create_init() {
|
||||
attention_info.flags = 0;
|
||||
field_0x570 = -1;
|
||||
}
|
||||
|
||||
int create() {
|
||||
fopAcM_ct(this, daTagAssist_c);
|
||||
create_init();
|
||||
return cPhs_COMPLEATE_e;
|
||||
}
|
||||
|
||||
int execute() {
|
||||
fopAcM_searchPlayerDistanceXZ(this);
|
||||
return 1;
|
||||
}
|
||||
inline void create_init();
|
||||
inline int create();
|
||||
inline int execute();
|
||||
|
||||
u8 field_0x568[8];
|
||||
s16 field_0x570;
|
||||
|
||||
@@ -16,6 +16,7 @@ public:
|
||||
void action();
|
||||
BOOL checkHit();
|
||||
void createItem();
|
||||
int draw();
|
||||
int _delete();
|
||||
|
||||
virtual ~daTagAtkItem_c() {}
|
||||
|
||||
@@ -4,6 +4,22 @@
|
||||
#include "d/d_com_inf_game.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
|
||||
class daAttp_HIO_c : public mDoHIO_entry_c {
|
||||
public:
|
||||
daAttp_HIO_c();
|
||||
|
||||
void genMessage(JORMContext*);
|
||||
|
||||
/* 0x06 */ u8 enable_type_switching;
|
||||
/* 0x07 */ u8 type_spec;
|
||||
/* 0x08 */ u8 enable_distance_display;
|
||||
/* 0x0C */ f32 dist_max;
|
||||
/* 0x10 */ f32 dist_max_release;
|
||||
/* 0x14 */ f32 dist_adjust;
|
||||
/* 0x18 */ f32 upper_y;
|
||||
/* 0x1C */ f32 lower_y;
|
||||
};
|
||||
|
||||
class daAttp_c : public fopAc_ac_c {
|
||||
public:
|
||||
int Create();
|
||||
@@ -11,28 +27,33 @@ public:
|
||||
int execute();
|
||||
int draw();
|
||||
int _delete();
|
||||
|
||||
#if DEBUG
|
||||
Mtx field_0x568;
|
||||
u8 field_0x598;
|
||||
#endif
|
||||
}; // Size: 0x568
|
||||
|
||||
namespace daAttp_prm {
|
||||
static inline u32 getArg0(daAttp_c* pActor) {
|
||||
return fopAcM_GetParam(pActor) & 3;
|
||||
static inline u8 getArg0(daAttp_c* pActor) {
|
||||
return fopAcM_GetParam(pActor) & 0x3;
|
||||
}
|
||||
static inline u32 getArg1(daAttp_c* pActor) {
|
||||
return (fopAcM_GetParam(pActor) >> 2) & 3;
|
||||
static inline u8 getArg1(daAttp_c* pActor) {
|
||||
return (fopAcM_GetParam(pActor) >> 2) & 0x3;
|
||||
}
|
||||
static inline u32 getArg2(daAttp_c* pActor) {
|
||||
return (fopAcM_GetParam(pActor) >> 4) & 7;
|
||||
static inline u8 getArg2(daAttp_c* pActor) {
|
||||
return (fopAcM_GetParam(pActor) >> 4) & 0x7;
|
||||
}
|
||||
static inline u32 getArg3(daAttp_c* pActor) {
|
||||
return (fopAcM_GetParam(pActor) >> 7) & 1;
|
||||
static inline u8 getArg3(daAttp_c* pActor) {
|
||||
return (fopAcM_GetParam(pActor) >> 7) & 0x1;
|
||||
}
|
||||
static inline u32 getArg4(daAttp_c* pActor) {
|
||||
return (fopAcM_GetParam(pActor) >> 8) & 1;
|
||||
static inline u8 getArg4(daAttp_c* pActor) {
|
||||
return (fopAcM_GetParam(pActor) >> 8) & 0x1;
|
||||
}
|
||||
static inline u32 getSw1(daAttp_c* pActor) {
|
||||
static inline u8 getSw1(daAttp_c* pActor) {
|
||||
return (fopAcM_GetParam(pActor) >> 0x10) & 0xff;
|
||||
}
|
||||
static inline u32 getSw2(daAttp_c* pActor) {
|
||||
static inline u8 getSw2(daAttp_c* pActor) {
|
||||
return (fopAcM_GetParam(pActor) >> 0x18);
|
||||
}
|
||||
} // namespace daAttp_prm
|
||||
|
||||
@@ -14,18 +14,18 @@ private:
|
||||
/* 0x0576 */ u8 mBottleItemType;
|
||||
|
||||
public:
|
||||
s32 create();
|
||||
s32 Delete();
|
||||
s32 Execute();
|
||||
s32 Draw();
|
||||
int create();
|
||||
int Delete();
|
||||
int Execute();
|
||||
int Draw();
|
||||
void setTypeFromParam();
|
||||
void restart();
|
||||
void initialize();
|
||||
int checkProcess(ProcessFunc);
|
||||
int setProcess(ProcessFunc);
|
||||
void setAttnPos();
|
||||
s32 chkEvent();
|
||||
s32 orderEvent();
|
||||
int chkEvent();
|
||||
int orderEvent();
|
||||
void makeSoup();
|
||||
int wait(void*);
|
||||
virtual ~daTag_BottleItem_c();
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user