Cheats menu - New option

Zephiles · Zephiles · commit 90a6492c3a4a · 2019-04-03T16:29:11.000-05:00
Added an option to manually change GSWs, GSWFs, GWs, GFs, LSWs, and LSWFs.
diff --git a/USER_MANUAL.md b/USER_MANUAL.md
@@ -56,7 +56,8 @@ This menu allows you to modify your entire inventory, including standard items,
 17. **Disable Pause Menu/Z Menu Sounds** disables the sound effects that play when the pause menu and the Z menu are opened/closed.
 18. **Bobbery Early** clears some values, which allows you to perform Bobbery Early more than once on a save file without the need to reload.
 19. **Force NPC Item Drop** forces any defeared enemy to drop a specified item. The item can be changed at will.
-20. **Clear Area Flags** allows you to clear most of the flags for a specified area. A confirmation message is displayed when trying to do so, to prevent accidently clearing flags. The flags will be cleared on the next screen transition.
+20. **Manage Flags** allows you to manually change a lot of the important flags in the game.
+21. **Clear Area Flags** allows you to clear most of the flags for a specified area. A confirmation message is displayed when trying to do so, to prevent accidently clearing flags. The flags will be cleared on the next screen transition.
 
 ### Stats
 This menu allows you to modify Mario's stats, all of your partner's stats, whether or not partners are enabled or not, whether a partner is out or not, and whether or not a follower is out or not.
diff --git a/ttyd-tools/rel/include/commonfunctions.h b/ttyd-tools/rel/include/commonfunctions.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <ttyd/seqdrv.h>
+#include <ttyd/evtmgr.h>
 
 #include <cstdint>
 
@@ -37,6 +38,7 @@ bool checkIfBadgeEquipped(int16_t badge);
 void recheckJumpAndHammerLevels();
 uint32_t getCurrentPitFloor();
 void clearGSWFsRange(uint32_t lowerBound, uint32_t upperBound);
+ttyd::evtmgr::EvtWork *getCurrentEventWork();
 void *getLastPointerFromPath(void *address, int32_t *offset, uint32_t offsetAmount);;
 
 }
diff --git a/ttyd-tools/rel/include/draw.h b/ttyd-tools/rel/include/draw.h
@@ -95,6 +95,7 @@ void drawCheatsBool(int32_t posY);
 void drawButtonCombo(uint16_t buttonCombo, int32_t posY, const char *description);
 void drawChangeButtonCombo(uint16_t &currentButtonCombo);
 void drawCheatsForcedDropItem();
+void drawCheatsManageFlagsMain(uint32_t currentMenu);
 void drawCheatsClearArea();
 void drawWarpsOptions();
 void drawOnScreenTimerButtonCombos();
diff --git a/ttyd-tools/rel/include/global.h b/ttyd-tools/rel/include/global.h
@@ -22,6 +22,8 @@ enum MENU_NAMES
 	CHEATS_STANDARD,
 	CHEATS_NO_BUTTON_COMBO,
 	CHEATS_NPC_FORCE_DROP,
+	CHEATS_MANAGE_FLAGS,
+	CHEATS_MANAGE_FLAGS_MAIN,
 	CHEATS_CLEAR_AREA_FLAGS,
 	STATS_MARIO,
 	STATS_PARTNERS,
@@ -79,6 +81,7 @@ enum CHEATS_OPTIONS
 	DISABLE_MENU_SOUNDS,
 	BOBBERY_EARLY,
 	FORCE_ITEM_DROP,
+	MANAGE_FLAGS,
 	CLEAR_AREA_FLAGS,
 };
 
@@ -99,6 +102,29 @@ enum CHEATS_FORCE_ITEM_DROP_SELECTION
 	ITEM_DROP_CHANGE_BY_ID,
 };
 
+enum CHEATS_MANAGE_FLAGS_SELECTION
+{
+	SET_GSW = 1,
+	SET_GSWF,
+	SET_GW,
+	SET_GF,
+	SET_LSW,
+	SET_LSWF,
+};
+
+enum CHEATS_MANAGE_GLOBAL_WORDS_SELECTION
+{
+	CHANGE_GLOBAL_WORD = 1,
+	CHANGE_GLOBAL_WORD_VALUE,
+	SET_GLOBAL_WORD_VALUE,
+};
+
+enum CHEATS_MANAGE_GLOBAL_FLAGS_SELECTION
+{
+	CHANGE_GLOBAL_FLAG = 1,
+	SET_GLOBAL_FLAG,
+};
+
 enum CHEATS_CLEAR_AREA_FLAGS_SELECTION
 {
 	SELECT_AREA = 1,
@@ -462,6 +488,12 @@ struct CheatsHandleDisplayButtons
 	uint8_t CheatsCurrentButtonsHeld[14]; // Extra spot for a 0 at the end of the array
 };
 
