Merge pull request #181 from wendelscardua/miroh-jr

Miroh Jr.

CMakeLists.txt

@@ -13,7 +13,7 @@ set(CMAKE_ASM_FLAGS_RELWITHDEBINFO "-Os -flto")
 set(LLVM_MOS_PLATFORM nes-action53)
 find_package(llvm-mos-sdk REQUIRED)
 
-project(miroh CXX ASM)
+project(miroh-jr CXX ASM)
 
 add_compile_options(
   -g -gdwarf-4
@@ -23,7 +23,8 @@ add_compile_options(
 
 add_link_options(
   -g -gdwarf-4
-  -mreserve-zp=58
+  -mreserve-zp=67
+  # donut: 18, ggsound: 40, zx02: 7
 
   # make functions non-recursive by default
   -fnonreentrant

CMakePresets.json

@@ -1,68 +1,52 @@
 {
-    "version": 3,
-    "cmakeMinimumRequired": {
-      "major": 3,
-      "minor": 18,
-      "patch": 0
-    },
-    "configurePresets": [
-      {
-        "name": "default",
-        "displayName": "Default",
-        "description": "Default config using Ninja generator",
-        "generator": "Ninja",
-        "binaryDir": "${sourceDir}/build/",
-        "cacheVariables": {
-          "CMAKE_BUILD_TYPE": "MinSizeRel",
-          "CMAKE_MODULE_PATH": "${sourceDir}/cmake",
-          "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
-        }
-      },
-      {
-        "name": "release-web",
-        "displayName": "Release Web",
-        "description": "User-defined presets for release to be embedded on a web page",
-        "inherits": "default",
-        "cacheVariables": {
-          "ROM_PLATFORM": "web"
-        }
-      },
-      {
-        "name": "release-nes",
-        "displayName": "Release NES",
-        "description": "User-defined presets for release to be distributed as a ROM",
-        "inherits": "default",
-        "cacheVariables": {
-          "ROM_PLATFORM": "nes"
-        }
-      },
-      {
-        "name": "debug",
-        "displayName": "Debug",
-        "description": "User-defined presets for debug",
-        "inherits": "default",
-        "cacheVariables": {
-          "CMAKE_BUILD_TYPE": "RelWithDebInfo",
-          "ROM_PLATFORM": "nes"
-        }
+  "version": 3,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 18,
+    "patch": 0
+  },
+  "configurePresets": [
+    {
+      "name": "default",
+      "displayName": "Default",
+      "description": "Default config using Ninja generator",
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/build/",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "MinSizeRel",
+        "CMAKE_MODULE_PATH": "${sourceDir}/cmake",
+        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
       }
-    ],
-    "buildPresets": [
-      {
-        "name": "default",
-        "configurePreset": "default"
-      },
-      {
-        "name": "release-web",
-        "configurePreset": "release-web"
-      },
-      {
-        "name": "release-nes",
-        "configurePreset": "release-nes"
-      },
-      {
-        "name": "debug",
-        "configurePreset": "debug"
+    },
+    {
+      "name": "release",
+      "displayName": "Release",
+      "description": "User-defined presets for release to be distributed as a ROM",
+      "inherits": "default"
+    },
+    {
+      "name": "debug",
+      "displayName": "Debug",
+      "description": "User-defined presets for debug",
+      "inherits": "default",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo",
+        "ROM_PLATFORM": "nes"
       }
-    ]
-}
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "default",
+      "configurePreset": "default"
+    },
+    {
+      "name": "release",
+      "configurePreset": "release"
+    },
+    {
+      "name": "debug",
+      "configurePreset": "debug"
+    }
+  ]
+}

LICENCE.zx0

@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2021, Einar Saukas
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

LICENSE.zx02

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Daniel Serpell
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

assets/FairyForestBG.pal

@@ -0,0 +1 @@
+8< 8)<8) 85 

assets/FairyForestSPR.pal

@@ -0,0 +1 @@
+8+ 8#48'982 

assets/GlitteryGrottoBG.pal

@@ -0,0 +1 @@
+62 62"6%6% 

assets/GlitteryGrottoSPR.pal

@@ -0,0 +1 @@
+6! 6'86%+62 

assets/MarshmallowMountainBG.pal

@@ -0,0 +1 @@
+2"62&62" 2" &

assets/MarshmallowMountainSPR.pal

