Commit Graph

929 Commits

Author SHA1 Message Date
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 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
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
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
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
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
LagoLunatic 534f5d4e72 player_crawl and player_hammer 100%, misc player cleanup 2025-05-07 23:00:35 -04:00
123456789758 224b83ed8c d_a_player_main - 96% matching (#750)
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
2025-05-07 19:08:04 -04:00
LagoLunatic 74e03b6ecb Document some more TU names 2025-05-07 17:22:10 -04:00
LagoLunatic f690b92d28 Add camera mWork union; also fix clang union handling
Union members with non-trivial ctors/dtors is undefined behavior and clangd normally throws a fit and refuses to parse the whole union, but it seems to be possible to ifdef the problematic ctors out for non-mwerks compilers and explicitly tell modern compilers to use the defaults instead. Thanks to encounter for this fix.
2025-05-07 01:19:23 -04:00
LagoLunatic 18fb9de306 d_cam_type OK for JPN, add style enum, fix pystts1 enum 2025-05-06 22:58:20 -04:00
Mattias Blum bfeb8af18b Merge branch 'zeldaret:main' into d_menu 2025-05-06 22:33:53 -04:00
LagoLunatic 1480636a5a d_cam_type and d_cam_style OK, enums cleanup 2025-05-06 21:48:03 -04:00
Mattias Blum c71bb1dafb d_camera 45% (#747)
* initial progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* fix outdated member names

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* fixed deprecated member references

* more progress

* more progress

* more progress

* fix deprecated member references

* more progress

* more progress

* more progress

* more progress

* more progress

* check in for review

* remove comment

* initial PR changes

* more PR changes

* more PR changes

* added anonymous struct as class member

* reverted changes to `stage_camera2_data_class`

* added `dCamera_event_data`, `dCamera_monitoring_things` and `dCamera_DMC_system` from debug maps

* more progress

* more progress

* realmatch for `camera_draw`

* PR changes

* fix broken merge

* formatting

* Reverted change to `camSphChkdata` that caused  `sph_chk_callback` match to regress

* Reverted change to `BG` struct that caused ctor and dtor match to regress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* more progress

* PR changes

* corrected size comment

* fixed broken member references
2025-05-06 21:02:35 -04:00
mattias-blum ea930e97d8 initial progress 2025-05-06 01:35:53 -04:00
Jcw87 c033afc1f0 Match some data (#745)
* J3DTransform Data

* d_map Data

* jstudio-object Data

* JASBankMgr Data

* JASTrack Data

* d_particle Data

* d_camera Data
2025-05-03 01:18:21 -04:00
LagoLunatic 2690304a74 player_main cleanup and a few matches 2025-04-29 15:44:49 -04:00
Jcw87 5e7b59f2fe Improve compiler compatibility (#743)
* fix returns

* use standard C headers

* struct/class mismatch

* explicit this in template

* switch variable scope

* C standard compliance

* & l-value
2025-04-29 12:49:09 -04:00
123456789758 eef20535ac d_a_player_main - 70% Matching. (#742)
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
2025-04-27 19:32:36 -04:00
LagoLunatic c4eb26b2a1 d_attention cleanup, add mDoCPd inlines 2025-04-27 16:38:29 -04:00
Mm2PL 4d1cb33cd8 d_attention 100% (#701)
* Add helper functions for d_attention

* Copy and adapt code from TP

* Move for better matching layout

* Clean up includes for d_attention.cpp

* Give dAttention_c::nextAttention a return

* Use enums in dAttention_c::getActionBtnB and slight reformat

* Change return types for comparison code to match
I don't love this

* Implement dAttList_c::calcWeight

* Implement dAttention_c::sortList

* Implement dAttDraw_c::draw

* Implement dAttDraw_c::setAnm

* Implement dAttention_c::chaseAttention

* Implement judgement related functions

* Implement dAttention_c::Run and runDrawProc

* Implement dAttention_c::Draw

Actually finish Draw

* Looks like dAttention_c::stockAttention had an unused return value

* Give d_Attention_c::mLockOnState an enum

* Rename field_0x02c to mDrawAttnPos based on TP

* Add comments for fields of d_attention

* Give d_attention's flags an enum (although without names)

* Undo type change for dAttention_c::{chk,set,clr}Flag

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

* Do not spell the `this` pointer

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

* Deal with resource enums and inlines

* Move PLAYER_STATUS_FLAG_MAGIC_JUDGEMENT to daPy__PlayerStatus0 enum

* Use inlines and macros

* Add mDoCPd_L_LOCK_BUTTON inline, debug maps claim it exists

Nothing else uses it

* Update TODO comments

* Debug maps claim runXyCheckCB was used but it only makes sense if modified

* Use dComIfGp_getPlayer instead of directly indexing the array

* Locate a few more inlines

* Do not cast to AttentionFlags enum type

* Update configure script

---------

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
2025-04-27 15:12:46 -04:00
LagoLunatic adc8a35063 d_grass OK 2025-04-25 20:44:34 -04:00
LagoLunatic b0874059dd d_s_menu OK on JPN and PAL 2025-04-25 19:32:23 -04:00