Fix line endings, bug, text & sound fixes (#8)

* Fix wrong line endings * Fixup launch tasks * Fixup nflib lib dir * Fixup debugger, improve dialogue save tracking * Fixup typo * Improve stability of game end logic * Dialogue text fixes * Fix SFX bug on Hank's mineral screen * Bump to 1.0.6 * Add SFX to cracking minigame
WiIIiam278 · Nov 22, 2023 · cd9753f · cd9753f
1 parent 1ca442e
commit cd9753f
Show file tree

Hide file tree

Showing 80 changed files with 18,795 additions and 18,750 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,26 +1,26 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-dockerfile
-{
-	"name": "Existing Dockerfile",
-	"build": {
-		// Sets the run context to one level up instead of the .devcontainer folder.
-		"context": "..",
-		// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
-		"dockerfile": "../Dockerfile"
-	}
-
-	// Features to add to the dev container. More info: https://containers.dev/features.
-	// "features": {},
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-
-	// Uncomment the next line to run commands after the container is created.
-	// "postCreateCommand": "cat /etc/os-release",
-
-	// Configure tool-specific properties.
-	// "customizations": {},
-
-	// Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root.
-	// "remoteUser": "devcontainer"
-}
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-dockerfile
+{
+	"name": "Existing Dockerfile",
+	"build": {
+		// Sets the run context to one level up instead of the .devcontainer folder.
+		"context": "..",
+		// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
+		"dockerfile": "../Dockerfile"
+	}
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Uncomment the next line to run commands after the container is created.
+	// "postCreateCommand": "cat /etc/os-release",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "devcontainer"
+}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,69 +1,69 @@
-name: CI
-
-on:
-  push:
-    branches: ["*"]
-    paths-ignore:
-      - 'README.md'
-  pull_request:
-    branches: ["*"]
-    paths-ignore:
-      - 'README.md'
-  release:
-    types: [created]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: devkitpro/devkitarm
-    steps:
-    - name: 'Checkout repository'
-      uses: actions/checkout@v3
-      with:
-        path: 'breaking-bad-ds'
-    - name: 'Checkout libfilesystem'
-      uses: actions/checkout@v3
-      with:
-        repository: 'RetroVNDjinn/libfilesystem'
-        path: 'libfilesystem'
-    - name: 'Patch libfilesystem'
-      run: |
-        cd ./libfilesystem;
-        make;
-        cp ./lib/libfilesystem.a /opt/devkitpro/libnds/lib/libfilesystem.a;
-        cd ../;
-    - name: 'Checkout Nitro-Engine'
-      uses: actions/checkout@v3
-      with:
-        repository: 'AntonioND/nitro-engine'
-        path: 'nitro-engine'
-    - name: 'Build Nitro-Engine'
-      run: |
-        cd ./nitro-engine;
-        make;
-        cd ../;
-        cp -r ./nitro-engine /opt/devkitpro/nitro-engine;
-    - name: 'Checkout NightFoxLib'
-      uses: actions/checkout@v3
-      with:
-        repository: 'knightfox75/nds_nflib'
-        path: 'nds_nflib'
-    - name: 'Build NightFoxLib'
-      run: |
-        cd ./nds_nflib;
-        make;
-        cd ../;
-        cp -r ./nds_nflib /opt/devkitpro/nflib;
-    - name: 'Execute build'
-      run: |
-        cd ./breaking-bad-ds/
-        make;
-    - name: 'Upload ROM'
-      uses: actions/upload-artifact@v3
-      with:
-        path: |
-           ./breaking-bad-ds/*.nds
-           ./breaking-bad-ds/*.md
-           ./breaking-bad-ds/LICENSE
-           ./breaking-bad-ds/cover-artwork.png
-        name: 'Breaking Bad DS'
+name: CI
+
+on:
+  push:
+    branches: ["*"]
+    paths-ignore:
+      - 'README.md'
+  pull_request:
+    branches: ["*"]
+    paths-ignore:
+      - 'README.md'
+  release:
+    types: [created]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container: devkitpro/devkitarm
+    steps:
+    - name: 'Checkout repository'
+      uses: actions/checkout@v3
+      with:
+        path: 'breaking-bad-ds'
+    - name: 'Checkout libfilesystem'
+      uses: actions/checkout@v3
+      with:
+        repository: 'RetroVNDjinn/libfilesystem'
+        path: 'libfilesystem'
+    - name: 'Patch libfilesystem'
+      run: |
+        cd ./libfilesystem;
+        make;
+        cp ./lib/libfilesystem.a /opt/devkitpro/libnds/lib/libfilesystem.a;
+        cd ../;
+    - name: 'Checkout Nitro-Engine'
+      uses: actions/checkout@v3
+      with:
+        repository: 'AntonioND/nitro-engine'
+        path: 'nitro-engine'
+    - name: 'Build Nitro-Engine'
+      run: |
+        cd ./nitro-engine;
+        make;
+        cd ../;
+        cp -r ./nitro-engine /opt/devkitpro/nitro-engine;
+    - name: 'Checkout NightFoxLib'
+      uses: actions/checkout@v3
+      with:
+        repository: 'knightfox75/nds_nflib'
+        path: 'nds_nflib'
+    - name: 'Build NightFoxLib'
+      run: |
+        cd ./nds_nflib;
+        make;
+        cd ../;
+        cp -r ./nds_nflib /opt/devkitpro/nflib;
+    - name: 'Execute build'
+      run: |
+        cd ./breaking-bad-ds/
+        make;
+    - name: 'Upload ROM'
+      uses: actions/upload-artifact@v3
+      with:
+        path: |
+           ./breaking-bad-ds/*.nds
+           ./breaking-bad-ds/*.md
+           ./breaking-bad-ds/LICENSE
+           ./breaking-bad-ds/cover-artwork.png
+        name: 'Breaking Bad DS'
diff --git a/.gitignore b/.gitignore
@@ -1,13 +1,13 @@
-build/*
-*.nds
-*.elf
-*.sav
-*.ml1
-*.ml2
-*.ml3
-*.ml4
-*.ml5
-*.ml6
-*.ml7
-*.ml8
+build/*
+*.nds
+*.elf
+*.sav
+*.ml1
+*.ml2
+*.ml3
+*.ml4
+*.ml5
+*.ml6
+*.ml7
+*.ml8
 *.ml9
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -1,33 +1,38 @@
-{
-    "configurations": [
-        {
-            "name": "NDS",
-            "includePath": [
-                "${workspaceFolder}",
-                "/nitro-engine/include/**",
-                "/nds_nflib/include/**",
-                "/opt/devkitpro/libnds/include/**"
-            ],
-            "defines": [
-                "_DEBUG",
-                "_UNICODE",
-                "WIN32",
-                "ARM7",
-                "ARM9"
-            ],
-            "browse": {
-                "path": [
-                    "${workspaceFolder}",
-                    "/nitro-engine/include/**",
-                    "/nds_nflib/include/**",
-                    "/opt/devkitpro/libnds/include/**"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            },
-            "cStandard": "c11",
-            "cppStandard": "c++11"
-        }
-    ],
-    "version": 4
+{
+    "configurations": [
+        {
+            "name": "NDS",
+            "includePath": [
+                "${workspaceFolder}",
+                "${workspaceFolder}/libs/**",
+                "C:/devkitPro/devkitARM/arm-none-eabi/include/**",
+                "C:/devkitpro/libnds/include/**",
+                "C:/devkitpro/nitro-engine/include/**",
+                "C:/devkitpro/nflib/include/**"
+            ],
+            "defines": [
+                "_DEBUG",
+                "_UNICODE",
+                "WIN32",
+                "ARM7",
+                "ARM9"
+            ],
+            "browse": {
+                "path": [
+                    "${workspaceFolder}",
+                    "${workspaceFolder}/libs/**",
+                    "C:/devkitPro/devkitARM/arm-none-eabi/include/**",
+                    "C:/devkitpro/libnds/include/**",
+                    "C:/devkitpro/nitro-engine/include/**",
+                    "C:/devkitpro/nflib/include/**"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            },
+            "cStandard": "c11",
+            "cppStandard": "c++11",
+            "compilerPath": "C:/devkitpro/devkitARM/bin/arm-none-eabi-g++.exe"
+        }
+    ],
+    "version": 4
 }
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,32 +1,32 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "(gdb) Launch",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}/${workspaceFolderBasename}.elf",
-            "targetArchitecture": "arm",
-            "preLaunchTask": "gdb-debug",
-            "postDebugTask": "stop-emulation",
-            "serverLaunchTimeout": 10000,
-            "stopAtEntry": true,
-            "cwd": "${workspaceFolder}",
-            "environment": [],
-            "externalConsole": true,
-            "MIMode": "gdb",
-            "miDebuggerPath": "/opt/devkitpro/devkitARM/bin/arm-none-eabi-gcc",
-            "miDebuggerServerAddress": "localhost:3333",
-            "setupCommands": [
-                {
-                    "description": "Enable pretty-printing",
-                    "text": "file ${workspaceFolder}/${workspaceFolderBasename}.elf -enable-pretty-printing",
-                    "ignoreFailures": true
-                }
-            ]
-        }
-    ]
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "(gdb) Launch",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/${workspaceFolderBasename}.elf",
+            "targetArchitecture": "arm",
+            "preLaunchTask": "gdb-debug",
+            "postDebugTask": "stop-emulation",
+            "serverLaunchTimeout": 10000,
+            "stopAtEntry": true,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "externalConsole": true,
+            "MIMode": "gdb",
+            "miDebuggerPath": "C:/devkitpro/devkitARM/bin/arm-none-eabi-gdb.exe",
+            "miDebuggerServerAddress": "localhost:20000",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing",
+                    "text": "file ${workspaceFolder}/${workspaceFolderBasename}.elf -enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ]
+        }
+    ]
 }
-Original file line number
+Diff line change
@@ -1,13 +1,13 @@
-    build/*
-    *.nds
-    *.elf
-    *.sav
-    *.ml1
-    *.ml2
-    *.ml3
-    *.ml4
-    *.ml5
-    *.ml6
-    *.ml7
-    *.ml8
+    build/*
+    *.nds
+    *.elf
+    *.sav
+    *.ml1
+    *.ml2
+    *.ml3
+    *.ml4
+    *.ml5
+    *.ml6
+    *.ml7
+    *.ml8
     *.ml9