From 0bb5696cd89ce890b4543da9f46c2053ce6aec03 Mon Sep 17 00:00:00 2001
From: LagoLunatic <LagoLunatic@users.noreply.github.com>
Date: Sun, 28 Jun 2026 18:53:19 -0400
Subject: [PATCH] dMinigame_Starter_c::_execute match

---
 include/d/d_tree.h           |  3 ++-
 src/d/d_minigame_starter.cpp | 13 +++++--------
 src/d/d_tree.cpp             |  4 ++--
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/include/d/d_tree.h b/include/d/d_tree.h
index be3dc2553..999a92276 100644
--- a/include/d/d_tree.h
+++ b/include/d/d_tree.h
@@ -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();
diff --git a/src/d/d_minigame_starter.cpp b/src/d/d_minigame_starter.cpp
index 0f3a23a51..fdf2b0e83 100644
--- a/src/d/d_minigame_starter.cpp
+++ b/src/d/d_minigame_starter.cpp
@@ -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();
     }
 
diff --git a/src/d/d_tree.cpp b/src/d/d_tree.cpp
index edfd3be1e..7537356f8 100644
--- a/src/d/d_tree.cpp
+++ b/src/d/d_tree.cpp
@@ -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));