MegaAtoms V0.4

MegaAtoms V0.4 Pause Screen added to Classic and Challenge High score table added to Challenge High scores saved to sram Progress bars added to Classic New artwork for professors and robots for Classic mode Tutorial added to Challenge mode
thegouldfish · Nov 6, 2018 · 04f21de · 04f21de
1 parent 3ed4109
commit 04f21de
Show file tree

Hide file tree

Showing 79 changed files with 1,419 additions and 682 deletions.
diff --git a/Atoms/inc/AtomsGameState.h b/Atoms/inc/AtomsGameState.h
@@ -23,5 +23,4 @@ extern SimpleState AtomsGameState;
 extern int m_PlayerSetup[7];
 extern int m_WinningPlayer;
 
-
 #endif
diff --git a/Atoms/inc/Audio.h b/Atoms/inc/Audio.h
@@ -0,0 +1,13 @@
+#ifndef _AUDIO_H_
+#define _AUDIO_H_
+
+
+#define SND_START 66
+#define SND_MOVE 67
+#define SND_GROW 68
+#define SND_EXPLODE 69
+
+#define SND_MENU_FORWARD 70
+#define SND_MENU_BACKWARD 71
+
+#endif
diff --git a/Atoms/inc/ChallengeModeHighScoreState.h b/Atoms/inc/ChallengeModeHighScoreState.h
@@ -0,0 +1,18 @@
+#ifndef	CHALLENGE_MOD_HIGHSCORE_STATE
+#define CHALLENGE_MOD_HIGHSCORE_STATE
+
+#include "SimpleState.h"
+
+
+
+
+void ChallengeModeHighScoreStateStart();
+void ChallengeModeHighScoreStateUpdate();
+void ChallengeModeHighScoreStateEnd();
+
+
+extern SimpleState ChallengeModeHighScoreState;
+
+
+
+#endif
diff --git a/Atoms/inc/ChallengeModeSetNameState.h b/Atoms/inc/ChallengeModeSetNameState.h
@@ -0,0 +1,18 @@
+#ifndef	CHALLENGE_MODE_SET_NAME_STATE
+#define CHALLENGE_MODE_SET_NAME_STATE
+
+#include "SimpleState.h"
+
+
+
+
+void ChallengeModeSetNameStateStart();
+void ChallengeModeSetNameStateUpdate();
+void ChallengeModeSetNameStateEnd();
+
+
+extern SimpleState ChallengeModeSetNameState;
+
+
+
+#endif
diff --git a/Atoms/inc/ChallengeModeTutorialState.h b/Atoms/inc/ChallengeModeTutorialState.h
@@ -0,0 +1,18 @@
+#ifndef	CHALLENGE_MODE_TUTORIAL_STATE
+#define CHALLENGE_MODE_TUTORIAL_STATE
+
+#include "SimpleState.h"
+
+
+
+
+void ChallengeModeTutorialStateStart();
+void ChallengeModeTutorialStateUpdate();
+void ChallengeModeTutorialStateEnd();
+
+
+extern SimpleState ChallengeModeTutorialState;
+
+
+
+#endif
diff --git a/Atoms/inc/GamePlay.h b/Atoms/inc/GamePlay.h
@@ -70,4 +70,13 @@ void DrawAtom(int player, int x, int y, int size);
 void DrawFullGrid();
 void DrawGameGrid();
 
+
+// quick helper to half the value of the passed in colour
+#define FADE_COLOUR(x)  (((VDPPALETTE_REDMASK & x) / 2) | ((VDPPALETTE_BLUEMASK & x) / 2) | ((VDPPALETTE_GREENMASK & x) / 2 ))
+extern u16 m_RegularPalette[];
+extern u16 m_FadedPalette[];
+
+void SetupFadedPalette();
+
+
 #endif
diff --git a/Atoms/inc/PadHelper.h b/Atoms/inc/PadHelper.h
@@ -24,13 +24,11 @@ typedef struct
 	u8 Left;
 	u8 Right;
 
-
+	u8 X;
+	u8 Y;
 
 	u16 CurrentState;
 	u16 PrevState;
-
-
-
 }Pad;
 
 

diff --git a/Atoms/inc/Prototype1.h b/Atoms/inc/Prototype1.h
diff --git a/Atoms/inc/TextHelpers.h b/Atoms/inc/TextHelpers.h
@@ -0,0 +1,12 @@
+#ifndef _TEXT_HELPERS_H_
+#define _TEXT_HELPERS_H_
+
+#include <genesis.h>
+
+void SetNumbers(int number, Sprite* sprites[], const int size);
+void SetNumberChars(u32 number, char* charArray);
+void SetNumberCharsEx(u32 number, char* charArray, int size, char defaultChar);
+
+void DrawTextToScreen(char* buffer, int size, int x, int y, u16 tileSetStart);
+
+#endif
diff --git a/Atoms/inc/atoms.h b/Atoms/inc/atoms.h
@@ -9,6 +9,18 @@
 
 extern Pad m_Pad;
 
-void SetNumbers(int number, Sprite* sprites[], const int size);
+
+
+
+#define HIGHSCORE_TOTAL 5
+#define HIGHSCORE_CHARS 4
+extern u32 m_HighScoreAmounts[HIGHSCORE_TOTAL];
+extern char m_HighScoreNames[HIGHSCORE_TOTAL][HIGHSCORE_CHARS];
+void DefaultScores();
+
+void SaveScores();
+u8 LoadScores();
+
+int random_int(int min, int max);
 
 #endif // !_ATOMS_H_
diff --git a/Atoms/res/Sprite/Buttons.bmp b/Atoms/res/Sprite/Buttons.bmp
diff --git a/Atoms/res/Sprite/Cursor.png b/Atoms/res/Sprite/Cursor.png
diff --git a/Atoms/res/Sprite/GameOverText.bmp b/Atoms/res/Sprite/GameOverText.bmp
diff --git a/Atoms/res/Sprite/HighScoreText.bmp b/Atoms/res/Sprite/HighScoreText.bmp
diff --git a/Atoms/res/Sprite/HighScoresText.bmp b/Atoms/res/Sprite/HighScoresText.bmp
diff --git a/Atoms/res/Sprite/LevelText.bmp b/Atoms/res/Sprite/LevelText.bmp
diff --git a/Atoms/res/Sprite/Numbers.bmp b/Atoms/res/Sprite/Numbers.bmp
diff --git a/Atoms/res/Sprite/ProfPalette.bmp b/Atoms/res/Sprite/ProfPalette.bmp
diff --git a/Atoms/res/Sprite/ScoreText.bmp b/Atoms/res/Sprite/ScoreText.bmp
diff --git a/Atoms/res/Sprite/TextCursor.bmp b/Atoms/res/Sprite/TextCursor.bmp
diff --git a/Atoms/res/Sprite/ladyprofs.bmp b/Atoms/res/Sprite/ladyprofs.bmp
diff --git a/Atoms/res/Sprite/messages.bmp b/Atoms/res/Sprite/messages.bmp
diff --git a/Atoms/res/Sprite/players2.bmp b/Atoms/res/Sprite/players2.bmp
diff --git a/Atoms/res/Sprite/players3.bmp b/Atoms/res/Sprite/players3.bmp
diff --git a/Atoms/res/Sprite/scalers.bmp b/Atoms/res/Sprite/scalers.bmp
diff --git a/Atoms/res/Sprite/stands.bmp b/Atoms/res/Sprite/stands.bmp
diff --git a/Atoms/res/gfx.h b/Atoms/res/gfx.h
@@ -3,7 +3,8 @@
 
 extern const Image title_front;
 extern const Image title_anim;
-extern const Image gouldfish;
+extern const Image logo_bg_1;
+extern const Image logo_bg_2;
 extern const Image atoms;
 extern const Image playerselect_background;
 extern const Image playerselect_stands_background;
