mirror of
https://github.com/projectPiki/pikmin2.git
synced 2024-11-23 05:20:06 +00:00
Link mapMgr.cpp
This commit is contained in:
HeartPiece
parent
9ad660726a
commit
a6867023be
File diff suppressed because it is too large
Load Diff
@ -900,7 +900,7 @@ LIBS = [
|
||||
["plugProjectKandoU/cellPyramid", False],
|
||||
["plugProjectKandoU/naviMgr", True],
|
||||
["plugProjectKandoU/pikiMgr", True],
|
||||
["plugProjectKandoU/mapMgr", False],
|
||||
["plugProjectKandoU/mapMgr", True],
|
||||
["plugProjectKandoU/baseHIOSection", True],
|
||||
["plugProjectKandoU/naviWhistle", False],
|
||||
["plugProjectKandoU/pelletMgr", False],
|
||||
|
||||
@ -75,7 +75,7 @@
|
||||
### <section id="plugProjectKandoU">plugProjectKandoU</section>
|
||||
| File | Size (bytes) | File | Size (bytes) |
|
||||
| ---- | ---- | ---- | ---- |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/cellIterator.cpp">cellIterator.cpp</a> | 7262 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/flockMgr.cpp">flockMgr.cpp</a> | 7475 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/cellIterator.cpp">cellIterator.cpp</a> | 7350 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/flockMgr.cpp">flockMgr.cpp</a> | 7475 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemWeed.cpp">itemWeed.cpp</a> | 9106 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/creatureLOD.cpp">creatureLOD.cpp</a> | 10127 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiEnter.cpp">aiEnter.cpp</a> | 10852 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/naviWhistle.cpp">naviWhistle.cpp</a> | 11601 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemHoney.cpp">itemHoney.cpp</a> | 12303 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiBreakGate.cpp">aiBreakGate.cpp</a> | 13960 |
|
||||
@ -88,21 +88,21 @@
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemGate.cpp">itemGate.cpp</a> | 32834 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gamePlayDataMemCard.cpp">gamePlayDataMemCard.cpp</a> | 36029 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameGeneratorCache.cpp">gameGeneratorCache.cpp</a> | 36353 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/piki.cpp">piki.cpp</a> | 36583 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gamePlayData.cpp">gamePlayData.cpp</a> | 36955 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/routeMgr.cpp">routeMgr.cpp</a> | 39142 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/mapMgr.cpp">mapMgr.cpp</a> | 41846 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/collinfo.cpp">collinfo.cpp</a> | 43044 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/fakePiki.cpp">fakePiki.cpp</a> | 50426 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/cellPyramid.cpp">cellPyramid.cpp</a> | 52719 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_CaveGame.cpp">singleGS_CaveGame.cpp</a> | 52841 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiFormation.cpp">aiFormation.cpp</a> | 53253 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/navi_demoCheck.cpp">navi_demoCheck.cpp</a> | 57727 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletState.cpp">pelletState.cpp</a> | 63200 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemUjamushi.cpp">itemUjamushi.cpp</a> | 63554 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemPlant.cpp">itemPlant.cpp</a> | 73149 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/baseGameSection.cpp">baseGameSection.cpp</a> | 92346 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiPrimitives.cpp">aiPrimitives.cpp</a> | 117085 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletMgr.cpp">pelletMgr.cpp</a> | 143372 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/navi.cpp">navi.cpp</a> | 152216 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pikiState.cpp">pikiState.cpp</a> | 155487 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_Zukan.cpp">singleGS_Zukan.cpp</a> | 163685 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameMapParts.cpp">gameMapParts.cpp</a> | 167440 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/naviState.cpp">naviState.cpp</a> | 182249 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/collinfo.cpp">collinfo.cpp</a> | 43044 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/fakePiki.cpp">fakePiki.cpp</a> | 50426 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/cellPyramid.cpp">cellPyramid.cpp</a> | 52719 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_CaveGame.cpp">singleGS_CaveGame.cpp</a> | 52841 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiFormation.cpp">aiFormation.cpp</a> | 53253 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/navi_demoCheck.cpp">navi_demoCheck.cpp</a> | 57727 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletState.cpp">pelletState.cpp</a> | 63200 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemUjamushi.cpp">itemUjamushi.cpp</a> | 63554 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/itemPlant.cpp">itemPlant.cpp</a> | 73149 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/baseGameSection.cpp">baseGameSection.cpp</a> | 92346 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/aiPrimitives.cpp">aiPrimitives.cpp</a> | 117085 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pelletMgr.cpp">pelletMgr.cpp</a> | 143372 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/navi.cpp">navi.cpp</a> | 152216 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/pikiState.cpp">pikiState.cpp</a> | 155487 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/singleGS_Zukan.cpp">singleGS_Zukan.cpp</a> | 163685 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/gameMapParts.cpp">gameMapParts.cpp</a> | 167440 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKandoU/naviState.cpp">naviState.cpp</a> | 182249 | | |
|
||||
|
||||
### <section id="plugProjectKonoU">plugProjectKonoU</section>
|
||||
| File | Size (bytes) | File | Size (bytes) |
|
||||
| ---- | ---- | ---- | ---- |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khCaveResult.cpp">khCaveResult.cpp</a> | 42208 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khFinalResult.cpp">khFinalResult.cpp</a> | 59951 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khDayEndResult.cpp">khDayEndResult.cpp</a> | 81617 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khWorldMap.cpp">khWorldMap.cpp</a> | 157269 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khDayEndResult.cpp">khDayEndResult.cpp</a> | 81617 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectKonoU/khWorldMap.cpp">khWorldMap.cpp</a> | 157282 |
|
||||
|
||||
### <section id="plugProjectMorimuraU">plugProjectMorimuraU</section>
|
||||
| File | Size (bytes) | File | Size (bytes) |
|
||||
|
||||
@ -131,8 +131,18 @@ struct ShapeMapMgr : public MapMgr {
|
||||
|
||||
ShapeMapMgr() { }
|
||||
|
||||
virtual void getBoundBox2d(BoundBox2d&); // _18 (weak)
|
||||
virtual void getBoundBox(BoundBox&); // _1C (weak)
|
||||
virtual void getBoundBox2d(BoundBox2d& bounds) // _18 (weak)
|
||||
{
|
||||
BoundBox calc;
|
||||
mMapCollision.mDivider->getBoundBox(calc);
|
||||
bounds.fromBoundBox(calc);
|
||||
}
|
||||
virtual void getBoundBox(BoundBox& bounds) // _1C (weak)
|
||||
{
|
||||
BoundBox calc;
|
||||
mMapCollision.mDivider->getBoundBox(calc);
|
||||
bounds = calc;
|
||||
}
|
||||
virtual bool findRayIntersection(Sys::RayIntersectInfo&); // _20
|
||||
virtual Sys::TriIndexList* traceMove(MoveInfo&, f32); // _24
|
||||
virtual f32 getMinY(Vector3f&); // _28
|
||||
|
||||
@ -12,69 +12,84 @@ struct ObjectMgr : public Container<T>, GenericObjectMgr {
|
||||
{
|
||||
}
|
||||
|
||||
///////////////// VTABLE
|
||||
// virtual ~ObjectMgr() { } // _08 (weak)
|
||||
virtual void doAnimation() // _34
|
||||
{
|
||||
Iterator<T> iter(this);
|
||||
iter.first();
|
||||
while (!iter.isDone()) {
|
||||
(*iter)->doAnimation();
|
||||
iter.next();
|
||||
}
|
||||
}
|
||||
virtual void doEntry() // _38
|
||||
{
|
||||
Iterator<T> iter(this);
|
||||
iter.first();
|
||||
while (!iter.isDone()) {
|
||||
(*iter)->doEntry();
|
||||
iter.next();
|
||||
}
|
||||
}
|
||||
virtual void doSetView(int viewportNumber) // _3C
|
||||
{
|
||||
Iterator<T> iter(this);
|
||||
iter.first();
|
||||
while (!iter.isDone()) {
|
||||
(*iter)->doSetView(viewportNumber);
|
||||
iter.next();
|
||||
}
|
||||
}
|
||||
virtual void doViewCalc() // _40
|
||||
{
|
||||
Iterator<T> iter(this);
|
||||
iter.first();
|
||||
while (!iter.isDone()) {
|
||||
(*iter)->doViewCalc();
|
||||
iter.next();
|
||||
}
|
||||
}
|
||||
virtual void doSimulation(f32 constraint) // _44
|
||||
{
|
||||
Iterator<T> iter(this);
|
||||
iter.first();
|
||||
while (!iter.isDone()) {
|
||||
(*iter)->doSimulation(constraint);
|
||||
iter.next();
|
||||
}
|
||||
}
|
||||
virtual void doDirectDraw(Graphics& graphics) // _48
|
||||
{
|
||||
Iterator<T> iter(this);
|
||||
iter.first();
|
||||
while (!iter.isDone()) {
|
||||
(*iter)->doDirectDraw(graphics);
|
||||
iter.next();
|
||||
}
|
||||
}
|
||||
///////////////// VTABLE END
|
||||
virtual void doAnimation(); // _34
|
||||
virtual void doEntry(); // _38
|
||||
virtual void doSetView(int viewportNumber); // _3C
|
||||
virtual void doViewCalc(); // _40
|
||||
virtual void doSimulation(f32 constraint); // _44
|
||||
virtual void doDirectDraw(Graphics& graphics); // _48
|
||||
|
||||
// _00 = VTBL
|
||||
// _00-_1C = Container
|
||||
// _1C-_20 = GenericObjectMgr
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
void ObjectMgr<T>::doAnimation()
|
||||
{
|
||||
Iterator<T> iter(this);
|
||||
iter.first();
|
||||
while (!iter.isDone()) {
|
||||
(*iter)->doAnimation();
|
||||
iter.next();
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
void ObjectMgr<T>::doEntry()
|
||||
{
|
||||
Iterator<T> iter(this);
|
||||
iter.first();
|
||||
while (!iter.isDone()) {
|
||||
(*iter)->doEntry();
|
||||
iter.next();
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
void ObjectMgr<T>::doSetView(int viewportNumber)
|
||||
{
|
||||
Iterator<T> iter(this);
|
||||
iter.first();
|
||||
while (!iter.isDone()) {
|
||||
(*iter)->doSetView(viewportNumber);
|
||||
iter.next();
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
void ObjectMgr<T>::doViewCalc()
|
||||
{
|
||||
Iterator<T> iter(this);
|
||||
iter.first();
|
||||
while (!iter.isDone()) {
|
||||
(*iter)->doViewCalc();
|
||||
iter.next();
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
void ObjectMgr<T>::doSimulation(f32 constraint)
|
||||
{
|
||||
Iterator<T> iter(this);
|
||||
iter.first();
|
||||
while (!iter.isDone()) {
|
||||
(*iter)->doSimulation(constraint);
|
||||
iter.next();
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
void ObjectMgr<T>::doDirectDraw(Graphics& gfx)
|
||||
{
|
||||
Iterator<T> iter(this);
|
||||
iter.first();
|
||||
while (!iter.isDone()) {
|
||||
(*iter)->doDirectDraw(gfx);
|
||||
iter.next();
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
struct TObjectNode : public CNode {
|
||||
TObjectNode() { }
|
||||
|
||||
@ -11,7 +11,7 @@ KANDO_FILES:=\
|
||||
$(BUILD_DIR)/asm/plugProjectKandoU/cellPyramid.o\
|
||||
$(BUILD_DIR)/src/plugProjectKandoU/naviMgr.o\
|
||||
$(BUILD_DIR)/src/plugProjectKandoU/pikiMgr.o\
|
||||
$(BUILD_DIR)/asm/plugProjectKandoU/mapMgr.o\
|
||||
$(BUILD_DIR)/src/plugProjectKandoU/mapMgr.o\
|
||||
$(BUILD_DIR)/src/plugProjectKandoU/baseHIOSection.o\
|
||||
$(BUILD_DIR)/asm/plugProjectKandoU/naviWhistle.o\
|
||||
$(BUILD_DIR)/asm/plugProjectKandoU/pelletMgr.o\
|
||||
|
||||
@ -284,9 +284,10 @@ void ShapeMapMgr::load(LoadArg& arg)
|
||||
sprintf(path, "%s/arc.szs", arg.mFolder);
|
||||
JKRArchive* arc = JKRMountArchive(path, JKRArchive::EMM_Mem, nullptr, JKRArchive::EMD_Head);
|
||||
if (!arc) {
|
||||
for (int i = 0; i < 512; i++) {
|
||||
// path[i] = 0; some wack way of clearing this
|
||||
}
|
||||
// what was this even here for.
|
||||
int count = 0;
|
||||
for (int i = 0; i < 96; i++, count++) { }
|
||||
for (int i = count; i < 100; i++) { }
|
||||
sprintf(path, "%s/arc.arc", arg.mFolder);
|
||||
arc = JKRMountArchive(path, JKRArchive::EMM_Mem, nullptr, JKRArchive::EMD_Head);
|
||||
}
|
||||
@ -348,14 +349,14 @@ void ShapeMapMgr::load(LoadArg& arg)
|
||||
// Load Lighting data
|
||||
char lightPath[512];
|
||||
sprintf(lightPath, "%s/light.ini", arg.mAbeFolder);
|
||||
file = JKRDvdToMainRam(lightPath, nullptr, Switch_0, 0, nullptr, JKRDvdRipper::ALLOC_DIR_BOTTOM, 0, nullptr, nullptr);
|
||||
if (file) {
|
||||
RamStream stream(file, -1);
|
||||
void* file2 = JKRDvdToMainRam(lightPath, nullptr, Switch_0, 0, nullptr, JKRDvdRipper::ALLOC_DIR_BOTTOM, 0, nullptr, nullptr);
|
||||
if (file2) {
|
||||
RamStream stream(file2, -1);
|
||||
stream.setMode(STREAM_MODE_TEXT, 1);
|
||||
if (gameSystem) {
|
||||
gameSystem->getLightMgr()->loadParm(stream);
|
||||
}
|
||||
delete[] file;
|
||||
delete[] file2;
|
||||
}
|
||||
|
||||
char textsPath[512];
|
||||
@ -370,25 +371,26 @@ void ShapeMapMgr::load(LoadArg& arg)
|
||||
mMapCollision.read(stream);
|
||||
sys->heapStatusEnd("map collision");
|
||||
|
||||
file = JKRFileLoader::getGlbResource("waterbox.txt", texts);
|
||||
if (file) {
|
||||
void* file2 = JKRFileLoader::getGlbResource("waterbox.txt", texts);
|
||||
if (file2) {
|
||||
sys->heapStatusStart("waterbox", nullptr);
|
||||
RamStream stream(file, -1);
|
||||
RamStream stream(file2, -1);
|
||||
stream.setMode(STREAM_MODE_TEXT, 1);
|
||||
mSeaMgr->read(stream);
|
||||
sys->heapStatusEnd("waterbox");
|
||||
}
|
||||
|
||||
file = JKRFileLoader::getGlbResource("mapcode.bin", texts);
|
||||
if (file) {
|
||||
void* file3 = JKRFileLoader::getGlbResource("mapcode.bin", texts);
|
||||
if (file3) {
|
||||
MapCode::Mgr* mgr = new MapCode::Mgr;
|
||||
RamStream stream(file, -1);
|
||||
RamStream stream(file3, -1);
|
||||
mgr->read(stream);
|
||||
mgr->attachCodes(mMapCollision.mDivider->mTriangleTable);
|
||||
}
|
||||
texts->unmount();
|
||||
} else {
|
||||
file = JKRDvdToMainRam(arg.mCollisionPath, nullptr, Switch_0, 0, nullptr, JKRDvdRipper::ALLOC_DIR_BOTTOM, 0, nullptr, nullptr);
|
||||
void* file
|
||||
= JKRDvdToMainRam(arg.mCollisionPath, nullptr, Switch_0, 0, nullptr, JKRDvdRipper::ALLOC_DIR_BOTTOM, 0, nullptr, nullptr);
|
||||
sys->heapStatusStart("map collision", nullptr);
|
||||
RamStream stream(file, -1);
|
||||
mMapCollision.read(stream);
|
||||
@ -431,596 +433,6 @@ void ShapeMapMgr::load(LoadArg& arg)
|
||||
}
|
||||
|
||||
sys->heapStatusEnd("mapMgr");
|
||||
|
||||
/*
|
||||
stwu r1, -0x2b30(r1)
|
||||
mflr r0
|
||||
lis r5, lbl_8047E190@ha
|
||||
stw r0, 0x2b34(r1)
|
||||
stmw r26, 0x2b18(r1)
|
||||
mr r31, r3
|
||||
mr r29, r4
|
||||
addi r30, r5, lbl_8047E190@l
|
||||
addi r4, r2, lbl_80518860@sda21
|
||||
li r5, 0
|
||||
lwz r3, sys@sda21(r13)
|
||||
bl heapStatusStart__6SystemFPcP7JKRHeap
|
||||
lwz r3, sys@sda21(r13)
|
||||
addi r4, r2, lbl_805188B0@sda21
|
||||
li r5, 0
|
||||
bl heapStatusStart__6SystemFPcP7JKRHeap
|
||||
lwz r5, 0(r29)
|
||||
addi r3, r1, 0x810
|
||||
addi r4, r30, 0x24
|
||||
crclr 6
|
||||
bl sprintf
|
||||
addi r3, r1, 0x810
|
||||
li r4, 1
|
||||
li r5, 0
|
||||
li r6, 1
|
||||
bl
|
||||
mount__10JKRArchiveFPCcQ210JKRArchive10EMountModeP7JKRHeapQ210JKRArchive15EMountDirection
|
||||
cmplwi r3, 0
|
||||
bne lbl_801631A8
|
||||
li r0, 0xc
|
||||
li r3, 0
|
||||
mtctr r0
|
||||
|
||||
lbl_80163164:
|
||||
addi r3, r3, 8
|
||||
bdnz lbl_80163164
|
||||
subfic r0, r3, 0x64
|
||||
mtctr r0
|
||||
cmpwi r3, 0x64
|
||||
bge lbl_80163180
|
||||
|
||||
lbl_8016317C:
|
||||
bdnz lbl_8016317C
|
||||
|
||||
lbl_80163180:
|
||||
lwz r5, 0(r29)
|
||||
addi r3, r1, 0x810
|
||||
addi r4, r30, 0x30
|
||||
crclr 6
|
||||
bl sprintf
|
||||
addi r3, r1, 0x810
|
||||
li r4, 1
|
||||
li r5, 0
|
||||
li r6, 1
|
||||
bl
|
||||
mount__10JKRArchiveFPCcQ210JKRArchive10EMountModeP7JKRHeapQ210JKRArchive15EMountDirection
|
||||
|
||||
lbl_801631A8:
|
||||
cmplwi r3, 0
|
||||
bne lbl_801631C4
|
||||
addi r3, r30, 0xc
|
||||
addi r5, r30, 0x18
|
||||
li r4, 0x2d0
|
||||
crclr 6
|
||||
bl panic_f__12JUTExceptionFPCciPCce
|
||||
|
||||
lbl_801631C4:
|
||||
lwz r3, sys@sda21(r13)
|
||||
addi r4, r2, lbl_805188B0@sda21
|
||||
bl heapStatusEnd__6SystemFPc
|
||||
lwz r3, sys@sda21(r13)
|
||||
addi r4, r30, 0x3c
|
||||
li r5, 0
|
||||
bl heapStatusStart__6SystemFPcP7JKRHeap
|
||||
addi r3, r30, 0x48
|
||||
li r4, 0
|
||||
bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader
|
||||
or. r27, r3, r3
|
||||
li r4, 0
|
||||
beq lbl_80163208
|
||||
lwz r0, 0(r29)
|
||||
cmplwi r0, 0
|
||||
beq lbl_80163208
|
||||
li r4, 1
|
||||
|
||||
lbl_80163208:
|
||||
clrlwi. r0, r4, 0x18
|
||||
bne lbl_80163224
|
||||
addi r3, r30, 0xc
|
||||
addi r5, r30, 0x18
|
||||
li r4, 0x2d9
|
||||
crclr 6
|
||||
bl panic_f__12JUTExceptionFPCciPCce
|
||||
|
||||
lbl_80163224:
|
||||
mr r3, r27
|
||||
lis r4, 0x2004
|
||||
bl load__22J3DModelLoaderDataBaseFPCvUl
|
||||
lis r4, 4
|
||||
mr r27, r3
|
||||
bl newSharedDisplayList__12J3DModelDataFUl
|
||||
mr r3, r27
|
||||
bl makeSharedDL__12J3DModelDataFv
|
||||
li r3, 0x14
|
||||
bl __nw__FUl
|
||||
or. r0, r3, r3
|
||||
beq lbl_80163268
|
||||
mr r4, r27
|
||||
lis r5, 2
|
||||
li r6, 2
|
||||
bl __ct__Q28SysShape5ModelFP12J3DModelDataUlUl
|
||||
mr r0, r3
|
||||
|
||||
lbl_80163268:
|
||||
stw r0, 0x34(r31)
|
||||
li r4, 0x200
|
||||
lwz r3, 0x34(r31)
|
||||
lwz r3, 8(r3)
|
||||
bl newDifferedDisplayList__8J3DModelFUl
|
||||
lwz r3, 0x34(r31)
|
||||
lwz r3, 8(r3)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x10(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r3, 0x34(r31)
|
||||
lwz r3, 8(r3)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x14(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r3, 0x34(r31)
|
||||
lwz r3, 8(r3)
|
||||
bl makeDL__8J3DModelFv
|
||||
lwz r3, 0x34(r31)
|
||||
lwz r3, 8(r3)
|
||||
bl lock__8J3DModelFv
|
||||
lwz r3, sys@sda21(r13)
|
||||
addi r4, r30, 0x3c
|
||||
bl heapStatusEnd__6SystemFPc
|
||||
li r3, 0x40
|
||||
bl __nw__FUl
|
||||
or. r0, r3, r3
|
||||
beq lbl_801632EC
|
||||
li r4, 2
|
||||
bl __ct__Q34Game4Farm7FarmMgrFUl
|
||||
mr r0, r3
|
||||
|
||||
lbl_801632EC:
|
||||
stw r0, farmMgr__Q24Game4Farm@sda21(r13)
|
||||
li r27, 0
|
||||
|
||||
lbl_801632F4:
|
||||
addi r3, r1, 0x610
|
||||
addi r4, r30, 0x54
|
||||
addi r5, r27, 1
|
||||
crclr 6
|
||||
bl sprintf
|
||||
addi r3, r1, 0x610
|
||||
li r4, 0
|
||||
bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader
|
||||
or. r4, r3, r3
|
||||
beq lbl_80163330
|
||||
lwz r3, farmMgr__Q24Game4Farm@sda21(r13)
|
||||
bl addFarmBmd__Q34Game4Farm7FarmMgrFPv
|
||||
addi r27, r27, 1
|
||||
cmpwi r27, 0xa
|
||||
blt lbl_801632F4
|
||||
|
||||
lbl_80163330:
|
||||
lwz r3, 0x34(r31)
|
||||
li r4, 0
|
||||
bl enableMaterialAnim__Q28SysShape5ModelFi
|
||||
li r0, 0
|
||||
li r27, 0
|
||||
stw r0, 0x24(r31)
|
||||
stw r0, 0x2c(r31)
|
||||
|
||||
lbl_8016334C:
|
||||
addi r3, r1, 0x110
|
||||
addi r4, r30, 0x60
|
||||
addi r5, r27, 1
|
||||
crclr 6
|
||||
bl sprintf
|
||||
addi r3, r1, 0x110
|
||||
li r4, 0
|
||||
bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader
|
||||
cmplwi r3, 0
|
||||
beq lbl_8016338C
|
||||
lwz r3, 0x24(r31)
|
||||
addi r27, r27, 1
|
||||
cmpwi r27, 0x64
|
||||
addi r0, r3, 1
|
||||
stw r0, 0x24(r31)
|
||||
blt lbl_8016334C
|
||||
|
||||
lbl_8016338C:
|
||||
lwz r0, 0x24(r31)
|
||||
cmpwi r0, 0
|
||||
ble lbl_80163478
|
||||
stw r0, 0x2c(r31)
|
||||
lwz r28, 0x24(r31)
|
||||
slwi r3, r28, 4
|
||||
addi r3, r3, 0x10
|
||||
bl __nwa__FUl
|
||||
lis r4, __ct__Q23Sys15MatTexAnimationFv@ha
|
||||
mr r7, r28
|
||||
addi r4, r4, __ct__Q23Sys15MatTexAnimationFv@l
|
||||
li r5, 0
|
||||
li r6, 0x10
|
||||
bl __construct_new_array
|
||||
stw r3, 0x28(r31)
|
||||
lwz r28, 0x2c(r31)
|
||||
mulli r3, r28, 0xc
|
||||
addi r3, r3, 0x10
|
||||
bl __nwa__FUl
|
||||
lis r4, __ct__Q23Sys15MatLoopAnimatorFv@ha
|
||||
mr r7, r28
|
||||
addi r4, r4, __ct__Q23Sys15MatLoopAnimatorFv@l
|
||||
li r5, 0
|
||||
li r6, 0xc
|
||||
bl __construct_new_array
|
||||
li r27, 0
|
||||
stw r3, 0x30(r31)
|
||||
mr r28, r27
|
||||
li r26, 0
|
||||
b lbl_8016346C
|
||||
|
||||
lbl_80163404:
|
||||
addi r3, r1, 0x10
|
||||
addi r4, r30, 0x60
|
||||
addi r5, r26, 1
|
||||
crclr 6
|
||||
bl sprintf
|
||||
addi r3, r1, 0x10
|
||||
li r4, 0
|
||||
bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader
|
||||
lwz r4, 0x34(r31)
|
||||
lwz r0, 0x28(r31)
|
||||
lwz r5, 8(r4)
|
||||
mr r4, r3
|
||||
add r3, r0, r27
|
||||
lwz r5, 4(r5)
|
||||
bl attachResource__Q23Sys16MatBaseAnimationFPvP12J3DModelData
|
||||
lwz r3, 0x30(r31)
|
||||
lwz r0, 0x28(r31)
|
||||
add r3, r3, r28
|
||||
lwz r12, 0(r3)
|
||||
add r4, r0, r27
|
||||
lwz r12, 8(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
addi r27, r27, 0x10
|
||||
addi r28, r28, 0xc
|
||||
addi r26, r26, 1
|
||||
|
||||
lbl_8016346C:
|
||||
lwz r0, 0x24(r31)
|
||||
cmpw r26, r0
|
||||
blt lbl_80163404
|
||||
|
||||
lbl_80163478:
|
||||
lwz r3, 0x34(r31)
|
||||
lwz r3, 8(r3)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x10(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r5, 4(r29)
|
||||
addi r3, r1, 0x410
|
||||
addi r4, r30, 0x70
|
||||
crclr 6
|
||||
bl sprintf
|
||||
li r0, 0
|
||||
addi r3, r1, 0x410
|
||||
stw r0, 8(r1)
|
||||
li r4, 0
|
||||
li r5, 0
|
||||
li r6, 0
|
||||
li r7, 0
|
||||
li r8, 2
|
||||
li r9, 0
|
||||
li r10, 0
|
||||
bl
|
||||
loadToMainRAM__12JKRDvdRipperFPCcPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl
|
||||
or. r28, r3, r3
|
||||
beq lbl_80163520
|
||||
mr r4, r28
|
||||
addi r3, r1, 0x26f0
|
||||
li r5, -1
|
||||
bl __ct__9RamStreamFPvi
|
||||
li r0, 1
|
||||
cmpwi r0, 1
|
||||
stw r0, 0x26fc(r1)
|
||||
bne lbl_80163500
|
||||
li r0, 0
|
||||
stw r0, 0x2b04(r1)
|
||||
|
||||
lbl_80163500:
|
||||
lwz r3, gameSystem__4Game@sda21(r13)
|
||||
cmplwi r3, 0
|
||||
beq lbl_80163518
|
||||
bl getLightMgr__Q24Game10GameSystemFv
|
||||
addi r4, r1, 0x26f0
|
||||
bl loadParm__Q24Game12GameLightMgrFR6Stream
|
||||
|
||||
lbl_80163518:
|
||||
mr r3, r28
|
||||
bl __dla__FPv
|
||||
|
||||
lbl_80163520:
|
||||
lwz r5, 0(r29)
|
||||
addi r3, r1, 0x210
|
||||
addi r4, r30, 0x80
|
||||
crclr 6
|
||||
bl sprintf
|
||||
lwz r5, sCurrentHeap__7JKRHeap@sda21(r13)
|
||||
addi r3, r1, 0x210
|
||||
li r4, 1
|
||||
li r6, 2
|
||||
bl
|
||||
mount__10JKRArchiveFPCcQ210JKRArchive10EMountModeP7JKRHeapQ210JKRArchive15EMountDirection
|
||||
or. r28, r3, r3
|
||||
beq lbl_80163684
|
||||
mr r4, r28
|
||||
addi r3, r30, 0x90
|
||||
bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader
|
||||
or. r26, r3, r3
|
||||
bne lbl_80163578
|
||||
addi r3, r30, 0xc
|
||||
addi r5, r30, 0x18
|
||||
li r4, 0x377
|
||||
crclr 6
|
||||
bl panic_f__12JUTExceptionFPCciPCce
|
||||
|
||||
lbl_80163578:
|
||||
lwz r3, sys@sda21(r13)
|
||||
addi r4, r30, 0x9c
|
||||
li r5, 0
|
||||
bl heapStatusStart__6SystemFPcP7JKRHeap
|
||||
mr r4, r26
|
||||
addi r3, r1, 0x22d0
|
||||
li r5, -1
|
||||
bl __ct__9RamStreamFPvi
|
||||
addi r3, r31, 0x38
|
||||
addi r4, r1, 0x22d0
|
||||
bl read__12MapCollisionFR6Stream
|
||||
lwz r3, sys@sda21(r13)
|
||||
addi r4, r30, 0x9c
|
||||
bl heapStatusEnd__6SystemFPc
|
||||
mr r4, r28
|
||||
addi r3, r30, 0xac
|
||||
bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader
|
||||
or. r26, r3, r3
|
||||
beq lbl_80163614
|
||||
lwz r3, sys@sda21(r13)
|
||||
addi r4, r30, 0xbc
|
||||
li r5, 0
|
||||
bl heapStatusStart__6SystemFPcP7JKRHeap
|
||||
mr r4, r26
|
||||
addi r3, r1, 0x1eb0
|
||||
li r5, -1
|
||||
bl __ct__9RamStreamFPvi
|
||||
li r0, 1
|
||||
cmpwi r0, 1
|
||||
stw r0, 0x1ebc(r1)
|
||||
bne lbl_801635FC
|
||||
li r0, 0
|
||||
stw r0, 0x22c4(r1)
|
||||
|
||||
lbl_801635FC:
|
||||
lwz r3, 0x10(r31)
|
||||
addi r4, r1, 0x1eb0
|
||||
bl read__Q24Game6SeaMgrFR6Stream
|
||||
lwz r3, sys@sda21(r13)
|
||||
addi r4, r30, 0xbc
|
||||
bl heapStatusEnd__6SystemFPc
|
||||
|
||||
lbl_80163614:
|
||||
mr r4, r28
|
||||
addi r3, r30, 0xc8
|
||||
bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader
|
||||
or. r26, r3, r3
|
||||
beq lbl_8016366C
|
||||
li r3, 0x28
|
||||
bl __nw__FUl
|
||||
or. r27, r3, r3
|
||||
beq lbl_80163640
|
||||
bl __ct__Q27MapCode3MgrFv
|
||||
mr r27, r3
|
||||
|
||||
lbl_80163640:
|
||||
mr r4, r26
|
||||
addi r3, r1, 0x1a90
|
||||
li r5, -1
|
||||
bl __ct__9RamStreamFPvi
|
||||
mr r3, r27
|
||||
addi r4, r1, 0x1a90
|
||||
bl read__Q27MapCode3MgrFR6Stream
|
||||
lwz r4, 0x50(r31)
|
||||
mr r3, r27
|
||||
lwz r4, 0x1c(r4)
|
||||
bl attachCodes__Q27MapCode3MgrFPQ23Sys13TriangleTable
|
||||
|
||||
lbl_8016366C:
|
||||
mr r3, r28
|
||||
lwz r12, 0(r28)
|
||||
lwz r12, 0xc(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
b lbl_80163808
|
||||
|
||||
lbl_80163684:
|
||||
li r0, 0
|
||||
li r4, 0
|
||||
stw r0, 8(r1)
|
||||
li r5, 0
|
||||
li r6, 0
|
||||
li r7, 0
|
||||
lwz r3, 0xc(r29)
|
||||
li r8, 2
|
||||
li r9, 0
|
||||
li r10, 0
|
||||
bl
|
||||
loadToMainRAM__12JKRDvdRipperFPCcPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl
|
||||
mr r27, r3
|
||||
lwz r3, sys@sda21(r13)
|
||||
addi r4, r30, 0x9c
|
||||
li r5, 0
|
||||
bl heapStatusStart__6SystemFPcP7JKRHeap
|
||||
mr r4, r27
|
||||
addi r3, r1, 0x1670
|
||||
li r5, -1
|
||||
bl __ct__9RamStreamFPvi
|
||||
addi r3, r31, 0x38
|
||||
addi r4, r1, 0x1670
|
||||
bl read__12MapCollisionFR6Stream
|
||||
lwz r3, sys@sda21(r13)
|
||||
addi r4, r30, 0x9c
|
||||
bl heapStatusEnd__6SystemFPc
|
||||
mr r3, r27
|
||||
bl __dla__FPv
|
||||
lwz r3, 0x10(r29)
|
||||
cmplwi r3, 0
|
||||
beq lbl_80163784
|
||||
li r0, 0
|
||||
li r4, 0
|
||||
stw r0, 8(r1)
|
||||
li r5, 0
|
||||
li r6, 0
|
||||
li r7, 0
|
||||
li r8, 2
|
||||
li r9, 0
|
||||
li r10, 0
|
||||
bl
|
||||
loadToMainRAM__12JKRDvdRipperFPCcPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl
|
||||
mr r27, r3
|
||||
lwz r3, sys@sda21(r13)
|
||||
addi r4, r30, 0xbc
|
||||
li r5, 0
|
||||
bl heapStatusStart__6SystemFPcP7JKRHeap
|
||||
mr r4, r27
|
||||
addi r3, r1, 0x1250
|
||||
li r5, -1
|
||||
bl __ct__9RamStreamFPvi
|
||||
li r0, 1
|
||||
cmpwi r0, 1
|
||||
stw r0, 0x125c(r1)
|
||||
bne lbl_80163764
|
||||
li r0, 0
|
||||
stw r0, 0x1664(r1)
|
||||
|
||||
lbl_80163764:
|
||||
lwz r3, 0x10(r31)
|
||||
addi r4, r1, 0x1250
|
||||
bl read__Q24Game6SeaMgrFR6Stream
|
||||
lwz r3, sys@sda21(r13)
|
||||
addi r4, r30, 0xbc
|
||||
bl heapStatusEnd__6SystemFPc
|
||||
mr r3, r27
|
||||
bl __dla__FPv
|
||||
|
||||
lbl_80163784:
|
||||
lwz r3, 0x14(r29)
|
||||
cmplwi r3, 0
|
||||
beq lbl_80163808
|
||||
li r0, 0
|
||||
li r4, 0
|
||||
stw r0, 8(r1)
|
||||
li r5, 0
|
||||
li r6, 0
|
||||
li r7, 0
|
||||
li r8, 2
|
||||
li r9, 0
|
||||
li r10, 0
|
||||
bl
|
||||
loadToMainRAM__12JKRDvdRipperFPCcPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl
|
||||
mr r27, r3
|
||||
li r3, 0x28
|
||||
bl __nw__FUl
|
||||
or. r28, r3, r3
|
||||
beq lbl_801637D4
|
||||
bl __ct__Q27MapCode3MgrFv
|
||||
mr r28, r3
|
||||
|
||||
lbl_801637D4:
|
||||
mr r4, r27
|
||||
addi r3, r1, 0xe30
|
||||
li r5, -1
|
||||
bl __ct__9RamStreamFPvi
|
||||
mr r3, r28
|
||||
addi r4, r1, 0xe30
|
||||
bl read__Q27MapCode3MgrFR6Stream
|
||||
lwz r4, 0x50(r31)
|
||||
mr r3, r28
|
||||
lwz r4, 0x1c(r4)
|
||||
bl attachCodes__Q27MapCode3MgrFPQ23Sys13TriangleTable
|
||||
mr r3, r27
|
||||
bl __dla__FPv
|
||||
|
||||
lbl_80163808:
|
||||
lwz r3, 0x1c(r29)
|
||||
cmplwi r3, 0
|
||||
beq lbl_801638CC
|
||||
li r0, 0
|
||||
li r4, 0
|
||||
stw r0, 8(r1)
|
||||
li r5, 0
|
||||
li r6, 0
|
||||
li r7, 0
|
||||
li r8, 2
|
||||
li r9, 0
|
||||
li r10, 0
|
||||
bl
|
||||
loadToMainRAM__12JKRDvdRipperFPCcPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl
|
||||
mr r27, r3
|
||||
lwz r3, sys@sda21(r13)
|
||||
addi r4, r30, 0xd4
|
||||
li r5, 0
|
||||
bl heapStatusStart__6SystemFPcP7JKRHeap
|
||||
mr r4, r27
|
||||
addi r3, r1, 0xa10
|
||||
li r5, -1
|
||||
bl __ct__9RamStreamFPvi
|
||||
li r0, 1
|
||||
cmpwi r0, 1
|
||||
stw r0, 0xa1c(r1)
|
||||
bne lbl_80163878
|
||||
li r0, 0
|
||||
stw r0, 0xe24(r1)
|
||||
|
||||
lbl_80163878:
|
||||
lwz r0, 8(r31)
|
||||
cmplwi r0, 0
|
||||
bne lbl_801638A0
|
||||
li r3, 0x24
|
||||
bl __nw__FUl
|
||||
or. r0, r3, r3
|
||||
beq lbl_8016389C
|
||||
bl __ct__Q24Game12GameRouteMgrFv
|
||||
mr r0, r3
|
||||
|
||||
lbl_8016389C:
|
||||
stw r0, 8(r31)
|
||||
|
||||
lbl_801638A0:
|
||||
lwz r3, 8(r31)
|
||||
addi r4, r1, 0xa10
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x30(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r3, sys@sda21(r13)
|
||||
addi r4, r30, 0xd4
|
||||
bl heapStatusEnd__6SystemFPc
|
||||
mr r3, r27
|
||||
bl __dla__FPv
|
||||
|
||||
lbl_801638CC:
|
||||
lwz r3, sys@sda21(r13)
|
||||
addi r4, r2, lbl_80518860@sda21
|
||||
bl heapStatusEnd__6SystemFPc
|
||||
lmw r26, 0x2b18(r1)
|
||||
lwz r0, 0x2b34(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x2b30
|
||||
blr
|
||||
*/
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1229,28 +641,6 @@ bool ShapeMapMgr::findRayIntersection(Sys::RayIntersectInfo& info)
|
||||
return intersectionFound;
|
||||
}
|
||||
|
||||
/**
|
||||
* @note Address: 0x80163FE0
|
||||
* @note Size: 0x80
|
||||
*/
|
||||
void ShapeMapMgr::getBoundBox2d(BoundBox2d& bounds)
|
||||
{
|
||||
BoundBox calc;
|
||||
mMapCollision.mDivider->getBoundBox(calc);
|
||||
bounds.fromBoundBox(calc);
|
||||
}
|
||||
|
||||
/**
|
||||
* @note Address: 0x80164060
|
||||
* @note Size: 0x90
|
||||
*/
|
||||
void ShapeMapMgr::getBoundBox(BoundBox& bounds)
|
||||
{
|
||||
BoundBox calc;
|
||||
mMapCollision.mDivider->getBoundBox(calc);
|
||||
bounds = calc;
|
||||
}
|
||||
|
||||
static const char unusedString1[] = "loop av. %.1f";
|
||||
static const char unusedString2[] = "%d %d %d<%d>";
|
||||
static const char unusedString3[] = "tris av. %.1f";
|
||||
|
||||
@ -983,3 +983,5 @@ You have 4507 out of 10000 Pokos and 112 out of 201 treasures.",2024-05-08 16:32
|
||||
You have 4528 out of 10000 Pokos and 112 out of 201 treasures.",2024-05-08 18:40:42.806286
|
||||
4541,2112992,0.45417715598475783,112,400727,0.5621429853995757,"
|
||||
You have 4541 out of 10000 Pokos and 112 out of 201 treasures.",2024-05-14 22:14:35.311817
|
||||
4563,2123316,0.4563962486071561,113,401409,0.563099700360241,"
|
||||
You have 4563 out of 10000 Pokos and 113 out of 201 treasures.",2024-05-18 11:09:44.869209
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user