sm64-mirrors/CHEATERex
1
0
Fork 0
mirror of https://github.com/s4Ys369/CHEATERex.git synced 2025-01-22 07:32:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

update Evanbowl's patch

Browse source
This commit is contained in:
$4Y$ 2020-11-02 11:52:17 -05:00
parent 95ff8a5a90
commit a33b11df77
3 changed files with 146 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -80,7 +80,7 @@ Run `./extract_assets.py --clean && make clean` or `make distclean` to remove RO
* Bugfixes by JAGSTAX
* DynOS by PeachyPeach
-Exit to Main Menu by Adya
* JP Red Coin Sound Cheat by Evanbowl
* JP Red Coin Sound Option by Evanbowl
* And of course, CHEATERv11 by $4Y$, me
## How to add cheats/mods

154
enhancements/jp_red_coin_sound_cheat.patch
View file

@ -1,154 +0,0 @@
// Hello to all that use it!
// If this does not work for you, that means you may already have additional cheats installed.
// To allow this to work in conjunction with others you need to change all 10's to 11, or something that is not used by other cheats.
// Enjoy!
// Issue? DM Evanbowl#9157
diff --git a/include/text_options_strings.h.in b/include/text_options_strings.h.in
index 141d354..356be76 100644
--- a/include/text_options_strings.h.in
+++ b/include/text_options_strings.h.in
@@ -83,7 +83,10 @@
#define TEXT_OPT_CHEAT7 _("EXIT COURSE AT ANY TIME")
#define TEXT_OPT_CHEAT8 _("HUGE MARIO")
#define TEXT_OPT_CHEAT9 _("TINY MARIO")
+#define TEXT_OPT_CHEAT10 _("RED COIN SOUND")
+#define TEXT_OPT_RedCoinSound1 _("NTSC-U")
+#define TEXT_OPT_RedCoinSound2 _("NTSC-J")
#else // VERSION
// Markers
@@ -146,7 +149,10 @@
#define TEXT_OPT_CHEAT7 _("Exit course at any time")
#define TEXT_OPT_CHEAT8 _("Huge Mario")
#define TEXT_OPT_CHEAT9 _("Tiny Mario")
+#define TEXT_OPT_CHEAT10 _("Red Coin Sound")
+#define TEXT_OPT_RedCoinSound1 _("NTSC-U")
+#define TEXT_OPT_RedCoinSound2 _("NTSC-J")
#endif // VERSION
#endif // TEXT_OPTIONS_STRINGS_H
diff --git a/sound/sequences/00_sound_player.s b/sound/sequences/00_sound_player.s
index e1297da..1f16fdf 100644
--- a/sound/sequences/00_sound_player.s
+++ b/sound/sequences/00_sound_player.s
@@ -4148,7 +4148,11 @@ layer_end
chan_setbank 9
chan_setinstr 3
.else
- chan_setinstr 128
+ chan_setbank 9
+ chan_setinstr 3
+ chan_setlayer 0, .layer_1907
+ chan_setlayer 1, .layer_1902
+ chan_setlayer 2, .layer_1909
.endif
chan_setenvelope .envelope_3378
chan_setlayer 0, .layer_1907
diff --git a/src/game/behaviors/red_coin.inc.c b/src/game/behaviors/red_coin.inc.c
index 1e5c858..c8e82fb 100644
--- a/src/game/behaviors/red_coin.inc.c
+++ b/src/game/behaviors/red_coin.inc.c
@@ -1,3 +1,4 @@
+#include "pc/cheats.h"
/**
* This file contains the initialization and behavior for red coins.
* Behavior controls audio and the orange number spawned, as well as interacting with
@@ -58,22 +59,37 @@ void bhv_red_coin_loop(void) {
o->parentObj->oHiddenStarTriggerCounter++;
// For JP version, play an identical sound for all coins.
-#ifdef VERSION_JP
+if (Cheats.RedCoinSound == FALSE) {
+ #ifdef VERSION_JP
create_sound_spawner(SOUND_GENERAL_RED_COIN);
#endif
+}
+else {
+ #ifdef VERSION_US
+ create_sound_spawner(SOUND_GENERAL_RED_COIN);
+#endif
+}
// Spawn the orange number counter, as long as it isn't the last coin.
if (o->parentObj->oHiddenStarTriggerCounter != 8) {
spawn_orange_number(o->parentObj->oHiddenStarTriggerCounter, 0, 0, 0);
}
// On all versions but the JP version, each coin collected plays a higher noise.
-#ifndef VERSION_JP
+if (Cheats.RedCoinSound == FALSE) {
+ #ifndef VERSION_JP
play_sound(SOUND_MENU_COLLECT_RED_COIN
+ (((u8) o->parentObj->oHiddenStarTriggerCounter - 1) << 16),
gDefaultSoundArgs);
#endif
+}
+else {
+ #ifndef VERSION_US
+ play_sound(SOUND_MENU_COLLECT_RED_COIN
+ + (((u8) o->parentObj->oHiddenStarTriggerCounter - 1) << 16),
+ gDefaultSoundArgs);
+#endif
+}
}
-
coin_collected();
// Despawn the coin.
o->oInteractStatus = 0;
diff --git a/src/game/options_menu.c b/src/game/options_menu.c
index e004749..98d09db 100644
--- a/src/game/options_menu.c
+++ b/src/game/options_menu.c
@@ -101,6 +101,7 @@ static const u8 optsCheatsStr[][64] = {
{ TEXT_OPT_CHEAT7 },
{ TEXT_OPT_CHEAT8 },
{ TEXT_OPT_CHEAT9 },
+ { TEXT_OPT_CHEAT10 },
};
static const u8 bindStr[][32] = {
@@ -124,6 +125,11 @@ static const u8 bindStr[][32] = {
{ TEXT_OPT_RUMBLE }
};
+static const u8 optsRedCoinSoundStr[][32] = {
+ { TEXT_OPT_RedCoinSound1 },
+ { TEXT_OPT_RedCoinSound2 },
+};
+
static const u8 *filterChoices[] = {
optsVideoStr[2],
optsVideoStr[3],
@@ -135,6 +141,10 @@ static const u8 *vsyncChoices[] = {
toggleStr[1],
optsVideoStr[6],
};
+static const u8 *redCoinSoundChoices[] = {
+ optsRedCoinSoundStr[0],
+ optsRedCoinSoundStr[1],
+};
enum OptType {
OPT_INVALID = 0,
@@ -277,7 +287,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_CHOICE( optsCheatsStr[9], &Cheats.RedCoinSound, redCoinSoundChoices),
};
/* submenu definitions */
diff --git a/src/pc/cheats.h b/src/pc/cheats.h
index eaf71ab..0970eef 100644
--- a/src/pc/cheats.h
+++ b/src/pc/cheats.h
@@ -13,6 +13,7 @@ struct CheatList {
bool ExitAnywhere;
bool HugeMario;
bool TinyMario;
+ bool RedCoinSound;
};
extern struct CheatList Cheats;