@@ -0,0 +1 @@
+% (8" 
7"

assets/RainbowRetreatBG.pal

@@ -0,0 +1 @@
+1; 15 1 !185 

assets/RainbowRetreatSPR.pal

@@ -0,0 +1 @@
+1# 1+91!(12 

assets/StarlitStablesBG.pal

@@ -0,0 +1 @@
+"2 "3 "<8"2 

assets/StarlitStablesSPR.pal

@@ -0,0 +1 @@
+"% "(8"1 "9+

assets/TitleBG.pal

@@ -0,0 +1 @@
+"3 "2 " ""&2

assets/TitleSPR.pal

@@ -0,0 +1 @@
+"%5"(8"1 ""+

assets/animations.yaml

@@ -0,0 +1,114 @@
+idle_right:
+  - [UniRightIdle, 162]
+  - [UniRightBlink, 12]
+  - [UniRightIdle, 8]
+  - [UniRightBlink, 12]
+  - [UniRightIdle, 162]
+  - [UniRightBlink, 12]
+  - [UniRightIdle, 8]
+  - [UniRightBlink, 12]
+  - [UniRightIdle, 162]
+  - [UniRightBlink, 12]
+idle_left:
+  - [UniLeftIdle, 162]
+  - [UniLeftBlink, 12]
+  - [UniLeftIdle, 8]
+  - [UniLeftBlink, 12]
+  - [UniLeftIdle, 162]
+  - [UniLeftBlink, 12]
+  - [UniLeftIdle, 8]
+  - [UniLeftBlink, 12]
+  - [UniLeftIdle, 162]
+  - [UniLeftBlink, 12]
+yawn_right:
+  - [UniRightYawn1, 78]
+  - [UniRightYawn2, 78]
+yawn_left:
+  - [UniLeftYawn1, 78]
+  - [UniLeftYawn2, 78]
+sleep_right:
+  - [UniRightSleep1, 162]
+  - [UniRightSleep2, 162]
+sleep_left:
+  - [UniLeftSleep1, 162]
+  - [UniLeftSleep2, 162]
+moving_right:
+  - [UniRightWalk1, 5]
+  - [UniRightWalk2, 9]
+  - [UniRightWalk3, 5]
+  - [UniRightWalk4, 9]
+moving_left:
+  - [UniLeftWalk1, 5]
+  - [UniLeftWalk2, 9]
+  - [UniLeftWalk3, 5]
+  - [UniLeftWalk4, 9]
+tired_right:
+  - [UniRightBreath1, 60]
+  - [UniRightBreath2, 60]
+tired_left:
+  - [UniLeftBreath1, 60]
+  - [UniLeftBreath2, 60]
+trudging_right:
+  - [UniRightTrudge1, 10]
+  - [UniRightTrudge2, 18]
+  - [UniRightTrudge3, 10]
+  - [UniRightTrudge4, 18]
+trudging_left:
+  - [UniLeftTrudge1, 10]
+  - [UniLeftTrudge2, 18]
+  - [UniLeftTrudge3, 10]
+  - [UniLeftTrudge4, 18]
+roll_right:
+  - [UniRightCharge1, 6]
+  - [UniRightCharge2, 3]
+  - [UniRightRoll1, 3]
+  - [UniRightRoll2, 3]
+  - [UniRightRoll3, 3]
+  - [UniRightRoll4, 3]
+  - [UniRightCharge2, 18]
+roll_left:
+  - [UniLeftCharge1, 6]
+  - [UniLeftCharge2, 3]
+  - [UniLeftRoll1, 3]
+  - [UniLeftRoll2, 3]
+  - [UniLeftRoll3, 3]
+  - [UniLeftRoll4, 3]
+  - [UniLeftCharge2, 18]
+impact_right:
+  - [UniRightImpact1, 6]
+  - [UniRightImpact2, 5]
+  - [UniRightBounce1, 5]
+  - [UniRightBounce2, 5]
+  - [UniRightBounce3, 5]
+  - [UniRightBounce4, 5]
+impact_left:
+  - [UniLeftImpact1, 6]
+  - [UniLeftImpact2, 5]
+  - [UniLeftBounce1, 5]
+  - [UniLeftBounce2, 5]
+  - [UniLeftBounce3, 5]
+  - [UniLeftBounce4, 5]
+trapped:
+  - [UniTrapped, 90]
+  - [UniTrappedBlink, 12]
+  - [UniTrapped, 8]
+  - [UniTrappedBlink, 12]
+  - [UniTrapped, 48]
+splash:
+  - [Splash1, 3]
+  - [Splash2, 3]
+  - [Splash3, 3]
+  - [Splash4, 3]
+  - [Splash5, 3]
+  - [Splash6, 3]
+  - [Splash7, 3]
+  - [Splash8, 3]
+  - [Splash9, 3]
+  - [Splash10, 3]
+  - [Splash11, 3]
+  - [Splash12, 3]
+  - [Splash13, 3]
+  - [Splash14, 3]
+  - [Splash15, 3]
+  - [Splash16, 3]
+  - [Splash17, 3]