Refactoring editor

Reviewed-on: #2

.gitea/workflows/build.yml

@@ -1,58 +0,0 @@
-name: Build Dusk
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  build-linux:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v5
-      - name: Install dependencies
-        run: |
-          apt-get update
-          apt-get install -y build-essential cmake python3 python3-pip python3-polib python3-pil libsdl2-dev libgl1-mesa-dev libzip-dev python3-dotenv python3-pyqt5 python3-opengl
-      - name: Configure CMake
-        run: cmake -S . -B build -DDUSK_TARGET_SYSTEM=linux
-      - name: Build
-        run: cmake --build build -- -j$(nproc)
-      - name: List build output
-        run: ls -lh build
-      - name: Upload Linux binary
-        uses: actions/upload-artifact@v3
-        with:
-          name: dusk-linux
-          path: build/Dusk
-          if-no-files-found: error
-
-  build-psp:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v5
-      - name: Install dependencies
-        run: |
-          apt-get update
-          apt-get install -y build-essential cmake python3 python3-pip python3-polib python3-pil libsdl2-dev libgl1-mesa-dev libzip-dev python3-dotenv python3-pyqt5 python3-opengl
-      - name: Configure CMake
-        run: cmake -S . -B build -DDUSK_TARGET_SYSTEM=psp
-      - name: Build
-        run: cmake --build build -- -j$(nproc)
-      - name: Move EBOOT.PBP to Dusk subfolder
-        run: |
-          mkdir -p build/gitea/Dusk
-          mv build/EBOOT.PBP build/gitea/Dusk/EBOOT.PBP
-      - name: List build output
-        run: ls -lh build/gitea/Dusk
-      - name: Upload PSP binary
-        uses: actions/upload-artifact@v3
-        with:
-          name: dusk-psp
-          path: build/gitea/
-          if-no-files-found: error

.github/workflows/build.yml

@@ -0,0 +1,117 @@
+name: Build Dusk
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+jobs:
+  run-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+      - name: Set up Docker
+        uses: docker/setup-docker-action@v5
+      - name: Run tests in Docker
+        run: ./scripts/test-linux-docker.sh
+
+  build-linux:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+      - name: Set up Docker
+        uses: docker/setup-docker-action@v5
+      - name: Build Linux
+        run: ./scripts/build-linux-docker.sh
+      - name: Upload Linux binary
+        uses: actions/upload-artifact@v6
+        with:
+          name: dusk-linux
+          path: build-linux/Dusk
+          if-no-files-found: error
+
+  build-psp:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+      - name: Set up Docker
+        uses: docker/setup-docker-action@v5
+      - name: Build psp
+        run: ./scripts/build-psp-docker.sh
+      - name: Move EBOOT.PBP to Dusk subfolder
+        run: |
+          mkdir -p ./git-artifcats/Dusk/PSP/GAME/Dusk
+          cp build-psp/EBOOT.PBP ./git-artifcats/Dusk/PSP/GAME/Dusk/EBOOT.PBP
+      - name: Upload psp binary
+        uses: actions/upload-artifact@v6
+        with:
+          name: dusk-psp
+          path: ./git-artifcats/Dusk
+          if-no-files-found: error
+
+  build-knulli:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+      - name: Set up Docker
+        uses: docker/setup-docker-action@v5
+      - name: Build knulli
+        run: ./scripts/build-knulli-docker.sh
+      - name: Move output to Dusk subfolder
+        run: |
+          mkdir -p ./git-artifcats/Dusk
+          cp -r build-knulli/dusk ./git-artifcats/Dusk
+      - name: Upload knulli binary
+        uses: actions/upload-artifact@v6
+        with:
+          name: dusk-knulli
+          path: ./git-artifcats/Dusk
+          if-no-files-found: error
+
+  build-gamecube:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+      - name: Set up Docker
+        uses: docker/setup-docker-action@v5
+      - name: Build GameCube
+        run: ./scripts/build-gamecube-docker.sh
+      - name: Copy output files.
+        run: |
+          mkdir -p ./git-artifcats/Dusk
+          cp build-gamecube/Dusk.dol ./git-artifcats/Dusk/Dusk.dol
+          cp build-gamecube/dusk.dsk ./git-artifcats/Dusk/dusk.dsk
+      - name: Upload GameCube binary
+        uses: actions/upload-artifact@v6
+        with:
+          name: dusk-gamecube
+          path: ./git-artifcats/Dusk
+          if-no-files-found: error
+
+  build-wii:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+      - name: Set up Docker
+        uses: docker/setup-docker-action@v5
+      - name: Build Wii
+        run: ./scripts/build-wii-docker.sh
+      - name: Copy output files.
+        run: |
+          mkdir -p ./git-artifcats/Dusk/apps/Dusk
+          cp build-wii/Dusk.dol ./git-artifcats/Dusk/apps/Dusk/boot.dol
+          cp build-wii/dusk.dsk ./git-artifcats/Dusk/apps/Dusk/dusk.dsk
+          cp docker/dolphin/meta.xml ./git-artifcats/Dusk/apps/Dusk/meta.xml
+      - name: Upload Wii binary
+        uses: actions/upload-artifact@v6
+        with:
+          name: dusk-wii
+          path: ./git-artifcats/Dusk
+          if-no-files-found: error

.gitignore

@@ -101,4 +101,7 @@ yarn-error.log
 yarn.lock
 
 .editor
-.venv
+.venv
+
+/build2
+/build*

CMakeLists.txt

@@ -4,15 +4,13 @@
 # https://opensource.org/licenses/MIT
 
 # Setup
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.18)
+
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED ON)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
 
-if(NOT DEFINED DUSK_TARGET_SYSTEM)
-  set(DUSK_TARGET_SYSTEM "linux")
-  #set(DUSK_TARGET_SYSTEM "psp")
-endif()
+option(DUSK_BUILD_TESTS "Enable tests" OFF)
 
 # Prep cache
 set(DUSK_CACHE_TARGET "dusk-target")
@@ -21,100 +19,96 @@ set(DUSK_CACHE_TARGET "dusk-target")
 set(DUSK_ROOT_DIR "${CMAKE_SOURCE_DIR}")
 set(DUSK_BUILD_DIR "${CMAKE_BINARY_DIR}")
 set(DUSK_SOURCES_DIR "${DUSK_ROOT_DIR}/src")
+set(DUSK_TEST_DIR "${DUSK_ROOT_DIR}/test")
 set(DUSK_TEMP_DIR "${DUSK_BUILD_DIR}/temp")
 set(DUSK_TOOLS_DIR "${DUSK_ROOT_DIR}/tools")
 set(DUSK_DATA_DIR "${DUSK_ROOT_DIR}/data")
 set(DUSK_ASSETS_DIR "${DUSK_ROOT_DIR}/assets")
 set(DUSK_BUILT_ASSETS_DIR "${DUSK_BUILD_DIR}/built_assets" CACHE INTERNAL ${DUSK_CACHE_TARGET})
 set(DUSK_GENERATED_HEADERS_DIR "${DUSK_BUILD_DIR}/generated")
-set(DUSK_TARGET_NAME "Dusk" CACHE INTERNAL ${DUSK_CACHE_TARGET})
 set(DUSK_BUILD_BINARY ${DUSK_BUILD_DIR}/Dusk CACHE INTERNAL ${DUSK_CACHE_TARGET})
 set(DUSK_ASSETS "" CACHE INTERNAL ${DUSK_CACHE_TARGET})
+set(DUSK_LIBRARY_TARGET_NAME "DuskCore" CACHE INTERNAL ${DUSK_CACHE_TARGET})
+set(DUSK_BINARY_TARGET_NAME "Dusk" CACHE INTERNAL ${DUSK_CACHE_TARGET})
+set(DUSK_ASSETS_ZIP "${DUSK_BUILD_DIR}/dusk.dsk" CACHE INTERNAL ${DUSK_CACHE_TARGET})
+
+if(NOT DEFINED DUSK_TARGET_SYSTEM)
+  set(DUSK_TARGET_SYSTEM "linux")
+endif()
 
 # Create directories
 file(MAKE_DIRECTORY ${DUSK_GENERATED_HEADERS_DIR})
