mirror of
https://github.com/projectPiki/pikmin2.git
synced 2024-11-27 23:30:27 +00:00
Make SingleGameSection.cpp objdiffable
This commit is contained in:
HeartPiece
parent
823f993c7f
commit
9f05af13a8
@ -86,27 +86,26 @@ struct SingleGameSection : public BaseGameSection {
|
||||
struct Game::ItemBigFountain::Item* mFountain; // _18C
|
||||
u32 _190; // _190
|
||||
bool _194; // _194
|
||||
// known to be at least 22 in length. Probably 32.
|
||||
// My guess there is that the spare 3 bytes is unintentional wiggle-room from this not being 4-byte aligned.
|
||||
char mCaveFilename[0x20]; // _195
|
||||
DvdThreadCommand mDvdThread; // _1B8
|
||||
Delegate<Game::SingleGameSection>* _224; // _224
|
||||
u8 _228; // _228
|
||||
Game::CourseInfo* mCurrentCourseInfo; // _22C
|
||||
ID32 mCaveID; // _230
|
||||
bool mInCave; // _23C
|
||||
u8 _23D;
|
||||
bool mNeedTreasureCalc;
|
||||
Delegate<Game::SingleGameSection>* _240;
|
||||
efx::TChasePos* _244;
|
||||
int mCurrentFloor; // _248
|
||||
Game::SingleGame::FSM* mFsm; // _24C
|
||||
Game::SingleGame::GameState* mCurrentState;
|
||||
KindCounter _254;
|
||||
KindCounter _25C;
|
||||
KindCounter mOtakaraCounter;
|
||||
KindCounter mItemCounter;
|
||||
u8 _274;
|
||||
char mCaveFilename[0x20]; // _195
|
||||
u8 _1B5; // _1B5, unknown
|
||||
DvdThreadCommand mDvdThread; // _1B8
|
||||
Delegate<Game::SingleGameSection>* _224; // _224
|
||||
u8 _228; // _228
|
||||
Game::CourseInfo* mCurrentCourseInfo; // _22C
|
||||
ID32 mCaveID; // _230
|
||||
bool mInCave; // _23C
|
||||
u8 _23D; // _23D
|
||||
bool mNeedTreasureCalc; // _23E
|
||||
Delegate<Game::SingleGameSection>* _240; // _240
|
||||
efx::TChasePos* _244; // _244
|
||||
int mCurrentFloor; // _248
|
||||
Game::SingleGame::FSM* mFsm; // _24C
|
||||
Game::SingleGame::GameState* mCurrentState; // 250
|
||||
KindCounter _254; // _254
|
||||
KindCounter _25C; // _25C
|
||||
KindCounter mOtakaraCounter; // _264
|
||||
KindCounter mItemCounter; // _26C
|
||||
u8 _274; // _274
|
||||
};
|
||||
} // namespace Game
|
||||
|
||||
|
||||
@ -23,10 +23,10 @@ struct DispMemberBase {
|
||||
{
|
||||
}
|
||||
|
||||
virtual u32 getSize() = 0; // _08
|
||||
virtual u32 getOwnerID() = 0; // _0C
|
||||
virtual u64 getMemberID() = 0; // _10
|
||||
virtual void doSetSubMemberAll(); // _14 (weak)
|
||||
virtual u32 getSize() = 0; // _08
|
||||
virtual u32 getOwnerID() = 0; // _0C
|
||||
virtual u64 getMemberID() = 0; // _10
|
||||
virtual void doSetSubMemberAll() { } // _14 (weak)
|
||||
|
||||
bool isID(u32, u64);
|
||||
void getMemberName(char*);
|
||||
|
||||
@ -1,13 +1,23 @@
|
||||
#include "Dolphin/string.h"
|
||||
#include "PSM/Scene.h"
|
||||
#include "Game/BaseGameSection.h"
|
||||
#include "Game/GameSystem.h"
|
||||
#include "Game/Piki.h"
|
||||
#include "Iterator.h"
|
||||
#include "Screen/Enums.h"
|
||||
#include "types.h"
|
||||
#include "Game/PikiMgr.h"
|
||||
#include "Game/SingleGameSection.h"
|
||||
#include "Game/SingleGame.h"
|
||||
#include "Game/Entities/ItemOnyon.h"
|
||||
#include "Game/Entities/ItemCave.h"
|
||||
#include "Game/gameStat.h"
|
||||
#include "efx/TLastMomiji.h"
|
||||
#include "efx/TForestSakura.h"
|
||||
#include "efx/TTutorialSnow.h"
|
||||
#include "Screen/Enums.h"
|
||||
#include "PSM/Scene.h"
|
||||
#include "PSSystem/PSGame.h"
|
||||
#include "PSSystem/PSMainSide_Scene.h"
|
||||
#include "Dolphin/string.h"
|
||||
#include "Iterator.h"
|
||||
#include "Radar.h"
|
||||
#include "nans.h"
|
||||
|
||||
/*
|
||||
Generated from dpostproc
|
||||
@ -620,53 +630,15 @@
|
||||
|
||||
namespace Game {
|
||||
|
||||
static const int unusedSGSArray[] = { 0, 0, 0 };
|
||||
static const char sgsName[] = "SingleGameSection";
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80152074
|
||||
* Size: 000084
|
||||
*/
|
||||
SingleGameSection::~SingleGameSection()
|
||||
{
|
||||
/*
|
||||
stwu r1, -0x10(r1)
|
||||
mflr r0
|
||||
stw r0, 0x14(r1)
|
||||
stw r31, 0xc(r1)
|
||||
mr r31, r4
|
||||
stw r30, 8(r1)
|
||||
or. r30, r3, r3
|
||||
beq lbl_801520DC
|
||||
lis r3, __vt__Q24Game17SingleGameSection@ha
|
||||
addic. r0, r30, 0x1b8
|
||||
addi r3, r3, __vt__Q24Game17SingleGameSection@l
|
||||
li r0, 0
|
||||
stw r3, 0(r30)
|
||||
stw r0, mgr__5Radar@sda21(r13)
|
||||
beq lbl_801520C0
|
||||
addic. r3, r30, 0x214
|
||||
beq lbl_801520C0
|
||||
li r4, 0
|
||||
bl __dt__10JSUPtrLinkFv
|
||||
|
||||
lbl_801520C0:
|
||||
mr r3, r30
|
||||
li r4, 0
|
||||
bl __dt__Q24Game15BaseGameSectionFv
|
||||
extsh. r0, r31
|
||||
ble lbl_801520DC
|
||||
mr r3, r30
|
||||
bl __dl__FPv
|
||||
|
||||
lbl_801520DC:
|
||||
lwz r0, 0x14(r1)
|
||||
mr r3, r30
|
||||
lwz r31, 0xc(r1)
|
||||
lwz r30, 8(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x10
|
||||
blr
|
||||
*/
|
||||
}
|
||||
SingleGameSection::~SingleGameSection() { Radar::mgr = nullptr; }
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
@ -675,121 +647,19 @@ lbl_801520DC:
|
||||
*/
|
||||
void SingleGameSection::startMainBgm()
|
||||
{
|
||||
/*
|
||||
stwu r1, -0x10(r1)
|
||||
mflr r0
|
||||
lis r4, lbl_8047CD98@ha
|
||||
stw r0, 0x14(r1)
|
||||
stw r31, 0xc(r1)
|
||||
addi r31, r4, lbl_8047CD98@l
|
||||
stw r30, 8(r1)
|
||||
lwz r3, gameSystem__4Game@sda21(r13)
|
||||
lbz r0, 0x3c(r3)
|
||||
ori r0, r0, 2
|
||||
stb r0, 0x3c(r3)
|
||||
lwz r0, spSceneMgr__8PSSystem@sda21(r13)
|
||||
cmplwi r0, 0
|
||||
bne lbl_80152144
|
||||
addi r3, r31, 0x20
|
||||
addi r5, r31, 0x2c
|
||||
li r4, 0x1d3
|
||||
crclr 6
|
||||
bl panic_f__12JUTExceptionFPCciPCce
|
||||
gameSystem->setFlag(GAMESYS_IsPlaying);
|
||||
PSSystem::SceneMgr* mgr = PSSystem::getSceneMgr();
|
||||
mgr->checkScene();
|
||||
mgr->mScenes->mChild->startMainSeq();
|
||||
|
||||
lbl_80152144:
|
||||
lwz r30, spSceneMgr__8PSSystem@sda21(r13)
|
||||
lwz r0, 4(r30)
|
||||
cmplwi r0, 0
|
||||
bne lbl_80152168
|
||||
addi r3, r31, 0x38
|
||||
addi r5, r31, 0x2c
|
||||
li r4, 0xc7
|
||||
crclr 6
|
||||
bl panic_f__12JUTExceptionFPCciPCce
|
||||
if (Radar::mgr && !Radar::mgr->getNumOtakaraItems() && gameSystem->mIsInCave) {
|
||||
PSSystem::SceneMgr* mgr2 = PSSystem::getSceneMgr();
|
||||
PSSystem::checkSceneMgr(mgr2);
|
||||
|
||||
lbl_80152168:
|
||||
lwz r3, 4(r30)
|
||||
lwz r3, 4(r3)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x1c(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r0, mgr__5Radar@sda21(r13)
|
||||
cmplwi r0, 0
|
||||
beq lbl_80152264
|
||||
bl getNumOtakaraItems__Q25Radar3MgrFv
|
||||
cmpwi r3, 0
|
||||
bne lbl_80152264
|
||||
lwz r3, gameSystem__4Game@sda21(r13)
|
||||
lbz r0, 0x48(r3)
|
||||
cmplwi r0, 0
|
||||
beq lbl_80152264
|
||||
lwz r0, spSceneMgr__8PSSystem@sda21(r13)
|
||||
cmplwi r0, 0
|
||||
bne lbl_801521C8
|
||||
addi r3, r31, 0x20
|
||||
addi r5, r31, 0x2c
|
||||
li r4, 0x1d3
|
||||
crclr 6
|
||||
bl panic_f__12JUTExceptionFPCciPCce
|
||||
|
||||
lbl_801521C8:
|
||||
lwz r30, spSceneMgr__8PSSystem@sda21(r13)
|
||||
cmplwi r30, 0
|
||||
bne lbl_801521E8
|
||||
addi r3, r31, 0x20
|
||||
addi r5, r31, 0x2c
|
||||
li r4, 0x1dc
|
||||
crclr 6
|
||||
bl panic_f__12JUTExceptionFPCciPCce
|
||||
|
||||
lbl_801521E8:
|
||||
lwz r0, 4(r30)
|
||||
cmplwi r0, 0
|
||||
bne lbl_80152208
|
||||
addi r3, r31, 0x38
|
||||
addi r5, r31, 0x2c
|
||||
li r4, 0xcf
|
||||
crclr 6
|
||||
bl panic_f__12JUTExceptionFPCciPCce
|
||||
|
||||
lbl_80152208:
|
||||
lwz r3, 4(r30)
|
||||
lwz r30, 4(r3)
|
||||
cmplwi r30, 0
|
||||
bne lbl_8015222C
|
||||
addi r3, r31, 0x38
|
||||
addi r5, r31, 0x44
|
||||
li r4, 0xd1
|
||||
crclr 6
|
||||
bl panic_f__12JUTExceptionFPCciPCce
|
||||
|
||||
lbl_8015222C:
|
||||
lwz r12, 0(r30)
|
||||
mr r3, r30
|
||||
lwz r12, 0x40(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
clrlwi. r0, r3, 0x18
|
||||
bne lbl_8015225C
|
||||
addi r3, r31, 0x68
|
||||
addi r5, r31, 0x2c
|
||||
li r4, 0x177
|
||||
crclr 6
|
||||
bl panic_f__12JUTExceptionFPCciPCce
|
||||
|
||||
lbl_8015225C:
|
||||
mr r3, r30
|
||||
bl stopPollutionSe__Q23PSM10Scene_CaveFv
|
||||
|
||||
lbl_80152264:
|
||||
lwz r0, 0x14(r1)
|
||||
lwz r31, 0xc(r1)
|
||||
lwz r30, 8(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x10
|
||||
blr
|
||||
*/
|
||||
PSM::Scene_Cave* scene = static_cast<PSM::Scene_Cave*>(mgr2->getChildScene());
|
||||
PSSystem::checkGameScene(scene);
|
||||
scene->stopPollutionSe();
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
@ -797,7 +667,7 @@ lbl_80152264:
|
||||
* Address: 80152284
|
||||
* Size: 0002A0
|
||||
*/
|
||||
void SingleGame::FSM::init(Game::SingleGameSection*)
|
||||
void SingleGame::FSM::init(SingleGameSection* section)
|
||||
{
|
||||
/*
|
||||
stwu r1, -0x10(r1)
|
||||
@ -1012,7 +882,7 @@ lbl_80152504:
|
||||
* Address: ........
|
||||
* Size: 000038
|
||||
*/
|
||||
void SingleGame::FSM::draw(Game::SingleGameSection*, Graphics&)
|
||||
void SingleGame::FSM::draw(SingleGameSection* section, Graphics&)
|
||||
{
|
||||
// UNUSED FUNCTION
|
||||
}
|
||||
@ -1022,7 +892,7 @@ void SingleGame::FSM::draw(Game::SingleGameSection*, Graphics&)
|
||||
* Address: 80152528
|
||||
* Size: 000020
|
||||
*/
|
||||
void SingleGame::FSM::transit(Game::SingleGameSection*, int, Game::StateArg*)
|
||||
void SingleGame::FSM::transit(SingleGameSection* section, int, Game::StateArg*)
|
||||
{
|
||||
/*
|
||||
stwu r1, -0x10(r1)
|
||||
@ -1077,7 +947,7 @@ lbl_80152580:
|
||||
* Address: 80152588
|
||||
* Size: 000200
|
||||
*/
|
||||
SingleGame::State* SingleGame::State::accountEarnings(Game::SingleGameSection*, Game::PelletCropMemory*, bool)
|
||||
SingleGame::State* SingleGame::State::accountEarnings(SingleGameSection* section, Game::PelletCropMemory*, bool)
|
||||
{
|
||||
/*
|
||||
.loc_0x0:
|
||||
@ -1237,7 +1107,7 @@ SingleGame::State* SingleGame::State::accountEarnings(Game::SingleGameSection*,
|
||||
* Address: 80152788
|
||||
* Size: 000160
|
||||
*/
|
||||
void SingleGame::CaveDayEndState::init(Game::SingleGameSection*, Game::StateArg*)
|
||||
void SingleGame::CaveDayEndState::init(SingleGameSection* section, Game::StateArg*)
|
||||
{
|
||||
/*
|
||||
.loc_0x0:
|
||||
@ -1349,7 +1219,7 @@ void SingleGame::CaveDayEndState::init(Game::SingleGameSection*, Game::StateArg*
|
||||
* Address: 801528E8
|
||||
* Size: 0000B4
|
||||
*/
|
||||
void SingleGame::CaveDayEndState::exec(Game::SingleGameSection*)
|
||||
void SingleGame::CaveDayEndState::exec(SingleGameSection* section)
|
||||
{
|
||||
/*
|
||||
stwu r1, -0x10(r1)
|
||||
@ -1431,7 +1301,7 @@ lbl_80152984:
|
||||
* Address: 801529CC
|
||||
* Size: 00003C
|
||||
*/
|
||||
void SingleGame::CaveDayEndState::draw(Game::SingleGameSection*, Graphics&)
|
||||
void SingleGame::CaveDayEndState::draw(SingleGameSection* section, Graphics&)
|
||||
{
|
||||
/*
|
||||
stwu r1, -0x10(r1)
|
||||
@ -1457,7 +1327,7 @@ void SingleGame::CaveDayEndState::draw(Game::SingleGameSection*, Graphics&)
|
||||
* Address: 80152A08
|
||||
* Size: 000034
|
||||
*/
|
||||
void SingleGame::CaveDayEndState::cleanup(Game::SingleGameSection*)
|
||||
void SingleGame::CaveDayEndState::cleanup(SingleGameSection* section)
|
||||
{
|
||||
/*
|
||||
stwu r1, -0x10(r1)
|
||||
@ -1481,7 +1351,8 @@ void SingleGame::CaveDayEndState::cleanup(Game::SingleGameSection*)
|
||||
* Address: 80152A3C
|
||||
* Size: 0000E0
|
||||
*/
|
||||
SingleGameSection::SingleGameSection(JKRHeap*)
|
||||
SingleGameSection::SingleGameSection(JKRHeap* heap)
|
||||
: BaseGameSection(heap)
|
||||
{
|
||||
/*
|
||||
stwu r1, -0x20(r1)
|
||||
@ -1569,13 +1440,6 @@ void SingleGameSection::section_fadeout()
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80152B50
|
||||
* Size: 000004
|
||||
*/
|
||||
void SingleGame::State::on_section_fadeout(Game::SingleGameSection*) { }
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80152B54
|
||||
@ -1732,7 +1596,7 @@ lbl_80152CB4:
|
||||
* Address: 80152D1C
|
||||
* Size: 0000EC
|
||||
*/
|
||||
void SingleGameSection::doUpdate()
|
||||
bool SingleGameSection::doUpdate()
|
||||
{
|
||||
/*
|
||||
stwu r1, -0x10(r1)
|
||||
@ -1801,13 +1665,6 @@ lbl_80152DF0:
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80152E08
|
||||
* Size: 000004
|
||||
*/
|
||||
void SingleGame::State::on_demo_timer(Game::SingleGameSection*, unsigned long) { }
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80152E0C
|
||||
@ -2063,7 +1920,7 @@ lbl_80153100:
|
||||
* Address: 80153118
|
||||
* Size: 000008
|
||||
*/
|
||||
void SingleGameSection::getCaveID()
|
||||
u32 SingleGameSection::getCaveID()
|
||||
{
|
||||
/*
|
||||
lwz r3, 0x238(r3)
|
||||
@ -2355,13 +2212,6 @@ lbl_80153450:
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80153460
|
||||
* Size: 000004
|
||||
*/
|
||||
void SingleGame::State::onOrimaDown(Game::SingleGameSection*, int) { }
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80153464
|
||||
@ -2481,13 +2331,6 @@ void SingleGameSection::onMovieStart(Game::MovieConfig* config, unsigned long p2
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 8015355C
|
||||
* Size: 000004
|
||||
*/
|
||||
void SingleGame::State::onMovieStart(Game::SingleGameSection*, Game::MovieConfig*, unsigned long, unsigned long) { }
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80153560
|
||||
@ -2531,13 +2374,6 @@ void SingleGameSection::onMovieDone(Game::MovieConfig* config, unsigned long p2,
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 801535C4
|
||||
* Size: 000004
|
||||
*/
|
||||
void SingleGame::State::onMovieDone(Game::SingleGameSection*, Game::MovieConfig*, unsigned long, unsigned long) { }
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 801535C8
|
||||
@ -2578,13 +2414,6 @@ lbl_8015360C:
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80153624
|
||||
* Size: 000004
|
||||
*/
|
||||
void SingleGame::State::onMovieCommand(Game::SingleGameSection*, int) { }
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80153628
|
||||
@ -2755,7 +2584,7 @@ lbl_80153854:
|
||||
* Address: 80153868
|
||||
* Size: 000008
|
||||
*/
|
||||
void Onyon::getFaceDir()
|
||||
f32 Onyon::getFaceDir()
|
||||
{
|
||||
/*
|
||||
lfs f1, 0x228(r3)
|
||||
@ -3089,7 +2918,7 @@ void SingleGameSection::saveMainMapSituation(bool isSubmergedCastle)
|
||||
if (piki->isAlive() && piki->mPikiKind != Blue) {
|
||||
playData->mPikiContainer.getCount(piki->mPikiKind, piki->mHappaKind)++;
|
||||
PikiKillArg killArg(0x10001);
|
||||
piki->kill(&pikiKillArg);
|
||||
piki->kill(&killArg);
|
||||
}
|
||||
iterator.next();
|
||||
}
|
||||
@ -3321,10 +3150,10 @@ void SingleGameSection::loadMainMapSituation()
|
||||
*/
|
||||
void SingleGameSection::clearCaveMenus()
|
||||
{
|
||||
_180 = 0;
|
||||
mCurrentCave = nullptr;
|
||||
mHole = nullptr;
|
||||
mFountain = nullptr;
|
||||
mOpenMenuFlags = 0;
|
||||
mCurrentCave = nullptr;
|
||||
mHole = nullptr;
|
||||
mFountain = nullptr;
|
||||
/*
|
||||
li r0, 0
|
||||
stb r0, 0x180(r3)
|
||||
@ -3913,7 +3742,7 @@ void SingleGameSection::openKanketuMenu(Game::ItemBigFountain::Item*, Controller
|
||||
* Address: 8015471C
|
||||
* Size: 000300
|
||||
*/
|
||||
void SingleGameSection::updateCaveMenus()
|
||||
bool SingleGameSection::updateCaveMenus()
|
||||
{
|
||||
/*
|
||||
stwu r1, -0x10(r1)
|
||||
@ -4168,13 +3997,6 @@ void SingleGameSection::goNextFloor(Game::ItemHole::Item* hole)
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80154A5C
|
||||
* Size: 000004
|
||||
*/
|
||||
void SingleGame::State::onNextFloor(Game::SingleGameSection*, Game::ItemHole::Item*) { }
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80154A60
|
||||
@ -4183,7 +4005,7 @@ void SingleGame::State::onNextFloor(Game::SingleGameSection*, Game::ItemHole::It
|
||||
void SingleGameSection::goCave(Game::ItemCave::Item* cave)
|
||||
{
|
||||
strcpy(mCaveFilename, cave->mCaveFilename);
|
||||
mCaveID->setID(cave->mCaveID.getID());
|
||||
mCaveID.setID(cave->mCaveID.getID());
|
||||
_194 = true;
|
||||
mInCave = true;
|
||||
mCurrentState->onHoleIn(this, cave);
|
||||
@ -4220,13 +4042,6 @@ void SingleGameSection::goCave(Game::ItemCave::Item* cave)
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80154AD4
|
||||
* Size: 000004
|
||||
*/
|
||||
void SingleGame::State::onHoleIn(Game::SingleGameSection*, Game::ItemCave::Item*) { }
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80154AD8
|
||||
@ -4259,13 +4074,6 @@ void SingleGameSection::goMainMap(Game::ItemBigFountain::Item* fountain)
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80154B20
|
||||
* Size: 000004
|
||||
*/
|
||||
void SingleGame::State::onFountainReturn(Game::SingleGameSection*, Game::ItemBigFountain::Item*) { }
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80154B24
|
||||
@ -4622,15 +4430,15 @@ lbl_80154F20:
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: ........
|
||||
* Size: 000440
|
||||
*/
|
||||
void SingleGameSection::createFallPikmins(Game::PikiContainer&, int)
|
||||
{
|
||||
// UNUSED FUNCTION
|
||||
}
|
||||
// /*
|
||||
// * --INFO--
|
||||
// * Address: ........
|
||||
// * Size: 000440
|
||||
// */
|
||||
// void SingleGameSection::createFallPikmins(Game::PikiContainer&, int)
|
||||
// {
|
||||
// // UNUSED FUNCTION
|
||||
// }
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
@ -5002,40 +4810,25 @@ lbl_80155430:
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 801554DC
|
||||
* Size: 000010
|
||||
*/
|
||||
void GameStat::PikiCounter::operator()(int)
|
||||
{
|
||||
/*
|
||||
slwi r0, r4, 2
|
||||
add r3, r3, r0
|
||||
lwz r3, 4(r3)
|
||||
blr
|
||||
*/
|
||||
}
|
||||
// /*
|
||||
// * --INFO--
|
||||
// * Address: ........
|
||||
// * Size: 0000E0
|
||||
// */
|
||||
// void SingleGameSection::setDispMemberNavi(og::Screen::DataNavi&, int)
|
||||
// {
|
||||
// // UNUSED FUNCTION
|
||||
// }
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: ........
|
||||
* Size: 0000E0
|
||||
*/
|
||||
void SingleGameSection::setDispMemberNavi(og::Screen::DataNavi&, int)
|
||||
{
|
||||
// UNUSED FUNCTION
|
||||
}
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: ........
|
||||
* Size: 000148
|
||||
*/
|
||||
void SingleGameSection::calcOtakaraLevel(float&)
|
||||
{
|
||||
// UNUSED FUNCTION
|
||||
}
|
||||
// /*
|
||||
// * --INFO--
|
||||
// * Address: ........
|
||||
// * Size: 000148
|
||||
// */
|
||||
// void SingleGameSection::calcOtakaraLevel(float&)
|
||||
// {
|
||||
// // UNUSED FUNCTION
|
||||
// }
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
@ -5441,13 +5234,6 @@ lbl_801559E4:
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80155A78
|
||||
* Size: 000004
|
||||
*/
|
||||
void SingleGameSection::drawMainMapScreen() { }
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80155A7C
|
||||
@ -5827,8 +5613,8 @@ void SingleGameSection::newCaveOtakaraEarningsAndDrops()
|
||||
int itemCount = PelletList::Mgr::getCount(PelletList::ITEM);
|
||||
_254.alloc(otakaraCount);
|
||||
_25C.alloc(itemCount);
|
||||
_264.alloc(otakaraCount);
|
||||
_26C.alloc(itemCount);
|
||||
mOtakaraCounter.alloc(otakaraCount);
|
||||
mItemCounter.alloc(itemCount);
|
||||
_274 = 0;
|
||||
/*
|
||||
stwu r1, -0x20(r1)
|
||||
@ -5878,8 +5664,8 @@ void SingleGameSection::clearCaveOtakaraEarningsAndDrops()
|
||||
{
|
||||
_254.clear();
|
||||
_25C.clear();
|
||||
_264.clear();
|
||||
_26C.clear();
|
||||
mOtakaraCounter.clear();
|
||||
mItemCounter.clear();
|
||||
_274 = 0;
|
||||
/*
|
||||
stwu r1, -0x10(r1)
|
||||
@ -5907,328 +5693,6 @@ void SingleGameSection::clearCaveOtakaraEarningsAndDrops()
|
||||
|
||||
} // namespace Game
|
||||
|
||||
namespace og {
|
||||
|
||||
namespace Screen {
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 8015603C
|
||||
* Size: 000008
|
||||
*/
|
||||
u32 DispMemberCave::getSize() { return sizeof(DispMemberCave); }
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80156044
|
||||
* Size: 00000C
|
||||
*/
|
||||
ScreenOwnerID DispMemberCave::getOwnerID()
|
||||
{
|
||||
return OWNER_OGA;
|
||||
/*
|
||||
lis r3, 0x004F4741@ha
|
||||
addi r3, r3, 0x004F4741@l
|
||||
blr
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80156050
|
||||
* Size: 000010
|
||||
*/
|
||||
ScreenMemberID DispMemberCave::getMemberID()
|
||||
{
|
||||
return MEMBER_CAVE;
|
||||
/*
|
||||
lis r4, 0x43415645@ha
|
||||
li r3, 0
|
||||
addi r4, r4, 0x43415645@l
|
||||
blr
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80156060
|
||||
* Size: 000004
|
||||
*/
|
||||
void DispMemberBase::doSetSubMemberAll() { }
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80156064
|
||||
* Size: 000008
|
||||
*/
|
||||
u32 DispMemberHurryUp::getSize() { return sizeof(DispMemberHurryUp); }
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 8015606C
|
||||
* Size: 00000C
|
||||
*/
|
||||
ScreenOwnerID DispMemberHurryUp::getOwnerID()
|
||||
{
|
||||
return OWNER_MRMR;
|
||||
/*
|
||||
lis r3, 0x4D524D52@ha
|
||||
addi r3, r3, 0x4D524D52@l
|
||||
blr
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80156078
|
||||
* Size: 000014
|
||||
*/
|
||||
ScreenMemberID DispMemberHurryUp::getMemberID()
|
||||
{
|
||||
return MEMBER_HURRY_UP;
|
||||
/*
|
||||
lis r4, 0x52595550@ha
|
||||
lis r3, 0x00485552@ha
|
||||
addi r4, r4, 0x52595550@l
|
||||
addi r3, r3, 0x00485552@l
|
||||
blr
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 8015608C
|
||||
* Size: 000008
|
||||
*/
|
||||
u32 DispMemberDayEndCount::getSize() { return sizeof(DispMemberDayEndCount); }
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80156094
|
||||
* Size: 00000C
|
||||
*/
|
||||
ScreenOwnerID DispMemberDayEndCount::getOwnerID()
|
||||
{
|
||||
return OWNER_MRMR;
|
||||
/*
|
||||
lis r3, 0x4D524D52@ha
|
||||
addi r3, r3, 0x4D524D52@l
|
||||
blr
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 801560A0
|
||||
* Size: 000014
|
||||
*/
|
||||
ScreenMemberID DispMemberDayEndCount::getMemberID()
|
||||
{
|
||||
return MEMBER_DAY_END_COUNT;
|
||||
/*
|
||||
lis r4, 0x4E444344@ha
|
||||
lis r3, 0x44415945@ha
|
||||
addi r4, r4, 0x4E444344@l
|
||||
addi r3, r3, 0x44415945@l
|
||||
blr
|
||||
*/
|
||||
}
|
||||
|
||||
// /*
|
||||
// * --INFO--
|
||||
// * Address: 801560B4
|
||||
// * Size: 000008
|
||||
// */
|
||||
// u32 DispMemberGround::getSize() { return 0x88; }
|
||||
|
||||
// /*
|
||||
// * --INFO--
|
||||
// * Address: 801560BC
|
||||
// * Size: 00000C
|
||||
// */
|
||||
// void DispMemberGround::getOwnerID()
|
||||
// {
|
||||
// /*
|
||||
// lis r3, 0x004F4741@ha
|
||||
// addi r3, r3, 0x004F4741@l
|
||||
// blr
|
||||
// */
|
||||
// }
|
||||
|
||||
// /*
|
||||
// * --INFO--
|
||||
// * Address: 801560C8
|
||||
// * Size: 000010
|
||||
// */
|
||||
// void DispMemberGround::getMemberID()
|
||||
// {
|
||||
// /*
|
||||
// lis r4, 0x4F554E44@ha
|
||||
// li r3, 0x4752
|
||||
// addi r4, r4, 0x4F554E44@l
|
||||
// blr
|
||||
// */
|
||||
// }
|
||||
|
||||
namespace Game {
|
||||
|
||||
} // namespace Game
|
||||
|
||||
} // namespace Screen
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 801560D8
|
||||
* Size: 00000C
|
||||
*/
|
||||
void PikiInitArg::getName()
|
||||
{
|
||||
return "PikiInitArg";
|
||||
/*
|
||||
lis r3, lbl_8047CFB8@ha
|
||||
addi r3, r3, lbl_8047CFB8@l
|
||||
blr
|
||||
*/
|
||||
}
|
||||
|
||||
} // namespace og
|
||||
|
||||
namespace og {
|
||||
|
||||
namespace Screen {
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 801560E4
|
||||
* Size: 000008
|
||||
*/
|
||||
u32 DispMemberKanketuMenu::getSize() { return sizeof(DispMemberKanketuMenu); }
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 801560EC
|
||||
* Size: 00000C
|
||||
*/
|
||||
ScreenOwnerID DispMemberKanketuMenu::getOwnerID()
|
||||
{
|
||||
return OWNER_OGA;
|
||||
/*
|
||||
lis r3, 0x004F4741@ha
|
||||
addi r3, r3, 0x004F4741@l
|
||||
blr
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 801560F8
|
||||
* Size: 000014
|
||||
*/
|
||||
ScreenMemberID DispMemberKanketuMenu::getMemberID()
|
||||
{
|
||||
/*
|
||||
lis r4, 0x4B455455@ha
|
||||
lis r3, 0x004B414E@ha
|
||||
addi r4, r4, 0x4B455455@l
|
||||
addi r3, r3, 0x004B414E@l
|
||||
blr
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 8015610C
|
||||
* Size: 000008
|
||||
*/
|
||||
u32 DispMemberCaveMore::getSize() { return 0x28; }
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80156114
|
||||
* Size: 00000C
|
||||
*/
|
||||
void DispMemberCaveMore::getOwnerID()
|
||||
{
|
||||
/*
|
||||
lis r3, 0x004F4741@ha
|
||||
addi r3, r3, 0x004F4741@l
|
||||
blr
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80156120
|
||||
* Size: 000014
|
||||
*/
|
||||
void DispMemberCaveMore::getMemberID()
|
||||
{
|
||||
/*
|
||||
lis r4, 0x4D4F5245@ha
|
||||
lis r3, 0x43415645@ha
|
||||
addi r4, r4, 0x4D4F5245@l
|
||||
addi r3, r3, 0x43415645@l
|
||||
blr
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80156134
|
||||
* Size: 000008
|
||||
*/
|
||||
u32 DispMemberAnaDemo::getSize() { return 0x24; }
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 8015613C
|
||||
* Size: 00000C
|
||||
*/
|
||||
void DispMemberAnaDemo::getOwnerID()
|
||||
{
|
||||
/*
|
||||
lis r3, 0x004F4741@ha
|
||||
addi r3, r3, 0x004F4741@l
|
||||
blr
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80156148
|
||||
* Size: 000014
|
||||
*/
|
||||
void DispMemberAnaDemo::getMemberID()
|
||||
{
|
||||
/*
|
||||
lis r4, 0x44454D4F@ha
|
||||
lis r3, 0x414E415F@ha
|
||||
addi r4, r4, 0x44454D4F@l
|
||||
addi r3, r3, 0x414E415F@l
|
||||
blr
|
||||
*/
|
||||
}
|
||||
|
||||
namespace Game {
|
||||
|
||||
} // namespace Game
|
||||
|
||||
} // namespace Screen
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 8015615C
|
||||
* Size: 00000C
|
||||
*/
|
||||
void PikiKillArg::getName()
|
||||
{
|
||||
/*
|
||||
lis r3, lbl_8047CFC4@ha
|
||||
addi r3, r3, lbl_8047CFC4@l
|
||||
blr
|
||||
*/
|
||||
}
|
||||
|
||||
namespace efx {
|
||||
|
||||
/*
|
||||
@ -6395,8 +5859,6 @@ blr
|
||||
|
||||
} // namespace efx
|
||||
|
||||
} // namespace og
|
||||
|
||||
/**
|
||||
* @reified{isCaveFloor__Q26PSGame13CaveFloorInfoFv}
|
||||
* @reified{isBossFloor__Q26PSGame13CaveFloorInfoFv}
|
||||
@ -6417,7 +5879,7 @@ bool SingleGameSection::isDevelopSection() { return false; }
|
||||
* Address: 80156374
|
||||
* Size: 000008
|
||||
*/
|
||||
void SingleGameSection::getTimerType()
|
||||
u32 SingleGameSection::getTimerType()
|
||||
{
|
||||
/*
|
||||
lwz r3, 0x17c(r3)
|
||||
@ -6430,7 +5892,7 @@ void SingleGameSection::getTimerType()
|
||||
* Address: 8015637C
|
||||
* Size: 000008
|
||||
*/
|
||||
void SingleGameSection::getCaveFilename()
|
||||
char* SingleGameSection::getCaveFilename()
|
||||
{
|
||||
/*
|
||||
addi r3, r3, 0x195
|
||||
@ -6657,30 +6119,3 @@ void StateMachine<SingleGameSection>::registerState(FSMState<SingleGameSection>*
|
||||
}
|
||||
|
||||
} // namespace Game
|
||||
|
||||
/*
|
||||
* --INFO--
|
||||
* Address: 80156588
|
||||
* Size: 000028
|
||||
*/
|
||||
void __sinit_singleGameSection_cpp()
|
||||
{
|
||||
/*
|
||||
lis r4, __float_nan@ha
|
||||
li r0, -1
|
||||
lfs f0, __float_nan@l(r4)
|
||||
lis r3, lbl_804B1070@ha
|
||||
stw r0, lbl_80515940@sda21(r13)
|
||||
stfsu f0, lbl_804B1070@l(r3)
|
||||
stfs f0, lbl_80515944@sda21(r13)
|
||||
stfs f0, 4(r3)
|
||||
stfs f0, 8(r3)
|
||||
blr
|
||||
*/
|
||||
}
|
||||
|
||||
/**
|
||||
* @generated{@4@__dt__Q23efx13TTutorialSnowFv}
|
||||
* @generated{@4@__dt__Q23efx13TForestSakuraFv}
|
||||
* @generated{@4@__dt__Q23efx11TLastMomijiFv}
|
||||
*/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user