Commit Graph

2524 Commits

Author SHA1 Message Date
Briggs Baltzell 9d76f1decd Add GXNormal1x16 and GXColor3x8 inline utility functions to GX.h for simplified normal and color input handling. 2026-03-05 12:53:10 -06:00
Briggs Baltzell 0dde5978e0 Refactor vertex handling in d_menu_cloth to group vertex and texture operations for improved readability and structure. 2026-03-05 12:35:45 -06:00
Briggs Baltzell 156149f947 Refactor vertex and texture coordinate handling in dMCloth_c::plot_shadow for improved clarity and correctness. 2026-03-05 12:28:08 -06:00
Briggs Baltzell 98af1f807f Refactor triangle strip generation in d_menu_cloth for improved readability and maintainability. 2026-03-05 12:16:17 -06:00
Briggs Baltzell 3ff385ffb6 Add inline utility function GXColor4x8 to GX.h for streamlined color input handling 2026-03-05 12:14:18 -06:00
Briggs Baltzell 09a8c046a6 Update vertex attribute formats in d_menu_cloth for improved correctness. 2026-03-05 00:36:13 -06:00
Briggs Baltzell e0156f17b9 Fix INNER_SIZE iteration in d_menu_cloth to properly handle loop bounds. 2026-03-05 00:00:43 -06:00
Briggs Baltzell add12a1e3c Match cloth_init in d_menu_cloth 2026-03-04 23:57:53 -06:00
Briggs Baltzell a74af799e5 Change mWaveProgress type from u16 to s16 in d_menu_cloth for consistency with signed calculations. 2026-03-04 17:11:19 -06:00
Briggs Baltzell 8834e7314d Replace hardcoded angle conversion with cM_deg2s in MENU_CLOTH_TYPE_0 logic for improved clarity and maintainability. 2026-03-04 17:07:49 -06:00
Briggs Baltzell b07c7e690e Change wavePreSteps type from u16 to s16 in d_menu_cloth for alignment with signed calculations. 2026-03-04 17:05:31 -06:00
Briggs Baltzell ac76b6e26d Refactor MENU_CLOTH_TYPE_2 logic: replace hardcoded rotation calculation with cM_deg2s for clarity and maintainability. 2026-03-04 17:04:10 -06:00
Briggs Baltzell b5240d4bdb Refactor dMCloth_c::cloth_init: replace raw pointer arithmetic with set calls for improved clarity and maintainability. 2026-03-04 16:58:11 -06:00
Briggs Baltzell d90d9b218d Merge branch 'main' into menu_cloth 2026-03-04 16:23:51 -06:00
LagoLunatic 256b4eeb37 Fix some clangd errors 2026-03-04 13:47:40 -05:00
Zeclos dcf4862387 D_a_npc_tc matching for retail (#930)
* progress

* code matching non-demo

* cleanup for d_a_npc_tc and d_a_obj_smplbg
2026-03-04 13:25:59 -05:00
Briggs Baltzell d54d983a4a d_a_boomerang matching (#936)
* Added constructor implementation for `daBoomerang_c`.

* Extend `daBoomerang_sightPacket_c` with `dDlst_base_c` base class.

* Refactor `d_a_boomerang.h`: reorganize class definitions and update member layout in `daBoomerang_c`.

* Extend `daBoomerang_c`: add new arrays, members, and static assertions for structure validation.

* Extend `daBoomerang_c`: add `dBgS_BoomerangLinChk` member and update padding fields.

* Extend `daBoomerang_c`: implement `create` method, add new members, and update function signatures.

* Refactor `daBoomerang_c`: update `createHeap` function to return `BOOL` and adjust related calls.

* Extend `daBoomerang_c`: implement `execute` method logic, update member variables, and adjust structure layout in `d_a_boomerang.h`.

* Extend `daBoomerang_c`: add static blur vector definitions for `l_blur_top` and `l_blur_root`.

* Add fields to `daBoomerang_blur_c`.

* Refactor `daBoomerang_blur_c`: implement `initBlur` logic, add `pos` field, update structure layout in `d_a_boomerang.h`.

* Refactor `daBoomerang_blur_c`: update `initBlur` and `copyBlur` logic, modify array structure to use 2D layout, and adjust declarations in `d_a_boomerang.h`.

* Match `copyBlur`

* Update `config.yml`: add symbol `l_matDL` for `daBoomerang_blur_c`.

* Extend `daBoomerang_blur_c`: implement `draw` method, add vertex description, attribute format lists, and texture handling logic.

* Add fields to `daBoomerang_sightPacket_c`

* Update `play` method in `daBoomerang_sightPacket_c`: implement looping logic for modifying `field_0xF4` values.

* Refactor `setSight` and `play` in `daBoomerang_sightPacket_c`: implement animation logic, replace `field_0xF4` with `arr_0xF4`, add `arr_0xF9`, and update structure in `d_a_boomerang.h`.

* Refactor `daBoomerang_sightPacket_c`: add `setTex` and `setImage` methods; update image data logic in `d_a_boomerang.cpp` and `d_a_boomerang.h`.

* Update `initFrame` and `resetSightOn` in `daBoomerang_sightPacket_c`: initialize `arr_0xF4` and reset `targetFlags`.

* Replace hardcoded array size with `BOOM_TARGET_MAX` in `d_a_boomerang.cpp` and `d_a_boomerang.h`

* Refactor `daBoomerang_sightPacket_c`: rename variables for clarity, update structure fields, and adjust logic in `setSight`, `play`, and related methods.

* Implement `draw` method in `daBoomerang_sightPacket_c`: add vertex descriptor/attribute format lists, texture handling, and sight rendering logic.

* Adjust vertex attribute formats in `d_a_boomerang.cpp`: update position to `GX_S8` and texture to `GX_U8`.

* Reorder includes in `d_a_boomerang.cpp` to resolve dependencies for `l_sightMatDL` and `l_sightDL__d_a_boomerang`

* Update `getFlyMax` in `daBoomerang_c`: add player status and stage name checks to determine maximum flight distance.

* Refactor `procMove` and `execute` in `daBoomerang_c`: improve boomerang targeting logic, rename variables for clarity, update array structures, and adjust control flow.

* Implement enhanced boomerang movement logic in `daBoomerang_c`: calculate angles, update position/rotation, handle water effects, and refine collision detection. Adjust structure fields in `d_a_boomerang.h`.

* Refactor `daBoomerang_c` control flow: reorder player retrieval logic, adjust distance-based normalization, and refine boomerang return handling.

* Change return type of `returnBoomerang` from `int` to `BOOL` in `d_a_player_main.h` and `d_a_player_boomerang.inc`.

* Change `setItemWaterEffect` return type from `u32` to `BOOL` and refactor its parameters and logic for clarity and behavior adjustment.

* Adjust `setItemWaterEffect` call in `d_a_boomerang.cpp` to use explicit `BOOL` comparison for clarity.

* Refactor `daBoomerang_c` control flow and targeting logic: introduce `mTargetRayEnd`, enhance position/angle calculations, integrate player sight checks, and update camera handling. Adjust includes and structure definitions for consistency.

* Match `rockLineCallback`

* Rename `param_1` to `pHitActor` in `rockLineCallback` for clarity.

* Match `setAimActor` in `d_a_boomerang.cpp`.

* Refactor `daBoomerang_c`: update `setLockActor` to use `BOOL` type, modify related logic for clarity, and ensure consistent parameter usage across `d_a_boomerang.cpp`.

* Match `resetLockActor` in `d_a_boomerang.cpp`: initialize target arrays and reset counters for consistency.

* Refactor `daBoomerang_c`: Fix struct offsets, update instance size

* Match `setRoomInfo` in `d_a_boomerang.cpp`: update position handling, ground checks, room ID assignment, and environment override logic.

* Match `create` in `d_a_boomerang.cpp`: update matrix handling, target ID initialization, callback setup, and clean up unused code.

* Match `setKeepMatrix` in `d_a_boomerang.cpp`: update transformation logic to align boomerang with Link's hand.

* Refactor `d_a_player_main` boomerang logic: rename `m36F4` to `mBoomerangCatchPos`, implement `getBoomerangCatchPos` accessor

* Match `setAimPos` in `d_a_boomerang.cpp`: implement target position logic based on current target index and player catch position.

* Match `checkBgHit` in `d_a_boomerang.cpp`: implement background collision logic, position updates, sound effects, and behavior adjustments.

* Continue matching `procWait` in `d_a_boomerang.cpp`

* Refactor `d_a_boomerang.cpp`: rename `field_0xF3A` to `mModelRotY` for clarity, update all associated references, and adjust struct definition in the header file.

* Continue matching `procWait` in `d_a_boomerang.cpp`

* Match `procWait` in `d_a_boomerang.cpp`

* Continue matching `procMove` in `d_a_boomerang.cpp`

* Refactor `d_a_boomerang.cpp`: convert `u8` fields to `bool` for clarity and better type usage, update header and references accordingly.

* Match `draw` in `d_a_boomerang.cpp`: implement drawing logic with model updates, light settings, shadow handling, and target sight management. Update struct definition to include `mGroundY`.

* Refactor `procMove` in `d_a_boomerang.cpp`: simplify angle calculations, update `mInWater` to `u8`, and improve readability by reducing nested logic.

* Fix `at_offset` initialization in `procMove` in `d_a_boomerang.cpp`

* Match `procMove` in `d_a_boomerang.cpp`

* Refine `draw` in `d_a_boomerang.cpp`: inline comments for quads setup, add light yellow trail color definition.

* Refactor `d_a_boomerang.cpp` and header: rename `field_0x14` to `numTrailSegments` for improved clarity and update all related references.

* Refactor `draw` in `d_a_boomerang.cpp`: reorganize quads initialization and alpha blending loops for improved structure and readability.

* Refactor `draw` in `d_a_boomerang.cpp`: combine alpha variable declarations for improved local scope and clarity.

* Refactor `draw` in `d_a_boomerang.cpp`: introduce `QUAD_VERT` macro to streamline quad vertex setup and improve code readability.

* Refactor `draw` in `d_a_boomerang.cpp`: rename `alpha` variables to `uCoord` for improved clarity and consistency with their purpose.

* Refactor `d_a_boomerang.cpp` and header: introduce `SEGMENTS_PER_STEP` constant for improved clarity and consistency, update related loops and data structures.

* Refactor `d_a_boomerang.cpp` and header: rename trail arrays for improved clarity and consistency, update all related references.

* Refactor `d_a_boomerang.cpp` and header: simplify trail vertex array indexing by flattening multidimensional arrays and updating all related code.

* Refactor `d_a_boomerang.cpp`: mark `se_flg` array as `const` for improved immutability and clarity.

* Refactor `d_a_boomerang.cpp`: relocate `l_at_cps_src` definition for improved organization and consistency.

* Refactor `d_a_boomerang.cpp` and header: rename and clarify multiple variables (e.g., `field_0xF2C` to `mIsReturning`) for improved readability and consistency, update all related references and logic.

* Refactor `d_a_boomerang.h`: add destructors to `daBoomerang_blur_c` and `daBoomerang_sightPacket_c` for proper ordering.

* Refactor `daBoomerang_blur_c::draw` in `d_a_boomerang.cpp`: reorder variable initialization, streamline loops, and adjust `QUAD_VERT` macro usage for improved clarity and consistency.

* Add inline geometry utility functions to `GFGeometry.h`

* Refactor `d_a_boomerang.cpp`: simplify geometry rendering by updating `QUAD_VERT` macro implementation and replacing manual vertex management with `GFBegin`/`GFEnd`.

* Refactor `d_a_boomerang.cpp`: simplify trail rendering by streamlining `uCoord` handling, reducing redundant variables, and improving clarity in loops.

* Refactor `d_a_boomerang.cpp`: rename `QUAD_VERT` to `QUAD_VTX` for clarity and update all related references.

* Add `l_matDL$4438` entry to config files for `daBoomerang_blur_c` rendering assets.

* Add version check around `j3dSys.reinitGX()` in `d_a_boomerang.cpp` to limit execution to non-demo builds.

* Refactor `d_a_boomerang.cpp`: replace direct `current.roomNo` usage with `roomNo` variable for improved clarity and consistency.

* Add version-specific asserts in `d_a_boomerang.cpp` for demo and non-demo builds

* Add version-specific asserts and adjust version check logic in `d_a_boomerang.cpp` for Japanese build

* Align `GXVtxDescList` and `GXVtxAttrFmtList` declarations with `ALIGN_DECL(32)` in `d_a_boomerang.cpp` for consistent memory alignment.

* Update `d_a_boomerang` to use `MatchingFor` in configuration

* Remove outdated `FIXME` comment in `d_a_boomerang.cpp`.

* Refactor `d_a_boomerang.cpp`: replace hardcoded rotation constants with `yRotPerStep` variable for clarity and maintainability.

* Update `d_a_boomerang.cpp` configuration to use `Matching` instead of `MatchingFor`.

* Refactor `d_a_boomerang.cpp`: rename `field_0xF2E` to `mJustHit` and `field_0xF2D` to `unused_0xF2D` for improved clarity.

* Replace hardcoded value in `d_a_boomerang.cpp` with `daBoomerang_blur_c::SEGMENTS_PER_STEP` for improved readability and maintainability.

* Refactor `d_a_boomerang.cpp`: replace `fpcM_GetParam` with `fopAcM_GetParam` for consistency with actor parameter retrieval methods.

* Introduce `Mode` enum in `d_a_boomerang` and replace related hardcoded values for improved readability and maintainability.

* Refactor `setAimActor` in `d_a_boomerang.cpp`: rename parameter for improved clarity.

* Replace `fpcM_SetParam` with `fopAcM_SetParam` in `d_a_boomerang.cpp` for consistency with actor parameter setting methods.

* Replace hardcoded `0` with `dEvtMode_NONE_e` in `d_a_boomerang.cpp` for improved readability and maintainability.

* Replace `BOOM_TARGET_MAX` with `BOOMERANG_LOCK_MAX` in `d_a_boomerang` for consistency.

* Refactor `d_a_boomerang.cpp` and `d_a_boomerang.h`: rename target-related variables and methods to lock-related for improved clarity and consistency.

* Refactor `daBoomerang_Draw` and `daBoomerang_Execute` in `d_a_boomerang.cpp` to simplify and remove redundant casts.

* Replace `Mode_0` and `Mode_1` with `Mode_Wait` and `Mode_Throw` in `d_a_boomerang`

* Simplify boolean assignment in boomerang lock condition in `d_a_boomerang.cpp`.

* Rename variable `b` to `isAiming` in `d_a_boomerang.cpp` for improved readability.

* Refactor draw methods in `d_a_boomerang.cpp` to streamline list-setting logic.

* Refactor particle effect in `d_a_boomerang.cpp` to use `dComIfGp_particle_setP1` for improved clarity and maintainability.

* Replace `g_dComIfG_gameInfo` camera getter with `dComIfGp` equivalents in `d_a_boomerang.cpp` for consistency.

* Simplify version-specific `JUT_ASSERT` calls in `d_a_boomerang.cpp` with `VERSION_SELECT` for improved maintainability.

* Replace direct model matrix assignment with `fopAcM_SetMtx` in `d_a_boomerang.cpp` for consistency.

* Update matching logic for `d_a_boomerang.cpp` to use `MatchingFor`.
2026-03-03 23:44:51 -05:00
Roland 60b0d94e2a d_a_obj_auzu (#935)
* 59% matching in .text

* d_a_obj_auzu 100% for demo and retail

* Named all fields of daObjAuzu::Act_c

* All fields named
2026-03-01 18:36:56 -05:00
Roland 034b90bfdc d_a_daiocta and d_a_daiocta_eye matching (#934)
* Initial work; 25% matching in .text

* 27% matching in .text

* Match daDaiocta_c::modeProc

* 56% matching in .text

* 61% matching in .text

* 69% matching in .text

* 74% matching in .text

* 84% matching in .text

* daDaiocta_Eye_c 31%

* Match daDaiocta_Eye_c node callbacks

* daDaiocta_Eye_c 69%

* daDaiocta_Eye_c 85%

* daDaiocta_Eye_c 100% for retail and demo

* daDaiocta_c 96%

* daDaiocta_c 100% for retail and demo

* Field name cleanup

* More field naming

* Implement {is_, to_, to_dis}appear daObjAuzu inlines

* Misc code formatting changes

* Use JntHitType enum (d_a_daiocta)

* Apply suggestions from code review

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

* Use fopAcM_SetMtx inline

---------

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
2026-02-27 14:04:36 -05:00
SuperDude88 1d96a4c988 d_a_fgmahou OK (#932)
* d_a_fgmahou OK

* Some Cleanup

- Add offset comments
- Name some class fields
- Use a couple inlines from the map
2026-02-26 14:46:54 -05:00
TetrisGG 847a5e98bf d_a_obj_mkie - matching retail (#931)
* d_a_obj_mkie - matching

* review changes
2026-02-15 10:23:06 -05:00
Briggs Baltzell 13ef326604 Replace numeric cloth type values with MenuClothType enum for improved readability and maintainability in d_menu_cloth. 2026-02-12 08:34:05 -06:00
Briggs Baltzell 72aa31b38a Use TRUE and FALSE macros instead of literal values in d_menu_cloth methods for consistency. 2026-02-12 08:34:05 -06:00
Briggs Baltzell 7ea2280040 Add clarifying comments in dMenu_ClothMethodTable about function order and usage 2026-02-12 08:34:05 -06:00
Briggs Baltzell 4e66e63cd2 Rename fields in d_menu_cloth 2026-02-12 08:34:05 -06:00
Briggs Baltzell 7110e3be69 Refactor d_menu_cloth to replace repeated member accesses with HIO_CHILD macro for improved readability and maintainability. 2026-02-12 08:34:05 -06:00
Briggs Baltzell 67e6c789e1 Refactor dMCloth_c::plot to improve naming consistency for loop variables and pointer arithmetic. 2026-02-12 08:34:05 -06:00
Briggs Baltzell 4f11e02768 Refactor d_menu_cloth to improve pointer arithmetic in plot loop and add missing implementations for getOffsetVec and getShadowPos. 2026-02-12 08:34:05 -06:00
Briggs Baltzell 9b5f5956c5 Add member comments in dMenu_ClothMethodTable 2026-02-12 08:34:05 -06:00
Briggs Baltzell 1c3414fe92 Update d_menu_cloth to use msg_method_class and msg_process_profile_definition. Refactor structure definitions and add TODO comment for size clarification. 2026-02-12 08:34:05 -06:00
Briggs Baltzell 02dc9c0b68 Match dMCloth_c::plot_shadow implementation and update parameter names in plot and plot_shadow declarations. 2026-02-12 08:34:05 -06:00
Briggs Baltzell 3744bed5ed Match dMCloth_c::draw implementation, refactor initialization of field_0x10, and update associated structure definitions. 2026-02-12 08:34:05 -06:00
Briggs Baltzell 74d213afaf Refactor d_menu_cloth to replace s16 color fields with GXColorS10 and GXColor structures. Update all related logic and structure definitions accordingly. 2026-02-12 08:34:05 -06:00
Briggs Baltzell 4938076537 Match dMCloth_c::plot implementation and minor formatting fix in dMCloth_c::ShadowTevSettingMenu. 2026-02-12 08:34:05 -06:00
Briggs Baltzell eea0f2883e Match dMCloth_c::alpha_out implementation. 2026-02-12 08:34:04 -06:00
Briggs Baltzell a7ab1c9c9e Match dMCloth_c::ShadowTevSettingMenu and dMCloth_c::ShadowTevSettingFileSelect implementations. 2026-02-12 08:34:04 -06:00
Briggs Baltzell 2ba45aa4a0 Match dMCloth_c::ShadowTevSetting implementation. 2026-02-12 08:34:04 -06:00
Briggs Baltzell d1179371d1 Start matching dMCloth_c::cloth_move_sin and dMCloth_c::cloth_move_simple implementations. 2026-02-12 08:34:04 -06:00
Briggs Baltzell 332db836a4 Match dMCloth_c::cloth_move implementation and update type definitions for field_0xa and field_0x34 to s16. 2026-02-12 08:34:04 -06:00
Briggs Baltzell 4174c6decd Update g_fopAc_Method reference to g_fopMsg_Method in cloth menu structure. 2026-02-12 08:34:04 -06:00
Briggs Baltzell 8abcb6ee26 Match dMenu_ClothCreate, dMenu_ClothDelete, dMenu_ClothExecute, dMenu_ClothDraw, and dMenu_ClothIsDelete implementations and update related structure definitions. 2026-02-12 08:34:04 -06:00
Briggs Baltzell fc8aafe9b4 Match daCLOTH_HIO_c destructor implementation. 2026-02-12 08:34:04 -06:00
Briggs Baltzell 40a0c594d1 Match dMCloth_c::setNrmVtx implementation and update header declaration. 2026-02-12 08:34:04 -06:00
Briggs Baltzell 1cc8554cd8 Start matching dMCloth_c::cloth_init and update structure definitions to use INNER_SIZE constant, optimize initialization logic, and replace redundant assignments with consolidated methods. 2026-02-12 08:34:04 -06:00
Briggs Baltzell 4c2f8709a3 Match dMCloth_c::lightSet1 2026-02-12 08:34:04 -06:00
Briggs Baltzell 5dcf008f4b Match dMCloth_c::TevSettingMenu and dMCloth_c::TevSettingFileSelect. 2026-02-12 08:34:04 -06:00
Briggs Baltzell 8d74eb04dc Match dMCloth_c::TevSettingMenu 2026-02-12 08:34:04 -06:00
Briggs Baltzell 3aecfeb1ba Match dMCloth_c::TevSetting 2026-02-12 08:34:04 -06:00
Briggs Baltzell 63fb32f7ab Define ARR_SIZE constant and replace hardcoded array sizes in d_menu_cloth. 2026-02-12 08:34:04 -06:00
Briggs Baltzell 65e6b3a767 Refactor dMCloth_c to use mCurArr for indexing and update structure definitions in d_menu_cloth. 2026-02-12 08:34:03 -06:00