@@ -24,8 +25,10 @@ extern const Image winner_ai6;
 extern const Image tutorial_backing;
 extern const Image tutorial_backing_2;
 extern const Image GameSelect;
-extern const Image prototype1_backing;
 extern const Image Prototype2_Background;
-extern const Image GameOver_background;
+extern const Image GameOver_Background;
+extern const Image HighScoreTable_Background;
+extern const Image NewHighScore_Background;
+extern const Image med_font;
 
 #endif // _RES_GFX_H_
diff --git a/Atoms/res/gfx.res b/Atoms/res/gfx.res
@@ -3,7 +3,10 @@
 // Title screen
 IMAGE title_front "gfx/TitleFront.bmp" BEST
 IMAGE title_anim "gfx/title_anim_more.bmp" BEST
-IMAGE gouldfish "gfx/gouldfish.bmp" BEST
+
+
+IMAGE logo_bg_1 "gfx/logo_bg_1.bmp" BEST
+IMAGE logo_bg_2 "gfx/logo_bg_2.bmp" BEST
 
 
 // General
@@ -51,14 +54,18 @@ IMAGE GameSelect "gfx/GameSelect2.bmp" BEST
 
 
 
-// Prototype 1
+// Prototype 2
 // ---------------------------
+IMAGE Prototype2_Background "gfx/Prototype2Background.bmp" NONE
 
-IMAGE prototype1_backing "gfx/Prototype1Background.bmp" BEST
 
+// Challegne Mode Screens
+// ---------------------------
+IMAGE GameOver_Background "gfx/GameOver.bmp" BEST
+IMAGE HighScoreTable_Background "gfx/HighScoreTable.bmp" BEST
+IMAGE NewHighScore_Background "gfx/HighScore.bmp" BEST
 
 
-// Prototype 2
+// Fonts
 // ---------------------------
-IMAGE Prototype2_Background "gfx/Prototype2Background.bmp" NONE
-IMAGE GameOver_background "gfx/GameOver.bmp" NONE
+IMAGE med_font "gfx/MedFont.bmp" NONE
diff --git a/Atoms/res/gfx/GameOver.bmp b/Atoms/res/gfx/GameOver.bmp
diff --git a/Atoms/res/gfx/HighScore.bmp b/Atoms/res/gfx/HighScore.bmp
diff --git a/Atoms/res/gfx/HighScoreTable.bmp b/Atoms/res/gfx/HighScoreTable.bmp
diff --git a/Atoms/res/gfx/MedFont.bmp b/Atoms/res/gfx/MedFont.bmp
diff --git a/Atoms/res/gfx/Prototype1Background.bmp b/Atoms/res/gfx/Prototype1Background.bmp
diff --git a/Atoms/res/gfx/Prototype2Background.bmp b/Atoms/res/gfx/Prototype2Background.bmp
diff --git a/Atoms/res/gfx/TitleBack.bmp b/Atoms/res/gfx/TitleBack.bmp
diff --git a/Atoms/res/gfx/Winner/Image10.bmp b/Atoms/res/gfx/Winner/Image10.bmp
diff --git a/Atoms/res/gfx/Winner/Image11.bmp b/Atoms/res/gfx/Winner/Image11.bmp
diff --git a/Atoms/res/gfx/Winner/Image12.bmp b/Atoms/res/gfx/Winner/Image12.bmp
diff --git a/Atoms/res/gfx/Winner/Image2.bmp b/Atoms/res/gfx/Winner/Image2.bmp
diff --git a/Atoms/res/gfx/Winner/Image3.bmp b/Atoms/res/gfx/Winner/Image3.bmp
diff --git a/Atoms/res/gfx/Winner/Image7.bmp b/Atoms/res/gfx/Winner/Image7.bmp
diff --git a/Atoms/res/gfx/Winner/Image8.bmp b/Atoms/res/gfx/Winner/Image8.bmp
diff --git a/Atoms/res/gfx/Winner/Image9.bmp b/Atoms/res/gfx/Winner/Image9.bmp
diff --git a/Atoms/res/gfx/atoms_24.bmp b/Atoms/res/gfx/atoms_24.bmp
diff --git a/Atoms/res/gfx/background_base.bmp b/Atoms/res/gfx/background_base.bmp
diff --git a/Atoms/res/gfx/bigFont.bmp b/Atoms/res/gfx/bigFont.bmp
diff --git a/Atoms/res/gfx/ingame_Backing.bmp b/Atoms/res/gfx/ingame_Backing.bmp
diff --git a/Atoms/res/gfx/ingame_Backing_2.bmp b/Atoms/res/gfx/ingame_Backing_2.bmp
diff --git a/Atoms/res/gfx/GouldFish.bmp → Atoms/res/gfx/logo_bg_1.bmp b/Atoms/res/gfx/GouldFish.bmp → Atoms/res/gfx/logo_bg_1.bmp
diff --git a/Atoms/res/gfx/logo_bg_2.bmp b/Atoms/res/gfx/logo_bg_2.bmp
diff --git a/Atoms/res/gfx/title.bmp b/Atoms/res/gfx/title.bmp
diff --git a/Atoms/res/sfx/SPACLORE.wav b/Atoms/res/sfx/SPACLORE.wav
diff --git a/Atoms/res/sfx/UFO.vgm b/Atoms/res/sfx/UFO.vgm
diff --git a/Atoms/res/sfx/can.vgm b/Atoms/res/sfx/can.vgm
diff --git a/Atoms/res/sfx/can2.xgm b/Atoms/res/sfx/can2.xgm
diff --git a/Atoms/res/sfx/sonic1.vgm b/Atoms/res/sfx/sonic1.vgm
diff --git a/Atoms/res/sfx/techo.vgm b/Atoms/res/sfx/techo.vgm
diff --git a/Atoms/res/sfx/techo2_old.vgm b/Atoms/res/sfx/techo2_old.vgm
diff --git a/Atoms/res/sfx/transision.wav b/Atoms/res/sfx/transision.wav
diff --git a/Atoms/res/sfx/ufo2.vgm b/Atoms/res/sfx/ufo2.vgm
diff --git a/Atoms/res/sprite.h b/Atoms/res/sprite.h
@@ -11,5 +11,6 @@ extern const SpriteDefinition NumbersBig;
 extern const SpriteDefinition AtomsSample;
 extern const SpriteDefinition Scalers;
 extern const SpriteDefinition messages;
+extern const SpriteDefinition TextCursor_Sprite;
 
 #endif // _RES_SPRITE_H_
diff --git a/Atoms/res/sprite.res b/Atoms/res/sprite.res
@@ -1,7 +1,10 @@
 // SPRITE ring_sprite "sprite/ring.png" 2 2 FAST 5
+
+
 SPRITE Cursor "sprite/Cursor.bmp" 4 4 BEST 10
 SPRITE playerselect_cursor "sprite/menuCursor.bmp" 6 10 BEST 0
-SPRITE profs "sprite/players2.bmp" 6 6 NONE 0
+
+SPRITE profs "sprite/players3.bmp" 6 6 NONE 0
 SPRITE robo_pal "sprite/ProfPalette.bmp" 1 1 BEST 0
 SPRITE controller "sprite/Buttons.bmp" 3 3 BEST 0
 
@@ -12,4 +15,6 @@ SPRITE NumbersBig "sprite/NumbersBig.bmp" 3 5 BEST 0
 SPRITE AtomsSample "sprite/AtomSample.bmp" 3 3 BEST 0
 SPRITE Scalers "sprite/scalers.bmp" 1 1 BEST 0
 
-SPRITE messages "sprite/messages.bmp" 23 5 BEST 0
+SPRITE messages "sprite/messages.bmp" 23 5 BEST 0
+
+SPRITE TextCursor_Sprite "sprite/TextCursor.bmp" 2 1 BEST 0