Game-Decompilation/pikmin2
1
0
Fork 0
mirror of https://github.com/projectPiki/pikmin2.git synced 2025-02-21 14:21:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

link ebiP2Title.cpp
Some checks failed
Build / Build (GPVE01) (push) Has been cancelled
Details
Build / Build (GPVE01_D17) (push) Has been cancelled
Details
Build / Build (legacy) (GPVE01) (push) Has been cancelled
Details
Build / Build (legacy) (GPVE01_D17) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
PikHacker 2025-01-03 18:33:19 -05:00
parent 7c579cf754
commit ef3d4fa77c
6 changed files with 17 additions and 5114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5082
asm/plugProjectEbisawaU/ebiP2Title.s
View File

File diff suppressed because it is too large Load Diff

2
configure.py
View File

@ -1771,7 +1771,7 @@ config.libs = [
Object(Matching, "plugProjectEbisawaU/efx2dBase.cpp"),
Object(Matching, "plugProjectEbisawaU/efx2dEffect.cpp"),
Object(Matching, "plugProjectEbisawaU/particleMgr.cpp"),
Object(NonMatching, "plugProjectEbisawaU/ebiP2Title.cpp"),
Object(Matching, "plugProjectEbisawaU/ebiP2Title.cpp"),
Object(Matching, "plugProjectEbisawaU/ebiP2TitleUnit.cpp"),
Object(Matching, "plugProjectEbisawaU/ebiUtility.cpp"),
Object(Matching, "plugProjectEbisawaU/ebiP2TitleCamera.cpp"),

5
docs/recommended_todo.md
View File

@ -53,9 +53,8 @@
### <section id="plugProjectEbisawaU">plugProjectEbisawaU</section>
| File | Size (bytes) | File | Size (bytes) |
| ---- | ---- | ---- | ---- |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/ebi2DCallBack.cpp">ebi2DCallBack.cpp</a> | 10768 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/ebiP2Title.cpp">ebiP2Title.cpp</a> | 23853 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/efxPikmin.cpp">efxPikmin.cpp</a> | 31834 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/efxEnemy.cpp">efxEnemy.cpp</a> | 32976 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/efxBase.cpp">efxBase.cpp</a> | 34373 | | |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/ebi2DCallBack.cpp">ebi2DCallBack.cpp</a> | 10768 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/efxPikmin.cpp">efxPikmin.cpp</a> | 31834 |
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/efxEnemy.cpp">efxEnemy.cpp</a> | 32976 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectEbisawaU/efxBase.cpp">efxBase.cpp</a> | 34373 |
### <section id="plugProjectHikinoU">plugProjectHikinoU</section>
| File | Size (bytes) | File | Size (bytes) |

9
include/ebi/title/Entities/TPikmin.h
View File

@ -188,15 +188,6 @@ struct TUnit : public TObjBase {
void updateSmoothWalk_(Vector2f&);
void updateEnemyReaction_();
inline void checkClosestEnemy(TObjBase* enemy, f32& distmax)
{
Vector2f dist = enemy->mPosition - mPosition;
if (dist.length() < distmax) {
distmax = dist.length();
mEnemyObj = enemy;
}
}
// _00 = VTBL
// _00-_2C = TObjBase
Vector2f mDestPos; // _2C

2
src/plugProjectEbisawaU/Makefile
View File

@ -7,7 +7,7 @@ EBISAWA_FILES:=\
$(BUILD_DIR)/src/plugProjectEbisawaU/efx2dBase.o\
$(BUILD_DIR)/src/plugProjectEbisawaU/efx2dEffect.o\
$(BUILD_DIR)/src/plugProjectEbisawaU/particleMgr.o\
$(BUILD_DIR)/asm/plugProjectEbisawaU/ebiP2Title.o\
$(BUILD_DIR)/src/plugProjectEbisawaU/ebiP2Title.o\
$(BUILD_DIR)/src/plugProjectEbisawaU/ebiP2TitleUnit.o\
$(BUILD_DIR)/src/plugProjectEbisawaU/ebiUtility.o\
$(BUILD_DIR)/src/plugProjectEbisawaU/ebiP2TitleCamera.o\

31
src/plugProjectEbisawaU/ebiP2Title.cpp
View File

@ -925,26 +925,21 @@ void TTitleMgr::checkEncounter_()
f32 distmax = 1000.0f;
if (mKoganeMgr.mObject->isCalc()) {
piki->checkClosestEnemy(mKoganeMgr.mObject, distmax);
// just using operator- isn't how ebisawa rolls
Vector2f dist(mKoganeMgr.mObject->mPosition.x - piki->mPosition.x, mKoganeMgr.mObject->mPosition.y - piki->mPosition.y);
if (dist.length() < distmax) {
distmax = dist.length();
piki->mEnemyObj = mKoganeMgr.mObject;
}
}
if (mChappyMgr.mObject->isCalc()) {
piki->checkClosestEnemy(mChappyMgr.mObject, distmax);
}
// if (mKoganeMgr.mObject->isCalc()) {
// Vector2f dist = mKoganeMgr.mObject->mPosition - piki->mPosition;
// if (dist.length() < distmax) {
// distmax = dist.length();
// piki->mEnemyObj = mKoganeMgr.mObject;
// }
// }
// if (mChappyMgr.mObject->isCalc()) {
// Vector2f dist = mChappyMgr.mObject->mPosition - piki->mPosition;
// if (dist.length() < distmax) {
// distmax = dist.length();
// piki->mEnemyObj = mChappyMgr.mObject;
// }
// }
if (mChappyMgr.mObject->isCalc()) {
Vector2f dist(mChappyMgr.mObject->mPosition.x - piki->mPosition.x, mChappyMgr.mObject->mPosition.y - piki->mPosition.y);
if (dist.length() < distmax) {
distmax = dist.length();
piki->mEnemyObj = mChappyMgr.mObject;
}
}
}
}
}