d_wood (bushes) matching #682

themikelester · 2024-10-22T03:18:01Z

Lago, I've been out of this scene for 5 years, but excited to be back and contributing. Please let me know if you see anything egregious in here, or anything I can do to match your style better.

include/d/d_wood.h

include/d/d_tree.h

src/d/d_wood.cpp

Jasper pointed me to the fact that the complicated inv_sqrt function I wrote was indeed just std::sqrtf(), which unlocked the rest of the match

src/d/d_wood.cpp

LagoLunatic · 2024-10-22T05:58:41Z

some general notes about the style:

you're using two spaces for indentation, this decomp uses four spaces.
you should keep the "Nonmatching" comments in until the function is matched. you said the TU is only 73% matched, so I assume several of the functions aren't at 100% yet, but all of the comments were removed.
it looks like you're using an autoformatter that limits line length, based on the comments containing the mangled symbol names (like cc_hit_before_cut__Q25dWood6Unit_cFPQ25dWood8Packet_c) getting split onto multiple lines instead of one. I'd recommend turning this off, we don't usually use an autoformatter and I find it easier if those automatically-generated comments don't get edited.

themikelester · 2024-10-22T16:19:11Z

Thanks! Style replies:

A mistake. It appears something got tweaked in my vscode settings
Ah, I'll definitely keep Nonmatching comments until complete, good idea
Interesting! The line trimming was bothering me too 😅. I actually thought it was using the project's default settings because there is a default formatter set in settings.json (which I see that you just changed this week). I'll tweak my settings to avoid line trimming

LagoLunatic · 2024-10-22T16:38:50Z

I actually thought it was using the project's default settings because there is a default formatter set in settings.json (which I see that you just changed this week).

oh, I thought I removed that after copying it from dtk-template but I must have just disabled it locally, my mistake. I removed it now.

This was a local system problem which slipped by me in a previous commit

Thanks Chippy! https://discord.com/channels/727908905392275526/873250400483024976/1298360716964790294

Based on the inline functions from the .map

… inline

…sert string

Switching normAnim to a const* did most of the work

The only error is that g_dTree_shadowTexCoord is still using a 32-bit load instead of 16. the only way I know of to fix that is to define the data in this compilation unit. But that can't be right

src/d/d_wood.cpp

- No one line function implementations - Replaced instances of (SomeType*)0x0 (copy/pasted from Ghidra) with NULL - Replaced a few instances of 0.0 with 0.0f - Replaced one instance where a number was used instead of an enum value

- Removed unused variables from functions - Removed unnecessary iVar1 loop variables (leftover Ghidra detritus) - Fixed dtk function comments being wrapped by autoformatter. They now always appear on one line

This moves g_dTree_shadowTexCoord into .sdata which allows d_wood::Packet_c::draw() to load its address with a single instruction. This makes a 100% match for draw()

g_dTree_shadowTexCoord now lives in the d_tree .sdata section, so its instruction can be loaded with a single instruction. This makes a 100% match with draw().

Also renamed mWindDir to mForceDir as it represents both wind and an actor pushing from a vector

The l_matDL display list is dynamically patched to reference the l_Txa_swood_bTEX texture at static initialization time. Is there a better way to represent this?

themikelester · 2024-10-29T04:29:39Z

Last bit that isn't matching is that the .data section is too long due to the vtables from collision system objects. I'm unsure as to why this is. See this post

Had to move Packet_c destructor to get the functions in the right order. See discussion: https://discord.com/channels/727908905392275526/873250400483024976/1300680009458913280

LagoLunatic · 2024-10-29T05:25:14Z

I think the build is failing because an enum was moved on the main branch - try adding an include for d_cc_d.h and see if it fixes it

LagoLunatic · 2024-10-29T16:24:25Z

looks like there's a version difference - if you don't have the japanese version to check what it is you can use MatchingFor("GZLE01", "GZLP01") in configure.py to mark it as matching for only the non-japanese versions of the game for now.

d_wood (bushes) 73% matching

737e92a

magcius reviewed Oct 22, 2024

View reviewed changes

include/d/d_wood.h Outdated Show resolved Hide resolved

include/d/d_tree.h Outdated Show resolved Hide resolved

src/d/d_wood.cpp Outdated Show resolved Hide resolved

src/d/d_wood.cpp Outdated Show resolved Hide resolved

src/d/d_wood.cpp Outdated Show resolved Hide resolved

themikelester added 5 commits October 21, 2024 21:56

d_wood::Unit_c::set_ground 100% match

a9fce50

Jasper pointed me to the fact that the complicated inv_sqrt function I wrote was indeed just std::sqrtf(), which unlocked the rest of the match

Replace some bitshifts with multiplies based on PR feedback

2de04ab

Remove all instances of "this->" from d_wood

5399a91

Add missing struct offset comment for mTevStr

e459bb4

Cleaned up d_tree externs

eeef0e9

LagoLunatic reviewed Oct 22, 2024

View reviewed changes

src/d/d_wood.cpp Outdated Show resolved Hide resolved

src/d/d_wood.cpp Outdated Show resolved Hide resolved

src/d/d_wood.cpp Outdated Show resolved Hide resolved

src/d/d_wood.cpp Outdated Show resolved Hide resolved

src/d/d_wood.cpp Outdated Show resolved Hide resolved

themikelester added 5 commits October 21, 2024 22:29