+file(MAKE_DIRECTORY ${DUSK_TEMP_DIR})
+file(MAKE_DIRECTORY ${DUSK_BUILT_ASSETS_DIR})
 
-# Find packages
+# Required build packages
 find_package(Python3 COMPONENTS Interpreter REQUIRED)
 
-# Toolchains
-if(DUSK_TARGET_SYSTEM STREQUAL "psp")
-  find_package(pspsdk REQUIRED)
-endif()
-
-# Init Project
-project(${DUSK_TARGET_NAME}
+# Init Project.
+project(${DUSK_LIBRARY_TARGET_NAME}
   VERSION 1.0.0
   LANGUAGES C
 )
 
-# Executable
-add_executable(${DUSK_TARGET_NAME})
+# Either, create library and binary separately (used for tests), or make them
+# one in the same so all code is in the binary only.
+# Binary Executable
+add_executable(${DUSK_BINARY_TARGET_NAME} ${DUSK_SOURCES_DIR}/dusk/null.c)
+
+if(DUSK_BUILD_TESTS)
+  # MainLibrary
+  add_library(${DUSK_LIBRARY_TARGET_NAME} STATIC)
+
+  # Link library to binary
+  target_link_libraries(${DUSK_BINARY_TARGET_NAME}
+    PUBLIC
+      ${DUSK_LIBRARY_TARGET_NAME}
+  )
+else()
+  set(DUSK_LIBRARY_TARGET_NAME "${DUSK_BINARY_TARGET_NAME}" CACHE INTERNAL ${DUSK_CACHE_TARGET})
+endif()
+
+# Definitions
+target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    DUSK_TARGET_SYSTEM="${DUSK_TARGET_SYSTEM}"
+)
+
+# Toolchains
+include(cmake/targets/${DUSK_TARGET_SYSTEM}.cmake)
 
 # Add tools
 add_subdirectory(tools)
 
