Skip to content

[OoT] Fix/workaround decomp extracting params macroified#681

Merged
Yanis002 merged 3 commits intoFast-64:mainfrom
Dragorn421:workaround_macroified_params
Mar 16, 2026
Merged

[OoT] Fix/workaround decomp extracting params macroified#681
Yanis002 merged 3 commits intoFast-64:mainfrom
Dragorn421:workaround_macroified_params

Conversation

@Dragorn421
Copy link
Contributor

Decomp recently started extracting params macroified like ENDOOR_PARAMS_NODATA(DOOR_ROOMLOAD, false) instead of as just raw hex 0x003F
for example this is an excerpt from extracted/gc-eu-mq-dbg/assets/scenes/dungeons/Bmori1/Bmori1_scene_02000090_TransitionActorEntryList.inc.c:

    {
        {
            // { room, bgCamIndex }
            { 11, -1 },
            { 8, -1 },
        }, // sides
        ACTOR_EN_DOOR,
        {  -1502,    523,  -1864 }, // pos
        -0x8000, // rotY
        ENDOOR_PARAMS_NODATA(DOOR_ROOMLOAD, false) /* 0x003F */, // params
    }, // 4

This breaks fast64 importing for two unrelated reasons:

  • fast64 does not expect additional commas in each entry, so I introduced split_c_on_commas which splits on commas but ignoring commas inside parentheses
  • fast64 expects to be able to parse the params; this is worked around

The workaround for the second point is to try set the params value, and if it fails then fallback to using the actor as "custom", setting the custom actor id and custom params.

The workaround is to try set the params value, and if it fails then
fallback to using the actor as "custom", setting the custom actor id
and custom params.
@Dragorn421 Dragorn421 changed the title Fix/workaround decomp extracting params macroified [OoT] Fix/workaround decomp extracting params macroified Mar 13, 2026
@Dragorn421 Dragorn421 added bug Something isn't working oot Has to do with the Ocarina of Time 64 side labels Mar 13, 2026
Copy link
Collaborator

@Yanis002 Yanis002 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it seems these changes are working like expected (I tested with kokiri forest and fire temple), though in the future I think we should add proper support for this instead of relying on the custom stuff

@Yanis002 Yanis002 added the merge soon Will be merged in a few days at most if nothing else comes up label Mar 14, 2026
@Yanis002 Yanis002 merged commit f2abc54 into Fast-64:main Mar 16, 2026
1 check passed
@Dragorn421 Dragorn421 deleted the workaround_macroified_params branch March 16, 2026 17:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working merge soon Will be merged in a few days at most if nothing else comes up oot Has to do with the Ocarina of Time 64 side

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants