AEFeinstein · AEFeinstein · Sep 26, 2023 · Sep 22, 2023 · Sep 22, 2023 · Sep 22, 2023
diff --git a/assets/breakout/sounds/sndBreak.mid b/assets/breakout/sounds/sndBreak.mid
diff --git a/assets/fonts/radiostars.font.png b/assets/fonts/radiostars.font.png
diff --git a/assets/platformer/levels/dac01.bin b/assets/platformer/levels/dac01.bin
diff --git a/assets/platformer/levels/dac02.bin b/assets/platformer/levels/dac02.bin
diff --git a/assets/platformer/levels/dac03.bin b/assets/platformer/levels/dac03.bin
diff --git a/assets/platformer/levels/debug.bin b/assets/platformer/levels/debug.bin
diff --git a/assets/platformer/levels/level1-1.bin b/assets/platformer/levels/level1-1.bin
diff --git a/assets/platformer/levels/level1-3.bin b/assets/platformer/levels/level1-3.bin
diff --git a/assets/platformer/levels/level1-4.bin b/assets/platformer/levels/level1-4.bin
diff --git a/assets/platformer/levels/level2-1.bin b/assets/platformer/levels/level2-1.bin
diff --git a/assets/platformer/levels/level2-3.bin b/assets/platformer/levels/level2-3.bin
diff --git a/assets/platformer/levels/level2-4.bin b/assets/platformer/levels/level2-4.bin
diff --git a/assets/platformer/levels/level3-1.bin b/assets/platformer/levels/level3-1.bin
diff --git a/assets/platformer/levels/level3-2.bin b/assets/platformer/levels/level3-2.bin
diff --git a/assets/platformer/levels/level3-3.bin b/assets/platformer/levels/level3-3.bin
diff --git a/assets/platformer/levels/level3-4.bin b/assets/platformer/levels/level3-4.bin
diff --git a/assets/platformer/levels/level4-1.bin b/assets/platformer/levels/level4-1.bin
diff --git a/assets/platformer/levels/level4-2.bin b/assets/platformer/levels/level4-2.bin
diff --git a/assets/platformer/levels/level4-3.bin b/assets/platformer/levels/level4-3.bin
diff --git a/assets/platformer/levels/level4-4.bin b/assets/platformer/levels/level4-4.bin
diff --git a/assets/platformer/sounds/bgmCastle.mid b/assets/platformer/sounds/bgmCastle.mid
diff --git a/assets/platformer/sounds/bgmDeMAGio.mid b/assets/platformer/sounds/bgmDeMAGio.mid
diff --git a/assets/platformer/sounds/bgmGameOver.mid b/assets/platformer/sounds/bgmGameOver.mid
diff --git a/assets/platformer/sounds/bgmGameStart.mid b/assets/platformer/sounds/bgmGameStart.mid
diff --git a/assets/platformer/sounds/bgmIntro.mid b/assets/platformer/sounds/bgmIntro.mid
diff --git a/assets/platformer/sounds/bgmNameEntry.mid b/assets/platformer/sounds/bgmNameEntry.mid
diff --git a/assets/platformer/sounds/bgmSmooth.mid b/assets/platformer/sounds/bgmSmooth.mid
diff --git a/assets/platformer/sounds/bgmUnderground.mid b/assets/platformer/sounds/bgmUnderground.mid
diff --git a/assets/platformer/sounds/snd1up.mid b/assets/platformer/sounds/snd1up.mid
diff --git a/assets/platformer/sounds/sndCheckpoint.mid b/assets/platformer/sounds/sndCheckpoint.mid
diff --git a/assets/platformer/sounds/sndCoin.mid b/assets/platformer/sounds/sndCoin.mid
diff --git a/assets/platformer/sounds/sndDie.mid b/assets/platformer/sounds/sndDie.mid
diff --git a/assets/platformer/sounds/sndHit.mid b/assets/platformer/sounds/sndHit.mid
diff --git a/assets/platformer/sounds/sndHurt.mid b/assets/platformer/sounds/sndHurt.mid
diff --git a/assets/platformer/sounds/sndJump1.mid b/assets/platformer/sounds/sndJump1.mid
diff --git a/assets/platformer/sounds/sndJump2.mid b/assets/platformer/sounds/sndJump2.mid
diff --git a/assets/platformer/sounds/sndJump3.mid b/assets/platformer/sounds/sndJump3.mid
diff --git a/assets/platformer/sounds/sndLevelClearA.mid b/assets/platformer/sounds/sndLevelClearA.mid
diff --git a/assets/platformer/sounds/sndLevelClearB.mid b/assets/platformer/sounds/sndLevelClearB.mid
diff --git a/assets/platformer/sounds/sndLevelClearC.mid b/assets/platformer/sounds/sndLevelClearC.mid
diff --git a/assets/platformer/sounds/sndLevelClearD.mid b/assets/platformer/sounds/sndLevelClearD.mid
diff --git a/assets/platformer/sounds/sndLevelClearS.mid b/assets/platformer/sounds/sndLevelClearS.mid
diff --git a/assets/platformer/sounds/sndMenuConfirm.mid b/assets/platformer/sounds/sndMenuConfirm.mid
diff --git a/assets/platformer/sounds/sndMenuDeny.mid b/assets/platformer/sounds/sndMenuDeny.mid
diff --git a/assets/platformer/sounds/sndMenuSelect.mid b/assets/platformer/sounds/sndMenuSelect.mid
diff --git a/assets/platformer/sounds/sndOuttatime.mid b/assets/platformer/sounds/sndOuttatime.mid
diff --git a/assets/platformer/sounds/sndPause.mid b/assets/platformer/sounds/sndPause.mid
diff --git a/assets/platformer/sounds/sndPowerUp.mid b/assets/platformer/sounds/sndPowerUp.mid
diff --git a/assets/platformer/sounds/sndSquish.mid b/assets/platformer/sounds/sndSquish.mid
diff --git a/assets/platformer/sounds/sndWarp.mid b/assets/platformer/sounds/sndWarp.mid
diff --git a/assets/platformer/sounds/sndWaveBall.mid b/assets/platformer/sounds/sndWaveBall.mid
diff --git a/assets/platformer/sprites/sprite000.png b/assets/platformer/sprites/sprite000.png
diff --git a/assets/platformer/sprites/sprite001.png b/assets/platformer/sprites/sprite001.png
diff --git a/assets/platformer/sprites/sprite002.png b/assets/platformer/sprites/sprite002.png
diff --git a/assets/platformer/sprites/sprite003.png b/assets/platformer/sprites/sprite003.png
diff --git a/assets/platformer/sprites/sprite004.png b/assets/platformer/sprites/sprite004.png
diff --git a/assets/platformer/sprites/sprite005.png b/assets/platformer/sprites/sprite005.png
diff --git a/assets/platformer/sprites/sprite006.png b/assets/platformer/sprites/sprite006.png
diff --git a/assets/platformer/sprites/sprite007.png b/assets/platformer/sprites/sprite007.png
diff --git a/assets/platformer/sprites/sprite008.png b/assets/platformer/sprites/sprite008.png
diff --git a/assets/platformer/sprites/sprite009.png b/assets/platformer/sprites/sprite009.png
diff --git a/assets/platformer/sprites/sprite012.png b/assets/platformer/sprites/sprite012.png
diff --git a/assets/platformer/sprites/sprite013.png b/assets/platformer/sprites/sprite013.png
diff --git a/assets/platformer/sprites/sprite014.png b/assets/platformer/sprites/sprite014.png
diff --git a/assets/platformer/sprites/sprite015.png b/assets/platformer/sprites/sprite015.png
diff --git a/assets/platformer/sprites/sprite016.png b/assets/platformer/sprites/sprite016.png
diff --git a/assets/platformer/sprites/sprite017.png b/assets/platformer/sprites/sprite017.png
diff --git a/assets/platformer/sprites/sprite018.png b/assets/platformer/sprites/sprite018.png
diff --git a/assets/platformer/sprites/sprite019.png b/assets/platformer/sprites/sprite019.png
diff --git a/assets/platformer/sprites/sprite020.png b/assets/platformer/sprites/sprite020.png
diff --git a/assets/platformer/sprites/sprite021.png b/assets/platformer/sprites/sprite021.png
diff --git a/assets/platformer/sprites/sprite022.png b/assets/platformer/sprites/sprite022.png
diff --git a/assets/platformer/sprites/sprite023.png b/assets/platformer/sprites/sprite023.png
diff --git a/assets/platformer/sprites/sprite024.png b/assets/platformer/sprites/sprite024.png
diff --git a/assets/platformer/sprites/sprite025.png b/assets/platformer/sprites/sprite025.png
diff --git a/assets/platformer/sprites/sprite026.png b/assets/platformer/sprites/sprite026.png
diff --git a/assets/platformer/sprites/sprite027.png b/assets/platformer/sprites/sprite027.png
diff --git a/assets/platformer/sprites/sprite028.png b/assets/platformer/sprites/sprite028.png
diff --git a/assets/platformer/sprites/sprite029.png b/assets/platformer/sprites/sprite029.png
diff --git a/assets/platformer/sprites/sprite030.png b/assets/platformer/sprites/sprite030.png
diff --git a/assets/platformer/sprites/sprite031.png b/assets/platformer/sprites/sprite031.png
diff --git a/assets/platformer/sprites/sprite032.png b/assets/platformer/sprites/sprite032.png
diff --git a/assets/platformer/sprites/sprite033.png b/assets/platformer/sprites/sprite033.png
diff --git a/assets/platformer/sprites/sprite034.png b/assets/platformer/sprites/sprite034.png
diff --git a/assets/platformer/sprites/sprite035.png b/assets/platformer/sprites/sprite035.png
diff --git a/assets/platformer/sprites/sprite036.png b/assets/platformer/sprites/sprite036.png
diff --git a/assets/platformer/sprites/sprite037.png b/assets/platformer/sprites/sprite037.png
diff --git a/assets/platformer/sprites/sprite038.png b/assets/platformer/sprites/sprite038.png
diff --git a/assets/platformer/sprites/sprite039.png b/assets/platformer/sprites/sprite039.png
diff --git a/assets/platformer/sprites/sprite040.png b/assets/platformer/sprites/sprite040.png
diff --git a/assets/platformer/sprites/sprite041.png b/assets/platformer/sprites/sprite041.png
diff --git a/assets/platformer/sprites/sprite042.png b/assets/platformer/sprites/sprite042.png
diff --git a/assets/platformer/sprites/sprite043.png b/assets/platformer/sprites/sprite043.png
diff --git a/assets/platformer/sprites/sprite044.png b/assets/platformer/sprites/sprite044.png
diff --git a/assets/platformer/sprites/sprite045.png b/assets/platformer/sprites/sprite045.png
diff --git a/assets/platformer/sprites/sprite046.png b/assets/platformer/sprites/sprite046.png
diff --git a/assets/platformer/sprites/sprite047.png b/assets/platformer/sprites/sprite047.png
diff --git a/assets/platformer/sprites/sprite048.png b/assets/platformer/sprites/sprite048.png
diff --git a/assets/platformer/sprites/sprite049.png b/assets/platformer/sprites/sprite049.png
diff --git a/assets/platformer/tiles/tile032.png b/assets/platformer/tiles/tile032.png
diff --git a/assets/platformer/tiles/tile033.png b/assets/platformer/tiles/tile033.png
diff --git a/assets/platformer/tiles/tile034.png b/assets/platformer/tiles/tile034.png
diff --git a/assets/platformer/tiles/tile035.png b/assets/platformer/tiles/tile035.png
diff --git a/assets/platformer/tiles/tile036.png b/assets/platformer/tiles/tile036.png
diff --git a/assets/platformer/tiles/tile037.png b/assets/platformer/tiles/tile037.png
diff --git a/assets/platformer/tiles/tile038.png b/assets/platformer/tiles/tile038.png
diff --git a/assets/platformer/tiles/tile039.png b/assets/platformer/tiles/tile039.png
diff --git a/assets/platformer/tiles/tile040.png b/assets/platformer/tiles/tile040.png
diff --git a/assets/platformer/tiles/tile041.png b/assets/platformer/tiles/tile041.png
diff --git a/assets/platformer/tiles/tile059.png b/assets/platformer/tiles/tile059.png
diff --git a/assets/platformer/tiles/tile060.png b/assets/platformer/tiles/tile060.png
diff --git a/assets/platformer/tiles/tile061.png b/assets/platformer/tiles/tile061.png
diff --git a/assets/platformer/tiles/tile062.png b/assets/platformer/tiles/tile062.png
diff --git a/assets/platformer/tiles/tile063.png b/assets/platformer/tiles/tile063.png
diff --git a/assets/platformer/tiles/tile064.png b/assets/platformer/tiles/tile064.png
diff --git a/assets/platformer/tiles/tile065.png b/assets/platformer/tiles/tile065.png
diff --git a/assets/platformer/tiles/tile066.png b/assets/platformer/tiles/tile066.png
diff --git a/assets/platformer/tiles/tile067.png b/assets/platformer/tiles/tile067.png
diff --git a/assets/platformer/tiles/tile068.png b/assets/platformer/tiles/tile068.png
diff --git a/assets/platformer/tiles/tile069.png b/assets/platformer/tiles/tile069.png
diff --git a/assets/platformer/tiles/tile070.png b/assets/platformer/tiles/tile070.png
diff --git a/assets/platformer/tiles/tile080.png b/assets/platformer/tiles/tile080.png
diff --git a/assets/platformer/tiles/tile081.png b/assets/platformer/tiles/tile081.png
diff --git a/assets/platformer/tiles/tile082.png b/assets/platformer/tiles/tile082.png
diff --git a/assets/platformer/tiles/tile083.png b/assets/platformer/tiles/tile083.png
diff --git a/assets/platformer/tiles/tile084.png b/assets/platformer/tiles/tile084.png
diff --git a/assets/platformer/tiles/tile085.png b/assets/platformer/tiles/tile085.png
diff --git a/assets/platformer/tiles/tile086.png b/assets/platformer/tiles/tile086.png
diff --git a/assets/platformer/tiles/tile087.png b/assets/platformer/tiles/tile087.png
diff --git a/assets/platformer/tiles/tile088.png b/assets/platformer/tiles/tile088.png
diff --git a/assets/platformer/tiles/tile089.png b/assets/platformer/tiles/tile089.png
diff --git a/assets/platformer/tiles/tile090.png b/assets/platformer/tiles/tile090.png
diff --git a/assets/platformer/tiles/tile091.png b/assets/platformer/tiles/tile091.png
diff --git a/assets/platformer/tiles/tile092.png b/assets/platformer/tiles/tile092.png
diff --git a/assets/platformer/tiles/tile093.png b/assets/platformer/tiles/tile093.png
diff --git a/assets/platformer/tiles/tile094.png b/assets/platformer/tiles/tile094.png
diff --git a/assets/platformer/tiles/tile095.png b/assets/platformer/tiles/tile095.png
diff --git a/assets/platformer/tiles/tile096.png b/assets/platformer/tiles/tile096.png
diff --git a/assets/platformer/tiles/tile097.png b/assets/platformer/tiles/tile097.png
diff --git a/assets/platformer/tiles/tile098.png b/assets/platformer/tiles/tile098.png
diff --git a/assets/platformer/tiles/tile099.png b/assets/platformer/tiles/tile099.png
diff --git a/assets/platformer/tiles/tile100.png b/assets/platformer/tiles/tile100.png
diff --git a/assets/platformer/tiles/tile101.png b/assets/platformer/tiles/tile101.png
diff --git a/assets/platformer/tiles/tile102.png b/assets/platformer/tiles/tile102.png
diff --git a/assets/platformer/tiles/tile103.png b/assets/platformer/tiles/tile103.png
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
@@ -51,6 +51,12 @@ idf_component_register(SRCS "swadge2024.c"
                             "modes/breakout/soundManager.c"
                             "modes/breakout/aabb_utils.c"
                             "modes/breakout/starfield.c"
+                            "modes/platformer/plEntity.c"
+                            "modes/platformer/plEntityManager.c"
+                            "modes/platformer/plGameData.c"
+                            "modes/platformer/mode_platformer.c"
+                            "modes/platformer/plTilemap.c"
+                            "modes/platformer/plSoundManager.c"
                             "modes/touchTest/touchTest.c"
                             "modes/quickSettings/menuQuickSettingsRenderer.c"
                             "modes/quickSettings/quickSettings.c"
@@ -105,6 +111,7 @@ idf_component_register(SRCS "swadge2024.c"
                                 "./modes/pushy"
                                 "./modes/pong"
                                 "./modes/breakout"
+                                "./modes/platformer"
                                 "./modes/tunernome"
                                 "./modes/mainMenu"
                                 "./modes/demo"

diff --git a/main/modes/mainMenu/mainMenu.c b/main/modes/mainMenu/mainMenu.c
@@ -16,6 +16,7 @@
 #include "lumberjack.h"
 #include "marbles.h"
 #include "mode_paint.h"
+#include "mode_platformer.h"
 #include "mode_ray.h"
 #include "paint_share.h"
 #include "pong.h"
@@ -120,6 +121,7 @@ static void mainMenuEnterMode(void)
     // Add single items
     mainMenu->menu = startSubMenu(mainMenu->menu, "Games");
     addSingleItemToMenu(mainMenu->menu, breakoutMode.modeName);
+    addSingleItemToMenu(mainMenu->menu, modePlatformer.modeName);
     addSingleItemToMenu(mainMenu->menu, lumberjackMode.modeName);
     addSingleItemToMenu(mainMenu->menu, marblesMode.modeName);
     addSingleItemToMenu(mainMenu->menu, pongMode.modeName);
@@ -260,6 +262,10 @@ static void mainMenuCb(const char* label, bool selected, uint32_t settingVal)
         {
             switchToSwadgeMode(&modePaint);
         }
+        else if (label == modePlatformer.modeName)
+        {
+            switchToSwadgeMode(&modePlatformer);
+        }
         else if (label == pongMode.modeName)
         {
             switchToSwadgeMode(&pongMode);