Commit Graph

89 Commits

Author SHA1 Message Date
Sam Chaturvedi acad3dba2a
d_a_obj_ganonwall matching (#2346)
* d_a_obj_ganonwall matching

* applied suggestions

* Rework l_idx into 2d array
2025-03-24 17:01:39 -07:00
Stbn-antier c33ddb3ac1
d_a_obj_sekidoor matching (#2344)
* Started work on d_a_obj_sekidoor, 38% match

* Filled functions, rough 70% match

* 76% method matching

* 84% match, only setPrtcls remaining

* Object 100% matching

* Cleanup, remove padding

* Adressed review comments

* Adressed review comment
2025-03-24 03:47:49 -07:00
Łukasz Starzyk 3f67b00c6e
d_a_obj_amiShutter equivalent (#2342)
* init commit

* functions matching progress

* new inline function

added new inline function `OnRoofRegist` to cBgW class

* use of inline function

uses the inline function as in the debug version

* d_a_obj_amiShutter equivalent

* cleanup and field rename

* addressed PR comments
2025-03-23 22:29:10 +02:00
LagoLunatic 4dc0cd9d09
Debug version now builds OK and all_source compiles (#2343)
* Fix missing arg to JUT_ASSERT

* Fix some MWCC version diff errors

* Compile m_Do_ext, d_demo, actor_mng

* Add VSCode task to quickly switch between versions

* Unlink magLift for debug

* Update the hash of the debug dol

The old cbea5fa... hash here was for the dol generated by the alf2dol.py script, which produces incorrect alignment.

The dol with the new hash can be obtained by using `dtk elf2dol` to convert the debug .alf file to a dol.

The DOL now builds OK.

* Fix all debug REL dtor splits

All RELs now also build OK, meaning `ninja build/ShieldD/ok` now succeeds.

* Add genMessage declarations to all HIO subclasses

* Fixing more compilation errors

* m_Do_mtx 100% on debug

Cannot be linked due to weak function name mangling?

* Improve various matches

* Fix all remaining compilation errors

* Fix new compilation errors from main

* Fix retail regression

* Link f_pc_profile_lst
2025-03-22 18:00:51 -07:00
Caroline Madsen 5a7b9f62d6
Z2AudioLib work (#2339)
* Z2LinkMgr work, Z2AudioArcLoader matching

* Z2SeMgr matching

* Z2SpeechMgr2 almost done, Z2SoundHandles matching
2025-03-21 23:03:43 -07:00
soruh cf87a207b6
decompile d_a_obj_bmshutter.cpp (#2338)
* Implement `onCondition` inline function of `dEvt_info_c`

* decompile d_a_obj_bmshutter.cpp

* remove uncesary inline and this->

* use dEvt_info_c::checkCommandDemoAccrpt instead of daObjBmSh_c::checkCommandDemoAccrpt

* change style of members

* Revert "Implement `onCondition` inline function of `dEvt_info_c`"

This reverts commit dc7e945aed.

* use `i_onCondition` instead of `onCondition`

* make l_ statics local

* remove uncessesary parenthesis

* make actor function pointers return ints

* make l_check_area a Vec[4]
2025-03-21 17:34:45 -07:00
Ttobas 6519691a47
d_a_obj_udoor matching (#2337)
* d_a_obj_udoor done

* Fix: Re-type unused fields to u8[]

* Fix: Make padding data implicit in obj_udoor_class

---------

Co-authored-by: Ttobas <anon@ym.ous>
2025-03-20 23:01:58 -07:00
Ttobas 02ded44d36
d_a_obj_zdoor matching (#2334)
* Fully matching

* Fix PR comments

* Fix PR comments (rename parameter in callback functions)

---------

Co-authored-by: Ttobas <anon@ym.ous>
2025-03-20 12:32:51 +02:00
Emma 1a5a81976a
d_a_obj_metalbox matching (#2333)
* Started work on d_a_obj_stick

* Lots of green

* Fixed mAcch vtable

* Only missing switch/if problem in create

* All green

* Set stick matching

* Cleanup

* Addressed PR comments

* Reset vscode config

* d_a_ob_metalbox mostly complete

* Completed d_a_obj_metalbox

* Addressed PR issues
2025-03-20 12:11:32 +02:00
zerox029 131548b015
d_a_obj_stick matching (#2332)
* Started work on d_a_obj_stick

* Lots of green

* Fixed mAcch vtable

* Only missing switch/if problem in create

* All green

* Set stick matching

* Cleanup

* Addressed PR comments

* Reset vscode config
2025-03-18 18:39:26 -07:00
Łukasz Starzyk 57fe6dcdea
d_a_obj_burnbox matching (#2331)
* initial work

* d_a_obj_burnbox, matching

* renamed varia bles and additional cleanup

* assigned correct comments to models' name

* post review changes

* if statement separation in Execute method
2025-03-18 17:18:22 -07:00
TakaRikka d3e9175bfb
d_a_e_pz equivalent (#2330)
* d_a_e_pz equivalent

* rename var

* match f_pc closer to debug

* hopefully fix decompctx

* sdk done

* remove unneeded file
2025-03-18 15:45:44 -04:00
TakaRikka 60748d0924
b_dr equivalent, update dtk-template (#2327)
* d_a_tag_allmato almost done

* d_a_swhit0 done

* some SSystem cleanup

* treesh done

* swball done, some other rel cleanup

* b_dr equivalent

* update dtk-template

* rename j3dframectrl mode enum
2025-03-14 04:46:21 -04:00
hatal175 34c5d8272e
daObjCBlk_c equivalent (#2326) 2025-03-12 16:03:14 -07:00
Caroline Madsen 3ad60c1b17
f_op_actor_mng matching (#2325) 2025-03-12 15:57:14 -07:00
hatal175 854e460a36
d_a_e_kg equivalent (#2322) 2025-03-09 16:53:31 -07:00
hatal175 763400c4c0
daObjNAN_c equivalent (#2320)
* daObjNAN_c equivalent

* Remove padding
2025-03-09 16:05:03 -07:00
YunataSavior 52b23ad73c
d_a_e_zs (a.k.a. Stallord's zombie soldiers) equivalent (#2313)
* Initial work for d_a_e_zs

* d_a_e_zs equivalent

* d_a_e_zs data fixes. Thanks Taka!

* Update d_a_e_zs based on Taka's comments
2025-03-08 01:04:31 -08:00
LagoLunatic fb45587923
c_m3d OK (#2317) 2025-03-07 16:01:38 -08:00
TakaRikka 19e18654c9
tag_allmato almost, swhit0 treesh swball done, misc cleanup (#2312)
* d_a_tag_allmato almost done

* d_a_swhit0 done

* some SSystem cleanup

* treesh done

* swball done, some other rel cleanup
2025-03-01 14:48:49 +02:00
Caroline Madsen 4453d0617e
d_a_npc_yelia equivalent (#2310) 2025-02-26 00:41:51 -08:00
Caroline Madsen 531a6d6d68
d_a_e_dt, d_a_e_ot equivalent (#2305) 2025-02-20 22:44:54 -08:00
TakaRikka bbc7944e54
d_a_boomerang / d_a_grass mostly done, d_a_spinner done (#2304)
* d_a_boomerang mostly done

* d_a_grass mostly done

* d_a_spinner done
2025-02-19 18:43:26 -05:00
YunataSavior c40e25577b
d_a_obj_Y_taihou equivalent (#2303)
* Transfer of Y_taihou work to cleaner and newer branch

* d_a_obj_Y_taihou nearly equivalent except for 2 functions

* Functionally correct d_a_obj_Y_taihou, but some issues remain

* d_a_obj_Y_taihou equivalent now; many thanks hatal!

* Update configure(dot)py and the config files for Y_taihou
2025-02-17 21:00:03 -08:00
TakaRikka 6e94efaefb
d_a_obj_carry mostly done (#2301)
* d_a_obj_carry mostly done

* cleanup some acch inlines
2025-02-13 10:37:46 -07:00
TakaRikka 2453c0e333
copy dolsdk2004 to tp / b_bh + e_mb done (#2299)
* move dolsdk2004 over

* cleanup some temp work

* finish and cleanup gf

* b_bh done

* d_a_e_mb done
2025-02-10 21:20:42 +02:00
YunataSavior 34b21412c4
d_a_obj_TvCdlst matching (#2292)
* d_a_obj_TvCdlst matching

* d_a_obj_kwheel00, 01, & d_a_obj_klift00 Equivalent (weak func and/or vtable order) (#2291)

* d_a_obj_kwheel00, 01, & d_a_obj_klift00 Equivalent (weak func and/or vtable order)
* Three rels equivalent
* Basic documentation for the three rels
* Define explicit constructor for dMdl_obj_c (needed for proper array creation in d_a_obj_klift00)
* Modify d_a_obj_bky_rock to account for new explicit constructor of dMdl_obj_c
* Specify weak func and/or vtable orders for rels in config.py

* Cleanup includes and dol2asm artifacts

* * Fix debug build
* Restore incorrectly removed l_bmdidx

* Fix US retail equivalency

* d_a_obj_Turara equivalent (#2289)

* Initial d_a_obj_Turara work

* More d_a_obj_Turara work

* d_a_obj_Turara equivalent except for weak func order of dEvLib_callback_c dtor

* Updates to d_a_obj_Turara after feedback from Taka

* b_dre equivalent (#2290)

* Update d_a_obj_Turara to remove unnecessary comment based on hatal\'s request

---------

Co-authored-by: TakaRikka <38417346+TakaRikka@users.noreply.github.com>

* Fix spurious differences when using `ninja diff` (#2294)

* Fix spurious differences when using ninja diff

* Fix some clangd errors/warnings

* d_a_obj_waterGate matching + d_a_obj_lv3Water2 equivalent (#2293)

* d_a_obj_waterGate matching + d_a_obj_lv3Water2 equivalent
* Add simpleCalcMaterial implicit inline to J3DModelData (seen in debug)
* Basic documentation for both actors
* WIP debug build implementations (note TODOs)
* Update configure.py and note weak ordering issues for lv3Water2

* Actually add modified J3DModelData.h & explicitly note fake padding

* Add fopAcM_Register... macros (for debug build) (#2295)

* Update d_a_obj_Tvcdlst to use LIGHT_INFLUENCE after Taka gave feedback

---------

Co-authored-by: Huitzi <73550465+marwernerh@users.noreply.github.com>
Co-authored-by: TakaRikka <38417346+TakaRikka@users.noreply.github.com>
Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
2025-02-03 10:30:40 +02:00
LagoLunatic ca3e900835
Fix false pointer relocations in data breaking shiftability (#2296)
* Fix false pointer relocations in data breaking shiftability

* Update matDL_dis.py from tww

* remove debug prints from matDL build script
* matDL build rule: Allow specifying global/local scope

* Use asset extraction for ShieldD

* Set mode `+x` on executable Python scripts

* set `+x` on matDL_dis
2025-01-31 23:58:59 +02:00
Huitzi 7c5006e446
d_a_obj_waterGate matching + d_a_obj_lv3Water2 equivalent (#2293)
* d_a_obj_waterGate matching + d_a_obj_lv3Water2 equivalent
* Add simpleCalcMaterial implicit inline to J3DModelData (seen in debug)
* Basic documentation for both actors
* WIP debug build implementations (note TODOs)
* Update configure.py and note weak ordering issues for lv3Water2

* Actually add modified J3DModelData.h & explicitly note fake padding
2025-01-27 11:55:55 -08:00
YunataSavior 5644936254
d_a_obj_Turara equivalent (#2289)
* Initial d_a_obj_Turara work

* More d_a_obj_Turara work

* d_a_obj_Turara equivalent except for weak func order of dEvLib_callback_c dtor

* Updates to d_a_obj_Turara after feedback from Taka

* b_dre equivalent (#2290)

* Update d_a_obj_Turara to remove unnecessary comment based on hatal\'s request

---------

Co-authored-by: TakaRikka <38417346+TakaRikka@users.noreply.github.com>
2025-01-23 12:42:27 -08:00
Huitzi c11cd855d5
d_a_obj_kwheel00, 01, & d_a_obj_klift00 Equivalent (weak func and/or vtable order) (#2291)
* d_a_obj_kwheel00, 01, & d_a_obj_klift00 Equivalent (weak func and/or vtable order)
* Three rels equivalent
* Basic documentation for the three rels
* Define explicit constructor for dMdl_obj_c (needed for proper array creation in d_a_obj_klift00)
* Modify d_a_obj_bky_rock to account for new explicit constructor of dMdl_obj_c
* Specify weak func and/or vtable orders for rels in config.py

* Cleanup includes and dol2asm artifacts

* * Fix debug build
* Restore incorrectly removed l_bmdidx

* Fix US retail equivalency
2025-01-23 21:48:23 +02:00
TakaRikka fa7821c4bb
b_dre equivalent (#2290) 2025-01-22 22:48:08 +02:00
TakaRikka e0824a1590
most of JHostIO / m_Do_hostIO done (#2288) 2025-01-19 22:05:53 -07:00
YunataSavior 7137f49bfc
d_a_obj_octhashi equivalent except for weak func ordering of cCcD_GStts dtor (#2287)
* Initial d_a_obj_octhashi work

* More d_a_obj_octhashi work

* d_a_obj_octhashi has 100% completion, but rodata doesn't match

* d_a_obj_octhashi equivalent. Would fully match except for cCcD_GStts dtor

* d_a_obj_octhashi update after feedback from Taka and hatal
2025-01-19 13:45:55 +02:00
YunataSavior 4996e91556
daMagLift_c matching (#2275)
* Initial work with daMagLift_c. Almost completely matching except for mode_proc

* mode_proc matching in d_a_obj_magLift.cpp

* First pass of polishing of d_a_obj_magLift

* Further d_a_obj_magLift updates to align with debug build
2025-01-16 18:50:04 -08:00
TakaRikka 9948a6371f
wip debug / pal building, b_gm mostly done (#2285)
* b_gm mostly done

* wip debug / pal building

* fix configure.py

* fix some debug macros / flags
2025-01-16 19:37:39 +02:00
LagoLunatic 2189777abf
Fix various issues in TUs marked `Equivalent` (#2286) 2025-01-14 22:47:29 -08:00
hatal175 0cdacf4bff
daItemShield_c OK (#2283) 2025-01-06 01:59:48 -08:00
hatal175 523040331d
daObj_Roten_c OK (#2282) 2025-01-03 15:28:59 -08:00
Huitzi 960b08e88c
d_a_obj_waterPillar + d_a_obj_syRock Equivalent (weak ordering) (#2281)
* d_a_obj_waterPillar + d_a_obj_syRock Equivalent (weak ordering)
* Added fake struct padding
* Added fake Chk inlines to dBgS_Acch
* Added AT_TYPE_100 to cCcD_ObjAtType

* Addressed fakematch
* Deleted fake Chk inlines from dBgS_Acch
* Removed duplicated, but commented, static check for struct size
* Renamed two d_a_obj_waterPillar fields according to comments

* Removed explicit inline keywords & swapped use of PSMTX for debug-friendly MTX
2025-01-03 14:50:14 -08:00
hatal175 fac61aaf40
d_a_obj_rstair OK (#2280) 2025-01-02 11:43:05 -07:00
hatal175 c67489d3da
d_a_obj_riverrock OK (#2279) 2025-01-01 15:51:34 -07:00
hatal175 ad5b89f795
d_a_obj_swturn OK (#2278) 2025-01-01 11:56:04 -07:00
hatal175 477cbf1bf1
d_a_obj_swhang equivalent (#2277) 2024-12-30 19:20:31 -07:00
hatal175 593f1d1587
d_a_obj_smtile OK (#2276) 2024-12-29 16:45:47 -07:00
Trueffel 78d206c1a3
d_stage linked and one function in m_do_ext matched (#2272) 2024-12-29 17:56:25 +02:00
TakaRikka 0e281cb975
various matches / cleanup (#2271)
* cleanup various TUs

* checkpoint

* d_attention doc
2024-12-29 17:53:54 +02:00
hatal175 c429ce21eb
d_a_obj_cwall almost matching (#2270)
* d_a_obj_cwall almost matching

* d_a_obj_pdoor OK
2024-12-27 19:16:59 -08:00
hatal175 d874f05f44
d_a_obj_wsStick, d_a_obj_onsenTaru OK (#2268)
* d_a_obj_wsStick, d_a_obj_onsenTaru OK

* d_a_obj_pdtile OK

* d_a_obj_stone equivalent

* d_a_npc_lf OK

* Z2SoundMgr OK

* Remove fixed nonmatching comment

* d_a_obj_kantera OK

* Remove unneeded header

* daMyna_c::deleteItem matching

* d_a_obj_crvsteel OK
2024-12-24 02:36:01 -08:00
hatal175 e0ea8495f7
d_a_obj_yel_bag OK (#2267)
* d_a_obj_web0 cleanup

* d_a_obj_yel_bag OK
2024-12-19 12:10:53 -08:00