Commit Graph

562 Commits

Author SHA1 Message Date
LagoLunatic efc33c5fc4 Various inline cleanup 2025-06-19 19:03:11 -04:00
LagoLunatic 264ee5d6e1 Clean up some inlines and field names 2025-06-18 19:29:02 -04:00
LagoLunatic 65379a432f d_a_obj_figure demo almost matches 2025-06-18 19:15:47 -04:00
LagoLunatic 3d0aff6a84 daPy_lk_c::dProcTool and daDemo00_c::execute matched, fix up various inlines and template classes, stb OK 2025-06-17 22:30:17 -04:00
LagoLunatic f042f156f5 Add all player demo mode names to enum 2025-06-15 16:10:33 -04:00
LagoLunatic 25b9aeae03 daPy_lk_c::procShipCrane 2025-06-15 15:43:35 -04:00
LagoLunatic 0146d0b91f d_a_player_main cleanup and inlines 2025-06-15 13:59:16 -04:00
Ammar Askar 3fbb9b5e74 Fully match d_a_npc_btsw and mark equivalent (#790)
* Match up d_a_npc_bmsw to 98%

* Remove old nonmatching comments

* Match MailCreateInit by using a static cast

* Match Throw and daNpc_Bmsw_getGameEndMsg

* Match CreateInit using demo for ref

* Fix inline for dComIfG_TimerStart

* Match shiwake_game_action

* Match getNextNo

* Mark Equivalent

* Fully match d_a_npc_btsw and mark equivelant

---------

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
2025-06-14 17:23:39 -04:00
Ammar Askar 5c391aa7ad Fully match d_a_npc_bmsw and mark equivalent (#789)
* Match up d_a_npc_bmsw to 98%

* Remove old nonmatching comments

* Match MailCreateInit by using a static cast

* Match Throw and daNpc_Bmsw_getGameEndMsg

* Match CreateInit using demo for ref

* Fix inline for dComIfG_TimerStart

* Match shiwake_game_action

* Match getNextNo

* Mark Equivalent
2025-06-14 17:14:12 -04:00
LagoLunatic b465138e9c daPy_lk_c::procBottleOpen 2025-06-14 17:00:59 -04:00
LagoLunatic 3bd775e04d Misc demo matches 2025-06-13 15:14:08 -04:00
Onni Leivo 8733e64147 implement daObjTable functions (#734)
* implement daObjTable functions

* matches now in build, 100%

* use inlines and make it cleaner

* inlines

* add only retail match

---------

Co-authored-by: Onni <mail@onnileivo.com>
2025-06-11 22:07:07 -04:00
Ammar Askar 498fd40d72 98% matching d_a_dk (#788)
* 98% matching d_a_dk

* Match tail_draw

* Fix demo build issue

* Fix inlines based on demo

* Address feedback from review
2025-06-08 19:27:32 -04:00
LagoLunatic e24cbed367 Demo work (#786)
* Demo work

* Fix PAL

* Fix d_door weak func order and link it

* Fix d_door for demo

* JKernel OK on demo + misc

* tag_attention 100% on demo

* More demo work and fix some retail fakematches
2025-06-04 16:50:49 -04:00
Skelp 08571c4865 #181: d_a_tag_attention (#784)
* #181: d_a_tag_attention matching; TODO: implement chk_inside and dComIfGp_att_Look2RequestF

* #181: continue working on d_a_tag_attention, matching almost complete

* #181: revert naming class member (not certain enough)

* #181: preliminary changes to resolve #784 comments regarding usage of debug maps

* #181: commit suggestion by @WilliamArnett, fixing regalloc error

Co-authored-by: WilliamArnett <149556961+WilliamArnett@users.noreply.github.com>

* #181: fix missing curly bracket

* #181: resolve #784 comments with the kind help of @WilliamArnett;
 move `daTagAttention::Act_c::chk_inside` to header file; split `plyrToObjVec` definition to match assembly;
 remove temp variable, use values directly and swap operands;
 implement `Look2RequestF` in `include/d/d_attention.h`;
 remove non-matching use of temp variable `iVar1` and replace `current.pos` with uninitialized variable in `daTagAttention::Act_c::_execute`

* Update include/d/actor/d_a_tag_attention.h

Co-authored-by: WilliamArnett <149556961+WilliamArnett@users.noreply.github.com>

* #181: update `d_a_tag_attention` to `Matching` in `configure.py`; remove Non-Matching comments

* #181: change matching type to `Equivalent` for `d_a_tag_attention`

* Apply suggestions from code review

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

* #181: fix PrmAbstract call

---------

Co-authored-by: WilliamArnett <149556961+WilliamArnett@users.noreply.github.com>
Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
2025-06-04 14:31:32 -04:00
LagoLunatic 5c5632822b Merge pull request #785 from ammaraskar/trivial_funcs
Auto-generate most trivial process_method_funcs
2025-06-03 17:38:06 -04:00
WilliamArnett 9fbf32eb05 d_a_npc_km1 Equivalent (#768)
* 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.

* 7% text

* 28% text

* 41% text

* 65% text

* 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.

* 82% text

* Equivalent. A lot of work is needed to name variables and clean up functions. Weak function ordering is wrong.

* Cleaned some functions, named several variables, and began documenting dialog tree.

* Naming a couple more variables

* 21% text

* change out getMySubstanceP for getMyIntegerP inline

* 100% text

* Refactor to use JUT_ASSERT macro

* Revert merges

* Revert "Merge branch 'main' into d_a_npc_km1"

This reverts commit 9ebc35f76b, reversing
changes made to b8807b2f50.

* Revert merges

* Revert "Merge branch 'main' into d_a_npc_km1"

This reverts commit 9ebc35f76b, reversing
changes made to b8807b2f50.

* Undo file changes

* Revert "Undo file changes"

This reverts commit 5bcc47fcd4.

* a couple more reverts

* Should be done with reverts

* revert configure.py

* Implement LagoLunatic's suggested changes

* add endif to allow demo to build
2025-06-03 17:34:41 -04:00
Ammar Askar e0626b6ccb Revert files in current pull requests 2025-06-03 17:17:55 -04:00
Ammar Askar 67050779fe Auto-generate trivial process_method_funcs 2025-06-03 16:30:53 -04:00
Ammar Askar 20a252e254 100% match and link d_a_windmill (#783)
* 98% matching d_a_windmill

* Match CreateInit

* Match hane_move

* Fully match and link TU
2025-06-03 15:43:15 -04:00
Ammar Askar 4bf91cbfea Start matching up d_a_bst (#775)
* Start matching up d_a_bst

* Commit more progress on d_a_bst

* Match up more functions

* Match up stay function

* Remove some questionable names

* Match fly and some attack functions

* Match collider data

* Address feedback from review

* Fix no-op actor calls and match some functions better
2025-06-03 01:12:48 -04:00
Ammar Askar b5a9419017 Link and match d_a_obj_correct (#782) 2025-06-02 15:29:55 -04:00
LagoLunatic 073df83073 Fix obj_movebox parameter inlines
fixes #781
2025-06-02 00:30:37 -04:00
LagoLunatic 4e7f5de0f3 d_a_npc_fa1 100% with weak order, add inlines 2025-06-01 19:09:57 -04:00
LagoLunatic 3771f5f6ee Merge pull request #779 from LagoLunatic/d44j01
Demo work, d_a_kytag02 and d_a_ff OK
2025-06-01 17:50:57 -04:00
123456789758 7eb543eb50 d_a_npc_fa1 - 99% matching (#780)
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
2025-06-01 17:49:10 -04:00
Ammar Askar 354a9625fe Automatically generate dCcD_Src structs for most files (#778)
* Add missing enum members for colliders

* Auto-generate most dCcD_Src* structs

* Manually fix namespaces for 11 TUs
2025-06-01 16:50:44 -04:00
LagoLunatic bd917524ba Demo work, d_a_kytag02 and d_a_ff OK 2025-05-31 20:09:14 -04:00
LagoLunatic 431943a893 Cleanup, demo work, and match daNpcPeople_c::getMsg on retail 2025-05-29 15:41:38 -04:00
123456789758 c1f54653fd Document several more TU names (#770)
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
2025-05-29 00:11:39 -04:00
LagoLunatic b9190842b7 Demo work 2025-05-28 01:39:07 -04:00
Zeclos 693c92638f D_a_obj_pfall matching (#769)
* 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

* close to matching

* matches

* added d/d_priority.h back

* configure.pu

* updated to match retail and cleanup
2025-05-26 13:54:30 -04: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
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
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
LagoLunatic d2f46f131a Demo: Add missing demo-only TU configs 2025-05-19 23:02:38 -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
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
LagoLunatic 337303fc79 Standardize mMode/mAction names in C-style actors 2025-05-17 14:01:12 -04:00
LagoLunatic 4a54a410b1 More player_main match fixes 2025-05-14 16:00:12 -04:00
Mattias Blum 95f230eb15 d_a_ks 100% (#746)
* initial progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* symbol cleanup

* more progress

* more progress

* d_a_ks 100%

* more symbol cleanup

* likely real-match for `useHeapInit`

* removed `csXyz` type from class member

* changed int to BOOL for `HEAVY_IN`

* documented matching issue

* PR changes
2025-05-09 15:18:16 -04:00
LagoLunatic cbbd4c2dc0 Match more player_main regalloc/stack/etc issues 2025-05-08 23:00:19 -04:00