Merge branch 'svmng' of https://github.com/zsrtp/tpgz into svmng

zsrtp · Feb 4, 2024 · 38ce748 · 38ce748
2 parents 3ba8a4d + ed85194
commit 38ce748
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/modules/boot/include/practice.h b/modules/boot/include/practice.h
@@ -4,7 +4,9 @@
 
 enum {
     ANY_INDEX,
+#ifdef GCN_PLATFORM
     ANY_BITE_INDEX,
+#endif
     HUNDO_INDEX,
     AD_INDEX,
     NOSQ_INDEX,

diff --git a/modules/boot/src/gorge.cpp b/modules/boot/src/gorge.cpp
@@ -9,12 +9,13 @@
 #include "libtp_c/include/f_op/f_op_scene_req.h"
 #include "libtp_c/include/utils.h"
 
-#define WARP_CS_FRAMES 132
 #ifdef WII_PLATFORM
 #define TARGET_BUTTON Z
+#define WARP_CS_FRAMES 160
 #endif
 #ifdef GCN_PLATFORM
 #define TARGET_BUTTON L
+#define WARP_CS_FRAMES 132
 #endif
 
 namespace GorgeVoidIndicator {
@@ -36,8 +37,10 @@ void warpToPosition() {
     g_dComIfG_gameInfo.info.mMemory.mBit.mSwitch[0] = 0;  // optimize later
     dComIfGs_putSave(g_dComIfG_gameInfo.info.mDan.mStageNo);
 
+#ifdef GCN_PLATFORM
     // change form to wolf
     dComIfGs_setTransformStatus(STATUS_WOLF);
+#endif
 
     // set loading info
     g_dComIfG_gameInfo.play.mNextStage.wipe = 13;

diff --git a/modules/menus/menu_practice/include/practice_menu.h b/modules/menus/menu_practice/include/practice_menu.h
@@ -3,7 +3,11 @@
 #include "practice.h"
 #include "gz_flags.h"
 
+#ifdef GCN_PLATFORM
 #define PRACTICE_MENU_NUM 6
+#elif defined WII_PLATFORM
+#define PRACTICE_MENU_NUM 5
+#endif
 
 class PracticeMenu : public Menu {
 public:

diff --git a/modules/menus/menu_practice/src/practice_menu.cpp b/modules/menus/menu_practice/src/practice_menu.cpp
@@ -28,9 +28,11 @@ void PracticeMenu::draw() {
         case ANY_INDEX:
             g_menuMgr->push(MN_ANY_SAVES_INDEX);
             return;
+#ifdef GCN_PLATFORM
         case ANY_BITE_INDEX:
             g_menuMgr->push(MN_ANY_BITE_SAVES_INDEX);
             return;
+#endif
         case HUNDO_INDEX:
             g_menuMgr->push(MN_HUNDO_SAVES_INDEX);
             return;