Skip to content

Forever Cap cheat #390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MartinPham wants to merge 5 commits into
base: nightly
Choose a base branch
from
Open

Forever Cap cheat #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e226b7a
Update cheats.h
MartinPham Aug 2, 2020
07aae18
Update text_options_strings.h.in
MartinPham Aug 2, 2020
372e71b
Update options_menu.c
MartinPham Aug 2, 2020
708c3f8
Update mario.c
MartinPham Aug 2, 2020
feab74a
Update options_menu.c
MartinPham Aug 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions include/text_options_strings.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
#define TEXT_OPT_CHEAT7 _("EXIT COURSE AT ANY TIME")
#define TEXT_OPT_CHEAT8 _("HUGE MARIO")
#define TEXT_OPT_CHEAT9 _("TINY MARIO")
#define TEXT_OPT_FOREVER_CAP _("FOREVER CAP")

#else // VERSION

Expand Down Expand Up @@ -148,6 +149,7 @@
#define TEXT_OPT_CHEAT7 _("Exit course at any time")
#define TEXT_OPT_CHEAT8 _("Huge Mario")
#define TEXT_OPT_CHEAT9 _("Tiny Mario")
#define TEXT_OPT_FOREVER_CAP _("Forever Cap")

#endif // VERSION

Expand Down
2 changes: 1 addition & 1 deletion src/game/mario.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1610,7 +1610,7 @@ u32 update_and_return_cap_flags(struct MarioState *m) {
if ((m->capTimer <= 60)
|| ((action != ACT_READING_AUTOMATIC_DIALOG) && (action != ACT_READING_NPC_DIALOG)
&& (action != ACT_READING_SIGN) && (action != ACT_IN_CANNON))) {
m->capTimer -= 1;
if (Cheats.EnableCheats && Cheats.ForeverCap) { m->capTimer -= 0; } else { m->capTimer -= 1; }
}

if (m->capTimer == 0) {
Expand Down
2 changes: 2 additions & 0 deletions src/game/options_menu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ static const u8 optsCheatsStr[][64] = {
{ TEXT_OPT_CHEAT7 },
{ TEXT_OPT_CHEAT8 },
{ TEXT_OPT_CHEAT9 },
{ TEXT_OPT_FOREVER_CAP },
};

static const u8 bindStr[][32] = {
Expand Down Expand Up @@ -279,6 +280,7 @@ static struct Option optsCheats[] = {
DEF_OPT_TOGGLE( optsCheatsStr[6], &Cheats.ExitAnywhere ),
DEF_OPT_TOGGLE( optsCheatsStr[7], &Cheats.HugeMario ),
DEF_OPT_TOGGLE( optsCheatsStr[8], &Cheats.TinyMario ),
DEF_OPT_TOGGLE( optsCheatsStr[9], &Cheats.ForeverCap ),

};

Expand Down
1 change: 1 addition & 0 deletions src/pc/cheats.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ struct CheatList {
bool ExitAnywhere;
bool HugeMario;
bool TinyMario;
bool ForeverCap;
};

extern struct CheatList Cheats;
Expand Down