Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update interfaces for animated player textures #13

Merged
merged 6 commits into from
Dec 14, 2024
Merged

Update interfaces for animated player textures #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2dabd48
Fix crashing includes
TheAzack9 Dec 14, 2024
5ae971b
Add mCap1 and mCap3 J3DModels
TheAzack9 Dec 14, 2024
b5dfe1a
Fix return type of checkWaveOnAram
TheAzack9 Dec 14, 2024
6fbc334
Formatting
TheAzack9 Dec 14, 2024
16c1d2e
Formatting
TheAzack9 Dec 14, 2024
24ea844
Formatting...
TheAzack9 Dec 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/SMS/Graph/GraphTracer.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public:
TGraphWeb *getGraph() const;
void moveTo(int);
void setTo(int);
void traceSpline(f32);
bool traceSpline(f32);

TGraphWeb *mGraph; // 0x0000
s32 mCurrentNode; // 0x0004
Expand Down
2 changes: 1 addition & 1 deletion include/SMS/Graph/SplineRail.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class TSplineRail {
public:
TSplineRail(TGraphWeb *);

void getPosAndRot(f32, TVec3f posOut, TVec3f rotOut);
void getPosAndRot(f32, TVec3f *posOut, TVec3f *rotOut);
};

class TSplinePath {
Expand Down
22 changes: 11 additions & 11 deletions include/SMS/MSound/MSound.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
#include <JSystem/JKernel/JKRHeap.hxx>

enum MS_SCENE_WAVE {
MS_WAVE_DEFAULT = 256,
MS_WAVE_DOLPIC = 513,
MS_WAVE_BIANCO = 514,
MS_WAVE_MANMA = 515,
MS_WAVE_PINNAPACO_S = 516,
MS_WAVE_PINNAPACO = 516,
MS_WAVE_MARE_SEA = 517,
MS_WAVE_DEFAULT = 256,
MS_WAVE_DOLPIC = 513,
MS_WAVE_BIANCO = 514,
MS_WAVE_MANMA = 515,
MS_WAVE_PINNAPACO_S = 516,
MS_WAVE_PINNAPACO = 516,
MS_WAVE_MARE_SEA = 517,
MS_WAVE_MONTEVILLAGE = 518,
MS_WAVE_SHILENA = 519,
MS_WAVE_RICO = 520,
MS_WAVE_CLEAR = 521,
MS_WAVE_SHILENA = 519,
MS_WAVE_RICO = 520,
MS_WAVE_CLEAR = 521,
};
enum MS_SOUND_EFFECT {
MSD_SE_PO_WATER_HI = 0x00000000,
Expand Down Expand Up @@ -1659,7 +1659,7 @@ public:

bool cameraLooksAtMario();
u32 checkMarioVoicePlaying(u8);
void checkWaveOnAram(MS_SCENE_WAVE);
bool checkWaveOnAram(MS_SCENE_WAVE);
void demoModeIn(u16, bool);
void demoModeOut(bool);
void enterStage(MS_SCENE_WAVE, u8, u8);
Expand Down
8 changes: 8 additions & 0 deletions include/SMS/Player/MarioCap.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ public:
void createMirrorModel();
void mtxEffectHide();
void mtxEffectShow();

u32 _00;
u32 _04;
u16 _08;
J3DModel *mCap1;
J3DModel *mCap3;
J3DModel *mDiverHelm;
J3DModel *maGlass1;
};

extern const char *cDirtyFileName;
Expand Down
Loading