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

Add symbols for coop #11

Merged
merged 1 commit into from
Nov 28, 2024
Merged

Add symbols for coop #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion include/SMS/Camera/CubeManagerBase.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public:

void calcPointInCubeRatio(const Vec &, s32, f32 *, f32 *, f32 *) const;
s32 getDataNo(s32) const;
s32 getInCubeNo(const Vec &pos) const;
u32 getInCubeNo(const Vec &pos) const;
bool isInCube(const Vec &pos, s32) const;

template <typename CubeT>
Expand All @@ -30,6 +30,7 @@ public:
u8 mCubeMax;
void *mCubeInfo;
const char *mCubeKey;
u32 mCurrentCube;
};

extern TCubeManagerBase *gpCubeMirror;
Expand Down
2 changes: 1 addition & 1 deletion include/SMS/Enemy/SpineEnemy.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public:
void walkToCurPathNode(f32, f32, f32);
void zigzagToCurPathNode(f32, f32, f32, f32);

u32 _F4;
THitActor* mTarget;
f32 _F8;
f32 _FC;
f32 _100;
Expand Down
11 changes: 9 additions & 2 deletions include/SMS/Player/MarioGamePad.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,16 @@ public:
struct {
u16 _00 : 8;
bool mDisable : 1;
u8 _01 : 5;
bool _01 : 1;
bool _02 : 1;
bool _03 : 1;
bool mIsTalking : 1;
bool _05 : 1;
bool _06 : 1;
bool _07 : 1;
bool _08 : 1;
bool mReadInput : 1;
u8 _02 : 1;
u8 _09 : 1;
} mState; // 0x00E2

u16 _E4;
Expand Down
4 changes: 2 additions & 2 deletions include/SMS/System/MarDirector.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ public:
s32 setup(JDrama::TDisplay *, TMarioGamePad **, u8 areaID, u8 episodeID);

TMarioGamePad **mGamePads;
TPerformList *mPerformListGX;
TPerformList *mPerformListSilhouette;
TPerformList *mPerformListGX; // 0x001c
TPerformList *mPerformListSilhouette; // 0x0020
TPerformList *mPerformListGXPost; // 0x0024
TPerformList *mPerformListMovement; // 0x0028
TPerformList *mPerformListCalcAnim; // 0x002C
Expand Down
2 changes: 2 additions & 0 deletions include/SMS/raw_fn.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2654,6 +2654,7 @@
#define __dt__16TNerveBossEelEatFv ((int (*)(...))0x800D0BF4)
#define __dt__26TNerveBossEelMouthOpenWaitFv ((int (*)(...))0x800D0CB4)
#define execute__16TNerveBossEelDieCFP24TSpineBase_1 ((int (*)(...))0x800D0D10)
#define execute__16TNerveBossEelEatCFP24TSpineBase_1 ((int (*)(...))0x800D1250)
#define theNerve__16TNerveBossEelDieFv ((int (*)(...))0x800D1190)
#define __dt__16TNerveBossEelDieFv ((int (*)(...))0x800D11F4)
#define __dt__22TNerveBossEelQuickBackFv ((int (*)(...))0x800D1884)
Expand Down Expand Up @@ -6341,6 +6342,7 @@
#define changeNerveFromTalk___8TBaseNPCFv ((int (*)(...))0x80214788)
#define isNerveCanGoToMad__8TBaseNPCCFv ((int (*)(...))0x80214970)
#define isNerveCanGoToTalk__8TBaseNPCCFv ((int (*)(...))0x80214A14)
#define isNerveMaybeDontCalcAnim0__8TBaseNPCCFv ((int (*)(...))0x80214bb8)
#define isNerveMaybeDontCalcAnim1__8TBaseNPCCFv ((int (*)(...))0x80214B44)
#define isNerveMaybeDontMovement__8TBaseNPCCFv ((int (*)(...))0x80214C20)
#define isNerveWalk__8TBaseNPCCFv ((int (*)(...))0x80214C94)
Expand Down
Loading