Use MTXIdentity instead of PSMTXIdentity

4b11e10

Remove incorrect TODO rearding cCcD_ObjAtType enum

d8087df

Use the mDoAud_seStart inline function

197461d

Remove unnecessary parenthesis

23e62e5

Fix incorrect branching logic in d_wood::cc_hit_before_cut()

338fde4

d_wood data sections fixup

fe9aa69

themikelester added 2 commits October 22, 2024 10:21

Re-add "Nonmatching" comments to all nonmatching functions

3d29ab3

Merge branch 'zeldaret:main' into main

bb1df4a

themikelester added 11 commits October 22, 2024 13:15

Formatting: reformat from 2 to 4 space indentation

017eae7

This was a local system problem which slipped by me in a previous commit

100% match for d_wood::Anm_c::mode_norm()

8e118f6

Thanks Chippy! https://discord.com/channels/727908905392275526/873250400483024976/1298360716964790294

Use cLib_*Bit() functions for flag checking and setting

0384622

Based on the inline functions from the .map

d_wood: Use AnmID_e according to the .map file

bbed25f

d_wood: add a couple AnmID_e related inlines from the .map

b49504a

d_wood: Name remaining unknowns related to animation

882ee40

d_wood: Match cc_hit_before_cut()

7fac3f5

d_wood: Match calc_cc() by using the dComIfGp_roomControl_getStayNo()…

abd202b

… inline

d_wood: Match string table and search_anm() by using a constant in as…

eb4be33

…sert string

d_wood: Match mode_to_norm()

87e7988

Switching normAnim to a const* did most of the work

d_wood: 100% match for L_attr and the .rodata section

c0c7b74

themikelester added 4 commits October 23, 2024 15:39

d_wood: Fill in .data section. Still some extra data from vtables

1467663

d_wood: Match .sbss section

cc24ab3

d_wood: Match .sdata section

4be77a1

d_wood: 98% match for Packet_c::draw()

fe13bf9

The only error is that g_dTree_shadowTexCoord is still using a 32-bit load instead of 16. the only way I know of to fix that is to define the data in this compilation unit. But that can't be right

LagoLunatic reviewed Oct 24, 2024

View reviewed changes

themikelester added 10 commits October 28, 2024 16:34

d_wood: Various small formatting changes

e4c6956

- No one line function implementations - Replaced instances of (SomeType*)0x0 (copy/pasted from Ghidra) with NULL - Replaced a few instances of 0.0 with 0.0f - Replaced one instance where a number was used instead of an enum value

d_wood: More formatting fixes

ae8db62

- Removed unused variables from functions - Removed unnecessary iVar1 loop variables (leftover Ghidra detritus) - Fixed dtk function comments being wrapped by autoformatter. They now always appear on one line

d_tree: 100% match of data which is used by d_wood

516de34

This moves g_dTree_shadowTexCoord into .sdata which allows d_wood::Packet_c::draw() to load its address with a single instruction. This makes a 100% match for draw()

d_wood: Removed unnecessary comment now that draw() matches

0fd7024

g_dTree_shadowTexCoord now lives in the d_tree .sdata section, so its instruction can be loaded with a single instruction. This makes a 100% match with draw().

d_wood: 100% match for mode_cut()

58966c1

d_wood: Match mode_push_into()

470af6a

Also renamed mWindDir to mForceDir as it represents both wind and an actor pushing from a vector

d_wood: Match mode_push_back

513b52a

d_wood: Match __sinit_d_wood_cpp

8013192

The l_matDL display list is dynamically patched to reference the l_Txa_swood_bTEX texture at static initialization time. Is there a better way to represent this?

d_wood: Fix incorrect constant in set_ground()

4e3103e

d_wood: Simplify dummy data at the top of .data section

a261786

themikelester changed the title ~~d_wood (bushes) 73% matching~~ d_wood (bushes) 99.9% matching Oct 29, 2024

d_wood: Mark as matching in configure.py

fd9cb51

Had to move Packet_c destructor to get the functions in the right order. See discussion: https://discord.com/channels/727908905392275526/873250400483024976/1300680009458913280

themikelester changed the title ~~d_wood (bushes) 99.9% matching~~ d_wood (bushes) matching Oct 29, 2024

themikelester added 2 commits October 29, 2024 09:55

d_wood: Add d/d_cc_d.h include as some enums have moved

0018671

d_wood: Clean up some types at the top

f296b48

Mark d_wood as non-matching for the Japanese version

b9d23a6

LagoLunatic merged commit 64cc277 into zeldaret:main Oct 31, 2024
4 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

d_wood (bushes) matching #682

d_wood (bushes) matching #682

themikelester commented Oct 22, 2024

LagoLunatic commented Oct 22, 2024

themikelester commented Oct 22, 2024

LagoLunatic commented Oct 22, 2024

themikelester commented Oct 29, 2024

LagoLunatic commented Oct 29, 2024

LagoLunatic commented Oct 29, 2024

d_wood (bushes) matching #682

d_wood (bushes) matching #682

Conversation

themikelester commented Oct 22, 2024

LagoLunatic commented Oct 22, 2024

themikelester commented Oct 22, 2024

LagoLunatic commented Oct 22, 2024

themikelester commented Oct 29, 2024

LagoLunatic commented Oct 29, 2024

LagoLunatic commented Oct 29, 2024