Commit Graph

410 Commits

Author SHA1 Message Date
YunataSavior 35bd1ba3a2 d_a_e_ym, d_a_e_oc, and d_a_npc_hanjo equivalent, d_a_npc_ashB work (#2368)
* d_a_e_ym, d_a_e_oc, and d_a_npc_hanjo equivalent, d_a_npc_ashB work

* Updates to PR based on feedback, plus fix debug build
2025-04-10 16:24:46 +03:00
Caroline Madsen c4457ede21 Various JSystem work (#2383)
* JKernel and JStudio cleanup

* JMessage cleanup

* JAudio cleanup

* JASBNKParser work

* functionvalue work

* fvb work

* J2D and J3D cleanup

* steal from tww

* J2DPictureEx mostly done

* fix build
2025-04-09 13:45:30 -07:00
LagoLunatic 44fda53986 JSystem work (#2384)
* object-id 100% on debug

Can't be linked due to .text alignment issues?

* J3DMaterialFactory and J3DMaterialFactory_v21 OK

* Match dKy_bg_MAxx_proc
2025-04-08 22:17:20 -07:00
Stbn-antier e96c0d018e d_a_obj_sekizoa Equivalent (#2379)
* Rough class structure, start of work

* First easy methods, 10% match

* Various progress, 27% match

* Progress on sekizoa, 43% match

* Progress on Sekizoa, need to pull SekiDoor changes

* First pass on all functions, 80% match

* 96% match, starting cleanup before last stretch

* Cleanup, 99% match

* Code formatting

* 100% match, builds on equivalent

* Adressed review comments
2025-04-08 00:26:01 -07:00
LagoLunatic 98083b30e1 JStudio object-actor OK (#2381)
* Fix debug build

* object-actor OK
2025-04-07 15:36:51 -07:00
hev7 cee078adf2 d_a_obj_lv6TogeRoll matching (#2377)
* d_a_obj_lv6TogeRoll almost matching

* Various improvements

* Matching

* unk rel data
2025-04-07 22:04:01 +03:00
TakaRikka 98db9a297a GCN pal / jpn support, some debug work (#2375)
* d_save debug cleanup / d_s_menu debug

* gameinfo / kankyo struct debug fixes

* pal building ok

* jp building ok

* some tests with jp

* some more pal/jp tests
2025-04-06 21:08:25 +03:00
Vlad 3c8bf12e57 d_a_npc_shop0 matching (#2374)
* d_a_npc_shop0 matching

* d_a_npc_shop0 matching
2025-04-06 21:06:44 +03:00
Niklas Bauer 220b84f3d9 d_a_obj_ihasi Matching (#2373)
* d_a_obj_ihasi matching

* d_a_obj_ihasi cleanup

* d_a_obj_ihasi style
2025-04-04 02:09:52 -07:00
TetrisGG 46e3dbf3a6 d_a_obj_maki matching (#2370)
* Matching daObj_Maki_HIO_c::daObj_Maki_HIO_c()

Matched daObj_Maki_HIO_c::daObj_Maki_HIO_c() and started work on daObj_Maki_HIO_c::~daObj_Maki_HIO_c()

* more work on d_a_obj_maki

More structures defined, work on all methods, some equivalent, just missing registers

* d_a_obj_maki Matching

Final work on maki to get it to Match 100%.

* d_a_obj_maki matching

d_a_obj_maki matching | * cleanup for PR
2025-04-02 17:12:00 -07:00
Caroline Madsen 03fafe3e15 d_camera work (#2369)
* bumpCheck matching

* checkGroundInfo matching

* chaseCamera matching

* lockonCamera attempted

* talktoCamera matching

* subjectCamera, magneCamera matching

* colosseumCamera close, plus various fixes

* towerCamera attempted

* hookshotCamera matching
2025-04-01 19:05:30 -07:00
Sam Chaturvedi 2976066aa6 d_a_obj_stopper matching (#2367)
* d_a_obj_stopper matching

* d_a_obj_stopper - address PR comments
2025-04-02 00:10:54 +03:00
hatal175 4dfd9b9f3c d_a_npc_worm matching (#2365)
* d_a_npc_worm matching

* Rename a_this
2025-03-31 18:30:42 -07:00
TakaRikka e6b07b81e4 d_a_b_mgn equivalent (#2363) 2025-03-31 19:43:11 +03:00
Huitzi 726e27cf98 d_event_debug equivalent & modifications to dEvLib_callback_c (#2359)
* WIP d_event_debug
* Implemented most functions close to matching
* Removed erroneous comment in d_com_inf_game.h
* Implemented getEventP in dEvDtBase_c
* Retyped dEvLib_callback_c function returns from BOOL to bool
* Implemented getHeader, getEventList, and setDbgData in dEvent_manager_c
* Moved relevant dEvDb_* classes from d_event.h to d_event_debug.h and changed to structs
* Extended JORFile mFilename character array from 8 to 256 characters
* Implemented combo boxes and update slider functionalities in JORMContext
* Named field_0xC of JORProperyEvent as id, based on use of field in d_event_debug.cpp
* Corrected debug event tables and created missing table
* Debug tables explicitly pasted in d_event_debug.cpp to circumvent ShiftJIS not properly encoding tables via #include directive

* Change return types for implemented virtual functions of actors that inherit from dEvLib_callback_c

* Add const modifier to several d_com_inf_game functions called in d_event_debug, and change respective fields in dEvDb_bit & reg_c to be const

* d_event_debug Equivalent
* Changed configure.py entry to equivalent instead of matching
* Preliminary documentation

* Remove debug tables from d_event.cpp
2025-03-30 20:11:50 -07:00
Trueffel 392c0f3181 d_a_e_kk equivalent (#2358)
* d_a_e_kk equivalent

* some docs
2025-03-29 21:24:51 +03:00
TakaRikka 64621f3ca3 e_th equivalent (#2357) 2025-03-29 17:41:13 +03:00
hatal175 803544b5df daPeru_c equivalent (#2356) 2025-03-28 23:55:32 -07:00
soruh 8e562847be d_a_cow Equivalent (#2353)
* decompile d_a_cow

* rescope enums to daCow_c class

* apply suggestions by TakaRikka

* fix JUT_ASSERT
2025-03-27 17:56:51 -07:00
TakaRikka 968b010023 d_a_e_th_ball done (#2352) 2025-03-27 11:44:40 +02:00
Sam Chaturvedi d7d1bddb37 d_a_obj_sword matching (#2349)
* d_a_obj_sword matching

* d_a_obj_sword -- Addressed PR comments
2025-03-26 18:38:45 -07:00
Sam Chaturvedi db83cd5d28 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 48fcb9dc9d 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 f47f32cacc 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 0ff06d2974 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 23f56e4c20 Z2AudioLib work (#2339)
* Z2LinkMgr work, Z2AudioArcLoader matching

* Z2SeMgr matching

* Z2SpeechMgr2 almost done, Z2SoundHandles matching
2025-03-21 23:03:43 -07:00
soruh 42b75737d5 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 dc7e945aedef44eb7be76a61c2da37e238560c3e.

* 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 7306fc9ccb 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 82eadade8d 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 947851ee6e 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 9324c1c22b 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 6375c780f1 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 03c019d736 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 4ba9e77b25 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 51a6a0f4fb daObjCBlk_c equivalent (#2326) 2025-03-12 16:03:14 -07:00
Caroline Madsen c98e97b27c f_op_actor_mng matching (#2325) 2025-03-12 15:57:14 -07:00
hatal175 4f33628566 d_a_e_kg equivalent (#2322) 2025-03-09 16:53:31 -07:00
hatal175 bcf6016cba daObjNAN_c equivalent (#2320)
* daObjNAN_c equivalent

* Remove padding
2025-03-09 16:05:03 -07:00
YunataSavior 0c61032a8e 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 af6c22ad81 c_m3d OK (#2317) 2025-03-07 16:01:38 -08:00
TakaRikka f06311cd09 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 e591c79810 d_a_npc_yelia equivalent (#2310) 2025-02-26 00:41:51 -08:00
Caroline Madsen f628e2e6ff d_a_e_dt, d_a_e_ot equivalent (#2305) 2025-02-20 22:44:54 -08:00
TakaRikka 0c2335b6bf 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 6132f7455f 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 dc32cbd7e6 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 eda175afc8 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 bb11583be6 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 7349c37bfb 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 d3a77b480c 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