+struct CheatsManageFlags
+{
+	uint16_t FlagToSet;
+	int32_t ValueToSet;
+};
+
 struct MarioPartnerPositionsStruct
 {
 	float MarioPosition[4];
@@ -571,8 +603,8 @@ struct SettingsStruct
 	MemoryWatchStruct MemoryWatchSettings[30];
 };
 
-extern Menus Menu[24];
-extern Cheats Cheat[19];
+extern Menus Menu[26];
+extern Cheats Cheat[20];
 extern bool Displays[9];
 extern char DisplayBuffer[256];
 extern MemoryWatchStruct MemoryWatch[30];
@@ -581,6 +613,7 @@ extern AutoIncrement AdjustableValueMenu;
 extern AutoIncrement MemoryWatchAdjustableValueMenu;
 extern AutoIncrementCoordinates MemoryWatchPosition;
 extern CheatsHandleDisplayButtons CheatsDisplayButtons;
+extern CheatsManageFlags ManageFlags;
 extern MarioPartnerPositionsStruct MarioPartnerPositions;
 extern SaveAnywhereStruct SaveAnywhere;
 extern SpeedUpMarioStruct SpeedUpMario;
@@ -600,6 +633,8 @@ extern const char *CheatsLines[];
 extern const char *CheatsForceItemDropAreas[];
 extern uint8_t CheatsForceItemDropAreasSize;
 extern const char *CheatsForceItemDropAreasFullNames[];
+extern const char *CheatsManageGlobalWordsOptions[];
+extern const char *CheatsManageGlobalFlagsOptions[];
 extern const char *StatsMarioOptionsLines[];
 extern uint8_t StatsMarioOptionsLinesSize;
 extern uint16_t StatsMarioIcons[];
diff --git a/ttyd-tools/rel/include/menufunctions.h b/ttyd-tools/rel/include/menufunctions.h
@@ -51,6 +51,11 @@ void setAddByIconValue(void *address);
 void duplicateCurrentItem(void *address);
 void deleteItem();
 int32_t changeItem();
+int32_t getGW(uint32_t gw);
+void setGW(uint32_t gw, uint32_t value);
+bool getGF(uint32_t gf);
+void setGF(uint32_t gf);
+int32_t getGlobalFlagValue(uint32_t currentMenu, uint32_t flag);
 void cheatClearAreaFlags(uint32_t currentMenuOption);
 
 // uint8_t *getButtonsPressedDynamic(uint8_t *buttonArray, uint16_t currentButtonCombo);
@@ -64,6 +69,7 @@ uint32_t checkButtonSingleFrame();
 // void correctPageSingleColumn(uint32_t button, uint8_t &currentPage)
 void default_DPAD_Actions(uint32_t button);
 void adjustCheatsSubMenu(uint32_t button);
+void adjustCheatsManageFlagsMainMenu(uint32_t button);
 void adjustMenuSelectionInventory(uint32_t button);
 void adjustCheatClearAreaFlagSelection(uint32_t button);
 void adjustMarioStatsSelection(uint32_t button);
diff --git a/ttyd-tools/rel/include/ttyd.eu.lst b/ttyd-tools/rel/include/ttyd.eu.lst
@@ -212,7 +212,7 @@
 // 80037898:evtmgrReInit
 // 80037904:evtmgrInit
 // 80037A1C:make_pri_table
-// 80037B48:evtGetWork
+80037B48:evtGetWork
 
 // evt_sub.o
 // 80053830:mail_evt_gor_04_keyoff_check
@@ -448,11 +448,11 @@
 // 80085C8C:msgInit
 
 // swdrv.o
-// 80086A98:_swByteGet
-// 80086AA8:_swByteSet
-// 80086AB8:_swClear
-// 80086AF8:_swGet
-// 80086B40:_swSet
+80086A98:_swByteGet
+80086AA8:_swByteSet
+80086AB8:_swClear
+80086AF8:_swGet
+80086B40:_swSet
 80086B80:swByteGet
 80086BA4:swByteSet
 80086BC8:swClear
diff --git a/ttyd-tools/rel/include/ttyd.jp.lst b/ttyd-tools/rel/include/ttyd.jp.lst
@@ -210,7 +210,7 @@
 // 80037114:evtmgrReInit
 // 80037180:evtmgrInit
 // 80037298:make_pri_table