-# Assets
-add_subdirectory(assets)
-
-# Add libraries
-if(DUSK_TARGET_SYSTEM STREQUAL "linux")
-  find_package(SDL2 REQUIRED)
-  find_package(OpenGL REQUIRED)
-  target_link_libraries(${DUSK_TARGET_NAME} PRIVATE 
-    SDL2
-    OpenGL::GL
-    GL
-  )
-
-elseif(DUSK_TARGET_SYSTEM STREQUAL "psp")
-  find_package(SDL2 REQUIRED)
-  find_package(OpenGL REQUIRED)
-  target_link_libraries(${DUSK_TARGET_NAME} PUBLIC
-    ${SDL2_LIBRARIES}
-    SDL2
-    OpenGL::GL
-    zip
-    bz2
-    z
-    mbedtls
-    mbedcrypto
-    lzma
-  )
-  target_include_directories(${DUSK_TARGET_NAME} PRIVATE
-    ${SDL2_INCLUDE_DIRS}
-  )
-endif()
-
-# Add code
-add_subdirectory(src)
-
-# Build assets
-add_custom_target(DUSK_ASSETS_BUILT ALL
-  COMMAND
-    ${Python3_EXECUTABLE} ${DUSK_TOOLS_DIR}/assettool.py
-      --assets ${DUSK_GAME_ASSETS_DIR}
-      --output-assets ${DUSK_BUILT_ASSETS_DIR}
-      --output-file ${DUSK_BUILD_DIR}/dusk.dsk
-      --headers-dir ${DUSK_GENERATED_HEADERS_DIR}
-      --input ${DUSK_ASSETS}
-)
-add_dependencies(${DUSK_TARGET_NAME} DUSK_ASSETS_BUILT)
-
-# Include generated headers
-target_include_directories(${DUSK_TARGET_NAME} PUBLIC
+# Include generated headers from tools.
+target_include_directories(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
   ${DUSK_GENERATED_HEADERS_DIR}
 )
 
-# Postbuild
-if(DUSK_TARGET_SYSTEM STREQUAL "psp")
-  create_pbp_file(
-    TARGET "${DUSK_TARGET_NAME}"
-    ICON_PATH NULL
-    BACKGROUND_PATH NULL
-    PREVIEW_PATH NULL
-    TITLE "${DUSK_TARGET_NAME}"
-    PSAR_PATH ${DUSK_BUILD_DIR}/dusk.dsk
-    VERSION 01.00
-  )
+# Add main code
+add_subdirectory(${DUSK_SOURCES_DIR})
+
+# Include generated headers
+target_include_directories(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
+  ${DUSK_GENERATED_HEADERS_DIR}
+)
+
+# Handle tests
+if(DUSK_BUILD_TESTS)
+  enable_testing()
+  add_subdirectory(test)
 endif()
+
+# Build assets
+file(GLOB_RECURSE DUSK_ASSET_FILES CONFIGURE_DEPENDS "${DUSK_ASSETS_DIR}/*")
+add_custom_command(
+  OUTPUT "${DUSK_ASSETS_ZIP}"
+  COMMAND ${CMAKE_COMMAND} -E make_directory "${DUSK_ASSETS_DIR}"
+  COMMAND ${CMAKE_COMMAND} -E rm -f "${DUSK_ASSETS_ZIP}"
+  COMMAND ${CMAKE_COMMAND} -E tar "cf" "${DUSK_ASSETS_ZIP}" --format=zip -- .
+  WORKING_DIRECTORY "${DUSK_ASSETS_DIR}"
+  DEPENDS ${DUSK_ASSET_FILES}
+  VERBATIM
+)
+add_custom_target(DUSK_ASSETS_BUILT DEPENDS "${DUSK_ASSETS_ZIP}")
+add_dependencies(${DUSK_LIBRARY_TARGET_NAME} DUSK_ASSETS_BUILT)

README.md

@@ -9,7 +9,7 @@ following packages, depending on your system;
 
 Fedora;
 ```
-sudo dnf install git make gcc python python-polib python3-pillow python3-dotenv python3-numpy python-qt5 python3-pyopengl
+sudo dnf install git make gcc cmake python python-polib python3-pillow python3-dotenv python3-numpy python-qt5 python3-pyopengl SDL2-devel zlib-devel libzip-devel bzip2-devel openssl-devel lzma-sdk-devel xz xz-devel lua-devel
 ```
 
 Ubuntu;

archive/asset/bundle/__main__.py

@@ -1,10 +1,10 @@
 import sys, os
-from assetstool.args import args
-from assetstool.processasset import processAsset
-from assetstool.processpalette import processPaletteList
-from assetstool.processtileset import processTilesetList
-from assetstool.processlanguage import processLanguageList
-from assetstool.assethelpers import getBuiltAssetsRelativePath
+from tools.asset.args import args
+from tools.asset.process.asset import processAsset
+from tools.asset.process.palette import processPaletteList
+from tools.asset.process.tileset import processTilesetList
+from tools.asset.process.language import processLanguageList
+from tools.asset.path import getBuiltAssetsRelativePath
 import zipfile
 
 # Parse input file args.

archive/asset/path.py

@@ -1,5 +1,5 @@
 import os
-from assetstool.args import args
+from tools.asset.args import args
 
 def getAssetRelativePath(fullPath):
   # Get the relative path to the asset

archive/asset/process/asset.py

@@ -1,11 +1,11 @@
 import sys
 # from processtileset import processTileset
-from assetstool.processimage import processImage
-from assetstool.processpalette import processPalette
-from assetstool.processtileset import processTileset
-from assetstool.processmap import processMap
-from assetstool.processlanguage import processLanguage
-from assetstool.processscript import processScript
+from tools.asset.process.image import processImage
+from tools.asset.process.palette import processPalette
+from tools.asset.process.tileset import processTileset
+from tools.asset.process.map import processMap
+from tools.asset.process.language import processLanguage
+from tools.asset.process.script import processScript
 
 processedAssets = []
 

archive/asset/process/image.py

@@ -1,10 +1,10 @@
 import os
 import sys
 from PIL import Image
-from assetstool.processpalette import extractPaletteFromImage, palettes
-from assetstool.args import args
-from assetstool.assethelpers import getAssetRelativePath
-from assetstool.assetcache import assetGetCache, assetCache
+from tools.asset.process.palette import extractPaletteFromImage, palettes
+from tools.asset.args import args
+from tools.asset.path import getAssetRelativePath
+from tools.asset.cache import assetGetCache, assetCache
 
 images = []
 
@@ -35,10 +35,24 @@ def processPalettizedImage(asset):
   imagePalette = extractPaletteFromImage(image)
 
   # Find palette that contains every color
-  for palette in palettes:
-    if all(color in palette['pixels'] for color in imagePalette):
+  palette = None
+  for p in palettes:
+    hasAllColors = True
+    for color in imagePalette:
+      for palColor in p['pixels']:
+        if color[0] == palColor[0] and color[1] == palColor[1] and color[2] == palColor[2] and color[3] == palColor[3]:
+          break
+        elif color[3] == 0 and palColor[3] == 0:
+          break
+      else:
+        print('Pallete {} does not contain color #{}'.format(p['paletteName'], '{:02x}{:02x}{:02x}{:02x}'.format(color[0], color[1], color[2], color[3])))
+        hasAllColors = False
+        break
+    if hasAllColors:
+      palette = p
       break
-  else:
+    
+  if palette is None:
     palette = palettes[0]  # Just to avoid reference error
     print(f"No matching palette found for {assetPath}!")
     # Find which pixel is missing

archive/asset/process/language.py

@@ -1,9 +1,9 @@
 import sys
 import os
-from assetstool.args import args
-from assetstool.assetcache import assetCache, assetGetCache
-from assetstool.assethelpers import getAssetRelativePath
-from dusk.defs import defs
+from tools.asset.args import args
+from tools.asset.cache import assetCache, assetGetCache
+from tools.asset.path import getAssetRelativePath
+from tools.dusk.defs import defs
 import polib
 import re
 
@@ -141,14 +141,49 @@ def processLanguageList():
     os.makedirs(os.path.dirname(outputFile), exist_ok=True)
     with open(outputFile, "wb") as f:
       f.write(langBuffer)
-    
-
+  
   # Write out the language keys header file
   outputFile = os.path.join(args.headers_dir, "locale", "language", "keys.h")
   os.makedirs(os.path.dirname(outputFile), exist_ok=True)
   with open(outputFile, "w") as f:
     f.write(headerKeys)
 
+  # Generate language list.
+  langValues = {}
+  headerLocale = "#pragma once\n#include \"locale/localeinfo.h\"\n\n"
+  headerLocale += "typedef enum {\n"
+  count = 0
+  headerLocale += f"  DUSK_LOCALE_NULL = {count},\n"
+  count += 1
+  for lang in LANGUAGE_DATA:
+    langKey = lang.replace('-', '_').replace(' ', '_').upper()
+    langValues[lang] = count
+    headerLocale += f"  DUSK_LOCALE_{langKey} = {count},\n"
+    count += 1
+  headerLocale += f"  DUSK_LOCALE_COUNT = {count}\n"
+  headerLocale += "} dusklocale_t;\n\n"
+  
+  headerLocale += f"static const localeinfo_t LOCALE_INFOS[DUSK_LOCALE_COUNT] = {{\n"
+  for lang in LANGUAGE_DATA:
+    langKey = lang.replace('-', '_').replace(' ', '_').upper()
+    headerLocale += f"  [DUSK_LOCALE_{langKey}] = {{\n"
+    headerLocale += f"    .file = \"{lang}\"\n"
+    headerLocale += f"  }},\n"
+  headerLocale += "};\n"
+
+  headerLocale += f"static const char_t *LOCALE_SCRIPT = \n"
+  for lang in LANGUAGE_DATA:
+    langKey = lang.replace('-', '_').replace(' ', '_').upper()
+    langValue = langValues[lang]
+    headerLocale += f"  \"DUSK_LOCALE_{langKey} = {langValue}\\n\"\n"
+  headerLocale +=  ";\n"
+
+  # Write out the locale enum header file
+  outputFile = os.path.join(args.headers_dir, "locale", "locale.h")
+  os.makedirs(os.path.dirname(outputFile), exist_ok=True)
+  with open(outputFile, "w") as f:
+    f.write(headerLocale)
+
   return {
     'files': files
   }

archive/asset/process/map.py

@@ -2,12 +2,12 @@ import struct
 import sys
 import os
 import json
-from assetstool.args import args
-from assetstool.assetcache import assetCache, assetGetCache
-from assetstool.assethelpers import getAssetRelativePath
-from dusk.defs import TILE_WIDTH, TILE_HEIGHT, TILE_DEPTH, CHUNK_WIDTH, CHUNK_HEIGHT, CHUNK_DEPTH, CHUNK_TILE_COUNT
-from dusk.map import Map
-from dusk.chunk import Chunk
+from tools.asset.args import args
+from tools.asset.cache import assetCache, assetGetCache
+from tools.asset.path import getAssetRelativePath
+from tools.dusk.defs import TILE_WIDTH, TILE_HEIGHT, TILE_DEPTH, CHUNK_WIDTH, CHUNK_HEIGHT, CHUNK_DEPTH, CHUNK_TILE_COUNT
+from tools.dusk.map import Map
+from tools.dusk.chunk import Chunk
 
 def convertModelData(modelData):
   # TLDR; Model data stores things efficiently with indices, but we buffer it 
@@ -51,7 +51,7 @@ def processChunk(chunk):
 
   # Generate binary buffer for efficient output
   buffer = bytearray()
-  buffer.extend(b'DCF')# Header
+  buffer.extend(b'DMC')# Header
   buffer.extend(len(chunk.tiles).to_bytes(4, 'little'))  # Number of tiles
   buffer.extend(len(models).to_bytes(1, 'little'))  # Number of models
   buffer.extend(len(chunk.entities).to_bytes(1, 'little'))  # Number of entities
@@ -92,7 +92,7 @@ def processChunk(chunk):
   # Write out map file
   relative = getAssetRelativePath(chunk.getFilename())
   fileNameWithoutExt = os.path.splitext(os.path.basename(relative))[0]
-  outputFileRelative = os.path.join(os.path.dirname(relative), f"{fileNameWithoutExt}.dcf")
+  outputFileRelative = os.path.join(os.path.dirname(relative), f"{fileNameWithoutExt}.dmc")
   outputFilePath = os.path.join(args.output_assets, outputFileRelative)
   os.makedirs(os.path.dirname(outputFilePath), exist_ok=True)
   with open(outputFilePath, "wb") as f:
@@ -111,11 +111,11 @@ def processMap(asset):
 
   map = Map(None)
   map.load(asset['path'])
-  dir = map.getMapDirectory()
+  chunksDir = map.getChunkDirectory()
 
-  files = os.listdir(dir)
+  files = os.listdir(chunksDir)
   if len(files) == 0:
-    print(f"Error: No chunk files found in map directory {dir}.")
+    print(f"Error: No chunk files found in {chunksDir}.")
     sys.exit(1)
 
   chunkFiles = []
@@ -133,21 +133,22 @@ def processMap(asset):
     result = processChunk(chunk)
     chunkFiles.extend(result['files'])
 
-  outMap = {
-    'files': chunkFiles
-  }
-  return assetCache(asset['path'], outMap)
-
-  # List files
-  chunkFiles = []
-  for fileName in os.listdir(asset['path']):
-    if not fileName.endswith('.json'):
-      continue
-    result = processChunk(os.path.join(asset['path'], fileName))
-    chunkFiles.extend(result['files'])
+  # Map file
+  outBuffer = bytearray()
+  outBuffer.extend(b'DMF')
+  outBuffer.extend(len(chunkFiles).to_bytes(4, 'little'))
+  
+  # DMF (Dusk Map file)
+  fileRelative = getAssetRelativePath(asset['path'])
+  fileNameWithoutExt = os.path.splitext(os.path.basename(fileRelative))[0]
+  outputMapRelative = os.path.join(os.path.dirname(fileRelative), f"{fileNameWithoutExt}.dmf")
+  outputMapPath = os.path.join(args.output_assets, outputMapRelative)
+  os.makedirs(os.path.dirname(outputMapPath), exist_ok=True)
+  with open(outputMapPath, "wb") as f:
+    f.write(outBuffer)
 
   outMap = {
     'files': chunkFiles
   }
-
+  outMap['files'].append(outputMapPath)
   return assetCache(asset['path'], outMap)

archive/asset/process/palette.py

@@ -1,8 +1,9 @@
+import json
 import os
 from PIL import Image
 import datetime
-from assetstool.args import args
-from assetstool.assetcache import assetCache, assetGetCache
+from tools.asset.args import args
+from tools.asset.cache import assetCache, assetGetCache
 
 palettes = []
 
@@ -78,6 +79,7 @@ def processPalette(asset):
 
 def processPaletteList():
   data = f"// Auto-generated palette list\n"
+  print(f"Generating palette list with {len(palettes)} palettes.")
   for palette in palettes:
     data += f"#include \"{palette['headerFile']}\"\n"
   data += f"\n"

archive/asset/process/script.py

@@ -1,9 +1,9 @@
 import sys
 import os
-from assetstool.args import args
-from assetstool.assetcache import assetCache, assetGetCache
-from assetstool.assethelpers import getAssetRelativePath
-from dusk.defs import defs
+from tools.asset.args import args
+from tools.asset.cache import assetCache, assetGetCache
+from tools.asset.path import getAssetRelativePath
+from tools.dusk.defs import fileDefs
 
 def processScript(asset):
   cache = assetGetCache(asset['path'])
@@ -16,6 +16,10 @@ def processScript(asset):
     
   # TODO: I will precompile or minify the Lua code here in the future
 
+  # Replace all definitions in the code
+  for key, val in fileDefs.items():
+    luaCode = luaCode.replace(key, str(val))
+
   # Create output Dusk Script File (DSF) data
   data = ""
   data += "DSF"

archive/asset/process/tileset.py

@@ -3,10 +3,10 @@ import sys
 import os
 import datetime
 from xml.etree import ElementTree
-from assetstool.processimage import processImage
-from assetstool.assethelpers import getAssetRelativePath
-from assetstool.args import args
-from assetstool.assetcache import assetGetCache, assetCache
+from tools.asset.process.image import processImage
+from tools.asset.path import getAssetRelativePath
+from tools.asset.args import args
+from tools.asset.cache import assetGetCache, assetCache
 
 tilesets = []
 
@@ -126,6 +126,7 @@ def processTileset(asset):
   data += f"#pragma once\n"
   data += f"#include \"display/tileset/tileset.h\"\n\n"
   data += f"static const tileset_t TILESET_{tilesetNameUpper} = {{\n"
+  data += f"  .name = {json.dumps(tilesetName)},\n"
   data += f"  .tileWidth = {tilesetData['tileWidth']},\n"
   data += f"  .tileHeight = {tilesetData['tileHeight']},\n"
   data += f"  .tileCount = {tilesetData['columns'] * tilesetData['rows']},\n"

archive/assetpalette.c

@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) 2026 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "assetpalette.h"
+#include "asset/assettype.h"
+#include "assert/assert.h"
+
+errorret_t assetPaletteLoad(assetentire_t entire) {
+  assertNotNull(entire.data, "Data pointer cannot be NULL.");
+  assertNotNull(entire.output, "Output pointer cannot be NULL.");
+
+  assetpalette_t *assetData = (assetpalette_t *)entire.data;
+  palette_t *palette = (palette_t *)entire.output;
+
+  // Read header and version (first 4 bytes)
+  if(
+    assetData->header[0] != 'D' || 
+    assetData->header[1] != 'P' ||
+    assetData->header[2] != 'F'
+  ) {
+    errorThrow("Invalid palette header");
+  }
+  
+  // Version (can only be 1 atm)
+  if(assetData->version != 0x01) {
+    errorThrow("Unsupported palette version");
+  }
+
+  // Check color count.
+  if(
+    assetData->colorCount == 0 || 
+    assetData->colorCount > PALETTE_COLOR_COUNT_MAX
+  ) {
+    errorThrow("Invalid palette color count");
+  }
+  
+  paletteInit(
+    palette,
+    assetData->colorCount,
+    assetData->colors
+  );
+  errorOk();
+}

