Merge branch 'develop' into ChristmasWork

Caladius · Nov 8, 2023 · dbd96dd · dbd96dd
2 parents 1bf2d98 + 30ab8e9
commit dbd96dd
Show file tree

Hide file tree

Showing 642 changed files with 13,614 additions and 13,213 deletions.
diff --git a/CMake/Packaging-2.cmake b/CMake/Packaging-2.cmake
@@ -24,7 +24,6 @@ if (CPACK_GENERATOR MATCHES "Bundle")
     set(CPACK_BUNDLE_NAME "soh")
     set(CPACK_BUNDLE_PLIST "macosx/Info.plist")
     set(CPACK_BUNDLE_ICON "macosx/soh.icns")
-    set(CPACK_BUNDLE_STARTUP_COMMAND "../soh/macosx/soh-macos.sh")
+    set(CPACK_BUNDLE_STARTUP_COMMAND "macosx/soh-macos.sh")
     set(CPACK_BUNDLE_APPLE_CERT_APP "-")
 endif()
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,8 +5,8 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")
 
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
 
-project(Ship VERSION 7.1.1 LANGUAGES C CXX)
-set(PROJECT_BUILD_NAME "Sulu Bravo" CACHE STRING "")
+project(Ship VERSION 8.0.0 LANGUAGES C CXX)
+set(PROJECT_BUILD_NAME "MacReady Alfa" CACHE STRING "")
 set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "")
 
 set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)
