TH13: spirit side

touhouworldcup · Feb 25, 2024 · db2782f · db2782f
1 parent 097ed89
commit db2782f
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 17 deletions.
diff --git a/thprac/src/thprac/thprac_games_def.json b/thprac/src/thprac/thprac_games_def.json
@@ -822,6 +822,10 @@
         "TH_P3",
         "TH_P4",
         "TH_RAGE"
+      ],
+      "TH_SIDE_SELECT": [
+          "TH_LEFT",
+          "TH_RIGHT"
       ]
     }
   },
@@ -4686,10 +4690,6 @@
     },
 
     "groups": {
-      "TH12_UFO_SIDE_SELECT": [
-          "TH_LEFT",
-          "TH_RIGHT"
-      ],
       "TH12_VENTRA_SELECT": [
         "TH12_VENTRA_NONE",
         "TH12_VENTRA_RED",
@@ -5728,7 +5728,8 @@
 
     "glossary": {
       "TH13_TRANCE_METER": [ "灵界槽", "Trance Meter", "霊界ゲージ" ],
-      "TH13_EXTEND": [ "奖残次数", "Times extended", "エクステンド回数" ]
+      "TH13_EXTEND": [ "奖残次数", "Times extended", "エクステンド回数" ],
+      "TH13_SPIRIT_SIDE": [ "灵方向", "Spirit side", "霊ー方向" ]
     },
 
     "sections": {

diff --git a/thprac/src/thprac/thprac_locale_def.cpp b/thprac/src/thprac/thprac_locale_def.cpp
@@ -7,7 +7,7 @@
 
 namespace THPrac {
 
-const char* th_glossary_str[3][906]
+const char* th_glossary_str[3][907]
 {
     {
         "",
@@ -163,6 +163,7 @@ const char* th_glossary_str[3][906]
         "红",
         "TH13.5 东方心绮楼　～ Hopeless Masquerade.",
         "奖残次数",
+        "灵方向",
         "TH13 东方神灵庙　～ Ten Desires.",
         "灵界槽",
         "TH14.3 弹幕天邪鬼　～ Impossible Spell Card.",
@@ -1071,6 +1072,7 @@ const char* th_glossary_str[3][906]
         "Red",
         "TH13.5 Hopeless Masquerade",
         "Times extended",
+        "Spirit side",
         "TH13 Ten Desires",
         "Trance Meter",
         "TH14.3 Impossible Spell Card",
@@ -1979,6 +1981,7 @@ const char* th_glossary_str[3][906]
         "赤",
         "TH13.5 東方心綺楼　～ Hopeless Masquerade.",
         "エクステンド回数",
+        "霊ー方向",
         "TH13 東方神霊廟　～ Ten Desires.",
         "霊界ゲージ",
         "TH14.3 弾幕アマノジャク　～ Impossible Spell Card.",
@@ -2819,6 +2822,12 @@ const th_glossary_t TH_SPELL_PHASE3[6]
     TH_RAGE,
 };
 
+const th_glossary_t TH_SIDE_SELECT[3]
+{
+    TH_LEFT,
+    TH_RIGHT,
+};
+
 namespace TH06 {
 
 const char* th_sections_str[3][4][107]
@@ -11054,12 +11063,6 @@ const th_sections_t th_sections_cbt[7][2][14]
     },
 };
 
-const th_glossary_t TH12_UFO_SIDE_SELECT[3]
-{
-    TH_LEFT,
-    TH_RIGHT,
-};
-
 const th_glossary_t TH12_VENTRA_SELECT[5]
 {
     TH12_VENTRA_NONE,

diff --git a/thprac/src/thprac/thprac_locale_def.h b/thprac/src/thprac/thprac_locale_def.h
@@ -163,6 +163,7 @@ enum th_glossary_t
     TH12_VENTRA_RED,
     TH135_TITLE,
     TH13_EXTEND,
+    TH13_SPIRIT_SIDE,
     TH13_TITLE,
     TH13_TRANCE_METER,
     TH143_TITLE,
@@ -918,7 +919,7 @@ enum th_glossary_t
     TH_WARP,
 };
 
-extern const char* th_glossary_str[3][906];
+extern const char* th_glossary_str[3][907];
 
 extern const th_glossary_t TH_TYPE_SELECT[13];
 
@@ -938,6 +939,8 @@ extern const th_glossary_t TH_SPELL_PHASE2[5];
 
 extern const th_glossary_t TH_SPELL_PHASE3[6];
 
+extern const th_glossary_t TH_SIDE_SELECT[3];
+
 namespace TH06 {
 
 enum th_sections_t : uint8_t
@@ -1642,8 +1645,6 @@ extern const th_sections_t th_sections_cba[7][2][19];
 
 extern const th_sections_t th_sections_cbt[7][2][14];
 
-extern const th_glossary_t TH12_UFO_SIDE_SELECT[3];
-
 extern const th_glossary_t TH12_VENTRA_SELECT[5];
 
 }

diff --git a/thprac/src/thprac/thprac_th12.cpp b/thprac/src/thprac/thprac_th12.cpp
@@ -334,7 +334,7 @@ namespace TH12 {
         Gui::GuiCombo mSection { TH_MODE };
         Gui::GuiCombo mPhase { TH_PHASE };
         Gui::GuiCheckBox mDlg { TH_DLG };
-        Gui::GuiCombo mUfoSide { TH12_UFO_SIDE, TH12_UFO_SIDE_SELECT };
+        Gui::GuiCombo mUfoSide { TH12_UFO_SIDE, TH_SIDE_SELECT };
         Gui::GuiCombo mVentra1 { TH12_VENTRA_1, TH12_VENTRA_SELECT };
         Gui::GuiCombo mVentra2 { TH12_VENTRA_2, TH12_VENTRA_SELECT };
         Gui::GuiCombo mVentra3 { TH12_VENTRA_3, TH12_VENTRA_SELECT };

diff --git a/thprac/src/thprac/thprac_th13.cpp b/thprac/src/thprac/thprac_th13.cpp
@@ -20,6 +20,7 @@ namespace TH13 {
         int32_t value;
         int32_t graze;
         int32_t trance_meter;
+        int32_t spirit_side;
 
         bool dlg;
 
@@ -133,6 +134,7 @@ namespace TH13 {
                 thPracParam.value = *mValue;
                 thPracParam.graze = *mGraze;
                 thPracParam.trance_meter = *mTranceMeter;
+                thPracParam.spirit_side = *mSpiritSide;
 
                 break;
             case 4:
@@ -219,6 +221,7 @@ namespace TH13 {
                 mGraze();
                 mScore();
                 mScore.RoundDown(10);
+                mSpiritSide();
             }
 
             mNavFocus();
@@ -309,6 +312,7 @@ namespace TH13 {
         Gui::GuiCombo mMode { TH_MODE, TH_MODE_SELECT };
         Gui::GuiCombo mStage { TH_STAGE, TH_STAGE_SELECT };
         Gui::GuiCombo mWarp { TH_WARP, TH_WARP_SELECT };
+        Gui::GuiCombo mSpiritSide { TH13_SPIRIT_SIDE, TH_SIDE_SELECT };
         Gui::GuiCombo mSection { TH_MODE };
         Gui::GuiCombo mPhase { TH_PHASE };
         Gui::GuiCheckBox mDlg { TH_DLG };
@@ -329,7 +333,7 @@ namespace TH13 {
         Gui::GuiNavFocus mNavFocus { TH_STAGE, TH_MODE, TH_WARP, TH_DLG,
             TH_MID_STAGE, TH_END_STAGE, TH_NONSPELL, TH_SPELL, TH_PHASE, TH_CHAPTER,
             TH_SCORE, TH_LIFE, TH13_EXTEND, TH_LIFE_FRAGMENT, TH_BOMB, TH_BOMB_FRAGMENT,
-            TH_POWER, TH_VALUE, TH_GRAZE, TH13_TRANCE_METER };
+            TH_POWER, TH_VALUE, TH_GRAZE, TH13_TRANCE_METER, TH13_SPIRIT_SIDE };
 
         int mChapterSetup[7][2] {
             { 3, 2 },
@@ -1598,6 +1602,8 @@ namespace TH13 {
             *(int32_t*)(0x4be7d0) = thPracParam.graze;
             *(int32_t*)(0x4be808) = thPracParam.trance_meter;
 
+            *(uint32_t*)GetMemAddr(0x4c22a4, 0x8820) = !thPracParam.spirit_side;
+
             THSectionPatch();
         }
     }