-// 800373C4:evtGetWork
+800373C4:evtGetWork
 
 // evt_sub.o
 // 80052AFC:mail_evt_gor_04_keyoff_check
@@ -443,11 +443,11 @@
 // 800839B0:msgInit
 
 // swdrv.o
-// 800847B8:_swByteGet
-// 800847C8:_swByteSet
-// 800847D8:_swClear
-// 80084818:_swGet
-// 80084860:_swSet
+800847B8:_swByteGet
+800847C8:_swByteSet
+800847D8:_swClear
+80084818:_swGet
+80084860:_swSet
 800848A0:swByteGet
 800848C4:swByteSet
 800848E8:swClear
diff --git a/ttyd-tools/rel/include/ttyd.us.lst b/ttyd-tools/rel/include/ttyd.us.lst
@@ -212,7 +212,7 @@
 // 800377B0:evtmgrReInit
 // 8003781C:evtmgrInit
 // 80037934:make_pri_table
-// 80037A60:evtGetWork
+80037A60:evtGetWork
 
 // evt_sub.o
 // 80053764:mail_evt_gor_04_keyoff_check
@@ -447,11 +447,11 @@
 // 80084938:msgInit
 
 // swdrv.o
-// 80085744:_swByteGet
-// 80085754:_swByteSet
-// 80085764:_swClear
-// 800857A4:_swGet
-// 800857EC:_swSet
+80085744:_swByteGet
+80085754:_swByteSet
+80085764:_swClear
+800857A4:_swGet
+800857EC:_swSet
 8008582C:swByteGet
 80085850:swByteSet
 80085874:swClear
diff --git a/ttyd-tools/rel/include/ttyd/evtmgr.h b/ttyd-tools/rel/include/ttyd/evtmgr.h
@@ -4,6 +4,17 @@
 
 namespace ttyd::evtmgr {
 
+struct EvtWork
+{
+    uint32_t maxEventCount;
+    uint32_t gwData[32];
+    uint32_t gfData[3]; // 96 flags total
+    // EvtContext *pContextBuffer;
+    void *pContextBuffer;
+    uint32_t unk_94;
+    uint64_t currentEventTime;
+} __attribute__((__packed__));
+
 extern "C" {
 
 // evtGetPtrID
@@ -32,7 +43,7 @@ uint32_t evtEntryType(void *script, uint32_t unk1, uint32_t unk2, uint32_t unk3)
 // evtmgrReInit
 // evtmgrInit
 // make_pri_table
-// evtGetWork
+EvtWork *evtGetWork(); // Gets current work
 
 }
 
diff --git a/ttyd-tools/rel/include/ttyd/swdrv.h b/ttyd-tools/rel/include/ttyd/swdrv.h
@@ -6,11 +6,11 @@ namespace ttyd::swdrv {
 
 extern "C" {
 
-// _swByteGet
-// _swByteSet
-// _swClear
-// _swGet
-// _swSet
+uint8_t _swByteGet(uint32_t lsw);
+void _swByteSet(uint32_t lsw, uint32_t value);
+void _swClear(uint32_t lswf);
+bool _swGet(uint32_t lswf);
+void _swSet(uint32_t lswf);
 uint32_t swByteGet(uint32_t gsw);
 void swByteSet(uint32_t gsw, uint32_t value);
 void swClear(uint32_t gswf);
diff --git a/ttyd-tools/rel/source/commonfunctions.cpp b/ttyd-tools/rel/source/commonfunctions.cpp
@@ -11,6 +11,7 @@
 #include <ttyd/party.h>
 #include <ttyd/mario_party.h>
 #include <ttyd/mario_pouch.h>
+#include <ttyd/evtmgr.h>
 
 #include <cstdio>
 
@@ -272,6 +273,11 @@ void clearGSWFsRange(uint32_t lowerBound, uint32_t upperBound)
 	}
 }
 
+ttyd::evtmgr::EvtWork *getCurrentEventWork()
+{
+	return ttyd::evtmgr::evtGetWork();
+}
+
 void *getLastPointerFromPath(void *address, int32_t *offset, uint32_t offsetAmount)
 {
 	uint32_t tempAddress = reinterpret_cast<uint32_t>(address);
diff --git a/ttyd-tools/rel/source/draw.cpp b/ttyd-tools/rel/source/draw.cpp
diff --git a/ttyd-tools/rel/source/global.cpp b/ttyd-tools/rel/source/global.cpp
diff --git a/ttyd-tools/rel/source/menu.cpp b/ttyd-tools/rel/source/menu.cpp
diff --git a/ttyd-tools/rel/source/menufunctions.cpp b/ttyd-tools/rel/source/menufunctions.cpp