@@ -97,7 +97,7 @@ set_property(TARGET soh PROPERTY APPIMAGE_DESKTOP_FILE "${CMAKE_SOURCE_DIR}/scri
 set_property(TARGET soh PROPERTY APPIMAGE_ICON_FILE "${CMAKE_BINARY_DIR}/sohIcon.png")
 
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
-install(PROGRAMS "${CMAKE_SOURCE_DIR}/scripts/linux/appimage/soh.sh" DESTINATION . COMPONENT appimage)
+install(PROGRAMS "${CMAKE_BINARY_DIR}/linux/soh.sh" DESTINATION . COMPONENT appimage)
 install(FILES "${CMAKE_SOURCE_DIR}/soh.otr" DESTINATION . COMPONENT ship)
 install(TARGETS ZAPD DESTINATION ./assets/extractor COMPONENT extractor)
 install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/extractor/" DESTINATION ./assets/extractor COMPONENT extractor)
@@ -124,7 +124,7 @@ add_custom_target(
     ExtractAssets
     # CMake versions prior to 3.17 do not have the rm command, use remove instead for older versions
     COMMAND ${CMAKE_COMMAND} -E $<IF:$<VERSION_LESS:${CMAKE_VERSION},3.17>,remove,rm> -f oot.otr oot-mq.otr soh.otr
-    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$<TARGET_FILE:ZAPD>" --non-interactive --xml-root ../soh/assets/xml --custom-otr-file soh.otr "--custom-assets-path" ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom
+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$<TARGET_FILE:ZAPD>" --non-interactive --xml-root ../soh/assets/xml --custom-otr-file soh.otr "--custom-assets-path" ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom --port-ver "${CMAKE_PROJECT_VERSION}"
     COMMAND ${CMAKE_COMMAND} -DSYSTEM_NAME=${CMAKE_SYSTEM_NAME} -DTARGET_DIR="$<TARGET_FILE_DIR:ZAPD>" -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DBINARY_DIR=${CMAKE_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/copy-existing-otrs.cmake
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter
     COMMENT "Running asset extraction..."
@@ -146,7 +146,7 @@ add_custom_target(
     GenerateSohOtr
     # CMake versions prior to 3.17 do not have the rm command, use remove instead for older versions
     COMMAND ${CMAKE_COMMAND} -E $<IF:$<VERSION_LESS:${CMAKE_VERSION},3.17>,remove,rm> -f soh.otr
-    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$<TARGET_FILE:ZAPD>" --norom --custom-otr-file soh.otr "--custom-assets-path" ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom
+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$<TARGET_FILE:ZAPD>" --norom --custom-otr-file soh.otr "--custom-assets-path" ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom --port-ver "${CMAKE_PROJECT_VERSION}"
     COMMAND ${CMAKE_COMMAND} -DSYSTEM_NAME=${CMAKE_SYSTEM_NAME} -DTARGET_DIR="$<TARGET_FILE_DIR:ZAPD>" -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DBINARY_DIR=${CMAKE_BINARY_DIR} -DONLYSOHOTR=On -P ${CMAKE_CURRENT_SOURCE_DIR}/copy-existing-otrs.cmake
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter
     COMMENT "Generating soh.otr..."

diff --git a/OTRExporter b/OTRExporter
diff --git a/ZAPDTR b/ZAPDTR
diff --git a/libultraship b/libultraship
diff --git a/scripts/linux/appimage/soh.sh → scripts/linux/appimage/soh.sh.in b/scripts/linux/appimage/soh.sh → scripts/linux/appimage/soh.sh.in
@@ -171,7 +171,7 @@ while [[ (! -e "$SHIP_HOME"/oot.otr) || (! -e "$SHIP_HOME"/oot-mq.otr) ]]; do
                     else
                         echo "Processing..."
                     fi
-                    assets/extractor/ZAPD.out ed -eh -i assets/extractor/xmls/"${ROM}" -b tmp/rom.z64 -fl assets/extractor/filelists -o placeholder -osf placeholder -gsf 1 -rconf assets/extractor/Config_"${ROM}".xml -se OTR --otrfile "${OTRNAME}" > /dev/null 2>&1
+                    assets/extractor/ZAPD.out ed -eh -i assets/extractor/xmls/"${ROM}" -b tmp/rom.z64 -fl assets/extractor/filelists -o placeholder -osf placeholder -gsf 1 -rconf assets/extractor/Config_"${ROM}".xml -se OTR --otrfile "${OTRNAME}" --portVer "@CMAKE_PROJECT_VERSION@" > /dev/null 2>&1
                     cp "$ASSETDIR"/"$OTRNAME" "$SHIP_HOME"
                 fi
             else

diff --git a/soh/CMakeLists.txt b/soh/CMakeLists.txt
@@ -757,11 +757,16 @@ INSTALL(FILES $<TARGET_PDB_FILE:soh> DESTINATION ./debug COMPONENT ship)
 INSTALL(FILES ${CMAKE_BINARY_DIR}/soh/soh.otr DESTINATION . COMPONENT ship)
 endif()
 
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/linux/appimage/soh.sh.in ${CMAKE_BINARY_DIR}/linux/soh.sh @ONLY)
+endif()
+
 find_program(CURL NAMES curl DOC "Path to the curl program.  Used to download files.")
 execute_process(COMMAND ${CURL} -sSfL https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt -o ${CMAKE_BINARY_DIR}/gamecontrollerdb.txt OUTPUT_VARIABLE RESULT)
 
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/macosx/Info.plist.in ${CMAKE_BINARY_DIR}/macosx/Info.plist @ONLY)
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/macosx/soh-macos.sh.in ${CMAKE_BINARY_DIR}/macosx/soh-macos.sh @ONLY)
 INSTALL(FILES ${CMAKE_BINARY_DIR}/gamecontrollerdb.txt DESTINATION ../MacOS COMPONENT ship)
 INSTALL(FILES ${CMAKE_BINARY_DIR}/soh/soh.otr DESTINATION ../Resources COMPONENT ship)
 elseif(NOT "${CMAKE_SYSTEM_NAME}" MATCHES "NintendoSwitch|CafeOS")

diff --git a/soh/assets/custom/accessibility/texts/kaleidoscope_eng.json b/soh/assets/custom/accessibility/texts/kaleidoscope_eng.json
@@ -12,6 +12,8 @@
     "equipped": "$0 - Equipped",
     "save_prompt": "Would you like to save?",
     "game_saved": "Game saved",
+    "game_over": "Game Over",
+    "continue_game": "Continue playing?",
     "assigned_to": "Assigned to $0",
     "0": "Deku Stick - $0",
     "1": "Deku Nut - $0",

diff --git a/soh/assets/custom/accessibility/texts/kaleidoscope_fra.json b/soh/assets/custom/accessibility/texts/kaleidoscope_fra.json
@@ -10,8 +10,10 @@
     "equip_menu": "Equipment",
     "overworld": "Surmonde",
     "equipped": "$0 - Équipé",
-    "save_prompt": "Voulez-vous sauvegarder?",
+    "save_prompt": "Voulez-vous sauvegarder ?",
     "game_saved": "Jeu sauvegardé",
+    "game_over": "Game Over",
+    "continue_game": "Continuer la partie ?",
     "assigned_to": "Assigné au $0",
     "0": "Bâton Mojo - $0",
     "1": "Noix Mojo - $0",

diff --git a/soh/assets/custom/accessibility/texts/kaleidoscope_ger.json b/soh/assets/custom/accessibility/texts/kaleidoscope_ger.json
@@ -10,8 +10,10 @@
     "equip_menu": "Ausrüstung",
     "overworld": "Überwelt",
     "equipped": "$0 - Ausgerüstet",
-    "save_prompt": "Spielstand sichern?",
+    "save_prompt": "Spielstand sichern ?",
     "game_saved": "Spielstand gesichert",
+    "game_over": "Game Over",
+    "continue_game": "Spiel fortsetzen ?",
     "assigned_to": "$0 zugeordnet",
     "0": "Deku-Stab - $0",
     "1": "Deku-Nuß - $0",

diff --git a/soh/assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h b/soh/assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h
@@ -3,6 +3,75 @@
 
 #include "align_asset_macro.h"
 
+#define dgameplay_dangeon_keepTex_000000 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_000000"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_000000[] = dgameplay_dangeon_keepTex_000000;
+
+#define dgameplay_dangeon_keepTex_000200 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_000200"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_000200[] = dgameplay_dangeon_keepTex_000200;
+
+#define dgameplay_dangeon_keepTex_0005C0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0005C0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0005C0[] = dgameplay_dangeon_keepTex_0005C0;
+
+#define dgameplay_dangeon_keepTex_001280 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_001280"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_001280[] = dgameplay_dangeon_keepTex_001280;
+
+#define dgameplay_dangeon_keepTex_0078A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0078A0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0078A0[] = dgameplay_dangeon_keepTex_0078A0;
+
+#define dgameplay_dangeon_keepTex_007CA0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_007CA0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_007CA0[] = dgameplay_dangeon_keepTex_007CA0;
+
+#define dgameplay_dangeon_keepTex_0080A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0080A0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0080A0[] = dgameplay_dangeon_keepTex_0080A0;
+
+#define dgameplay_dangeon_keepTex_0088A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0088A0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0088A0[] = dgameplay_dangeon_keepTex_0088A0;
+
+#define dgameplay_dangeon_keepTex_00D8A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_00D8A0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_00D8A0[] = dgameplay_dangeon_keepTex_00D8A0;
+
+#define dgameplay_dangeon_keepTex_00E0A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_00E0A0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_00E0A0[] = dgameplay_dangeon_keepTex_00E0A0;
+
+#define dgameplay_dangeon_keepTex_00F8A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_00F8A0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_00F8A0[] = dgameplay_dangeon_keepTex_00F8A0;
+
+#define dgameplay_dangeon_keepTex_0108A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0108A0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0108A0[] = dgameplay_dangeon_keepTex_0108A0;
+
+#define dgameplay_dangeon_keepTex_0118A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0118A0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0118A0[] = dgameplay_dangeon_keepTex_0118A0;
+
+#define dgameplay_dangeon_keepTex_011AA0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_011AA0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_011AA0[] = dgameplay_dangeon_keepTex_011AA0;
+
+#define dgameplay_dangeon_keepTex_011CA0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_011CA0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_011CA0[] = dgameplay_dangeon_keepTex_011CA0;
+
+#define dgameplay_dangeon_keepTex_012CA0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_012CA0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_012CA0[] = dgameplay_dangeon_keepTex_012CA0;
+
+#define dgameplay_dangeon_keepTex_0134A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0134A0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0134A0[] = dgameplay_dangeon_keepTex_0134A0;
+
+#define dgameplay_dangeon_keepTex_013CA0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_013CA0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_013CA0[] = dgameplay_dangeon_keepTex_013CA0;
+
+#define dgameplay_dangeon_keepTex_013CB0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_013CB0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_013CB0[] = dgameplay_dangeon_keepTex_013CB0;
+
+#define dgameplay_dangeon_keepTex_0154B0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0154B0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0154B0[] = dgameplay_dangeon_keepTex_0154B0;
+
+#define dgameplay_dangeon_keepTex_015CB0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_015CB0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_015CB0[] = dgameplay_dangeon_keepTex_015CB0;
+
+#define dgameplay_dangeon_keepTex_0164B0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0164B0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0164B0[] = dgameplay_dangeon_keepTex_0164B0;
+
+#define dgameplay_dangeon_keepTex_016CB0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_016CB0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_016CB0[] = dgameplay_dangeon_keepTex_016CB0;
+
 #define dgUnusedCandleDL "__OTR__objects/gameplay_dangeon_keep/gUnusedCandleDL"
 static const ALIGN_ASSET(2) char gUnusedCandleDL[] = dgUnusedCandleDL;
 
@@ -147,73 +216,4 @@ static const ALIGN_ASSET(2) char gPotDL[] = dgPotDL;
 #define dgPotFragmentDL "__OTR__objects/gameplay_dangeon_keep/gPotFragmentDL"
 static const ALIGN_ASSET(2) char gPotFragmentDL[] = dgPotFragmentDL;
 
-#define dgameplay_dangeon_keepTex_000000 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_000000"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_000000[] = dgameplay_dangeon_keepTex_000000;
-
-#define dgameplay_dangeon_keepTex_000200 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_000200"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_000200[] = dgameplay_dangeon_keepTex_000200;
-
-#define dgameplay_dangeon_keepTex_0005C0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0005C0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0005C0[] = dgameplay_dangeon_keepTex_0005C0;
-
-#define dgameplay_dangeon_keepTex_001280 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_001280"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_001280[] = dgameplay_dangeon_keepTex_001280;
-
-#define dgameplay_dangeon_keepTex_0164B0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0164B0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0164B0[] = dgameplay_dangeon_keepTex_0164B0;
-
-#define dgameplay_dangeon_keepTex_00F8A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_00F8A0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_00F8A0[] = dgameplay_dangeon_keepTex_00F8A0;
-
-#define dgameplay_dangeon_keepTex_011CA0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_011CA0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_011CA0[] = dgameplay_dangeon_keepTex_011CA0;
-
-#define dgameplay_dangeon_keepTex_012CA0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_012CA0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_012CA0[] = dgameplay_dangeon_keepTex_012CA0;
-
-#define dgameplay_dangeon_keepTex_0154B0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0154B0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0154B0[] = dgameplay_dangeon_keepTex_0154B0;
-
-#define dgameplay_dangeon_keepTex_015CB0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_015CB0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_015CB0[] = dgameplay_dangeon_keepTex_015CB0;
-
-#define dgameplay_dangeon_keepTex_016CB0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_016CB0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_016CB0[] = dgameplay_dangeon_keepTex_016CB0;
-
-#define dgameplay_dangeon_keepTex_007CA0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_007CA0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_007CA0[] = dgameplay_dangeon_keepTex_007CA0;
-
-#define dgameplay_dangeon_keepTex_0078A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0078A0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0078A0[] = dgameplay_dangeon_keepTex_0078A0;
-
-#define dgameplay_dangeon_keepTex_00D8A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_00D8A0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_00D8A0[] = dgameplay_dangeon_keepTex_00D8A0;
-
-#define dgameplay_dangeon_keepTex_00E0A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_00E0A0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_00E0A0[] = dgameplay_dangeon_keepTex_00E0A0;
-
-#define dgameplay_dangeon_keepTex_0080A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0080A0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0080A0[] = dgameplay_dangeon_keepTex_0080A0;
-
-#define dgameplay_dangeon_keepTex_0088A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0088A0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0088A0[] = dgameplay_dangeon_keepTex_0088A0;
-
-#define dgameplay_dangeon_keepTex_013CB0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_013CB0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_013CB0[] = dgameplay_dangeon_keepTex_013CB0;
-
-#define dgameplay_dangeon_keepTex_0134A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0134A0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0134A0[] = dgameplay_dangeon_keepTex_0134A0;
-
-#define dgameplay_dangeon_keepTex_013CA0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_013CA0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_013CA0[] = dgameplay_dangeon_keepTex_013CA0;
-
-#define dgameplay_dangeon_keepTex_0108A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0108A0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0108A0[] = dgameplay_dangeon_keepTex_0108A0;
-
-#define dgameplay_dangeon_keepTex_0118A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0118A0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0118A0[] = dgameplay_dangeon_keepTex_0118A0;
-
-#define dgameplay_dangeon_keepTex_011AA0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_011AA0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_011AA0[] = dgameplay_dangeon_keepTex_011AA0;
-
 #endif // OBJECTS_GAMEPLAY_DANGEON_KEEP_H
diff --git a/soh/assets/objects/gameplay_keep/gameplay_keep.h b/soh/assets/objects/gameplay_keep/gameplay_keep.h
@@ -3,6 +3,18 @@
 
 #include "align_asset_macro.h"
 
+#define dgameplay_keepTex_04C540 "__OTR__objects/gameplay_keep/gameplay_keepTex_04C540"
+static const ALIGN_ASSET(2) char gameplay_keepTex_04C540[] = dgameplay_keepTex_04C540;
+
+#define dgameplay_keepTex_04C740 "__OTR__objects/gameplay_keep/gameplay_keepTex_04C740"
+static const ALIGN_ASSET(2) char gameplay_keepTex_04C740[] = dgameplay_keepTex_04C740;
+
+#define dgameplay_keepTex_04CD40 "__OTR__objects/gameplay_keep/gameplay_keepTex_04CD40"
+static const ALIGN_ASSET(2) char gameplay_keepTex_04CD40[] = dgameplay_keepTex_04CD40;
+
+#define dgameplay_keepTex_04CF40 "__OTR__objects/gameplay_keep/gameplay_keepTex_04CF40"
+static const ALIGN_ASSET(2) char gameplay_keepTex_04CF40[] = dgameplay_keepTex_04CF40;
+
 #define dgHilite1Tex "__OTR__objects/gameplay_keep/gHilite1Tex"
 static const ALIGN_ASSET(2) char gHilite1Tex[] = dgHilite1Tex;
 
@@ -2826,18 +2838,6 @@ static const ALIGN_ASSET(2) char gEffSpark3Tex[] = dgEffSpark3Tex;
 #define dgEffSpark4Tex "__OTR__objects/gameplay_keep/gEffSpark4Tex"
 static const ALIGN_ASSET(2) char gEffSpark4Tex[] = dgEffSpark4Tex;
 
-#define dgameplay_keepTex_04C540 "__OTR__objects/gameplay_keep/gameplay_keepTex_04C540"
-static const ALIGN_ASSET(2) char gameplay_keepTex_04C540[] = dgameplay_keepTex_04C540;
-
-#define dgameplay_keepTex_04CD40 "__OTR__objects/gameplay_keep/gameplay_keepTex_04CD40"
-static const ALIGN_ASSET(2) char gameplay_keepTex_04CD40[] = dgameplay_keepTex_04CD40;
-
-#define dgameplay_keepTex_04C740 "__OTR__objects/gameplay_keep/gameplay_keepTex_04C740"
-static const ALIGN_ASSET(2) char gameplay_keepTex_04C740[] = dgameplay_keepTex_04C740;
-
-#define dgameplay_keepTex_04CF40 "__OTR__objects/gameplay_keep/gameplay_keepTex_04CF40"
-static const ALIGN_ASSET(2) char gameplay_keepTex_04CF40[] = dgameplay_keepTex_04CF40;
-
 #define dgFishSkelLimbsLimb_018F98DL_018A68 "__OTR__objects/gameplay_keep/gFishSkelLimbsLimb_018F98DL_018A68"
 static const ALIGN_ASSET(2) char gFishSkelLimbsLimb_018F98DL_018A68[] = dgFishSkelLimbsLimb_018F98DL_018A68;
+14 −7		OTRExporter/DisplayListExporter.cpp
+47 −7		OTRExporter/Main.cpp
+11 −4		extract_assets.py
+1 −1		src/graphic/Fast3D/gfx_direct3d11.cpp
+10 −7		src/window/gui/InputEditorWindow.cpp