Skip to content

Commit f6a87e8

Browse files
committed
Missed an early return, and had a block interfering with reds counting in vanilla.
1 parent 3f986a6 commit f6a87e8

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

src/game/behaviors/red_coin.inc.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ void bhv_red_coin_loop(void) {
5757
// ...increment the star's counter.
5858
o->parentObj->oHiddenStarTriggerCounter++;
5959

60-
if (o->parentObj->oHiddenStarTriggerCounter < 7) {
61-
o->parentObj->oHiddenStarTriggerCounter = 7;
62-
}
63-
6460
// Spawn the orange number counter, as long as it isn't the last coin.
6561
if (o->parentObj->oHiddenStarTriggerCounter != 8) {
6662
spawn_orange_number(o->parentObj->oHiddenStarTriggerCounter, 0, 0, 0);

src/port/Rando/MiscBehavior/MiscBehavior.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ void Rando::MiscBehavior::Init() {
2727

2828
REGISTER_LISTENER(LevelScriptExecute, EVENT_PRIORITY_NORMAL, [](IEvent* event) {
2929
LevelScriptExecute* ev = (LevelScriptExecute*)event;
30+
if (!IS_RANDO(selectedFileNum)) {
31+
return;
32+
}
3033
if (ev->command == 17) {
3134
if (gCurrLevelNum == LEVEL_CASTLE || gCurrLevelNum == LEVEL_CASTLE_COURTYARD ||
3235
gCurrLevelNum == LEVEL_CASTLE_GROUNDS) {

0 commit comments

Comments
 (0)