archive/assetpalette.h

@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2026 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+#include "error/error.h"
+#include "display/texture/palette.h"
+
+typedef struct assetentire_s assetentire_t;
+
+#pragma pack(push, 1)
+typedef struct {
+  char_t header[3];
+  uint8_t version;
+
+  uint8_t colorCount;
+  color_t colors[PALETTE_COLOR_COUNT_MAX];
+} assetpalette_t;
+#pragma pack(pop)
+
+/**
+ * Loads a palette from the given data pointer into the output palette.
+ *
+ * @param entire Data received from the asset loader system.
+ * @return An error code.
+ */
+errorret_t assetPaletteLoad(assetentire_t entire);

archive/dusk/chunk.py

@@ -1,11 +1,11 @@
 import json
 import os
-from dusk.event import Event
-from dusk.defs import CHUNK_WIDTH, CHUNK_HEIGHT, CHUNK_DEPTH, CHUNK_VERTEX_COUNT_MAX, TILE_SHAPE_NULL
-from dusk.tile import Tile
-from dusk.entity import Entity
-from dusk.region import Region
-from editortool.map.vertexbuffer import VertexBuffer
+from tools.dusk.event import Event
+from tools.dusk.defs import CHUNK_WIDTH, CHUNK_HEIGHT, CHUNK_DEPTH, CHUNK_VERTEX_COUNT_MAX, TILE_SHAPE_NULL
+from tools.dusk.tile import Tile
+from tools.dusk.entity import Entity
+from tools.dusk.region import Region
+from tools.editor.map.vertexbuffer import VertexBuffer
 from OpenGL.GL import *
 
 class Chunk:
@@ -131,12 +131,12 @@ class Chunk:
     return self.dirty
 
   def getFilename(self):
-    if not self.map or not hasattr(self.map, 'getMapDirectory'):
+    if not self.map or not hasattr(self.map, 'getChunkDirectory'):
       return None
-    dir_path = self.map.getMapDirectory()
-    if dir_path is None:
+    dirPath = self.map.getChunkDirectory()
+    if dirPath is None:
       return None
-    return f"{dir_path}/{self.x}_{self.y}_{self.z}.json"
+    return f"{dirPath}/{self.x}_{self.y}_{self.z}.json"
   
   def draw(self):
     self.vertexBuffer.draw()

archive/dusk/defs.py

@@ -1,4 +1,4 @@
-from dotenv import load_dotenv
+from dotenv import load_dotenv, dotenv_values
 import os
 import sys
 
@@ -13,6 +13,8 @@ if not os.path.isfile(duskDefsPath):
 load_dotenv(dotenv_path=duskDefsPath)
 defs = {key: os.getenv(key) for key in os.environ.keys()}
 
+fileDefs = dotenv_values(dotenv_path=duskDefsPath)
+
 # Parsed out definitions
 CHUNK_WIDTH = int(defs.get('CHUNK_WIDTH'))
 CHUNK_HEIGHT = int(defs.get('CHUNK_HEIGHT'))

archive/dusk/entity.py

@@ -1,5 +1,5 @@
-from dusk.defs import ENTITY_TYPE_NULL, ENTITY_TYPE_NPC, CHUNK_WIDTH, CHUNK_HEIGHT, CHUNK_DEPTH, TILE_WIDTH, TILE_HEIGHT, TILE_DEPTH
-from editortool.map.vertexbuffer import VertexBuffer
+from tools.dusk.defs import ENTITY_TYPE_NULL, ENTITY_TYPE_NPC, CHUNK_WIDTH, CHUNK_HEIGHT, CHUNK_DEPTH, TILE_WIDTH, TILE_HEIGHT, TILE_DEPTH
+from tools.editor.map.vertexbuffer import VertexBuffer
 
 class Entity:
   def __init__(self, chunk, localX=0, localY=0, localZ=0):

