Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
55 changes: 55 additions & 0 deletions include/MoveBG/MapObjCorona.hpp
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
104 changes: 104 additions & 0 deletions src/MoveBG/MapObjCorona.cpp
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() { }
Copy link
Collaborator

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