Commit Graph

134 Commits

Author SHA1 Message Date
Huitzi 4ccca6b893
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
LagoLunatic 559d389e3d
Fix dPnt struct (#2361)
* Fix dPnt struct

* Fix Vec warning
2025-03-30 15:45:59 -07:00
LagoLunatic ed42b15988
Debug build now takes .alf as input instead of .dol (#2360)
* Fix debug build

* Debug build now takes .alf as input instead of .dol

I had to manually remove the following line from symbols.txt for DTK to work:
```
.data = .sbss:0x8074C97C; // type:object size:0x4 scope:local data:byte
```
After that it built OK, and DTK automatically modified all other lines in symbols.txt.

* Fix pragma in header messing up debug optimization level
2025-03-30 15:43:44 -07:00
Trueffel b427ac85cf
d_a_e_kk equivalent (#2358)
* d_a_e_kk equivalent

* some docs
2025-03-29 21:24:51 +03:00
TakaRikka 83875b9c9e
e_th equivalent (#2357) 2025-03-29 17:41:13 +03:00
hatal175 12d44903cd
daPeru_c equivalent (#2356) 2025-03-28 23:55:32 -07:00
soruh 747bd373b0
Name d_a_cow Animations (#2355)
* name d_a_cow animations

* name run type according to animation name
2025-03-27 20:12:13 -07:00
soruh 4679b6e17f
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
Carco_21 57289d0a65
Work on d_a_obj_timer (#2350)
* Work on d_a_obj_timer

* Cleanup for pull request
2025-03-27 15:46:01 -07:00
Carco_21 fcf83b895b
d_a_b_mgn (Dark Beast Ganon) (#2348)
* Started work on d_a_b_mgn

* Finished some of the smaller functions

* A lot of work on the set_Effect methods

* Work on CreateHeap

* Work on calcBloodMove

* Work on setHideSmokeEffect and _delete

* damage_check at 50%

* demo_skip 94% matching

* Work on some execute functions and a couple others

* Worked on last few functions and general cleanup

* Cleanup for pull request

* Last few pr review comments addressed
2025-03-27 15:45:21 -07:00
TakaRikka 137fe8b8df
d_a_e_th_ball done (#2352) 2025-03-27 11:44:40 +02:00
TakaRikka 934e14f12b
fix debug build (#2345) 2025-03-27 00:45:52 -07:00
hatal175 6648566b7a
Work on d_a_npc_cdn3 (#2351) 2025-03-26 18:48:43 -07:00
Sam Chaturvedi 764eb0493e
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
Ttobas b6febdc2b6
d_a_obj_shoe 91% (#2347)
* Basic structure done

* daNpcShoe_Param_c done, class cleaned a bit, ::Create matching, destructor matching

* WIP

* About 70% done

* Fix after merging main

* TU almost done, missing correct rodata ordering, constructor, setMotionAnim, __sinit not matching

* Fix: Apply suggestions

---------

Co-authored-by: Ttobas <anon@ym.ous>
2025-03-25 18:05:02 -07:00
Emma e876797c3d
d_a_obj_flag 95% (#2341)
* 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

* Started d_a_obj_flag

* More work on flag

* More work on flag

* Flag 60%

* Flag progress

* 80% done

* 87% done

* 95%

* Some more work

* Addressed PR comments

* Switched c for 99
2025-03-25 18:04:00 -07:00
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
TakaRikka a4cdad86f4
b_gnd equivalent (#2340)
* b_gnd equivalent

* fix dEvt_info_c inlines

* fix some more inlines
2025-03-23 21:55:28 +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
Carco_21 d0f89e41b1
d_a_mant almost done (#2335)
* d_a_mant Create almost equivalent

* Work on mant_move

* Remade d_a_mant branch

* d_a_mant ~76% matching

* daMant_packet_c::draw() 69% matching

* d_a_mant data matching and joint_control over 50% matching

* daMant_Execute looking better

* d_a_mant 92% equivalent

* Removed commented rodata
2025-03-22 02:16:25 -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
hatal175 861e99c403
d_a_npc_cd2 work (#2336) 2025-03-20 22:59: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
Carco_21 58ba86b6a3
d_a_b_gnd ~86% equivalent (#2329)
* Remade fresh fork with clean main branch

* d_a_b_gnd functions are 40% matching

* Some data work

* daB_GND_Execute 26% matching

* daB_GND_Execute 59% matching

* Create and useHeapInit work

* Cleanup work and demo_camera at 50% matching

* h_damage_check 91% matching

* eff_set_h 76% matching

* b_gnd_g_down 82% matching

* general work

* a little bit of improvement on himo_control1

* General work

* Draw at 96%

* Small gake_check work

* Small data cleanup

* NodeCallBack matching and data cleanup
2025-03-17 20:03:37 -07:00
hatal175 556f5ca8d4
passer_mng work (#2328) 2025-03-15 23:44:45 -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 15a807bb7b
e_rdy mostly done (#2324)
* e_rdy work

* e_rdy work

* e_rdy work

* e_rdy mostly done

* e_rdy fix hit direction
2025-03-12 16:02:03 -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 800049a811
d_a_e_kg equivalent except for action (#2321)
* Initial work on d_a_e_kg

* d_a_e_kg 57% matching

* d_a_e_kg 83% done with regalloc issue in action function

* d_a_e_kg equivalent except for action
2025-03-10 00:57:19 +02:00
hatal175 569344ccf6
Match daNpc_Jagar_c::chkToMotion (#2319) 2025-03-08 15:25:30 -08:00
YunataSavior a18a828463
Fixes and cleanup for d_a_npc_jagar to hit 99% matching (#2318) 2025-03-08 01:05:46 -08: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
hatal175 0d3b4bf9de
A little work on daObjMasterSword_c (#2316) 2025-03-07 16:01:15 -08:00
Carco_21 0f141c2a9c
d_a_npc_jagar - ~94% (#2309)
* Began work on d_a_npc_jagar

* Major work on daNpc_Jagar_c::create()

* Jagar create() - 11%

* Continued work on daNpc_Jagar_c

* Jagar create() - 87%

* Continues work on Jagar

* Work on Jagar.checkChangeEvt()

* Working on Jagar.talk()

* Work on Jagar.changeBtp()

* Jagar.checkChangeJoint() & checkRemoveJoint()

* Jagar.chkAction() & setAction()

* Jagar.chkChuMotion()

* Jagar.chkSitMotion() & chkSitMotion2()

* Jagar.chkToMotion()

* Jagar.CreateHeap()

* Jagar.createHeapCallBack() & ctrlJointCallBack()

* Jagar.cuAnger()

* Jagar.cutClimbUp() - 92%

* Jagar.setAttnPos() - 85%

* Jagar.cutConversationWithBou() - 48%

* Jagar work and daNpcT_c::getActorDistance - 83%

* Jagar setParam work and daNpcT_c::getActorDistance - 85%

* Prep Jagar push to main

* little cleanup

* Fixed return type discrepancy

* Fixed *other* return type issues & variable names for Jagar

* Jagar talkWithBou work

* Work on Jagar talk

* Data & function cleanup

* I dont remember what i added this time lol

* Finished some functions

* Reworking Jagar talk()

* Finished some functions

* Attempting to rework cutNeedYourHelp

* Almost(ish) done with Jaggle

* Almost done with Jaggle

* Took out inline assembly in Jagar.chkToMotion()

* Cleanup

* Minor variable initialization change

* Small cleanup

* Hopefully fixed d_a_npc_bou compilation error
2025-03-07 19:41:36 +02:00
hatal175 294d104bc6
Minor work on octhashi/sekizoa I had lying around (#2314)
* Minor octhashi changes

* Minor work on sekizoa
2025-03-03 18:00: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
YunataSavior 9c3c07575a
d_a_e_ym (a.k.a. Twilight bugs) 99% equivalent (daE_YM_c::checkBeforeBg and daE_YM_c::create have regalloc issues) (#2311)
* checkWallCrash and checkWolfBark done for d_a_e_ym

* d_a_e_ym at 36 percent

* 46% completion for d_a_e_ym

* d_a_e_ym at 65% completion

* d_a_e_ym 83% complete

* d_a_e_ym 90% complete

* d_a_e_ym 99% decompiled. All done except for 2 functions with regalloc issues. Cleanup of mSound funcs in d_a_e_ym.

* Update d_a_e_ym based on Taka's feedback
2025-02-28 23:05:49 -08:00
Caroline Madsen 4453d0617e
d_a_npc_yelia equivalent (#2310) 2025-02-26 00:41:51 -08:00
Caroline Madsen e3d0b94122
d_a_npc work (#2306) 2025-02-23 14:43:25 -08:00
Caroline Madsen 531a6d6d68
d_a_e_dt, d_a_e_ot equivalent (#2305) 2025-02-20 22:44:54 -08:00