145
enhancements/jp_red_coin_sound_option.patch Normal file
View file

@ -0,0 +1,145 @@
diff --git a/include/text_options_strings.h.in b/include/text_options_strings.h.in
index 141d354..57e9dad 100644
--- a/include/text_options_strings.h.in
+++ b/include/text_options_strings.h.in
@@ -56,6 +56,9 @@
#define TEXT_OPT_THREEPT _("THREE POINT")
#define TEXT_OPT_APPLY _("APPLY")
#define TEXT_OPT_RESETWND _("RESET WINDOW")
+#define TEXT_OPT_RedCoinSound _("RED COIN SOUND")
+#define TEXT_OPT_RedCoinSound1 _("NTSC-U")
+#define TEXT_OPT_RedCoinSound2 _("NTSC-J")
#define TEXT_BIND_A _("A BUTTON")
#define TEXT_BIND_B _("B BUTTON")
@@ -119,6 +122,9 @@
#define TEXT_OPT_THREEPT _("Three-point")
#define TEXT_OPT_APPLY _("Apply")
#define TEXT_OPT_RESETWND _("Reset Window")
+#define TEXT_OPT_RedCoinSound _("Red Coin Sound")
+#define TEXT_OPT_RedCoinSound1 _("NTSC-U")
+#define TEXT_OPT_RedCoinSound2 _("NTSC-J")
#define TEXT_BIND_A _("A Button")
#define TEXT_BIND_B _("B Button")
diff --git a/sound/sequences/00_sound_player.s b/sound/sequences/00_sound_player.s
index e1297da..eceea2c 100644
--- a/sound/sequences/00_sound_player.s
+++ b/sound/sequences/00_sound_player.s
@@ -4148,7 +4148,11 @@ layer_end
chan_setbank 9
chan_setinstr 3
.else
- chan_setinstr 128
+ chan_setbank 9
+ chan_setinstr 3
+ chan_setlayer 0, .layer_1909
+ chan_setlayer 1, .layer_1902
+ chan_setlayer 2, .layer_1907
.endif
chan_setenvelope .envelope_3378
chan_setlayer 0, .layer_1907
diff --git a/src/game/behaviors/red_coin.inc.c b/src/game/behaviors/red_coin.inc.c
index 1e5c858..3b8e4b8 100644
--- a/src/game/behaviors/red_coin.inc.c
+++ b/src/game/behaviors/red_coin.inc.c
@@ -1,3 +1,4 @@
+#include "pc/cheats.h"
/**
* This file contains the initialization and behavior for red coins.
* Behavior controls audio and the orange number spawned, as well as interacting with
@@ -57,21 +58,36 @@ void bhv_red_coin_loop(void) {
// ...increment the star's counter.
o->parentObj->oHiddenStarTriggerCounter++;
- // For JP version, play an identical sound for all coins.
-#ifdef VERSION_JP
+if (Cheats.RedCoinSound == FALSE) {
+ #ifdef VERSION_JP
+ create_sound_spawner(SOUND_GENERAL_RED_COIN);
+ #endif
+}
+else {
+ #ifdef VERSION_US
create_sound_spawner(SOUND_GENERAL_RED_COIN);
#endif
- // Spawn the orange number counter, as long as it isn't the last coin.
- if (o->parentObj->oHiddenStarTriggerCounter != 8) {
- spawn_orange_number(o->parentObj->oHiddenStarTriggerCounter, 0, 0, 0);
- }
-
- // On all versions but the JP version, each coin collected plays a higher noise.
-#ifndef VERSION_JP
+}
+ // Spawn the orange number counter, as long as it isn't the last coin.
+ if (o->parentObj->oHiddenStarTriggerCounter != 8) {
+ spawn_orange_number(o->parentObj->oHiddenStarTriggerCounter, 0, 0, 0);
+ }
+
+ // On all versions but the JP version, each coin collected plays a higher noise.
+if (Cheats.RedCoinSound == FALSE) {
+ #ifndef VERSION_JP
+ play_sound(SOUND_MENU_COLLECT_RED_COIN
+ + (((u8) o->parentObj->oHiddenStarTriggerCounter - 1) << 16),
+ gDefaultSoundArgs);
+ #endif
+}
+else {
+ #ifndef VERSION_US
play_sound(SOUND_MENU_COLLECT_RED_COIN
+ (((u8) o->parentObj->oHiddenStarTriggerCounter - 1) << 16),
gDefaultSoundArgs);
#endif
+}
}
coin_collected();
diff --git a/src/game/options_menu.c b/src/game/options_menu.c
index e004749..0e97798 100644
--- a/src/game/options_menu.c
+++ b/src/game/options_menu.c
@@ -89,6 +89,7 @@ static const u8 optsAudioStr[][32] = {
{ TEXT_OPT_MUSVOLUME },
{ TEXT_OPT_SFXVOLUME },
{ TEXT_OPT_ENVVOLUME },
+ { TEXT_OPT_RedCoinSound },
};
static const u8 optsCheatsStr[][64] = {
@@ -103,6 +104,16 @@ static const u8 optsCheatsStr[][64] = {
{ TEXT_OPT_CHEAT9 },
};
+static const u8 optsRedCoinSoundStr[][32] = {
+ { TEXT_OPT_RedCoinSound1 },
+ { TEXT_OPT_RedCoinSound2 },
+};
+
+static const u8 *redCoinSoundChoices[] = {
+ optsRedCoinSoundStr[0],
+ optsRedCoinSoundStr[1],
+};
+
static const u8 bindStr[][32] = {
{ TEXT_OPT_UNBOUND },
{ TEXT_OPT_PRESSKEY },
@@ -265,6 +276,7 @@ static struct Option optsAudio[] = {
DEF_OPT_SCROLL( optsAudioStr[1], &configMusicVolume, 0, MAX_VOLUME, 1),
DEF_OPT_SCROLL( optsAudioStr[2], &configSfxVolume, 0, MAX_VOLUME, 1),
DEF_OPT_SCROLL( optsAudioStr[3], &configEnvVolume, 0, MAX_VOLUME, 1),
+ DEF_OPT_CHOICE( optsAudioStr[4], &Cheats.RedCoinSound, redCoinSoundChoices ),
};
static struct Option optsCheats[] = {
diff --git a/src/pc/cheats.h b/src/pc/cheats.h
index eaf71ab..0970eef 100644
--- a/src/pc/cheats.h
+++ b/src/pc/cheats.h
@@ -13,6 +13,7 @@ struct CheatList {
bool ExitAnywhere;
bool HugeMario;
bool TinyMario;
+ bool RedCoinSound;
};
extern struct CheatList Cheats;