Merge pull request #28 from SeekyCt/dev

v4

Author: SeekyCt

MANUAL.md

@@ -16,6 +16,15 @@ A full list of map names can be found [here](https://docs.google.com/document/d/
 
 By default a Dimentio teleport animation will play when you do this (thanks to JohnP55 for the idea and documentation of relevant functions), but you can turn that off by pressing `-` in the menu if you'd like.
 
+## Pit Warping
+The `Warp To Pit Floor` option in the menu allows you to warp to any floor of either Pit of 100 Trials.
+
+In the left column you can choose which pit you'd like to warp to, and in the right column you can choose the floor of that pit. These can be scrolled through using the D-Pad.
+
+Once you've chosen the floor and pit you'd like to warp to, press `2`.
+
+By default a Dimentio teleport animation will play when you do this (thanks to JohnP55 for the idea and documentation of relevant functions), but you can turn that off by pressing `-` in the menu if you'd like.
+
 ## HUD Displays
 The `Edit HUD Display Options` option in the menu allows you to enable and disable various displays on the screen. The list can be navigated with the D-Pad and `2` can be pressed to switch between Enabled and Disabled.
 
@@ -53,6 +62,9 @@ The `Edit Stats` option in the menu allows you to change the values of your Leve
 ## Saved Settings
 The `Manage Saved Settings` option in the menu allows you to save your settings for the mod to your Wii's NAND (to the file `pcset.bin` in the game's save folder) and they'll automatically load next time you boot the mod. You can also load your saved settings, load the default settings or delete them from your NAND. 
 