archive/dusk/map.py

@@ -1,10 +1,11 @@
 import json
-from dusk.event import Event
+import sys
+from tools.dusk.event import Event
 from PyQt5.QtWidgets import QFileDialog, QMessageBox
 from PyQt5.QtCore import QTimer
 import os
-from dusk.chunk import Chunk
-from dusk.defs import MAP_WIDTH, MAP_HEIGHT, MAP_DEPTH, CHUNK_WIDTH, CHUNK_HEIGHT, CHUNK_DEPTH
+from tools.dusk.chunk import Chunk
+from tools.dusk.defs import MAP_WIDTH, MAP_HEIGHT, MAP_DEPTH, CHUNK_WIDTH, CHUNK_HEIGHT, CHUNK_DEPTH
 import traceback
 
 MAP_DEFAULT_PATH = os.path.join(os.path.dirname(__file__), '../../assets/map/')
@@ -129,11 +130,17 @@ class Map:
     return self.mapFileName if self.mapFileName and os.path.exists(self.mapFileName) else None
 
   def getMapDirectory(self):
-    fname = self.getMapFilename()
-    if not fname or not fname.endswith('.json'):
+    if self.mapFileName is None:
       return None
-    return fname[:-5]  # Remove '.json' extension
-
+    dirname = os.path.dirname(self.mapFileName)
+    return dirname
+  
+  def getChunkDirectory(self):
+    dirName = self.getMapDirectory()
+    if dirName is None:
+      return None
+    return os.path.join(dirName, 'chunks')
+  
   def anyChunksDirty(self):
     for chunk in self.chunks.values():
       if chunk.isDirty():
@@ -149,7 +156,7 @@ class Map:
     newTopLeftChunkY = y // CHUNK_HEIGHT - (MAP_HEIGHT // 2)
     newTopLeftChunkZ = z // CHUNK_DEPTH - (MAP_DEPTH // 2)
 
