diff --git a/src/zeroxfc/nullpo/custom/modes/FireworkChallenge.java b/src/zeroxfc/nullpo/custom/modes/FireworkChallenge.java index 6388d29..68b85fe 100644 --- a/src/zeroxfc/nullpo/custom/modes/FireworkChallenge.java +++ b/src/zeroxfc/nullpo/custom/modes/FireworkChallenge.java @@ -116,6 +116,15 @@ public class FireworkChallenge extends DummyMode { "GLITCHYPSI, OSHISAURE, RY00001, AKARI, THE DRAGON GOD NERROTH.", "YOU HAVE COMPLETED THE FIREWORK CHALLENGE!" }; + + private static final int[] INPUT_SEQUENCE = { + Controller.BUTTON_DOWN, Controller.BUTTON_DOWN, + Controller.BUTTON_UP, Controller.BUTTON_UP, + Controller.BUTTON_RIGHT, Controller.BUTTON_LEFT, + Controller.BUTTON_RIGHT, Controller.BUTTON_LEFT, + }; + + private boolean[] presses; // Staff roll object private ScrollingMarqueeText creditObject; @@ -258,6 +267,7 @@ public class FireworkChallenge extends DummyMode { private int[] rankingFireworksPlayer, rankingLevelPlayer, rankingTimePlayer; private boolean killed; + // TODO: debug mode meme // Get mode name @Override @@ -268,6 +278,8 @@ public String getName() { // Initialise everything. @Override public void playerInit(GameEngine engine, int playerID) { + presses = new boolean[] { false, false, false, false, false, false, false, false, false, false }; + SoundLoader.loadSoundset(SoundLoader.LOADTYPE_FIREWORKS); creditObject = new ScrollingMarqueeText(CREDIT_HEADINGS, CREDIT_TEXTS, EventReceiver.COLOR_ORANGE, EventReceiver.COLOR_WHITE); diff --git a/src/zeroxfc/nullpo/custom/modes/ShadowMarathon.java b/src/zeroxfc/nullpo/custom/modes/ShadowMarathon.java index 6cd90e9..2bbc57a 100644 --- a/src/zeroxfc/nullpo/custom/modes/ShadowMarathon.java +++ b/src/zeroxfc/nullpo/custom/modes/ShadowMarathon.java @@ -1819,7 +1819,8 @@ public void onLast(GameEngine engine, int playerID) { } if (engine.gameActive && (engine.stat == GameEngine.STAT_MOVE || engine.stat == GameEngine.STAT_ARE)) { - if (engine.ctrl.isPush(Controller.BUTTON_F) && onShadow && currentMaxMatchValue >= 0.75) { + // Sometimes engine.nowPieceObject is null? + if (engine.nowPieceObject != null && engine.ctrl.isPush(Controller.BUTTON_F) && onShadow && currentMaxMatchValue >= 0.75) { fallPieceDraw = new Piece(engine.nowPieceObject); int bX = receiver.getFieldDisplayPositionX(engine, playerID) + 4;