mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-29 18:52:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

dMinigame_Starter_c::_execute match

Browse Source
This commit is contained in:
LagoLunatic
2026-06-28 18:53:19 -04:00
parent 88a753265e
commit 0bb5696cd8
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_tree.h
+2 -1
View File
@@ -101,7 +101,8 @@ public:
void setPlayerSwordAngY(s16 i_ang) { mPlayerSwordAngY = i_ang;}
s16 getPlayerSwordMoveAngY() { return mPlayerSwordMoveAngY; }
int getNum() {}
// TODO
void getNum() {}
virtual void draw();
virtual ~dTree_packet_c();
src/d/d_minigame_starter.cpp
+5 -8
View File
@@ -59,7 +59,6 @@ cPhs_State dMinigame_Starter_c::_create() {
}
/* 80206124-8020629C .text _execute__19dMinigame_Starter_cFv */
// NONMATCHING - instruction ordering
BOOL dMinigame_Starter_c::_execute() {
int var_r30 = (cdFrame0 + cdFrame1 + tmFrame + cdFrame2 + cdFrame3) - 30;
int var_r29 = (cdFrame4 + cdFrame5 + cdFrame6 + cdFrame7 + cdFrame8) - 23;
@@ -68,11 +67,9 @@ BOOL dMinigame_Starter_c::_execute() {
return FALSE;
}
int var_r31 = var_r30 * 3;
if (mTimer < (var_r31 + var_r29) + 137) {
if (mTimer < var_r30 * 3 + 137 + var_r29) {
mTimer++;
if (mTimer >= (var_r31 + var_r29) + 89) {
if (mTimer >= var_r30 * 3 + 89 + var_r29) {
mStatus = 2;
}
} else {
@@ -83,15 +80,15 @@ BOOL dMinigame_Starter_c::_execute() {
mStarterScrn->anime1(2);
}
if (mTimer >= var_r30 + 28 && mTimer <= (var_r30 * 2) + 57) {
if (mTimer >= var_r30 + 28 && mTimer <= var_r30 * 2 + 57) {
mStarterScrn->anime1(1);
}
if (mTimer >= (var_r30 * 2) + 55 && mTimer <= var_r31 + 84) {
if (mTimer >= (var_r30 * 2) + 55 && mTimer <= var_r30 * 3 + 84) {
mStarterScrn->anime1(0);
}
if (mTimer >= var_r31 + 84 && mTimer <= (var_r31 + var_r29) + 107) {
if (mTimer >= var_r30 * 3 + 84 && mTimer <= var_r30 * 3 + 107 + var_r29) {
mStarterScrn->anime2();
}
src/d/d_tree.cpp
+2 -2
View File
@@ -384,7 +384,7 @@ void dTree_data_c::animation(int i_roomNo) {
cXyz sp18;
MTXMultVec(anm->field_0x24, &l_particleOffset, &sp18);
JPABaseEmitter* emitter = dComIfGp_particle_setToon(0x2022, &sp18, NULL, &l_scale, 0xAA, &mSmokeEcallback, i_roomNo, NULL, NULL, NULL);
JPABaseEmitter* emitter = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE00, &sp18, NULL, &l_scale, 0xAA, &mSmokeEcallback, i_roomNo, NULL, NULL, NULL);
if (emitter != NULL) {
emitter->setRate(20.0f);
emitter->setSpread(1.0f);
@@ -394,7 +394,7 @@ void dTree_data_c::animation(int i_roomNo) {
}
sp18.y -= 50.0f;
dComIfGp_particle_set(0x3df, &sp18);
dComIfGp_particle_set(dPa_name::ID_IT_JN_HAPPA02, &sp18);
#if VERSION == VERSION_DEMO
dComIfGp_getVibration().StartShock(4, -0x21, cXyz(0.0f, 1.0f, 0.0f));