-    if (newTopLeftChunkX != self.topLeftX or
+    if(newTopLeftChunkX != self.topLeftX or
         newTopLeftChunkY != self.topLeftY or
         newTopLeftChunkZ != self.topLeftZ):
       
@@ -159,7 +166,7 @@ class Map:
         chunkWorldX = chunk.x
         chunkWorldY = chunk.y
         chunkWorldZ = chunk.z
-        if (chunkWorldX < newTopLeftChunkX or
+        if(chunkWorldX < newTopLeftChunkX or
             chunkWorldX >= newTopLeftChunkX + MAP_WIDTH or
             chunkWorldY < newTopLeftChunkY or
             chunkWorldY >= newTopLeftChunkY + MAP_HEIGHT or

archive/dusk/region.py

@@ -1,5 +1,5 @@
-from dusk.defs import CHUNK_WIDTH, CHUNK_HEIGHT, CHUNK_DEPTH, TILE_WIDTH, TILE_HEIGHT, TILE_DEPTH
-from editortool.map.vertexbuffer import VertexBuffer
+from tools.dusk.defs import CHUNK_WIDTH, CHUNK_HEIGHT, CHUNK_DEPTH, TILE_WIDTH, TILE_HEIGHT, TILE_DEPTH
+from tools.editor.map.vertexbuffer import VertexBuffer
 from OpenGL.GL import *
 from OpenGL.GLU import *
 

archive/dusk/tile.py

@@ -1,5 +1,5 @@
 from OpenGL.GL import *
-from dusk.defs import (
+from tools.dusk.defs import (
   TILE_WIDTH, TILE_HEIGHT, TILE_DEPTH,
   CHUNK_WIDTH, CHUNK_HEIGHT, CHUNK_DEPTH,
   TILE_SHAPE_NULL, TILE_SHAPE_FLOOR,

archive/editor/__main__.py

@@ -6,9 +6,9 @@ from PyQt5.QtWidgets import (
 )
 from OpenGL.GL import *
 from OpenGL.GLU import *
-from editortool.maptool import MapWindow
-from editortool.langtool import LangToolWindow
-from editortool.cutscenetool import CutsceneToolWindow
+from tools.editor.maptool import MapWindow
+from tools.editor.langtool import LangToolWindow
+from tools.editor.cutscenetool import CutsceneToolWindow
 
 DEFAULT_TOOL = None
 DEFAULT_TOOL = "map"

archive/editor/cutscenetool.py

@@ -1,7 +1,7 @@
 from PyQt5.QtWidgets import QMainWindow, QApplication, QWidget, QVBoxLayout, QHBoxLayout, QLabel, QPushButton, QListWidget, QListWidgetItem, QMenuBar, QAction, QFileDialog, QMessageBox
 from PyQt5.QtGui import QKeySequence
-from editortool.cutscene.cutsceneitemeditor import CutsceneItemEditor
-from editortool.cutscene.cutscenemenubar import CutsceneMenuBar
+from tools.editor.cutscene.cutsceneitemeditor import CutsceneItemEditor
+from tools.editor.cutscene.cutscenemenubar import CutsceneMenuBar
 import sys
 
 class CutsceneToolWindow(QMainWindow):

archive/editor/map/camera.py

@@ -2,7 +2,7 @@ import math
 import time
 from OpenGL.GL import *
 from OpenGL.GLU import *
-from dusk.defs import TILE_WIDTH, TILE_HEIGHT, TILE_DEPTH, RPG_CAMERA_PIXELS_PER_UNIT, RPG_CAMERA_Z_OFFSET, RPG_CAMERA_FOV
+from tools.dusk.defs import TILE_WIDTH, TILE_HEIGHT, TILE_DEPTH, RPG_CAMERA_PIXELS_PER_UNIT, RPG_CAMERA_Z_OFFSET, RPG_CAMERA_FOV
 
 class Camera:
   def __init__(self, parent):

archive/editor/map/chunkpanel.py

@@ -1,5 +1,5 @@
 from PyQt5.QtWidgets import QWidget, QVBoxLayout, QLabel, QGridLayout, QTreeWidget, QTreeWidgetItem, QComboBox
-from dusk.defs import CHUNK_WIDTH, CHUNK_HEIGHT, CHUNK_DEPTH, TILE_SHAPES
+from tools.dusk.defs import CHUNK_WIDTH, CHUNK_HEIGHT, CHUNK_DEPTH, TILE_SHAPES
 
 class ChunkPanel(QWidget):
   def __init__(self, parent):

archive/editor/map/entitypanel.py

@@ -1,7 +1,7 @@
 from PyQt5.QtWidgets import QWidget, QVBoxLayout, QLabel, QComboBox, QHBoxLayout, QPushButton, QLineEdit, QListWidget, QListWidgetItem
 from PyQt5.QtCore import Qt
-from dusk.entity import Entity
-from dusk.defs import CHUNK_WIDTH, CHUNK_HEIGHT, CHUNK_DEPTH, ENTITY_TYPES, ENTITY_TYPE_NULL
+from tools.dusk.entity import Entity
+from tools.dusk.defs import CHUNK_WIDTH, CHUNK_HEIGHT, CHUNK_DEPTH, ENTITY_TYPES, ENTITY_TYPE_NULL
 
 class EntityPanel(QWidget):
   def __init__(self, parent):

archive/editor/map/grid.py

@@ -1,5 +1,5 @@
 from OpenGL.GL import *
-from dusk.defs import TILE_WIDTH, TILE_HEIGHT, TILE_DEPTH
+from tools.dusk.defs import TILE_WIDTH, TILE_HEIGHT, TILE_DEPTH
 
 class Grid:
   def __init__(self, lines=1000):

archive/editor/map/mapinfopanel.py

@@ -1,5 +1,5 @@
 from PyQt5.QtWidgets import QWidget, QVBoxLayout, QLabel, QLineEdit, QPushButton, QHBoxLayout, QMessageBox
-from dusk.defs import CHUNK_WIDTH, CHUNK_HEIGHT, CHUNK_DEPTH
+from tools.dusk.defs import CHUNK_WIDTH, CHUNK_HEIGHT, CHUNK_DEPTH
 
 class MapInfoPanel(QWidget):
   def __init__(self, parent):

archive/editor/map/mapleftpanel.py

@@ -1,7 +1,7 @@
 from PyQt5.QtWidgets import QWidget, QVBoxLayout, QGridLayout, QPushButton, QTabWidget, QLabel
-from editortool.map.chunkpanel import ChunkPanel
-from editortool.map.entitypanel import EntityPanel
-from editortool.map.regionpanel import RegionPanel
+from tools.editor.map.chunkpanel import ChunkPanel
+from tools.editor.map.entitypanel import EntityPanel
+from tools.editor.map.regionpanel import RegionPanel
 
 class MapLeftPanel(QWidget):
   def __init__(self, parent):

archive/editor/map/menubar.py

@@ -1,7 +1,7 @@
 import os
 from PyQt5.QtWidgets import QAction, QMenuBar, QFileDialog
 from PyQt5.QtGui import QKeySequence
-from dusk.map import MAP_DEFAULT_PATH
+from tools.dusk.map import MAP_DEFAULT_PATH
 
 class MapMenubar:
   def __init__(self, parent):

archive/editor/map/regionpanel.py

@@ -1,7 +1,7 @@
 from PyQt5.QtWidgets import QWidget, QVBoxLayout, QLabel, QComboBox, QHBoxLayout, QPushButton, QLineEdit, QListWidget, QListWidgetItem
 from PyQt5.QtCore import Qt
-from dusk.entity import Entity
-from dusk.defs import CHUNK_WIDTH, CHUNK_HEIGHT, CHUNK_DEPTH, ENTITY_TYPES, ENTITY_TYPE_NULL
+from tools.dusk.entity import Entity
+from tools.dusk.defs import CHUNK_WIDTH, CHUNK_HEIGHT, CHUNK_DEPTH, ENTITY_TYPES, ENTITY_TYPE_NULL
 
 class RegionPanel(QWidget):
   def __init__(self, parent):

archive/editor/map/selectbox.py

@@ -1,7 +1,7 @@
 import OpenGL.GL as gl
-from dusk.defs import defs
+from tools.dusk.defs import defs
 import colorsys
-from dusk.defs import TILE_WIDTH, TILE_HEIGHT, TILE_DEPTH
+from tools.dusk.defs import TILE_WIDTH, TILE_HEIGHT, TILE_DEPTH
 
 class SelectBox:
   def __init__(self, parent):

archive/editor/maptool.py

@@ -1,16 +1,16 @@
 import os
 from PyQt5.QtWidgets import QMainWindow, QWidget, QHBoxLayout, QMessageBox
 from PyQt5.QtCore import Qt
-from editortool.map.glwidget import GLWidget
-from editortool.map.mapleftpanel import MapLeftPanel
-from editortool.map.mapinfopanel import MapInfoPanel
-from editortool.map.menubar import MapMenubar
-from editortool.map.statusbar import StatusBar
-from dusk.map import Map
-from dusk.defs import CHUNK_WIDTH, CHUNK_HEIGHT, CHUNK_DEPTH, TILE_SHAPE_NULL, TILE_SHAPE_FLOOR
-from editortool.map.selectbox import SelectBox
-from editortool.map.camera import Camera
-from editortool.map.grid import Grid
+from tools.editor.map.glwidget import GLWidget
+from tools.editor.map.mapleftpanel import MapLeftPanel
+from tools.editor.map.mapinfopanel import MapInfoPanel
+from tools.editor.map.menubar import MapMenubar
+from tools.editor.map.statusbar import StatusBar
+from tools.dusk.map import Map
+from tools.dusk.defs import CHUNK_WIDTH, CHUNK_HEIGHT, CHUNK_DEPTH, TILE_SHAPE_NULL, TILE_SHAPE_FLOOR
+from tools.editor.map.selectbox import SelectBox
+from tools.editor.map.camera import Camera
+from tools.editor.map.grid import Grid
 
 class MapWindow(QMainWindow):
   def __init__(self):

archive/map/CMakeLists.txt

@@ -3,4 +3,4 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-add_asset(MAP map.json)
+add_subdirectory(testmap)

archive/map/testmap/CMakeLists.txt

@@ -3,4 +3,4 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-add_asset(SCRIPT test.lua)
+add_asset(MAP testmap.json)

archive/map/testmap/testmap.json

@@ -0,0 +1,3 @@
+{
+  "name": "Test"
+}

archive/modulemap.h

@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) 2025 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+#include "script/scriptcontext.h"
+#include "debug/debug.h"
+#include "assert/assert.h"
+#include "rpg/overworld/map.h"
+
+int moduleMapLoad(lua_State *L) {
+  assertNotNull(L, "Lua state cannot be NULL");
+
+  if(!lua_isstring(L, 1)) {
+    luaL_error(L, "Expected string map filename");
+    return 0;
+  }
+
+  // Potentially provide up to 3 params
+  chunkpos_t initial = { .x = 0, .y = 0, .z = 0 };
+  if(lua_isnumber(L, 2)) {
+    initial.x = (chunkunit_t)lua_tonumber(L, 2);
+  }
+  if(lua_isnumber(L, 3)) {
+    initial.y = (chunkunit_t)lua_tonumber(L, 3);
+  }
+  if(lua_isnumber(L, 4)) {
+    initial.z = (chunkunit_t)lua_tonumber(L, 4);
+  }
+
+  // Load the map.
+  errorret_t ret = mapLoad(luaL_checkstring(L, 1), initial);
+  if(ret.code != ERROR_OK) {
+    luaL_error(L, "Failed to load map");
+    errorCatch(errorPrint(ret));
+    return 0;
+  }
+
+  return 0;
+}
+
+void moduleMapSystem(scriptcontext_t *context) {
+  assertNotNull(context, "Script context cannot be NULL");
+
+  lua_register(context->luaState, "mapLoad", moduleMapLoad);
+}

archive/platform/CMakeLists.txt

@@ -0,0 +1,12 @@
+# Copyright (c) 2025 Dominic Masters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    sdl2.c
+    psp.c
+    dolphin.c
+)

archive/platform/dolphin.c

@@ -0,0 +1,92 @@
+/**
+ * Copyright (c) 2026 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "dolphin.h"
+
+void displayInitDolphin(void) {
+  VIDEO_Init();
+  DISPLAY.screenMode = VIDEO_GetPreferredMode(NULL);
+  DISPLAY.frameBuffer[0] = MEM_K0_TO_K1(
+    SYS_AllocateFramebuffer(DISPLAY.screenMode)
+  );
+  DISPLAY.frameBuffer[1] = MEM_K0_TO_K1(
+    SYS_AllocateFramebuffer(DISPLAY.screenMode)
+  );
+  VIDEO_Configure(DISPLAY.screenMode);
+
+  VIDEO_SetNextFramebuffer(DISPLAY.frameBuffer[DISPLAY.whichFrameBuffer]);
+  // VIDEO_SetPostRetraceCallback(copy_buffers);
+  VIDEO_SetBlack(FALSE);
+  VIDEO_Flush();
+  VIDEO_WaitVSync();
+  if(DISPLAY.screenMode->viTVMode & VI_NON_INTERLACE) VIDEO_WaitVSync();
+
+  DISPLAY.fifoBuffer = memalign(32, DISPLAY_FIFO_SIZE);
+  memoryZero(DISPLAY.fifoBuffer, DISPLAY_FIFO_SIZE);
+
+  GX_Init(DISPLAY.fifoBuffer, DISPLAY_FIFO_SIZE);
+
+  // This seems to be mostly related to interlacing vs progressive
+  GX_SetViewport(
+    0, 0,
+    DISPLAY.screenMode->fbWidth, DISPLAY.screenMode->efbHeight,
+    0, 1
+  );
+  float_t yscale = GX_GetYScaleFactor(
+    DISPLAY.screenMode->efbHeight, DISPLAY.screenMode->xfbHeight
+  );
+  uint32_t xfbHeight = GX_SetDispCopyYScale(yscale);
+  GX_SetScissor(
+    0, 0,
+    DISPLAY.screenMode->fbWidth, DISPLAY.screenMode->efbHeight
+  );
+  GX_SetDispCopySrc(
+    0, 0,
+    DISPLAY.screenMode->fbWidth, DISPLAY.screenMode->efbHeight
+  );
+  GX_SetDispCopyDst(DISPLAY.screenMode->fbWidth, xfbHeight);
+  GX_SetCopyFilter(
+    DISPLAY.screenMode->aa,
+    DISPLAY.screenMode->sample_pattern,
+    GX_TRUE,
+    DISPLAY.screenMode->vfilter
+  );
+  GX_SetFieldMode(
+    DISPLAY.screenMode->field_rendering,
+    (
+      (DISPLAY.screenMode->viHeight == 2 * DISPLAY.screenMode->xfbHeight) ?
+      GX_ENABLE :
+      GX_DISABLE
+    )
+  );
+
+  // Setup cull modes
+  GX_SetCullMode(GX_CULL_NONE);
+  GX_SetZMode(GX_FALSE, GX_ALWAYS, GX_FALSE);
+  GX_CopyDisp(DISPLAY.frameBuffer[DISPLAY.whichFrameBuffer], GX_TRUE);
+  GX_SetDispCopyGamma(GX_GM_1_0);
+
+  GX_ClearVtxDesc();
+  GX_SetVtxDesc(GX_VA_POS,  GX_INDEX16);
+  GX_SetVtxDesc(GX_VA_CLR0, GX_INDEX16);
+  GX_SetVtxDesc(GX_VA_TEX0, GX_INDEX16);
+  GX_SetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
+  GX_SetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_U8, 0);
+  GX_SetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
+}
+
+void displayDolphinSwap(void) {
+  GX_DrawDone();
+
+  DISPLAY.whichFrameBuffer ^= 1;
+  GX_SetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE);
+  GX_SetColorUpdate(GX_TRUE);
+  GX_CopyDisp(DISPLAY.frameBuffer[DISPLAY.whichFrameBuffer], GX_TRUE);
+  VIDEO_SetNextFramebuffer(DISPLAY.frameBuffer[DISPLAY.whichFrameBuffer]);
+  VIDEO_Flush();
+  VIDEO_WaitVSync();
+}

archive/platform/dolphin.h

@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2026 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+#include "dusk.h"
+#include "display/displaydefs.h"
+
+typedef struct {
+  void *frameBuffer[2];// Double-Bufferred
+  int whichFrameBuffer;
+  GXRModeObj *screenMode;
+  void *fifoBuffer;
+} displaydolphin_t;
+
+/**
+ * Initializes the display for Dolphin.
+ */
+void displayDolphinInit(void);
+
+/**
+ * Swaps the back buffer to the front for Dolphin.
+ */
+void displayDolphinSwap(void);

archive/platform/psp.c

@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) 2026 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "psp.h"
+
+void displayInitPSP(void) {
+  DISPLAY.usingShaderedPalettes = false;
+}

archive/platform/psp.h

@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) 2026 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+
+/**
+ * Initializes the display for PSP.
+ */
+void displayInitPSP(void);

archive/platform/sdl2.c

@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2026 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "sdl2.h"
+
+void displaySDL2Update(void) {
+}
+
+void displaySDL2Swap(void) {
+  SDL_GL_SwapWindow(DISPLAY.window);
+
+  GLenum err;
+  while((err = glGetError()) != GL_NO_ERROR) {
+    debugPrint("GL Error: %d\n", err);
+  }
+}
+
+void displaySDL2Dispose(void) {
+  if(DISPLAY.glContext) {
+    SDL_GL_DeleteContext(DISPLAY.glContext);
+    DISPLAY.glContext = NULL;
+  }
+  if(DISPLAY.window) {
+    SDL_DestroyWindow(DISPLAY.window);
+    DISPLAY.window = NULL;
+  }
+  SDL_Quit();
+}

archive/platform/sdl2.h

@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) 2026 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+#include "dusk.h"
+
+typedef struct {
+  SDL_Window *window;
+  SDL_GLContext glContext;
+  bool_t usingShaderedPalettes;
+} displaysdl2_t;
+
+/**
+ * Initializes the display for SDL2.
+ */
+void displaySDL2Init(void);
+
+/**
+ * Updates the display for SDL2.
+ */
+void displaySDL2Update(void);
+
+/**
+ * Swaps the display buffers for SDL2.
+ */
+void displaySDL2Swap(void);
+
+/**
+ * Disposes of the display for SDL2.
+ */
+void displaySDL2Dispose(void);

