Skip to content

Conversation

@SquareMan
Copy link
Member

@SquareMan SquareMan commented Feb 17, 2025

Basically just the full set of headers from doldecomp/dolsdk2004

This may not be 100% accurate for us but I figure that we will need to edit these headers much less often than we currently need to edit our monolithic dolphin.h

Notable Changes:

fastmath.h

Starting getting a redefinition error for Vec in xVec3.cpp for some reason after this. It appears to be unused so I just deleted it from the fastmath header.

dolphin/types.h

adjusted std includes to use our std headers.

dolphin/card.h

renamed two function arguments from new to _new to avoid conflicting with the c++ keyword

Added missing defines:

#define CARD_STAT_ANIM_LOOP 0x00
#define CARD_STAT_ANIM_BOUNCE 0x04
#define CARD_STAT_ANIM_MASK 0x04

@SquareMan SquareMan mentioned this pull request Feb 20, 2025
@JoshSanch
Copy link
Collaborator

JoshSanch commented Mar 29, 2025

We are merging this PR in, acknowledging that these headers will be an inexact match for this project. However, they will be closer to what we need than what we have now, so the progress is welcome. Thanks for the effort @SquareMan

@JoshSanch JoshSanch merged commit 2c68e9a into bfbbdecomp:main Mar 29, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants