Added additional features

Added a display that allows the player to see the frame that they tried to guard/superguard. If they press the button early, then it'll say how many frames early, to a specific extent.

Added a cheat that allows the player to walk through most objects. They will not be able to walk through NPCs.

Author: Zephiles

USER_MANUAL.md

@@ -36,23 +36,24 @@ This menu allows you to modify your entire inventory, including standard items,
 
 ### Cheats
 1. **Change Sequence** allows you to change the current Sequence value, which is the value used to tell what part of the game you're currently at.
-2. **Save Coordinates** allows you to save Mario's and your partner's current positions and angles.
-3. **Load Coordinates** allows you to load the positions and angles saved from the previous code.
-4. **Spawn Item** allows you to spawn any item into the field.
-5. **Save Anywhere** allows you to save the game at any location, even if a save block is not present in the current room.
-6. **Text Storage** sets a specific value that causes Text Storage to be active. A partner is required to be out for this code to have an effect.
-7. **Time Stop Text Storage** sets a specific value that causes Time Stop Text Storage to be active. A partner is required to be out for this code to have an effect.
-8. **Speed Up Mario** applies a large speed boost to Mario. 
-9. **Disable Non-Cutscene Battles** disables any battles in the field that are started by a cutscene.
-10. **Auto Action Commands** automatically performs action commands for you, similar to how the Debug Badge works. This applies to most guards/superguards as well as for filling the run meter.
-11. **Infinite Item Usage** allows you to use any item without it being removed from the menu. You must hold the button combination when using the item for this code to work.
-12. **Reload Room** reloads the current room. This cannot be used on the title screen nor on the file select screen.
-13. **Levitate** allows you to levitate in the air. You must hold the button combination for this code to work.
-14. **Lock Mario's HP To Max** locks Mario's current HP to the max.
-15. **Allow Running From Any Battle** allows you to run from any battle, even if the battle would normally not allow this.
-16. **Bobbery Early** clears some values, which allows you to perform Bobbery Early more than once on a save file without the need to reload.
-17. **Force NPC Item Drop** forces any defeared enemy to drop a specified item. The item can be changed at will.
-18. **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.
+2. **Walk Through Most Objects** allows you to walk through most objects. It does now allow walking through NPCs. The button combination must be held for this code to work.
+3. **Save Coordinates** allows you to save Mario's and your partner's current positions and angles.
+4. **Load Coordinates** allows you to load the positions and angles saved from the previous code.
+5. **Spawn Item** allows you to spawn any item into the field.
+6. **Save Anywhere** allows you to save the game at any location, even if a save block is not present in the current room.
+7. **Text Storage** sets a specific value that causes Text Storage to be active. A partner is required to be out for this code to have an effect.
+8. **Time Stop Text Storage** sets a specific value that causes Time Stop Text Storage to be active. A partner is required to be out for this code to have an effect.
+9. **Speed Up Mario** applies a large speed boost to Mario. The button combination must be held for this code to work.
+10. **Disable Non-Cutscene Battles** disables any battles in the field that are started by a cutscene. The button combination must be held for this code to work.
+11. **Auto Action Commands** automatically performs action commands for you, similar to how the Debug Badge works. This applies to most guards/superguards as well as for filling the run meter. The button combination must be held for this code to work.
+12. **Infinite Item Usage** allows you to use any item without it being removed from the menu. You must hold the button combination when using the item for this code to work. The button combination must be held for this code to work.
+13. **Reload Room** reloads the current room. This cannot be used on the title screen nor on the file select screen.
+14. **Levitate** allows you to levitate in the air. The button combination must be held for this code to work.
+15. **Lock Mario's HP To Max** locks Mario's current HP to the max.
+16. **Allow Running From Any Battle** allows you to run from any battle, even if the battle would normally not allow this.
+17. **Bobbery Early** clears some values, which allows you to perform Bobbery Early more than once on a save file without the need to reload.
+18. **Force NPC Item Drop** forces any defeared enemy to drop a specified item. The item can be changed at will.
+19. **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.
@@ -66,9 +67,13 @@ This menu allows you to change the HP, Max HP, FP, Max FP, and statuses of anyon
 2. **Mario's Coordinates** displays Mario's coordinates at the bottom-left of the screen. If the On-Screen Timer is active, then the position of Mario's Coordinates will be shifted upwards.
 3. **Jump Storage** displays a value that determines whether you have Jump Storage or not. The value will be 0 when you don't have it, and 1 when you have it. While this display is active, you can press Y three times in succession to manually give yourself Jump Storage.
 4. **Button Input Display** displays which buttons are pressed at the bottom-left of the screen. When this display is active, the other displays that are placed at the bottom-left of the screen are shifted upwards.
-5. **Art Attack Hitboxes** displays boxes around enemies in battles when using Art Attack.
-6. **Yoshi Skip** displays various information about performing this skip. The main timer (labeled YST) is set to reset and start running once you leave a battle, and pauses once you press A. You can also manually reset this timer by holding Y for two seconds.
-7. **Palace Skip** displays various information about performing this skip. The main timer (labeled YST) is set to reset and start once you leave the pause menu, and pauses once you press X. You can also manually reset this timer by holding Y for two seconds. *PhaEmy* keeps track of the Y coordinate for the phantom ember, *ItemTimer* keeps track of the timer for the current item in the field, and *ParY* keeps track of your partner's Y coordinate.
+5. **Guard/Superguard Timings** displays the following:
+   * The frame that you guarded/superguarded an attack out of the total amount of possible frames.
+   * How many frames early you pressed A or B. It should be noted that nothing will be displayed if the button was pressed very early (more than 6 or so frames for guards, and more than 12 or so frames for superguards).
+   * Whether you pressed too many buttons in a short period of time for the guard/superguard to be accepted.
+6. **Art Attack Hitboxes** displays boxes around enemies in battles when using Art Attack.
+7. **Yoshi Skip** displays various information about performing this skip. The main timer (labeled YST) is set to reset and start running once you leave a battle, and pauses once you press A. You can also manually reset this timer by holding Y for two seconds.
+8. **Palace Skip** displays various information about performing this skip. The main timer (labeled YST) is set to reset and start once you leave the pause menu, and pauses once you press X. You can also manually reset this timer by holding Y for two seconds. *PhaEmy* keeps track of the Y coordinate for the phantom ember, *ItemTimer* keeps track of the timer for the current item in the field, and *ParY* keeps track of your partner's Y coordinate.
 
 ### Warps
 This menu allows you to warp to various places around the game. A description for each option is displayed when the cursor is over one.

ttyd-tools/rel/include/codes.h

@@ -4,6 +4,7 @@
 
 namespace mod {
 
+void walkThroughMostObjects();
 void saveMarioAndPartnerPositions();
 void loadMarioAndPartnerPositions();
 void saveAnywhere();
@@ -16,6 +17,7 @@ void levitate();
 void lockMarioHPToMax();
 void bobberyEarly();
 void spawnItem();
+void checkIfAreaFlagsShouldBeCleared();
 
 void displaySequenceInPauseMenu();
 void displayOnScreenTimer();
@@ -24,6 +26,8 @@ void displayJumpStorageDetails();
 void displayButtonInputs();
 void displayYoshiSkipDetails();
 void displayPalaceSkipDetails();
+void actionCommandsTimingsInit();
+void displayActionCommandsTiming();
 
 int32_t warpToMap(uint32_t value);
 

ttyd-tools/rel/include/draw.h

@@ -89,6 +89,7 @@ void drawJumpStorageDetails();
 void drawButtonInputs();
 void drawYoshiSkipDetails();
 void drawPalaceSkipDetails();
+void drawActionCommandsTiming();
 
 void drawTitleScreenInfo();
 void drawFileSelectScreenInfo();

ttyd-tools/rel/include/global.h

@@ -55,6 +55,7 @@ enum INVENTORY_SELECTION_ERRORS
 enum CHEATS_OPTIONS
 {
 	CHANGE_SEQUENCE = 0,
+	WALK_THROUGH_WALLS,
 	SAVE_COORDINATES,
 	LOAD_COORDINATES,
 	SPAWN_ITEM,
@@ -211,6 +212,7 @@ enum DISPLAYS_OPTIONS
 	MARIO_COORDINATES,
 	JUMP_STORAGE,
 	BUTTON_INPUT_DISPLAY,
+	GUARD_SUPERGUARD_TIMINGS,
 	ART_ATTACK_HITBOXES,
 	YOSHI_SKIP,
 	PALACE_SKIP,
@@ -399,6 +401,13 @@ struct SpawnItems
 	bool InAdjustableValueMenu;
 };
 
+struct ClearAreaFlagsStruct
+{
+	uint8_t CurrentOption;
+	bool FlagsShouldBeCleared;
+	bool StartClearingFlags;
+};
+
 struct TrickDisplay
 {
 	uint32_t MainTimer;
@@ -424,9 +433,18 @@ struct OnScreenTimerDisplay
 	}
 };
 
+struct DisplayActionCommandTiming
+{
+	int32_t (*Trampoline)(void *, void *);
+	uint16_t DisplayTimer;
+	int8_t TypeToDraw;
+	int8_t Last_A_Frame;
+	int8_t Last_B_Frame;
+};
+
 extern Menus Menu[20];
-extern Cheats Cheat[17];
-extern bool Displays[7];
+extern Cheats Cheat[18];
+extern bool Displays[8];
 extern char DisplayBuffer[256];
 
 extern AutoIncrement AdjustableValueMenu;
@@ -435,9 +453,11 @@ extern MarioPartnerPositionsStruct MarioPartnerPositions;
 extern SaveAnywhereStruct SaveAnywhere;
 extern ReloadRoomStruct ReloadRoom;
 extern SpawnItems SpawnItem;
+extern ClearAreaFlagsStruct ClearAreaFlags;
 extern TrickDisplay YoshiSkip;
 extern TrickDisplay PalaceSkip;
 extern OnScreenTimerDisplay OnScreenTimer;
+extern DisplayActionCommandTiming DisplayActionCommands;
 
 extern const char *CheatsLines[];
 extern const char *CheatsForceItemDropAreas[];
@@ -487,6 +507,8 @@ extern char *NextBero;
 extern char *NextMap;
 extern char *NextArea;
 extern ItemData *ItemDataTable;
+extern int8_t *GuardFrames;
+extern int8_t *SuperguardFrames;
 extern uint32_t PauseMenuStartAddress;
 extern uint32_t wp_fadedrv_Address;
 extern uint32_t _mapEntAddress;
@@ -499,6 +521,7 @@ extern uint32_t FieldItemsAddressesStart;
 extern uint32_t GlobalWorkPointer;
 extern uint32_t titleMainAddress;
 
+extern bool ResetMarioProperties;
 extern int16_t ForcedNPCItemDrop;
 extern bool MarioFreeze;
 extern uint16_t JumpStorageSetCounter;

ttyd-tools/rel/include/menufunctions.h

@@ -49,7 +49,7 @@ void setAddByIconValue(void *address);
 void duplicateCurrentItem(void *address);
 void deleteItem();
 int32_t changeItem();
-void cheatClearAreaFlags();
+void cheatClearAreaFlags(uint32_t currentMenuOption);
 
 // uint8_t *getButtonsPressedDynamic(uint8_t *buttonArray, uint16_t currentButtonCombo);
 uint8_t *getButtonsPressed(uint8_t *buttonArray, uint16_t currentButtonCombo);

ttyd-tools/rel/include/ttyd.eu.lst

@@ -810,6 +810,27 @@
 // 800F9EA8:battleSeqEndCheck
 // 800F9EB8:battleMain
 
+// battle_ac.o
+// 800F9F00:BattleAcGaugeSeDelete
+// 800F9F44:BattleAcGaugeSeUpdate
+// 800F9FBC:BattleAcGaugeSeInit
+// 800F9FFC:BattleAcDrawGauge
+// 800FAD10:BattleACGetButtonIcon
+// 800FAF54:BattleActionCommandGetPrizeLv
+// 800FAF98:BattleActionCommandSetDifficulty
+800FAFC8:BattleActionCommandGetDifficulty
+// 800FAFD0:BattleActionCommandResetDefenceResult
+// 800FB000:BattleActionCommandGetDefenceResult
+800FB00C:BattleACPadCheckRecordTrigger
+800FB024:BattleActionCommandCheckDefence
+// 800FB28C:BattleActionCommandStop
+// 800FB2BC:BattleActionCommandStart
+// 800FB2C8:BattleActionCommandSetup
+// 800FB35C:BattleActionCommandDeclareACResult
+// 800FB3E0:BattleActionCommandResult
+// 800FB41C:BattleActionCommandManager
+// 800FB498:BattleActionCommandManagerInit
+
 // battle_disp.o
 // 801010C4:_btlStockExpDisp
 // 801012C8:BattleStockExpDisp

ttyd-tools/rel/include/ttyd.jp.lst

@@ -804,6 +804,27 @@
 // 800F40EC:battleSeqEndCheck
 // 800F40FC:battleMain
 
+// battle_ac.o
+// 800F4144:BattleAcGaugeSeDelete
+// 800F4188:BattleAcGaugeSeUpdate
+// 800F4200:BattleAcGaugeSeInit
+// 800F4240:BattleAcDrawGauge
+// 800F4F54:BattleACGetButtonIcon
+// 800F5198:BattleActionCommandGetPrizeLv
+// 800F51DC:BattleActionCommandSetDifficulty
+800F520C:BattleActionCommandGetDifficulty
+// 800F5214:BattleActionCommandResetDefenceResult
+// 800F5244:BattleActionCommandGetDefenceResult
+800F5250:BattleACPadCheckRecordTrigger
+800F5268:BattleActionCommandCheckDefence
+// 800F54D0:BattleActionCommandStop
+// 800F5500:BattleActionCommandStart
+// 800F550C:BattleActionCommandSetup
+// 800F55A0:BattleActionCommandDeclareACResult
+// 800F5624:BattleActionCommandResult
+// 800F5660:BattleActionCommandManager
+// 800F56DC:BattleActionCommandManagerInit
+
 // battle_disp.o
 // 800FB2D8:_btlStockExpDisp
 // 800FB4DC:BattleStockExpDisp

ttyd-tools/rel/include/ttyd.us.lst

@@ -809,6 +809,27 @@
 // 800F903C:battleSeqEndCheck
 // 800F904C:battleMain
 
+// battle_ac.o
+// 800F9094:BattleAcGaugeSeDelete
+// 800F90D8:BattleAcGaugeSeUpdate
+// 800F9150:BattleAcGaugeSeInit
+// 800F9190:BattleAcDrawGauge
+// 800F9EA4:BattleACGetButtonIcon
+// 800FA0E8:BattleActionCommandGetPrizeLv
+// 800FA12C:BattleActionCommandSetDifficulty
+800FA15C:BattleActionCommandGetDifficulty
+// 800FA164:BattleActionCommandResetDefenceResult
+// 800FA194:BattleActionCommandGetDefenceResult
+800FA1A0:BattleACPadCheckRecordTrigger
+800FA1B8:BattleActionCommandCheckDefence
+// 800FA420:BattleActionCommandStop
+// 800FA450:BattleActionCommandStart
+// 800FA45C:BattleActionCommandSetup
+// 800FA4F0:BattleActionCommandDeclareACResult
+// 800FA574:BattleActionCommandResult
+// 800FA5B0:BattleActionCommandManager
+// 800FA62C:BattleActionCommandManagerInit
+
 // battle_disp.o
 // 80100258:_btlStockExpDisp
 // 8010045C:BattleStockExpDisp

ttyd-tools/rel/include/ttyd/battle_ac.h

@@ -0,0 +1,31 @@
+#pragma once
+
+#include <cstdint>
+
+namespace ttyd::battle_ac {
+
+extern "C" {
+
+// BattleAcGaugeSeDelete
+// BattleAcGaugeSeUpdate
+// BattleAcGaugeSeInit
+// BattleAcDrawGauge
+// BattleACGetButtonIcon
+// BattleActionCommandGetPrizeLv
+// BattleActionCommandSetDifficulty
+int8_t BattleActionCommandGetDifficulty(void *battlePointer);
+// BattleActionCommandResetDefenceResult
+// BattleActionCommandGetDefenceResult
+uint32_t BattleACPadCheckRecordTrigger(uint32_t frame, uint32_t button);
+int32_t BattleActionCommandCheckDefence(void *battle_unit, void *attack_params);
+// BattleActionCommandStop
+// BattleActionCommandStart
+// BattleActionCommandSetup
+// BattleActionCommandDeclareACResult
+// BattleActionCommandResult
+// BattleActionCommandManager
+// BattleActionCommandManagerInit
+
+}
+
+}