-
Notifications
You must be signed in to change notification settings - Fork 36
Add TBathtub and add stubs for functions #66
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.
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
Open
TheAzack9
wants to merge
3
commits into
doldecomp:main
Choose a base branch
from
TheAzack9:az-tbathtub-and-stubs
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| #ifndef MOVE_BG_MAP_OBJ_CORONA_HPP | ||
| #define MOVE_BG_MAP_OBJ_CORONA_HPP | ||
|
|
||
| #include <MoveBG/MapObjBase.hpp> | ||
|
|
||
| class TBathtub : public TMapObjBase { | ||
| public: | ||
| TBathtub(const char*); | ||
| ~TBathtub(); | ||
|
|
||
| void loadAfter(); | ||
| void hipdrop(const JGeometry::TVec3<f32>&); | ||
| void quake(const JGeometry::TVec3<f32>&); | ||
| u8 getNumGripsDead() const; | ||
| void tumble(f32, f32); | ||
| MtxPtr getTakingMtx(); | ||
| MtxPtr getSubmarineMtxInDemo(); | ||
| MtxPtr getPeachMtxInDemo(); | ||
| MtxPtr getKoopaJrMtxInDemo(); | ||
| BOOL receiveMessage(THitActor* sender, u32 message); | ||
| Mtx* getRootJointMtx() const; | ||
| void perform(u32, JDrama::TGraphics*); | ||
| void control(); | ||
| void calcBathtubData(); | ||
| void setupCollisions_(); | ||
| void removeCollisions_(); // Unused | ||
| void startDemo(); | ||
| bool allowsTumble() const; | ||
| void calcRootMatrix(); | ||
| bool getNearGrip(const JGeometry::TVec3<f32>&, f32, f32*) const; | ||
| u8 getNextJuncture(const JGeometry::TVec3<f32>&, | ||
| const JGeometry::TVec3<f32>&) const; | ||
| u8 getNextGrip(const JGeometry::TVec3<f32>&, const JGeometry::TVec3<f32>&, | ||
| f32, f32*) const; | ||
| void updatePosture_(); | ||
| void load(JSUMemoryInputStream&); | ||
| u8 getNumKillerLaunchable() const; | ||
| bool isKillerAttackable() const; | ||
| u8 getNumKillerBurstable() const; | ||
| bool isBreaking() const; // Unused | ||
| bool isKillerLaunchable() const; // Unused | ||
| void showMessage(u32); // Unused | ||
| u8 getNearJuncture(const JGeometry::TVec3<f32>&) const; // Unused | ||
| MtxPtr getKoopaMtxInDemo(); // Unused | ||
| MtxPtr getWaterMtx(s32); // Unused | ||
| MtxPtr getShineEffectMtx(); // Unused | ||
| MtxPtr getShineMtx(); // Unused | ||
| void liftMario(const JGeometry::TVec3<f32>&); // Unused | ||
| void trample(const JGeometry::TVec3<f32>&); // Unused | ||
|
|
||
| public: | ||
| // Will start at 0x138 | ||
| }; | ||
|
|
||
| #endif |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| #include "MoveBG/MapObjCorona.hpp" | ||
| #include "MoveBG/MapObjBase.hpp" | ||
|
|
||
| void TBathtub::loadAfter() { } | ||
|
|
||
| void TBathtub::hipdrop(const JGeometry::TVec3<f32>&) { } | ||
|
|
||
| void TBathtub::quake(const JGeometry::TVec3<f32>&) { } | ||
|
|
||
| u8 TBathtub::getNumGripsDead() const { return 0; } | ||
|
|
||
| void TBathtub::tumble(f32, f32) { } | ||
|
|
||
| MtxPtr TBathtub::getTakingMtx() { return nullptr; } | ||
|
|
||
| MtxPtr TBathtub::getSubmarineMtxInDemo() { return nullptr; } | ||
|
|
||
| MtxPtr TBathtub::getPeachMtxInDemo() { return nullptr; } | ||
|
|
||
| MtxPtr TBathtub::getKoopaJrMtxInDemo() { return nullptr; } | ||
|
|
||
| BOOL TBathtub::receiveMessage(THitActor* sender, u32 message) { return false; } | ||
|
|
||
| Mtx* TBathtub::getRootJointMtx() const { return nullptr; } | ||
|
|
||
| void TBathtub::perform(u32, JDrama::TGraphics*) { } | ||
|
|
||
| void TBathtub::control() { } | ||
|
|
||
| void TBathtub::calcBathtubData() { } | ||
|
|
||
| void TBathtub::setupCollisions_() { } | ||
|
|
||
| void TBathtub::removeCollisions_() { } // Unused | ||
|
|
||
| void TBathtub::startDemo() { } | ||
|
|
||
| bool TBathtub::allowsTumble() const { return false; } | ||
|
|
||
| void TBathtub::calcRootMatrix() { } | ||
|
|
||
| bool TBathtub::getNearGrip(const JGeometry::TVec3<f32>&, f32, f32*) const | ||
| { | ||
| return false; | ||
| } | ||
|
|
||
| u8 TBathtub::getNextJuncture(const JGeometry::TVec3<f32>&, | ||
| const JGeometry::TVec3<f32>&) const | ||
| { | ||
| return 0; | ||
| } | ||
|
|
||
| u8 TBathtub::getNextGrip(const JGeometry::TVec3<f32>&, | ||
| const JGeometry::TVec3<f32>&, f32, f32*) const | ||
| { | ||
| return 0; | ||
| } | ||
|
|
||
| void TBathtub::updatePosture_() { } | ||
|
|
||
| TBathtub::TBathtub(const char* name) | ||
| : TMapObjBase(name) | ||
| { | ||
| } | ||
|
|
||
| void TBathtub::load(JSUMemoryInputStream&) { } | ||
|
|
||
| u8 TBathtub::getNumKillerLaunchable() const { return 0; } | ||
|
|
||
| bool TBathtub::isKillerAttackable() const { return false; } | ||
|
|
||
| u8 TBathtub::getNumKillerBurstable() const { return 0; } | ||
|
|
||
| // Unused | ||
| bool TBathtub::isBreaking() const { return false; } | ||
|
|
||
| // Unused | ||
| bool TBathtub::isKillerLaunchable() const { return false; } | ||
|
|
||
| // Unused | ||
| void TBathtub::showMessage(u32) { } | ||
|
|
||
| // Unused | ||
| u8 TBathtub::getNearJuncture(const JGeometry::TVec3<f32>&) const { return 0; } | ||
|
|
||
| // Unused | ||
| MtxPtr TBathtub::getKoopaMtxInDemo() { return nullptr; } | ||
|
|
||
| // Unused | ||
| MtxPtr TBathtub::getWaterMtx(s32) { return nullptr; } | ||
|
|
||
| // Unused | ||
| MtxPtr TBathtub::getShineEffectMtx() { return nullptr; } | ||
|
|
||
| // Unused | ||
| MtxPtr TBathtub::getShineMtx() { return nullptr; } | ||
|
|
||
| // Unused | ||
| void TBathtub::liftMario(const JGeometry::TVec3<f32>&) { } | ||
|
|
||
| // Unused | ||
| void TBathtub::trample(const JGeometry::TVec3<f32>&) { } | ||
|
|
||
| TBathtub::~TBathtub() { } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove the ctor definition & declaration, I'm 99.99% sure it's auto-generated and the symbol is weak. Check other symbols in this TU too please, in case they are weak and should be defined in the header rather than here