Commit Graph

293 Commits

Author SHA1 Message Date
LagoLunatic ea4725a8d5 Demo: Match barrel2 mode_demo_explode0 2025-08-03 23:47:09 -04:00
SuperDude88 4adfd27155 daNpc_Cb1_c Almost OK (#822)
* daNpc_Cb1_c Almost OK

Down to regswaps/minor instruction issues

* Oops

That inline was fake

* Some Cleanup

- Fill in more inlines
- Reorganize daNpc_Cb1_c inlines
- Use inlines more
- Some naming and typing consistency

* Naming, Consistency Tweaks

- TRUE/FALSE macros for all cases of BOOL, use int -> BOOL sometimes
- Rename HIO to be consistent with other NPCs
- Animation enum

* Some HIO Names

* Clarity Tweaks

- NULL in more asserts
- Squared constants
2025-07-29 21:04:42 -04:00
Maide 8ee539cdbc d_a_knob00 (#823)
* d_a_knob00

* PR
2025-07-28 18:44:12 -04:00
Maide b93c7993da d_a_ki (#821)
* d_a_ki

* PR
2025-07-27 17:19:15 -04:00
LagoLunatic 67259edeeb Clean up HIO reg accesses 2025-07-17 21:41:40 -04:00
LagoLunatic 3bb95dd90c d_mesg work 2025-06-26 19:12:22 -04:00
LagoLunatic efc33c5fc4 Various inline cleanup 2025-06-19 19:03:11 -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 92a094ef6d d_file_select matching for JPN and demo 2025-06-14 19:09:05 -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
SuperDude88 947a9a05b1 d_file_select Matching on US (#795)
* d_file_select Almost Matching

Down to 3 regswaps and probably weak func ordering

* Fix Remaining Nonmatches

Regswaps figured out by @ammaraskar
2025-06-14 17:09:40 -04:00
LagoLunatic e7d0df1e50 Cleanup player struct 2025-06-09 23:29:34 -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
LagoLunatic cdfaa05635 More demo work, cleanup 2025-06-01 16:05:42 -04:00
LagoLunatic 22ba12593a dComIfG_Ccsp_SetMass 2025-05-29 19:40:36 -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
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 86c96002bc Fix demo version diffs in gameinfo/save/stage/etc 2025-05-21 00:49:35 -04:00
LagoLunatic 99c78680de Fix version defines 2025-05-19 20:17:13 -04:00
Mattias Blum 59d39267ec Merge branch 'zeldaret:main' into d_menu 2025-05-17 22:57:55 -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
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 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
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 b0874059dd d_s_menu OK on JPN and PAL 2025-04-25 19:32:23 -04:00
LagoLunatic ce8d17ec08 Add an enum for action button icon status 2025-04-20 20:06:40 -04:00
LagoLunatic 2f4c6f89b3 Bunch of inline fixes 2025-04-16 13:23:21 -04:00
123456789758 70d9f5df10 d_a_player_main - 48% Matching. (#739)
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
2025-04-14 17:17:47 -04:00
LagoLunatic 26015238ef d_stage cleanup 2025-04-13 23:21:01 -04:00
LagoLunatic 780d4e680a d_drawlist OK, J2DPicture inline cleanup 2025-04-12 23:18:11 -04:00
SuperDude88 1f1900bf66 f_op_msg_mng Work (#685)
* f_op_msg_mng work

* Fix Some Conflicts

Haven't had much chance to work on actual progress, still looking to do more matching before merge

* Tiny bit of Work

Little bit of cleanup, start on a couple more functions

* More Matches

Also add back some missing nonmatch comments

* Fixes

* JPN ifdefs

* Inline Fix

Also force one match (there's no way that casting is real)

* Reorder Strings

Fix rodata, I think this order is also slightly more accurate to the function (but I'm not really trying to match it right now anyways)
2025-04-12 21:02:24 -04:00
Mattias Blum 5f287fcaee d_camera 28% (#732)
* 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
2025-04-11 16:37:42 -04:00
LagoLunatic 309158e274 J3DModel inlines cleanup, procBottleSwing_init match, etc 2025-04-10 19:30:51 -04:00
123456789758 072cb3a441 d_a_player_misc - Several matches/close matches across several files. (#736)
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
2025-04-08 17:41:27 -04:00
LagoLunatic f2ff19c83e player_fan 99% 2025-04-01 20:46:23 -04:00
123456789758 ecd9b48113 d_a_player_sword.inc - Several matching with minor issues. (#731)
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
2025-04-01 14:39:22 -04:00
123456789758 53dfbaa55a d_a_player_bottle.inc - Several matching with minor issues. (#729)
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
2025-04-01 14:38:18 -04:00
123456789758 3bb407642a d_a_player_ship.inc - Several close to matching except minor issues. (#721)
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
2025-04-01 14:31:12 -04:00
123456789758 81379e4b3f d_a_player_vomit.inc - Almost all matching with minor issues. (#726)
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
2025-04-01 14:30:25 -04:00
123456789758 d4bbb4fb43 d_a_player_battle.inc - All close to matching with minor issues. (#720)
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
2025-03-31 18:44:43 -04:00
123456789758 26f1b0c8f0 d_a_player_whide.inc - Almost all matching except floats, (#717)
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
2025-03-31 17:56:25 -04:00
123456789758 6bc267c369 d_a_player_hook.inc - All matching except floats. (#724)
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
2025-03-31 17:48:52 -04:00
123456789758 3f2fc267c5 d_a_player_hang.inc - All matching except floats. (#715)
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
2025-03-31 17:41:48 -04:00
LagoLunatic 41621f4e72 Fix weird gameInfo loads caused by casts within inlines 2025-03-31 14:07:20 -04:00
123456789758 f4587892ff d_a_player_dproc.inc - All except two fully matching. (#713)
* d_a_player_dproc.inc - All except two fully matching.

* Addressed review comments.

* Missed two mCurProc checks.

* Second review.

---------

Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
2025-03-30 14:08:11 -04:00