+## Game Saving and Reloading
+The `Game Save Options` option in the menu allows you to save the game anywhere (it's recommended to make a backup of your save file before using this feature, if you do have any issues with it please report them either as an issue in the Github repo or by contacting me on Discord) and to reload the current save file.
+
 ## Return to Title Screen
 The `Return to Title Screen` option allows you to return to the main menu without needing to game over or reboot.
 

include/gamesavemenu.h

@@ -0,0 +1,30 @@
+/*
+    GameSaveMenu
+    Controls for saving & loading the game save file
+*/
+
+#pragma once
+
+#include "mod_ui_base/menuwindow.h"
+
+namespace mod {
+
+class GameSaveMenu : public MenuWindow
+{
+private:
+    MenuButton * mButtons[2];
+
+    virtual void close() override;
+    void initMainScreen();
+    void initConfirmScreen();
+    void exitScreen();
+    static bool openMainScreen(MenuButton * button, void * param);
+    static bool openConfirmScreen(MenuButton * button, void * param);
+
+public:
+    GameSaveMenu();
+
+    static void pitSavePatch();
+};
+
+}

include/mainmenu.h

@@ -9,7 +9,7 @@
 
 namespace mod {
 
-#define MAIN_MENU_OPTION_COUNT 8
+#define MAIN_MENU_OPTION_COUNT 10
 
 class MainMenu : public MenuWindow
 {

include/mod.h

@@ -2,9 +2,10 @@
 
 namespace mod {
 
-#define MOD_VERSION "SPM Practice Codes v3"
+#define MOD_VERSION "SPM Practice Codes v4"
 
-extern bool isDolphin;
+extern bool gIsDolphin;
+extern bool gIs4_3;
 
 void main();
 

include/nandsettings.h

@@ -53,13 +53,13 @@ struct NandSettings
     bool mapChangeEffect;
 };
 
-extern NandSettings * settings;
+extern NandSettings * gSettings;
 
 EVT_DECLARE(nand_settings_load);
 EVT_DECLARE(nand_settings_write);
 EVT_DECLARE(nand_settings_delete);
 
-extern int nandSettingsSuccess;
+extern int gNandSettingsSuccess;
 
 void nandSettingsDefaults();
 void nandSettingsPatch();

include/pitselectmenu.h

@@ -0,0 +1,42 @@
+/*
+    PitSelectMenu
+    Menu window to warp to a floor of a pit of 100 trials
+*/
+
+#pragma once
+
+#include "mod_ui_base/menuscroller.h"
+#include "mod_ui_base/menuwindow.h"
+
+namespace mod {
+
+class PitSelectMenu : public MenuWindow
+{
+private:
+    int mGroup;
+    int mFloor;
+    char mFloorStr[3];
+    MenuScroller * mGroupDisp;
+    MenuScroller * mFloorDisp;
+
+    void updateGroupDisp();
+    void updateFloorDisp();
+    void _doMapChange();
+
+    static void groupSwap(MenuScroller * scroller, void * param);
+    static void floorUp(MenuScroller * scroller, void * param);
+    static void floorDown(MenuScroller * scroller, void * param);
+    static bool doMapChange(MenuButton * button, void * param);
+
+protected:
+    virtual void disp() override;
+    virtual void close() override;
+
+public:
+    static const char * sMapName;
+    static int sGSW1;
+
+    PitSelectMenu();
+};
+
+}

include/spm.eu0.lst

@@ -43,6 +43,10 @@
 8003ab80:windowDispGX2_Waku_col
 // more
 
+// camdrv.c
+80055b24:camGetPtr
+// more
+
 // dispdrv.c
 8005af04:dispEntry
 // more
@@ -116,9 +120,13 @@
 // more
 
 // evt_mobj.c
+// text
 800f3608:evt_mobj_delete
 800f8be8:evt_mobj_blk
 // more
+// data
+8041b6d8:mobj_save_blk_sysevt
+// more
 
 // evt_msg.c
 800fba54:evt_msg_print
@@ -138,6 +146,8 @@
 80121f48:marioGetPtr
 80122b68:marioCtrlOffChk
 80122b7c:marioKeyOffChk
+80122bf4:marioKeyOff
+80122c2c:marioKeyOn
 8012b50c:marioSetGravity
 // more
 
@@ -165,6 +175,10 @@
 80179140:seq_logoMain
 // more
 
+// seq_mapchange.c
+8017af98:_unload
+// more
+
 // seq_game.c
 8017ce44:seq_gameInit
 // more
@@ -187,6 +201,11 @@
 80195f98:charPixlItemWinIsClosed
 // more
 
+// hud.c
+80199490:hudLoadStats
+80199ad0:hudHide
+// more
+
 // system.c
 8019d254:irand
 8019c54c:__assert2
@@ -271,6 +290,7 @@
 // spmario_snd.c
 80238598:spsndExit
 8023c93c:spsndBGMOn
+8023c948:spsndBGMOff_f_d
 // more
 
 // relmgr.c
@@ -283,6 +303,12 @@
 805ae1a4:relDecompName
 805ae1a8:relCompName
 
+// nandmgr.c
+8023e9ec:nandGetSaveFiles
+8023edcc:nandUpdateSave
+8023efe0:nandLoadSave
+// more
+
 // MSL_C.PPCEABI.bare.H.a
 // printf.c
 8025d098:sprintf

include/spm.jp0.lst

@@ -199,3 +199,16 @@
 802958FC:IOS_Open
 80295ADC:IOS_Close
 80C36B20:evt_machi_set_elv_descs
+
+// new to v4
+80055A0C:camGetPtr
+803B0FB0:mobj_save_blk_sysevt
+80122198:marioKeyOff
+801221D0:marioKeyOn
+8017A2F0:_unload
+80198650:hudLoadStats
+80198C90:hudHide
+8023A2F4:spsndBGMOff_f_d
+8023C2F8:nandGetSaveFiles
+8023C6D8:nandUpdateSave
+8023c8ec:nandLoadSave

include/spm.jp1.lst

@@ -199,3 +199,16 @@
 80295E98:IOS_Open
 80296078:IOS_Close
 80C23E20:evt_machi_set_elv_descs
+
+// new to v4
+80055A2C:camGetPtr
+803B2130:mobj_save_blk_sysevt
+801221B8:marioKeyOff
+801221F0:marioKeyOn
+8017A338:_unload
+80198698:hudLoadStats
+80198CD8:hudHide
+8023A9A0:spsndBGMOff_f_d
+8023C9A4:nandGetSaveFiles
+8023CD84:nandUpdateSave
+8023cf98:nandLoadSave

include/spm.kr0.lst

@@ -189,3 +189,16 @@
 8029DD50:IOS_Open
 8029DF30:IOS_Close
 80C64440:evt_machi_set_elv_descs
+
+// new to v4
+8004FF58:camGetPtr
+8044BE18:mobj_save_blk_sysevt
+8011E780:marioKeyOff
+8011E7B8:marioKeyOn
+80176CE8:_unload
+80195544:hudLoadStats
+80195B84:hudHide
+80234FCC:spsndBGMOff_f_d
+802371CC:nandGetSaveFiles
+80237544:nandUpdateSave
+80237758:nandLoadSave

include/spm.us0.lst

@@ -199,3 +199,16 @@
 8029594C:IOS_Open
 80295B2C:IOS_Close
 80C1BC00:evt_machi_set_elv_descs
+
+// new to v4
+80055A0C:camGetPtr
+803DBD30:mobj_save_blk_sysevt
+80122198:marioKeyOff
+801221D0:marioKeyOn
+8017A300:_unload
+80198660:hudLoadStats
+80198CA0:hudHide
+8023A34C:spsndBGMOff_f_d
+8023C350:nandGetSaveFiles
+8023C730:nandUpdateSave
+8023c944:nandLoadSave

include/spm.us1.lst

@@ -199,3 +199,16 @@
 80296118:IOS_Open
 802962F8:IOS_Close
 80C09180:evt_machi_set_elv_descs
+
+// new to v4
+80055A2C:camGetPtr
+803DD090:mobj_save_blk_sysevt
+801221B8:marioKeyOff
+801221F0:marioKeyOn
+8017A35C:_unload
+801986BC:hudLoadStats
+80198CFC:hudHide
+8023AA38:spsndBGMOff_f_d
+8023CA3C:nandGetSaveFiles
+8023CE1C:nandUpdateSave
+8023d030:nandLoadSave

include/spm.us2.lst

@@ -199,3 +199,16 @@
 802961B8:IOS_Open
 80296398:IOS_Close
 80C09300:evt_machi_set_elv_descs
+
+// new to v4
+800559AC:camGetPtr
+803DD270:mobj_save_blk_sysevt
+801225C8:marioKeyOff
+80122600:marioKeyOn
+8017A76C:_unload
+80198ACC:hudLoadStats
+8019910C:hudHide
+8023AD64:spsndBGMOff_f_d
+8023CD68:nandGetSaveFiles
+8023D0CC:nandUpdateSave
+8023d2e0:nandLoadSave

include/spm/camdrv.h

@@ -0,0 +1,33 @@
+#pragma once
+
+#include <types.h>
+#include <wii/types.h>
+
+namespace spm::camdrv {
+
+#define CAM_FLAG_16_9 0x10000000
+
+enum
+{
+    // 0-12 unknown
+    CAM_DEBUG = 13,
+    CAM_DEBUG_3D = 14
+};
+
+struct CamEntry
+{
+    u32 flag;
+    u8 unknown_0x4[0x15c - 0x4];
+    wii::Vec3 pos;
+    wii::Vec3 target;
+    u8 unknown_0x174[0x2f0 - 0x174]; 
+};
+static_assert(sizeof(CamEntry) == 0x2f0);
+
+extern "C" {
+
+CamEntry * camGetPtr(int camId);
+
+}
+
+}

include/spm/dispdrv.h

@@ -1,16 +1,10 @@
 #pragma once
 
 #include <types.h>
+#include <spm/camdrv.h>
 
 namespace spm::dispdrv {
 
-enum
-{
-    // 0-12 unknown
-    CAM_DEBUG = 13,
-    CAM_DEBUG_3D = 14
-};
-
 typedef void (DispCallback)(s8 cameraId, void * param);
 
 extern "C" {

include/spm/evt_mobj.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include "evt_cmd.h"
+
+namespace spm::evt_mobj {
+
+extern "C" {
+
+// Script to save the game
+EVT_DECLARE(mobj_save_blk_sysevt);
+
+}
+
+}