archive/rpg/CMakeLists.txt

@@ -4,8 +4,8 @@
 # https://opensource.org/licenses/MIT
 
 # Sources
-target_sources(${DUSK_TARGET_NAME}
-  PRIVATE
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
     rpg.c
     rpgcamera.c
     rpgtextbox.c
@@ -14,4 +14,4 @@ target_sources(${DUSK_TARGET_NAME}
 # Subdirs
 add_subdirectory(cutscene)
 add_subdirectory(entity)
-add_subdirectory(world)
+add_subdirectory(overworld)

archive/rpg/cutscene/CMakeLists.txt

@@ -4,8 +4,8 @@
 # https://opensource.org/licenses/MIT
 
 # Sources
-target_sources(${DUSK_TARGET_NAME}
-  PRIVATE
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
     cutscenesystem.c
     cutscenemode.c
 )

archive/rpg/cutscene/item/CMakeLists.txt

@@ -4,7 +4,7 @@
 # https://opensource.org/licenses/MIT
 
 # Sources
-target_sources(${DUSK_TARGET_NAME}
-  PRIVATE
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
     cutsceneitem.c
 )

archive/rpg/cutscene/item/cutsceneitem.h

@@ -9,7 +9,8 @@
 #include "cutscenewait.h"
 #include "cutscenecallback.h"
 #include "cutscenetext.h"
-#include "cutscenecutscene.h"
+
+typedef struct cutscene_s cutscene_t;
 
 typedef enum {
   CUTSCENE_ITEM_TYPE_NULL,
@@ -27,7 +28,7 @@ typedef struct cutsceneitem_s {
     cutscenetext_t text;
     cutscenecallback_t callback;
     cutscenewait_t wait;
-    const cutscenecutscene_t cutscene;
+    const cutscene_t *cutscene;
   };
 } cutsceneitem_t;
 

archive/rpg/entity/CMakeLists.txt

@@ -4,8 +4,8 @@
 # https://opensource.org/licenses/MIT
 
 # Sources
-target_sources(${DUSK_TARGET_NAME}
-  PRIVATE
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
     entity.c
     entityanim.c
     npc.c

archive/rpg/entity/entity.c

@@ -11,7 +11,7 @@
 #include "time/time.h"
 #include "util/math.h"
 #include "rpg/cutscene/cutscenemode.h"
-#include "rpg/world/map.h"
+#include "rpg/overworld/map.h"
 
 entity_t ENTITIES[ENTITY_COUNT];
 

archive/rpg/entity/entity.h

@@ -16,7 +16,7 @@ typedef struct map_s map_t;
 typedef struct entity_s {
   uint8_t id;
   entitytype_t type;
-  entitytypedata_t;
+  entitytypedata_t data;
 
   // Movement
   entitydir_t direction;

archive/rpg/entity/entitydir.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "rpg/world/worldpos.h"
+#include "rpg/overworld/worldpos.h"
 
 typedef enum {
   ENTITY_DIR_UP = ENTITY_DIR_NORTH,

archive/rpg/item/inventory.h

@@ -8,6 +8,6 @@
 #pragma once
 #include "dusk.h"
 
-typedef struct cutscene_s cutscene_t;
-
-typedef cutscene_t* cutscenecutscene_t;
+typedef struct {
+  void *nothing;
+} inventory_t;

archive/rpg/overworld/CMakeLists.txt

@@ -4,8 +4,8 @@
 # https://opensource.org/licenses/MIT
 
 # Sources
-target_sources(${DUSK_TARGET_NAME}
-  PRIVATE
+target_sources(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
     chunk.c
     map.c
     worldpos.c

archive/rpg/overworld/chunk.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "rpg/world/tile.h"
+#include "rpg/overworld/tile.h"
 #include "worldpos.h"
 #include "display/mesh/quad.h"
 

archive/rpg/overworld/map.c

@@ -10,33 +10,92 @@
 #include "assert/assert.h"
 #include "asset/asset.h"
 #include "rpg/entity/entity.h"
+#include "util/string.h"
+#include "script/scriptcontext.h"
 
 map_t MAP;
 
 errorret_t mapInit() {
   memoryZero(&MAP, sizeof(map_t));
+  errorOk();
+}
 
-  // Init the default chunks. In future I'll probably make this based on where
-  // the player spawns in to save an initial mapSet.
-  chunkindex_t index = 0;
+bool_t mapIsLoaded() {
+  return MAP.filePath[0] != '\0';
+}
+
+errorret_t mapLoad(const char_t *path, const chunkpos_t position) {
+  assertStrLenMin(path, 1, "Map file path cannot be empty");
+  assertStrLenMax(path, MAP_FILE_PATH_MAX - 1, "Map file path too long");
+
+  if(stringCompare(MAP.filePath, path) == 0) {
+    // Same map, no need to reload
+    errorOk();
+  }
+
+  chunkindex_t i;
+  
+  // Unload all loaded chunks
+  if(mapIsLoaded()) {
+    for(i = 0; i < MAP_CHUNK_COUNT; i++) {
+      mapChunkUnload(&MAP.chunks[i]);
+    }
+  }
+
+  // Store the map file path
+  stringCopy(MAP.filePath, path, MAP_FILE_PATH_MAX);
+
+  // Determine directory path (it is dirname)
+  stringCopy(MAP.dirPath, path, MAP_FILE_PATH_MAX);
+  char_t *last = stringFindLastChar(MAP.dirPath, '/');
+  if(last == NULL) errorThrow("Invalid map file path");
+
+  // Store filename, sans extension
+  stringCopy(MAP.fileName, last + 1, MAP_FILE_PATH_MAX);
+  *last = '\0'; // Terminate to get directory path
+
+  last = stringFindLastChar(MAP.fileName, '.');
+  if(last == NULL) errorThrow("Map file name has no extension");
+  *last = '\0'; // Terminate to remove extension
+
+  // Reset map position
+  MAP.chunkPosition = position;
+
+  // Perform "initial load"
+  i = 0;
   for(chunkunit_t z = 0; z < MAP_CHUNK_DEPTH; z++) {
     for(chunkunit_t y = 0; y < MAP_CHUNK_HEIGHT; y++) {
       for(chunkunit_t x = 0; x < MAP_CHUNK_WIDTH; x++) {
-        chunk_t *chunk = &MAP.chunks[index];
-        chunk->position.x = x;
-        chunk->position.y = y;
-        chunk->position.z = z;
-        MAP.chunkOrder[index] = chunk;
+        chunk_t *chunk = &MAP.chunks[i];
+        chunk->position.x = x + position.x;
+        chunk->position.y = y + position.y;
+        chunk->position.z = z + position.z;
+        MAP.chunkOrder[i] = chunk;
         errorChain(mapChunkLoad(chunk));
-        index++;
+        i++;
       }
     }
   }
 
+  // Execute map script.
+  char_t scriptPath[MAP_FILE_PATH_MAX + 16];
+  stringFormat(
+    scriptPath, sizeof(scriptPath), "%s/%s.dsf",
+    MAP.dirPath, MAP.fileName
+  );
+  if(assetFileExists(scriptPath)) {
+    scriptcontext_t ctx;
+    errorChain(scriptContextInit(&ctx));
+    errorChain(scriptContextExecFile(&ctx, scriptPath));
+    scriptContextDispose(&ctx);
+  }
+
   errorOk();
 }
 
 errorret_t mapPositionSet(const chunkpos_t newPos) {
+  if(!mapIsLoaded()) errorThrow("No map loaded");
+
   const chunkpos_t curPos = MAP.chunkPosition;
   if(chunkPositionIsEqual(curPos, newPos)) {
     errorOk();
@@ -132,6 +191,7 @@ void mapChunkUnload(chunk_t* chunk) {
     entity_t *entity = &ENTITIES[chunk->entities[i]];
     entity->type = ENTITY_TYPE_NULL;
   }
+
   for(uint8_t i = 0; i < chunk->meshCount; i++) {
     if(chunk->meshes[i].vertexCount == 0) continue;
     meshDispose(&chunk->meshes[i]);
@@ -139,28 +199,37 @@ void mapChunkUnload(chunk_t* chunk) {
 }
 
 errorret_t mapChunkLoad(chunk_t* chunk) {
+  if(!mapIsLoaded()) errorThrow("No map loaded");
+
   char_t buffer[64];
 
+  // TODO: Can probably move this to asset load logic?
   chunk->meshCount = 0;
   memoryZero(chunk->meshes, sizeof(chunk->meshes));
   memorySet(chunk->entities, 0xFF, sizeof(chunk->entities));
 
-  snprintf(buffer, sizeof(buffer), "map/map/%d_%d_%d.dcf",
+  // Get chunk filepath.
+  snprintf(buffer, sizeof(buffer), "%s/chunks/%d_%d_%d.dmc",
+    MAP.dirPath,
     chunk->position.x,
     chunk->position.y,
     chunk->position.z
   );
 
+  // Chunk available?
   if(!assetFileExists(buffer)) {
     memoryZero(chunk->tiles, sizeof(chunk->tiles));
     errorOk();
   }
 
+  // Load.
   errorChain(assetLoad(buffer, chunk));
   errorOk();
 }
 
 chunkindex_t mapGetChunkIndexAt(const chunkpos_t position) {
+  if(!mapIsLoaded()) return -1;
+
   chunkpos_t relPos = {
     position.x - MAP.chunkPosition.x,
     position.y - MAP.chunkPosition.y,
@@ -181,10 +250,13 @@ chunkindex_t mapGetChunkIndexAt(const chunkpos_t position) {
 
 chunk_t* mapGetChunk(const uint8_t index) {
   if(index >= MAP_CHUNK_COUNT) return NULL;
+  if(!mapIsLoaded()) return NULL;
   return MAP.chunkOrder[index];
 }
 
 tile_t mapGetTile(const worldpos_t position) {
+  if(!mapIsLoaded()) return TILE_SHAPE_NULL;
+
   chunkpos_t chunkPos;
   worldPosToChunkPos(&position, &chunkPos);
   chunkindex_t chunkIndex = mapGetChunkIndexAt(chunkPos);

archive/rpg/overworld/map.h

@@ -6,9 +6,15 @@
  */
 
 #pragma once
-#include "rpg/world/chunk.h"
+#include "rpg/overworld/chunk.h"
+
+#define MAP_FILE_PATH_MAX 128
 
 typedef struct map_s {
+  char_t filePath[MAP_FILE_PATH_MAX];
+  char_t dirPath[MAP_FILE_PATH_MAX];
+  char_t fileName[MAP_FILE_PATH_MAX];
+
   chunk_t chunks[MAP_CHUNK_COUNT];
   chunk_t *chunkOrder[MAP_CHUNK_COUNT];
   chunkpos_t chunkPosition;
@@ -23,6 +29,25 @@ extern map_t MAP;
  */
 errorret_t mapInit();
 
+/**
+ * Checks if a map is loaded.
+ * 
+ * @return true if a map is loaded, false otherwise.
+ */
+bool_t mapIsLoaded();
+
+/**
+ * Loads a map from the given file path.
+ * 
+ * @param path The file path.
+ * @param position The initial chunk position.
+ * @return An error code.
+ */
+errorret_t mapLoad(
+  const char_t *path,
+  const chunkpos_t position
+);
+
 /**
  * Updates the map.
  */