Commit Graph

950 Commits

Author SHA1 Message Date
WilliamArnett 5bcc47fcd4 Undo file changes 2025-05-26 04:59:16 -05:00
WilliamArnett 1d1c15650d Revert "Merge branch 'main' into d_a_npc_km1"
This reverts commit 9ebc35f76b, reversing
changes made to b8807b2f50.
2025-05-26 04:39:29 -05:00
WilliamArnett b7dc2aca2c Revert merges 2025-05-26 04:39:29 -05:00
WilliamArnett 9ebc35f76b Merge branch 'main' into d_a_npc_km1 2025-05-26 01:42:57 -05:00
WilliamArnett 09b97f925a Merge pull request #2 from WilliamArnett/d_a_npc_kk1
D a npc kk1
2025-05-26 01:40:46 -05:00
WilliamArnett 81618b6177 Refactor to use JUT_ASSERT macro 2025-05-26 01:23:29 -05:00
WilliamArnett b8807b2f50 100% text 2025-05-25 20:27:32 -05:00
LagoLunatic c484eb490d More demo work, fix some fakematches in retail 2025-05-25 19:20:08 -04:00
LagoLunatic 0ee416c538 Match daPy_lk_c::checkPlayerGuard, switch all of daPy_lk_c's inlines to return BOOL instead of bool 2025-05-25 17:28:35 -04:00
Zeclos 3755fbfd39 D_a_npc_photo (#759)
* bit too difficult for me for now, might go back later

* progress

* getmsg

* logic matching data isnt

* data section matches

* mathubcg 100%

* cleanup

* revert this change

* final cleanup and configure.py

* nevermind cleanup

* Equivalent onstead of matching

* removed padding

* cleanup code comments and a bit more

* Fix build

---------

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
2025-05-25 17:01:01 -04:00
WilliamArnett e68c7e7424 21% text 2025-05-24 23:46:20 -05:00
WilliamArnett c8eb2c4a84 Naming a couple more variables 2025-05-24 20:33:04 -05:00
LagoLunatic 7cd75e8f7b Demo matches (#767) 2025-05-24 18:54:46 -04:00
Squidysquid1 5190f081c7 d_a_machine 100% (#754)
* d_a_machine 83%

* d_a_machine 87%

* d_a_machine matching functions

* 99% d_a_machine

* d_a_machine 100%

* Unmark as matching for demo

---------

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
2025-05-24 14:15:28 -04:00
WilliamArnett 6e4f6d1ff6 Cleaned some functions, named several variables, and began documenting dialog tree. 2025-05-24 05:56:00 -05:00
WilliamArnett 7387d532f5 Equivalent. A lot of work is needed to name variables and clean up functions. Weak function ordering is wrong. 2025-05-23 01:08:09 -05:00
Mm2PL 6ff1da3741 d_a_jbo (#744)
* Do initial work on d_a_jbo

* Remove outdated comments

* Move co_sph_src to be a function static variable

* Mark as matching

* Rename mParamsLower to mParam

* Give names to mFramesUntilJump, mAnimRotation, mAnimationSpeed, mParticlePos

* Give jbo_class::mState an enum

* fixup! Give names to mFramesUntilJump, mAnimRotation, mAnimationSpeed, mParticlePos

* Give resource ids an enum

* Add documentation comment for actor

* MWCC shenanigans

* Rename variables to better match coding guidelines

* Apply suggestions from code review

- use J3DModel::setBaseScale() inline
- use existing resource id enum
- rename `i_actor` -> `i_this`, `that` -> `a_this`
- use defines for missed returned booleans
- replace `mDoAud_seStart` -> `fopAcM_seStart`

Co-Authored-By: LagoLunatic <LagoLunatic@users.noreply.github.com>

* Apply rest of inlines

i must have forgotten about them earlier

---------

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
2025-05-22 20:28:56 -04:00
Ammar Askar 78d6f0384b Merge pull request #765 from ammaraskar/d_a_fire
Match and link d_a_fire
2025-05-22 17:59:39 -04:00
WilliamArnett 41d9631073 82% text 2025-05-22 08:31:29 -05:00
WilliamArnett e96ca610be merge in changes to main 2025-05-22 01:23:45 -05:00
WilliamArnett 20de5d926e 65% text 2025-05-22 00:34:26 -05:00
LagoLunatic 936a47461d Merge pull request #757 from mattias-blum/d_menu
d_menu work
2025-05-21 18:10:15 -04:00
LagoLunatic d097c85eb0 Cleanup 2025-05-21 18:07:36 -04:00
LagoLunatic 21cd7a2f67 G_CM3D_F_INF 2025-05-21 16:46:21 -04:00
LagoLunatic c625992a77 Add enum for actor priority 2025-05-21 14:44:25 -04:00
Mattias Blum 6ea1287d1b Merge branch 'zeldaret:main' into d_menu 2025-05-21 10:08:01 -04:00
mattias-blum c99dc93347 PR changes + added inlines 2025-05-21 10:07:26 -04:00
LagoLunatic 86c96002bc Fix demo version diffs in gameinfo/save/stage/etc 2025-05-21 00:49:35 -04:00
LagoLunatic d2f46f131a Demo: Add missing demo-only TU configs 2025-05-19 23:02:38 -04:00
LagoLunatic ec17b3e819 Demo: Fix procname enum 2025-05-19 20:39:47 -04:00
LagoLunatic 99c78680de Fix version defines 2025-05-19 20:17:13 -04:00
LagoLunatic fd6cb6e4ca Fix weak function order of dBgS_MoveBgActor::Draw
fixes #217
fixes #239
fixes #389
fixes #418
fixes #428
fixes #147
2025-05-19 18:41:23 -04:00
Ammar Askar 661f53bc8a d_a_hys 100% equivalent with weak func order (#758)
* Start matching d_a_hys

* Add d_a_hys 100% except for weak func ordering

* Enable nosyminline

* Address PR comments
2025-05-19 14:49:44 -04:00
WilliamArnett c9d38baa21 41% text 2025-05-19 00:07:19 -05:00
Azurpourpre 3f9a041528 D_a_kita matching (#751)
* ride_call_back progress

* daKita_Draw match

* kita_move progress

* ride_call_back match

* daKita_Execute will match

* daKita_Delete & daKita_IsDelete match

* CallbackCreateHeap match

* daKita_Create progress

* himo_create progress

* d_a_kita : small overall progress

* hand_draw match

* daShand_Draw match

* d_a_shand/control1 match except regalloc

* control2 almost done (regalloc issue)

* control3 match

* cut_control progress

* cut_control3 match

* normal progress

* cut match

* hand_move progress

* daShand_Execute match

* daShand_Delete & daShand_IsDelete match

* daShand_Create progress

* daShand_solidHeapCB match & useHeapInit progress

* daShand_HIO_c::daShand_HIO_c match

* control1 match

* control2 match

* cut_control match

* hand_move progress

* daShand_Create progress

* useHeapInit match

* Minor fixing

* renaming fields

* Merge with upstream now compiling

* cleaning up & minor fixes

* fixing string

* adding suggestions (PR #751)

* d_a_shand integration & kita_move gndchk position fix

* Removing awful cap_min_val inline

* 100% match

* Adding match to configure.py
2025-05-18 23:00:00 -04:00
WilliamArnett 28f3c8425e d_a_tag_kk1 (#755)
* 99% match

* Rewrote _execute to increase accuracy. Only issue in .text is a label not loading correctly. I have no idea how to fix this.

* Equivalent. Weak func ordering.

* Update src/d/actor/d_a_tag_kk1.cpp

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>

* Update src/d/actor/d_a_tag_kk1.cpp

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>

* Remove explicit `this`

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>

* Implemented hio_prm_c struct

---------

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
2025-05-18 21:42:29 -04:00
Ammar Askar 094a297809 100% d_a_kui (#756)
* 45% d_a_kui

* 97% d_a_kui

* 100% d_a_kui match

* Fix easy issues from PR review

* Use s16[3] for field_0x2DC
2025-05-18 21:40:09 -04:00
mattias-blum 568fe41d61 PR changes made 2025-05-18 10:15:09 -04:00
WilliamArnett 2c4a44999c 28% text 2025-05-17 23:31:58 -05:00
Mattias Blum 59d39267ec Merge branch 'zeldaret:main' into d_menu 2025-05-17 22:57:55 -04:00
mattias-blum 6c3f33263d more progress 2025-05-17 22:40:49 -04:00
mattias-blum a4e5f77721 more progress 2025-05-17 17:22:15 -04:00
mattias-blum 49023df979 more progress 2025-05-17 17:08:14 -04:00
LagoLunatic 337303fc79 Standardize mMode/mAction names in C-style actors 2025-05-17 14:01:12 -04:00
mattias-blum a4947d09f9 more progress 2025-05-15 21:27:27 -04:00
WilliamArnett fc5f48f3c7 7% text 2025-05-15 18:14:35 -05:00
WilliamArnett 84f631e234 Equivalent. Weak func ordering. 2025-05-15 18:04:20 -05:00
mattias-blum 0a2e18900f more progress 2025-05-15 17:51:38 -04:00
mattias-blum f72d6b5910 more progress 2025-05-15 11:48:36 -04:00
mattias-blum 9d1cd5c6df more progress 2025-05-15 11:05:44 -04:00