diff --git a/.github/workflows/generate-builds.yml b/.github/workflows/generate-builds.yml index cd8a6fd9b..f95051515 100644 --- a/.github/workflows/generate-builds.yml +++ b/.github/workflows/generate-builds.yml @@ -281,13 +281,20 @@ jobs: with: submodules: true - name: ccache - uses: dcvz/ccache-action@27b9f33213c0079872f064f6b6ba0233dfa16ba2 + uses: hendrikmuhs/ccache-action@v1.2 with: key: ${{ runner.os }}-ccache - - uses: ilammy/msvc-dev-cmd@v1 + - name: vcpkg + uses: johnwason/vcpkg-action@v5 + with: + pkgs: zlib bzip2 libpng sdl2 sdl2-net glew glfw3 + token: ${{ github.token }} + triplet: 'x64-windows-static' + - name: Configure Developer Command Prompt + uses: ilammy/msvc-dev-cmd@v1 - name: Build SoH env: - VCPKG_ROOT: D:/a/vcpkg + VCPKG_ROOT: ${{github.workspace}}/vcpkg run: | set $env:PATH="$env:USERPROFILE/.cargo/bin;$env:PATH" cmake -S . -B build-windows -G Ninja -DCMAKE_MAKE_PROGRAM=ninja -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache diff --git a/CMake/Packaging-2.cmake b/CMake/Packaging-2.cmake index 3525ae1e4..38fcc59f3 100644 --- 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 index 92ddc528d..9ae0360d8 100644 --- 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.3 LANGUAGES C CXX) +set(PROJECT_BUILD_NAME "MacReady Delta" 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 $,remove,rm> -f oot.otr oot-mq.otr soh.otr - COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$" --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 "$" --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="$" -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 $,remove,rm> -f soh.otr - COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$" --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 "$" --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="$" -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 index f1bc0a726..04b85b95f 160000 --- a/OTRExporter +++ b/OTRExporter @@ -1 +1 @@ -Subproject commit f1bc0a726813d7e70ad471fdebd080e6fd77996a +Subproject commit 04b85b95fab07a394b62dcd28a502a3040f08e0c diff --git a/ZAPDTR b/ZAPDTR index 9b8e224da..eff290361 160000 --- a/ZAPDTR +++ b/ZAPDTR @@ -1 +1 @@ -Subproject commit 9b8e224dac83aa8e47a688884ad48725f18fc293 +Subproject commit eff29036118349e142ee8efca80fd975a2a2b6ff diff --git a/libultraship b/libultraship index 317edd72c..4600eedcc 160000 --- a/libultraship +++ b/libultraship @@ -1 +1 @@ -Subproject commit 317edd72cc317387f8ac010a9ec772d4bfdfdbb6 +Subproject commit 4600eedcc18f496319c99e07b8b2b4f11a0f6e64 diff --git a/scripts/linux/appimage/soh.sh b/scripts/linux/appimage/soh.sh.in similarity index 98% rename from scripts/linux/appimage/soh.sh rename to scripts/linux/appimage/soh.sh.in index 0e8414ac0..bfc3cfec6 100644 --- a/scripts/linux/appimage/soh.sh +++ b/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 index 647c491f8..fd0c6ac25 100644 --- a/soh/CMakeLists.txt +++ b/soh/CMakeLists.txt @@ -757,11 +757,16 @@ INSTALL(FILES $ 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 index 10b016b32..a89c12889 100644 --- 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 index 820eb4cbc..116c19a41 100644 --- 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 index 630d933fc..649790da3 100644 --- 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 index 89e6c9342..5675ef0c2 100644 --- 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 index 473b2b8d6..6377e165d 100644 --- 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; diff --git a/soh/assets/objects/object_am/object_am.h b/soh/assets/objects/object_am/object_am.h index 0f91c99b4..908e8c707 100644 --- a/soh/assets/objects/object_am/object_am.h +++ b/soh/assets/objects/object_am/object_am.h @@ -3,6 +3,45 @@ #include "align_asset_macro.h" +#define dobject_amTex_002638 "__OTR__objects/object_am/object_amTex_002638" +static const ALIGN_ASSET(2) char object_amTex_002638[] = dobject_amTex_002638; + +#define dobject_amTex_002838 "__OTR__objects/object_am/object_amTex_002838" +static const ALIGN_ASSET(2) char object_amTex_002838[] = dobject_amTex_002838; + +#define dobject_amTex_002938 "__OTR__objects/object_am/object_amTex_002938" +static const ALIGN_ASSET(2) char object_amTex_002938[] = dobject_amTex_002938; + +#define dobject_amTex_002D38 "__OTR__objects/object_am/object_amTex_002D38" +static const ALIGN_ASSET(2) char object_amTex_002D38[] = dobject_amTex_002D38; + +#define dobject_amTex_002E38 "__OTR__objects/object_am/object_amTex_002E38" +static const ALIGN_ASSET(2) char object_amTex_002E38[] = dobject_amTex_002E38; + +#define dobject_amTex_003038 "__OTR__objects/object_am/object_amTex_003038" +static const ALIGN_ASSET(2) char object_amTex_003038[] = dobject_amTex_003038; + +#define dobject_amTex_003238 "__OTR__objects/object_am/object_amTex_003238" +static const ALIGN_ASSET(2) char object_amTex_003238[] = dobject_amTex_003238; + +#define dobject_amTex_003A38 "__OTR__objects/object_am/object_amTex_003A38" +static const ALIGN_ASSET(2) char object_amTex_003A38[] = dobject_amTex_003A38; + +#define dobject_amTex_003C38 "__OTR__objects/object_am/object_amTex_003C38" +static const ALIGN_ASSET(2) char object_amTex_003C38[] = dobject_amTex_003C38; + +#define dobject_amTex_004438 "__OTR__objects/object_am/object_amTex_004438" +static const ALIGN_ASSET(2) char object_amTex_004438[] = dobject_amTex_004438; + +#define dobject_amTex_004C38 "__OTR__objects/object_am/object_amTex_004C38" +static const ALIGN_ASSET(2) char object_amTex_004C38[] = dobject_amTex_004C38; + +#define dobject_amTex_005438 "__OTR__objects/object_am/object_amTex_005438" +static const ALIGN_ASSET(2) char object_amTex_005438[] = dobject_amTex_005438; + +#define dobject_amTex_005478 "__OTR__objects/object_am/object_amTex_005478" +static const ALIGN_ASSET(2) char object_amTex_005478[] = dobject_amTex_005478; + #define dgArmosSkel "__OTR__objects/object_am/gArmosSkel" static const ALIGN_ASSET(2) char gArmosSkel[] = dgArmosSkel; @@ -30,43 +69,5 @@ static const ALIGN_ASSET(2) char gArmosSkelLimbsLimb_0058E4DL_002278[] = dgArmos #define dgArmosSkelLimbsLimb_005908DL_0005D0 "__OTR__objects/object_am/gArmosSkelLimbsLimb_005908DL_0005D0" static const ALIGN_ASSET(2) char gArmosSkelLimbsLimb_005908DL_0005D0[] = dgArmosSkelLimbsLimb_005908DL_0005D0; -#define dobject_amTex_002638 "__OTR__objects/object_am/object_amTex_002638" -static const ALIGN_ASSET(2) char object_amTex_002638[] = dobject_amTex_002638; - -#define dobject_amTex_003C38 "__OTR__objects/object_am/object_amTex_003C38" -static const ALIGN_ASSET(2) char object_amTex_003C38[] = dobject_amTex_003C38; - -#define dobject_amTex_003238 "__OTR__objects/object_am/object_amTex_003238" -static const ALIGN_ASSET(2) char object_amTex_003238[] = dobject_amTex_003238; - -#define dobject_amTex_002838 "__OTR__objects/object_am/object_amTex_002838" -static const ALIGN_ASSET(2) char object_amTex_002838[] = dobject_amTex_002838; - -#define dobject_amTex_004C38 "__OTR__objects/object_am/object_amTex_004C38" -static const ALIGN_ASSET(2) char object_amTex_004C38[] = dobject_amTex_004C38; - -#define dobject_amTex_003A38 "__OTR__objects/object_am/object_amTex_003A38" -static const ALIGN_ASSET(2) char object_amTex_003A38[] = dobject_amTex_003A38; - -#define dobject_amTex_003038 "__OTR__objects/object_am/object_amTex_003038" -static const ALIGN_ASSET(2) char object_amTex_003038[] = dobject_amTex_003038; - -#define dobject_amTex_004438 "__OTR__objects/object_am/object_amTex_004438" -static const ALIGN_ASSET(2) char object_amTex_004438[] = dobject_amTex_004438; - -#define dobject_amTex_002938 "__OTR__objects/object_am/object_amTex_002938" -static const ALIGN_ASSET(2) char object_amTex_002938[] = dobject_amTex_002938; - -#define dobject_amTex_002D38 "__OTR__objects/object_am/object_amTex_002D38" -static const ALIGN_ASSET(2) char object_amTex_002D38[] = dobject_amTex_002D38; - -#define dobject_amTex_002E38 "__OTR__objects/object_am/object_amTex_002E38" -static const ALIGN_ASSET(2) char object_amTex_002E38[] = dobject_amTex_002E38; - -#define dobject_amTex_005478 "__OTR__objects/object_am/object_amTex_005478" -static const ALIGN_ASSET(2) char object_amTex_005478[] = dobject_amTex_005478; - -#define dobject_amTex_005438 "__OTR__objects/object_am/object_amTex_005438" -static const ALIGN_ASSET(2) char object_amTex_005438[] = dobject_amTex_005438; #endif // OBJECTS_OBJECT_AM_H diff --git a/soh/assets/objects/object_ani/object_ani.h b/soh/assets/objects/object_ani/object_ani.h index a2b80171f..34a57f89d 100644 --- a/soh/assets/objects/object_ani/object_ani.h +++ b/soh/assets/objects/object_ani/object_ani.h @@ -3,6 +3,9 @@ #include "align_asset_macro.h" +#define dobject_aniTex_0011D8 "__OTR__objects/object_ani/object_aniTex_0011D8" +static const ALIGN_ASSET(2) char object_aniTex_0011D8[] = dobject_aniTex_0011D8; + #define dgRoofManSkel "__OTR__objects/object_ani/gRoofManSkel" static const ALIGN_ASSET(2) char gRoofManSkel[] = dgRoofManSkel; @@ -99,7 +102,5 @@ static const ALIGN_ASSET(2) char gRoofManGettingUpAfterKnockbackAnim[] = dgRoofM #define dgRoofManIdleAnim "__OTR__objects/object_ani/gRoofManIdleAnim" static const ALIGN_ASSET(2) char gRoofManIdleAnim[] = dgRoofManIdleAnim; -#define dobject_aniTex_0011D8 "__OTR__objects/object_ani/object_aniTex_0011D8" -static const ALIGN_ASSET(2) char object_aniTex_0011D8[] = dobject_aniTex_0011D8; #endif // OBJECTS_OBJECT_ANI_H diff --git a/soh/assets/objects/object_anubice/object_anubice.h b/soh/assets/objects/object_anubice/object_anubice.h index 3d0e76d01..5a2bdf514 100644 --- a/soh/assets/objects/object_anubice/object_anubice.h +++ b/soh/assets/objects/object_anubice/object_anubice.h @@ -3,6 +3,33 @@ #include "align_asset_macro.h" +#define dobject_anubiceTex_000F90 "__OTR__objects/object_anubice/object_anubiceTex_000F90" +static const ALIGN_ASSET(2) char object_anubiceTex_000F90[] = dobject_anubiceTex_000F90; + +#define dobject_anubiceTex_001090 "__OTR__objects/object_anubice/object_anubiceTex_001090" +static const ALIGN_ASSET(2) char object_anubiceTex_001090[] = dobject_anubiceTex_001090; + +#define dobject_anubiceTex_001110 "__OTR__objects/object_anubice/object_anubiceTex_001110" +static const ALIGN_ASSET(2) char object_anubiceTex_001110[] = dobject_anubiceTex_001110; + +#define dobject_anubiceTex_001510 "__OTR__objects/object_anubice/object_anubiceTex_001510" +static const ALIGN_ASSET(2) char object_anubiceTex_001510[] = dobject_anubiceTex_001510; + +#define dobject_anubiceTex_001590 "__OTR__objects/object_anubice/object_anubiceTex_001590" +static const ALIGN_ASSET(2) char object_anubiceTex_001590[] = dobject_anubiceTex_001590; + +#define dobject_anubiceTex_001610 "__OTR__objects/object_anubice/object_anubiceTex_001610" +static const ALIGN_ASSET(2) char object_anubiceTex_001610[] = dobject_anubiceTex_001610; + +#define dobject_anubiceTex_001690 "__OTR__objects/object_anubice/object_anubiceTex_001690" +static const ALIGN_ASSET(2) char object_anubiceTex_001690[] = dobject_anubiceTex_001690; + +#define dobject_anubiceTex_001A90 "__OTR__objects/object_anubice/object_anubiceTex_001A90" +static const ALIGN_ASSET(2) char object_anubiceTex_001A90[] = dobject_anubiceTex_001A90; + +#define dobject_anubiceTex_0036A0 "__OTR__objects/object_anubice/object_anubiceTex_0036A0" +static const ALIGN_ASSET(2) char object_anubiceTex_0036A0[] = dobject_anubiceTex_0036A0; + #define dgAnubiceSkel "__OTR__objects/object_anubice/gAnubiceSkel" static const ALIGN_ASSET(2) char gAnubiceSkel[] = dgAnubiceSkel; @@ -39,12 +66,6 @@ static const ALIGN_ASSET(2) char gAnubiceAnim_000A48[] = dgAnubiceAnim_000A48; #define dgAnubiceAnim_000BAC "__OTR__objects/object_anubice/gAnubiceAnim_000BAC" static const ALIGN_ASSET(2) char gAnubiceAnim_000BAC[] = dgAnubiceAnim_000BAC; -#define dobject_anubiceTex_001690 "__OTR__objects/object_anubice/object_anubiceTex_001690" -static const ALIGN_ASSET(2) char object_anubiceTex_001690[] = dobject_anubiceTex_001690; - -#define dobject_anubiceTex_0036A0 "__OTR__objects/object_anubice/object_anubiceTex_0036A0" -static const ALIGN_ASSET(2) char object_anubiceTex_0036A0[] = dobject_anubiceTex_0036A0; - #define dgAnubiceSkelLimbsLimb_0038B8DL_002CE0 "__OTR__objects/object_anubice/gAnubiceSkelLimbsLimb_0038B8DL_002CE0" static const ALIGN_ASSET(2) char gAnubiceSkelLimbsLimb_0038B8DL_002CE0[] = dgAnubiceSkelLimbsLimb_0038B8DL_002CE0; @@ -69,25 +90,5 @@ static const ALIGN_ASSET(2) char gAnubiceSkelLimbsLimb_003930DL_003288[] = dgAnu #define dgAnubiceSkelLimbsLimb_003948DL_0031A0 "__OTR__objects/object_anubice/gAnubiceSkelLimbsLimb_003948DL_0031A0" static const ALIGN_ASSET(2) char gAnubiceSkelLimbsLimb_003948DL_0031A0[] = dgAnubiceSkelLimbsLimb_003948DL_0031A0; -#define dobject_anubiceTex_001090 "__OTR__objects/object_anubice/object_anubiceTex_001090" -static const ALIGN_ASSET(2) char object_anubiceTex_001090[] = dobject_anubiceTex_001090; - -#define dobject_anubiceTex_000F90 "__OTR__objects/object_anubice/object_anubiceTex_000F90" -static const ALIGN_ASSET(2) char object_anubiceTex_000F90[] = dobject_anubiceTex_000F90; - -#define dobject_anubiceTex_001110 "__OTR__objects/object_anubice/object_anubiceTex_001110" -static const ALIGN_ASSET(2) char object_anubiceTex_001110[] = dobject_anubiceTex_001110; - -#define dobject_anubiceTex_001510 "__OTR__objects/object_anubice/object_anubiceTex_001510" -static const ALIGN_ASSET(2) char object_anubiceTex_001510[] = dobject_anubiceTex_001510; - -#define dobject_anubiceTex_001590 "__OTR__objects/object_anubice/object_anubiceTex_001590" -static const ALIGN_ASSET(2) char object_anubiceTex_001590[] = dobject_anubiceTex_001590; - -#define dobject_anubiceTex_001610 "__OTR__objects/object_anubice/object_anubiceTex_001610" -static const ALIGN_ASSET(2) char object_anubiceTex_001610[] = dobject_anubiceTex_001610; - -#define dobject_anubiceTex_001A90 "__OTR__objects/object_anubice/object_anubiceTex_001A90" -static const ALIGN_ASSET(2) char object_anubiceTex_001A90[] = dobject_anubiceTex_001A90; #endif // OBJECTS_OBJECT_ANUBICE_H diff --git a/soh/assets/objects/object_blkobj/object_blkobj.h b/soh/assets/objects/object_blkobj/object_blkobj.h index 3e1524b3a..dbbd1f46d 100644 --- a/soh/assets/objects/object_blkobj/object_blkobj.h +++ b/soh/assets/objects/object_blkobj/object_blkobj.h @@ -3,17 +3,8 @@ #include "align_asset_macro.h" -#define dgIllusionRoomCol "__OTR__objects/object_blkobj/gIllusionRoomCol" -static const ALIGN_ASSET(2) char gIllusionRoomCol[] = dgIllusionRoomCol; - -#define dgIllusionRoomNormalDL "__OTR__objects/object_blkobj/gIllusionRoomNormalDL" -static const ALIGN_ASSET(2) char gIllusionRoomNormalDL[] = dgIllusionRoomNormalDL; - -#define dgIllusionRoomIllusionDL "__OTR__objects/object_blkobj/gIllusionRoomIllusionDL" -static const ALIGN_ASSET(2) char gIllusionRoomIllusionDL[] = dgIllusionRoomIllusionDL; - -#define dgIllusionRoomTreeDL "__OTR__objects/object_blkobj/gIllusionRoomTreeDL" -static const ALIGN_ASSET(2) char gIllusionRoomTreeDL[] = dgIllusionRoomTreeDL; +#define dobject_blkobjTex_008090 "__OTR__objects/object_blkobj/object_blkobjTex_008090" +static const ALIGN_ASSET(2) char object_blkobjTex_008090[] = dobject_blkobjTex_008090; #define dobject_blkobjTex_008890 "__OTR__objects/object_blkobj/object_blkobjTex_008890" static const ALIGN_ASSET(2) char object_blkobjTex_008890[] = dobject_blkobjTex_008890; @@ -21,50 +12,41 @@ static const ALIGN_ASSET(2) char object_blkobjTex_008890[] = dobject_blkobjTex_0 #define dobject_blkobjTex_009090 "__OTR__objects/object_blkobj/object_blkobjTex_009090" static const ALIGN_ASSET(2) char object_blkobjTex_009090[] = dobject_blkobjTex_009090; -#define dobject_blkobjTex_00C090 "__OTR__objects/object_blkobj/object_blkobjTex_00C090" -static const ALIGN_ASSET(2) char object_blkobjTex_00C090[] = dobject_blkobjTex_00C090; - -#define dobject_blkobjTex_00D090 "__OTR__objects/object_blkobj/object_blkobjTex_00D090" -static const ALIGN_ASSET(2) char object_blkobjTex_00D090[] = dobject_blkobjTex_00D090; - #define dobject_blkobjTex_009890 "__OTR__objects/object_blkobj/object_blkobjTex_009890" static const ALIGN_ASSET(2) char object_blkobjTex_009890[] = dobject_blkobjTex_009890; -#define dobject_blkobjTex_00B890 "__OTR__objects/object_blkobj/object_blkobjTex_00B890" -static const ALIGN_ASSET(2) char object_blkobjTex_00B890[] = dobject_blkobjTex_00B890; - -#define dobject_blkobjTex_00C890 "__OTR__objects/object_blkobj/object_blkobjTex_00C890" -static const ALIGN_ASSET(2) char object_blkobjTex_00C890[] = dobject_blkobjTex_00C890; - -#define dobject_blkobjTex_00B090 "__OTR__objects/object_blkobj/object_blkobjTex_00B090" -static const ALIGN_ASSET(2) char object_blkobjTex_00B090[] = dobject_blkobjTex_00B090; - -#define dobject_blkobjTex_00E090 "__OTR__objects/object_blkobj/object_blkobjTex_00E090" -static const ALIGN_ASSET(2) char object_blkobjTex_00E090[] = dobject_blkobjTex_00E090; - -#define dobject_blkobjTex_008090 "__OTR__objects/object_blkobj/object_blkobjTex_008090" -static const ALIGN_ASSET(2) char object_blkobjTex_008090[] = dobject_blkobjTex_008090; - -#define dobject_blkobjTex_00A890 "__OTR__objects/object_blkobj/object_blkobjTex_00A890" -static const ALIGN_ASSET(2) char object_blkobjTex_00A890[] = dobject_blkobjTex_00A890; - -#define dobject_blkobjTex_00D890 "__OTR__objects/object_blkobj/object_blkobjTex_00D890" -static const ALIGN_ASSET(2) char object_blkobjTex_00D890[] = dobject_blkobjTex_00D890; - #define dobject_blkobjTex_00A090 "__OTR__objects/object_blkobj/object_blkobjTex_00A090" static const ALIGN_ASSET(2) char object_blkobjTex_00A090[] = dobject_blkobjTex_00A090; +#define dobject_blkobjTex_00A890 "__OTR__objects/object_blkobj/object_blkobjTex_00A890" +static const ALIGN_ASSET(2) char object_blkobjTex_00A890[] = dobject_blkobjTex_00A890; + +#define dobject_blkobjTex_00B090 "__OTR__objects/object_blkobj/object_blkobjTex_00B090" +static const ALIGN_ASSET(2) char object_blkobjTex_00B090[] = dobject_blkobjTex_00B090; + +#define dobject_blkobjTex_00B890 "__OTR__objects/object_blkobj/object_blkobjTex_00B890" +static const ALIGN_ASSET(2) char object_blkobjTex_00B890[] = dobject_blkobjTex_00B890; + +#define dobject_blkobjTex_00C090 "__OTR__objects/object_blkobj/object_blkobjTex_00C090" +static const ALIGN_ASSET(2) char object_blkobjTex_00C090[] = dobject_blkobjTex_00C090; + +#define dobject_blkobjTex_00C890 "__OTR__objects/object_blkobj/object_blkobjTex_00C890" +static const ALIGN_ASSET(2) char object_blkobjTex_00C890[] = dobject_blkobjTex_00C890; + +#define dobject_blkobjTex_00D090 "__OTR__objects/object_blkobj/object_blkobjTex_00D090" +static const ALIGN_ASSET(2) char object_blkobjTex_00D090[] = dobject_blkobjTex_00D090; + +#define dobject_blkobjTex_00D890 "__OTR__objects/object_blkobj/object_blkobjTex_00D890" +static const ALIGN_ASSET(2) char object_blkobjTex_00D890[] = dobject_blkobjTex_00D890; + +#define dobject_blkobjTex_00E090 "__OTR__objects/object_blkobj/object_blkobjTex_00E090" +static const ALIGN_ASSET(2) char object_blkobjTex_00E090[] = dobject_blkobjTex_00E090; + #define dobject_blkobjTex_00E890 "__OTR__objects/object_blkobj/object_blkobjTex_00E890" static const ALIGN_ASSET(2) char object_blkobjTex_00E890[] = dobject_blkobjTex_00E890; -#define dobject_blkobjTex_013090 "__OTR__objects/object_blkobj/object_blkobjTex_013090" -static const ALIGN_ASSET(2) char object_blkobjTex_013090[] = dobject_blkobjTex_013090; - -#define dobject_blkobjTex_012890 "__OTR__objects/object_blkobj/object_blkobjTex_012890" -static const ALIGN_ASSET(2) char object_blkobjTex_012890[] = dobject_blkobjTex_012890; - -#define dobject_blkobjTex_012090 "__OTR__objects/object_blkobj/object_blkobjTex_012090" -static const ALIGN_ASSET(2) char object_blkobjTex_012090[] = dobject_blkobjTex_012090; +#define dobject_blkobjTex_00F890 "__OTR__objects/object_blkobj/object_blkobjTex_00F890" +static const ALIGN_ASSET(2) char object_blkobjTex_00F890[] = dobject_blkobjTex_00F890; #define dobject_blkobjTex_010090 "__OTR__objects/object_blkobj/object_blkobjTex_010090" static const ALIGN_ASSET(2) char object_blkobjTex_010090[] = dobject_blkobjTex_010090; @@ -78,7 +60,25 @@ static const ALIGN_ASSET(2) char object_blkobjTex_011090[] = dobject_blkobjTex_0 #define dobject_blkobjTex_011890 "__OTR__objects/object_blkobj/object_blkobjTex_011890" static const ALIGN_ASSET(2) char object_blkobjTex_011890[] = dobject_blkobjTex_011890; -#define dobject_blkobjTex_00F890 "__OTR__objects/object_blkobj/object_blkobjTex_00F890" -static const ALIGN_ASSET(2) char object_blkobjTex_00F890[] = dobject_blkobjTex_00F890; +#define dobject_blkobjTex_012090 "__OTR__objects/object_blkobj/object_blkobjTex_012090" +static const ALIGN_ASSET(2) char object_blkobjTex_012090[] = dobject_blkobjTex_012090; + +#define dobject_blkobjTex_012890 "__OTR__objects/object_blkobj/object_blkobjTex_012890" +static const ALIGN_ASSET(2) char object_blkobjTex_012890[] = dobject_blkobjTex_012890; + +#define dobject_blkobjTex_013090 "__OTR__objects/object_blkobj/object_blkobjTex_013090" +static const ALIGN_ASSET(2) char object_blkobjTex_013090[] = dobject_blkobjTex_013090; + +#define dgIllusionRoomCol "__OTR__objects/object_blkobj/gIllusionRoomCol" +static const ALIGN_ASSET(2) char gIllusionRoomCol[] = dgIllusionRoomCol; + +#define dgIllusionRoomNormalDL "__OTR__objects/object_blkobj/gIllusionRoomNormalDL" +static const ALIGN_ASSET(2) char gIllusionRoomNormalDL[] = dgIllusionRoomNormalDL; + +#define dgIllusionRoomIllusionDL "__OTR__objects/object_blkobj/gIllusionRoomIllusionDL" +static const ALIGN_ASSET(2) char gIllusionRoomIllusionDL[] = dgIllusionRoomIllusionDL; + +#define dgIllusionRoomTreeDL "__OTR__objects/object_blkobj/gIllusionRoomTreeDL" +static const ALIGN_ASSET(2) char gIllusionRoomTreeDL[] = dgIllusionRoomTreeDL; #endif // OBJECTS_OBJECT_BLKOBJ_H diff --git a/soh/assets/objects/object_box/object_box.h b/soh/assets/objects/object_box/object_box.h index 118b0cc50..d8c4b8e89 100644 --- a/soh/assets/objects/object_box/object_box.h +++ b/soh/assets/objects/object_box/object_box.h @@ -3,6 +3,9 @@ #include "align_asset_macro.h" +#define dobject_boxTex_004F80 "__OTR__objects/object_box/object_boxTex_004F80" +static const ALIGN_ASSET(2) char object_boxTex_004F80[] = dobject_boxTex_004F80; + #define dgTreasureChestCurveSkel "__OTR__objects/object_box/gTreasureChestCurveSkel" static const ALIGN_ASSET(2) char gTreasureChestCurveSkel[] = dgTreasureChestCurveSkel; @@ -72,7 +75,5 @@ static const ALIGN_ASSET(2) char gTreasureChestCurveSkelLimbsLimb_005E50Curve2DL #define dgTreasureChestCurveSkelLimbsLimb_005E74Curve2DL_005AB8 "__OTR__objects/object_box/gTreasureChestCurveSkelLimbsLimb_005E74Curve2DL_005AB8" static const ALIGN_ASSET(2) char gTreasureChestCurveSkelLimbsLimb_005E74Curve2DL_005AB8[] = dgTreasureChestCurveSkelLimbsLimb_005E74Curve2DL_005AB8; -#define dobject_boxTex_004F80 "__OTR__objects/object_box/object_boxTex_004F80" -static const ALIGN_ASSET(2) char object_boxTex_004F80[] = dobject_boxTex_004F80; #endif // OBJECTS_OBJECT_BOX_H diff --git a/soh/assets/objects/object_bv/object_bv.h b/soh/assets/objects/object_bv/object_bv.h index fc65e6bf5..2815f1ffc 100644 --- a/soh/assets/objects/object_bv/object_bv.h +++ b/soh/assets/objects/object_bv/object_bv.h @@ -3,6 +3,117 @@ #include "align_asset_macro.h" +#define dobject_bvTex_000040 "__OTR__objects/object_bv/object_bvTex_000040" +static const ALIGN_ASSET(2) char object_bvTex_000040[] = dobject_bvTex_000040; + +#define dobject_bvTex_000840 "__OTR__objects/object_bv/object_bvTex_000840" +static const ALIGN_ASSET(2) char object_bvTex_000840[] = dobject_bvTex_000840; + +#define dobject_bvTex_000A40 "__OTR__objects/object_bv/object_bvTex_000A40" +static const ALIGN_ASSET(2) char object_bvTex_000A40[] = dobject_bvTex_000A40; + +#define dobject_bvTex_0051A0 "__OTR__objects/object_bv/object_bvTex_0051A0" +static const ALIGN_ASSET(2) char object_bvTex_0051A0[] = dobject_bvTex_0051A0; + +#define dobject_bvTex_0052A0 "__OTR__objects/object_bv/object_bvTex_0052A0" +static const ALIGN_ASSET(2) char object_bvTex_0052A0[] = dobject_bvTex_0052A0; + +#define dobject_bvTex_0053A0 "__OTR__objects/object_bv/object_bvTex_0053A0" +static const ALIGN_ASSET(2) char object_bvTex_0053A0[] = dobject_bvTex_0053A0; + +#define dobject_bvTex_0055A0 "__OTR__objects/object_bv/object_bvTex_0055A0" +static const ALIGN_ASSET(2) char object_bvTex_0055A0[] = dobject_bvTex_0055A0; + +#define dobject_bvTex_0059A0 "__OTR__objects/object_bv/object_bvTex_0059A0" +static const ALIGN_ASSET(2) char object_bvTex_0059A0[] = dobject_bvTex_0059A0; + +#define dobject_bvTex_005DA0 "__OTR__objects/object_bv/object_bvTex_005DA0" +static const ALIGN_ASSET(2) char object_bvTex_005DA0[] = dobject_bvTex_005DA0; + +#define dobject_bvTex_0065A0 "__OTR__objects/object_bv/object_bvTex_0065A0" +static const ALIGN_ASSET(2) char object_bvTex_0065A0[] = dobject_bvTex_0065A0; + +#define dobject_bvTex_008F88 "__OTR__objects/object_bv/object_bvTex_008F88" +static const ALIGN_ASSET(2) char object_bvTex_008F88[] = dobject_bvTex_008F88; + +#define dobject_bvTex_0117B8 "__OTR__objects/object_bv/object_bvTex_0117B8" +static const ALIGN_ASSET(2) char object_bvTex_0117B8[] = dobject_bvTex_0117B8; + +#define dobject_bvTex_0119B8 "__OTR__objects/object_bv/object_bvTex_0119B8" +static const ALIGN_ASSET(2) char object_bvTex_0119B8[] = dobject_bvTex_0119B8; + +#define dobject_bvTex_011BB8 "__OTR__objects/object_bv/object_bvTex_011BB8" +static const ALIGN_ASSET(2) char object_bvTex_011BB8[] = dobject_bvTex_011BB8; + +#define dobject_bvTex_012CE0 "__OTR__objects/object_bv/object_bvTex_012CE0" +static const ALIGN_ASSET(2) char object_bvTex_012CE0[] = dobject_bvTex_012CE0; + +#define dobject_bvTex_013660 "__OTR__objects/object_bv/object_bvTex_013660" +static const ALIGN_ASSET(2) char object_bvTex_013660[] = dobject_bvTex_013660; + +#define dobject_bvTex_0170D8 "__OTR__objects/object_bv/object_bvTex_0170D8" +static const ALIGN_ASSET(2) char object_bvTex_0170D8[] = dobject_bvTex_0170D8; + +#define dobject_bvTex_0171D8 "__OTR__objects/object_bv/object_bvTex_0171D8" +static const ALIGN_ASSET(2) char object_bvTex_0171D8[] = dobject_bvTex_0171D8; + +#define dobject_bvTex_018770 "__OTR__objects/object_bv/object_bvTex_018770" +static const ALIGN_ASSET(2) char object_bvTex_018770[] = dobject_bvTex_018770; + +#define dobject_bvTex_018D30 "__OTR__objects/object_bv/object_bvTex_018D30" +static const ALIGN_ASSET(2) char object_bvTex_018D30[] = dobject_bvTex_018D30; + +#define dobject_bvTex_018E30 "__OTR__objects/object_bv/object_bvTex_018E30" +static const ALIGN_ASSET(2) char object_bvTex_018E30[] = dobject_bvTex_018E30; + +#define dobject_bvTex_019BB8 "__OTR__objects/object_bv/object_bvTex_019BB8" +static const ALIGN_ASSET(2) char object_bvTex_019BB8[] = dobject_bvTex_019BB8; + +#define dobject_bvTex_01A6B8 "__OTR__objects/object_bv/object_bvTex_01A6B8" +static const ALIGN_ASSET(2) char object_bvTex_01A6B8[] = dobject_bvTex_01A6B8; + +#define dobject_bvTex_01B1B8 "__OTR__objects/object_bv/object_bvTex_01B1B8" +static const ALIGN_ASSET(2) char object_bvTex_01B1B8[] = dobject_bvTex_01B1B8; + +#define dobject_bvTex_01BCB8 "__OTR__objects/object_bv/object_bvTex_01BCB8" +static const ALIGN_ASSET(2) char object_bvTex_01BCB8[] = dobject_bvTex_01BCB8; + +#define dobject_bvTex_01C7B8 "__OTR__objects/object_bv/object_bvTex_01C7B8" +static const ALIGN_ASSET(2) char object_bvTex_01C7B8[] = dobject_bvTex_01C7B8; + +#define dobject_bvTex_01D2B8 "__OTR__objects/object_bv/object_bvTex_01D2B8" +static const ALIGN_ASSET(2) char object_bvTex_01D2B8[] = dobject_bvTex_01D2B8; + +#define dobject_bvTex_01DDB8 "__OTR__objects/object_bv/object_bvTex_01DDB8" +static const ALIGN_ASSET(2) char object_bvTex_01DDB8[] = dobject_bvTex_01DDB8; + +#define dobject_bvTex_01E8B8 "__OTR__objects/object_bv/object_bvTex_01E8B8" +static const ALIGN_ASSET(2) char object_bvTex_01E8B8[] = dobject_bvTex_01E8B8; + +#define dobject_bvTLUT_0199B0 "__OTR__objects/object_bv/object_bvTLUT_0199B0" +static const ALIGN_ASSET(2) char object_bvTLUT_0199B0[] = dobject_bvTLUT_0199B0; + +#define dobject_bvTLUT_01A4B0 "__OTR__objects/object_bv/object_bvTLUT_01A4B0" +static const ALIGN_ASSET(2) char object_bvTLUT_01A4B0[] = dobject_bvTLUT_01A4B0; + +#define dobject_bvTLUT_01AFB0 "__OTR__objects/object_bv/object_bvTLUT_01AFB0" +static const ALIGN_ASSET(2) char object_bvTLUT_01AFB0[] = dobject_bvTLUT_01AFB0; + +#define dobject_bvTLUT_01BAB0 "__OTR__objects/object_bv/object_bvTLUT_01BAB0" +static const ALIGN_ASSET(2) char object_bvTLUT_01BAB0[] = dobject_bvTLUT_01BAB0; + +#define dobject_bvTLUT_01C5B0 "__OTR__objects/object_bv/object_bvTLUT_01C5B0" +static const ALIGN_ASSET(2) char object_bvTLUT_01C5B0[] = dobject_bvTLUT_01C5B0; + +#define dobject_bvTLUT_01D0B0 "__OTR__objects/object_bv/object_bvTLUT_01D0B0" +static const ALIGN_ASSET(2) char object_bvTLUT_01D0B0[] = dobject_bvTLUT_01D0B0; + +#define dobject_bvTLUT_01DBB0 "__OTR__objects/object_bv/object_bvTLUT_01DBB0" +static const ALIGN_ASSET(2) char object_bvTLUT_01DBB0[] = dobject_bvTLUT_01DBB0; + +#define dobject_bvTLUT_01E6B0 "__OTR__objects/object_bv/object_bvTLUT_01E6B0" +static const ALIGN_ASSET(2) char object_bvTLUT_01E6B0[] = dobject_bvTLUT_01E6B0; + #define dgBarinadeTitleCardTex "__OTR__objects/object_bv/gBarinadeTitleCardTex" static const ALIGN_ASSET(2) char gBarinadeTitleCardTex[] = dgBarinadeTitleCardTex; @@ -183,87 +294,6 @@ static const ALIGN_ASSET(2) char gBarinadeDL_0094F8[] = dgBarinadeDL_0094F8; #define dgBarinadeDL_0095B0 "__OTR__objects/object_bv/gBarinadeDL_0095B0" static const ALIGN_ASSET(2) char gBarinadeDL_0095B0[] = dgBarinadeDL_0095B0; -#define dobject_bvTex_0065A0 "__OTR__objects/object_bv/object_bvTex_0065A0" -static const ALIGN_ASSET(2) char object_bvTex_0065A0[] = dobject_bvTex_0065A0; - -#define dobject_bvTex_005DA0 "__OTR__objects/object_bv/object_bvTex_005DA0" -static const ALIGN_ASSET(2) char object_bvTex_005DA0[] = dobject_bvTex_005DA0; - -#define dobject_bvTex_000A40 "__OTR__objects/object_bv/object_bvTex_000A40" -static const ALIGN_ASSET(2) char object_bvTex_000A40[] = dobject_bvTex_000A40; - -#define dobject_bvTex_013660 "__OTR__objects/object_bv/object_bvTex_013660" -static const ALIGN_ASSET(2) char object_bvTex_013660[] = dobject_bvTex_013660; - -#define dobject_bvTex_0117B8 "__OTR__objects/object_bv/object_bvTex_0117B8" -static const ALIGN_ASSET(2) char object_bvTex_0117B8[] = dobject_bvTex_0117B8; - -#define dobject_bvTex_011BB8 "__OTR__objects/object_bv/object_bvTex_011BB8" -static const ALIGN_ASSET(2) char object_bvTex_011BB8[] = dobject_bvTex_011BB8; - -#define dobject_bvTex_0119B8 "__OTR__objects/object_bv/object_bvTex_0119B8" -static const ALIGN_ASSET(2) char object_bvTex_0119B8[] = dobject_bvTex_0119B8; - -#define dobject_bvTex_012CE0 "__OTR__objects/object_bv/object_bvTex_012CE0" -static const ALIGN_ASSET(2) char object_bvTex_012CE0[] = dobject_bvTex_012CE0; - -#define dobject_bvTex_008F88 "__OTR__objects/object_bv/object_bvTex_008F88" -static const ALIGN_ASSET(2) char object_bvTex_008F88[] = dobject_bvTex_008F88; - -#define dobject_bvTex_019BB8 "__OTR__objects/object_bv/object_bvTex_019BB8" -static const ALIGN_ASSET(2) char object_bvTex_019BB8[] = dobject_bvTex_019BB8; - -#define dobject_bvTLUT_0199B0 "__OTR__objects/object_bv/object_bvTLUT_0199B0" -static const ALIGN_ASSET(2) char object_bvTLUT_0199B0[] = dobject_bvTLUT_0199B0; - -#define dobject_bvTex_01A6B8 "__OTR__objects/object_bv/object_bvTex_01A6B8" -static const ALIGN_ASSET(2) char object_bvTex_01A6B8[] = dobject_bvTex_01A6B8; - -#define dobject_bvTLUT_01A4B0 "__OTR__objects/object_bv/object_bvTLUT_01A4B0" -static const ALIGN_ASSET(2) char object_bvTLUT_01A4B0[] = dobject_bvTLUT_01A4B0; - -#define dobject_bvTex_01B1B8 "__OTR__objects/object_bv/object_bvTex_01B1B8" -static const ALIGN_ASSET(2) char object_bvTex_01B1B8[] = dobject_bvTex_01B1B8; - -#define dobject_bvTLUT_01AFB0 "__OTR__objects/object_bv/object_bvTLUT_01AFB0" -static const ALIGN_ASSET(2) char object_bvTLUT_01AFB0[] = dobject_bvTLUT_01AFB0; - -#define dobject_bvTex_01BCB8 "__OTR__objects/object_bv/object_bvTex_01BCB8" -static const ALIGN_ASSET(2) char object_bvTex_01BCB8[] = dobject_bvTex_01BCB8; - -#define dobject_bvTLUT_01BAB0 "__OTR__objects/object_bv/object_bvTLUT_01BAB0" -static const ALIGN_ASSET(2) char object_bvTLUT_01BAB0[] = dobject_bvTLUT_01BAB0; - -#define dobject_bvTex_01C7B8 "__OTR__objects/object_bv/object_bvTex_01C7B8" -static const ALIGN_ASSET(2) char object_bvTex_01C7B8[] = dobject_bvTex_01C7B8; - -#define dobject_bvTLUT_01C5B0 "__OTR__objects/object_bv/object_bvTLUT_01C5B0" -static const ALIGN_ASSET(2) char object_bvTLUT_01C5B0[] = dobject_bvTLUT_01C5B0; - -#define dobject_bvTex_01D2B8 "__OTR__objects/object_bv/object_bvTex_01D2B8" -static const ALIGN_ASSET(2) char object_bvTex_01D2B8[] = dobject_bvTex_01D2B8; - -#define dobject_bvTLUT_01D0B0 "__OTR__objects/object_bv/object_bvTLUT_01D0B0" -static const ALIGN_ASSET(2) char object_bvTLUT_01D0B0[] = dobject_bvTLUT_01D0B0; - -#define dobject_bvTex_01DDB8 "__OTR__objects/object_bv/object_bvTex_01DDB8" -static const ALIGN_ASSET(2) char object_bvTex_01DDB8[] = dobject_bvTex_01DDB8; - -#define dobject_bvTLUT_01DBB0 "__OTR__objects/object_bv/object_bvTLUT_01DBB0" -static const ALIGN_ASSET(2) char object_bvTLUT_01DBB0[] = dobject_bvTLUT_01DBB0; - -#define dobject_bvTex_01E8B8 "__OTR__objects/object_bv/object_bvTex_01E8B8" -static const ALIGN_ASSET(2) char object_bvTex_01E8B8[] = dobject_bvTex_01E8B8; - -#define dobject_bvTLUT_01E6B0 "__OTR__objects/object_bv/object_bvTLUT_01E6B0" -static const ALIGN_ASSET(2) char object_bvTLUT_01E6B0[] = dobject_bvTLUT_01E6B0; - -#define dobject_bvTex_0052A0 "__OTR__objects/object_bv/object_bvTex_0052A0" -static const ALIGN_ASSET(2) char object_bvTex_0052A0[] = dobject_bvTex_0052A0; - -#define dobject_bvTex_0053A0 "__OTR__objects/object_bv/object_bvTex_0053A0" -static const ALIGN_ASSET(2) char object_bvTex_0053A0[] = dobject_bvTex_0053A0; - #define dgBarinadeBodySkelLimbsLimb_015770DL_007FD8 "__OTR__objects/object_bv/gBarinadeBodySkelLimbsLimb_015770DL_007FD8" static const ALIGN_ASSET(2) char gBarinadeBodySkelLimbsLimb_015770DL_007FD8[] = dgBarinadeBodySkelLimbsLimb_015770DL_007FD8; @@ -360,34 +390,5 @@ static const ALIGN_ASSET(2) char gBarinadeCutSupportSkelLimbsLimb_017F88DL_017CB #define dgBarinadeCutSupportSkelLimbsLimb_017F94DL_017B90 "__OTR__objects/object_bv/gBarinadeCutSupportSkelLimbsLimb_017F94DL_017B90" static const ALIGN_ASSET(2) char gBarinadeCutSupportSkelLimbsLimb_017F94DL_017B90[] = dgBarinadeCutSupportSkelLimbsLimb_017F94DL_017B90; -#define dobject_bvTex_0051A0 "__OTR__objects/object_bv/object_bvTex_0051A0" -static const ALIGN_ASSET(2) char object_bvTex_0051A0[] = dobject_bvTex_0051A0; - -#define dobject_bvTex_0055A0 "__OTR__objects/object_bv/object_bvTex_0055A0" -static const ALIGN_ASSET(2) char object_bvTex_0055A0[] = dobject_bvTex_0055A0; - -#define dobject_bvTex_0059A0 "__OTR__objects/object_bv/object_bvTex_0059A0" -static const ALIGN_ASSET(2) char object_bvTex_0059A0[] = dobject_bvTex_0059A0; - -#define dobject_bvTex_0170D8 "__OTR__objects/object_bv/object_bvTex_0170D8" -static const ALIGN_ASSET(2) char object_bvTex_0170D8[] = dobject_bvTex_0170D8; - -#define dobject_bvTex_0171D8 "__OTR__objects/object_bv/object_bvTex_0171D8" -static const ALIGN_ASSET(2) char object_bvTex_0171D8[] = dobject_bvTex_0171D8; - -#define dobject_bvTex_018E30 "__OTR__objects/object_bv/object_bvTex_018E30" -static const ALIGN_ASSET(2) char object_bvTex_018E30[] = dobject_bvTex_018E30; - -#define dobject_bvTex_018D30 "__OTR__objects/object_bv/object_bvTex_018D30" -static const ALIGN_ASSET(2) char object_bvTex_018D30[] = dobject_bvTex_018D30; - -#define dobject_bvTex_018770 "__OTR__objects/object_bv/object_bvTex_018770" -static const ALIGN_ASSET(2) char object_bvTex_018770[] = dobject_bvTex_018770; - -#define dobject_bvTex_000840 "__OTR__objects/object_bv/object_bvTex_000840" -static const ALIGN_ASSET(2) char object_bvTex_000840[] = dobject_bvTex_000840; - -#define dobject_bvTex_000040 "__OTR__objects/object_bv/object_bvTex_000040" -static const ALIGN_ASSET(2) char object_bvTex_000040[] = dobject_bvTex_000040; #endif // OBJECTS_OBJECT_BV_H diff --git a/soh/assets/objects/object_demo_kekkai/object_demo_kekkai.h b/soh/assets/objects/object_demo_kekkai/object_demo_kekkai.h index 5cc98d75f..50177f33e 100644 --- a/soh/assets/objects/object_demo_kekkai/object_demo_kekkai.h +++ b/soh/assets/objects/object_demo_kekkai/object_demo_kekkai.h @@ -3,6 +3,54 @@ #include "align_asset_macro.h" +#define dobject_demo_kekkaiTex_000000 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_000000" +static const ALIGN_ASSET(2) char object_demo_kekkaiTex_000000[] = dobject_demo_kekkaiTex_000000; + +#define dobject_demo_kekkaiTex_000800 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_000800" +static const ALIGN_ASSET(2) char object_demo_kekkaiTex_000800[] = dobject_demo_kekkaiTex_000800; + +#define dobject_demo_kekkaiTex_001000 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_001000" +static const ALIGN_ASSET(2) char object_demo_kekkaiTex_001000[] = dobject_demo_kekkaiTex_001000; + +#define dobject_demo_kekkaiTex_002450 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_002450" +static const ALIGN_ASSET(2) char object_demo_kekkaiTex_002450[] = dobject_demo_kekkaiTex_002450; + +#define dobject_demo_kekkaiTex_0036A0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_0036A0" +static const ALIGN_ASSET(2) char object_demo_kekkaiTex_0036A0[] = dobject_demo_kekkaiTex_0036A0; + +#define dobject_demo_kekkaiTex_003EA0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_003EA0" +static const ALIGN_ASSET(2) char object_demo_kekkaiTex_003EA0[] = dobject_demo_kekkaiTex_003EA0; + +#define dobject_demo_kekkaiTex_004AC0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_004AC0" +static const ALIGN_ASSET(2) char object_demo_kekkaiTex_004AC0[] = dobject_demo_kekkaiTex_004AC0; + +#define dobject_demo_kekkaiTex_006140 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_006140" +static const ALIGN_ASSET(2) char object_demo_kekkaiTex_006140[] = dobject_demo_kekkaiTex_006140; + +#define dobject_demo_kekkaiTex_006940 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_006940" +static const ALIGN_ASSET(2) char object_demo_kekkaiTex_006940[] = dobject_demo_kekkaiTex_006940; + +#define dobject_demo_kekkaiTex_007DB0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_007DB0" +static const ALIGN_ASSET(2) char object_demo_kekkaiTex_007DB0[] = dobject_demo_kekkaiTex_007DB0; + +#define dobject_demo_kekkaiTex_0089D0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_0089D0" +static const ALIGN_ASSET(2) char object_demo_kekkaiTex_0089D0[] = dobject_demo_kekkaiTex_0089D0; + +#define dobject_demo_kekkaiTex_0092D0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_0092D0" +static const ALIGN_ASSET(2) char object_demo_kekkaiTex_0092D0[] = dobject_demo_kekkaiTex_0092D0; + +#define dobject_demo_kekkaiTex_00A440 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_00A440" +static const ALIGN_ASSET(2) char object_demo_kekkaiTex_00A440[] = dobject_demo_kekkaiTex_00A440; + +#define dobject_demo_kekkaiTex_00B540 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_00B540" +static const ALIGN_ASSET(2) char object_demo_kekkaiTex_00B540[] = dobject_demo_kekkaiTex_00B540; + +#define dobject_demo_kekkaiTex_00C0B0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_00C0B0" +static const ALIGN_ASSET(2) char object_demo_kekkaiTex_00C0B0[] = dobject_demo_kekkaiTex_00C0B0; + +#define dobject_demo_kekkaiTex_00C8B0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_00C8B0" +static const ALIGN_ASSET(2) char object_demo_kekkaiTex_00C8B0[] = dobject_demo_kekkaiTex_00C8B0; + #define dgTowerBarrierDL "__OTR__objects/object_demo_kekkai/gTowerBarrierDL" static const ALIGN_ASSET(2) char gTowerBarrierDL[] = dgTowerBarrierDL; @@ -63,52 +111,4 @@ static const ALIGN_ASSET(2) char gDemoKekkaiDL_005FF0[] = dgDemoKekkaiDL_005FF0; #define dgGanonsCastleDoorDL "__OTR__objects/object_demo_kekkai/gGanonsCastleDoorDL" static const ALIGN_ASSET(2) char gGanonsCastleDoorDL[] = dgGanonsCastleDoorDL; -#define dobject_demo_kekkaiTex_000000 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_000000" -static const ALIGN_ASSET(2) char object_demo_kekkaiTex_000000[] = dobject_demo_kekkaiTex_000000; - -#define dobject_demo_kekkaiTex_004AC0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_004AC0" -static const ALIGN_ASSET(2) char object_demo_kekkaiTex_004AC0[] = dobject_demo_kekkaiTex_004AC0; - -#define dobject_demo_kekkaiTex_000800 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_000800" -static const ALIGN_ASSET(2) char object_demo_kekkaiTex_000800[] = dobject_demo_kekkaiTex_000800; - -#define dobject_demo_kekkaiTex_007DB0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_007DB0" -static const ALIGN_ASSET(2) char object_demo_kekkaiTex_007DB0[] = dobject_demo_kekkaiTex_007DB0; - -#define dobject_demo_kekkaiTex_00B540 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_00B540" -static const ALIGN_ASSET(2) char object_demo_kekkaiTex_00B540[] = dobject_demo_kekkaiTex_00B540; - -#define dobject_demo_kekkaiTex_00C8B0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_00C8B0" -static const ALIGN_ASSET(2) char object_demo_kekkaiTex_00C8B0[] = dobject_demo_kekkaiTex_00C8B0; - -#define dobject_demo_kekkaiTex_00C0B0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_00C0B0" -static const ALIGN_ASSET(2) char object_demo_kekkaiTex_00C0B0[] = dobject_demo_kekkaiTex_00C0B0; - -#define dobject_demo_kekkaiTex_0036A0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_0036A0" -static const ALIGN_ASSET(2) char object_demo_kekkaiTex_0036A0[] = dobject_demo_kekkaiTex_0036A0; - -#define dobject_demo_kekkaiTex_003EA0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_003EA0" -static const ALIGN_ASSET(2) char object_demo_kekkaiTex_003EA0[] = dobject_demo_kekkaiTex_003EA0; - -#define dobject_demo_kekkaiTex_0089D0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_0089D0" -static const ALIGN_ASSET(2) char object_demo_kekkaiTex_0089D0[] = dobject_demo_kekkaiTex_0089D0; - -#define dobject_demo_kekkaiTex_0092D0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_0092D0" -static const ALIGN_ASSET(2) char object_demo_kekkaiTex_0092D0[] = dobject_demo_kekkaiTex_0092D0; - -#define dobject_demo_kekkaiTex_00A440 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_00A440" -static const ALIGN_ASSET(2) char object_demo_kekkaiTex_00A440[] = dobject_demo_kekkaiTex_00A440; - -#define dobject_demo_kekkaiTex_006140 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_006140" -static const ALIGN_ASSET(2) char object_demo_kekkaiTex_006140[] = dobject_demo_kekkaiTex_006140; - -#define dobject_demo_kekkaiTex_006940 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_006940" -static const ALIGN_ASSET(2) char object_demo_kekkaiTex_006940[] = dobject_demo_kekkaiTex_006940; - -#define dobject_demo_kekkaiTex_002450 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_002450" -static const ALIGN_ASSET(2) char object_demo_kekkaiTex_002450[] = dobject_demo_kekkaiTex_002450; - -#define dobject_demo_kekkaiTex_001000 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_001000" -static const ALIGN_ASSET(2) char object_demo_kekkaiTex_001000[] = dobject_demo_kekkaiTex_001000; - #endif // OBJECTS_OBJECT_DEMO_KEKKAI_H diff --git a/soh/assets/objects/object_dnk/object_dnk.h b/soh/assets/objects/object_dnk/object_dnk.h index 6fcec0b50..90a4642a3 100644 --- a/soh/assets/objects/object_dnk/object_dnk.h +++ b/soh/assets/objects/object_dnk/object_dnk.h @@ -3,6 +3,21 @@ #include "align_asset_macro.h" +#define dobject_dnkTex_001BD0 "__OTR__objects/object_dnk/object_dnkTex_001BD0" +static const ALIGN_ASSET(2) char object_dnkTex_001BD0[] = dobject_dnkTex_001BD0; + +#define dobject_dnkTex_0023D0 "__OTR__objects/object_dnk/object_dnkTex_0023D0" +static const ALIGN_ASSET(2) char object_dnkTex_0023D0[] = dobject_dnkTex_0023D0; + +#define dobject_dnkTex_002650 "__OTR__objects/object_dnk/object_dnkTex_002650" +static const ALIGN_ASSET(2) char object_dnkTex_002650[] = dobject_dnkTex_002650; + +#define dobject_dnkTex_0026D0 "__OTR__objects/object_dnk/object_dnkTex_0026D0" +static const ALIGN_ASSET(2) char object_dnkTex_0026D0[] = dobject_dnkTex_0026D0; + +#define dobject_dnkTex_002850 "__OTR__objects/object_dnk/object_dnkTex_002850" +static const ALIGN_ASSET(2) char object_dnkTex_002850[] = dobject_dnkTex_002850; + #define dgDntStageSkel "__OTR__objects/object_dnk/gDntStageSkel" static const ALIGN_ASSET(2) char gDntStageSkel[] = dgDntStageSkel; @@ -42,12 +57,6 @@ static const ALIGN_ASSET(2) char gDntStageNutDL[] = dgDntStageNutDL; #define dgDntStageWaitAnim "__OTR__objects/object_dnk/gDntStageWaitAnim" static const ALIGN_ASSET(2) char gDntStageWaitAnim[] = dgDntStageWaitAnim; -#define dobject_dnkTex_001BD0 "__OTR__objects/object_dnk/object_dnkTex_001BD0" -static const ALIGN_ASSET(2) char object_dnkTex_001BD0[] = dobject_dnkTex_001BD0; - -#define dobject_dnkTex_002850 "__OTR__objects/object_dnk/object_dnkTex_002850" -static const ALIGN_ASSET(2) char object_dnkTex_002850[] = dobject_dnkTex_002850; - #define dgDntStageSkelLimbsLimb_002A50DL_0011E0 "__OTR__objects/object_dnk/gDntStageSkelLimbsLimb_002A50DL_0011E0" static const ALIGN_ASSET(2) char gDntStageSkelLimbsLimb_002A50DL_0011E0[] = dgDntStageSkelLimbsLimb_002A50DL_0011E0; @@ -78,13 +87,5 @@ static const ALIGN_ASSET(2) char gDntStageSkelLimbsLimb_002AB0DL_001700[] = dgDn #define dgDntStageSkelLimbsLimb_002ABCDL_0017B0 "__OTR__objects/object_dnk/gDntStageSkelLimbsLimb_002ABCDL_0017B0" static const ALIGN_ASSET(2) char gDntStageSkelLimbsLimb_002ABCDL_0017B0[] = dgDntStageSkelLimbsLimb_002ABCDL_0017B0; -#define dobject_dnkTex_0023D0 "__OTR__objects/object_dnk/object_dnkTex_0023D0" -static const ALIGN_ASSET(2) char object_dnkTex_0023D0[] = dobject_dnkTex_0023D0; - -#define dobject_dnkTex_002650 "__OTR__objects/object_dnk/object_dnkTex_002650" -static const ALIGN_ASSET(2) char object_dnkTex_002650[] = dobject_dnkTex_002650; - -#define dobject_dnkTex_0026D0 "__OTR__objects/object_dnk/object_dnkTex_0026D0" -static const ALIGN_ASSET(2) char object_dnkTex_0026D0[] = dobject_dnkTex_0026D0; #endif // OBJECTS_OBJECT_DNK_H diff --git a/soh/assets/objects/object_dns/object_dns.h b/soh/assets/objects/object_dns/object_dns.h index 630a7e9d0..4ab11c5ef 100644 --- a/soh/assets/objects/object_dns/object_dns.h +++ b/soh/assets/objects/object_dns/object_dns.h @@ -3,6 +3,21 @@ #include "align_asset_macro.h" +#define dobject_dnsTex_0024A0 "__OTR__objects/object_dns/object_dnsTex_0024A0" +static const ALIGN_ASSET(2) char object_dnsTex_0024A0[] = dobject_dnsTex_0024A0; + +#define dobject_dnsTex_002CA0 "__OTR__objects/object_dns/object_dnsTex_002CA0" +static const ALIGN_ASSET(2) char object_dnsTex_002CA0[] = dobject_dnsTex_002CA0; + +#define dobject_dnsTex_002F20 "__OTR__objects/object_dns/object_dnsTex_002F20" +static const ALIGN_ASSET(2) char object_dnsTex_002F20[] = dobject_dnsTex_002F20; + +#define dobject_dnsTex_002FA0 "__OTR__objects/object_dns/object_dnsTex_002FA0" +static const ALIGN_ASSET(2) char object_dnsTex_002FA0[] = dobject_dnsTex_002FA0; + +#define dobject_dnsTex_003120 "__OTR__objects/object_dns/object_dnsTex_003120" +static const ALIGN_ASSET(2) char object_dnsTex_003120[] = dobject_dnsTex_003120; + #define dgDntJijiSkel "__OTR__objects/object_dns/gDntJijiSkel" static const ALIGN_ASSET(2) char gDntJijiSkel[] = dgDntJijiSkel; @@ -54,12 +69,6 @@ static const ALIGN_ASSET(2) char gDntJijiUnkAnim[] = dgDntJijiUnkAnim; #define dgDntJijiWaitAnim "__OTR__objects/object_dns/gDntJijiWaitAnim" static const ALIGN_ASSET(2) char gDntJijiWaitAnim[] = dgDntJijiWaitAnim; -#define dobject_dnsTex_0024A0 "__OTR__objects/object_dns/object_dnsTex_0024A0" -static const ALIGN_ASSET(2) char object_dnsTex_0024A0[] = dobject_dnsTex_0024A0; - -#define dobject_dnsTex_003120 "__OTR__objects/object_dns/object_dnsTex_003120" -static const ALIGN_ASSET(2) char object_dnsTex_003120[] = dobject_dnsTex_003120; - #define dgDntJijiSkelLimbsLimb_003320DL_001AF0 "__OTR__objects/object_dns/gDntJijiSkelLimbsLimb_003320DL_001AF0" static const ALIGN_ASSET(2) char gDntJijiSkelLimbsLimb_003320DL_001AF0[] = dgDntJijiSkelLimbsLimb_003320DL_001AF0; @@ -96,13 +105,5 @@ static const ALIGN_ASSET(2) char gDntJijiSkelLimbsLimb_003398DL_001A40[] = dgDnt #define dgDntJijiSkelLimbsLimb_0033A4DL_001990 "__OTR__objects/object_dns/gDntJijiSkelLimbsLimb_0033A4DL_001990" static const ALIGN_ASSET(2) char gDntJijiSkelLimbsLimb_0033A4DL_001990[] = dgDntJijiSkelLimbsLimb_0033A4DL_001990; -#define dobject_dnsTex_002CA0 "__OTR__objects/object_dns/object_dnsTex_002CA0" -static const ALIGN_ASSET(2) char object_dnsTex_002CA0[] = dobject_dnsTex_002CA0; - -#define dobject_dnsTex_002F20 "__OTR__objects/object_dns/object_dnsTex_002F20" -static const ALIGN_ASSET(2) char object_dnsTex_002F20[] = dobject_dnsTex_002F20; - -#define dobject_dnsTex_002FA0 "__OTR__objects/object_dns/object_dnsTex_002FA0" -static const ALIGN_ASSET(2) char object_dnsTex_002FA0[] = dobject_dnsTex_002FA0; #endif // OBJECTS_OBJECT_DNS_H diff --git a/soh/assets/objects/object_fd/object_fd.h b/soh/assets/objects/object_fd/object_fd.h index fb2beed84..bc0dd3d4d 100644 --- a/soh/assets/objects/object_fd/object_fd.h +++ b/soh/assets/objects/object_fd/object_fd.h @@ -3,6 +3,87 @@ #include "align_asset_macro.h" +#define dobject_fdTex_000458 "__OTR__objects/object_fd/object_fdTex_000458" +static const ALIGN_ASSET(2) char object_fdTex_000458[] = dobject_fdTex_000458; + +#define dobject_fdTex_000658 "__OTR__objects/object_fd/object_fdTex_000658" +static const ALIGN_ASSET(2) char object_fdTex_000658[] = dobject_fdTex_000658; + +#define dobject_fdTex_000A78 "__OTR__objects/object_fd/object_fdTex_000A78" +static const ALIGN_ASSET(2) char object_fdTex_000A78[] = dobject_fdTex_000A78; + +#define dobject_fdTex_0040A8 "__OTR__objects/object_fd/object_fdTex_0040A8" +static const ALIGN_ASSET(2) char object_fdTex_0040A8[] = dobject_fdTex_0040A8; + +#define dobject_fdTex_0048A8 "__OTR__objects/object_fd/object_fdTex_0048A8" +static const ALIGN_ASSET(2) char object_fdTex_0048A8[] = dobject_fdTex_0048A8; + +#define dobject_fdTex_0050A8 "__OTR__objects/object_fd/object_fdTex_0050A8" +static const ALIGN_ASSET(2) char object_fdTex_0050A8[] = dobject_fdTex_0050A8; + +#define dobject_fdTex_0052A8 "__OTR__objects/object_fd/object_fdTex_0052A8" +static const ALIGN_ASSET(2) char object_fdTex_0052A8[] = dobject_fdTex_0052A8; + +#define dobject_fdTex_0054A8 "__OTR__objects/object_fd/object_fdTex_0054A8" +static const ALIGN_ASSET(2) char object_fdTex_0054A8[] = dobject_fdTex_0054A8; + +#define dobject_fdTex_0056A8 "__OTR__objects/object_fd/object_fdTex_0056A8" +static const ALIGN_ASSET(2) char object_fdTex_0056A8[] = dobject_fdTex_0056A8; + +#define dobject_fdTex_005B60 "__OTR__objects/object_fd/object_fdTex_005B60" +static const ALIGN_ASSET(2) char object_fdTex_005B60[] = dobject_fdTex_005B60; + +#define dobject_fdTex_005D60 "__OTR__objects/object_fd/object_fdTex_005D60" +static const ALIGN_ASSET(2) char object_fdTex_005D60[] = dobject_fdTex_005D60; + +#define dobject_fdTex_005F60 "__OTR__objects/object_fd/object_fdTex_005F60" +static const ALIGN_ASSET(2) char object_fdTex_005F60[] = dobject_fdTex_005F60; + +#define dobject_fdTex_009208 "__OTR__objects/object_fd/object_fdTex_009208" +static const ALIGN_ASSET(2) char object_fdTex_009208[] = dobject_fdTex_009208; + +#define dobject_fdTex_009780 "__OTR__objects/object_fd/object_fdTex_009780" +static const ALIGN_ASSET(2) char object_fdTex_009780[] = dobject_fdTex_009780; + +#define dobject_fdTex_009980 "__OTR__objects/object_fd/object_fdTex_009980" +static const ALIGN_ASSET(2) char object_fdTex_009980[] = dobject_fdTex_009980; + +#define dobject_fdTex_00A050 "__OTR__objects/object_fd/object_fdTex_00A050" +static const ALIGN_ASSET(2) char object_fdTex_00A050[] = dobject_fdTex_00A050; + +#define dobject_fdTex_00A918 "__OTR__objects/object_fd/object_fdTex_00A918" +static const ALIGN_ASSET(2) char object_fdTex_00A918[] = dobject_fdTex_00A918; + +#define dobject_fdTex_00AA18 "__OTR__objects/object_fd/object_fdTex_00AA18" +static const ALIGN_ASSET(2) char object_fdTex_00AA18[] = dobject_fdTex_00AA18; + +#define dobject_fdTex_00B458 "__OTR__objects/object_fd/object_fdTex_00B458" +static const ALIGN_ASSET(2) char object_fdTex_00B458[] = dobject_fdTex_00B458; + +#define dobject_fdTex_00BC58 "__OTR__objects/object_fd/object_fdTex_00BC58" +static const ALIGN_ASSET(2) char object_fdTex_00BC58[] = dobject_fdTex_00BC58; + +#define dobject_fdTex_00BE58 "__OTR__objects/object_fd/object_fdTex_00BE58" +static const ALIGN_ASSET(2) char object_fdTex_00BE58[] = dobject_fdTex_00BE58; + +#define dobject_fdTex_00C058 "__OTR__objects/object_fd/object_fdTex_00C058" +static const ALIGN_ASSET(2) char object_fdTex_00C058[] = dobject_fdTex_00C058; + +#define dobject_fdTex_00D170 "__OTR__objects/object_fd/object_fdTex_00D170" +static const ALIGN_ASSET(2) char object_fdTex_00D170[] = dobject_fdTex_00D170; + +#define dobject_fdTex_00D438 "__OTR__objects/object_fd/object_fdTex_00D438" +static const ALIGN_ASSET(2) char object_fdTex_00D438[] = dobject_fdTex_00D438; + +#define dobject_fdTLUT_000438 "__OTR__objects/object_fd/object_fdTLUT_000438" +static const ALIGN_ASSET(2) char object_fdTLUT_000438[] = dobject_fdTLUT_000438; + +#define dobject_fdTLUT_000A58 "__OTR__objects/object_fd/object_fdTLUT_000A58" +static const ALIGN_ASSET(2) char object_fdTLUT_000A58[] = dobject_fdTLUT_000A58; + +#define dobject_fdTLUT_0032A8 "__OTR__objects/object_fd/object_fdTLUT_0032A8" +static const ALIGN_ASSET(2) char object_fdTLUT_0032A8[] = dobject_fdTLUT_0032A8; + #define dgVolvagiaTitleCardTex "__OTR__objects/object_fd/gVolvagiaTitleCardTex" static const ALIGN_ASSET(2) char gVolvagiaTitleCardTex[] = dgVolvagiaTitleCardTex; @@ -150,72 +231,6 @@ static const ALIGN_ASSET(2) char gVolvagiaPlatformDL[] = dgVolvagiaPlatformDL; #define dgVolvagiaRockDL "__OTR__objects/object_fd/gVolvagiaRockDL" static const ALIGN_ASSET(2) char gVolvagiaRockDL[] = dgVolvagiaRockDL; -#define dobject_fdTex_005B60 "__OTR__objects/object_fd/object_fdTex_005B60" -static const ALIGN_ASSET(2) char object_fdTex_005B60[] = dobject_fdTex_005B60; - -#define dobject_fdTex_005F60 "__OTR__objects/object_fd/object_fdTex_005F60" -static const ALIGN_ASSET(2) char object_fdTex_005F60[] = dobject_fdTex_005F60; - -#define dobject_fdTex_005D60 "__OTR__objects/object_fd/object_fdTex_005D60" -static const ALIGN_ASSET(2) char object_fdTex_005D60[] = dobject_fdTex_005D60; - -#define dobject_fdTex_009208 "__OTR__objects/object_fd/object_fdTex_009208" -static const ALIGN_ASSET(2) char object_fdTex_009208[] = dobject_fdTex_009208; - -#define dobject_fdTex_00AA18 "__OTR__objects/object_fd/object_fdTex_00AA18" -static const ALIGN_ASSET(2) char object_fdTex_00AA18[] = dobject_fdTex_00AA18; - -#define dobject_fdTex_00C058 "__OTR__objects/object_fd/object_fdTex_00C058" -static const ALIGN_ASSET(2) char object_fdTex_00C058[] = dobject_fdTex_00C058; - -#define dobject_fdTex_00BE58 "__OTR__objects/object_fd/object_fdTex_00BE58" -static const ALIGN_ASSET(2) char object_fdTex_00BE58[] = dobject_fdTex_00BE58; - -#define dobject_fdTex_00BC58 "__OTR__objects/object_fd/object_fdTex_00BC58" -static const ALIGN_ASSET(2) char object_fdTex_00BC58[] = dobject_fdTex_00BC58; - -#define dobject_fdTex_00B458 "__OTR__objects/object_fd/object_fdTex_00B458" -static const ALIGN_ASSET(2) char object_fdTex_00B458[] = dobject_fdTex_00B458; - -#define dobject_fdTex_0040A8 "__OTR__objects/object_fd/object_fdTex_0040A8" -static const ALIGN_ASSET(2) char object_fdTex_0040A8[] = dobject_fdTex_0040A8; - -#define dobject_fdTex_0048A8 "__OTR__objects/object_fd/object_fdTex_0048A8" -static const ALIGN_ASSET(2) char object_fdTex_0048A8[] = dobject_fdTex_0048A8; - -#define dobject_fdTex_00A918 "__OTR__objects/object_fd/object_fdTex_00A918" -static const ALIGN_ASSET(2) char object_fdTex_00A918[] = dobject_fdTex_00A918; - -#define dobject_fdTex_00D170 "__OTR__objects/object_fd/object_fdTex_00D170" -static const ALIGN_ASSET(2) char object_fdTex_00D170[] = dobject_fdTex_00D170; - -#define dobject_fdTex_00D438 "__OTR__objects/object_fd/object_fdTex_00D438" -static const ALIGN_ASSET(2) char object_fdTex_00D438[] = dobject_fdTex_00D438; - -#define dobject_fdTex_009780 "__OTR__objects/object_fd/object_fdTex_009780" -static const ALIGN_ASSET(2) char object_fdTex_009780[] = dobject_fdTex_009780; - -#define dobject_fdTex_009980 "__OTR__objects/object_fd/object_fdTex_009980" -static const ALIGN_ASSET(2) char object_fdTex_009980[] = dobject_fdTex_009980; - -#define dobject_fdTex_000A78 "__OTR__objects/object_fd/object_fdTex_000A78" -static const ALIGN_ASSET(2) char object_fdTex_000A78[] = dobject_fdTex_000A78; - -#define dobject_fdTLUT_000A58 "__OTR__objects/object_fd/object_fdTLUT_000A58" -static const ALIGN_ASSET(2) char object_fdTLUT_000A58[] = dobject_fdTLUT_000A58; - -#define dobject_fdTex_000658 "__OTR__objects/object_fd/object_fdTex_000658" -static const ALIGN_ASSET(2) char object_fdTex_000658[] = dobject_fdTex_000658; - -#define dobject_fdTLUT_000438 "__OTR__objects/object_fd/object_fdTLUT_000438" -static const ALIGN_ASSET(2) char object_fdTLUT_000438[] = dobject_fdTLUT_000438; - -#define dobject_fdTex_000458 "__OTR__objects/object_fd/object_fdTex_000458" -static const ALIGN_ASSET(2) char object_fdTex_000458[] = dobject_fdTex_000458; - -#define dobject_fdTex_00A050 "__OTR__objects/object_fd/object_fdTex_00A050" -static const ALIGN_ASSET(2) char object_fdTex_00A050[] = dobject_fdTex_00A050; - #define dgVolvagiaLeftArmSkelLimbsLimb_011480DL_0024E8 "__OTR__objects/object_fd/gVolvagiaLeftArmSkelLimbsLimb_011480DL_0024E8" static const ALIGN_ASSET(2) char gVolvagiaLeftArmSkelLimbsLimb_011480DL_0024E8[] = dgVolvagiaLeftArmSkelLimbsLimb_011480DL_0024E8; @@ -267,19 +282,5 @@ static const ALIGN_ASSET(2) char gVolvagiaHeadSkelLimbsLimb_011630DL_0020A8[] = #define dgVolvagiaHeadSkelLimbsLimb_01163CDL_001DB0 "__OTR__objects/object_fd/gVolvagiaHeadSkelLimbsLimb_01163CDL_001DB0" static const ALIGN_ASSET(2) char gVolvagiaHeadSkelLimbsLimb_01163CDL_001DB0[] = dgVolvagiaHeadSkelLimbsLimb_01163CDL_001DB0; -#define dobject_fdTex_0050A8 "__OTR__objects/object_fd/object_fdTex_0050A8" -static const ALIGN_ASSET(2) char object_fdTex_0050A8[] = dobject_fdTex_0050A8; - -#define dobject_fdTex_0054A8 "__OTR__objects/object_fd/object_fdTex_0054A8" -static const ALIGN_ASSET(2) char object_fdTex_0054A8[] = dobject_fdTex_0054A8; - -#define dobject_fdTex_0052A8 "__OTR__objects/object_fd/object_fdTex_0052A8" -static const ALIGN_ASSET(2) char object_fdTex_0052A8[] = dobject_fdTex_0052A8; - -#define dobject_fdTex_0056A8 "__OTR__objects/object_fd/object_fdTex_0056A8" -static const ALIGN_ASSET(2) char object_fdTex_0056A8[] = dobject_fdTex_0056A8; - -#define dobject_fdTLUT_0032A8 "__OTR__objects/object_fd/object_fdTLUT_0032A8" -static const ALIGN_ASSET(2) char object_fdTLUT_0032A8[] = dobject_fdTLUT_0032A8; #endif // OBJECTS_OBJECT_FD_H diff --git a/soh/assets/objects/object_fd2/object_fd2.h b/soh/assets/objects/object_fd2/object_fd2.h index 736f5f1f1..047bfce57 100644 --- a/soh/assets/objects/object_fd2/object_fd2.h +++ b/soh/assets/objects/object_fd2/object_fd2.h @@ -3,6 +3,39 @@ #include "align_asset_macro.h" +#define dobject_fd2Tex_003308 "__OTR__objects/object_fd2/object_fd2Tex_003308" +static const ALIGN_ASSET(2) char object_fd2Tex_003308[] = dobject_fd2Tex_003308; + +#define dobject_fd2Tex_003B08 "__OTR__objects/object_fd2/object_fd2Tex_003B08" +static const ALIGN_ASSET(2) char object_fd2Tex_003B08[] = dobject_fd2Tex_003B08; + +#define dobject_fd2Tex_004308 "__OTR__objects/object_fd2/object_fd2Tex_004308" +static const ALIGN_ASSET(2) char object_fd2Tex_004308[] = dobject_fd2Tex_004308; + +#define dobject_fd2Tex_004508 "__OTR__objects/object_fd2/object_fd2Tex_004508" +static const ALIGN_ASSET(2) char object_fd2Tex_004508[] = dobject_fd2Tex_004508; + +#define dobject_fd2Tex_004708 "__OTR__objects/object_fd2/object_fd2Tex_004708" +static const ALIGN_ASSET(2) char object_fd2Tex_004708[] = dobject_fd2Tex_004708; + +#define dobject_fd2Tex_004908 "__OTR__objects/object_fd2/object_fd2Tex_004908" +static const ALIGN_ASSET(2) char object_fd2Tex_004908[] = dobject_fd2Tex_004908; + +#define dobject_fd2Tex_004BE8 "__OTR__objects/object_fd2/object_fd2Tex_004BE8" +static const ALIGN_ASSET(2) char object_fd2Tex_004BE8[] = dobject_fd2Tex_004BE8; + +#define dobject_fd2Tex_004FA0 "__OTR__objects/object_fd2/object_fd2Tex_004FA0" +static const ALIGN_ASSET(2) char object_fd2Tex_004FA0[] = dobject_fd2Tex_004FA0; + +#define dobject_fd2Tex_0051A0 "__OTR__objects/object_fd2/object_fd2Tex_0051A0" +static const ALIGN_ASSET(2) char object_fd2Tex_0051A0[] = dobject_fd2Tex_0051A0; + +#define dobject_fd2Tex_0053A0 "__OTR__objects/object_fd2/object_fd2Tex_0053A0" +static const ALIGN_ASSET(2) char object_fd2Tex_0053A0[] = dobject_fd2Tex_0053A0; + +#define dobject_fd2TLUT_002508 "__OTR__objects/object_fd2/object_fd2TLUT_002508" +static const ALIGN_ASSET(2) char object_fd2TLUT_002508[] = dobject_fd2TLUT_002508; + #define dgHoleVolvagiaSkel "__OTR__objects/object_fd2/gHoleVolvagiaSkel" static const ALIGN_ASSET(2) char gHoleVolvagiaSkel[] = dgHoleVolvagiaSkel; @@ -63,18 +96,6 @@ static const ALIGN_ASSET(2) char gHoleVolvagiaVtx_00DD80[] = dgHoleVolvagiaVtx_0 #define dgHoleVolvagiaVtx_00D000 "__OTR__objects/object_fd2/gHoleVolvagiaVtx_00D000" static const ALIGN_ASSET(2) char gHoleVolvagiaVtx_00D000[] = dgHoleVolvagiaVtx_00D000; -#define dobject_fd2Tex_004BE8 "__OTR__objects/object_fd2/object_fd2Tex_004BE8" -static const ALIGN_ASSET(2) char object_fd2Tex_004BE8[] = dobject_fd2Tex_004BE8; - -#define dobject_fd2Tex_004FA0 "__OTR__objects/object_fd2/object_fd2Tex_004FA0" -static const ALIGN_ASSET(2) char object_fd2Tex_004FA0[] = dobject_fd2Tex_004FA0; - -#define dobject_fd2Tex_0053A0 "__OTR__objects/object_fd2/object_fd2Tex_0053A0" -static const ALIGN_ASSET(2) char object_fd2Tex_0053A0[] = dobject_fd2Tex_0053A0; - -#define dobject_fd2Tex_0051A0 "__OTR__objects/object_fd2/object_fd2Tex_0051A0" -static const ALIGN_ASSET(2) char object_fd2Tex_0051A0[] = dobject_fd2Tex_0051A0; - #define dgHoleVolvagiaSkelLimbsLimb_011838DL_00FF70 "__OTR__objects/object_fd2/gHoleVolvagiaSkelLimbsLimb_011838DL_00FF70" static const ALIGN_ASSET(2) char gHoleVolvagiaSkelLimbsLimb_011838DL_00FF70[] = dgHoleVolvagiaSkelLimbsLimb_011838DL_00FF70; @@ -180,25 +201,5 @@ static const ALIGN_ASSET(2) char gHoleVolvagiaSkelLimbsLimb_0119D0DL_001308[] = #define dgHoleVolvagiaSkelLimbsLimb_0119DCDL_001010 "__OTR__objects/object_fd2/gHoleVolvagiaSkelLimbsLimb_0119DCDL_001010" static const ALIGN_ASSET(2) char gHoleVolvagiaSkelLimbsLimb_0119DCDL_001010[] = dgHoleVolvagiaSkelLimbsLimb_0119DCDL_001010; -#define dobject_fd2Tex_003308 "__OTR__objects/object_fd2/object_fd2Tex_003308" -static const ALIGN_ASSET(2) char object_fd2Tex_003308[] = dobject_fd2Tex_003308; - -#define dobject_fd2Tex_003B08 "__OTR__objects/object_fd2/object_fd2Tex_003B08" -static const ALIGN_ASSET(2) char object_fd2Tex_003B08[] = dobject_fd2Tex_003B08; - -#define dobject_fd2Tex_004308 "__OTR__objects/object_fd2/object_fd2Tex_004308" -static const ALIGN_ASSET(2) char object_fd2Tex_004308[] = dobject_fd2Tex_004308; - -#define dobject_fd2Tex_004708 "__OTR__objects/object_fd2/object_fd2Tex_004708" -static const ALIGN_ASSET(2) char object_fd2Tex_004708[] = dobject_fd2Tex_004708; - -#define dobject_fd2Tex_004508 "__OTR__objects/object_fd2/object_fd2Tex_004508" -static const ALIGN_ASSET(2) char object_fd2Tex_004508[] = dobject_fd2Tex_004508; - -#define dobject_fd2Tex_004908 "__OTR__objects/object_fd2/object_fd2Tex_004908" -static const ALIGN_ASSET(2) char object_fd2Tex_004908[] = dobject_fd2Tex_004908; - -#define dobject_fd2TLUT_002508 "__OTR__objects/object_fd2/object_fd2TLUT_002508" -static const ALIGN_ASSET(2) char object_fd2TLUT_002508[] = dobject_fd2TLUT_002508; #endif // OBJECTS_OBJECT_FD2_H diff --git a/soh/assets/objects/object_fhg/object_fhg.h b/soh/assets/objects/object_fhg/object_fhg.h index fb398e416..ae1cbd1f0 100644 --- a/soh/assets/objects/object_fhg/object_fhg.h +++ b/soh/assets/objects/object_fhg/object_fhg.h @@ -3,6 +3,66 @@ #include "align_asset_macro.h" +#define dobject_fhgTex_003320 "__OTR__objects/object_fhg/object_fhgTex_003320" +static const ALIGN_ASSET(2) char object_fhgTex_003320[] = dobject_fhgTex_003320; + +#define dobject_fhgTex_003520 "__OTR__objects/object_fhg/object_fhgTex_003520" +static const ALIGN_ASSET(2) char object_fhgTex_003520[] = dobject_fhgTex_003520; + +#define dobject_fhgTex_003720 "__OTR__objects/object_fhg/object_fhgTex_003720" +static const ALIGN_ASSET(2) char object_fhgTex_003720[] = dobject_fhgTex_003720; + +#define dobject_fhgTex_003920 "__OTR__objects/object_fhg/object_fhgTex_003920" +static const ALIGN_ASSET(2) char object_fhgTex_003920[] = dobject_fhgTex_003920; + +#define dobject_fhgTex_003B20 "__OTR__objects/object_fhg/object_fhgTex_003B20" +static const ALIGN_ASSET(2) char object_fhgTex_003B20[] = dobject_fhgTex_003B20; + +#define dobject_fhgTex_003BA0 "__OTR__objects/object_fhg/object_fhgTex_003BA0" +static const ALIGN_ASSET(2) char object_fhgTex_003BA0[] = dobject_fhgTex_003BA0; + +#define dobject_fhgTex_003DA0 "__OTR__objects/object_fhg/object_fhgTex_003DA0" +static const ALIGN_ASSET(2) char object_fhgTex_003DA0[] = dobject_fhgTex_003DA0; + +#define dobject_fhgTex_003FA0 "__OTR__objects/object_fhg/object_fhgTex_003FA0" +static const ALIGN_ASSET(2) char object_fhgTex_003FA0[] = dobject_fhgTex_003FA0; + +#define dobject_fhgTex_0043A0 "__OTR__objects/object_fhg/object_fhgTex_0043A0" +static const ALIGN_ASSET(2) char object_fhgTex_0043A0[] = dobject_fhgTex_0043A0; + +#define dobject_fhgTex_0044A0 "__OTR__objects/object_fhg/object_fhgTex_0044A0" +static const ALIGN_ASSET(2) char object_fhgTex_0044A0[] = dobject_fhgTex_0044A0; + +#define dobject_fhgTex_004CA0 "__OTR__objects/object_fhg/object_fhgTex_004CA0" +static const ALIGN_ASSET(2) char object_fhgTex_004CA0[] = dobject_fhgTex_004CA0; + +#define dobject_fhgTex_004DA0 "__OTR__objects/object_fhg/object_fhgTex_004DA0" +static const ALIGN_ASSET(2) char object_fhgTex_004DA0[] = dobject_fhgTex_004DA0; + +#define dobject_fhgTex_00D040 "__OTR__objects/object_fhg/object_fhgTex_00D040" +static const ALIGN_ASSET(2) char object_fhgTex_00D040[] = dobject_fhgTex_00D040; + +#define dobject_fhgTex_00D060 "__OTR__objects/object_fhg/object_fhgTex_00D060" +static const ALIGN_ASSET(2) char object_fhgTex_00D060[] = dobject_fhgTex_00D060; + +#define dobject_fhgTex_00E8B0 "__OTR__objects/object_fhg/object_fhgTex_00E8B0" +static const ALIGN_ASSET(2) char object_fhgTex_00E8B0[] = dobject_fhgTex_00E8B0; + +#define dobject_fhgTex_00F0B0 "__OTR__objects/object_fhg/object_fhgTex_00F0B0" +static const ALIGN_ASSET(2) char object_fhgTex_00F0B0[] = dobject_fhgTex_00F0B0; + +#define dobject_fhgTex_00FD98 "__OTR__objects/object_fhg/object_fhgTex_00FD98" +static const ALIGN_ASSET(2) char object_fhgTex_00FD98[] = dobject_fhgTex_00FD98; + +#define dobject_fhgTex_010660 "__OTR__objects/object_fhg/object_fhgTex_010660" +static const ALIGN_ASSET(2) char object_fhgTex_010660[] = dobject_fhgTex_010660; + +#define dobject_fhgTex_010D20 "__OTR__objects/object_fhg/object_fhgTex_010D20" +static const ALIGN_ASSET(2) char object_fhgTex_010D20[] = dobject_fhgTex_010D20; + +#define dobject_fhgTex_011120 "__OTR__objects/object_fhg/object_fhgTex_011120" +static const ALIGN_ASSET(2) char object_fhgTex_011120[] = dobject_fhgTex_011120; + #define dgPhantomHorseSkel "__OTR__objects/object_fhg/gPhantomHorseSkel" static const ALIGN_ASSET(2) char gPhantomHorseSkel[] = dgPhantomHorseSkel; @@ -54,45 +114,6 @@ static const ALIGN_ASSET(2) char gPhantomUnkDL_FCA0[] = dgPhantomUnkDL_FCA0; #define dgPhantomUnkDL_10CA0 "__OTR__objects/object_fhg/gPhantomUnkDL_10CA0" static const ALIGN_ASSET(2) char gPhantomUnkDL_10CA0[] = dgPhantomUnkDL_10CA0; -#define dobject_fhgTex_00E8B0 "__OTR__objects/object_fhg/object_fhgTex_00E8B0" -static const ALIGN_ASSET(2) char object_fhgTex_00E8B0[] = dobject_fhgTex_00E8B0; - -#define dobject_fhgTex_00F0B0 "__OTR__objects/object_fhg/object_fhgTex_00F0B0" -static const ALIGN_ASSET(2) char object_fhgTex_00F0B0[] = dobject_fhgTex_00F0B0; - -#define dobject_fhgTex_00FD98 "__OTR__objects/object_fhg/object_fhgTex_00FD98" -static const ALIGN_ASSET(2) char object_fhgTex_00FD98[] = dobject_fhgTex_00FD98; - -#define dobject_fhgTex_010660 "__OTR__objects/object_fhg/object_fhgTex_010660" -static const ALIGN_ASSET(2) char object_fhgTex_010660[] = dobject_fhgTex_010660; - -#define dobject_fhgTex_011120 "__OTR__objects/object_fhg/object_fhgTex_011120" -static const ALIGN_ASSET(2) char object_fhgTex_011120[] = dobject_fhgTex_011120; - -#define dobject_fhgTex_010D20 "__OTR__objects/object_fhg/object_fhgTex_010D20" -static const ALIGN_ASSET(2) char object_fhgTex_010D20[] = dobject_fhgTex_010D20; - -#define dobject_fhgTex_00D060 "__OTR__objects/object_fhg/object_fhgTex_00D060" -static const ALIGN_ASSET(2) char object_fhgTex_00D060[] = dobject_fhgTex_00D060; - -#define dobject_fhgTex_00D040 "__OTR__objects/object_fhg/object_fhgTex_00D040" -static const ALIGN_ASSET(2) char object_fhgTex_00D040[] = dobject_fhgTex_00D040; - -#define dobject_fhgTex_004CA0 "__OTR__objects/object_fhg/object_fhgTex_004CA0" -static const ALIGN_ASSET(2) char object_fhgTex_004CA0[] = dobject_fhgTex_004CA0; - -#define dobject_fhgTex_003DA0 "__OTR__objects/object_fhg/object_fhgTex_003DA0" -static const ALIGN_ASSET(2) char object_fhgTex_003DA0[] = dobject_fhgTex_003DA0; - -#define dobject_fhgTex_003720 "__OTR__objects/object_fhg/object_fhgTex_003720" -static const ALIGN_ASSET(2) char object_fhgTex_003720[] = dobject_fhgTex_003720; - -#define dobject_fhgTex_003520 "__OTR__objects/object_fhg/object_fhgTex_003520" -static const ALIGN_ASSET(2) char object_fhgTex_003520[] = dobject_fhgTex_003520; - -#define dobject_fhgTex_003320 "__OTR__objects/object_fhg/object_fhgTex_003320" -static const ALIGN_ASSET(2) char object_fhgTex_003320[] = dobject_fhgTex_003320; - #define dgPhantomHorseSkelLimbsLimb_00ACC4SkinLimbDL_00CB30 "__OTR__objects/object_fhg/gPhantomHorseSkelLimbsLimb_00ACC4SkinLimbDL_00CB30" static const ALIGN_ASSET(2) char gPhantomHorseSkelLimbsLimb_00ACC4SkinLimbDL_00CB30[] = dgPhantomHorseSkelLimbsLimb_00ACC4SkinLimbDL_00CB30; @@ -146,25 +167,4 @@ static const ALIGN_ASSET(2) char gPhantomHorseSkelLimbsLimb_00AFB4DL_003170[] = #define dgPhantomHorseSkelLimbsLimb_00ACC4SkinLimbDL_00CB30 "__OTR__objects/object_fhg/gPhantomHorseSkelLimbsLimb_00ACC4SkinLimbDL_00CB30" -#define dobject_fhgTex_003BA0 "__OTR__objects/object_fhg/object_fhgTex_003BA0" -static const ALIGN_ASSET(2) char object_fhgTex_003BA0[] = dobject_fhgTex_003BA0; - -#define dobject_fhgTex_0043A0 "__OTR__objects/object_fhg/object_fhgTex_0043A0" -static const ALIGN_ASSET(2) char object_fhgTex_0043A0[] = dobject_fhgTex_0043A0; - -#define dobject_fhgTex_003FA0 "__OTR__objects/object_fhg/object_fhgTex_003FA0" -static const ALIGN_ASSET(2) char object_fhgTex_003FA0[] = dobject_fhgTex_003FA0; - -#define dobject_fhgTex_004DA0 "__OTR__objects/object_fhg/object_fhgTex_004DA0" -static const ALIGN_ASSET(2) char object_fhgTex_004DA0[] = dobject_fhgTex_004DA0; - -#define dobject_fhgTex_003920 "__OTR__objects/object_fhg/object_fhgTex_003920" -static const ALIGN_ASSET(2) char object_fhgTex_003920[] = dobject_fhgTex_003920; - -#define dobject_fhgTex_0044A0 "__OTR__objects/object_fhg/object_fhgTex_0044A0" -static const ALIGN_ASSET(2) char object_fhgTex_0044A0[] = dobject_fhgTex_0044A0; - -#define dobject_fhgTex_003B20 "__OTR__objects/object_fhg/object_fhgTex_003B20" -static const ALIGN_ASSET(2) char object_fhgTex_003B20[] = dobject_fhgTex_003B20; - #endif // OBJECTS_OBJECT_FHG_H diff --git a/soh/assets/objects/object_fw/object_fw.h b/soh/assets/objects/object_fw/object_fw.h index 5cf2925d2..105fa9f44 100644 --- a/soh/assets/objects/object_fw/object_fw.h +++ b/soh/assets/objects/object_fw/object_fw.h @@ -3,6 +3,9 @@ #include "align_asset_macro.h" +#define dobject_fwTex_007A90 "__OTR__objects/object_fw/object_fwTex_007A90" +static const ALIGN_ASSET(2) char object_fwTex_007A90[] = dobject_fwTex_007A90; + #define dgFlareDancerSkel "__OTR__objects/object_fw/gFlareDancerSkel" static const ALIGN_ASSET(2) char gFlareDancerSkel[] = dgFlareDancerSkel; @@ -150,7 +153,5 @@ static const ALIGN_ASSET(2) char gFlareDancerCoreRunCycleAnim[] = dgFlareDancerC #define dgFlareDancerCoreEndRunCycleAnim "__OTR__objects/object_fw/gFlareDancerCoreEndRunCycleAnim" static const ALIGN_ASSET(2) char gFlareDancerCoreEndRunCycleAnim[] = dgFlareDancerCoreEndRunCycleAnim; -#define dobject_fwTex_007A90 "__OTR__objects/object_fw/object_fwTex_007A90" -static const ALIGN_ASSET(2) char object_fwTex_007A90[] = dobject_fwTex_007A90; #endif // OBJECTS_OBJECT_FW_H diff --git a/soh/assets/objects/object_geldb/object_geldb.h b/soh/assets/objects/object_geldb/object_geldb.h index 169277a70..f8e771639 100644 --- a/soh/assets/objects/object_geldb/object_geldb.h +++ b/soh/assets/objects/object_geldb/object_geldb.h @@ -3,6 +3,54 @@ #include "align_asset_macro.h" +#define dobject_geldbTex_002700 "__OTR__objects/object_geldb/object_geldbTex_002700" +static const ALIGN_ASSET(2) char object_geldbTex_002700[] = dobject_geldbTex_002700; + +#define dobject_geldbTex_002740 "__OTR__objects/object_geldb/object_geldbTex_002740" +static const ALIGN_ASSET(2) char object_geldbTex_002740[] = dobject_geldbTex_002740; + +#define dobject_geldbTex_002780 "__OTR__objects/object_geldb/object_geldbTex_002780" +static const ALIGN_ASSET(2) char object_geldbTex_002780[] = dobject_geldbTex_002780; + +#define dobject_geldbTex_002880 "__OTR__objects/object_geldb/object_geldbTex_002880" +static const ALIGN_ASSET(2) char object_geldbTex_002880[] = dobject_geldbTex_002880; + +#define dobject_geldbTex_002980 "__OTR__objects/object_geldb/object_geldbTex_002980" +static const ALIGN_ASSET(2) char object_geldbTex_002980[] = dobject_geldbTex_002980; + +#define dobject_geldbTex_002A80 "__OTR__objects/object_geldb/object_geldbTex_002A80" +static const ALIGN_ASSET(2) char object_geldbTex_002A80[] = dobject_geldbTex_002A80; + +#define dobject_geldbTex_002B80 "__OTR__objects/object_geldb/object_geldbTex_002B80" +static const ALIGN_ASSET(2) char object_geldbTex_002B80[] = dobject_geldbTex_002B80; + +#define dobject_geldbTex_005F68 "__OTR__objects/object_geldb/object_geldbTex_005F68" +static const ALIGN_ASSET(2) char object_geldbTex_005F68[] = dobject_geldbTex_005F68; + +#define dobject_geldbTex_0063E8 "__OTR__objects/object_geldb/object_geldbTex_0063E8" +static const ALIGN_ASSET(2) char object_geldbTex_0063E8[] = dobject_geldbTex_0063E8; + +#define dobject_geldbTex_0064E8 "__OTR__objects/object_geldb/object_geldbTex_0064E8" +static const ALIGN_ASSET(2) char object_geldbTex_0064E8[] = dobject_geldbTex_0064E8; + +#define dobject_geldbTex_006568 "__OTR__objects/object_geldb/object_geldbTex_006568" +static const ALIGN_ASSET(2) char object_geldbTex_006568[] = dobject_geldbTex_006568; + +#define dobject_geldbTex_0069A8 "__OTR__objects/object_geldb/object_geldbTex_0069A8" +static const ALIGN_ASSET(2) char object_geldbTex_0069A8[] = dobject_geldbTex_0069A8; + +#define dobject_geldbTex_006A28 "__OTR__objects/object_geldb/object_geldbTex_006A28" +static const ALIGN_ASSET(2) char object_geldbTex_006A28[] = dobject_geldbTex_006A28; + +#define dobject_geldbTex_006B28 "__OTR__objects/object_geldb/object_geldbTex_006B28" +static const ALIGN_ASSET(2) char object_geldbTex_006B28[] = dobject_geldbTex_006B28; + +#define dobject_geldbTex_006C28 "__OTR__objects/object_geldb/object_geldbTex_006C28" +static const ALIGN_ASSET(2) char object_geldbTex_006C28[] = dobject_geldbTex_006C28; + +#define dobject_geldbTLUT_002500 "__OTR__objects/object_geldb/object_geldbTLUT_002500" +static const ALIGN_ASSET(2) char object_geldbTLUT_002500[] = dobject_geldbTLUT_002500; + #define dgGerudoRedSkel "__OTR__objects/object_geldb/gGerudoRedSkel" static const ALIGN_ASSET(2) char gGerudoRedSkel[] = dgGerudoRedSkel; @@ -111,52 +159,5 @@ static const ALIGN_ASSET(2) char gGerudoRedSkelLimbsLimb_00A3E4DL_009108[] = dgG #define dgGerudoRedSkelLimbsLimb_00A3F0DL_005420 "__OTR__objects/object_geldb/gGerudoRedSkelLimbsLimb_00A3F0DL_005420" static const ALIGN_ASSET(2) char gGerudoRedSkelLimbsLimb_00A3F0DL_005420[] = dgGerudoRedSkelLimbsLimb_00A3F0DL_005420; -#define dobject_geldbTLUT_002500 "__OTR__objects/object_geldb/object_geldbTLUT_002500" -static const ALIGN_ASSET(2) char object_geldbTLUT_002500[] = dobject_geldbTLUT_002500; - -#define dobject_geldbTex_002700 "__OTR__objects/object_geldb/object_geldbTex_002700" -static const ALIGN_ASSET(2) char object_geldbTex_002700[] = dobject_geldbTex_002700; - -#define dobject_geldbTex_002980 "__OTR__objects/object_geldb/object_geldbTex_002980" -static const ALIGN_ASSET(2) char object_geldbTex_002980[] = dobject_geldbTex_002980; - -#define dobject_geldbTex_002880 "__OTR__objects/object_geldb/object_geldbTex_002880" -static const ALIGN_ASSET(2) char object_geldbTex_002880[] = dobject_geldbTex_002880; - -#define dobject_geldbTex_002780 "__OTR__objects/object_geldb/object_geldbTex_002780" -static const ALIGN_ASSET(2) char object_geldbTex_002780[] = dobject_geldbTex_002780; - -#define dobject_geldbTex_002740 "__OTR__objects/object_geldb/object_geldbTex_002740" -static const ALIGN_ASSET(2) char object_geldbTex_002740[] = dobject_geldbTex_002740; - -#define dobject_geldbTex_006A28 "__OTR__objects/object_geldb/object_geldbTex_006A28" -static const ALIGN_ASSET(2) char object_geldbTex_006A28[] = dobject_geldbTex_006A28; - -#define dobject_geldbTex_0063E8 "__OTR__objects/object_geldb/object_geldbTex_0063E8" -static const ALIGN_ASSET(2) char object_geldbTex_0063E8[] = dobject_geldbTex_0063E8; - -#define dobject_geldbTex_005F68 "__OTR__objects/object_geldb/object_geldbTex_005F68" -static const ALIGN_ASSET(2) char object_geldbTex_005F68[] = dobject_geldbTex_005F68; - -#define dobject_geldbTex_006C28 "__OTR__objects/object_geldb/object_geldbTex_006C28" -static const ALIGN_ASSET(2) char object_geldbTex_006C28[] = dobject_geldbTex_006C28; - -#define dobject_geldbTex_0069A8 "__OTR__objects/object_geldb/object_geldbTex_0069A8" -static const ALIGN_ASSET(2) char object_geldbTex_0069A8[] = dobject_geldbTex_0069A8; - -#define dobject_geldbTex_006B28 "__OTR__objects/object_geldb/object_geldbTex_006B28" -static const ALIGN_ASSET(2) char object_geldbTex_006B28[] = dobject_geldbTex_006B28; - -#define dobject_geldbTex_002A80 "__OTR__objects/object_geldb/object_geldbTex_002A80" -static const ALIGN_ASSET(2) char object_geldbTex_002A80[] = dobject_geldbTex_002A80; - -#define dobject_geldbTex_002B80 "__OTR__objects/object_geldb/object_geldbTex_002B80" -static const ALIGN_ASSET(2) char object_geldbTex_002B80[] = dobject_geldbTex_002B80; - -#define dobject_geldbTex_0064E8 "__OTR__objects/object_geldb/object_geldbTex_0064E8" -static const ALIGN_ASSET(2) char object_geldbTex_0064E8[] = dobject_geldbTex_0064E8; - -#define dobject_geldbTex_006568 "__OTR__objects/object_geldb/object_geldbTex_006568" -static const ALIGN_ASSET(2) char object_geldbTex_006568[] = dobject_geldbTex_006568; #endif // OBJECTS_OBJECT_GELDB_H diff --git a/soh/assets/objects/object_gi_boots_2/object_gi_boots_2.h b/soh/assets/objects/object_gi_boots_2/object_gi_boots_2.h index c7cb14d3b..9b8247559 100644 --- a/soh/assets/objects/object_gi_boots_2/object_gi_boots_2.h +++ b/soh/assets/objects/object_gi_boots_2/object_gi_boots_2.h @@ -3,13 +3,13 @@ #include "align_asset_macro.h" +#define dobject_gi_boots_2Tex_000000 "__OTR__objects/object_gi_boots_2/object_gi_boots_2Tex_000000" +static const ALIGN_ASSET(2) char object_gi_boots_2Tex_000000[] = dobject_gi_boots_2Tex_000000; + #define dgGiIronBootsDL "__OTR__objects/object_gi_boots_2/gGiIronBootsDL" static const ALIGN_ASSET(2) char gGiIronBootsDL[] = dgGiIronBootsDL; #define dgGiIronBootsRivetsDL "__OTR__objects/object_gi_boots_2/gGiIronBootsRivetsDL" static const ALIGN_ASSET(2) char gGiIronBootsRivetsDL[] = dgGiIronBootsRivetsDL; -#define dobject_gi_boots_2Tex_000000 "__OTR__objects/object_gi_boots_2/object_gi_boots_2Tex_000000" -static const ALIGN_ASSET(2) char object_gi_boots_2Tex_000000[] = dobject_gi_boots_2Tex_000000; - #endif // OBJECTS_OBJECT_GI_BOOTS_2_H diff --git a/soh/assets/objects/object_gi_butterfly/object_gi_butterfly.h b/soh/assets/objects/object_gi_butterfly/object_gi_butterfly.h index f8936cfa7..8838bf2eb 100644 --- a/soh/assets/objects/object_gi_butterfly/object_gi_butterfly.h +++ b/soh/assets/objects/object_gi_butterfly/object_gi_butterfly.h @@ -3,13 +3,13 @@ #include "align_asset_macro.h" +#define dobject_gi_butterflyTex_000000 "__OTR__objects/object_gi_butterfly/object_gi_butterflyTex_000000" +static const ALIGN_ASSET(2) char object_gi_butterflyTex_000000[] = dobject_gi_butterflyTex_000000; + #define dgGiButterflyContainerDL "__OTR__objects/object_gi_butterfly/gGiButterflyContainerDL" static const ALIGN_ASSET(2) char gGiButterflyContainerDL[] = dgGiButterflyContainerDL; #define dgGiButterflyGlassDL "__OTR__objects/object_gi_butterfly/gGiButterflyGlassDL" static const ALIGN_ASSET(2) char gGiButterflyGlassDL[] = dgGiButterflyGlassDL; -#define dobject_gi_butterflyTex_000000 "__OTR__objects/object_gi_butterfly/object_gi_butterflyTex_000000" -static const ALIGN_ASSET(2) char object_gi_butterflyTex_000000[] = dobject_gi_butterflyTex_000000; - #endif // OBJECTS_OBJECT_GI_BUTTERFLY_H diff --git a/soh/assets/objects/object_gi_clothes/object_gi_clothes.h b/soh/assets/objects/object_gi_clothes/object_gi_clothes.h index f9546b31f..21989e15f 100644 --- a/soh/assets/objects/object_gi_clothes/object_gi_clothes.h +++ b/soh/assets/objects/object_gi_clothes/object_gi_clothes.h @@ -3,6 +3,9 @@ #include "align_asset_macro.h" +#define dobject_gi_clothesTex_000000 "__OTR__objects/object_gi_clothes/object_gi_clothesTex_000000" +static const ALIGN_ASSET(2) char object_gi_clothesTex_000000[] = dobject_gi_clothesTex_000000; + #define dgGiGoronCollarColorDL "__OTR__objects/object_gi_clothes/gGiGoronCollarColorDL" static const ALIGN_ASSET(2) char gGiGoronCollarColorDL[] = dgGiGoronCollarColorDL; @@ -21,7 +24,4 @@ static const ALIGN_ASSET(2) char gGiTunicCollarDL[] = dgGiTunicCollarDL; #define dgGiTunicDL "__OTR__objects/object_gi_clothes/gGiTunicDL" static const ALIGN_ASSET(2) char gGiTunicDL[] = dgGiTunicDL; -#define dobject_gi_clothesTex_000000 "__OTR__objects/object_gi_clothes/object_gi_clothesTex_000000" -static const ALIGN_ASSET(2) char object_gi_clothesTex_000000[] = dobject_gi_clothesTex_000000; - #endif // OBJECTS_OBJECT_GI_CLOTHES_H diff --git a/soh/assets/objects/object_gi_dekupouch/object_gi_dekupouch.h b/soh/assets/objects/object_gi_dekupouch/object_gi_dekupouch.h index c80b269e0..cd92bf231 100644 --- a/soh/assets/objects/object_gi_dekupouch/object_gi_dekupouch.h +++ b/soh/assets/objects/object_gi_dekupouch/object_gi_dekupouch.h @@ -3,6 +3,12 @@ #include "align_asset_macro.h" +#define dobject_gi_dekupouchTex_000000 "__OTR__objects/object_gi_dekupouch/object_gi_dekupouchTex_000000" +static const ALIGN_ASSET(2) char object_gi_dekupouchTex_000000[] = dobject_gi_dekupouchTex_000000; + +#define dobject_gi_dekupouchTex_000100 "__OTR__objects/object_gi_dekupouch/object_gi_dekupouchTex_000100" +static const ALIGN_ASSET(2) char object_gi_dekupouchTex_000100[] = dobject_gi_dekupouchTex_000100; + #define dgGiBulletBagColorDL "__OTR__objects/object_gi_dekupouch/gGiBulletBagColorDL" static const ALIGN_ASSET(2) char gGiBulletBagColorDL[] = dgGiBulletBagColorDL; @@ -24,10 +30,4 @@ static const ALIGN_ASSET(2) char gGiBulletBagStringDL[] = dgGiBulletBagStringDL; #define dgGiBulletBagWritingDL "__OTR__objects/object_gi_dekupouch/gGiBulletBagWritingDL" static const ALIGN_ASSET(2) char gGiBulletBagWritingDL[] = dgGiBulletBagWritingDL; -#define dobject_gi_dekupouchTex_000000 "__OTR__objects/object_gi_dekupouch/object_gi_dekupouchTex_000000" -static const ALIGN_ASSET(2) char object_gi_dekupouchTex_000000[] = dobject_gi_dekupouchTex_000000; - -#define dobject_gi_dekupouchTex_000100 "__OTR__objects/object_gi_dekupouch/object_gi_dekupouchTex_000100" -static const ALIGN_ASSET(2) char object_gi_dekupouchTex_000100[] = dobject_gi_dekupouchTex_000100; - #endif // OBJECTS_OBJECT_GI_DEKUPOUCH_H diff --git a/soh/assets/objects/object_gi_fire/object_gi_fire.h b/soh/assets/objects/object_gi_fire/object_gi_fire.h index f66f7a766..649eaed9e 100644 --- a/soh/assets/objects/object_gi_fire/object_gi_fire.h +++ b/soh/assets/objects/object_gi_fire/object_gi_fire.h @@ -3,16 +3,16 @@ #include "align_asset_macro.h" -#define dgGiBlueFireChamberstickDL "__OTR__objects/object_gi_fire/gGiBlueFireChamberstickDL" -static const ALIGN_ASSET(2) char gGiBlueFireChamberstickDL[] = dgGiBlueFireChamberstickDL; - -#define dgGiBlueFireFlameDL "__OTR__objects/object_gi_fire/gGiBlueFireFlameDL" -static const ALIGN_ASSET(2) char gGiBlueFireFlameDL[] = dgGiBlueFireFlameDL; - #define dobject_gi_fireTex_000000 "__OTR__objects/object_gi_fire/object_gi_fireTex_000000" static const ALIGN_ASSET(2) char object_gi_fireTex_000000[] = dobject_gi_fireTex_000000; #define dobject_gi_fireTex_000200 "__OTR__objects/object_gi_fire/object_gi_fireTex_000200" static const ALIGN_ASSET(2) char object_gi_fireTex_000200[] = dobject_gi_fireTex_000200; +#define dgGiBlueFireChamberstickDL "__OTR__objects/object_gi_fire/gGiBlueFireChamberstickDL" +static const ALIGN_ASSET(2) char gGiBlueFireChamberstickDL[] = dgGiBlueFireChamberstickDL; + +#define dgGiBlueFireFlameDL "__OTR__objects/object_gi_fire/gGiBlueFireFlameDL" +static const ALIGN_ASSET(2) char gGiBlueFireFlameDL[] = dgGiBlueFireFlameDL; + #endif // OBJECTS_OBJECT_GI_FIRE_H diff --git a/soh/assets/objects/object_gi_frog/object_gi_frog.h b/soh/assets/objects/object_gi_frog/object_gi_frog.h index ba33d67b5..53a163926 100644 --- a/soh/assets/objects/object_gi_frog/object_gi_frog.h +++ b/soh/assets/objects/object_gi_frog/object_gi_frog.h @@ -3,13 +3,13 @@ #include "align_asset_macro.h" +#define dobject_gi_frogTex_000000 "__OTR__objects/object_gi_frog/object_gi_frogTex_000000" +static const ALIGN_ASSET(2) char object_gi_frogTex_000000[] = dobject_gi_frogTex_000000; + #define dgGiFrogDL "__OTR__objects/object_gi_frog/gGiFrogDL" static const ALIGN_ASSET(2) char gGiFrogDL[] = dgGiFrogDL; #define dgGiFrogEyesDL "__OTR__objects/object_gi_frog/gGiFrogEyesDL" static const ALIGN_ASSET(2) char gGiFrogEyesDL[] = dgGiFrogEyesDL; -#define dobject_gi_frogTex_000000 "__OTR__objects/object_gi_frog/object_gi_frogTex_000000" -static const ALIGN_ASSET(2) char object_gi_frogTex_000000[] = dobject_gi_frogTex_000000; - #endif // OBJECTS_OBJECT_GI_FROG_H diff --git a/soh/assets/objects/object_gi_gerudo/object_gi_gerudo.h b/soh/assets/objects/object_gi_gerudo/object_gi_gerudo.h index fd05e9ff0..35633e972 100644 --- a/soh/assets/objects/object_gi_gerudo/object_gi_gerudo.h +++ b/soh/assets/objects/object_gi_gerudo/object_gi_gerudo.h @@ -3,10 +3,10 @@ #include "align_asset_macro.h" -#define dgGiGerudoCardDL "__OTR__objects/object_gi_gerudo/gGiGerudoCardDL" -static const ALIGN_ASSET(2) char gGiGerudoCardDL[] = dgGiGerudoCardDL; - #define dobject_gi_gerudoTex_000000 "__OTR__objects/object_gi_gerudo/object_gi_gerudoTex_000000" static const ALIGN_ASSET(2) char object_gi_gerudoTex_000000[] = dobject_gi_gerudoTex_000000; +#define dgGiGerudoCardDL "__OTR__objects/object_gi_gerudo/gGiGerudoCardDL" +static const ALIGN_ASSET(2) char gGiGerudoCardDL[] = dgGiGerudoCardDL; + #endif // OBJECTS_OBJECT_GI_GERUDO_H diff --git a/soh/assets/objects/object_gi_gerudomask/object_gi_gerudomask.h b/soh/assets/objects/object_gi_gerudomask/object_gi_gerudomask.h index 2eb6032b6..7983b3ef6 100644 --- a/soh/assets/objects/object_gi_gerudomask/object_gi_gerudomask.h +++ b/soh/assets/objects/object_gi_gerudomask/object_gi_gerudomask.h @@ -3,15 +3,9 @@ #include "align_asset_macro.h" -#define dgGiGerudoMaskDL "__OTR__objects/object_gi_gerudomask/gGiGerudoMaskDL" -static const ALIGN_ASSET(2) char gGiGerudoMaskDL[] = dgGiGerudoMaskDL; - #define dobject_gi_gerudomaskTex_000208 "__OTR__objects/object_gi_gerudomask/object_gi_gerudomaskTex_000208" static const ALIGN_ASSET(2) char object_gi_gerudomaskTex_000208[] = dobject_gi_gerudomaskTex_000208; -#define dobject_gi_gerudomaskTLUT_000000 "__OTR__objects/object_gi_gerudomask/object_gi_gerudomaskTLUT_000000" -static const ALIGN_ASSET(2) char object_gi_gerudomaskTLUT_000000[] = dobject_gi_gerudomaskTLUT_000000; - #define dobject_gi_gerudomaskTex_000248 "__OTR__objects/object_gi_gerudomask/object_gi_gerudomaskTex_000248" static const ALIGN_ASSET(2) char object_gi_gerudomaskTex_000248[] = dobject_gi_gerudomaskTex_000248; @@ -21,4 +15,10 @@ static const ALIGN_ASSET(2) char object_gi_gerudomaskTex_000348[] = dobject_gi_g #define dobject_gi_gerudomaskTex_000448 "__OTR__objects/object_gi_gerudomask/object_gi_gerudomaskTex_000448" static const ALIGN_ASSET(2) char object_gi_gerudomaskTex_000448[] = dobject_gi_gerudomaskTex_000448; +#define dobject_gi_gerudomaskTLUT_000000 "__OTR__objects/object_gi_gerudomask/object_gi_gerudomaskTLUT_000000" +static const ALIGN_ASSET(2) char object_gi_gerudomaskTLUT_000000[] = dobject_gi_gerudomaskTLUT_000000; + +#define dgGiGerudoMaskDL "__OTR__objects/object_gi_gerudomask/gGiGerudoMaskDL" +static const ALIGN_ASSET(2) char gGiGerudoMaskDL[] = dgGiGerudoMaskDL; + #endif // OBJECTS_OBJECT_GI_GERUDOMASK_H diff --git a/soh/assets/objects/object_gi_ghost/object_gi_ghost.h b/soh/assets/objects/object_gi_ghost/object_gi_ghost.h index e1cf7f924..47f49d427 100644 --- a/soh/assets/objects/object_gi_ghost/object_gi_ghost.h +++ b/soh/assets/objects/object_gi_ghost/object_gi_ghost.h @@ -3,6 +3,12 @@ #include "align_asset_macro.h" +#define dobject_gi_ghostTex_000000 "__OTR__objects/object_gi_ghost/object_gi_ghostTex_000000" +static const ALIGN_ASSET(2) char object_gi_ghostTex_000000[] = dobject_gi_ghostTex_000000; + +#define dobject_gi_ghostTex_000200 "__OTR__objects/object_gi_ghost/object_gi_ghostTex_000200" +static const ALIGN_ASSET(2) char object_gi_ghostTex_000200[] = dobject_gi_ghostTex_000200; + #define dgGiPoeColorDL "__OTR__objects/object_gi_ghost/gGiPoeColorDL" static const ALIGN_ASSET(2) char gGiPoeColorDL[] = dgGiPoeColorDL; @@ -18,10 +24,4 @@ static const ALIGN_ASSET(2) char gGiGhostContainerGlassDL[] = dgGiGhostContainer #define dgGiGhostContainerContentsDL "__OTR__objects/object_gi_ghost/gGiGhostContainerContentsDL" static const ALIGN_ASSET(2) char gGiGhostContainerContentsDL[] = dgGiGhostContainerContentsDL; -#define dobject_gi_ghostTex_000000 "__OTR__objects/object_gi_ghost/object_gi_ghostTex_000000" -static const ALIGN_ASSET(2) char object_gi_ghostTex_000000[] = dobject_gi_ghostTex_000000; - -#define dobject_gi_ghostTex_000200 "__OTR__objects/object_gi_ghost/object_gi_ghostTex_000200" -static const ALIGN_ASSET(2) char object_gi_ghostTex_000200[] = dobject_gi_ghostTex_000200; - #endif // OBJECTS_OBJECT_GI_GHOST_H diff --git a/soh/assets/objects/object_gi_gloves/object_gi_gloves.h b/soh/assets/objects/object_gi_gloves/object_gi_gloves.h index f56225493..65a4d4dc8 100644 --- a/soh/assets/objects/object_gi_gloves/object_gi_gloves.h +++ b/soh/assets/objects/object_gi_gloves/object_gi_gloves.h @@ -3,6 +3,9 @@ #include "align_asset_macro.h" +#define dobject_gi_glovesTex_000000 "__OTR__objects/object_gi_gloves/object_gi_glovesTex_000000" +static const ALIGN_ASSET(2) char object_gi_glovesTex_000000[] = dobject_gi_glovesTex_000000; + #define dgGiSilverGauntletsColorDL "__OTR__objects/object_gi_gloves/gGiSilverGauntletsColorDL" static const ALIGN_ASSET(2) char gGiSilverGauntletsColorDL[] = dgGiSilverGauntletsColorDL; @@ -21,7 +24,4 @@ static const ALIGN_ASSET(2) char gGiGauntletsDL[] = dgGiGauntletsDL; #define dgGiGauntletsPlateDL "__OTR__objects/object_gi_gloves/gGiGauntletsPlateDL" static const ALIGN_ASSET(2) char gGiGauntletsPlateDL[] = dgGiGauntletsPlateDL; -#define dobject_gi_glovesTex_000000 "__OTR__objects/object_gi_gloves/object_gi_glovesTex_000000" -static const ALIGN_ASSET(2) char object_gi_glovesTex_000000[] = dobject_gi_glovesTex_000000; - #endif // OBJECTS_OBJECT_GI_GLOVES_H diff --git a/soh/assets/objects/object_gi_golonmask/object_gi_golonmask.h b/soh/assets/objects/object_gi_golonmask/object_gi_golonmask.h index 3e6dc1bcf..03ee995e9 100644 --- a/soh/assets/objects/object_gi_golonmask/object_gi_golonmask.h +++ b/soh/assets/objects/object_gi_golonmask/object_gi_golonmask.h @@ -3,15 +3,9 @@ #include "align_asset_macro.h" -#define dgGiGoronMaskDL "__OTR__objects/object_gi_golonmask/gGiGoronMaskDL" -static const ALIGN_ASSET(2) char gGiGoronMaskDL[] = dgGiGoronMaskDL; - #define dobject_gi_golonmaskTex_000208 "__OTR__objects/object_gi_golonmask/object_gi_golonmaskTex_000208" static const ALIGN_ASSET(2) char object_gi_golonmaskTex_000208[] = dobject_gi_golonmaskTex_000208; -#define dobject_gi_golonmaskTLUT_000000 "__OTR__objects/object_gi_golonmask/object_gi_golonmaskTLUT_000000" -static const ALIGN_ASSET(2) char object_gi_golonmaskTLUT_000000[] = dobject_gi_golonmaskTLUT_000000; - #define dobject_gi_golonmaskTex_000248 "__OTR__objects/object_gi_golonmask/object_gi_golonmaskTex_000248" static const ALIGN_ASSET(2) char object_gi_golonmaskTex_000248[] = dobject_gi_golonmaskTex_000248; @@ -21,4 +15,10 @@ static const ALIGN_ASSET(2) char object_gi_golonmaskTex_000348[] = dobject_gi_go #define dobject_gi_golonmaskTex_000748 "__OTR__objects/object_gi_golonmask/object_gi_golonmaskTex_000748" static const ALIGN_ASSET(2) char object_gi_golonmaskTex_000748[] = dobject_gi_golonmaskTex_000748; +#define dobject_gi_golonmaskTLUT_000000 "__OTR__objects/object_gi_golonmask/object_gi_golonmaskTLUT_000000" +static const ALIGN_ASSET(2) char object_gi_golonmaskTLUT_000000[] = dobject_gi_golonmaskTLUT_000000; + +#define dgGiGoronMaskDL "__OTR__objects/object_gi_golonmask/gGiGoronMaskDL" +static const ALIGN_ASSET(2) char gGiGoronMaskDL[] = dgGiGoronMaskDL; + #endif // OBJECTS_OBJECT_GI_GOLONMASK_H diff --git a/soh/assets/objects/object_gi_hoverboots/object_gi_hoverboots.h b/soh/assets/objects/object_gi_hoverboots/object_gi_hoverboots.h index 9c1558700..d94b4fac6 100644 --- a/soh/assets/objects/object_gi_hoverboots/object_gi_hoverboots.h +++ b/soh/assets/objects/object_gi_hoverboots/object_gi_hoverboots.h @@ -3,13 +3,13 @@ #include "align_asset_macro.h" -#define dgGiHoverBootsDL "__OTR__objects/object_gi_hoverboots/gGiHoverBootsDL" -static const ALIGN_ASSET(2) char gGiHoverBootsDL[] = dgGiHoverBootsDL; +#define dobject_gi_hoverbootsTex_000000 "__OTR__objects/object_gi_hoverboots/object_gi_hoverbootsTex_000000" +static const ALIGN_ASSET(2) char object_gi_hoverbootsTex_000000[] = dobject_gi_hoverbootsTex_000000; #define dobject_gi_hoverbootsTex_000300 "__OTR__objects/object_gi_hoverboots/object_gi_hoverbootsTex_000300" static const ALIGN_ASSET(2) char object_gi_hoverbootsTex_000300[] = dobject_gi_hoverbootsTex_000300; -#define dobject_gi_hoverbootsTex_000000 "__OTR__objects/object_gi_hoverboots/object_gi_hoverbootsTex_000000" -static const ALIGN_ASSET(2) char object_gi_hoverbootsTex_000000[] = dobject_gi_hoverbootsTex_000000; +#define dgGiHoverBootsDL "__OTR__objects/object_gi_hoverboots/gGiHoverBootsDL" +static const ALIGN_ASSET(2) char gGiHoverBootsDL[] = dgGiHoverBootsDL; #endif // OBJECTS_OBJECT_GI_HOVERBOOTS_H diff --git a/soh/assets/objects/object_gi_ki_tan_mask/object_gi_ki_tan_mask.h b/soh/assets/objects/object_gi_ki_tan_mask/object_gi_ki_tan_mask.h index 3a7e897ea..5e311e2b6 100644 --- a/soh/assets/objects/object_gi_ki_tan_mask/object_gi_ki_tan_mask.h +++ b/soh/assets/objects/object_gi_ki_tan_mask/object_gi_ki_tan_mask.h @@ -3,13 +3,13 @@ #include "align_asset_macro.h" +#define dobject_gi_ki_tan_maskTex_000000 "__OTR__objects/object_gi_ki_tan_mask/object_gi_ki_tan_maskTex_000000" +static const ALIGN_ASSET(2) char object_gi_ki_tan_maskTex_000000[] = dobject_gi_ki_tan_maskTex_000000; + #define dgGiKeatonMaskDL "__OTR__objects/object_gi_ki_tan_mask/gGiKeatonMaskDL" static const ALIGN_ASSET(2) char gGiKeatonMaskDL[] = dgGiKeatonMaskDL; #define dgGiKeatonMaskEyesDL "__OTR__objects/object_gi_ki_tan_mask/gGiKeatonMaskEyesDL" static const ALIGN_ASSET(2) char gGiKeatonMaskEyesDL[] = dgGiKeatonMaskEyesDL; -#define dobject_gi_ki_tan_maskTex_000000 "__OTR__objects/object_gi_ki_tan_mask/object_gi_ki_tan_maskTex_000000" -static const ALIGN_ASSET(2) char object_gi_ki_tan_maskTex_000000[] = dobject_gi_ki_tan_maskTex_000000; - #endif // OBJECTS_OBJECT_GI_KI_TAN_MASK_H diff --git a/soh/assets/objects/object_gi_letter/object_gi_letter.h b/soh/assets/objects/object_gi_letter/object_gi_letter.h index cc813ce0c..d3b2f4db5 100644 --- a/soh/assets/objects/object_gi_letter/object_gi_letter.h +++ b/soh/assets/objects/object_gi_letter/object_gi_letter.h @@ -3,16 +3,16 @@ #include "align_asset_macro.h" -#define dgGiLetterDL "__OTR__objects/object_gi_letter/gGiLetterDL" -static const ALIGN_ASSET(2) char gGiLetterDL[] = dgGiLetterDL; - -#define dgGiLetterWritingDL "__OTR__objects/object_gi_letter/gGiLetterWritingDL" -static const ALIGN_ASSET(2) char gGiLetterWritingDL[] = dgGiLetterWritingDL; - #define dobject_gi_letterTex_000000 "__OTR__objects/object_gi_letter/object_gi_letterTex_000000" static const ALIGN_ASSET(2) char object_gi_letterTex_000000[] = dobject_gi_letterTex_000000; #define dobject_gi_letterTex_000600 "__OTR__objects/object_gi_letter/object_gi_letterTex_000600" static const ALIGN_ASSET(2) char object_gi_letterTex_000600[] = dobject_gi_letterTex_000600; +#define dgGiLetterDL "__OTR__objects/object_gi_letter/gGiLetterDL" +static const ALIGN_ASSET(2) char gGiLetterDL[] = dgGiLetterDL; + +#define dgGiLetterWritingDL "__OTR__objects/object_gi_letter/gGiLetterWritingDL" +static const ALIGN_ASSET(2) char gGiLetterWritingDL[] = dgGiLetterWritingDL; + #endif // OBJECTS_OBJECT_GI_LETTER_H diff --git a/soh/assets/objects/object_gi_liquid/object_gi_liquid.h b/soh/assets/objects/object_gi_liquid/object_gi_liquid.h index 533a96f84..bd804fb94 100644 --- a/soh/assets/objects/object_gi_liquid/object_gi_liquid.h +++ b/soh/assets/objects/object_gi_liquid/object_gi_liquid.h @@ -3,6 +3,15 @@ #include "align_asset_macro.h" +#define dobject_gi_liquidTex_000000 "__OTR__objects/object_gi_liquid/object_gi_liquidTex_000000" +static const ALIGN_ASSET(2) char object_gi_liquidTex_000000[] = dobject_gi_liquidTex_000000; + +#define dobject_gi_liquidTex_000200 "__OTR__objects/object_gi_liquid/object_gi_liquidTex_000200" +static const ALIGN_ASSET(2) char object_gi_liquidTex_000200[] = dobject_gi_liquidTex_000200; + +#define dobject_gi_liquidTex_000400 "__OTR__objects/object_gi_liquid/object_gi_liquidTex_000400" +static const ALIGN_ASSET(2) char object_gi_liquidTex_000400[] = dobject_gi_liquidTex_000400; + #define dgGiGreenPotColorDL "__OTR__objects/object_gi_liquid/gGiGreenPotColorDL" static const ALIGN_ASSET(2) char gGiGreenPotColorDL[] = dgGiGreenPotColorDL; @@ -39,13 +48,4 @@ static const ALIGN_ASSET(2) char gGiPotionLiquidDL[] = dgGiPotionLiquidDL; #define dgGiPotionPatternDL "__OTR__objects/object_gi_liquid/gGiPotionPatternDL" static const ALIGN_ASSET(2) char gGiPotionPatternDL[] = dgGiPotionPatternDL; -#define dobject_gi_liquidTex_000000 "__OTR__objects/object_gi_liquid/object_gi_liquidTex_000000" -static const ALIGN_ASSET(2) char object_gi_liquidTex_000000[] = dobject_gi_liquidTex_000000; - -#define dobject_gi_liquidTex_000200 "__OTR__objects/object_gi_liquid/object_gi_liquidTex_000200" -static const ALIGN_ASSET(2) char object_gi_liquidTex_000200[] = dobject_gi_liquidTex_000200; - -#define dobject_gi_liquidTex_000400 "__OTR__objects/object_gi_liquid/object_gi_liquidTex_000400" -static const ALIGN_ASSET(2) char object_gi_liquidTex_000400[] = dobject_gi_liquidTex_000400; - #endif // OBJECTS_OBJECT_GI_LIQUID_H diff --git a/soh/assets/objects/object_gi_map/object_gi_map.h b/soh/assets/objects/object_gi_map/object_gi_map.h index c4ecee7e9..52c2075ab 100644 --- a/soh/assets/objects/object_gi_map/object_gi_map.h +++ b/soh/assets/objects/object_gi_map/object_gi_map.h @@ -3,13 +3,13 @@ #include "align_asset_macro.h" +#define dobject_gi_mapTex_000D60 "__OTR__objects/object_gi_map/object_gi_mapTex_000D60" +static const ALIGN_ASSET(2) char object_gi_mapTex_000D60[] = dobject_gi_mapTex_000D60; + #define dgGiDungeonMapDL "__OTR__objects/object_gi_map/gGiDungeonMapDL" static const ALIGN_ASSET(2) char gGiDungeonMapDL[] = dgGiDungeonMapDL; #define dgGiStoneOfAgonyDL "__OTR__objects/object_gi_map/gGiStoneOfAgonyDL" static const ALIGN_ASSET(2) char gGiStoneOfAgonyDL[] = dgGiStoneOfAgonyDL; -#define dobject_gi_mapTex_000D60 "__OTR__objects/object_gi_map/object_gi_mapTex_000D60" -static const ALIGN_ASSET(2) char object_gi_mapTex_000D60[] = dobject_gi_mapTex_000D60; - #endif // OBJECTS_OBJECT_GI_MAP_H diff --git a/soh/assets/objects/object_gi_milk/object_gi_milk.h b/soh/assets/objects/object_gi_milk/object_gi_milk.h index 3b6bb4d21..a0164ae8a 100644 --- a/soh/assets/objects/object_gi_milk/object_gi_milk.h +++ b/soh/assets/objects/object_gi_milk/object_gi_milk.h @@ -3,13 +3,13 @@ #include "align_asset_macro.h" +#define dobject_gi_milkTex_000000 "__OTR__objects/object_gi_milk/object_gi_milkTex_000000" +static const ALIGN_ASSET(2) char object_gi_milkTex_000000[] = dobject_gi_milkTex_000000; + #define dgGiMilkBottleContentsDL "__OTR__objects/object_gi_milk/gGiMilkBottleContentsDL" static const ALIGN_ASSET(2) char gGiMilkBottleContentsDL[] = dgGiMilkBottleContentsDL; #define dgGiMilkBottleDL "__OTR__objects/object_gi_milk/gGiMilkBottleDL" static const ALIGN_ASSET(2) char gGiMilkBottleDL[] = dgGiMilkBottleDL; -#define dobject_gi_milkTex_000000 "__OTR__objects/object_gi_milk/object_gi_milkTex_000000" -static const ALIGN_ASSET(2) char object_gi_milkTex_000000[] = dobject_gi_milkTex_000000; - #endif // OBJECTS_OBJECT_GI_MILK_H diff --git a/soh/assets/objects/object_gi_niwatori/object_gi_niwatori.h b/soh/assets/objects/object_gi_niwatori/object_gi_niwatori.h index 1a8a63a0e..bb94e8980 100644 --- a/soh/assets/objects/object_gi_niwatori/object_gi_niwatori.h +++ b/soh/assets/objects/object_gi_niwatori/object_gi_niwatori.h @@ -3,6 +3,12 @@ #include "align_asset_macro.h" +#define dobject_gi_niwatoriTex_000000 "__OTR__objects/object_gi_niwatori/object_gi_niwatoriTex_000000" +static const ALIGN_ASSET(2) char object_gi_niwatoriTex_000000[] = dobject_gi_niwatoriTex_000000; + +#define dobject_gi_niwatoriTex_000800 "__OTR__objects/object_gi_niwatori/object_gi_niwatoriTex_000800" +static const ALIGN_ASSET(2) char object_gi_niwatoriTex_000800[] = dobject_gi_niwatoriTex_000800; + #define dgGiChickenColorDL "__OTR__objects/object_gi_niwatori/gGiChickenColorDL" static const ALIGN_ASSET(2) char gGiChickenColorDL[] = dgGiChickenColorDL; @@ -15,10 +21,4 @@ static const ALIGN_ASSET(2) char gGiChickenDL[] = dgGiChickenDL; #define dgGiChickenEyesDL "__OTR__objects/object_gi_niwatori/gGiChickenEyesDL" static const ALIGN_ASSET(2) char gGiChickenEyesDL[] = dgGiChickenEyesDL; -#define dobject_gi_niwatoriTex_000000 "__OTR__objects/object_gi_niwatori/object_gi_niwatoriTex_000000" -static const ALIGN_ASSET(2) char object_gi_niwatoriTex_000000[] = dobject_gi_niwatoriTex_000000; - -#define dobject_gi_niwatoriTex_000800 "__OTR__objects/object_gi_niwatori/object_gi_niwatoriTex_000800" -static const ALIGN_ASSET(2) char object_gi_niwatoriTex_000800[] = dobject_gi_niwatoriTex_000800; - #endif // OBJECTS_OBJECT_GI_NIWATORI_H diff --git a/soh/assets/objects/object_gi_nuts/object_gi_nuts.h b/soh/assets/objects/object_gi_nuts/object_gi_nuts.h index e758b46fb..434312aca 100644 --- a/soh/assets/objects/object_gi_nuts/object_gi_nuts.h +++ b/soh/assets/objects/object_gi_nuts/object_gi_nuts.h @@ -3,10 +3,10 @@ #include "align_asset_macro.h" -#define dgGiNutDL "__OTR__objects/object_gi_nuts/gGiNutDL" -static const ALIGN_ASSET(2) char gGiNutDL[] = dgGiNutDL; - #define dobject_gi_nutsTex_000000 "__OTR__objects/object_gi_nuts/object_gi_nutsTex_000000" static const ALIGN_ASSET(2) char object_gi_nutsTex_000000[] = dobject_gi_nutsTex_000000; +#define dgGiNutDL "__OTR__objects/object_gi_nuts/gGiNutDL" +static const ALIGN_ASSET(2) char gGiNutDL[] = dgGiNutDL; + #endif // OBJECTS_OBJECT_GI_NUTS_H diff --git a/soh/assets/objects/object_gi_ocarina/object_gi_ocarina.h b/soh/assets/objects/object_gi_ocarina/object_gi_ocarina.h index 77efb0331..7eb5fd83b 100644 --- a/soh/assets/objects/object_gi_ocarina/object_gi_ocarina.h +++ b/soh/assets/objects/object_gi_ocarina/object_gi_ocarina.h @@ -3,13 +3,13 @@ #include "align_asset_macro.h" +#define dobject_gi_ocarinaTex_000000 "__OTR__objects/object_gi_ocarina/object_gi_ocarinaTex_000000" +static const ALIGN_ASSET(2) char object_gi_ocarinaTex_000000[] = dobject_gi_ocarinaTex_000000; + #define dgGiOcarinaTimeDL "__OTR__objects/object_gi_ocarina/gGiOcarinaTimeDL" static const ALIGN_ASSET(2) char gGiOcarinaTimeDL[] = dgGiOcarinaTimeDL; #define dgGiOcarinaTimeHolesDL "__OTR__objects/object_gi_ocarina/gGiOcarinaTimeHolesDL" static const ALIGN_ASSET(2) char gGiOcarinaTimeHolesDL[] = dgGiOcarinaTimeHolesDL; -#define dobject_gi_ocarinaTex_000000 "__OTR__objects/object_gi_ocarina/object_gi_ocarinaTex_000000" -static const ALIGN_ASSET(2) char object_gi_ocarinaTex_000000[] = dobject_gi_ocarinaTex_000000; - #endif // OBJECTS_OBJECT_GI_OCARINA_H diff --git a/soh/assets/objects/object_gi_ocarina_0/object_gi_ocarina_0.h b/soh/assets/objects/object_gi_ocarina_0/object_gi_ocarina_0.h index 747a5ad6a..6f67ce1f9 100644 --- a/soh/assets/objects/object_gi_ocarina_0/object_gi_ocarina_0.h +++ b/soh/assets/objects/object_gi_ocarina_0/object_gi_ocarina_0.h @@ -3,13 +3,13 @@ #include "align_asset_macro.h" +#define dobject_gi_ocarina_0Tex_000000 "__OTR__objects/object_gi_ocarina_0/object_gi_ocarina_0Tex_000000" +static const ALIGN_ASSET(2) char object_gi_ocarina_0Tex_000000[] = dobject_gi_ocarina_0Tex_000000; + #define dgGiOcarinaFairyDL "__OTR__objects/object_gi_ocarina_0/gGiOcarinaFairyDL" static const ALIGN_ASSET(2) char gGiOcarinaFairyDL[] = dgGiOcarinaFairyDL; #define dgGiOcarinaFairyHolesDL "__OTR__objects/object_gi_ocarina_0/gGiOcarinaFairyHolesDL" static const ALIGN_ASSET(2) char gGiOcarinaFairyHolesDL[] = dgGiOcarinaFairyHolesDL; -#define dobject_gi_ocarina_0Tex_000000 "__OTR__objects/object_gi_ocarina_0/object_gi_ocarina_0Tex_000000" -static const ALIGN_ASSET(2) char object_gi_ocarina_0Tex_000000[] = dobject_gi_ocarina_0Tex_000000; - #endif // OBJECTS_OBJECT_GI_OCARINA_0_H diff --git a/soh/assets/objects/object_gi_prescription/object_gi_prescription.h b/soh/assets/objects/object_gi_prescription/object_gi_prescription.h index 249b89bf0..7e0264aad 100644 --- a/soh/assets/objects/object_gi_prescription/object_gi_prescription.h +++ b/soh/assets/objects/object_gi_prescription/object_gi_prescription.h @@ -3,13 +3,13 @@ #include "align_asset_macro.h" +#define dobject_gi_prescriptionTex_000000 "__OTR__objects/object_gi_prescription/object_gi_prescriptionTex_000000" +static const ALIGN_ASSET(2) char object_gi_prescriptionTex_000000[] = dobject_gi_prescriptionTex_000000; + #define dgGiPrescriptionDL "__OTR__objects/object_gi_prescription/gGiPrescriptionDL" static const ALIGN_ASSET(2) char gGiPrescriptionDL[] = dgGiPrescriptionDL; #define dgGiPrescriptionWritingDL "__OTR__objects/object_gi_prescription/gGiPrescriptionWritingDL" static const ALIGN_ASSET(2) char gGiPrescriptionWritingDL[] = dgGiPrescriptionWritingDL; -#define dobject_gi_prescriptionTex_000000 "__OTR__objects/object_gi_prescription/object_gi_prescriptionTex_000000" -static const ALIGN_ASSET(2) char object_gi_prescriptionTex_000000[] = dobject_gi_prescriptionTex_000000; - #endif // OBJECTS_OBJECT_GI_PRESCRIPTION_H diff --git a/soh/assets/objects/object_gi_purse/object_gi_purse.h b/soh/assets/objects/object_gi_purse/object_gi_purse.h index 6949c7455..e524d00e4 100644 --- a/soh/assets/objects/object_gi_purse/object_gi_purse.h +++ b/soh/assets/objects/object_gi_purse/object_gi_purse.h @@ -3,6 +3,9 @@ #include "align_asset_macro.h" +#define dobject_gi_purseTex_000000 "__OTR__objects/object_gi_purse/object_gi_purseTex_000000" +static const ALIGN_ASSET(2) char object_gi_purseTex_000000[] = dobject_gi_purseTex_000000; + #define dgGiAdultWalletColorDL "__OTR__objects/object_gi_purse/gGiAdultWalletColorDL" static const ALIGN_ASSET(2) char gGiAdultWalletColorDL[] = dgGiAdultWalletColorDL; @@ -39,7 +42,4 @@ static const ALIGN_ASSET(2) char gGiWalletStringDL[] = dgGiWalletStringDL; #define dgGiWalletRupeeInnerDL "__OTR__objects/object_gi_purse/gGiWalletRupeeInnerDL" static const ALIGN_ASSET(2) char gGiWalletRupeeInnerDL[] = dgGiWalletRupeeInnerDL; -#define dobject_gi_purseTex_000000 "__OTR__objects/object_gi_purse/object_gi_purseTex_000000" -static const ALIGN_ASSET(2) char object_gi_purseTex_000000[] = dobject_gi_purseTex_000000; - #endif // OBJECTS_OBJECT_GI_PURSE_H diff --git a/soh/assets/objects/object_gi_rabit_mask/object_gi_rabit_mask.h b/soh/assets/objects/object_gi_rabit_mask/object_gi_rabit_mask.h index 575ba6706..5291c1f7d 100644 --- a/soh/assets/objects/object_gi_rabit_mask/object_gi_rabit_mask.h +++ b/soh/assets/objects/object_gi_rabit_mask/object_gi_rabit_mask.h @@ -3,13 +3,13 @@ #include "align_asset_macro.h" +#define dobject_gi_rabit_maskTex_000000 "__OTR__objects/object_gi_rabit_mask/object_gi_rabit_maskTex_000000" +static const ALIGN_ASSET(2) char object_gi_rabit_maskTex_000000[] = dobject_gi_rabit_maskTex_000000; + #define dgGiBunnyHoodDL "__OTR__objects/object_gi_rabit_mask/gGiBunnyHoodDL" static const ALIGN_ASSET(2) char gGiBunnyHoodDL[] = dgGiBunnyHoodDL; #define dgGiBunnyHoodEyesDL "__OTR__objects/object_gi_rabit_mask/gGiBunnyHoodEyesDL" static const ALIGN_ASSET(2) char gGiBunnyHoodEyesDL[] = dgGiBunnyHoodEyesDL; -#define dobject_gi_rabit_maskTex_000000 "__OTR__objects/object_gi_rabit_mask/object_gi_rabit_maskTex_000000" -static const ALIGN_ASSET(2) char object_gi_rabit_maskTex_000000[] = dobject_gi_rabit_maskTex_000000; - #endif // OBJECTS_OBJECT_GI_RABIT_MASK_H diff --git a/soh/assets/objects/object_gi_shield_1/object_gi_shield_1.h b/soh/assets/objects/object_gi_shield_1/object_gi_shield_1.h index 6c7e2c907..4572ca78b 100644 --- a/soh/assets/objects/object_gi_shield_1/object_gi_shield_1.h +++ b/soh/assets/objects/object_gi_shield_1/object_gi_shield_1.h @@ -3,10 +3,10 @@ #include "align_asset_macro.h" -#define dgGiDekuShieldDL "__OTR__objects/object_gi_shield_1/gGiDekuShieldDL" -static const ALIGN_ASSET(2) char gGiDekuShieldDL[] = dgGiDekuShieldDL; - #define dobject_gi_shield_1Tex_000000 "__OTR__objects/object_gi_shield_1/object_gi_shield_1Tex_000000" static const ALIGN_ASSET(2) char object_gi_shield_1Tex_000000[] = dobject_gi_shield_1Tex_000000; +#define dgGiDekuShieldDL "__OTR__objects/object_gi_shield_1/gGiDekuShieldDL" +static const ALIGN_ASSET(2) char gGiDekuShieldDL[] = dgGiDekuShieldDL; + #endif // OBJECTS_OBJECT_GI_SHIELD_1_H diff --git a/soh/assets/objects/object_gi_shield_3/object_gi_shield_3.h b/soh/assets/objects/object_gi_shield_3/object_gi_shield_3.h index 81f8013c8..c80dd6c55 100644 --- a/soh/assets/objects/object_gi_shield_3/object_gi_shield_3.h +++ b/soh/assets/objects/object_gi_shield_3/object_gi_shield_3.h @@ -3,16 +3,16 @@ #include "align_asset_macro.h" -#define dgGiMirrorShieldDL "__OTR__objects/object_gi_shield_3/gGiMirrorShieldDL" -static const ALIGN_ASSET(2) char gGiMirrorShieldDL[] = dgGiMirrorShieldDL; - -#define dgGiMirrorShieldSymbolDL "__OTR__objects/object_gi_shield_3/gGiMirrorShieldSymbolDL" -static const ALIGN_ASSET(2) char gGiMirrorShieldSymbolDL[] = dgGiMirrorShieldSymbolDL; - #define dobject_gi_shield_3Tex_000000 "__OTR__objects/object_gi_shield_3/object_gi_shield_3Tex_000000" static const ALIGN_ASSET(2) char object_gi_shield_3Tex_000000[] = dobject_gi_shield_3Tex_000000; #define dobject_gi_shield_3Tex_000400 "__OTR__objects/object_gi_shield_3/object_gi_shield_3Tex_000400" static const ALIGN_ASSET(2) char object_gi_shield_3Tex_000400[] = dobject_gi_shield_3Tex_000400; +#define dgGiMirrorShieldDL "__OTR__objects/object_gi_shield_3/gGiMirrorShieldDL" +static const ALIGN_ASSET(2) char gGiMirrorShieldDL[] = dgGiMirrorShieldDL; + +#define dgGiMirrorShieldSymbolDL "__OTR__objects/object_gi_shield_3/gGiMirrorShieldSymbolDL" +static const ALIGN_ASSET(2) char gGiMirrorShieldSymbolDL[] = dgGiMirrorShieldSymbolDL; + #endif // OBJECTS_OBJECT_GI_SHIELD_3_H diff --git a/soh/assets/objects/object_gi_soldout/object_gi_soldout.h b/soh/assets/objects/object_gi_soldout/object_gi_soldout.h index 5aa035518..c9efc334b 100644 --- a/soh/assets/objects/object_gi_soldout/object_gi_soldout.h +++ b/soh/assets/objects/object_gi_soldout/object_gi_soldout.h @@ -3,10 +3,10 @@ #include "align_asset_macro.h" -#define dgGiSoldOutDL "__OTR__objects/object_gi_soldout/gGiSoldOutDL" -static const ALIGN_ASSET(2) char gGiSoldOutDL[] = dgGiSoldOutDL; - #define dobject_gi_soldoutTex_000000 "__OTR__objects/object_gi_soldout/object_gi_soldoutTex_000000" static const ALIGN_ASSET(2) char object_gi_soldoutTex_000000[] = dobject_gi_soldoutTex_000000; +#define dgGiSoldOutDL "__OTR__objects/object_gi_soldout/gGiSoldOutDL" +static const ALIGN_ASSET(2) char gGiSoldOutDL[] = dgGiSoldOutDL; + #endif // OBJECTS_OBJECT_GI_SOLDOUT_H diff --git a/soh/assets/objects/object_gi_soul/object_gi_soul.h b/soh/assets/objects/object_gi_soul/object_gi_soul.h index da5fcb74c..c7b71db6f 100644 --- a/soh/assets/objects/object_gi_soul/object_gi_soul.h +++ b/soh/assets/objects/object_gi_soul/object_gi_soul.h @@ -3,6 +3,9 @@ #include "align_asset_macro.h" +#define dobject_gi_soulTex_000000 "__OTR__objects/object_gi_soul/object_gi_soulTex_000000" +static const ALIGN_ASSET(2) char object_gi_soulTex_000000[] = dobject_gi_soulTex_000000; + #define dgGiFairyContainerBaseCapDL "__OTR__objects/object_gi_soul/gGiFairyContainerBaseCapDL" static const ALIGN_ASSET(2) char gGiFairyContainerBaseCapDL[] = dgGiFairyContainerBaseCapDL; @@ -12,7 +15,4 @@ static const ALIGN_ASSET(2) char gGiFairyContainerGlassDL[] = dgGiFairyContainer #define dgGiFairyContainerContentsDL "__OTR__objects/object_gi_soul/gGiFairyContainerContentsDL" static const ALIGN_ASSET(2) char gGiFairyContainerContentsDL[] = dgGiFairyContainerContentsDL; -#define dobject_gi_soulTex_000000 "__OTR__objects/object_gi_soul/object_gi_soulTex_000000" -static const ALIGN_ASSET(2) char object_gi_soulTex_000000[] = dobject_gi_soulTex_000000; - #endif // OBJECTS_OBJECT_GI_SOUL_H diff --git a/soh/assets/objects/object_gi_ticketstone/object_gi_ticketstone.h b/soh/assets/objects/object_gi_ticketstone/object_gi_ticketstone.h index ad02d89ce..cafa87458 100644 --- a/soh/assets/objects/object_gi_ticketstone/object_gi_ticketstone.h +++ b/soh/assets/objects/object_gi_ticketstone/object_gi_ticketstone.h @@ -3,16 +3,16 @@ #include "align_asset_macro.h" +#define dobject_gi_ticketstoneTex_000000 "__OTR__objects/object_gi_ticketstone/object_gi_ticketstoneTex_000000" +static const ALIGN_ASSET(2) char object_gi_ticketstoneTex_000000[] = dobject_gi_ticketstoneTex_000000; + +#define dobject_gi_ticketstoneTex_000240 "__OTR__objects/object_gi_ticketstone/object_gi_ticketstoneTex_000240" +static const ALIGN_ASSET(2) char object_gi_ticketstoneTex_000240[] = dobject_gi_ticketstoneTex_000240; + #define dgGiClaimCheckDL "__OTR__objects/object_gi_ticketstone/gGiClaimCheckDL" static const ALIGN_ASSET(2) char gGiClaimCheckDL[] = dgGiClaimCheckDL; #define dgGiClaimCheckWritingDL "__OTR__objects/object_gi_ticketstone/gGiClaimCheckWritingDL" static const ALIGN_ASSET(2) char gGiClaimCheckWritingDL[] = dgGiClaimCheckWritingDL; -#define dobject_gi_ticketstoneTex_000240 "__OTR__objects/object_gi_ticketstone/object_gi_ticketstoneTex_000240" -static const ALIGN_ASSET(2) char object_gi_ticketstoneTex_000240[] = dobject_gi_ticketstoneTex_000240; - -#define dobject_gi_ticketstoneTex_000000 "__OTR__objects/object_gi_ticketstone/object_gi_ticketstoneTex_000000" -static const ALIGN_ASSET(2) char object_gi_ticketstoneTex_000000[] = dobject_gi_ticketstoneTex_000000; - #endif // OBJECTS_OBJECT_GI_TICKETSTONE_H diff --git a/soh/assets/objects/object_gi_truth_mask/object_gi_truth_mask.h b/soh/assets/objects/object_gi_truth_mask/object_gi_truth_mask.h index bae7c2954..8952d6743 100644 --- a/soh/assets/objects/object_gi_truth_mask/object_gi_truth_mask.h +++ b/soh/assets/objects/object_gi_truth_mask/object_gi_truth_mask.h @@ -3,16 +3,16 @@ #include "align_asset_macro.h" -#define dgGiMaskOfTruthDL "__OTR__objects/object_gi_truth_mask/gGiMaskOfTruthDL" -static const ALIGN_ASSET(2) char gGiMaskOfTruthDL[] = dgGiMaskOfTruthDL; - -#define dgGiMaskOfTruthAccentsDL "__OTR__objects/object_gi_truth_mask/gGiMaskOfTruthAccentsDL" -static const ALIGN_ASSET(2) char gGiMaskOfTruthAccentsDL[] = dgGiMaskOfTruthAccentsDL; - #define dobject_gi_truth_maskTex_000000 "__OTR__objects/object_gi_truth_mask/object_gi_truth_maskTex_000000" static const ALIGN_ASSET(2) char object_gi_truth_maskTex_000000[] = dobject_gi_truth_maskTex_000000; #define dobject_gi_truth_maskTex_000400 "__OTR__objects/object_gi_truth_mask/object_gi_truth_maskTex_000400" static const ALIGN_ASSET(2) char object_gi_truth_maskTex_000400[] = dobject_gi_truth_maskTex_000400; +#define dgGiMaskOfTruthDL "__OTR__objects/object_gi_truth_mask/gGiMaskOfTruthDL" +static const ALIGN_ASSET(2) char gGiMaskOfTruthDL[] = dgGiMaskOfTruthDL; + +#define dgGiMaskOfTruthAccentsDL "__OTR__objects/object_gi_truth_mask/gGiMaskOfTruthAccentsDL" +static const ALIGN_ASSET(2) char gGiMaskOfTruthAccentsDL[] = dgGiMaskOfTruthAccentsDL; + #endif // OBJECTS_OBJECT_GI_TRUTH_MASK_H diff --git a/soh/assets/objects/object_gi_zoramask/object_gi_zoramask.h b/soh/assets/objects/object_gi_zoramask/object_gi_zoramask.h index fa17359cb..e0f352392 100644 --- a/soh/assets/objects/object_gi_zoramask/object_gi_zoramask.h +++ b/soh/assets/objects/object_gi_zoramask/object_gi_zoramask.h @@ -3,15 +3,9 @@ #include "align_asset_macro.h" -#define dgGiZoraMaskDL "__OTR__objects/object_gi_zoramask/gGiZoraMaskDL" -static const ALIGN_ASSET(2) char gGiZoraMaskDL[] = dgGiZoraMaskDL; - #define dobject_gi_zoramaskTex_000208 "__OTR__objects/object_gi_zoramask/object_gi_zoramaskTex_000208" static const ALIGN_ASSET(2) char object_gi_zoramaskTex_000208[] = dobject_gi_zoramaskTex_000208; -#define dobject_gi_zoramaskTLUT_000000 "__OTR__objects/object_gi_zoramask/object_gi_zoramaskTLUT_000000" -static const ALIGN_ASSET(2) char object_gi_zoramaskTLUT_000000[] = dobject_gi_zoramaskTLUT_000000; - #define dobject_gi_zoramaskTex_000248 "__OTR__objects/object_gi_zoramask/object_gi_zoramaskTex_000248" static const ALIGN_ASSET(2) char object_gi_zoramaskTex_000248[] = dobject_gi_zoramaskTex_000248; @@ -21,4 +15,10 @@ static const ALIGN_ASSET(2) char object_gi_zoramaskTex_000648[] = dobject_gi_zor #define dobject_gi_zoramaskTex_000A48 "__OTR__objects/object_gi_zoramask/object_gi_zoramaskTex_000A48" static const ALIGN_ASSET(2) char object_gi_zoramaskTex_000A48[] = dobject_gi_zoramaskTex_000A48; +#define dobject_gi_zoramaskTLUT_000000 "__OTR__objects/object_gi_zoramask/object_gi_zoramaskTLUT_000000" +static const ALIGN_ASSET(2) char object_gi_zoramaskTLUT_000000[] = dobject_gi_zoramaskTLUT_000000; + +#define dgGiZoraMaskDL "__OTR__objects/object_gi_zoramask/gGiZoraMaskDL" +static const ALIGN_ASSET(2) char gGiZoraMaskDL[] = dgGiZoraMaskDL; + #endif // OBJECTS_OBJECT_GI_ZORAMASK_H diff --git a/soh/assets/objects/object_gj/object_gj.h b/soh/assets/objects/object_gj/object_gj.h index a05b7a084..c38e97660 100644 --- a/soh/assets/objects/object_gj/object_gj.h +++ b/soh/assets/objects/object_gj/object_gj.h @@ -3,6 +3,36 @@ #include "align_asset_macro.h" +#define dobject_gjTex_003B20 "__OTR__objects/object_gj/object_gjTex_003B20" +static const ALIGN_ASSET(2) char object_gjTex_003B20[] = dobject_gjTex_003B20; + +#define dobject_gjTex_003C20 "__OTR__objects/object_gj/object_gjTex_003C20" +static const ALIGN_ASSET(2) char object_gjTex_003C20[] = dobject_gjTex_003C20; + +#define dobject_gjTex_003D20 "__OTR__objects/object_gj/object_gjTex_003D20" +static const ALIGN_ASSET(2) char object_gjTex_003D20[] = dobject_gjTex_003D20; + +#define dobject_gjTex_003F20 "__OTR__objects/object_gj/object_gjTex_003F20" +static const ALIGN_ASSET(2) char object_gjTex_003F20[] = dobject_gjTex_003F20; + +#define dobject_gjTex_004F20 "__OTR__objects/object_gj/object_gjTex_004F20" +static const ALIGN_ASSET(2) char object_gjTex_004F20[] = dobject_gjTex_004F20; + +#define dobject_gjTex_005F20 "__OTR__objects/object_gj/object_gjTex_005F20" +static const ALIGN_ASSET(2) char object_gjTex_005F20[] = dobject_gjTex_005F20; + +#define dobject_gjTex_006F20 "__OTR__objects/object_gj/object_gjTex_006F20" +static const ALIGN_ASSET(2) char object_gjTex_006F20[] = dobject_gjTex_006F20; + +#define dobject_gjTex_007320 "__OTR__objects/object_gj/object_gjTex_007320" +static const ALIGN_ASSET(2) char object_gjTex_007320[] = dobject_gjTex_007320; + +#define dobject_gjTex_007720 "__OTR__objects/object_gj/object_gjTex_007720" +static const ALIGN_ASSET(2) char object_gjTex_007720[] = dobject_gjTex_007720; + +#define dobject_gjTex_007B20 "__OTR__objects/object_gj/object_gjTex_007B20" +static const ALIGN_ASSET(2) char object_gjTex_007B20[] = dobject_gjTex_007B20; + #define dgGanonsCastleRubbleAroundArenaDL "__OTR__objects/object_gj/gGanonsCastleRubbleAroundArenaDL" static const ALIGN_ASSET(2) char gGanonsCastleRubbleAroundArenaDL[] = dgGanonsCastleRubbleAroundArenaDL; @@ -60,34 +90,4 @@ static const ALIGN_ASSET(2) char gGanonsCastleUnusedWallTex[] = dgGanonsCastleUn #define dgGanonsCastleUnusedTex_00A320 "__OTR__objects/object_gj/gGanonsCastleUnusedTex_00A320" static const ALIGN_ASSET(2) char gGanonsCastleUnusedTex_00A320[] = dgGanonsCastleUnusedTex_00A320; -#define dobject_gjTex_003D20 "__OTR__objects/object_gj/object_gjTex_003D20" -static const ALIGN_ASSET(2) char object_gjTex_003D20[] = dobject_gjTex_003D20; - -#define dobject_gjTex_003B20 "__OTR__objects/object_gj/object_gjTex_003B20" -static const ALIGN_ASSET(2) char object_gjTex_003B20[] = dobject_gjTex_003B20; - -#define dobject_gjTex_004F20 "__OTR__objects/object_gj/object_gjTex_004F20" -static const ALIGN_ASSET(2) char object_gjTex_004F20[] = dobject_gjTex_004F20; - -#define dobject_gjTex_003C20 "__OTR__objects/object_gj/object_gjTex_003C20" -static const ALIGN_ASSET(2) char object_gjTex_003C20[] = dobject_gjTex_003C20; - -#define dobject_gjTex_003F20 "__OTR__objects/object_gj/object_gjTex_003F20" -static const ALIGN_ASSET(2) char object_gjTex_003F20[] = dobject_gjTex_003F20; - -#define dobject_gjTex_005F20 "__OTR__objects/object_gj/object_gjTex_005F20" -static const ALIGN_ASSET(2) char object_gjTex_005F20[] = dobject_gjTex_005F20; - -#define dobject_gjTex_007B20 "__OTR__objects/object_gj/object_gjTex_007B20" -static const ALIGN_ASSET(2) char object_gjTex_007B20[] = dobject_gjTex_007B20; - -#define dobject_gjTex_007320 "__OTR__objects/object_gj/object_gjTex_007320" -static const ALIGN_ASSET(2) char object_gjTex_007320[] = dobject_gjTex_007320; - -#define dobject_gjTex_007720 "__OTR__objects/object_gj/object_gjTex_007720" -static const ALIGN_ASSET(2) char object_gjTex_007720[] = dobject_gjTex_007720; - -#define dobject_gjTex_006F20 "__OTR__objects/object_gj/object_gjTex_006F20" -static const ALIGN_ASSET(2) char object_gjTex_006F20[] = dobject_gjTex_006F20; - #endif // OBJECTS_OBJECT_GJ_H diff --git a/soh/assets/objects/object_gnd/object_gnd.h b/soh/assets/objects/object_gnd/object_gnd.h index ffad270fb..409e87f9b 100644 --- a/soh/assets/objects/object_gnd/object_gnd.h +++ b/soh/assets/objects/object_gnd/object_gnd.h @@ -3,6 +3,9 @@ #include "align_asset_macro.h" +#define dobject_gndTex_012B50 "__OTR__objects/object_gnd/object_gndTex_012B50" +static const ALIGN_ASSET(2) char object_gndTex_012B50[] = dobject_gndTex_012B50; + #define dgPhantomGanonSkel "__OTR__objects/object_gnd/gPhantomGanonSkel" static const ALIGN_ASSET(2) char gPhantomGanonSkel[] = dgPhantomGanonSkel; @@ -177,9 +180,6 @@ static const ALIGN_ASSET(2) char gPhantomGanonBarsDL[] = dgPhantomGanonBarsDL; #define dgPhantomGanonBarsCol "__OTR__objects/object_gnd/gPhantomGanonBarsCol" static const ALIGN_ASSET(2) char gPhantomGanonBarsCol[] = dgPhantomGanonBarsCol; -#define dobject_gndTex_012B50 "__OTR__objects/object_gnd/object_gndTex_012B50" -static const ALIGN_ASSET(2) char object_gndTex_012B50[] = dobject_gndTex_012B50; - #define dgPhantomGanonSkelLimbsLimb_00C5B0DL_0086F0 "__OTR__objects/object_gnd/gPhantomGanonSkelLimbsLimb_00C5B0DL_0086F0" static const ALIGN_ASSET(2) char gPhantomGanonSkelLimbsLimb_00C5B0DL_0086F0[] = dgPhantomGanonSkelLimbsLimb_00C5B0DL_0086F0; diff --git a/soh/assets/objects/object_gr/object_gr.h b/soh/assets/objects/object_gr/object_gr.h index d2f09cef2..0a0ec3024 100644 --- a/soh/assets/objects/object_gr/object_gr.h +++ b/soh/assets/objects/object_gr/object_gr.h @@ -3,6 +3,39 @@ #include "align_asset_macro.h" +#define dobject_grTex_005D78 "__OTR__objects/object_gr/object_grTex_005D78" +static const ALIGN_ASSET(2) char object_grTex_005D78[] = dobject_grTex_005D78; + +#define dobject_grTex_005E78 "__OTR__objects/object_gr/object_grTex_005E78" +static const ALIGN_ASSET(2) char object_grTex_005E78[] = dobject_grTex_005E78; + +#define dobject_grTex_005EB8 "__OTR__objects/object_gr/object_grTex_005EB8" +static const ALIGN_ASSET(2) char object_grTex_005EB8[] = dobject_grTex_005EB8; + +#define dobject_grTex_005EF8 "__OTR__objects/object_gr/object_grTex_005EF8" +static const ALIGN_ASSET(2) char object_grTex_005EF8[] = dobject_grTex_005EF8; + +#define dobject_grTex_0077F8 "__OTR__objects/object_gr/object_grTex_0077F8" +static const ALIGN_ASSET(2) char object_grTex_0077F8[] = dobject_grTex_0077F8; + +#define dobject_grTex_007BF8 "__OTR__objects/object_gr/object_grTex_007BF8" +static const ALIGN_ASSET(2) char object_grTex_007BF8[] = dobject_grTex_007BF8; + +#define dobject_grTex_007FF8 "__OTR__objects/object_gr/object_grTex_007FF8" +static const ALIGN_ASSET(2) char object_grTex_007FF8[] = dobject_grTex_007FF8; + +#define dobject_grTex_0083F8 "__OTR__objects/object_gr/object_grTex_0083F8" +static const ALIGN_ASSET(2) char object_grTex_0083F8[] = dobject_grTex_0083F8; + +#define dobject_grTex_0097F8 "__OTR__objects/object_gr/object_grTex_0097F8" +static const ALIGN_ASSET(2) char object_grTex_0097F8[] = dobject_grTex_0097F8; + +#define dobject_grTex_009808 "__OTR__objects/object_gr/object_grTex_009808" +static const ALIGN_ASSET(2) char object_grTex_009808[] = dobject_grTex_009808; + +#define dobject_grTLUT_003F78 "__OTR__objects/object_gr/object_grTLUT_003F78" +static const ALIGN_ASSET(2) char object_grTLUT_003F78[] = dobject_grTLUT_003F78; + #define dgNiwGirlSkel "__OTR__objects/object_gr/gNiwGirlSkel" static const ALIGN_ASSET(2) char gNiwGirlSkel[] = dgNiwGirlSkel; @@ -84,37 +117,5 @@ static const ALIGN_ASSET(2) char gNiwGirlSkelLimbsLimb_0098F0DL_003D78[] = dgNiw #define dgNiwGirlSkelLimbsLimb_0098FCDL_003BA0 "__OTR__objects/object_gr/gNiwGirlSkelLimbsLimb_0098FCDL_003BA0" static const ALIGN_ASSET(2) char gNiwGirlSkelLimbsLimb_0098FCDL_003BA0[] = dgNiwGirlSkelLimbsLimb_0098FCDL_003BA0; -#define dobject_grTLUT_003F78 "__OTR__objects/object_gr/object_grTLUT_003F78" -static const ALIGN_ASSET(2) char object_grTLUT_003F78[] = dobject_grTLUT_003F78; - -#define dobject_grTex_005EB8 "__OTR__objects/object_gr/object_grTex_005EB8" -static const ALIGN_ASSET(2) char object_grTex_005EB8[] = dobject_grTex_005EB8; - -#define dobject_grTex_005D78 "__OTR__objects/object_gr/object_grTex_005D78" -static const ALIGN_ASSET(2) char object_grTex_005D78[] = dobject_grTex_005D78; - -#define dobject_grTex_005E78 "__OTR__objects/object_gr/object_grTex_005E78" -static const ALIGN_ASSET(2) char object_grTex_005E78[] = dobject_grTex_005E78; - -#define dobject_grTex_0077F8 "__OTR__objects/object_gr/object_grTex_0077F8" -static const ALIGN_ASSET(2) char object_grTex_0077F8[] = dobject_grTex_0077F8; - -#define dobject_grTex_007BF8 "__OTR__objects/object_gr/object_grTex_007BF8" -static const ALIGN_ASSET(2) char object_grTex_007BF8[] = dobject_grTex_007BF8; - -#define dobject_grTex_007FF8 "__OTR__objects/object_gr/object_grTex_007FF8" -static const ALIGN_ASSET(2) char object_grTex_007FF8[] = dobject_grTex_007FF8; - -#define dobject_grTex_0083F8 "__OTR__objects/object_gr/object_grTex_0083F8" -static const ALIGN_ASSET(2) char object_grTex_0083F8[] = dobject_grTex_0083F8; - -#define dobject_grTex_005EF8 "__OTR__objects/object_gr/object_grTex_005EF8" -static const ALIGN_ASSET(2) char object_grTex_005EF8[] = dobject_grTex_005EF8; - -#define dobject_grTex_0097F8 "__OTR__objects/object_gr/object_grTex_0097F8" -static const ALIGN_ASSET(2) char object_grTex_0097F8[] = dobject_grTex_0097F8; - -#define dobject_grTex_009808 "__OTR__objects/object_gr/object_grTex_009808" -static const ALIGN_ASSET(2) char object_grTex_009808[] = dobject_grTex_009808; #endif // OBJECTS_OBJECT_GR_H diff --git a/soh/assets/objects/object_hakach_objects/object_hakach_objects.h b/soh/assets/objects/object_hakach_objects/object_hakach_objects.h index caeaaf280..410f5cc06 100644 --- a/soh/assets/objects/object_hakach_objects/object_hakach_objects.h +++ b/soh/assets/objects/object_hakach_objects/object_hakach_objects.h @@ -3,6 +3,9 @@ #include "align_asset_macro.h" +#define dobject_hakach_objectsTex_0062F0 "__OTR__objects/object_hakach_objects/object_hakach_objectsTex_0062F0" +static const ALIGN_ASSET(2) char object_hakach_objectsTex_0062F0[] = dobject_hakach_objectsTex_0062F0; + #define dgBotwHoleTrap1DL "__OTR__objects/object_hakach_objects/gBotwHoleTrap1DL" static const ALIGN_ASSET(2) char gBotwHoleTrap1DL[] = dgBotwHoleTrap1DL; @@ -69,7 +72,4 @@ static const ALIGN_ASSET(2) char gBotwTex_0058F0[] = dgBotwTex_0058F0; #define dgBotwTex_0060F0 "__OTR__objects/object_hakach_objects/gBotwTex_0060F0" static const ALIGN_ASSET(2) char gBotwTex_0060F0[] = dgBotwTex_0060F0; -#define dobject_hakach_objectsTex_0062F0 "__OTR__objects/object_hakach_objects/object_hakach_objectsTex_0062F0" -static const ALIGN_ASSET(2) char object_hakach_objectsTex_0062F0[] = dobject_hakach_objectsTex_0062F0; - #endif // OBJECTS_OBJECT_HAKACH_OBJECTS_H diff --git a/soh/assets/objects/object_hidan_objects/object_hidan_objects.h b/soh/assets/objects/object_hidan_objects/object_hidan_objects.h index 50bc08df1..dc676a2b3 100644 --- a/soh/assets/objects/object_hidan_objects/object_hidan_objects.h +++ b/soh/assets/objects/object_hidan_objects/object_hidan_objects.h @@ -3,6 +3,66 @@ #include "align_asset_macro.h" +#define dobject_hidan_objectsTex_000040 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_000040" +static const ALIGN_ASSET(2) char object_hidan_objectsTex_000040[] = dobject_hidan_objectsTex_000040; + +#define dobject_hidan_objectsTex_000240 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_000240" +static const ALIGN_ASSET(2) char object_hidan_objectsTex_000240[] = dobject_hidan_objectsTex_000240; + +#define dobject_hidan_objectsTex_000A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_000A40" +static const ALIGN_ASSET(2) char object_hidan_objectsTex_000A40[] = dobject_hidan_objectsTex_000A40; + +#define dobject_hidan_objectsTex_001A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_001A40" +static const ALIGN_ASSET(2) char object_hidan_objectsTex_001A40[] = dobject_hidan_objectsTex_001A40; + +#define dobject_hidan_objectsTex_002A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_002A40" +static const ALIGN_ASSET(2) char object_hidan_objectsTex_002A40[] = dobject_hidan_objectsTex_002A40; + +#define dobject_hidan_objectsTex_003A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_003A40" +static const ALIGN_ASSET(2) char object_hidan_objectsTex_003A40[] = dobject_hidan_objectsTex_003A40; + +#define dobject_hidan_objectsTex_004240 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_004240" +static const ALIGN_ASSET(2) char object_hidan_objectsTex_004240[] = dobject_hidan_objectsTex_004240; + +#define dobject_hidan_objectsTex_004A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_004A40" +static const ALIGN_ASSET(2) char object_hidan_objectsTex_004A40[] = dobject_hidan_objectsTex_004A40; + +#define dobject_hidan_objectsTex_005240 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_005240" +static const ALIGN_ASSET(2) char object_hidan_objectsTex_005240[] = dobject_hidan_objectsTex_005240; + +#define dobject_hidan_objectsTex_005640 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_005640" +static const ALIGN_ASSET(2) char object_hidan_objectsTex_005640[] = dobject_hidan_objectsTex_005640; + +#define dobject_hidan_objectsTex_005A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_005A40" +static const ALIGN_ASSET(2) char object_hidan_objectsTex_005A40[] = dobject_hidan_objectsTex_005A40; + +#define dobject_hidan_objectsTex_005E40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_005E40" +static const ALIGN_ASSET(2) char object_hidan_objectsTex_005E40[] = dobject_hidan_objectsTex_005E40; + +#define dobject_hidan_objectsTex_006640 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_006640" +static const ALIGN_ASSET(2) char object_hidan_objectsTex_006640[] = dobject_hidan_objectsTex_006640; + +#define dobject_hidan_objectsTex_006A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_006A40" +static const ALIGN_ASSET(2) char object_hidan_objectsTex_006A40[] = dobject_hidan_objectsTex_006A40; + +#define dobject_hidan_objectsTex_006C40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_006C40" +static const ALIGN_ASSET(2) char object_hidan_objectsTex_006C40[] = dobject_hidan_objectsTex_006C40; + +#define dobject_hidan_objectsTex_006E40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_006E40" +static const ALIGN_ASSET(2) char object_hidan_objectsTex_006E40[] = dobject_hidan_objectsTex_006E40; + +#define dobject_hidan_objectsTex_00FB20 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_00FB20" +static const ALIGN_ASSET(2) char object_hidan_objectsTex_00FB20[] = dobject_hidan_objectsTex_00FB20; + +#define dobject_hidan_objectsTex_010D90 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_010D90" +static const ALIGN_ASSET(2) char object_hidan_objectsTex_010D90[] = dobject_hidan_objectsTex_010D90; + +#define dobject_hidan_objectsTLUT_000000 "__OTR__objects/object_hidan_objects/object_hidan_objectsTLUT_000000" +static const ALIGN_ASSET(2) char object_hidan_objectsTLUT_000000[] = dobject_hidan_objectsTLUT_000000; + +#define dobject_hidan_objectsTLUT_000020 "__OTR__objects/object_hidan_objects/object_hidan_objectsTLUT_000020" +static const ALIGN_ASSET(2) char object_hidan_objectsTLUT_000020[] = dobject_hidan_objectsTLUT_000020; + #define dgFireTempleHammerableTotemBodyDL "__OTR__objects/object_hidan_objects/gFireTempleHammerableTotemBodyDL" static const ALIGN_ASSET(2) char gFireTempleHammerableTotemBodyDL[] = dgFireTempleHammerableTotemBodyDL; @@ -204,64 +264,4 @@ static const ALIGN_ASSET(2) char gFireTempleDoorBackDL[] = dgFireTempleDoorBackD #define dgFireTempleDoorKillerTex "__OTR__objects/object_hidan_objects/gFireTempleDoorKillerTex" static const ALIGN_ASSET(2) char gFireTempleDoorKillerTex[] = dgFireTempleDoorKillerTex; -#define dobject_hidan_objectsTex_000A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_000A40" -static const ALIGN_ASSET(2) char object_hidan_objectsTex_000A40[] = dobject_hidan_objectsTex_000A40; - -#define dobject_hidan_objectsTex_002A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_002A40" -static const ALIGN_ASSET(2) char object_hidan_objectsTex_002A40[] = dobject_hidan_objectsTex_002A40; - -#define dobject_hidan_objectsTex_000040 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_000040" -static const ALIGN_ASSET(2) char object_hidan_objectsTex_000040[] = dobject_hidan_objectsTex_000040; - -#define dobject_hidan_objectsTLUT_000000 "__OTR__objects/object_hidan_objects/object_hidan_objectsTLUT_000000" -static const ALIGN_ASSET(2) char object_hidan_objectsTLUT_000000[] = dobject_hidan_objectsTLUT_000000; - -#define dobject_hidan_objectsTex_004A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_004A40" -static const ALIGN_ASSET(2) char object_hidan_objectsTex_004A40[] = dobject_hidan_objectsTex_004A40; - -#define dobject_hidan_objectsTex_005640 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_005640" -static const ALIGN_ASSET(2) char object_hidan_objectsTex_005640[] = dobject_hidan_objectsTex_005640; - -#define dobject_hidan_objectsTex_006640 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_006640" -static const ALIGN_ASSET(2) char object_hidan_objectsTex_006640[] = dobject_hidan_objectsTex_006640; - -#define dobject_hidan_objectsTex_006A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_006A40" -static const ALIGN_ASSET(2) char object_hidan_objectsTex_006A40[] = dobject_hidan_objectsTex_006A40; - -#define dobject_hidan_objectsTex_004240 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_004240" -static const ALIGN_ASSET(2) char object_hidan_objectsTex_004240[] = dobject_hidan_objectsTex_004240; - -#define dobject_hidan_objectsTex_005E40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_005E40" -static const ALIGN_ASSET(2) char object_hidan_objectsTex_005E40[] = dobject_hidan_objectsTex_005E40; - -#define dobject_hidan_objectsTex_006C40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_006C40" -static const ALIGN_ASSET(2) char object_hidan_objectsTex_006C40[] = dobject_hidan_objectsTex_006C40; - -#define dobject_hidan_objectsTex_005240 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_005240" -static const ALIGN_ASSET(2) char object_hidan_objectsTex_005240[] = dobject_hidan_objectsTex_005240; - -#define dobject_hidan_objectsTex_003A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_003A40" -static const ALIGN_ASSET(2) char object_hidan_objectsTex_003A40[] = dobject_hidan_objectsTex_003A40; - -#define dobject_hidan_objectsTex_005A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_005A40" -static const ALIGN_ASSET(2) char object_hidan_objectsTex_005A40[] = dobject_hidan_objectsTex_005A40; - -#define dobject_hidan_objectsTLUT_000020 "__OTR__objects/object_hidan_objects/object_hidan_objectsTLUT_000020" -static const ALIGN_ASSET(2) char object_hidan_objectsTLUT_000020[] = dobject_hidan_objectsTLUT_000020; - -#define dobject_hidan_objectsTex_001A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_001A40" -static const ALIGN_ASSET(2) char object_hidan_objectsTex_001A40[] = dobject_hidan_objectsTex_001A40; - -#define dobject_hidan_objectsTex_000240 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_000240" -static const ALIGN_ASSET(2) char object_hidan_objectsTex_000240[] = dobject_hidan_objectsTex_000240; - -#define dobject_hidan_objectsTex_006E40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_006E40" -static const ALIGN_ASSET(2) char object_hidan_objectsTex_006E40[] = dobject_hidan_objectsTex_006E40; - -#define dobject_hidan_objectsTex_00FB20 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_00FB20" -static const ALIGN_ASSET(2) char object_hidan_objectsTex_00FB20[] = dobject_hidan_objectsTex_00FB20; - -#define dobject_hidan_objectsTex_010D90 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_010D90" -static const ALIGN_ASSET(2) char object_hidan_objectsTex_010D90[] = dobject_hidan_objectsTex_010D90; - #endif // OBJECTS_OBJECT_HIDAN_OBJECTS_H diff --git a/soh/assets/objects/object_hintnuts/object_hintnuts.h b/soh/assets/objects/object_hintnuts/object_hintnuts.h index 59ea49111..481ccc57b 100644 --- a/soh/assets/objects/object_hintnuts/object_hintnuts.h +++ b/soh/assets/objects/object_hintnuts/object_hintnuts.h @@ -3,6 +3,24 @@ #include "align_asset_macro.h" +#define dobject_hintnutsTex_0015A8 "__OTR__objects/object_hintnuts/object_hintnutsTex_0015A8" +static const ALIGN_ASSET(2) char object_hintnutsTex_0015A8[] = dobject_hintnutsTex_0015A8; + +#define dobject_hintnutsTex_001DA8 "__OTR__objects/object_hintnuts/object_hintnutsTex_001DA8" +static const ALIGN_ASSET(2) char object_hintnutsTex_001DA8[] = dobject_hintnutsTex_001DA8; + +#define dobject_hintnutsTex_001FA8 "__OTR__objects/object_hintnuts/object_hintnutsTex_001FA8" +static const ALIGN_ASSET(2) char object_hintnutsTex_001FA8[] = dobject_hintnutsTex_001FA8; + +#define dobject_hintnutsTex_002028 "__OTR__objects/object_hintnuts/object_hintnutsTex_002028" +static const ALIGN_ASSET(2) char object_hintnutsTex_002028[] = dobject_hintnutsTex_002028; + +#define dobject_hintnutsTex_0020A8 "__OTR__objects/object_hintnuts/object_hintnutsTex_0020A8" +static const ALIGN_ASSET(2) char object_hintnutsTex_0020A8[] = dobject_hintnutsTex_0020A8; + +#define dobject_hintnutsTex_002128 "__OTR__objects/object_hintnuts/object_hintnutsTex_002128" +static const ALIGN_ASSET(2) char object_hintnutsTex_002128[] = dobject_hintnutsTex_002128; + #define dgHintNutsSkel "__OTR__objects/object_hintnuts/gHintNutsSkel" static const ALIGN_ASSET(2) char gHintNutsSkel[] = dgHintNutsSkel; @@ -39,12 +57,6 @@ static const ALIGN_ASSET(2) char gHintNutsFlowerDL[] = dgHintNutsFlowerDL; #define dgHintNutsNutDL "__OTR__objects/object_hintnuts/gHintNutsNutDL" static const ALIGN_ASSET(2) char gHintNutsNutDL[] = dgHintNutsNutDL; -#define dobject_hintnutsTex_0015A8 "__OTR__objects/object_hintnuts/object_hintnutsTex_0015A8" -static const ALIGN_ASSET(2) char object_hintnutsTex_0015A8[] = dobject_hintnutsTex_0015A8; - -#define dobject_hintnutsTex_002128 "__OTR__objects/object_hintnuts/object_hintnutsTex_002128" -static const ALIGN_ASSET(2) char object_hintnutsTex_002128[] = dobject_hintnutsTex_002128; - #define dgHintNutsSkelLimbsLimb_002328DL_000C68 "__OTR__objects/object_hintnuts/gHintNutsSkelLimbsLimb_002328DL_000C68" static const ALIGN_ASSET(2) char gHintNutsSkelLimbsLimb_002328DL_000C68[] = dgHintNutsSkelLimbsLimb_002328DL_000C68; @@ -72,16 +84,5 @@ static const ALIGN_ASSET(2) char gHintNutsSkelLimbsLimb_00237CDL_000E28[] = dgHi #define dgHintNutsSkelLimbsLimb_002388DL_000EC8 "__OTR__objects/object_hintnuts/gHintNutsSkelLimbsLimb_002388DL_000EC8" static const ALIGN_ASSET(2) char gHintNutsSkelLimbsLimb_002388DL_000EC8[] = dgHintNutsSkelLimbsLimb_002388DL_000EC8; -#define dobject_hintnutsTex_001DA8 "__OTR__objects/object_hintnuts/object_hintnutsTex_001DA8" -static const ALIGN_ASSET(2) char object_hintnutsTex_001DA8[] = dobject_hintnutsTex_001DA8; - -#define dobject_hintnutsTex_001FA8 "__OTR__objects/object_hintnuts/object_hintnutsTex_001FA8" -static const ALIGN_ASSET(2) char object_hintnutsTex_001FA8[] = dobject_hintnutsTex_001FA8; - -#define dobject_hintnutsTex_002028 "__OTR__objects/object_hintnuts/object_hintnutsTex_002028" -static const ALIGN_ASSET(2) char object_hintnutsTex_002028[] = dobject_hintnutsTex_002028; - -#define dobject_hintnutsTex_0020A8 "__OTR__objects/object_hintnuts/object_hintnutsTex_0020A8" -static const ALIGN_ASSET(2) char object_hintnutsTex_0020A8[] = dobject_hintnutsTex_0020A8; #endif // OBJECTS_OBJECT_HINTNUTS_H diff --git a/soh/assets/objects/object_horse_ganon/object_horse_ganon.h b/soh/assets/objects/object_horse_ganon/object_horse_ganon.h index 99ba41bd1..a08d41e45 100644 --- a/soh/assets/objects/object_horse_ganon/object_horse_ganon.h +++ b/soh/assets/objects/object_horse_ganon/object_horse_ganon.h @@ -3,6 +3,39 @@ #include "align_asset_macro.h" +#define dobject_horse_ganonTex_00A570 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00A570" +static const ALIGN_ASSET(2) char object_horse_ganonTex_00A570[] = dobject_horse_ganonTex_00A570; + +#define dobject_horse_ganonTex_00A5F0 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00A5F0" +static const ALIGN_ASSET(2) char object_horse_ganonTex_00A5F0[] = dobject_horse_ganonTex_00A5F0; + +#define dobject_horse_ganonTex_00A7F0 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00A7F0" +static const ALIGN_ASSET(2) char object_horse_ganonTex_00A7F0[] = dobject_horse_ganonTex_00A7F0; + +#define dobject_horse_ganonTex_00A810 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00A810" +static const ALIGN_ASSET(2) char object_horse_ganonTex_00A810[] = dobject_horse_ganonTex_00A810; + +#define dobject_horse_ganonTex_00AA10 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00AA10" +static const ALIGN_ASSET(2) char object_horse_ganonTex_00AA10[] = dobject_horse_ganonTex_00AA10; + +#define dobject_horse_ganonTex_00B010 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00B010" +static const ALIGN_ASSET(2) char object_horse_ganonTex_00B010[] = dobject_horse_ganonTex_00B010; + +#define dobject_horse_ganonTex_00B110 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00B110" +static const ALIGN_ASSET(2) char object_horse_ganonTex_00B110[] = dobject_horse_ganonTex_00B110; + +#define dobject_horse_ganonTex_00B510 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00B510" +static const ALIGN_ASSET(2) char object_horse_ganonTex_00B510[] = dobject_horse_ganonTex_00B510; + +#define dobject_horse_ganonTex_00B610 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00B610" +static const ALIGN_ASSET(2) char object_horse_ganonTex_00B610[] = dobject_horse_ganonTex_00B610; + +#define dobject_horse_ganonTex_00B690 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00B690" +static const ALIGN_ASSET(2) char object_horse_ganonTex_00B690[] = dobject_horse_ganonTex_00B690; + +#define dobject_horse_ganonTex_00BE90 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00BE90" +static const ALIGN_ASSET(2) char object_horse_ganonTex_00BE90[] = dobject_horse_ganonTex_00BE90; + #define dgHorseGanonSkel "__OTR__objects/object_horse_ganon/gHorseGanonSkel" static const ALIGN_ASSET(2) char gHorseGanonSkel[] = dgHorseGanonSkel; @@ -33,21 +66,6 @@ static const ALIGN_ASSET(2) char gHorseGanonHeadHairTex[] = dgHorseGanonHeadHair #define dgHorseGanonLegTex "__OTR__objects/object_horse_ganon/gHorseGanonLegTex" static const ALIGN_ASSET(2) char gHorseGanonLegTex[] = dgHorseGanonLegTex; -#define dobject_horse_ganonTex_00BE90 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00BE90" -static const ALIGN_ASSET(2) char object_horse_ganonTex_00BE90[] = dobject_horse_ganonTex_00BE90; - -#define dobject_horse_ganonTex_00A7F0 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00A7F0" -static const ALIGN_ASSET(2) char object_horse_ganonTex_00A7F0[] = dobject_horse_ganonTex_00A7F0; - -#define dobject_horse_ganonTex_00B010 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00B010" -static const ALIGN_ASSET(2) char object_horse_ganonTex_00B010[] = dobject_horse_ganonTex_00B010; - -#define dobject_horse_ganonTex_00A5F0 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00A5F0" -static const ALIGN_ASSET(2) char object_horse_ganonTex_00A5F0[] = dobject_horse_ganonTex_00A5F0; - -#define dobject_horse_ganonTex_00AA10 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00AA10" -static const ALIGN_ASSET(2) char object_horse_ganonTex_00AA10[] = dobject_horse_ganonTex_00AA10; - #define dgHorseGanonSkelLimbsLimb_008294SkinLimbDL_009D20 "__OTR__objects/object_horse_ganon/gHorseGanonSkelLimbsLimb_008294SkinLimbDL_009D20" static const ALIGN_ASSET(2) char gHorseGanonSkelLimbsLimb_008294SkinLimbDL_009D20[] = dgHorseGanonSkelLimbsLimb_008294SkinLimbDL_009D20; @@ -101,22 +119,4 @@ static const ALIGN_ASSET(2) char gHorseGanonSkelLimbsLimb_008584DL_001CE0[] = dg #define dgHorseGanonSkelLimbsLimb_008294SkinLimbDL_009D20 "__OTR__objects/object_horse_ganon/gHorseGanonSkelLimbsLimb_008294SkinLimbDL_009D20" -#define dobject_horse_ganonTex_00B510 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00B510" -static const ALIGN_ASSET(2) char object_horse_ganonTex_00B510[] = dobject_horse_ganonTex_00B510; - -#define dobject_horse_ganonTex_00B110 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00B110" -static const ALIGN_ASSET(2) char object_horse_ganonTex_00B110[] = dobject_horse_ganonTex_00B110; - -#define dobject_horse_ganonTex_00A570 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00A570" -static const ALIGN_ASSET(2) char object_horse_ganonTex_00A570[] = dobject_horse_ganonTex_00A570; - -#define dobject_horse_ganonTex_00A810 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00A810" -static const ALIGN_ASSET(2) char object_horse_ganonTex_00A810[] = dobject_horse_ganonTex_00A810; - -#define dobject_horse_ganonTex_00B690 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00B690" -static const ALIGN_ASSET(2) char object_horse_ganonTex_00B690[] = dobject_horse_ganonTex_00B690; - -#define dobject_horse_ganonTex_00B610 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00B610" -static const ALIGN_ASSET(2) char object_horse_ganonTex_00B610[] = dobject_horse_ganonTex_00B610; - #endif // OBJECTS_OBJECT_HORSE_GANON_H diff --git a/soh/assets/objects/object_horse_link_child/object_horse_link_child.h b/soh/assets/objects/object_horse_link_child/object_horse_link_child.h index c52e043e0..98cd558c6 100644 --- a/soh/assets/objects/object_horse_link_child/object_horse_link_child.h +++ b/soh/assets/objects/object_horse_link_child/object_horse_link_child.h @@ -3,6 +3,33 @@ #include "align_asset_macro.h" +#define dobject_horse_link_childTex_001F28 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_001F28" +static const ALIGN_ASSET(2) char object_horse_link_childTex_001F28[] = dobject_horse_link_childTex_001F28; + +#define dobject_horse_link_childTex_001F68 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_001F68" +static const ALIGN_ASSET(2) char object_horse_link_childTex_001F68[] = dobject_horse_link_childTex_001F68; + +#define dobject_horse_link_childTex_002168 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_002168" +static const ALIGN_ASSET(2) char object_horse_link_childTex_002168[] = dobject_horse_link_childTex_002168; + +#define dobject_horse_link_childTex_002368 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_002368" +static const ALIGN_ASSET(2) char object_horse_link_childTex_002368[] = dobject_horse_link_childTex_002368; + +#define dobject_horse_link_childTex_002568 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_002568" +static const ALIGN_ASSET(2) char object_horse_link_childTex_002568[] = dobject_horse_link_childTex_002568; + +#define dobject_horse_link_childTex_002588 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_002588" +static const ALIGN_ASSET(2) char object_horse_link_childTex_002588[] = dobject_horse_link_childTex_002588; + +#define dobject_horse_link_childTex_002788 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_002788" +static const ALIGN_ASSET(2) char object_horse_link_childTex_002788[] = dobject_horse_link_childTex_002788; + +#define dobject_horse_link_childTex_008120 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_008120" +static const ALIGN_ASSET(2) char object_horse_link_childTex_008120[] = dobject_horse_link_childTex_008120; + +#define dobject_horse_link_childTex_008320 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_008320" +static const ALIGN_ASSET(2) char object_horse_link_childTex_008320[] = dobject_horse_link_childTex_008320; + #define dgChildEponaSkel "__OTR__objects/object_horse_link_child/gChildEponaSkel" static const ALIGN_ASSET(2) char gChildEponaSkel[] = dgChildEponaSkel; @@ -33,21 +60,6 @@ static const ALIGN_ASSET(2) char gChildEponaEyeHalfTex[] = dgChildEponaEyeHalfTe #define dgChildEponaEyeCloseTex "__OTR__objects/object_horse_link_child/gChildEponaEyeCloseTex" static const ALIGN_ASSET(2) char gChildEponaEyeCloseTex[] = dgChildEponaEyeCloseTex; -#define dobject_horse_link_childTex_002568 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_002568" -static const ALIGN_ASSET(2) char object_horse_link_childTex_002568[] = dobject_horse_link_childTex_002568; - -#define dobject_horse_link_childTex_008320 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_008320" -static const ALIGN_ASSET(2) char object_horse_link_childTex_008320[] = dobject_horse_link_childTex_008320; - -#define dobject_horse_link_childTex_002168 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_002168" -static const ALIGN_ASSET(2) char object_horse_link_childTex_002168[] = dobject_horse_link_childTex_002168; - -#define dobject_horse_link_childTex_008120 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_008120" -static const ALIGN_ASSET(2) char object_horse_link_childTex_008120[] = dobject_horse_link_childTex_008120; - -#define dobject_horse_link_childTex_001F68 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_001F68" -static const ALIGN_ASSET(2) char object_horse_link_childTex_001F68[] = dobject_horse_link_childTex_001F68; - #define dgChildEponaSkelLimbsLimb_0077D8SkinLimbDL_007B30 "__OTR__objects/object_horse_link_child/gChildEponaSkelLimbsLimb_0077D8SkinLimbDL_007B30" static const ALIGN_ASSET(2) char gChildEponaSkelLimbsLimb_0077D8SkinLimbDL_007B30[] = dgChildEponaSkelLimbsLimb_0077D8SkinLimbDL_007B30; @@ -80,16 +92,4 @@ static const ALIGN_ASSET(2) char gChildEponaSkelLimbsLimb_007A58DL_001678[] = dg #define dgChildEponaSkelLimbsLimb_0077D8SkinLimbDL_007B30 "__OTR__objects/object_horse_link_child/gChildEponaSkelLimbsLimb_0077D8SkinLimbDL_007B30" -#define dobject_horse_link_childTex_002788 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_002788" -static const ALIGN_ASSET(2) char object_horse_link_childTex_002788[] = dobject_horse_link_childTex_002788; - -#define dobject_horse_link_childTex_002588 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_002588" -static const ALIGN_ASSET(2) char object_horse_link_childTex_002588[] = dobject_horse_link_childTex_002588; - -#define dobject_horse_link_childTex_002368 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_002368" -static const ALIGN_ASSET(2) char object_horse_link_childTex_002368[] = dobject_horse_link_childTex_002368; - -#define dobject_horse_link_childTex_001F28 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_001F28" -static const ALIGN_ASSET(2) char object_horse_link_childTex_001F28[] = dobject_horse_link_childTex_001F28; - #endif // OBJECTS_OBJECT_HORSE_LINK_CHILD_H diff --git a/soh/assets/objects/object_horse_normal/object_horse_normal.h b/soh/assets/objects/object_horse_normal/object_horse_normal.h index 5fbb019ba..d3bd4efd7 100644 --- a/soh/assets/objects/object_horse_normal/object_horse_normal.h +++ b/soh/assets/objects/object_horse_normal/object_horse_normal.h @@ -3,6 +3,30 @@ #include "align_asset_macro.h" +#define dobject_horse_normalTex_0058D8 "__OTR__objects/object_horse_normal/object_horse_normalTex_0058D8" +static const ALIGN_ASSET(2) char object_horse_normalTex_0058D8[] = dobject_horse_normalTex_0058D8; + +#define dobject_horse_normalTex_005918 "__OTR__objects/object_horse_normal/object_horse_normalTex_005918" +static const ALIGN_ASSET(2) char object_horse_normalTex_005918[] = dobject_horse_normalTex_005918; + +#define dobject_horse_normalTex_005B18 "__OTR__objects/object_horse_normal/object_horse_normalTex_005B18" +static const ALIGN_ASSET(2) char object_horse_normalTex_005B18[] = dobject_horse_normalTex_005B18; + +#define dobject_horse_normalTex_005B98 "__OTR__objects/object_horse_normal/object_horse_normalTex_005B98" +static const ALIGN_ASSET(2) char object_horse_normalTex_005B98[] = dobject_horse_normalTex_005B98; + +#define dobject_horse_normalTex_005C98 "__OTR__objects/object_horse_normal/object_horse_normalTex_005C98" +static const ALIGN_ASSET(2) char object_horse_normalTex_005C98[] = dobject_horse_normalTex_005C98; + +#define dobject_horse_normalTex_006F28 "__OTR__objects/object_horse_normal/object_horse_normalTex_006F28" +static const ALIGN_ASSET(2) char object_horse_normalTex_006F28[] = dobject_horse_normalTex_006F28; + +#define dobject_horse_normalTex_007028 "__OTR__objects/object_horse_normal/object_horse_normalTex_007028" +static const ALIGN_ASSET(2) char object_horse_normalTex_007028[] = dobject_horse_normalTex_007028; + +#define dobject_horse_normalTex_007128 "__OTR__objects/object_horse_normal/object_horse_normalTex_007128" +static const ALIGN_ASSET(2) char object_horse_normalTex_007128[] = dobject_horse_normalTex_007128; + #define dgHorseNormalSkel "__OTR__objects/object_horse_normal/gHorseNormalSkel" static const ALIGN_ASSET(2) char gHorseNormalSkel[] = dgHorseNormalSkel; @@ -36,21 +60,6 @@ static const ALIGN_ASSET(2) char gHorseNormalWalkingAnim[] = dgHorseNormalWalkin #define dgHorseNormalEyeTex "__OTR__objects/object_horse_normal/gHorseNormalEyeTex" static const ALIGN_ASSET(2) char gHorseNormalEyeTex[] = dgHorseNormalEyeTex; -#define dobject_horse_normalTex_005B98 "__OTR__objects/object_horse_normal/object_horse_normalTex_005B98" -static const ALIGN_ASSET(2) char object_horse_normalTex_005B98[] = dobject_horse_normalTex_005B98; - -#define dobject_horse_normalTex_007128 "__OTR__objects/object_horse_normal/object_horse_normalTex_007128" -static const ALIGN_ASSET(2) char object_horse_normalTex_007128[] = dobject_horse_normalTex_007128; - -#define dobject_horse_normalTex_007028 "__OTR__objects/object_horse_normal/object_horse_normalTex_007028" -static const ALIGN_ASSET(2) char object_horse_normalTex_007028[] = dobject_horse_normalTex_007028; - -#define dobject_horse_normalTex_006F28 "__OTR__objects/object_horse_normal/object_horse_normalTex_006F28" -static const ALIGN_ASSET(2) char object_horse_normalTex_006F28[] = dobject_horse_normalTex_006F28; - -#define dobject_horse_normalTex_0058D8 "__OTR__objects/object_horse_normal/object_horse_normalTex_0058D8" -static const ALIGN_ASSET(2) char object_horse_normalTex_0058D8[] = dobject_horse_normalTex_0058D8; - #define dgHorseNormalSkelLimbsLimb_009C64SkinLimbDL_007528 "__OTR__objects/object_horse_normal/gHorseNormalSkelLimbsLimb_009C64SkinLimbDL_007528" static const ALIGN_ASSET(2) char gHorseNormalSkelLimbsLimb_009C64SkinLimbDL_007528[] = dgHorseNormalSkelLimbsLimb_009C64SkinLimbDL_007528; @@ -83,13 +92,4 @@ static const ALIGN_ASSET(2) char gHorseNormalSkelLimbsLimb_009EE4DL_006878[] = d #define dgHorseNormalSkelLimbsLimb_009C64SkinLimbDL_007528 "__OTR__objects/object_horse_normal/gHorseNormalSkelLimbsLimb_009C64SkinLimbDL_007528" -#define dobject_horse_normalTex_005918 "__OTR__objects/object_horse_normal/object_horse_normalTex_005918" -static const ALIGN_ASSET(2) char object_horse_normalTex_005918[] = dobject_horse_normalTex_005918; - -#define dobject_horse_normalTex_005C98 "__OTR__objects/object_horse_normal/object_horse_normalTex_005C98" -static const ALIGN_ASSET(2) char object_horse_normalTex_005C98[] = dobject_horse_normalTex_005C98; - -#define dobject_horse_normalTex_005B18 "__OTR__objects/object_horse_normal/object_horse_normalTex_005B18" -static const ALIGN_ASSET(2) char object_horse_normalTex_005B18[] = dobject_horse_normalTex_005B18; - #endif // OBJECTS_OBJECT_HORSE_NORMAL_H diff --git a/soh/assets/objects/object_horse_zelda/object_horse_zelda.h b/soh/assets/objects/object_horse_zelda/object_horse_zelda.h index 59647d4b0..8c95c4ca2 100644 --- a/soh/assets/objects/object_horse_zelda/object_horse_zelda.h +++ b/soh/assets/objects/object_horse_zelda/object_horse_zelda.h @@ -3,6 +3,42 @@ #include "align_asset_macro.h" +#define dobject_horse_zeldaTex_000408 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_000408" +static const ALIGN_ASSET(2) char object_horse_zeldaTex_000408[] = dobject_horse_zeldaTex_000408; + +#define dobject_horse_zeldaTex_000888 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_000888" +static const ALIGN_ASSET(2) char object_horse_zeldaTex_000888[] = dobject_horse_zeldaTex_000888; + +#define dobject_horse_zeldaTex_000988 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_000988" +static const ALIGN_ASSET(2) char object_horse_zeldaTex_000988[] = dobject_horse_zeldaTex_000988; + +#define dobject_horse_zeldaTex_002578 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_002578" +static const ALIGN_ASSET(2) char object_horse_zeldaTex_002578[] = dobject_horse_zeldaTex_002578; + +#define dobject_horse_zeldaTex_002678 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_002678" +static const ALIGN_ASSET(2) char object_horse_zeldaTex_002678[] = dobject_horse_zeldaTex_002678; + +#define dobject_horse_zeldaTex_002778 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_002778" +static const ALIGN_ASSET(2) char object_horse_zeldaTex_002778[] = dobject_horse_zeldaTex_002778; + +#define dobject_horse_zeldaTex_002978 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_002978" +static const ALIGN_ASSET(2) char object_horse_zeldaTex_002978[] = dobject_horse_zeldaTex_002978; + +#define dobject_horse_zeldaTex_003178 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_003178" +static const ALIGN_ASSET(2) char object_horse_zeldaTex_003178[] = dobject_horse_zeldaTex_003178; + +#define dobject_horse_zeldaTex_003278 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_003278" +static const ALIGN_ASSET(2) char object_horse_zeldaTex_003278[] = dobject_horse_zeldaTex_003278; + +#define dobject_horse_zeldaTex_003378 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_003378" +static const ALIGN_ASSET(2) char object_horse_zeldaTex_003378[] = dobject_horse_zeldaTex_003378; + +#define dobject_horse_zeldaTex_0033F8 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_0033F8" +static const ALIGN_ASSET(2) char object_horse_zeldaTex_0033F8[] = dobject_horse_zeldaTex_0033F8; + +#define dobject_horse_zeldaTex_0034F8 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_0034F8" +static const ALIGN_ASSET(2) char object_horse_zeldaTex_0034F8[] = dobject_horse_zeldaTex_0034F8; + #define dgHorseZeldaSkel "__OTR__objects/object_horse_zelda/gHorseZeldaSkel" static const ALIGN_ASSET(2) char gHorseZeldaSkel[] = dgHorseZeldaSkel; @@ -21,33 +57,6 @@ static const ALIGN_ASSET(2) char gHorseZeldaNoseTex[] = dgHorseZeldaNoseTex; #define dgHorseZeldaLegTex "__OTR__objects/object_horse_zelda/gHorseZeldaLegTex" static const ALIGN_ASSET(2) char gHorseZeldaLegTex[] = dgHorseZeldaLegTex; -#define dobject_horse_zeldaTex_0034F8 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_0034F8" -static const ALIGN_ASSET(2) char object_horse_zeldaTex_0034F8[] = dobject_horse_zeldaTex_0034F8; - -#define dobject_horse_zeldaTex_0033F8 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_0033F8" -static const ALIGN_ASSET(2) char object_horse_zeldaTex_0033F8[] = dobject_horse_zeldaTex_0033F8; - -#define dobject_horse_zeldaTex_003378 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_003378" -static const ALIGN_ASSET(2) char object_horse_zeldaTex_003378[] = dobject_horse_zeldaTex_003378; - -#define dobject_horse_zeldaTex_003278 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_003278" -static const ALIGN_ASSET(2) char object_horse_zeldaTex_003278[] = dobject_horse_zeldaTex_003278; - -#define dobject_horse_zeldaTex_003178 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_003178" -static const ALIGN_ASSET(2) char object_horse_zeldaTex_003178[] = dobject_horse_zeldaTex_003178; - -#define dobject_horse_zeldaTex_002978 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_002978" -static const ALIGN_ASSET(2) char object_horse_zeldaTex_002978[] = dobject_horse_zeldaTex_002978; - -#define dobject_horse_zeldaTex_002778 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_002778" -static const ALIGN_ASSET(2) char object_horse_zeldaTex_002778[] = dobject_horse_zeldaTex_002778; - -#define dobject_horse_zeldaTex_002678 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_002678" -static const ALIGN_ASSET(2) char object_horse_zeldaTex_002678[] = dobject_horse_zeldaTex_002678; - -#define dobject_horse_zeldaTex_002578 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_002578" -static const ALIGN_ASSET(2) char object_horse_zeldaTex_002578[] = dobject_horse_zeldaTex_002578; - #define dgHorseZeldaSkelLimbsLimb_0067E4SkinLimbDL_0036F8 "__OTR__objects/object_horse_zelda/gHorseZeldaSkelLimbsLimb_0067E4SkinLimbDL_0036F8" static const ALIGN_ASSET(2) char gHorseZeldaSkelLimbsLimb_0067E4SkinLimbDL_0036F8[] = dgHorseZeldaSkelLimbsLimb_0067E4SkinLimbDL_0036F8; @@ -80,13 +89,4 @@ static const ALIGN_ASSET(2) char gHorseZeldaSkelLimbsLimb_006A64DL_002088[] = dg #define dgHorseZeldaSkelLimbsLimb_0067E4SkinLimbDL_0036F8 "__OTR__objects/object_horse_zelda/gHorseZeldaSkelLimbsLimb_0067E4SkinLimbDL_0036F8" -#define dobject_horse_zeldaTex_000988 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_000988" -static const ALIGN_ASSET(2) char object_horse_zeldaTex_000988[] = dobject_horse_zeldaTex_000988; - -#define dobject_horse_zeldaTex_000888 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_000888" -static const ALIGN_ASSET(2) char object_horse_zeldaTex_000888[] = dobject_horse_zeldaTex_000888; - -#define dobject_horse_zeldaTex_000408 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_000408" -static const ALIGN_ASSET(2) char object_horse_zeldaTex_000408[] = dobject_horse_zeldaTex_000408; - #endif // OBJECTS_OBJECT_HORSE_ZELDA_H diff --git a/soh/assets/objects/object_jya_obj/object_jya_obj.h b/soh/assets/objects/object_jya_obj/object_jya_obj.h index e34686999..f5a7b839e 100644 --- a/soh/assets/objects/object_jya_obj/object_jya_obj.h +++ b/soh/assets/objects/object_jya_obj/object_jya_obj.h @@ -3,6 +3,27 @@ #include "align_asset_macro.h" +#define dobject_jya_objTex_00B4B8 "__OTR__objects/object_jya_obj/object_jya_objTex_00B4B8" +static const ALIGN_ASSET(2) char object_jya_objTex_00B4B8[] = dobject_jya_objTex_00B4B8; + +#define dobject_jya_objTex_011A80 "__OTR__objects/object_jya_obj/object_jya_objTex_011A80" +static const ALIGN_ASSET(2) char object_jya_objTex_011A80[] = dobject_jya_objTex_011A80; + +#define dobject_jya_objTex_016140 "__OTR__objects/object_jya_obj/object_jya_objTex_016140" +static const ALIGN_ASSET(2) char object_jya_objTex_016140[] = dobject_jya_objTex_016140; + +#define dobject_jya_objTex_017140 "__OTR__objects/object_jya_obj/object_jya_objTex_017140" +static const ALIGN_ASSET(2) char object_jya_objTex_017140[] = dobject_jya_objTex_017140; + +#define dobject_jya_objTex_01B340 "__OTR__objects/object_jya_obj/object_jya_objTex_01B340" +static const ALIGN_ASSET(2) char object_jya_objTex_01B340[] = dobject_jya_objTex_01B340; + +#define dobject_jya_objTex_01B740 "__OTR__objects/object_jya_obj/object_jya_objTex_01B740" +static const ALIGN_ASSET(2) char object_jya_objTex_01B740[] = dobject_jya_objTex_01B740; + +#define dobject_jya_objTLUT_011A60 "__OTR__objects/object_jya_obj/object_jya_objTLUT_011A60" +static const ALIGN_ASSET(2) char object_jya_objTLUT_011A60[] = dobject_jya_objTLUT_011A60; + #define dg1fliftDL "__OTR__objects/object_jya_obj/g1fliftDL" static const ALIGN_ASSET(2) char g1fliftDL[] = dg1fliftDL; @@ -231,25 +252,4 @@ static const ALIGN_ASSET(2) char gZurerukabeDL[] = dgZurerukabeDL; #define dgZurerukabeCol "__OTR__objects/object_jya_obj/gZurerukabeCol" static const ALIGN_ASSET(2) char gZurerukabeCol[] = dgZurerukabeCol; -#define dobject_jya_objTex_017140 "__OTR__objects/object_jya_obj/object_jya_objTex_017140" -static const ALIGN_ASSET(2) char object_jya_objTex_017140[] = dobject_jya_objTex_017140; - -#define dobject_jya_objTex_01B340 "__OTR__objects/object_jya_obj/object_jya_objTex_01B340" -static const ALIGN_ASSET(2) char object_jya_objTex_01B340[] = dobject_jya_objTex_01B340; - -#define dobject_jya_objTex_01B740 "__OTR__objects/object_jya_obj/object_jya_objTex_01B740" -static const ALIGN_ASSET(2) char object_jya_objTex_01B740[] = dobject_jya_objTex_01B740; - -#define dobject_jya_objTex_00B4B8 "__OTR__objects/object_jya_obj/object_jya_objTex_00B4B8" -static const ALIGN_ASSET(2) char object_jya_objTex_00B4B8[] = dobject_jya_objTex_00B4B8; - -#define dobject_jya_objTex_016140 "__OTR__objects/object_jya_obj/object_jya_objTex_016140" -static const ALIGN_ASSET(2) char object_jya_objTex_016140[] = dobject_jya_objTex_016140; - -#define dobject_jya_objTex_011A80 "__OTR__objects/object_jya_obj/object_jya_objTex_011A80" -static const ALIGN_ASSET(2) char object_jya_objTex_011A80[] = dobject_jya_objTex_011A80; - -#define dobject_jya_objTLUT_011A60 "__OTR__objects/object_jya_obj/object_jya_objTLUT_011A60" -static const ALIGN_ASSET(2) char object_jya_objTLUT_011A60[] = dobject_jya_objTLUT_011A60; - #endif // OBJECTS_OBJECT_JYA_OBJ_H diff --git a/soh/assets/objects/object_link_boy/object_link_boy.h b/soh/assets/objects/object_link_boy/object_link_boy.h index 13ad2b3a1..a36662a80 100644 --- a/soh/assets/objects/object_link_boy/object_link_boy.h +++ b/soh/assets/objects/object_link_boy/object_link_boy.h @@ -3,6 +3,27 @@ #include "align_asset_macro.h" +#define dobject_link_boyTLUT_005400 "__OTR__objects/object_link_boy/object_link_boyTLUT_005400" +static const ALIGN_ASSET(2) char object_link_boyTLUT_005400[] = dobject_link_boyTLUT_005400; + +#define dobject_link_boyTLUT_005800 "__OTR__objects/object_link_boy/object_link_boyTLUT_005800" +static const ALIGN_ASSET(2) char object_link_boyTLUT_005800[] = dobject_link_boyTLUT_005800; + +#define dobject_link_boyTLUT_005A00 "__OTR__objects/object_link_boy/object_link_boyTLUT_005A00" +static const ALIGN_ASSET(2) char object_link_boyTLUT_005A00[] = dobject_link_boyTLUT_005A00; + +#define dobject_link_boyTLUT_00CB40 "__OTR__objects/object_link_boy/object_link_boyTLUT_00CB40" +static const ALIGN_ASSET(2) char object_link_boyTLUT_00CB40[] = dobject_link_boyTLUT_00CB40; + +#define dobject_link_boyTLUT_00CD48 "__OTR__objects/object_link_boy/object_link_boyTLUT_00CD48" +static const ALIGN_ASSET(2) char object_link_boyTLUT_00CD48[] = dobject_link_boyTLUT_00CD48; + +#define dobject_link_boyTLUT_00CF50 "__OTR__objects/object_link_boy/object_link_boyTLUT_00CF50" +static const ALIGN_ASSET(2) char object_link_boyTLUT_00CF50[] = dobject_link_boyTLUT_00CF50; + +#define dobject_link_boyTLUT_00D078 "__OTR__objects/object_link_boy/object_link_boyTLUT_00D078" +static const ALIGN_ASSET(2) char object_link_boyTLUT_00D078[] = dobject_link_boyTLUT_00D078; + #define dgLinkAdultSkel "__OTR__objects/object_link_boy/gLinkAdultSkel" static const ALIGN_ASSET(2) char gLinkAdultSkel[] = dgLinkAdultSkel; @@ -309,9 +330,6 @@ static const ALIGN_ASSET(2) char gLinkAdultHookshotDesignTex[] = dgLinkAdultHook #define dgLinkAdultHookshotChainTex "__OTR__objects/object_link_boy/gLinkAdultHookshotChainTex" static const ALIGN_ASSET(2) char gLinkAdultHookshotChainTex[] = dgLinkAdultHookshotChainTex; -#define dgLinkAdultHookshotReticleVtx "__OTR__objects/object_link_boy/gLinkAdultHookshotReticleVtx" -static const ALIGN_ASSET(2) char gLinkAdultHookshotReticleVtx[] = dgLinkAdultHookshotReticleVtx; - #define dgLinkAdultHookshotReticleTex "__OTR__objects/object_link_boy/gLinkAdultHookshotReticleTex" static const ALIGN_ASSET(2) char gLinkAdultHookshotReticleTex[] = dgLinkAdultHookshotReticleTex; @@ -369,6 +387,9 @@ static const ALIGN_ASSET(2) char gLinkAdultGauntletPlate1Tex[] = dgLinkAdultGaun #define dgLinkAdultGauntletPlate2Tex "__OTR__objects/object_link_boy/gLinkAdultGauntletPlate2Tex" static const ALIGN_ASSET(2) char gLinkAdultGauntletPlate2Tex[] = dgLinkAdultGauntletPlate2Tex; +#define dgLinkAdultHookshotReticleVtx "__OTR__objects/object_link_boy/gLinkAdultHookshotReticleVtx" +static const ALIGN_ASSET(2) char gLinkAdultHookshotReticleVtx[] = dgLinkAdultHookshotReticleVtx; + #define dgLinkAdultHookshotReticleDL "__OTR__objects/object_link_boy/gLinkAdultHookshotReticleDL" static const ALIGN_ASSET(2) char gLinkAdultHookshotReticleDL[] = dgLinkAdultHookshotReticleDL; @@ -489,25 +510,5 @@ static const ALIGN_ASSET(2) char gLinkAdultVtx_0340A0[] = dgLinkAdultVtx_0340A0; #define dgLinkAdultVtx_02E7E0 "__OTR__objects/object_link_boy/gLinkAdultVtx_02E7E0" static const ALIGN_ASSET(2) char gLinkAdultVtx_02E7E0[] = dgLinkAdultVtx_02E7E0; -#define dobject_link_boyTLUT_005800 "__OTR__objects/object_link_boy/object_link_boyTLUT_005800" -static const ALIGN_ASSET(2) char object_link_boyTLUT_005800[] = dobject_link_boyTLUT_005800; - -#define dobject_link_boyTLUT_005A00 "__OTR__objects/object_link_boy/object_link_boyTLUT_005A00" -static const ALIGN_ASSET(2) char object_link_boyTLUT_005A00[] = dobject_link_boyTLUT_005A00; - -#define dobject_link_boyTLUT_005400 "__OTR__objects/object_link_boy/object_link_boyTLUT_005400" -static const ALIGN_ASSET(2) char object_link_boyTLUT_005400[] = dobject_link_boyTLUT_005400; - -#define dobject_link_boyTLUT_00CD48 "__OTR__objects/object_link_boy/object_link_boyTLUT_00CD48" -static const ALIGN_ASSET(2) char object_link_boyTLUT_00CD48[] = dobject_link_boyTLUT_00CD48; - -#define dobject_link_boyTLUT_00CF50 "__OTR__objects/object_link_boy/object_link_boyTLUT_00CF50" -static const ALIGN_ASSET(2) char object_link_boyTLUT_00CF50[] = dobject_link_boyTLUT_00CF50; - -#define dobject_link_boyTLUT_00CB40 "__OTR__objects/object_link_boy/object_link_boyTLUT_00CB40" -static const ALIGN_ASSET(2) char object_link_boyTLUT_00CB40[] = dobject_link_boyTLUT_00CB40; - -#define dobject_link_boyTLUT_00D078 "__OTR__objects/object_link_boy/object_link_boyTLUT_00D078" -static const ALIGN_ASSET(2) char object_link_boyTLUT_00D078[] = dobject_link_boyTLUT_00D078; #endif // OBJECTS_OBJECT_LINK_BOY_H diff --git a/soh/assets/objects/object_masterkokirihead/object_masterkokirihead.h b/soh/assets/objects/object_masterkokirihead/object_masterkokirihead.h index eb93d9bc6..a097752ba 100644 --- a/soh/assets/objects/object_masterkokirihead/object_masterkokirihead.h +++ b/soh/assets/objects/object_masterkokirihead/object_masterkokirihead.h @@ -3,6 +3,12 @@ #include "align_asset_macro.h" +#define dobject_masterkokiriheadTex_0009F0 "__OTR__objects/object_masterkokirihead/object_masterkokiriheadTex_0009F0" +static const ALIGN_ASSET(2) char object_masterkokiriheadTex_0009F0[] = dobject_masterkokiriheadTex_0009F0; + +#define dobject_masterkokiriheadTex_000A30 "__OTR__objects/object_masterkokirihead/object_masterkokiriheadTex_000A30" +static const ALIGN_ASSET(2) char object_masterkokiriheadTex_000A30[] = dobject_masterkokiriheadTex_000A30; + #define dgKokiriShopkeeperHeadDL "__OTR__objects/object_masterkokirihead/gKokiriShopkeeperHeadDL" static const ALIGN_ASSET(2) char gKokiriShopkeeperHeadDL[] = dgKokiriShopkeeperHeadDL; @@ -33,10 +39,4 @@ static const ALIGN_ASSET(2) char gKokiriShopkeeperHatTex[] = dgKokiriShopkeeperH #define dgKokiriShopkeeperMouthAndNoseTex "__OTR__objects/object_masterkokirihead/gKokiriShopkeeperMouthAndNoseTex" static const ALIGN_ASSET(2) char gKokiriShopkeeperMouthAndNoseTex[] = dgKokiriShopkeeperMouthAndNoseTex; -#define dobject_masterkokiriheadTex_0009F0 "__OTR__objects/object_masterkokirihead/object_masterkokiriheadTex_0009F0" -static const ALIGN_ASSET(2) char object_masterkokiriheadTex_0009F0[] = dobject_masterkokiriheadTex_0009F0; - -#define dobject_masterkokiriheadTex_000A30 "__OTR__objects/object_masterkokirihead/object_masterkokiriheadTex_000A30" -static const ALIGN_ASSET(2) char object_masterkokiriheadTex_000A30[] = dobject_masterkokiriheadTex_000A30; - #endif // OBJECTS_OBJECT_MASTERKOKIRIHEAD_H diff --git a/soh/assets/objects/object_mb/object_mb.h b/soh/assets/objects/object_mb/object_mb.h index 3079270a0..38e0a0d78 100644 --- a/soh/assets/objects/object_mb/object_mb.h +++ b/soh/assets/objects/object_mb/object_mb.h @@ -3,6 +3,48 @@ #include "align_asset_macro.h" +#define dobject_mbTex_008128 "__OTR__objects/object_mb/object_mbTex_008128" +static const ALIGN_ASSET(2) char object_mbTex_008128[] = dobject_mbTex_008128; + +#define dobject_mbTex_008328 "__OTR__objects/object_mb/object_mbTex_008328" +static const ALIGN_ASSET(2) char object_mbTex_008328[] = dobject_mbTex_008328; + +#define dobject_mbTex_008928 "__OTR__objects/object_mb/object_mbTex_008928" +static const ALIGN_ASSET(2) char object_mbTex_008928[] = dobject_mbTex_008928; + +#define dobject_mbTex_008A28 "__OTR__objects/object_mb/object_mbTex_008A28" +static const ALIGN_ASSET(2) char object_mbTex_008A28[] = dobject_mbTex_008A28; + +#define dobject_mbTex_008A48 "__OTR__objects/object_mb/object_mbTex_008A48" +static const ALIGN_ASSET(2) char object_mbTex_008A48[] = dobject_mbTex_008A48; + +#define dobject_mbTex_008BC8 "__OTR__objects/object_mb/object_mbTex_008BC8" +static const ALIGN_ASSET(2) char object_mbTex_008BC8[] = dobject_mbTex_008BC8; + +#define dobject_mbTex_008C48 "__OTR__objects/object_mb/object_mbTex_008C48" +static const ALIGN_ASSET(2) char object_mbTex_008C48[] = dobject_mbTex_008C48; + +#define dobject_mbTex_008C88 "__OTR__objects/object_mb/object_mbTex_008C88" +static const ALIGN_ASSET(2) char object_mbTex_008C88[] = dobject_mbTex_008C88; + +#define dobject_mbTex_00EC00 "__OTR__objects/object_mb/object_mbTex_00EC00" +static const ALIGN_ASSET(2) char object_mbTex_00EC00[] = dobject_mbTex_00EC00; + +#define dobject_mbTex_00EE00 "__OTR__objects/object_mb/object_mbTex_00EE00" +static const ALIGN_ASSET(2) char object_mbTex_00EE00[] = dobject_mbTex_00EE00; + +#define dobject_mbTex_00EF00 "__OTR__objects/object_mb/object_mbTex_00EF00" +static const ALIGN_ASSET(2) char object_mbTex_00EF00[] = dobject_mbTex_00EF00; + +#define dobject_mbTex_00F000 "__OTR__objects/object_mb/object_mbTex_00F000" +static const ALIGN_ASSET(2) char object_mbTex_00F000[] = dobject_mbTex_00F000; + +#define dobject_mbTex_00F200 "__OTR__objects/object_mb/object_mbTex_00F200" +static const ALIGN_ASSET(2) char object_mbTex_00F200[] = dobject_mbTex_00F200; + +#define dobject_mbTex_00F280 "__OTR__objects/object_mb/object_mbTex_00F280" +static const ALIGN_ASSET(2) char object_mbTex_00F280[] = dobject_mbTex_00F280; + #define dgEnMbSpearSkel "__OTR__objects/object_mb/gEnMbSpearSkel" static const ALIGN_ASSET(2) char gEnMbSpearSkel[] = dgEnMbSpearSkel; @@ -168,48 +210,6 @@ static const ALIGN_ASSET(2) char gEnMbDL_013A30[] = dgEnMbDL_013A30; #define dgEnMbDL_013DF0 "__OTR__objects/object_mb/gEnMbDL_013DF0" static const ALIGN_ASSET(2) char gEnMbDL_013DF0[] = dgEnMbDL_013DF0; -#define dobject_mbTex_008328 "__OTR__objects/object_mb/object_mbTex_008328" -static const ALIGN_ASSET(2) char object_mbTex_008328[] = dobject_mbTex_008328; - -#define dobject_mbTex_008128 "__OTR__objects/object_mb/object_mbTex_008128" -static const ALIGN_ASSET(2) char object_mbTex_008128[] = dobject_mbTex_008128; - -#define dobject_mbTex_008BC8 "__OTR__objects/object_mb/object_mbTex_008BC8" -static const ALIGN_ASSET(2) char object_mbTex_008BC8[] = dobject_mbTex_008BC8; - -#define dobject_mbTex_008C48 "__OTR__objects/object_mb/object_mbTex_008C48" -static const ALIGN_ASSET(2) char object_mbTex_008C48[] = dobject_mbTex_008C48; - -#define dobject_mbTex_008C88 "__OTR__objects/object_mb/object_mbTex_008C88" -static const ALIGN_ASSET(2) char object_mbTex_008C88[] = dobject_mbTex_008C88; - -#define dobject_mbTex_008A48 "__OTR__objects/object_mb/object_mbTex_008A48" -static const ALIGN_ASSET(2) char object_mbTex_008A48[] = dobject_mbTex_008A48; - -#define dobject_mbTex_008928 "__OTR__objects/object_mb/object_mbTex_008928" -static const ALIGN_ASSET(2) char object_mbTex_008928[] = dobject_mbTex_008928; - -#define dobject_mbTex_008A28 "__OTR__objects/object_mb/object_mbTex_008A28" -static const ALIGN_ASSET(2) char object_mbTex_008A28[] = dobject_mbTex_008A28; - -#define dobject_mbTex_00F280 "__OTR__objects/object_mb/object_mbTex_00F280" -static const ALIGN_ASSET(2) char object_mbTex_00F280[] = dobject_mbTex_00F280; - -#define dobject_mbTex_00EE00 "__OTR__objects/object_mb/object_mbTex_00EE00" -static const ALIGN_ASSET(2) char object_mbTex_00EE00[] = dobject_mbTex_00EE00; - -#define dobject_mbTex_00EC00 "__OTR__objects/object_mb/object_mbTex_00EC00" -static const ALIGN_ASSET(2) char object_mbTex_00EC00[] = dobject_mbTex_00EC00; - -#define dobject_mbTex_00EF00 "__OTR__objects/object_mb/object_mbTex_00EF00" -static const ALIGN_ASSET(2) char object_mbTex_00EF00[] = dobject_mbTex_00EF00; - -#define dobject_mbTex_00F000 "__OTR__objects/object_mb/object_mbTex_00F000" -static const ALIGN_ASSET(2) char object_mbTex_00F000[] = dobject_mbTex_00F000; - -#define dobject_mbTex_00F200 "__OTR__objects/object_mb/object_mbTex_00F200" -static const ALIGN_ASSET(2) char object_mbTex_00F200[] = dobject_mbTex_00F200; - #define dgEnMbSpearSkelLimbsLimb_008DE8DL_007908 "__OTR__objects/object_mb/gEnMbSpearSkelLimbsLimb_008DE8DL_007908" static const ALIGN_ASSET(2) char gEnMbSpearSkelLimbsLimb_008DE8DL_007908[] = dgEnMbSpearSkelLimbsLimb_008DE8DL_007908; diff --git a/soh/assets/objects/object_mizu_objects/object_mizu_objects.h b/soh/assets/objects/object_mizu_objects/object_mizu_objects.h index c135c8db2..c447bc54a 100644 --- a/soh/assets/objects/object_mizu_objects/object_mizu_objects.h +++ b/soh/assets/objects/object_mizu_objects/object_mizu_objects.h @@ -3,6 +3,48 @@ #include "align_asset_macro.h" +#define dobject_mizu_objectsTex_004C00 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_004C00" +static const ALIGN_ASSET(2) char object_mizu_objectsTex_004C00[] = dobject_mizu_objectsTex_004C00; + +#define dobject_mizu_objectsTex_005E70 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_005E70" +static const ALIGN_ASSET(2) char object_mizu_objectsTex_005E70[] = dobject_mizu_objectsTex_005E70; + +#define dobject_mizu_objectsTex_007520 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_007520" +static const ALIGN_ASSET(2) char object_mizu_objectsTex_007520[] = dobject_mizu_objectsTex_007520; + +#define dobject_mizu_objectsTex_007D20 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_007D20" +static const ALIGN_ASSET(2) char object_mizu_objectsTex_007D20[] = dobject_mizu_objectsTex_007D20; + +#define dobject_mizu_objectsTex_008520 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_008520" +static const ALIGN_ASSET(2) char object_mizu_objectsTex_008520[] = dobject_mizu_objectsTex_008520; + +#define dobject_mizu_objectsTex_008D20 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_008D20" +static const ALIGN_ASSET(2) char object_mizu_objectsTex_008D20[] = dobject_mizu_objectsTex_008D20; + +#define dobject_mizu_objectsTex_009520 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_009520" +static const ALIGN_ASSET(2) char object_mizu_objectsTex_009520[] = dobject_mizu_objectsTex_009520; + +#define dobject_mizu_objectsTex_009720 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_009720" +static const ALIGN_ASSET(2) char object_mizu_objectsTex_009720[] = dobject_mizu_objectsTex_009720; + +#define dobject_mizu_objectsTex_009920 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_009920" +static const ALIGN_ASSET(2) char object_mizu_objectsTex_009920[] = dobject_mizu_objectsTex_009920; + +#define dobject_mizu_objectsTex_009B20 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_009B20" +static const ALIGN_ASSET(2) char object_mizu_objectsTex_009B20[] = dobject_mizu_objectsTex_009B20; + +#define dobject_mizu_objectsTex_009D20 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_009D20" +static const ALIGN_ASSET(2) char object_mizu_objectsTex_009D20[] = dobject_mizu_objectsTex_009D20; + +#define dobject_mizu_objectsTex_009F20 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_009F20" +static const ALIGN_ASSET(2) char object_mizu_objectsTex_009F20[] = dobject_mizu_objectsTex_009F20; + +#define dobject_mizu_objectsTex_00A720 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_00A720" +static const ALIGN_ASSET(2) char object_mizu_objectsTex_00A720[] = dobject_mizu_objectsTex_00A720; + +#define dobject_mizu_objectsTex_00AB20 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_00AB20" +static const ALIGN_ASSET(2) char object_mizu_objectsTex_00AB20[] = dobject_mizu_objectsTex_00AB20; + #define dgObjectMizuObjectsMovebgDL_000190 "__OTR__objects/object_mizu_objects/gObjectMizuObjectsMovebgDL_000190" static const ALIGN_ASSET(2) char gObjectMizuObjectsMovebgDL_000190[] = dgObjectMizuObjectsMovebgDL_000190; @@ -93,46 +135,4 @@ static const ALIGN_ASSET(2) char gObjectMizuObjectsShutterCol_0073F0[] = dgObjec #define dgObjectMizuObjectsUzuCol_0074EC "__OTR__objects/object_mizu_objects/gObjectMizuObjectsUzuCol_0074EC" static const ALIGN_ASSET(2) char gObjectMizuObjectsUzuCol_0074EC[] = dgObjectMizuObjectsUzuCol_0074EC; -#define dobject_mizu_objectsTex_007D20 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_007D20" -static const ALIGN_ASSET(2) char object_mizu_objectsTex_007D20[] = dobject_mizu_objectsTex_007D20; - -#define dobject_mizu_objectsTex_008520 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_008520" -static const ALIGN_ASSET(2) char object_mizu_objectsTex_008520[] = dobject_mizu_objectsTex_008520; - -#define dobject_mizu_objectsTex_008D20 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_008D20" -static const ALIGN_ASSET(2) char object_mizu_objectsTex_008D20[] = dobject_mizu_objectsTex_008D20; - -#define dobject_mizu_objectsTex_00AB20 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_00AB20" -static const ALIGN_ASSET(2) char object_mizu_objectsTex_00AB20[] = dobject_mizu_objectsTex_00AB20; - -#define dobject_mizu_objectsTex_009B20 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_009B20" -static const ALIGN_ASSET(2) char object_mizu_objectsTex_009B20[] = dobject_mizu_objectsTex_009B20; - -#define dobject_mizu_objectsTex_009D20 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_009D20" -static const ALIGN_ASSET(2) char object_mizu_objectsTex_009D20[] = dobject_mizu_objectsTex_009D20; - -#define dobject_mizu_objectsTex_009920 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_009920" -static const ALIGN_ASSET(2) char object_mizu_objectsTex_009920[] = dobject_mizu_objectsTex_009920; - -#define dobject_mizu_objectsTex_009720 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_009720" -static const ALIGN_ASSET(2) char object_mizu_objectsTex_009720[] = dobject_mizu_objectsTex_009720; - -#define dobject_mizu_objectsTex_009520 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_009520" -static const ALIGN_ASSET(2) char object_mizu_objectsTex_009520[] = dobject_mizu_objectsTex_009520; - -#define dobject_mizu_objectsTex_009F20 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_009F20" -static const ALIGN_ASSET(2) char object_mizu_objectsTex_009F20[] = dobject_mizu_objectsTex_009F20; - -#define dobject_mizu_objectsTex_007520 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_007520" -static const ALIGN_ASSET(2) char object_mizu_objectsTex_007520[] = dobject_mizu_objectsTex_007520; - -#define dobject_mizu_objectsTex_004C00 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_004C00" -static const ALIGN_ASSET(2) char object_mizu_objectsTex_004C00[] = dobject_mizu_objectsTex_004C00; - -#define dobject_mizu_objectsTex_005E70 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_005E70" -static const ALIGN_ASSET(2) char object_mizu_objectsTex_005E70[] = dobject_mizu_objectsTex_005E70; - -#define dobject_mizu_objectsTex_00A720 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_00A720" -static const ALIGN_ASSET(2) char object_mizu_objectsTex_00A720[] = dobject_mizu_objectsTex_00A720; - #endif // OBJECTS_OBJECT_MIZU_OBJECTS_H diff --git a/soh/assets/objects/object_mm/object_mm.h b/soh/assets/objects/object_mm/object_mm.h index 00170fa3b..cefc05044 100644 --- a/soh/assets/objects/object_mm/object_mm.h +++ b/soh/assets/objects/object_mm/object_mm.h @@ -3,6 +3,33 @@ #include "align_asset_macro.h" +#define dobject_mmTex_000930 "__OTR__objects/object_mm/object_mmTex_000930" +static const ALIGN_ASSET(2) char object_mmTex_000930[] = dobject_mmTex_000930; + +#define dobject_mmTex_000970 "__OTR__objects/object_mm/object_mmTex_000970" +static const ALIGN_ASSET(2) char object_mmTex_000970[] = dobject_mmTex_000970; + +#define dobject_mmTex_0009B0 "__OTR__objects/object_mm/object_mmTex_0009B0" +static const ALIGN_ASSET(2) char object_mmTex_0009B0[] = dobject_mmTex_0009B0; + +#define dobject_mmTex_0009F0 "__OTR__objects/object_mm/object_mmTex_0009F0" +static const ALIGN_ASSET(2) char object_mmTex_0009F0[] = dobject_mmTex_0009F0; + +#define dobject_mmTex_000A30 "__OTR__objects/object_mm/object_mmTex_000A30" +static const ALIGN_ASSET(2) char object_mmTex_000A30[] = dobject_mmTex_000A30; + +#define dobject_mmTex_000B30 "__OTR__objects/object_mm/object_mmTex_000B30" +static const ALIGN_ASSET(2) char object_mmTex_000B30[] = dobject_mmTex_000B30; + +#define dobject_mmTex_001030 "__OTR__objects/object_mm/object_mmTex_001030" +static const ALIGN_ASSET(2) char object_mmTex_001030[] = dobject_mmTex_001030; + +#define dobject_mmTex_001130 "__OTR__objects/object_mm/object_mmTex_001130" +static const ALIGN_ASSET(2) char object_mmTex_001130[] = dobject_mmTex_001130; + +#define dobject_mmTex_001330 "__OTR__objects/object_mm/object_mmTex_001330" +static const ALIGN_ASSET(2) char object_mmTex_001330[] = dobject_mmTex_001330; + #define dgRunningManSkel "__OTR__objects/object_mm/gRunningManSkel" static const ALIGN_ASSET(2) char gRunningManSkel[] = dgRunningManSkel; @@ -78,31 +105,5 @@ static const ALIGN_ASSET(2) char gRunningManSkelLimbsLimb_005DC4DL_004CC8[] = dg #define dgRunningManSkelLimbsLimb_005DD0DL_004348 "__OTR__objects/object_mm/gRunningManSkelLimbsLimb_005DD0DL_004348" static const ALIGN_ASSET(2) char gRunningManSkelLimbsLimb_005DD0DL_004348[] = dgRunningManSkelLimbsLimb_005DD0DL_004348; -#define dobject_mmTex_001330 "__OTR__objects/object_mm/object_mmTex_001330" -static const ALIGN_ASSET(2) char object_mmTex_001330[] = dobject_mmTex_001330; - -#define dobject_mmTex_001130 "__OTR__objects/object_mm/object_mmTex_001130" -static const ALIGN_ASSET(2) char object_mmTex_001130[] = dobject_mmTex_001130; - -#define dobject_mmTex_000930 "__OTR__objects/object_mm/object_mmTex_000930" -static const ALIGN_ASSET(2) char object_mmTex_000930[] = dobject_mmTex_000930; - -#define dobject_mmTex_000970 "__OTR__objects/object_mm/object_mmTex_000970" -static const ALIGN_ASSET(2) char object_mmTex_000970[] = dobject_mmTex_000970; - -#define dobject_mmTex_001030 "__OTR__objects/object_mm/object_mmTex_001030" -static const ALIGN_ASSET(2) char object_mmTex_001030[] = dobject_mmTex_001030; - -#define dobject_mmTex_0009B0 "__OTR__objects/object_mm/object_mmTex_0009B0" -static const ALIGN_ASSET(2) char object_mmTex_0009B0[] = dobject_mmTex_0009B0; - -#define dobject_mmTex_0009F0 "__OTR__objects/object_mm/object_mmTex_0009F0" -static const ALIGN_ASSET(2) char object_mmTex_0009F0[] = dobject_mmTex_0009F0; - -#define dobject_mmTex_000A30 "__OTR__objects/object_mm/object_mmTex_000A30" -static const ALIGN_ASSET(2) char object_mmTex_000A30[] = dobject_mmTex_000A30; - -#define dobject_mmTex_000B30 "__OTR__objects/object_mm/object_mmTex_000B30" -static const ALIGN_ASSET(2) char object_mmTex_000B30[] = dobject_mmTex_000B30; #endif // OBJECTS_OBJECT_MM_H diff --git a/soh/assets/objects/object_mo/object_mo.h b/soh/assets/objects/object_mo/object_mo.h index 61983a400..fc48efd02 100644 --- a/soh/assets/objects/object_mo/object_mo.h +++ b/soh/assets/objects/object_mo/object_mo.h @@ -3,6 +3,21 @@ #include "align_asset_macro.h" +#define dobject_moTex_000000 "__OTR__objects/object_mo/object_moTex_000000" +static const ALIGN_ASSET(2) char object_moTex_000000[] = dobject_moTex_000000; + +#define dobject_moTex_000680 "__OTR__objects/object_mo/object_moTex_000680" +static const ALIGN_ASSET(2) char object_moTex_000680[] = dobject_moTex_000680; + +#define dobject_moTex_004D20 "__OTR__objects/object_mo/object_moTex_004D20" +static const ALIGN_ASSET(2) char object_moTex_004D20[] = dobject_moTex_004D20; + +#define dobject_moTex_005520 "__OTR__objects/object_mo/object_moTex_005520" +static const ALIGN_ASSET(2) char object_moTex_005520[] = dobject_moTex_005520; + +#define dobject_moTex_005D20 "__OTR__objects/object_mo/object_moTex_005D20" +static const ALIGN_ASSET(2) char object_moTex_005D20[] = dobject_moTex_005D20; + #define dgMorphaTitleCardTex "__OTR__objects/object_mo/gMorphaTitleCardTex" static const ALIGN_ASSET(2) char gMorphaTitleCardTex[] = dgMorphaTitleCardTex; @@ -174,19 +189,4 @@ static const ALIGN_ASSET(2) char gMorphaVtx_006938[] = dgMorphaVtx_006938; #define dgMorphaVtx_007BB8 "__OTR__objects/object_mo/gMorphaVtx_007BB8" static const ALIGN_ASSET(2) char gMorphaVtx_007BB8[] = dgMorphaVtx_007BB8; -#define dobject_moTex_004D20 "__OTR__objects/object_mo/object_moTex_004D20" -static const ALIGN_ASSET(2) char object_moTex_004D20[] = dobject_moTex_004D20; - -#define dobject_moTex_005D20 "__OTR__objects/object_mo/object_moTex_005D20" -static const ALIGN_ASSET(2) char object_moTex_005D20[] = dobject_moTex_005D20; - -#define dobject_moTex_005520 "__OTR__objects/object_mo/object_moTex_005520" -static const ALIGN_ASSET(2) char object_moTex_005520[] = dobject_moTex_005520; - -#define dobject_moTex_000000 "__OTR__objects/object_mo/object_moTex_000000" -static const ALIGN_ASSET(2) char object_moTex_000000[] = dobject_moTex_000000; - -#define dobject_moTex_000680 "__OTR__objects/object_mo/object_moTex_000680" -static const ALIGN_ASSET(2) char object_moTex_000680[] = dobject_moTex_000680; - #endif // OBJECTS_OBJECT_MO_H diff --git a/soh/assets/objects/object_oE1s/object_oE1s.h b/soh/assets/objects/object_oE1s/object_oE1s.h index 4e1911ac9..6a7974c43 100644 --- a/soh/assets/objects/object_oE1s/object_oE1s.h +++ b/soh/assets/objects/object_oE1s/object_oE1s.h @@ -3,6 +3,12 @@ #include "align_asset_macro.h" +#define dobject_oE1sTex_000478 "__OTR__objects/object_oE1s/object_oE1sTex_000478" +static const ALIGN_ASSET(2) char object_oE1sTex_000478[] = dobject_oE1sTex_000478; + +#define dobject_oE1sTLUT_0001A8 "__OTR__objects/object_oE1s/object_oE1sTLUT_0001A8" +static const ALIGN_ASSET(2) char object_oE1sTLUT_0001A8[] = dobject_oE1sTLUT_0001A8; + #define dobject_oE1s_Anim_00007C "__OTR__objects/object_oE1s/object_oE1s_Anim_00007C" static const ALIGN_ASSET(2) char object_oE1s_Anim_00007C[] = dobject_oE1s_Anim_00007C; @@ -87,10 +93,5 @@ static const ALIGN_ASSET(2) char object_oE1s_DL_006340[] = dobject_oE1s_DL_00634 #define dobject_oE1s_DL_006490 "__OTR__objects/object_oE1s/object_oE1s_DL_006490" static const ALIGN_ASSET(2) char object_oE1s_DL_006490[] = dobject_oE1s_DL_006490; -#define dobject_oE1sTex_000478 "__OTR__objects/object_oE1s/object_oE1sTex_000478" -static const ALIGN_ASSET(2) char object_oE1sTex_000478[] = dobject_oE1sTex_000478; - -#define dobject_oE1sTLUT_0001A8 "__OTR__objects/object_oE1s/object_oE1sTLUT_0001A8" -static const ALIGN_ASSET(2) char object_oE1sTLUT_0001A8[] = dobject_oE1sTLUT_0001A8; #endif // OBJECTS_OBJECT_OE1S_H diff --git a/soh/assets/objects/object_oE4s/object_oE4s.h b/soh/assets/objects/object_oE4s/object_oE4s.h index 28d7182a7..fe5eb473b 100644 --- a/soh/assets/objects/object_oE4s/object_oE4s.h +++ b/soh/assets/objects/object_oE4s/object_oE4s.h @@ -3,6 +3,12 @@ #include "align_asset_macro.h" +#define dobject_oE4sTex_0002A0 "__OTR__objects/object_oE4s/object_oE4sTex_0002A0" +static const ALIGN_ASSET(2) char object_oE4sTex_0002A0[] = dobject_oE4sTex_0002A0; + +#define dobject_oE4sTex_0003A0 "__OTR__objects/object_oE4s/object_oE4sTex_0003A0" +static const ALIGN_ASSET(2) char object_oE4sTex_0003A0[] = dobject_oE4sTex_0003A0; + #define dobject_oE4s_Anim_00007C "__OTR__objects/object_oE4s/object_oE4s_Anim_00007C" static const ALIGN_ASSET(2) char object_oE4s_Anim_00007C[] = dobject_oE4s_Anim_00007C; @@ -81,10 +87,5 @@ static const ALIGN_ASSET(2) char object_oE4s_DL_004C48[] = dobject_oE4s_DL_004C4 #define dobject_oE4s_DL_004D00 "__OTR__objects/object_oE4s/object_oE4s_DL_004D00" static const ALIGN_ASSET(2) char object_oE4s_DL_004D00[] = dobject_oE4s_DL_004D00; -#define dobject_oE4sTex_0002A0 "__OTR__objects/object_oE4s/object_oE4sTex_0002A0" -static const ALIGN_ASSET(2) char object_oE4sTex_0002A0[] = dobject_oE4sTex_0002A0; - -#define dobject_oE4sTex_0003A0 "__OTR__objects/object_oE4s/object_oE4sTex_0003A0" -static const ALIGN_ASSET(2) char object_oE4sTex_0003A0[] = dobject_oE4sTex_0003A0; #endif // OBJECTS_OBJECT_OE4S_H diff --git a/soh/assets/objects/object_oF1d_map/object_oF1d_map.h b/soh/assets/objects/object_oF1d_map/object_oF1d_map.h index 7d232190c..9d9f3093c 100644 --- a/soh/assets/objects/object_oF1d_map/object_oF1d_map.h +++ b/soh/assets/objects/object_oF1d_map/object_oF1d_map.h @@ -3,6 +3,57 @@ #include "align_asset_macro.h" +#define dobject_oF1d_mapTex_009270 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_009270" +static const ALIGN_ASSET(2) char object_oF1d_mapTex_009270[] = dobject_oF1d_mapTex_009270; + +#define dobject_oF1d_mapTex_0092B0 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_0092B0" +static const ALIGN_ASSET(2) char object_oF1d_mapTex_0092B0[] = dobject_oF1d_mapTex_0092B0; + +#define dobject_oF1d_mapTex_0092F0 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_0092F0" +static const ALIGN_ASSET(2) char object_oF1d_mapTex_0092F0[] = dobject_oF1d_mapTex_0092F0; + +#define dobject_oF1d_mapTex_009370 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_009370" +static const ALIGN_ASSET(2) char object_oF1d_mapTex_009370[] = dobject_oF1d_mapTex_009370; + +#define dobject_oF1d_mapTex_009B70 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_009B70" +static const ALIGN_ASSET(2) char object_oF1d_mapTex_009B70[] = dobject_oF1d_mapTex_009B70; + +#define dobject_oF1d_mapTex_009C70 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_009C70" +static const ALIGN_ASSET(2) char object_oF1d_mapTex_009C70[] = dobject_oF1d_mapTex_009C70; + +#define dobject_oF1d_mapTex_00C840 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00C840" +static const ALIGN_ASSET(2) char object_oF1d_mapTex_00C840[] = dobject_oF1d_mapTex_00C840; + +#define dobject_oF1d_mapTex_00C880 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00C880" +static const ALIGN_ASSET(2) char object_oF1d_mapTex_00C880[] = dobject_oF1d_mapTex_00C880; + +#define dobject_oF1d_mapTex_00CA80 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00CA80" +static const ALIGN_ASSET(2) char object_oF1d_mapTex_00CA80[] = dobject_oF1d_mapTex_00CA80; + +#define dobject_oF1d_mapTex_00EE80 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00EE80" +static const ALIGN_ASSET(2) char object_oF1d_mapTex_00EE80[] = dobject_oF1d_mapTex_00EE80; + +#define dobject_oF1d_mapTex_00F680 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00F680" +static const ALIGN_ASSET(2) char object_oF1d_mapTex_00F680[] = dobject_oF1d_mapTex_00F680; + +#define dobject_oF1d_mapTex_00F6C0 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00F6C0" +static const ALIGN_ASSET(2) char object_oF1d_mapTex_00F6C0[] = dobject_oF1d_mapTex_00F6C0; + +#define dobject_oF1d_mapTex_00F7C0 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00F7C0" +static const ALIGN_ASSET(2) char object_oF1d_mapTex_00F7C0[] = dobject_oF1d_mapTex_00F7C0; + +#define dobject_oF1d_mapTex_00F8C0 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00F8C0" +static const ALIGN_ASSET(2) char object_oF1d_mapTex_00F8C0[] = dobject_oF1d_mapTex_00F8C0; + +#define dobject_oF1d_mapTex_00FCC0 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00FCC0" +static const ALIGN_ASSET(2) char object_oF1d_mapTex_00FCC0[] = dobject_oF1d_mapTex_00FCC0; + +#define dobject_oF1d_mapTLUT_009130 "__OTR__objects/object_oF1d_map/object_oF1d_mapTLUT_009130" +static const ALIGN_ASSET(2) char object_oF1d_mapTLUT_009130[] = dobject_oF1d_mapTLUT_009130; + +#define dobject_oF1d_mapTLUT_00C440 "__OTR__objects/object_oF1d_map/object_oF1d_mapTLUT_00C440" +static const ALIGN_ASSET(2) char object_oF1d_mapTLUT_00C440[] = dobject_oF1d_mapTLUT_00C440; + #define dgGoronAnim_000750 "__OTR__objects/object_oF1d_map/gGoronAnim_000750" static const ALIGN_ASSET(2) char gGoronAnim_000750[] = dgGoronAnim_000750; @@ -72,27 +123,6 @@ static const ALIGN_ASSET(2) char gGoronCsMouthNeutralTex[] = dgGoronCsMouthNeutr #define dgGoronCsMouthSmileTex "__OTR__objects/object_oF1d_map/gGoronCsMouthSmileTex" static const ALIGN_ASSET(2) char gGoronCsMouthSmileTex[] = dgGoronCsMouthSmileTex; -#define dobject_oF1d_mapTex_009C70 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_009C70" -static const ALIGN_ASSET(2) char object_oF1d_mapTex_009C70[] = dobject_oF1d_mapTex_009C70; - -#define dobject_oF1d_mapTex_009270 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_009270" -static const ALIGN_ASSET(2) char object_oF1d_mapTex_009270[] = dobject_oF1d_mapTex_009270; - -#define dobject_oF1d_mapTLUT_009130 "__OTR__objects/object_oF1d_map/object_oF1d_mapTLUT_009130" -static const ALIGN_ASSET(2) char object_oF1d_mapTLUT_009130[] = dobject_oF1d_mapTLUT_009130; - -#define dobject_oF1d_mapTex_0092B0 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_0092B0" -static const ALIGN_ASSET(2) char object_oF1d_mapTex_0092B0[] = dobject_oF1d_mapTex_0092B0; - -#define dobject_oF1d_mapTex_0092F0 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_0092F0" -static const ALIGN_ASSET(2) char object_oF1d_mapTex_0092F0[] = dobject_oF1d_mapTex_0092F0; - -#define dobject_oF1d_mapTex_009370 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_009370" -static const ALIGN_ASSET(2) char object_oF1d_mapTex_009370[] = dobject_oF1d_mapTex_009370; - -#define dobject_oF1d_mapTex_009B70 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_009B70" -static const ALIGN_ASSET(2) char object_oF1d_mapTex_009B70[] = dobject_oF1d_mapTex_009B70; - #define dgGoronSkelLimbsLimb_00FDECDL_008708 "__OTR__objects/object_oF1d_map/gGoronSkelLimbsLimb_00FDECDL_008708" static const ALIGN_ASSET(2) char gGoronSkelLimbsLimb_00FDECDL_008708[] = dgGoronSkelLimbsLimb_00FDECDL_008708; @@ -138,34 +168,5 @@ static const ALIGN_ASSET(2) char gGoronSkelLimbsLimb_00FE94DL_007FF0[] = dgGoron #define dgGoronSkelLimbsLimb_00FEA0DL_007458 "__OTR__objects/object_oF1d_map/gGoronSkelLimbsLimb_00FEA0DL_007458" static const ALIGN_ASSET(2) char gGoronSkelLimbsLimb_00FEA0DL_007458[] = dgGoronSkelLimbsLimb_00FEA0DL_007458; -#define dobject_oF1d_mapTLUT_00C440 "__OTR__objects/object_oF1d_map/object_oF1d_mapTLUT_00C440" -static const ALIGN_ASSET(2) char object_oF1d_mapTLUT_00C440[] = dobject_oF1d_mapTLUT_00C440; - -#define dobject_oF1d_mapTex_00C840 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00C840" -static const ALIGN_ASSET(2) char object_oF1d_mapTex_00C840[] = dobject_oF1d_mapTex_00C840; - -#define dobject_oF1d_mapTex_00C880 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00C880" -static const ALIGN_ASSET(2) char object_oF1d_mapTex_00C880[] = dobject_oF1d_mapTex_00C880; - -#define dobject_oF1d_mapTex_00CA80 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00CA80" -static const ALIGN_ASSET(2) char object_oF1d_mapTex_00CA80[] = dobject_oF1d_mapTex_00CA80; - -#define dobject_oF1d_mapTex_00F680 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00F680" -static const ALIGN_ASSET(2) char object_oF1d_mapTex_00F680[] = dobject_oF1d_mapTex_00F680; - -#define dobject_oF1d_mapTex_00EE80 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00EE80" -static const ALIGN_ASSET(2) char object_oF1d_mapTex_00EE80[] = dobject_oF1d_mapTex_00EE80; - -#define dobject_oF1d_mapTex_00FCC0 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00FCC0" -static const ALIGN_ASSET(2) char object_oF1d_mapTex_00FCC0[] = dobject_oF1d_mapTex_00FCC0; - -#define dobject_oF1d_mapTex_00F8C0 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00F8C0" -static const ALIGN_ASSET(2) char object_oF1d_mapTex_00F8C0[] = dobject_oF1d_mapTex_00F8C0; - -#define dobject_oF1d_mapTex_00F7C0 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00F7C0" -static const ALIGN_ASSET(2) char object_oF1d_mapTex_00F7C0[] = dobject_oF1d_mapTex_00F7C0; - -#define dobject_oF1d_mapTex_00F6C0 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00F6C0" -static const ALIGN_ASSET(2) char object_oF1d_mapTex_00F6C0[] = dobject_oF1d_mapTex_00F6C0; #endif // OBJECTS_OBJECT_OF1D_MAP_H diff --git a/soh/assets/objects/object_ossan/object_ossan.h b/soh/assets/objects/object_ossan/object_ossan.h index c19bb0095..5a9d1a4a4 100644 --- a/soh/assets/objects/object_ossan/object_ossan.h +++ b/soh/assets/objects/object_ossan/object_ossan.h @@ -3,6 +3,36 @@ #include "align_asset_macro.h" +#define dobject_ossanTex_005078 "__OTR__objects/object_ossan/object_ossanTex_005078" +static const ALIGN_ASSET(2) char object_ossanTex_005078[] = dobject_ossanTex_005078; + +#define dobject_ossanTex_005178 "__OTR__objects/object_ossan/object_ossanTex_005178" +static const ALIGN_ASSET(2) char object_ossanTex_005178[] = dobject_ossanTex_005178; + +#define dobject_ossanTex_005278 "__OTR__objects/object_ossan/object_ossanTex_005278" +static const ALIGN_ASSET(2) char object_ossanTex_005278[] = dobject_ossanTex_005278; + +#define dobject_ossanTex_005AB8 "__OTR__objects/object_ossan/object_ossanTex_005AB8" +static const ALIGN_ASSET(2) char object_ossanTex_005AB8[] = dobject_ossanTex_005AB8; + +#define dobject_ossanTex_008A38 "__OTR__objects/object_ossan/object_ossanTex_008A38" +static const ALIGN_ASSET(2) char object_ossanTex_008A38[] = dobject_ossanTex_008A38; + +#define dobject_ossanTex_008AB8 "__OTR__objects/object_ossan/object_ossanTex_008AB8" +static const ALIGN_ASSET(2) char object_ossanTex_008AB8[] = dobject_ossanTex_008AB8; + +#define dobject_ossanTex_008CB8 "__OTR__objects/object_ossan/object_ossanTex_008CB8" +static const ALIGN_ASSET(2) char object_ossanTex_008CB8[] = dobject_ossanTex_008CB8; + +#define dobject_ossanTex_008EB8 "__OTR__objects/object_ossan/object_ossanTex_008EB8" +static const ALIGN_ASSET(2) char object_ossanTex_008EB8[] = dobject_ossanTex_008EB8; + +#define dobject_ossanTex_0096B8 "__OTR__objects/object_ossan/object_ossanTex_0096B8" +static const ALIGN_ASSET(2) char object_ossanTex_0096B8[] = dobject_ossanTex_0096B8; + +#define dobject_ossanTex_0098B8 "__OTR__objects/object_ossan/object_ossanTex_0098B8" +static const ALIGN_ASSET(2) char object_ossanTex_0098B8[] = dobject_ossanTex_0098B8; + #define dgObjectOssanAnim_000338 "__OTR__objects/object_ossan/gObjectOssanAnim_000338" static const ALIGN_ASSET(2) char gObjectOssanAnim_000338[] = dgObjectOssanAnim_000338; @@ -30,18 +60,6 @@ static const ALIGN_ASSET(2) char gObjectOssanEnSyatekiManDL_007E28[] = dgObjectO #define dgObjectOssanSkel "__OTR__objects/object_ossan/gObjectOssanSkel" static const ALIGN_ASSET(2) char gObjectOssanSkel[] = dgObjectOssanSkel; -#define dobject_ossanTex_005078 "__OTR__objects/object_ossan/object_ossanTex_005078" -static const ALIGN_ASSET(2) char object_ossanTex_005078[] = dobject_ossanTex_005078; - -#define dobject_ossanTex_005AB8 "__OTR__objects/object_ossan/object_ossanTex_005AB8" -static const ALIGN_ASSET(2) char object_ossanTex_005AB8[] = dobject_ossanTex_005AB8; - -#define dobject_ossanTex_005178 "__OTR__objects/object_ossan/object_ossanTex_005178" -static const ALIGN_ASSET(2) char object_ossanTex_005178[] = dobject_ossanTex_005178; - -#define dobject_ossanTex_005278 "__OTR__objects/object_ossan/object_ossanTex_005278" -static const ALIGN_ASSET(2) char object_ossanTex_005278[] = dobject_ossanTex_005278; - #define dgObjectOssanSkelLimbsLimb_009AB8DL_002E30 "__OTR__objects/object_ossan/gObjectOssanSkelLimbsLimb_009AB8DL_002E30" static const ALIGN_ASSET(2) char gObjectOssanSkelLimbsLimb_009AB8DL_002E30[] = dgObjectOssanSkelLimbsLimb_009AB8DL_002E30; @@ -66,22 +84,5 @@ static const ALIGN_ASSET(2) char gObjectOssanSkelLimbsLimb_009B00DL_003708[] = d #define dgObjectOssanSkelLimbsLimb_009B0CDL_007428 "__OTR__objects/object_ossan/gObjectOssanSkelLimbsLimb_009B0CDL_007428" static const ALIGN_ASSET(2) char gObjectOssanSkelLimbsLimb_009B0CDL_007428[] = dgObjectOssanSkelLimbsLimb_009B0CDL_007428; -#define dobject_ossanTex_008EB8 "__OTR__objects/object_ossan/object_ossanTex_008EB8" -static const ALIGN_ASSET(2) char object_ossanTex_008EB8[] = dobject_ossanTex_008EB8; - -#define dobject_ossanTex_008A38 "__OTR__objects/object_ossan/object_ossanTex_008A38" -static const ALIGN_ASSET(2) char object_ossanTex_008A38[] = dobject_ossanTex_008A38; - -#define dobject_ossanTex_0096B8 "__OTR__objects/object_ossan/object_ossanTex_0096B8" -static const ALIGN_ASSET(2) char object_ossanTex_0096B8[] = dobject_ossanTex_0096B8; - -#define dobject_ossanTex_0098B8 "__OTR__objects/object_ossan/object_ossanTex_0098B8" -static const ALIGN_ASSET(2) char object_ossanTex_0098B8[] = dobject_ossanTex_0098B8; - -#define dobject_ossanTex_008AB8 "__OTR__objects/object_ossan/object_ossanTex_008AB8" -static const ALIGN_ASSET(2) char object_ossanTex_008AB8[] = dobject_ossanTex_008AB8; - -#define dobject_ossanTex_008CB8 "__OTR__objects/object_ossan/object_ossanTex_008CB8" -static const ALIGN_ASSET(2) char object_ossanTex_008CB8[] = dobject_ossanTex_008CB8; #endif // OBJECTS_OBJECT_OSSAN_H diff --git a/soh/assets/objects/object_owl/object_owl.h b/soh/assets/objects/object_owl/object_owl.h index 3e4bc7fc3..ed3d494d6 100644 --- a/soh/assets/objects/object_owl/object_owl.h +++ b/soh/assets/objects/object_owl/object_owl.h @@ -3,6 +3,30 @@ #include "align_asset_macro.h" +#define dobject_owlTex_0071A8 "__OTR__objects/object_owl/object_owlTex_0071A8" +static const ALIGN_ASSET(2) char object_owlTex_0071A8[] = dobject_owlTex_0071A8; + +#define dobject_owlTex_0079A8 "__OTR__objects/object_owl/object_owlTex_0079A8" +static const ALIGN_ASSET(2) char object_owlTex_0079A8[] = dobject_owlTex_0079A8; + +#define dobject_owlTex_0081A8 "__OTR__objects/object_owl/object_owlTex_0081A8" +static const ALIGN_ASSET(2) char object_owlTex_0081A8[] = dobject_owlTex_0081A8; + +#define dobject_owlTex_0095A8 "__OTR__objects/object_owl/object_owlTex_0095A8" +static const ALIGN_ASSET(2) char object_owlTex_0095A8[] = dobject_owlTex_0095A8; + +#define dobject_owlTex_009DA8 "__OTR__objects/object_owl/object_owlTex_009DA8" +static const ALIGN_ASSET(2) char object_owlTex_009DA8[] = dobject_owlTex_009DA8; + +#define dobject_owlTex_009FA8 "__OTR__objects/object_owl/object_owlTex_009FA8" +static const ALIGN_ASSET(2) char object_owlTex_009FA8[] = dobject_owlTex_009FA8; + +#define dobject_owlTex_00AFA8 "__OTR__objects/object_owl/object_owlTex_00AFA8" +static const ALIGN_ASSET(2) char object_owlTex_00AFA8[] = dobject_owlTex_00AFA8; + +#define dobject_owlTex_00B7A8 "__OTR__objects/object_owl/object_owlTex_00B7A8" +static const ALIGN_ASSET(2) char object_owlTex_00B7A8[] = dobject_owlTex_00B7A8; + #define dgOwlFlyingSkel "__OTR__objects/object_owl/gOwlFlyingSkel" static const ALIGN_ASSET(2) char gOwlFlyingSkel[] = dgOwlFlyingSkel; @@ -99,30 +123,6 @@ static const ALIGN_ASSET(2) char gObjOwlEyeHalfTex[] = dgObjOwlEyeHalfTex; #define dgObjOwlEyeClosedTex "__OTR__objects/object_owl/gObjOwlEyeClosedTex" static const ALIGN_ASSET(2) char gObjOwlEyeClosedTex[] = dgObjOwlEyeClosedTex; -#define dobject_owlTex_009DA8 "__OTR__objects/object_owl/object_owlTex_009DA8" -static const ALIGN_ASSET(2) char object_owlTex_009DA8[] = dobject_owlTex_009DA8; - -#define dobject_owlTex_0071A8 "__OTR__objects/object_owl/object_owlTex_0071A8" -static const ALIGN_ASSET(2) char object_owlTex_0071A8[] = dobject_owlTex_0071A8; - -#define dobject_owlTex_0079A8 "__OTR__objects/object_owl/object_owlTex_0079A8" -static const ALIGN_ASSET(2) char object_owlTex_0079A8[] = dobject_owlTex_0079A8; - -#define dobject_owlTex_0081A8 "__OTR__objects/object_owl/object_owlTex_0081A8" -static const ALIGN_ASSET(2) char object_owlTex_0081A8[] = dobject_owlTex_0081A8; - -#define dobject_owlTex_0095A8 "__OTR__objects/object_owl/object_owlTex_0095A8" -static const ALIGN_ASSET(2) char object_owlTex_0095A8[] = dobject_owlTex_0095A8; - -#define dobject_owlTex_009FA8 "__OTR__objects/object_owl/object_owlTex_009FA8" -static const ALIGN_ASSET(2) char object_owlTex_009FA8[] = dobject_owlTex_009FA8; - -#define dobject_owlTex_00AFA8 "__OTR__objects/object_owl/object_owlTex_00AFA8" -static const ALIGN_ASSET(2) char object_owlTex_00AFA8[] = dobject_owlTex_00AFA8; - -#define dobject_owlTex_00B7A8 "__OTR__objects/object_owl/object_owlTex_00B7A8" -static const ALIGN_ASSET(2) char object_owlTex_00B7A8[] = dobject_owlTex_00B7A8; - #define dgOwlPerchingSkelLimbsLimb_00FFCCDL_00F1C0 "__OTR__objects/object_owl/gOwlPerchingSkelLimbsLimb_00FFCCDL_00F1C0" static const ALIGN_ASSET(2) char gOwlPerchingSkelLimbsLimb_00FFCCDL_00F1C0[] = dgOwlPerchingSkelLimbsLimb_00FFCCDL_00F1C0; diff --git a/soh/assets/objects/object_po_composer/object_po_composer.h b/soh/assets/objects/object_po_composer/object_po_composer.h index 9db85ca52..efba77124 100644 --- a/soh/assets/objects/object_po_composer/object_po_composer.h +++ b/soh/assets/objects/object_po_composer/object_po_composer.h @@ -3,6 +3,45 @@ #include "align_asset_macro.h" +#define dobject_po_composerTex_001450 "__OTR__objects/object_po_composer/object_po_composerTex_001450" +static const ALIGN_ASSET(2) char object_po_composerTex_001450[] = dobject_po_composerTex_001450; + +#define dobject_po_composerTex_0054E0 "__OTR__objects/object_po_composer/object_po_composerTex_0054E0" +static const ALIGN_ASSET(2) char object_po_composerTex_0054E0[] = dobject_po_composerTex_0054E0; + +#define dobject_po_composerTex_0056E0 "__OTR__objects/object_po_composer/object_po_composerTex_0056E0" +static const ALIGN_ASSET(2) char object_po_composerTex_0056E0[] = dobject_po_composerTex_0056E0; + +#define dobject_po_composerTex_0058E0 "__OTR__objects/object_po_composer/object_po_composerTex_0058E0" +static const ALIGN_ASSET(2) char object_po_composerTex_0058E0[] = dobject_po_composerTex_0058E0; + +#define dobject_po_composerTex_005AE0 "__OTR__objects/object_po_composer/object_po_composerTex_005AE0" +static const ALIGN_ASSET(2) char object_po_composerTex_005AE0[] = dobject_po_composerTex_005AE0; + +#define dobject_po_composerTex_005CE0 "__OTR__objects/object_po_composer/object_po_composerTex_005CE0" +static const ALIGN_ASSET(2) char object_po_composerTex_005CE0[] = dobject_po_composerTex_005CE0; + +#define dobject_po_composerTex_0060E0 "__OTR__objects/object_po_composer/object_po_composerTex_0060E0" +static const ALIGN_ASSET(2) char object_po_composerTex_0060E0[] = dobject_po_composerTex_0060E0; + +#define dobject_po_composerTex_0062E0 "__OTR__objects/object_po_composer/object_po_composerTex_0062E0" +static const ALIGN_ASSET(2) char object_po_composerTex_0062E0[] = dobject_po_composerTex_0062E0; + +#define dobject_po_composerTex_0064E0 "__OTR__objects/object_po_composer/object_po_composerTex_0064E0" +static const ALIGN_ASSET(2) char object_po_composerTex_0064E0[] = dobject_po_composerTex_0064E0; + +#define dobject_po_composerTex_0066E0 "__OTR__objects/object_po_composer/object_po_composerTex_0066E0" +static const ALIGN_ASSET(2) char object_po_composerTex_0066E0[] = dobject_po_composerTex_0066E0; + +#define dobject_po_composerTex_0068E0 "__OTR__objects/object_po_composer/object_po_composerTex_0068E0" +static const ALIGN_ASSET(2) char object_po_composerTex_0068E0[] = dobject_po_composerTex_0068E0; + +#define dobject_po_composerTex_006AE0 "__OTR__objects/object_po_composer/object_po_composerTex_006AE0" +static const ALIGN_ASSET(2) char object_po_composerTex_006AE0[] = dobject_po_composerTex_006AE0; + +#define dobject_po_composerTex_006CE0 "__OTR__objects/object_po_composer/object_po_composerTex_006CE0" +static const ALIGN_ASSET(2) char object_po_composerTex_006CE0[] = dobject_po_composerTex_006CE0; + #define dgPoeComposerAttackAnim "__OTR__objects/object_po_composer/gPoeComposerAttackAnim" static const ALIGN_ASSET(2) char gPoeComposerAttackAnim[] = dgPoeComposerAttackAnim; @@ -42,39 +81,6 @@ static const ALIGN_ASSET(2) char gPoeComposerBurnDL[] = dgPoeComposerBurnDL; #define dgPoeComposerSkel "__OTR__objects/object_po_composer/gPoeComposerSkel" static const ALIGN_ASSET(2) char gPoeComposerSkel[] = dgPoeComposerSkel; -#define dobject_po_composerTex_001450 "__OTR__objects/object_po_composer/object_po_composerTex_001450" -static const ALIGN_ASSET(2) char object_po_composerTex_001450[] = dobject_po_composerTex_001450; - -#define dobject_po_composerTex_0056E0 "__OTR__objects/object_po_composer/object_po_composerTex_0056E0" -static const ALIGN_ASSET(2) char object_po_composerTex_0056E0[] = dobject_po_composerTex_0056E0; - -#define dobject_po_composerTex_0058E0 "__OTR__objects/object_po_composer/object_po_composerTex_0058E0" -static const ALIGN_ASSET(2) char object_po_composerTex_0058E0[] = dobject_po_composerTex_0058E0; - -#define dobject_po_composerTex_005AE0 "__OTR__objects/object_po_composer/object_po_composerTex_005AE0" -static const ALIGN_ASSET(2) char object_po_composerTex_005AE0[] = dobject_po_composerTex_005AE0; - -#define dobject_po_composerTex_0068E0 "__OTR__objects/object_po_composer/object_po_composerTex_0068E0" -static const ALIGN_ASSET(2) char object_po_composerTex_0068E0[] = dobject_po_composerTex_0068E0; - -#define dobject_po_composerTex_0062E0 "__OTR__objects/object_po_composer/object_po_composerTex_0062E0" -static const ALIGN_ASSET(2) char object_po_composerTex_0062E0[] = dobject_po_composerTex_0062E0; - -#define dobject_po_composerTex_0064E0 "__OTR__objects/object_po_composer/object_po_composerTex_0064E0" -static const ALIGN_ASSET(2) char object_po_composerTex_0064E0[] = dobject_po_composerTex_0064E0; - -#define dobject_po_composerTex_0060E0 "__OTR__objects/object_po_composer/object_po_composerTex_0060E0" -static const ALIGN_ASSET(2) char object_po_composerTex_0060E0[] = dobject_po_composerTex_0060E0; - -#define dobject_po_composerTex_005CE0 "__OTR__objects/object_po_composer/object_po_composerTex_005CE0" -static const ALIGN_ASSET(2) char object_po_composerTex_005CE0[] = dobject_po_composerTex_005CE0; - -#define dobject_po_composerTex_006CE0 "__OTR__objects/object_po_composer/object_po_composerTex_006CE0" -static const ALIGN_ASSET(2) char object_po_composerTex_006CE0[] = dobject_po_composerTex_006CE0; - -#define dobject_po_composerTex_006AE0 "__OTR__objects/object_po_composer/object_po_composerTex_006AE0" -static const ALIGN_ASSET(2) char object_po_composerTex_006AE0[] = dobject_po_composerTex_006AE0; - #define dgPoeComposerSkelLimbsLimb_006EE0DL_002970 "__OTR__objects/object_po_composer/gPoeComposerSkelLimbsLimb_006EE0DL_002970" static const ALIGN_ASSET(2) char gPoeComposerSkelLimbsLimb_006EE0DL_002970[] = dgPoeComposerSkelLimbsLimb_006EE0DL_002970; @@ -105,10 +111,5 @@ static const ALIGN_ASSET(2) char gPoeComposerSkelLimbsLimb_006F4CDL_004100[] = d #define dgPoeComposerSkelLimbsLimb_006F58DL_002B70 "__OTR__objects/object_po_composer/gPoeComposerSkelLimbsLimb_006F58DL_002B70" static const ALIGN_ASSET(2) char gPoeComposerSkelLimbsLimb_006F58DL_002B70[] = dgPoeComposerSkelLimbsLimb_006F58DL_002B70; -#define dobject_po_composerTex_0054E0 "__OTR__objects/object_po_composer/object_po_composerTex_0054E0" -static const ALIGN_ASSET(2) char object_po_composerTex_0054E0[] = dobject_po_composerTex_0054E0; - -#define dobject_po_composerTex_0066E0 "__OTR__objects/object_po_composer/object_po_composerTex_0066E0" -static const ALIGN_ASSET(2) char object_po_composerTex_0066E0[] = dobject_po_composerTex_0066E0; #endif // OBJECTS_OBJECT_PO_COMPOSER_H diff --git a/soh/assets/objects/object_po_field/object_po_field.h b/soh/assets/objects/object_po_field/object_po_field.h index c6c2f1f5a..813b3e86d 100644 --- a/soh/assets/objects/object_po_field/object_po_field.h +++ b/soh/assets/objects/object_po_field/object_po_field.h @@ -3,6 +3,39 @@ #include "align_asset_macro.h" +#define dobject_po_fieldTex_002470 "__OTR__objects/object_po_field/object_po_fieldTex_002470" +static const ALIGN_ASSET(2) char object_po_fieldTex_002470[] = dobject_po_fieldTex_002470; + +#define dobject_po_fieldTex_002670 "__OTR__objects/object_po_field/object_po_fieldTex_002670" +static const ALIGN_ASSET(2) char object_po_fieldTex_002670[] = dobject_po_fieldTex_002670; + +#define dobject_po_fieldTex_002870 "__OTR__objects/object_po_field/object_po_fieldTex_002870" +static const ALIGN_ASSET(2) char object_po_fieldTex_002870[] = dobject_po_fieldTex_002870; + +#define dobject_po_fieldTex_003070 "__OTR__objects/object_po_field/object_po_fieldTex_003070" +static const ALIGN_ASSET(2) char object_po_fieldTex_003070[] = dobject_po_fieldTex_003070; + +#define dobject_po_fieldTex_003270 "__OTR__objects/object_po_field/object_po_fieldTex_003270" +static const ALIGN_ASSET(2) char object_po_fieldTex_003270[] = dobject_po_fieldTex_003270; + +#define dobject_po_fieldTex_0032F0 "__OTR__objects/object_po_field/object_po_fieldTex_0032F0" +static const ALIGN_ASSET(2) char object_po_fieldTex_0032F0[] = dobject_po_fieldTex_0032F0; + +#define dobject_po_fieldTex_0033F0 "__OTR__objects/object_po_field/object_po_fieldTex_0033F0" +static const ALIGN_ASSET(2) char object_po_fieldTex_0033F0[] = dobject_po_fieldTex_0033F0; + +#define dobject_po_fieldTex_0035F0 "__OTR__objects/object_po_field/object_po_fieldTex_0035F0" +static const ALIGN_ASSET(2) char object_po_fieldTex_0035F0[] = dobject_po_fieldTex_0035F0; + +#define dobject_po_fieldTex_0037F0 "__OTR__objects/object_po_field/object_po_fieldTex_0037F0" +static const ALIGN_ASSET(2) char object_po_fieldTex_0037F0[] = dobject_po_fieldTex_0037F0; + +#define dobject_po_fieldTex_005AB0 "__OTR__objects/object_po_field/object_po_fieldTex_005AB0" +static const ALIGN_ASSET(2) char object_po_fieldTex_005AB0[] = dobject_po_fieldTex_005AB0; + +#define dobject_po_fieldTex_005CB0 "__OTR__objects/object_po_field/object_po_fieldTex_005CB0" +static const ALIGN_ASSET(2) char object_po_fieldTex_005CB0[] = dobject_po_fieldTex_005CB0; + #define dgPoeFieldAttackAnim "__OTR__objects/object_po_field/gPoeFieldAttackAnim" static const ALIGN_ASSET(2) char gPoeFieldAttackAnim[] = dgPoeFieldAttackAnim; @@ -51,33 +84,6 @@ static const ALIGN_ASSET(2) char gPoeFieldBurnDL[] = dgPoeFieldBurnDL; #define dgPoeFieldSkel "__OTR__objects/object_po_field/gPoeFieldSkel" static const ALIGN_ASSET(2) char gPoeFieldSkel[] = dgPoeFieldSkel; -#define dobject_po_fieldTex_002670 "__OTR__objects/object_po_field/object_po_fieldTex_002670" -static const ALIGN_ASSET(2) char object_po_fieldTex_002670[] = dobject_po_fieldTex_002670; - -#define dobject_po_fieldTex_002470 "__OTR__objects/object_po_field/object_po_fieldTex_002470" -static const ALIGN_ASSET(2) char object_po_fieldTex_002470[] = dobject_po_fieldTex_002470; - -#define dobject_po_fieldTex_0033F0 "__OTR__objects/object_po_field/object_po_fieldTex_0033F0" -static const ALIGN_ASSET(2) char object_po_fieldTex_0033F0[] = dobject_po_fieldTex_0033F0; - -#define dobject_po_fieldTex_0032F0 "__OTR__objects/object_po_field/object_po_fieldTex_0032F0" -static const ALIGN_ASSET(2) char object_po_fieldTex_0032F0[] = dobject_po_fieldTex_0032F0; - -#define dobject_po_fieldTex_003270 "__OTR__objects/object_po_field/object_po_fieldTex_003270" -static const ALIGN_ASSET(2) char object_po_fieldTex_003270[] = dobject_po_fieldTex_003270; - -#define dobject_po_fieldTex_002870 "__OTR__objects/object_po_field/object_po_fieldTex_002870" -static const ALIGN_ASSET(2) char object_po_fieldTex_002870[] = dobject_po_fieldTex_002870; - -#define dobject_po_fieldTex_0037F0 "__OTR__objects/object_po_field/object_po_fieldTex_0037F0" -static const ALIGN_ASSET(2) char object_po_fieldTex_0037F0[] = dobject_po_fieldTex_0037F0; - -#define dobject_po_fieldTex_005AB0 "__OTR__objects/object_po_field/object_po_fieldTex_005AB0" -static const ALIGN_ASSET(2) char object_po_fieldTex_005AB0[] = dobject_po_fieldTex_005AB0; - -#define dobject_po_fieldTex_005CB0 "__OTR__objects/object_po_field/object_po_fieldTex_005CB0" -static const ALIGN_ASSET(2) char object_po_fieldTex_005CB0[] = dobject_po_fieldTex_005CB0; - #define dgPoeFieldSkelLimbsLimb_0069A0DL_004F60 "__OTR__objects/object_po_field/gPoeFieldSkelLimbsLimb_0069A0DL_004F60" static const ALIGN_ASSET(2) char gPoeFieldSkelLimbsLimb_0069A0DL_004F60[] = dgPoeFieldSkelLimbsLimb_0069A0DL_004F60; @@ -102,10 +108,5 @@ static const ALIGN_ASSET(2) char gPoeFieldSkelLimbsLimb_0069F4DL_005328[] = dgPo #define dgPoeFieldSkelLimbsLimb_006A00DL_004DF8 "__OTR__objects/object_po_field/gPoeFieldSkelLimbsLimb_006A00DL_004DF8" static const ALIGN_ASSET(2) char gPoeFieldSkelLimbsLimb_006A00DL_004DF8[] = dgPoeFieldSkelLimbsLimb_006A00DL_004DF8; -#define dobject_po_fieldTex_0035F0 "__OTR__objects/object_po_field/object_po_fieldTex_0035F0" -static const ALIGN_ASSET(2) char object_po_fieldTex_0035F0[] = dobject_po_fieldTex_0035F0; - -#define dobject_po_fieldTex_003070 "__OTR__objects/object_po_field/object_po_fieldTex_003070" -static const ALIGN_ASSET(2) char object_po_fieldTex_003070[] = dobject_po_fieldTex_003070; #endif // OBJECTS_OBJECT_PO_FIELD_H diff --git a/soh/assets/objects/object_po_sisters/object_po_sisters.h b/soh/assets/objects/object_po_sisters/object_po_sisters.h index f958aa3bb..91af03194 100644 --- a/soh/assets/objects/object_po_sisters/object_po_sisters.h +++ b/soh/assets/objects/object_po_sisters/object_po_sisters.h @@ -3,6 +3,90 @@ #include "align_asset_macro.h" +#define dobject_po_sistersTex_0048D8 "__OTR__objects/object_po_sisters/object_po_sistersTex_0048D8" +static const ALIGN_ASSET(2) char object_po_sistersTex_0048D8[] = dobject_po_sistersTex_0048D8; + +#define dobject_po_sistersTex_004AD8 "__OTR__objects/object_po_sisters/object_po_sistersTex_004AD8" +static const ALIGN_ASSET(2) char object_po_sistersTex_004AD8[] = dobject_po_sistersTex_004AD8; + +#define dobject_po_sistersTex_0052D8 "__OTR__objects/object_po_sisters/object_po_sistersTex_0052D8" +static const ALIGN_ASSET(2) char object_po_sistersTex_0052D8[] = dobject_po_sistersTex_0052D8; + +#define dobject_po_sistersTex_0056D8 "__OTR__objects/object_po_sisters/object_po_sistersTex_0056D8" +static const ALIGN_ASSET(2) char object_po_sistersTex_0056D8[] = dobject_po_sistersTex_0056D8; + +#define dobject_po_sistersTex_0058D8 "__OTR__objects/object_po_sisters/object_po_sistersTex_0058D8" +static const ALIGN_ASSET(2) char object_po_sistersTex_0058D8[] = dobject_po_sistersTex_0058D8; + +#define dobject_po_sistersTex_0058F8 "__OTR__objects/object_po_sisters/object_po_sistersTex_0058F8" +static const ALIGN_ASSET(2) char object_po_sistersTex_0058F8[] = dobject_po_sistersTex_0058F8; + +#define dobject_po_sistersTex_005AF8 "__OTR__objects/object_po_sisters/object_po_sistersTex_005AF8" +static const ALIGN_ASSET(2) char object_po_sistersTex_005AF8[] = dobject_po_sistersTex_005AF8; + +#define dobject_po_sistersTex_005CF8 "__OTR__objects/object_po_sisters/object_po_sistersTex_005CF8" +static const ALIGN_ASSET(2) char object_po_sistersTex_005CF8[] = dobject_po_sistersTex_005CF8; + +#define dobject_po_sistersTex_005D78 "__OTR__objects/object_po_sisters/object_po_sistersTex_005D78" +static const ALIGN_ASSET(2) char object_po_sistersTex_005D78[] = dobject_po_sistersTex_005D78; + +#define dobject_po_sistersTex_005F78 "__OTR__objects/object_po_sisters/object_po_sistersTex_005F78" +static const ALIGN_ASSET(2) char object_po_sistersTex_005F78[] = dobject_po_sistersTex_005F78; + +#define dobject_po_sistersTex_006078 "__OTR__objects/object_po_sisters/object_po_sistersTex_006078" +static const ALIGN_ASSET(2) char object_po_sistersTex_006078[] = dobject_po_sistersTex_006078; + +#define dobject_po_sistersTex_006278 "__OTR__objects/object_po_sisters/object_po_sistersTex_006278" +static const ALIGN_ASSET(2) char object_po_sistersTex_006278[] = dobject_po_sistersTex_006278; + +#define dobject_po_sistersTex_0062F8 "__OTR__objects/object_po_sisters/object_po_sistersTex_0062F8" +static const ALIGN_ASSET(2) char object_po_sistersTex_0062F8[] = dobject_po_sistersTex_0062F8; + +#define dobject_po_sistersTex_006318 "__OTR__objects/object_po_sisters/object_po_sistersTex_006318" +static const ALIGN_ASSET(2) char object_po_sistersTex_006318[] = dobject_po_sistersTex_006318; + +#define dobject_po_sistersTex_007AC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_007AC0" +static const ALIGN_ASSET(2) char object_po_sistersTex_007AC0[] = dobject_po_sistersTex_007AC0; + +#define dobject_po_sistersTex_0082C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_0082C0" +static const ALIGN_ASSET(2) char object_po_sistersTex_0082C0[] = dobject_po_sistersTex_0082C0; + +#define dobject_po_sistersTex_0083C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_0083C0" +static const ALIGN_ASSET(2) char object_po_sistersTex_0083C0[] = dobject_po_sistersTex_0083C0; + +#define dobject_po_sistersTex_008BC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_008BC0" +static const ALIGN_ASSET(2) char object_po_sistersTex_008BC0[] = dobject_po_sistersTex_008BC0; + +#define dobject_po_sistersTex_0093C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_0093C0" +static const ALIGN_ASSET(2) char object_po_sistersTex_0093C0[] = dobject_po_sistersTex_0093C0; + +#define dobject_po_sistersTex_009BC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_009BC0" +static const ALIGN_ASSET(2) char object_po_sistersTex_009BC0[] = dobject_po_sistersTex_009BC0; + +#define dobject_po_sistersTex_00A3C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00A3C0" +static const ALIGN_ASSET(2) char object_po_sistersTex_00A3C0[] = dobject_po_sistersTex_00A3C0; + +#define dobject_po_sistersTex_00ABC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00ABC0" +static const ALIGN_ASSET(2) char object_po_sistersTex_00ABC0[] = dobject_po_sistersTex_00ABC0; + +#define dobject_po_sistersTex_00B3C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00B3C0" +static const ALIGN_ASSET(2) char object_po_sistersTex_00B3C0[] = dobject_po_sistersTex_00B3C0; + +#define dobject_po_sistersTex_00BBC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00BBC0" +static const ALIGN_ASSET(2) char object_po_sistersTex_00BBC0[] = dobject_po_sistersTex_00BBC0; + +#define dobject_po_sistersTex_00C3C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00C3C0" +static const ALIGN_ASSET(2) char object_po_sistersTex_00C3C0[] = dobject_po_sistersTex_00C3C0; + +#define dobject_po_sistersTex_00CBC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00CBC0" +static const ALIGN_ASSET(2) char object_po_sistersTex_00CBC0[] = dobject_po_sistersTex_00CBC0; + +#define dobject_po_sistersTex_00D3C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00D3C0" +static const ALIGN_ASSET(2) char object_po_sistersTex_00D3C0[] = dobject_po_sistersTex_00D3C0; + +#define dobject_po_sistersTex_00DBC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00DBC0" +static const ALIGN_ASSET(2) char object_po_sistersTex_00DBC0[] = dobject_po_sistersTex_00DBC0; + #define dgPoeSistersAttackAnim "__OTR__objects/object_po_sisters/gPoeSistersAttackAnim" static const ALIGN_ASSET(2) char gPoeSistersAttackAnim[] = dgPoeSistersAttackAnim; @@ -75,87 +159,6 @@ static const ALIGN_ASSET(2) char gPoSistersAmyBlockCol[] = dgPoSistersAmyBlockCo #define dgPoSistersAmyBethBlockDL "__OTR__objects/object_po_sisters/gPoSistersAmyBethBlockDL" static const ALIGN_ASSET(2) char gPoSistersAmyBethBlockDL[] = dgPoSistersAmyBethBlockDL; -#define dobject_po_sistersTex_0056D8 "__OTR__objects/object_po_sisters/object_po_sistersTex_0056D8" -static const ALIGN_ASSET(2) char object_po_sistersTex_0056D8[] = dobject_po_sistersTex_0056D8; - -#define dobject_po_sistersTex_005AF8 "__OTR__objects/object_po_sisters/object_po_sistersTex_005AF8" -static const ALIGN_ASSET(2) char object_po_sistersTex_005AF8[] = dobject_po_sistersTex_005AF8; - -#define dobject_po_sistersTex_0058D8 "__OTR__objects/object_po_sisters/object_po_sistersTex_0058D8" -static const ALIGN_ASSET(2) char object_po_sistersTex_0058D8[] = dobject_po_sistersTex_0058D8; - -#define dobject_po_sistersTex_0058F8 "__OTR__objects/object_po_sisters/object_po_sistersTex_0058F8" -static const ALIGN_ASSET(2) char object_po_sistersTex_0058F8[] = dobject_po_sistersTex_0058F8; - -#define dobject_po_sistersTex_004AD8 "__OTR__objects/object_po_sisters/object_po_sistersTex_004AD8" -static const ALIGN_ASSET(2) char object_po_sistersTex_004AD8[] = dobject_po_sistersTex_004AD8; - -#define dobject_po_sistersTex_0048D8 "__OTR__objects/object_po_sisters/object_po_sistersTex_0048D8" -static const ALIGN_ASSET(2) char object_po_sistersTex_0048D8[] = dobject_po_sistersTex_0048D8; - -#define dobject_po_sistersTex_005CF8 "__OTR__objects/object_po_sisters/object_po_sistersTex_005CF8" -static const ALIGN_ASSET(2) char object_po_sistersTex_005CF8[] = dobject_po_sistersTex_005CF8; - -#define dobject_po_sistersTex_005D78 "__OTR__objects/object_po_sisters/object_po_sistersTex_005D78" -static const ALIGN_ASSET(2) char object_po_sistersTex_005D78[] = dobject_po_sistersTex_005D78; - -#define dobject_po_sistersTex_006078 "__OTR__objects/object_po_sisters/object_po_sistersTex_006078" -static const ALIGN_ASSET(2) char object_po_sistersTex_006078[] = dobject_po_sistersTex_006078; - -#define dobject_po_sistersTex_006278 "__OTR__objects/object_po_sisters/object_po_sistersTex_006278" -static const ALIGN_ASSET(2) char object_po_sistersTex_006278[] = dobject_po_sistersTex_006278; - -#define dobject_po_sistersTex_005F78 "__OTR__objects/object_po_sisters/object_po_sistersTex_005F78" -static const ALIGN_ASSET(2) char object_po_sistersTex_005F78[] = dobject_po_sistersTex_005F78; - -#define dobject_po_sistersTex_0062F8 "__OTR__objects/object_po_sisters/object_po_sistersTex_0062F8" -static const ALIGN_ASSET(2) char object_po_sistersTex_0062F8[] = dobject_po_sistersTex_0062F8; - -#define dobject_po_sistersTex_006318 "__OTR__objects/object_po_sisters/object_po_sistersTex_006318" -static const ALIGN_ASSET(2) char object_po_sistersTex_006318[] = dobject_po_sistersTex_006318; - -#define dobject_po_sistersTex_0082C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_0082C0" -static const ALIGN_ASSET(2) char object_po_sistersTex_0082C0[] = dobject_po_sistersTex_0082C0; - -#define dobject_po_sistersTex_008BC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_008BC0" -static const ALIGN_ASSET(2) char object_po_sistersTex_008BC0[] = dobject_po_sistersTex_008BC0; - -#define dobject_po_sistersTex_007AC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_007AC0" -static const ALIGN_ASSET(2) char object_po_sistersTex_007AC0[] = dobject_po_sistersTex_007AC0; - -#define dobject_po_sistersTex_009BC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_009BC0" -static const ALIGN_ASSET(2) char object_po_sistersTex_009BC0[] = dobject_po_sistersTex_009BC0; - -#define dobject_po_sistersTex_0083C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_0083C0" -static const ALIGN_ASSET(2) char object_po_sistersTex_0083C0[] = dobject_po_sistersTex_0083C0; - -#define dobject_po_sistersTex_0093C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_0093C0" -static const ALIGN_ASSET(2) char object_po_sistersTex_0093C0[] = dobject_po_sistersTex_0093C0; - -#define dobject_po_sistersTex_00ABC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00ABC0" -static const ALIGN_ASSET(2) char object_po_sistersTex_00ABC0[] = dobject_po_sistersTex_00ABC0; - -#define dobject_po_sistersTex_00BBC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00BBC0" -static const ALIGN_ASSET(2) char object_po_sistersTex_00BBC0[] = dobject_po_sistersTex_00BBC0; - -#define dobject_po_sistersTex_00A3C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00A3C0" -static const ALIGN_ASSET(2) char object_po_sistersTex_00A3C0[] = dobject_po_sistersTex_00A3C0; - -#define dobject_po_sistersTex_00B3C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00B3C0" -static const ALIGN_ASSET(2) char object_po_sistersTex_00B3C0[] = dobject_po_sistersTex_00B3C0; - -#define dobject_po_sistersTex_00DBC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00DBC0" -static const ALIGN_ASSET(2) char object_po_sistersTex_00DBC0[] = dobject_po_sistersTex_00DBC0; - -#define dobject_po_sistersTex_00D3C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00D3C0" -static const ALIGN_ASSET(2) char object_po_sistersTex_00D3C0[] = dobject_po_sistersTex_00D3C0; - -#define dobject_po_sistersTex_00CBC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00CBC0" -static const ALIGN_ASSET(2) char object_po_sistersTex_00CBC0[] = dobject_po_sistersTex_00CBC0; - -#define dobject_po_sistersTex_00C3C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00C3C0" -static const ALIGN_ASSET(2) char object_po_sistersTex_00C3C0[] = dobject_po_sistersTex_00C3C0; - #define dgPoeSistersSkelLimbsLimb_006524DL_002718 "__OTR__objects/object_po_sisters/gPoeSistersSkelLimbsLimb_006524DL_002718" static const ALIGN_ASSET(2) char gPoeSistersSkelLimbsLimb_006524DL_002718[] = dgPoeSistersSkelLimbsLimb_006524DL_002718; @@ -174,7 +177,5 @@ static const ALIGN_ASSET(2) char gPoeSistersSkelLimbsLimb_006560DL_002570[] = dg #define dgPoeSistersSkelLimbsLimb_006590DL_0024A8 "__OTR__objects/object_po_sisters/gPoeSistersSkelLimbsLimb_006590DL_0024A8" static const ALIGN_ASSET(2) char gPoeSistersSkelLimbsLimb_006590DL_0024A8[] = dgPoeSistersSkelLimbsLimb_006590DL_0024A8; -#define dobject_po_sistersTex_0052D8 "__OTR__objects/object_po_sisters/object_po_sistersTex_0052D8" -static const ALIGN_ASSET(2) char object_po_sistersTex_0052D8[] = dobject_po_sistersTex_0052D8; #endif // OBJECTS_OBJECT_PO_SISTERS_H diff --git a/soh/assets/objects/object_poh/object_poh.h b/soh/assets/objects/object_poh/object_poh.h index da3693b45..fa6c1e96e 100644 --- a/soh/assets/objects/object_poh/object_poh.h +++ b/soh/assets/objects/object_poh/object_poh.h @@ -3,6 +3,39 @@ #include "align_asset_macro.h" +#define dobject_pohTex_003010 "__OTR__objects/object_poh/object_pohTex_003010" +static const ALIGN_ASSET(2) char object_pohTex_003010[] = dobject_pohTex_003010; + +#define dobject_pohTex_003910 "__OTR__objects/object_poh/object_pohTex_003910" +static const ALIGN_ASSET(2) char object_pohTex_003910[] = dobject_pohTex_003910; + +#define dobject_pohTex_003D10 "__OTR__objects/object_poh/object_pohTex_003D10" +static const ALIGN_ASSET(2) char object_pohTex_003D10[] = dobject_pohTex_003D10; + +#define dobject_pohTex_004510 "__OTR__objects/object_poh/object_pohTex_004510" +static const ALIGN_ASSET(2) char object_pohTex_004510[] = dobject_pohTex_004510; + +#define dobject_pohTex_004710 "__OTR__objects/object_poh/object_pohTex_004710" +static const ALIGN_ASSET(2) char object_pohTex_004710[] = dobject_pohTex_004710; + +#define dobject_pohTex_004790 "__OTR__objects/object_poh/object_pohTex_004790" +static const ALIGN_ASSET(2) char object_pohTex_004790[] = dobject_pohTex_004790; + +#define dobject_pohTex_004990 "__OTR__objects/object_poh/object_pohTex_004990" +static const ALIGN_ASSET(2) char object_pohTex_004990[] = dobject_pohTex_004990; + +#define dobject_pohTex_004A10 "__OTR__objects/object_poh/object_pohTex_004A10" +static const ALIGN_ASSET(2) char object_pohTex_004A10[] = dobject_pohTex_004A10; + +#define dobject_pohTex_004B10 "__OTR__objects/object_poh/object_pohTex_004B10" +static const ALIGN_ASSET(2) char object_pohTex_004B10[] = dobject_pohTex_004B10; + +#define dobject_pohTex_004D10 "__OTR__objects/object_poh/object_pohTex_004D10" +static const ALIGN_ASSET(2) char object_pohTex_004D10[] = dobject_pohTex_004D10; + +#define dobject_pohTex_004F10 "__OTR__objects/object_poh/object_pohTex_004F10" +static const ALIGN_ASSET(2) char object_pohTex_004F10[] = dobject_pohTex_004F10; + #define dgPoeAttackAnim "__OTR__objects/object_poh/gPoeAttackAnim" static const ALIGN_ASSET(2) char gPoeAttackAnim[] = dgPoeAttackAnim; @@ -33,24 +66,6 @@ static const ALIGN_ASSET(2) char gPoeSoulDL[] = dgPoeSoulDL; #define dgPoeSkel "__OTR__objects/object_poh/gPoeSkel" static const ALIGN_ASSET(2) char gPoeSkel[] = dgPoeSkel; -#define dobject_pohTex_004D10 "__OTR__objects/object_poh/object_pohTex_004D10" -static const ALIGN_ASSET(2) char object_pohTex_004D10[] = dobject_pohTex_004D10; - -#define dobject_pohTex_004F10 "__OTR__objects/object_poh/object_pohTex_004F10" -static const ALIGN_ASSET(2) char object_pohTex_004F10[] = dobject_pohTex_004F10; - -#define dobject_pohTex_004A10 "__OTR__objects/object_poh/object_pohTex_004A10" -static const ALIGN_ASSET(2) char object_pohTex_004A10[] = dobject_pohTex_004A10; - -#define dobject_pohTex_004990 "__OTR__objects/object_poh/object_pohTex_004990" -static const ALIGN_ASSET(2) char object_pohTex_004990[] = dobject_pohTex_004990; - -#define dobject_pohTex_004B10 "__OTR__objects/object_poh/object_pohTex_004B10" -static const ALIGN_ASSET(2) char object_pohTex_004B10[] = dobject_pohTex_004B10; - -#define dobject_pohTex_003010 "__OTR__objects/object_poh/object_pohTex_003010" -static const ALIGN_ASSET(2) char object_pohTex_003010[] = dobject_pohTex_003010; - #define dgPoeSkelLimbsLimb_004FB4DL_002F58 "__OTR__objects/object_poh/gPoeSkelLimbsLimb_004FB4DL_002F58" static const ALIGN_ASSET(2) char gPoeSkelLimbsLimb_004FB4DL_002F58[] = dgPoeSkelLimbsLimb_004FB4DL_002F58; @@ -75,19 +90,5 @@ static const ALIGN_ASSET(2) char gPoeSkelLimbsLimb_005068DL_001B70[] = dgPoeSkel #define dgPoeSkelLimbsLimb_005074DL_001A78 "__OTR__objects/object_poh/gPoeSkelLimbsLimb_005074DL_001A78" static const ALIGN_ASSET(2) char gPoeSkelLimbsLimb_005074DL_001A78[] = dgPoeSkelLimbsLimb_005074DL_001A78; -#define dobject_pohTex_003D10 "__OTR__objects/object_poh/object_pohTex_003D10" -static const ALIGN_ASSET(2) char object_pohTex_003D10[] = dobject_pohTex_003D10; - -#define dobject_pohTex_004710 "__OTR__objects/object_poh/object_pohTex_004710" -static const ALIGN_ASSET(2) char object_pohTex_004710[] = dobject_pohTex_004710; - -#define dobject_pohTex_004510 "__OTR__objects/object_poh/object_pohTex_004510" -static const ALIGN_ASSET(2) char object_pohTex_004510[] = dobject_pohTex_004510; - -#define dobject_pohTex_003910 "__OTR__objects/object_poh/object_pohTex_003910" -static const ALIGN_ASSET(2) char object_pohTex_003910[] = dobject_pohTex_003910; - -#define dobject_pohTex_004790 "__OTR__objects/object_poh/object_pohTex_004790" -static const ALIGN_ASSET(2) char object_pohTex_004790[] = dobject_pohTex_004790; #endif // OBJECTS_OBJECT_POH_H diff --git a/soh/assets/objects/object_ps/object_ps.h b/soh/assets/objects/object_ps/object_ps.h index bba360f73..5a1cd90f9 100644 --- a/soh/assets/objects/object_ps/object_ps.h +++ b/soh/assets/objects/object_ps/object_ps.h @@ -3,6 +3,75 @@ #include "align_asset_macro.h" +#define dobject_psTex_0005B8 "__OTR__objects/object_ps/object_psTex_0005B8" +static const ALIGN_ASSET(2) char object_psTex_0005B8[] = dobject_psTex_0005B8; + +#define dobject_psTex_0015B8 "__OTR__objects/object_ps/object_psTex_0015B8" +static const ALIGN_ASSET(2) char object_psTex_0015B8[] = dobject_psTex_0015B8; + +#define dobject_psTex_0015F8 "__OTR__objects/object_ps/object_psTex_0015F8" +static const ALIGN_ASSET(2) char object_psTex_0015F8[] = dobject_psTex_0015F8; + +#define dobject_psTex_0017F8 "__OTR__objects/object_ps/object_psTex_0017F8" +static const ALIGN_ASSET(2) char object_psTex_0017F8[] = dobject_psTex_0017F8; + +#define dobject_psTex_001838 "__OTR__objects/object_ps/object_psTex_001838" +static const ALIGN_ASSET(2) char object_psTex_001838[] = dobject_psTex_001838; + +#define dobject_psTex_001C38 "__OTR__objects/object_ps/object_psTex_001C38" +static const ALIGN_ASSET(2) char object_psTex_001C38[] = dobject_psTex_001C38; + +#define dobject_psTex_001D38 "__OTR__objects/object_ps/object_psTex_001D38" +static const ALIGN_ASSET(2) char object_psTex_001D38[] = dobject_psTex_001D38; + +#define dobject_psTex_001D78 "__OTR__objects/object_ps/object_psTex_001D78" +static const ALIGN_ASSET(2) char object_psTex_001D78[] = dobject_psTex_001D78; + +#define dobject_psTex_001E78 "__OTR__objects/object_ps/object_psTex_001E78" +static const ALIGN_ASSET(2) char object_psTex_001E78[] = dobject_psTex_001E78; + +#define dobject_psTex_001F78 "__OTR__objects/object_ps/object_psTex_001F78" +static const ALIGN_ASSET(2) char object_psTex_001F78[] = dobject_psTex_001F78; + +#define dobject_psTex_002178 "__OTR__objects/object_ps/object_psTex_002178" +static const ALIGN_ASSET(2) char object_psTex_002178[] = dobject_psTex_002178; + +#define dobject_psTex_002378 "__OTR__objects/object_ps/object_psTex_002378" +static const ALIGN_ASSET(2) char object_psTex_002378[] = dobject_psTex_002378; + +#define dobject_psTex_002578 "__OTR__objects/object_ps/object_psTex_002578" +static const ALIGN_ASSET(2) char object_psTex_002578[] = dobject_psTex_002578; + +#define dobject_psTex_002978 "__OTR__objects/object_ps/object_psTex_002978" +static const ALIGN_ASSET(2) char object_psTex_002978[] = dobject_psTex_002978; + +#define dobject_psTex_007180 "__OTR__objects/object_ps/object_psTex_007180" +static const ALIGN_ASSET(2) char object_psTex_007180[] = dobject_psTex_007180; + +#define dobject_psTex_0071C0 "__OTR__objects/object_ps/object_psTex_0071C0" +static const ALIGN_ASSET(2) char object_psTex_0071C0[] = dobject_psTex_0071C0; + +#define dobject_psTex_0075C0 "__OTR__objects/object_ps/object_psTex_0075C0" +static const ALIGN_ASSET(2) char object_psTex_0075C0[] = dobject_psTex_0075C0; + +#define dobject_psTex_007600 "__OTR__objects/object_ps/object_psTex_007600" +static const ALIGN_ASSET(2) char object_psTex_007600[] = dobject_psTex_007600; + +#define dobject_psTex_007640 "__OTR__objects/object_ps/object_psTex_007640" +static const ALIGN_ASSET(2) char object_psTex_007640[] = dobject_psTex_007640; + +#define dobject_psTex_007A40 "__OTR__objects/object_ps/object_psTex_007A40" +static const ALIGN_ASSET(2) char object_psTex_007A40[] = dobject_psTex_007A40; + +#define dobject_psTex_007C40 "__OTR__objects/object_ps/object_psTex_007C40" +static const ALIGN_ASSET(2) char object_psTex_007C40[] = dobject_psTex_007C40; + +#define dobject_psTLUT_0004B0 "__OTR__objects/object_ps/object_psTLUT_0004B0" +static const ALIGN_ASSET(2) char object_psTLUT_0004B0[] = dobject_psTLUT_0004B0; + +#define dobject_psTLUT_005880 "__OTR__objects/object_ps/object_psTLUT_005880" +static const ALIGN_ASSET(2) char object_psTLUT_005880[] = dobject_psTLUT_005880; + #define dgPoeSellerIdleAnim "__OTR__objects/object_ps/gPoeSellerIdleAnim" static const ALIGN_ASSET(2) char gPoeSellerIdleAnim[] = dgPoeSellerIdleAnim; @@ -78,73 +147,5 @@ static const ALIGN_ASSET(2) char gPoeSellerSkelLimbsLimb_00C1DCDL_00A1D8[] = dgP #define dgPoeSellerSkelLimbsLimb_00C1E8DL_0096C0 "__OTR__objects/object_ps/gPoeSellerSkelLimbsLimb_00C1E8DL_0096C0" static const ALIGN_ASSET(2) char gPoeSellerSkelLimbsLimb_00C1E8DL_0096C0[] = dgPoeSellerSkelLimbsLimb_00C1E8DL_0096C0; -#define dobject_psTex_0015B8 "__OTR__objects/object_ps/object_psTex_0015B8" -static const ALIGN_ASSET(2) char object_psTex_0015B8[] = dobject_psTex_0015B8; - -#define dobject_psTLUT_0004B0 "__OTR__objects/object_ps/object_psTLUT_0004B0" -static const ALIGN_ASSET(2) char object_psTLUT_0004B0[] = dobject_psTLUT_0004B0; - -#define dobject_psTex_0005B8 "__OTR__objects/object_ps/object_psTex_0005B8" -static const ALIGN_ASSET(2) char object_psTex_0005B8[] = dobject_psTex_0005B8; - -#define dobject_psTex_0015F8 "__OTR__objects/object_ps/object_psTex_0015F8" -static const ALIGN_ASSET(2) char object_psTex_0015F8[] = dobject_psTex_0015F8; - -#define dobject_psTex_0017F8 "__OTR__objects/object_ps/object_psTex_0017F8" -static const ALIGN_ASSET(2) char object_psTex_0017F8[] = dobject_psTex_0017F8; - -#define dobject_psTex_001838 "__OTR__objects/object_ps/object_psTex_001838" -static const ALIGN_ASSET(2) char object_psTex_001838[] = dobject_psTex_001838; - -#define dobject_psTex_002578 "__OTR__objects/object_ps/object_psTex_002578" -static const ALIGN_ASSET(2) char object_psTex_002578[] = dobject_psTex_002578; - -#define dobject_psTex_001D78 "__OTR__objects/object_ps/object_psTex_001D78" -static const ALIGN_ASSET(2) char object_psTex_001D78[] = dobject_psTex_001D78; - -#define dobject_psTex_001C38 "__OTR__objects/object_ps/object_psTex_001C38" -static const ALIGN_ASSET(2) char object_psTex_001C38[] = dobject_psTex_001C38; - -#define dobject_psTex_002978 "__OTR__objects/object_ps/object_psTex_002978" -static const ALIGN_ASSET(2) char object_psTex_002978[] = dobject_psTex_002978; - -#define dobject_psTex_001F78 "__OTR__objects/object_ps/object_psTex_001F78" -static const ALIGN_ASSET(2) char object_psTex_001F78[] = dobject_psTex_001F78; - -#define dobject_psTex_002178 "__OTR__objects/object_ps/object_psTex_002178" -static const ALIGN_ASSET(2) char object_psTex_002178[] = dobject_psTex_002178; - -#define dobject_psTex_002378 "__OTR__objects/object_ps/object_psTex_002378" -static const ALIGN_ASSET(2) char object_psTex_002378[] = dobject_psTex_002378; - -#define dobject_psTex_001D38 "__OTR__objects/object_ps/object_psTex_001D38" -static const ALIGN_ASSET(2) char object_psTex_001D38[] = dobject_psTex_001D38; - -#define dobject_psTex_001E78 "__OTR__objects/object_ps/object_psTex_001E78" -static const ALIGN_ASSET(2) char object_psTex_001E78[] = dobject_psTex_001E78; - -#define dobject_psTLUT_005880 "__OTR__objects/object_ps/object_psTLUT_005880" -static const ALIGN_ASSET(2) char object_psTLUT_005880[] = dobject_psTLUT_005880; - -#define dobject_psTex_0075C0 "__OTR__objects/object_ps/object_psTex_0075C0" -static const ALIGN_ASSET(2) char object_psTex_0075C0[] = dobject_psTex_0075C0; - -#define dobject_psTex_007180 "__OTR__objects/object_ps/object_psTex_007180" -static const ALIGN_ASSET(2) char object_psTex_007180[] = dobject_psTex_007180; - -#define dobject_psTex_007600 "__OTR__objects/object_ps/object_psTex_007600" -static const ALIGN_ASSET(2) char object_psTex_007600[] = dobject_psTex_007600; - -#define dobject_psTex_007640 "__OTR__objects/object_ps/object_psTex_007640" -static const ALIGN_ASSET(2) char object_psTex_007640[] = dobject_psTex_007640; - -#define dobject_psTex_007A40 "__OTR__objects/object_ps/object_psTex_007A40" -static const ALIGN_ASSET(2) char object_psTex_007A40[] = dobject_psTex_007A40; - -#define dobject_psTex_007C40 "__OTR__objects/object_ps/object_psTex_007C40" -static const ALIGN_ASSET(2) char object_psTex_007C40[] = dobject_psTex_007C40; - -#define dobject_psTex_0071C0 "__OTR__objects/object_ps/object_psTex_0071C0" -static const ALIGN_ASSET(2) char object_psTex_0071C0[] = dobject_psTex_0071C0; #endif // OBJECTS_OBJECT_PS_H diff --git a/soh/assets/objects/object_rl/object_rl.h b/soh/assets/objects/object_rl/object_rl.h index f0137db11..e10127c58 100644 --- a/soh/assets/objects/object_rl/object_rl.h +++ b/soh/assets/objects/object_rl/object_rl.h @@ -3,6 +3,12 @@ #include "align_asset_macro.h" +#define dobject_rlTex_0033E0 "__OTR__objects/object_rl/object_rlTex_0033E0" +static const ALIGN_ASSET(2) char object_rlTex_0033E0[] = dobject_rlTex_0033E0; + +#define dobject_rlTex_003420 "__OTR__objects/object_rl/object_rlTex_003420" +static const ALIGN_ASSET(2) char object_rlTex_003420[] = dobject_rlTex_003420; + #define dobject_rl_Anim_00040C "__OTR__objects/object_rl/object_rl_Anim_00040C" static const ALIGN_ASSET(2) char object_rl_Anim_00040C[] = dobject_rl_Anim_00040C; @@ -102,11 +108,5 @@ static const ALIGN_ASSET(2) char object_rl_Tex_007998[] = dobject_rl_Tex_007998; #define dobject_rl_Skel_007B38 "__OTR__objects/object_rl/object_rl_Skel_007B38" static const ALIGN_ASSET(2) char object_rl_Skel_007B38[] = dobject_rl_Skel_007B38; -#define dobject_rlTex_0033E0 "__OTR__objects/object_rl/object_rlTex_0033E0" -static const ALIGN_ASSET(2) char object_rlTex_0033E0[] = dobject_rlTex_0033E0; - -#define dobject_rlTex_003420 "__OTR__objects/object_rl/object_rlTex_003420" -static const ALIGN_ASSET(2) char object_rlTex_003420[] = dobject_rlTex_003420; - #endif // OBJECTS_OBJECT_RL_H diff --git a/soh/assets/objects/object_ru2/object_ru2.h b/soh/assets/objects/object_ru2/object_ru2.h index 237be4fe7..68152618d 100644 --- a/soh/assets/objects/object_ru2/object_ru2.h +++ b/soh/assets/objects/object_ru2/object_ru2.h @@ -3,6 +3,12 @@ #include "align_asset_macro.h" +#define dobject_ru2Tex_0055C0 "__OTR__objects/object_ru2/object_ru2Tex_0055C0" +static const ALIGN_ASSET(2) char object_ru2Tex_0055C0[] = dobject_ru2Tex_0055C0; + +#define dobject_ru2Tex_0056C0 "__OTR__objects/object_ru2/object_ru2Tex_0056C0" +static const ALIGN_ASSET(2) char object_ru2Tex_0056C0[] = dobject_ru2Tex_0056C0; + #define dgAdultRutoSkel "__OTR__objects/object_ru2/gAdultRutoSkel" static const ALIGN_ASSET(2) char gAdultRutoSkel[] = dgAdultRutoSkel; @@ -156,10 +162,5 @@ static const ALIGN_ASSET(2) char gAdultRutoLookingDownLeftAnim[] = dgAdultRutoLo #define dgAdultRutoSwimmingUpAnim "__OTR__objects/object_ru2/gAdultRutoSwimmingUpAnim" static const ALIGN_ASSET(2) char gAdultRutoSwimmingUpAnim[] = dgAdultRutoSwimmingUpAnim; -#define dobject_ru2Tex_0055C0 "__OTR__objects/object_ru2/object_ru2Tex_0055C0" -static const ALIGN_ASSET(2) char object_ru2Tex_0055C0[] = dobject_ru2Tex_0055C0; - -#define dobject_ru2Tex_0056C0 "__OTR__objects/object_ru2/object_ru2Tex_0056C0" -static const ALIGN_ASSET(2) char object_ru2Tex_0056C0[] = dobject_ru2Tex_0056C0; #endif // OBJECTS_OBJECT_RU2_H diff --git a/soh/assets/objects/object_sa/object_sa.h b/soh/assets/objects/object_sa/object_sa.h index bed18b041..c1d121fe6 100644 --- a/soh/assets/objects/object_sa/object_sa.h +++ b/soh/assets/objects/object_sa/object_sa.h @@ -3,6 +3,9 @@ #include "align_asset_macro.h" +#define dobject_saTex_002530 "__OTR__objects/object_sa/object_saTex_002530" +static const ALIGN_ASSET(2) char object_saTex_002530[] = dobject_saTex_002530; + #define dgSariaSkel "__OTR__objects/object_sa/gSariaSkel" static const ALIGN_ASSET(2) char gSariaSkel[] = dgSariaSkel; @@ -225,7 +228,5 @@ static const ALIGN_ASSET(2) char gSariaMouthSuprisedTex[] = dgSariaMouthSuprised #define dgSariaEyeSadTex "__OTR__objects/object_sa/gSariaEyeSadTex" static const ALIGN_ASSET(2) char gSariaEyeSadTex[] = dgSariaEyeSadTex; -#define dobject_saTex_002530 "__OTR__objects/object_sa/object_saTex_002530" -static const ALIGN_ASSET(2) char object_saTex_002530[] = dobject_saTex_002530; #endif // OBJECTS_OBJECT_SA_H diff --git a/soh/assets/objects/object_skj/object_skj.h b/soh/assets/objects/object_skj/object_skj.h index bc1ec3dd5..d8cd93538 100644 --- a/soh/assets/objects/object_skj/object_skj.h +++ b/soh/assets/objects/object_skj/object_skj.h @@ -3,6 +3,30 @@ #include "align_asset_macro.h" +#define dobject_skjTex_005300 "__OTR__objects/object_skj/object_skjTex_005300" +static const ALIGN_ASSET(2) char object_skjTex_005300[] = dobject_skjTex_005300; + +#define dobject_skjTex_005500 "__OTR__objects/object_skj/object_skjTex_005500" +static const ALIGN_ASSET(2) char object_skjTex_005500[] = dobject_skjTex_005500; + +#define dobject_skjTex_005700 "__OTR__objects/object_skj/object_skjTex_005700" +static const ALIGN_ASSET(2) char object_skjTex_005700[] = dobject_skjTex_005700; + +#define dobject_skjTex_005900 "__OTR__objects/object_skj/object_skjTex_005900" +static const ALIGN_ASSET(2) char object_skjTex_005900[] = dobject_skjTex_005900; + +#define dobject_skjTex_005B00 "__OTR__objects/object_skj/object_skjTex_005B00" +static const ALIGN_ASSET(2) char object_skjTex_005B00[] = dobject_skjTex_005B00; + +#define dobject_skjTex_005B80 "__OTR__objects/object_skj/object_skjTex_005B80" +static const ALIGN_ASSET(2) char object_skjTex_005B80[] = dobject_skjTex_005B80; + +#define dobject_skjTex_005D80 "__OTR__objects/object_skj/object_skjTex_005D80" +static const ALIGN_ASSET(2) char object_skjTex_005D80[] = dobject_skjTex_005D80; + +#define dobject_skjTex_005DA0 "__OTR__objects/object_skj/object_skjTex_005DA0" +static const ALIGN_ASSET(2) char object_skjTex_005DA0[] = dobject_skjTex_005DA0; + #define dgSkullKidNeedleDL "__OTR__objects/object_skj/gSkullKidNeedleDL" static const ALIGN_ASSET(2) char gSkullKidNeedleDL[] = dgSkullKidNeedleDL; @@ -123,28 +147,5 @@ static const ALIGN_ASSET(2) char gSkullKidUnkLimb_5E2CDL_0036A0[] = dgSkullKidUn #define dgSkullKidUnkLimb_5E38DL_003E48 "__OTR__objects/object_skj/gSkullKidUnkLimb_5E38DL_003E48" static const ALIGN_ASSET(2) char gSkullKidUnkLimb_5E38DL_003E48[] = dgSkullKidUnkLimb_5E38DL_003E48; -#define dobject_skjTex_005700 "__OTR__objects/object_skj/object_skjTex_005700" -static const ALIGN_ASSET(2) char object_skjTex_005700[] = dobject_skjTex_005700; - -#define dobject_skjTex_005300 "__OTR__objects/object_skj/object_skjTex_005300" -static const ALIGN_ASSET(2) char object_skjTex_005300[] = dobject_skjTex_005300; - -#define dobject_skjTex_005500 "__OTR__objects/object_skj/object_skjTex_005500" -static const ALIGN_ASSET(2) char object_skjTex_005500[] = dobject_skjTex_005500; - -#define dobject_skjTex_005900 "__OTR__objects/object_skj/object_skjTex_005900" -static const ALIGN_ASSET(2) char object_skjTex_005900[] = dobject_skjTex_005900; - -#define dobject_skjTex_005B00 "__OTR__objects/object_skj/object_skjTex_005B00" -static const ALIGN_ASSET(2) char object_skjTex_005B00[] = dobject_skjTex_005B00; - -#define dobject_skjTex_005B80 "__OTR__objects/object_skj/object_skjTex_005B80" -static const ALIGN_ASSET(2) char object_skjTex_005B80[] = dobject_skjTex_005B80; - -#define dobject_skjTex_005D80 "__OTR__objects/object_skj/object_skjTex_005D80" -static const ALIGN_ASSET(2) char object_skjTex_005D80[] = dobject_skjTex_005D80; - -#define dobject_skjTex_005DA0 "__OTR__objects/object_skj/object_skjTex_005DA0" -static const ALIGN_ASSET(2) char object_skjTex_005DA0[] = dobject_skjTex_005DA0; #endif // OBJECTS_OBJECT_SKJ_H diff --git a/soh/assets/objects/object_spot09_obj/object_spot09_obj.h b/soh/assets/objects/object_spot09_obj/object_spot09_obj.h index 12cc0df15..9a016aabf 100644 --- a/soh/assets/objects/object_spot09_obj/object_spot09_obj.h +++ b/soh/assets/objects/object_spot09_obj/object_spot09_obj.h @@ -3,6 +3,69 @@ #include "align_asset_macro.h" +#define dobject_spot09_objTex_008490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_008490" +static const ALIGN_ASSET(2) char object_spot09_objTex_008490[] = dobject_spot09_objTex_008490; + +#define dobject_spot09_objTex_008C90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_008C90" +static const ALIGN_ASSET(2) char object_spot09_objTex_008C90[] = dobject_spot09_objTex_008C90; + +#define dobject_spot09_objTex_009490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_009490" +static const ALIGN_ASSET(2) char object_spot09_objTex_009490[] = dobject_spot09_objTex_009490; + +#define dobject_spot09_objTex_00A490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00A490" +static const ALIGN_ASSET(2) char object_spot09_objTex_00A490[] = dobject_spot09_objTex_00A490; + +#define dobject_spot09_objTex_00AC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00AC90" +static const ALIGN_ASSET(2) char object_spot09_objTex_00AC90[] = dobject_spot09_objTex_00AC90; + +#define dobject_spot09_objTex_00B490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00B490" +static const ALIGN_ASSET(2) char object_spot09_objTex_00B490[] = dobject_spot09_objTex_00B490; + +#define dobject_spot09_objTex_00BC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00BC90" +static const ALIGN_ASSET(2) char object_spot09_objTex_00BC90[] = dobject_spot09_objTex_00BC90; + +#define dobject_spot09_objTex_00CC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00CC90" +static const ALIGN_ASSET(2) char object_spot09_objTex_00CC90[] = dobject_spot09_objTex_00CC90; + +#define dobject_spot09_objTex_00DC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00DC90" +static const ALIGN_ASSET(2) char object_spot09_objTex_00DC90[] = dobject_spot09_objTex_00DC90; + +#define dobject_spot09_objTex_00EC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00EC90" +static const ALIGN_ASSET(2) char object_spot09_objTex_00EC90[] = dobject_spot09_objTex_00EC90; + +#define dobject_spot09_objTex_00FC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00FC90" +static const ALIGN_ASSET(2) char object_spot09_objTex_00FC90[] = dobject_spot09_objTex_00FC90; + +#define dobject_spot09_objTex_010090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_010090" +static const ALIGN_ASSET(2) char object_spot09_objTex_010090[] = dobject_spot09_objTex_010090; + +#define dobject_spot09_objTex_011090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_011090" +static const ALIGN_ASSET(2) char object_spot09_objTex_011090[] = dobject_spot09_objTex_011090; + +#define dobject_spot09_objTex_012090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_012090" +static const ALIGN_ASSET(2) char object_spot09_objTex_012090[] = dobject_spot09_objTex_012090; + +#define dobject_spot09_objTex_013090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_013090" +static const ALIGN_ASSET(2) char object_spot09_objTex_013090[] = dobject_spot09_objTex_013090; + +#define dobject_spot09_objTex_014090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_014090" +static const ALIGN_ASSET(2) char object_spot09_objTex_014090[] = dobject_spot09_objTex_014090; + +#define dobject_spot09_objTex_015090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_015090" +static const ALIGN_ASSET(2) char object_spot09_objTex_015090[] = dobject_spot09_objTex_015090; + +#define dobject_spot09_objTex_016090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_016090" +static const ALIGN_ASSET(2) char object_spot09_objTex_016090[] = dobject_spot09_objTex_016090; + +#define dobject_spot09_objTex_017090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_017090" +static const ALIGN_ASSET(2) char object_spot09_objTex_017090[] = dobject_spot09_objTex_017090; + +#define dobject_spot09_objTex_017490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_017490" +static const ALIGN_ASSET(2) char object_spot09_objTex_017490[] = dobject_spot09_objTex_017490; + +#define dobject_spot09_objTex_017890 "__OTR__objects/object_spot09_obj/object_spot09_objTex_017890" +static const ALIGN_ASSET(2) char object_spot09_objTex_017890[] = dobject_spot09_objTex_017890; + #define dgValleyBridgeSidesDL "__OTR__objects/object_spot09_obj/gValleyBridgeSidesDL" static const ALIGN_ASSET(2) char gValleyBridgeSidesDL[] = dgValleyBridgeSidesDL; @@ -33,67 +96,4 @@ static const ALIGN_ASSET(2) char gValleyObjects3Col[] = dgValleyObjects3Col; #define dgValleyObjects4Col "__OTR__objects/object_spot09_obj/gValleyObjects4Col" static const ALIGN_ASSET(2) char gValleyObjects4Col[] = dgValleyObjects4Col; -#define dobject_spot09_objTex_013090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_013090" -static const ALIGN_ASSET(2) char object_spot09_objTex_013090[] = dobject_spot09_objTex_013090; - -#define dobject_spot09_objTex_014090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_014090" -static const ALIGN_ASSET(2) char object_spot09_objTex_014090[] = dobject_spot09_objTex_014090; - -#define dobject_spot09_objTex_00AC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00AC90" -static const ALIGN_ASSET(2) char object_spot09_objTex_00AC90[] = dobject_spot09_objTex_00AC90; - -#define dobject_spot09_objTex_00BC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00BC90" -static const ALIGN_ASSET(2) char object_spot09_objTex_00BC90[] = dobject_spot09_objTex_00BC90; - -#define dobject_spot09_objTex_00B490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00B490" -static const ALIGN_ASSET(2) char object_spot09_objTex_00B490[] = dobject_spot09_objTex_00B490; - -#define dobject_spot09_objTex_00A490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00A490" -static const ALIGN_ASSET(2) char object_spot09_objTex_00A490[] = dobject_spot09_objTex_00A490; - -#define dobject_spot09_objTex_00CC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00CC90" -static const ALIGN_ASSET(2) char object_spot09_objTex_00CC90[] = dobject_spot09_objTex_00CC90; - -#define dobject_spot09_objTex_00DC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00DC90" -static const ALIGN_ASSET(2) char object_spot09_objTex_00DC90[] = dobject_spot09_objTex_00DC90; - -#define dobject_spot09_objTex_00EC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00EC90" -static const ALIGN_ASSET(2) char object_spot09_objTex_00EC90[] = dobject_spot09_objTex_00EC90; - -#define dobject_spot09_objTex_008C90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_008C90" -static const ALIGN_ASSET(2) char object_spot09_objTex_008C90[] = dobject_spot09_objTex_008C90; - -#define dobject_spot09_objTex_00FC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00FC90" -static const ALIGN_ASSET(2) char object_spot09_objTex_00FC90[] = dobject_spot09_objTex_00FC90; - -#define dobject_spot09_objTex_012090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_012090" -static const ALIGN_ASSET(2) char object_spot09_objTex_012090[] = dobject_spot09_objTex_012090; - -#define dobject_spot09_objTex_011090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_011090" -static const ALIGN_ASSET(2) char object_spot09_objTex_011090[] = dobject_spot09_objTex_011090; - -#define dobject_spot09_objTex_010090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_010090" -static const ALIGN_ASSET(2) char object_spot09_objTex_010090[] = dobject_spot09_objTex_010090; - -#define dobject_spot09_objTex_017890 "__OTR__objects/object_spot09_obj/object_spot09_objTex_017890" -static const ALIGN_ASSET(2) char object_spot09_objTex_017890[] = dobject_spot09_objTex_017890; - -#define dobject_spot09_objTex_015090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_015090" -static const ALIGN_ASSET(2) char object_spot09_objTex_015090[] = dobject_spot09_objTex_015090; - -#define dobject_spot09_objTex_008490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_008490" -static const ALIGN_ASSET(2) char object_spot09_objTex_008490[] = dobject_spot09_objTex_008490; - -#define dobject_spot09_objTex_016090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_016090" -static const ALIGN_ASSET(2) char object_spot09_objTex_016090[] = dobject_spot09_objTex_016090; - -#define dobject_spot09_objTex_009490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_009490" -static const ALIGN_ASSET(2) char object_spot09_objTex_009490[] = dobject_spot09_objTex_009490; - -#define dobject_spot09_objTex_017490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_017490" -static const ALIGN_ASSET(2) char object_spot09_objTex_017490[] = dobject_spot09_objTex_017490; - -#define dobject_spot09_objTex_017090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_017090" -static const ALIGN_ASSET(2) char object_spot09_objTex_017090[] = dobject_spot09_objTex_017090; - #endif // OBJECTS_OBJECT_SPOT09_OBJ_H diff --git a/soh/assets/objects/object_sst/object_sst.h b/soh/assets/objects/object_sst/object_sst.h index a3b60a8be..b2c66ccb9 100644 --- a/soh/assets/objects/object_sst/object_sst.h +++ b/soh/assets/objects/object_sst/object_sst.h @@ -3,6 +3,54 @@ #include "align_asset_macro.h" +#define dobject_sstTex_017FE0 "__OTR__objects/object_sst/object_sstTex_017FE0" +static const ALIGN_ASSET(2) char object_sstTex_017FE0[] = dobject_sstTex_017FE0; + +#define dobject_sstTex_019530 "__OTR__objects/object_sst/object_sstTex_019530" +static const ALIGN_ASSET(2) char object_sstTex_019530[] = dobject_sstTex_019530; + +#define dobject_sstTex_019570 "__OTR__objects/object_sst/object_sstTex_019570" +static const ALIGN_ASSET(2) char object_sstTex_019570[] = dobject_sstTex_019570; + +#define dobject_sstTex_019670 "__OTR__objects/object_sst/object_sstTex_019670" +static const ALIGN_ASSET(2) char object_sstTex_019670[] = dobject_sstTex_019670; + +#define dobject_sstTex_019770 "__OTR__objects/object_sst/object_sstTex_019770" +static const ALIGN_ASSET(2) char object_sstTex_019770[] = dobject_sstTex_019770; + +#define dobject_sstTex_0197B0 "__OTR__objects/object_sst/object_sstTex_0197B0" +static const ALIGN_ASSET(2) char object_sstTex_0197B0[] = dobject_sstTex_0197B0; + +#define dobject_sstTex_0199B0 "__OTR__objects/object_sst/object_sstTex_0199B0" +static const ALIGN_ASSET(2) char object_sstTex_0199B0[] = dobject_sstTex_0199B0; + +#define dobject_sstTex_019AB0 "__OTR__objects/object_sst/object_sstTex_019AB0" +static const ALIGN_ASSET(2) char object_sstTex_019AB0[] = dobject_sstTex_019AB0; + +#define dobject_sstTex_019BB0 "__OTR__objects/object_sst/object_sstTex_019BB0" +static const ALIGN_ASSET(2) char object_sstTex_019BB0[] = dobject_sstTex_019BB0; + +#define dobject_sstTex_019FB0 "__OTR__objects/object_sst/object_sstTex_019FB0" +static const ALIGN_ASSET(2) char object_sstTex_019FB0[] = dobject_sstTex_019FB0; + +#define dobject_sstTex_01A0B0 "__OTR__objects/object_sst/object_sstTex_01A0B0" +static const ALIGN_ASSET(2) char object_sstTex_01A0B0[] = dobject_sstTex_01A0B0; + +#define dobject_sstTex_01A1B0 "__OTR__objects/object_sst/object_sstTex_01A1B0" +static const ALIGN_ASSET(2) char object_sstTex_01A1B0[] = dobject_sstTex_01A1B0; + +#define dobject_sstTex_01A3B0 "__OTR__objects/object_sst/object_sstTex_01A3B0" +static const ALIGN_ASSET(2) char object_sstTex_01A3B0[] = dobject_sstTex_01A3B0; + +#define dobject_sstTex_01A5B0 "__OTR__objects/object_sst/object_sstTex_01A5B0" +static const ALIGN_ASSET(2) char object_sstTex_01A5B0[] = dobject_sstTex_01A5B0; + +#define dobject_sstTex_01A730 "__OTR__objects/object_sst/object_sstTex_01A730" +static const ALIGN_ASSET(2) char object_sstTex_01A730[] = dobject_sstTex_01A730; + +#define dobject_sstTex_01A7B0 "__OTR__objects/object_sst/object_sstTex_01A7B0" +static const ALIGN_ASSET(2) char object_sstTex_01A7B0[] = dobject_sstTex_01A7B0; + #define dgBongoTitleCardTex "__OTR__objects/object_sst/gBongoTitleCardTex" static const ALIGN_ASSET(2) char gBongoTitleCardTex[] = dgBongoTitleCardTex; @@ -111,9 +159,6 @@ static const ALIGN_ASSET(2) char gBongoUnused1Tex[] = dgBongoUnused1Tex; #define dgBongoUnused2Tex "__OTR__objects/object_sst/gBongoUnused2Tex" static const ALIGN_ASSET(2) char gBongoUnused2Tex[] = dgBongoUnused2Tex; -#define dobject_sstTex_017FE0 "__OTR__objects/object_sst/object_sstTex_017FE0" -static const ALIGN_ASSET(2) char object_sstTex_017FE0[] = dobject_sstTex_017FE0; - #define dgBongoLeftHandSkelLimbsLimb_004C4CDL_0044C8 "__OTR__objects/object_sst/gBongoLeftHandSkelLimbsLimb_004C4CDL_0044C8" static const ALIGN_ASSET(2) char gBongoLeftHandSkelLimbsLimb_004C4CDL_0044C8[] = dgBongoLeftHandSkelLimbsLimb_004C4CDL_0044C8; @@ -294,49 +339,5 @@ static const ALIGN_ASSET(2) char gBongoHeadSkelLimbsLimb_017B78DL_011658[] = dgB #define dgBongoHeadSkelLimbsLimb_017B84DL_0119B0 "__OTR__objects/object_sst/gBongoHeadSkelLimbsLimb_017B84DL_0119B0" static const ALIGN_ASSET(2) char gBongoHeadSkelLimbsLimb_017B84DL_0119B0[] = dgBongoHeadSkelLimbsLimb_017B84DL_0119B0; -#define dobject_sstTex_01A730 "__OTR__objects/object_sst/object_sstTex_01A730" -static const ALIGN_ASSET(2) char object_sstTex_01A730[] = dobject_sstTex_01A730; - -#define dobject_sstTex_0199B0 "__OTR__objects/object_sst/object_sstTex_0199B0" -static const ALIGN_ASSET(2) char object_sstTex_0199B0[] = dobject_sstTex_0199B0; - -#define dobject_sstTex_019BB0 "__OTR__objects/object_sst/object_sstTex_019BB0" -static const ALIGN_ASSET(2) char object_sstTex_019BB0[] = dobject_sstTex_019BB0; - -#define dobject_sstTex_01A3B0 "__OTR__objects/object_sst/object_sstTex_01A3B0" -static const ALIGN_ASSET(2) char object_sstTex_01A3B0[] = dobject_sstTex_01A3B0; - -#define dobject_sstTex_01A7B0 "__OTR__objects/object_sst/object_sstTex_01A7B0" -static const ALIGN_ASSET(2) char object_sstTex_01A7B0[] = dobject_sstTex_01A7B0; - -#define dobject_sstTex_019AB0 "__OTR__objects/object_sst/object_sstTex_019AB0" -static const ALIGN_ASSET(2) char object_sstTex_019AB0[] = dobject_sstTex_019AB0; - -#define dobject_sstTex_019FB0 "__OTR__objects/object_sst/object_sstTex_019FB0" -static const ALIGN_ASSET(2) char object_sstTex_019FB0[] = dobject_sstTex_019FB0; - -#define dobject_sstTex_01A5B0 "__OTR__objects/object_sst/object_sstTex_01A5B0" -static const ALIGN_ASSET(2) char object_sstTex_01A5B0[] = dobject_sstTex_01A5B0; - -#define dobject_sstTex_01A1B0 "__OTR__objects/object_sst/object_sstTex_01A1B0" -static const ALIGN_ASSET(2) char object_sstTex_01A1B0[] = dobject_sstTex_01A1B0; - -#define dobject_sstTex_0197B0 "__OTR__objects/object_sst/object_sstTex_0197B0" -static const ALIGN_ASSET(2) char object_sstTex_0197B0[] = dobject_sstTex_0197B0; - -#define dobject_sstTex_019570 "__OTR__objects/object_sst/object_sstTex_019570" -static const ALIGN_ASSET(2) char object_sstTex_019570[] = dobject_sstTex_019570; - -#define dobject_sstTex_019530 "__OTR__objects/object_sst/object_sstTex_019530" -static const ALIGN_ASSET(2) char object_sstTex_019530[] = dobject_sstTex_019530; - -#define dobject_sstTex_019670 "__OTR__objects/object_sst/object_sstTex_019670" -static const ALIGN_ASSET(2) char object_sstTex_019670[] = dobject_sstTex_019670; - -#define dobject_sstTex_019770 "__OTR__objects/object_sst/object_sstTex_019770" -static const ALIGN_ASSET(2) char object_sstTex_019770[] = dobject_sstTex_019770; - -#define dobject_sstTex_01A0B0 "__OTR__objects/object_sst/object_sstTex_01A0B0" -static const ALIGN_ASSET(2) char object_sstTex_01A0B0[] = dobject_sstTex_01A0B0; #endif // OBJECTS_OBJECT_SST_H diff --git a/soh/assets/objects/object_tk/object_tk.h b/soh/assets/objects/object_tk/object_tk.h index a5ad11494..08118a2df 100644 --- a/soh/assets/objects/object_tk/object_tk.h +++ b/soh/assets/objects/object_tk/object_tk.h @@ -3,6 +3,57 @@ #include "align_asset_macro.h" +#define dobject_tkTex_003980 "__OTR__objects/object_tk/object_tkTex_003980" +static const ALIGN_ASSET(2) char object_tkTex_003980[] = dobject_tkTex_003980; + +#define dobject_tkTex_0039C0 "__OTR__objects/object_tk/object_tkTex_0039C0" +static const ALIGN_ASSET(2) char object_tkTex_0039C0[] = dobject_tkTex_0039C0; + +#define dobject_tkTex_003A00 "__OTR__objects/object_tk/object_tkTex_003A00" +static const ALIGN_ASSET(2) char object_tkTex_003A00[] = dobject_tkTex_003A00; + +#define dobject_tkTex_003A40 "__OTR__objects/object_tk/object_tkTex_003A40" +static const ALIGN_ASSET(2) char object_tkTex_003A40[] = dobject_tkTex_003A40; + +#define dobject_tkTex_005340 "__OTR__objects/object_tk/object_tkTex_005340" +static const ALIGN_ASSET(2) char object_tkTex_005340[] = dobject_tkTex_005340; + +#define dobject_tkTex_005440 "__OTR__objects/object_tk/object_tkTex_005440" +static const ALIGN_ASSET(2) char object_tkTex_005440[] = dobject_tkTex_005440; + +#define dobject_tkTex_0056C0 "__OTR__objects/object_tk/object_tkTex_0056C0" +static const ALIGN_ASSET(2) char object_tkTex_0056C0[] = dobject_tkTex_0056C0; + +#define dobject_tkTex_009B00 "__OTR__objects/object_tk/object_tkTex_009B00" +static const ALIGN_ASSET(2) char object_tkTex_009B00[] = dobject_tkTex_009B00; + +#define dobject_tkTex_009C00 "__OTR__objects/object_tk/object_tkTex_009C00" +static const ALIGN_ASSET(2) char object_tkTex_009C00[] = dobject_tkTex_009C00; + +#define dobject_tkTex_009C80 "__OTR__objects/object_tk/object_tkTex_009C80" +static const ALIGN_ASSET(2) char object_tkTex_009C80[] = dobject_tkTex_009C80; + +#define dobject_tkTex_009CC0 "__OTR__objects/object_tk/object_tkTex_009CC0" +static const ALIGN_ASSET(2) char object_tkTex_009CC0[] = dobject_tkTex_009CC0; + +#define dobject_tkTex_009D40 "__OTR__objects/object_tk/object_tkTex_009D40" +static const ALIGN_ASSET(2) char object_tkTex_009D40[] = dobject_tkTex_009D40; + +#define dobject_tkTex_00B088 "__OTR__objects/object_tk/object_tkTex_00B088" +static const ALIGN_ASSET(2) char object_tkTex_00B088[] = dobject_tkTex_00B088; + +#define dobject_tkTex_00B288 "__OTR__objects/object_tk/object_tkTex_00B288" +static const ALIGN_ASSET(2) char object_tkTex_00B288[] = dobject_tkTex_00B288; + +#define dobject_tkTex_00B488 "__OTR__objects/object_tk/object_tkTex_00B488" +static const ALIGN_ASSET(2) char object_tkTex_00B488[] = dobject_tkTex_00B488; + +#define dobject_tkTLUT_003780 "__OTR__objects/object_tk/object_tkTLUT_003780" +static const ALIGN_ASSET(2) char object_tkTLUT_003780[] = dobject_tkTLUT_003780; + +#define dobject_tkTLUT_009AB0 "__OTR__objects/object_tk/object_tkTLUT_009AB0" +static const ALIGN_ASSET(2) char object_tkTLUT_009AB0[] = dobject_tkTLUT_009AB0; + #define dgDampeDigAnim "__OTR__objects/object_tk/gDampeDigAnim" static const ALIGN_ASSET(2) char gDampeDigAnim[] = dgDampeDigAnim; @@ -45,27 +96,6 @@ static const ALIGN_ASSET(2) char gDampeEff2DL[] = dgDampeEff2DL; #define dgDampeSkel "__OTR__objects/object_tk/gDampeSkel" static const ALIGN_ASSET(2) char gDampeSkel[] = dgDampeSkel; -#define dobject_tkTLUT_003780 "__OTR__objects/object_tk/object_tkTLUT_003780" -static const ALIGN_ASSET(2) char object_tkTLUT_003780[] = dobject_tkTLUT_003780; - -#define dobject_tkTex_009CC0 "__OTR__objects/object_tk/object_tkTex_009CC0" -static const ALIGN_ASSET(2) char object_tkTex_009CC0[] = dobject_tkTex_009CC0; - -#define dobject_tkTex_009D40 "__OTR__objects/object_tk/object_tkTex_009D40" -static const ALIGN_ASSET(2) char object_tkTex_009D40[] = dobject_tkTex_009D40; - -#define dobject_tkTex_009C80 "__OTR__objects/object_tk/object_tkTex_009C80" -static const ALIGN_ASSET(2) char object_tkTex_009C80[] = dobject_tkTex_009C80; - -#define dobject_tkTex_00B288 "__OTR__objects/object_tk/object_tkTex_00B288" -static const ALIGN_ASSET(2) char object_tkTex_00B288[] = dobject_tkTex_00B288; - -#define dobject_tkTex_00B088 "__OTR__objects/object_tk/object_tkTex_00B088" -static const ALIGN_ASSET(2) char object_tkTex_00B088[] = dobject_tkTex_00B088; - -#define dobject_tkTex_00B488 "__OTR__objects/object_tk/object_tkTex_00B488" -static const ALIGN_ASSET(2) char object_tkTex_00B488[] = dobject_tkTex_00B488; - #define dgDampeSkelLimbsLimb_00BD30DL_008020 "__OTR__objects/object_tk/gDampeSkelLimbsLimb_00BD30DL_008020" static const ALIGN_ASSET(2) char gDampeSkelLimbsLimb_00BD30DL_008020[] = dgDampeSkelLimbsLimb_00BD30DL_008020; @@ -117,34 +147,5 @@ static const ALIGN_ASSET(2) char gDampeSkelLimbsLimb_00BDE4DL_008410[] = dgDampe #define dgDampeSkelLimbsLimb_00BDF0DL_008958 "__OTR__objects/object_tk/gDampeSkelLimbsLimb_00BDF0DL_008958" static const ALIGN_ASSET(2) char gDampeSkelLimbsLimb_00BDF0DL_008958[] = dgDampeSkelLimbsLimb_00BDF0DL_008958; -#define dobject_tkTex_005440 "__OTR__objects/object_tk/object_tkTex_005440" -static const ALIGN_ASSET(2) char object_tkTex_005440[] = dobject_tkTex_005440; - -#define dobject_tkTex_0056C0 "__OTR__objects/object_tk/object_tkTex_0056C0" -static const ALIGN_ASSET(2) char object_tkTex_0056C0[] = dobject_tkTex_0056C0; - -#define dobject_tkTex_003980 "__OTR__objects/object_tk/object_tkTex_003980" -static const ALIGN_ASSET(2) char object_tkTex_003980[] = dobject_tkTex_003980; - -#define dobject_tkTex_009B00 "__OTR__objects/object_tk/object_tkTex_009B00" -static const ALIGN_ASSET(2) char object_tkTex_009B00[] = dobject_tkTex_009B00; - -#define dobject_tkTLUT_009AB0 "__OTR__objects/object_tk/object_tkTLUT_009AB0" -static const ALIGN_ASSET(2) char object_tkTLUT_009AB0[] = dobject_tkTLUT_009AB0; - -#define dobject_tkTex_009C00 "__OTR__objects/object_tk/object_tkTex_009C00" -static const ALIGN_ASSET(2) char object_tkTex_009C00[] = dobject_tkTex_009C00; - -#define dobject_tkTex_005340 "__OTR__objects/object_tk/object_tkTex_005340" -static const ALIGN_ASSET(2) char object_tkTex_005340[] = dobject_tkTex_005340; - -#define dobject_tkTex_003A40 "__OTR__objects/object_tk/object_tkTex_003A40" -static const ALIGN_ASSET(2) char object_tkTex_003A40[] = dobject_tkTex_003A40; - -#define dobject_tkTex_0039C0 "__OTR__objects/object_tk/object_tkTex_0039C0" -static const ALIGN_ASSET(2) char object_tkTex_0039C0[] = dobject_tkTex_0039C0; - -#define dobject_tkTex_003A00 "__OTR__objects/object_tk/object_tkTex_003A00" -static const ALIGN_ASSET(2) char object_tkTex_003A00[] = dobject_tkTex_003A00; #endif // OBJECTS_OBJECT_TK_H diff --git a/soh/assets/objects/object_torch2/object_torch2.h b/soh/assets/objects/object_torch2/object_torch2.h index 7c79eb4b4..de35cf3e9 100644 --- a/soh/assets/objects/object_torch2/object_torch2.h +++ b/soh/assets/objects/object_torch2/object_torch2.h @@ -3,15 +3,18 @@ #include "align_asset_macro.h" +#define dobject_torch2Tex_0041C0 "__OTR__objects/object_torch2/object_torch2Tex_0041C0" +static const ALIGN_ASSET(2) char object_torch2Tex_0041C0[] = dobject_torch2Tex_0041C0; + +#define dobject_torch2Tex_0043C0 "__OTR__objects/object_torch2/object_torch2Tex_0043C0" +static const ALIGN_ASSET(2) char object_torch2Tex_0043C0[] = dobject_torch2Tex_0043C0; + #define dgDarkLinkSkel "__OTR__objects/object_torch2/gDarkLinkSkel" static const ALIGN_ASSET(2) char gDarkLinkSkel[] = dgDarkLinkSkel; #define dsDarkLinkSheathDL "__OTR__objects/object_torch2/sDarkLinkSheathDL" static const ALIGN_ASSET(2) char sDarkLinkSheathDL[] = dsDarkLinkSheathDL; -#define dobject_torch2Tex_0041C0 "__OTR__objects/object_torch2/object_torch2Tex_0041C0" -static const ALIGN_ASSET(2) char object_torch2Tex_0041C0[] = dobject_torch2Tex_0041C0; - #define dgDarkLinkSkelLimbsLimb_0045D0FarDL_002BD0 "__OTR__objects/object_torch2/gDarkLinkSkelLimbsLimb_0045D0FarDL_002BD0" static const ALIGN_ASSET(2) char gDarkLinkSkelLimbsLimb_0045D0FarDL_002BD0[] = dgDarkLinkSkelLimbsLimb_0045D0FarDL_002BD0; @@ -63,7 +66,5 @@ static const ALIGN_ASSET(2) char gDarkLinkSkelLimbsLimb_0046E0FarDL_003C10[] = d #define dgDarkLinkSkelLimbsLimb_004700FarDL_0038D0 "__OTR__objects/object_torch2/gDarkLinkSkelLimbsLimb_004700FarDL_0038D0" static const ALIGN_ASSET(2) char gDarkLinkSkelLimbsLimb_004700FarDL_0038D0[] = dgDarkLinkSkelLimbsLimb_004700FarDL_0038D0; -#define dobject_torch2Tex_0043C0 "__OTR__objects/object_torch2/object_torch2Tex_0043C0" -static const ALIGN_ASSET(2) char object_torch2Tex_0043C0[] = dobject_torch2Tex_0043C0; #endif // OBJECTS_OBJECT_TORCH2_H diff --git a/soh/assets/objects/object_xc/object_xc.h b/soh/assets/objects/object_xc/object_xc.h index 2a2bb4d19..9a9b03bb2 100644 --- a/soh/assets/objects/object_xc/object_xc.h +++ b/soh/assets/objects/object_xc/object_xc.h @@ -3,6 +3,87 @@ #include "align_asset_macro.h" +#define dobject_xcTex_004C40 "__OTR__objects/object_xc/object_xcTex_004C40" +static const ALIGN_ASSET(2) char object_xcTex_004C40[] = dobject_xcTex_004C40; + +#define dobject_xcTex_004C80 "__OTR__objects/object_xc/object_xcTex_004C80" +static const ALIGN_ASSET(2) char object_xcTex_004C80[] = dobject_xcTex_004C80; + +#define dobject_xcTex_005CC0 "__OTR__objects/object_xc/object_xcTex_005CC0" +static const ALIGN_ASSET(2) char object_xcTex_005CC0[] = dobject_xcTex_005CC0; + +#define dobject_xcTex_0060C0 "__OTR__objects/object_xc/object_xcTex_0060C0" +static const ALIGN_ASSET(2) char object_xcTex_0060C0[] = dobject_xcTex_0060C0; + +#define dobject_xcTex_0064C0 "__OTR__objects/object_xc/object_xcTex_0064C0" +static const ALIGN_ASSET(2) char object_xcTex_0064C0[] = dobject_xcTex_0064C0; + +#define dobject_xcTex_006CC0 "__OTR__objects/object_xc/object_xcTex_006CC0" +static const ALIGN_ASSET(2) char object_xcTex_006CC0[] = dobject_xcTex_006CC0; + +#define dobject_xcTex_006D40 "__OTR__objects/object_xc/object_xcTex_006D40" +static const ALIGN_ASSET(2) char object_xcTex_006D40[] = dobject_xcTex_006D40; + +#define dobject_xcTex_006D80 "__OTR__objects/object_xc/object_xcTex_006D80" +static const ALIGN_ASSET(2) char object_xcTex_006D80[] = dobject_xcTex_006D80; + +#define dobject_xcTex_006E80 "__OTR__objects/object_xc/object_xcTex_006E80" +static const ALIGN_ASSET(2) char object_xcTex_006E80[] = dobject_xcTex_006E80; + +#define dobject_xcTex_007280 "__OTR__objects/object_xc/object_xcTex_007280" +static const ALIGN_ASSET(2) char object_xcTex_007280[] = dobject_xcTex_007280; + +#define dobject_xcTex_007380 "__OTR__objects/object_xc/object_xcTex_007380" +static const ALIGN_ASSET(2) char object_xcTex_007380[] = dobject_xcTex_007380; + +#define dobject_xcTex_007B80 "__OTR__objects/object_xc/object_xcTex_007B80" +static const ALIGN_ASSET(2) char object_xcTex_007B80[] = dobject_xcTex_007B80; + +#define dobject_xcTex_008380 "__OTR__objects/object_xc/object_xcTex_008380" +static const ALIGN_ASSET(2) char object_xcTex_008380[] = dobject_xcTex_008380; + +#define dobject_xcTex_008B80 "__OTR__objects/object_xc/object_xcTex_008B80" +static const ALIGN_ASSET(2) char object_xcTex_008B80[] = dobject_xcTex_008B80; + +#define dobject_xcTex_008C00 "__OTR__objects/object_xc/object_xcTex_008C00" +static const ALIGN_ASSET(2) char object_xcTex_008C00[] = dobject_xcTex_008C00; + +#define dobject_xcTex_00F790 "__OTR__objects/object_xc/object_xcTex_00F790" +static const ALIGN_ASSET(2) char object_xcTex_00F790[] = dobject_xcTex_00F790; + +#define dobject_xcTex_00F7D0 "__OTR__objects/object_xc/object_xcTex_00F7D0" +static const ALIGN_ASSET(2) char object_xcTex_00F7D0[] = dobject_xcTex_00F7D0; + +#define dobject_xcTex_00FBD0 "__OTR__objects/object_xc/object_xcTex_00FBD0" +static const ALIGN_ASSET(2) char object_xcTex_00FBD0[] = dobject_xcTex_00FBD0; + +#define dobject_xcTex_00FCD0 "__OTR__objects/object_xc/object_xcTex_00FCD0" +static const ALIGN_ASSET(2) char object_xcTex_00FCD0[] = dobject_xcTex_00FCD0; + +#define dobject_xcTex_00FD10 "__OTR__objects/object_xc/object_xcTex_00FD10" +static const ALIGN_ASSET(2) char object_xcTex_00FD10[] = dobject_xcTex_00FD10; + +#define dobject_xcTex_00FD90 "__OTR__objects/object_xc/object_xcTex_00FD90" +static const ALIGN_ASSET(2) char object_xcTex_00FD90[] = dobject_xcTex_00FD90; + +#define dobject_xcTex_00FDD0 "__OTR__objects/object_xc/object_xcTex_00FDD0" +static const ALIGN_ASSET(2) char object_xcTex_00FDD0[] = dobject_xcTex_00FDD0; + +#define dobject_xcTex_0101D0 "__OTR__objects/object_xc/object_xcTex_0101D0" +static const ALIGN_ASSET(2) char object_xcTex_0101D0[] = dobject_xcTex_0101D0; + +#define dobject_xcTex_011930 "__OTR__objects/object_xc/object_xcTex_011930" +static const ALIGN_ASSET(2) char object_xcTex_011930[] = dobject_xcTex_011930; + +#define dobject_xcTLUT_004840 "__OTR__objects/object_xc/object_xcTLUT_004840" +static const ALIGN_ASSET(2) char object_xcTLUT_004840[] = dobject_xcTLUT_004840; + +#define dobject_xcTLUT_00F6C0 "__OTR__objects/object_xc/object_xcTLUT_00F6C0" +static const ALIGN_ASSET(2) char object_xcTLUT_00F6C0[] = dobject_xcTLUT_00F6C0; + +#define dobject_xcTLUT_00F720 "__OTR__objects/object_xc/object_xcTLUT_00F720" +static const ALIGN_ASSET(2) char object_xcTLUT_00F720[] = dobject_xcTLUT_00F720; + #define dgSheikSkel "__OTR__objects/object_xc/gSheikSkel" static const ALIGN_ASSET(2) char gSheikSkel[] = dgSheikSkel; @@ -90,39 +171,6 @@ static const ALIGN_ASSET(2) char gSheikDL_011620[] = dgSheikDL_011620; #define dgSheikDL_012970 "__OTR__objects/object_xc/gSheikDL_012970" static const ALIGN_ASSET(2) char gSheikDL_012970[] = dgSheikDL_012970; -#define dobject_xcTex_00F790 "__OTR__objects/object_xc/object_xcTex_00F790" -static const ALIGN_ASSET(2) char object_xcTex_00F790[] = dobject_xcTex_00F790; - -#define dobject_xcTLUT_00F6C0 "__OTR__objects/object_xc/object_xcTLUT_00F6C0" -static const ALIGN_ASSET(2) char object_xcTLUT_00F6C0[] = dobject_xcTLUT_00F6C0; - -#define dobject_xcTex_00F7D0 "__OTR__objects/object_xc/object_xcTex_00F7D0" -static const ALIGN_ASSET(2) char object_xcTex_00F7D0[] = dobject_xcTex_00F7D0; - -#define dobject_xcTLUT_00F720 "__OTR__objects/object_xc/object_xcTLUT_00F720" -static const ALIGN_ASSET(2) char object_xcTLUT_00F720[] = dobject_xcTLUT_00F720; - -#define dobject_xcTex_00FBD0 "__OTR__objects/object_xc/object_xcTex_00FBD0" -static const ALIGN_ASSET(2) char object_xcTex_00FBD0[] = dobject_xcTex_00FBD0; - -#define dobject_xcTex_00FD10 "__OTR__objects/object_xc/object_xcTex_00FD10" -static const ALIGN_ASSET(2) char object_xcTex_00FD10[] = dobject_xcTex_00FD10; - -#define dobject_xcTex_00FD90 "__OTR__objects/object_xc/object_xcTex_00FD90" -static const ALIGN_ASSET(2) char object_xcTex_00FD90[] = dobject_xcTex_00FD90; - -#define dobject_xcTex_00FDD0 "__OTR__objects/object_xc/object_xcTex_00FDD0" -static const ALIGN_ASSET(2) char object_xcTex_00FDD0[] = dobject_xcTex_00FDD0; - -#define dobject_xcTex_0101D0 "__OTR__objects/object_xc/object_xcTex_0101D0" -static const ALIGN_ASSET(2) char object_xcTex_0101D0[] = dobject_xcTex_0101D0; - -#define dobject_xcTex_00FCD0 "__OTR__objects/object_xc/object_xcTex_00FCD0" -static const ALIGN_ASSET(2) char object_xcTex_00FCD0[] = dobject_xcTex_00FCD0; - -#define dobject_xcTex_011930 "__OTR__objects/object_xc/object_xcTex_011930" -static const ALIGN_ASSET(2) char object_xcTex_011930[] = dobject_xcTex_011930; - #define dgSheikSkelLimbsLimb_0129FCDL_00EA98 "__OTR__objects/object_xc/gSheikSkelLimbsLimb_0129FCDL_00EA98" static const ALIGN_ASSET(2) char gSheikSkelLimbsLimb_0129FCDL_00EA98[] = dgSheikSkelLimbsLimb_0129FCDL_00EA98; @@ -168,52 +216,5 @@ static const ALIGN_ASSET(2) char gSheikSkelLimbsLimb_012A98DL_00E220[] = dgSheik #define dgSheikSkelLimbsLimb_012AA4DL_00D710 "__OTR__objects/object_xc/gSheikSkelLimbsLimb_012AA4DL_00D710" static const ALIGN_ASSET(2) char gSheikSkelLimbsLimb_012AA4DL_00D710[] = dgSheikSkelLimbsLimb_012AA4DL_00D710; -#define dobject_xcTLUT_004840 "__OTR__objects/object_xc/object_xcTLUT_004840" -static const ALIGN_ASSET(2) char object_xcTLUT_004840[] = dobject_xcTLUT_004840; - -#define dobject_xcTex_006D80 "__OTR__objects/object_xc/object_xcTex_006D80" -static const ALIGN_ASSET(2) char object_xcTex_006D80[] = dobject_xcTex_006D80; - -#define dobject_xcTex_007280 "__OTR__objects/object_xc/object_xcTex_007280" -static const ALIGN_ASSET(2) char object_xcTex_007280[] = dobject_xcTex_007280; - -#define dobject_xcTex_007380 "__OTR__objects/object_xc/object_xcTex_007380" -static const ALIGN_ASSET(2) char object_xcTex_007380[] = dobject_xcTex_007380; - -#define dobject_xcTex_007B80 "__OTR__objects/object_xc/object_xcTex_007B80" -static const ALIGN_ASSET(2) char object_xcTex_007B80[] = dobject_xcTex_007B80; - -#define dobject_xcTex_008380 "__OTR__objects/object_xc/object_xcTex_008380" -static const ALIGN_ASSET(2) char object_xcTex_008380[] = dobject_xcTex_008380; - -#define dobject_xcTex_008B80 "__OTR__objects/object_xc/object_xcTex_008B80" -static const ALIGN_ASSET(2) char object_xcTex_008B80[] = dobject_xcTex_008B80; - -#define dobject_xcTex_008C00 "__OTR__objects/object_xc/object_xcTex_008C00" -static const ALIGN_ASSET(2) char object_xcTex_008C00[] = dobject_xcTex_008C00; - -#define dobject_xcTex_004C40 "__OTR__objects/object_xc/object_xcTex_004C40" -static const ALIGN_ASSET(2) char object_xcTex_004C40[] = dobject_xcTex_004C40; - -#define dobject_xcTex_0060C0 "__OTR__objects/object_xc/object_xcTex_0060C0" -static const ALIGN_ASSET(2) char object_xcTex_0060C0[] = dobject_xcTex_0060C0; - -#define dobject_xcTex_0064C0 "__OTR__objects/object_xc/object_xcTex_0064C0" -static const ALIGN_ASSET(2) char object_xcTex_0064C0[] = dobject_xcTex_0064C0; - -#define dobject_xcTex_006E80 "__OTR__objects/object_xc/object_xcTex_006E80" -static const ALIGN_ASSET(2) char object_xcTex_006E80[] = dobject_xcTex_006E80; - -#define dobject_xcTex_004C80 "__OTR__objects/object_xc/object_xcTex_004C80" -static const ALIGN_ASSET(2) char object_xcTex_004C80[] = dobject_xcTex_004C80; - -#define dobject_xcTex_005CC0 "__OTR__objects/object_xc/object_xcTex_005CC0" -static const ALIGN_ASSET(2) char object_xcTex_005CC0[] = dobject_xcTex_005CC0; - -#define dobject_xcTex_006CC0 "__OTR__objects/object_xc/object_xcTex_006CC0" -static const ALIGN_ASSET(2) char object_xcTex_006CC0[] = dobject_xcTex_006CC0; - -#define dobject_xcTex_006D40 "__OTR__objects/object_xc/object_xcTex_006D40" -static const ALIGN_ASSET(2) char object_xcTex_006D40[] = dobject_xcTex_006D40; #endif // OBJECTS_OBJECT_XC_H diff --git a/soh/assets/objects/object_zl1/object_zl1.h b/soh/assets/objects/object_zl1/object_zl1.h index cd2326051..b6e7658a1 100644 --- a/soh/assets/objects/object_zl1/object_zl1.h +++ b/soh/assets/objects/object_zl1/object_zl1.h @@ -3,6 +3,9 @@ #include "align_asset_macro.h" +#define dobject_zl1Tex_00EE58 "__OTR__objects/object_zl1/object_zl1Tex_00EE58" +static const ALIGN_ASSET(2) char object_zl1Tex_00EE58[] = dobject_zl1Tex_00EE58; + #define dgChildZelda1Skel "__OTR__objects/object_zl1/gChildZelda1Skel" static const ALIGN_ASSET(2) char gChildZelda1Skel[] = dgChildZelda1Skel; @@ -231,7 +234,5 @@ static const ALIGN_ASSET(2) char gChildZelda1Anim_13F10[] = dgChildZelda1Anim_13 #define dgChildZelda1Anim_143A8 "__OTR__objects/object_zl1/gChildZelda1Anim_143A8" static const ALIGN_ASSET(2) char gChildZelda1Anim_143A8[] = dgChildZelda1Anim_143A8; -#define dobject_zl1Tex_00EE58 "__OTR__objects/object_zl1/object_zl1Tex_00EE58" -static const ALIGN_ASSET(2) char object_zl1Tex_00EE58[] = dobject_zl1Tex_00EE58; #endif // OBJECTS_OBJECT_ZL1_H diff --git a/soh/assets/objects/object_zl2/object_zl2.h b/soh/assets/objects/object_zl2/object_zl2.h index fe038ad18..647db8673 100644 --- a/soh/assets/objects/object_zl2/object_zl2.h +++ b/soh/assets/objects/object_zl2/object_zl2.h @@ -3,6 +3,105 @@ #include "align_asset_macro.h" +#define dobject_zl2Tex_000E00 "__OTR__objects/object_zl2/object_zl2Tex_000E00" +static const ALIGN_ASSET(2) char object_zl2Tex_000E00[] = dobject_zl2Tex_000E00; + +#define dobject_zl2Tex_000F00 "__OTR__objects/object_zl2/object_zl2Tex_000F00" +static const ALIGN_ASSET(2) char object_zl2Tex_000F00[] = dobject_zl2Tex_000F00; + +#define dobject_zl2Tex_000F40 "__OTR__objects/object_zl2/object_zl2Tex_000F40" +static const ALIGN_ASSET(2) char object_zl2Tex_000F40[] = dobject_zl2Tex_000F40; + +#define dobject_zl2Tex_001140 "__OTR__objects/object_zl2/object_zl2Tex_001140" +static const ALIGN_ASSET(2) char object_zl2Tex_001140[] = dobject_zl2Tex_001140; + +#define dobject_zl2Tex_001180 "__OTR__objects/object_zl2/object_zl2Tex_001180" +static const ALIGN_ASSET(2) char object_zl2Tex_001180[] = dobject_zl2Tex_001180; + +#define dobject_zl2Tex_001280 "__OTR__objects/object_zl2/object_zl2Tex_001280" +static const ALIGN_ASSET(2) char object_zl2Tex_001280[] = dobject_zl2Tex_001280; + +#define dobject_zl2Tex_0012C0 "__OTR__objects/object_zl2/object_zl2Tex_0012C0" +static const ALIGN_ASSET(2) char object_zl2Tex_0012C0[] = dobject_zl2Tex_0012C0; + +#define dobject_zl2Tex_0016C0 "__OTR__objects/object_zl2/object_zl2Tex_0016C0" +static const ALIGN_ASSET(2) char object_zl2Tex_0016C0[] = dobject_zl2Tex_0016C0; + +#define dobject_zl2Tex_001AC0 "__OTR__objects/object_zl2/object_zl2Tex_001AC0" +static const ALIGN_ASSET(2) char object_zl2Tex_001AC0[] = dobject_zl2Tex_001AC0; + +#define dobject_zl2Tex_001CC0 "__OTR__objects/object_zl2/object_zl2Tex_001CC0" +static const ALIGN_ASSET(2) char object_zl2Tex_001CC0[] = dobject_zl2Tex_001CC0; + +#define dobject_zl2Tex_0024C0 "__OTR__objects/object_zl2/object_zl2Tex_0024C0" +static const ALIGN_ASSET(2) char object_zl2Tex_0024C0[] = dobject_zl2Tex_0024C0; + +#define dobject_zl2Tex_002500 "__OTR__objects/object_zl2/object_zl2Tex_002500" +static const ALIGN_ASSET(2) char object_zl2Tex_002500[] = dobject_zl2Tex_002500; + +#define dobject_zl2Tex_002600 "__OTR__objects/object_zl2/object_zl2Tex_002600" +static const ALIGN_ASSET(2) char object_zl2Tex_002600[] = dobject_zl2Tex_002600; + +#define dobject_zl2Tex_002700 "__OTR__objects/object_zl2/object_zl2Tex_002700" +static const ALIGN_ASSET(2) char object_zl2Tex_002700[] = dobject_zl2Tex_002700; + +#define dobject_zl2Tex_002740 "__OTR__objects/object_zl2/object_zl2Tex_002740" +static const ALIGN_ASSET(2) char object_zl2Tex_002740[] = dobject_zl2Tex_002740; + +#define dobject_zl2Tex_002780 "__OTR__objects/object_zl2/object_zl2Tex_002780" +static const ALIGN_ASSET(2) char object_zl2Tex_002780[] = dobject_zl2Tex_002780; + +#define dobject_zl2Tex_002880 "__OTR__objects/object_zl2/object_zl2Tex_002880" +static const ALIGN_ASSET(2) char object_zl2Tex_002880[] = dobject_zl2Tex_002880; + +#define dobject_zl2Tex_0034C8 "__OTR__objects/object_zl2/object_zl2Tex_0034C8" +static const ALIGN_ASSET(2) char object_zl2Tex_0034C8[] = dobject_zl2Tex_0034C8; + +#define dobject_zl2Tex_003908 "__OTR__objects/object_zl2/object_zl2Tex_003908" +static const ALIGN_ASSET(2) char object_zl2Tex_003908[] = dobject_zl2Tex_003908; + +#define dobject_zl2Tex_003A08 "__OTR__objects/object_zl2/object_zl2Tex_003A08" +static const ALIGN_ASSET(2) char object_zl2Tex_003A08[] = dobject_zl2Tex_003A08; + +#define dobject_zl2Tex_003A48 "__OTR__objects/object_zl2/object_zl2Tex_003A48" +static const ALIGN_ASSET(2) char object_zl2Tex_003A48[] = dobject_zl2Tex_003A48; + +#define dobject_zl2Tex_003AC8 "__OTR__objects/object_zl2/object_zl2Tex_003AC8" +static const ALIGN_ASSET(2) char object_zl2Tex_003AC8[] = dobject_zl2Tex_003AC8; + +#define dobject_zl2Tex_003B48 "__OTR__objects/object_zl2/object_zl2Tex_003B48" +static const ALIGN_ASSET(2) char object_zl2Tex_003B48[] = dobject_zl2Tex_003B48; + +#define dobject_zl2Tex_004448 "__OTR__objects/object_zl2/object_zl2Tex_004448" +static const ALIGN_ASSET(2) char object_zl2Tex_004448[] = dobject_zl2Tex_004448; + +#define dobject_zl2Tex_006548 "__OTR__objects/object_zl2/object_zl2Tex_006548" +static const ALIGN_ASSET(2) char object_zl2Tex_006548[] = dobject_zl2Tex_006548; + +#define dobject_zl2Tex_009738 "__OTR__objects/object_zl2/object_zl2Tex_009738" +static const ALIGN_ASSET(2) char object_zl2Tex_009738[] = dobject_zl2Tex_009738; + +#define dobject_zl2Tex_009938 "__OTR__objects/object_zl2/object_zl2Tex_009938" +static const ALIGN_ASSET(2) char object_zl2Tex_009938[] = dobject_zl2Tex_009938; + +#define dobject_zl2Tex_009A38 "__OTR__objects/object_zl2/object_zl2Tex_009A38" +static const ALIGN_ASSET(2) char object_zl2Tex_009A38[] = dobject_zl2Tex_009A38; + +#define dobject_zl2Tex_009A78 "__OTR__objects/object_zl2/object_zl2Tex_009A78" +static const ALIGN_ASSET(2) char object_zl2Tex_009A78[] = dobject_zl2Tex_009A78; + +#define dobject_zl2Tex_009E78 "__OTR__objects/object_zl2/object_zl2Tex_009E78" +static const ALIGN_ASSET(2) char object_zl2Tex_009E78[] = dobject_zl2Tex_009E78; + +#define dobject_zl2Tex_009F78 "__OTR__objects/object_zl2/object_zl2Tex_009F78" +static const ALIGN_ASSET(2) char object_zl2Tex_009F78[] = dobject_zl2Tex_009F78; + +#define dobject_zl2Tex_009FF8 "__OTR__objects/object_zl2/object_zl2Tex_009FF8" +static const ALIGN_ASSET(2) char object_zl2Tex_009FF8[] = dobject_zl2Tex_009FF8; + +#define dobject_zl2Tex_00A0F8 "__OTR__objects/object_zl2/object_zl2Tex_00A0F8" +static const ALIGN_ASSET(2) char object_zl2Tex_00A0F8[] = dobject_zl2Tex_00A0F8; + #define dgZelda2Skel "__OTR__objects/object_zl2/gZelda2Skel" static const ALIGN_ASSET(2) char gZelda2Skel[] = dgZelda2Skel; @@ -123,103 +222,5 @@ static const ALIGN_ASSET(2) char gZelda2SkelLimbsLimb_010D20DL_00EA58[] = dgZeld #define dgZelda2SkelLimbsLimb_010D2CDL_007DC8 "__OTR__objects/object_zl2/gZelda2SkelLimbsLimb_010D2CDL_007DC8" static const ALIGN_ASSET(2) char gZelda2SkelLimbsLimb_010D2CDL_007DC8[] = dgZelda2SkelLimbsLimb_010D2CDL_007DC8; -#define dobject_zl2Tex_0024C0 "__OTR__objects/object_zl2/object_zl2Tex_0024C0" -static const ALIGN_ASSET(2) char object_zl2Tex_0024C0[] = dobject_zl2Tex_0024C0; - -#define dobject_zl2Tex_000E00 "__OTR__objects/object_zl2/object_zl2Tex_000E00" -static const ALIGN_ASSET(2) char object_zl2Tex_000E00[] = dobject_zl2Tex_000E00; - -#define dobject_zl2Tex_002500 "__OTR__objects/object_zl2/object_zl2Tex_002500" -static const ALIGN_ASSET(2) char object_zl2Tex_002500[] = dobject_zl2Tex_002500; - -#define dobject_zl2Tex_002600 "__OTR__objects/object_zl2/object_zl2Tex_002600" -static const ALIGN_ASSET(2) char object_zl2Tex_002600[] = dobject_zl2Tex_002600; - -#define dobject_zl2Tex_002700 "__OTR__objects/object_zl2/object_zl2Tex_002700" -static const ALIGN_ASSET(2) char object_zl2Tex_002700[] = dobject_zl2Tex_002700; - -#define dobject_zl2Tex_002740 "__OTR__objects/object_zl2/object_zl2Tex_002740" -static const ALIGN_ASSET(2) char object_zl2Tex_002740[] = dobject_zl2Tex_002740; - -#define dobject_zl2Tex_002780 "__OTR__objects/object_zl2/object_zl2Tex_002780" -static const ALIGN_ASSET(2) char object_zl2Tex_002780[] = dobject_zl2Tex_002780; - -#define dobject_zl2Tex_002880 "__OTR__objects/object_zl2/object_zl2Tex_002880" -static const ALIGN_ASSET(2) char object_zl2Tex_002880[] = dobject_zl2Tex_002880; - -#define dobject_zl2Tex_0012C0 "__OTR__objects/object_zl2/object_zl2Tex_0012C0" -static const ALIGN_ASSET(2) char object_zl2Tex_0012C0[] = dobject_zl2Tex_0012C0; - -#define dobject_zl2Tex_001CC0 "__OTR__objects/object_zl2/object_zl2Tex_001CC0" -static const ALIGN_ASSET(2) char object_zl2Tex_001CC0[] = dobject_zl2Tex_001CC0; - -#define dobject_zl2Tex_0016C0 "__OTR__objects/object_zl2/object_zl2Tex_0016C0" -static const ALIGN_ASSET(2) char object_zl2Tex_0016C0[] = dobject_zl2Tex_0016C0; - -#define dobject_zl2Tex_001AC0 "__OTR__objects/object_zl2/object_zl2Tex_001AC0" -static const ALIGN_ASSET(2) char object_zl2Tex_001AC0[] = dobject_zl2Tex_001AC0; - -#define dobject_zl2Tex_009A38 "__OTR__objects/object_zl2/object_zl2Tex_009A38" -static const ALIGN_ASSET(2) char object_zl2Tex_009A38[] = dobject_zl2Tex_009A38; - -#define dobject_zl2Tex_003A08 "__OTR__objects/object_zl2/object_zl2Tex_003A08" -static const ALIGN_ASSET(2) char object_zl2Tex_003A08[] = dobject_zl2Tex_003A08; - -#define dobject_zl2Tex_009738 "__OTR__objects/object_zl2/object_zl2Tex_009738" -static const ALIGN_ASSET(2) char object_zl2Tex_009738[] = dobject_zl2Tex_009738; - -#define dobject_zl2Tex_009938 "__OTR__objects/object_zl2/object_zl2Tex_009938" -static const ALIGN_ASSET(2) char object_zl2Tex_009938[] = dobject_zl2Tex_009938; - -#define dobject_zl2Tex_009A78 "__OTR__objects/object_zl2/object_zl2Tex_009A78" -static const ALIGN_ASSET(2) char object_zl2Tex_009A78[] = dobject_zl2Tex_009A78; - -#define dobject_zl2Tex_009E78 "__OTR__objects/object_zl2/object_zl2Tex_009E78" -static const ALIGN_ASSET(2) char object_zl2Tex_009E78[] = dobject_zl2Tex_009E78; - -#define dobject_zl2Tex_009F78 "__OTR__objects/object_zl2/object_zl2Tex_009F78" -static const ALIGN_ASSET(2) char object_zl2Tex_009F78[] = dobject_zl2Tex_009F78; - -#define dobject_zl2Tex_009FF8 "__OTR__objects/object_zl2/object_zl2Tex_009FF8" -static const ALIGN_ASSET(2) char object_zl2Tex_009FF8[] = dobject_zl2Tex_009FF8; - -#define dobject_zl2Tex_00A0F8 "__OTR__objects/object_zl2/object_zl2Tex_00A0F8" -static const ALIGN_ASSET(2) char object_zl2Tex_00A0F8[] = dobject_zl2Tex_00A0F8; - -#define dobject_zl2Tex_001140 "__OTR__objects/object_zl2/object_zl2Tex_001140" -static const ALIGN_ASSET(2) char object_zl2Tex_001140[] = dobject_zl2Tex_001140; - -#define dobject_zl2Tex_001180 "__OTR__objects/object_zl2/object_zl2Tex_001180" -static const ALIGN_ASSET(2) char object_zl2Tex_001180[] = dobject_zl2Tex_001180; - -#define dobject_zl2Tex_001280 "__OTR__objects/object_zl2/object_zl2Tex_001280" -static const ALIGN_ASSET(2) char object_zl2Tex_001280[] = dobject_zl2Tex_001280; - -#define dobject_zl2Tex_000F40 "__OTR__objects/object_zl2/object_zl2Tex_000F40" -static const ALIGN_ASSET(2) char object_zl2Tex_000F40[] = dobject_zl2Tex_000F40; - -#define dobject_zl2Tex_000F00 "__OTR__objects/object_zl2/object_zl2Tex_000F00" -static const ALIGN_ASSET(2) char object_zl2Tex_000F00[] = dobject_zl2Tex_000F00; - -#define dobject_zl2Tex_003AC8 "__OTR__objects/object_zl2/object_zl2Tex_003AC8" -static const ALIGN_ASSET(2) char object_zl2Tex_003AC8[] = dobject_zl2Tex_003AC8; - -#define dobject_zl2Tex_0034C8 "__OTR__objects/object_zl2/object_zl2Tex_0034C8" -static const ALIGN_ASSET(2) char object_zl2Tex_0034C8[] = dobject_zl2Tex_0034C8; - -#define dobject_zl2Tex_004448 "__OTR__objects/object_zl2/object_zl2Tex_004448" -static const ALIGN_ASSET(2) char object_zl2Tex_004448[] = dobject_zl2Tex_004448; - -#define dobject_zl2Tex_003A48 "__OTR__objects/object_zl2/object_zl2Tex_003A48" -static const ALIGN_ASSET(2) char object_zl2Tex_003A48[] = dobject_zl2Tex_003A48; - -#define dobject_zl2Tex_006548 "__OTR__objects/object_zl2/object_zl2Tex_006548" -static const ALIGN_ASSET(2) char object_zl2Tex_006548[] = dobject_zl2Tex_006548; - -#define dobject_zl2Tex_003B48 "__OTR__objects/object_zl2/object_zl2Tex_003B48" -static const ALIGN_ASSET(2) char object_zl2Tex_003B48[] = dobject_zl2Tex_003B48; - -#define dobject_zl2Tex_003908 "__OTR__objects/object_zl2/object_zl2Tex_003908" -static const ALIGN_ASSET(2) char object_zl2Tex_003908[] = dobject_zl2Tex_003908; #endif // OBJECTS_OBJECT_ZL2_H diff --git a/soh/assets/objects/object_zl4/object_zl4.h b/soh/assets/objects/object_zl4/object_zl4.h index 45c887b54..59c480917 100644 --- a/soh/assets/objects/object_zl4/object_zl4.h +++ b/soh/assets/objects/object_zl4/object_zl4.h @@ -3,6 +3,99 @@ #include "align_asset_macro.h" +#define dobject_zl4Tex_000C70 "__OTR__objects/object_zl4/object_zl4Tex_000C70" +static const ALIGN_ASSET(2) char object_zl4Tex_000C70[] = dobject_zl4Tex_000C70; + +#define dobject_zl4Tex_000CB0 "__OTR__objects/object_zl4/object_zl4Tex_000CB0" +static const ALIGN_ASSET(2) char object_zl4Tex_000CB0[] = dobject_zl4Tex_000CB0; + +#define dobject_zl4Tex_000DB0 "__OTR__objects/object_zl4/object_zl4Tex_000DB0" +static const ALIGN_ASSET(2) char object_zl4Tex_000DB0[] = dobject_zl4Tex_000DB0; + +#define dobject_zl4Tex_0015B0 "__OTR__objects/object_zl4/object_zl4Tex_0015B0" +static const ALIGN_ASSET(2) char object_zl4Tex_0015B0[] = dobject_zl4Tex_0015B0; + +#define dobject_zl4Tex_001630 "__OTR__objects/object_zl4/object_zl4Tex_001630" +static const ALIGN_ASSET(2) char object_zl4Tex_001630[] = dobject_zl4Tex_001630; + +#define dobject_zl4Tex_0016B0 "__OTR__objects/object_zl4/object_zl4Tex_0016B0" +static const ALIGN_ASSET(2) char object_zl4Tex_0016B0[] = dobject_zl4Tex_0016B0; + +#define dobject_zl4Tex_0017B0 "__OTR__objects/object_zl4/object_zl4Tex_0017B0" +static const ALIGN_ASSET(2) char object_zl4Tex_0017B0[] = dobject_zl4Tex_0017B0; + +#define dobject_zl4Tex_0017F0 "__OTR__objects/object_zl4/object_zl4Tex_0017F0" +static const ALIGN_ASSET(2) char object_zl4Tex_0017F0[] = dobject_zl4Tex_0017F0; + +#define dobject_zl4Tex_001BF0 "__OTR__objects/object_zl4/object_zl4Tex_001BF0" +static const ALIGN_ASSET(2) char object_zl4Tex_001BF0[] = dobject_zl4Tex_001BF0; + +#define dobject_zl4Tex_001CF0 "__OTR__objects/object_zl4/object_zl4Tex_001CF0" +static const ALIGN_ASSET(2) char object_zl4Tex_001CF0[] = dobject_zl4Tex_001CF0; + +#define dobject_zl4Tex_001DF0 "__OTR__objects/object_zl4/object_zl4Tex_001DF0" +static const ALIGN_ASSET(2) char object_zl4Tex_001DF0[] = dobject_zl4Tex_001DF0; + +#define dobject_zl4Tex_001E30 "__OTR__objects/object_zl4/object_zl4Tex_001E30" +static const ALIGN_ASSET(2) char object_zl4Tex_001E30[] = dobject_zl4Tex_001E30; + +#define dobject_zl4Tex_002230 "__OTR__objects/object_zl4/object_zl4Tex_002230" +static const ALIGN_ASSET(2) char object_zl4Tex_002230[] = dobject_zl4Tex_002230; + +#define dobject_zl4Tex_002270 "__OTR__objects/object_zl4/object_zl4Tex_002270" +static const ALIGN_ASSET(2) char object_zl4Tex_002270[] = dobject_zl4Tex_002270; + +#define dobject_zl4Tex_0022F0 "__OTR__objects/object_zl4/object_zl4Tex_0022F0" +static const ALIGN_ASSET(2) char object_zl4Tex_0022F0[] = dobject_zl4Tex_0022F0; + +#define dobject_zl4Tex_0024F0 "__OTR__objects/object_zl4/object_zl4Tex_0024F0" +static const ALIGN_ASSET(2) char object_zl4Tex_0024F0[] = dobject_zl4Tex_0024F0; + +#define dobject_zl4Tex_0026F0 "__OTR__objects/object_zl4/object_zl4Tex_0026F0" +static const ALIGN_ASSET(2) char object_zl4Tex_0026F0[] = dobject_zl4Tex_0026F0; + +#define dobject_zl4Tex_0028F0 "__OTR__objects/object_zl4/object_zl4Tex_0028F0" +static const ALIGN_ASSET(2) char object_zl4Tex_0028F0[] = dobject_zl4Tex_0028F0; + +#define dobject_zl4Tex_002970 "__OTR__objects/object_zl4/object_zl4Tex_002970" +static const ALIGN_ASSET(2) char object_zl4Tex_002970[] = dobject_zl4Tex_002970; + +#define dobject_zl4Tex_0029F0 "__OTR__objects/object_zl4/object_zl4Tex_0029F0" +static const ALIGN_ASSET(2) char object_zl4Tex_0029F0[] = dobject_zl4Tex_0029F0; + +#define dobject_zl4Tex_0056F0 "__OTR__objects/object_zl4/object_zl4Tex_0056F0" +static const ALIGN_ASSET(2) char object_zl4Tex_0056F0[] = dobject_zl4Tex_0056F0; + +#define dobject_zl4Tex_0058F0 "__OTR__objects/object_zl4/object_zl4Tex_0058F0" +static const ALIGN_ASSET(2) char object_zl4Tex_0058F0[] = dobject_zl4Tex_0058F0; + +#define dobject_zl4Tex_0059F0 "__OTR__objects/object_zl4/object_zl4Tex_0059F0" +static const ALIGN_ASSET(2) char object_zl4Tex_0059F0[] = dobject_zl4Tex_0059F0; + +#define dobject_zl4Tex_005A70 "__OTR__objects/object_zl4/object_zl4Tex_005A70" +static const ALIGN_ASSET(2) char object_zl4Tex_005A70[] = dobject_zl4Tex_005A70; + +#define dobject_zl4Tex_005C70 "__OTR__objects/object_zl4/object_zl4Tex_005C70" +static const ALIGN_ASSET(2) char object_zl4Tex_005C70[] = dobject_zl4Tex_005C70; + +#define dobject_zl4Tex_005CB0 "__OTR__objects/object_zl4/object_zl4Tex_005CB0" +static const ALIGN_ASSET(2) char object_zl4Tex_005CB0[] = dobject_zl4Tex_005CB0; + +#define dobject_zl4Tex_005DB0 "__OTR__objects/object_zl4/object_zl4Tex_005DB0" +static const ALIGN_ASSET(2) char object_zl4Tex_005DB0[] = dobject_zl4Tex_005DB0; + +#define dobject_zl4Tex_00D8B8 "__OTR__objects/object_zl4/object_zl4Tex_00D8B8" +static const ALIGN_ASSET(2) char object_zl4Tex_00D8B8[] = dobject_zl4Tex_00D8B8; + +#define dobject_zl4TLUT_000670 "__OTR__objects/object_zl4/object_zl4TLUT_000670" +static const ALIGN_ASSET(2) char object_zl4TLUT_000670[] = dobject_zl4TLUT_000670; + +#define dobject_zl4TLUT_000870 "__OTR__objects/object_zl4/object_zl4TLUT_000870" +static const ALIGN_ASSET(2) char object_zl4TLUT_000870[] = dobject_zl4TLUT_000870; + +#define dobject_zl4TLUT_000A70 "__OTR__objects/object_zl4/object_zl4TLUT_000A70" +static const ALIGN_ASSET(2) char object_zl4TLUT_000A70[] = dobject_zl4TLUT_000A70; + #define dgChildZeldaSkel "__OTR__objects/object_zl4/gChildZeldaSkel" static const ALIGN_ASSET(2) char gChildZeldaSkel[] = dgChildZeldaSkel; @@ -144,27 +237,6 @@ static const ALIGN_ASSET(2) char gChildZeldaCutsceneDressDL[] = dgChildZeldaCuts #define dgChildZeldaOcarinaOfTimeDL "__OTR__objects/object_zl4/gChildZeldaOcarinaOfTimeDL" static const ALIGN_ASSET(2) char gChildZeldaOcarinaOfTimeDL[] = dgChildZeldaOcarinaOfTimeDL; -#define dobject_zl4TLUT_000670 "__OTR__objects/object_zl4/object_zl4TLUT_000670" -static const ALIGN_ASSET(2) char object_zl4TLUT_000670[] = dobject_zl4TLUT_000670; - -#define dobject_zl4Tex_0017B0 "__OTR__objects/object_zl4/object_zl4Tex_0017B0" -static const ALIGN_ASSET(2) char object_zl4Tex_0017B0[] = dobject_zl4Tex_0017B0; - -#define dobject_zl4Tex_0016B0 "__OTR__objects/object_zl4/object_zl4Tex_0016B0" -static const ALIGN_ASSET(2) char object_zl4Tex_0016B0[] = dobject_zl4Tex_0016B0; - -#define dobject_zl4Tex_001BF0 "__OTR__objects/object_zl4/object_zl4Tex_001BF0" -static const ALIGN_ASSET(2) char object_zl4Tex_001BF0[] = dobject_zl4Tex_001BF0; - -#define dobject_zl4Tex_001CF0 "__OTR__objects/object_zl4/object_zl4Tex_001CF0" -static const ALIGN_ASSET(2) char object_zl4Tex_001CF0[] = dobject_zl4Tex_001CF0; - -#define dobject_zl4Tex_001DF0 "__OTR__objects/object_zl4/object_zl4Tex_001DF0" -static const ALIGN_ASSET(2) char object_zl4Tex_001DF0[] = dobject_zl4Tex_001DF0; - -#define dobject_zl4Tex_00D8B8 "__OTR__objects/object_zl4/object_zl4Tex_00D8B8" -static const ALIGN_ASSET(2) char object_zl4Tex_00D8B8[] = dobject_zl4Tex_00D8B8; - #define dgChildZeldaSkelLimbsLimb_00DF34DL_00C8D0 "__OTR__objects/object_zl4/gChildZeldaSkelLimbsLimb_00DF34DL_00C8D0" static const ALIGN_ASSET(2) char gChildZeldaSkelLimbsLimb_00DF34DL_00C8D0[] = dgChildZeldaSkelLimbsLimb_00DF34DL_00C8D0; @@ -213,76 +285,5 @@ static const ALIGN_ASSET(2) char gChildZeldaSkelLimbsLimb_00DFDCDL_00BC90[] = dg #define dgChildZeldaSkelLimbsLimb_00DFE8DL_00AFC8 "__OTR__objects/object_zl4/gChildZeldaSkelLimbsLimb_00DFE8DL_00AFC8" static const ALIGN_ASSET(2) char gChildZeldaSkelLimbsLimb_00DFE8DL_00AFC8[] = dgChildZeldaSkelLimbsLimb_00DFE8DL_00AFC8; -#define dobject_zl4Tex_000C70 "__OTR__objects/object_zl4/object_zl4Tex_000C70" -static const ALIGN_ASSET(2) char object_zl4Tex_000C70[] = dobject_zl4Tex_000C70; - -#define dobject_zl4Tex_000CB0 "__OTR__objects/object_zl4/object_zl4Tex_000CB0" -static const ALIGN_ASSET(2) char object_zl4Tex_000CB0[] = dobject_zl4Tex_000CB0; - -#define dobject_zl4Tex_000DB0 "__OTR__objects/object_zl4/object_zl4Tex_000DB0" -static const ALIGN_ASSET(2) char object_zl4Tex_000DB0[] = dobject_zl4Tex_000DB0; - -#define dobject_zl4Tex_0017F0 "__OTR__objects/object_zl4/object_zl4Tex_0017F0" -static const ALIGN_ASSET(2) char object_zl4Tex_0017F0[] = dobject_zl4Tex_0017F0; - -#define dobject_zl4Tex_0015B0 "__OTR__objects/object_zl4/object_zl4Tex_0015B0" -static const ALIGN_ASSET(2) char object_zl4Tex_0015B0[] = dobject_zl4Tex_0015B0; - -#define dobject_zl4Tex_001630 "__OTR__objects/object_zl4/object_zl4Tex_001630" -static const ALIGN_ASSET(2) char object_zl4Tex_001630[] = dobject_zl4Tex_001630; - -#define dobject_zl4Tex_0028F0 "__OTR__objects/object_zl4/object_zl4Tex_0028F0" -static const ALIGN_ASSET(2) char object_zl4Tex_0028F0[] = dobject_zl4Tex_0028F0; - -#define dobject_zl4Tex_0059F0 "__OTR__objects/object_zl4/object_zl4Tex_0059F0" -static const ALIGN_ASSET(2) char object_zl4Tex_0059F0[] = dobject_zl4Tex_0059F0; - -#define dobject_zl4Tex_005CB0 "__OTR__objects/object_zl4/object_zl4Tex_005CB0" -static const ALIGN_ASSET(2) char object_zl4Tex_005CB0[] = dobject_zl4Tex_005CB0; - -#define dobject_zl4Tex_005DB0 "__OTR__objects/object_zl4/object_zl4Tex_005DB0" -static const ALIGN_ASSET(2) char object_zl4Tex_005DB0[] = dobject_zl4Tex_005DB0; - -#define dobject_zl4Tex_005A70 "__OTR__objects/object_zl4/object_zl4Tex_005A70" -static const ALIGN_ASSET(2) char object_zl4Tex_005A70[] = dobject_zl4Tex_005A70; - -#define dobject_zl4Tex_005C70 "__OTR__objects/object_zl4/object_zl4Tex_005C70" -static const ALIGN_ASSET(2) char object_zl4Tex_005C70[] = dobject_zl4Tex_005C70; - -#define dobject_zl4Tex_0058F0 "__OTR__objects/object_zl4/object_zl4Tex_0058F0" -static const ALIGN_ASSET(2) char object_zl4Tex_0058F0[] = dobject_zl4Tex_0058F0; - -#define dobject_zl4Tex_0056F0 "__OTR__objects/object_zl4/object_zl4Tex_0056F0" -static const ALIGN_ASSET(2) char object_zl4Tex_0056F0[] = dobject_zl4Tex_0056F0; - -#define dobject_zl4Tex_001E30 "__OTR__objects/object_zl4/object_zl4Tex_001E30" -static const ALIGN_ASSET(2) char object_zl4Tex_001E30[] = dobject_zl4Tex_001E30; - -#define dobject_zl4Tex_002230 "__OTR__objects/object_zl4/object_zl4Tex_002230" -static const ALIGN_ASSET(2) char object_zl4Tex_002230[] = dobject_zl4Tex_002230; - -#define dobject_zl4Tex_002270 "__OTR__objects/object_zl4/object_zl4Tex_002270" -static const ALIGN_ASSET(2) char object_zl4Tex_002270[] = dobject_zl4Tex_002270; - -#define dobject_zl4Tex_0022F0 "__OTR__objects/object_zl4/object_zl4Tex_0022F0" -static const ALIGN_ASSET(2) char object_zl4Tex_0022F0[] = dobject_zl4Tex_0022F0; - -#define dobject_zl4Tex_0024F0 "__OTR__objects/object_zl4/object_zl4Tex_0024F0" -static const ALIGN_ASSET(2) char object_zl4Tex_0024F0[] = dobject_zl4Tex_0024F0; - -#define dobject_zl4Tex_0026F0 "__OTR__objects/object_zl4/object_zl4Tex_0026F0" -static const ALIGN_ASSET(2) char object_zl4Tex_0026F0[] = dobject_zl4Tex_0026F0; - -#define dobject_zl4Tex_002970 "__OTR__objects/object_zl4/object_zl4Tex_002970" -static const ALIGN_ASSET(2) char object_zl4Tex_002970[] = dobject_zl4Tex_002970; - -#define dobject_zl4Tex_0029F0 "__OTR__objects/object_zl4/object_zl4Tex_0029F0" -static const ALIGN_ASSET(2) char object_zl4Tex_0029F0[] = dobject_zl4Tex_0029F0; - -#define dobject_zl4TLUT_000870 "__OTR__objects/object_zl4/object_zl4TLUT_000870" -static const ALIGN_ASSET(2) char object_zl4TLUT_000870[] = dobject_zl4TLUT_000870; - -#define dobject_zl4TLUT_000A70 "__OTR__objects/object_zl4/object_zl4TLUT_000A70" -static const ALIGN_ASSET(2) char object_zl4TLUT_000A70[] = dobject_zl4TLUT_000A70; #endif // OBJECTS_OBJECT_ZL4_H diff --git a/soh/assets/overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.h b/soh/assets/overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.h index fcca66ac5..39f06f431 100644 --- a/soh/assets/overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.h +++ b/soh/assets/overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.h @@ -3,6 +3,54 @@ #include "align_asset_macro.h" +#define dovl_Boss_GanonTex_00E748 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_00E748" +static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_00E748[] = dovl_Boss_GanonTex_00E748; + +#define dovl_Boss_GanonTex_00F848 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_00F848" +static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_00F848[] = dovl_Boss_GanonTex_00F848; + +#define dovl_Boss_GanonTex_010538 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_010538" +static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_010538[] = dovl_Boss_GanonTex_010538; + +#define dovl_Boss_GanonTex_01A7B0 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01A7B0" +static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01A7B0[] = dovl_Boss_GanonTex_01A7B0; + +#define dovl_Boss_GanonTex_01AFB0 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01AFB0" +static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01AFB0[] = dovl_Boss_GanonTex_01AFB0; + +#define dovl_Boss_GanonTex_01B7B0 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01B7B0" +static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01B7B0[] = dovl_Boss_GanonTex_01B7B0; + +#define dovl_Boss_GanonTex_01C420 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01C420" +static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01C420[] = dovl_Boss_GanonTex_01C420; + +#define dovl_Boss_GanonTex_01CEB8 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01CEB8" +static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01CEB8[] = dovl_Boss_GanonTex_01CEB8; + +#define dovl_Boss_GanonTex_01D6B8 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01D6B8" +static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01D6B8[] = dovl_Boss_GanonTex_01D6B8; + +#define dovl_Boss_GanonTex_01DE88 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01DE88" +static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01DE88[] = dovl_Boss_GanonTex_01DE88; + +#define dovl_Boss_GanonTex_01E688 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01E688" +static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01E688[] = dovl_Boss_GanonTex_01E688; + +#define dovl_Boss_GanonTex_01EF90 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01EF90" +static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01EF90[] = dovl_Boss_GanonTex_01EF90; + +#define dovl_Boss_GanonTex_01FFF8 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01FFF8" +static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01FFF8[] = dovl_Boss_GanonTex_01FFF8; + +#define dovl_Boss_GanonTex_020370 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_020370" +static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_020370[] = dovl_Boss_GanonTex_020370; + +#define dovl_Boss_GanonTex_020770 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_020770" +static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_020770[] = dovl_Boss_GanonTex_020770; + +#define dovl_Boss_GanonTLUT_00F808 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTLUT_00F808" +static const ALIGN_ASSET(2) char ovl_Boss_GanonTLUT_00F808[] = dovl_Boss_GanonTLUT_00F808; + #define dgGanondorfLightning1Tex "__OTR__overlays/ovl_Boss_Ganon/gGanondorfLightning1Tex" static const ALIGN_ASSET(2) char gGanondorfLightning1Tex[] = dgGanondorfLightning1Tex; @@ -138,52 +186,4 @@ static const ALIGN_ASSET(2) char gGanondorfShockDL[] = dgGanondorfShockDL; #define dgGanondorfVortexDL "__OTR__overlays/ovl_Boss_Ganon/gGanondorfVortexDL" static const ALIGN_ASSET(2) char gGanondorfVortexDL[] = dgGanondorfVortexDL; -#define dovl_Boss_GanonTex_01EF90 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01EF90" -static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01EF90[] = dovl_Boss_GanonTex_01EF90; - -#define dovl_Boss_GanonTex_00E748 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_00E748" -static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_00E748[] = dovl_Boss_GanonTex_00E748; - -#define dovl_Boss_GanonTex_00F848 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_00F848" -static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_00F848[] = dovl_Boss_GanonTex_00F848; - -#define dovl_Boss_GanonTLUT_00F808 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTLUT_00F808" -static const ALIGN_ASSET(2) char ovl_Boss_GanonTLUT_00F808[] = dovl_Boss_GanonTLUT_00F808; - -#define dovl_Boss_GanonTex_010538 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_010538" -static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_010538[] = dovl_Boss_GanonTex_010538; - -#define dovl_Boss_GanonTex_01B7B0 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01B7B0" -static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01B7B0[] = dovl_Boss_GanonTex_01B7B0; - -#define dovl_Boss_GanonTex_01A7B0 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01A7B0" -static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01A7B0[] = dovl_Boss_GanonTex_01A7B0; - -#define dovl_Boss_GanonTex_01AFB0 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01AFB0" -static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01AFB0[] = dovl_Boss_GanonTex_01AFB0; - -#define dovl_Boss_GanonTex_01C420 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01C420" -static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01C420[] = dovl_Boss_GanonTex_01C420; - -#define dovl_Boss_GanonTex_01CEB8 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01CEB8" -static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01CEB8[] = dovl_Boss_GanonTex_01CEB8; - -#define dovl_Boss_GanonTex_01D6B8 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01D6B8" -static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01D6B8[] = dovl_Boss_GanonTex_01D6B8; - -#define dovl_Boss_GanonTex_01DE88 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01DE88" -static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01DE88[] = dovl_Boss_GanonTex_01DE88; - -#define dovl_Boss_GanonTex_01E688 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01E688" -static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01E688[] = dovl_Boss_GanonTex_01E688; - -#define dovl_Boss_GanonTex_01FFF8 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01FFF8" -static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01FFF8[] = dovl_Boss_GanonTex_01FFF8; - -#define dovl_Boss_GanonTex_020370 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_020370" -static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_020370[] = dovl_Boss_GanonTex_020370; - -#define dovl_Boss_GanonTex_020770 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_020770" -static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_020770[] = dovl_Boss_GanonTex_020770; - #endif // OVERLAYS_OVL_BOSS_GANON_H diff --git a/soh/assets/overlays/ovl_Boss_Sst/ovl_Boss_Sst.h b/soh/assets/overlays/ovl_Boss_Sst/ovl_Boss_Sst.h index cda7d6c88..47667cd51 100644 --- a/soh/assets/overlays/ovl_Boss_Sst/ovl_Boss_Sst.h +++ b/soh/assets/overlays/ovl_Boss_Sst/ovl_Boss_Sst.h @@ -3,6 +3,12 @@ #include "align_asset_macro.h" +#define dovl_Boss_SstTex_00A438 "__OTR__overlays/ovl_Boss_Sst/ovl_Boss_SstTex_00A438" +static const ALIGN_ASSET(2) char ovl_Boss_SstTex_00A438[] = dovl_Boss_SstTex_00A438; + +#define dovl_Boss_SstTex_00A8F0 "__OTR__overlays/ovl_Boss_Sst/ovl_Boss_SstTex_00A8F0" +static const ALIGN_ASSET(2) char ovl_Boss_SstTex_00A8F0[] = dovl_Boss_SstTex_00A8F0; + #define dsBodyStaticDList "__OTR__overlays/ovl_Boss_Sst/sBodyStaticDList" static const ALIGN_ASSET(2) char sBodyStaticDList[] = dsBodyStaticDList; @@ -15,10 +21,4 @@ static const ALIGN_ASSET(2) char sIntroVanishDList[] = dsIntroVanishDList; #define dsShadowDList "__OTR__overlays/ovl_Boss_Sst/sShadowDList" static const ALIGN_ASSET(2) char sShadowDList[] = dsShadowDList; -#define dovl_Boss_SstTex_00A438 "__OTR__overlays/ovl_Boss_Sst/ovl_Boss_SstTex_00A438" -static const ALIGN_ASSET(2) char ovl_Boss_SstTex_00A438[] = dovl_Boss_SstTex_00A438; - -#define dovl_Boss_SstTex_00A8F0 "__OTR__overlays/ovl_Boss_Sst/ovl_Boss_SstTex_00A8F0" -static const ALIGN_ASSET(2) char ovl_Boss_SstTex_00A8F0[] = dovl_Boss_SstTex_00A8F0; - #endif // OVERLAYS_OVL_BOSS_SST_H diff --git a/soh/assets/overlays/ovl_Demo_Shd/ovl_Demo_Shd.h b/soh/assets/overlays/ovl_Demo_Shd/ovl_Demo_Shd.h index 1c0057530..e23433e72 100644 --- a/soh/assets/overlays/ovl_Demo_Shd/ovl_Demo_Shd.h +++ b/soh/assets/overlays/ovl_Demo_Shd/ovl_Demo_Shd.h @@ -3,6 +3,12 @@ #include "align_asset_macro.h" +#define dovl_Demo_ShdTex_000450 "__OTR__overlays/ovl_Demo_Shd/ovl_Demo_ShdTex_000450" +static const ALIGN_ASSET(2) char ovl_Demo_ShdTex_000450[] = dovl_Demo_ShdTex_000450; + +#define dovl_Demo_ShdTex_000C50 "__OTR__overlays/ovl_Demo_Shd/ovl_Demo_ShdTex_000C50" +static const ALIGN_ASSET(2) char ovl_Demo_ShdTex_000C50[] = dovl_Demo_ShdTex_000C50; + #define dD_809932D0 "__OTR__overlays/ovl_Demo_Shd/D_809932D0" static const ALIGN_ASSET(2) char D_809932D0[] = dD_809932D0; @@ -12,10 +18,4 @@ static const ALIGN_ASSET(2) char D_80993390[] = dD_80993390; #define dD_809934B8 "__OTR__overlays/ovl_Demo_Shd/D_809934B8" static const ALIGN_ASSET(2) char D_809934B8[] = dD_809934B8; -#define dovl_Demo_ShdTex_000450 "__OTR__overlays/ovl_Demo_Shd/ovl_Demo_ShdTex_000450" -static const ALIGN_ASSET(2) char ovl_Demo_ShdTex_000450[] = dovl_Demo_ShdTex_000450; - -#define dovl_Demo_ShdTex_000C50 "__OTR__overlays/ovl_Demo_Shd/ovl_Demo_ShdTex_000C50" -static const ALIGN_ASSET(2) char ovl_Demo_ShdTex_000C50[] = dovl_Demo_ShdTex_000C50; - #endif // OVERLAYS_OVL_DEMO_SHD_H diff --git a/soh/assets/overlays/ovl_En_Clear_Tag/ovl_En_Clear_Tag.h b/soh/assets/overlays/ovl_En_Clear_Tag/ovl_En_Clear_Tag.h index f45fb8da3..d34eb8634 100644 --- a/soh/assets/overlays/ovl_En_Clear_Tag/ovl_En_Clear_Tag.h +++ b/soh/assets/overlays/ovl_En_Clear_Tag/ovl_En_Clear_Tag.h @@ -3,6 +3,48 @@ #include "align_asset_macro.h" +#define dovl_En_Clear_TagTex_003308 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_003308" +static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_003308[] = dovl_En_Clear_TagTex_003308; + +#define dovl_En_Clear_TagTex_003388 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_003388" +static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_003388[] = dovl_En_Clear_TagTex_003388; + +#define dovl_En_Clear_TagTex_003B88 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_003B88" +static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_003B88[] = dovl_En_Clear_TagTex_003B88; + +#define dovl_En_Clear_TagTex_004B88 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_004B88" +static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_004B88[] = dovl_En_Clear_TagTex_004B88; + +#define dovl_En_Clear_TagTex_005388 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_005388" +static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_005388[] = dovl_En_Clear_TagTex_005388; + +#define dovl_En_Clear_TagTex_005B88 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_005B88" +static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_005B88[] = dovl_En_Clear_TagTex_005B88; + +#define dovl_En_Clear_TagTex_006458 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_006458" +static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_006458[] = dovl_En_Clear_TagTex_006458; + +#define dovl_En_Clear_TagTex_006708 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_006708" +static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_006708[] = dovl_En_Clear_TagTex_006708; + +#define dovl_En_Clear_TagTex_006808 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_006808" +static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_006808[] = dovl_En_Clear_TagTex_006808; + +#define dovl_En_Clear_TagTex_006AD0 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_006AD0" +static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_006AD0[] = dovl_En_Clear_TagTex_006AD0; + +#define dovl_En_Clear_TagTex_006ED0 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_006ED0" +static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_006ED0[] = dovl_En_Clear_TagTex_006ED0; + +#define dovl_En_Clear_TagTex_0071C8 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_0071C8" +static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_0071C8[] = dovl_En_Clear_TagTex_0071C8; + +#define dovl_En_Clear_TagTex_008288 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_008288" +static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_008288[] = dovl_En_Clear_TagTex_008288; + +#define dovl_En_Clear_TagTex_008540 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_008540" +static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_008540[] = dovl_En_Clear_TagTex_008540; + #define dgArwingDL "__OTR__overlays/ovl_En_Clear_Tag/gArwingDL" static const ALIGN_ASSET(2) char gArwingDL[] = dgArwingDL; @@ -33,46 +75,4 @@ static const ALIGN_ASSET(2) char gArwingFlashEffectGroundDL[] = dgArwingFlashEff #define dgArwingShadowDL "__OTR__overlays/ovl_En_Clear_Tag/gArwingShadowDL" static const ALIGN_ASSET(2) char gArwingShadowDL[] = dgArwingShadowDL; -#define dovl_En_Clear_TagTex_003B88 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_003B88" -static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_003B88[] = dovl_En_Clear_TagTex_003B88; - -#define dovl_En_Clear_TagTex_004B88 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_004B88" -static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_004B88[] = dovl_En_Clear_TagTex_004B88; - -#define dovl_En_Clear_TagTex_003388 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_003388" -static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_003388[] = dovl_En_Clear_TagTex_003388; - -#define dovl_En_Clear_TagTex_005388 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_005388" -static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_005388[] = dovl_En_Clear_TagTex_005388; - -#define dovl_En_Clear_TagTex_005B88 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_005B88" -static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_005B88[] = dovl_En_Clear_TagTex_005B88; - -#define dovl_En_Clear_TagTex_003308 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_003308" -static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_003308[] = dovl_En_Clear_TagTex_003308; - -#define dovl_En_Clear_TagTex_006458 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_006458" -static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_006458[] = dovl_En_Clear_TagTex_006458; - -#define dovl_En_Clear_TagTex_006708 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_006708" -static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_006708[] = dovl_En_Clear_TagTex_006708; - -#define dovl_En_Clear_TagTex_006808 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_006808" -static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_006808[] = dovl_En_Clear_TagTex_006808; - -#define dovl_En_Clear_TagTex_006AD0 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_006AD0" -static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_006AD0[] = dovl_En_Clear_TagTex_006AD0; - -#define dovl_En_Clear_TagTex_006ED0 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_006ED0" -static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_006ED0[] = dovl_En_Clear_TagTex_006ED0; - -#define dovl_En_Clear_TagTex_0071C8 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_0071C8" -static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_0071C8[] = dovl_En_Clear_TagTex_0071C8; - -#define dovl_En_Clear_TagTex_008288 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_008288" -static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_008288[] = dovl_En_Clear_TagTex_008288; - -#define dovl_En_Clear_TagTex_008540 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_008540" -static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_008540[] = dovl_En_Clear_TagTex_008540; - #endif // OVERLAYS_OVL_EN_CLEAR_TAG_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_0.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_0.h index 11c516005..3bc61bac8 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_0.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_0.h @@ -3,29 +3,20 @@ #include "align_asset_macro.h" -#define dBmori1_room_0DL_005CC8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0DL_005CC8" -static const ALIGN_ASSET(2) char Bmori1_room_0DL_005CC8[] = dBmori1_room_0DL_005CC8; - -#define dBmori1_room_0Tex_00B0F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_00B0F8" -static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00B0F8[] = dBmori1_room_0Tex_00B0F8; - -#define dBmori1_room_0Tex_00C2F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_00C2F8" -static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00C2F8[] = dBmori1_room_0Tex_00C2F8; - -#define dBmori1_room_0Tex_00C0F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_00C0F8" -static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00C0F8[] = dBmori1_room_0Tex_00C0F8; - -#define dBmori1_room_0Tex_00B8F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_00B8F8" -static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00B8F8[] = dBmori1_room_0Tex_00B8F8; - -#define dBmori1_room_0Tex_0084F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_0084F8" -static const ALIGN_ASSET(2) char Bmori1_room_0Tex_0084F8[] = dBmori1_room_0Tex_0084F8; - #define dBmori1_room_0Tex_005CF8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_005CF8" static const ALIGN_ASSET(2) char Bmori1_room_0Tex_005CF8[] = dBmori1_room_0Tex_005CF8; -#define dBmori1_room_0Tex_00A0F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_00A0F8" -static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00A0F8[] = dBmori1_room_0Tex_00A0F8; +#define dBmori1_room_0Tex_0064F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_0064F8" +static const ALIGN_ASSET(2) char Bmori1_room_0Tex_0064F8[] = dBmori1_room_0Tex_0064F8; + +#define dBmori1_room_0Tex_0074F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_0074F8" +static const ALIGN_ASSET(2) char Bmori1_room_0Tex_0074F8[] = dBmori1_room_0Tex_0074F8; + +#define dBmori1_room_0Tex_007CF8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_007CF8" +static const ALIGN_ASSET(2) char Bmori1_room_0Tex_007CF8[] = dBmori1_room_0Tex_007CF8; + +#define dBmori1_room_0Tex_0084F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_0084F8" +static const ALIGN_ASSET(2) char Bmori1_room_0Tex_0084F8[] = dBmori1_room_0Tex_0084F8; #define dBmori1_room_0Tex_0088F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_0088F8" static const ALIGN_ASSET(2) char Bmori1_room_0Tex_0088F8[] = dBmori1_room_0Tex_0088F8; @@ -33,23 +24,32 @@ static const ALIGN_ASSET(2) char Bmori1_room_0Tex_0088F8[] = dBmori1_room_0Tex_0 #define dBmori1_room_0Tex_0098F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_0098F8" static const ALIGN_ASSET(2) char Bmori1_room_0Tex_0098F8[] = dBmori1_room_0Tex_0098F8; +#define dBmori1_room_0Tex_00A0F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_00A0F8" +static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00A0F8[] = dBmori1_room_0Tex_00A0F8; + +#define dBmori1_room_0Tex_00B0F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_00B0F8" +static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00B0F8[] = dBmori1_room_0Tex_00B0F8; + #define dBmori1_room_0Tex_00B4F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_00B4F8" static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00B4F8[] = dBmori1_room_0Tex_00B4F8; -#define dBmori1_room_0Tex_007CF8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_007CF8" -static const ALIGN_ASSET(2) char Bmori1_room_0Tex_007CF8[] = dBmori1_room_0Tex_007CF8; +#define dBmori1_room_0Tex_00B8F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_00B8F8" +static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00B8F8[] = dBmori1_room_0Tex_00B8F8; -#define dBmori1_room_0Tex_0074F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_0074F8" -static const ALIGN_ASSET(2) char Bmori1_room_0Tex_0074F8[] = dBmori1_room_0Tex_0074F8; +#define dBmori1_room_0Tex_00C0F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_00C0F8" +static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00C0F8[] = dBmori1_room_0Tex_00C0F8; -#define dBmori1_room_0Tex_0064F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_0064F8" -static const ALIGN_ASSET(2) char Bmori1_room_0Tex_0064F8[] = dBmori1_room_0Tex_0064F8; - -#define dBmori1_room_0DL_00CB70 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0DL_00CB70" -static const ALIGN_ASSET(2) char Bmori1_room_0DL_00CB70[] = dBmori1_room_0DL_00CB70; +#define dBmori1_room_0Tex_00C2F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_00C2F8" +static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00C2F8[] = dBmori1_room_0Tex_00C2F8; #define dBmori1_room_0Tex_00CB88 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_00CB88" static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00CB88[] = dBmori1_room_0Tex_00CB88; +#define dBmori1_room_0DL_005CC8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0DL_005CC8" +static const ALIGN_ASSET(2) char Bmori1_room_0DL_005CC8[] = dBmori1_room_0DL_005CC8; + +#define dBmori1_room_0DL_00CB70 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0DL_00CB70" +static const ALIGN_ASSET(2) char Bmori1_room_0DL_00CB70[] = dBmori1_room_0DL_00CB70; + #endif // DUNGEONS_BMORI1_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_1.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_1.h index 171ddf755..1afb24f95 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_1.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_1.h @@ -3,20 +3,20 @@ #include "align_asset_macro.h" -#define dBmori1_room_1DL_003350 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_1DL_003350" -static const ALIGN_ASSET(2) char Bmori1_room_1DL_003350[] = dBmori1_room_1DL_003350; +#define dBmori1_room_1Tex_003368 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_1Tex_003368" +static const ALIGN_ASSET(2) char Bmori1_room_1Tex_003368[] = dBmori1_room_1Tex_003368; #define dBmori1_room_1Tex_003B68 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_1Tex_003B68" static const ALIGN_ASSET(2) char Bmori1_room_1Tex_003B68[] = dBmori1_room_1Tex_003B68; -#define dBmori1_room_1Tex_003368 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_1Tex_003368" -static const ALIGN_ASSET(2) char Bmori1_room_1Tex_003368[] = dBmori1_room_1Tex_003368; +#define dBmori1_room_1Tex_004368 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_1Tex_004368" +static const ALIGN_ASSET(2) char Bmori1_room_1Tex_004368[] = dBmori1_room_1Tex_004368; #define dBmori1_room_1Tex_005368 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_1Tex_005368" static const ALIGN_ASSET(2) char Bmori1_room_1Tex_005368[] = dBmori1_room_1Tex_005368; -#define dBmori1_room_1Tex_004368 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_1Tex_004368" -static const ALIGN_ASSET(2) char Bmori1_room_1Tex_004368[] = dBmori1_room_1Tex_004368; +#define dBmori1_room_1DL_003350 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_1DL_003350" +static const ALIGN_ASSET(2) char Bmori1_room_1DL_003350[] = dBmori1_room_1DL_003350; #endif // DUNGEONS_BMORI1_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_10.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_10.h index 03c8a5410..c35a128ae 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_10.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_10.h @@ -3,17 +3,14 @@ #include "align_asset_macro.h" -#define dBmori1_room_10DL_001248 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_10DL_001248" -static const ALIGN_ASSET(2) char Bmori1_room_10DL_001248[] = dBmori1_room_10DL_001248; - -#define dBmori1_room_10Tex_002260 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_10Tex_002260" -static const ALIGN_ASSET(2) char Bmori1_room_10Tex_002260[] = dBmori1_room_10Tex_002260; +#define dBmori1_room_10Tex_001260 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_10Tex_001260" +static const ALIGN_ASSET(2) char Bmori1_room_10Tex_001260[] = dBmori1_room_10Tex_001260; #define dBmori1_room_10Tex_001A60 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_10Tex_001A60" static const ALIGN_ASSET(2) char Bmori1_room_10Tex_001A60[] = dBmori1_room_10Tex_001A60; -#define dBmori1_room_10Tex_001260 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_10Tex_001260" -static const ALIGN_ASSET(2) char Bmori1_room_10Tex_001260[] = dBmori1_room_10Tex_001260; +#define dBmori1_room_10Tex_002260 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_10Tex_002260" +static const ALIGN_ASSET(2) char Bmori1_room_10Tex_002260[] = dBmori1_room_10Tex_002260; #define dBmori1_room_10Tex_002A60 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_10Tex_002A60" static const ALIGN_ASSET(2) char Bmori1_room_10Tex_002A60[] = dBmori1_room_10Tex_002A60; @@ -21,11 +18,14 @@ static const ALIGN_ASSET(2) char Bmori1_room_10Tex_002A60[] = dBmori1_room_10Tex #define dBmori1_room_10Tex_003A60 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_10Tex_003A60" static const ALIGN_ASSET(2) char Bmori1_room_10Tex_003A60[] = dBmori1_room_10Tex_003A60; -#define dBmori1_room_10DL_004BC8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_10DL_004BC8" -static const ALIGN_ASSET(2) char Bmori1_room_10DL_004BC8[] = dBmori1_room_10DL_004BC8; - #define dBmori1_room_10Tex_004BD8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_10Tex_004BD8" static const ALIGN_ASSET(2) char Bmori1_room_10Tex_004BD8[] = dBmori1_room_10Tex_004BD8; +#define dBmori1_room_10DL_001248 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_10DL_001248" +static const ALIGN_ASSET(2) char Bmori1_room_10DL_001248[] = dBmori1_room_10DL_001248; + +#define dBmori1_room_10DL_004BC8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_10DL_004BC8" +static const ALIGN_ASSET(2) char Bmori1_room_10DL_004BC8[] = dBmori1_room_10DL_004BC8; + #endif // DUNGEONS_BMORI1_ROOM_10_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_11.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_11.h index ba6073a21..ed832b5b5 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_11.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_11.h @@ -3,11 +3,11 @@ #include "align_asset_macro.h" -#define dBmori1_room_11DL_008158 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_11DL_008158" -static const ALIGN_ASSET(2) char Bmori1_room_11DL_008158[] = dBmori1_room_11DL_008158; +#define dBmori1_room_11Tex_008198 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_11Tex_008198" +static const ALIGN_ASSET(2) char Bmori1_room_11Tex_008198[] = dBmori1_room_11Tex_008198; -#define dBmori1_room_11Tex_00A598 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_11Tex_00A598" -static const ALIGN_ASSET(2) char Bmori1_room_11Tex_00A598[] = dBmori1_room_11Tex_00A598; +#define dBmori1_room_11Tex_009198 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_11Tex_009198" +static const ALIGN_ASSET(2) char Bmori1_room_11Tex_009198[] = dBmori1_room_11Tex_009198; #define dBmori1_room_11Tex_009598 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_11Tex_009598" static const ALIGN_ASSET(2) char Bmori1_room_11Tex_009598[] = dBmori1_room_11Tex_009598; @@ -15,11 +15,11 @@ static const ALIGN_ASSET(2) char Bmori1_room_11Tex_009598[] = dBmori1_room_11Tex #define dBmori1_room_11Tex_009D98 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_11Tex_009D98" static const ALIGN_ASSET(2) char Bmori1_room_11Tex_009D98[] = dBmori1_room_11Tex_009D98; -#define dBmori1_room_11Tex_009198 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_11Tex_009198" -static const ALIGN_ASSET(2) char Bmori1_room_11Tex_009198[] = dBmori1_room_11Tex_009198; +#define dBmori1_room_11Tex_00A598 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_11Tex_00A598" +static const ALIGN_ASSET(2) char Bmori1_room_11Tex_00A598[] = dBmori1_room_11Tex_00A598; -#define dBmori1_room_11Tex_008198 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_11Tex_008198" -static const ALIGN_ASSET(2) char Bmori1_room_11Tex_008198[] = dBmori1_room_11Tex_008198; +#define dBmori1_room_11DL_008158 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_11DL_008158" +static const ALIGN_ASSET(2) char Bmori1_room_11DL_008158[] = dBmori1_room_11DL_008158; #define dBmori1_room_11DL_00ABD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_11DL_00ABD0" static const ALIGN_ASSET(2) char Bmori1_room_11DL_00ABD0[] = dBmori1_room_11DL_00ABD0; diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_12.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_12.h index 79e268611..b174b2eca 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_12.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_12.h @@ -3,35 +3,35 @@ #include "align_asset_macro.h" -#define dBmori1_room_12DL_0049E8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12DL_0049E8" -static const ALIGN_ASSET(2) char Bmori1_room_12DL_0049E8[] = dBmori1_room_12DL_0049E8; - -#define dBmori1_room_12Tex_006600 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_006600" -static const ALIGN_ASSET(2) char Bmori1_room_12Tex_006600[] = dBmori1_room_12Tex_006600; - -#define dBmori1_room_12Tex_005E00 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_005E00" -static const ALIGN_ASSET(2) char Bmori1_room_12Tex_005E00[] = dBmori1_room_12Tex_005E00; - -#define dBmori1_room_12Tex_005600 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_005600" -static const ALIGN_ASSET(2) char Bmori1_room_12Tex_005600[] = dBmori1_room_12Tex_005600; - -#define dBmori1_room_12Tex_006E00 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_006E00" -static const ALIGN_ASSET(2) char Bmori1_room_12Tex_006E00[] = dBmori1_room_12Tex_006E00; +#define dBmori1_room_12Tex_004A00 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_004A00" +static const ALIGN_ASSET(2) char Bmori1_room_12Tex_004A00[] = dBmori1_room_12Tex_004A00; #define dBmori1_room_12Tex_004E00 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_004E00" static const ALIGN_ASSET(2) char Bmori1_room_12Tex_004E00[] = dBmori1_room_12Tex_004E00; -#define dBmori1_room_12Tex_004A00 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_004A00" -static const ALIGN_ASSET(2) char Bmori1_room_12Tex_004A00[] = dBmori1_room_12Tex_004A00; +#define dBmori1_room_12Tex_005600 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_005600" +static const ALIGN_ASSET(2) char Bmori1_room_12Tex_005600[] = dBmori1_room_12Tex_005600; + +#define dBmori1_room_12Tex_005E00 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_005E00" +static const ALIGN_ASSET(2) char Bmori1_room_12Tex_005E00[] = dBmori1_room_12Tex_005E00; + +#define dBmori1_room_12Tex_006600 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_006600" +static const ALIGN_ASSET(2) char Bmori1_room_12Tex_006600[] = dBmori1_room_12Tex_006600; + +#define dBmori1_room_12Tex_006E00 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_006E00" +static const ALIGN_ASSET(2) char Bmori1_room_12Tex_006E00[] = dBmori1_room_12Tex_006E00; #define dBmori1_room_12Tex_007200 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_007200" static const ALIGN_ASSET(2) char Bmori1_room_12Tex_007200[] = dBmori1_room_12Tex_007200; -#define dBmori1_room_12DL_007BC8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12DL_007BC8" -static const ALIGN_ASSET(2) char Bmori1_room_12DL_007BC8[] = dBmori1_room_12DL_007BC8; - #define dBmori1_room_12Tex_007BD8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_007BD8" static const ALIGN_ASSET(2) char Bmori1_room_12Tex_007BD8[] = dBmori1_room_12Tex_007BD8; +#define dBmori1_room_12DL_0049E8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12DL_0049E8" +static const ALIGN_ASSET(2) char Bmori1_room_12DL_0049E8[] = dBmori1_room_12DL_0049E8; + +#define dBmori1_room_12DL_007BC8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12DL_007BC8" +static const ALIGN_ASSET(2) char Bmori1_room_12DL_007BC8[] = dBmori1_room_12DL_007BC8; + #endif // DUNGEONS_BMORI1_ROOM_12_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_13.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_13.h index eab7767d3..cf8314bcf 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_13.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_13.h @@ -3,35 +3,35 @@ #include "align_asset_macro.h" -#define dBmori1_room_13DL_004CB8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13DL_004CB8" -static const ALIGN_ASSET(2) char Bmori1_room_13DL_004CB8[] = dBmori1_room_13DL_004CB8; - -#define dBmori1_room_13Tex_006CD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13Tex_006CD0" -static const ALIGN_ASSET(2) char Bmori1_room_13Tex_006CD0[] = dBmori1_room_13Tex_006CD0; - -#define dBmori1_room_13Tex_0064D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13Tex_0064D0" -static const ALIGN_ASSET(2) char Bmori1_room_13Tex_0064D0[] = dBmori1_room_13Tex_0064D0; - -#define dBmori1_room_13Tex_005CD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13Tex_005CD0" -static const ALIGN_ASSET(2) char Bmori1_room_13Tex_005CD0[] = dBmori1_room_13Tex_005CD0; +#define dBmori1_room_13Tex_004CD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13Tex_004CD0" +static const ALIGN_ASSET(2) char Bmori1_room_13Tex_004CD0[] = dBmori1_room_13Tex_004CD0; #define dBmori1_room_13Tex_0054D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13Tex_0054D0" static const ALIGN_ASSET(2) char Bmori1_room_13Tex_0054D0[] = dBmori1_room_13Tex_0054D0; +#define dBmori1_room_13Tex_005CD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13Tex_005CD0" +static const ALIGN_ASSET(2) char Bmori1_room_13Tex_005CD0[] = dBmori1_room_13Tex_005CD0; + +#define dBmori1_room_13Tex_0064D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13Tex_0064D0" +static const ALIGN_ASSET(2) char Bmori1_room_13Tex_0064D0[] = dBmori1_room_13Tex_0064D0; + +#define dBmori1_room_13Tex_006CD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13Tex_006CD0" +static const ALIGN_ASSET(2) char Bmori1_room_13Tex_006CD0[] = dBmori1_room_13Tex_006CD0; + #define dBmori1_room_13Tex_0074D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13Tex_0074D0" static const ALIGN_ASSET(2) char Bmori1_room_13Tex_0074D0[] = dBmori1_room_13Tex_0074D0; -#define dBmori1_room_13Tex_004CD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13Tex_004CD0" -static const ALIGN_ASSET(2) char Bmori1_room_13Tex_004CD0[] = dBmori1_room_13Tex_004CD0; - #define dBmori1_room_13Tex_0078D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13Tex_0078D0" static const ALIGN_ASSET(2) char Bmori1_room_13Tex_0078D0[] = dBmori1_room_13Tex_0078D0; -#define dBmori1_room_13DL_008298 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13DL_008298" -static const ALIGN_ASSET(2) char Bmori1_room_13DL_008298[] = dBmori1_room_13DL_008298; - #define dBmori1_room_13Tex_0082A8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13Tex_0082A8" static const ALIGN_ASSET(2) char Bmori1_room_13Tex_0082A8[] = dBmori1_room_13Tex_0082A8; +#define dBmori1_room_13DL_004CB8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13DL_004CB8" +static const ALIGN_ASSET(2) char Bmori1_room_13DL_004CB8[] = dBmori1_room_13DL_004CB8; + +#define dBmori1_room_13DL_008298 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13DL_008298" +static const ALIGN_ASSET(2) char Bmori1_room_13DL_008298[] = dBmori1_room_13DL_008298; + #endif // DUNGEONS_BMORI1_ROOM_13_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_14.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_14.h index 5e8abdcd7..5953a9113 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_14.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_14.h @@ -3,29 +3,29 @@ #include "align_asset_macro.h" -#define dBmori1_room_14DL_003520 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14DL_003520" -static const ALIGN_ASSET(2) char Bmori1_room_14DL_003520[] = dBmori1_room_14DL_003520; - #define dBmori1_room_14Tex_003560 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14Tex_003560" static const ALIGN_ASSET(2) char Bmori1_room_14Tex_003560[] = dBmori1_room_14Tex_003560; -#define dBmori1_room_14Tex_004D60 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14Tex_004D60" -static const ALIGN_ASSET(2) char Bmori1_room_14Tex_004D60[] = dBmori1_room_14Tex_004D60; - -#define dBmori1_room_14Tex_004960 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14Tex_004960" -static const ALIGN_ASSET(2) char Bmori1_room_14Tex_004960[] = dBmori1_room_14Tex_004960; - -#define dBmori1_room_14Tex_004160 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14Tex_004160" -static const ALIGN_ASSET(2) char Bmori1_room_14Tex_004160[] = dBmori1_room_14Tex_004160; - #define dBmori1_room_14Tex_003960 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14Tex_003960" static const ALIGN_ASSET(2) char Bmori1_room_14Tex_003960[] = dBmori1_room_14Tex_003960; -#define dBmori1_room_14DL_005760 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14DL_005760" -static const ALIGN_ASSET(2) char Bmori1_room_14DL_005760[] = dBmori1_room_14DL_005760; +#define dBmori1_room_14Tex_004160 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14Tex_004160" +static const ALIGN_ASSET(2) char Bmori1_room_14Tex_004160[] = dBmori1_room_14Tex_004160; + +#define dBmori1_room_14Tex_004960 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14Tex_004960" +static const ALIGN_ASSET(2) char Bmori1_room_14Tex_004960[] = dBmori1_room_14Tex_004960; + +#define dBmori1_room_14Tex_004D60 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14Tex_004D60" +static const ALIGN_ASSET(2) char Bmori1_room_14Tex_004D60[] = dBmori1_room_14Tex_004D60; #define dBmori1_room_14Tex_005770 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14Tex_005770" static const ALIGN_ASSET(2) char Bmori1_room_14Tex_005770[] = dBmori1_room_14Tex_005770; +#define dBmori1_room_14DL_003520 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14DL_003520" +static const ALIGN_ASSET(2) char Bmori1_room_14DL_003520[] = dBmori1_room_14DL_003520; + +#define dBmori1_room_14DL_005760 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14DL_005760" +static const ALIGN_ASSET(2) char Bmori1_room_14DL_005760[] = dBmori1_room_14DL_005760; + #endif // DUNGEONS_BMORI1_ROOM_14_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_15.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_15.h index 3937419fb..af57d0da5 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_15.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_15.h @@ -3,9 +3,6 @@ #include "align_asset_macro.h" -#define dBmori1_room_15DL_0012D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_15DL_0012D0" -static const ALIGN_ASSET(2) char Bmori1_room_15DL_0012D0[] = dBmori1_room_15DL_0012D0; - #define dBmori1_room_15Tex_0012E0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_15Tex_0012E0" static const ALIGN_ASSET(2) char Bmori1_room_15Tex_0012E0[] = dBmori1_room_15Tex_0012E0; @@ -15,5 +12,8 @@ static const ALIGN_ASSET(2) char Bmori1_room_15Tex_001AE0[] = dBmori1_room_15Tex #define dBmori1_room_15Tex_001EE0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_15Tex_001EE0" static const ALIGN_ASSET(2) char Bmori1_room_15Tex_001EE0[] = dBmori1_room_15Tex_001EE0; +#define dBmori1_room_15DL_0012D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_15DL_0012D0" +static const ALIGN_ASSET(2) char Bmori1_room_15DL_0012D0[] = dBmori1_room_15DL_0012D0; + #endif // DUNGEONS_BMORI1_ROOM_15_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_16.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_16.h index 183a557b9..1f0a91e10 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_16.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_16.h @@ -3,8 +3,11 @@ #include "align_asset_macro.h" -#define dBmori1_room_16DL_002F88 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_16DL_002F88" -static const ALIGN_ASSET(2) char Bmori1_room_16DL_002F88[] = dBmori1_room_16DL_002F88; +#define dBmori1_room_16Tex_002F98 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_16Tex_002F98" +static const ALIGN_ASSET(2) char Bmori1_room_16Tex_002F98[] = dBmori1_room_16Tex_002F98; + +#define dBmori1_room_16Tex_003798 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_16Tex_003798" +static const ALIGN_ASSET(2) char Bmori1_room_16Tex_003798[] = dBmori1_room_16Tex_003798; #define dBmori1_room_16Tex_003F98 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_16Tex_003F98" static const ALIGN_ASSET(2) char Bmori1_room_16Tex_003F98[] = dBmori1_room_16Tex_003F98; @@ -15,11 +18,8 @@ static const ALIGN_ASSET(2) char Bmori1_room_16Tex_004398[] = dBmori1_room_16Tex #define dBmori1_room_16Tex_004798 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_16Tex_004798" static const ALIGN_ASSET(2) char Bmori1_room_16Tex_004798[] = dBmori1_room_16Tex_004798; -#define dBmori1_room_16Tex_002F98 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_16Tex_002F98" -static const ALIGN_ASSET(2) char Bmori1_room_16Tex_002F98[] = dBmori1_room_16Tex_002F98; - -#define dBmori1_room_16Tex_003798 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_16Tex_003798" -static const ALIGN_ASSET(2) char Bmori1_room_16Tex_003798[] = dBmori1_room_16Tex_003798; +#define dBmori1_room_16DL_002F88 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_16DL_002F88" +static const ALIGN_ASSET(2) char Bmori1_room_16DL_002F88[] = dBmori1_room_16DL_002F88; #endif // DUNGEONS_BMORI1_ROOM_16_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_17.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_17.h index 76784d887..ffb1c47d0 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_17.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_17.h @@ -3,18 +3,6 @@ #include "align_asset_macro.h" -#define dBmori1_room_17DL_006490 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_17DL_006490" -static const ALIGN_ASSET(2) char Bmori1_room_17DL_006490[] = dBmori1_room_17DL_006490; - -#define dBmori1_room_17Tex_007CE8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_17Tex_007CE8" -static const ALIGN_ASSET(2) char Bmori1_room_17Tex_007CE8[] = dBmori1_room_17Tex_007CE8; - -#define dBmori1_room_17Tex_0080E8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_17Tex_0080E8" -static const ALIGN_ASSET(2) char Bmori1_room_17Tex_0080E8[] = dBmori1_room_17Tex_0080E8; - -#define dBmori1_room_17Tex_0088E8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_17Tex_0088E8" -static const ALIGN_ASSET(2) char Bmori1_room_17Tex_0088E8[] = dBmori1_room_17Tex_0088E8; - #define dBmori1_room_17Tex_0064E8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_17Tex_0064E8" static const ALIGN_ASSET(2) char Bmori1_room_17Tex_0064E8[] = dBmori1_room_17Tex_0064E8; @@ -27,5 +15,17 @@ static const ALIGN_ASSET(2) char Bmori1_room_17Tex_0074E8[] = dBmori1_room_17Tex #define dBmori1_room_17Tex_0078E8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_17Tex_0078E8" static const ALIGN_ASSET(2) char Bmori1_room_17Tex_0078E8[] = dBmori1_room_17Tex_0078E8; +#define dBmori1_room_17Tex_007CE8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_17Tex_007CE8" +static const ALIGN_ASSET(2) char Bmori1_room_17Tex_007CE8[] = dBmori1_room_17Tex_007CE8; + +#define dBmori1_room_17Tex_0080E8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_17Tex_0080E8" +static const ALIGN_ASSET(2) char Bmori1_room_17Tex_0080E8[] = dBmori1_room_17Tex_0080E8; + +#define dBmori1_room_17Tex_0088E8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_17Tex_0088E8" +static const ALIGN_ASSET(2) char Bmori1_room_17Tex_0088E8[] = dBmori1_room_17Tex_0088E8; + +#define dBmori1_room_17DL_006490 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_17DL_006490" +static const ALIGN_ASSET(2) char Bmori1_room_17DL_006490[] = dBmori1_room_17DL_006490; + #endif // DUNGEONS_BMORI1_ROOM_17_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_18.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_18.h index fbe628da8..14f26f539 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_18.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_18.h @@ -3,11 +3,11 @@ #include "align_asset_macro.h" -#define dBmori1_room_18DL_000B20 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_18DL_000B20" -static const ALIGN_ASSET(2) char Bmori1_room_18DL_000B20[] = dBmori1_room_18DL_000B20; - #define dBmori1_room_18Tex_000B30 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_18Tex_000B30" static const ALIGN_ASSET(2) char Bmori1_room_18Tex_000B30[] = dBmori1_room_18Tex_000B30; +#define dBmori1_room_18DL_000B20 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_18DL_000B20" +static const ALIGN_ASSET(2) char Bmori1_room_18DL_000B20[] = dBmori1_room_18DL_000B20; + #endif // DUNGEONS_BMORI1_ROOM_18_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_2.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_2.h index 120300dec..0de35f717 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_2.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_2.h @@ -3,41 +3,41 @@ #include "align_asset_macro.h" -#define dBmori1_room_2DL_00A328 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2DL_00A328" -static const ALIGN_ASSET(2) char Bmori1_room_2DL_00A328[] = dBmori1_room_2DL_00A328; - #define dBmori1_room_2Tex_00A380 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00A380" static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00A380[] = dBmori1_room_2Tex_00A380; -#define dBmori1_room_2Tex_00F180 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00F180" -static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00F180[] = dBmori1_room_2Tex_00F180; - -#define dBmori1_room_2Tex_00DD80 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00DD80" -static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00DD80[] = dBmori1_room_2Tex_00DD80; - #define dBmori1_room_2Tex_00AB80 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00AB80" static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00AB80[] = dBmori1_room_2Tex_00AB80; -#define dBmori1_room_2Tex_00DB80 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00DB80" -static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00DB80[] = dBmori1_room_2Tex_00DB80; - -#define dBmori1_room_2Tex_00E580 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00E580" -static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00E580[] = dBmori1_room_2Tex_00E580; - -#define dBmori1_room_2Tex_00D380 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00D380" -static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00D380[] = dBmori1_room_2Tex_00D380; - -#define dBmori1_room_2Tex_00CF80 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00CF80" -static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00CF80[] = dBmori1_room_2Tex_00CF80; +#define dBmori1_room_2Tex_00AF80 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00AF80" +static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00AF80[] = dBmori1_room_2Tex_00AF80; #define dBmori1_room_2Tex_00BF80 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00BF80" static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00BF80[] = dBmori1_room_2Tex_00BF80; -#define dBmori1_room_2Tex_00AF80 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00AF80" -static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00AF80[] = dBmori1_room_2Tex_00AF80; +#define dBmori1_room_2Tex_00CF80 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00CF80" +static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00CF80[] = dBmori1_room_2Tex_00CF80; + +#define dBmori1_room_2Tex_00D380 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00D380" +static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00D380[] = dBmori1_room_2Tex_00D380; + +#define dBmori1_room_2Tex_00DB80 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00DB80" +static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00DB80[] = dBmori1_room_2Tex_00DB80; + +#define dBmori1_room_2Tex_00DD80 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00DD80" +static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00DD80[] = dBmori1_room_2Tex_00DD80; + +#define dBmori1_room_2Tex_00E580 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00E580" +static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00E580[] = dBmori1_room_2Tex_00E580; #define dBmori1_room_2Tex_00E980 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00E980" static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00E980[] = dBmori1_room_2Tex_00E980; +#define dBmori1_room_2Tex_00F180 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00F180" +static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00F180[] = dBmori1_room_2Tex_00F180; + +#define dBmori1_room_2DL_00A328 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2DL_00A328" +static const ALIGN_ASSET(2) char Bmori1_room_2DL_00A328[] = dBmori1_room_2DL_00A328; + #endif // DUNGEONS_BMORI1_ROOM_2_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_20.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_20.h index 5562713f7..e5889975c 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_20.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_20.h @@ -3,14 +3,14 @@ #include "align_asset_macro.h" -#define dBmori1_room_20DL_0006E8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_20DL_0006E8" -static const ALIGN_ASSET(2) char Bmori1_room_20DL_0006E8[] = dBmori1_room_20DL_0006E8; - #define dBmori1_room_20Tex_0006F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_20Tex_0006F8" static const ALIGN_ASSET(2) char Bmori1_room_20Tex_0006F8[] = dBmori1_room_20Tex_0006F8; #define dBmori1_room_20Tex_000EF8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_20Tex_000EF8" static const ALIGN_ASSET(2) char Bmori1_room_20Tex_000EF8[] = dBmori1_room_20Tex_000EF8; +#define dBmori1_room_20DL_0006E8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_20DL_0006E8" +static const ALIGN_ASSET(2) char Bmori1_room_20DL_0006E8[] = dBmori1_room_20DL_0006E8; + #endif // DUNGEONS_BMORI1_ROOM_20_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_21.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_21.h index 6ea485025..15800c8ed 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_21.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_21.h @@ -3,11 +3,11 @@ #include "align_asset_macro.h" -#define dBmori1_room_21DL_000F60 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_21DL_000F60" -static const ALIGN_ASSET(2) char Bmori1_room_21DL_000F60[] = dBmori1_room_21DL_000F60; - #define dBmori1_room_21Tex_000F70 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_21Tex_000F70" static const ALIGN_ASSET(2) char Bmori1_room_21Tex_000F70[] = dBmori1_room_21Tex_000F70; +#define dBmori1_room_21DL_000F60 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_21DL_000F60" +static const ALIGN_ASSET(2) char Bmori1_room_21DL_000F60[] = dBmori1_room_21DL_000F60; + #endif // DUNGEONS_BMORI1_ROOM_21_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_22.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_22.h index 0561ec526..e10c5cb27 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_22.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_22.h @@ -3,14 +3,14 @@ #include "align_asset_macro.h" -#define dBmori1_room_22DL_0005D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_22DL_0005D0" -static const ALIGN_ASSET(2) char Bmori1_room_22DL_0005D0[] = dBmori1_room_22DL_0005D0; - #define dBmori1_room_22Tex_0005E0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_22Tex_0005E0" static const ALIGN_ASSET(2) char Bmori1_room_22Tex_0005E0[] = dBmori1_room_22Tex_0005E0; #define dBmori1_room_22Tex_0015E0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_22Tex_0015E0" static const ALIGN_ASSET(2) char Bmori1_room_22Tex_0015E0[] = dBmori1_room_22Tex_0015E0; +#define dBmori1_room_22DL_0005D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_22DL_0005D0" +static const ALIGN_ASSET(2) char Bmori1_room_22DL_0005D0[] = dBmori1_room_22DL_0005D0; + #endif // DUNGEONS_BMORI1_ROOM_22_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_3.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_3.h index 94c9a2d4a..d2173d3d5 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_3.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_3.h @@ -3,23 +3,23 @@ #include "align_asset_macro.h" -#define dBmori1_room_3DL_0023B8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_3DL_0023B8" -static const ALIGN_ASSET(2) char Bmori1_room_3DL_0023B8[] = dBmori1_room_3DL_0023B8; - -#define dBmori1_room_3Tex_0033D8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_3Tex_0033D8" -static const ALIGN_ASSET(2) char Bmori1_room_3Tex_0033D8[] = dBmori1_room_3Tex_0033D8; - #define dBmori1_room_3Tex_0023D8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_3Tex_0023D8" static const ALIGN_ASSET(2) char Bmori1_room_3Tex_0023D8[] = dBmori1_room_3Tex_0023D8; #define dBmori1_room_3Tex_002BD8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_3Tex_002BD8" static const ALIGN_ASSET(2) char Bmori1_room_3Tex_002BD8[] = dBmori1_room_3Tex_002BD8; +#define dBmori1_room_3Tex_0033D8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_3Tex_0033D8" +static const ALIGN_ASSET(2) char Bmori1_room_3Tex_0033D8[] = dBmori1_room_3Tex_0033D8; + #define dBmori1_room_3Tex_0037D8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_3Tex_0037D8" static const ALIGN_ASSET(2) char Bmori1_room_3Tex_0037D8[] = dBmori1_room_3Tex_0037D8; #define dBmori1_room_3Tex_0038D8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_3Tex_0038D8" static const ALIGN_ASSET(2) char Bmori1_room_3Tex_0038D8[] = dBmori1_room_3Tex_0038D8; +#define dBmori1_room_3DL_0023B8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_3DL_0023B8" +static const ALIGN_ASSET(2) char Bmori1_room_3DL_0023B8[] = dBmori1_room_3DL_0023B8; + #endif // DUNGEONS_BMORI1_ROOM_3_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_4.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_4.h index d061768f9..859fd0a59 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_4.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_4.h @@ -3,14 +3,14 @@ #include "align_asset_macro.h" -#define dBmori1_room_4DL_0022A8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_4DL_0022A8" -static const ALIGN_ASSET(2) char Bmori1_room_4DL_0022A8[] = dBmori1_room_4DL_0022A8; +#define dBmori1_room_4Tex_0022B8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_4Tex_0022B8" +static const ALIGN_ASSET(2) char Bmori1_room_4Tex_0022B8[] = dBmori1_room_4Tex_0022B8; #define dBmori1_room_4Tex_002AB8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_4Tex_002AB8" static const ALIGN_ASSET(2) char Bmori1_room_4Tex_002AB8[] = dBmori1_room_4Tex_002AB8; -#define dBmori1_room_4Tex_0022B8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_4Tex_0022B8" -static const ALIGN_ASSET(2) char Bmori1_room_4Tex_0022B8[] = dBmori1_room_4Tex_0022B8; +#define dBmori1_room_4DL_0022A8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_4DL_0022A8" +static const ALIGN_ASSET(2) char Bmori1_room_4DL_0022A8[] = dBmori1_room_4DL_0022A8; #endif // DUNGEONS_BMORI1_ROOM_4_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_5.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_5.h index 383d0d20b..10f5e6225 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_5.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_5.h @@ -3,23 +3,23 @@ #include "align_asset_macro.h" -#define dBmori1_room_5DL_0023B0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_5DL_0023B0" -static const ALIGN_ASSET(2) char Bmori1_room_5DL_0023B0[] = dBmori1_room_5DL_0023B0; - -#define dBmori1_room_5Tex_002FD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_5Tex_002FD0" -static const ALIGN_ASSET(2) char Bmori1_room_5Tex_002FD0[] = dBmori1_room_5Tex_002FD0; - #define dBmori1_room_5Tex_0023D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_5Tex_0023D0" static const ALIGN_ASSET(2) char Bmori1_room_5Tex_0023D0[] = dBmori1_room_5Tex_0023D0; #define dBmori1_room_5Tex_0027D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_5Tex_0027D0" static const ALIGN_ASSET(2) char Bmori1_room_5Tex_0027D0[] = dBmori1_room_5Tex_0027D0; -#define dBmori1_room_5Tex_0034D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_5Tex_0034D0" -static const ALIGN_ASSET(2) char Bmori1_room_5Tex_0034D0[] = dBmori1_room_5Tex_0034D0; +#define dBmori1_room_5Tex_002FD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_5Tex_002FD0" +static const ALIGN_ASSET(2) char Bmori1_room_5Tex_002FD0[] = dBmori1_room_5Tex_002FD0; #define dBmori1_room_5Tex_0033D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_5Tex_0033D0" static const ALIGN_ASSET(2) char Bmori1_room_5Tex_0033D0[] = dBmori1_room_5Tex_0033D0; +#define dBmori1_room_5Tex_0034D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_5Tex_0034D0" +static const ALIGN_ASSET(2) char Bmori1_room_5Tex_0034D0[] = dBmori1_room_5Tex_0034D0; + +#define dBmori1_room_5DL_0023B0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_5DL_0023B0" +static const ALIGN_ASSET(2) char Bmori1_room_5DL_0023B0[] = dBmori1_room_5DL_0023B0; + #endif // DUNGEONS_BMORI1_ROOM_5_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_6.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_6.h index 069b8a998..6a1d9132a 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_6.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_6.h @@ -3,29 +3,29 @@ #include "align_asset_macro.h" -#define dBmori1_room_6DL_0065D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_6DL_0065D0" -static const ALIGN_ASSET(2) char Bmori1_room_6DL_0065D0[] = dBmori1_room_6DL_0065D0; +#define dBmori1_room_6Tex_006630 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_6Tex_006630" +static const ALIGN_ASSET(2) char Bmori1_room_6Tex_006630[] = dBmori1_room_6Tex_006630; #define dBmori1_room_6Tex_006E30 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_6Tex_006E30" static const ALIGN_ASSET(2) char Bmori1_room_6Tex_006E30[] = dBmori1_room_6Tex_006E30; +#define dBmori1_room_6Tex_007630 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_6Tex_007630" +static const ALIGN_ASSET(2) char Bmori1_room_6Tex_007630[] = dBmori1_room_6Tex_007630; + +#define dBmori1_room_6Tex_007A30 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_6Tex_007A30" +static const ALIGN_ASSET(2) char Bmori1_room_6Tex_007A30[] = dBmori1_room_6Tex_007A30; + #define dBmori1_room_6Tex_008230 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_6Tex_008230" static const ALIGN_ASSET(2) char Bmori1_room_6Tex_008230[] = dBmori1_room_6Tex_008230; #define dBmori1_room_6Tex_008A30 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_6Tex_008A30" static const ALIGN_ASSET(2) char Bmori1_room_6Tex_008A30[] = dBmori1_room_6Tex_008A30; -#define dBmori1_room_6Tex_007A30 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_6Tex_007A30" -static const ALIGN_ASSET(2) char Bmori1_room_6Tex_007A30[] = dBmori1_room_6Tex_007A30; - #define dBmori1_room_6Tex_008C30 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_6Tex_008C30" static const ALIGN_ASSET(2) char Bmori1_room_6Tex_008C30[] = dBmori1_room_6Tex_008C30; -#define dBmori1_room_6Tex_006630 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_6Tex_006630" -static const ALIGN_ASSET(2) char Bmori1_room_6Tex_006630[] = dBmori1_room_6Tex_006630; - -#define dBmori1_room_6Tex_007630 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_6Tex_007630" -static const ALIGN_ASSET(2) char Bmori1_room_6Tex_007630[] = dBmori1_room_6Tex_007630; +#define dBmori1_room_6DL_0065D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_6DL_0065D0" +static const ALIGN_ASSET(2) char Bmori1_room_6DL_0065D0[] = dBmori1_room_6DL_0065D0; #endif // DUNGEONS_BMORI1_ROOM_6_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_7.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_7.h index f792aac57..1843e4e0c 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_7.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_7.h @@ -3,23 +3,11 @@ #include "align_asset_macro.h" -#define dBmori1_room_7DL_007D88 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7DL_007D88" -static const ALIGN_ASSET(2) char Bmori1_room_7DL_007D88[] = dBmori1_room_7DL_007D88; +#define dBmori1_room_7Tex_007DD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_007DD0" +static const ALIGN_ASSET(2) char Bmori1_room_7Tex_007DD0[] = dBmori1_room_7Tex_007DD0; -#define dBmori1_room_7Tex_009DD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_009DD0" -static const ALIGN_ASSET(2) char Bmori1_room_7Tex_009DD0[] = dBmori1_room_7Tex_009DD0; - -#define dBmori1_room_7Tex_00CDD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00CDD0" -static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00CDD0[] = dBmori1_room_7Tex_00CDD0; - -#define dBmori1_room_7Tex_00ADD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00ADD0" -static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00ADD0[] = dBmori1_room_7Tex_00ADD0; - -#define dBmori1_room_7Tex_00A5D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00A5D0" -static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00A5D0[] = dBmori1_room_7Tex_00A5D0; - -#define dBmori1_room_7Tex_00B5D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00B5D0" -static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00B5D0[] = dBmori1_room_7Tex_00B5D0; +#define dBmori1_room_7Tex_0085D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_0085D0" +static const ALIGN_ASSET(2) char Bmori1_room_7Tex_0085D0[] = dBmori1_room_7Tex_0085D0; #define dBmori1_room_7Tex_008DD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_008DD0" static const ALIGN_ASSET(2) char Bmori1_room_7Tex_008DD0[] = dBmori1_room_7Tex_008DD0; @@ -30,35 +18,47 @@ static const ALIGN_ASSET(2) char Bmori1_room_7Tex_0091D0[] = dBmori1_room_7Tex_0 #define dBmori1_room_7Tex_0095D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_0095D0" static const ALIGN_ASSET(2) char Bmori1_room_7Tex_0095D0[] = dBmori1_room_7Tex_0095D0; -#define dBmori1_room_7Tex_0085D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_0085D0" -static const ALIGN_ASSET(2) char Bmori1_room_7Tex_0085D0[] = dBmori1_room_7Tex_0085D0; +#define dBmori1_room_7Tex_009DD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_009DD0" +static const ALIGN_ASSET(2) char Bmori1_room_7Tex_009DD0[] = dBmori1_room_7Tex_009DD0; + +#define dBmori1_room_7Tex_00A5D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00A5D0" +static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00A5D0[] = dBmori1_room_7Tex_00A5D0; + +#define dBmori1_room_7Tex_00ADD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00ADD0" +static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00ADD0[] = dBmori1_room_7Tex_00ADD0; + +#define dBmori1_room_7Tex_00B5D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00B5D0" +static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00B5D0[] = dBmori1_room_7Tex_00B5D0; #define dBmori1_room_7Tex_00BDD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00BDD0" static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00BDD0[] = dBmori1_room_7Tex_00BDD0; -#define dBmori1_room_7Tex_007DD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_007DD0" -static const ALIGN_ASSET(2) char Bmori1_room_7Tex_007DD0[] = dBmori1_room_7Tex_007DD0; +#define dBmori1_room_7Tex_00CDD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00CDD0" +static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00CDD0[] = dBmori1_room_7Tex_00CDD0; #define dBmori1_room_7Tex_00DDD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00DDD0" static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00DDD0[] = dBmori1_room_7Tex_00DDD0; -#define dBmori1_room_7DL_00EFA8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7DL_00EFA8" -static const ALIGN_ASSET(2) char Bmori1_room_7DL_00EFA8[] = dBmori1_room_7DL_00EFA8; - -#define dBmori1_room_7Tex_0117D8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_0117D8" -static const ALIGN_ASSET(2) char Bmori1_room_7Tex_0117D8[] = dBmori1_room_7Tex_0117D8; +#define dBmori1_room_7Tex_00EFD8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00EFD8" +static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00EFD8[] = dBmori1_room_7Tex_00EFD8; #define dBmori1_room_7Tex_00FFD8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00FFD8" static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00FFD8[] = dBmori1_room_7Tex_00FFD8; -#define dBmori1_room_7Tex_011FD8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_011FD8" -static const ALIGN_ASSET(2) char Bmori1_room_7Tex_011FD8[] = dBmori1_room_7Tex_011FD8; - -#define dBmori1_room_7Tex_00EFD8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00EFD8" -static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00EFD8[] = dBmori1_room_7Tex_00EFD8; - #define dBmori1_room_7Tex_010FD8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_010FD8" static const ALIGN_ASSET(2) char Bmori1_room_7Tex_010FD8[] = dBmori1_room_7Tex_010FD8; +#define dBmori1_room_7Tex_0117D8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_0117D8" +static const ALIGN_ASSET(2) char Bmori1_room_7Tex_0117D8[] = dBmori1_room_7Tex_0117D8; + +#define dBmori1_room_7Tex_011FD8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_011FD8" +static const ALIGN_ASSET(2) char Bmori1_room_7Tex_011FD8[] = dBmori1_room_7Tex_011FD8; + +#define dBmori1_room_7DL_007D88 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7DL_007D88" +static const ALIGN_ASSET(2) char Bmori1_room_7DL_007D88[] = dBmori1_room_7DL_007D88; + +#define dBmori1_room_7DL_00EFA8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7DL_00EFA8" +static const ALIGN_ASSET(2) char Bmori1_room_7DL_00EFA8[] = dBmori1_room_7DL_00EFA8; + #endif // DUNGEONS_BMORI1_ROOM_7_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_8.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_8.h index 41411aa8c..d3cb39b8d 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_8.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_8.h @@ -3,59 +3,50 @@ #include "align_asset_macro.h" -#define dBmori1_room_8DL_00ABB0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8DL_00ABB0" -static const ALIGN_ASSET(2) char Bmori1_room_8DL_00ABB0[] = dBmori1_room_8DL_00ABB0; - #define dBmori1_room_8Tex_00AC10 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00AC10" static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00AC10[] = dBmori1_room_8Tex_00AC10; -#define dBmori1_room_8Tex_010810 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_010810" -static const ALIGN_ASSET(2) char Bmori1_room_8Tex_010810[] = dBmori1_room_8Tex_010810; - -#define dBmori1_room_8Tex_00E010 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00E010" -static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00E010[] = dBmori1_room_8Tex_00E010; - -#define dBmori1_room_8Tex_00F010 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00F010" -static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00F010[] = dBmori1_room_8Tex_00F010; - -#define dBmori1_room_8Tex_00CC10 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00CC10" -static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00CC10[] = dBmori1_room_8Tex_00CC10; - -#define dBmori1_room_8Tex_00E810 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00E810" -static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00E810[] = dBmori1_room_8Tex_00E810; - -#define dBmori1_room_8Tex_00D410 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00D410" -static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00D410[] = dBmori1_room_8Tex_00D410; - -#define dBmori1_room_8Tex_00D810 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00D810" -static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00D810[] = dBmori1_room_8Tex_00D810; - -#define dBmori1_room_8Tex_00F810 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00F810" -static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00F810[] = dBmori1_room_8Tex_00F810; - #define dBmori1_room_8Tex_00B410 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00B410" static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00B410[] = dBmori1_room_8Tex_00B410; #define dBmori1_room_8Tex_00C410 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00C410" static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00C410[] = dBmori1_room_8Tex_00C410; -#define dBmori1_room_8Tex_012410 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_012410" -static const ALIGN_ASSET(2) char Bmori1_room_8Tex_012410[] = dBmori1_room_8Tex_012410; - -#define dBmori1_room_8Tex_011C10 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_011C10" -static const ALIGN_ASSET(2) char Bmori1_room_8Tex_011C10[] = dBmori1_room_8Tex_011C10; +#define dBmori1_room_8Tex_00CC10 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00CC10" +static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00CC10[] = dBmori1_room_8Tex_00CC10; #define dBmori1_room_8Tex_00D010 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00D010" static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00D010[] = dBmori1_room_8Tex_00D010; +#define dBmori1_room_8Tex_00D410 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00D410" +static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00D410[] = dBmori1_room_8Tex_00D410; + +#define dBmori1_room_8Tex_00D810 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00D810" +static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00D810[] = dBmori1_room_8Tex_00D810; + +#define dBmori1_room_8Tex_00E010 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00E010" +static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00E010[] = dBmori1_room_8Tex_00E010; + +#define dBmori1_room_8Tex_00E810 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00E810" +static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00E810[] = dBmori1_room_8Tex_00E810; + +#define dBmori1_room_8Tex_00F010 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00F010" +static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00F010[] = dBmori1_room_8Tex_00F010; + +#define dBmori1_room_8Tex_00F810 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00F810" +static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00F810[] = dBmori1_room_8Tex_00F810; + +#define dBmori1_room_8Tex_010810 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_010810" +static const ALIGN_ASSET(2) char Bmori1_room_8Tex_010810[] = dBmori1_room_8Tex_010810; + #define dBmori1_room_8Tex_011810 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_011810" static const ALIGN_ASSET(2) char Bmori1_room_8Tex_011810[] = dBmori1_room_8Tex_011810; -#define dBmori1_room_8DL_013A68 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8DL_013A68" -static const ALIGN_ASSET(2) char Bmori1_room_8DL_013A68[] = dBmori1_room_8DL_013A68; +#define dBmori1_room_8Tex_011C10 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_011C10" +static const ALIGN_ASSET(2) char Bmori1_room_8Tex_011C10[] = dBmori1_room_8Tex_011C10; -#define dBmori1_room_8Tex_016AB0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_016AB0" -static const ALIGN_ASSET(2) char Bmori1_room_8Tex_016AB0[] = dBmori1_room_8Tex_016AB0; +#define dBmori1_room_8Tex_012410 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_012410" +static const ALIGN_ASSET(2) char Bmori1_room_8Tex_012410[] = dBmori1_room_8Tex_012410; #define dBmori1_room_8Tex_013AB0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_013AB0" static const ALIGN_ASSET(2) char Bmori1_room_8Tex_013AB0[] = dBmori1_room_8Tex_013AB0; @@ -69,5 +60,14 @@ static const ALIGN_ASSET(2) char Bmori1_room_8Tex_0152B0[] = dBmori1_room_8Tex_0 #define dBmori1_room_8Tex_015AB0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_015AB0" static const ALIGN_ASSET(2) char Bmori1_room_8Tex_015AB0[] = dBmori1_room_8Tex_015AB0; +#define dBmori1_room_8Tex_016AB0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_016AB0" +static const ALIGN_ASSET(2) char Bmori1_room_8Tex_016AB0[] = dBmori1_room_8Tex_016AB0; + +#define dBmori1_room_8DL_00ABB0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8DL_00ABB0" +static const ALIGN_ASSET(2) char Bmori1_room_8DL_00ABB0[] = dBmori1_room_8DL_00ABB0; + +#define dBmori1_room_8DL_013A68 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8DL_013A68" +static const ALIGN_ASSET(2) char Bmori1_room_8DL_013A68[] = dBmori1_room_8DL_013A68; + #endif // DUNGEONS_BMORI1_ROOM_8_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_9.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_9.h index a989f1119..37c771db5 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_9.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_9.h @@ -3,32 +3,26 @@ #include "align_asset_macro.h" -#define dBmori1_room_9DL_004880 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9DL_004880" -static const ALIGN_ASSET(2) char Bmori1_room_9DL_004880[] = dBmori1_room_9DL_004880; - -#define dBmori1_room_9Tex_0074B8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_0074B8" -static const ALIGN_ASSET(2) char Bmori1_room_9Tex_0074B8[] = dBmori1_room_9Tex_0074B8; - -#define dBmori1_room_9Tex_0054B8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_0054B8" -static const ALIGN_ASSET(2) char Bmori1_room_9Tex_0054B8[] = dBmori1_room_9Tex_0054B8; - -#define dBmori1_room_9Tex_0064B8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_0064B8" -static const ALIGN_ASSET(2) char Bmori1_room_9Tex_0064B8[] = dBmori1_room_9Tex_0064B8; - -#define dBmori1_room_9Tex_005CB8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_005CB8" -static const ALIGN_ASSET(2) char Bmori1_room_9Tex_005CB8[] = dBmori1_room_9Tex_005CB8; - -#define dBmori1_room_9Tex_006CB8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_006CB8" -static const ALIGN_ASSET(2) char Bmori1_room_9Tex_006CB8[] = dBmori1_room_9Tex_006CB8; - #define dBmori1_room_9Tex_0048B8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_0048B8" static const ALIGN_ASSET(2) char Bmori1_room_9Tex_0048B8[] = dBmori1_room_9Tex_0048B8; #define dBmori1_room_9Tex_0050B8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_0050B8" static const ALIGN_ASSET(2) char Bmori1_room_9Tex_0050B8[] = dBmori1_room_9Tex_0050B8; -#define dBmori1_room_9DL_008940 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9DL_008940" -static const ALIGN_ASSET(2) char Bmori1_room_9DL_008940[] = dBmori1_room_9DL_008940; +#define dBmori1_room_9Tex_0054B8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_0054B8" +static const ALIGN_ASSET(2) char Bmori1_room_9Tex_0054B8[] = dBmori1_room_9Tex_0054B8; + +#define dBmori1_room_9Tex_005CB8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_005CB8" +static const ALIGN_ASSET(2) char Bmori1_room_9Tex_005CB8[] = dBmori1_room_9Tex_005CB8; + +#define dBmori1_room_9Tex_0064B8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_0064B8" +static const ALIGN_ASSET(2) char Bmori1_room_9Tex_0064B8[] = dBmori1_room_9Tex_0064B8; + +#define dBmori1_room_9Tex_006CB8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_006CB8" +static const ALIGN_ASSET(2) char Bmori1_room_9Tex_006CB8[] = dBmori1_room_9Tex_006CB8; + +#define dBmori1_room_9Tex_0074B8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_0074B8" +static const ALIGN_ASSET(2) char Bmori1_room_9Tex_0074B8[] = dBmori1_room_9Tex_0074B8; #define dBmori1_room_9Tex_008958 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_008958" static const ALIGN_ASSET(2) char Bmori1_room_9Tex_008958[] = dBmori1_room_9Tex_008958; @@ -36,5 +30,11 @@ static const ALIGN_ASSET(2) char Bmori1_room_9Tex_008958[] = dBmori1_room_9Tex_0 #define dBmori1_room_9Tex_009158 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_009158" static const ALIGN_ASSET(2) char Bmori1_room_9Tex_009158[] = dBmori1_room_9Tex_009158; +#define dBmori1_room_9DL_004880 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9DL_004880" +static const ALIGN_ASSET(2) char Bmori1_room_9DL_004880[] = dBmori1_room_9DL_004880; + +#define dBmori1_room_9DL_008940 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9DL_008940" +static const ALIGN_ASSET(2) char Bmori1_room_9DL_008940[] = dBmori1_room_9DL_008940; + #endif // DUNGEONS_BMORI1_ROOM_9_H diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_scene.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_scene.h index 5c3e0492e..48f518b52 100644 --- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_scene.h +++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_scene.h @@ -3,6 +3,27 @@ #include "align_asset_macro.h" +#define dBmori1_sceneTex_014490 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTex_014490" +static const ALIGN_ASSET(2) char Bmori1_sceneTex_014490[] = dBmori1_sceneTex_014490; + +#define dBmori1_sceneTex_015590 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTex_015590" +static const ALIGN_ASSET(2) char Bmori1_sceneTex_015590[] = dBmori1_sceneTex_015590; + +#define dBmori1_sceneTex_015690 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTex_015690" +static const ALIGN_ASSET(2) char Bmori1_sceneTex_015690[] = dBmori1_sceneTex_015690; + +#define dBmori1_sceneTex_015A90 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTex_015A90" +static const ALIGN_ASSET(2) char Bmori1_sceneTex_015A90[] = dBmori1_sceneTex_015A90; + +#define dBmori1_sceneTex_015B90 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTex_015B90" +static const ALIGN_ASSET(2) char Bmori1_sceneTex_015B90[] = dBmori1_sceneTex_015B90; + +#define dBmori1_sceneTLUT_014080 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTLUT_014080" +static const ALIGN_ASSET(2) char Bmori1_sceneTLUT_014080[] = dBmori1_sceneTLUT_014080; + +#define dBmori1_sceneTLUT_014288 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTLUT_014288" +static const ALIGN_ASSET(2) char Bmori1_sceneTLUT_014288[] = dBmori1_sceneTLUT_014288; + #define dgForestTempleDayEntranceTex "__OTR__scenes/nonmq/Bmori1_scene/gForestTempleDayEntranceTex" static const ALIGN_ASSET(2) char gForestTempleDayEntranceTex[] = dgForestTempleDayEntranceTex; @@ -12,25 +33,5 @@ static const ALIGN_ASSET(2) char gForestTempleNightEntranceTex[] = dgForestTempl #define dBmori1_sceneCollisionHeader_014054 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneCollisionHeader_014054" static const ALIGN_ASSET(2) char Bmori1_sceneCollisionHeader_014054[] = dBmori1_sceneCollisionHeader_014054; -#define dBmori1_sceneTLUT_014288 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTLUT_014288" -static const ALIGN_ASSET(2) char Bmori1_sceneTLUT_014288[] = dBmori1_sceneTLUT_014288; - -#define dBmori1_sceneTex_015B90 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTex_015B90" -static const ALIGN_ASSET(2) char Bmori1_sceneTex_015B90[] = dBmori1_sceneTex_015B90; - -#define dBmori1_sceneTLUT_014080 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTLUT_014080" -static const ALIGN_ASSET(2) char Bmori1_sceneTLUT_014080[] = dBmori1_sceneTLUT_014080; - -#define dBmori1_sceneTex_014490 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTex_014490" -static const ALIGN_ASSET(2) char Bmori1_sceneTex_014490[] = dBmori1_sceneTex_014490; - -#define dBmori1_sceneTex_015A90 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTex_015A90" -static const ALIGN_ASSET(2) char Bmori1_sceneTex_015A90[] = dBmori1_sceneTex_015A90; - -#define dBmori1_sceneTex_015690 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTex_015690" -static const ALIGN_ASSET(2) char Bmori1_sceneTex_015690[] = dBmori1_sceneTex_015690; - -#define dBmori1_sceneTex_015590 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTex_015590" -static const ALIGN_ASSET(2) char Bmori1_sceneTex_015590[] = dBmori1_sceneTex_015590; #endif // DUNGEONS_BMORI1_SCENE_H diff --git a/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_0.h b/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_0.h index 79bf76e74..51ca2214a 100644 --- a/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_0.h +++ b/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_0.h @@ -3,35 +3,35 @@ #include "align_asset_macro.h" -#define dFIRE_bs_room_0DL_002E08 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_0DL_002E08" -static const ALIGN_ASSET(2) char FIRE_bs_room_0DL_002E08[] = dFIRE_bs_room_0DL_002E08; - -#define dFIRE_bs_room_0Tex_004068 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_0Tex_004068" -static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_004068[] = dFIRE_bs_room_0Tex_004068; - -#define dFIRE_bs_room_0TLUT_002E48 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_0TLUT_002E48" -static const ALIGN_ASSET(2) char FIRE_bs_room_0TLUT_002E48[] = dFIRE_bs_room_0TLUT_002E48; - -#define dFIRE_bs_room_0Tex_003C68 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_0Tex_003C68" -static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_003C68[] = dFIRE_bs_room_0Tex_003C68; - -#define dFIRE_bs_room_0Tex_003A68 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_0Tex_003A68" -static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_003A68[] = dFIRE_bs_room_0Tex_003A68; - -#define dFIRE_bs_room_0TLUT_002E28 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_0TLUT_002E28" -static const ALIGN_ASSET(2) char FIRE_bs_room_0TLUT_002E28[] = dFIRE_bs_room_0TLUT_002E28; - -#define dFIRE_bs_room_0Tex_003868 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_0Tex_003868" -static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_003868[] = dFIRE_bs_room_0Tex_003868; - -#define dFIRE_bs_room_0Tex_003468 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_0Tex_003468" -static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_003468[] = dFIRE_bs_room_0Tex_003468; - -#define dFIRE_bs_room_0Tex_002E68 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_0Tex_002E68" +#define dFIRE_bs_room_0Tex_002E68 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_0Tex_002E68" static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_002E68[] = dFIRE_bs_room_0Tex_002E68; -#define dFIRE_bs_room_0Tex_003068 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_0Tex_003068" +#define dFIRE_bs_room_0Tex_003068 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_0Tex_003068" static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_003068[] = dFIRE_bs_room_0Tex_003068; +#define dFIRE_bs_room_0Tex_003468 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_0Tex_003468" +static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_003468[] = dFIRE_bs_room_0Tex_003468; + +#define dFIRE_bs_room_0Tex_003868 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_0Tex_003868" +static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_003868[] = dFIRE_bs_room_0Tex_003868; + +#define dFIRE_bs_room_0Tex_003A68 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_0Tex_003A68" +static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_003A68[] = dFIRE_bs_room_0Tex_003A68; + +#define dFIRE_bs_room_0Tex_003C68 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_0Tex_003C68" +static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_003C68[] = dFIRE_bs_room_0Tex_003C68; + +#define dFIRE_bs_room_0Tex_004068 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_0Tex_004068" +static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_004068[] = dFIRE_bs_room_0Tex_004068; + +#define dFIRE_bs_room_0TLUT_002E28 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_0TLUT_002E28" +static const ALIGN_ASSET(2) char FIRE_bs_room_0TLUT_002E28[] = dFIRE_bs_room_0TLUT_002E28; + +#define dFIRE_bs_room_0TLUT_002E48 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_0TLUT_002E48" +static const ALIGN_ASSET(2) char FIRE_bs_room_0TLUT_002E48[] = dFIRE_bs_room_0TLUT_002E48; + +#define dFIRE_bs_room_0DL_002E08 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_0DL_002E08" +static const ALIGN_ASSET(2) char FIRE_bs_room_0DL_002E08[] = dFIRE_bs_room_0DL_002E08; + #endif // DUNGEONS_FIRE_BS_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_1.h b/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_1.h index a223e899b..a902e2ca4 100644 --- a/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_1.h +++ b/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_1.h @@ -3,38 +3,38 @@ #include "align_asset_macro.h" -#define dFIRE_bs_room_1DL_004940 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_1DL_004940" -static const ALIGN_ASSET(2) char FIRE_bs_room_1DL_004940[] = dFIRE_bs_room_1DL_004940; - -#define dFIRE_bs_room_1Tex_004BD8 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_1Tex_004BD8" -static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_004BD8[] = dFIRE_bs_room_1Tex_004BD8; - -#define dFIRE_bs_room_1Tex_006DD8 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_1Tex_006DD8" -static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_006DD8[] = dFIRE_bs_room_1Tex_006DD8; - -#define dFIRE_bs_room_1TLUT_0049B8 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_1TLUT_0049B8" -static const ALIGN_ASSET(2) char FIRE_bs_room_1TLUT_0049B8[] = dFIRE_bs_room_1TLUT_0049B8; - -#define dFIRE_bs_room_1Tex_0061D8 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_1Tex_0061D8" -static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_0061D8[] = dFIRE_bs_room_1Tex_0061D8; - -#define dFIRE_bs_room_1Tex_005FD8 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_1Tex_005FD8" -static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_005FD8[] = dFIRE_bs_room_1Tex_005FD8; - -#define dFIRE_bs_room_1TLUT_004998 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_1TLUT_004998" -static const ALIGN_ASSET(2) char FIRE_bs_room_1TLUT_004998[] = dFIRE_bs_room_1TLUT_004998; - -#define dFIRE_bs_room_1Tex_005BD8 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_1Tex_005BD8" -static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_005BD8[] = dFIRE_bs_room_1Tex_005BD8; - -#define dFIRE_bs_room_1Tex_0049D8 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_1Tex_0049D8" +#define dFIRE_bs_room_1Tex_0049D8 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_1Tex_0049D8" static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_0049D8[] = dFIRE_bs_room_1Tex_0049D8; -#define dFIRE_bs_room_1Tex_0065D8 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_1Tex_0065D8" +#define dFIRE_bs_room_1Tex_004BD8 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_1Tex_004BD8" +static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_004BD8[] = dFIRE_bs_room_1Tex_004BD8; + +#define dFIRE_bs_room_1Tex_0053D8 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_1Tex_0053D8" +static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_0053D8[] = dFIRE_bs_room_1Tex_0053D8; + +#define dFIRE_bs_room_1Tex_005BD8 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_1Tex_005BD8" +static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_005BD8[] = dFIRE_bs_room_1Tex_005BD8; + +#define dFIRE_bs_room_1Tex_005FD8 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_1Tex_005FD8" +static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_005FD8[] = dFIRE_bs_room_1Tex_005FD8; + +#define dFIRE_bs_room_1Tex_0061D8 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_1Tex_0061D8" +static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_0061D8[] = dFIRE_bs_room_1Tex_0061D8; + +#define dFIRE_bs_room_1Tex_0065D8 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_1Tex_0065D8" static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_0065D8[] = dFIRE_bs_room_1Tex_0065D8; -#define dFIRE_bs_room_1Tex_0053D8 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_1Tex_0053D8" -static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_0053D8[] = dFIRE_bs_room_1Tex_0053D8; +#define dFIRE_bs_room_1Tex_006DD8 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_1Tex_006DD8" +static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_006DD8[] = dFIRE_bs_room_1Tex_006DD8; + +#define dFIRE_bs_room_1TLUT_004998 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_1TLUT_004998" +static const ALIGN_ASSET(2) char FIRE_bs_room_1TLUT_004998[] = dFIRE_bs_room_1TLUT_004998; + +#define dFIRE_bs_room_1TLUT_0049B8 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_1TLUT_0049B8" +static const ALIGN_ASSET(2) char FIRE_bs_room_1TLUT_0049B8[] = dFIRE_bs_room_1TLUT_0049B8; + +#define dFIRE_bs_room_1DL_004940 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_1DL_004940" +static const ALIGN_ASSET(2) char FIRE_bs_room_1DL_004940[] = dFIRE_bs_room_1DL_004940; #endif // DUNGEONS_FIRE_BS_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_scene.h b/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_scene.h index 2f96ec96b..68035e4bb 100644 --- a/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_scene.h +++ b/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_scene.h @@ -3,19 +3,20 @@ #include "align_asset_macro.h" -#define dFIRE_bs_sceneCollisionHeader_002BCC "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_sceneCollisionHeader_002BCC" -static const ALIGN_ASSET(2) char FIRE_bs_sceneCollisionHeader_002BCC[] = dFIRE_bs_sceneCollisionHeader_002BCC; - -#define dFIRE_bs_sceneTex_003400 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_sceneTex_003400" -static const ALIGN_ASSET(2) char FIRE_bs_sceneTex_003400[] = dFIRE_bs_sceneTex_003400; - -#define dFIRE_bs_sceneTex_002C00 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_sceneTex_002C00" +#define dFIRE_bs_sceneTex_002C00 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_sceneTex_002C00" static const ALIGN_ASSET(2) char FIRE_bs_sceneTex_002C00[] = dFIRE_bs_sceneTex_002C00; -#define dFIRE_bs_sceneTex_003C00 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_sceneTex_003C00" +#define dFIRE_bs_sceneTex_003400 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_sceneTex_003400" +static const ALIGN_ASSET(2) char FIRE_bs_sceneTex_003400[] = dFIRE_bs_sceneTex_003400; + +#define dFIRE_bs_sceneTex_003C00 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_sceneTex_003C00" static const ALIGN_ASSET(2) char FIRE_bs_sceneTex_003C00[] = dFIRE_bs_sceneTex_003C00; -#define dFIRE_bs_sceneTex_004400 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_sceneTex_004400" +#define dFIRE_bs_sceneTex_004400 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_sceneTex_004400" static const ALIGN_ASSET(2) char FIRE_bs_sceneTex_004400[] = dFIRE_bs_sceneTex_004400; +#define dFIRE_bs_sceneCollisionHeader_002BCC "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_sceneCollisionHeader_002BCC" +static const ALIGN_ASSET(2) char FIRE_bs_sceneCollisionHeader_002BCC[] = dFIRE_bs_sceneCollisionHeader_002BCC; + + #endif // DUNGEONS_FIRE_BS_SCENE_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_0.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_0.h index 87fc1832d..9be04e2b3 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_0.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_0.h @@ -3,14 +3,20 @@ #include "align_asset_macro.h" -#define dHAKAdan_room_0DL_002768 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0DL_002768" -static const ALIGN_ASSET(2) char HAKAdan_room_0DL_002768[] = dHAKAdan_room_0DL_002768; +#define dHAKAdan_room_0Tex_008230 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0Tex_008230" +static const ALIGN_ASSET(2) char HAKAdan_room_0Tex_008230[] = dHAKAdan_room_0Tex_008230; #define dHAKAdan_room_0Tex_009230 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0Tex_009230" static const ALIGN_ASSET(2) char HAKAdan_room_0Tex_009230[] = dHAKAdan_room_0Tex_009230; -#define dHAKAdan_room_0Tex_008230 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0Tex_008230" -static const ALIGN_ASSET(2) char HAKAdan_room_0Tex_008230[] = dHAKAdan_room_0Tex_008230; +#define dHAKAdan_room_0Tex_00A230 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0Tex_00A230" +static const ALIGN_ASSET(2) char HAKAdan_room_0Tex_00A230[] = dHAKAdan_room_0Tex_00A230; + +#define dHAKAdan_room_0Tex_00AD48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0Tex_00AD48" +static const ALIGN_ASSET(2) char HAKAdan_room_0Tex_00AD48[] = dHAKAdan_room_0Tex_00AD48; + +#define dHAKAdan_room_0DL_002768 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0DL_002768" +static const ALIGN_ASSET(2) char HAKAdan_room_0DL_002768[] = dHAKAdan_room_0DL_002768; #define dHAKAdan_room_0DL_005FF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0DL_005FF0" static const ALIGN_ASSET(2) char HAKAdan_room_0DL_005FF0[] = dHAKAdan_room_0DL_005FF0; @@ -18,9 +24,6 @@ static const ALIGN_ASSET(2) char HAKAdan_room_0DL_005FF0[] = dHAKAdan_room_0DL_0 #define dHAKAdan_room_0DL_000D00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0DL_000D00" static const ALIGN_ASSET(2) char HAKAdan_room_0DL_000D00[] = dHAKAdan_room_0DL_000D00; -#define dHAKAdan_room_0Tex_00A230 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0Tex_00A230" -static const ALIGN_ASSET(2) char HAKAdan_room_0Tex_00A230[] = dHAKAdan_room_0Tex_00A230; - #define dHAKAdan_room_0DL_007EC8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0DL_007EC8" static const ALIGN_ASSET(2) char HAKAdan_room_0DL_007EC8[] = dHAKAdan_room_0DL_007EC8; @@ -30,8 +33,5 @@ static const ALIGN_ASSET(2) char HAKAdan_room_0DL_0045C0[] = dHAKAdan_room_0DL_0 #define dHAKAdan_room_0DL_00AC40 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0DL_00AC40" static const ALIGN_ASSET(2) char HAKAdan_room_0DL_00AC40[] = dHAKAdan_room_0DL_00AC40; -#define dHAKAdan_room_0Tex_00AD48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0Tex_00AD48" -static const ALIGN_ASSET(2) char HAKAdan_room_0Tex_00AD48[] = dHAKAdan_room_0Tex_00AD48; - #endif // DUNGEONS_HAKADAN_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_1.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_1.h index 5bd5de9bd..2639c7de5 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_1.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_1.h @@ -3,12 +3,12 @@ #include "align_asset_macro.h" -#define dHAKAdan_room_1DL_001110 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_1DL_001110" -static const ALIGN_ASSET(2) char HAKAdan_room_1DL_001110[] = dHAKAdan_room_1DL_001110; - #define dHAKAdan_room_1Tex_0012E8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_1Tex_0012E8" static const ALIGN_ASSET(2) char HAKAdan_room_1Tex_0012E8[] = dHAKAdan_room_1Tex_0012E8; +#define dHAKAdan_room_1DL_001110 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_1DL_001110" +static const ALIGN_ASSET(2) char HAKAdan_room_1DL_001110[] = dHAKAdan_room_1DL_001110; + #define dHAKAdan_room_1DL_000270 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_1DL_000270" static const ALIGN_ASSET(2) char HAKAdan_room_1DL_000270[] = dHAKAdan_room_1DL_000270; diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_10.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_10.h index 993a39b5d..c865e3e75 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_10.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_10.h @@ -3,32 +3,35 @@ #include "align_asset_macro.h" -#define dHAKAdan_room_10DL_0019C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10DL_0019C0" -static const ALIGN_ASSET(2) char HAKAdan_room_10DL_0019C0[] = dHAKAdan_room_10DL_0019C0; - -#define dHAKAdan_room_10Tex_004FF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_004FF0" -static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_004FF0[] = dHAKAdan_room_10Tex_004FF0; - -#define dHAKAdan_room_10DL_002B70 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10DL_002B70" -static const ALIGN_ASSET(2) char HAKAdan_room_10DL_002B70[] = dHAKAdan_room_10DL_002B70; - -#define dHAKAdan_room_10Tex_006BF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_006BF0" -static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_006BF0[] = dHAKAdan_room_10Tex_006BF0; - -#define dHAKAdan_room_10Tex_003FF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_003FF0" -static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_003FF0[] = dHAKAdan_room_10Tex_003FF0; +#define dHAKAdan_room_10Tex_0039F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_0039F0" +static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_0039F0[] = dHAKAdan_room_10Tex_0039F0; #define dHAKAdan_room_10Tex_003DF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_003DF0" static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_003DF0[] = dHAKAdan_room_10Tex_003DF0; -#define dHAKAdan_room_10Tex_0073F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_0073F0" -static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_0073F0[] = dHAKAdan_room_10Tex_0073F0; +#define dHAKAdan_room_10Tex_003FF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_003FF0" +static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_003FF0[] = dHAKAdan_room_10Tex_003FF0; + +#define dHAKAdan_room_10Tex_004FF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_004FF0" +static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_004FF0[] = dHAKAdan_room_10Tex_004FF0; + +#define dHAKAdan_room_10Tex_005FF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_005FF0" +static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_005FF0[] = dHAKAdan_room_10Tex_005FF0; #define dHAKAdan_room_10Tex_0067F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_0067F0" static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_0067F0[] = dHAKAdan_room_10Tex_0067F0; -#define dHAKAdan_room_10Tex_0039F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_0039F0" -static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_0039F0[] = dHAKAdan_room_10Tex_0039F0; +#define dHAKAdan_room_10Tex_006BF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_006BF0" +static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_006BF0[] = dHAKAdan_room_10Tex_006BF0; + +#define dHAKAdan_room_10Tex_0073F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_0073F0" +static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_0073F0[] = dHAKAdan_room_10Tex_0073F0; + +#define dHAKAdan_room_10DL_0019C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10DL_0019C0" +static const ALIGN_ASSET(2) char HAKAdan_room_10DL_0019C0[] = dHAKAdan_room_10DL_0019C0; + +#define dHAKAdan_room_10DL_002B70 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10DL_002B70" +static const ALIGN_ASSET(2) char HAKAdan_room_10DL_002B70[] = dHAKAdan_room_10DL_002B70; #define dHAKAdan_room_10DL_003430 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10DL_003430" static const ALIGN_ASSET(2) char HAKAdan_room_10DL_003430[] = dHAKAdan_room_10DL_003430; @@ -39,9 +42,6 @@ static const ALIGN_ASSET(2) char HAKAdan_room_10DL_0016B8[] = dHAKAdan_room_10DL #define dHAKAdan_room_10DL_001440 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10DL_001440" static const ALIGN_ASSET(2) char HAKAdan_room_10DL_001440[] = dHAKAdan_room_10DL_001440; -#define dHAKAdan_room_10Tex_005FF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_005FF0" -static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_005FF0[] = dHAKAdan_room_10Tex_005FF0; - #define dHAKAdan_room_10DL_003858 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10DL_003858" static const ALIGN_ASSET(2) char HAKAdan_room_10DL_003858[] = dHAKAdan_room_10DL_003858; diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_11.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_11.h index e25cfb03b..f1f234f36 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_11.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_11.h @@ -3,39 +3,39 @@ #include "align_asset_macro.h" -#define dHAKAdan_room_11DL_0008B0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11DL_0008B0" -static const ALIGN_ASSET(2) char HAKAdan_room_11DL_0008B0[] = dHAKAdan_room_11DL_0008B0; - -#define dHAKAdan_room_11Tex_002A60 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11Tex_002A60" -static const ALIGN_ASSET(2) char HAKAdan_room_11Tex_002A60[] = dHAKAdan_room_11Tex_002A60; +#define dHAKAdan_room_11Tex_001E60 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11Tex_001E60" +static const ALIGN_ASSET(2) char HAKAdan_room_11Tex_001E60[] = dHAKAdan_room_11Tex_001E60; #define dHAKAdan_room_11Tex_002660 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11Tex_002660" static const ALIGN_ASSET(2) char HAKAdan_room_11Tex_002660[] = dHAKAdan_room_11Tex_002660; -#define dHAKAdan_room_11DL_001928 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11DL_001928" -static const ALIGN_ASSET(2) char HAKAdan_room_11DL_001928[] = dHAKAdan_room_11DL_001928; +#define dHAKAdan_room_11Tex_002A60 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11Tex_002A60" +static const ALIGN_ASSET(2) char HAKAdan_room_11Tex_002A60[] = dHAKAdan_room_11Tex_002A60; -#define dHAKAdan_room_11Tex_001E60 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11Tex_001E60" -static const ALIGN_ASSET(2) char HAKAdan_room_11Tex_001E60[] = dHAKAdan_room_11Tex_001E60; +#define dHAKAdan_room_11Tex_002C60 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11Tex_002C60" +static const ALIGN_ASSET(2) char HAKAdan_room_11Tex_002C60[] = dHAKAdan_room_11Tex_002C60; + +#define dHAKAdan_room_11Tex_003460 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11Tex_003460" +static const ALIGN_ASSET(2) char HAKAdan_room_11Tex_003460[] = dHAKAdan_room_11Tex_003460; #define dHAKAdan_room_11Tex_003C60 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11Tex_003C60" static const ALIGN_ASSET(2) char HAKAdan_room_11Tex_003C60[] = dHAKAdan_room_11Tex_003C60; +#define dHAKAdan_room_11DL_0008B0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11DL_0008B0" +static const ALIGN_ASSET(2) char HAKAdan_room_11DL_0008B0[] = dHAKAdan_room_11DL_0008B0; + +#define dHAKAdan_room_11DL_001928 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11DL_001928" +static const ALIGN_ASSET(2) char HAKAdan_room_11DL_001928[] = dHAKAdan_room_11DL_001928; + #define dHAKAdan_room_11DL_0013D0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11DL_0013D0" static const ALIGN_ASSET(2) char HAKAdan_room_11DL_0013D0[] = dHAKAdan_room_11DL_0013D0; -#define dHAKAdan_room_11Tex_002C60 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11Tex_002C60" -static const ALIGN_ASSET(2) char HAKAdan_room_11Tex_002C60[] = dHAKAdan_room_11Tex_002C60; - #define dHAKAdan_room_11DL_001B78 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11DL_001B78" static const ALIGN_ASSET(2) char HAKAdan_room_11DL_001B78[] = dHAKAdan_room_11DL_001B78; #define dHAKAdan_room_11DL_000F30 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11DL_000F30" static const ALIGN_ASSET(2) char HAKAdan_room_11DL_000F30[] = dHAKAdan_room_11DL_000F30; -#define dHAKAdan_room_11Tex_003460 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11Tex_003460" -static const ALIGN_ASSET(2) char HAKAdan_room_11Tex_003460[] = dHAKAdan_room_11Tex_003460; - #define dHAKAdan_room_11DL_001D58 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11DL_001D58" static const ALIGN_ASSET(2) char HAKAdan_room_11DL_001D58[] = dHAKAdan_room_11DL_001D58; diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_12.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_12.h index b71de72c1..dde09068a 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_12.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_12.h @@ -3,38 +3,38 @@ #include "align_asset_macro.h" -#define dHAKAdan_room_12DL_002A88 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12DL_002A88" -static const ALIGN_ASSET(2) char HAKAdan_room_12DL_002A88[] = dHAKAdan_room_12DL_002A88; - -#define dHAKAdan_room_12Tex_003B48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_003B48" -static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003B48[] = dHAKAdan_room_12Tex_003B48; - -#define dHAKAdan_room_12Tex_003748 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_003748" -static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003748[] = dHAKAdan_room_12Tex_003748; - -#define dHAKAdan_room_12Tex_003D48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_003D48" -static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003D48[] = dHAKAdan_room_12Tex_003D48; - -#define dHAKAdan_room_12DL_0014F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12DL_0014F0" -static const ALIGN_ASSET(2) char HAKAdan_room_12DL_0014F0[] = dHAKAdan_room_12DL_0014F0; - -#define dHAKAdan_room_12DL_001C60 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12DL_001C60" -static const ALIGN_ASSET(2) char HAKAdan_room_12DL_001C60[] = dHAKAdan_room_12DL_001C60; - -#define dHAKAdan_room_12Tex_004D48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_004D48" -static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_004D48[] = dHAKAdan_room_12Tex_004D48; - -#define dHAKAdan_room_12DL_000CF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12DL_000CF0" -static const ALIGN_ASSET(2) char HAKAdan_room_12DL_000CF0[] = dHAKAdan_room_12DL_000CF0; - -#define dHAKAdan_room_12Tex_005548 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_005548" -static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_005548[] = dHAKAdan_room_12Tex_005548; - #define dHAKAdan_room_12Tex_003348 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_003348" static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003348[] = dHAKAdan_room_12Tex_003348; #define dHAKAdan_room_12Tex_003548 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_003548" static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003548[] = dHAKAdan_room_12Tex_003548; +#define dHAKAdan_room_12Tex_003748 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_003748" +static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003748[] = dHAKAdan_room_12Tex_003748; + +#define dHAKAdan_room_12Tex_003B48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_003B48" +static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003B48[] = dHAKAdan_room_12Tex_003B48; + +#define dHAKAdan_room_12Tex_003D48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_003D48" +static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003D48[] = dHAKAdan_room_12Tex_003D48; + +#define dHAKAdan_room_12Tex_004D48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_004D48" +static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_004D48[] = dHAKAdan_room_12Tex_004D48; + +#define dHAKAdan_room_12Tex_005548 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_005548" +static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_005548[] = dHAKAdan_room_12Tex_005548; + +#define dHAKAdan_room_12DL_002A88 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12DL_002A88" +static const ALIGN_ASSET(2) char HAKAdan_room_12DL_002A88[] = dHAKAdan_room_12DL_002A88; + +#define dHAKAdan_room_12DL_0014F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12DL_0014F0" +static const ALIGN_ASSET(2) char HAKAdan_room_12DL_0014F0[] = dHAKAdan_room_12DL_0014F0; + +#define dHAKAdan_room_12DL_001C60 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12DL_001C60" +static const ALIGN_ASSET(2) char HAKAdan_room_12DL_001C60[] = dHAKAdan_room_12DL_001C60; + +#define dHAKAdan_room_12DL_000CF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12DL_000CF0" +static const ALIGN_ASSET(2) char HAKAdan_room_12DL_000CF0[] = dHAKAdan_room_12DL_000CF0; + #endif // DUNGEONS_HAKADAN_ROOM_12_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_13.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_13.h index ef3b0cd41..2a4dea0b4 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_13.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_13.h @@ -3,12 +3,12 @@ #include "align_asset_macro.h" -#define dHAKAdan_room_13DL_0006E0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_13DL_0006E0" -static const ALIGN_ASSET(2) char HAKAdan_room_13DL_0006E0[] = dHAKAdan_room_13DL_0006E0; - #define dHAKAdan_room_13Tex_000818 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_13Tex_000818" static const ALIGN_ASSET(2) char HAKAdan_room_13Tex_000818[] = dHAKAdan_room_13Tex_000818; +#define dHAKAdan_room_13DL_0006E0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_13DL_0006E0" +static const ALIGN_ASSET(2) char HAKAdan_room_13DL_0006E0[] = dHAKAdan_room_13DL_0006E0; + #define dHAKAdan_room_13DL_000450 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_13DL_000450" static const ALIGN_ASSET(2) char HAKAdan_room_13DL_000450[] = dHAKAdan_room_13DL_000450; diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_14.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_14.h index 7b99f6eb5..735340083 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_14.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_14.h @@ -3,38 +3,38 @@ #include "align_asset_macro.h" -#define dHAKAdan_room_14DL_002D08 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14DL_002D08" -static const ALIGN_ASSET(2) char HAKAdan_room_14DL_002D08[] = dHAKAdan_room_14DL_002D08; - -#define dHAKAdan_room_14Tex_003D00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14Tex_003D00" -static const ALIGN_ASSET(2) char HAKAdan_room_14Tex_003D00[] = dHAKAdan_room_14Tex_003D00; - -#define dHAKAdan_room_14Tex_003900 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14Tex_003900" -static const ALIGN_ASSET(2) char HAKAdan_room_14Tex_003900[] = dHAKAdan_room_14Tex_003900; - -#define dHAKAdan_room_14Tex_003F00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14Tex_003F00" -static const ALIGN_ASSET(2) char HAKAdan_room_14Tex_003F00[] = dHAKAdan_room_14Tex_003F00; - -#define dHAKAdan_room_14DL_000470 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14DL_000470" -static const ALIGN_ASSET(2) char HAKAdan_room_14DL_000470[] = dHAKAdan_room_14DL_000470; - -#define dHAKAdan_room_14DL_001AE8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14DL_001AE8" -static const ALIGN_ASSET(2) char HAKAdan_room_14DL_001AE8[] = dHAKAdan_room_14DL_001AE8; - #define dHAKAdan_room_14Tex_003500 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14Tex_003500" static const ALIGN_ASSET(2) char HAKAdan_room_14Tex_003500[] = dHAKAdan_room_14Tex_003500; #define dHAKAdan_room_14Tex_003700 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14Tex_003700" static const ALIGN_ASSET(2) char HAKAdan_room_14Tex_003700[] = dHAKAdan_room_14Tex_003700; -#define dHAKAdan_room_14Tex_005700 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14Tex_005700" -static const ALIGN_ASSET(2) char HAKAdan_room_14Tex_005700[] = dHAKAdan_room_14Tex_005700; +#define dHAKAdan_room_14Tex_003900 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14Tex_003900" +static const ALIGN_ASSET(2) char HAKAdan_room_14Tex_003900[] = dHAKAdan_room_14Tex_003900; -#define dHAKAdan_room_14DL_000DC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14DL_000DC0" -static const ALIGN_ASSET(2) char HAKAdan_room_14DL_000DC0[] = dHAKAdan_room_14DL_000DC0; +#define dHAKAdan_room_14Tex_003D00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14Tex_003D00" +static const ALIGN_ASSET(2) char HAKAdan_room_14Tex_003D00[] = dHAKAdan_room_14Tex_003D00; + +#define dHAKAdan_room_14Tex_003F00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14Tex_003F00" +static const ALIGN_ASSET(2) char HAKAdan_room_14Tex_003F00[] = dHAKAdan_room_14Tex_003F00; #define dHAKAdan_room_14Tex_004F00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14Tex_004F00" static const ALIGN_ASSET(2) char HAKAdan_room_14Tex_004F00[] = dHAKAdan_room_14Tex_004F00; +#define dHAKAdan_room_14Tex_005700 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14Tex_005700" +static const ALIGN_ASSET(2) char HAKAdan_room_14Tex_005700[] = dHAKAdan_room_14Tex_005700; + +#define dHAKAdan_room_14DL_002D08 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14DL_002D08" +static const ALIGN_ASSET(2) char HAKAdan_room_14DL_002D08[] = dHAKAdan_room_14DL_002D08; + +#define dHAKAdan_room_14DL_000470 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14DL_000470" +static const ALIGN_ASSET(2) char HAKAdan_room_14DL_000470[] = dHAKAdan_room_14DL_000470; + +#define dHAKAdan_room_14DL_001AE8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14DL_001AE8" +static const ALIGN_ASSET(2) char HAKAdan_room_14DL_001AE8[] = dHAKAdan_room_14DL_001AE8; + +#define dHAKAdan_room_14DL_000DC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14DL_000DC0" +static const ALIGN_ASSET(2) char HAKAdan_room_14DL_000DC0[] = dHAKAdan_room_14DL_000DC0; + #endif // DUNGEONS_HAKADAN_ROOM_14_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_15.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_15.h index 5bae3d3dd..101bd4482 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_15.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_15.h @@ -3,38 +3,38 @@ #include "align_asset_macro.h" -#define dHAKAdan_room_15DL_003340 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15DL_003340" -static const ALIGN_ASSET(2) char HAKAdan_room_15DL_003340[] = dHAKAdan_room_15DL_003340; - -#define dHAKAdan_room_15Tex_005EC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15Tex_005EC0" -static const ALIGN_ASSET(2) char HAKAdan_room_15Tex_005EC0[] = dHAKAdan_room_15Tex_005EC0; - -#define dHAKAdan_room_15Tex_005AC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15Tex_005AC0" -static const ALIGN_ASSET(2) char HAKAdan_room_15Tex_005AC0[] = dHAKAdan_room_15Tex_005AC0; - -#define dHAKAdan_room_15DL_004428 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15DL_004428" -static const ALIGN_ASSET(2) char HAKAdan_room_15DL_004428[] = dHAKAdan_room_15DL_004428; - -#define dHAKAdan_room_15DL_001350 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15DL_001350" -static const ALIGN_ASSET(2) char HAKAdan_room_15DL_001350[] = dHAKAdan_room_15DL_001350; - -#define dHAKAdan_room_15Tex_0070C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15Tex_0070C0" -static const ALIGN_ASSET(2) char HAKAdan_room_15Tex_0070C0[] = dHAKAdan_room_15Tex_0070C0; - #define dHAKAdan_room_15Tex_0056C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15Tex_0056C0" static const ALIGN_ASSET(2) char HAKAdan_room_15Tex_0056C0[] = dHAKAdan_room_15Tex_0056C0; #define dHAKAdan_room_15Tex_0058C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15Tex_0058C0" static const ALIGN_ASSET(2) char HAKAdan_room_15Tex_0058C0[] = dHAKAdan_room_15Tex_0058C0; -#define dHAKAdan_room_15DL_0053B0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15DL_0053B0" -static const ALIGN_ASSET(2) char HAKAdan_room_15DL_0053B0[] = dHAKAdan_room_15DL_0053B0; +#define dHAKAdan_room_15Tex_005AC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15Tex_005AC0" +static const ALIGN_ASSET(2) char HAKAdan_room_15Tex_005AC0[] = dHAKAdan_room_15Tex_005AC0; -#define dHAKAdan_room_15Tex_0068C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15Tex_0068C0" -static const ALIGN_ASSET(2) char HAKAdan_room_15Tex_0068C0[] = dHAKAdan_room_15Tex_0068C0; +#define dHAKAdan_room_15Tex_005EC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15Tex_005EC0" +static const ALIGN_ASSET(2) char HAKAdan_room_15Tex_005EC0[] = dHAKAdan_room_15Tex_005EC0; #define dHAKAdan_room_15Tex_0060C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15Tex_0060C0" static const ALIGN_ASSET(2) char HAKAdan_room_15Tex_0060C0[] = dHAKAdan_room_15Tex_0060C0; +#define dHAKAdan_room_15Tex_0068C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15Tex_0068C0" +static const ALIGN_ASSET(2) char HAKAdan_room_15Tex_0068C0[] = dHAKAdan_room_15Tex_0068C0; + +#define dHAKAdan_room_15Tex_0070C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15Tex_0070C0" +static const ALIGN_ASSET(2) char HAKAdan_room_15Tex_0070C0[] = dHAKAdan_room_15Tex_0070C0; + +#define dHAKAdan_room_15DL_003340 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15DL_003340" +static const ALIGN_ASSET(2) char HAKAdan_room_15DL_003340[] = dHAKAdan_room_15DL_003340; + +#define dHAKAdan_room_15DL_004428 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15DL_004428" +static const ALIGN_ASSET(2) char HAKAdan_room_15DL_004428[] = dHAKAdan_room_15DL_004428; + +#define dHAKAdan_room_15DL_001350 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15DL_001350" +static const ALIGN_ASSET(2) char HAKAdan_room_15DL_001350[] = dHAKAdan_room_15DL_001350; + +#define dHAKAdan_room_15DL_0053B0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15DL_0053B0" +static const ALIGN_ASSET(2) char HAKAdan_room_15DL_0053B0[] = dHAKAdan_room_15DL_0053B0; + #endif // DUNGEONS_HAKADAN_ROOM_15_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_16.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_16.h index f6b0ce048..c35a4b434 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_16.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_16.h @@ -3,12 +3,12 @@ #include "align_asset_macro.h" -#define dHAKAdan_room_16DL_001858 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_16DL_001858" -static const ALIGN_ASSET(2) char HAKAdan_room_16DL_001858[] = dHAKAdan_room_16DL_001858; - #define dHAKAdan_room_16Tex_001930 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_16Tex_001930" static const ALIGN_ASSET(2) char HAKAdan_room_16Tex_001930[] = dHAKAdan_room_16Tex_001930; +#define dHAKAdan_room_16DL_001858 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_16DL_001858" +static const ALIGN_ASSET(2) char HAKAdan_room_16DL_001858[] = dHAKAdan_room_16DL_001858; + #define dHAKAdan_room_16DL_001400 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_16DL_001400" static const ALIGN_ASSET(2) char HAKAdan_room_16DL_001400[] = dHAKAdan_room_16DL_001400; diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_17.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_17.h index 9a86ffebd..bd7eaee03 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_17.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_17.h @@ -3,24 +3,27 @@ #include "align_asset_macro.h" -#define dHAKAdan_room_17DL_000D28 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17DL_000D28" -static const ALIGN_ASSET(2) char HAKAdan_room_17DL_000D28[] = dHAKAdan_room_17DL_000D28; - #define dHAKAdan_room_17Tex_001248 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17Tex_001248" static const ALIGN_ASSET(2) char HAKAdan_room_17Tex_001248[] = dHAKAdan_room_17Tex_001248; -#define dHAKAdan_room_17Tex_002048 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17Tex_002048" -static const ALIGN_ASSET(2) char HAKAdan_room_17Tex_002048[] = dHAKAdan_room_17Tex_002048; +#define dHAKAdan_room_17Tex_001448 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17Tex_001448" +static const ALIGN_ASSET(2) char HAKAdan_room_17Tex_001448[] = dHAKAdan_room_17Tex_001448; #define dHAKAdan_room_17Tex_001C48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17Tex_001C48" static const ALIGN_ASSET(2) char HAKAdan_room_17Tex_001C48[] = dHAKAdan_room_17Tex_001C48; +#define dHAKAdan_room_17Tex_002048 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17Tex_002048" +static const ALIGN_ASSET(2) char HAKAdan_room_17Tex_002048[] = dHAKAdan_room_17Tex_002048; + +#define dHAKAdan_room_17Tex_0025D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17Tex_0025D8" +static const ALIGN_ASSET(2) char HAKAdan_room_17Tex_0025D8[] = dHAKAdan_room_17Tex_0025D8; + +#define dHAKAdan_room_17DL_000D28 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17DL_000D28" +static const ALIGN_ASSET(2) char HAKAdan_room_17DL_000D28[] = dHAKAdan_room_17DL_000D28; + #define dHAKAdan_room_17DL_000610 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17DL_000610" static const ALIGN_ASSET(2) char HAKAdan_room_17DL_000610[] = dHAKAdan_room_17DL_000610; -#define dHAKAdan_room_17Tex_001448 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17Tex_001448" -static const ALIGN_ASSET(2) char HAKAdan_room_17Tex_001448[] = dHAKAdan_room_17Tex_001448; - #define dHAKAdan_room_17DL_001128 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17DL_001128" static const ALIGN_ASSET(2) char HAKAdan_room_17DL_001128[] = dHAKAdan_room_17DL_001128; @@ -30,8 +33,5 @@ static const ALIGN_ASSET(2) char HAKAdan_room_17DL_000400[] = dHAKAdan_room_17DL #define dHAKAdan_room_17DL_002510 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17DL_002510" static const ALIGN_ASSET(2) char HAKAdan_room_17DL_002510[] = dHAKAdan_room_17DL_002510; -#define dHAKAdan_room_17Tex_0025D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17Tex_0025D8" -static const ALIGN_ASSET(2) char HAKAdan_room_17Tex_0025D8[] = dHAKAdan_room_17Tex_0025D8; - #endif // DUNGEONS_HAKADAN_ROOM_17_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_18.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_18.h index 3bf496856..2bc5db12e 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_18.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_18.h @@ -3,23 +3,20 @@ #include "align_asset_macro.h" -#define dHAKAdan_room_18DL_0032A0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_0032A0" -static const ALIGN_ASSET(2) char HAKAdan_room_18DL_0032A0[] = dHAKAdan_room_18DL_0032A0; - -#define dHAKAdan_room_18Tex_00C708 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00C708" -static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00C708[] = dHAKAdan_room_18Tex_00C708; +#define dHAKAdan_room_18Tex_00B908 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00B908" +static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00B908[] = dHAKAdan_room_18Tex_00B908; #define dHAKAdan_room_18Tex_00BB08 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00BB08" static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00BB08[] = dHAKAdan_room_18Tex_00BB08; -#define dHAKAdan_room_18Tex_00CF08 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00CF08" -static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00CF08[] = dHAKAdan_room_18Tex_00CF08; +#define dHAKAdan_room_18Tex_00BF08 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00BF08" +static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00BF08[] = dHAKAdan_room_18Tex_00BF08; -#define dHAKAdan_room_18DL_000560 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_000560" -static const ALIGN_ASSET(2) char HAKAdan_room_18DL_000560[] = dHAKAdan_room_18DL_000560; +#define dHAKAdan_room_18Tex_00C708 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00C708" +static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00C708[] = dHAKAdan_room_18Tex_00C708; -#define dHAKAdan_room_18DL_001298 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_001298" -static const ALIGN_ASSET(2) char HAKAdan_room_18DL_001298[] = dHAKAdan_room_18DL_001298; +#define dHAKAdan_room_18Tex_00C908 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00C908" +static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00C908[] = dHAKAdan_room_18Tex_00C908; #define dHAKAdan_room_18Tex_00CB08 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00CB08" static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00CB08[] = dHAKAdan_room_18Tex_00CB08; @@ -27,11 +24,17 @@ static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00CB08[] = dHAKAdan_room_18T #define dHAKAdan_room_18Tex_00CD08 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00CD08" static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00CD08[] = dHAKAdan_room_18Tex_00CD08; -#define dHAKAdan_room_18Tex_00C908 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00C908" -static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00C908[] = dHAKAdan_room_18Tex_00C908; +#define dHAKAdan_room_18Tex_00CF08 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00CF08" +static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00CF08[] = dHAKAdan_room_18Tex_00CF08; -#define dHAKAdan_room_18Tex_00B908 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00B908" -static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00B908[] = dHAKAdan_room_18Tex_00B908; +#define dHAKAdan_room_18DL_0032A0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_0032A0" +static const ALIGN_ASSET(2) char HAKAdan_room_18DL_0032A0[] = dHAKAdan_room_18DL_0032A0; + +#define dHAKAdan_room_18DL_000560 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_000560" +static const ALIGN_ASSET(2) char HAKAdan_room_18DL_000560[] = dHAKAdan_room_18DL_000560; + +#define dHAKAdan_room_18DL_001298 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_001298" +static const ALIGN_ASSET(2) char HAKAdan_room_18DL_001298[] = dHAKAdan_room_18DL_001298; #define dHAKAdan_room_18DL_004928 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_004928" static const ALIGN_ASSET(2) char HAKAdan_room_18DL_004928[] = dHAKAdan_room_18DL_004928; @@ -51,9 +54,6 @@ static const ALIGN_ASSET(2) char HAKAdan_room_18DL_009D28[] = dHAKAdan_room_18DL #define dHAKAdan_room_18DL_003BD0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_003BD0" static const ALIGN_ASSET(2) char HAKAdan_room_18DL_003BD0[] = dHAKAdan_room_18DL_003BD0; -#define dHAKAdan_room_18Tex_00BF08 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00BF08" -static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00BF08[] = dHAKAdan_room_18Tex_00BF08; - #define dHAKAdan_room_18DL_002708 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_002708" static const ALIGN_ASSET(2) char HAKAdan_room_18DL_002708[] = dHAKAdan_room_18DL_002708; diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_19.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_19.h index b6204a4fd..0cd07b136 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_19.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_19.h @@ -3,18 +3,18 @@ #include "align_asset_macro.h" -#define dHAKAdan_room_19DL_0011E0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_19DL_0011E0" -static const ALIGN_ASSET(2) char HAKAdan_room_19DL_0011E0[] = dHAKAdan_room_19DL_0011E0; +#define dHAKAdan_room_19Tex_001578 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_19Tex_001578" +static const ALIGN_ASSET(2) char HAKAdan_room_19Tex_001578[] = dHAKAdan_room_19Tex_001578; #define dHAKAdan_room_19Tex_002578 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_19Tex_002578" static const ALIGN_ASSET(2) char HAKAdan_room_19Tex_002578[] = dHAKAdan_room_19Tex_002578; +#define dHAKAdan_room_19DL_0011E0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_19DL_0011E0" +static const ALIGN_ASSET(2) char HAKAdan_room_19DL_0011E0[] = dHAKAdan_room_19DL_0011E0; + #define dHAKAdan_room_19DL_001490 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_19DL_001490" static const ALIGN_ASSET(2) char HAKAdan_room_19DL_001490[] = dHAKAdan_room_19DL_001490; -#define dHAKAdan_room_19Tex_001578 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_19Tex_001578" -static const ALIGN_ASSET(2) char HAKAdan_room_19Tex_001578[] = dHAKAdan_room_19Tex_001578; - #define dHAKAdan_room_19DL_000290 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_19DL_000290" static const ALIGN_ASSET(2) char HAKAdan_room_19DL_000290[] = dHAKAdan_room_19DL_000290; diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_2.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_2.h index 59e816a2e..76ac06d05 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_2.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_2.h @@ -3,17 +3,41 @@ #include "align_asset_macro.h" -#define dHAKAdan_room_2DL_004960 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2DL_004960" -static const ALIGN_ASSET(2) char HAKAdan_room_2DL_004960[] = dHAKAdan_room_2DL_004960; +#define dHAKAdan_room_2Tex_006BD8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_006BD8" +static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_006BD8[] = dHAKAdan_room_2Tex_006BD8; -#define dHAKAdan_room_2Tex_0081D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_0081D8" -static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_0081D8[] = dHAKAdan_room_2Tex_0081D8; +#define dHAKAdan_room_2Tex_0073D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_0073D8" +static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_0073D8[] = dHAKAdan_room_2Tex_0073D8; + +#define dHAKAdan_room_2Tex_0077D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_0077D8" +static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_0077D8[] = dHAKAdan_room_2Tex_0077D8; #define dHAKAdan_room_2Tex_007FD8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_007FD8" static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_007FD8[] = dHAKAdan_room_2Tex_007FD8; -#define dHAKAdan_room_2Tex_0073D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_0073D8" -static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_0073D8[] = dHAKAdan_room_2Tex_0073D8; +#define dHAKAdan_room_2Tex_0081D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_0081D8" +static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_0081D8[] = dHAKAdan_room_2Tex_0081D8; + +#define dHAKAdan_room_2Tex_0091D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_0091D8" +static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_0091D8[] = dHAKAdan_room_2Tex_0091D8; + +#define dHAKAdan_room_2Tex_0099D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_0099D8" +static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_0099D8[] = dHAKAdan_room_2Tex_0099D8; + +#define dHAKAdan_room_2Tex_009BD8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_009BD8" +static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_009BD8[] = dHAKAdan_room_2Tex_009BD8; + +#define dHAKAdan_room_2Tex_00A3D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_00A3D8" +static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_00A3D8[] = dHAKAdan_room_2Tex_00A3D8; + +#define dHAKAdan_room_2Tex_00A5D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_00A5D8" +static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_00A5D8[] = dHAKAdan_room_2Tex_00A5D8; + +#define dHAKAdan_room_2Tex_00A7D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_00A7D8" +static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_00A7D8[] = dHAKAdan_room_2Tex_00A7D8; + +#define dHAKAdan_room_2DL_004960 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2DL_004960" +static const ALIGN_ASSET(2) char HAKAdan_room_2DL_004960[] = dHAKAdan_room_2DL_004960; #define dHAKAdan_room_2DL_006828 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2DL_006828" static const ALIGN_ASSET(2) char HAKAdan_room_2DL_006828[] = dHAKAdan_room_2DL_006828; @@ -24,39 +48,15 @@ static const ALIGN_ASSET(2) char HAKAdan_room_2DL_005260[] = dHAKAdan_room_2DL_0 #define dHAKAdan_room_2DL_006A90 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2DL_006A90" static const ALIGN_ASSET(2) char HAKAdan_room_2DL_006A90[] = dHAKAdan_room_2DL_006A90; -#define dHAKAdan_room_2Tex_0077D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_0077D8" -static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_0077D8[] = dHAKAdan_room_2Tex_0077D8; - #define dHAKAdan_room_2DL_002248 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2DL_002248" static const ALIGN_ASSET(2) char HAKAdan_room_2DL_002248[] = dHAKAdan_room_2DL_002248; -#define dHAKAdan_room_2Tex_0091D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_0091D8" -static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_0091D8[] = dHAKAdan_room_2Tex_0091D8; - #define dHAKAdan_room_2DL_003570 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2DL_003570" static const ALIGN_ASSET(2) char HAKAdan_room_2DL_003570[] = dHAKAdan_room_2DL_003570; -#define dHAKAdan_room_2Tex_00A3D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_00A3D8" -static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_00A3D8[] = dHAKAdan_room_2Tex_00A3D8; - -#define dHAKAdan_room_2Tex_00A7D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_00A7D8" -static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_00A7D8[] = dHAKAdan_room_2Tex_00A7D8; - -#define dHAKAdan_room_2Tex_00A5D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_00A5D8" -static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_00A5D8[] = dHAKAdan_room_2Tex_00A5D8; - -#define dHAKAdan_room_2Tex_0099D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_0099D8" -static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_0099D8[] = dHAKAdan_room_2Tex_0099D8; - -#define dHAKAdan_room_2Tex_006BD8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_006BD8" -static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_006BD8[] = dHAKAdan_room_2Tex_006BD8; - #define dHAKAdan_room_2DL_005B28 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2DL_005B28" static const ALIGN_ASSET(2) char HAKAdan_room_2DL_005B28[] = dHAKAdan_room_2DL_005B28; -#define dHAKAdan_room_2Tex_009BD8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_009BD8" -static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_009BD8[] = dHAKAdan_room_2Tex_009BD8; - #define dHAKAdan_room_2DL_006158 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2DL_006158" static const ALIGN_ASSET(2) char HAKAdan_room_2DL_006158[] = dHAKAdan_room_2DL_006158; diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_20.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_20.h index 227a653c7..216f497c3 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_20.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_20.h @@ -3,12 +3,12 @@ #include "align_asset_macro.h" -#define dHAKAdan_room_20DL_0013D0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_20DL_0013D0" -static const ALIGN_ASSET(2) char HAKAdan_room_20DL_0013D0[] = dHAKAdan_room_20DL_0013D0; - #define dHAKAdan_room_20Tex_001640 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_20Tex_001640" static const ALIGN_ASSET(2) char HAKAdan_room_20Tex_001640[] = dHAKAdan_room_20Tex_001640; +#define dHAKAdan_room_20DL_0013D0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_20DL_0013D0" +static const ALIGN_ASSET(2) char HAKAdan_room_20DL_0013D0[] = dHAKAdan_room_20DL_0013D0; + #define dHAKAdan_room_20DL_0002B0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_20DL_0002B0" static const ALIGN_ASSET(2) char HAKAdan_room_20DL_0002B0[] = dHAKAdan_room_20DL_0002B0; diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_21.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_21.h index 05e5a58bc..5fa148a10 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_21.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_21.h @@ -3,17 +3,14 @@ #include "align_asset_macro.h" -#define dHAKAdan_room_21DL_006690 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21DL_006690" -static const ALIGN_ASSET(2) char HAKAdan_room_21DL_006690[] = dHAKAdan_room_21DL_006690; - -#define dHAKAdan_room_21Tex_007800 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_007800" -static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_007800[] = dHAKAdan_room_21Tex_007800; +#define dHAKAdan_room_21Tex_006E00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_006E00" +static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_006E00[] = dHAKAdan_room_21Tex_006E00; #define dHAKAdan_room_21Tex_007600 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_007600" static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_007600[] = dHAKAdan_room_21Tex_007600; -#define dHAKAdan_room_21Tex_009800 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_009800" -static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_009800[] = dHAKAdan_room_21Tex_009800; +#define dHAKAdan_room_21Tex_007800 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_007800" +static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_007800[] = dHAKAdan_room_21Tex_007800; #define dHAKAdan_room_21Tex_008800 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_008800" static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_008800[] = dHAKAdan_room_21Tex_008800; @@ -21,21 +18,33 @@ static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_008800[] = dHAKAdan_room_21T #define dHAKAdan_room_21Tex_009000 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_009000" static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_009000[] = dHAKAdan_room_21Tex_009000; -#define dHAKAdan_room_21DL_001A60 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21DL_001A60" -static const ALIGN_ASSET(2) char HAKAdan_room_21DL_001A60[] = dHAKAdan_room_21DL_001A60; +#define dHAKAdan_room_21Tex_009800 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_009800" +static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_009800[] = dHAKAdan_room_21Tex_009800; + +#define dHAKAdan_room_21Tex_00A000 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_00A000" +static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_00A000[] = dHAKAdan_room_21Tex_00A000; #define dHAKAdan_room_21Tex_00A800 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_00A800" static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_00A800[] = dHAKAdan_room_21Tex_00A800; +#define dHAKAdan_room_21Tex_00AA00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_00AA00" +static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_00AA00[] = dHAKAdan_room_21Tex_00AA00; + +#define dHAKAdan_room_21Tex_00ADA8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_00ADA8" +static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_00ADA8[] = dHAKAdan_room_21Tex_00ADA8; + +#define dHAKAdan_room_21DL_006690 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21DL_006690" +static const ALIGN_ASSET(2) char HAKAdan_room_21DL_006690[] = dHAKAdan_room_21DL_006690; + +#define dHAKAdan_room_21DL_001A60 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21DL_001A60" +static const ALIGN_ASSET(2) char HAKAdan_room_21DL_001A60[] = dHAKAdan_room_21DL_001A60; + #define dHAKAdan_room_21DL_005110 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21DL_005110" static const ALIGN_ASSET(2) char HAKAdan_room_21DL_005110[] = dHAKAdan_room_21DL_005110; #define dHAKAdan_room_21DL_003DB8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21DL_003DB8" static const ALIGN_ASSET(2) char HAKAdan_room_21DL_003DB8[] = dHAKAdan_room_21DL_003DB8; -#define dHAKAdan_room_21Tex_00AA00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_00AA00" -static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_00AA00[] = dHAKAdan_room_21Tex_00AA00; - #define dHAKAdan_room_21DL_000AA8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21DL_000AA8" static const ALIGN_ASSET(2) char HAKAdan_room_21DL_000AA8[] = dHAKAdan_room_21DL_000AA8; @@ -48,24 +57,15 @@ static const ALIGN_ASSET(2) char HAKAdan_room_21DL_000710[] = dHAKAdan_room_21DL #define dHAKAdan_room_21DL_00ACC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21DL_00ACC0" static const ALIGN_ASSET(2) char HAKAdan_room_21DL_00ACC0[] = dHAKAdan_room_21DL_00ACC0; -#define dHAKAdan_room_21Tex_00ADA8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_00ADA8" -static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_00ADA8[] = dHAKAdan_room_21Tex_00ADA8; - #define dHAKAdan_room_21DL_005500 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21DL_005500" static const ALIGN_ASSET(2) char HAKAdan_room_21DL_005500[] = dHAKAdan_room_21DL_005500; -#define dHAKAdan_room_21Tex_006E00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_006E00" -static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_006E00[] = dHAKAdan_room_21Tex_006E00; - #define dHAKAdan_room_21DL_002CE8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21DL_002CE8" static const ALIGN_ASSET(2) char HAKAdan_room_21DL_002CE8[] = dHAKAdan_room_21DL_002CE8; #define dHAKAdan_room_21DL_0010D0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21DL_0010D0" static const ALIGN_ASSET(2) char HAKAdan_room_21DL_0010D0[] = dHAKAdan_room_21DL_0010D0; -#define dHAKAdan_room_21Tex_00A000 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_00A000" -static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_00A000[] = dHAKAdan_room_21Tex_00A000; - #define dHAKAdan_room_21DL_0047A0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21DL_0047A0" static const ALIGN_ASSET(2) char HAKAdan_room_21DL_0047A0[] = dHAKAdan_room_21DL_0047A0; diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_22.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_22.h index ced6150dd..275f3b4aa 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_22.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_22.h @@ -3,17 +3,17 @@ #include "align_asset_macro.h" -#define dHAKAdan_room_22DL_000B00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_22DL_000B00" -static const ALIGN_ASSET(2) char HAKAdan_room_22DL_000B00[] = dHAKAdan_room_22DL_000B00; +#define dHAKAdan_room_22Tex_000FA8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_22Tex_000FA8" +static const ALIGN_ASSET(2) char HAKAdan_room_22Tex_000FA8[] = dHAKAdan_room_22Tex_000FA8; #define dHAKAdan_room_22Tex_0011A8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_22Tex_0011A8" static const ALIGN_ASSET(2) char HAKAdan_room_22Tex_0011A8[] = dHAKAdan_room_22Tex_0011A8; -#define dHAKAdan_room_22Tex_000FA8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_22Tex_000FA8" -static const ALIGN_ASSET(2) char HAKAdan_room_22Tex_000FA8[] = dHAKAdan_room_22Tex_000FA8; - #define dHAKAdan_room_22Tex_0021A8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_22Tex_0021A8" static const ALIGN_ASSET(2) char HAKAdan_room_22Tex_0021A8[] = dHAKAdan_room_22Tex_0021A8; +#define dHAKAdan_room_22DL_000B00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_22DL_000B00" +static const ALIGN_ASSET(2) char HAKAdan_room_22DL_000B00[] = dHAKAdan_room_22DL_000B00; + #endif // DUNGEONS_HAKADAN_ROOM_22_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_3.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_3.h index 8a0ddbec1..0e68a61ce 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_3.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_3.h @@ -3,8 +3,11 @@ #include "align_asset_macro.h" -#define dHAKAdan_room_3DL_000CB0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_3DL_000CB0" -static const ALIGN_ASSET(2) char HAKAdan_room_3DL_000CB0[] = dHAKAdan_room_3DL_000CB0; +#define dHAKAdan_room_3Tex_001578 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_3Tex_001578" +static const ALIGN_ASSET(2) char HAKAdan_room_3Tex_001578[] = dHAKAdan_room_3Tex_001578; + +#define dHAKAdan_room_3Tex_001D78 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_3Tex_001D78" +static const ALIGN_ASSET(2) char HAKAdan_room_3Tex_001D78[] = dHAKAdan_room_3Tex_001D78; #define dHAKAdan_room_3Tex_002578 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_3Tex_002578" static const ALIGN_ASSET(2) char HAKAdan_room_3Tex_002578[] = dHAKAdan_room_3Tex_002578; @@ -12,18 +15,15 @@ static const ALIGN_ASSET(2) char HAKAdan_room_3Tex_002578[] = dHAKAdan_room_3Tex #define dHAKAdan_room_3Tex_002778 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_3Tex_002778" static const ALIGN_ASSET(2) char HAKAdan_room_3Tex_002778[] = dHAKAdan_room_3Tex_002778; +#define dHAKAdan_room_3DL_000CB0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_3DL_000CB0" +static const ALIGN_ASSET(2) char HAKAdan_room_3DL_000CB0[] = dHAKAdan_room_3DL_000CB0; + #define dHAKAdan_room_3DL_001420 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_3DL_001420" static const ALIGN_ASSET(2) char HAKAdan_room_3DL_001420[] = dHAKAdan_room_3DL_001420; #define dHAKAdan_room_3DL_000750 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_3DL_000750" static const ALIGN_ASSET(2) char HAKAdan_room_3DL_000750[] = dHAKAdan_room_3DL_000750; -#define dHAKAdan_room_3Tex_001D78 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_3Tex_001D78" -static const ALIGN_ASSET(2) char HAKAdan_room_3Tex_001D78[] = dHAKAdan_room_3Tex_001D78; - -#define dHAKAdan_room_3Tex_001578 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_3Tex_001578" -static const ALIGN_ASSET(2) char HAKAdan_room_3Tex_001578[] = dHAKAdan_room_3Tex_001578; - #define dHAKAdan_room_3DL_0011B0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_3DL_0011B0" static const ALIGN_ASSET(2) char HAKAdan_room_3DL_0011B0[] = dHAKAdan_room_3DL_0011B0; diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_4.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_4.h index 8398ab19e..21dfd2927 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_4.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_4.h @@ -3,12 +3,12 @@ #include "align_asset_macro.h" -#define dHAKAdan_room_4DL_001230 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_4DL_001230" -static const ALIGN_ASSET(2) char HAKAdan_room_4DL_001230[] = dHAKAdan_room_4DL_001230; - #define dHAKAdan_room_4Tex_001458 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_4Tex_001458" static const ALIGN_ASSET(2) char HAKAdan_room_4Tex_001458[] = dHAKAdan_room_4Tex_001458; +#define dHAKAdan_room_4DL_001230 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_4DL_001230" +static const ALIGN_ASSET(2) char HAKAdan_room_4DL_001230[] = dHAKAdan_room_4DL_001230; + #define dHAKAdan_room_4DL_000280 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_4DL_000280" static const ALIGN_ASSET(2) char HAKAdan_room_4DL_000280[] = dHAKAdan_room_4DL_000280; diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_5.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_5.h index 76c87596f..1063fa1d6 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_5.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_5.h @@ -3,14 +3,23 @@ #include "align_asset_macro.h" -#define dHAKAdan_room_5DL_002E10 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5DL_002E10" -static const ALIGN_ASSET(2) char HAKAdan_room_5DL_002E10[] = dHAKAdan_room_5DL_002E10; +#define dHAKAdan_room_5Tex_003CC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5Tex_003CC0" +static const ALIGN_ASSET(2) char HAKAdan_room_5Tex_003CC0[] = dHAKAdan_room_5Tex_003CC0; + +#define dHAKAdan_room_5Tex_0040C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5Tex_0040C0" +static const ALIGN_ASSET(2) char HAKAdan_room_5Tex_0040C0[] = dHAKAdan_room_5Tex_0040C0; #define dHAKAdan_room_5Tex_0048C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5Tex_0048C0" static const ALIGN_ASSET(2) char HAKAdan_room_5Tex_0048C0[] = dHAKAdan_room_5Tex_0048C0; -#define dHAKAdan_room_5Tex_003CC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5Tex_003CC0" -static const ALIGN_ASSET(2) char HAKAdan_room_5Tex_003CC0[] = dHAKAdan_room_5Tex_003CC0; +#define dHAKAdan_room_5Tex_004AC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5Tex_004AC0" +static const ALIGN_ASSET(2) char HAKAdan_room_5Tex_004AC0[] = dHAKAdan_room_5Tex_004AC0; + +#define dHAKAdan_room_5Tex_0052C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5Tex_0052C0" +static const ALIGN_ASSET(2) char HAKAdan_room_5Tex_0052C0[] = dHAKAdan_room_5Tex_0052C0; + +#define dHAKAdan_room_5DL_002E10 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5DL_002E10" +static const ALIGN_ASSET(2) char HAKAdan_room_5DL_002E10[] = dHAKAdan_room_5DL_002E10; #define dHAKAdan_room_5DL_003398 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5DL_003398" static const ALIGN_ASSET(2) char HAKAdan_room_5DL_003398[] = dHAKAdan_room_5DL_003398; @@ -18,21 +27,12 @@ static const ALIGN_ASSET(2) char HAKAdan_room_5DL_003398[] = dHAKAdan_room_5DL_0 #define dHAKAdan_room_5DL_003938 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5DL_003938" static const ALIGN_ASSET(2) char HAKAdan_room_5DL_003938[] = dHAKAdan_room_5DL_003938; -#define dHAKAdan_room_5Tex_004AC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5Tex_004AC0" -static const ALIGN_ASSET(2) char HAKAdan_room_5Tex_004AC0[] = dHAKAdan_room_5Tex_004AC0; - #define dHAKAdan_room_5DL_0001F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5DL_0001F0" static const ALIGN_ASSET(2) char HAKAdan_room_5DL_0001F0[] = dHAKAdan_room_5DL_0001F0; -#define dHAKAdan_room_5Tex_0040C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5Tex_0040C0" -static const ALIGN_ASSET(2) char HAKAdan_room_5Tex_0040C0[] = dHAKAdan_room_5Tex_0040C0; - #define dHAKAdan_room_5DL_003B88 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5DL_003B88" static const ALIGN_ASSET(2) char HAKAdan_room_5DL_003B88[] = dHAKAdan_room_5DL_003B88; -#define dHAKAdan_room_5Tex_0052C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5Tex_0052C0" -static const ALIGN_ASSET(2) char HAKAdan_room_5Tex_0052C0[] = dHAKAdan_room_5Tex_0052C0; - #define dHAKAdan_room_5DL_0019E8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5DL_0019E8" static const ALIGN_ASSET(2) char HAKAdan_room_5DL_0019E8[] = dHAKAdan_room_5DL_0019E8; diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_6.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_6.h index df746e0ef..93d89f4c2 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_6.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_6.h @@ -3,23 +3,26 @@ #include "align_asset_macro.h" -#define dHAKAdan_room_6DL_004178 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6DL_004178" -static const ALIGN_ASSET(2) char HAKAdan_room_6DL_004178[] = dHAKAdan_room_6DL_004178; +#define dHAKAdan_room_6Tex_004BF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_004BF0" +static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_004BF0[] = dHAKAdan_room_6Tex_004BF0; -#define dHAKAdan_room_6Tex_0071F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_0071F0" -static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_0071F0[] = dHAKAdan_room_6Tex_0071F0; +#define dHAKAdan_room_6Tex_0053F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_0053F0" +static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_0053F0[] = dHAKAdan_room_6Tex_0053F0; #define dHAKAdan_room_6Tex_0055F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_0055F0" static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_0055F0[] = dHAKAdan_room_6Tex_0055F0; -#define dHAKAdan_room_6Tex_006DF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_006DF0" -static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_006DF0[] = dHAKAdan_room_6Tex_006DF0; - #define dHAKAdan_room_6Tex_0065F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_0065F0" static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_0065F0[] = dHAKAdan_room_6Tex_0065F0; -#define dHAKAdan_room_6Tex_0053F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_0053F0" -static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_0053F0[] = dHAKAdan_room_6Tex_0053F0; +#define dHAKAdan_room_6Tex_006DF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_006DF0" +static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_006DF0[] = dHAKAdan_room_6Tex_006DF0; + +#define dHAKAdan_room_6Tex_0071F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_0071F0" +static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_0071F0[] = dHAKAdan_room_6Tex_0071F0; + +#define dHAKAdan_room_6DL_004178 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6DL_004178" +static const ALIGN_ASSET(2) char HAKAdan_room_6DL_004178[] = dHAKAdan_room_6DL_004178; #define dHAKAdan_room_6DL_001B40 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6DL_001B40" static const ALIGN_ASSET(2) char HAKAdan_room_6DL_001B40[] = dHAKAdan_room_6DL_001B40; @@ -27,8 +30,5 @@ static const ALIGN_ASSET(2) char HAKAdan_room_6DL_001B40[] = dHAKAdan_room_6DL_0 #define dHAKAdan_room_6DL_004B18 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6DL_004B18" static const ALIGN_ASSET(2) char HAKAdan_room_6DL_004B18[] = dHAKAdan_room_6DL_004B18; -#define dHAKAdan_room_6Tex_004BF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_004BF0" -static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_004BF0[] = dHAKAdan_room_6Tex_004BF0; - #endif // DUNGEONS_HAKADAN_ROOM_6_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_7.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_7.h index 220e443f5..51103e4fe 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_7.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_7.h @@ -3,12 +3,12 @@ #include "align_asset_macro.h" -#define dHAKAdan_room_7DL_001100 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_7DL_001100" -static const ALIGN_ASSET(2) char HAKAdan_room_7DL_001100[] = dHAKAdan_room_7DL_001100; - #define dHAKAdan_room_7Tex_0012D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_7Tex_0012D8" static const ALIGN_ASSET(2) char HAKAdan_room_7Tex_0012D8[] = dHAKAdan_room_7Tex_0012D8; +#define dHAKAdan_room_7DL_001100 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_7DL_001100" +static const ALIGN_ASSET(2) char HAKAdan_room_7DL_001100[] = dHAKAdan_room_7DL_001100; + #define dHAKAdan_room_7DL_000260 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_7DL_000260" static const ALIGN_ASSET(2) char HAKAdan_room_7DL_000260[] = dHAKAdan_room_7DL_000260; diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_8.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_8.h index 0c06b4805..fc879a1df 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_8.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_8.h @@ -3,14 +3,23 @@ #include "align_asset_macro.h" -#define dHAKAdan_room_8DL_000E70 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8DL_000E70" -static const ALIGN_ASSET(2) char HAKAdan_room_8DL_000E70[] = dHAKAdan_room_8DL_000E70; +#define dHAKAdan_room_8Tex_003098 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_003098" +static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_003098[] = dHAKAdan_room_8Tex_003098; + +#define dHAKAdan_room_8Tex_003298 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_003298" +static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_003298[] = dHAKAdan_room_8Tex_003298; + +#define dHAKAdan_room_8Tex_004298 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_004298" +static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_004298[] = dHAKAdan_room_8Tex_004298; + +#define dHAKAdan_room_8Tex_004A98 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_004A98" +static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_004A98[] = dHAKAdan_room_8Tex_004A98; #define dHAKAdan_room_8Tex_004C98 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_004C98" static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_004C98[] = dHAKAdan_room_8Tex_004C98; -#define dHAKAdan_room_8Tex_003098 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_003098" -static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_003098[] = dHAKAdan_room_8Tex_003098; +#define dHAKAdan_room_8DL_000E70 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8DL_000E70" +static const ALIGN_ASSET(2) char HAKAdan_room_8DL_000E70[] = dHAKAdan_room_8DL_000E70; #define dHAKAdan_room_8DL_002418 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8DL_002418" static const ALIGN_ASSET(2) char HAKAdan_room_8DL_002418[] = dHAKAdan_room_8DL_002418; @@ -18,17 +27,8 @@ static const ALIGN_ASSET(2) char HAKAdan_room_8DL_002418[] = dHAKAdan_room_8DL_0 #define dHAKAdan_room_8DL_002CC8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8DL_002CC8" static const ALIGN_ASSET(2) char HAKAdan_room_8DL_002CC8[] = dHAKAdan_room_8DL_002CC8; -#define dHAKAdan_room_8Tex_004A98 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_004A98" -static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_004A98[] = dHAKAdan_room_8Tex_004A98; - -#define dHAKAdan_room_8Tex_003298 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_003298" -static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_003298[] = dHAKAdan_room_8Tex_003298; - #define dHAKAdan_room_8DL_001CE8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8DL_001CE8" static const ALIGN_ASSET(2) char HAKAdan_room_8DL_001CE8[] = dHAKAdan_room_8DL_001CE8; -#define dHAKAdan_room_8Tex_004298 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_004298" -static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_004298[] = dHAKAdan_room_8Tex_004298; - #endif // DUNGEONS_HAKADAN_ROOM_8_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_9.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_9.h index 701377160..2dd54a7bf 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_9.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_9.h @@ -3,18 +3,36 @@ #include "align_asset_macro.h" -#define dHAKAdan_room_9DL_005AF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_005AF0" -static const ALIGN_ASSET(2) char HAKAdan_room_9DL_005AF0[] = dHAKAdan_room_9DL_005AF0; +#define dHAKAdan_room_9Tex_009090 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_009090" +static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_009090[] = dHAKAdan_room_9Tex_009090; -#define dHAKAdan_room_9Tex_00C890 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00C890" -static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00C890[] = dHAKAdan_room_9Tex_00C890; +#define dHAKAdan_room_9Tex_009890 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_009890" +static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_009890[] = dHAKAdan_room_9Tex_009890; #define dHAKAdan_room_9Tex_00A090 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00A090" static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00A090[] = dHAKAdan_room_9Tex_00A090; +#define dHAKAdan_room_9Tex_00A290 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00A290" +static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00A290[] = dHAKAdan_room_9Tex_00A290; + +#define dHAKAdan_room_9Tex_00B290 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00B290" +static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00B290[] = dHAKAdan_room_9Tex_00B290; + #define dHAKAdan_room_9Tex_00BA90 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00BA90" static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00BA90[] = dHAKAdan_room_9Tex_00BA90; +#define dHAKAdan_room_9Tex_00BE90 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00BE90" +static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00BE90[] = dHAKAdan_room_9Tex_00BE90; + +#define dHAKAdan_room_9Tex_00C690 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00C690" +static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00C690[] = dHAKAdan_room_9Tex_00C690; + +#define dHAKAdan_room_9Tex_00C890 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00C890" +static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00C890[] = dHAKAdan_room_9Tex_00C890; + +#define dHAKAdan_room_9DL_005AF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_005AF0" +static const ALIGN_ASSET(2) char HAKAdan_room_9DL_005AF0[] = dHAKAdan_room_9DL_005AF0; + #define dHAKAdan_room_9DL_008E68 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_008E68" static const ALIGN_ASSET(2) char HAKAdan_room_9DL_008E68[] = dHAKAdan_room_9DL_008E68; @@ -27,30 +45,15 @@ static const ALIGN_ASSET(2) char HAKAdan_room_9DL_000470[] = dHAKAdan_room_9DL_0 #define dHAKAdan_room_9DL_006600 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_006600" static const ALIGN_ASSET(2) char HAKAdan_room_9DL_006600[] = dHAKAdan_room_9DL_006600; -#define dHAKAdan_room_9Tex_00B290 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00B290" -static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00B290[] = dHAKAdan_room_9Tex_00B290; - #define dHAKAdan_room_9DL_008910 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_008910" static const ALIGN_ASSET(2) char HAKAdan_room_9DL_008910[] = dHAKAdan_room_9DL_008910; #define dHAKAdan_room_9DL_002248 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_002248" static const ALIGN_ASSET(2) char HAKAdan_room_9DL_002248[] = dHAKAdan_room_9DL_002248; -#define dHAKAdan_room_9Tex_009890 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_009890" -static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_009890[] = dHAKAdan_room_9Tex_009890; - #define dHAKAdan_room_9DL_003E30 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_003E30" static const ALIGN_ASSET(2) char HAKAdan_room_9DL_003E30[] = dHAKAdan_room_9DL_003E30; -#define dHAKAdan_room_9Tex_009090 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_009090" -static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_009090[] = dHAKAdan_room_9Tex_009090; - -#define dHAKAdan_room_9Tex_00C690 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00C690" -static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00C690[] = dHAKAdan_room_9Tex_00C690; - -#define dHAKAdan_room_9Tex_00A290 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00A290" -static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00A290[] = dHAKAdan_room_9Tex_00A290; - #define dHAKAdan_room_9DL_0085F8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_0085F8" static const ALIGN_ASSET(2) char HAKAdan_room_9DL_0085F8[] = dHAKAdan_room_9DL_0085F8; @@ -60,8 +63,5 @@ static const ALIGN_ASSET(2) char HAKAdan_room_9DL_000868[] = dHAKAdan_room_9DL_0 #define dHAKAdan_room_9DL_007620 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_007620" static const ALIGN_ASSET(2) char HAKAdan_room_9DL_007620[] = dHAKAdan_room_9DL_007620; -#define dHAKAdan_room_9Tex_00BE90 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00BE90" -static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00BE90[] = dHAKAdan_room_9Tex_00BE90; - #endif // DUNGEONS_HAKADAN_ROOM_9_H diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_scene.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_scene.h index f9339f787..1808817c9 100644 --- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_scene.h +++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_scene.h @@ -3,8 +3,11 @@ #include "align_asset_macro.h" -#define dHAKAdan_sceneCollisionHeader_016394 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_sceneCollisionHeader_016394" -static const ALIGN_ASSET(2) char HAKAdan_sceneCollisionHeader_016394[] = dHAKAdan_sceneCollisionHeader_016394; +#define dHAKAdan_sceneTex_0163C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_sceneTex_0163C0" +static const ALIGN_ASSET(2) char HAKAdan_sceneTex_0163C0[] = dHAKAdan_sceneTex_0163C0; + +#define dHAKAdan_sceneTex_016BC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_sceneTex_016BC0" +static const ALIGN_ASSET(2) char HAKAdan_sceneTex_016BC0[] = dHAKAdan_sceneTex_016BC0; #define dHAKAdan_sceneTex_0173C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_sceneTex_0173C0" static const ALIGN_ASSET(2) char HAKAdan_sceneTex_0173C0[] = dHAKAdan_sceneTex_0173C0; @@ -12,10 +15,8 @@ static const ALIGN_ASSET(2) char HAKAdan_sceneTex_0173C0[] = dHAKAdan_sceneTex_0 #define dHAKAdan_sceneTex_017BC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_sceneTex_017BC0" static const ALIGN_ASSET(2) char HAKAdan_sceneTex_017BC0[] = dHAKAdan_sceneTex_017BC0; -#define dHAKAdan_sceneTex_016BC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_sceneTex_016BC0" -static const ALIGN_ASSET(2) char HAKAdan_sceneTex_016BC0[] = dHAKAdan_sceneTex_016BC0; +#define dHAKAdan_sceneCollisionHeader_016394 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_sceneCollisionHeader_016394" +static const ALIGN_ASSET(2) char HAKAdan_sceneCollisionHeader_016394[] = dHAKAdan_sceneCollisionHeader_016394; -#define dHAKAdan_sceneTex_0163C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_sceneTex_0163C0" -static const ALIGN_ASSET(2) char HAKAdan_sceneTex_0163C0[] = dHAKAdan_sceneTex_0163C0; #endif // DUNGEONS_HAKADAN_SCENE_H diff --git a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_0.h b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_0.h index 4faff3d1f..3294db129 100644 --- a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_0.h +++ b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_0.h @@ -3,32 +3,65 @@ #include "align_asset_macro.h" -#define dHAKAdanCH_room_0DL_001D30 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_001D30" -static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_001D30[] = dHAKAdanCH_room_0DL_001D30; - -#define dHAKAdanCH_room_0Tex_013320 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_013320" -static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_013320[] = dHAKAdanCH_room_0Tex_013320; - -#define dHAKAdanCH_room_0Tex_011920 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_011920" -static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_011920[] = dHAKAdanCH_room_0Tex_011920; - -#define dHAKAdanCH_room_0Tex_011120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_011120" -static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_011120[] = dHAKAdanCH_room_0Tex_011120; +#define dHAKAdanCH_room_0Tex_00D720 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_00D720" +static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_00D720[] = dHAKAdanCH_room_0Tex_00D720; #define dHAKAdanCH_room_0Tex_00DF20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_00DF20" static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_00DF20[] = dHAKAdanCH_room_0Tex_00DF20; +#define dHAKAdanCH_room_0Tex_00E120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_00E120" +static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_00E120[] = dHAKAdanCH_room_0Tex_00E120; + +#define dHAKAdanCH_room_0Tex_00F120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_00F120" +static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_00F120[] = dHAKAdanCH_room_0Tex_00F120; + #define dHAKAdanCH_room_0Tex_00F920 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_00F920" static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_00F920[] = dHAKAdanCH_room_0Tex_00F920; -#define dHAKAdanCH_room_0DL_004018 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_004018" -static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_004018[] = dHAKAdanCH_room_0DL_004018; +#define dHAKAdanCH_room_0Tex_010120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_010120" +static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_010120[] = dHAKAdanCH_room_0Tex_010120; + +#define dHAKAdanCH_room_0Tex_011120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_011120" +static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_011120[] = dHAKAdanCH_room_0Tex_011120; + +#define dHAKAdanCH_room_0Tex_011920 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_011920" +static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_011920[] = dHAKAdanCH_room_0Tex_011920; + +#define dHAKAdanCH_room_0Tex_011D20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_011D20" +static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_011D20[] = dHAKAdanCH_room_0Tex_011D20; #define dHAKAdanCH_room_0Tex_011F20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_011F20" static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_011F20[] = dHAKAdanCH_room_0Tex_011F20; -#define dHAKAdanCH_room_0Tex_010120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_010120" -static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_010120[] = dHAKAdanCH_room_0Tex_010120; +#define dHAKAdanCH_room_0Tex_012720 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_012720" +static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_012720[] = dHAKAdanCH_room_0Tex_012720; + +#define dHAKAdanCH_room_0Tex_012F20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_012F20" +static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_012F20[] = dHAKAdanCH_room_0Tex_012F20; + +#define dHAKAdanCH_room_0Tex_013120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_013120" +static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_013120[] = dHAKAdanCH_room_0Tex_013120; + +#define dHAKAdanCH_room_0Tex_013320 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_013320" +static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_013320[] = dHAKAdanCH_room_0Tex_013320; + +#define dHAKAdanCH_room_0Tex_013720 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_013720" +static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_013720[] = dHAKAdanCH_room_0Tex_013720; + +#define dHAKAdanCH_room_0Tex_013F20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_013F20" +static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_013F20[] = dHAKAdanCH_room_0Tex_013F20; + +#define dHAKAdanCH_room_0Tex_014B20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_014B20" +static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_014B20[] = dHAKAdanCH_room_0Tex_014B20; + +#define dHAKAdanCH_room_0Tex_014F20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_014F20" +static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_014F20[] = dHAKAdanCH_room_0Tex_014F20; + +#define dHAKAdanCH_room_0DL_001D30 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_001D30" +static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_001D30[] = dHAKAdanCH_room_0DL_001D30; + +#define dHAKAdanCH_room_0DL_004018 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_004018" +static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_004018[] = dHAKAdanCH_room_0DL_004018; #define dHAKAdanCH_room_0DL_004D18 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_004D18" static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_004D18[] = dHAKAdanCH_room_0DL_004D18; @@ -36,9 +69,6 @@ static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_004D18[] = dHAKAdanCH_room_0 #define dHAKAdanCH_room_0DL_0057C0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_0057C0" static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_0057C0[] = dHAKAdanCH_room_0DL_0057C0; -#define dHAKAdanCH_room_0Tex_00E120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_00E120" -static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_00E120[] = dHAKAdanCH_room_0Tex_00E120; - #define dHAKAdanCH_room_0DL_005C30 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_005C30" static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_005C30[] = dHAKAdanCH_room_0DL_005C30; @@ -54,9 +84,6 @@ static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_00D550[] = dHAKAdanCH_room_0 #define dHAKAdanCH_room_0DL_001360 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_001360" static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_001360[] = dHAKAdanCH_room_0DL_001360; -#define dHAKAdanCH_room_0Tex_013720 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_013720" -static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_013720[] = dHAKAdanCH_room_0Tex_013720; - #define dHAKAdanCH_room_0DL_0079B0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_0079B0" static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_0079B0[] = dHAKAdanCH_room_0DL_0079B0; @@ -84,24 +111,15 @@ static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_002C00[] = dHAKAdanCH_room_0 #define dHAKAdanCH_room_0DL_014430 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_014430" static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_014430[] = dHAKAdanCH_room_0DL_014430; -#define dHAKAdanCH_room_0Tex_014B20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_014B20" -static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_014B20[] = dHAKAdanCH_room_0Tex_014B20; - #define dHAKAdanCH_room_0DL_014868 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_014868" static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_014868[] = dHAKAdanCH_room_0DL_014868; -#define dHAKAdanCH_room_0Tex_014F20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_014F20" -static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_014F20[] = dHAKAdanCH_room_0Tex_014F20; - #define dHAKAdanCH_room_0DL_014A38 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_014A38" static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_014A38[] = dHAKAdanCH_room_0DL_014A38; #define dHAKAdanCH_room_0DL_006D58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_006D58" static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_006D58[] = dHAKAdanCH_room_0DL_006D58; -#define dHAKAdanCH_room_0Tex_00D720 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_00D720" -static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_00D720[] = dHAKAdanCH_room_0Tex_00D720; - #define dHAKAdanCH_room_0DL_0007B0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_0007B0" static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_0007B0[] = dHAKAdanCH_room_0DL_0007B0; @@ -114,30 +132,12 @@ static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_003518[] = dHAKAdanCH_room_0 #define dHAKAdanCH_room_0DL_006760 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_006760" static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_006760[] = dHAKAdanCH_room_0DL_006760; -#define dHAKAdanCH_room_0Tex_011D20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_011D20" -static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_011D20[] = dHAKAdanCH_room_0Tex_011D20; - -#define dHAKAdanCH_room_0Tex_012F20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_012F20" -static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_012F20[] = dHAKAdanCH_room_0Tex_012F20; - -#define dHAKAdanCH_room_0Tex_013120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_013120" -static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_013120[] = dHAKAdanCH_room_0Tex_013120; - -#define dHAKAdanCH_room_0Tex_013F20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_013F20" -static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_013F20[] = dHAKAdanCH_room_0Tex_013F20; - #define dHAKAdanCH_room_0DL_0021C0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_0021C0" static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_0021C0[] = dHAKAdanCH_room_0DL_0021C0; -#define dHAKAdanCH_room_0Tex_00F120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_00F120" -static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_00F120[] = dHAKAdanCH_room_0Tex_00F120; - #define dHAKAdanCH_room_0DL_00BAB8 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_00BAB8" static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_00BAB8[] = dHAKAdanCH_room_0DL_00BAB8; -#define dHAKAdanCH_room_0Tex_012720 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_012720" -static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_012720[] = dHAKAdanCH_room_0Tex_012720; - #define dHAKAdanCH_room_0DL_00C178 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_00C178" static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_00C178[] = dHAKAdanCH_room_0DL_00C178; diff --git a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_1.h b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_1.h index 9719a3b54..5ab971600 100644 --- a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_1.h +++ b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_1.h @@ -3,30 +3,42 @@ #include "align_asset_macro.h" -#define dHAKAdanCH_room_1DL_008B10 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_008B10" -static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_008B10[] = dHAKAdanCH_room_1DL_008B10; - -#define dHAKAdanCH_room_1Tex_00A158 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_00A158" -static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_00A158[] = dHAKAdanCH_room_1Tex_00A158; - -#define dHAKAdanCH_room_1DL_005E60 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_005E60" -static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_005E60[] = dHAKAdanCH_room_1DL_005E60; - -#define dHAKAdanCH_room_1Tex_009758 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_009758" -static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_009758[] = dHAKAdanCH_room_1Tex_009758; - #define dHAKAdanCH_room_1Tex_008D58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_008D58" static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_008D58[] = dHAKAdanCH_room_1Tex_008D58; +#define dHAKAdanCH_room_1Tex_008F58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_008F58" +static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_008F58[] = dHAKAdanCH_room_1Tex_008F58; + +#define dHAKAdanCH_room_1Tex_009158 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_009158" +static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_009158[] = dHAKAdanCH_room_1Tex_009158; + #define dHAKAdanCH_room_1Tex_009358 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_009358" static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_009358[] = dHAKAdanCH_room_1Tex_009358; -#define dHAKAdanCH_room_1DL_007358 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_007358" -static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_007358[] = dHAKAdanCH_room_1DL_007358; +#define dHAKAdanCH_room_1Tex_009758 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_009758" +static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_009758[] = dHAKAdanCH_room_1Tex_009758; + +#define dHAKAdanCH_room_1Tex_009F58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_009F58" +static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_009F58[] = dHAKAdanCH_room_1Tex_009F58; + +#define dHAKAdanCH_room_1Tex_00A158 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_00A158" +static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_00A158[] = dHAKAdanCH_room_1Tex_00A158; #define dHAKAdanCH_room_1Tex_00A558 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_00A558" static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_00A558[] = dHAKAdanCH_room_1Tex_00A558; +#define dHAKAdanCH_room_1Tex_00AD58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_00AD58" +static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_00AD58[] = dHAKAdanCH_room_1Tex_00AD58; + +#define dHAKAdanCH_room_1DL_008B10 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_008B10" +static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_008B10[] = dHAKAdanCH_room_1DL_008B10; + +#define dHAKAdanCH_room_1DL_005E60 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_005E60" +static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_005E60[] = dHAKAdanCH_room_1DL_005E60; + +#define dHAKAdanCH_room_1DL_007358 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_007358" +static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_007358[] = dHAKAdanCH_room_1DL_007358; + #define dHAKAdanCH_room_1DL_007EA8 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_007EA8" static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_007EA8[] = dHAKAdanCH_room_1DL_007EA8; @@ -42,18 +54,6 @@ static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_0018D8[] = dHAKAdanCH_room_1 #define dHAKAdanCH_room_1DL_0040C0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_0040C0" static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_0040C0[] = dHAKAdanCH_room_1DL_0040C0; -#define dHAKAdanCH_room_1Tex_00AD58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_00AD58" -static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_00AD58[] = dHAKAdanCH_room_1Tex_00AD58; - -#define dHAKAdanCH_room_1Tex_009F58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_009F58" -static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_009F58[] = dHAKAdanCH_room_1Tex_009F58; - -#define dHAKAdanCH_room_1Tex_008F58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_008F58" -static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_008F58[] = dHAKAdanCH_room_1Tex_008F58; - -#define dHAKAdanCH_room_1Tex_009158 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_009158" -static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_009158[] = dHAKAdanCH_room_1Tex_009158; - #define dHAKAdanCH_room_1DL_00B040 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_00B040" static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_00B040[] = dHAKAdanCH_room_1DL_00B040; diff --git a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_2.h b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_2.h index 072ff02de..b93776a67 100644 --- a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_2.h +++ b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_2.h @@ -3,23 +3,23 @@ #include "align_asset_macro.h" -#define dHAKAdanCH_room_2DL_0009E0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_2DL_0009E0" -static const ALIGN_ASSET(2) char HAKAdanCH_room_2DL_0009E0[] = dHAKAdanCH_room_2DL_0009E0; - #define dHAKAdanCH_room_2Tex_002958 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_2Tex_002958" static const ALIGN_ASSET(2) char HAKAdanCH_room_2Tex_002958[] = dHAKAdanCH_room_2Tex_002958; -#define dHAKAdanCH_room_2DL_001FA8 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_2DL_001FA8" -static const ALIGN_ASSET(2) char HAKAdanCH_room_2DL_001FA8[] = dHAKAdanCH_room_2DL_001FA8; - -#define dHAKAdanCH_room_2Tex_002F58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_2Tex_002F58" -static const ALIGN_ASSET(2) char HAKAdanCH_room_2Tex_002F58[] = dHAKAdanCH_room_2Tex_002F58; +#define dHAKAdanCH_room_2Tex_002B58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_2Tex_002B58" +static const ALIGN_ASSET(2) char HAKAdanCH_room_2Tex_002B58[] = dHAKAdanCH_room_2Tex_002B58; #define dHAKAdanCH_room_2Tex_002D58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_2Tex_002D58" static const ALIGN_ASSET(2) char HAKAdanCH_room_2Tex_002D58[] = dHAKAdanCH_room_2Tex_002D58; -#define dHAKAdanCH_room_2Tex_002B58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_2Tex_002B58" -static const ALIGN_ASSET(2) char HAKAdanCH_room_2Tex_002B58[] = dHAKAdanCH_room_2Tex_002B58; +#define dHAKAdanCH_room_2Tex_002F58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_2Tex_002F58" +static const ALIGN_ASSET(2) char HAKAdanCH_room_2Tex_002F58[] = dHAKAdanCH_room_2Tex_002F58; + +#define dHAKAdanCH_room_2DL_0009E0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_2DL_0009E0" +static const ALIGN_ASSET(2) char HAKAdanCH_room_2DL_0009E0[] = dHAKAdanCH_room_2DL_0009E0; + +#define dHAKAdanCH_room_2DL_001FA8 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_2DL_001FA8" +static const ALIGN_ASSET(2) char HAKAdanCH_room_2DL_001FA8[] = dHAKAdanCH_room_2DL_001FA8; #define dHAKAdanCH_room_2DL_0006E0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_2DL_0006E0" static const ALIGN_ASSET(2) char HAKAdanCH_room_2DL_0006E0[] = dHAKAdanCH_room_2DL_0006E0; diff --git a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_3.h b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_3.h index f92842202..e2c4f05c8 100644 --- a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_3.h +++ b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_3.h @@ -3,12 +3,12 @@ #include "align_asset_macro.h" -#define dHAKAdanCH_room_3DL_000D40 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_3DL_000D40" -static const ALIGN_ASSET(2) char HAKAdanCH_room_3DL_000D40[] = dHAKAdanCH_room_3DL_000D40; - #define dHAKAdanCH_room_3Tex_0014C0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_3Tex_0014C0" static const ALIGN_ASSET(2) char HAKAdanCH_room_3Tex_0014C0[] = dHAKAdanCH_room_3Tex_0014C0; +#define dHAKAdanCH_room_3DL_000D40 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_3DL_000D40" +static const ALIGN_ASSET(2) char HAKAdanCH_room_3DL_000D40[] = dHAKAdanCH_room_3DL_000D40; + #define dHAKAdanCH_room_3DL_0013A0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_3DL_0013A0" static const ALIGN_ASSET(2) char HAKAdanCH_room_3DL_0013A0[] = dHAKAdanCH_room_3DL_0013A0; diff --git a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_4.h b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_4.h index 553ef384f..64dc85e50 100644 --- a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_4.h +++ b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_4.h @@ -3,18 +3,18 @@ #include "align_asset_macro.h" -#define dHAKAdanCH_room_4DL_001270 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_4DL_001270" -static const ALIGN_ASSET(2) char HAKAdanCH_room_4DL_001270[] = dHAKAdanCH_room_4DL_001270; +#define dHAKAdanCH_room_4Tex_001498 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_4Tex_001498" +static const ALIGN_ASSET(2) char HAKAdanCH_room_4Tex_001498[] = dHAKAdanCH_room_4Tex_001498; #define dHAKAdanCH_room_4Tex_001C98 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_4Tex_001C98" static const ALIGN_ASSET(2) char HAKAdanCH_room_4Tex_001C98[] = dHAKAdanCH_room_4Tex_001C98; +#define dHAKAdanCH_room_4DL_001270 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_4DL_001270" +static const ALIGN_ASSET(2) char HAKAdanCH_room_4DL_001270[] = dHAKAdanCH_room_4DL_001270; + #define dHAKAdanCH_room_4DL_0002C0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_4DL_0002C0" static const ALIGN_ASSET(2) char HAKAdanCH_room_4DL_0002C0[] = dHAKAdanCH_room_4DL_0002C0; -#define dHAKAdanCH_room_4Tex_001498 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_4Tex_001498" -static const ALIGN_ASSET(2) char HAKAdanCH_room_4Tex_001498[] = dHAKAdanCH_room_4Tex_001498; - #define dHAKAdanCH_room_4DL_000898 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_4DL_000898" static const ALIGN_ASSET(2) char HAKAdanCH_room_4DL_000898[] = dHAKAdanCH_room_4DL_000898; diff --git a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_5.h b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_5.h index 6d3b6d031..e1433aa16 100644 --- a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_5.h +++ b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_5.h @@ -3,21 +3,21 @@ #include "align_asset_macro.h" -#define dHAKAdanCH_room_5DL_0010A0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_5DL_0010A0" -static const ALIGN_ASSET(2) char HAKAdanCH_room_5DL_0010A0[] = dHAKAdanCH_room_5DL_0010A0; - #define dHAKAdanCH_room_5Tex_001190 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_5Tex_001190" static const ALIGN_ASSET(2) char HAKAdanCH_room_5Tex_001190[] = dHAKAdanCH_room_5Tex_001190; +#define dHAKAdanCH_room_5Tex_002190 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_5Tex_002190" +static const ALIGN_ASSET(2) char HAKAdanCH_room_5Tex_002190[] = dHAKAdanCH_room_5Tex_002190; + +#define dHAKAdanCH_room_5DL_0010A0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_5DL_0010A0" +static const ALIGN_ASSET(2) char HAKAdanCH_room_5DL_0010A0[] = dHAKAdanCH_room_5DL_0010A0; + #define dHAKAdanCH_room_5DL_000F10 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_5DL_000F10" static const ALIGN_ASSET(2) char HAKAdanCH_room_5DL_000F10[] = dHAKAdanCH_room_5DL_000F10; #define dHAKAdanCH_room_5DL_000C18 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_5DL_000C18" static const ALIGN_ASSET(2) char HAKAdanCH_room_5DL_000C18[] = dHAKAdanCH_room_5DL_000C18; -#define dHAKAdanCH_room_5Tex_002190 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_5Tex_002190" -static const ALIGN_ASSET(2) char HAKAdanCH_room_5Tex_002190[] = dHAKAdanCH_room_5Tex_002190; - #define dHAKAdanCH_room_5DL_000420 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_5DL_000420" static const ALIGN_ASSET(2) char HAKAdanCH_room_5DL_000420[] = dHAKAdanCH_room_5DL_000420; diff --git a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_6.h b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_6.h index 9c9f28b98..1435416ec 100644 --- a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_6.h +++ b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_6.h @@ -3,8 +3,8 @@ #include "align_asset_macro.h" -#define dHAKAdanCH_room_6DL_000C30 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_6DL_000C30" -static const ALIGN_ASSET(2) char HAKAdanCH_room_6DL_000C30[] = dHAKAdanCH_room_6DL_000C30; +#define dHAKAdanCH_room_6Tex_000EA0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_6Tex_000EA0" +static const ALIGN_ASSET(2) char HAKAdanCH_room_6Tex_000EA0[] = dHAKAdanCH_room_6Tex_000EA0; #define dHAKAdanCH_room_6Tex_0016A0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_6Tex_0016A0" static const ALIGN_ASSET(2) char HAKAdanCH_room_6Tex_0016A0[] = dHAKAdanCH_room_6Tex_0016A0; @@ -12,11 +12,11 @@ static const ALIGN_ASSET(2) char HAKAdanCH_room_6Tex_0016A0[] = dHAKAdanCH_room_ #define dHAKAdanCH_room_6Tex_0026A0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_6Tex_0026A0" static const ALIGN_ASSET(2) char HAKAdanCH_room_6Tex_0026A0[] = dHAKAdanCH_room_6Tex_0026A0; +#define dHAKAdanCH_room_6DL_000C30 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_6DL_000C30" +static const ALIGN_ASSET(2) char HAKAdanCH_room_6DL_000C30[] = dHAKAdanCH_room_6DL_000C30; + #define dHAKAdanCH_room_6DL_000410 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_6DL_000410" static const ALIGN_ASSET(2) char HAKAdanCH_room_6DL_000410[] = dHAKAdanCH_room_6DL_000410; -#define dHAKAdanCH_room_6Tex_000EA0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_6Tex_000EA0" -static const ALIGN_ASSET(2) char HAKAdanCH_room_6Tex_000EA0[] = dHAKAdanCH_room_6Tex_000EA0; - #endif // DUNGEONS_HAKADANCH_ROOM_6_H diff --git a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_scene.h b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_scene.h index 871325e38..1d498a7e4 100644 --- a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_scene.h +++ b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_scene.h @@ -3,19 +3,20 @@ #include "align_asset_macro.h" -#define dHAKAdanCH_sceneCollisionHeader_00A558 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_sceneCollisionHeader_00A558" -static const ALIGN_ASSET(2) char HAKAdanCH_sceneCollisionHeader_00A558[] = dHAKAdanCH_sceneCollisionHeader_00A558; - -#define dHAKAdanCH_sceneTex_00BD90 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_sceneTex_00BD90" -static const ALIGN_ASSET(2) char HAKAdanCH_sceneTex_00BD90[] = dHAKAdanCH_sceneTex_00BD90; +#define dHAKAdanCH_sceneTex_00A590 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_sceneTex_00A590" +static const ALIGN_ASSET(2) char HAKAdanCH_sceneTex_00A590[] = dHAKAdanCH_sceneTex_00A590; #define dHAKAdanCH_sceneTex_00AD90 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_sceneTex_00AD90" static const ALIGN_ASSET(2) char HAKAdanCH_sceneTex_00AD90[] = dHAKAdanCH_sceneTex_00AD90; -#define dHAKAdanCH_sceneTex_00A590 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_sceneTex_00A590" -static const ALIGN_ASSET(2) char HAKAdanCH_sceneTex_00A590[] = dHAKAdanCH_sceneTex_00A590; - #define dHAKAdanCH_sceneTex_00B590 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_sceneTex_00B590" static const ALIGN_ASSET(2) char HAKAdanCH_sceneTex_00B590[] = dHAKAdanCH_sceneTex_00B590; +#define dHAKAdanCH_sceneTex_00BD90 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_sceneTex_00BD90" +static const ALIGN_ASSET(2) char HAKAdanCH_sceneTex_00BD90[] = dHAKAdanCH_sceneTex_00BD90; + +#define dHAKAdanCH_sceneCollisionHeader_00A558 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_sceneCollisionHeader_00A558" +static const ALIGN_ASSET(2) char HAKAdanCH_sceneCollisionHeader_00A558[] = dHAKAdanCH_sceneCollisionHeader_00A558; + + #endif // DUNGEONS_HAKADANCH_SCENE_H diff --git a/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_0.h b/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_0.h index 5f61f8dc5..e0c59f51f 100644 --- a/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_0.h +++ b/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_0.h @@ -3,17 +3,17 @@ #include "align_asset_macro.h" -#define dHAKAdan_bs_room_0DL_0021B0 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_room_0DL_0021B0" -static const ALIGN_ASSET(2) char HAKAdan_bs_room_0DL_0021B0[] = dHAKAdan_bs_room_0DL_0021B0; - -#define dHAKAdan_bs_room_0Tex_0023E0 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_room_0Tex_0023E0" -static const ALIGN_ASSET(2) char HAKAdan_bs_room_0Tex_0023E0[] = dHAKAdan_bs_room_0Tex_0023E0; - -#define dHAKAdan_bs_room_0Tex_0021E0 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_room_0Tex_0021E0" +#define dHAKAdan_bs_room_0Tex_0021E0 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_room_0Tex_0021E0" static const ALIGN_ASSET(2) char HAKAdan_bs_room_0Tex_0021E0[] = dHAKAdan_bs_room_0Tex_0021E0; -#define dHAKAdan_bs_room_0Tex_0027E0 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_room_0Tex_0027E0" +#define dHAKAdan_bs_room_0Tex_0023E0 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_room_0Tex_0023E0" +static const ALIGN_ASSET(2) char HAKAdan_bs_room_0Tex_0023E0[] = dHAKAdan_bs_room_0Tex_0023E0; + +#define dHAKAdan_bs_room_0Tex_0027E0 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_room_0Tex_0027E0" static const ALIGN_ASSET(2) char HAKAdan_bs_room_0Tex_0027E0[] = dHAKAdan_bs_room_0Tex_0027E0; +#define dHAKAdan_bs_room_0DL_0021B0 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_room_0DL_0021B0" +static const ALIGN_ASSET(2) char HAKAdan_bs_room_0DL_0021B0[] = dHAKAdan_bs_room_0DL_0021B0; + #endif // DUNGEONS_HAKADAN_BS_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_1.h b/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_1.h index 1bce316d1..e3e3fd863 100644 --- a/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_1.h +++ b/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_1.h @@ -3,23 +3,23 @@ #include "align_asset_macro.h" -#define dHAKAdan_bs_room_1DL_002D20 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_room_1DL_002D20" -static const ALIGN_ASSET(2) char HAKAdan_bs_room_1DL_002D20[] = dHAKAdan_bs_room_1DL_002D20; - -#define dHAKAdan_bs_room_1Tex_004F50 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_room_1Tex_004F50" -static const ALIGN_ASSET(2) char HAKAdan_bs_room_1Tex_004F50[] = dHAKAdan_bs_room_1Tex_004F50; - -#define dHAKAdan_bs_room_1Tex_003750 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_room_1Tex_003750" -static const ALIGN_ASSET(2) char HAKAdan_bs_room_1Tex_003750[] = dHAKAdan_bs_room_1Tex_003750; - -#define dHAKAdan_bs_room_1Tex_002F50 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_room_1Tex_002F50" -static const ALIGN_ASSET(2) char HAKAdan_bs_room_1Tex_002F50[] = dHAKAdan_bs_room_1Tex_002F50; - -#define dHAKAdan_bs_room_1Tex_002D50 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_room_1Tex_002D50" +#define dHAKAdan_bs_room_1Tex_002D50 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_room_1Tex_002D50" static const ALIGN_ASSET(2) char HAKAdan_bs_room_1Tex_002D50[] = dHAKAdan_bs_room_1Tex_002D50; -#define dHAKAdan_bs_room_1Tex_003F50 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_room_1Tex_003F50" +#define dHAKAdan_bs_room_1Tex_002F50 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_room_1Tex_002F50" +static const ALIGN_ASSET(2) char HAKAdan_bs_room_1Tex_002F50[] = dHAKAdan_bs_room_1Tex_002F50; + +#define dHAKAdan_bs_room_1Tex_003750 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_room_1Tex_003750" +static const ALIGN_ASSET(2) char HAKAdan_bs_room_1Tex_003750[] = dHAKAdan_bs_room_1Tex_003750; + +#define dHAKAdan_bs_room_1Tex_003F50 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_room_1Tex_003F50" static const ALIGN_ASSET(2) char HAKAdan_bs_room_1Tex_003F50[] = dHAKAdan_bs_room_1Tex_003F50; +#define dHAKAdan_bs_room_1Tex_004F50 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_room_1Tex_004F50" +static const ALIGN_ASSET(2) char HAKAdan_bs_room_1Tex_004F50[] = dHAKAdan_bs_room_1Tex_004F50; + +#define dHAKAdan_bs_room_1DL_002D20 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_room_1DL_002D20" +static const ALIGN_ASSET(2) char HAKAdan_bs_room_1DL_002D20[] = dHAKAdan_bs_room_1DL_002D20; + #endif // DUNGEONS_HAKADAN_BS_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_scene.h b/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_scene.h index 40292e447..3663a6564 100644 --- a/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_scene.h +++ b/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_scene.h @@ -3,19 +3,20 @@ #include "align_asset_macro.h" -#define dHAKAdan_bs_sceneCollisionHeader_00134C "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_sceneCollisionHeader_00134C" -static const ALIGN_ASSET(2) char HAKAdan_bs_sceneCollisionHeader_00134C[] = dHAKAdan_bs_sceneCollisionHeader_00134C; - -#define dHAKAdan_bs_sceneTex_001F80 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_sceneTex_001F80" -static const ALIGN_ASSET(2) char HAKAdan_bs_sceneTex_001F80[] = dHAKAdan_bs_sceneTex_001F80; - -#define dHAKAdan_bs_sceneTex_001580 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_sceneTex_001580" -static const ALIGN_ASSET(2) char HAKAdan_bs_sceneTex_001580[] = dHAKAdan_bs_sceneTex_001580; - -#define dHAKAdan_bs_sceneTex_001380 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_sceneTex_001380" +#define dHAKAdan_bs_sceneTex_001380 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_sceneTex_001380" static const ALIGN_ASSET(2) char HAKAdan_bs_sceneTex_001380[] = dHAKAdan_bs_sceneTex_001380; -#define dHAKAdan_bs_sceneTex_001780 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_sceneTex_001780" +#define dHAKAdan_bs_sceneTex_001580 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_sceneTex_001580" +static const ALIGN_ASSET(2) char HAKAdan_bs_sceneTex_001580[] = dHAKAdan_bs_sceneTex_001580; + +#define dHAKAdan_bs_sceneTex_001780 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_sceneTex_001780" static const ALIGN_ASSET(2) char HAKAdan_bs_sceneTex_001780[] = dHAKAdan_bs_sceneTex_001780; +#define dHAKAdan_bs_sceneTex_001F80 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_sceneTex_001F80" +static const ALIGN_ASSET(2) char HAKAdan_bs_sceneTex_001F80[] = dHAKAdan_bs_sceneTex_001F80; + +#define dHAKAdan_bs_sceneCollisionHeader_00134C "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_sceneCollisionHeader_00134C" +static const ALIGN_ASSET(2) char HAKAdan_bs_sceneCollisionHeader_00134C[] = dHAKAdan_bs_sceneCollisionHeader_00134C; + + #endif // DUNGEONS_HAKADAN_BS_SCENE_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_0.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_0.h index 731bccb75..ca681cf01 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_0.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_0.h @@ -3,29 +3,29 @@ #include "align_asset_macro.h" -#define dHIDAN_room_0DL_002C50 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0DL_002C50" -static const ALIGN_ASSET(2) char HIDAN_room_0DL_002C50[] = dHIDAN_room_0DL_002C50; - -#define dHIDAN_room_0Tex_005CF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0Tex_005CF0" -static const ALIGN_ASSET(2) char HIDAN_room_0Tex_005CF0[] = dHIDAN_room_0Tex_005CF0; - -#define dHIDAN_room_0Tex_0062F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0Tex_0062F0" -static const ALIGN_ASSET(2) char HIDAN_room_0Tex_0062F0[] = dHIDAN_room_0Tex_0062F0; - -#define dHIDAN_room_0Tex_005AF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0Tex_005AF0" -static const ALIGN_ASSET(2) char HIDAN_room_0Tex_005AF0[] = dHIDAN_room_0Tex_005AF0; - -#define dHIDAN_room_0Tex_0056F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0Tex_0056F0" -static const ALIGN_ASSET(2) char HIDAN_room_0Tex_0056F0[] = dHIDAN_room_0Tex_0056F0; - #define dHIDAN_room_0Tex_004EF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0Tex_004EF0" static const ALIGN_ASSET(2) char HIDAN_room_0Tex_004EF0[] = dHIDAN_room_0Tex_004EF0; #define dHIDAN_room_0Tex_0052F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0Tex_0052F0" static const ALIGN_ASSET(2) char HIDAN_room_0Tex_0052F0[] = dHIDAN_room_0Tex_0052F0; +#define dHIDAN_room_0Tex_0056F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0Tex_0056F0" +static const ALIGN_ASSET(2) char HIDAN_room_0Tex_0056F0[] = dHIDAN_room_0Tex_0056F0; + +#define dHIDAN_room_0Tex_005AF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0Tex_005AF0" +static const ALIGN_ASSET(2) char HIDAN_room_0Tex_005AF0[] = dHIDAN_room_0Tex_005AF0; + +#define dHIDAN_room_0Tex_005CF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0Tex_005CF0" +static const ALIGN_ASSET(2) char HIDAN_room_0Tex_005CF0[] = dHIDAN_room_0Tex_005CF0; + #define dHIDAN_room_0Tex_005EF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0Tex_005EF0" static const ALIGN_ASSET(2) char HIDAN_room_0Tex_005EF0[] = dHIDAN_room_0Tex_005EF0; +#define dHIDAN_room_0Tex_0062F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0Tex_0062F0" +static const ALIGN_ASSET(2) char HIDAN_room_0Tex_0062F0[] = dHIDAN_room_0Tex_0062F0; + +#define dHIDAN_room_0DL_002C50 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0DL_002C50" +static const ALIGN_ASSET(2) char HIDAN_room_0DL_002C50[] = dHIDAN_room_0DL_002C50; + #endif // DUNGEONS_HIDAN_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_1.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_1.h index 84d39a9cf..3d28ebbc8 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_1.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_1.h @@ -3,23 +3,14 @@ #include "align_asset_macro.h" -#define dHIDAN_room_1DL_000DC8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1DL_000DC8" -static const ALIGN_ASSET(2) char HIDAN_room_1DL_000DC8[] = dHIDAN_room_1DL_000DC8; - -#define dHIDAN_room_1Tex_009130 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_009130" -static const ALIGN_ASSET(2) char HIDAN_room_1Tex_009130[] = dHIDAN_room_1Tex_009130; - -#define dHIDAN_room_1Tex_00B530 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_00B530" -static const ALIGN_ASSET(2) char HIDAN_room_1Tex_00B530[] = dHIDAN_room_1Tex_00B530; - #define dHIDAN_room_1Tex_008730 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_008730" static const ALIGN_ASSET(2) char HIDAN_room_1Tex_008730[] = dHIDAN_room_1Tex_008730; -#define dHIDAN_room_1Tex_00A530 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_00A530" -static const ALIGN_ASSET(2) char HIDAN_room_1Tex_00A530[] = dHIDAN_room_1Tex_00A530; +#define dHIDAN_room_1Tex_008930 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_008930" +static const ALIGN_ASSET(2) char HIDAN_room_1Tex_008930[] = dHIDAN_room_1Tex_008930; -#define dHIDAN_room_1DL_002500 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1DL_002500" -static const ALIGN_ASSET(2) char HIDAN_room_1DL_002500[] = dHIDAN_room_1DL_002500; +#define dHIDAN_room_1Tex_009130 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_009130" +static const ALIGN_ASSET(2) char HIDAN_room_1Tex_009130[] = dHIDAN_room_1Tex_009130; #define dHIDAN_room_1Tex_009930 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_009930" static const ALIGN_ASSET(2) char HIDAN_room_1Tex_009930[] = dHIDAN_room_1Tex_009930; @@ -27,15 +18,27 @@ static const ALIGN_ASSET(2) char HIDAN_room_1Tex_009930[] = dHIDAN_room_1Tex_009 #define dHIDAN_room_1Tex_00A130 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_00A130" static const ALIGN_ASSET(2) char HIDAN_room_1Tex_00A130[] = dHIDAN_room_1Tex_00A130; +#define dHIDAN_room_1Tex_00A530 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_00A530" +static const ALIGN_ASSET(2) char HIDAN_room_1Tex_00A530[] = dHIDAN_room_1Tex_00A530; + +#define dHIDAN_room_1Tex_00B530 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_00B530" +static const ALIGN_ASSET(2) char HIDAN_room_1Tex_00B530[] = dHIDAN_room_1Tex_00B530; + #define dHIDAN_room_1Tex_00BD30 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_00BD30" static const ALIGN_ASSET(2) char HIDAN_room_1Tex_00BD30[] = dHIDAN_room_1Tex_00BD30; +#define dHIDAN_room_1Tex_00C130 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_00C130" +static const ALIGN_ASSET(2) char HIDAN_room_1Tex_00C130[] = dHIDAN_room_1Tex_00C130; + +#define dHIDAN_room_1DL_000DC8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1DL_000DC8" +static const ALIGN_ASSET(2) char HIDAN_room_1DL_000DC8[] = dHIDAN_room_1DL_000DC8; + +#define dHIDAN_room_1DL_002500 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1DL_002500" +static const ALIGN_ASSET(2) char HIDAN_room_1DL_002500[] = dHIDAN_room_1DL_002500; + #define dHIDAN_room_1DL_006BF8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1DL_006BF8" static const ALIGN_ASSET(2) char HIDAN_room_1DL_006BF8[] = dHIDAN_room_1DL_006BF8; -#define dHIDAN_room_1Tex_008930 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_008930" -static const ALIGN_ASSET(2) char HIDAN_room_1Tex_008930[] = dHIDAN_room_1Tex_008930; - #define dHIDAN_room_1DL_0057B0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1DL_0057B0" static const ALIGN_ASSET(2) char HIDAN_room_1DL_0057B0[] = dHIDAN_room_1DL_0057B0; @@ -45,9 +48,6 @@ static const ALIGN_ASSET(2) char HIDAN_room_1DL_004068[] = dHIDAN_room_1DL_00406 #define dHIDAN_room_1DL_0002D0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1DL_0002D0" static const ALIGN_ASSET(2) char HIDAN_room_1DL_0002D0[] = dHIDAN_room_1DL_0002D0; -#define dHIDAN_room_1Tex_00C130 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_00C130" -static const ALIGN_ASSET(2) char HIDAN_room_1Tex_00C130[] = dHIDAN_room_1Tex_00C130; - #define dHIDAN_room_1DL_008448 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1DL_008448" static const ALIGN_ASSET(2) char HIDAN_room_1DL_008448[] = dHIDAN_room_1DL_008448; diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_10.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_10.h index 80e1af2c2..5920cdb0d 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_10.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_10.h @@ -3,63 +3,69 @@ #include "align_asset_macro.h" -#define dHIDAN_room_10DL_000680 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10DL_000680" -static const ALIGN_ASSET(2) char HIDAN_room_10DL_000680[] = dHIDAN_room_10DL_000680; - -#define dHIDAN_room_10Tex_017018 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_017018" -static const ALIGN_ASSET(2) char HIDAN_room_10Tex_017018[] = dHIDAN_room_10Tex_017018; - -#define dHIDAN_room_10DL_000B40 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10DL_000B40" -static const ALIGN_ASSET(2) char HIDAN_room_10DL_000B40[] = dHIDAN_room_10DL_000B40; - #define dHIDAN_room_10Tex_011818 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_011818" static const ALIGN_ASSET(2) char HIDAN_room_10Tex_011818[] = dHIDAN_room_10Tex_011818; #define dHIDAN_room_10Tex_011A18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_011A18" static const ALIGN_ASSET(2) char HIDAN_room_10Tex_011A18[] = dHIDAN_room_10Tex_011A18; -#define dHIDAN_room_10DL_002620 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10DL_002620" -static const ALIGN_ASSET(2) char HIDAN_room_10DL_002620[] = dHIDAN_room_10DL_002620; +#define dHIDAN_room_10Tex_012218 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_012218" +static const ALIGN_ASSET(2) char HIDAN_room_10Tex_012218[] = dHIDAN_room_10Tex_012218; -#define dHIDAN_room_10Tex_016A18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_016A18" -static const ALIGN_ASSET(2) char HIDAN_room_10Tex_016A18[] = dHIDAN_room_10Tex_016A18; - -#define dHIDAN_room_10Tex_016C18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_016C18" -static const ALIGN_ASSET(2) char HIDAN_room_10Tex_016C18[] = dHIDAN_room_10Tex_016C18; - -#define dHIDAN_room_10Tex_014418 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_014418" -static const ALIGN_ASSET(2) char HIDAN_room_10Tex_014418[] = dHIDAN_room_10Tex_014418; +#define dHIDAN_room_10Tex_012618 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_012618" +static const ALIGN_ASSET(2) char HIDAN_room_10Tex_012618[] = dHIDAN_room_10Tex_012618; #define dHIDAN_room_10Tex_012E18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_012E18" static const ALIGN_ASSET(2) char HIDAN_room_10Tex_012E18[] = dHIDAN_room_10Tex_012E18; +#define dHIDAN_room_10Tex_013218 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_013218" +static const ALIGN_ASSET(2) char HIDAN_room_10Tex_013218[] = dHIDAN_room_10Tex_013218; + #define dHIDAN_room_10Tex_013418 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_013418" static const ALIGN_ASSET(2) char HIDAN_room_10Tex_013418[] = dHIDAN_room_10Tex_013418; +#define dHIDAN_room_10Tex_014418 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_014418" +static const ALIGN_ASSET(2) char HIDAN_room_10Tex_014418[] = dHIDAN_room_10Tex_014418; + +#define dHIDAN_room_10Tex_015418 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_015418" +static const ALIGN_ASSET(2) char HIDAN_room_10Tex_015418[] = dHIDAN_room_10Tex_015418; + #define dHIDAN_room_10Tex_015818 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_015818" static const ALIGN_ASSET(2) char HIDAN_room_10Tex_015818[] = dHIDAN_room_10Tex_015818; #define dHIDAN_room_10Tex_015A18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_015A18" static const ALIGN_ASSET(2) char HIDAN_room_10Tex_015A18[] = dHIDAN_room_10Tex_015A18; +#define dHIDAN_room_10Tex_016A18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_016A18" +static const ALIGN_ASSET(2) char HIDAN_room_10Tex_016A18[] = dHIDAN_room_10Tex_016A18; + +#define dHIDAN_room_10Tex_016C18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_016C18" +static const ALIGN_ASSET(2) char HIDAN_room_10Tex_016C18[] = dHIDAN_room_10Tex_016C18; + +#define dHIDAN_room_10Tex_017018 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_017018" +static const ALIGN_ASSET(2) char HIDAN_room_10Tex_017018[] = dHIDAN_room_10Tex_017018; + +#define dHIDAN_room_10Tex_017818 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_017818" +static const ALIGN_ASSET(2) char HIDAN_room_10Tex_017818[] = dHIDAN_room_10Tex_017818; + +#define dHIDAN_room_10Tex_017C18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_017C18" +static const ALIGN_ASSET(2) char HIDAN_room_10Tex_017C18[] = dHIDAN_room_10Tex_017C18; + +#define dHIDAN_room_10DL_000680 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10DL_000680" +static const ALIGN_ASSET(2) char HIDAN_room_10DL_000680[] = dHIDAN_room_10DL_000680; + +#define dHIDAN_room_10DL_000B40 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10DL_000B40" +static const ALIGN_ASSET(2) char HIDAN_room_10DL_000B40[] = dHIDAN_room_10DL_000B40; + +#define dHIDAN_room_10DL_002620 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10DL_002620" +static const ALIGN_ASSET(2) char HIDAN_room_10DL_002620[] = dHIDAN_room_10DL_002620; + #define dHIDAN_room_10DL_004900 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10DL_004900" static const ALIGN_ASSET(2) char HIDAN_room_10DL_004900[] = dHIDAN_room_10DL_004900; #define dHIDAN_room_10DL_0055C0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10DL_0055C0" static const ALIGN_ASSET(2) char HIDAN_room_10DL_0055C0[] = dHIDAN_room_10DL_0055C0; -#define dHIDAN_room_10Tex_017C18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_017C18" -static const ALIGN_ASSET(2) char HIDAN_room_10Tex_017C18[] = dHIDAN_room_10Tex_017C18; - -#define dHIDAN_room_10Tex_012618 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_012618" -static const ALIGN_ASSET(2) char HIDAN_room_10Tex_012618[] = dHIDAN_room_10Tex_012618; - -#define dHIDAN_room_10Tex_013218 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_013218" -static const ALIGN_ASSET(2) char HIDAN_room_10Tex_013218[] = dHIDAN_room_10Tex_013218; - -#define dHIDAN_room_10Tex_017818 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_017818" -static const ALIGN_ASSET(2) char HIDAN_room_10Tex_017818[] = dHIDAN_room_10Tex_017818; - #define dHIDAN_room_10DL_0069D0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10DL_0069D0" static const ALIGN_ASSET(2) char HIDAN_room_10DL_0069D0[] = dHIDAN_room_10DL_0069D0; @@ -78,12 +84,6 @@ static const ALIGN_ASSET(2) char HIDAN_room_10DL_00D970[] = dHIDAN_room_10DL_00D #define dHIDAN_room_10DL_00FBD0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10DL_00FBD0" static const ALIGN_ASSET(2) char HIDAN_room_10DL_00FBD0[] = dHIDAN_room_10DL_00FBD0; -#define dHIDAN_room_10Tex_015418 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_015418" -static const ALIGN_ASSET(2) char HIDAN_room_10Tex_015418[] = dHIDAN_room_10Tex_015418; - -#define dHIDAN_room_10Tex_012218 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_012218" -static const ALIGN_ASSET(2) char HIDAN_room_10Tex_012218[] = dHIDAN_room_10Tex_012218; - #define dHIDAN_room_10DL_011610 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10DL_011610" static const ALIGN_ASSET(2) char HIDAN_room_10DL_011610[] = dHIDAN_room_10DL_011610; diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_11.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_11.h index c49f0f91c..1ebe930bc 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_11.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_11.h @@ -3,21 +3,21 @@ #include "align_asset_macro.h" -#define dHIDAN_room_11DL_0009E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_11DL_0009E0" -static const ALIGN_ASSET(2) char HIDAN_room_11DL_0009E0[] = dHIDAN_room_11DL_0009E0; +#define dHIDAN_room_11Tex_0027D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_11Tex_0027D8" +static const ALIGN_ASSET(2) char HIDAN_room_11Tex_0027D8[] = dHIDAN_room_11Tex_0027D8; + +#define dHIDAN_room_11Tex_002FD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_11Tex_002FD8" +static const ALIGN_ASSET(2) char HIDAN_room_11Tex_002FD8[] = dHIDAN_room_11Tex_002FD8; #define dHIDAN_room_11Tex_0033D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_11Tex_0033D8" static const ALIGN_ASSET(2) char HIDAN_room_11Tex_0033D8[] = dHIDAN_room_11Tex_0033D8; -#define dHIDAN_room_11Tex_0027D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_11Tex_0027D8" -static const ALIGN_ASSET(2) char HIDAN_room_11Tex_0027D8[] = dHIDAN_room_11Tex_0027D8; +#define dHIDAN_room_11DL_0009E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_11DL_0009E0" +static const ALIGN_ASSET(2) char HIDAN_room_11DL_0009E0[] = dHIDAN_room_11DL_0009E0; #define dHIDAN_room_11DL_001908 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_11DL_001908" static const ALIGN_ASSET(2) char HIDAN_room_11DL_001908[] = dHIDAN_room_11DL_001908; -#define dHIDAN_room_11Tex_002FD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_11Tex_002FD8" -static const ALIGN_ASSET(2) char HIDAN_room_11Tex_002FD8[] = dHIDAN_room_11Tex_002FD8; - #define dHIDAN_room_11DL_002628 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_11DL_002628" static const ALIGN_ASSET(2) char HIDAN_room_11DL_002628[] = dHIDAN_room_11DL_002628; diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_12.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_12.h index 691f1756b..7a8f22118 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_12.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_12.h @@ -3,23 +3,23 @@ #include "align_asset_macro.h" -#define dHIDAN_room_12DL_000B70 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_12DL_000B70" -static const ALIGN_ASSET(2) char HIDAN_room_12DL_000B70[] = dHIDAN_room_12DL_000B70; - -#define dHIDAN_room_12Tex_002768 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_12Tex_002768" -static const ALIGN_ASSET(2) char HIDAN_room_12Tex_002768[] = dHIDAN_room_12Tex_002768; - -#define dHIDAN_room_12DL_001520 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_12DL_001520" -static const ALIGN_ASSET(2) char HIDAN_room_12DL_001520[] = dHIDAN_room_12DL_001520; - -#define dHIDAN_room_12DL_001A58 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_12DL_001A58" -static const ALIGN_ASSET(2) char HIDAN_room_12DL_001A58[] = dHIDAN_room_12DL_001A58; - #define dHIDAN_room_12Tex_001D68 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_12Tex_001D68" static const ALIGN_ASSET(2) char HIDAN_room_12Tex_001D68[] = dHIDAN_room_12Tex_001D68; #define dHIDAN_room_12Tex_001F68 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_12Tex_001F68" static const ALIGN_ASSET(2) char HIDAN_room_12Tex_001F68[] = dHIDAN_room_12Tex_001F68; +#define dHIDAN_room_12Tex_002768 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_12Tex_002768" +static const ALIGN_ASSET(2) char HIDAN_room_12Tex_002768[] = dHIDAN_room_12Tex_002768; + +#define dHIDAN_room_12DL_000B70 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_12DL_000B70" +static const ALIGN_ASSET(2) char HIDAN_room_12DL_000B70[] = dHIDAN_room_12DL_000B70; + +#define dHIDAN_room_12DL_001520 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_12DL_001520" +static const ALIGN_ASSET(2) char HIDAN_room_12DL_001520[] = dHIDAN_room_12DL_001520; + +#define dHIDAN_room_12DL_001A58 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_12DL_001A58" +static const ALIGN_ASSET(2) char HIDAN_room_12DL_001A58[] = dHIDAN_room_12DL_001A58; + #endif // DUNGEONS_HIDAN_ROOM_12_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_13.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_13.h index 5fa60bbc4..5f5eecde7 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_13.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_13.h @@ -3,41 +3,41 @@ #include "align_asset_macro.h" -#define dHIDAN_room_13DL_001210 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13DL_001210" -static const ALIGN_ASSET(2) char HIDAN_room_13DL_001210[] = dHIDAN_room_13DL_001210; - -#define dHIDAN_room_13Tex_00B388 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13Tex_00B388" -static const ALIGN_ASSET(2) char HIDAN_room_13Tex_00B388[] = dHIDAN_room_13Tex_00B388; - #define dHIDAN_room_13Tex_00A788 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13Tex_00A788" static const ALIGN_ASSET(2) char HIDAN_room_13Tex_00A788[] = dHIDAN_room_13Tex_00A788; #define dHIDAN_room_13Tex_00AF88 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13Tex_00AF88" static const ALIGN_ASSET(2) char HIDAN_room_13Tex_00AF88[] = dHIDAN_room_13Tex_00AF88; +#define dHIDAN_room_13Tex_00B388 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13Tex_00B388" +static const ALIGN_ASSET(2) char HIDAN_room_13Tex_00B388[] = dHIDAN_room_13Tex_00B388; + +#define dHIDAN_room_13Tex_00B788 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13Tex_00B788" +static const ALIGN_ASSET(2) char HIDAN_room_13Tex_00B788[] = dHIDAN_room_13Tex_00B788; + +#define dHIDAN_room_13Tex_00BB88 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13Tex_00BB88" +static const ALIGN_ASSET(2) char HIDAN_room_13Tex_00BB88[] = dHIDAN_room_13Tex_00BB88; + +#define dHIDAN_room_13Tex_00C388 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13Tex_00C388" +static const ALIGN_ASSET(2) char HIDAN_room_13Tex_00C388[] = dHIDAN_room_13Tex_00C388; + +#define dHIDAN_room_13DL_001210 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13DL_001210" +static const ALIGN_ASSET(2) char HIDAN_room_13DL_001210[] = dHIDAN_room_13DL_001210; + #define dHIDAN_room_13DL_0031F8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13DL_0031F8" static const ALIGN_ASSET(2) char HIDAN_room_13DL_0031F8[] = dHIDAN_room_13DL_0031F8; #define dHIDAN_room_13DL_005138 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13DL_005138" static const ALIGN_ASSET(2) char HIDAN_room_13DL_005138[] = dHIDAN_room_13DL_005138; -#define dHIDAN_room_13Tex_00C388 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13Tex_00C388" -static const ALIGN_ASSET(2) char HIDAN_room_13Tex_00C388[] = dHIDAN_room_13Tex_00C388; - #define dHIDAN_room_13DL_007908 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13DL_007908" static const ALIGN_ASSET(2) char HIDAN_room_13DL_007908[] = dHIDAN_room_13DL_007908; -#define dHIDAN_room_13Tex_00BB88 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13Tex_00BB88" -static const ALIGN_ASSET(2) char HIDAN_room_13Tex_00BB88[] = dHIDAN_room_13Tex_00BB88; - #define dHIDAN_room_13DL_009160 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13DL_009160" static const ALIGN_ASSET(2) char HIDAN_room_13DL_009160[] = dHIDAN_room_13DL_009160; #define dHIDAN_room_13DL_00A228 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13DL_00A228" static const ALIGN_ASSET(2) char HIDAN_room_13DL_00A228[] = dHIDAN_room_13DL_00A228; -#define dHIDAN_room_13Tex_00B788 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13Tex_00B788" -static const ALIGN_ASSET(2) char HIDAN_room_13Tex_00B788[] = dHIDAN_room_13Tex_00B788; - #endif // DUNGEONS_HIDAN_ROOM_13_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_14.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_14.h index ced1a642a..e3cd47a89 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_14.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_14.h @@ -3,14 +3,14 @@ #include "align_asset_macro.h" -#define dHIDAN_room_14DL_001030 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_14DL_001030" -static const ALIGN_ASSET(2) char HIDAN_room_14DL_001030[] = dHIDAN_room_14DL_001030; +#define dHIDAN_room_14Tex_0019F8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_14Tex_0019F8" +static const ALIGN_ASSET(2) char HIDAN_room_14Tex_0019F8[] = dHIDAN_room_14Tex_0019F8; #define dHIDAN_room_14Tex_001DF8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_14Tex_001DF8" static const ALIGN_ASSET(2) char HIDAN_room_14Tex_001DF8[] = dHIDAN_room_14Tex_001DF8; -#define dHIDAN_room_14Tex_0019F8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_14Tex_0019F8" -static const ALIGN_ASSET(2) char HIDAN_room_14Tex_0019F8[] = dHIDAN_room_14Tex_0019F8; +#define dHIDAN_room_14DL_001030 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_14DL_001030" +static const ALIGN_ASSET(2) char HIDAN_room_14DL_001030[] = dHIDAN_room_14DL_001030; #endif // DUNGEONS_HIDAN_ROOM_14_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_15.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_15.h index 715769058..6e73050fd 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_15.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_15.h @@ -3,11 +3,11 @@ #include "align_asset_macro.h" -#define dHIDAN_room_15DL_000910 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_15DL_000910" -static const ALIGN_ASSET(2) char HIDAN_room_15DL_000910[] = dHIDAN_room_15DL_000910; - #define dHIDAN_room_15Tex_000D88 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_15Tex_000D88" static const ALIGN_ASSET(2) char HIDAN_room_15Tex_000D88[] = dHIDAN_room_15Tex_000D88; +#define dHIDAN_room_15DL_000910 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_15DL_000910" +static const ALIGN_ASSET(2) char HIDAN_room_15DL_000910[] = dHIDAN_room_15DL_000910; + #endif // DUNGEONS_HIDAN_ROOM_15_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_16.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_16.h index ed501ffee..aeb65e809 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_16.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_16.h @@ -3,56 +3,56 @@ #include "align_asset_macro.h" -#define dHIDAN_room_16DL_000350 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16DL_000350" -static const ALIGN_ASSET(2) char HIDAN_room_16DL_000350[] = dHIDAN_room_16DL_000350; - -#define dHIDAN_room_16Tex_009DE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_009DE0" -static const ALIGN_ASSET(2) char HIDAN_room_16Tex_009DE0[] = dHIDAN_room_16Tex_009DE0; - -#define dHIDAN_room_16DL_001480 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16DL_001480" -static const ALIGN_ASSET(2) char HIDAN_room_16DL_001480[] = dHIDAN_room_16DL_001480; +#define dHIDAN_room_16Tex_006DE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_006DE0" +static const ALIGN_ASSET(2) char HIDAN_room_16Tex_006DE0[] = dHIDAN_room_16Tex_006DE0; #define dHIDAN_room_16Tex_006FE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_006FE0" static const ALIGN_ASSET(2) char HIDAN_room_16Tex_006FE0[] = dHIDAN_room_16Tex_006FE0; -#define dHIDAN_room_16Tex_006DE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_006DE0" -static const ALIGN_ASSET(2) char HIDAN_room_16Tex_006DE0[] = dHIDAN_room_16Tex_006DE0; - -#define dHIDAN_room_16Tex_00A5E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_00A5E0" -static const ALIGN_ASSET(2) char HIDAN_room_16Tex_00A5E0[] = dHIDAN_room_16Tex_00A5E0; - -#define dHIDAN_room_16Tex_0085E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_0085E0" -static const ALIGN_ASSET(2) char HIDAN_room_16Tex_0085E0[] = dHIDAN_room_16Tex_0085E0; - #define dHIDAN_room_16Tex_0077E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_0077E0" static const ALIGN_ASSET(2) char HIDAN_room_16Tex_0077E0[] = dHIDAN_room_16Tex_0077E0; -#define dHIDAN_room_16Tex_0091E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_0091E0" -static const ALIGN_ASSET(2) char HIDAN_room_16Tex_0091E0[] = dHIDAN_room_16Tex_0091E0; - -#define dHIDAN_room_16Tex_0083E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_0083E0" -static const ALIGN_ASSET(2) char HIDAN_room_16Tex_0083E0[] = dHIDAN_room_16Tex_0083E0; - -#define dHIDAN_room_16DL_003B58 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16DL_003B58" -static const ALIGN_ASSET(2) char HIDAN_room_16DL_003B58[] = dHIDAN_room_16DL_003B58; - -#define dHIDAN_room_16Tex_0095E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_0095E0" -static const ALIGN_ASSET(2) char HIDAN_room_16Tex_0095E0[] = dHIDAN_room_16Tex_0095E0; - #define dHIDAN_room_16Tex_007FE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_007FE0" static const ALIGN_ASSET(2) char HIDAN_room_16Tex_007FE0[] = dHIDAN_room_16Tex_007FE0; -#define dHIDAN_room_16Tex_00B1E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_00B1E0" -static const ALIGN_ASSET(2) char HIDAN_room_16Tex_00B1E0[] = dHIDAN_room_16Tex_00B1E0; +#define dHIDAN_room_16Tex_0083E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_0083E0" +static const ALIGN_ASSET(2) char HIDAN_room_16Tex_0083E0[] = dHIDAN_room_16Tex_0083E0; -#define dHIDAN_room_16Tex_00A9E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_00A9E0" -static const ALIGN_ASSET(2) char HIDAN_room_16Tex_00A9E0[] = dHIDAN_room_16Tex_00A9E0; - -#define dHIDAN_room_16DL_005ED8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16DL_005ED8" -static const ALIGN_ASSET(2) char HIDAN_room_16DL_005ED8[] = dHIDAN_room_16DL_005ED8; +#define dHIDAN_room_16Tex_0085E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_0085E0" +static const ALIGN_ASSET(2) char HIDAN_room_16Tex_0085E0[] = dHIDAN_room_16Tex_0085E0; #define dHIDAN_room_16Tex_008DE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_008DE0" static const ALIGN_ASSET(2) char HIDAN_room_16Tex_008DE0[] = dHIDAN_room_16Tex_008DE0; +#define dHIDAN_room_16Tex_0091E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_0091E0" +static const ALIGN_ASSET(2) char HIDAN_room_16Tex_0091E0[] = dHIDAN_room_16Tex_0091E0; + +#define dHIDAN_room_16Tex_0095E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_0095E0" +static const ALIGN_ASSET(2) char HIDAN_room_16Tex_0095E0[] = dHIDAN_room_16Tex_0095E0; + +#define dHIDAN_room_16Tex_009DE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_009DE0" +static const ALIGN_ASSET(2) char HIDAN_room_16Tex_009DE0[] = dHIDAN_room_16Tex_009DE0; + +#define dHIDAN_room_16Tex_00A5E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_00A5E0" +static const ALIGN_ASSET(2) char HIDAN_room_16Tex_00A5E0[] = dHIDAN_room_16Tex_00A5E0; + +#define dHIDAN_room_16Tex_00A9E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_00A9E0" +static const ALIGN_ASSET(2) char HIDAN_room_16Tex_00A9E0[] = dHIDAN_room_16Tex_00A9E0; + +#define dHIDAN_room_16Tex_00B1E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_00B1E0" +static const ALIGN_ASSET(2) char HIDAN_room_16Tex_00B1E0[] = dHIDAN_room_16Tex_00B1E0; + +#define dHIDAN_room_16DL_000350 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16DL_000350" +static const ALIGN_ASSET(2) char HIDAN_room_16DL_000350[] = dHIDAN_room_16DL_000350; + +#define dHIDAN_room_16DL_001480 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16DL_001480" +static const ALIGN_ASSET(2) char HIDAN_room_16DL_001480[] = dHIDAN_room_16DL_001480; + +#define dHIDAN_room_16DL_003B58 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16DL_003B58" +static const ALIGN_ASSET(2) char HIDAN_room_16DL_003B58[] = dHIDAN_room_16DL_003B58; + +#define dHIDAN_room_16DL_005ED8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16DL_005ED8" +static const ALIGN_ASSET(2) char HIDAN_room_16DL_005ED8[] = dHIDAN_room_16DL_005ED8; + #endif // DUNGEONS_HIDAN_ROOM_16_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_17.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_17.h index eea1ecdd2..238015bf0 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_17.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_17.h @@ -3,24 +3,6 @@ #include "align_asset_macro.h" -#define dHIDAN_room_17DL_003290 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17DL_003290" -static const ALIGN_ASSET(2) char HIDAN_room_17DL_003290[] = dHIDAN_room_17DL_003290; - -#define dHIDAN_room_17Tex_007968 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17Tex_007968" -static const ALIGN_ASSET(2) char HIDAN_room_17Tex_007968[] = dHIDAN_room_17Tex_007968; - -#define dHIDAN_room_17Tex_008968 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17Tex_008968" -static const ALIGN_ASSET(2) char HIDAN_room_17Tex_008968[] = dHIDAN_room_17Tex_008968; - -#define dHIDAN_room_17Tex_008168 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17Tex_008168" -static const ALIGN_ASSET(2) char HIDAN_room_17Tex_008168[] = dHIDAN_room_17Tex_008168; - -#define dHIDAN_room_17Tex_007168 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17Tex_007168" -static const ALIGN_ASSET(2) char HIDAN_room_17Tex_007168[] = dHIDAN_room_17Tex_007168; - -#define dHIDAN_room_17Tex_006968 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17Tex_006968" -static const ALIGN_ASSET(2) char HIDAN_room_17Tex_006968[] = dHIDAN_room_17Tex_006968; - #define dHIDAN_room_17Tex_005168 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17Tex_005168" static const ALIGN_ASSET(2) char HIDAN_room_17Tex_005168[] = dHIDAN_room_17Tex_005168; @@ -30,5 +12,23 @@ static const ALIGN_ASSET(2) char HIDAN_room_17Tex_005968[] = dHIDAN_room_17Tex_0 #define dHIDAN_room_17Tex_006168 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17Tex_006168" static const ALIGN_ASSET(2) char HIDAN_room_17Tex_006168[] = dHIDAN_room_17Tex_006168; +#define dHIDAN_room_17Tex_006968 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17Tex_006968" +static const ALIGN_ASSET(2) char HIDAN_room_17Tex_006968[] = dHIDAN_room_17Tex_006968; + +#define dHIDAN_room_17Tex_007168 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17Tex_007168" +static const ALIGN_ASSET(2) char HIDAN_room_17Tex_007168[] = dHIDAN_room_17Tex_007168; + +#define dHIDAN_room_17Tex_007968 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17Tex_007968" +static const ALIGN_ASSET(2) char HIDAN_room_17Tex_007968[] = dHIDAN_room_17Tex_007968; + +#define dHIDAN_room_17Tex_008168 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17Tex_008168" +static const ALIGN_ASSET(2) char HIDAN_room_17Tex_008168[] = dHIDAN_room_17Tex_008168; + +#define dHIDAN_room_17Tex_008968 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17Tex_008968" +static const ALIGN_ASSET(2) char HIDAN_room_17Tex_008968[] = dHIDAN_room_17Tex_008968; + +#define dHIDAN_room_17DL_003290 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17DL_003290" +static const ALIGN_ASSET(2) char HIDAN_room_17DL_003290[] = dHIDAN_room_17DL_003290; + #endif // DUNGEONS_HIDAN_ROOM_17_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_18.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_18.h index e28427abf..d6904d05a 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_18.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_18.h @@ -3,17 +3,14 @@ #include "align_asset_macro.h" -#define dHIDAN_room_18DL_001890 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_18DL_001890" -static const ALIGN_ASSET(2) char HIDAN_room_18DL_001890[] = dHIDAN_room_18DL_001890; - -#define dHIDAN_room_18Tex_0033F8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_18Tex_0033F8" -static const ALIGN_ASSET(2) char HIDAN_room_18Tex_0033F8[] = dHIDAN_room_18Tex_0033F8; +#define dHIDAN_room_18Tex_0027F8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_18Tex_0027F8" +static const ALIGN_ASSET(2) char HIDAN_room_18Tex_0027F8[] = dHIDAN_room_18Tex_0027F8; #define dHIDAN_room_18Tex_002FF8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_18Tex_002FF8" static const ALIGN_ASSET(2) char HIDAN_room_18Tex_002FF8[] = dHIDAN_room_18Tex_002FF8; -#define dHIDAN_room_18Tex_0027F8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_18Tex_0027F8" -static const ALIGN_ASSET(2) char HIDAN_room_18Tex_0027F8[] = dHIDAN_room_18Tex_0027F8; +#define dHIDAN_room_18Tex_0033F8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_18Tex_0033F8" +static const ALIGN_ASSET(2) char HIDAN_room_18Tex_0033F8[] = dHIDAN_room_18Tex_0033F8; #define dHIDAN_room_18Tex_0037F8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_18Tex_0037F8" static const ALIGN_ASSET(2) char HIDAN_room_18Tex_0037F8[] = dHIDAN_room_18Tex_0037F8; @@ -21,5 +18,8 @@ static const ALIGN_ASSET(2) char HIDAN_room_18Tex_0037F8[] = dHIDAN_room_18Tex_0 #define dHIDAN_room_18Tex_0039F8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_18Tex_0039F8" static const ALIGN_ASSET(2) char HIDAN_room_18Tex_0039F8[] = dHIDAN_room_18Tex_0039F8; +#define dHIDAN_room_18DL_001890 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_18DL_001890" +static const ALIGN_ASSET(2) char HIDAN_room_18DL_001890[] = dHIDAN_room_18DL_001890; + #endif // DUNGEONS_HIDAN_ROOM_18_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_19.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_19.h index b809f6f4f..d9d0f5f7b 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_19.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_19.h @@ -3,23 +3,23 @@ #include "align_asset_macro.h" -#define dHIDAN_room_19DL_001C00 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_19DL_001C00" -static const ALIGN_ASSET(2) char HIDAN_room_19DL_001C00[] = dHIDAN_room_19DL_001C00; - #define dHIDAN_room_19Tex_002E28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_19Tex_002E28" static const ALIGN_ASSET(2) char HIDAN_room_19Tex_002E28[] = dHIDAN_room_19Tex_002E28; -#define dHIDAN_room_19Tex_003E28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_19Tex_003E28" -static const ALIGN_ASSET(2) char HIDAN_room_19Tex_003E28[] = dHIDAN_room_19Tex_003E28; - -#define dHIDAN_room_19Tex_003A28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_19Tex_003A28" -static const ALIGN_ASSET(2) char HIDAN_room_19Tex_003A28[] = dHIDAN_room_19Tex_003A28; - -#define dHIDAN_room_19Tex_004028 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_19Tex_004028" -static const ALIGN_ASSET(2) char HIDAN_room_19Tex_004028[] = dHIDAN_room_19Tex_004028; - #define dHIDAN_room_19Tex_003628 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_19Tex_003628" static const ALIGN_ASSET(2) char HIDAN_room_19Tex_003628[] = dHIDAN_room_19Tex_003628; +#define dHIDAN_room_19Tex_003A28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_19Tex_003A28" +static const ALIGN_ASSET(2) char HIDAN_room_19Tex_003A28[] = dHIDAN_room_19Tex_003A28; + +#define dHIDAN_room_19Tex_003E28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_19Tex_003E28" +static const ALIGN_ASSET(2) char HIDAN_room_19Tex_003E28[] = dHIDAN_room_19Tex_003E28; + +#define dHIDAN_room_19Tex_004028 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_19Tex_004028" +static const ALIGN_ASSET(2) char HIDAN_room_19Tex_004028[] = dHIDAN_room_19Tex_004028; + +#define dHIDAN_room_19DL_001C00 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_19DL_001C00" +static const ALIGN_ASSET(2) char HIDAN_room_19DL_001C00[] = dHIDAN_room_19DL_001C00; + #endif // DUNGEONS_HIDAN_ROOM_19_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_2.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_2.h index 131325d78..25e6e6909 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_2.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_2.h @@ -3,21 +3,27 @@ #include "align_asset_macro.h" -#define dHIDAN_room_2DL_0094C0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2DL_0094C0" -static const ALIGN_ASSET(2) char HIDAN_room_2DL_0094C0[] = dHIDAN_room_2DL_0094C0; +#define dHIDAN_room_2Tex_009628 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_009628" +static const ALIGN_ASSET(2) char HIDAN_room_2Tex_009628[] = dHIDAN_room_2Tex_009628; -#define dHIDAN_room_2Tex_00E428 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00E428" -static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00E428[] = dHIDAN_room_2Tex_00E428; +#define dHIDAN_room_2Tex_009828 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_009828" +static const ALIGN_ASSET(2) char HIDAN_room_2Tex_009828[] = dHIDAN_room_2Tex_009828; -#define dHIDAN_room_2DL_002A80 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2DL_002A80" -static const ALIGN_ASSET(2) char HIDAN_room_2DL_002A80[] = dHIDAN_room_2DL_002A80; - -#define dHIDAN_room_2Tex_00F028 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00F028" -static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00F028[] = dHIDAN_room_2Tex_00F028; +#define dHIDAN_room_2Tex_00A028 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00A028" +static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00A028[] = dHIDAN_room_2Tex_00A028; #define dHIDAN_room_2Tex_00A828 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00A828" static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00A828[] = dHIDAN_room_2Tex_00A828; +#define dHIDAN_room_2Tex_00AC28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00AC28" +static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00AC28[] = dHIDAN_room_2Tex_00AC28; + +#define dHIDAN_room_2Tex_00BC28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00BC28" +static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00BC28[] = dHIDAN_room_2Tex_00BC28; + +#define dHIDAN_room_2Tex_00CC28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00CC28" +static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00CC28[] = dHIDAN_room_2Tex_00CC28; + #define dHIDAN_room_2Tex_00CE28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00CE28" static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00CE28[] = dHIDAN_room_2Tex_00CE28; @@ -27,20 +33,23 @@ static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00DE28[] = dHIDAN_room_2Tex_00D #define dHIDAN_room_2Tex_00E028 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00E028" static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00E028[] = dHIDAN_room_2Tex_00E028; -#define dHIDAN_room_2Tex_00AC28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00AC28" -static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00AC28[] = dHIDAN_room_2Tex_00AC28; +#define dHIDAN_room_2Tex_00E428 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00E428" +static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00E428[] = dHIDAN_room_2Tex_00E428; -#define dHIDAN_room_2Tex_00CC28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00CC28" -static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00CC28[] = dHIDAN_room_2Tex_00CC28; +#define dHIDAN_room_2Tex_00EC28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00EC28" +static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00EC28[] = dHIDAN_room_2Tex_00EC28; -#define dHIDAN_room_2Tex_00A028 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00A028" -static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00A028[] = dHIDAN_room_2Tex_00A028; +#define dHIDAN_room_2Tex_00F028 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00F028" +static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00F028[] = dHIDAN_room_2Tex_00F028; #define dHIDAN_room_2Tex_00F828 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00F828" static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00F828[] = dHIDAN_room_2Tex_00F828; -#define dHIDAN_room_2Tex_00BC28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00BC28" -static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00BC28[] = dHIDAN_room_2Tex_00BC28; +#define dHIDAN_room_2DL_0094C0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2DL_0094C0" +static const ALIGN_ASSET(2) char HIDAN_room_2DL_0094C0[] = dHIDAN_room_2DL_0094C0; + +#define dHIDAN_room_2DL_002A80 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2DL_002A80" +static const ALIGN_ASSET(2) char HIDAN_room_2DL_002A80[] = dHIDAN_room_2DL_002A80; #define dHIDAN_room_2DL_005A80 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2DL_005A80" static const ALIGN_ASSET(2) char HIDAN_room_2DL_005A80[] = dHIDAN_room_2DL_005A80; @@ -48,14 +57,5 @@ static const ALIGN_ASSET(2) char HIDAN_room_2DL_005A80[] = dHIDAN_room_2DL_005A8 #define dHIDAN_room_2DL_0079A0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2DL_0079A0" static const ALIGN_ASSET(2) char HIDAN_room_2DL_0079A0[] = dHIDAN_room_2DL_0079A0; -#define dHIDAN_room_2Tex_009628 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_009628" -static const ALIGN_ASSET(2) char HIDAN_room_2Tex_009628[] = dHIDAN_room_2Tex_009628; - -#define dHIDAN_room_2Tex_009828 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_009828" -static const ALIGN_ASSET(2) char HIDAN_room_2Tex_009828[] = dHIDAN_room_2Tex_009828; - -#define dHIDAN_room_2Tex_00EC28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00EC28" -static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00EC28[] = dHIDAN_room_2Tex_00EC28; - #endif // DUNGEONS_HIDAN_ROOM_2_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_20.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_20.h index 021845678..1a78b1028 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_20.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_20.h @@ -3,23 +3,8 @@ #include "align_asset_macro.h" -#define dHIDAN_room_20DL_001BE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20DL_001BE0" -static const ALIGN_ASSET(2) char HIDAN_room_20DL_001BE0[] = dHIDAN_room_20DL_001BE0; - -#define dHIDAN_room_20Tex_006508 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_006508" -static const ALIGN_ASSET(2) char HIDAN_room_20Tex_006508[] = dHIDAN_room_20Tex_006508; - -#define dHIDAN_room_20Tex_005D08 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_005D08" -static const ALIGN_ASSET(2) char HIDAN_room_20Tex_005D08[] = dHIDAN_room_20Tex_005D08; - -#define dHIDAN_room_20Tex_005508 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_005508" -static const ALIGN_ASSET(2) char HIDAN_room_20Tex_005508[] = dHIDAN_room_20Tex_005508; - -#define dHIDAN_room_20Tex_004D08 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_004D08" -static const ALIGN_ASSET(2) char HIDAN_room_20Tex_004D08[] = dHIDAN_room_20Tex_004D08; - -#define dHIDAN_room_20Tex_004508 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_004508" -static const ALIGN_ASSET(2) char HIDAN_room_20Tex_004508[] = dHIDAN_room_20Tex_004508; +#define dHIDAN_room_20Tex_002D08 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_002D08" +static const ALIGN_ASSET(2) char HIDAN_room_20Tex_002D08[] = dHIDAN_room_20Tex_002D08; #define dHIDAN_room_20Tex_003508 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_003508" static const ALIGN_ASSET(2) char HIDAN_room_20Tex_003508[] = dHIDAN_room_20Tex_003508; @@ -27,8 +12,23 @@ static const ALIGN_ASSET(2) char HIDAN_room_20Tex_003508[] = dHIDAN_room_20Tex_0 #define dHIDAN_room_20Tex_003D08 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_003D08" static const ALIGN_ASSET(2) char HIDAN_room_20Tex_003D08[] = dHIDAN_room_20Tex_003D08; -#define dHIDAN_room_20Tex_002D08 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_002D08" -static const ALIGN_ASSET(2) char HIDAN_room_20Tex_002D08[] = dHIDAN_room_20Tex_002D08; +#define dHIDAN_room_20Tex_004508 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_004508" +static const ALIGN_ASSET(2) char HIDAN_room_20Tex_004508[] = dHIDAN_room_20Tex_004508; + +#define dHIDAN_room_20Tex_004D08 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_004D08" +static const ALIGN_ASSET(2) char HIDAN_room_20Tex_004D08[] = dHIDAN_room_20Tex_004D08; + +#define dHIDAN_room_20Tex_005508 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_005508" +static const ALIGN_ASSET(2) char HIDAN_room_20Tex_005508[] = dHIDAN_room_20Tex_005508; + +#define dHIDAN_room_20Tex_005D08 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_005D08" +static const ALIGN_ASSET(2) char HIDAN_room_20Tex_005D08[] = dHIDAN_room_20Tex_005D08; + +#define dHIDAN_room_20Tex_006508 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_006508" +static const ALIGN_ASSET(2) char HIDAN_room_20Tex_006508[] = dHIDAN_room_20Tex_006508; + +#define dHIDAN_room_20DL_001BE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20DL_001BE0" +static const ALIGN_ASSET(2) char HIDAN_room_20DL_001BE0[] = dHIDAN_room_20DL_001BE0; #endif // DUNGEONS_HIDAN_ROOM_20_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_21.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_21.h index 0974156e8..16df7a7ee 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_21.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_21.h @@ -3,18 +3,42 @@ #include "align_asset_macro.h" -#define dHIDAN_room_21DL_0003E8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21DL_0003E8" -static const ALIGN_ASSET(2) char HIDAN_room_21DL_0003E8[] = dHIDAN_room_21DL_0003E8; +#define dHIDAN_room_21Tex_004478 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_004478" +static const ALIGN_ASSET(2) char HIDAN_room_21Tex_004478[] = dHIDAN_room_21Tex_004478; + +#define dHIDAN_room_21Tex_004678 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_004678" +static const ALIGN_ASSET(2) char HIDAN_room_21Tex_004678[] = dHIDAN_room_21Tex_004678; + +#define dHIDAN_room_21Tex_004E78 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_004E78" +static const ALIGN_ASSET(2) char HIDAN_room_21Tex_004E78[] = dHIDAN_room_21Tex_004E78; + +#define dHIDAN_room_21Tex_005678 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_005678" +static const ALIGN_ASSET(2) char HIDAN_room_21Tex_005678[] = dHIDAN_room_21Tex_005678; + +#define dHIDAN_room_21Tex_005E78 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_005E78" +static const ALIGN_ASSET(2) char HIDAN_room_21Tex_005E78[] = dHIDAN_room_21Tex_005E78; + +#define dHIDAN_room_21Tex_006678 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_006678" +static const ALIGN_ASSET(2) char HIDAN_room_21Tex_006678[] = dHIDAN_room_21Tex_006678; + +#define dHIDAN_room_21Tex_006A78 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_006A78" +static const ALIGN_ASSET(2) char HIDAN_room_21Tex_006A78[] = dHIDAN_room_21Tex_006A78; + +#define dHIDAN_room_21Tex_007278 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_007278" +static const ALIGN_ASSET(2) char HIDAN_room_21Tex_007278[] = dHIDAN_room_21Tex_007278; #define dHIDAN_room_21Tex_007478 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_007478" static const ALIGN_ASSET(2) char HIDAN_room_21Tex_007478[] = dHIDAN_room_21Tex_007478; -#define dHIDAN_room_21DL_000230 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21DL_000230" -static const ALIGN_ASSET(2) char HIDAN_room_21DL_000230[] = dHIDAN_room_21DL_000230; - #define dHIDAN_room_21Tex_007C78 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_007C78" static const ALIGN_ASSET(2) char HIDAN_room_21Tex_007C78[] = dHIDAN_room_21Tex_007C78; +#define dHIDAN_room_21DL_0003E8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21DL_0003E8" +static const ALIGN_ASSET(2) char HIDAN_room_21DL_0003E8[] = dHIDAN_room_21DL_0003E8; + +#define dHIDAN_room_21DL_000230 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21DL_000230" +static const ALIGN_ASSET(2) char HIDAN_room_21DL_000230[] = dHIDAN_room_21DL_000230; + #define dHIDAN_room_21DL_003FF8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21DL_003FF8" static const ALIGN_ASSET(2) char HIDAN_room_21DL_003FF8[] = dHIDAN_room_21DL_003FF8; @@ -24,9 +48,6 @@ static const ALIGN_ASSET(2) char HIDAN_room_21DL_004348[] = dHIDAN_room_21DL_004 #define dHIDAN_room_21DL_003AF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21DL_003AF0" static const ALIGN_ASSET(2) char HIDAN_room_21DL_003AF0[] = dHIDAN_room_21DL_003AF0; -#define dHIDAN_room_21Tex_004E78 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_004E78" -static const ALIGN_ASSET(2) char HIDAN_room_21Tex_004E78[] = dHIDAN_room_21Tex_004E78; - #define dHIDAN_room_21DL_003458 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21DL_003458" static const ALIGN_ASSET(2) char HIDAN_room_21DL_003458[] = dHIDAN_room_21DL_003458; @@ -36,35 +57,14 @@ static const ALIGN_ASSET(2) char HIDAN_room_21DL_002F58[] = dHIDAN_room_21DL_002 #define dHIDAN_room_21DL_002560 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21DL_002560" static const ALIGN_ASSET(2) char HIDAN_room_21DL_002560[] = dHIDAN_room_21DL_002560; -#define dHIDAN_room_21Tex_004478 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_004478" -static const ALIGN_ASSET(2) char HIDAN_room_21Tex_004478[] = dHIDAN_room_21Tex_004478; - -#define dHIDAN_room_21Tex_005678 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_005678" -static const ALIGN_ASSET(2) char HIDAN_room_21Tex_005678[] = dHIDAN_room_21Tex_005678; - #define dHIDAN_room_21DL_0010C0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21DL_0010C0" static const ALIGN_ASSET(2) char HIDAN_room_21DL_0010C0[] = dHIDAN_room_21DL_0010C0; -#define dHIDAN_room_21Tex_007278 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_007278" -static const ALIGN_ASSET(2) char HIDAN_room_21Tex_007278[] = dHIDAN_room_21Tex_007278; - -#define dHIDAN_room_21Tex_005E78 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_005E78" -static const ALIGN_ASSET(2) char HIDAN_room_21Tex_005E78[] = dHIDAN_room_21Tex_005E78; - -#define dHIDAN_room_21Tex_004678 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_004678" -static const ALIGN_ASSET(2) char HIDAN_room_21Tex_004678[] = dHIDAN_room_21Tex_004678; - -#define dHIDAN_room_21Tex_006678 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_006678" -static const ALIGN_ASSET(2) char HIDAN_room_21Tex_006678[] = dHIDAN_room_21Tex_006678; - #define dHIDAN_room_21DL_000838 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21DL_000838" static const ALIGN_ASSET(2) char HIDAN_room_21DL_000838[] = dHIDAN_room_21DL_000838; #define dHIDAN_room_21DL_000670 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21DL_000670" static const ALIGN_ASSET(2) char HIDAN_room_21DL_000670[] = dHIDAN_room_21DL_000670; -#define dHIDAN_room_21Tex_006A78 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_006A78" -static const ALIGN_ASSET(2) char HIDAN_room_21Tex_006A78[] = dHIDAN_room_21Tex_006A78; - #endif // DUNGEONS_HIDAN_ROOM_21_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_22.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_22.h index 63df6179d..84e10ddce 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_22.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_22.h @@ -3,24 +3,6 @@ #include "align_asset_macro.h" -#define dHIDAN_room_22DL_001AA0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22DL_001AA0" -static const ALIGN_ASSET(2) char HIDAN_room_22DL_001AA0[] = dHIDAN_room_22DL_001AA0; - -#define dHIDAN_room_22Tex_0052E8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22Tex_0052E8" -static const ALIGN_ASSET(2) char HIDAN_room_22Tex_0052E8[] = dHIDAN_room_22Tex_0052E8; - -#define dHIDAN_room_22Tex_0062E8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22Tex_0062E8" -static const ALIGN_ASSET(2) char HIDAN_room_22Tex_0062E8[] = dHIDAN_room_22Tex_0062E8; - -#define dHIDAN_room_22Tex_005AE8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22Tex_005AE8" -static const ALIGN_ASSET(2) char HIDAN_room_22Tex_005AE8[] = dHIDAN_room_22Tex_005AE8; - -#define dHIDAN_room_22Tex_004AE8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22Tex_004AE8" -static const ALIGN_ASSET(2) char HIDAN_room_22Tex_004AE8[] = dHIDAN_room_22Tex_004AE8; - -#define dHIDAN_room_22Tex_0042E8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22Tex_0042E8" -static const ALIGN_ASSET(2) char HIDAN_room_22Tex_0042E8[] = dHIDAN_room_22Tex_0042E8; - #define dHIDAN_room_22Tex_002AE8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22Tex_002AE8" static const ALIGN_ASSET(2) char HIDAN_room_22Tex_002AE8[] = dHIDAN_room_22Tex_002AE8; @@ -30,5 +12,23 @@ static const ALIGN_ASSET(2) char HIDAN_room_22Tex_0032E8[] = dHIDAN_room_22Tex_0 #define dHIDAN_room_22Tex_003AE8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22Tex_003AE8" static const ALIGN_ASSET(2) char HIDAN_room_22Tex_003AE8[] = dHIDAN_room_22Tex_003AE8; +#define dHIDAN_room_22Tex_0042E8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22Tex_0042E8" +static const ALIGN_ASSET(2) char HIDAN_room_22Tex_0042E8[] = dHIDAN_room_22Tex_0042E8; + +#define dHIDAN_room_22Tex_004AE8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22Tex_004AE8" +static const ALIGN_ASSET(2) char HIDAN_room_22Tex_004AE8[] = dHIDAN_room_22Tex_004AE8; + +#define dHIDAN_room_22Tex_0052E8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22Tex_0052E8" +static const ALIGN_ASSET(2) char HIDAN_room_22Tex_0052E8[] = dHIDAN_room_22Tex_0052E8; + +#define dHIDAN_room_22Tex_005AE8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22Tex_005AE8" +static const ALIGN_ASSET(2) char HIDAN_room_22Tex_005AE8[] = dHIDAN_room_22Tex_005AE8; + +#define dHIDAN_room_22Tex_0062E8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22Tex_0062E8" +static const ALIGN_ASSET(2) char HIDAN_room_22Tex_0062E8[] = dHIDAN_room_22Tex_0062E8; + +#define dHIDAN_room_22DL_001AA0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22DL_001AA0" +static const ALIGN_ASSET(2) char HIDAN_room_22DL_001AA0[] = dHIDAN_room_22DL_001AA0; + #endif // DUNGEONS_HIDAN_ROOM_22_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_23.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_23.h index 193e540fb..49ce9ddea 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_23.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_23.h @@ -3,23 +3,8 @@ #include "align_asset_macro.h" -#define dHIDAN_room_23DL_001BF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23DL_001BF0" -static const ALIGN_ASSET(2) char HIDAN_room_23DL_001BF0[] = dHIDAN_room_23DL_001BF0; - -#define dHIDAN_room_23Tex_006518 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_006518" -static const ALIGN_ASSET(2) char HIDAN_room_23Tex_006518[] = dHIDAN_room_23Tex_006518; - -#define dHIDAN_room_23Tex_005D18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_005D18" -static const ALIGN_ASSET(2) char HIDAN_room_23Tex_005D18[] = dHIDAN_room_23Tex_005D18; - -#define dHIDAN_room_23Tex_005518 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_005518" -static const ALIGN_ASSET(2) char HIDAN_room_23Tex_005518[] = dHIDAN_room_23Tex_005518; - -#define dHIDAN_room_23Tex_004D18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_004D18" -static const ALIGN_ASSET(2) char HIDAN_room_23Tex_004D18[] = dHIDAN_room_23Tex_004D18; - -#define dHIDAN_room_23Tex_004518 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_004518" -static const ALIGN_ASSET(2) char HIDAN_room_23Tex_004518[] = dHIDAN_room_23Tex_004518; +#define dHIDAN_room_23Tex_002D18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_002D18" +static const ALIGN_ASSET(2) char HIDAN_room_23Tex_002D18[] = dHIDAN_room_23Tex_002D18; #define dHIDAN_room_23Tex_003518 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_003518" static const ALIGN_ASSET(2) char HIDAN_room_23Tex_003518[] = dHIDAN_room_23Tex_003518; @@ -27,8 +12,23 @@ static const ALIGN_ASSET(2) char HIDAN_room_23Tex_003518[] = dHIDAN_room_23Tex_0 #define dHIDAN_room_23Tex_003D18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_003D18" static const ALIGN_ASSET(2) char HIDAN_room_23Tex_003D18[] = dHIDAN_room_23Tex_003D18; -#define dHIDAN_room_23Tex_002D18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_002D18" -static const ALIGN_ASSET(2) char HIDAN_room_23Tex_002D18[] = dHIDAN_room_23Tex_002D18; +#define dHIDAN_room_23Tex_004518 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_004518" +static const ALIGN_ASSET(2) char HIDAN_room_23Tex_004518[] = dHIDAN_room_23Tex_004518; + +#define dHIDAN_room_23Tex_004D18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_004D18" +static const ALIGN_ASSET(2) char HIDAN_room_23Tex_004D18[] = dHIDAN_room_23Tex_004D18; + +#define dHIDAN_room_23Tex_005518 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_005518" +static const ALIGN_ASSET(2) char HIDAN_room_23Tex_005518[] = dHIDAN_room_23Tex_005518; + +#define dHIDAN_room_23Tex_005D18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_005D18" +static const ALIGN_ASSET(2) char HIDAN_room_23Tex_005D18[] = dHIDAN_room_23Tex_005D18; + +#define dHIDAN_room_23Tex_006518 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_006518" +static const ALIGN_ASSET(2) char HIDAN_room_23Tex_006518[] = dHIDAN_room_23Tex_006518; + +#define dHIDAN_room_23DL_001BF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23DL_001BF0" +static const ALIGN_ASSET(2) char HIDAN_room_23DL_001BF0[] = dHIDAN_room_23DL_001BF0; #endif // DUNGEONS_HIDAN_ROOM_23_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_24.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_24.h index 730363386..2bc510514 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_24.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_24.h @@ -3,18 +3,6 @@ #include "align_asset_macro.h" -#define dHIDAN_room_24DL_003A10 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_24DL_003A10" -static const ALIGN_ASSET(2) char HIDAN_room_24DL_003A10[] = dHIDAN_room_24DL_003A10; - -#define dHIDAN_room_24Tex_004D38 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_24Tex_004D38" -static const ALIGN_ASSET(2) char HIDAN_room_24Tex_004D38[] = dHIDAN_room_24Tex_004D38; - -#define dHIDAN_room_24DL_0019B0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_24DL_0019B0" -static const ALIGN_ASSET(2) char HIDAN_room_24DL_0019B0[] = dHIDAN_room_24DL_0019B0; - -#define dHIDAN_room_24Tex_004938 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_24Tex_004938" -static const ALIGN_ASSET(2) char HIDAN_room_24Tex_004938[] = dHIDAN_room_24Tex_004938; - #define dHIDAN_room_24Tex_003B38 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_24Tex_003B38" static const ALIGN_ASSET(2) char HIDAN_room_24Tex_003B38[] = dHIDAN_room_24Tex_003B38; @@ -27,6 +15,18 @@ static const ALIGN_ASSET(2) char HIDAN_room_24Tex_004338[] = dHIDAN_room_24Tex_0 #define dHIDAN_room_24Tex_004738 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_24Tex_004738" static const ALIGN_ASSET(2) char HIDAN_room_24Tex_004738[] = dHIDAN_room_24Tex_004738; +#define dHIDAN_room_24Tex_004938 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_24Tex_004938" +static const ALIGN_ASSET(2) char HIDAN_room_24Tex_004938[] = dHIDAN_room_24Tex_004938; + +#define dHIDAN_room_24Tex_004D38 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_24Tex_004D38" +static const ALIGN_ASSET(2) char HIDAN_room_24Tex_004D38[] = dHIDAN_room_24Tex_004D38; + +#define dHIDAN_room_24DL_003A10 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_24DL_003A10" +static const ALIGN_ASSET(2) char HIDAN_room_24DL_003A10[] = dHIDAN_room_24DL_003A10; + +#define dHIDAN_room_24DL_0019B0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_24DL_0019B0" +static const ALIGN_ASSET(2) char HIDAN_room_24DL_0019B0[] = dHIDAN_room_24DL_0019B0; + #define dHIDAN_room_24DL_003660 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_24DL_003660" static const ALIGN_ASSET(2) char HIDAN_room_24DL_003660[] = dHIDAN_room_24DL_003660; diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_25.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_25.h index 8f552fcdd..01512f23b 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_25.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_25.h @@ -3,24 +3,6 @@ #include "align_asset_macro.h" -#define dHIDAN_room_25DL_001A90 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25DL_001A90" -static const ALIGN_ASSET(2) char HIDAN_room_25DL_001A90[] = dHIDAN_room_25DL_001A90; - -#define dHIDAN_room_25Tex_0052D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25Tex_0052D8" -static const ALIGN_ASSET(2) char HIDAN_room_25Tex_0052D8[] = dHIDAN_room_25Tex_0052D8; - -#define dHIDAN_room_25Tex_0062D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25Tex_0062D8" -static const ALIGN_ASSET(2) char HIDAN_room_25Tex_0062D8[] = dHIDAN_room_25Tex_0062D8; - -#define dHIDAN_room_25Tex_005AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25Tex_005AD8" -static const ALIGN_ASSET(2) char HIDAN_room_25Tex_005AD8[] = dHIDAN_room_25Tex_005AD8; - -#define dHIDAN_room_25Tex_004AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25Tex_004AD8" -static const ALIGN_ASSET(2) char HIDAN_room_25Tex_004AD8[] = dHIDAN_room_25Tex_004AD8; - -#define dHIDAN_room_25Tex_0042D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25Tex_0042D8" -static const ALIGN_ASSET(2) char HIDAN_room_25Tex_0042D8[] = dHIDAN_room_25Tex_0042D8; - #define dHIDAN_room_25Tex_002AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25Tex_002AD8" static const ALIGN_ASSET(2) char HIDAN_room_25Tex_002AD8[] = dHIDAN_room_25Tex_002AD8; @@ -30,5 +12,23 @@ static const ALIGN_ASSET(2) char HIDAN_room_25Tex_0032D8[] = dHIDAN_room_25Tex_0 #define dHIDAN_room_25Tex_003AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25Tex_003AD8" static const ALIGN_ASSET(2) char HIDAN_room_25Tex_003AD8[] = dHIDAN_room_25Tex_003AD8; +#define dHIDAN_room_25Tex_0042D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25Tex_0042D8" +static const ALIGN_ASSET(2) char HIDAN_room_25Tex_0042D8[] = dHIDAN_room_25Tex_0042D8; + +#define dHIDAN_room_25Tex_004AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25Tex_004AD8" +static const ALIGN_ASSET(2) char HIDAN_room_25Tex_004AD8[] = dHIDAN_room_25Tex_004AD8; + +#define dHIDAN_room_25Tex_0052D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25Tex_0052D8" +static const ALIGN_ASSET(2) char HIDAN_room_25Tex_0052D8[] = dHIDAN_room_25Tex_0052D8; + +#define dHIDAN_room_25Tex_005AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25Tex_005AD8" +static const ALIGN_ASSET(2) char HIDAN_room_25Tex_005AD8[] = dHIDAN_room_25Tex_005AD8; + +#define dHIDAN_room_25Tex_0062D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25Tex_0062D8" +static const ALIGN_ASSET(2) char HIDAN_room_25Tex_0062D8[] = dHIDAN_room_25Tex_0062D8; + +#define dHIDAN_room_25DL_001A90 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25DL_001A90" +static const ALIGN_ASSET(2) char HIDAN_room_25DL_001A90[] = dHIDAN_room_25DL_001A90; + #endif // DUNGEONS_HIDAN_ROOM_25_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_26.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_26.h index 638e5d73f..20aab9f88 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_26.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_26.h @@ -3,18 +3,27 @@ #include "align_asset_macro.h" -#define dHIDAN_room_26DL_003590 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26DL_003590" -static const ALIGN_ASSET(2) char HIDAN_room_26DL_003590[] = dHIDAN_room_26DL_003590; +#define dHIDAN_room_26Tex_004A98 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26Tex_004A98" +static const ALIGN_ASSET(2) char HIDAN_room_26Tex_004A98[] = dHIDAN_room_26Tex_004A98; + +#define dHIDAN_room_26Tex_005298 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26Tex_005298" +static const ALIGN_ASSET(2) char HIDAN_room_26Tex_005298[] = dHIDAN_room_26Tex_005298; + +#define dHIDAN_room_26Tex_005698 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26Tex_005698" +static const ALIGN_ASSET(2) char HIDAN_room_26Tex_005698[] = dHIDAN_room_26Tex_005698; + +#define dHIDAN_room_26Tex_005898 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26Tex_005898" +static const ALIGN_ASSET(2) char HIDAN_room_26Tex_005898[] = dHIDAN_room_26Tex_005898; #define dHIDAN_room_26Tex_006098 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26Tex_006098" static const ALIGN_ASSET(2) char HIDAN_room_26Tex_006098[] = dHIDAN_room_26Tex_006098; +#define dHIDAN_room_26DL_003590 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26DL_003590" +static const ALIGN_ASSET(2) char HIDAN_room_26DL_003590[] = dHIDAN_room_26DL_003590; + #define dHIDAN_room_26DL_0037A0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26DL_0037A0" static const ALIGN_ASSET(2) char HIDAN_room_26DL_0037A0[] = dHIDAN_room_26DL_0037A0; -#define dHIDAN_room_26Tex_005898 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26Tex_005898" -static const ALIGN_ASSET(2) char HIDAN_room_26Tex_005898[] = dHIDAN_room_26Tex_005898; - #define dHIDAN_room_26DL_000A80 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26DL_000A80" static const ALIGN_ASSET(2) char HIDAN_room_26DL_000A80[] = dHIDAN_room_26DL_000A80; @@ -27,12 +36,6 @@ static const ALIGN_ASSET(2) char HIDAN_room_26DL_0010C0[] = dHIDAN_room_26DL_001 #define dHIDAN_room_26DL_001D40 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26DL_001D40" static const ALIGN_ASSET(2) char HIDAN_room_26DL_001D40[] = dHIDAN_room_26DL_001D40; -#define dHIDAN_room_26Tex_005698 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26Tex_005698" -static const ALIGN_ASSET(2) char HIDAN_room_26Tex_005698[] = dHIDAN_room_26Tex_005698; - -#define dHIDAN_room_26Tex_005298 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26Tex_005298" -static const ALIGN_ASSET(2) char HIDAN_room_26Tex_005298[] = dHIDAN_room_26Tex_005298; - #define dHIDAN_room_26DL_0015B8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26DL_0015B8" static const ALIGN_ASSET(2) char HIDAN_room_26DL_0015B8[] = dHIDAN_room_26DL_0015B8; @@ -45,8 +48,5 @@ static const ALIGN_ASSET(2) char HIDAN_room_26DL_002F68[] = dHIDAN_room_26DL_002 #define dHIDAN_room_26DL_0046B8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26DL_0046B8" static const ALIGN_ASSET(2) char HIDAN_room_26DL_0046B8[] = dHIDAN_room_26DL_0046B8; -#define dHIDAN_room_26Tex_004A98 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26Tex_004A98" -static const ALIGN_ASSET(2) char HIDAN_room_26Tex_004A98[] = dHIDAN_room_26Tex_004A98; - #endif // DUNGEONS_HIDAN_ROOM_26_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_3.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_3.h index 81e9b9170..d9bf1219e 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_3.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_3.h @@ -3,23 +3,23 @@ #include "align_asset_macro.h" -#define dHIDAN_room_3DL_000980 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_3DL_000980" -static const ALIGN_ASSET(2) char HIDAN_room_3DL_000980[] = dHIDAN_room_3DL_000980; +#define dHIDAN_room_3Tex_001AC8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_3Tex_001AC8" +static const ALIGN_ASSET(2) char HIDAN_room_3Tex_001AC8[] = dHIDAN_room_3Tex_001AC8; + +#define dHIDAN_room_3Tex_001EC8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_3Tex_001EC8" +static const ALIGN_ASSET(2) char HIDAN_room_3Tex_001EC8[] = dHIDAN_room_3Tex_001EC8; #define dHIDAN_room_3Tex_0022C8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_3Tex_0022C8" static const ALIGN_ASSET(2) char HIDAN_room_3Tex_0022C8[] = dHIDAN_room_3Tex_0022C8; +#define dHIDAN_room_3DL_000980 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_3DL_000980" +static const ALIGN_ASSET(2) char HIDAN_room_3DL_000980[] = dHIDAN_room_3DL_000980; + #define dHIDAN_room_3DL_0014A0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_3DL_0014A0" static const ALIGN_ASSET(2) char HIDAN_room_3DL_0014A0[] = dHIDAN_room_3DL_0014A0; #define dHIDAN_room_3DL_001840 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_3DL_001840" static const ALIGN_ASSET(2) char HIDAN_room_3DL_001840[] = dHIDAN_room_3DL_001840; -#define dHIDAN_room_3Tex_001EC8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_3Tex_001EC8" -static const ALIGN_ASSET(2) char HIDAN_room_3Tex_001EC8[] = dHIDAN_room_3Tex_001EC8; - -#define dHIDAN_room_3Tex_001AC8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_3Tex_001AC8" -static const ALIGN_ASSET(2) char HIDAN_room_3Tex_001AC8[] = dHIDAN_room_3Tex_001AC8; - #endif // DUNGEONS_HIDAN_ROOM_3_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_4.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_4.h index 7516f21d0..206e69299 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_4.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_4.h @@ -3,50 +3,50 @@ #include "align_asset_macro.h" -#define dHIDAN_room_4DL_000470 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4DL_000470" -static const ALIGN_ASSET(2) char HIDAN_room_4DL_000470[] = dHIDAN_room_4DL_000470; +#define dHIDAN_room_4Tex_0050F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_0050F0" +static const ALIGN_ASSET(2) char HIDAN_room_4Tex_0050F0[] = dHIDAN_room_4Tex_0050F0; -#define dHIDAN_room_4Tex_0066F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_0066F0" -static const ALIGN_ASSET(2) char HIDAN_room_4Tex_0066F0[] = dHIDAN_room_4Tex_0066F0; +#define dHIDAN_room_4Tex_0052F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_0052F0" +static const ALIGN_ASSET(2) char HIDAN_room_4Tex_0052F0[] = dHIDAN_room_4Tex_0052F0; -#define dHIDAN_room_4DL_001A10 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4DL_001A10" -static const ALIGN_ASSET(2) char HIDAN_room_4DL_001A10[] = dHIDAN_room_4DL_001A10; - -#define dHIDAN_room_4Tex_006CF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_006CF0" -static const ALIGN_ASSET(2) char HIDAN_room_4Tex_006CF0[] = dHIDAN_room_4Tex_006CF0; - -#define dHIDAN_room_4Tex_0068F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_0068F0" -static const ALIGN_ASSET(2) char HIDAN_room_4Tex_0068F0[] = dHIDAN_room_4Tex_0068F0; +#define dHIDAN_room_4Tex_005AF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_005AF0" +static const ALIGN_ASSET(2) char HIDAN_room_4Tex_005AF0[] = dHIDAN_room_4Tex_005AF0; #define dHIDAN_room_4Tex_0062F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_0062F0" static const ALIGN_ASSET(2) char HIDAN_room_4Tex_0062F0[] = dHIDAN_room_4Tex_0062F0; +#define dHIDAN_room_4Tex_0066F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_0066F0" +static const ALIGN_ASSET(2) char HIDAN_room_4Tex_0066F0[] = dHIDAN_room_4Tex_0066F0; + +#define dHIDAN_room_4Tex_0068F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_0068F0" +static const ALIGN_ASSET(2) char HIDAN_room_4Tex_0068F0[] = dHIDAN_room_4Tex_0068F0; + +#define dHIDAN_room_4Tex_006CF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_006CF0" +static const ALIGN_ASSET(2) char HIDAN_room_4Tex_006CF0[] = dHIDAN_room_4Tex_006CF0; + +#define dHIDAN_room_4Tex_0070F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_0070F0" +static const ALIGN_ASSET(2) char HIDAN_room_4Tex_0070F0[] = dHIDAN_room_4Tex_0070F0; + +#define dHIDAN_room_4DL_000470 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4DL_000470" +static const ALIGN_ASSET(2) char HIDAN_room_4DL_000470[] = dHIDAN_room_4DL_000470; + +#define dHIDAN_room_4DL_001A10 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4DL_001A10" +static const ALIGN_ASSET(2) char HIDAN_room_4DL_001A10[] = dHIDAN_room_4DL_001A10; + #define dHIDAN_room_4DL_0028B8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4DL_0028B8" static const ALIGN_ASSET(2) char HIDAN_room_4DL_0028B8[] = dHIDAN_room_4DL_0028B8; -#define dHIDAN_room_4Tex_0052F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_0052F0" -static const ALIGN_ASSET(2) char HIDAN_room_4Tex_0052F0[] = dHIDAN_room_4Tex_0052F0; - #define dHIDAN_room_4DL_003060 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4DL_003060" static const ALIGN_ASSET(2) char HIDAN_room_4DL_003060[] = dHIDAN_room_4DL_003060; #define dHIDAN_room_4DL_003C08 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4DL_003C08" static const ALIGN_ASSET(2) char HIDAN_room_4DL_003C08[] = dHIDAN_room_4DL_003C08; -#define dHIDAN_room_4Tex_0050F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_0050F0" -static const ALIGN_ASSET(2) char HIDAN_room_4Tex_0050F0[] = dHIDAN_room_4Tex_0050F0; - -#define dHIDAN_room_4Tex_005AF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_005AF0" -static const ALIGN_ASSET(2) char HIDAN_room_4Tex_005AF0[] = dHIDAN_room_4Tex_005AF0; - #define dHIDAN_room_4DL_004758 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4DL_004758" static const ALIGN_ASSET(2) char HIDAN_room_4DL_004758[] = dHIDAN_room_4DL_004758; #define dHIDAN_room_4DL_004DA0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4DL_004DA0" static const ALIGN_ASSET(2) char HIDAN_room_4DL_004DA0[] = dHIDAN_room_4DL_004DA0; -#define dHIDAN_room_4Tex_0070F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_0070F0" -static const ALIGN_ASSET(2) char HIDAN_room_4Tex_0070F0[] = dHIDAN_room_4Tex_0070F0; - #endif // DUNGEONS_HIDAN_ROOM_4_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_5.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_5.h index 10aa6f123..6b6ae1f3c 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_5.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_5.h @@ -3,47 +3,47 @@ #include "align_asset_macro.h" -#define dHIDAN_room_5DL_000A60 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5DL_000A60" -static const ALIGN_ASSET(2) char HIDAN_room_5DL_000A60[] = dHIDAN_room_5DL_000A60; - #define dHIDAN_room_5Tex_007EE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5Tex_007EE0" static const ALIGN_ASSET(2) char HIDAN_room_5Tex_007EE0[] = dHIDAN_room_5Tex_007EE0; #define dHIDAN_room_5Tex_0080E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5Tex_0080E0" static const ALIGN_ASSET(2) char HIDAN_room_5Tex_0080E0[] = dHIDAN_room_5Tex_0080E0; -#define dHIDAN_room_5DL_002140 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5DL_002140" -static const ALIGN_ASSET(2) char HIDAN_room_5DL_002140[] = dHIDAN_room_5DL_002140; - -#define dHIDAN_room_5Tex_0096E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5Tex_0096E0" -static const ALIGN_ASSET(2) char HIDAN_room_5Tex_0096E0[] = dHIDAN_room_5Tex_0096E0; +#define dHIDAN_room_5Tex_0088E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5Tex_0088E0" +static const ALIGN_ASSET(2) char HIDAN_room_5Tex_0088E0[] = dHIDAN_room_5Tex_0088E0; #define dHIDAN_room_5Tex_008CE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5Tex_008CE0" static const ALIGN_ASSET(2) char HIDAN_room_5Tex_008CE0[] = dHIDAN_room_5Tex_008CE0; +#define dHIDAN_room_5Tex_0094E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5Tex_0094E0" +static const ALIGN_ASSET(2) char HIDAN_room_5Tex_0094E0[] = dHIDAN_room_5Tex_0094E0; + +#define dHIDAN_room_5Tex_0096E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5Tex_0096E0" +static const ALIGN_ASSET(2) char HIDAN_room_5Tex_0096E0[] = dHIDAN_room_5Tex_0096E0; + #define dHIDAN_room_5Tex_009AE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5Tex_009AE0" static const ALIGN_ASSET(2) char HIDAN_room_5Tex_009AE0[] = dHIDAN_room_5Tex_009AE0; #define dHIDAN_room_5Tex_009EE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5Tex_009EE0" static const ALIGN_ASSET(2) char HIDAN_room_5Tex_009EE0[] = dHIDAN_room_5Tex_009EE0; +#define dHIDAN_room_5DL_000A60 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5DL_000A60" +static const ALIGN_ASSET(2) char HIDAN_room_5DL_000A60[] = dHIDAN_room_5DL_000A60; + +#define dHIDAN_room_5DL_002140 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5DL_002140" +static const ALIGN_ASSET(2) char HIDAN_room_5DL_002140[] = dHIDAN_room_5DL_002140; + #define dHIDAN_room_5DL_003BE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5DL_003BE0" static const ALIGN_ASSET(2) char HIDAN_room_5DL_003BE0[] = dHIDAN_room_5DL_003BE0; #define dHIDAN_room_5DL_005058 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5DL_005058" static const ALIGN_ASSET(2) char HIDAN_room_5DL_005058[] = dHIDAN_room_5DL_005058; -#define dHIDAN_room_5Tex_0088E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5Tex_0088E0" -static const ALIGN_ASSET(2) char HIDAN_room_5Tex_0088E0[] = dHIDAN_room_5Tex_0088E0; - #define dHIDAN_room_5DL_005D80 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5DL_005D80" static const ALIGN_ASSET(2) char HIDAN_room_5DL_005D80[] = dHIDAN_room_5DL_005D80; #define dHIDAN_room_5DL_007130 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5DL_007130" static const ALIGN_ASSET(2) char HIDAN_room_5DL_007130[] = dHIDAN_room_5DL_007130; -#define dHIDAN_room_5Tex_0094E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5Tex_0094E0" -static const ALIGN_ASSET(2) char HIDAN_room_5Tex_0094E0[] = dHIDAN_room_5Tex_0094E0; - #endif // DUNGEONS_HIDAN_ROOM_5_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_6.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_6.h index 9246611f6..df7faa92c 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_6.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_6.h @@ -3,35 +3,35 @@ #include "align_asset_macro.h" -#define dHIDAN_room_6DL_002B78 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6DL_002B78" -static const ALIGN_ASSET(2) char HIDAN_room_6DL_002B78[] = dHIDAN_room_6DL_002B78; +#define dHIDAN_room_6Tex_003990 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6Tex_003990" +static const ALIGN_ASSET(2) char HIDAN_room_6Tex_003990[] = dHIDAN_room_6Tex_003990; #define dHIDAN_room_6Tex_003B90 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6Tex_003B90" static const ALIGN_ASSET(2) char HIDAN_room_6Tex_003B90[] = dHIDAN_room_6Tex_003B90; +#define dHIDAN_room_6Tex_004390 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6Tex_004390" +static const ALIGN_ASSET(2) char HIDAN_room_6Tex_004390[] = dHIDAN_room_6Tex_004390; + #define dHIDAN_room_6Tex_004B90 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6Tex_004B90" static const ALIGN_ASSET(2) char HIDAN_room_6Tex_004B90[] = dHIDAN_room_6Tex_004B90; -#define dHIDAN_room_6Tex_003990 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6Tex_003990" -static const ALIGN_ASSET(2) char HIDAN_room_6Tex_003990[] = dHIDAN_room_6Tex_003990; - #define dHIDAN_room_6Tex_005B90 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6Tex_005B90" static const ALIGN_ASSET(2) char HIDAN_room_6Tex_005B90[] = dHIDAN_room_6Tex_005B90; #define dHIDAN_room_6Tex_006390 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6Tex_006390" static const ALIGN_ASSET(2) char HIDAN_room_6Tex_006390[] = dHIDAN_room_6Tex_006390; -#define dHIDAN_room_6DL_001A00 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6DL_001A00" -static const ALIGN_ASSET(2) char HIDAN_room_6DL_001A00[] = dHIDAN_room_6DL_001A00; - #define dHIDAN_room_6Tex_006790 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6Tex_006790" static const ALIGN_ASSET(2) char HIDAN_room_6Tex_006790[] = dHIDAN_room_6Tex_006790; +#define dHIDAN_room_6DL_002B78 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6DL_002B78" +static const ALIGN_ASSET(2) char HIDAN_room_6DL_002B78[] = dHIDAN_room_6DL_002B78; + +#define dHIDAN_room_6DL_001A00 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6DL_001A00" +static const ALIGN_ASSET(2) char HIDAN_room_6DL_001A00[] = dHIDAN_room_6DL_001A00; + #define dHIDAN_room_6DL_001350 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6DL_001350" static const ALIGN_ASSET(2) char HIDAN_room_6DL_001350[] = dHIDAN_room_6DL_001350; -#define dHIDAN_room_6Tex_004390 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6Tex_004390" -static const ALIGN_ASSET(2) char HIDAN_room_6Tex_004390[] = dHIDAN_room_6Tex_004390; - #endif // DUNGEONS_HIDAN_ROOM_6_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_7.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_7.h index 5eac179cd..a904710e5 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_7.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_7.h @@ -3,8 +3,11 @@ #include "align_asset_macro.h" -#define dHIDAN_room_7DL_000C80 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_7DL_000C80" -static const ALIGN_ASSET(2) char HIDAN_room_7DL_000C80[] = dHIDAN_room_7DL_000C80; +#define dHIDAN_room_7Tex_001C48 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_7Tex_001C48" +static const ALIGN_ASSET(2) char HIDAN_room_7Tex_001C48[] = dHIDAN_room_7Tex_001C48; + +#define dHIDAN_room_7Tex_001E48 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_7Tex_001E48" +static const ALIGN_ASSET(2) char HIDAN_room_7Tex_001E48[] = dHIDAN_room_7Tex_001E48; #define dHIDAN_room_7Tex_002648 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_7Tex_002648" static const ALIGN_ASSET(2) char HIDAN_room_7Tex_002648[] = dHIDAN_room_7Tex_002648; @@ -12,14 +15,11 @@ static const ALIGN_ASSET(2) char HIDAN_room_7Tex_002648[] = dHIDAN_room_7Tex_002 #define dHIDAN_room_7Tex_002A48 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_7Tex_002A48" static const ALIGN_ASSET(2) char HIDAN_room_7Tex_002A48[] = dHIDAN_room_7Tex_002A48; +#define dHIDAN_room_7DL_000C80 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_7DL_000C80" +static const ALIGN_ASSET(2) char HIDAN_room_7DL_000C80[] = dHIDAN_room_7DL_000C80; + #define dHIDAN_room_7DL_001948 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_7DL_001948" static const ALIGN_ASSET(2) char HIDAN_room_7DL_001948[] = dHIDAN_room_7DL_001948; -#define dHIDAN_room_7Tex_001E48 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_7Tex_001E48" -static const ALIGN_ASSET(2) char HIDAN_room_7Tex_001E48[] = dHIDAN_room_7Tex_001E48; - -#define dHIDAN_room_7Tex_001C48 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_7Tex_001C48" -static const ALIGN_ASSET(2) char HIDAN_room_7Tex_001C48[] = dHIDAN_room_7Tex_001C48; - #endif // DUNGEONS_HIDAN_ROOM_7_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_8.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_8.h index 21ebac291..920480049 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_8.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_8.h @@ -3,29 +3,44 @@ #include "align_asset_macro.h" -#define dHIDAN_room_8DL_003668 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8DL_003668" -static const ALIGN_ASSET(2) char HIDAN_room_8DL_003668[] = dHIDAN_room_8DL_003668; +#define dHIDAN_room_8Tex_0050D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_0050D8" +static const ALIGN_ASSET(2) char HIDAN_room_8Tex_0050D8[] = dHIDAN_room_8Tex_0050D8; + +#define dHIDAN_room_8Tex_0052D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_0052D8" +static const ALIGN_ASSET(2) char HIDAN_room_8Tex_0052D8[] = dHIDAN_room_8Tex_0052D8; #define dHIDAN_room_8Tex_005AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_005AD8" static const ALIGN_ASSET(2) char HIDAN_room_8Tex_005AD8[] = dHIDAN_room_8Tex_005AD8; -#define dHIDAN_room_8DL_002660 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8DL_002660" -static const ALIGN_ASSET(2) char HIDAN_room_8DL_002660[] = dHIDAN_room_8DL_002660; - -#define dHIDAN_room_8Tex_0092D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_0092D8" -static const ALIGN_ASSET(2) char HIDAN_room_8Tex_0092D8[] = dHIDAN_room_8Tex_0092D8; - -#define dHIDAN_room_8DL_000700 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8DL_000700" -static const ALIGN_ASSET(2) char HIDAN_room_8DL_000700[] = dHIDAN_room_8DL_000700; - #define dHIDAN_room_8Tex_0062D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_0062D8" static const ALIGN_ASSET(2) char HIDAN_room_8Tex_0062D8[] = dHIDAN_room_8Tex_0062D8; +#define dHIDAN_room_8Tex_006AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_006AD8" +static const ALIGN_ASSET(2) char HIDAN_room_8Tex_006AD8[] = dHIDAN_room_8Tex_006AD8; + +#define dHIDAN_room_8Tex_007AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_007AD8" +static const ALIGN_ASSET(2) char HIDAN_room_8Tex_007AD8[] = dHIDAN_room_8Tex_007AD8; + +#define dHIDAN_room_8Tex_0082D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_0082D8" +static const ALIGN_ASSET(2) char HIDAN_room_8Tex_0082D8[] = dHIDAN_room_8Tex_0082D8; + #define dHIDAN_room_8Tex_0086D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_0086D8" static const ALIGN_ASSET(2) char HIDAN_room_8Tex_0086D8[] = dHIDAN_room_8Tex_0086D8; -#define dHIDAN_room_8Tex_0082D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_0082D8" -static const ALIGN_ASSET(2) char HIDAN_room_8Tex_0082D8[] = dHIDAN_room_8Tex_0082D8; +#define dHIDAN_room_8Tex_008AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_008AD8" +static const ALIGN_ASSET(2) char HIDAN_room_8Tex_008AD8[] = dHIDAN_room_8Tex_008AD8; + +#define dHIDAN_room_8Tex_0092D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_0092D8" +static const ALIGN_ASSET(2) char HIDAN_room_8Tex_0092D8[] = dHIDAN_room_8Tex_0092D8; + +#define dHIDAN_room_8DL_003668 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8DL_003668" +static const ALIGN_ASSET(2) char HIDAN_room_8DL_003668[] = dHIDAN_room_8DL_003668; + +#define dHIDAN_room_8DL_002660 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8DL_002660" +static const ALIGN_ASSET(2) char HIDAN_room_8DL_002660[] = dHIDAN_room_8DL_002660; + +#define dHIDAN_room_8DL_000700 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8DL_000700" +static const ALIGN_ASSET(2) char HIDAN_room_8DL_000700[] = dHIDAN_room_8DL_000700; #define dHIDAN_room_8DL_001248 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8DL_001248" static const ALIGN_ASSET(2) char HIDAN_room_8DL_001248[] = dHIDAN_room_8DL_001248; @@ -36,23 +51,8 @@ static const ALIGN_ASSET(2) char HIDAN_room_8DL_001900[] = dHIDAN_room_8DL_00190 #define dHIDAN_room_8DL_002050 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8DL_002050" static const ALIGN_ASSET(2) char HIDAN_room_8DL_002050[] = dHIDAN_room_8DL_002050; -#define dHIDAN_room_8Tex_008AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_008AD8" -static const ALIGN_ASSET(2) char HIDAN_room_8Tex_008AD8[] = dHIDAN_room_8Tex_008AD8; - #define dHIDAN_room_8DL_0047E8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8DL_0047E8" static const ALIGN_ASSET(2) char HIDAN_room_8DL_0047E8[] = dHIDAN_room_8DL_0047E8; -#define dHIDAN_room_8Tex_0052D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_0052D8" -static const ALIGN_ASSET(2) char HIDAN_room_8Tex_0052D8[] = dHIDAN_room_8Tex_0052D8; - -#define dHIDAN_room_8Tex_006AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_006AD8" -static const ALIGN_ASSET(2) char HIDAN_room_8Tex_006AD8[] = dHIDAN_room_8Tex_006AD8; - -#define dHIDAN_room_8Tex_0050D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_0050D8" -static const ALIGN_ASSET(2) char HIDAN_room_8Tex_0050D8[] = dHIDAN_room_8Tex_0050D8; - -#define dHIDAN_room_8Tex_007AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_007AD8" -static const ALIGN_ASSET(2) char HIDAN_room_8Tex_007AD8[] = dHIDAN_room_8Tex_007AD8; - #endif // DUNGEONS_HIDAN_ROOM_8_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_9.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_9.h index 57f2eea69..ceac93cca 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_9.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_9.h @@ -3,20 +3,8 @@ #include "align_asset_macro.h" -#define dHIDAN_room_9DL_002C30 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9DL_002C30" -static const ALIGN_ASSET(2) char HIDAN_room_9DL_002C30[] = dHIDAN_room_9DL_002C30; - -#define dHIDAN_room_9Tex_007768 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_007768" -static const ALIGN_ASSET(2) char HIDAN_room_9Tex_007768[] = dHIDAN_room_9Tex_007768; - -#define dHIDAN_room_9Tex_006F68 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_006F68" -static const ALIGN_ASSET(2) char HIDAN_room_9Tex_006F68[] = dHIDAN_room_9Tex_006F68; - -#define dHIDAN_room_9Tex_006768 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_006768" -static const ALIGN_ASSET(2) char HIDAN_room_9Tex_006768[] = dHIDAN_room_9Tex_006768; - -#define dHIDAN_room_9Tex_005F68 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_005F68" -static const ALIGN_ASSET(2) char HIDAN_room_9Tex_005F68[] = dHIDAN_room_9Tex_005F68; +#define dHIDAN_room_9Tex_004768 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_004768" +static const ALIGN_ASSET(2) char HIDAN_room_9Tex_004768[] = dHIDAN_room_9Tex_004768; #define dHIDAN_room_9Tex_004F68 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_004F68" static const ALIGN_ASSET(2) char HIDAN_room_9Tex_004F68[] = dHIDAN_room_9Tex_004F68; @@ -24,11 +12,23 @@ static const ALIGN_ASSET(2) char HIDAN_room_9Tex_004F68[] = dHIDAN_room_9Tex_004 #define dHIDAN_room_9Tex_005768 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_005768" static const ALIGN_ASSET(2) char HIDAN_room_9Tex_005768[] = dHIDAN_room_9Tex_005768; -#define dHIDAN_room_9Tex_004768 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_004768" -static const ALIGN_ASSET(2) char HIDAN_room_9Tex_004768[] = dHIDAN_room_9Tex_004768; +#define dHIDAN_room_9Tex_005F68 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_005F68" +static const ALIGN_ASSET(2) char HIDAN_room_9Tex_005F68[] = dHIDAN_room_9Tex_005F68; + +#define dHIDAN_room_9Tex_006768 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_006768" +static const ALIGN_ASSET(2) char HIDAN_room_9Tex_006768[] = dHIDAN_room_9Tex_006768; + +#define dHIDAN_room_9Tex_006F68 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_006F68" +static const ALIGN_ASSET(2) char HIDAN_room_9Tex_006F68[] = dHIDAN_room_9Tex_006F68; + +#define dHIDAN_room_9Tex_007768 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_007768" +static const ALIGN_ASSET(2) char HIDAN_room_9Tex_007768[] = dHIDAN_room_9Tex_007768; #define dHIDAN_room_9Tex_007F68 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_007F68" static const ALIGN_ASSET(2) char HIDAN_room_9Tex_007F68[] = dHIDAN_room_9Tex_007F68; +#define dHIDAN_room_9DL_002C30 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9DL_002C30" +static const ALIGN_ASSET(2) char HIDAN_room_9DL_002C30[] = dHIDAN_room_9DL_002C30; + #endif // DUNGEONS_HIDAN_ROOM_9_H diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_scene.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_scene.h index 41ef37126..6b729eab1 100644 --- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_scene.h +++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_scene.h @@ -3,31 +3,32 @@ #include "align_asset_macro.h" -#define dHIDAN_sceneCollisionHeader_01895C "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneCollisionHeader_01895C" -static const ALIGN_ASSET(2) char HIDAN_sceneCollisionHeader_01895C[] = dHIDAN_sceneCollisionHeader_01895C; - -#define dHIDAN_sceneTLUT_018990 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTLUT_018990" -static const ALIGN_ASSET(2) char HIDAN_sceneTLUT_018990[] = dHIDAN_sceneTLUT_018990; - -#define dHIDAN_sceneTex_0195D0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTex_0195D0" -static const ALIGN_ASSET(2) char HIDAN_sceneTex_0195D0[] = dHIDAN_sceneTex_0195D0; - -#define dHIDAN_sceneTex_018DD0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTex_018DD0" -static const ALIGN_ASSET(2) char HIDAN_sceneTex_018DD0[] = dHIDAN_sceneTex_018DD0; +#define dHIDAN_sceneTex_0189D0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTex_0189D0" +static const ALIGN_ASSET(2) char HIDAN_sceneTex_0189D0[] = dHIDAN_sceneTex_0189D0; #define dHIDAN_sceneTex_018BD0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTex_018BD0" static const ALIGN_ASSET(2) char HIDAN_sceneTex_018BD0[] = dHIDAN_sceneTex_018BD0; -#define dHIDAN_sceneTLUT_0189B0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTLUT_0189B0" -static const ALIGN_ASSET(2) char HIDAN_sceneTLUT_0189B0[] = dHIDAN_sceneTLUT_0189B0; +#define dHIDAN_sceneTex_018DD0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTex_018DD0" +static const ALIGN_ASSET(2) char HIDAN_sceneTex_018DD0[] = dHIDAN_sceneTex_018DD0; + +#define dHIDAN_sceneTex_0195D0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTex_0195D0" +static const ALIGN_ASSET(2) char HIDAN_sceneTex_0195D0[] = dHIDAN_sceneTex_0195D0; #define dHIDAN_sceneTex_019DD0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTex_019DD0" static const ALIGN_ASSET(2) char HIDAN_sceneTex_019DD0[] = dHIDAN_sceneTex_019DD0; -#define dHIDAN_sceneTex_0189D0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTex_0189D0" -static const ALIGN_ASSET(2) char HIDAN_sceneTex_0189D0[] = dHIDAN_sceneTex_0189D0; - #define dHIDAN_sceneTex_019FD0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTex_019FD0" static const ALIGN_ASSET(2) char HIDAN_sceneTex_019FD0[] = dHIDAN_sceneTex_019FD0; +#define dHIDAN_sceneTLUT_018990 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTLUT_018990" +static const ALIGN_ASSET(2) char HIDAN_sceneTLUT_018990[] = dHIDAN_sceneTLUT_018990; + +#define dHIDAN_sceneTLUT_0189B0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTLUT_0189B0" +static const ALIGN_ASSET(2) char HIDAN_sceneTLUT_0189B0[] = dHIDAN_sceneTLUT_0189B0; + +#define dHIDAN_sceneCollisionHeader_01895C "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneCollisionHeader_01895C" +static const ALIGN_ASSET(2) char HIDAN_sceneCollisionHeader_01895C[] = dHIDAN_sceneCollisionHeader_01895C; + + #endif // DUNGEONS_HIDAN_SCENE_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_0.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_0.h index b4400b9f4..a1c161762 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_0.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_0.h @@ -3,6 +3,57 @@ #include "align_asset_macro.h" +#define dMIZUsin_room_0Tex_00CDF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00CDF8" +static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00CDF8[] = dMIZUsin_room_0Tex_00CDF8; + +#define dMIZUsin_room_0Tex_00D5F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00D5F8" +static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00D5F8[] = dMIZUsin_room_0Tex_00D5F8; + +#define dMIZUsin_room_0Tex_00DDF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00DDF8" +static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00DDF8[] = dMIZUsin_room_0Tex_00DDF8; + +#define dMIZUsin_room_0Tex_00E5F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00E5F8" +static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00E5F8[] = dMIZUsin_room_0Tex_00E5F8; + +#define dMIZUsin_room_0Tex_00EDF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00EDF8" +static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00EDF8[] = dMIZUsin_room_0Tex_00EDF8; + +#define dMIZUsin_room_0Tex_00F5F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00F5F8" +static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00F5F8[] = dMIZUsin_room_0Tex_00F5F8; + +#define dMIZUsin_room_0Tex_00FDF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00FDF8" +static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00FDF8[] = dMIZUsin_room_0Tex_00FDF8; + +#define dMIZUsin_room_0Tex_0105F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0105F8" +static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0105F8[] = dMIZUsin_room_0Tex_0105F8; + +#define dMIZUsin_room_0Tex_010DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_010DF8" +static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_010DF8[] = dMIZUsin_room_0Tex_010DF8; + +#define dMIZUsin_room_0Tex_0115F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0115F8" +static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0115F8[] = dMIZUsin_room_0Tex_0115F8; + +#define dMIZUsin_room_0Tex_011DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_011DF8" +static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_011DF8[] = dMIZUsin_room_0Tex_011DF8; + +#define dMIZUsin_room_0Tex_0125F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0125F8" +static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0125F8[] = dMIZUsin_room_0Tex_0125F8; + +#define dMIZUsin_room_0Tex_012DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_012DF8" +static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_012DF8[] = dMIZUsin_room_0Tex_012DF8; + +#define dMIZUsin_room_0Tex_0135F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0135F8" +static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0135F8[] = dMIZUsin_room_0Tex_0135F8; + +#define dMIZUsin_room_0Tex_013DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_013DF8" +static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_013DF8[] = dMIZUsin_room_0Tex_013DF8; + +#define dMIZUsin_room_0Tex_0145F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0145F8" +static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0145F8[] = dMIZUsin_room_0Tex_0145F8; + +#define dMIZUsin_room_0Tex_015428 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_015428" +static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_015428[] = dMIZUsin_room_0Tex_015428; + #define dMIZUsin_room_0DL_0051B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_0051B8" static const ALIGN_ASSET(2) char MIZUsin_room_0DL_0051B8[] = dMIZUsin_room_0DL_0051B8; @@ -30,30 +81,18 @@ static const ALIGN_ASSET(2) char MIZUsin_room_0DL_015330[] = dMIZUsin_room_0DL_0 #define dMIZUsin_room_0DL_003E38 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_003E38" static const ALIGN_ASSET(2) char MIZUsin_room_0DL_003E38[] = dMIZUsin_room_0DL_003E38; -#define dMIZUsin_room_0Tex_0125F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0125F8" -static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0125F8[] = dMIZUsin_room_0Tex_0125F8; - #define dMIZUsin_room_0DL_0027C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_0027C8" static const ALIGN_ASSET(2) char MIZUsin_room_0DL_0027C8[] = dMIZUsin_room_0DL_0027C8; -#define dMIZUsin_room_0Tex_00F5F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00F5F8" -static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00F5F8[] = dMIZUsin_room_0Tex_00F5F8; - #define dMIZUsin_room_0DL_015078 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_015078" static const ALIGN_ASSET(2) char MIZUsin_room_0DL_015078[] = dMIZUsin_room_0DL_015078; -#define dMIZUsin_room_0Tex_015428 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_015428" -static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_015428[] = dMIZUsin_room_0Tex_015428; - #define dMIZUsin_room_0DL_014EC0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_014EC0" static const ALIGN_ASSET(2) char MIZUsin_room_0DL_014EC0[] = dMIZUsin_room_0DL_014EC0; #define dMIZUsin_room_0DL_007AC0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_007AC0" static const ALIGN_ASSET(2) char MIZUsin_room_0DL_007AC0[] = dMIZUsin_room_0DL_007AC0; -#define dMIZUsin_room_0Tex_00DDF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00DDF8" -static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00DDF8[] = dMIZUsin_room_0Tex_00DDF8; - #define dMIZUsin_room_0DL_007620 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_007620" static const ALIGN_ASSET(2) char MIZUsin_room_0DL_007620[] = dMIZUsin_room_0DL_007620; @@ -72,27 +111,15 @@ static const ALIGN_ASSET(2) char MIZUsin_room_0DL_007050[] = dMIZUsin_room_0DL_0 #define dMIZUsin_room_0DL_0062E0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_0062E0" static const ALIGN_ASSET(2) char MIZUsin_room_0DL_0062E0[] = dMIZUsin_room_0DL_0062E0; -#define dMIZUsin_room_0Tex_012DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_012DF8" -static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_012DF8[] = dMIZUsin_room_0Tex_012DF8; - #define dMIZUsin_room_0DL_0067C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_0067C8" static const ALIGN_ASSET(2) char MIZUsin_room_0DL_0067C8[] = dMIZUsin_room_0DL_0067C8; -#define dMIZUsin_room_0Tex_00E5F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00E5F8" -static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00E5F8[] = dMIZUsin_room_0Tex_00E5F8; - #define dMIZUsin_room_0DL_006508 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_006508" static const ALIGN_ASSET(2) char MIZUsin_room_0DL_006508[] = dMIZUsin_room_0DL_006508; #define dMIZUsin_room_0DL_0008F0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_0008F0" static const ALIGN_ASSET(2) char MIZUsin_room_0DL_0008F0[] = dMIZUsin_room_0DL_0008F0; -#define dMIZUsin_room_0Tex_00CDF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00CDF8" -static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00CDF8[] = dMIZUsin_room_0Tex_00CDF8; - -#define dMIZUsin_room_0Tex_00D5F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00D5F8" -static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00D5F8[] = dMIZUsin_room_0Tex_00D5F8; - #define dMIZUsin_room_0DL_005428 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_005428" static const ALIGN_ASSET(2) char MIZUsin_room_0DL_005428[] = dMIZUsin_room_0DL_005428; @@ -126,21 +153,12 @@ static const ALIGN_ASSET(2) char MIZUsin_room_0DL_009560[] = dMIZUsin_room_0DL_0 #define dMIZUsin_room_0DL_00CB60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00CB60" static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00CB60[] = dMIZUsin_room_0DL_00CB60; -#define dMIZUsin_room_0Tex_00EDF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00EDF8" -static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00EDF8[] = dMIZUsin_room_0Tex_00EDF8; - #define dMIZUsin_room_0DL_00C180 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00C180" static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00C180[] = dMIZUsin_room_0DL_00C180; -#define dMIZUsin_room_0Tex_011DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_011DF8" -static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_011DF8[] = dMIZUsin_room_0Tex_011DF8; - #define dMIZUsin_room_0DL_00B018 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00B018" static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00B018[] = dMIZUsin_room_0DL_00B018; -#define dMIZUsin_room_0Tex_010DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_010DF8" -static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_010DF8[] = dMIZUsin_room_0Tex_010DF8; - #define dMIZUsin_room_0DL_00B328 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00B328" static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00B328[] = dMIZUsin_room_0DL_00B328; @@ -150,21 +168,12 @@ static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00B730[] = dMIZUsin_room_0DL_0 #define dMIZUsin_room_0DL_00ABB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00ABB8" static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00ABB8[] = dMIZUsin_room_0DL_00ABB8; -#define dMIZUsin_room_0Tex_00FDF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00FDF8" -static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00FDF8[] = dMIZUsin_room_0Tex_00FDF8; - #define dMIZUsin_room_0DL_00BCC8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00BCC8" static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00BCC8[] = dMIZUsin_room_0DL_00BCC8; -#define dMIZUsin_room_0Tex_0115F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0115F8" -static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0115F8[] = dMIZUsin_room_0Tex_0115F8; - #define dMIZUsin_room_0DL_00A550 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00A550" static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00A550[] = dMIZUsin_room_0DL_00A550; -#define dMIZUsin_room_0Tex_0105F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0105F8" -static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0105F8[] = dMIZUsin_room_0Tex_0105F8; - #define dMIZUsin_room_0DL_001D70 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_001D70" static const ALIGN_ASSET(2) char MIZUsin_room_0DL_001D70[] = dMIZUsin_room_0DL_001D70; @@ -174,20 +183,11 @@ static const ALIGN_ASSET(2) char MIZUsin_room_0DL_004D90[] = dMIZUsin_room_0DL_0 #define dMIZUsin_room_0DL_00C5D8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00C5D8" static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00C5D8[] = dMIZUsin_room_0DL_00C5D8; -#define dMIZUsin_room_0Tex_013DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_013DF8" -static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_013DF8[] = dMIZUsin_room_0Tex_013DF8; - #define dMIZUsin_room_0DL_00C840 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00C840" static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00C840[] = dMIZUsin_room_0DL_00C840; -#define dMIZUsin_room_0Tex_0135F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0135F8" -static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0135F8[] = dMIZUsin_room_0Tex_0135F8; - #define dMIZUsin_room_0DL_009D60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_009D60" static const ALIGN_ASSET(2) char MIZUsin_room_0DL_009D60[] = dMIZUsin_room_0DL_009D60; -#define dMIZUsin_room_0Tex_0145F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0145F8" -static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0145F8[] = dMIZUsin_room_0Tex_0145F8; - #endif // DUNGEONS_MIZUSIN_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_1.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_1.h index 0d57dedd4..9594569cd 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_1.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_1.h @@ -3,6 +3,33 @@ #include "align_asset_macro.h" +#define dMIZUsin_room_1Tex_0059D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0059D0" +static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0059D0[] = dMIZUsin_room_1Tex_0059D0; + +#define dMIZUsin_room_1Tex_0061D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0061D0" +static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0061D0[] = dMIZUsin_room_1Tex_0061D0; + +#define dMIZUsin_room_1Tex_0069D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0069D0" +static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0069D0[] = dMIZUsin_room_1Tex_0069D0; + +#define dMIZUsin_room_1Tex_0071D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0071D0" +static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0071D0[] = dMIZUsin_room_1Tex_0071D0; + +#define dMIZUsin_room_1Tex_0079D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0079D0" +static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0079D0[] = dMIZUsin_room_1Tex_0079D0; + +#define dMIZUsin_room_1Tex_0081D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0081D0" +static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0081D0[] = dMIZUsin_room_1Tex_0081D0; + +#define dMIZUsin_room_1Tex_0089D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0089D0" +static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0089D0[] = dMIZUsin_room_1Tex_0089D0; + +#define dMIZUsin_room_1Tex_0091D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0091D0" +static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0091D0[] = dMIZUsin_room_1Tex_0091D0; + +#define dMIZUsin_room_1Tex_0099D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0099D0" +static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0099D0[] = dMIZUsin_room_1Tex_0099D0; + #define dMIZUsin_room_1DL_003D70 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_003D70" static const ALIGN_ASSET(2) char MIZUsin_room_1DL_003D70[] = dMIZUsin_room_1DL_003D70; @@ -12,54 +39,27 @@ static const ALIGN_ASSET(2) char MIZUsin_room_1DL_005818[] = dMIZUsin_room_1DL_0 #define dMIZUsin_room_1DL_004B18 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_004B18" static const ALIGN_ASSET(2) char MIZUsin_room_1DL_004B18[] = dMIZUsin_room_1DL_004B18; -#define dMIZUsin_room_1Tex_0089D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0089D0" -static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0089D0[] = dMIZUsin_room_1Tex_0089D0; - #define dMIZUsin_room_1DL_003888 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_003888" static const ALIGN_ASSET(2) char MIZUsin_room_1DL_003888[] = dMIZUsin_room_1DL_003888; -#define dMIZUsin_room_1Tex_0069D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0069D0" -static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0069D0[] = dMIZUsin_room_1Tex_0069D0; - #define dMIZUsin_room_1DL_0045D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_0045D0" static const ALIGN_ASSET(2) char MIZUsin_room_1DL_0045D0[] = dMIZUsin_room_1DL_0045D0; -#define dMIZUsin_room_1Tex_0071D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0071D0" -static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0071D0[] = dMIZUsin_room_1Tex_0071D0; - #define dMIZUsin_room_1DL_003030 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_003030" static const ALIGN_ASSET(2) char MIZUsin_room_1DL_003030[] = dMIZUsin_room_1DL_003030; -#define dMIZUsin_room_1Tex_0079D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0079D0" -static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0079D0[] = dMIZUsin_room_1Tex_0079D0; - #define dMIZUsin_room_1DL_002C40 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_002C40" static const ALIGN_ASSET(2) char MIZUsin_room_1DL_002C40[] = dMIZUsin_room_1DL_002C40; -#define dMIZUsin_room_1Tex_0091D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0091D0" -static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0091D0[] = dMIZUsin_room_1Tex_0091D0; - #define dMIZUsin_room_1DL_004DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_004DF8" static const ALIGN_ASSET(2) char MIZUsin_room_1DL_004DF8[] = dMIZUsin_room_1DL_004DF8; -#define dMIZUsin_room_1Tex_0059D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0059D0" -static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0059D0[] = dMIZUsin_room_1Tex_0059D0; - -#define dMIZUsin_room_1Tex_0061D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0061D0" -static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0061D0[] = dMIZUsin_room_1Tex_0061D0; - #define dMIZUsin_room_1DL_005050 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_005050" static const ALIGN_ASSET(2) char MIZUsin_room_1DL_005050[] = dMIZUsin_room_1DL_005050; -#define dMIZUsin_room_1Tex_0099D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0099D0" -static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0099D0[] = dMIZUsin_room_1Tex_0099D0; - #define dMIZUsin_room_1DL_001F20 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_001F20" static const ALIGN_ASSET(2) char MIZUsin_room_1DL_001F20[] = dMIZUsin_room_1DL_001F20; -#define dMIZUsin_room_1Tex_0081D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0081D0" -static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0081D0[] = dMIZUsin_room_1Tex_0081D0; - #define dMIZUsin_room_1DL_0028D8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_0028D8" static const ALIGN_ASSET(2) char MIZUsin_room_1DL_0028D8[] = dMIZUsin_room_1DL_0028D8; diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_10.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_10.h index 3731303d2..bef89d909 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_10.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_10.h @@ -3,30 +3,30 @@ #include "align_asset_macro.h" +#define dMIZUsin_room_10Tex_003870 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10Tex_003870" +static const ALIGN_ASSET(2) char MIZUsin_room_10Tex_003870[] = dMIZUsin_room_10Tex_003870; + +#define dMIZUsin_room_10Tex_004070 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10Tex_004070" +static const ALIGN_ASSET(2) char MIZUsin_room_10Tex_004070[] = dMIZUsin_room_10Tex_004070; + +#define dMIZUsin_room_10Tex_004870 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10Tex_004870" +static const ALIGN_ASSET(2) char MIZUsin_room_10Tex_004870[] = dMIZUsin_room_10Tex_004870; + +#define dMIZUsin_room_10Tex_005070 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10Tex_005070" +static const ALIGN_ASSET(2) char MIZUsin_room_10Tex_005070[] = dMIZUsin_room_10Tex_005070; + +#define dMIZUsin_room_10Tex_005870 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10Tex_005870" +static const ALIGN_ASSET(2) char MIZUsin_room_10Tex_005870[] = dMIZUsin_room_10Tex_005870; + #define dMIZUsin_room_10DL_001B80 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10DL_001B80" static const ALIGN_ASSET(2) char MIZUsin_room_10DL_001B80[] = dMIZUsin_room_10DL_001B80; #define dMIZUsin_room_10DL_000FE0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10DL_000FE0" static const ALIGN_ASSET(2) char MIZUsin_room_10DL_000FE0[] = dMIZUsin_room_10DL_000FE0; -#define dMIZUsin_room_10Tex_004870 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10Tex_004870" -static const ALIGN_ASSET(2) char MIZUsin_room_10Tex_004870[] = dMIZUsin_room_10Tex_004870; - -#define dMIZUsin_room_10Tex_005870 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10Tex_005870" -static const ALIGN_ASSET(2) char MIZUsin_room_10Tex_005870[] = dMIZUsin_room_10Tex_005870; - -#define dMIZUsin_room_10Tex_005070 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10Tex_005070" -static const ALIGN_ASSET(2) char MIZUsin_room_10Tex_005070[] = dMIZUsin_room_10Tex_005070; - -#define dMIZUsin_room_10Tex_004070 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10Tex_004070" -static const ALIGN_ASSET(2) char MIZUsin_room_10Tex_004070[] = dMIZUsin_room_10Tex_004070; - #define dMIZUsin_room_10DL_003298 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10DL_003298" static const ALIGN_ASSET(2) char MIZUsin_room_10DL_003298[] = dMIZUsin_room_10DL_003298; -#define dMIZUsin_room_10Tex_003870 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10Tex_003870" -static const ALIGN_ASSET(2) char MIZUsin_room_10Tex_003870[] = dMIZUsin_room_10Tex_003870; - #define dMIZUsin_room_10DL_001E60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10DL_001E60" static const ALIGN_ASSET(2) char MIZUsin_room_10DL_001E60[] = dMIZUsin_room_10DL_001E60; diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_11.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_11.h index d7aa9a0bf..81dccfd81 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_11.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_11.h @@ -3,15 +3,6 @@ #include "align_asset_macro.h" -#define dMIZUsin_room_11DL_001580 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_11DL_001580" -static const ALIGN_ASSET(2) char MIZUsin_room_11DL_001580[] = dMIZUsin_room_11DL_001580; - -#define dMIZUsin_room_11Tex_003A20 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_11Tex_003A20" -static const ALIGN_ASSET(2) char MIZUsin_room_11Tex_003A20[] = dMIZUsin_room_11Tex_003A20; - -#define dMIZUsin_room_11Tex_004220 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_11Tex_004220" -static const ALIGN_ASSET(2) char MIZUsin_room_11Tex_004220[] = dMIZUsin_room_11Tex_004220; - #define dMIZUsin_room_11Tex_002220 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_11Tex_002220" static const ALIGN_ASSET(2) char MIZUsin_room_11Tex_002220[] = dMIZUsin_room_11Tex_002220; @@ -21,5 +12,14 @@ static const ALIGN_ASSET(2) char MIZUsin_room_11Tex_002A20[] = dMIZUsin_room_11T #define dMIZUsin_room_11Tex_003220 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_11Tex_003220" static const ALIGN_ASSET(2) char MIZUsin_room_11Tex_003220[] = dMIZUsin_room_11Tex_003220; +#define dMIZUsin_room_11Tex_003A20 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_11Tex_003A20" +static const ALIGN_ASSET(2) char MIZUsin_room_11Tex_003A20[] = dMIZUsin_room_11Tex_003A20; + +#define dMIZUsin_room_11Tex_004220 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_11Tex_004220" +static const ALIGN_ASSET(2) char MIZUsin_room_11Tex_004220[] = dMIZUsin_room_11Tex_004220; + +#define dMIZUsin_room_11DL_001580 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_11DL_001580" +static const ALIGN_ASSET(2) char MIZUsin_room_11DL_001580[] = dMIZUsin_room_11DL_001580; + #endif // DUNGEONS_MIZUSIN_ROOM_11_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_12.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_12.h index 2ed26b79e..3d8db9a6b 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_12.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_12.h @@ -3,42 +3,42 @@ #include "align_asset_macro.h" +#define dMIZUsin_room_12Tex_0039C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_0039C8" +static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_0039C8[] = dMIZUsin_room_12Tex_0039C8; + +#define dMIZUsin_room_12Tex_0041C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_0041C8" +static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_0041C8[] = dMIZUsin_room_12Tex_0041C8; + +#define dMIZUsin_room_12Tex_0049C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_0049C8" +static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_0049C8[] = dMIZUsin_room_12Tex_0049C8; + +#define dMIZUsin_room_12Tex_0051C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_0051C8" +static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_0051C8[] = dMIZUsin_room_12Tex_0051C8; + +#define dMIZUsin_room_12Tex_006628 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_006628" +static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_006628[] = dMIZUsin_room_12Tex_006628; + #define dMIZUsin_room_12DL_0024F0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12DL_0024F0" static const ALIGN_ASSET(2) char MIZUsin_room_12DL_0024F0[] = dMIZUsin_room_12DL_0024F0; #define dMIZUsin_room_12DL_0035A8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12DL_0035A8" static const ALIGN_ASSET(2) char MIZUsin_room_12DL_0035A8[] = dMIZUsin_room_12DL_0035A8; -#define dMIZUsin_room_12Tex_0051C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_0051C8" -static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_0051C8[] = dMIZUsin_room_12Tex_0051C8; - #define dMIZUsin_room_12DL_002D30 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12DL_002D30" static const ALIGN_ASSET(2) char MIZUsin_room_12DL_002D30[] = dMIZUsin_room_12DL_002D30; -#define dMIZUsin_room_12Tex_0039C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_0039C8" -static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_0039C8[] = dMIZUsin_room_12Tex_0039C8; - #define dMIZUsin_room_12DL_0061C0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12DL_0061C0" static const ALIGN_ASSET(2) char MIZUsin_room_12DL_0061C0[] = dMIZUsin_room_12DL_0061C0; -#define dMIZUsin_room_12Tex_006628 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_006628" -static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_006628[] = dMIZUsin_room_12Tex_006628; - #define dMIZUsin_room_12DL_006518 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12DL_006518" static const ALIGN_ASSET(2) char MIZUsin_room_12DL_006518[] = dMIZUsin_room_12DL_006518; #define dMIZUsin_room_12DL_000DF0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12DL_000DF0" static const ALIGN_ASSET(2) char MIZUsin_room_12DL_000DF0[] = dMIZUsin_room_12DL_000DF0; -#define dMIZUsin_room_12Tex_0041C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_0041C8" -static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_0041C8[] = dMIZUsin_room_12Tex_0041C8; - #define dMIZUsin_room_12DL_002F68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12DL_002F68" static const ALIGN_ASSET(2) char MIZUsin_room_12DL_002F68[] = dMIZUsin_room_12DL_002F68; -#define dMIZUsin_room_12Tex_0049C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_0049C8" -static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_0049C8[] = dMIZUsin_room_12Tex_0049C8; - #define dMIZUsin_room_12DL_000AC8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12DL_000AC8" static const ALIGN_ASSET(2) char MIZUsin_room_12DL_000AC8[] = dMIZUsin_room_12DL_000AC8; diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_13.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_13.h index a185aef22..b674f2065 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_13.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_13.h @@ -3,11 +3,11 @@ #include "align_asset_macro.h" -#define dMIZUsin_room_13DL_000130 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_13DL_000130" -static const ALIGN_ASSET(2) char MIZUsin_room_13DL_000130[] = dMIZUsin_room_13DL_000130; - #define dMIZUsin_room_13Tex_0001F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_13Tex_0001F8" static const ALIGN_ASSET(2) char MIZUsin_room_13Tex_0001F8[] = dMIZUsin_room_13Tex_0001F8; +#define dMIZUsin_room_13DL_000130 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_13DL_000130" +static const ALIGN_ASSET(2) char MIZUsin_room_13DL_000130[] = dMIZUsin_room_13DL_000130; + #endif // DUNGEONS_MIZUSIN_ROOM_13_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_14.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_14.h index 077589b46..652d159e2 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_14.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_14.h @@ -3,14 +3,14 @@ #include "align_asset_macro.h" -#define dMIZUsin_room_14DL_0009E0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14DL_0009E0" -static const ALIGN_ASSET(2) char MIZUsin_room_14DL_0009E0[] = dMIZUsin_room_14DL_0009E0; +#define dMIZUsin_room_14Tex_003680 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_003680" +static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_003680[] = dMIZUsin_room_14Tex_003680; -#define dMIZUsin_room_14DL_002548 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14DL_002548" -static const ALIGN_ASSET(2) char MIZUsin_room_14DL_002548[] = dMIZUsin_room_14DL_002548; +#define dMIZUsin_room_14Tex_003E80 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_003E80" +static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_003E80[] = dMIZUsin_room_14Tex_003E80; -#define dMIZUsin_room_14Tex_006680 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_006680" -static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_006680[] = dMIZUsin_room_14Tex_006680; +#define dMIZUsin_room_14Tex_004680 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_004680" +static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_004680[] = dMIZUsin_room_14Tex_004680; #define dMIZUsin_room_14Tex_004E80 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_004E80" static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_004E80[] = dMIZUsin_room_14Tex_004E80; @@ -18,27 +18,27 @@ static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_004E80[] = dMIZUsin_room_14T #define dMIZUsin_room_14Tex_005680 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_005680" static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_005680[] = dMIZUsin_room_14Tex_005680; -#define dMIZUsin_room_14Tex_004680 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_004680" -static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_004680[] = dMIZUsin_room_14Tex_004680; +#define dMIZUsin_room_14Tex_005E80 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_005E80" +static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_005E80[] = dMIZUsin_room_14Tex_005E80; + +#define dMIZUsin_room_14Tex_006680 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_006680" +static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_006680[] = dMIZUsin_room_14Tex_006680; + +#define dMIZUsin_room_14DL_0009E0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14DL_0009E0" +static const ALIGN_ASSET(2) char MIZUsin_room_14DL_0009E0[] = dMIZUsin_room_14DL_0009E0; + +#define dMIZUsin_room_14DL_002548 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14DL_002548" +static const ALIGN_ASSET(2) char MIZUsin_room_14DL_002548[] = dMIZUsin_room_14DL_002548; #define dMIZUsin_room_14DL_000FB0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14DL_000FB0" static const ALIGN_ASSET(2) char MIZUsin_room_14DL_000FB0[] = dMIZUsin_room_14DL_000FB0; -#define dMIZUsin_room_14Tex_003E80 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_003E80" -static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_003E80[] = dMIZUsin_room_14Tex_003E80; - #define dMIZUsin_room_14DL_003520 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14DL_003520" static const ALIGN_ASSET(2) char MIZUsin_room_14DL_003520[] = dMIZUsin_room_14DL_003520; -#define dMIZUsin_room_14Tex_005E80 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_005E80" -static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_005E80[] = dMIZUsin_room_14Tex_005E80; - #define dMIZUsin_room_14DL_000E38 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14DL_000E38" static const ALIGN_ASSET(2) char MIZUsin_room_14DL_000E38[] = dMIZUsin_room_14DL_000E38; -#define dMIZUsin_room_14Tex_003680 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_003680" -static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_003680[] = dMIZUsin_room_14Tex_003680; - #define dMIZUsin_room_14DL_000C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14DL_000C68" static const ALIGN_ASSET(2) char MIZUsin_room_14DL_000C68[] = dMIZUsin_room_14DL_000C68; diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_15.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_15.h index 70f65104c..77a20854a 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_15.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_15.h @@ -3,20 +3,20 @@ #include "align_asset_macro.h" -#define dMIZUsin_room_15DL_001990 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15DL_001990" -static const ALIGN_ASSET(2) char MIZUsin_room_15DL_001990[] = dMIZUsin_room_15DL_001990; +#define dMIZUsin_room_15Tex_002C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_002C68" +static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_002C68[] = dMIZUsin_room_15Tex_002C68; -#define dMIZUsin_room_15Tex_006C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_006C68" -static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_006C68[] = dMIZUsin_room_15Tex_006C68; +#define dMIZUsin_room_15Tex_003468 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_003468" +static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_003468[] = dMIZUsin_room_15Tex_003468; -#define dMIZUsin_room_15Tex_006468 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_006468" -static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_006468[] = dMIZUsin_room_15Tex_006468; +#define dMIZUsin_room_15Tex_003C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_003C68" +static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_003C68[] = dMIZUsin_room_15Tex_003C68; #define dMIZUsin_room_15Tex_004468 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_004468" static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_004468[] = dMIZUsin_room_15Tex_004468; -#define dMIZUsin_room_15Tex_003468 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_003468" -static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_003468[] = dMIZUsin_room_15Tex_003468; +#define dMIZUsin_room_15Tex_004C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_004C68" +static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_004C68[] = dMIZUsin_room_15Tex_004C68; #define dMIZUsin_room_15Tex_005468 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_005468" static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_005468[] = dMIZUsin_room_15Tex_005468; @@ -24,17 +24,17 @@ static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_005468[] = dMIZUsin_room_15T #define dMIZUsin_room_15Tex_005C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_005C68" static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_005C68[] = dMIZUsin_room_15Tex_005C68; -#define dMIZUsin_room_15Tex_004C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_004C68" -static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_004C68[] = dMIZUsin_room_15Tex_004C68; +#define dMIZUsin_room_15Tex_006468 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_006468" +static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_006468[] = dMIZUsin_room_15Tex_006468; -#define dMIZUsin_room_15Tex_003C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_003C68" -static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_003C68[] = dMIZUsin_room_15Tex_003C68; +#define dMIZUsin_room_15Tex_006C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_006C68" +static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_006C68[] = dMIZUsin_room_15Tex_006C68; + +#define dMIZUsin_room_15DL_001990 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15DL_001990" +static const ALIGN_ASSET(2) char MIZUsin_room_15DL_001990[] = dMIZUsin_room_15DL_001990; #define dMIZUsin_room_15DL_002B98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15DL_002B98" static const ALIGN_ASSET(2) char MIZUsin_room_15DL_002B98[] = dMIZUsin_room_15DL_002B98; -#define dMIZUsin_room_15Tex_002C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_002C68" -static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_002C68[] = dMIZUsin_room_15Tex_002C68; - #endif // DUNGEONS_MIZUSIN_ROOM_15_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_16.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_16.h index 0833a30ea..9354caa0a 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_16.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_16.h @@ -3,23 +3,23 @@ #include "align_asset_macro.h" -#define dMIZUsin_room_16DL_000D50 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_16DL_000D50" -static const ALIGN_ASSET(2) char MIZUsin_room_16DL_000D50[] = dMIZUsin_room_16DL_000D50; - -#define dMIZUsin_room_16Tex_002330 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_16Tex_002330" -static const ALIGN_ASSET(2) char MIZUsin_room_16Tex_002330[] = dMIZUsin_room_16Tex_002330; - #define dMIZUsin_room_16Tex_001330 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_16Tex_001330" static const ALIGN_ASSET(2) char MIZUsin_room_16Tex_001330[] = dMIZUsin_room_16Tex_001330; #define dMIZUsin_room_16Tex_001B30 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_16Tex_001B30" static const ALIGN_ASSET(2) char MIZUsin_room_16Tex_001B30[] = dMIZUsin_room_16Tex_001B30; -#define dMIZUsin_room_16Tex_003330 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_16Tex_003330" -static const ALIGN_ASSET(2) char MIZUsin_room_16Tex_003330[] = dMIZUsin_room_16Tex_003330; +#define dMIZUsin_room_16Tex_002330 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_16Tex_002330" +static const ALIGN_ASSET(2) char MIZUsin_room_16Tex_002330[] = dMIZUsin_room_16Tex_002330; #define dMIZUsin_room_16Tex_002B30 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_16Tex_002B30" static const ALIGN_ASSET(2) char MIZUsin_room_16Tex_002B30[] = dMIZUsin_room_16Tex_002B30; +#define dMIZUsin_room_16Tex_003330 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_16Tex_003330" +static const ALIGN_ASSET(2) char MIZUsin_room_16Tex_003330[] = dMIZUsin_room_16Tex_003330; + +#define dMIZUsin_room_16DL_000D50 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_16DL_000D50" +static const ALIGN_ASSET(2) char MIZUsin_room_16DL_000D50[] = dMIZUsin_room_16DL_000D50; + #endif // DUNGEONS_MIZUSIN_ROOM_16_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_17.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_17.h index 99c13d5fc..fddca359d 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_17.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_17.h @@ -3,6 +3,24 @@ #include "align_asset_macro.h" +#define dMIZUsin_room_17Tex_005AA8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_005AA8" +static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_005AA8[] = dMIZUsin_room_17Tex_005AA8; + +#define dMIZUsin_room_17Tex_0062A8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_0062A8" +static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_0062A8[] = dMIZUsin_room_17Tex_0062A8; + +#define dMIZUsin_room_17Tex_006AA8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_006AA8" +static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_006AA8[] = dMIZUsin_room_17Tex_006AA8; + +#define dMIZUsin_room_17Tex_0072A8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_0072A8" +static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_0072A8[] = dMIZUsin_room_17Tex_0072A8; + +#define dMIZUsin_room_17Tex_007AA8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_007AA8" +static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_007AA8[] = dMIZUsin_room_17Tex_007AA8; + +#define dMIZUsin_room_17Tex_0082A8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_0082A8" +static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_0082A8[] = dMIZUsin_room_17Tex_0082A8; + #define dMIZUsin_room_17DL_003458 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17DL_003458" static const ALIGN_ASSET(2) char MIZUsin_room_17DL_003458[] = dMIZUsin_room_17DL_003458; @@ -12,33 +30,15 @@ static const ALIGN_ASSET(2) char MIZUsin_room_17DL_0041C8[] = dMIZUsin_room_17DL #define dMIZUsin_room_17DL_001010 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17DL_001010" static const ALIGN_ASSET(2) char MIZUsin_room_17DL_001010[] = dMIZUsin_room_17DL_001010; -#define dMIZUsin_room_17Tex_006AA8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_006AA8" -static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_006AA8[] = dMIZUsin_room_17Tex_006AA8; - -#define dMIZUsin_room_17Tex_007AA8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_007AA8" -static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_007AA8[] = dMIZUsin_room_17Tex_007AA8; - -#define dMIZUsin_room_17Tex_0072A8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_0072A8" -static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_0072A8[] = dMIZUsin_room_17Tex_0072A8; - -#define dMIZUsin_room_17Tex_0082A8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_0082A8" -static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_0082A8[] = dMIZUsin_room_17Tex_0082A8; - #define dMIZUsin_room_17DL_005928 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17DL_005928" static const ALIGN_ASSET(2) char MIZUsin_room_17DL_005928[] = dMIZUsin_room_17DL_005928; #define dMIZUsin_room_17DL_0056E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17DL_0056E8" static const ALIGN_ASSET(2) char MIZUsin_room_17DL_0056E8[] = dMIZUsin_room_17DL_0056E8; -#define dMIZUsin_room_17Tex_005AA8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_005AA8" -static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_005AA8[] = dMIZUsin_room_17Tex_005AA8; - #define dMIZUsin_room_17DL_0016E0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17DL_0016E0" static const ALIGN_ASSET(2) char MIZUsin_room_17DL_0016E0[] = dMIZUsin_room_17DL_0016E0; -#define dMIZUsin_room_17Tex_0062A8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_0062A8" -static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_0062A8[] = dMIZUsin_room_17Tex_0062A8; - #define dMIZUsin_room_17DL_001910 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17DL_001910" static const ALIGN_ASSET(2) char MIZUsin_room_17DL_001910[] = dMIZUsin_room_17DL_001910; diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_18.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_18.h index 47eef912b..3a4ef2d1d 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_18.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_18.h @@ -3,41 +3,41 @@ #include "align_asset_macro.h" +#define dMIZUsin_room_18Tex_0018F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18Tex_0018F8" +static const ALIGN_ASSET(2) char MIZUsin_room_18Tex_0018F8[] = dMIZUsin_room_18Tex_0018F8; + +#define dMIZUsin_room_18Tex_0020F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18Tex_0020F8" +static const ALIGN_ASSET(2) char MIZUsin_room_18Tex_0020F8[] = dMIZUsin_room_18Tex_0020F8; + +#define dMIZUsin_room_18Tex_0028F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18Tex_0028F8" +static const ALIGN_ASSET(2) char MIZUsin_room_18Tex_0028F8[] = dMIZUsin_room_18Tex_0028F8; + +#define dMIZUsin_room_18Tex_0030F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18Tex_0030F8" +static const ALIGN_ASSET(2) char MIZUsin_room_18Tex_0030F8[] = dMIZUsin_room_18Tex_0030F8; + +#define dMIZUsin_room_18Tex_0038F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18Tex_0038F8" +static const ALIGN_ASSET(2) char MIZUsin_room_18Tex_0038F8[] = dMIZUsin_room_18Tex_0038F8; + #define dMIZUsin_room_18DL_0006B0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18DL_0006B0" static const ALIGN_ASSET(2) char MIZUsin_room_18DL_0006B0[] = dMIZUsin_room_18DL_0006B0; #define dMIZUsin_room_18DL_000240 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18DL_000240" static const ALIGN_ASSET(2) char MIZUsin_room_18DL_000240[] = dMIZUsin_room_18DL_000240; -#define dMIZUsin_room_18Tex_0018F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18Tex_0018F8" -static const ALIGN_ASSET(2) char MIZUsin_room_18Tex_0018F8[] = dMIZUsin_room_18Tex_0018F8; - #define dMIZUsin_room_18DL_0008F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18DL_0008F8" static const ALIGN_ASSET(2) char MIZUsin_room_18DL_0008F8[] = dMIZUsin_room_18DL_0008F8; -#define dMIZUsin_room_18Tex_0020F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18Tex_0020F8" -static const ALIGN_ASSET(2) char MIZUsin_room_18Tex_0020F8[] = dMIZUsin_room_18Tex_0020F8; - #define dMIZUsin_room_18DL_000B38 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18DL_000B38" static const ALIGN_ASSET(2) char MIZUsin_room_18DL_000B38[] = dMIZUsin_room_18DL_000B38; #define dMIZUsin_room_18DL_0011A0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18DL_0011A0" static const ALIGN_ASSET(2) char MIZUsin_room_18DL_0011A0[] = dMIZUsin_room_18DL_0011A0; -#define dMIZUsin_room_18Tex_0030F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18Tex_0030F8" -static const ALIGN_ASSET(2) char MIZUsin_room_18Tex_0030F8[] = dMIZUsin_room_18Tex_0030F8; - #define dMIZUsin_room_18DL_000E00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18DL_000E00" static const ALIGN_ASSET(2) char MIZUsin_room_18DL_000E00[] = dMIZUsin_room_18DL_000E00; -#define dMIZUsin_room_18Tex_0028F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18Tex_0028F8" -static const ALIGN_ASSET(2) char MIZUsin_room_18Tex_0028F8[] = dMIZUsin_room_18Tex_0028F8; - #define dMIZUsin_room_18DL_001740 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18DL_001740" static const ALIGN_ASSET(2) char MIZUsin_room_18DL_001740[] = dMIZUsin_room_18DL_001740; -#define dMIZUsin_room_18Tex_0038F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18Tex_0038F8" -static const ALIGN_ASSET(2) char MIZUsin_room_18Tex_0038F8[] = dMIZUsin_room_18Tex_0038F8; - #endif // DUNGEONS_MIZUSIN_ROOM_18_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_19.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_19.h index 58cb59dd8..22a87a626 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_19.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_19.h @@ -3,9 +3,6 @@ #include "align_asset_macro.h" -#define dMIZUsin_room_19DL_000D00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_19DL_000D00" -static const ALIGN_ASSET(2) char MIZUsin_room_19DL_000D00[] = dMIZUsin_room_19DL_000D00; - #define dMIZUsin_room_19Tex_001130 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_19Tex_001130" static const ALIGN_ASSET(2) char MIZUsin_room_19Tex_001130[] = dMIZUsin_room_19Tex_001130; @@ -21,5 +18,8 @@ static const ALIGN_ASSET(2) char MIZUsin_room_19Tex_002930[] = dMIZUsin_room_19T #define dMIZUsin_room_19Tex_003130 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_19Tex_003130" static const ALIGN_ASSET(2) char MIZUsin_room_19Tex_003130[] = dMIZUsin_room_19Tex_003130; +#define dMIZUsin_room_19DL_000D00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_19DL_000D00" +static const ALIGN_ASSET(2) char MIZUsin_room_19DL_000D00[] = dMIZUsin_room_19DL_000D00; + #endif // DUNGEONS_MIZUSIN_ROOM_19_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_2.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_2.h index c3e1eaf87..362f0d433 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_2.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_2.h @@ -3,33 +3,33 @@ #include "align_asset_macro.h" +#define dMIZUsin_room_2Tex_002AB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_002AB8" +static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_002AB8[] = dMIZUsin_room_2Tex_002AB8; + +#define dMIZUsin_room_2Tex_0032B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_0032B8" +static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_0032B8[] = dMIZUsin_room_2Tex_0032B8; + +#define dMIZUsin_room_2Tex_003AB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_003AB8" +static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_003AB8[] = dMIZUsin_room_2Tex_003AB8; + +#define dMIZUsin_room_2Tex_0042B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_0042B8" +static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_0042B8[] = dMIZUsin_room_2Tex_0042B8; + +#define dMIZUsin_room_2Tex_004AB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_004AB8" +static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_004AB8[] = dMIZUsin_room_2Tex_004AB8; + +#define dMIZUsin_room_2Tex_005488 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_005488" +static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_005488[] = dMIZUsin_room_2Tex_005488; + #define dMIZUsin_room_2DL_0028A0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2DL_0028A0" static const ALIGN_ASSET(2) char MIZUsin_room_2DL_0028A0[] = dMIZUsin_room_2DL_0028A0; #define dMIZUsin_room_2DL_001428 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2DL_001428" static const ALIGN_ASSET(2) char MIZUsin_room_2DL_001428[] = dMIZUsin_room_2DL_001428; -#define dMIZUsin_room_2Tex_004AB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_004AB8" -static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_004AB8[] = dMIZUsin_room_2Tex_004AB8; - -#define dMIZUsin_room_2Tex_003AB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_003AB8" -static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_003AB8[] = dMIZUsin_room_2Tex_003AB8; - -#define dMIZUsin_room_2Tex_002AB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_002AB8" -static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_002AB8[] = dMIZUsin_room_2Tex_002AB8; - -#define dMIZUsin_room_2Tex_0042B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_0042B8" -static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_0042B8[] = dMIZUsin_room_2Tex_0042B8; - -#define dMIZUsin_room_2Tex_0032B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_0032B8" -static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_0032B8[] = dMIZUsin_room_2Tex_0032B8; - #define dMIZUsin_room_2DL_005380 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2DL_005380" static const ALIGN_ASSET(2) char MIZUsin_room_2DL_005380[] = dMIZUsin_room_2DL_005380; -#define dMIZUsin_room_2Tex_005488 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_005488" -static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_005488[] = dMIZUsin_room_2Tex_005488; - #define dMIZUsin_room_2DL_0004E0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2DL_0004E0" static const ALIGN_ASSET(2) char MIZUsin_room_2DL_0004E0[] = dMIZUsin_room_2DL_0004E0; diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_20.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_20.h index e3236ac82..1a989e899 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_20.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_20.h @@ -3,27 +3,39 @@ #include "align_asset_macro.h" +#define dMIZUsin_room_20Tex_003040 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_003040" +static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_003040[] = dMIZUsin_room_20Tex_003040; + +#define dMIZUsin_room_20Tex_003840 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_003840" +static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_003840[] = dMIZUsin_room_20Tex_003840; + +#define dMIZUsin_room_20Tex_004040 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_004040" +static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_004040[] = dMIZUsin_room_20Tex_004040; + +#define dMIZUsin_room_20Tex_004840 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_004840" +static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_004840[] = dMIZUsin_room_20Tex_004840; + +#define dMIZUsin_room_20Tex_005040 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_005040" +static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_005040[] = dMIZUsin_room_20Tex_005040; + +#define dMIZUsin_room_20Tex_005840 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_005840" +static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_005840[] = dMIZUsin_room_20Tex_005840; + +#define dMIZUsin_room_20Tex_006040 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_006040" +static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_006040[] = dMIZUsin_room_20Tex_006040; + #define dMIZUsin_room_20DL_0018B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20DL_0018B8" static const ALIGN_ASSET(2) char MIZUsin_room_20DL_0018B8[] = dMIZUsin_room_20DL_0018B8; #define dMIZUsin_room_20DL_0006E0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20DL_0006E0" static const ALIGN_ASSET(2) char MIZUsin_room_20DL_0006E0[] = dMIZUsin_room_20DL_0006E0; -#define dMIZUsin_room_20Tex_004840 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_004840" -static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_004840[] = dMIZUsin_room_20Tex_004840; - #define dMIZUsin_room_20DL_002ED8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20DL_002ED8" static const ALIGN_ASSET(2) char MIZUsin_room_20DL_002ED8[] = dMIZUsin_room_20DL_002ED8; -#define dMIZUsin_room_20Tex_004040 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_004040" -static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_004040[] = dMIZUsin_room_20Tex_004040; - #define dMIZUsin_room_20DL_002B30 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20DL_002B30" static const ALIGN_ASSET(2) char MIZUsin_room_20DL_002B30[] = dMIZUsin_room_20DL_002B30; -#define dMIZUsin_room_20Tex_003840 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_003840" -static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_003840[] = dMIZUsin_room_20Tex_003840; - #define dMIZUsin_room_20DL_000BA0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20DL_000BA0" static const ALIGN_ASSET(2) char MIZUsin_room_20DL_000BA0[] = dMIZUsin_room_20DL_000BA0; @@ -33,26 +45,14 @@ static const ALIGN_ASSET(2) char MIZUsin_room_20DL_002980[] = dMIZUsin_room_20DL #define dMIZUsin_room_20DL_0026D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20DL_0026D0" static const ALIGN_ASSET(2) char MIZUsin_room_20DL_0026D0[] = dMIZUsin_room_20DL_0026D0; -#define dMIZUsin_room_20Tex_005840 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_005840" -static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_005840[] = dMIZUsin_room_20Tex_005840; - #define dMIZUsin_room_20DL_001D48 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20DL_001D48" static const ALIGN_ASSET(2) char MIZUsin_room_20DL_001D48[] = dMIZUsin_room_20DL_001D48; -#define dMIZUsin_room_20Tex_005040 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_005040" -static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_005040[] = dMIZUsin_room_20Tex_005040; - #define dMIZUsin_room_20DL_0022D8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20DL_0022D8" static const ALIGN_ASSET(2) char MIZUsin_room_20DL_0022D8[] = dMIZUsin_room_20DL_0022D8; -#define dMIZUsin_room_20Tex_006040 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_006040" -static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_006040[] = dMIZUsin_room_20Tex_006040; - #define dMIZUsin_room_20DL_002CB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20DL_002CB8" static const ALIGN_ASSET(2) char MIZUsin_room_20DL_002CB8[] = dMIZUsin_room_20DL_002CB8; -#define dMIZUsin_room_20Tex_003040 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_003040" -static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_003040[] = dMIZUsin_room_20Tex_003040; - #endif // DUNGEONS_MIZUSIN_ROOM_20_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_21.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_21.h index 92e908ed3..c89c37208 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_21.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_21.h @@ -3,39 +3,39 @@ #include "align_asset_macro.h" +#define dMIZUsin_room_21Tex_004360 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21Tex_004360" +static const ALIGN_ASSET(2) char MIZUsin_room_21Tex_004360[] = dMIZUsin_room_21Tex_004360; + +#define dMIZUsin_room_21Tex_004B60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21Tex_004B60" +static const ALIGN_ASSET(2) char MIZUsin_room_21Tex_004B60[] = dMIZUsin_room_21Tex_004B60; + +#define dMIZUsin_room_21Tex_005360 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21Tex_005360" +static const ALIGN_ASSET(2) char MIZUsin_room_21Tex_005360[] = dMIZUsin_room_21Tex_005360; + +#define dMIZUsin_room_21Tex_005B60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21Tex_005B60" +static const ALIGN_ASSET(2) char MIZUsin_room_21Tex_005B60[] = dMIZUsin_room_21Tex_005B60; + +#define dMIZUsin_room_21Tex_006CA0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21Tex_006CA0" +static const ALIGN_ASSET(2) char MIZUsin_room_21Tex_006CA0[] = dMIZUsin_room_21Tex_006CA0; + #define dMIZUsin_room_21DL_0003E0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21DL_0003E0" static const ALIGN_ASSET(2) char MIZUsin_room_21DL_0003E0[] = dMIZUsin_room_21DL_0003E0; #define dMIZUsin_room_21DL_003CD8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21DL_003CD8" static const ALIGN_ASSET(2) char MIZUsin_room_21DL_003CD8[] = dMIZUsin_room_21DL_003CD8; -#define dMIZUsin_room_21Tex_005360 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21Tex_005360" -static const ALIGN_ASSET(2) char MIZUsin_room_21Tex_005360[] = dMIZUsin_room_21Tex_005360; - #define dMIZUsin_room_21DL_006A40 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21DL_006A40" static const ALIGN_ASSET(2) char MIZUsin_room_21DL_006A40[] = dMIZUsin_room_21DL_006A40; -#define dMIZUsin_room_21Tex_006CA0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21Tex_006CA0" -static const ALIGN_ASSET(2) char MIZUsin_room_21Tex_006CA0[] = dMIZUsin_room_21Tex_006CA0; - #define dMIZUsin_room_21DL_002D40 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21DL_002D40" static const ALIGN_ASSET(2) char MIZUsin_room_21DL_002D40[] = dMIZUsin_room_21DL_002D40; -#define dMIZUsin_room_21Tex_004360 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21Tex_004360" -static const ALIGN_ASSET(2) char MIZUsin_room_21Tex_004360[] = dMIZUsin_room_21Tex_004360; - #define dMIZUsin_room_21DL_004228 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21DL_004228" static const ALIGN_ASSET(2) char MIZUsin_room_21DL_004228[] = dMIZUsin_room_21DL_004228; -#define dMIZUsin_room_21Tex_005B60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21Tex_005B60" -static const ALIGN_ASSET(2) char MIZUsin_room_21Tex_005B60[] = dMIZUsin_room_21Tex_005B60; - #define dMIZUsin_room_21DL_004018 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21DL_004018" static const ALIGN_ASSET(2) char MIZUsin_room_21DL_004018[] = dMIZUsin_room_21DL_004018; -#define dMIZUsin_room_21Tex_004B60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21Tex_004B60" -static const ALIGN_ASSET(2) char MIZUsin_room_21Tex_004B60[] = dMIZUsin_room_21Tex_004B60; - #define dMIZUsin_room_21DL_003A70 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21DL_003A70" static const ALIGN_ASSET(2) char MIZUsin_room_21DL_003A70[] = dMIZUsin_room_21DL_003A70; diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_22.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_22.h index 0fc1a10b5..7bab9f20c 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_22.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_22.h @@ -3,65 +3,65 @@ #include "align_asset_macro.h" -#define dMIZUsin_room_22DL_002E40 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_002E40" -static const ALIGN_ASSET(2) char MIZUsin_room_22DL_002E40[] = dMIZUsin_room_22DL_002E40; - -#define dMIZUsin_room_22Tex_0068E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0068E8" -static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0068E8[] = dMIZUsin_room_22Tex_0068E8; - -#define dMIZUsin_room_22DL_003E08 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_003E08" -static const ALIGN_ASSET(2) char MIZUsin_room_22DL_003E08[] = dMIZUsin_room_22DL_003E08; - -#define dMIZUsin_room_22Tex_0060E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0060E8" -static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0060E8[] = dMIZUsin_room_22Tex_0060E8; - -#define dMIZUsin_room_22DL_0040C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_0040C8" -static const ALIGN_ASSET(2) char MIZUsin_room_22DL_0040C8[] = dMIZUsin_room_22DL_0040C8; - -#define dMIZUsin_room_22Tex_0058E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0058E8" -static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0058E8[] = dMIZUsin_room_22Tex_0058E8; - -#define dMIZUsin_room_22DL_004370 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_004370" -static const ALIGN_ASSET(2) char MIZUsin_room_22DL_004370[] = dMIZUsin_room_22DL_004370; - -#define dMIZUsin_room_22Tex_0050E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0050E8" -static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0050E8[] = dMIZUsin_room_22Tex_0050E8; - -#define dMIZUsin_room_22DL_0033A0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_0033A0" -static const ALIGN_ASSET(2) char MIZUsin_room_22DL_0033A0[] = dMIZUsin_room_22DL_0033A0; - -#define dMIZUsin_room_22Tex_0080E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0080E8" -static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0080E8[] = dMIZUsin_room_22Tex_0080E8; - -#define dMIZUsin_room_22DL_002B18 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_002B18" -static const ALIGN_ASSET(2) char MIZUsin_room_22DL_002B18[] = dMIZUsin_room_22DL_002B18; +#define dMIZUsin_room_22Tex_0044E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0044E8" +static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0044E8[] = dMIZUsin_room_22Tex_0044E8; #define dMIZUsin_room_22Tex_0048E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0048E8" static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0048E8[] = dMIZUsin_room_22Tex_0048E8; -#define dMIZUsin_room_22DL_000380 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_000380" -static const ALIGN_ASSET(2) char MIZUsin_room_22DL_000380[] = dMIZUsin_room_22DL_000380; +#define dMIZUsin_room_22Tex_0050E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0050E8" +static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0050E8[] = dMIZUsin_room_22Tex_0050E8; -#define dMIZUsin_room_22Tex_0044E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0044E8" -static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0044E8[] = dMIZUsin_room_22Tex_0044E8; +#define dMIZUsin_room_22Tex_0058E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0058E8" +static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0058E8[] = dMIZUsin_room_22Tex_0058E8; -#define dMIZUsin_room_22DL_003778 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_003778" -static const ALIGN_ASSET(2) char MIZUsin_room_22DL_003778[] = dMIZUsin_room_22DL_003778; +#define dMIZUsin_room_22Tex_0060E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0060E8" +static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0060E8[] = dMIZUsin_room_22Tex_0060E8; -#define dMIZUsin_room_22Tex_0078E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0078E8" -static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0078E8[] = dMIZUsin_room_22Tex_0078E8; - -#define dMIZUsin_room_22DL_0006D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_0006D0" -static const ALIGN_ASSET(2) char MIZUsin_room_22DL_0006D0[] = dMIZUsin_room_22DL_0006D0; - -#define dMIZUsin_room_22Tex_0088E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0088E8" -static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0088E8[] = dMIZUsin_room_22Tex_0088E8; - -#define dMIZUsin_room_22DL_0020C0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_0020C0" -static const ALIGN_ASSET(2) char MIZUsin_room_22DL_0020C0[] = dMIZUsin_room_22DL_0020C0; +#define dMIZUsin_room_22Tex_0068E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0068E8" +static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0068E8[] = dMIZUsin_room_22Tex_0068E8; #define dMIZUsin_room_22Tex_0070E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0070E8" static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0070E8[] = dMIZUsin_room_22Tex_0070E8; +#define dMIZUsin_room_22Tex_0078E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0078E8" +static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0078E8[] = dMIZUsin_room_22Tex_0078E8; + +#define dMIZUsin_room_22Tex_0080E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0080E8" +static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0080E8[] = dMIZUsin_room_22Tex_0080E8; + +#define dMIZUsin_room_22Tex_0088E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0088E8" +static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0088E8[] = dMIZUsin_room_22Tex_0088E8; + +#define dMIZUsin_room_22DL_002E40 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_002E40" +static const ALIGN_ASSET(2) char MIZUsin_room_22DL_002E40[] = dMIZUsin_room_22DL_002E40; + +#define dMIZUsin_room_22DL_003E08 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_003E08" +static const ALIGN_ASSET(2) char MIZUsin_room_22DL_003E08[] = dMIZUsin_room_22DL_003E08; + +#define dMIZUsin_room_22DL_0040C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_0040C8" +static const ALIGN_ASSET(2) char MIZUsin_room_22DL_0040C8[] = dMIZUsin_room_22DL_0040C8; + +#define dMIZUsin_room_22DL_004370 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_004370" +static const ALIGN_ASSET(2) char MIZUsin_room_22DL_004370[] = dMIZUsin_room_22DL_004370; + +#define dMIZUsin_room_22DL_0033A0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_0033A0" +static const ALIGN_ASSET(2) char MIZUsin_room_22DL_0033A0[] = dMIZUsin_room_22DL_0033A0; + +#define dMIZUsin_room_22DL_002B18 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_002B18" +static const ALIGN_ASSET(2) char MIZUsin_room_22DL_002B18[] = dMIZUsin_room_22DL_002B18; + +#define dMIZUsin_room_22DL_000380 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_000380" +static const ALIGN_ASSET(2) char MIZUsin_room_22DL_000380[] = dMIZUsin_room_22DL_000380; + +#define dMIZUsin_room_22DL_003778 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_003778" +static const ALIGN_ASSET(2) char MIZUsin_room_22DL_003778[] = dMIZUsin_room_22DL_003778; + +#define dMIZUsin_room_22DL_0006D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_0006D0" +static const ALIGN_ASSET(2) char MIZUsin_room_22DL_0006D0[] = dMIZUsin_room_22DL_0006D0; + +#define dMIZUsin_room_22DL_0020C0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_0020C0" +static const ALIGN_ASSET(2) char MIZUsin_room_22DL_0020C0[] = dMIZUsin_room_22DL_0020C0; + #endif // DUNGEONS_MIZUSIN_ROOM_22_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_3.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_3.h index d7b6b4650..22f77644b 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_3.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_3.h @@ -3,6 +3,24 @@ #include "align_asset_macro.h" +#define dMIZUsin_room_3Tex_0037B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3Tex_0037B8" +static const ALIGN_ASSET(2) char MIZUsin_room_3Tex_0037B8[] = dMIZUsin_room_3Tex_0037B8; + +#define dMIZUsin_room_3Tex_003FB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3Tex_003FB8" +static const ALIGN_ASSET(2) char MIZUsin_room_3Tex_003FB8[] = dMIZUsin_room_3Tex_003FB8; + +#define dMIZUsin_room_3Tex_0047B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3Tex_0047B8" +static const ALIGN_ASSET(2) char MIZUsin_room_3Tex_0047B8[] = dMIZUsin_room_3Tex_0047B8; + +#define dMIZUsin_room_3Tex_004FB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3Tex_004FB8" +static const ALIGN_ASSET(2) char MIZUsin_room_3Tex_004FB8[] = dMIZUsin_room_3Tex_004FB8; + +#define dMIZUsin_room_3Tex_0057B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3Tex_0057B8" +static const ALIGN_ASSET(2) char MIZUsin_room_3Tex_0057B8[] = dMIZUsin_room_3Tex_0057B8; + +#define dMIZUsin_room_3Tex_005FB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3Tex_005FB8" +static const ALIGN_ASSET(2) char MIZUsin_room_3Tex_005FB8[] = dMIZUsin_room_3Tex_005FB8; + #define dMIZUsin_room_3DL_0007F0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3DL_0007F0" static const ALIGN_ASSET(2) char MIZUsin_room_3DL_0007F0[] = dMIZUsin_room_3DL_0007F0; @@ -12,30 +30,12 @@ static const ALIGN_ASSET(2) char MIZUsin_room_3DL_0012B0[] = dMIZUsin_room_3DL_0 #define dMIZUsin_room_3DL_0030D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3DL_0030D0" static const ALIGN_ASSET(2) char MIZUsin_room_3DL_0030D0[] = dMIZUsin_room_3DL_0030D0; -#define dMIZUsin_room_3Tex_0037B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3Tex_0037B8" -static const ALIGN_ASSET(2) char MIZUsin_room_3Tex_0037B8[] = dMIZUsin_room_3Tex_0037B8; - -#define dMIZUsin_room_3Tex_0057B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3Tex_0057B8" -static const ALIGN_ASSET(2) char MIZUsin_room_3Tex_0057B8[] = dMIZUsin_room_3Tex_0057B8; - -#define dMIZUsin_room_3Tex_003FB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3Tex_003FB8" -static const ALIGN_ASSET(2) char MIZUsin_room_3Tex_003FB8[] = dMIZUsin_room_3Tex_003FB8; - -#define dMIZUsin_room_3Tex_004FB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3Tex_004FB8" -static const ALIGN_ASSET(2) char MIZUsin_room_3Tex_004FB8[] = dMIZUsin_room_3Tex_004FB8; - -#define dMIZUsin_room_3Tex_005FB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3Tex_005FB8" -static const ALIGN_ASSET(2) char MIZUsin_room_3Tex_005FB8[] = dMIZUsin_room_3Tex_005FB8; - #define dMIZUsin_room_3DL_002190 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3DL_002190" static const ALIGN_ASSET(2) char MIZUsin_room_3DL_002190[] = dMIZUsin_room_3DL_002190; #define dMIZUsin_room_3DL_0003C0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3DL_0003C0" static const ALIGN_ASSET(2) char MIZUsin_room_3DL_0003C0[] = dMIZUsin_room_3DL_0003C0; -#define dMIZUsin_room_3Tex_0047B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3Tex_0047B8" -static const ALIGN_ASSET(2) char MIZUsin_room_3Tex_0047B8[] = dMIZUsin_room_3Tex_0047B8; - #define dMIZUsin_room_3DL_001658 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3DL_001658" static const ALIGN_ASSET(2) char MIZUsin_room_3DL_001658[] = dMIZUsin_room_3DL_001658; diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_4.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_4.h index 73e796c54..d1f8f39dd 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_4.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_4.h @@ -3,41 +3,41 @@ #include "align_asset_macro.h" +#define dMIZUsin_room_4Tex_002820 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_002820" +static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_002820[] = dMIZUsin_room_4Tex_002820; + +#define dMIZUsin_room_4Tex_003020 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_003020" +static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_003020[] = dMIZUsin_room_4Tex_003020; + +#define dMIZUsin_room_4Tex_003820 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_003820" +static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_003820[] = dMIZUsin_room_4Tex_003820; + +#define dMIZUsin_room_4Tex_004020 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_004020" +static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_004020[] = dMIZUsin_room_4Tex_004020; + +#define dMIZUsin_room_4Tex_004820 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_004820" +static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_004820[] = dMIZUsin_room_4Tex_004820; + +#define dMIZUsin_room_4Tex_005020 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_005020" +static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_005020[] = dMIZUsin_room_4Tex_005020; + +#define dMIZUsin_room_4Tex_005820 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_005820" +static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_005820[] = dMIZUsin_room_4Tex_005820; + #define dMIZUsin_room_4DL_000780 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4DL_000780" static const ALIGN_ASSET(2) char MIZUsin_room_4DL_000780[] = dMIZUsin_room_4DL_000780; #define dMIZUsin_room_4DL_0023A0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4DL_0023A0" static const ALIGN_ASSET(2) char MIZUsin_room_4DL_0023A0[] = dMIZUsin_room_4DL_0023A0; -#define dMIZUsin_room_4Tex_004820 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_004820" -static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_004820[] = dMIZUsin_room_4Tex_004820; - -#define dMIZUsin_room_4Tex_005820 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_005820" -static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_005820[] = dMIZUsin_room_4Tex_005820; - -#define dMIZUsin_room_4Tex_005020 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_005020" -static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_005020[] = dMIZUsin_room_4Tex_005020; - -#define dMIZUsin_room_4Tex_004020 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_004020" -static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_004020[] = dMIZUsin_room_4Tex_004020; - -#define dMIZUsin_room_4Tex_003020 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_003020" -static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_003020[] = dMIZUsin_room_4Tex_003020; - #define dMIZUsin_room_4DL_0016C0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4DL_0016C0" static const ALIGN_ASSET(2) char MIZUsin_room_4DL_0016C0[] = dMIZUsin_room_4DL_0016C0; -#define dMIZUsin_room_4Tex_002820 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_002820" -static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_002820[] = dMIZUsin_room_4Tex_002820; - #define dMIZUsin_room_4DL_000AD8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4DL_000AD8" static const ALIGN_ASSET(2) char MIZUsin_room_4DL_000AD8[] = dMIZUsin_room_4DL_000AD8; #define dMIZUsin_room_4DL_001370 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4DL_001370" static const ALIGN_ASSET(2) char MIZUsin_room_4DL_001370[] = dMIZUsin_room_4DL_001370; -#define dMIZUsin_room_4Tex_003820 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_003820" -static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_003820[] = dMIZUsin_room_4Tex_003820; - #endif // DUNGEONS_MIZUSIN_ROOM_4_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_5.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_5.h index 9badd3e10..4557dcfc8 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_5.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_5.h @@ -3,60 +3,60 @@ #include "align_asset_macro.h" -#define dMIZUsin_room_5DL_0014D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5DL_0014D0" -static const ALIGN_ASSET(2) char MIZUsin_room_5DL_0014D0[] = dMIZUsin_room_5DL_0014D0; - -#define dMIZUsin_room_5Tex_006A48 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_006A48" -static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_006A48[] = dMIZUsin_room_5Tex_006A48; - -#define dMIZUsin_room_5Tex_005A48 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_005A48" -static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_005A48[] = dMIZUsin_room_5Tex_005A48; - -#define dMIZUsin_room_5Tex_004A48 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_004A48" -static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_004A48[] = dMIZUsin_room_5Tex_004A48; - -#define dMIZUsin_room_5Tex_006248 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_006248" -static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_006248[] = dMIZUsin_room_5Tex_006248; - -#define dMIZUsin_room_5DL_0008E0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5DL_0008E0" -static const ALIGN_ASSET(2) char MIZUsin_room_5DL_0008E0[] = dMIZUsin_room_5DL_0008E0; - -#define dMIZUsin_room_5Tex_005248 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_005248" -static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_005248[] = dMIZUsin_room_5Tex_005248; - -#define dMIZUsin_room_5DL_009CB0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5DL_009CB0" -static const ALIGN_ASSET(2) char MIZUsin_room_5DL_009CB0[] = dMIZUsin_room_5DL_009CB0; - -#define dMIZUsin_room_5Tex_009E38 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_009E38" -static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_009E38[] = dMIZUsin_room_5Tex_009E38; - -#define dMIZUsin_room_5DL_002610 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5DL_002610" -static const ALIGN_ASSET(2) char MIZUsin_room_5DL_002610[] = dMIZUsin_room_5DL_002610; - -#define dMIZUsin_room_5Tex_009248 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_009248" -static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_009248[] = dMIZUsin_room_5Tex_009248; - -#define dMIZUsin_room_5Tex_008A48 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_008A48" -static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_008A48[] = dMIZUsin_room_5Tex_008A48; - -#define dMIZUsin_room_5Tex_008248 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_008248" -static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_008248[] = dMIZUsin_room_5Tex_008248; - -#define dMIZUsin_room_5Tex_007A48 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_007A48" -static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_007A48[] = dMIZUsin_room_5Tex_007A48; - -#define dMIZUsin_room_5DL_003470 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5DL_003470" -static const ALIGN_ASSET(2) char MIZUsin_room_5DL_003470[] = dMIZUsin_room_5DL_003470; - -#define dMIZUsin_room_5Tex_007248 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_007248" -static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_007248[] = dMIZUsin_room_5Tex_007248; - #define dMIZUsin_room_5Tex_003A48 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_003A48" static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_003A48[] = dMIZUsin_room_5Tex_003A48; #define dMIZUsin_room_5Tex_004248 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_004248" static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_004248[] = dMIZUsin_room_5Tex_004248; +#define dMIZUsin_room_5Tex_004A48 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_004A48" +static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_004A48[] = dMIZUsin_room_5Tex_004A48; + +#define dMIZUsin_room_5Tex_005248 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_005248" +static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_005248[] = dMIZUsin_room_5Tex_005248; + +#define dMIZUsin_room_5Tex_005A48 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_005A48" +static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_005A48[] = dMIZUsin_room_5Tex_005A48; + +#define dMIZUsin_room_5Tex_006248 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_006248" +static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_006248[] = dMIZUsin_room_5Tex_006248; + +#define dMIZUsin_room_5Tex_006A48 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_006A48" +static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_006A48[] = dMIZUsin_room_5Tex_006A48; + +#define dMIZUsin_room_5Tex_007248 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_007248" +static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_007248[] = dMIZUsin_room_5Tex_007248; + +#define dMIZUsin_room_5Tex_007A48 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_007A48" +static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_007A48[] = dMIZUsin_room_5Tex_007A48; + +#define dMIZUsin_room_5Tex_008248 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_008248" +static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_008248[] = dMIZUsin_room_5Tex_008248; + +#define dMIZUsin_room_5Tex_008A48 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_008A48" +static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_008A48[] = dMIZUsin_room_5Tex_008A48; + +#define dMIZUsin_room_5Tex_009248 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_009248" +static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_009248[] = dMIZUsin_room_5Tex_009248; + +#define dMIZUsin_room_5Tex_009E38 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_009E38" +static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_009E38[] = dMIZUsin_room_5Tex_009E38; + +#define dMIZUsin_room_5DL_0014D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5DL_0014D0" +static const ALIGN_ASSET(2) char MIZUsin_room_5DL_0014D0[] = dMIZUsin_room_5DL_0014D0; + +#define dMIZUsin_room_5DL_0008E0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5DL_0008E0" +static const ALIGN_ASSET(2) char MIZUsin_room_5DL_0008E0[] = dMIZUsin_room_5DL_0008E0; + +#define dMIZUsin_room_5DL_009CB0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5DL_009CB0" +static const ALIGN_ASSET(2) char MIZUsin_room_5DL_009CB0[] = dMIZUsin_room_5DL_009CB0; + +#define dMIZUsin_room_5DL_002610 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5DL_002610" +static const ALIGN_ASSET(2) char MIZUsin_room_5DL_002610[] = dMIZUsin_room_5DL_002610; + +#define dMIZUsin_room_5DL_003470 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5DL_003470" +static const ALIGN_ASSET(2) char MIZUsin_room_5DL_003470[] = dMIZUsin_room_5DL_003470; + #define dMIZUsin_room_5DL_0004C0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5DL_0004C0" static const ALIGN_ASSET(2) char MIZUsin_room_5DL_0004C0[] = dMIZUsin_room_5DL_0004C0; diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_6.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_6.h index c0b44487a..f22a4e9cd 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_6.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_6.h @@ -3,11 +3,35 @@ #include "align_asset_macro.h" -#define dMIZUsin_room_6DL_0047E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6DL_0047E8" -static const ALIGN_ASSET(2) char MIZUsin_room_6DL_0047E8[] = dMIZUsin_room_6DL_0047E8; +#define dMIZUsin_room_6Tex_005100 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_005100" +static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_005100[] = dMIZUsin_room_6Tex_005100; -#define dMIZUsin_room_6DL_002908 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6DL_002908" -static const ALIGN_ASSET(2) char MIZUsin_room_6DL_002908[] = dMIZUsin_room_6DL_002908; +#define dMIZUsin_room_6Tex_005300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_005300" +static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_005300[] = dMIZUsin_room_6Tex_005300; + +#define dMIZUsin_room_6Tex_005B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_005B00" +static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_005B00[] = dMIZUsin_room_6Tex_005B00; + +#define dMIZUsin_room_6Tex_006300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006300" +static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006300[] = dMIZUsin_room_6Tex_006300; + +#define dMIZUsin_room_6Tex_006500 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006500" +static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006500[] = dMIZUsin_room_6Tex_006500; + +#define dMIZUsin_room_6Tex_006700 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006700" +static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006700[] = dMIZUsin_room_6Tex_006700; + +#define dMIZUsin_room_6Tex_006900 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006900" +static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006900[] = dMIZUsin_room_6Tex_006900; + +#define dMIZUsin_room_6Tex_006B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006B00" +static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006B00[] = dMIZUsin_room_6Tex_006B00; + +#define dMIZUsin_room_6Tex_007300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_007300" +static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_007300[] = dMIZUsin_room_6Tex_007300; + +#define dMIZUsin_room_6Tex_007B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_007B00" +static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_007B00[] = dMIZUsin_room_6Tex_007B00; #define dMIZUsin_room_6Tex_008300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_008300" static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_008300[] = dMIZUsin_room_6Tex_008300; @@ -15,57 +39,33 @@ static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_008300[] = dMIZUsin_room_6Tex #define dMIZUsin_room_6Tex_008B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_008B00" static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_008B00[] = dMIZUsin_room_6Tex_008B00; +#define dMIZUsin_room_6Tex_009300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_009300" +static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_009300[] = dMIZUsin_room_6Tex_009300; + +#define dMIZUsin_room_6Tex_009B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_009B00" +static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_009B00[] = dMIZUsin_room_6Tex_009B00; + #define dMIZUsin_room_6Tex_00A300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_00A300" static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_00A300[] = dMIZUsin_room_6Tex_00A300; #define dMIZUsin_room_6Tex_00AB00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_00AB00" static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_00AB00[] = dMIZUsin_room_6Tex_00AB00; -#define dMIZUsin_room_6Tex_005300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_005300" -static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_005300[] = dMIZUsin_room_6Tex_005300; +#define dMIZUsin_room_6DL_0047E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6DL_0047E8" +static const ALIGN_ASSET(2) char MIZUsin_room_6DL_0047E8[] = dMIZUsin_room_6DL_0047E8; -#define dMIZUsin_room_6Tex_007B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_007B00" -static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_007B00[] = dMIZUsin_room_6Tex_007B00; - -#define dMIZUsin_room_6Tex_007300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_007300" -static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_007300[] = dMIZUsin_room_6Tex_007300; - -#define dMIZUsin_room_6Tex_009B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_009B00" -static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_009B00[] = dMIZUsin_room_6Tex_009B00; - -#define dMIZUsin_room_6Tex_009300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_009300" -static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_009300[] = dMIZUsin_room_6Tex_009300; - -#define dMIZUsin_room_6Tex_005B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_005B00" -static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_005B00[] = dMIZUsin_room_6Tex_005B00; +#define dMIZUsin_room_6DL_002908 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6DL_002908" +static const ALIGN_ASSET(2) char MIZUsin_room_6DL_002908[] = dMIZUsin_room_6DL_002908; #define dMIZUsin_room_6DL_0014D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6DL_0014D0" static const ALIGN_ASSET(2) char MIZUsin_room_6DL_0014D0[] = dMIZUsin_room_6DL_0014D0; -#define dMIZUsin_room_6Tex_006300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006300" -static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006300[] = dMIZUsin_room_6Tex_006300; - -#define dMIZUsin_room_6Tex_006700 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006700" -static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006700[] = dMIZUsin_room_6Tex_006700; - -#define dMIZUsin_room_6Tex_006500 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006500" -static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006500[] = dMIZUsin_room_6Tex_006500; - -#define dMIZUsin_room_6Tex_005100 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_005100" -static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_005100[] = dMIZUsin_room_6Tex_005100; - -#define dMIZUsin_room_6Tex_006900 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006900" -static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006900[] = dMIZUsin_room_6Tex_006900; - #define dMIZUsin_room_6DL_003450 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6DL_003450" static const ALIGN_ASSET(2) char MIZUsin_room_6DL_003450[] = dMIZUsin_room_6DL_003450; #define dMIZUsin_room_6DL_003898 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6DL_003898" static const ALIGN_ASSET(2) char MIZUsin_room_6DL_003898[] = dMIZUsin_room_6DL_003898; -#define dMIZUsin_room_6Tex_006B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006B00" -static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006B00[] = dMIZUsin_room_6Tex_006B00; - #define dMIZUsin_room_6DL_003D08 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6DL_003D08" static const ALIGN_ASSET(2) char MIZUsin_room_6DL_003D08[] = dMIZUsin_room_6DL_003D08; diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_7.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_7.h index 88b8e506c..1d35c87c6 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_7.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_7.h @@ -3,8 +3,17 @@ #include "align_asset_macro.h" -#define dMIZUsin_room_7DL_0014B0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7DL_0014B0" -static const ALIGN_ASSET(2) char MIZUsin_room_7DL_0014B0[] = dMIZUsin_room_7DL_0014B0; +#define dMIZUsin_room_7Tex_002560 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_002560" +static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_002560[] = dMIZUsin_room_7Tex_002560; + +#define dMIZUsin_room_7Tex_002D60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_002D60" +static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_002D60[] = dMIZUsin_room_7Tex_002D60; + +#define dMIZUsin_room_7Tex_003560 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_003560" +static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_003560[] = dMIZUsin_room_7Tex_003560; + +#define dMIZUsin_room_7Tex_003D60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_003D60" +static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_003D60[] = dMIZUsin_room_7Tex_003D60; #define dMIZUsin_room_7Tex_004560 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_004560" static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_004560[] = dMIZUsin_room_7Tex_004560; @@ -12,20 +21,11 @@ static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_004560[] = dMIZUsin_room_7Tex #define dMIZUsin_room_7Tex_004D60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_004D60" static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_004D60[] = dMIZUsin_room_7Tex_004D60; -#define dMIZUsin_room_7Tex_003D60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_003D60" -static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_003D60[] = dMIZUsin_room_7Tex_003D60; - -#define dMIZUsin_room_7Tex_002560 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_002560" -static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_002560[] = dMIZUsin_room_7Tex_002560; - -#define dMIZUsin_room_7Tex_003560 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_003560" -static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_003560[] = dMIZUsin_room_7Tex_003560; +#define dMIZUsin_room_7DL_0014B0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7DL_0014B0" +static const ALIGN_ASSET(2) char MIZUsin_room_7DL_0014B0[] = dMIZUsin_room_7DL_0014B0; #define dMIZUsin_room_7DL_002440 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7DL_002440" static const ALIGN_ASSET(2) char MIZUsin_room_7DL_002440[] = dMIZUsin_room_7DL_002440; -#define dMIZUsin_room_7Tex_002D60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_002D60" -static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_002D60[] = dMIZUsin_room_7Tex_002D60; - #endif // DUNGEONS_MIZUSIN_ROOM_7_H diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_8.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_8.h index f87f427db..ac1af9f06 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_8.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_8.h @@ -3,111 +3,111 @@ #include "align_asset_macro.h" +#define dMIZUsin_room_8Tex_005D98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_005D98" +static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_005D98[] = dMIZUsin_room_8Tex_005D98; + +#define dMIZUsin_room_8Tex_005F98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_005F98" +static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_005F98[] = dMIZUsin_room_8Tex_005F98; + +#define dMIZUsin_room_8Tex_006198 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_006198" +static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_006198[] = dMIZUsin_room_8Tex_006198; + +#define dMIZUsin_room_8Tex_006998 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_006998" +static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_006998[] = dMIZUsin_room_8Tex_006998; + +#define dMIZUsin_room_8Tex_007198 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_007198" +static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_007198[] = dMIZUsin_room_8Tex_007198; + +#define dMIZUsin_room_8Tex_007398 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_007398" +static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_007398[] = dMIZUsin_room_8Tex_007398; + +#define dMIZUsin_room_8Tex_007598 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_007598" +static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_007598[] = dMIZUsin_room_8Tex_007598; + +#define dMIZUsin_room_8Tex_007D98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_007D98" +static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_007D98[] = dMIZUsin_room_8Tex_007D98; + +#define dMIZUsin_room_8Tex_008598 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_008598" +static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_008598[] = dMIZUsin_room_8Tex_008598; + +#define dMIZUsin_room_8Tex_008D98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_008D98" +static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_008D98[] = dMIZUsin_room_8Tex_008D98; + +#define dMIZUsin_room_8Tex_009598 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_009598" +static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_009598[] = dMIZUsin_room_8Tex_009598; + +#define dMIZUsin_room_8Tex_009D98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_009D98" +static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_009D98[] = dMIZUsin_room_8Tex_009D98; + +#define dMIZUsin_room_8Tex_00A598 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_00A598" +static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_00A598[] = dMIZUsin_room_8Tex_00A598; + +#define dMIZUsin_room_8Tex_00AD98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_00AD98" +static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_00AD98[] = dMIZUsin_room_8Tex_00AD98; + +#define dMIZUsin_room_8Tex_00B598 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_00B598" +static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_00B598[] = dMIZUsin_room_8Tex_00B598; + +#define dMIZUsin_room_8Tex_00BD98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_00BD98" +static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_00BD98[] = dMIZUsin_room_8Tex_00BD98; + +#define dMIZUsin_room_8Tex_00C598 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_00C598" +static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_00C598[] = dMIZUsin_room_8Tex_00C598; + +#define dMIZUsin_room_8Tex_00D578 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_00D578" +static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_00D578[] = dMIZUsin_room_8Tex_00D578; + #define dMIZUsin_room_8DL_001398 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_001398" static const ALIGN_ASSET(2) char MIZUsin_room_8DL_001398[] = dMIZUsin_room_8DL_001398; #define dMIZUsin_room_8DL_004E40 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_004E40" static const ALIGN_ASSET(2) char MIZUsin_room_8DL_004E40[] = dMIZUsin_room_8DL_004E40; -#define dMIZUsin_room_8Tex_00B598 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_00B598" -static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_00B598[] = dMIZUsin_room_8Tex_00B598; - -#define dMIZUsin_room_8Tex_00AD98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_00AD98" -static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_00AD98[] = dMIZUsin_room_8Tex_00AD98; - -#define dMIZUsin_room_8Tex_00C598 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_00C598" -static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_00C598[] = dMIZUsin_room_8Tex_00C598; - -#define dMIZUsin_room_8Tex_00BD98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_00BD98" -static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_00BD98[] = dMIZUsin_room_8Tex_00BD98; - -#define dMIZUsin_room_8Tex_007598 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_007598" -static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_007598[] = dMIZUsin_room_8Tex_007598; - #define dMIZUsin_room_8DL_000DB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_000DB8" static const ALIGN_ASSET(2) char MIZUsin_room_8DL_000DB8[] = dMIZUsin_room_8DL_000DB8; -#define dMIZUsin_room_8Tex_006998 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_006998" -static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_006998[] = dMIZUsin_room_8Tex_006998; - #define dMIZUsin_room_8DL_003008 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_003008" static const ALIGN_ASSET(2) char MIZUsin_room_8DL_003008[] = dMIZUsin_room_8DL_003008; -#define dMIZUsin_room_8Tex_009598 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_009598" -static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_009598[] = dMIZUsin_room_8Tex_009598; - #define dMIZUsin_room_8DL_0025F0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_0025F0" static const ALIGN_ASSET(2) char MIZUsin_room_8DL_0025F0[] = dMIZUsin_room_8DL_0025F0; -#define dMIZUsin_room_8Tex_006198 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_006198" -static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_006198[] = dMIZUsin_room_8Tex_006198; - #define dMIZUsin_room_8DL_00D0A0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_00D0A0" static const ALIGN_ASSET(2) char MIZUsin_room_8DL_00D0A0[] = dMIZUsin_room_8DL_00D0A0; -#define dMIZUsin_room_8Tex_00D578 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_00D578" -static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_00D578[] = dMIZUsin_room_8Tex_00D578; - #define dMIZUsin_room_8DL_00CED0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_00CED0" static const ALIGN_ASSET(2) char MIZUsin_room_8DL_00CED0[] = dMIZUsin_room_8DL_00CED0; #define dMIZUsin_room_8DL_000740 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_000740" static const ALIGN_ASSET(2) char MIZUsin_room_8DL_000740[] = dMIZUsin_room_8DL_000740; -#define dMIZUsin_room_8Tex_008598 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_008598" -static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_008598[] = dMIZUsin_room_8Tex_008598; - #define dMIZUsin_room_8DL_003968 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_003968" static const ALIGN_ASSET(2) char MIZUsin_room_8DL_003968[] = dMIZUsin_room_8DL_003968; -#define dMIZUsin_room_8Tex_007198 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_007198" -static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_007198[] = dMIZUsin_room_8Tex_007198; - #define dMIZUsin_room_8DL_003B70 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_003B70" static const ALIGN_ASSET(2) char MIZUsin_room_8DL_003B70[] = dMIZUsin_room_8DL_003B70; -#define dMIZUsin_room_8Tex_005F98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_005F98" -static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_005F98[] = dMIZUsin_room_8Tex_005F98; - #define dMIZUsin_room_8DL_0036C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_0036C8" static const ALIGN_ASSET(2) char MIZUsin_room_8DL_0036C8[] = dMIZUsin_room_8DL_0036C8; -#define dMIZUsin_room_8Tex_007398 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_007398" -static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_007398[] = dMIZUsin_room_8Tex_007398; - #define dMIZUsin_room_8DL_0020E0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_0020E0" static const ALIGN_ASSET(2) char MIZUsin_room_8DL_0020E0[] = dMIZUsin_room_8DL_0020E0; -#define dMIZUsin_room_8Tex_005D98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_005D98" -static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_005D98[] = dMIZUsin_room_8Tex_005D98; - #define dMIZUsin_room_8DL_003F58 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_003F58" static const ALIGN_ASSET(2) char MIZUsin_room_8DL_003F58[] = dMIZUsin_room_8DL_003F58; -#define dMIZUsin_room_8Tex_009D98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_009D98" -static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_009D98[] = dMIZUsin_room_8Tex_009D98; - #define dMIZUsin_room_8DL_00D408 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_00D408" static const ALIGN_ASSET(2) char MIZUsin_room_8DL_00D408[] = dMIZUsin_room_8DL_00D408; #define dMIZUsin_room_8DL_005C00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_005C00" static const ALIGN_ASSET(2) char MIZUsin_room_8DL_005C00[] = dMIZUsin_room_8DL_005C00; -#define dMIZUsin_room_8Tex_008D98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_008D98" -static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_008D98[] = dMIZUsin_room_8Tex_008D98; - #define dMIZUsin_room_8DL_000A78 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_000A78" static const ALIGN_ASSET(2) char MIZUsin_room_8DL_000A78[] = dMIZUsin_room_8DL_000A78; -#define dMIZUsin_room_8Tex_00A598 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_00A598" -static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_00A598[] = dMIZUsin_room_8Tex_00A598; - #define dMIZUsin_room_8DL_003D40 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_003D40" static const ALIGN_ASSET(2) char MIZUsin_room_8DL_003D40[] = dMIZUsin_room_8DL_003D40; -#define dMIZUsin_room_8Tex_007D98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_007D98" -static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_007D98[] = dMIZUsin_room_8Tex_007D98; - #define dMIZUsin_room_8DL_002C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_002C68" static const ALIGN_ASSET(2) char MIZUsin_room_8DL_002C68[] = dMIZUsin_room_8DL_002C68; diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_9.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_9.h index b41725882..190143a9e 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_9.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_9.h @@ -3,45 +3,45 @@ #include "align_asset_macro.h" +#define dMIZUsin_room_9Tex_0036D8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_0036D8" +static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_0036D8[] = dMIZUsin_room_9Tex_0036D8; + +#define dMIZUsin_room_9Tex_003ED8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_003ED8" +static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_003ED8[] = dMIZUsin_room_9Tex_003ED8; + +#define dMIZUsin_room_9Tex_0046D8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_0046D8" +static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_0046D8[] = dMIZUsin_room_9Tex_0046D8; + +#define dMIZUsin_room_9Tex_004ED8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_004ED8" +static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_004ED8[] = dMIZUsin_room_9Tex_004ED8; + +#define dMIZUsin_room_9Tex_0056D8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_0056D8" +static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_0056D8[] = dMIZUsin_room_9Tex_0056D8; + +#define dMIZUsin_room_9Tex_005ED8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_005ED8" +static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_005ED8[] = dMIZUsin_room_9Tex_005ED8; + +#define dMIZUsin_room_9Tex_0066D8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_0066D8" +static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_0066D8[] = dMIZUsin_room_9Tex_0066D8; + +#define dMIZUsin_room_9Tex_006ED8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_006ED8" +static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_006ED8[] = dMIZUsin_room_9Tex_006ED8; + +#define dMIZUsin_room_9Tex_0078A8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_0078A8" +static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_0078A8[] = dMIZUsin_room_9Tex_0078A8; + #define dMIZUsin_room_9DL_002E20 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9DL_002E20" static const ALIGN_ASSET(2) char MIZUsin_room_9DL_002E20[] = dMIZUsin_room_9DL_002E20; #define dMIZUsin_room_9DL_001890 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9DL_001890" static const ALIGN_ASSET(2) char MIZUsin_room_9DL_001890[] = dMIZUsin_room_9DL_001890; -#define dMIZUsin_room_9Tex_005ED8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_005ED8" -static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_005ED8[] = dMIZUsin_room_9Tex_005ED8; - -#define dMIZUsin_room_9Tex_0056D8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_0056D8" -static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_0056D8[] = dMIZUsin_room_9Tex_0056D8; - -#define dMIZUsin_room_9Tex_0046D8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_0046D8" -static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_0046D8[] = dMIZUsin_room_9Tex_0046D8; - -#define dMIZUsin_room_9Tex_003ED8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_003ED8" -static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_003ED8[] = dMIZUsin_room_9Tex_003ED8; - -#define dMIZUsin_room_9Tex_004ED8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_004ED8" -static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_004ED8[] = dMIZUsin_room_9Tex_004ED8; - -#define dMIZUsin_room_9Tex_006ED8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_006ED8" -static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_006ED8[] = dMIZUsin_room_9Tex_006ED8; - -#define dMIZUsin_room_9Tex_0066D8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_0066D8" -static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_0066D8[] = dMIZUsin_room_9Tex_0066D8; - #define dMIZUsin_room_9DL_0077A0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9DL_0077A0" static const ALIGN_ASSET(2) char MIZUsin_room_9DL_0077A0[] = dMIZUsin_room_9DL_0077A0; -#define dMIZUsin_room_9Tex_0078A8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_0078A8" -static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_0078A8[] = dMIZUsin_room_9Tex_0078A8; - #define dMIZUsin_room_9DL_0035F0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9DL_0035F0" static const ALIGN_ASSET(2) char MIZUsin_room_9DL_0035F0[] = dMIZUsin_room_9DL_0035F0; -#define dMIZUsin_room_9Tex_0036D8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_0036D8" -static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_0036D8[] = dMIZUsin_room_9Tex_0036D8; - #define dMIZUsin_room_9DL_0030C0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9DL_0030C0" static const ALIGN_ASSET(2) char MIZUsin_room_9DL_0030C0[] = dMIZUsin_room_9DL_0030C0; diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_scene.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_scene.h index 24897ddec..3b75e49be 100644 --- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_scene.h +++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_scene.h @@ -3,6 +3,15 @@ #include "align_asset_macro.h" +#define dMIZUsin_sceneTex_013C30 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_sceneTex_013C30" +static const ALIGN_ASSET(2) char MIZUsin_sceneTex_013C30[] = dMIZUsin_sceneTex_013C30; + +#define dMIZUsin_sceneTex_014430 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_sceneTex_014430" +static const ALIGN_ASSET(2) char MIZUsin_sceneTex_014430[] = dMIZUsin_sceneTex_014430; + +#define dMIZUsin_sceneTex_015030 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_sceneTex_015030" +static const ALIGN_ASSET(2) char MIZUsin_sceneTex_015030[] = dMIZUsin_sceneTex_015030; + #define dgWaterTempleDayEntranceTex "__OTR__scenes/nonmq/MIZUsin_scene/gWaterTempleDayEntranceTex" static const ALIGN_ASSET(2) char gWaterTempleDayEntranceTex[] = dgWaterTempleDayEntranceTex; @@ -12,13 +21,5 @@ static const ALIGN_ASSET(2) char gWaterTempleNightEntranceTex[] = dgWaterTempleN #define dMIZUsin_sceneCollisionHeader_013C04 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_sceneCollisionHeader_013C04" static const ALIGN_ASSET(2) char MIZUsin_sceneCollisionHeader_013C04[] = dMIZUsin_sceneCollisionHeader_013C04; -#define dMIZUsin_sceneTex_014430 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_sceneTex_014430" -static const ALIGN_ASSET(2) char MIZUsin_sceneTex_014430[] = dMIZUsin_sceneTex_014430; - -#define dMIZUsin_sceneTex_013C30 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_sceneTex_013C30" -static const ALIGN_ASSET(2) char MIZUsin_sceneTex_013C30[] = dMIZUsin_sceneTex_013C30; - -#define dMIZUsin_sceneTex_015030 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_sceneTex_015030" -static const ALIGN_ASSET(2) char MIZUsin_sceneTex_015030[] = dMIZUsin_sceneTex_015030; #endif // DUNGEONS_MIZUSIN_SCENE_H diff --git a/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_0.h b/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_0.h index 3a57019b7..5f43bea60 100644 --- a/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_0.h +++ b/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_0.h @@ -3,26 +3,26 @@ #include "align_asset_macro.h" -#define dMIZUsin_bs_room_0DL_001460 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_0DL_001460" -static const ALIGN_ASSET(2) char MIZUsin_bs_room_0DL_001460[] = dMIZUsin_bs_room_0DL_001460; +#define dMIZUsin_bs_room_0Tex_001470 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_0Tex_001470" +static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_001470[] = dMIZUsin_bs_room_0Tex_001470; -#define dMIZUsin_bs_room_0Tex_003C70 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_0Tex_003C70" -static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_003C70[] = dMIZUsin_bs_room_0Tex_003C70; - -#define dMIZUsin_bs_room_0Tex_003470 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_0Tex_003470" -static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_003470[] = dMIZUsin_bs_room_0Tex_003470; - -#define dMIZUsin_bs_room_0Tex_002C70 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_0Tex_002C70" -static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_002C70[] = dMIZUsin_bs_room_0Tex_002C70; - -#define dMIZUsin_bs_room_0Tex_002470 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_0Tex_002470" -static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_002470[] = dMIZUsin_bs_room_0Tex_002470; - -#define dMIZUsin_bs_room_0Tex_001C70 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_0Tex_001C70" +#define dMIZUsin_bs_room_0Tex_001C70 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_0Tex_001C70" static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_001C70[] = dMIZUsin_bs_room_0Tex_001C70; -#define dMIZUsin_bs_room_0Tex_001470 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_0Tex_001470" -static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_001470[] = dMIZUsin_bs_room_0Tex_001470; +#define dMIZUsin_bs_room_0Tex_002470 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_0Tex_002470" +static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_002470[] = dMIZUsin_bs_room_0Tex_002470; + +#define dMIZUsin_bs_room_0Tex_002C70 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_0Tex_002C70" +static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_002C70[] = dMIZUsin_bs_room_0Tex_002C70; + +#define dMIZUsin_bs_room_0Tex_003470 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_0Tex_003470" +static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_003470[] = dMIZUsin_bs_room_0Tex_003470; + +#define dMIZUsin_bs_room_0Tex_003C70 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_0Tex_003C70" +static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_003C70[] = dMIZUsin_bs_room_0Tex_003C70; + +#define dMIZUsin_bs_room_0DL_001460 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_0DL_001460" +static const ALIGN_ASSET(2) char MIZUsin_bs_room_0DL_001460[] = dMIZUsin_bs_room_0DL_001460; #endif // DUNGEONS_MIZUSIN_BS_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_1.h b/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_1.h index a7861cb5e..0237e15c3 100644 --- a/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_1.h +++ b/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_1.h @@ -3,44 +3,44 @@ #include "align_asset_macro.h" -#define dMIZUsin_bs_room_1DL_005688 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1DL_005688" -static const ALIGN_ASSET(2) char MIZUsin_bs_room_1DL_005688[] = dMIZUsin_bs_room_1DL_005688; - -#define dMIZUsin_bs_room_1Tex_0056E8 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_0056E8" +#define dMIZUsin_bs_room_1Tex_0056E8 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_0056E8" static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_0056E8[] = dMIZUsin_bs_room_1Tex_0056E8; -#define dMIZUsin_bs_room_1Tex_005EE8 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_005EE8" +#define dMIZUsin_bs_room_1Tex_005EE8 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_005EE8" static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_005EE8[] = dMIZUsin_bs_room_1Tex_005EE8; -#define dMIZUsin_bs_room_1Tex_007EE8 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_007EE8" -static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_007EE8[] = dMIZUsin_bs_room_1Tex_007EE8; - -#define dMIZUsin_bs_room_1Tex_00A2E8 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_00A2E8" -static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_00A2E8[] = dMIZUsin_bs_room_1Tex_00A2E8; - -#define dMIZUsin_bs_room_1Tex_0086E8 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_0086E8" -static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_0086E8[] = dMIZUsin_bs_room_1Tex_0086E8; - -#define dMIZUsin_bs_room_1Tex_0076E8 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_0076E8" -static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_0076E8[] = dMIZUsin_bs_room_1Tex_0076E8; - -#define dMIZUsin_bs_room_1Tex_006EE8 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_006EE8" -static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_006EE8[] = dMIZUsin_bs_room_1Tex_006EE8; - -#define dMIZUsin_bs_room_1Tex_0066E8 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_0066E8" +#define dMIZUsin_bs_room_1Tex_0066E8 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_0066E8" static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_0066E8[] = dMIZUsin_bs_room_1Tex_0066E8; -#define dMIZUsin_bs_room_1Tex_0092E8 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_0092E8" +#define dMIZUsin_bs_room_1Tex_006EE8 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_006EE8" +static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_006EE8[] = dMIZUsin_bs_room_1Tex_006EE8; + +#define dMIZUsin_bs_room_1Tex_0076E8 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_0076E8" +static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_0076E8[] = dMIZUsin_bs_room_1Tex_0076E8; + +#define dMIZUsin_bs_room_1Tex_007EE8 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_007EE8" +static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_007EE8[] = dMIZUsin_bs_room_1Tex_007EE8; + +#define dMIZUsin_bs_room_1Tex_0086E8 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_0086E8" +static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_0086E8[] = dMIZUsin_bs_room_1Tex_0086E8; + +#define dMIZUsin_bs_room_1Tex_008EE8 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_008EE8" +static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_008EE8[] = dMIZUsin_bs_room_1Tex_008EE8; + +#define dMIZUsin_bs_room_1Tex_0092E8 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_0092E8" static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_0092E8[] = dMIZUsin_bs_room_1Tex_0092E8; -#define dMIZUsin_bs_room_1Tex_009AE8 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_009AE8" +#define dMIZUsin_bs_room_1Tex_009AE8 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_009AE8" static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_009AE8[] = dMIZUsin_bs_room_1Tex_009AE8; -#define dMIZUsin_bs_room_1Tex_00AAE8 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_00AAE8" +#define dMIZUsin_bs_room_1Tex_00A2E8 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_00A2E8" +static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_00A2E8[] = dMIZUsin_bs_room_1Tex_00A2E8; + +#define dMIZUsin_bs_room_1Tex_00AAE8 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_00AAE8" static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_00AAE8[] = dMIZUsin_bs_room_1Tex_00AAE8; -#define dMIZUsin_bs_room_1Tex_008EE8 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_008EE8" -static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_008EE8[] = dMIZUsin_bs_room_1Tex_008EE8; +#define dMIZUsin_bs_room_1DL_005688 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1DL_005688" +static const ALIGN_ASSET(2) char MIZUsin_bs_room_1DL_005688[] = dMIZUsin_bs_room_1DL_005688; #endif // DUNGEONS_MIZUSIN_BS_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_scene.h b/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_scene.h index f045c3662..eef5bfed6 100644 --- a/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_scene.h +++ b/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dMIZUsin_bs_sceneCollisionHeader_001A34 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_sceneCollisionHeader_001A34" +#define dMIZUsin_bs_sceneCollisionHeader_001A34 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_sceneCollisionHeader_001A34" static const ALIGN_ASSET(2) char MIZUsin_bs_sceneCollisionHeader_001A34[] = dMIZUsin_bs_sceneCollisionHeader_001A34; diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_0.h b/soh/assets/scenes/dungeons/bdan/bdan_room_0.h index 162472187..4cb2ded23 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_0.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_0.h @@ -3,9 +3,6 @@ #include "align_asset_macro.h" -#define dbdan_room_0DL_002DA8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_0DL_002DA8" -static const ALIGN_ASSET(2) char bdan_room_0DL_002DA8[] = dbdan_room_0DL_002DA8; - #define dbdan_room_0Tex_002DB8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_0Tex_002DB8" static const ALIGN_ASSET(2) char bdan_room_0Tex_002DB8[] = dbdan_room_0Tex_002DB8; @@ -15,6 +12,9 @@ static const ALIGN_ASSET(2) char bdan_room_0Tex_0031B8[] = dbdan_room_0Tex_0031B #define dbdan_room_0Tex_0039B8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_0Tex_0039B8" static const ALIGN_ASSET(2) char bdan_room_0Tex_0039B8[] = dbdan_room_0Tex_0039B8; +#define dbdan_room_0DL_002DA8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_0DL_002DA8" +static const ALIGN_ASSET(2) char bdan_room_0DL_002DA8[] = dbdan_room_0DL_002DA8; + #define dbdan_room_0DL_004130 "__OTR__scenes/nonmq/bdan_scene/bdan_room_0DL_004130" static const ALIGN_ASSET(2) char bdan_room_0DL_004130[] = dbdan_room_0DL_004130; diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_1.h b/soh/assets/scenes/dungeons/bdan/bdan_room_1.h index 33c707378..801fc8e94 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_1.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_1.h @@ -3,15 +3,15 @@ #include "align_asset_macro.h" -#define dbdan_room_1DL_004DF0 "__OTR__scenes/nonmq/bdan_scene/bdan_room_1DL_004DF0" -static const ALIGN_ASSET(2) char bdan_room_1DL_004DF0[] = dbdan_room_1DL_004DF0; - #define dbdan_room_1Tex_004E00 "__OTR__scenes/nonmq/bdan_scene/bdan_room_1Tex_004E00" static const ALIGN_ASSET(2) char bdan_room_1Tex_004E00[] = dbdan_room_1Tex_004E00; #define dbdan_room_1Tex_005600 "__OTR__scenes/nonmq/bdan_scene/bdan_room_1Tex_005600" static const ALIGN_ASSET(2) char bdan_room_1Tex_005600[] = dbdan_room_1Tex_005600; +#define dbdan_room_1DL_004DF0 "__OTR__scenes/nonmq/bdan_scene/bdan_room_1DL_004DF0" +static const ALIGN_ASSET(2) char bdan_room_1DL_004DF0[] = dbdan_room_1DL_004DF0; + #define dbdan_room_1DL_005FA8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_1DL_005FA8" static const ALIGN_ASSET(2) char bdan_room_1DL_005FA8[] = dbdan_room_1DL_005FA8; diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_12.h b/soh/assets/scenes/dungeons/bdan/bdan_room_12.h index f9bf57419..3a3e95e94 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_12.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_12.h @@ -3,12 +3,12 @@ #include "align_asset_macro.h" -#define dbdan_room_12DL_003848 "__OTR__scenes/nonmq/bdan_scene/bdan_room_12DL_003848" -static const ALIGN_ASSET(2) char bdan_room_12DL_003848[] = dbdan_room_12DL_003848; - #define dbdan_room_12Tex_0038E0 "__OTR__scenes/nonmq/bdan_scene/bdan_room_12Tex_0038E0" static const ALIGN_ASSET(2) char bdan_room_12Tex_0038E0[] = dbdan_room_12Tex_0038E0; +#define dbdan_room_12DL_003848 "__OTR__scenes/nonmq/bdan_scene/bdan_room_12DL_003848" +static const ALIGN_ASSET(2) char bdan_room_12DL_003848[] = dbdan_room_12DL_003848; + #define dbdan_room_12Set_000150DL_003848 "__OTR__scenes/nonmq/bdan_scene/bdan_room_12Set_000150DL_003848" static const ALIGN_ASSET(2) char bdan_room_12Set_000150DL_003848[] = dbdan_room_12Set_000150DL_003848; diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_13.h b/soh/assets/scenes/dungeons/bdan/bdan_room_13.h index 8b555a2c8..4c278c578 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_13.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_13.h @@ -3,17 +3,17 @@ #include "align_asset_macro.h" -#define dbdan_room_13DL_0015A8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_13DL_0015A8" -static const ALIGN_ASSET(2) char bdan_room_13DL_0015A8[] = dbdan_room_13DL_0015A8; - #define dbdan_room_13Tex_0015B8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_13Tex_0015B8" static const ALIGN_ASSET(2) char bdan_room_13Tex_0015B8[] = dbdan_room_13Tex_0015B8; +#define dbdan_room_13Tex_001DB8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_13Tex_001DB8" +static const ALIGN_ASSET(2) char bdan_room_13Tex_001DB8[] = dbdan_room_13Tex_001DB8; + #define dbdan_room_13Tex_0021B8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_13Tex_0021B8" static const ALIGN_ASSET(2) char bdan_room_13Tex_0021B8[] = dbdan_room_13Tex_0021B8; -#define dbdan_room_13Tex_001DB8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_13Tex_001DB8" -static const ALIGN_ASSET(2) char bdan_room_13Tex_001DB8[] = dbdan_room_13Tex_001DB8; +#define dbdan_room_13DL_0015A8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_13DL_0015A8" +static const ALIGN_ASSET(2) char bdan_room_13DL_0015A8[] = dbdan_room_13DL_0015A8; #define dbdan_room_13DL_002B68 "__OTR__scenes/nonmq/bdan_scene/bdan_room_13DL_002B68" static const ALIGN_ASSET(2) char bdan_room_13DL_002B68[] = dbdan_room_13DL_002B68; diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_14.h b/soh/assets/scenes/dungeons/bdan/bdan_room_14.h index ca44e1126..f2d04b56e 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_14.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_14.h @@ -3,8 +3,11 @@ #include "align_asset_macro.h" -#define dbdan_room_14DL_0045B8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_14DL_0045B8" -static const ALIGN_ASSET(2) char bdan_room_14DL_0045B8[] = dbdan_room_14DL_0045B8; +#define dbdan_room_14Tex_0045C8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_14Tex_0045C8" +static const ALIGN_ASSET(2) char bdan_room_14Tex_0045C8[] = dbdan_room_14Tex_0045C8; + +#define dbdan_room_14Tex_004DC8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_14Tex_004DC8" +static const ALIGN_ASSET(2) char bdan_room_14Tex_004DC8[] = dbdan_room_14Tex_004DC8; #define dbdan_room_14Tex_0055C8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_14Tex_0055C8" static const ALIGN_ASSET(2) char bdan_room_14Tex_0055C8[] = dbdan_room_14Tex_0055C8; @@ -12,11 +15,8 @@ static const ALIGN_ASSET(2) char bdan_room_14Tex_0055C8[] = dbdan_room_14Tex_005 #define dbdan_room_14Tex_0059C8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_14Tex_0059C8" static const ALIGN_ASSET(2) char bdan_room_14Tex_0059C8[] = dbdan_room_14Tex_0059C8; -#define dbdan_room_14Tex_004DC8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_14Tex_004DC8" -static const ALIGN_ASSET(2) char bdan_room_14Tex_004DC8[] = dbdan_room_14Tex_004DC8; - -#define dbdan_room_14Tex_0045C8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_14Tex_0045C8" -static const ALIGN_ASSET(2) char bdan_room_14Tex_0045C8[] = dbdan_room_14Tex_0045C8; +#define dbdan_room_14DL_0045B8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_14DL_0045B8" +static const ALIGN_ASSET(2) char bdan_room_14DL_0045B8[] = dbdan_room_14DL_0045B8; #define dbdan_room_14Set_000190DL_0045B8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_14Set_000190DL_0045B8" static const ALIGN_ASSET(2) char bdan_room_14Set_000190DL_0045B8[] = dbdan_room_14Set_000190DL_0045B8; diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_2.h b/soh/assets/scenes/dungeons/bdan/bdan_room_2.h index 6e4f5c072..0c42ff9d8 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_2.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_2.h @@ -3,11 +3,8 @@ #include "align_asset_macro.h" -#define dbdan_room_2DL_006DD8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_2DL_006DD8" -static const ALIGN_ASSET(2) char bdan_room_2DL_006DD8[] = dbdan_room_2DL_006DD8; - -#define dbdan_room_2Tex_008E38 "__OTR__scenes/nonmq/bdan_scene/bdan_room_2Tex_008E38" -static const ALIGN_ASSET(2) char bdan_room_2Tex_008E38[] = dbdan_room_2Tex_008E38; +#define dbdan_room_2Tex_006E38 "__OTR__scenes/nonmq/bdan_scene/bdan_room_2Tex_006E38" +static const ALIGN_ASSET(2) char bdan_room_2Tex_006E38[] = dbdan_room_2Tex_006E38; #define dbdan_room_2Tex_007E38 "__OTR__scenes/nonmq/bdan_scene/bdan_room_2Tex_007E38" static const ALIGN_ASSET(2) char bdan_room_2Tex_007E38[] = dbdan_room_2Tex_007E38; @@ -15,8 +12,11 @@ static const ALIGN_ASSET(2) char bdan_room_2Tex_007E38[] = dbdan_room_2Tex_007E3 #define dbdan_room_2Tex_008638 "__OTR__scenes/nonmq/bdan_scene/bdan_room_2Tex_008638" static const ALIGN_ASSET(2) char bdan_room_2Tex_008638[] = dbdan_room_2Tex_008638; -#define dbdan_room_2Tex_006E38 "__OTR__scenes/nonmq/bdan_scene/bdan_room_2Tex_006E38" -static const ALIGN_ASSET(2) char bdan_room_2Tex_006E38[] = dbdan_room_2Tex_006E38; +#define dbdan_room_2Tex_008E38 "__OTR__scenes/nonmq/bdan_scene/bdan_room_2Tex_008E38" +static const ALIGN_ASSET(2) char bdan_room_2Tex_008E38[] = dbdan_room_2Tex_008E38; + +#define dbdan_room_2DL_006DD8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_2DL_006DD8" +static const ALIGN_ASSET(2) char bdan_room_2DL_006DD8[] = dbdan_room_2DL_006DD8; #define dbdan_room_2Set_000180DL_006DD8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_2Set_000180DL_006DD8" static const ALIGN_ASSET(2) char bdan_room_2Set_000180DL_006DD8[] = dbdan_room_2Set_000180DL_006DD8; diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_3.h b/soh/assets/scenes/dungeons/bdan/bdan_room_3.h index 49e4d32a9..9bca1fb3b 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_3.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_3.h @@ -3,23 +3,23 @@ #include "align_asset_macro.h" -#define dbdan_room_3DL_004858 "__OTR__scenes/nonmq/bdan_scene/bdan_room_3DL_004858" -static const ALIGN_ASSET(2) char bdan_room_3DL_004858[] = dbdan_room_3DL_004858; +#define dbdan_room_3Tex_004888 "__OTR__scenes/nonmq/bdan_scene/bdan_room_3Tex_004888" +static const ALIGN_ASSET(2) char bdan_room_3Tex_004888[] = dbdan_room_3Tex_004888; #define dbdan_room_3Tex_005888 "__OTR__scenes/nonmq/bdan_scene/bdan_room_3Tex_005888" static const ALIGN_ASSET(2) char bdan_room_3Tex_005888[] = dbdan_room_3Tex_005888; -#define dbdan_room_3Tex_006488 "__OTR__scenes/nonmq/bdan_scene/bdan_room_3Tex_006488" -static const ALIGN_ASSET(2) char bdan_room_3Tex_006488[] = dbdan_room_3Tex_006488; - #define dbdan_room_3Tex_006088 "__OTR__scenes/nonmq/bdan_scene/bdan_room_3Tex_006088" static const ALIGN_ASSET(2) char bdan_room_3Tex_006088[] = dbdan_room_3Tex_006088; +#define dbdan_room_3Tex_006488 "__OTR__scenes/nonmq/bdan_scene/bdan_room_3Tex_006488" +static const ALIGN_ASSET(2) char bdan_room_3Tex_006488[] = dbdan_room_3Tex_006488; + #define dbdan_room_3Tex_006C88 "__OTR__scenes/nonmq/bdan_scene/bdan_room_3Tex_006C88" static const ALIGN_ASSET(2) char bdan_room_3Tex_006C88[] = dbdan_room_3Tex_006C88; -#define dbdan_room_3Tex_004888 "__OTR__scenes/nonmq/bdan_scene/bdan_room_3Tex_004888" -static const ALIGN_ASSET(2) char bdan_room_3Tex_004888[] = dbdan_room_3Tex_004888; +#define dbdan_room_3DL_004858 "__OTR__scenes/nonmq/bdan_scene/bdan_room_3DL_004858" +static const ALIGN_ASSET(2) char bdan_room_3DL_004858[] = dbdan_room_3DL_004858; #define dbdan_room_3DL_007250 "__OTR__scenes/nonmq/bdan_scene/bdan_room_3DL_007250" static const ALIGN_ASSET(2) char bdan_room_3DL_007250[] = dbdan_room_3DL_007250; diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_4.h b/soh/assets/scenes/dungeons/bdan/bdan_room_4.h index 8256559d5..559ba128d 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_4.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_4.h @@ -3,9 +3,6 @@ #include "align_asset_macro.h" -#define dbdan_room_4DL_002B20 "__OTR__scenes/nonmq/bdan_scene/bdan_room_4DL_002B20" -static const ALIGN_ASSET(2) char bdan_room_4DL_002B20[] = dbdan_room_4DL_002B20; - #define dbdan_room_4Tex_002B30 "__OTR__scenes/nonmq/bdan_scene/bdan_room_4Tex_002B30" static const ALIGN_ASSET(2) char bdan_room_4Tex_002B30[] = dbdan_room_4Tex_002B30; @@ -15,6 +12,9 @@ static const ALIGN_ASSET(2) char bdan_room_4Tex_002F30[] = dbdan_room_4Tex_002F3 #define dbdan_room_4Tex_003730 "__OTR__scenes/nonmq/bdan_scene/bdan_room_4Tex_003730" static const ALIGN_ASSET(2) char bdan_room_4Tex_003730[] = dbdan_room_4Tex_003730; +#define dbdan_room_4DL_002B20 "__OTR__scenes/nonmq/bdan_scene/bdan_room_4DL_002B20" +static const ALIGN_ASSET(2) char bdan_room_4DL_002B20[] = dbdan_room_4DL_002B20; + #define dbdan_room_4DL_0040F0 "__OTR__scenes/nonmq/bdan_scene/bdan_room_4DL_0040F0" static const ALIGN_ASSET(2) char bdan_room_4DL_0040F0[] = dbdan_room_4DL_0040F0; diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_5.h b/soh/assets/scenes/dungeons/bdan/bdan_room_5.h index 775950fba..b469af6b8 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_5.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_5.h @@ -3,26 +3,26 @@ #include "align_asset_macro.h" -#define dbdan_room_5DL_002498 "__OTR__scenes/nonmq/bdan_scene/bdan_room_5DL_002498" -static const ALIGN_ASSET(2) char bdan_room_5DL_002498[] = dbdan_room_5DL_002498; - #define dbdan_room_5Tex_0024A8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_5Tex_0024A8" static const ALIGN_ASSET(2) char bdan_room_5Tex_0024A8[] = dbdan_room_5Tex_0024A8; -#define dbdan_room_5Tex_0030A8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_5Tex_0030A8" -static const ALIGN_ASSET(2) char bdan_room_5Tex_0030A8[] = dbdan_room_5Tex_0030A8; - #define dbdan_room_5Tex_0028A8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_5Tex_0028A8" static const ALIGN_ASSET(2) char bdan_room_5Tex_0028A8[] = dbdan_room_5Tex_0028A8; -#define dbdan_room_5DL_004070 "__OTR__scenes/nonmq/bdan_scene/bdan_room_5DL_004070" -static const ALIGN_ASSET(2) char bdan_room_5DL_004070[] = dbdan_room_5DL_004070; +#define dbdan_room_5Tex_0030A8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_5Tex_0030A8" +static const ALIGN_ASSET(2) char bdan_room_5Tex_0030A8[] = dbdan_room_5Tex_0030A8; + +#define dbdan_room_5Tex_004090 "__OTR__scenes/nonmq/bdan_scene/bdan_room_5Tex_004090" +static const ALIGN_ASSET(2) char bdan_room_5Tex_004090[] = dbdan_room_5Tex_004090; #define dbdan_room_5Tex_005090 "__OTR__scenes/nonmq/bdan_scene/bdan_room_5Tex_005090" static const ALIGN_ASSET(2) char bdan_room_5Tex_005090[] = dbdan_room_5Tex_005090; -#define dbdan_room_5Tex_004090 "__OTR__scenes/nonmq/bdan_scene/bdan_room_5Tex_004090" -static const ALIGN_ASSET(2) char bdan_room_5Tex_004090[] = dbdan_room_5Tex_004090; +#define dbdan_room_5DL_002498 "__OTR__scenes/nonmq/bdan_scene/bdan_room_5DL_002498" +static const ALIGN_ASSET(2) char bdan_room_5DL_002498[] = dbdan_room_5DL_002498; + +#define dbdan_room_5DL_004070 "__OTR__scenes/nonmq/bdan_scene/bdan_room_5DL_004070" +static const ALIGN_ASSET(2) char bdan_room_5DL_004070[] = dbdan_room_5DL_004070; #define dbdan_room_5Set_000180DL_002498 "__OTR__scenes/nonmq/bdan_scene/bdan_room_5Set_000180DL_002498" static const ALIGN_ASSET(2) char bdan_room_5Set_000180DL_002498[] = dbdan_room_5Set_000180DL_002498; diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_6.h b/soh/assets/scenes/dungeons/bdan/bdan_room_6.h index a0be4719d..57ac10b90 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_6.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_6.h @@ -3,15 +3,15 @@ #include "align_asset_macro.h" -#define dbdan_room_6DL_003048 "__OTR__scenes/nonmq/bdan_scene/bdan_room_6DL_003048" -static const ALIGN_ASSET(2) char bdan_room_6DL_003048[] = dbdan_room_6DL_003048; - #define dbdan_room_6Tex_003068 "__OTR__scenes/nonmq/bdan_scene/bdan_room_6Tex_003068" static const ALIGN_ASSET(2) char bdan_room_6Tex_003068[] = dbdan_room_6Tex_003068; #define dbdan_room_6Tex_003868 "__OTR__scenes/nonmq/bdan_scene/bdan_room_6Tex_003868" static const ALIGN_ASSET(2) char bdan_room_6Tex_003868[] = dbdan_room_6Tex_003868; +#define dbdan_room_6DL_003048 "__OTR__scenes/nonmq/bdan_scene/bdan_room_6DL_003048" +static const ALIGN_ASSET(2) char bdan_room_6DL_003048[] = dbdan_room_6DL_003048; + #define dbdan_room_6DL_004230 "__OTR__scenes/nonmq/bdan_scene/bdan_room_6DL_004230" static const ALIGN_ASSET(2) char bdan_room_6DL_004230[] = dbdan_room_6DL_004230; diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_7.h b/soh/assets/scenes/dungeons/bdan/bdan_room_7.h index 1a7f6555b..744daf427 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_7.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_7.h @@ -3,15 +3,15 @@ #include "align_asset_macro.h" -#define dbdan_room_7DL_002CB8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_7DL_002CB8" -static const ALIGN_ASSET(2) char bdan_room_7DL_002CB8[] = dbdan_room_7DL_002CB8; - #define dbdan_room_7Tex_002CD0 "__OTR__scenes/nonmq/bdan_scene/bdan_room_7Tex_002CD0" static const ALIGN_ASSET(2) char bdan_room_7Tex_002CD0[] = dbdan_room_7Tex_002CD0; #define dbdan_room_7Tex_0030D0 "__OTR__scenes/nonmq/bdan_scene/bdan_room_7Tex_0030D0" static const ALIGN_ASSET(2) char bdan_room_7Tex_0030D0[] = dbdan_room_7Tex_0030D0; +#define dbdan_room_7DL_002CB8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_7DL_002CB8" +static const ALIGN_ASSET(2) char bdan_room_7DL_002CB8[] = dbdan_room_7DL_002CB8; + #define dbdan_room_7Set_000150DL_002CB8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_7Set_000150DL_002CB8" static const ALIGN_ASSET(2) char bdan_room_7Set_000150DL_002CB8[] = dbdan_room_7Set_000150DL_002CB8; diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_9.h b/soh/assets/scenes/dungeons/bdan/bdan_room_9.h index 186b21f3e..bc3ee1255 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_room_9.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_room_9.h @@ -3,12 +3,12 @@ #include "align_asset_macro.h" -#define dbdan_room_9DL_003790 "__OTR__scenes/nonmq/bdan_scene/bdan_room_9DL_003790" -static const ALIGN_ASSET(2) char bdan_room_9DL_003790[] = dbdan_room_9DL_003790; - #define dbdan_room_9Tex_003828 "__OTR__scenes/nonmq/bdan_scene/bdan_room_9Tex_003828" static const ALIGN_ASSET(2) char bdan_room_9Tex_003828[] = dbdan_room_9Tex_003828; +#define dbdan_room_9DL_003790 "__OTR__scenes/nonmq/bdan_scene/bdan_room_9DL_003790" +static const ALIGN_ASSET(2) char bdan_room_9DL_003790[] = dbdan_room_9DL_003790; + #define dbdan_room_9Set_0000A0DL_003790 "__OTR__scenes/nonmq/bdan_scene/bdan_room_9Set_0000A0DL_003790" static const ALIGN_ASSET(2) char bdan_room_9Set_0000A0DL_003790[] = dbdan_room_9Set_0000A0DL_003790; diff --git a/soh/assets/scenes/dungeons/bdan/bdan_scene.h b/soh/assets/scenes/dungeons/bdan/bdan_scene.h index 6cf171fdc..11cd718a9 100644 --- a/soh/assets/scenes/dungeons/bdan/bdan_scene.h +++ b/soh/assets/scenes/dungeons/bdan/bdan_scene.h @@ -3,14 +3,14 @@ #include "align_asset_macro.h" -#define dgJabuJabuIntroCs "__OTR__scenes/nonmq/bdan_scene/gJabuJabuIntroCs" -static const ALIGN_ASSET(2) char gJabuJabuIntroCs[] = dgJabuJabuIntroCs; +#define dbdan_sceneTex_013E00 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneTex_013E00" +static const ALIGN_ASSET(2) char bdan_sceneTex_013E00[] = dbdan_sceneTex_013E00; -#define dbdan_sceneCollisionHeader_013074 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneCollisionHeader_013074" -static const ALIGN_ASSET(2) char bdan_sceneCollisionHeader_013074[] = dbdan_sceneCollisionHeader_013074; +#define dbdan_sceneTex_014600 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneTex_014600" +static const ALIGN_ASSET(2) char bdan_sceneTex_014600[] = dbdan_sceneTex_014600; -#define dbdan_sceneTLUT_013BF8 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneTLUT_013BF8" -static const ALIGN_ASSET(2) char bdan_sceneTLUT_013BF8[] = dbdan_sceneTLUT_013BF8; +#define dbdan_sceneTex_014A00 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneTex_014A00" +static const ALIGN_ASSET(2) char bdan_sceneTex_014A00[] = dbdan_sceneTex_014A00; #define dbdan_sceneTex_015200 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneTex_015200" static const ALIGN_ASSET(2) char bdan_sceneTex_015200[] = dbdan_sceneTex_015200; @@ -18,14 +18,14 @@ static const ALIGN_ASSET(2) char bdan_sceneTex_015200[] = dbdan_sceneTex_015200; #define dbdan_sceneTLUT_0139F0 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneTLUT_0139F0" static const ALIGN_ASSET(2) char bdan_sceneTLUT_0139F0[] = dbdan_sceneTLUT_0139F0; -#define dbdan_sceneTex_014A00 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneTex_014A00" -static const ALIGN_ASSET(2) char bdan_sceneTex_014A00[] = dbdan_sceneTex_014A00; +#define dbdan_sceneTLUT_013BF8 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneTLUT_013BF8" +static const ALIGN_ASSET(2) char bdan_sceneTLUT_013BF8[] = dbdan_sceneTLUT_013BF8; -#define dbdan_sceneTex_014600 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneTex_014600" -static const ALIGN_ASSET(2) char bdan_sceneTex_014600[] = dbdan_sceneTex_014600; +#define dgJabuJabuIntroCs "__OTR__scenes/nonmq/bdan_scene/gJabuJabuIntroCs" +static const ALIGN_ASSET(2) char gJabuJabuIntroCs[] = dgJabuJabuIntroCs; -#define dbdan_sceneTex_013E00 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneTex_013E00" -static const ALIGN_ASSET(2) char bdan_sceneTex_013E00[] = dbdan_sceneTex_013E00; +#define dbdan_sceneCollisionHeader_013074 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneCollisionHeader_013074" +static const ALIGN_ASSET(2) char bdan_sceneCollisionHeader_013074[] = dbdan_sceneCollisionHeader_013074; #define dbdan_sceneCollisionHeader_013074 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneCollisionHeader_013074" diff --git a/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_room_0.h b/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_room_0.h index 0311e3c48..1fdc43640 100644 --- a/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_room_0.h +++ b/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_room_0.h @@ -3,23 +3,23 @@ #include "align_asset_macro.h" -#define dbdan_boss_room_0DL_001E28 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_room_0DL_001E28" -static const ALIGN_ASSET(2) char bdan_boss_room_0DL_001E28[] = dbdan_boss_room_0DL_001E28; - -#define dbdan_boss_room_0Tex_002040 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_room_0Tex_002040" +#define dbdan_boss_room_0Tex_002040 "__OTR__scenes/shared/bdan_boss_scene/bdan_boss_room_0Tex_002040" static const ALIGN_ASSET(2) char bdan_boss_room_0Tex_002040[] = dbdan_boss_room_0Tex_002040; -#define dbdan_boss_room_0TLUT_001E38 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_room_0TLUT_001E38" -static const ALIGN_ASSET(2) char bdan_boss_room_0TLUT_001E38[] = dbdan_boss_room_0TLUT_001E38; - -#define dbdan_boss_room_0DL_002A00 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_room_0DL_002A00" -static const ALIGN_ASSET(2) char bdan_boss_room_0DL_002A00[] = dbdan_boss_room_0DL_002A00; - -#define dbdan_boss_room_0Tex_002C18 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_room_0Tex_002C18" +#define dbdan_boss_room_0Tex_002C18 "__OTR__scenes/shared/bdan_boss_scene/bdan_boss_room_0Tex_002C18" static const ALIGN_ASSET(2) char bdan_boss_room_0Tex_002C18[] = dbdan_boss_room_0Tex_002C18; -#define dbdan_boss_room_0TLUT_002A10 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_room_0TLUT_002A10" +#define dbdan_boss_room_0TLUT_001E38 "__OTR__scenes/shared/bdan_boss_scene/bdan_boss_room_0TLUT_001E38" +static const ALIGN_ASSET(2) char bdan_boss_room_0TLUT_001E38[] = dbdan_boss_room_0TLUT_001E38; + +#define dbdan_boss_room_0TLUT_002A10 "__OTR__scenes/shared/bdan_boss_scene/bdan_boss_room_0TLUT_002A10" static const ALIGN_ASSET(2) char bdan_boss_room_0TLUT_002A10[] = dbdan_boss_room_0TLUT_002A10; +#define dbdan_boss_room_0DL_001E28 "__OTR__scenes/shared/bdan_boss_scene/bdan_boss_room_0DL_001E28" +static const ALIGN_ASSET(2) char bdan_boss_room_0DL_001E28[] = dbdan_boss_room_0DL_001E28; + +#define dbdan_boss_room_0DL_002A00 "__OTR__scenes/shared/bdan_boss_scene/bdan_boss_room_0DL_002A00" +static const ALIGN_ASSET(2) char bdan_boss_room_0DL_002A00[] = dbdan_boss_room_0DL_002A00; + #endif // DUNGEONS_BDAN_BOSS_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_room_1.h b/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_room_1.h index 854997c56..4fc368fff 100644 --- a/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_room_1.h +++ b/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_room_1.h @@ -3,20 +3,20 @@ #include "align_asset_macro.h" -#define dbdan_boss_room_1DL_003A58 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_room_1DL_003A58" -static const ALIGN_ASSET(2) char bdan_boss_room_1DL_003A58[] = dbdan_boss_room_1DL_003A58; +#define dbdan_boss_room_1Tex_003CB8 "__OTR__scenes/shared/bdan_boss_scene/bdan_boss_room_1Tex_003CB8" +static const ALIGN_ASSET(2) char bdan_boss_room_1Tex_003CB8[] = dbdan_boss_room_1Tex_003CB8; -#define dbdan_boss_room_1Tex_0048B8 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_room_1Tex_0048B8" -static const ALIGN_ASSET(2) char bdan_boss_room_1Tex_0048B8[] = dbdan_boss_room_1Tex_0048B8; - -#define dbdan_boss_room_1TLUT_003AB0 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_room_1TLUT_003AB0" -static const ALIGN_ASSET(2) char bdan_boss_room_1TLUT_003AB0[] = dbdan_boss_room_1TLUT_003AB0; - -#define dbdan_boss_room_1Tex_0044B8 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_room_1Tex_0044B8" +#define dbdan_boss_room_1Tex_0044B8 "__OTR__scenes/shared/bdan_boss_scene/bdan_boss_room_1Tex_0044B8" static const ALIGN_ASSET(2) char bdan_boss_room_1Tex_0044B8[] = dbdan_boss_room_1Tex_0044B8; -#define dbdan_boss_room_1Tex_003CB8 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_room_1Tex_003CB8" -static const ALIGN_ASSET(2) char bdan_boss_room_1Tex_003CB8[] = dbdan_boss_room_1Tex_003CB8; +#define dbdan_boss_room_1Tex_0048B8 "__OTR__scenes/shared/bdan_boss_scene/bdan_boss_room_1Tex_0048B8" +static const ALIGN_ASSET(2) char bdan_boss_room_1Tex_0048B8[] = dbdan_boss_room_1Tex_0048B8; + +#define dbdan_boss_room_1TLUT_003AB0 "__OTR__scenes/shared/bdan_boss_scene/bdan_boss_room_1TLUT_003AB0" +static const ALIGN_ASSET(2) char bdan_boss_room_1TLUT_003AB0[] = dbdan_boss_room_1TLUT_003AB0; + +#define dbdan_boss_room_1DL_003A58 "__OTR__scenes/shared/bdan_boss_scene/bdan_boss_room_1DL_003A58" +static const ALIGN_ASSET(2) char bdan_boss_room_1DL_003A58[] = dbdan_boss_room_1DL_003A58; #endif // DUNGEONS_BDAN_BOSS_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_scene.h b/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_scene.h index 01827e86a..5f7d97fa8 100644 --- a/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_scene.h +++ b/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dbdan_boss_sceneCollisionHeader_000E14 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_sceneCollisionHeader_000E14" +#define dbdan_boss_sceneCollisionHeader_000E14 "__OTR__scenes/shared/bdan_boss_scene/bdan_boss_sceneCollisionHeader_000E14" static const ALIGN_ASSET(2) char bdan_boss_sceneCollisionHeader_000E14[] = dbdan_boss_sceneCollisionHeader_000E14; diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_0.h b/soh/assets/scenes/dungeons/ddan/ddan_room_0.h index e475c26d0..27075a8aa 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_0.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_0.h @@ -3,66 +3,93 @@ #include "align_asset_macro.h" -#define dddan_room_0DL_000D98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_000D98" -static const ALIGN_ASSET(2) char ddan_room_0DL_000D98[] = dddan_room_0DL_000D98; - -#define dddan_room_0Tex_018C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_018C98" -static const ALIGN_ASSET(2) char ddan_room_0Tex_018C98[] = dddan_room_0Tex_018C98; +#define dddan_room_0Tex_011498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_011498" +static const ALIGN_ASSET(2) char ddan_room_0Tex_011498[] = dddan_room_0Tex_011498; #define dddan_room_0Tex_011898 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_011898" static const ALIGN_ASSET(2) char ddan_room_0Tex_011898[] = dddan_room_0Tex_011898; -#define dddan_room_0Tex_01B498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_01B498" -static const ALIGN_ASSET(2) char ddan_room_0Tex_01B498[] = dddan_room_0Tex_01B498; - -#define dddan_room_0DL_001710 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_001710" -static const ALIGN_ASSET(2) char ddan_room_0DL_001710[] = dddan_room_0DL_001710; - -#define dddan_room_0Tex_016898 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_016898" -static const ALIGN_ASSET(2) char ddan_room_0Tex_016898[] = dddan_room_0Tex_016898; - -#define dddan_room_0DL_0021E0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_0021E0" -static const ALIGN_ASSET(2) char ddan_room_0DL_0021E0[] = dddan_room_0DL_0021E0; +#define dddan_room_0Tex_011C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_011C98" +static const ALIGN_ASSET(2) char ddan_room_0Tex_011C98[] = dddan_room_0Tex_011C98; #define dddan_room_0Tex_012498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_012498" static const ALIGN_ASSET(2) char ddan_room_0Tex_012498[] = dddan_room_0Tex_012498; +#define dddan_room_0Tex_012C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_012C98" +static const ALIGN_ASSET(2) char ddan_room_0Tex_012C98[] = dddan_room_0Tex_012C98; + +#define dddan_room_0Tex_013C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_013C98" +static const ALIGN_ASSET(2) char ddan_room_0Tex_013C98[] = dddan_room_0Tex_013C98; + +#define dddan_room_0Tex_014C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_014C98" +static const ALIGN_ASSET(2) char ddan_room_0Tex_014C98[] = dddan_room_0Tex_014C98; + +#define dddan_room_0Tex_015498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_015498" +static const ALIGN_ASSET(2) char ddan_room_0Tex_015498[] = dddan_room_0Tex_015498; + +#define dddan_room_0Tex_015C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_015C98" +static const ALIGN_ASSET(2) char ddan_room_0Tex_015C98[] = dddan_room_0Tex_015C98; + +#define dddan_room_0Tex_016498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_016498" +static const ALIGN_ASSET(2) char ddan_room_0Tex_016498[] = dddan_room_0Tex_016498; + +#define dddan_room_0Tex_016898 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_016898" +static const ALIGN_ASSET(2) char ddan_room_0Tex_016898[] = dddan_room_0Tex_016898; + +#define dddan_room_0Tex_017098 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_017098" +static const ALIGN_ASSET(2) char ddan_room_0Tex_017098[] = dddan_room_0Tex_017098; + +#define dddan_room_0Tex_017898 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_017898" +static const ALIGN_ASSET(2) char ddan_room_0Tex_017898[] = dddan_room_0Tex_017898; + +#define dddan_room_0Tex_017C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_017C98" +static const ALIGN_ASSET(2) char ddan_room_0Tex_017C98[] = dddan_room_0Tex_017C98; + #define dddan_room_0Tex_018498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_018498" static const ALIGN_ASSET(2) char ddan_room_0Tex_018498[] = dddan_room_0Tex_018498; +#define dddan_room_0Tex_018C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_018C98" +static const ALIGN_ASSET(2) char ddan_room_0Tex_018C98[] = dddan_room_0Tex_018C98; + +#define dddan_room_0Tex_019498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_019498" +static const ALIGN_ASSET(2) char ddan_room_0Tex_019498[] = dddan_room_0Tex_019498; + +#define dddan_room_0Tex_01A498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_01A498" +static const ALIGN_ASSET(2) char ddan_room_0Tex_01A498[] = dddan_room_0Tex_01A498; + +#define dddan_room_0Tex_01B498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_01B498" +static const ALIGN_ASSET(2) char ddan_room_0Tex_01B498[] = dddan_room_0Tex_01B498; + +#define dddan_room_0TLUT_011290 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0TLUT_011290" +static const ALIGN_ASSET(2) char ddan_room_0TLUT_011290[] = dddan_room_0TLUT_011290; + +#define dddan_room_0DL_000D98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_000D98" +static const ALIGN_ASSET(2) char ddan_room_0DL_000D98[] = dddan_room_0DL_000D98; + +#define dddan_room_0DL_001710 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_001710" +static const ALIGN_ASSET(2) char ddan_room_0DL_001710[] = dddan_room_0DL_001710; + +#define dddan_room_0DL_0021E0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_0021E0" +static const ALIGN_ASSET(2) char ddan_room_0DL_0021E0[] = dddan_room_0DL_0021E0; + #define dddan_room_0DL_002F28 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_002F28" static const ALIGN_ASSET(2) char ddan_room_0DL_002F28[] = dddan_room_0DL_002F28; #define dddan_room_0DL_004110 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_004110" static const ALIGN_ASSET(2) char ddan_room_0DL_004110[] = dddan_room_0DL_004110; -#define dddan_room_0Tex_015C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_015C98" -static const ALIGN_ASSET(2) char ddan_room_0Tex_015C98[] = dddan_room_0Tex_015C98; - #define dddan_room_0DL_0050A8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_0050A8" static const ALIGN_ASSET(2) char ddan_room_0DL_0050A8[] = dddan_room_0DL_0050A8; #define dddan_room_0DL_006588 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_006588" static const ALIGN_ASSET(2) char ddan_room_0DL_006588[] = dddan_room_0DL_006588; -#define dddan_room_0Tex_017898 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_017898" -static const ALIGN_ASSET(2) char ddan_room_0Tex_017898[] = dddan_room_0Tex_017898; - -#define dddan_room_0Tex_016498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_016498" -static const ALIGN_ASSET(2) char ddan_room_0Tex_016498[] = dddan_room_0Tex_016498; - -#define dddan_room_0TLUT_011290 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0TLUT_011290" -static const ALIGN_ASSET(2) char ddan_room_0TLUT_011290[] = dddan_room_0TLUT_011290; - #define dddan_room_0DL_0072B8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_0072B8" static const ALIGN_ASSET(2) char ddan_room_0DL_0072B8[] = dddan_room_0DL_0072B8; #define dddan_room_0DL_007E68 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_007E68" static const ALIGN_ASSET(2) char ddan_room_0DL_007E68[] = dddan_room_0DL_007E68; -#define dddan_room_0Tex_011498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_011498" -static const ALIGN_ASSET(2) char ddan_room_0Tex_011498[] = dddan_room_0Tex_011498; - #define dddan_room_0DL_009110 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_009110" static const ALIGN_ASSET(2) char ddan_room_0DL_009110[] = dddan_room_0DL_009110; @@ -72,9 +99,6 @@ static const ALIGN_ASSET(2) char ddan_room_0DL_00A0B8[] = dddan_room_0DL_00A0B8; #define dddan_room_0DL_00AE68 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_00AE68" static const ALIGN_ASSET(2) char ddan_room_0DL_00AE68[] = dddan_room_0DL_00AE68; -#define dddan_room_0Tex_017098 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_017098" -static const ALIGN_ASSET(2) char ddan_room_0Tex_017098[] = dddan_room_0Tex_017098; - #define dddan_room_0DL_00B520 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_00B520" static const ALIGN_ASSET(2) char ddan_room_0DL_00B520[] = dddan_room_0DL_00B520; @@ -87,36 +111,12 @@ static const ALIGN_ASSET(2) char ddan_room_0DL_00C518[] = dddan_room_0DL_00C518; #define dddan_room_0DL_00CD38 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_00CD38" static const ALIGN_ASSET(2) char ddan_room_0DL_00CD38[] = dddan_room_0DL_00CD38; -#define dddan_room_0Tex_013C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_013C98" -static const ALIGN_ASSET(2) char ddan_room_0Tex_013C98[] = dddan_room_0Tex_013C98; - -#define dddan_room_0Tex_011C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_011C98" -static const ALIGN_ASSET(2) char ddan_room_0Tex_011C98[] = dddan_room_0Tex_011C98; - -#define dddan_room_0Tex_012C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_012C98" -static const ALIGN_ASSET(2) char ddan_room_0Tex_012C98[] = dddan_room_0Tex_012C98; - #define dddan_room_0DL_00DE20 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_00DE20" static const ALIGN_ASSET(2) char ddan_room_0DL_00DE20[] = dddan_room_0DL_00DE20; -#define dddan_room_0Tex_01A498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_01A498" -static const ALIGN_ASSET(2) char ddan_room_0Tex_01A498[] = dddan_room_0Tex_01A498; - -#define dddan_room_0Tex_019498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_019498" -static const ALIGN_ASSET(2) char ddan_room_0Tex_019498[] = dddan_room_0Tex_019498; - -#define dddan_room_0Tex_014C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_014C98" -static const ALIGN_ASSET(2) char ddan_room_0Tex_014C98[] = dddan_room_0Tex_014C98; - #define dddan_room_0DL_00F100 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_00F100" static const ALIGN_ASSET(2) char ddan_room_0DL_00F100[] = dddan_room_0DL_00F100; -#define dddan_room_0Tex_017C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_017C98" -static const ALIGN_ASSET(2) char ddan_room_0Tex_017C98[] = dddan_room_0Tex_017C98; - -#define dddan_room_0Tex_015498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_015498" -static const ALIGN_ASSET(2) char ddan_room_0Tex_015498[] = dddan_room_0Tex_015498; - #define dddan_room_0DL_010238 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_010238" static const ALIGN_ASSET(2) char ddan_room_0DL_010238[] = dddan_room_0DL_010238; diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_1.h b/soh/assets/scenes/dungeons/ddan/ddan_room_1.h index 56cdae2d3..51b404364 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_1.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_1.h @@ -3,41 +3,41 @@ #include "align_asset_macro.h" -#define dddan_room_1DL_002520 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1DL_002520" -static const ALIGN_ASSET(2) char ddan_room_1DL_002520[] = dddan_room_1DL_002520; - #define dddan_room_1Tex_004770 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_004770" static const ALIGN_ASSET(2) char ddan_room_1Tex_004770[] = dddan_room_1Tex_004770; -#define dddan_room_1Tex_007F70 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_007F70" -static const ALIGN_ASSET(2) char ddan_room_1Tex_007F70[] = dddan_room_1Tex_007F70; +#define dddan_room_1Tex_004B70 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_004B70" +static const ALIGN_ASSET(2) char ddan_room_1Tex_004B70[] = dddan_room_1Tex_004B70; -#define dddan_room_1Tex_008770 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_008770" -static const ALIGN_ASSET(2) char ddan_room_1Tex_008770[] = dddan_room_1Tex_008770; - -#define dddan_room_1Tex_009770 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_009770" -static const ALIGN_ASSET(2) char ddan_room_1Tex_009770[] = dddan_room_1Tex_009770; +#define dddan_room_1Tex_004F70 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_004F70" +static const ALIGN_ASSET(2) char ddan_room_1Tex_004F70[] = dddan_room_1Tex_004F70; #define dddan_room_1Tex_005770 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_005770" static const ALIGN_ASSET(2) char ddan_room_1Tex_005770[] = dddan_room_1Tex_005770; -#define dddan_room_1Tex_004B70 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_004B70" -static const ALIGN_ASSET(2) char ddan_room_1Tex_004B70[] = dddan_room_1Tex_004B70; - #define dddan_room_1Tex_005F70 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_005F70" static const ALIGN_ASSET(2) char ddan_room_1Tex_005F70[] = dddan_room_1Tex_005F70; #define dddan_room_1Tex_006F70 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_006F70" static const ALIGN_ASSET(2) char ddan_room_1Tex_006F70[] = dddan_room_1Tex_006F70; -#define dddan_room_1Tex_004F70 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_004F70" -static const ALIGN_ASSET(2) char ddan_room_1Tex_004F70[] = dddan_room_1Tex_004F70; +#define dddan_room_1Tex_007F70 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_007F70" +static const ALIGN_ASSET(2) char ddan_room_1Tex_007F70[] = dddan_room_1Tex_007F70; -#define dddan_room_1DL_004630 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1DL_004630" -static const ALIGN_ASSET(2) char ddan_room_1DL_004630[] = dddan_room_1DL_004630; +#define dddan_room_1Tex_008770 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_008770" +static const ALIGN_ASSET(2) char ddan_room_1Tex_008770[] = dddan_room_1Tex_008770; #define dddan_room_1Tex_008F70 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_008F70" static const ALIGN_ASSET(2) char ddan_room_1Tex_008F70[] = dddan_room_1Tex_008F70; +#define dddan_room_1Tex_009770 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_009770" +static const ALIGN_ASSET(2) char ddan_room_1Tex_009770[] = dddan_room_1Tex_009770; + +#define dddan_room_1DL_002520 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1DL_002520" +static const ALIGN_ASSET(2) char ddan_room_1DL_002520[] = dddan_room_1DL_002520; + +#define dddan_room_1DL_004630 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1DL_004630" +static const ALIGN_ASSET(2) char ddan_room_1DL_004630[] = dddan_room_1DL_004630; + #endif // DUNGEONS_DDAN_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_10.h b/soh/assets/scenes/dungeons/ddan/ddan_room_10.h index e7cd22c3a..429fff0f4 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_10.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_10.h @@ -3,20 +3,26 @@ #include "align_asset_macro.h" -#define dddan_room_10DL_001B10 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10DL_001B10" -static const ALIGN_ASSET(2) char ddan_room_10DL_001B10[] = dddan_room_10DL_001B10; +#define dddan_room_10Tex_002B10 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_002B10" +static const ALIGN_ASSET(2) char ddan_room_10Tex_002B10[] = dddan_room_10Tex_002B10; -#define dddan_room_10Tex_004F10 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_004F10" -static const ALIGN_ASSET(2) char ddan_room_10Tex_004F10[] = dddan_room_10Tex_004F10; +#define dddan_room_10Tex_002F10 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_002F10" +static const ALIGN_ASSET(2) char ddan_room_10Tex_002F10[] = dddan_room_10Tex_002F10; + +#define dddan_room_10Tex_003710 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_003710" +static const ALIGN_ASSET(2) char ddan_room_10Tex_003710[] = dddan_room_10Tex_003710; + +#define dddan_room_10Tex_003B10 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_003B10" +static const ALIGN_ASSET(2) char ddan_room_10Tex_003B10[] = dddan_room_10Tex_003B10; + +#define dddan_room_10Tex_004310 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_004310" +static const ALIGN_ASSET(2) char ddan_room_10Tex_004310[] = dddan_room_10Tex_004310; #define dddan_room_10Tex_004710 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_004710" static const ALIGN_ASSET(2) char ddan_room_10Tex_004710[] = dddan_room_10Tex_004710; -#define dddan_room_10Tex_007B10 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_007B10" -static const ALIGN_ASSET(2) char ddan_room_10Tex_007B10[] = dddan_room_10Tex_007B10; - -#define dddan_room_10Tex_002F10 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_002F10" -static const ALIGN_ASSET(2) char ddan_room_10Tex_002F10[] = dddan_room_10Tex_002F10; +#define dddan_room_10Tex_004F10 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_004F10" +static const ALIGN_ASSET(2) char ddan_room_10Tex_004F10[] = dddan_room_10Tex_004F10; #define dddan_room_10Tex_005310 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_005310" static const ALIGN_ASSET(2) char ddan_room_10Tex_005310[] = dddan_room_10Tex_005310; @@ -24,20 +30,14 @@ static const ALIGN_ASSET(2) char ddan_room_10Tex_005310[] = dddan_room_10Tex_005 #define dddan_room_10Tex_006310 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_006310" static const ALIGN_ASSET(2) char ddan_room_10Tex_006310[] = dddan_room_10Tex_006310; -#define dddan_room_10Tex_003B10 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_003B10" -static const ALIGN_ASSET(2) char ddan_room_10Tex_003B10[] = dddan_room_10Tex_003B10; - -#define dddan_room_10Tex_003710 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_003710" -static const ALIGN_ASSET(2) char ddan_room_10Tex_003710[] = dddan_room_10Tex_003710; - -#define dddan_room_10Tex_004310 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_004310" -static const ALIGN_ASSET(2) char ddan_room_10Tex_004310[] = dddan_room_10Tex_004310; - -#define dddan_room_10Tex_002B10 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_002B10" -static const ALIGN_ASSET(2) char ddan_room_10Tex_002B10[] = dddan_room_10Tex_002B10; - #define dddan_room_10Tex_007310 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_007310" static const ALIGN_ASSET(2) char ddan_room_10Tex_007310[] = dddan_room_10Tex_007310; +#define dddan_room_10Tex_007B10 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_007B10" +static const ALIGN_ASSET(2) char ddan_room_10Tex_007B10[] = dddan_room_10Tex_007B10; + +#define dddan_room_10DL_001B10 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10DL_001B10" +static const ALIGN_ASSET(2) char ddan_room_10DL_001B10[] = dddan_room_10DL_001B10; + #endif // DUNGEONS_DDAN_ROOM_10_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_11.h b/soh/assets/scenes/dungeons/ddan/ddan_room_11.h index 2dfed8d44..d2fd67440 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_11.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_11.h @@ -3,17 +3,17 @@ #include "align_asset_macro.h" -#define dddan_room_11DL_0006A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_11DL_0006A0" -static const ALIGN_ASSET(2) char ddan_room_11DL_0006A0[] = dddan_room_11DL_0006A0; - -#define dddan_room_11Tex_001C30 "__OTR__scenes/nonmq/ddan_scene/ddan_room_11Tex_001C30" -static const ALIGN_ASSET(2) char ddan_room_11Tex_001C30[] = dddan_room_11Tex_001C30; +#define dddan_room_11Tex_000C30 "__OTR__scenes/nonmq/ddan_scene/ddan_room_11Tex_000C30" +static const ALIGN_ASSET(2) char ddan_room_11Tex_000C30[] = dddan_room_11Tex_000C30; #define dddan_room_11Tex_001430 "__OTR__scenes/nonmq/ddan_scene/ddan_room_11Tex_001430" static const ALIGN_ASSET(2) char ddan_room_11Tex_001430[] = dddan_room_11Tex_001430; -#define dddan_room_11Tex_000C30 "__OTR__scenes/nonmq/ddan_scene/ddan_room_11Tex_000C30" -static const ALIGN_ASSET(2) char ddan_room_11Tex_000C30[] = dddan_room_11Tex_000C30; +#define dddan_room_11Tex_001C30 "__OTR__scenes/nonmq/ddan_scene/ddan_room_11Tex_001C30" +static const ALIGN_ASSET(2) char ddan_room_11Tex_001C30[] = dddan_room_11Tex_001C30; + +#define dddan_room_11DL_0006A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_11DL_0006A0" +static const ALIGN_ASSET(2) char ddan_room_11DL_0006A0[] = dddan_room_11DL_0006A0; #endif // DUNGEONS_DDAN_ROOM_11_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_12.h b/soh/assets/scenes/dungeons/ddan/ddan_room_12.h index f63f65ec2..443d91a02 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_12.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_12.h @@ -3,44 +3,44 @@ #include "align_asset_macro.h" -#define dddan_room_12DL_001BE0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12DL_001BE0" -static const ALIGN_ASSET(2) char ddan_room_12DL_001BE0[] = dddan_room_12DL_001BE0; - -#define dddan_room_12Tex_007B80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_007B80" -static const ALIGN_ASSET(2) char ddan_room_12Tex_007B80[] = dddan_room_12Tex_007B80; - -#define dddan_room_12Tex_005380 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_005380" -static const ALIGN_ASSET(2) char ddan_room_12Tex_005380[] = dddan_room_12Tex_005380; - -#define dddan_room_12Tex_007780 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_007780" -static const ALIGN_ASSET(2) char ddan_room_12Tex_007780[] = dddan_room_12Tex_007780; - -#define dddan_room_12Tex_004B80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_004B80" -static const ALIGN_ASSET(2) char ddan_room_12Tex_004B80[] = dddan_room_12Tex_004B80; - -#define dddan_room_12Tex_008380 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_008380" -static const ALIGN_ASSET(2) char ddan_room_12Tex_008380[] = dddan_room_12Tex_008380; +#define dddan_room_12Tex_002F80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_002F80" +static const ALIGN_ASSET(2) char ddan_room_12Tex_002F80[] = dddan_room_12Tex_002F80; #define dddan_room_12Tex_003380 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_003380" static const ALIGN_ASSET(2) char ddan_room_12Tex_003380[] = dddan_room_12Tex_003380; -#define dddan_room_12Tex_006780 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_006780" -static const ALIGN_ASSET(2) char ddan_room_12Tex_006780[] = dddan_room_12Tex_006780; - -#define dddan_room_12Tex_005780 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_005780" -static const ALIGN_ASSET(2) char ddan_room_12Tex_005780[] = dddan_room_12Tex_005780; +#define dddan_room_12Tex_003B80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_003B80" +static const ALIGN_ASSET(2) char ddan_room_12Tex_003B80[] = dddan_room_12Tex_003B80; #define dddan_room_12Tex_003F80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_003F80" static const ALIGN_ASSET(2) char ddan_room_12Tex_003F80[] = dddan_room_12Tex_003F80; -#define dddan_room_12Tex_003B80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_003B80" -static const ALIGN_ASSET(2) char ddan_room_12Tex_003B80[] = dddan_room_12Tex_003B80; - #define dddan_room_12Tex_004780 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_004780" static const ALIGN_ASSET(2) char ddan_room_12Tex_004780[] = dddan_room_12Tex_004780; -#define dddan_room_12Tex_002F80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_002F80" -static const ALIGN_ASSET(2) char ddan_room_12Tex_002F80[] = dddan_room_12Tex_002F80; +#define dddan_room_12Tex_004B80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_004B80" +static const ALIGN_ASSET(2) char ddan_room_12Tex_004B80[] = dddan_room_12Tex_004B80; + +#define dddan_room_12Tex_005380 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_005380" +static const ALIGN_ASSET(2) char ddan_room_12Tex_005380[] = dddan_room_12Tex_005380; + +#define dddan_room_12Tex_005780 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_005780" +static const ALIGN_ASSET(2) char ddan_room_12Tex_005780[] = dddan_room_12Tex_005780; + +#define dddan_room_12Tex_006780 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_006780" +static const ALIGN_ASSET(2) char ddan_room_12Tex_006780[] = dddan_room_12Tex_006780; + +#define dddan_room_12Tex_007780 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_007780" +static const ALIGN_ASSET(2) char ddan_room_12Tex_007780[] = dddan_room_12Tex_007780; + +#define dddan_room_12Tex_007B80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_007B80" +static const ALIGN_ASSET(2) char ddan_room_12Tex_007B80[] = dddan_room_12Tex_007B80; + +#define dddan_room_12Tex_008380 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_008380" +static const ALIGN_ASSET(2) char ddan_room_12Tex_008380[] = dddan_room_12Tex_008380; + +#define dddan_room_12DL_001BE0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12DL_001BE0" +static const ALIGN_ASSET(2) char ddan_room_12DL_001BE0[] = dddan_room_12DL_001BE0; #endif // DUNGEONS_DDAN_ROOM_12_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_13.h b/soh/assets/scenes/dungeons/ddan/ddan_room_13.h index ba9752dcc..ebb860af3 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_13.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_13.h @@ -3,20 +3,20 @@ #include "align_asset_macro.h" -#define dddan_room_13DL_0006E0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_13DL_0006E0" -static const ALIGN_ASSET(2) char ddan_room_13DL_0006E0[] = dddan_room_13DL_0006E0; +#define dddan_room_13Tex_000CC8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_13Tex_000CC8" +static const ALIGN_ASSET(2) char ddan_room_13Tex_000CC8[] = dddan_room_13Tex_000CC8; #define dddan_room_13Tex_0014C8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_13Tex_0014C8" static const ALIGN_ASSET(2) char ddan_room_13Tex_0014C8[] = dddan_room_13Tex_0014C8; -#define dddan_room_13Tex_0020C8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_13Tex_0020C8" -static const ALIGN_ASSET(2) char ddan_room_13Tex_0020C8[] = dddan_room_13Tex_0020C8; - -#define dddan_room_13Tex_000CC8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_13Tex_000CC8" -static const ALIGN_ASSET(2) char ddan_room_13Tex_000CC8[] = dddan_room_13Tex_000CC8; - #define dddan_room_13Tex_001CC8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_13Tex_001CC8" static const ALIGN_ASSET(2) char ddan_room_13Tex_001CC8[] = dddan_room_13Tex_001CC8; +#define dddan_room_13Tex_0020C8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_13Tex_0020C8" +static const ALIGN_ASSET(2) char ddan_room_13Tex_0020C8[] = dddan_room_13Tex_0020C8; + +#define dddan_room_13DL_0006E0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_13DL_0006E0" +static const ALIGN_ASSET(2) char ddan_room_13DL_0006E0[] = dddan_room_13DL_0006E0; + #endif // DUNGEONS_DDAN_ROOM_13_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_14.h b/soh/assets/scenes/dungeons/ddan/ddan_room_14.h index 7d37556f9..114d62339 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_14.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_14.h @@ -3,20 +3,20 @@ #include "align_asset_macro.h" -#define dddan_room_14DL_0006A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_14DL_0006A0" -static const ALIGN_ASSET(2) char ddan_room_14DL_0006A0[] = dddan_room_14DL_0006A0; - #define dddan_room_14Tex_000CC8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_14Tex_000CC8" static const ALIGN_ASSET(2) char ddan_room_14Tex_000CC8[] = dddan_room_14Tex_000CC8; -#define dddan_room_14Tex_0020C8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_14Tex_0020C8" -static const ALIGN_ASSET(2) char ddan_room_14Tex_0020C8[] = dddan_room_14Tex_0020C8; - #define dddan_room_14Tex_0014C8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_14Tex_0014C8" static const ALIGN_ASSET(2) char ddan_room_14Tex_0014C8[] = dddan_room_14Tex_0014C8; #define dddan_room_14Tex_001CC8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_14Tex_001CC8" static const ALIGN_ASSET(2) char ddan_room_14Tex_001CC8[] = dddan_room_14Tex_001CC8; +#define dddan_room_14Tex_0020C8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_14Tex_0020C8" +static const ALIGN_ASSET(2) char ddan_room_14Tex_0020C8[] = dddan_room_14Tex_0020C8; + +#define dddan_room_14DL_0006A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_14DL_0006A0" +static const ALIGN_ASSET(2) char ddan_room_14DL_0006A0[] = dddan_room_14DL_0006A0; + #endif // DUNGEONS_DDAN_ROOM_14_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_15.h b/soh/assets/scenes/dungeons/ddan/ddan_room_15.h index 8b3993eca..df5973361 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_15.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_15.h @@ -3,8 +3,11 @@ #include "align_asset_macro.h" -#define dddan_room_15DL_000780 "__OTR__scenes/nonmq/ddan_scene/ddan_room_15DL_000780" -static const ALIGN_ASSET(2) char ddan_room_15DL_000780[] = dddan_room_15DL_000780; +#define dddan_room_15Tex_000D28 "__OTR__scenes/nonmq/ddan_scene/ddan_room_15Tex_000D28" +static const ALIGN_ASSET(2) char ddan_room_15Tex_000D28[] = dddan_room_15Tex_000D28; + +#define dddan_room_15Tex_001528 "__OTR__scenes/nonmq/ddan_scene/ddan_room_15Tex_001528" +static const ALIGN_ASSET(2) char ddan_room_15Tex_001528[] = dddan_room_15Tex_001528; #define dddan_room_15Tex_001D28 "__OTR__scenes/nonmq/ddan_scene/ddan_room_15Tex_001D28" static const ALIGN_ASSET(2) char ddan_room_15Tex_001D28[] = dddan_room_15Tex_001D28; @@ -12,11 +15,8 @@ static const ALIGN_ASSET(2) char ddan_room_15Tex_001D28[] = dddan_room_15Tex_001 #define dddan_room_15Tex_002528 "__OTR__scenes/nonmq/ddan_scene/ddan_room_15Tex_002528" static const ALIGN_ASSET(2) char ddan_room_15Tex_002528[] = dddan_room_15Tex_002528; -#define dddan_room_15Tex_001528 "__OTR__scenes/nonmq/ddan_scene/ddan_room_15Tex_001528" -static const ALIGN_ASSET(2) char ddan_room_15Tex_001528[] = dddan_room_15Tex_001528; - -#define dddan_room_15Tex_000D28 "__OTR__scenes/nonmq/ddan_scene/ddan_room_15Tex_000D28" -static const ALIGN_ASSET(2) char ddan_room_15Tex_000D28[] = dddan_room_15Tex_000D28; +#define dddan_room_15DL_000780 "__OTR__scenes/nonmq/ddan_scene/ddan_room_15DL_000780" +static const ALIGN_ASSET(2) char ddan_room_15DL_000780[] = dddan_room_15DL_000780; #endif // DUNGEONS_DDAN_ROOM_15_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_16.h b/soh/assets/scenes/dungeons/ddan/ddan_room_16.h index f34baa433..963050044 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_16.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_16.h @@ -3,11 +3,14 @@ #include "align_asset_macro.h" -#define dddan_room_16DL_0009D0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16DL_0009D0" -static const ALIGN_ASSET(2) char ddan_room_16DL_0009D0[] = dddan_room_16DL_0009D0; +#define dddan_room_16Tex_002158 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16Tex_002158" +static const ALIGN_ASSET(2) char ddan_room_16Tex_002158[] = dddan_room_16Tex_002158; -#define dddan_room_16Tex_005158 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16Tex_005158" -static const ALIGN_ASSET(2) char ddan_room_16Tex_005158[] = dddan_room_16Tex_005158; +#define dddan_room_16Tex_003158 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16Tex_003158" +static const ALIGN_ASSET(2) char ddan_room_16Tex_003158[] = dddan_room_16Tex_003158; + +#define dddan_room_16Tex_003958 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16Tex_003958" +static const ALIGN_ASSET(2) char ddan_room_16Tex_003958[] = dddan_room_16Tex_003958; #define dddan_room_16Tex_004158 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16Tex_004158" static const ALIGN_ASSET(2) char ddan_room_16Tex_004158[] = dddan_room_16Tex_004158; @@ -15,17 +18,14 @@ static const ALIGN_ASSET(2) char ddan_room_16Tex_004158[] = dddan_room_16Tex_004 #define dddan_room_16Tex_004958 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16Tex_004958" static const ALIGN_ASSET(2) char ddan_room_16Tex_004958[] = dddan_room_16Tex_004958; +#define dddan_room_16Tex_005158 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16Tex_005158" +static const ALIGN_ASSET(2) char ddan_room_16Tex_005158[] = dddan_room_16Tex_005158; + +#define dddan_room_16DL_0009D0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16DL_0009D0" +static const ALIGN_ASSET(2) char ddan_room_16DL_0009D0[] = dddan_room_16DL_0009D0; + #define dddan_room_16DL_0019B8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16DL_0019B8" static const ALIGN_ASSET(2) char ddan_room_16DL_0019B8[] = dddan_room_16DL_0019B8; -#define dddan_room_16Tex_003158 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16Tex_003158" -static const ALIGN_ASSET(2) char ddan_room_16Tex_003158[] = dddan_room_16Tex_003158; - -#define dddan_room_16Tex_002158 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16Tex_002158" -static const ALIGN_ASSET(2) char ddan_room_16Tex_002158[] = dddan_room_16Tex_002158; - -#define dddan_room_16Tex_003958 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16Tex_003958" -static const ALIGN_ASSET(2) char ddan_room_16Tex_003958[] = dddan_room_16Tex_003958; - #endif // DUNGEONS_DDAN_ROOM_16_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_2.h b/soh/assets/scenes/dungeons/ddan/ddan_room_2.h index 2c8a3c2ed..687616b82 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_2.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_2.h @@ -3,41 +3,41 @@ #include "align_asset_macro.h" -#define dddan_room_2DL_001B30 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2DL_001B30" -static const ALIGN_ASSET(2) char ddan_room_2DL_001B30[] = dddan_room_2DL_001B30; - -#define dddan_room_2Tex_004B80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_004B80" -static const ALIGN_ASSET(2) char ddan_room_2Tex_004B80[] = dddan_room_2Tex_004B80; - -#define dddan_room_2Tex_006380 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_006380" -static const ALIGN_ASSET(2) char ddan_room_2Tex_006380[] = dddan_room_2Tex_006380; - #define dddan_room_2Tex_003B80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_003B80" static const ALIGN_ASSET(2) char ddan_room_2Tex_003B80[] = dddan_room_2Tex_003B80; -#define dddan_room_2Tex_005F80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_005F80" -static const ALIGN_ASSET(2) char ddan_room_2Tex_005F80[] = dddan_room_2Tex_005F80; - -#define dddan_room_2Tex_005380 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_005380" -static const ALIGN_ASSET(2) char ddan_room_2Tex_005380[] = dddan_room_2Tex_005380; - -#define dddan_room_2Tex_004780 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_004780" -static const ALIGN_ASSET(2) char ddan_room_2Tex_004780[] = dddan_room_2Tex_004780; - #define dddan_room_2Tex_004380 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_004380" static const ALIGN_ASSET(2) char ddan_room_2Tex_004380[] = dddan_room_2Tex_004380; +#define dddan_room_2Tex_004780 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_004780" +static const ALIGN_ASSET(2) char ddan_room_2Tex_004780[] = dddan_room_2Tex_004780; + +#define dddan_room_2Tex_004B80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_004B80" +static const ALIGN_ASSET(2) char ddan_room_2Tex_004B80[] = dddan_room_2Tex_004B80; + +#define dddan_room_2Tex_005380 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_005380" +static const ALIGN_ASSET(2) char ddan_room_2Tex_005380[] = dddan_room_2Tex_005380; + #define dddan_room_2Tex_005B80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_005B80" static const ALIGN_ASSET(2) char ddan_room_2Tex_005B80[] = dddan_room_2Tex_005B80; +#define dddan_room_2Tex_005F80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_005F80" +static const ALIGN_ASSET(2) char ddan_room_2Tex_005F80[] = dddan_room_2Tex_005F80; + +#define dddan_room_2Tex_006380 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_006380" +static const ALIGN_ASSET(2) char ddan_room_2Tex_006380[] = dddan_room_2Tex_006380; + +#define dddan_room_2Tex_006EB8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_006EB8" +static const ALIGN_ASSET(2) char ddan_room_2Tex_006EB8[] = dddan_room_2Tex_006EB8; + +#define dddan_room_2DL_001B30 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2DL_001B30" +static const ALIGN_ASSET(2) char ddan_room_2DL_001B30[] = dddan_room_2DL_001B30; + #define dddan_room_2DL_0035C8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2DL_0035C8" static const ALIGN_ASSET(2) char ddan_room_2DL_0035C8[] = dddan_room_2DL_0035C8; #define dddan_room_2DL_006CB0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2DL_006CB0" static const ALIGN_ASSET(2) char ddan_room_2DL_006CB0[] = dddan_room_2DL_006CB0; -#define dddan_room_2Tex_006EB8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_006EB8" -static const ALIGN_ASSET(2) char ddan_room_2Tex_006EB8[] = dddan_room_2Tex_006EB8; - #endif // DUNGEONS_DDAN_ROOM_2_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_3.h b/soh/assets/scenes/dungeons/ddan/ddan_room_3.h index 76b5b7bb9..f23526a81 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_3.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_3.h @@ -3,23 +3,11 @@ #include "align_asset_macro.h" -#define dddan_room_3DL_0018F0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_0018F0" -static const ALIGN_ASSET(2) char ddan_room_3DL_0018F0[] = dddan_room_3DL_0018F0; - -#define dddan_room_3Tex_00A838 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00A838" -static const ALIGN_ASSET(2) char ddan_room_3Tex_00A838[] = dddan_room_3Tex_00A838; - -#define dddan_room_3Tex_008C38 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_008C38" -static const ALIGN_ASSET(2) char ddan_room_3Tex_008C38[] = dddan_room_3Tex_008C38; - -#define dddan_room_3Tex_00D038 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00D038" -static const ALIGN_ASSET(2) char ddan_room_3Tex_00D038[] = dddan_room_3Tex_00D038; - #define dddan_room_3Tex_008838 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_008838" static const ALIGN_ASSET(2) char ddan_room_3Tex_008838[] = dddan_room_3Tex_008838; -#define dddan_room_3DL_002A40 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_002A40" -static const ALIGN_ASSET(2) char ddan_room_3DL_002A40[] = dddan_room_3DL_002A40; +#define dddan_room_3Tex_008C38 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_008C38" +static const ALIGN_ASSET(2) char ddan_room_3Tex_008C38[] = dddan_room_3Tex_008C38; #define dddan_room_3Tex_009438 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_009438" static const ALIGN_ASSET(2) char ddan_room_3Tex_009438[] = dddan_room_3Tex_009438; @@ -30,26 +18,47 @@ static const ALIGN_ASSET(2) char ddan_room_3Tex_009838[] = dddan_room_3Tex_00983 #define dddan_room_3Tex_00A038 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00A038" static const ALIGN_ASSET(2) char ddan_room_3Tex_00A038[] = dddan_room_3Tex_00A038; +#define dddan_room_3Tex_00A838 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00A838" +static const ALIGN_ASSET(2) char ddan_room_3Tex_00A838[] = dddan_room_3Tex_00A838; + +#define dddan_room_3Tex_00B038 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00B038" +static const ALIGN_ASSET(2) char ddan_room_3Tex_00B038[] = dddan_room_3Tex_00B038; + +#define dddan_room_3Tex_00B438 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00B438" +static const ALIGN_ASSET(2) char ddan_room_3Tex_00B438[] = dddan_room_3Tex_00B438; + #define dddan_room_3Tex_00B838 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00B838" static const ALIGN_ASSET(2) char ddan_room_3Tex_00B838[] = dddan_room_3Tex_00B838; #define dddan_room_3Tex_00BC38 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00BC38" static const ALIGN_ASSET(2) char ddan_room_3Tex_00BC38[] = dddan_room_3Tex_00BC38; -#define dddan_room_3DL_003968 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_003968" -static const ALIGN_ASSET(2) char ddan_room_3DL_003968[] = dddan_room_3DL_003968; - #define dddan_room_3Tex_00C438 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00C438" static const ALIGN_ASSET(2) char ddan_room_3Tex_00C438[] = dddan_room_3Tex_00C438; -#define dddan_room_3DL_005098 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_005098" -static const ALIGN_ASSET(2) char ddan_room_3DL_005098[] = dddan_room_3DL_005098; - #define dddan_room_3Tex_00CC38 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00CC38" static const ALIGN_ASSET(2) char ddan_room_3Tex_00CC38[] = dddan_room_3Tex_00CC38; -#define dddan_room_3Tex_00B438 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00B438" -static const ALIGN_ASSET(2) char ddan_room_3Tex_00B438[] = dddan_room_3Tex_00B438; +#define dddan_room_3Tex_00D038 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00D038" +static const ALIGN_ASSET(2) char ddan_room_3Tex_00D038[] = dddan_room_3Tex_00D038; + +#define dddan_room_3Tex_00D668 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00D668" +static const ALIGN_ASSET(2) char ddan_room_3Tex_00D668[] = dddan_room_3Tex_00D668; + +#define dddan_room_3TLUT_008630 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3TLUT_008630" +static const ALIGN_ASSET(2) char ddan_room_3TLUT_008630[] = dddan_room_3TLUT_008630; + +#define dddan_room_3DL_0018F0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_0018F0" +static const ALIGN_ASSET(2) char ddan_room_3DL_0018F0[] = dddan_room_3DL_0018F0; + +#define dddan_room_3DL_002A40 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_002A40" +static const ALIGN_ASSET(2) char ddan_room_3DL_002A40[] = dddan_room_3DL_002A40; + +#define dddan_room_3DL_003968 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_003968" +static const ALIGN_ASSET(2) char ddan_room_3DL_003968[] = dddan_room_3DL_003968; + +#define dddan_room_3DL_005098 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_005098" +static const ALIGN_ASSET(2) char ddan_room_3DL_005098[] = dddan_room_3DL_005098; #define dddan_room_3DL_006510 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_006510" static const ALIGN_ASSET(2) char ddan_room_3DL_006510[] = dddan_room_3DL_006510; @@ -63,21 +72,12 @@ static const ALIGN_ASSET(2) char ddan_room_3DL_007990[] = dddan_room_3DL_007990; #define dddan_room_3DL_008018 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_008018" static const ALIGN_ASSET(2) char ddan_room_3DL_008018[] = dddan_room_3DL_008018; -#define dddan_room_3TLUT_008630 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3TLUT_008630" -static const ALIGN_ASSET(2) char ddan_room_3TLUT_008630[] = dddan_room_3TLUT_008630; - #define dddan_room_3DL_008430 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_008430" static const ALIGN_ASSET(2) char ddan_room_3DL_008430[] = dddan_room_3DL_008430; -#define dddan_room_3Tex_00B038 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00B038" -static const ALIGN_ASSET(2) char ddan_room_3Tex_00B038[] = dddan_room_3Tex_00B038; - #define dddan_room_3DL_00D560 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_00D560" static const ALIGN_ASSET(2) char ddan_room_3DL_00D560[] = dddan_room_3DL_00D560; -#define dddan_room_3Tex_00D668 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00D668" -static const ALIGN_ASSET(2) char ddan_room_3Tex_00D668[] = dddan_room_3Tex_00D668; - #define dddan_room_3DL_000430 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_000430" static const ALIGN_ASSET(2) char ddan_room_3DL_000430[] = dddan_room_3DL_000430; diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_4.h b/soh/assets/scenes/dungeons/ddan/ddan_room_4.h index f8e792c01..1944d691c 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_4.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_4.h @@ -3,35 +3,35 @@ #include "align_asset_macro.h" -#define dddan_room_4DL_003260 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4DL_003260" -static const ALIGN_ASSET(2) char ddan_room_4DL_003260[] = dddan_room_4DL_003260; - -#define dddan_room_4Tex_007D58 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4Tex_007D58" -static const ALIGN_ASSET(2) char ddan_room_4Tex_007D58[] = dddan_room_4Tex_007D58; +#define dddan_room_4Tex_006D58 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4Tex_006D58" +static const ALIGN_ASSET(2) char ddan_room_4Tex_006D58[] = dddan_room_4Tex_006D58; #define dddan_room_4Tex_007158 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4Tex_007158" static const ALIGN_ASSET(2) char ddan_room_4Tex_007158[] = dddan_room_4Tex_007158; -#define dddan_room_4TLUT_006B50 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4TLUT_006B50" -static const ALIGN_ASSET(2) char ddan_room_4TLUT_006B50[] = dddan_room_4TLUT_006B50; - -#define dddan_room_4Tex_009158 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4Tex_009158" -static const ALIGN_ASSET(2) char ddan_room_4Tex_009158[] = dddan_room_4Tex_009158; - #define dddan_room_4Tex_007558 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4Tex_007558" static const ALIGN_ASSET(2) char ddan_room_4Tex_007558[] = dddan_room_4Tex_007558; -#define dddan_room_4Tex_008D58 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4Tex_008D58" -static const ALIGN_ASSET(2) char ddan_room_4Tex_008D58[] = dddan_room_4Tex_008D58; - -#define dddan_room_4Tex_006D58 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4Tex_006D58" -static const ALIGN_ASSET(2) char ddan_room_4Tex_006D58[] = dddan_room_4Tex_006D58; - -#define dddan_room_4DL_0068C0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4DL_0068C0" -static const ALIGN_ASSET(2) char ddan_room_4DL_0068C0[] = dddan_room_4DL_0068C0; +#define dddan_room_4Tex_007D58 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4Tex_007D58" +static const ALIGN_ASSET(2) char ddan_room_4Tex_007D58[] = dddan_room_4Tex_007D58; #define dddan_room_4Tex_008558 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4Tex_008558" static const ALIGN_ASSET(2) char ddan_room_4Tex_008558[] = dddan_room_4Tex_008558; +#define dddan_room_4Tex_008D58 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4Tex_008D58" +static const ALIGN_ASSET(2) char ddan_room_4Tex_008D58[] = dddan_room_4Tex_008D58; + +#define dddan_room_4Tex_009158 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4Tex_009158" +static const ALIGN_ASSET(2) char ddan_room_4Tex_009158[] = dddan_room_4Tex_009158; + +#define dddan_room_4TLUT_006B50 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4TLUT_006B50" +static const ALIGN_ASSET(2) char ddan_room_4TLUT_006B50[] = dddan_room_4TLUT_006B50; + +#define dddan_room_4DL_003260 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4DL_003260" +static const ALIGN_ASSET(2) char ddan_room_4DL_003260[] = dddan_room_4DL_003260; + +#define dddan_room_4DL_0068C0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4DL_0068C0" +static const ALIGN_ASSET(2) char ddan_room_4DL_0068C0[] = dddan_room_4DL_0068C0; + #endif // DUNGEONS_DDAN_ROOM_4_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_5.h b/soh/assets/scenes/dungeons/ddan/ddan_room_5.h index 0ff71839f..92776c592 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_5.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_5.h @@ -3,29 +3,29 @@ #include "align_asset_macro.h" -#define dddan_room_5DL_001D70 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5DL_001D70" -static const ALIGN_ASSET(2) char ddan_room_5DL_001D70[] = dddan_room_5DL_001D70; - -#define dddan_room_5Tex_0042B8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5Tex_0042B8" -static const ALIGN_ASSET(2) char ddan_room_5Tex_0042B8[] = dddan_room_5Tex_0042B8; - -#define dddan_room_5Tex_004AB8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5Tex_004AB8" -static const ALIGN_ASSET(2) char ddan_room_5Tex_004AB8[] = dddan_room_5Tex_004AB8; - #define dddan_room_5Tex_0032B8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5Tex_0032B8" static const ALIGN_ASSET(2) char ddan_room_5Tex_0032B8[] = dddan_room_5Tex_0032B8; -#define dddan_room_5Tex_004EB8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5Tex_004EB8" -static const ALIGN_ASSET(2) char ddan_room_5Tex_004EB8[] = dddan_room_5Tex_004EB8; - -#define dddan_room_5Tex_0046B8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5Tex_0046B8" -static const ALIGN_ASSET(2) char ddan_room_5Tex_0046B8[] = dddan_room_5Tex_0046B8; - #define dddan_room_5Tex_003AB8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5Tex_003AB8" static const ALIGN_ASSET(2) char ddan_room_5Tex_003AB8[] = dddan_room_5Tex_003AB8; +#define dddan_room_5Tex_0042B8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5Tex_0042B8" +static const ALIGN_ASSET(2) char ddan_room_5Tex_0042B8[] = dddan_room_5Tex_0042B8; + +#define dddan_room_5Tex_0046B8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5Tex_0046B8" +static const ALIGN_ASSET(2) char ddan_room_5Tex_0046B8[] = dddan_room_5Tex_0046B8; + +#define dddan_room_5Tex_004AB8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5Tex_004AB8" +static const ALIGN_ASSET(2) char ddan_room_5Tex_004AB8[] = dddan_room_5Tex_004AB8; + +#define dddan_room_5Tex_004EB8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5Tex_004EB8" +static const ALIGN_ASSET(2) char ddan_room_5Tex_004EB8[] = dddan_room_5Tex_004EB8; + #define dddan_room_5Tex_0056B8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5Tex_0056B8" static const ALIGN_ASSET(2) char ddan_room_5Tex_0056B8[] = dddan_room_5Tex_0056B8; +#define dddan_room_5DL_001D70 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5DL_001D70" +static const ALIGN_ASSET(2) char ddan_room_5DL_001D70[] = dddan_room_5DL_001D70; + #endif // DUNGEONS_DDAN_ROOM_5_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_6.h b/soh/assets/scenes/dungeons/ddan/ddan_room_6.h index d4a6a0ede..472520ec3 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_6.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_6.h @@ -3,20 +3,20 @@ #include "align_asset_macro.h" -#define dddan_room_6DL_000700 "__OTR__scenes/nonmq/ddan_scene/ddan_room_6DL_000700" -static const ALIGN_ASSET(2) char ddan_room_6DL_000700[] = dddan_room_6DL_000700; - #define dddan_room_6Tex_000CA8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_6Tex_000CA8" static const ALIGN_ASSET(2) char ddan_room_6Tex_000CA8[] = dddan_room_6Tex_000CA8; #define dddan_room_6Tex_0014A8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_6Tex_0014A8" static const ALIGN_ASSET(2) char ddan_room_6Tex_0014A8[] = dddan_room_6Tex_0014A8; -#define dddan_room_6Tex_0020A8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_6Tex_0020A8" -static const ALIGN_ASSET(2) char ddan_room_6Tex_0020A8[] = dddan_room_6Tex_0020A8; - #define dddan_room_6Tex_001CA8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_6Tex_001CA8" static const ALIGN_ASSET(2) char ddan_room_6Tex_001CA8[] = dddan_room_6Tex_001CA8; +#define dddan_room_6Tex_0020A8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_6Tex_0020A8" +static const ALIGN_ASSET(2) char ddan_room_6Tex_0020A8[] = dddan_room_6Tex_0020A8; + +#define dddan_room_6DL_000700 "__OTR__scenes/nonmq/ddan_scene/ddan_room_6DL_000700" +static const ALIGN_ASSET(2) char ddan_room_6DL_000700[] = dddan_room_6DL_000700; + #endif // DUNGEONS_DDAN_ROOM_6_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_7.h b/soh/assets/scenes/dungeons/ddan/ddan_room_7.h index 034fa7ac1..1de794e98 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_7.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_7.h @@ -3,18 +3,12 @@ #include "align_asset_macro.h" -#define dddan_room_7DL_002670 "__OTR__scenes/nonmq/ddan_scene/ddan_room_7DL_002670" -static const ALIGN_ASSET(2) char ddan_room_7DL_002670[] = dddan_room_7DL_002670; - #define dddan_room_7Tex_0046F8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_7Tex_0046F8" static const ALIGN_ASSET(2) char ddan_room_7Tex_0046F8[] = dddan_room_7Tex_0046F8; #define dddan_room_7Tex_004AF8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_7Tex_004AF8" static const ALIGN_ASSET(2) char ddan_room_7Tex_004AF8[] = dddan_room_7Tex_004AF8; -#define dddan_room_7Tex_0066F8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_7Tex_0066F8" -static const ALIGN_ASSET(2) char ddan_room_7Tex_0066F8[] = dddan_room_7Tex_0066F8; - #define dddan_room_7Tex_004EF8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_7Tex_004EF8" static const ALIGN_ASSET(2) char ddan_room_7Tex_004EF8[] = dddan_room_7Tex_004EF8; @@ -24,9 +18,15 @@ static const ALIGN_ASSET(2) char ddan_room_7Tex_0056F8[] = dddan_room_7Tex_0056F #define dddan_room_7Tex_005EF8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_7Tex_005EF8" static const ALIGN_ASSET(2) char ddan_room_7Tex_005EF8[] = dddan_room_7Tex_005EF8; +#define dddan_room_7Tex_0066F8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_7Tex_0066F8" +static const ALIGN_ASSET(2) char ddan_room_7Tex_0066F8[] = dddan_room_7Tex_0066F8; + #define dddan_room_7Tex_006EF8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_7Tex_006EF8" static const ALIGN_ASSET(2) char ddan_room_7Tex_006EF8[] = dddan_room_7Tex_006EF8; +#define dddan_room_7DL_002670 "__OTR__scenes/nonmq/ddan_scene/ddan_room_7DL_002670" +static const ALIGN_ASSET(2) char ddan_room_7DL_002670[] = dddan_room_7DL_002670; + #define dddan_room_7DL_004538 "__OTR__scenes/nonmq/ddan_scene/ddan_room_7DL_004538" static const ALIGN_ASSET(2) char ddan_room_7DL_004538[] = dddan_room_7DL_004538; diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_8.h b/soh/assets/scenes/dungeons/ddan/ddan_room_8.h index 6a2cf811e..2878c82b3 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_8.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_8.h @@ -3,38 +3,17 @@ #include "align_asset_macro.h" -#define dddan_room_8DL_002610 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8DL_002610" -static const ALIGN_ASSET(2) char ddan_room_8DL_002610[] = dddan_room_8DL_002610; +#define dddan_room_8Tex_0041A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0041A0" +static const ALIGN_ASSET(2) char ddan_room_8Tex_0041A0[] = dddan_room_8Tex_0041A0; -#define dddan_room_8Tex_0089A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0089A0" -static const ALIGN_ASSET(2) char ddan_room_8Tex_0089A0[] = dddan_room_8Tex_0089A0; - -#define dddan_room_8Tex_0071A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0071A0" -static const ALIGN_ASSET(2) char ddan_room_8Tex_0071A0[] = dddan_room_8Tex_0071A0; - -#define dddan_room_8Tex_0091A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0091A0" -static const ALIGN_ASSET(2) char ddan_room_8Tex_0091A0[] = dddan_room_8Tex_0091A0; - -#define dddan_room_8Tex_0051A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0051A0" -static const ALIGN_ASSET(2) char ddan_room_8Tex_0051A0[] = dddan_room_8Tex_0051A0; - -#define dddan_room_8Tex_0081A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0081A0" -static const ALIGN_ASSET(2) char ddan_room_8Tex_0081A0[] = dddan_room_8Tex_0081A0; +#define dddan_room_8Tex_0049A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0049A0" +static const ALIGN_ASSET(2) char ddan_room_8Tex_0049A0[] = dddan_room_8Tex_0049A0; #define dddan_room_8Tex_004DA0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_004DA0" static const ALIGN_ASSET(2) char ddan_room_8Tex_004DA0[] = dddan_room_8Tex_004DA0; -#define dddan_room_8Tex_0069A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0069A0" -static const ALIGN_ASSET(2) char ddan_room_8Tex_0069A0[] = dddan_room_8Tex_0069A0; - -#define dddan_room_8Tex_0041A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0041A0" -static const ALIGN_ASSET(2) char ddan_room_8Tex_0041A0[] = dddan_room_8Tex_0041A0; - -#define dddan_room_8Tex_0079A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0079A0" -static const ALIGN_ASSET(2) char ddan_room_8Tex_0079A0[] = dddan_room_8Tex_0079A0; - -#define dddan_room_8Tex_0049A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0049A0" -static const ALIGN_ASSET(2) char ddan_room_8Tex_0049A0[] = dddan_room_8Tex_0049A0; +#define dddan_room_8Tex_0051A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0051A0" +static const ALIGN_ASSET(2) char ddan_room_8Tex_0051A0[] = dddan_room_8Tex_0051A0; #define dddan_room_8Tex_0059A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0059A0" static const ALIGN_ASSET(2) char ddan_room_8Tex_0059A0[] = dddan_room_8Tex_0059A0; @@ -42,5 +21,26 @@ static const ALIGN_ASSET(2) char ddan_room_8Tex_0059A0[] = dddan_room_8Tex_0059A #define dddan_room_8Tex_0061A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0061A0" static const ALIGN_ASSET(2) char ddan_room_8Tex_0061A0[] = dddan_room_8Tex_0061A0; +#define dddan_room_8Tex_0069A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0069A0" +static const ALIGN_ASSET(2) char ddan_room_8Tex_0069A0[] = dddan_room_8Tex_0069A0; + +#define dddan_room_8Tex_0071A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0071A0" +static const ALIGN_ASSET(2) char ddan_room_8Tex_0071A0[] = dddan_room_8Tex_0071A0; + +#define dddan_room_8Tex_0079A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0079A0" +static const ALIGN_ASSET(2) char ddan_room_8Tex_0079A0[] = dddan_room_8Tex_0079A0; + +#define dddan_room_8Tex_0081A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0081A0" +static const ALIGN_ASSET(2) char ddan_room_8Tex_0081A0[] = dddan_room_8Tex_0081A0; + +#define dddan_room_8Tex_0089A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0089A0" +static const ALIGN_ASSET(2) char ddan_room_8Tex_0089A0[] = dddan_room_8Tex_0089A0; + +#define dddan_room_8Tex_0091A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0091A0" +static const ALIGN_ASSET(2) char ddan_room_8Tex_0091A0[] = dddan_room_8Tex_0091A0; + +#define dddan_room_8DL_002610 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8DL_002610" +static const ALIGN_ASSET(2) char ddan_room_8DL_002610[] = dddan_room_8DL_002610; + #endif // DUNGEONS_DDAN_ROOM_8_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_9.h b/soh/assets/scenes/dungeons/ddan/ddan_room_9.h index dee3f237e..17eb8941f 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_room_9.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_room_9.h @@ -3,35 +3,8 @@ #include "align_asset_macro.h" -#define dddan_room_9DL_0032B0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9DL_0032B0" -static const ALIGN_ASSET(2) char ddan_room_9DL_0032B0[] = dddan_room_9DL_0032B0; - -#define dddan_room_9Tex_009128 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_009128" -static const ALIGN_ASSET(2) char ddan_room_9Tex_009128[] = dddan_room_9Tex_009128; - -#define dddan_room_9Tex_009928 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_009928" -static const ALIGN_ASSET(2) char ddan_room_9Tex_009928[] = dddan_room_9Tex_009928; - -#define dddan_room_9Tex_00B128 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_00B128" -static const ALIGN_ASSET(2) char ddan_room_9Tex_00B128[] = dddan_room_9Tex_00B128; - -#define dddan_room_9Tex_006928 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_006928" -static const ALIGN_ASSET(2) char ddan_room_9Tex_006928[] = dddan_room_9Tex_006928; - -#define dddan_room_9Tex_006128 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_006128" -static const ALIGN_ASSET(2) char ddan_room_9Tex_006128[] = dddan_room_9Tex_006128; - -#define dddan_room_9Tex_008D28 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_008D28" -static const ALIGN_ASSET(2) char ddan_room_9Tex_008D28[] = dddan_room_9Tex_008D28; - -#define dddan_room_9Tex_007D28 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_007D28" -static const ALIGN_ASSET(2) char ddan_room_9Tex_007D28[] = dddan_room_9Tex_007D28; - -#define dddan_room_9Tex_006D28 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_006D28" -static const ALIGN_ASSET(2) char ddan_room_9Tex_006D28[] = dddan_room_9Tex_006D28; - -#define dddan_room_9Tex_00A128 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_00A128" -static const ALIGN_ASSET(2) char ddan_room_9Tex_00A128[] = dddan_room_9Tex_00A128; +#define dddan_room_9Tex_005128 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_005128" +static const ALIGN_ASSET(2) char ddan_room_9Tex_005128[] = dddan_room_9Tex_005128; #define dddan_room_9Tex_005528 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_005528" static const ALIGN_ASSET(2) char ddan_room_9Tex_005528[] = dddan_room_9Tex_005528; @@ -39,11 +12,38 @@ static const ALIGN_ASSET(2) char ddan_room_9Tex_005528[] = dddan_room_9Tex_00552 #define dddan_room_9Tex_005D28 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_005D28" static const ALIGN_ASSET(2) char ddan_room_9Tex_005D28[] = dddan_room_9Tex_005D28; -#define dddan_room_9Tex_005128 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_005128" -static const ALIGN_ASSET(2) char ddan_room_9Tex_005128[] = dddan_room_9Tex_005128; +#define dddan_room_9Tex_006128 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_006128" +static const ALIGN_ASSET(2) char ddan_room_9Tex_006128[] = dddan_room_9Tex_006128; + +#define dddan_room_9Tex_006928 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_006928" +static const ALIGN_ASSET(2) char ddan_room_9Tex_006928[] = dddan_room_9Tex_006928; + +#define dddan_room_9Tex_006D28 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_006D28" +static const ALIGN_ASSET(2) char ddan_room_9Tex_006D28[] = dddan_room_9Tex_006D28; + +#define dddan_room_9Tex_007D28 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_007D28" +static const ALIGN_ASSET(2) char ddan_room_9Tex_007D28[] = dddan_room_9Tex_007D28; + +#define dddan_room_9Tex_008D28 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_008D28" +static const ALIGN_ASSET(2) char ddan_room_9Tex_008D28[] = dddan_room_9Tex_008D28; + +#define dddan_room_9Tex_009128 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_009128" +static const ALIGN_ASSET(2) char ddan_room_9Tex_009128[] = dddan_room_9Tex_009128; + +#define dddan_room_9Tex_009928 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_009928" +static const ALIGN_ASSET(2) char ddan_room_9Tex_009928[] = dddan_room_9Tex_009928; + +#define dddan_room_9Tex_00A128 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_00A128" +static const ALIGN_ASSET(2) char ddan_room_9Tex_00A128[] = dddan_room_9Tex_00A128; #define dddan_room_9Tex_00A928 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_00A928" static const ALIGN_ASSET(2) char ddan_room_9Tex_00A928[] = dddan_room_9Tex_00A928; +#define dddan_room_9Tex_00B128 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_00B128" +static const ALIGN_ASSET(2) char ddan_room_9Tex_00B128[] = dddan_room_9Tex_00B128; + +#define dddan_room_9DL_0032B0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9DL_0032B0" +static const ALIGN_ASSET(2) char ddan_room_9DL_0032B0[] = dddan_room_9DL_0032B0; + #endif // DUNGEONS_DDAN_ROOM_9_H diff --git a/soh/assets/scenes/dungeons/ddan/ddan_scene.h b/soh/assets/scenes/dungeons/ddan/ddan_scene.h index 358ec5d21..c53b12a07 100644 --- a/soh/assets/scenes/dungeons/ddan/ddan_scene.h +++ b/soh/assets/scenes/dungeons/ddan/ddan_scene.h @@ -3,6 +3,9 @@ #include "align_asset_macro.h" +#define dddan_sceneTLUT_011D70 "__OTR__scenes/nonmq/ddan_scene/ddan_sceneTLUT_011D70" +static const ALIGN_ASSET(2) char ddan_sceneTLUT_011D70[] = dddan_sceneTLUT_011D70; + #define dgDCDayEntranceTex "__OTR__scenes/nonmq/ddan_scene/gDCDayEntranceTex" static const ALIGN_ASSET(2) char gDCDayEntranceTex[] = dgDCDayEntranceTex; @@ -39,7 +42,5 @@ static const ALIGN_ASSET(2) char gDcOpeningCs[] = dgDcOpeningCs; #define dddan_sceneCollisionHeader_011D40 "__OTR__scenes/nonmq/ddan_scene/ddan_sceneCollisionHeader_011D40" static const ALIGN_ASSET(2) char ddan_sceneCollisionHeader_011D40[] = dddan_sceneCollisionHeader_011D40; -#define dddan_sceneTLUT_011D70 "__OTR__scenes/nonmq/ddan_scene/ddan_sceneTLUT_011D70" -static const ALIGN_ASSET(2) char ddan_sceneTLUT_011D70[] = dddan_sceneTLUT_011D70; #endif // DUNGEONS_DDAN_SCENE_H diff --git a/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_0.h b/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_0.h index 9f60814d0..9b727a9b5 100644 --- a/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_0.h +++ b/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_0.h @@ -3,20 +3,20 @@ #include "align_asset_macro.h" -#define dddan_boss_room_0DL_002000 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_0DL_002000" -static const ALIGN_ASSET(2) char ddan_boss_room_0DL_002000[] = dddan_boss_room_0DL_002000; - -#define dddan_boss_room_0Tex_003A28 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_0Tex_003A28" -static const ALIGN_ASSET(2) char ddan_boss_room_0Tex_003A28[] = dddan_boss_room_0Tex_003A28; - -#define dddan_boss_room_0Tex_003628 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_0Tex_003628" +#define dddan_boss_room_0Tex_003628 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_0Tex_003628" static const ALIGN_ASSET(2) char ddan_boss_room_0Tex_003628[] = dddan_boss_room_0Tex_003628; -#define dddan_boss_room_0Tex_003E28 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_0Tex_003E28" +#define dddan_boss_room_0Tex_003A28 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_0Tex_003A28" +static const ALIGN_ASSET(2) char ddan_boss_room_0Tex_003A28[] = dddan_boss_room_0Tex_003A28; + +#define dddan_boss_room_0Tex_003E28 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_0Tex_003E28" static const ALIGN_ASSET(2) char ddan_boss_room_0Tex_003E28[] = dddan_boss_room_0Tex_003E28; -#define dddan_boss_room_0Tex_004628 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_0Tex_004628" +#define dddan_boss_room_0Tex_004628 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_0Tex_004628" static const ALIGN_ASSET(2) char ddan_boss_room_0Tex_004628[] = dddan_boss_room_0Tex_004628; +#define dddan_boss_room_0DL_002000 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_0DL_002000" +static const ALIGN_ASSET(2) char ddan_boss_room_0DL_002000[] = dddan_boss_room_0DL_002000; + #endif // DUNGEONS_DDAN_BOSS_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_1.h b/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_1.h index f73a076d6..68cbacb81 100644 --- a/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_1.h +++ b/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_1.h @@ -3,19 +3,19 @@ #include "align_asset_macro.h" -#define dgDodongosCavernBossLavaFloorTex "__OTR__scenes/nonmq/ddan_boss_scene/gDodongosCavernBossLavaFloorTex" -static const ALIGN_ASSET(2) char gDodongosCavernBossLavaFloorTex[] = dgDodongosCavernBossLavaFloorTex; - -#define dddan_boss_room_1DL_001A38 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_1DL_001A38" -static const ALIGN_ASSET(2) char ddan_boss_room_1DL_001A38[] = dddan_boss_room_1DL_001A38; - -#define dddan_boss_room_1Tex_0031D8 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_1Tex_0031D8" +#define dddan_boss_room_1Tex_0031D8 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_1Tex_0031D8" static const ALIGN_ASSET(2) char ddan_boss_room_1Tex_0031D8[] = dddan_boss_room_1Tex_0031D8; -#define dddan_boss_room_1Tex_0039D8 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_1Tex_0039D8" +#define dddan_boss_room_1Tex_0039D8 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_1Tex_0039D8" static const ALIGN_ASSET(2) char ddan_boss_room_1Tex_0039D8[] = dddan_boss_room_1Tex_0039D8; -#define dddan_boss_room_1DL_000A50 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_1DL_000A50" +#define dgDodongosCavernBossLavaFloorTex "__OTR__scenes/shared/ddan_boss_scene/gDodongosCavernBossLavaFloorTex" +static const ALIGN_ASSET(2) char gDodongosCavernBossLavaFloorTex[] = dgDodongosCavernBossLavaFloorTex; + +#define dddan_boss_room_1DL_001A38 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_1DL_001A38" +static const ALIGN_ASSET(2) char ddan_boss_room_1DL_001A38[] = dddan_boss_room_1DL_001A38; + +#define dddan_boss_room_1DL_000A50 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_1DL_000A50" static const ALIGN_ASSET(2) char ddan_boss_room_1DL_000A50[] = dddan_boss_room_1DL_000A50; diff --git a/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_scene.h b/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_scene.h index 285a15c40..43bcc056f 100644 --- a/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_scene.h +++ b/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_scene.h @@ -3,19 +3,20 @@ #include "align_asset_macro.h" -#define dddan_boss_sceneCollisionHeader_000E20 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_sceneCollisionHeader_000E20" -static const ALIGN_ASSET(2) char ddan_boss_sceneCollisionHeader_000E20[] = dddan_boss_sceneCollisionHeader_000E20; - -#define dddan_boss_sceneTex_001858 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_sceneTex_001858" -static const ALIGN_ASSET(2) char ddan_boss_sceneTex_001858[] = dddan_boss_sceneTex_001858; - -#define dddan_boss_sceneTLUT_000E50 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_sceneTLUT_000E50" -static const ALIGN_ASSET(2) char ddan_boss_sceneTLUT_000E50[] = dddan_boss_sceneTLUT_000E50; - -#define dddan_boss_sceneTex_002058 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_sceneTex_002058" -static const ALIGN_ASSET(2) char ddan_boss_sceneTex_002058[] = dddan_boss_sceneTex_002058; - -#define dddan_boss_sceneTex_001058 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_sceneTex_001058" +#define dddan_boss_sceneTex_001058 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_sceneTex_001058" static const ALIGN_ASSET(2) char ddan_boss_sceneTex_001058[] = dddan_boss_sceneTex_001058; +#define dddan_boss_sceneTex_001858 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_sceneTex_001858" +static const ALIGN_ASSET(2) char ddan_boss_sceneTex_001858[] = dddan_boss_sceneTex_001858; + +#define dddan_boss_sceneTex_002058 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_sceneTex_002058" +static const ALIGN_ASSET(2) char ddan_boss_sceneTex_002058[] = dddan_boss_sceneTex_002058; + +#define dddan_boss_sceneTLUT_000E50 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_sceneTLUT_000E50" +static const ALIGN_ASSET(2) char ddan_boss_sceneTLUT_000E50[] = dddan_boss_sceneTLUT_000E50; + +#define dddan_boss_sceneCollisionHeader_000E20 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_sceneCollisionHeader_000E20" +static const ALIGN_ASSET(2) char ddan_boss_sceneCollisionHeader_000E20[] = dddan_boss_sceneCollisionHeader_000E20; + + #endif // DUNGEONS_DDAN_BOSS_SCENE_H diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_0.h b/soh/assets/scenes/dungeons/ganon/ganon_room_0.h index 06e6b05ac..f27d9f7c5 100644 --- a/soh/assets/scenes/dungeons/ganon/ganon_room_0.h +++ b/soh/assets/scenes/dungeons/ganon/ganon_room_0.h @@ -3,32 +3,32 @@ #include "align_asset_macro.h" -#define dganon_room_0DL_004C50 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0DL_004C50" -static const ALIGN_ASSET(2) char ganon_room_0DL_004C50[] = dganon_room_0DL_004C50; - -#define dganon_room_0Tex_004C68 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0Tex_004C68" +#define dganon_room_0Tex_004C68 "__OTR__scenes/shared/ganon_scene/ganon_room_0Tex_004C68" static const ALIGN_ASSET(2) char ganon_room_0Tex_004C68[] = dganon_room_0Tex_004C68; -#define dganon_room_0Tex_005468 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0Tex_005468" +#define dganon_room_0Tex_005468 "__OTR__scenes/shared/ganon_scene/ganon_room_0Tex_005468" static const ALIGN_ASSET(2) char ganon_room_0Tex_005468[] = dganon_room_0Tex_005468; -#define dganon_room_0Tex_007068 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0Tex_007068" -static const ALIGN_ASSET(2) char ganon_room_0Tex_007068[] = dganon_room_0Tex_007068; - -#define dganon_room_0Tex_006068 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0Tex_006068" -static const ALIGN_ASSET(2) char ganon_room_0Tex_006068[] = dganon_room_0Tex_006068; - -#define dganon_room_0Tex_006868 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0Tex_006868" -static const ALIGN_ASSET(2) char ganon_room_0Tex_006868[] = dganon_room_0Tex_006868; - -#define dganon_room_0Tex_005C68 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0Tex_005C68" +#define dganon_room_0Tex_005C68 "__OTR__scenes/shared/ganon_scene/ganon_room_0Tex_005C68" static const ALIGN_ASSET(2) char ganon_room_0Tex_005C68[] = dganon_room_0Tex_005C68; -#define dganon_room_0DL_0076C0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0DL_0076C0" -static const ALIGN_ASSET(2) char ganon_room_0DL_0076C0[] = dganon_room_0DL_0076C0; +#define dganon_room_0Tex_006068 "__OTR__scenes/shared/ganon_scene/ganon_room_0Tex_006068" +static const ALIGN_ASSET(2) char ganon_room_0Tex_006068[] = dganon_room_0Tex_006068; -#define dganon_room_0Tex_0076D0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0Tex_0076D0" +#define dganon_room_0Tex_006868 "__OTR__scenes/shared/ganon_scene/ganon_room_0Tex_006868" +static const ALIGN_ASSET(2) char ganon_room_0Tex_006868[] = dganon_room_0Tex_006868; + +#define dganon_room_0Tex_007068 "__OTR__scenes/shared/ganon_scene/ganon_room_0Tex_007068" +static const ALIGN_ASSET(2) char ganon_room_0Tex_007068[] = dganon_room_0Tex_007068; + +#define dganon_room_0Tex_0076D0 "__OTR__scenes/shared/ganon_scene/ganon_room_0Tex_0076D0" static const ALIGN_ASSET(2) char ganon_room_0Tex_0076D0[] = dganon_room_0Tex_0076D0; +#define dganon_room_0DL_004C50 "__OTR__scenes/shared/ganon_scene/ganon_room_0DL_004C50" +static const ALIGN_ASSET(2) char ganon_room_0DL_004C50[] = dganon_room_0DL_004C50; + +#define dganon_room_0DL_0076C0 "__OTR__scenes/shared/ganon_scene/ganon_room_0DL_0076C0" +static const ALIGN_ASSET(2) char ganon_room_0DL_0076C0[] = dganon_room_0DL_0076C0; + #endif // DUNGEONS_GANON_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_1.h b/soh/assets/scenes/dungeons/ganon/ganon_room_1.h index b4af253ec..4009286dd 100644 --- a/soh/assets/scenes/dungeons/ganon/ganon_room_1.h +++ b/soh/assets/scenes/dungeons/ganon/ganon_room_1.h @@ -3,23 +3,23 @@ #include "align_asset_macro.h" -#define dganon_room_1DL_005360 "__OTR__scenes/nonmq/ganon_scene/ganon_room_1DL_005360" -static const ALIGN_ASSET(2) char ganon_room_1DL_005360[] = dganon_room_1DL_005360; - -#define dganon_room_1Tex_006370 "__OTR__scenes/nonmq/ganon_scene/ganon_room_1Tex_006370" -static const ALIGN_ASSET(2) char ganon_room_1Tex_006370[] = dganon_room_1Tex_006370; - -#define dganon_room_1Tex_005F70 "__OTR__scenes/nonmq/ganon_scene/ganon_room_1Tex_005F70" -static const ALIGN_ASSET(2) char ganon_room_1Tex_005F70[] = dganon_room_1Tex_005F70; - -#define dganon_room_1Tex_005B70 "__OTR__scenes/nonmq/ganon_scene/ganon_room_1Tex_005B70" -static const ALIGN_ASSET(2) char ganon_room_1Tex_005B70[] = dganon_room_1Tex_005B70; - -#define dganon_room_1Tex_005370 "__OTR__scenes/nonmq/ganon_scene/ganon_room_1Tex_005370" +#define dganon_room_1Tex_005370 "__OTR__scenes/shared/ganon_scene/ganon_room_1Tex_005370" static const ALIGN_ASSET(2) char ganon_room_1Tex_005370[] = dganon_room_1Tex_005370; -#define dganon_room_1Tex_006770 "__OTR__scenes/nonmq/ganon_scene/ganon_room_1Tex_006770" +#define dganon_room_1Tex_005B70 "__OTR__scenes/shared/ganon_scene/ganon_room_1Tex_005B70" +static const ALIGN_ASSET(2) char ganon_room_1Tex_005B70[] = dganon_room_1Tex_005B70; + +#define dganon_room_1Tex_005F70 "__OTR__scenes/shared/ganon_scene/ganon_room_1Tex_005F70" +static const ALIGN_ASSET(2) char ganon_room_1Tex_005F70[] = dganon_room_1Tex_005F70; + +#define dganon_room_1Tex_006370 "__OTR__scenes/shared/ganon_scene/ganon_room_1Tex_006370" +static const ALIGN_ASSET(2) char ganon_room_1Tex_006370[] = dganon_room_1Tex_006370; + +#define dganon_room_1Tex_006770 "__OTR__scenes/shared/ganon_scene/ganon_room_1Tex_006770" static const ALIGN_ASSET(2) char ganon_room_1Tex_006770[] = dganon_room_1Tex_006770; +#define dganon_room_1DL_005360 "__OTR__scenes/shared/ganon_scene/ganon_room_1DL_005360" +static const ALIGN_ASSET(2) char ganon_room_1DL_005360[] = dganon_room_1DL_005360; + #endif // DUNGEONS_GANON_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_2.h b/soh/assets/scenes/dungeons/ganon/ganon_room_2.h index d43f70ddb..3868e6e91 100644 --- a/soh/assets/scenes/dungeons/ganon/ganon_room_2.h +++ b/soh/assets/scenes/dungeons/ganon/ganon_room_2.h @@ -3,35 +3,35 @@ #include "align_asset_macro.h" -#define dganon_room_2DL_003DD8 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2DL_003DD8" -static const ALIGN_ASSET(2) char ganon_room_2DL_003DD8[] = dganon_room_2DL_003DD8; - -#define dganon_room_2Tex_005DF0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_005DF0" -static const ALIGN_ASSET(2) char ganon_room_2Tex_005DF0[] = dganon_room_2Tex_005DF0; - -#define dganon_room_2Tex_004DF0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_004DF0" -static const ALIGN_ASSET(2) char ganon_room_2Tex_004DF0[] = dganon_room_2Tex_004DF0; - -#define dganon_room_2Tex_0059F0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_0059F0" -static const ALIGN_ASSET(2) char ganon_room_2Tex_0059F0[] = dganon_room_2Tex_0059F0; - -#define dganon_room_2Tex_0041F0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_0041F0" -static const ALIGN_ASSET(2) char ganon_room_2Tex_0041F0[] = dganon_room_2Tex_0041F0; - -#define dganon_room_2Tex_0049F0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_0049F0" -static const ALIGN_ASSET(2) char ganon_room_2Tex_0049F0[] = dganon_room_2Tex_0049F0; - -#define dganon_room_2Tex_003DF0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_003DF0" +#define dganon_room_2Tex_003DF0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_003DF0" static const ALIGN_ASSET(2) char ganon_room_2Tex_003DF0[] = dganon_room_2Tex_003DF0; -#define dganon_room_2Tex_0051F0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_0051F0" +#define dganon_room_2Tex_0041F0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_0041F0" +static const ALIGN_ASSET(2) char ganon_room_2Tex_0041F0[] = dganon_room_2Tex_0041F0; + +#define dganon_room_2Tex_0049F0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_0049F0" +static const ALIGN_ASSET(2) char ganon_room_2Tex_0049F0[] = dganon_room_2Tex_0049F0; + +#define dganon_room_2Tex_004DF0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_004DF0" +static const ALIGN_ASSET(2) char ganon_room_2Tex_004DF0[] = dganon_room_2Tex_004DF0; + +#define dganon_room_2Tex_0051F0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_0051F0" static const ALIGN_ASSET(2) char ganon_room_2Tex_0051F0[] = dganon_room_2Tex_0051F0; -#define dganon_room_2DL_007040 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2DL_007040" -static const ALIGN_ASSET(2) char ganon_room_2DL_007040[] = dganon_room_2DL_007040; +#define dganon_room_2Tex_0059F0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_0059F0" +static const ALIGN_ASSET(2) char ganon_room_2Tex_0059F0[] = dganon_room_2Tex_0059F0; -#define dganon_room_2Tex_007050 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_007050" +#define dganon_room_2Tex_005DF0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_005DF0" +static const ALIGN_ASSET(2) char ganon_room_2Tex_005DF0[] = dganon_room_2Tex_005DF0; + +#define dganon_room_2Tex_007050 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_007050" static const ALIGN_ASSET(2) char ganon_room_2Tex_007050[] = dganon_room_2Tex_007050; +#define dganon_room_2DL_003DD8 "__OTR__scenes/shared/ganon_scene/ganon_room_2DL_003DD8" +static const ALIGN_ASSET(2) char ganon_room_2DL_003DD8[] = dganon_room_2DL_003DD8; + +#define dganon_room_2DL_007040 "__OTR__scenes/shared/ganon_scene/ganon_room_2DL_007040" +static const ALIGN_ASSET(2) char ganon_room_2DL_007040[] = dganon_room_2DL_007040; + #endif // DUNGEONS_GANON_ROOM_2_H diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_3.h b/soh/assets/scenes/dungeons/ganon/ganon_room_3.h index c81614fdf..8e6ba9076 100644 --- a/soh/assets/scenes/dungeons/ganon/ganon_room_3.h +++ b/soh/assets/scenes/dungeons/ganon/ganon_room_3.h @@ -3,23 +3,23 @@ #include "align_asset_macro.h" -#define dganon_room_3DL_004F20 "__OTR__scenes/nonmq/ganon_scene/ganon_room_3DL_004F20" -static const ALIGN_ASSET(2) char ganon_room_3DL_004F20[] = dganon_room_3DL_004F20; - -#define dganon_room_3Tex_004F30 "__OTR__scenes/nonmq/ganon_scene/ganon_room_3Tex_004F30" +#define dganon_room_3Tex_004F30 "__OTR__scenes/shared/ganon_scene/ganon_room_3Tex_004F30" static const ALIGN_ASSET(2) char ganon_room_3Tex_004F30[] = dganon_room_3Tex_004F30; -#define dganon_room_3Tex_005330 "__OTR__scenes/nonmq/ganon_scene/ganon_room_3Tex_005330" +#define dganon_room_3Tex_005330 "__OTR__scenes/shared/ganon_scene/ganon_room_3Tex_005330" static const ALIGN_ASSET(2) char ganon_room_3Tex_005330[] = dganon_room_3Tex_005330; -#define dganon_room_3Tex_005730 "__OTR__scenes/nonmq/ganon_scene/ganon_room_3Tex_005730" +#define dganon_room_3Tex_005730 "__OTR__scenes/shared/ganon_scene/ganon_room_3Tex_005730" static const ALIGN_ASSET(2) char ganon_room_3Tex_005730[] = dganon_room_3Tex_005730; -#define dganon_room_3Tex_005F30 "__OTR__scenes/nonmq/ganon_scene/ganon_room_3Tex_005F30" +#define dganon_room_3Tex_005F30 "__OTR__scenes/shared/ganon_scene/ganon_room_3Tex_005F30" static const ALIGN_ASSET(2) char ganon_room_3Tex_005F30[] = dganon_room_3Tex_005F30; -#define dganon_room_3Tex_006730 "__OTR__scenes/nonmq/ganon_scene/ganon_room_3Tex_006730" +#define dganon_room_3Tex_006730 "__OTR__scenes/shared/ganon_scene/ganon_room_3Tex_006730" static const ALIGN_ASSET(2) char ganon_room_3Tex_006730[] = dganon_room_3Tex_006730; +#define dganon_room_3DL_004F20 "__OTR__scenes/shared/ganon_scene/ganon_room_3DL_004F20" +static const ALIGN_ASSET(2) char ganon_room_3DL_004F20[] = dganon_room_3DL_004F20; + #endif // DUNGEONS_GANON_ROOM_3_H diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_4.h b/soh/assets/scenes/dungeons/ganon/ganon_room_4.h index f08d2e722..e20ca9722 100644 --- a/soh/assets/scenes/dungeons/ganon/ganon_room_4.h +++ b/soh/assets/scenes/dungeons/ganon/ganon_room_4.h @@ -3,44 +3,44 @@ #include "align_asset_macro.h" -#define dganon_room_4DL_004650 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4DL_004650" -static const ALIGN_ASSET(2) char ganon_room_4DL_004650[] = dganon_room_4DL_004650; - -#define dganon_room_4Tex_007668 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_007668" -static const ALIGN_ASSET(2) char ganon_room_4Tex_007668[] = dganon_room_4Tex_007668; - -#define dganon_room_4Tex_004668 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_004668" +#define dganon_room_4Tex_004668 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_004668" static const ALIGN_ASSET(2) char ganon_room_4Tex_004668[] = dganon_room_4Tex_004668; -#define dganon_room_4Tex_005A68 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_005A68" -static const ALIGN_ASSET(2) char ganon_room_4Tex_005A68[] = dganon_room_4Tex_005A68; - -#define dganon_room_4Tex_006268 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_006268" -static const ALIGN_ASSET(2) char ganon_room_4Tex_006268[] = dganon_room_4Tex_006268; - -#define dganon_room_4Tex_005668 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_005668" -static const ALIGN_ASSET(2) char ganon_room_4Tex_005668[] = dganon_room_4Tex_005668; - -#define dganon_room_4Tex_004E68 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_004E68" +#define dganon_room_4Tex_004E68 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_004E68" static const ALIGN_ASSET(2) char ganon_room_4Tex_004E68[] = dganon_room_4Tex_004E68; -#define dganon_room_4Tex_006668 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_006668" +#define dganon_room_4Tex_005668 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_005668" +static const ALIGN_ASSET(2) char ganon_room_4Tex_005668[] = dganon_room_4Tex_005668; + +#define dganon_room_4Tex_005A68 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_005A68" +static const ALIGN_ASSET(2) char ganon_room_4Tex_005A68[] = dganon_room_4Tex_005A68; + +#define dganon_room_4Tex_006268 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_006268" +static const ALIGN_ASSET(2) char ganon_room_4Tex_006268[] = dganon_room_4Tex_006268; + +#define dganon_room_4Tex_006668 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_006668" static const ALIGN_ASSET(2) char ganon_room_4Tex_006668[] = dganon_room_4Tex_006668; -#define dganon_room_4Tex_006E68 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_006E68" -static const ALIGN_ASSET(2) char ganon_room_4Tex_006E68[] = dganon_room_4Tex_006E68; - -#define dganon_room_4Tex_007E68 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_007E68" -static const ALIGN_ASSET(2) char ganon_room_4Tex_007E68[] = dganon_room_4Tex_007E68; - -#define dganon_room_4Tex_006A68 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_006A68" +#define dganon_room_4Tex_006A68 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_006A68" static const ALIGN_ASSET(2) char ganon_room_4Tex_006A68[] = dganon_room_4Tex_006A68; -#define dganon_room_4DL_0088C0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4DL_0088C0" -static const ALIGN_ASSET(2) char ganon_room_4DL_0088C0[] = dganon_room_4DL_0088C0; +#define dganon_room_4Tex_006E68 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_006E68" +static const ALIGN_ASSET(2) char ganon_room_4Tex_006E68[] = dganon_room_4Tex_006E68; -#define dganon_room_4Tex_0088D0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_0088D0" +#define dganon_room_4Tex_007668 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_007668" +static const ALIGN_ASSET(2) char ganon_room_4Tex_007668[] = dganon_room_4Tex_007668; + +#define dganon_room_4Tex_007E68 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_007E68" +static const ALIGN_ASSET(2) char ganon_room_4Tex_007E68[] = dganon_room_4Tex_007E68; + +#define dganon_room_4Tex_0088D0 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_0088D0" static const ALIGN_ASSET(2) char ganon_room_4Tex_0088D0[] = dganon_room_4Tex_0088D0; +#define dganon_room_4DL_004650 "__OTR__scenes/shared/ganon_scene/ganon_room_4DL_004650" +static const ALIGN_ASSET(2) char ganon_room_4DL_004650[] = dganon_room_4DL_004650; + +#define dganon_room_4DL_0088C0 "__OTR__scenes/shared/ganon_scene/ganon_room_4DL_0088C0" +static const ALIGN_ASSET(2) char ganon_room_4DL_0088C0[] = dganon_room_4DL_0088C0; + #endif // DUNGEONS_GANON_ROOM_4_H diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_5.h b/soh/assets/scenes/dungeons/ganon/ganon_room_5.h index 063b5a746..45284c02a 100644 --- a/soh/assets/scenes/dungeons/ganon/ganon_room_5.h +++ b/soh/assets/scenes/dungeons/ganon/ganon_room_5.h @@ -3,26 +3,26 @@ #include "align_asset_macro.h" -#define dganon_room_5DL_005AF8 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5DL_005AF8" -static const ALIGN_ASSET(2) char ganon_room_5DL_005AF8[] = dganon_room_5DL_005AF8; - -#define dganon_room_5Tex_007F08 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5Tex_007F08" -static const ALIGN_ASSET(2) char ganon_room_5Tex_007F08[] = dganon_room_5Tex_007F08; - -#define dganon_room_5Tex_007B08 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5Tex_007B08" -static const ALIGN_ASSET(2) char ganon_room_5Tex_007B08[] = dganon_room_5Tex_007B08; - -#define dganon_room_5Tex_005B08 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5Tex_005B08" +#define dganon_room_5Tex_005B08 "__OTR__scenes/shared/ganon_scene/ganon_room_5Tex_005B08" static const ALIGN_ASSET(2) char ganon_room_5Tex_005B08[] = dganon_room_5Tex_005B08; -#define dganon_room_5Tex_008308 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5Tex_008308" -static const ALIGN_ASSET(2) char ganon_room_5Tex_008308[] = dganon_room_5Tex_008308; +#define dganon_room_5Tex_006308 "__OTR__scenes/shared/ganon_scene/ganon_room_5Tex_006308" +static const ALIGN_ASSET(2) char ganon_room_5Tex_006308[] = dganon_room_5Tex_006308; -#define dganon_room_5Tex_006B08 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5Tex_006B08" +#define dganon_room_5Tex_006B08 "__OTR__scenes/shared/ganon_scene/ganon_room_5Tex_006B08" static const ALIGN_ASSET(2) char ganon_room_5Tex_006B08[] = dganon_room_5Tex_006B08; -#define dganon_room_5Tex_006308 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5Tex_006308" -static const ALIGN_ASSET(2) char ganon_room_5Tex_006308[] = dganon_room_5Tex_006308; +#define dganon_room_5Tex_007B08 "__OTR__scenes/shared/ganon_scene/ganon_room_5Tex_007B08" +static const ALIGN_ASSET(2) char ganon_room_5Tex_007B08[] = dganon_room_5Tex_007B08; + +#define dganon_room_5Tex_007F08 "__OTR__scenes/shared/ganon_scene/ganon_room_5Tex_007F08" +static const ALIGN_ASSET(2) char ganon_room_5Tex_007F08[] = dganon_room_5Tex_007F08; + +#define dganon_room_5Tex_008308 "__OTR__scenes/shared/ganon_scene/ganon_room_5Tex_008308" +static const ALIGN_ASSET(2) char ganon_room_5Tex_008308[] = dganon_room_5Tex_008308; + +#define dganon_room_5DL_005AF8 "__OTR__scenes/shared/ganon_scene/ganon_room_5DL_005AF8" +static const ALIGN_ASSET(2) char ganon_room_5DL_005AF8[] = dganon_room_5DL_005AF8; #endif // DUNGEONS_GANON_ROOM_5_H diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_6.h b/soh/assets/scenes/dungeons/ganon/ganon_room_6.h index 626ce1890..cec4dc81e 100644 --- a/soh/assets/scenes/dungeons/ganon/ganon_room_6.h +++ b/soh/assets/scenes/dungeons/ganon/ganon_room_6.h @@ -3,35 +3,35 @@ #include "align_asset_macro.h" -#define dganon_room_6DL_006DF0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6DL_006DF0" -static const ALIGN_ASSET(2) char ganon_room_6DL_006DF0[] = dganon_room_6DL_006DF0; - -#define dganon_room_6Tex_007A00 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6Tex_007A00" -static const ALIGN_ASSET(2) char ganon_room_6Tex_007A00[] = dganon_room_6Tex_007A00; - -#define dganon_room_6Tex_008200 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6Tex_008200" -static const ALIGN_ASSET(2) char ganon_room_6Tex_008200[] = dganon_room_6Tex_008200; - -#define dganon_room_6Tex_007200 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6Tex_007200" -static const ALIGN_ASSET(2) char ganon_room_6Tex_007200[] = dganon_room_6Tex_007200; - -#define dganon_room_6Tex_008B00 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6Tex_008B00" -static const ALIGN_ASSET(2) char ganon_room_6Tex_008B00[] = dganon_room_6Tex_008B00; - -#define dganon_room_6Tex_007600 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6Tex_007600" -static const ALIGN_ASSET(2) char ganon_room_6Tex_007600[] = dganon_room_6Tex_007600; - -#define dganon_room_6Tex_006E00 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6Tex_006E00" +#define dganon_room_6Tex_006E00 "__OTR__scenes/shared/ganon_scene/ganon_room_6Tex_006E00" static const ALIGN_ASSET(2) char ganon_room_6Tex_006E00[] = dganon_room_6Tex_006E00; -#define dganon_room_6Tex_008300 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6Tex_008300" +#define dganon_room_6Tex_007200 "__OTR__scenes/shared/ganon_scene/ganon_room_6Tex_007200" +static const ALIGN_ASSET(2) char ganon_room_6Tex_007200[] = dganon_room_6Tex_007200; + +#define dganon_room_6Tex_007600 "__OTR__scenes/shared/ganon_scene/ganon_room_6Tex_007600" +static const ALIGN_ASSET(2) char ganon_room_6Tex_007600[] = dganon_room_6Tex_007600; + +#define dganon_room_6Tex_007A00 "__OTR__scenes/shared/ganon_scene/ganon_room_6Tex_007A00" +static const ALIGN_ASSET(2) char ganon_room_6Tex_007A00[] = dganon_room_6Tex_007A00; + +#define dganon_room_6Tex_008200 "__OTR__scenes/shared/ganon_scene/ganon_room_6Tex_008200" +static const ALIGN_ASSET(2) char ganon_room_6Tex_008200[] = dganon_room_6Tex_008200; + +#define dganon_room_6Tex_008300 "__OTR__scenes/shared/ganon_scene/ganon_room_6Tex_008300" static const ALIGN_ASSET(2) char ganon_room_6Tex_008300[] = dganon_room_6Tex_008300; -#define dganon_room_6DL_009388 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6DL_009388" -static const ALIGN_ASSET(2) char ganon_room_6DL_009388[] = dganon_room_6DL_009388; +#define dganon_room_6Tex_008B00 "__OTR__scenes/shared/ganon_scene/ganon_room_6Tex_008B00" +static const ALIGN_ASSET(2) char ganon_room_6Tex_008B00[] = dganon_room_6Tex_008B00; -#define dganon_room_6Tex_009398 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6Tex_009398" +#define dganon_room_6Tex_009398 "__OTR__scenes/shared/ganon_scene/ganon_room_6Tex_009398" static const ALIGN_ASSET(2) char ganon_room_6Tex_009398[] = dganon_room_6Tex_009398; +#define dganon_room_6DL_006DF0 "__OTR__scenes/shared/ganon_scene/ganon_room_6DL_006DF0" +static const ALIGN_ASSET(2) char ganon_room_6DL_006DF0[] = dganon_room_6DL_006DF0; + +#define dganon_room_6DL_009388 "__OTR__scenes/shared/ganon_scene/ganon_room_6DL_009388" +static const ALIGN_ASSET(2) char ganon_room_6DL_009388[] = dganon_room_6DL_009388; + #endif // DUNGEONS_GANON_ROOM_6_H diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_7.h b/soh/assets/scenes/dungeons/ganon/ganon_room_7.h index 522239a0d..6e7d0c10f 100644 --- a/soh/assets/scenes/dungeons/ganon/ganon_room_7.h +++ b/soh/assets/scenes/dungeons/ganon/ganon_room_7.h @@ -3,32 +3,32 @@ #include "align_asset_macro.h" -#define dganon_room_7DL_0071C8 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7DL_0071C8" -static const ALIGN_ASSET(2) char ganon_room_7DL_0071C8[] = dganon_room_7DL_0071C8; - -#define dganon_room_7Tex_0085E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_0085E0" -static const ALIGN_ASSET(2) char ganon_room_7Tex_0085E0[] = dganon_room_7Tex_0085E0; - -#define dganon_room_7Tex_0089E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_0089E0" -static const ALIGN_ASSET(2) char ganon_room_7Tex_0089E0[] = dganon_room_7Tex_0089E0; - -#define dganon_room_7Tex_007DE0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_007DE0" -static const ALIGN_ASSET(2) char ganon_room_7Tex_007DE0[] = dganon_room_7Tex_007DE0; - -#define dganon_room_7Tex_0075E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_0075E0" -static const ALIGN_ASSET(2) char ganon_room_7Tex_0075E0[] = dganon_room_7Tex_0075E0; - -#define dganon_room_7Tex_0091E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_0091E0" -static const ALIGN_ASSET(2) char ganon_room_7Tex_0091E0[] = dganon_room_7Tex_0091E0; - -#define dganon_room_7Tex_0071E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_0071E0" +#define dganon_room_7Tex_0071E0 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_0071E0" static const ALIGN_ASSET(2) char ganon_room_7Tex_0071E0[] = dganon_room_7Tex_0071E0; -#define dganon_room_7DL_009F88 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7DL_009F88" -static const ALIGN_ASSET(2) char ganon_room_7DL_009F88[] = dganon_room_7DL_009F88; +#define dganon_room_7Tex_0075E0 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_0075E0" +static const ALIGN_ASSET(2) char ganon_room_7Tex_0075E0[] = dganon_room_7Tex_0075E0; -#define dganon_room_7Tex_009F98 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_009F98" +#define dganon_room_7Tex_007DE0 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_007DE0" +static const ALIGN_ASSET(2) char ganon_room_7Tex_007DE0[] = dganon_room_7Tex_007DE0; + +#define dganon_room_7Tex_0085E0 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_0085E0" +static const ALIGN_ASSET(2) char ganon_room_7Tex_0085E0[] = dganon_room_7Tex_0085E0; + +#define dganon_room_7Tex_0089E0 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_0089E0" +static const ALIGN_ASSET(2) char ganon_room_7Tex_0089E0[] = dganon_room_7Tex_0089E0; + +#define dganon_room_7Tex_0091E0 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_0091E0" +static const ALIGN_ASSET(2) char ganon_room_7Tex_0091E0[] = dganon_room_7Tex_0091E0; + +#define dganon_room_7Tex_009F98 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_009F98" static const ALIGN_ASSET(2) char ganon_room_7Tex_009F98[] = dganon_room_7Tex_009F98; +#define dganon_room_7DL_0071C8 "__OTR__scenes/shared/ganon_scene/ganon_room_7DL_0071C8" +static const ALIGN_ASSET(2) char ganon_room_7DL_0071C8[] = dganon_room_7DL_0071C8; + +#define dganon_room_7DL_009F88 "__OTR__scenes/shared/ganon_scene/ganon_room_7DL_009F88" +static const ALIGN_ASSET(2) char ganon_room_7DL_009F88[] = dganon_room_7DL_009F88; + #endif // DUNGEONS_GANON_ROOM_7_H diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_8.h b/soh/assets/scenes/dungeons/ganon/ganon_room_8.h index 40aacf021..5e3337220 100644 --- a/soh/assets/scenes/dungeons/ganon/ganon_room_8.h +++ b/soh/assets/scenes/dungeons/ganon/ganon_room_8.h @@ -3,35 +3,35 @@ #include "align_asset_macro.h" -#define dganon_room_8DL_004940 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8DL_004940" -static const ALIGN_ASSET(2) char ganon_room_8DL_004940[] = dganon_room_8DL_004940; - -#define dganon_room_8Tex_005BE0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8Tex_005BE0" -static const ALIGN_ASSET(2) char ganon_room_8Tex_005BE0[] = dganon_room_8Tex_005BE0; - -#define dganon_room_8Tex_0053E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8Tex_0053E0" -static const ALIGN_ASSET(2) char ganon_room_8Tex_0053E0[] = dganon_room_8Tex_0053E0; - -#define dganon_room_8Tex_005320 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8Tex_005320" -static const ALIGN_ASSET(2) char ganon_room_8Tex_005320[] = dganon_room_8Tex_005320; - -#define dganon_room_8Tex_005220 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8Tex_005220" -static const ALIGN_ASSET(2) char ganon_room_8Tex_005220[] = dganon_room_8Tex_005220; - -#define dganon_room_8Tex_004A20 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8Tex_004A20" +#define dganon_room_8Tex_004A20 "__OTR__scenes/shared/ganon_scene/ganon_room_8Tex_004A20" static const ALIGN_ASSET(2) char ganon_room_8Tex_004A20[] = dganon_room_8Tex_004A20; -#define dganon_room_8TLUT_004950 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8TLUT_004950" -static const ALIGN_ASSET(2) char ganon_room_8TLUT_004950[] = dganon_room_8TLUT_004950; +#define dganon_room_8Tex_005220 "__OTR__scenes/shared/ganon_scene/ganon_room_8Tex_005220" +static const ALIGN_ASSET(2) char ganon_room_8Tex_005220[] = dganon_room_8Tex_005220; -#define dganon_room_8Tex_0063E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8Tex_0063E0" -static const ALIGN_ASSET(2) char ganon_room_8Tex_0063E0[] = dganon_room_8Tex_0063E0; +#define dganon_room_8Tex_005320 "__OTR__scenes/shared/ganon_scene/ganon_room_8Tex_005320" +static const ALIGN_ASSET(2) char ganon_room_8Tex_005320[] = dganon_room_8Tex_005320; -#define dganon_room_8Tex_005360 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8Tex_005360" +#define dganon_room_8Tex_005360 "__OTR__scenes/shared/ganon_scene/ganon_room_8Tex_005360" static const ALIGN_ASSET(2) char ganon_room_8Tex_005360[] = dganon_room_8Tex_005360; -#define dganon_room_8Tex_005FE0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8Tex_005FE0" +#define dganon_room_8Tex_0053E0 "__OTR__scenes/shared/ganon_scene/ganon_room_8Tex_0053E0" +static const ALIGN_ASSET(2) char ganon_room_8Tex_0053E0[] = dganon_room_8Tex_0053E0; + +#define dganon_room_8Tex_005BE0 "__OTR__scenes/shared/ganon_scene/ganon_room_8Tex_005BE0" +static const ALIGN_ASSET(2) char ganon_room_8Tex_005BE0[] = dganon_room_8Tex_005BE0; + +#define dganon_room_8Tex_005FE0 "__OTR__scenes/shared/ganon_scene/ganon_room_8Tex_005FE0" static const ALIGN_ASSET(2) char ganon_room_8Tex_005FE0[] = dganon_room_8Tex_005FE0; +#define dganon_room_8Tex_0063E0 "__OTR__scenes/shared/ganon_scene/ganon_room_8Tex_0063E0" +static const ALIGN_ASSET(2) char ganon_room_8Tex_0063E0[] = dganon_room_8Tex_0063E0; + +#define dganon_room_8TLUT_004950 "__OTR__scenes/shared/ganon_scene/ganon_room_8TLUT_004950" +static const ALIGN_ASSET(2) char ganon_room_8TLUT_004950[] = dganon_room_8TLUT_004950; + +#define dganon_room_8DL_004940 "__OTR__scenes/shared/ganon_scene/ganon_room_8DL_004940" +static const ALIGN_ASSET(2) char ganon_room_8DL_004940[] = dganon_room_8DL_004940; + #endif // DUNGEONS_GANON_ROOM_8_H diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_9.h b/soh/assets/scenes/dungeons/ganon/ganon_room_9.h index 47cad0daa..ba88c5a76 100644 --- a/soh/assets/scenes/dungeons/ganon/ganon_room_9.h +++ b/soh/assets/scenes/dungeons/ganon/ganon_room_9.h @@ -3,41 +3,41 @@ #include "align_asset_macro.h" -#define dganon_room_9DL_001F08 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9DL_001F08" -static const ALIGN_ASSET(2) char ganon_room_9DL_001F08[] = dganon_room_9DL_001F08; - -#define dganon_room_9Tex_004D20 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_004D20" -static const ALIGN_ASSET(2) char ganon_room_9Tex_004D20[] = dganon_room_9Tex_004D20; - -#define dganon_room_9Tex_003D20 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_003D20" -static const ALIGN_ASSET(2) char ganon_room_9Tex_003D20[] = dganon_room_9Tex_003D20; - -#define dganon_room_9Tex_002120 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_002120" +#define dganon_room_9Tex_002120 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_002120" static const ALIGN_ASSET(2) char ganon_room_9Tex_002120[] = dganon_room_9Tex_002120; -#define dganon_room_9Tex_005120 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_005120" -static const ALIGN_ASSET(2) char ganon_room_9Tex_005120[] = dganon_room_9Tex_005120; - -#define dganon_room_9Tex_002920 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_002920" +#define dganon_room_9Tex_002920 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_002920" static const ALIGN_ASSET(2) char ganon_room_9Tex_002920[] = dganon_room_9Tex_002920; -#define dganon_room_9TLUT_001F18 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9TLUT_001F18" -static const ALIGN_ASSET(2) char ganon_room_9TLUT_001F18[] = dganon_room_9TLUT_001F18; - -#define dganon_room_9Tex_004520 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_004520" -static const ALIGN_ASSET(2) char ganon_room_9Tex_004520[] = dganon_room_9Tex_004520; - -#define dganon_room_9Tex_002D20 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_002D20" +#define dganon_room_9Tex_002D20 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_002D20" static const ALIGN_ASSET(2) char ganon_room_9Tex_002D20[] = dganon_room_9Tex_002D20; -#define dganon_room_9Tex_003120 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_003120" +#define dganon_room_9Tex_003120 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_003120" static const ALIGN_ASSET(2) char ganon_room_9Tex_003120[] = dganon_room_9Tex_003120; -#define dganon_room_9Tex_003520 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_003520" +#define dganon_room_9Tex_003520 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_003520" static const ALIGN_ASSET(2) char ganon_room_9Tex_003520[] = dganon_room_9Tex_003520; -#define dganon_room_9Tex_003920 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_003920" +#define dganon_room_9Tex_003920 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_003920" static const ALIGN_ASSET(2) char ganon_room_9Tex_003920[] = dganon_room_9Tex_003920; +#define dganon_room_9Tex_003D20 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_003D20" +static const ALIGN_ASSET(2) char ganon_room_9Tex_003D20[] = dganon_room_9Tex_003D20; + +#define dganon_room_9Tex_004520 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_004520" +static const ALIGN_ASSET(2) char ganon_room_9Tex_004520[] = dganon_room_9Tex_004520; + +#define dganon_room_9Tex_004D20 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_004D20" +static const ALIGN_ASSET(2) char ganon_room_9Tex_004D20[] = dganon_room_9Tex_004D20; + +#define dganon_room_9Tex_005120 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_005120" +static const ALIGN_ASSET(2) char ganon_room_9Tex_005120[] = dganon_room_9Tex_005120; + +#define dganon_room_9TLUT_001F18 "__OTR__scenes/shared/ganon_scene/ganon_room_9TLUT_001F18" +static const ALIGN_ASSET(2) char ganon_room_9TLUT_001F18[] = dganon_room_9TLUT_001F18; + +#define dganon_room_9DL_001F08 "__OTR__scenes/shared/ganon_scene/ganon_room_9DL_001F08" +static const ALIGN_ASSET(2) char ganon_room_9DL_001F08[] = dganon_room_9DL_001F08; + #endif // DUNGEONS_GANON_ROOM_9_H diff --git a/soh/assets/scenes/dungeons/ganon/ganon_scene.h b/soh/assets/scenes/dungeons/ganon/ganon_scene.h index 58eff87d2..cc4542ec6 100644 --- a/soh/assets/scenes/dungeons/ganon/ganon_scene.h +++ b/soh/assets/scenes/dungeons/ganon/ganon_scene.h @@ -3,34 +3,35 @@ #include "align_asset_macro.h" -#define dganon_sceneCollisionHeader_00E7A0 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneCollisionHeader_00E7A0" -static const ALIGN_ASSET(2) char ganon_sceneCollisionHeader_00E7A0[] = dganon_sceneCollisionHeader_00E7A0; - -#define dganon_sceneTex_00FBA8 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTex_00FBA8" -static const ALIGN_ASSET(2) char ganon_sceneTex_00FBA8[] = dganon_sceneTex_00FBA8; - -#define dganon_sceneTLUT_00E7D0 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTLUT_00E7D0" -static const ALIGN_ASSET(2) char ganon_sceneTLUT_00E7D0[] = dganon_sceneTLUT_00E7D0; - -#define dganon_sceneTex_00EFA8 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTex_00EFA8" +#define dganon_sceneTex_00EFA8 "__OTR__scenes/shared/ganon_scene/ganon_sceneTex_00EFA8" static const ALIGN_ASSET(2) char ganon_sceneTex_00EFA8[] = dganon_sceneTex_00EFA8; -#define dganon_sceneTLUT_00EDA0 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTLUT_00EDA0" -static const ALIGN_ASSET(2) char ganon_sceneTLUT_00EDA0[] = dganon_sceneTLUT_00EDA0; - -#define dganon_sceneTex_00F3A8 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTex_00F3A8" +#define dganon_sceneTex_00F3A8 "__OTR__scenes/shared/ganon_scene/ganon_sceneTex_00F3A8" static const ALIGN_ASSET(2) char ganon_sceneTex_00F3A8[] = dganon_sceneTex_00F3A8; -#define dganon_sceneTex_00F7A8 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTex_00F7A8" +#define dganon_sceneTex_00F7A8 "__OTR__scenes/shared/ganon_scene/ganon_sceneTex_00F7A8" static const ALIGN_ASSET(2) char ganon_sceneTex_00F7A8[] = dganon_sceneTex_00F7A8; -#define dganon_sceneTex_00FFA8 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTex_00FFA8" +#define dganon_sceneTex_00FBA8 "__OTR__scenes/shared/ganon_scene/ganon_sceneTex_00FBA8" +static const ALIGN_ASSET(2) char ganon_sceneTex_00FBA8[] = dganon_sceneTex_00FBA8; + +#define dganon_sceneTex_00FFA8 "__OTR__scenes/shared/ganon_scene/ganon_sceneTex_00FFA8" static const ALIGN_ASSET(2) char ganon_sceneTex_00FFA8[] = dganon_sceneTex_00FFA8; -#define dganon_sceneTLUT_00EBE0 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTLUT_00EBE0" -static const ALIGN_ASSET(2) char ganon_sceneTLUT_00EBE0[] = dganon_sceneTLUT_00EBE0; +#define dganon_sceneTLUT_00E7D0 "__OTR__scenes/shared/ganon_scene/ganon_sceneTLUT_00E7D0" +static const ALIGN_ASSET(2) char ganon_sceneTLUT_00E7D0[] = dganon_sceneTLUT_00E7D0; -#define dganon_sceneTLUT_00E9D8 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTLUT_00E9D8" +#define dganon_sceneTLUT_00E9D8 "__OTR__scenes/shared/ganon_scene/ganon_sceneTLUT_00E9D8" static const ALIGN_ASSET(2) char ganon_sceneTLUT_00E9D8[] = dganon_sceneTLUT_00E9D8; +#define dganon_sceneTLUT_00EBE0 "__OTR__scenes/shared/ganon_scene/ganon_sceneTLUT_00EBE0" +static const ALIGN_ASSET(2) char ganon_sceneTLUT_00EBE0[] = dganon_sceneTLUT_00EBE0; + +#define dganon_sceneTLUT_00EDA0 "__OTR__scenes/shared/ganon_scene/ganon_sceneTLUT_00EDA0" +static const ALIGN_ASSET(2) char ganon_sceneTLUT_00EDA0[] = dganon_sceneTLUT_00EDA0; + +#define dganon_sceneCollisionHeader_00E7A0 "__OTR__scenes/shared/ganon_scene/ganon_sceneCollisionHeader_00E7A0" +static const ALIGN_ASSET(2) char ganon_sceneCollisionHeader_00E7A0[] = dganon_sceneCollisionHeader_00E7A0; + + #endif // DUNGEONS_GANON_SCENE_H diff --git a/soh/assets/scenes/dungeons/ganon_boss/ganon_boss_room_0.h b/soh/assets/scenes/dungeons/ganon_boss/ganon_boss_room_0.h index 58fc10437..e7e7812fd 100644 --- a/soh/assets/scenes/dungeons/ganon_boss/ganon_boss_room_0.h +++ b/soh/assets/scenes/dungeons/ganon_boss/ganon_boss_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dganon_boss_room_0DL_005E50 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_room_0DL_005E50" +#define dganon_boss_room_0DL_005E50 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_room_0DL_005E50" static const ALIGN_ASSET(2) char ganon_boss_room_0DL_005E50[] = dganon_boss_room_0DL_005E50; diff --git a/soh/assets/scenes/dungeons/ganon_boss/ganon_boss_scene.h b/soh/assets/scenes/dungeons/ganon_boss/ganon_boss_scene.h index 13d810fbd..ad661db4c 100644 --- a/soh/assets/scenes/dungeons/ganon_boss/ganon_boss_scene.h +++ b/soh/assets/scenes/dungeons/ganon_boss/ganon_boss_scene.h @@ -3,76 +3,77 @@ #include "align_asset_macro.h" -#define dganon_boss_sceneCollisionHeader_001520 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneCollisionHeader_001520" -static const ALIGN_ASSET(2) char ganon_boss_sceneCollisionHeader_001520[] = dganon_boss_sceneCollisionHeader_001520; - -#define dganon_boss_sceneTex_002798 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_002798" -static const ALIGN_ASSET(2) char ganon_boss_sceneTex_002798[] = dganon_boss_sceneTex_002798; - -#define dganon_boss_sceneTLUT_001C50 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTLUT_001C50" -static const ALIGN_ASSET(2) char ganon_boss_sceneTLUT_001C50[] = dganon_boss_sceneTLUT_001C50; - -#define dganon_boss_sceneTex_002B98 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_002B98" -static const ALIGN_ASSET(2) char ganon_boss_sceneTex_002B98[] = dganon_boss_sceneTex_002B98; - -#define dganon_boss_sceneTLUT_001A90 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTLUT_001A90" -static const ALIGN_ASSET(2) char ganon_boss_sceneTLUT_001A90[] = dganon_boss_sceneTLUT_001A90; - -#define dganon_boss_sceneTex_004C18 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_004C18" -static const ALIGN_ASSET(2) char ganon_boss_sceneTex_004C18[] = dganon_boss_sceneTex_004C18; - -#define dganon_boss_sceneTex_006C18 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_006C18" -static const ALIGN_ASSET(2) char ganon_boss_sceneTex_006C18[] = dganon_boss_sceneTex_006C18; - -#define dganon_boss_sceneTLUT_001680 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTLUT_001680" -static const ALIGN_ASSET(2) char ganon_boss_sceneTLUT_001680[] = dganon_boss_sceneTLUT_001680; - -#define dganon_boss_sceneTex_002C18 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_002C18" -static const ALIGN_ASSET(2) char ganon_boss_sceneTex_002C18[] = dganon_boss_sceneTex_002C18; - -#define dganon_boss_sceneTex_005018 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_005018" -static const ALIGN_ASSET(2) char ganon_boss_sceneTex_005018[] = dganon_boss_sceneTex_005018; - -#define dganon_boss_sceneTex_002658 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_002658" -static const ALIGN_ASSET(2) char ganon_boss_sceneTex_002658[] = dganon_boss_sceneTex_002658; - -#define dganon_boss_sceneTex_003C18 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_003C18" -static const ALIGN_ASSET(2) char ganon_boss_sceneTex_003C18[] = dganon_boss_sceneTex_003C18; - -#define dganon_boss_sceneTLUT_001620 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTLUT_001620" -static const ALIGN_ASSET(2) char ganon_boss_sceneTLUT_001620[] = dganon_boss_sceneTLUT_001620; - -#define dganon_boss_sceneTex_002758 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_002758" -static const ALIGN_ASSET(2) char ganon_boss_sceneTex_002758[] = dganon_boss_sceneTex_002758; - -#define dganon_boss_sceneTex_006418 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_006418" -static const ALIGN_ASSET(2) char ganon_boss_sceneTex_006418[] = dganon_boss_sceneTex_006418; - -#define dganon_boss_sceneTex_001E58 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_001E58" +#define dganon_boss_sceneTex_001E58 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_001E58" static const ALIGN_ASSET(2) char ganon_boss_sceneTex_001E58[] = dganon_boss_sceneTex_001E58; -#define dganon_boss_sceneTLUT_001550 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTLUT_001550" -static const ALIGN_ASSET(2) char ganon_boss_sceneTLUT_001550[] = dganon_boss_sceneTLUT_001550; +#define dganon_boss_sceneTex_002658 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_002658" +static const ALIGN_ASSET(2) char ganon_boss_sceneTex_002658[] = dganon_boss_sceneTex_002658; -#define dganon_boss_sceneTex_006018 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_006018" -static const ALIGN_ASSET(2) char ganon_boss_sceneTex_006018[] = dganon_boss_sceneTex_006018; +#define dganon_boss_sceneTex_002758 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_002758" +static const ALIGN_ASSET(2) char ganon_boss_sceneTex_002758[] = dganon_boss_sceneTex_002758; -#define dganon_boss_sceneTex_005818 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_005818" -static const ALIGN_ASSET(2) char ganon_boss_sceneTex_005818[] = dganon_boss_sceneTex_005818; +#define dganon_boss_sceneTex_002798 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_002798" +static const ALIGN_ASSET(2) char ganon_boss_sceneTex_002798[] = dganon_boss_sceneTex_002798; -#define dganon_boss_sceneTLUT_001888 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTLUT_001888" -static const ALIGN_ASSET(2) char ganon_boss_sceneTLUT_001888[] = dganon_boss_sceneTLUT_001888; +#define dganon_boss_sceneTex_002B98 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_002B98" +static const ALIGN_ASSET(2) char ganon_boss_sceneTex_002B98[] = dganon_boss_sceneTex_002B98; -#define dganon_boss_sceneTex_004818 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_004818" -static const ALIGN_ASSET(2) char ganon_boss_sceneTex_004818[] = dganon_boss_sceneTex_004818; +#define dganon_boss_sceneTex_002C18 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_002C18" +static const ALIGN_ASSET(2) char ganon_boss_sceneTex_002C18[] = dganon_boss_sceneTex_002C18; -#define dganon_boss_sceneTex_004418 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_004418" -static const ALIGN_ASSET(2) char ganon_boss_sceneTex_004418[] = dganon_boss_sceneTex_004418; +#define dganon_boss_sceneTex_003C18 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_003C18" +static const ALIGN_ASSET(2) char ganon_boss_sceneTex_003C18[] = dganon_boss_sceneTex_003C18; -#define dganon_boss_sceneTex_004018 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_004018" +#define dganon_boss_sceneTex_004018 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_004018" static const ALIGN_ASSET(2) char ganon_boss_sceneTex_004018[] = dganon_boss_sceneTex_004018; -#define dganon_boss_sceneTex_007418 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_007418" +#define dganon_boss_sceneTex_004418 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_004418" +static const ALIGN_ASSET(2) char ganon_boss_sceneTex_004418[] = dganon_boss_sceneTex_004418; + +#define dganon_boss_sceneTex_004818 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_004818" +static const ALIGN_ASSET(2) char ganon_boss_sceneTex_004818[] = dganon_boss_sceneTex_004818; + +#define dganon_boss_sceneTex_004C18 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_004C18" +static const ALIGN_ASSET(2) char ganon_boss_sceneTex_004C18[] = dganon_boss_sceneTex_004C18; + +#define dganon_boss_sceneTex_005018 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_005018" +static const ALIGN_ASSET(2) char ganon_boss_sceneTex_005018[] = dganon_boss_sceneTex_005018; + +#define dganon_boss_sceneTex_005818 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_005818" +static const ALIGN_ASSET(2) char ganon_boss_sceneTex_005818[] = dganon_boss_sceneTex_005818; + +#define dganon_boss_sceneTex_006018 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_006018" +static const ALIGN_ASSET(2) char ganon_boss_sceneTex_006018[] = dganon_boss_sceneTex_006018; + +#define dganon_boss_sceneTex_006418 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_006418" +static const ALIGN_ASSET(2) char ganon_boss_sceneTex_006418[] = dganon_boss_sceneTex_006418; + +#define dganon_boss_sceneTex_006C18 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_006C18" +static const ALIGN_ASSET(2) char ganon_boss_sceneTex_006C18[] = dganon_boss_sceneTex_006C18; + +#define dganon_boss_sceneTex_007418 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_007418" static const ALIGN_ASSET(2) char ganon_boss_sceneTex_007418[] = dganon_boss_sceneTex_007418; +#define dganon_boss_sceneTLUT_001550 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTLUT_001550" +static const ALIGN_ASSET(2) char ganon_boss_sceneTLUT_001550[] = dganon_boss_sceneTLUT_001550; + +#define dganon_boss_sceneTLUT_001620 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTLUT_001620" +static const ALIGN_ASSET(2) char ganon_boss_sceneTLUT_001620[] = dganon_boss_sceneTLUT_001620; + +#define dganon_boss_sceneTLUT_001680 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTLUT_001680" +static const ALIGN_ASSET(2) char ganon_boss_sceneTLUT_001680[] = dganon_boss_sceneTLUT_001680; + +#define dganon_boss_sceneTLUT_001888 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTLUT_001888" +static const ALIGN_ASSET(2) char ganon_boss_sceneTLUT_001888[] = dganon_boss_sceneTLUT_001888; + +#define dganon_boss_sceneTLUT_001A90 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTLUT_001A90" +static const ALIGN_ASSET(2) char ganon_boss_sceneTLUT_001A90[] = dganon_boss_sceneTLUT_001A90; + +#define dganon_boss_sceneTLUT_001C50 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTLUT_001C50" +static const ALIGN_ASSET(2) char ganon_boss_sceneTLUT_001C50[] = dganon_boss_sceneTLUT_001C50; + +#define dganon_boss_sceneCollisionHeader_001520 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneCollisionHeader_001520" +static const ALIGN_ASSET(2) char ganon_boss_sceneCollisionHeader_001520[] = dganon_boss_sceneCollisionHeader_001520; + + #endif // DUNGEONS_GANON_BOSS_SCENE_H diff --git a/soh/assets/scenes/dungeons/ganon_demo/ganon_demo_room_0.h b/soh/assets/scenes/dungeons/ganon_demo/ganon_demo_room_0.h index c1927a945..b2c0ce76a 100644 --- a/soh/assets/scenes/dungeons/ganon_demo/ganon_demo_room_0.h +++ b/soh/assets/scenes/dungeons/ganon_demo/ganon_demo_room_0.h @@ -3,16 +3,16 @@ #include "align_asset_macro.h" -#define dganon_demo_room_0DL_003D58 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_room_0DL_003D58" +#define dganon_demo_room_0DL_003D58 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_room_0DL_003D58" static const ALIGN_ASSET(2) char ganon_demo_room_0DL_003D58[] = dganon_demo_room_0DL_003D58; -#define dganon_demo_room_0DL_004140 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_room_0DL_004140" +#define dganon_demo_room_0DL_004140 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_room_0DL_004140" static const ALIGN_ASSET(2) char ganon_demo_room_0DL_004140[] = dganon_demo_room_0DL_004140; -#define dganon_demo_room_0Set_000230DL_003D58 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_room_0Set_000230DL_003D58" +#define dganon_demo_room_0Set_000230DL_003D58 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_room_0Set_000230DL_003D58" static const ALIGN_ASSET(2) char ganon_demo_room_0Set_000230DL_003D58[] = dganon_demo_room_0Set_000230DL_003D58; -#define dganon_demo_room_0Set_000230DL_004140 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_room_0Set_000230DL_004140" +#define dganon_demo_room_0Set_000230DL_004140 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_room_0Set_000230DL_004140" static const ALIGN_ASSET(2) char ganon_demo_room_0Set_000230DL_004140[] = dganon_demo_room_0Set_000230DL_004140; diff --git a/soh/assets/scenes/dungeons/ganon_demo/ganon_demo_scene.h b/soh/assets/scenes/dungeons/ganon_demo/ganon_demo_scene.h index 0044d616d..ffa379765 100644 --- a/soh/assets/scenes/dungeons/ganon_demo/ganon_demo_scene.h +++ b/soh/assets/scenes/dungeons/ganon_demo/ganon_demo_scene.h @@ -3,43 +3,43 @@ #include "align_asset_macro.h" -#define dganon_demo_sceneCollisionHeader_001AA0 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneCollisionHeader_001AA0" -static const ALIGN_ASSET(2) char ganon_demo_sceneCollisionHeader_001AA0[] = dganon_demo_sceneCollisionHeader_001AA0; - -#define dganon_demo_sceneTex_008370 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_008370" -static const ALIGN_ASSET(2) char ganon_demo_sceneTex_008370[] = dganon_demo_sceneTex_008370; - -#define dganon_demo_sceneTex_007370 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_007370" -static const ALIGN_ASSET(2) char ganon_demo_sceneTex_007370[] = dganon_demo_sceneTex_007370; - -#define dganon_demo_sceneTex_008870 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_008870" -static const ALIGN_ASSET(2) char ganon_demo_sceneTex_008870[] = dganon_demo_sceneTex_008870; - -#define dganon_demo_sceneTex_008770 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_008770" -static const ALIGN_ASSET(2) char ganon_demo_sceneTex_008770[] = dganon_demo_sceneTex_008770; - -#define dganon_demo_sceneTex_006370 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_006370" -static const ALIGN_ASSET(2) char ganon_demo_sceneTex_006370[] = dganon_demo_sceneTex_006370; - -#define dganon_demo_sceneTex_005B70 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_005B70" -static const ALIGN_ASSET(2) char ganon_demo_sceneTex_005B70[] = dganon_demo_sceneTex_005B70; - -#define dganon_demo_sceneTex_004B70 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_004B70" -static const ALIGN_ASSET(2) char ganon_demo_sceneTex_004B70[] = dganon_demo_sceneTex_004B70; - -#define dganon_demo_sceneTex_003B70 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_003B70" -static const ALIGN_ASSET(2) char ganon_demo_sceneTex_003B70[] = dganon_demo_sceneTex_003B70; - -#define dganon_demo_sceneTex_002B70 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_002B70" -static const ALIGN_ASSET(2) char ganon_demo_sceneTex_002B70[] = dganon_demo_sceneTex_002B70; - -#define dganon_demo_sceneTex_001B70 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_001B70" +#define dganon_demo_sceneTex_001B70 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_001B70" static const ALIGN_ASSET(2) char ganon_demo_sceneTex_001B70[] = dganon_demo_sceneTex_001B70; -#define dganon_demo_sceneTex_006B70 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_006B70" +#define dganon_demo_sceneTex_002B70 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_002B70" +static const ALIGN_ASSET(2) char ganon_demo_sceneTex_002B70[] = dganon_demo_sceneTex_002B70; + +#define dganon_demo_sceneTex_003B70 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_003B70" +static const ALIGN_ASSET(2) char ganon_demo_sceneTex_003B70[] = dganon_demo_sceneTex_003B70; + +#define dganon_demo_sceneTex_004B70 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_004B70" +static const ALIGN_ASSET(2) char ganon_demo_sceneTex_004B70[] = dganon_demo_sceneTex_004B70; + +#define dganon_demo_sceneTex_005B70 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_005B70" +static const ALIGN_ASSET(2) char ganon_demo_sceneTex_005B70[] = dganon_demo_sceneTex_005B70; + +#define dganon_demo_sceneTex_006370 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_006370" +static const ALIGN_ASSET(2) char ganon_demo_sceneTex_006370[] = dganon_demo_sceneTex_006370; + +#define dganon_demo_sceneTex_006B70 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_006B70" static const ALIGN_ASSET(2) char ganon_demo_sceneTex_006B70[] = dganon_demo_sceneTex_006B70; -#define dganon_demo_sceneCollisionHeader_001AA0 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneCollisionHeader_001AA0" +#define dganon_demo_sceneTex_007370 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_007370" +static const ALIGN_ASSET(2) char ganon_demo_sceneTex_007370[] = dganon_demo_sceneTex_007370; + +#define dganon_demo_sceneTex_008370 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_008370" +static const ALIGN_ASSET(2) char ganon_demo_sceneTex_008370[] = dganon_demo_sceneTex_008370; + +#define dganon_demo_sceneTex_008770 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_008770" +static const ALIGN_ASSET(2) char ganon_demo_sceneTex_008770[] = dganon_demo_sceneTex_008770; + +#define dganon_demo_sceneTex_008870 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_008870" +static const ALIGN_ASSET(2) char ganon_demo_sceneTex_008870[] = dganon_demo_sceneTex_008870; + +#define dganon_demo_sceneCollisionHeader_001AA0 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneCollisionHeader_001AA0" +static const ALIGN_ASSET(2) char ganon_demo_sceneCollisionHeader_001AA0[] = dganon_demo_sceneCollisionHeader_001AA0; + +#define dganon_demo_sceneCollisionHeader_001AA0 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneCollisionHeader_001AA0" #endif // DUNGEONS_GANON_DEMO_SCENE_H diff --git a/soh/assets/scenes/dungeons/ganon_final/ganon_final_room_0.h b/soh/assets/scenes/dungeons/ganon_final/ganon_final_room_0.h index 5a859ed00..633e0a348 100644 --- a/soh/assets/scenes/dungeons/ganon_final/ganon_final_room_0.h +++ b/soh/assets/scenes/dungeons/ganon_final/ganon_final_room_0.h @@ -3,10 +3,10 @@ #include "align_asset_macro.h" -#define dganon_final_room_0DL_00CA40 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_room_0DL_00CA40" +#define dganon_final_room_0DL_00CA40 "__OTR__scenes/shared/ganon_final_scene/ganon_final_room_0DL_00CA40" static const ALIGN_ASSET(2) char ganon_final_room_0DL_00CA40[] = dganon_final_room_0DL_00CA40; -#define dganon_final_room_0DL_00CE98 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_room_0DL_00CE98" +#define dganon_final_room_0DL_00CE98 "__OTR__scenes/shared/ganon_final_scene/ganon_final_room_0DL_00CE98" static const ALIGN_ASSET(2) char ganon_final_room_0DL_00CE98[] = dganon_final_room_0DL_00CE98; diff --git a/soh/assets/scenes/dungeons/ganon_final/ganon_final_scene.h b/soh/assets/scenes/dungeons/ganon_final/ganon_final_scene.h index efa7738d1..78ee3c548 100644 --- a/soh/assets/scenes/dungeons/ganon_final/ganon_final_scene.h +++ b/soh/assets/scenes/dungeons/ganon_final/ganon_final_scene.h @@ -3,82 +3,83 @@ #include "align_asset_macro.h" -#define dganon_final_sceneCollisionHeader_002354 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneCollisionHeader_002354" -static const ALIGN_ASSET(2) char ganon_final_sceneCollisionHeader_002354[] = dganon_final_sceneCollisionHeader_002354; - -#define dganon_final_sceneTex_00A580 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00A580" -static const ALIGN_ASSET(2) char ganon_final_sceneTex_00A580[] = dganon_final_sceneTex_00A580; - -#define dganon_final_sceneTex_00BD80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00BD80" -static const ALIGN_ASSET(2) char ganon_final_sceneTex_00BD80[] = dganon_final_sceneTex_00BD80; - -#define dganon_final_sceneTex_00AD80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00AD80" -static const ALIGN_ASSET(2) char ganon_final_sceneTex_00AD80[] = dganon_final_sceneTex_00AD80; - -#define dganon_final_sceneTex_00CD80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00CD80" -static const ALIGN_ASSET(2) char ganon_final_sceneTex_00CD80[] = dganon_final_sceneTex_00CD80; - -#define dganon_final_sceneTex_004D80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_004D80" -static const ALIGN_ASSET(2) char ganon_final_sceneTex_004D80[] = dganon_final_sceneTex_004D80; - -#define dganon_final_sceneTex_006D80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_006D80" -static const ALIGN_ASSET(2) char ganon_final_sceneTex_006D80[] = dganon_final_sceneTex_006D80; - -#define dganon_final_sceneTex_003D80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_003D80" -static const ALIGN_ASSET(2) char ganon_final_sceneTex_003D80[] = dganon_final_sceneTex_003D80; - -#define dganon_final_sceneTex_010580 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_010580" -static const ALIGN_ASSET(2) char ganon_final_sceneTex_010580[] = dganon_final_sceneTex_010580; - -#define dganon_final_sceneTex_00CE80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00CE80" -static const ALIGN_ASSET(2) char ganon_final_sceneTex_00CE80[] = dganon_final_sceneTex_00CE80; - -#define dganon_final_sceneTex_00DE80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00DE80" -static const ALIGN_ASSET(2) char ganon_final_sceneTex_00DE80[] = dganon_final_sceneTex_00DE80; - -#define dganon_final_sceneTex_002980 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_002980" -static const ALIGN_ASSET(2) char ganon_final_sceneTex_002980[] = dganon_final_sceneTex_002980; - -#define dganon_final_sceneTex_002380 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_002380" +#define dganon_final_sceneTex_002380 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_002380" static const ALIGN_ASSET(2) char ganon_final_sceneTex_002380[] = dganon_final_sceneTex_002380; -#define dganon_final_sceneTex_002D80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_002D80" -static const ALIGN_ASSET(2) char ganon_final_sceneTex_002D80[] = dganon_final_sceneTex_002D80; - -#define dganon_final_sceneTex_007580 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_007580" -static const ALIGN_ASSET(2) char ganon_final_sceneTex_007580[] = dganon_final_sceneTex_007580; - -#define dganon_final_sceneTex_00E180 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00E180" -static const ALIGN_ASSET(2) char ganon_final_sceneTex_00E180[] = dganon_final_sceneTex_00E180; - -#define dganon_final_sceneTex_00F580 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00F580" -static const ALIGN_ASSET(2) char ganon_final_sceneTex_00F580[] = dganon_final_sceneTex_00F580; - -#define dganon_final_sceneTex_005D80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_005D80" -static const ALIGN_ASSET(2) char ganon_final_sceneTex_005D80[] = dganon_final_sceneTex_005D80; - -#define dganon_final_sceneTex_008580 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_008580" -static const ALIGN_ASSET(2) char ganon_final_sceneTex_008580[] = dganon_final_sceneTex_008580; - -#define dganon_final_sceneTex_009580 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_009580" -static const ALIGN_ASSET(2) char ganon_final_sceneTex_009580[] = dganon_final_sceneTex_009580; - -#define dganon_final_sceneTex_010980 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_010980" -static const ALIGN_ASSET(2) char ganon_final_sceneTex_010980[] = dganon_final_sceneTex_010980; - -#define dganon_final_sceneTex_004580 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_004580" -static const ALIGN_ASSET(2) char ganon_final_sceneTex_004580[] = dganon_final_sceneTex_004580; - -#define dganon_final_sceneTex_002780 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_002780" +#define dganon_final_sceneTex_002780 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_002780" static const ALIGN_ASSET(2) char ganon_final_sceneTex_002780[] = dganon_final_sceneTex_002780; -#define dganon_final_sceneTex_00F180 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00F180" -static const ALIGN_ASSET(2) char ganon_final_sceneTex_00F180[] = dganon_final_sceneTex_00F180; +#define dganon_final_sceneTex_002980 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_002980" +static const ALIGN_ASSET(2) char ganon_final_sceneTex_002980[] = dganon_final_sceneTex_002980; -#define dganon_final_sceneTex_00E080 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00E080" +#define dganon_final_sceneTex_002D80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_002D80" +static const ALIGN_ASSET(2) char ganon_final_sceneTex_002D80[] = dganon_final_sceneTex_002D80; + +#define dganon_final_sceneTex_003D80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_003D80" +static const ALIGN_ASSET(2) char ganon_final_sceneTex_003D80[] = dganon_final_sceneTex_003D80; + +#define dganon_final_sceneTex_004580 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_004580" +static const ALIGN_ASSET(2) char ganon_final_sceneTex_004580[] = dganon_final_sceneTex_004580; + +#define dganon_final_sceneTex_004D80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_004D80" +static const ALIGN_ASSET(2) char ganon_final_sceneTex_004D80[] = dganon_final_sceneTex_004D80; + +#define dganon_final_sceneTex_005D80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_005D80" +static const ALIGN_ASSET(2) char ganon_final_sceneTex_005D80[] = dganon_final_sceneTex_005D80; + +#define dganon_final_sceneTex_006D80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_006D80" +static const ALIGN_ASSET(2) char ganon_final_sceneTex_006D80[] = dganon_final_sceneTex_006D80; + +#define dganon_final_sceneTex_007580 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_007580" +static const ALIGN_ASSET(2) char ganon_final_sceneTex_007580[] = dganon_final_sceneTex_007580; + +#define dganon_final_sceneTex_008580 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_008580" +static const ALIGN_ASSET(2) char ganon_final_sceneTex_008580[] = dganon_final_sceneTex_008580; + +#define dganon_final_sceneTex_009580 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_009580" +static const ALIGN_ASSET(2) char ganon_final_sceneTex_009580[] = dganon_final_sceneTex_009580; + +#define dganon_final_sceneTex_00A580 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00A580" +static const ALIGN_ASSET(2) char ganon_final_sceneTex_00A580[] = dganon_final_sceneTex_00A580; + +#define dganon_final_sceneTex_00AD80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00AD80" +static const ALIGN_ASSET(2) char ganon_final_sceneTex_00AD80[] = dganon_final_sceneTex_00AD80; + +#define dganon_final_sceneTex_00BD80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00BD80" +static const ALIGN_ASSET(2) char ganon_final_sceneTex_00BD80[] = dganon_final_sceneTex_00BD80; + +#define dganon_final_sceneTex_00CD80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00CD80" +static const ALIGN_ASSET(2) char ganon_final_sceneTex_00CD80[] = dganon_final_sceneTex_00CD80; + +#define dganon_final_sceneTex_00CE80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00CE80" +static const ALIGN_ASSET(2) char ganon_final_sceneTex_00CE80[] = dganon_final_sceneTex_00CE80; + +#define dganon_final_sceneTex_00DE80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00DE80" +static const ALIGN_ASSET(2) char ganon_final_sceneTex_00DE80[] = dganon_final_sceneTex_00DE80; + +#define dganon_final_sceneTex_00E080 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00E080" static const ALIGN_ASSET(2) char ganon_final_sceneTex_00E080[] = dganon_final_sceneTex_00E080; -#define dganon_final_sceneTex_011180 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_011180" +#define dganon_final_sceneTex_00E180 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00E180" +static const ALIGN_ASSET(2) char ganon_final_sceneTex_00E180[] = dganon_final_sceneTex_00E180; + +#define dganon_final_sceneTex_00F180 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00F180" +static const ALIGN_ASSET(2) char ganon_final_sceneTex_00F180[] = dganon_final_sceneTex_00F180; + +#define dganon_final_sceneTex_00F580 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00F580" +static const ALIGN_ASSET(2) char ganon_final_sceneTex_00F580[] = dganon_final_sceneTex_00F580; + +#define dganon_final_sceneTex_010580 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_010580" +static const ALIGN_ASSET(2) char ganon_final_sceneTex_010580[] = dganon_final_sceneTex_010580; + +#define dganon_final_sceneTex_010980 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_010980" +static const ALIGN_ASSET(2) char ganon_final_sceneTex_010980[] = dganon_final_sceneTex_010980; + +#define dganon_final_sceneTex_011180 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_011180" static const ALIGN_ASSET(2) char ganon_final_sceneTex_011180[] = dganon_final_sceneTex_011180; +#define dganon_final_sceneCollisionHeader_002354 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneCollisionHeader_002354" +static const ALIGN_ASSET(2) char ganon_final_sceneCollisionHeader_002354[] = dganon_final_sceneCollisionHeader_002354; + + #endif // DUNGEONS_GANON_FINAL_SCENE_H diff --git a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_0.h b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_0.h index ca506aa89..5ca345c1b 100644 --- a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_0.h +++ b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_0.h @@ -3,34 +3,34 @@ #include "align_asset_macro.h" -#define dganon_sonogo_room_0DL_005010 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_0DL_005010" -static const ALIGN_ASSET(2) char ganon_sonogo_room_0DL_005010[] = dganon_sonogo_room_0DL_005010; - -#define dganon_sonogo_room_0Tex_005820 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_0Tex_005820" -static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_005820[] = dganon_sonogo_room_0Tex_005820; - -#define dganon_sonogo_room_0Tex_005020 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_0Tex_005020" +#define dganon_sonogo_room_0Tex_005020 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_0Tex_005020" static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_005020[] = dganon_sonogo_room_0Tex_005020; -#define dganon_sonogo_room_0Tex_007820 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_0Tex_007820" -static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_007820[] = dganon_sonogo_room_0Tex_007820; +#define dganon_sonogo_room_0Tex_005820 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_0Tex_005820" +static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_005820[] = dganon_sonogo_room_0Tex_005820; -#define dganon_sonogo_room_0Tex_006020 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_0Tex_006020" -static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_006020[] = dganon_sonogo_room_0Tex_006020; - -#define dganon_sonogo_room_0Tex_006820 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_0Tex_006820" -static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_006820[] = dganon_sonogo_room_0Tex_006820; - -#define dganon_sonogo_room_0Tex_007420 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_0Tex_007420" -static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_007420[] = dganon_sonogo_room_0Tex_007420; - -#define dganon_sonogo_room_0Tex_007020 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_0Tex_007020" -static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_007020[] = dganon_sonogo_room_0Tex_007020; - -#define dganon_sonogo_room_0Tex_005C20 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_0Tex_005C20" +#define dganon_sonogo_room_0Tex_005C20 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_0Tex_005C20" static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_005C20[] = dganon_sonogo_room_0Tex_005C20; -#define dganon_sonogo_room_0DL_007E70 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_0DL_007E70" +#define dganon_sonogo_room_0Tex_006020 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_0Tex_006020" +static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_006020[] = dganon_sonogo_room_0Tex_006020; + +#define dganon_sonogo_room_0Tex_006820 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_0Tex_006820" +static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_006820[] = dganon_sonogo_room_0Tex_006820; + +#define dganon_sonogo_room_0Tex_007020 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_0Tex_007020" +static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_007020[] = dganon_sonogo_room_0Tex_007020; + +#define dganon_sonogo_room_0Tex_007420 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_0Tex_007420" +static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_007420[] = dganon_sonogo_room_0Tex_007420; + +#define dganon_sonogo_room_0Tex_007820 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_0Tex_007820" +static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_007820[] = dganon_sonogo_room_0Tex_007820; + +#define dganon_sonogo_room_0DL_005010 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_0DL_005010" +static const ALIGN_ASSET(2) char ganon_sonogo_room_0DL_005010[] = dganon_sonogo_room_0DL_005010; + +#define dganon_sonogo_room_0DL_007E70 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_0DL_007E70" static const ALIGN_ASSET(2) char ganon_sonogo_room_0DL_007E70[] = dganon_sonogo_room_0DL_007E70; diff --git a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_1.h b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_1.h index f4d721082..291cf604b 100644 --- a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_1.h +++ b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_1.h @@ -3,37 +3,37 @@ #include "align_asset_macro.h" -#define dganon_sonogo_room_1DL_004138 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_1DL_004138" -static const ALIGN_ASSET(2) char ganon_sonogo_room_1DL_004138[] = dganon_sonogo_room_1DL_004138; - -#define dganon_sonogo_room_1Tex_004948 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_1Tex_004948" -static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_004948[] = dganon_sonogo_room_1Tex_004948; - -#define dganon_sonogo_room_1Tex_006948 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_1Tex_006948" -static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_006948[] = dganon_sonogo_room_1Tex_006948; - -#define dganon_sonogo_room_1Tex_005948 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_1Tex_005948" -static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_005948[] = dganon_sonogo_room_1Tex_005948; - -#define dganon_sonogo_room_1Tex_006548 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_1Tex_006548" -static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_006548[] = dganon_sonogo_room_1Tex_006548; - -#define dganon_sonogo_room_1Tex_004D48 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_1Tex_004D48" -static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_004D48[] = dganon_sonogo_room_1Tex_004D48; - -#define dganon_sonogo_room_1Tex_005548 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_1Tex_005548" -static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_005548[] = dganon_sonogo_room_1Tex_005548; - -#define dganon_sonogo_room_1Tex_004148 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_1Tex_004148" +#define dganon_sonogo_room_1Tex_004148 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_1Tex_004148" static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_004148[] = dganon_sonogo_room_1Tex_004148; -#define dganon_sonogo_room_1Tex_005D48 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_1Tex_005D48" -static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_005D48[] = dganon_sonogo_room_1Tex_005D48; - -#define dganon_sonogo_room_1Tex_004548 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_1Tex_004548" +#define dganon_sonogo_room_1Tex_004548 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_1Tex_004548" static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_004548[] = dganon_sonogo_room_1Tex_004548; -#define dganon_sonogo_room_1DL_007BA0 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_1DL_007BA0" +#define dganon_sonogo_room_1Tex_004948 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_1Tex_004948" +static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_004948[] = dganon_sonogo_room_1Tex_004948; + +#define dganon_sonogo_room_1Tex_004D48 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_1Tex_004D48" +static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_004D48[] = dganon_sonogo_room_1Tex_004D48; + +#define dganon_sonogo_room_1Tex_005548 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_1Tex_005548" +static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_005548[] = dganon_sonogo_room_1Tex_005548; + +#define dganon_sonogo_room_1Tex_005948 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_1Tex_005948" +static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_005948[] = dganon_sonogo_room_1Tex_005948; + +#define dganon_sonogo_room_1Tex_005D48 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_1Tex_005D48" +static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_005D48[] = dganon_sonogo_room_1Tex_005D48; + +#define dganon_sonogo_room_1Tex_006548 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_1Tex_006548" +static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_006548[] = dganon_sonogo_room_1Tex_006548; + +#define dganon_sonogo_room_1Tex_006948 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_1Tex_006948" +static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_006948[] = dganon_sonogo_room_1Tex_006948; + +#define dganon_sonogo_room_1DL_004138 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_1DL_004138" +static const ALIGN_ASSET(2) char ganon_sonogo_room_1DL_004138[] = dganon_sonogo_room_1DL_004138; + +#define dganon_sonogo_room_1DL_007BA0 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_1DL_007BA0" static const ALIGN_ASSET(2) char ganon_sonogo_room_1DL_007BA0[] = dganon_sonogo_room_1DL_007BA0; diff --git a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_2.h b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_2.h index 584de962e..f09eaf090 100644 --- a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_2.h +++ b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_2.h @@ -3,43 +3,43 @@ #include "align_asset_macro.h" -#define dganon_sonogo_room_2DL_004A30 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2DL_004A30" -static const ALIGN_ASSET(2) char ganon_sonogo_room_2DL_004A30[] = dganon_sonogo_room_2DL_004A30; - -#define dganon_sonogo_room_2Tex_006640 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2Tex_006640" -static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_006640[] = dganon_sonogo_room_2Tex_006640; - -#define dganon_sonogo_room_2Tex_007A40 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2Tex_007A40" -static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_007A40[] = dganon_sonogo_room_2Tex_007A40; - -#define dganon_sonogo_room_2Tex_005240 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2Tex_005240" -static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_005240[] = dganon_sonogo_room_2Tex_005240; - -#define dganon_sonogo_room_2Tex_005A40 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2Tex_005A40" -static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_005A40[] = dganon_sonogo_room_2Tex_005A40; - -#define dganon_sonogo_room_2Tex_006240 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2Tex_006240" -static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_006240[] = dganon_sonogo_room_2Tex_006240; - -#define dganon_sonogo_room_2Tex_005640 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2Tex_005640" -static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_005640[] = dganon_sonogo_room_2Tex_005640; - -#define dganon_sonogo_room_2Tex_004A40 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2Tex_004A40" +#define dganon_sonogo_room_2Tex_004A40 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2Tex_004A40" static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_004A40[] = dganon_sonogo_room_2Tex_004A40; -#define dganon_sonogo_room_2Tex_006A40 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2Tex_006A40" +#define dganon_sonogo_room_2Tex_005240 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2Tex_005240" +static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_005240[] = dganon_sonogo_room_2Tex_005240; + +#define dganon_sonogo_room_2Tex_005640 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2Tex_005640" +static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_005640[] = dganon_sonogo_room_2Tex_005640; + +#define dganon_sonogo_room_2Tex_005A40 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2Tex_005A40" +static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_005A40[] = dganon_sonogo_room_2Tex_005A40; + +#define dganon_sonogo_room_2Tex_006240 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2Tex_006240" +static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_006240[] = dganon_sonogo_room_2Tex_006240; + +#define dganon_sonogo_room_2Tex_006640 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2Tex_006640" +static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_006640[] = dganon_sonogo_room_2Tex_006640; + +#define dganon_sonogo_room_2Tex_006A40 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2Tex_006A40" static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_006A40[] = dganon_sonogo_room_2Tex_006A40; -#define dganon_sonogo_room_2Tex_007240 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2Tex_007240" -static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_007240[] = dganon_sonogo_room_2Tex_007240; - -#define dganon_sonogo_room_2Tex_008240 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2Tex_008240" -static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_008240[] = dganon_sonogo_room_2Tex_008240; - -#define dganon_sonogo_room_2Tex_006E40 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2Tex_006E40" +#define dganon_sonogo_room_2Tex_006E40 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2Tex_006E40" static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_006E40[] = dganon_sonogo_room_2Tex_006E40; -#define dganon_sonogo_room_2DL_008C90 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2DL_008C90" +#define dganon_sonogo_room_2Tex_007240 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2Tex_007240" +static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_007240[] = dganon_sonogo_room_2Tex_007240; + +#define dganon_sonogo_room_2Tex_007A40 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2Tex_007A40" +static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_007A40[] = dganon_sonogo_room_2Tex_007A40; + +#define dganon_sonogo_room_2Tex_008240 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2Tex_008240" +static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_008240[] = dganon_sonogo_room_2Tex_008240; + +#define dganon_sonogo_room_2DL_004A30 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2DL_004A30" +static const ALIGN_ASSET(2) char ganon_sonogo_room_2DL_004A30[] = dganon_sonogo_room_2DL_004A30; + +#define dganon_sonogo_room_2DL_008C90 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2DL_008C90" static const ALIGN_ASSET(2) char ganon_sonogo_room_2DL_008C90[] = dganon_sonogo_room_2DL_008C90; diff --git a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_3.h b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_3.h index 77620980e..592025452 100644 --- a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_3.h +++ b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_3.h @@ -3,20 +3,20 @@ #include "align_asset_macro.h" -#define dganon_sonogo_room_3DL_003A28 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_3DL_003A28" -static const ALIGN_ASSET(2) char ganon_sonogo_room_3DL_003A28[] = dganon_sonogo_room_3DL_003A28; - -#define dganon_sonogo_room_3Tex_003A38 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_3Tex_003A38" +#define dganon_sonogo_room_3Tex_003A38 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_3Tex_003A38" static const ALIGN_ASSET(2) char ganon_sonogo_room_3Tex_003A38[] = dganon_sonogo_room_3Tex_003A38; -#define dganon_sonogo_room_3Tex_004E38 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_3Tex_004E38" -static const ALIGN_ASSET(2) char ganon_sonogo_room_3Tex_004E38[] = dganon_sonogo_room_3Tex_004E38; +#define dganon_sonogo_room_3Tex_003E38 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_3Tex_003E38" +static const ALIGN_ASSET(2) char ganon_sonogo_room_3Tex_003E38[] = dganon_sonogo_room_3Tex_003E38; -#define dganon_sonogo_room_3Tex_004638 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_3Tex_004638" +#define dganon_sonogo_room_3Tex_004638 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_3Tex_004638" static const ALIGN_ASSET(2) char ganon_sonogo_room_3Tex_004638[] = dganon_sonogo_room_3Tex_004638; -#define dganon_sonogo_room_3Tex_003E38 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_3Tex_003E38" -static const ALIGN_ASSET(2) char ganon_sonogo_room_3Tex_003E38[] = dganon_sonogo_room_3Tex_003E38; +#define dganon_sonogo_room_3Tex_004E38 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_3Tex_004E38" +static const ALIGN_ASSET(2) char ganon_sonogo_room_3Tex_004E38[] = dganon_sonogo_room_3Tex_004E38; + +#define dganon_sonogo_room_3DL_003A28 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_3DL_003A28" +static const ALIGN_ASSET(2) char ganon_sonogo_room_3DL_003A28[] = dganon_sonogo_room_3DL_003A28; #endif // DUNGEONS_GANON_SONOGO_ROOM_3_H diff --git a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_4.h b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_4.h index c56319d02..9931d3547 100644 --- a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_4.h +++ b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_4.h @@ -3,47 +3,47 @@ #include "align_asset_macro.h" -#define dganon_sonogo_room_4DL_004830 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4DL_004830" -static const ALIGN_ASSET(2) char ganon_sonogo_room_4DL_004830[] = dganon_sonogo_room_4DL_004830; - -#define dganon_sonogo_room_4Tex_005CE8 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4Tex_005CE8" -static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_005CE8[] = dganon_sonogo_room_4Tex_005CE8; - -#define dganon_sonogo_room_4TLUT_004910 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4TLUT_004910" -static const ALIGN_ASSET(2) char ganon_sonogo_room_4TLUT_004910[] = dganon_sonogo_room_4TLUT_004910; - -#define dganon_sonogo_room_4Tex_0064E8 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4Tex_0064E8" -static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0064E8[] = dganon_sonogo_room_4Tex_0064E8; - -#define dganon_sonogo_room_4TLUT_004B18 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4TLUT_004B18" -static const ALIGN_ASSET(2) char ganon_sonogo_room_4TLUT_004B18[] = dganon_sonogo_room_4TLUT_004B18; - -#define dganon_sonogo_room_4Tex_0053A8 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4Tex_0053A8" -static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0053A8[] = dganon_sonogo_room_4Tex_0053A8; - -#define dganon_sonogo_room_4Tex_0074E8 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4Tex_0074E8" -static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0074E8[] = dganon_sonogo_room_4Tex_0074E8; - -#define dganon_sonogo_room_4Tex_0054E8 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4Tex_0054E8" -static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0054E8[] = dganon_sonogo_room_4Tex_0054E8; - -#define dganon_sonogo_room_4Tex_0068E8 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4Tex_0068E8" -static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0068E8[] = dganon_sonogo_room_4Tex_0068E8; - -#define dganon_sonogo_room_4Tex_004BA8 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4Tex_004BA8" +#define dganon_sonogo_room_4Tex_004BA8 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4Tex_004BA8" static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_004BA8[] = dganon_sonogo_room_4Tex_004BA8; -#define dganon_sonogo_room_4TLUT_004840 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4TLUT_004840" -static const ALIGN_ASSET(2) char ganon_sonogo_room_4TLUT_004840[] = dganon_sonogo_room_4TLUT_004840; +#define dganon_sonogo_room_4Tex_0053A8 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4Tex_0053A8" +static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0053A8[] = dganon_sonogo_room_4Tex_0053A8; -#define dganon_sonogo_room_4Tex_007CE8 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4Tex_007CE8" -static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_007CE8[] = dganon_sonogo_room_4Tex_007CE8; +#define dganon_sonogo_room_4Tex_0054A8 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4Tex_0054A8" +static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0054A8[] = dganon_sonogo_room_4Tex_0054A8; -#define dganon_sonogo_room_4Tex_006CE8 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4Tex_006CE8" +#define dganon_sonogo_room_4Tex_0054E8 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4Tex_0054E8" +static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0054E8[] = dganon_sonogo_room_4Tex_0054E8; + +#define dganon_sonogo_room_4Tex_005CE8 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4Tex_005CE8" +static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_005CE8[] = dganon_sonogo_room_4Tex_005CE8; + +#define dganon_sonogo_room_4Tex_0064E8 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4Tex_0064E8" +static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0064E8[] = dganon_sonogo_room_4Tex_0064E8; + +#define dganon_sonogo_room_4Tex_0068E8 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4Tex_0068E8" +static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0068E8[] = dganon_sonogo_room_4Tex_0068E8; + +#define dganon_sonogo_room_4Tex_006CE8 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4Tex_006CE8" static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_006CE8[] = dganon_sonogo_room_4Tex_006CE8; -#define dganon_sonogo_room_4Tex_0054A8 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4Tex_0054A8" -static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0054A8[] = dganon_sonogo_room_4Tex_0054A8; +#define dganon_sonogo_room_4Tex_0074E8 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4Tex_0074E8" +static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0074E8[] = dganon_sonogo_room_4Tex_0074E8; + +#define dganon_sonogo_room_4Tex_007CE8 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4Tex_007CE8" +static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_007CE8[] = dganon_sonogo_room_4Tex_007CE8; + +#define dganon_sonogo_room_4TLUT_004840 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4TLUT_004840" +static const ALIGN_ASSET(2) char ganon_sonogo_room_4TLUT_004840[] = dganon_sonogo_room_4TLUT_004840; + +#define dganon_sonogo_room_4TLUT_004910 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4TLUT_004910" +static const ALIGN_ASSET(2) char ganon_sonogo_room_4TLUT_004910[] = dganon_sonogo_room_4TLUT_004910; + +#define dganon_sonogo_room_4TLUT_004B18 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4TLUT_004B18" +static const ALIGN_ASSET(2) char ganon_sonogo_room_4TLUT_004B18[] = dganon_sonogo_room_4TLUT_004B18; + +#define dganon_sonogo_room_4DL_004830 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4DL_004830" +static const ALIGN_ASSET(2) char ganon_sonogo_room_4DL_004830[] = dganon_sonogo_room_4DL_004830; #endif // DUNGEONS_GANON_SONOGO_ROOM_4_H diff --git a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_scene.h b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_scene.h index 429616fc0..ec48d7402 100644 --- a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_scene.h +++ b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_scene.h @@ -3,25 +3,26 @@ #include "align_asset_macro.h" -#define dganon_sonogo_sceneCollisionHeader_0062CC "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_sceneCollisionHeader_0062CC" -static const ALIGN_ASSET(2) char ganon_sonogo_sceneCollisionHeader_0062CC[] = dganon_sonogo_sceneCollisionHeader_0062CC; - -#define dganon_sonogo_sceneTex_007310 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_sceneTex_007310" -static const ALIGN_ASSET(2) char ganon_sonogo_sceneTex_007310[] = dganon_sonogo_sceneTex_007310; - -#define dganon_sonogo_sceneTLUT_006300 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_sceneTLUT_006300" -static const ALIGN_ASSET(2) char ganon_sonogo_sceneTLUT_006300[] = dganon_sonogo_sceneTLUT_006300; - -#define dganon_sonogo_sceneTex_006710 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_sceneTex_006710" +#define dganon_sonogo_sceneTex_006710 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_sceneTex_006710" static const ALIGN_ASSET(2) char ganon_sonogo_sceneTex_006710[] = dganon_sonogo_sceneTex_006710; -#define dganon_sonogo_sceneTLUT_006508 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_sceneTLUT_006508" -static const ALIGN_ASSET(2) char ganon_sonogo_sceneTLUT_006508[] = dganon_sonogo_sceneTLUT_006508; - -#define dganon_sonogo_sceneTex_006F10 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_sceneTex_006F10" +#define dganon_sonogo_sceneTex_006F10 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_sceneTex_006F10" static const ALIGN_ASSET(2) char ganon_sonogo_sceneTex_006F10[] = dganon_sonogo_sceneTex_006F10; -#define dganon_sonogo_sceneTex_007710 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_sceneTex_007710" +#define dganon_sonogo_sceneTex_007310 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_sceneTex_007310" +static const ALIGN_ASSET(2) char ganon_sonogo_sceneTex_007310[] = dganon_sonogo_sceneTex_007310; + +#define dganon_sonogo_sceneTex_007710 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_sceneTex_007710" static const ALIGN_ASSET(2) char ganon_sonogo_sceneTex_007710[] = dganon_sonogo_sceneTex_007710; +#define dganon_sonogo_sceneTLUT_006300 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_sceneTLUT_006300" +static const ALIGN_ASSET(2) char ganon_sonogo_sceneTLUT_006300[] = dganon_sonogo_sceneTLUT_006300; + +#define dganon_sonogo_sceneTLUT_006508 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_sceneTLUT_006508" +static const ALIGN_ASSET(2) char ganon_sonogo_sceneTLUT_006508[] = dganon_sonogo_sceneTLUT_006508; + +#define dganon_sonogo_sceneCollisionHeader_0062CC "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_sceneCollisionHeader_0062CC" +static const ALIGN_ASSET(2) char ganon_sonogo_sceneCollisionHeader_0062CC[] = dganon_sonogo_sceneCollisionHeader_0062CC; + + #endif // DUNGEONS_GANON_SONOGO_SCENE_H diff --git a/soh/assets/scenes/dungeons/ganon_tou/ganon_tou_room_0.h b/soh/assets/scenes/dungeons/ganon_tou/ganon_tou_room_0.h index a6c570778..1500981f9 100644 --- a/soh/assets/scenes/dungeons/ganon_tou/ganon_tou_room_0.h +++ b/soh/assets/scenes/dungeons/ganon_tou/ganon_tou_room_0.h @@ -3,85 +3,85 @@ #include "align_asset_macro.h" -#define dganon_tou_room_0DL_0084A8 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0DL_0084A8" -static const ALIGN_ASSET(2) char ganon_tou_room_0DL_0084A8[] = dganon_tou_room_0DL_0084A8; - -#define dganon_tou_room_0Tex_00E750 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00E750" -static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00E750[] = dganon_tou_room_0Tex_00E750; - -#define dganon_tou_room_0Tex_00D750 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00D750" -static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00D750[] = dganon_tou_room_0Tex_00D750; - -#define dganon_tou_room_0Tex_008550 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_008550" +#define dganon_tou_room_0Tex_008550 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_008550" static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_008550[] = dganon_tou_room_0Tex_008550; -#define dganon_tou_room_0Tex_00FF50 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00FF50" -static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00FF50[] = dganon_tou_room_0Tex_00FF50; - -#define dganon_tou_room_0Tex_00FB50 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00FB50" -static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00FB50[] = dganon_tou_room_0Tex_00FB50; - -#define dganon_tou_room_0Tex_00BF50 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00BF50" -static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00BF50[] = dganon_tou_room_0Tex_00BF50; - -#define dganon_tou_room_0Tex_00B950 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00B950" -static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00B950[] = dganon_tou_room_0Tex_00B950; - -#define dganon_tou_room_0Tex_00B550 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00B550" -static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00B550[] = dganon_tou_room_0Tex_00B550; - -#define dganon_tou_room_0Tex_00CF50 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00CF50" -static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00CF50[] = dganon_tou_room_0Tex_00CF50; - -#define dganon_tou_room_0Tex_00BD50 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00BD50" -static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00BD50[] = dganon_tou_room_0Tex_00BD50; - -#define dganon_tou_room_0Tex_00B150 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00B150" -static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00B150[] = dganon_tou_room_0Tex_00B150; - -#define dganon_tou_room_0Tex_010550 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_010550" -static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_010550[] = dganon_tou_room_0Tex_010550; - -#define dganon_tou_room_0Tex_010150 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_010150" -static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_010150[] = dganon_tou_room_0Tex_010150; - -#define dganon_tou_room_0Tex_00F750 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00F750" -static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00F750[] = dganon_tou_room_0Tex_00F750; - -#define dganon_tou_room_0Tex_00A150 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00A150" -static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00A150[] = dganon_tou_room_0Tex_00A150; - -#define dganon_tou_room_0Tex_009150 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_009150" -static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_009150[] = dganon_tou_room_0Tex_009150; - -#define dganon_tou_room_0Tex_008F50 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_008F50" -static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_008F50[] = dganon_tou_room_0Tex_008F50; - -#define dganon_tou_room_0Tex_008D50 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_008D50" +#define dganon_tou_room_0Tex_008D50 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_008D50" static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_008D50[] = dganon_tou_room_0Tex_008D50; -#define dganon_tou_room_0DL_0124B8 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0DL_0124B8" -static const ALIGN_ASSET(2) char ganon_tou_room_0DL_0124B8[] = dganon_tou_room_0DL_0124B8; +#define dganon_tou_room_0Tex_008F50 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_008F50" +static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_008F50[] = dganon_tou_room_0Tex_008F50; -#define dganon_tou_room_0Tex_0125F0 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_0125F0" -static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_0125F0[] = dganon_tou_room_0Tex_0125F0; +#define dganon_tou_room_0Tex_009150 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_009150" +static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_009150[] = dganon_tou_room_0Tex_009150; -#define dganon_tou_room_0Tex_0139F0 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_0139F0" -static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_0139F0[] = dganon_tou_room_0Tex_0139F0; +#define dganon_tou_room_0Tex_00A150 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00A150" +static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00A150[] = dganon_tou_room_0Tex_00A150; -#define dganon_tou_room_0Tex_012DF0 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_012DF0" -static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_012DF0[] = dganon_tou_room_0Tex_012DF0; +#define dganon_tou_room_0Tex_00B150 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00B150" +static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00B150[] = dganon_tou_room_0Tex_00B150; -#define dganon_tou_room_0Tex_0135F0 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_0135F0" -static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_0135F0[] = dganon_tou_room_0Tex_0135F0; +#define dganon_tou_room_0Tex_00B550 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00B550" +static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00B550[] = dganon_tou_room_0Tex_00B550; -#define dganon_tou_room_0Tex_0124F0 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_0124F0" +#define dganon_tou_room_0Tex_00B950 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00B950" +static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00B950[] = dganon_tou_room_0Tex_00B950; + +#define dganon_tou_room_0Tex_00BD50 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00BD50" +static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00BD50[] = dganon_tou_room_0Tex_00BD50; + +#define dganon_tou_room_0Tex_00BF50 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00BF50" +static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00BF50[] = dganon_tou_room_0Tex_00BF50; + +#define dganon_tou_room_0Tex_00CF50 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00CF50" +static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00CF50[] = dganon_tou_room_0Tex_00CF50; + +#define dganon_tou_room_0Tex_00D750 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00D750" +static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00D750[] = dganon_tou_room_0Tex_00D750; + +#define dganon_tou_room_0Tex_00E750 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00E750" +static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00E750[] = dganon_tou_room_0Tex_00E750; + +#define dganon_tou_room_0Tex_00F750 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00F750" +static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00F750[] = dganon_tou_room_0Tex_00F750; + +#define dganon_tou_room_0Tex_00FB50 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00FB50" +static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00FB50[] = dganon_tou_room_0Tex_00FB50; + +#define dganon_tou_room_0Tex_00FF50 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00FF50" +static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00FF50[] = dganon_tou_room_0Tex_00FF50; + +#define dganon_tou_room_0Tex_010150 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_010150" +static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_010150[] = dganon_tou_room_0Tex_010150; + +#define dganon_tou_room_0Tex_010550 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_010550" +static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_010550[] = dganon_tou_room_0Tex_010550; + +#define dganon_tou_room_0Tex_0124F0 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_0124F0" static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_0124F0[] = dganon_tou_room_0Tex_0124F0; -#define dganon_tou_room_0Set_000160DL_0084A8 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Set_000160DL_0084A8" +#define dganon_tou_room_0Tex_0125F0 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_0125F0" +static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_0125F0[] = dganon_tou_room_0Tex_0125F0; + +#define dganon_tou_room_0Tex_012DF0 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_012DF0" +static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_012DF0[] = dganon_tou_room_0Tex_012DF0; + +#define dganon_tou_room_0Tex_0135F0 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_0135F0" +static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_0135F0[] = dganon_tou_room_0Tex_0135F0; + +#define dganon_tou_room_0Tex_0139F0 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_0139F0" +static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_0139F0[] = dganon_tou_room_0Tex_0139F0; + +#define dganon_tou_room_0DL_0084A8 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0DL_0084A8" +static const ALIGN_ASSET(2) char ganon_tou_room_0DL_0084A8[] = dganon_tou_room_0DL_0084A8; + +#define dganon_tou_room_0DL_0124B8 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0DL_0124B8" +static const ALIGN_ASSET(2) char ganon_tou_room_0DL_0124B8[] = dganon_tou_room_0DL_0124B8; + +#define dganon_tou_room_0Set_000160DL_0084A8 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Set_000160DL_0084A8" static const ALIGN_ASSET(2) char ganon_tou_room_0Set_000160DL_0084A8[] = dganon_tou_room_0Set_000160DL_0084A8; -#define dganon_tou_room_0Set_000160DL_0124B8 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Set_000160DL_0124B8" +#define dganon_tou_room_0Set_000160DL_0124B8 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Set_000160DL_0124B8" static const ALIGN_ASSET(2) char ganon_tou_room_0Set_000160DL_0124B8[] = dganon_tou_room_0Set_000160DL_0124B8; diff --git a/soh/assets/scenes/dungeons/ganon_tou/ganon_tou_scene.h b/soh/assets/scenes/dungeons/ganon_tou/ganon_tou_scene.h index 0b16597af..403eb7872 100644 --- a/soh/assets/scenes/dungeons/ganon_tou/ganon_tou_scene.h +++ b/soh/assets/scenes/dungeons/ganon_tou/ganon_tou_scene.h @@ -3,19 +3,19 @@ #include "align_asset_macro.h" -#define dgRainbowBridgeCs "__OTR__scenes/nonmq/ganon_tou_scene/gRainbowBridgeCs" -static const ALIGN_ASSET(2) char gRainbowBridgeCs[] = dgRainbowBridgeCs; - -#define dgGanonsCastleIntroCs "__OTR__scenes/nonmq/ganon_tou_scene/gGanonsCastleIntroCs" -static const ALIGN_ASSET(2) char gGanonsCastleIntroCs[] = dgGanonsCastleIntroCs; - -#define dganon_tou_sceneCollisionHeader_002610 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_sceneCollisionHeader_002610" -static const ALIGN_ASSET(2) char ganon_tou_sceneCollisionHeader_002610[] = dganon_tou_sceneCollisionHeader_002610; - -#define dganon_tou_sceneTex_003280 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_sceneTex_003280" +#define dganon_tou_sceneTex_003280 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_sceneTex_003280" static const ALIGN_ASSET(2) char ganon_tou_sceneTex_003280[] = dganon_tou_sceneTex_003280; -#define dganon_tou_sceneCollisionHeader_002610 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_sceneCollisionHeader_002610" +#define dgRainbowBridgeCs "__OTR__scenes/shared/ganon_tou_scene/gRainbowBridgeCs" +static const ALIGN_ASSET(2) char gRainbowBridgeCs[] = dgRainbowBridgeCs; + +#define dgGanonsCastleIntroCs "__OTR__scenes/shared/ganon_tou_scene/gGanonsCastleIntroCs" +static const ALIGN_ASSET(2) char gGanonsCastleIntroCs[] = dgGanonsCastleIntroCs; + +#define dganon_tou_sceneCollisionHeader_002610 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_sceneCollisionHeader_002610" +static const ALIGN_ASSET(2) char ganon_tou_sceneCollisionHeader_002610[] = dganon_tou_sceneCollisionHeader_002610; + +#define dganon_tou_sceneCollisionHeader_002610 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_sceneCollisionHeader_002610" #endif // DUNGEONS_GANON_TOU_SCENE_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_0.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_0.h index b1f1e276a..8b687d735 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_0.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_0.h @@ -3,12 +3,15 @@ #include "align_asset_macro.h" -#define dganontika_room_0DL_000550 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_0DL_000550" -static const ALIGN_ASSET(2) char ganontika_room_0DL_000550[] = dganontika_room_0DL_000550; - #define dganontika_room_0Tex_007F48 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_0Tex_007F48" static const ALIGN_ASSET(2) char ganontika_room_0Tex_007F48[] = dganontika_room_0Tex_007F48; +#define dganontika_room_0Tex_008A10 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_0Tex_008A10" +static const ALIGN_ASSET(2) char ganontika_room_0Tex_008A10[] = dganontika_room_0Tex_008A10; + +#define dganontika_room_0DL_000550 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_0DL_000550" +static const ALIGN_ASSET(2) char ganontika_room_0DL_000550[] = dganontika_room_0DL_000550; + #define dganontika_room_0DL_000B30 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_0DL_000B30" static const ALIGN_ASSET(2) char ganontika_room_0DL_000B30[] = dganontika_room_0DL_000B30; @@ -18,9 +21,6 @@ static const ALIGN_ASSET(2) char ganontika_room_0DL_001088[] = dganontika_room_0 #define dganontika_room_0DL_008910 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_0DL_008910" static const ALIGN_ASSET(2) char ganontika_room_0DL_008910[] = dganontika_room_0DL_008910; -#define dganontika_room_0Tex_008A10 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_0Tex_008A10" -static const ALIGN_ASSET(2) char ganontika_room_0Tex_008A10[] = dganontika_room_0Tex_008A10; - #define dganontika_room_0DL_001670 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_0DL_001670" static const ALIGN_ASSET(2) char ganontika_room_0DL_001670[] = dganontika_room_0DL_001670; diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_1.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_1.h index d1c2ddb40..fda95c8ae 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_1.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_1.h @@ -3,32 +3,83 @@ #include "align_asset_macro.h" -#define dganontika_room_1DL_0007C0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_0007C0" -static const ALIGN_ASSET(2) char ganontika_room_1DL_0007C0[] = dganontika_room_1DL_0007C0; +#define dganontika_room_1Tex_00D9E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_00D9E0" +static const ALIGN_ASSET(2) char ganontika_room_1Tex_00D9E0[] = dganontika_room_1Tex_00D9E0; + +#define dganontika_room_1Tex_00E9E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_00E9E0" +static const ALIGN_ASSET(2) char ganontika_room_1Tex_00E9E0[] = dganontika_room_1Tex_00E9E0; + +#define dganontika_room_1Tex_00F9E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_00F9E0" +static const ALIGN_ASSET(2) char ganontika_room_1Tex_00F9E0[] = dganontika_room_1Tex_00F9E0; + +#define dganontika_room_1Tex_0109E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0109E0" +static const ALIGN_ASSET(2) char ganontika_room_1Tex_0109E0[] = dganontika_room_1Tex_0109E0; + +#define dganontika_room_1Tex_0119E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0119E0" +static const ALIGN_ASSET(2) char ganontika_room_1Tex_0119E0[] = dganontika_room_1Tex_0119E0; + +#define dganontika_room_1Tex_0121E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0121E0" +static const ALIGN_ASSET(2) char ganontika_room_1Tex_0121E0[] = dganontika_room_1Tex_0121E0; #define dganontika_room_1Tex_0129E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0129E0" static const ALIGN_ASSET(2) char ganontika_room_1Tex_0129E0[] = dganontika_room_1Tex_0129E0; +#define dganontika_room_1Tex_0131E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0131E0" +static const ALIGN_ASSET(2) char ganontika_room_1Tex_0131E0[] = dganontika_room_1Tex_0131E0; + #define dganontika_room_1Tex_0139E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0139E0" static const ALIGN_ASSET(2) char ganontika_room_1Tex_0139E0[] = dganontika_room_1Tex_0139E0; -#define dganontika_room_1DL_000F60 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_000F60" -static const ALIGN_ASSET(2) char ganontika_room_1DL_000F60[] = dganontika_room_1DL_000F60; +#define dganontika_room_1Tex_0141E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0141E0" +static const ALIGN_ASSET(2) char ganontika_room_1Tex_0141E0[] = dganontika_room_1Tex_0141E0; -#define dganontika_room_1Tex_019DE0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_019DE0" -static const ALIGN_ASSET(2) char ganontika_room_1Tex_019DE0[] = dganontika_room_1Tex_019DE0; +#define dganontika_room_1Tex_0149E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0149E0" +static const ALIGN_ASSET(2) char ganontika_room_1Tex_0149E0[] = dganontika_room_1Tex_0149E0; -#define dganontika_room_1Tex_0199E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0199E0" -static const ALIGN_ASSET(2) char ganontika_room_1Tex_0199E0[] = dganontika_room_1Tex_0199E0; +#define dganontika_room_1Tex_0151E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0151E0" +static const ALIGN_ASSET(2) char ganontika_room_1Tex_0151E0[] = dganontika_room_1Tex_0151E0; -#define dganontika_room_1DL_001A08 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_001A08" -static const ALIGN_ASSET(2) char ganontika_room_1DL_001A08[] = dganontika_room_1DL_001A08; +#define dganontika_room_1Tex_0159E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0159E0" +static const ALIGN_ASSET(2) char ganontika_room_1Tex_0159E0[] = dganontika_room_1Tex_0159E0; + +#define dganontika_room_1Tex_0161E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0161E0" +static const ALIGN_ASSET(2) char ganontika_room_1Tex_0161E0[] = dganontika_room_1Tex_0161E0; + +#define dganontika_room_1Tex_0169E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0169E0" +static const ALIGN_ASSET(2) char ganontika_room_1Tex_0169E0[] = dganontika_room_1Tex_0169E0; + +#define dganontika_room_1Tex_0171E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0171E0" +static const ALIGN_ASSET(2) char ganontika_room_1Tex_0171E0[] = dganontika_room_1Tex_0171E0; + +#define dganontika_room_1Tex_0179E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0179E0" +static const ALIGN_ASSET(2) char ganontika_room_1Tex_0179E0[] = dganontika_room_1Tex_0179E0; + +#define dganontika_room_1Tex_0181E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0181E0" +static const ALIGN_ASSET(2) char ganontika_room_1Tex_0181E0[] = dganontika_room_1Tex_0181E0; #define dganontika_room_1Tex_0189E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0189E0" static const ALIGN_ASSET(2) char ganontika_room_1Tex_0189E0[] = dganontika_room_1Tex_0189E0; -#define dganontika_room_1Tex_0141E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0141E0" -static const ALIGN_ASSET(2) char ganontika_room_1Tex_0141E0[] = dganontika_room_1Tex_0141E0; +#define dganontika_room_1Tex_0199E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0199E0" +static const ALIGN_ASSET(2) char ganontika_room_1Tex_0199E0[] = dganontika_room_1Tex_0199E0; + +#define dganontika_room_1Tex_019DE0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_019DE0" +static const ALIGN_ASSET(2) char ganontika_room_1Tex_019DE0[] = dganontika_room_1Tex_019DE0; + +#define dganontika_room_1Tex_01B9C8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_01B9C8" +static const ALIGN_ASSET(2) char ganontika_room_1Tex_01B9C8[] = dganontika_room_1Tex_01B9C8; + +#define dganontika_room_1TLUT_00D9C0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1TLUT_00D9C0" +static const ALIGN_ASSET(2) char ganontika_room_1TLUT_00D9C0[] = dganontika_room_1TLUT_00D9C0; + +#define dganontika_room_1DL_0007C0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_0007C0" +static const ALIGN_ASSET(2) char ganontika_room_1DL_0007C0[] = dganontika_room_1DL_0007C0; + +#define dganontika_room_1DL_000F60 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_000F60" +static const ALIGN_ASSET(2) char ganontika_room_1DL_000F60[] = dganontika_room_1DL_000F60; + +#define dganontika_room_1DL_001A08 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_001A08" +static const ALIGN_ASSET(2) char ganontika_room_1DL_001A08[] = dganontika_room_1DL_001A08; #define dganontika_room_1DL_002290 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_002290" static const ALIGN_ASSET(2) char ganontika_room_1DL_002290[] = dganontika_room_1DL_002290; @@ -54,15 +105,9 @@ static const ALIGN_ASSET(2) char ganontika_room_1DL_0040D8[] = dganontika_room_1 #define dganontika_room_1DL_004450 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_004450" static const ALIGN_ASSET(2) char ganontika_room_1DL_004450[] = dganontika_room_1DL_004450; -#define dganontika_room_1Tex_0149E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0149E0" -static const ALIGN_ASSET(2) char ganontika_room_1Tex_0149E0[] = dganontika_room_1Tex_0149E0; - #define dganontika_room_1DL_004838 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_004838" static const ALIGN_ASSET(2) char ganontika_room_1DL_004838[] = dganontika_room_1DL_004838; -#define dganontika_room_1Tex_0121E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0121E0" -static const ALIGN_ASSET(2) char ganontika_room_1Tex_0121E0[] = dganontika_room_1Tex_0121E0; - #define dganontika_room_1DL_004B88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_004B88" static const ALIGN_ASSET(2) char ganontika_room_1DL_004B88[] = dganontika_room_1DL_004B88; @@ -78,12 +123,6 @@ static const ALIGN_ASSET(2) char ganontika_room_1DL_005A98[] = dganontika_room_1 #define dganontika_room_1DL_006498 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_006498" static const ALIGN_ASSET(2) char ganontika_room_1DL_006498[] = dganontika_room_1DL_006498; -#define dganontika_room_1Tex_0151E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0151E0" -static const ALIGN_ASSET(2) char ganontika_room_1Tex_0151E0[] = dganontika_room_1Tex_0151E0; - -#define dganontika_room_1Tex_0109E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0109E0" -static const ALIGN_ASSET(2) char ganontika_room_1Tex_0109E0[] = dganontika_room_1Tex_0109E0; - #define dganontika_room_1DL_007120 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_007120" static const ALIGN_ASSET(2) char ganontika_room_1DL_007120[] = dganontika_room_1DL_007120; @@ -93,66 +132,39 @@ static const ALIGN_ASSET(2) char ganontika_room_1DL_0079A8[] = dganontika_room_1 #define dganontika_room_1DL_008220 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_008220" static const ALIGN_ASSET(2) char ganontika_room_1DL_008220[] = dganontika_room_1DL_008220; -#define dganontika_room_1Tex_0119E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0119E0" -static const ALIGN_ASSET(2) char ganontika_room_1Tex_0119E0[] = dganontika_room_1Tex_0119E0; - #define dganontika_room_1DL_008578 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_008578" static const ALIGN_ASSET(2) char ganontika_room_1DL_008578[] = dganontika_room_1DL_008578; -#define dganontika_room_1Tex_0181E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0181E0" -static const ALIGN_ASSET(2) char ganontika_room_1Tex_0181E0[] = dganontika_room_1Tex_0181E0; - -#define dganontika_room_1TLUT_00D9C0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1TLUT_00D9C0" -static const ALIGN_ASSET(2) char ganontika_room_1TLUT_00D9C0[] = dganontika_room_1TLUT_00D9C0; - #define dganontika_room_1DL_01A810 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_01A810" static const ALIGN_ASSET(2) char ganontika_room_1DL_01A810[] = dganontika_room_1DL_01A810; -#define dganontika_room_1Tex_01B9C8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_01B9C8" -static const ALIGN_ASSET(2) char ganontika_room_1Tex_01B9C8[] = dganontika_room_1Tex_01B9C8; - #define dganontika_room_1DL_008738 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_008738" static const ALIGN_ASSET(2) char ganontika_room_1DL_008738[] = dganontika_room_1DL_008738; -#define dganontika_room_1Tex_0179E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0179E0" -static const ALIGN_ASSET(2) char ganontika_room_1Tex_0179E0[] = dganontika_room_1Tex_0179E0; - #define dganontika_room_1DL_01AB58 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_01AB58" static const ALIGN_ASSET(2) char ganontika_room_1DL_01AB58[] = dganontika_room_1DL_01AB58; #define dganontika_room_1DL_0088F8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_0088F8" static const ALIGN_ASSET(2) char ganontika_room_1DL_0088F8[] = dganontika_room_1DL_0088F8; -#define dganontika_room_1Tex_0171E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0171E0" -static const ALIGN_ASSET(2) char ganontika_room_1Tex_0171E0[] = dganontika_room_1Tex_0171E0; - #define dganontika_room_1DL_01AEA0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_01AEA0" static const ALIGN_ASSET(2) char ganontika_room_1DL_01AEA0[] = dganontika_room_1DL_01AEA0; #define dganontika_room_1DL_008AB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_008AB8" static const ALIGN_ASSET(2) char ganontika_room_1DL_008AB8[] = dganontika_room_1DL_008AB8; -#define dganontika_room_1Tex_0169E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0169E0" -static const ALIGN_ASSET(2) char ganontika_room_1Tex_0169E0[] = dganontika_room_1Tex_0169E0; - #define dganontika_room_1DL_01B1E8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_01B1E8" static const ALIGN_ASSET(2) char ganontika_room_1DL_01B1E8[] = dganontika_room_1DL_01B1E8; #define dganontika_room_1DL_008C78 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_008C78" static const ALIGN_ASSET(2) char ganontika_room_1DL_008C78[] = dganontika_room_1DL_008C78; -#define dganontika_room_1Tex_0161E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0161E0" -static const ALIGN_ASSET(2) char ganontika_room_1Tex_0161E0[] = dganontika_room_1Tex_0161E0; - #define dganontika_room_1DL_01B530 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_01B530" static const ALIGN_ASSET(2) char ganontika_room_1DL_01B530[] = dganontika_room_1DL_01B530; #define dganontika_room_1DL_008E38 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_008E38" static const ALIGN_ASSET(2) char ganontika_room_1DL_008E38[] = dganontika_room_1DL_008E38; -#define dganontika_room_1Tex_0159E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0159E0" -static const ALIGN_ASSET(2) char ganontika_room_1Tex_0159E0[] = dganontika_room_1Tex_0159E0; - #define dganontika_room_1DL_01B878 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_01B878" static const ALIGN_ASSET(2) char ganontika_room_1DL_01B878[] = dganontika_room_1DL_01B878; @@ -171,21 +183,9 @@ static const ALIGN_ASSET(2) char ganontika_room_1DL_00A548[] = dganontika_room_1 #define dganontika_room_1DL_00B730 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_00B730" static const ALIGN_ASSET(2) char ganontika_room_1DL_00B730[] = dganontika_room_1DL_00B730; -#define dganontika_room_1Tex_00D9E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_00D9E0" -static const ALIGN_ASSET(2) char ganontika_room_1Tex_00D9E0[] = dganontika_room_1Tex_00D9E0; - -#define dganontika_room_1Tex_00E9E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_00E9E0" -static const ALIGN_ASSET(2) char ganontika_room_1Tex_00E9E0[] = dganontika_room_1Tex_00E9E0; - -#define dganontika_room_1Tex_00F9E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_00F9E0" -static const ALIGN_ASSET(2) char ganontika_room_1Tex_00F9E0[] = dganontika_room_1Tex_00F9E0; - #define dganontika_room_1DL_00C9E8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_00C9E8" static const ALIGN_ASSET(2) char ganontika_room_1DL_00C9E8[] = dganontika_room_1DL_00C9E8; -#define dganontika_room_1Tex_0131E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0131E0" -static const ALIGN_ASSET(2) char ganontika_room_1Tex_0131E0[] = dganontika_room_1Tex_0131E0; - #define dganontika_room_1DL_00CE08 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_00CE08" static const ALIGN_ASSET(2) char ganontika_room_1DL_00CE08[] = dganontika_room_1DL_00CE08; diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_10.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_10.h index ff09e407c..38e562789 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_10.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_10.h @@ -3,20 +3,17 @@ #include "align_asset_macro.h" -#define dganontika_room_10DL_000290 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10DL_000290" -static const ALIGN_ASSET(2) char ganontika_room_10DL_000290[] = dganontika_room_10DL_000290; - #define dganontika_room_10Tex_0039B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10Tex_0039B8" static const ALIGN_ASSET(2) char ganontika_room_10Tex_0039B8[] = dganontika_room_10Tex_0039B8; -#define dganontika_room_10DL_000568 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10DL_000568" -static const ALIGN_ASSET(2) char ganontika_room_10DL_000568[] = dganontika_room_10DL_000568; - #define dganontika_room_10Tex_0041B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10Tex_0041B8" static const ALIGN_ASSET(2) char ganontika_room_10Tex_0041B8[] = dganontika_room_10Tex_0041B8; -#define dganontika_room_10DL_0017C0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10DL_0017C0" -static const ALIGN_ASSET(2) char ganontika_room_10DL_0017C0[] = dganontika_room_10DL_0017C0; +#define dganontika_room_10Tex_0049B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10Tex_0049B8" +static const ALIGN_ASSET(2) char ganontika_room_10Tex_0049B8[] = dganontika_room_10Tex_0049B8; + +#define dganontika_room_10Tex_0051B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10Tex_0051B8" +static const ALIGN_ASSET(2) char ganontika_room_10Tex_0051B8[] = dganontika_room_10Tex_0051B8; #define dganontika_room_10Tex_0059B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10Tex_0059B8" static const ALIGN_ASSET(2) char ganontika_room_10Tex_0059B8[] = dganontika_room_10Tex_0059B8; @@ -24,11 +21,14 @@ static const ALIGN_ASSET(2) char ganontika_room_10Tex_0059B8[] = dganontika_room #define dganontika_room_10Tex_005BB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10Tex_005BB8" static const ALIGN_ASSET(2) char ganontika_room_10Tex_005BB8[] = dganontika_room_10Tex_005BB8; -#define dganontika_room_10Tex_0051B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10Tex_0051B8" -static const ALIGN_ASSET(2) char ganontika_room_10Tex_0051B8[] = dganontika_room_10Tex_0051B8; +#define dganontika_room_10DL_000290 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10DL_000290" +static const ALIGN_ASSET(2) char ganontika_room_10DL_000290[] = dganontika_room_10DL_000290; -#define dganontika_room_10Tex_0049B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10Tex_0049B8" -static const ALIGN_ASSET(2) char ganontika_room_10Tex_0049B8[] = dganontika_room_10Tex_0049B8; +#define dganontika_room_10DL_000568 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10DL_000568" +static const ALIGN_ASSET(2) char ganontika_room_10DL_000568[] = dganontika_room_10DL_000568; + +#define dganontika_room_10DL_0017C0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10DL_0017C0" +static const ALIGN_ASSET(2) char ganontika_room_10DL_0017C0[] = dganontika_room_10DL_0017C0; #define dganontika_room_10DL_002AD8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10DL_002AD8" static const ALIGN_ASSET(2) char ganontika_room_10DL_002AD8[] = dganontika_room_10DL_002AD8; diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_11.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_11.h index 02df22e39..274362df1 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_11.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_11.h @@ -3,27 +3,33 @@ #include "align_asset_macro.h" -#define dganontika_room_11DL_000390 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11DL_000390" -static const ALIGN_ASSET(2) char ganontika_room_11DL_000390[] = dganontika_room_11DL_000390; +#define dganontika_room_11Tex_004150 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11Tex_004150" +static const ALIGN_ASSET(2) char ganontika_room_11Tex_004150[] = dganontika_room_11Tex_004150; #define dganontika_room_11Tex_004950 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11Tex_004950" static const ALIGN_ASSET(2) char ganontika_room_11Tex_004950[] = dganontika_room_11Tex_004950; +#define dganontika_room_11Tex_005150 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11Tex_005150" +static const ALIGN_ASSET(2) char ganontika_room_11Tex_005150[] = dganontika_room_11Tex_005150; + +#define dganontika_room_11Tex_005950 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11Tex_005950" +static const ALIGN_ASSET(2) char ganontika_room_11Tex_005950[] = dganontika_room_11Tex_005950; + +#define dganontika_room_11Tex_006150 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11Tex_006150" +static const ALIGN_ASSET(2) char ganontika_room_11Tex_006150[] = dganontika_room_11Tex_006150; + +#define dganontika_room_11DL_000390 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11DL_000390" +static const ALIGN_ASSET(2) char ganontika_room_11DL_000390[] = dganontika_room_11DL_000390; + #define dganontika_room_11DL_000580 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11DL_000580" static const ALIGN_ASSET(2) char ganontika_room_11DL_000580[] = dganontika_room_11DL_000580; #define dganontika_room_11DL_000878 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11DL_000878" static const ALIGN_ASSET(2) char ganontika_room_11DL_000878[] = dganontika_room_11DL_000878; -#define dganontika_room_11Tex_006150 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11Tex_006150" -static const ALIGN_ASSET(2) char ganontika_room_11Tex_006150[] = dganontika_room_11Tex_006150; - #define dganontika_room_11DL_000E60 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11DL_000E60" static const ALIGN_ASSET(2) char ganontika_room_11DL_000E60[] = dganontika_room_11DL_000E60; -#define dganontika_room_11Tex_005150 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11Tex_005150" -static const ALIGN_ASSET(2) char ganontika_room_11Tex_005150[] = dganontika_room_11Tex_005150; - #define dganontika_room_11DL_0015B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11DL_0015B8" static const ALIGN_ASSET(2) char ganontika_room_11DL_0015B8[] = dganontika_room_11DL_0015B8; @@ -39,12 +45,6 @@ static const ALIGN_ASSET(2) char ganontika_room_11DL_0029D0[] = dganontika_room_ #define dganontika_room_11DL_0034D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11DL_0034D8" static const ALIGN_ASSET(2) char ganontika_room_11DL_0034D8[] = dganontika_room_11DL_0034D8; -#define dganontika_room_11Tex_005950 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11Tex_005950" -static const ALIGN_ASSET(2) char ganontika_room_11Tex_005950[] = dganontika_room_11Tex_005950; - -#define dganontika_room_11Tex_004150 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11Tex_004150" -static const ALIGN_ASSET(2) char ganontika_room_11Tex_004150[] = dganontika_room_11Tex_004150; - #define dganontika_room_11DL_003F60 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11DL_003F60" static const ALIGN_ASSET(2) char ganontika_room_11DL_003F60[] = dganontika_room_11DL_003F60; diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_12.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_12.h index 003441450..08b22e156 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_12.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_12.h @@ -3,51 +3,57 @@ #include "align_asset_macro.h" -#define dganontika_room_12DL_0021C0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12DL_0021C0" -static const ALIGN_ASSET(2) char ganontika_room_12DL_0021C0[] = dganontika_room_12DL_0021C0; +#define dganontika_room_12Tex_005160 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_005160" +static const ALIGN_ASSET(2) char ganontika_room_12Tex_005160[] = dganontika_room_12Tex_005160; -#define dganontika_room_12Tex_008560 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_008560" -static const ALIGN_ASSET(2) char ganontika_room_12Tex_008560[] = dganontika_room_12Tex_008560; +#define dganontika_room_12Tex_005960 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_005960" +static const ALIGN_ASSET(2) char ganontika_room_12Tex_005960[] = dganontika_room_12Tex_005960; + +#define dganontika_room_12Tex_006160 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_006160" +static const ALIGN_ASSET(2) char ganontika_room_12Tex_006160[] = dganontika_room_12Tex_006160; + +#define dganontika_room_12Tex_006960 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_006960" +static const ALIGN_ASSET(2) char ganontika_room_12Tex_006960[] = dganontika_room_12Tex_006960; + +#define dganontika_room_12Tex_007160 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_007160" +static const ALIGN_ASSET(2) char ganontika_room_12Tex_007160[] = dganontika_room_12Tex_007160; #define dganontika_room_12Tex_008160 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_008160" static const ALIGN_ASSET(2) char ganontika_room_12Tex_008160[] = dganontika_room_12Tex_008160; +#define dganontika_room_12Tex_008560 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_008560" +static const ALIGN_ASSET(2) char ganontika_room_12Tex_008560[] = dganontika_room_12Tex_008560; + +#define dganontika_room_12Tex_009270 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_009270" +static const ALIGN_ASSET(2) char ganontika_room_12Tex_009270[] = dganontika_room_12Tex_009270; + +#define dganontika_room_12Tex_00A270 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_00A270" +static const ALIGN_ASSET(2) char ganontika_room_12Tex_00A270[] = dganontika_room_12Tex_00A270; + +#define dganontika_room_12TLUT_005140 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12TLUT_005140" +static const ALIGN_ASSET(2) char ganontika_room_12TLUT_005140[] = dganontika_room_12TLUT_005140; + +#define dganontika_room_12DL_0021C0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12DL_0021C0" +static const ALIGN_ASSET(2) char ganontika_room_12DL_0021C0[] = dganontika_room_12DL_0021C0; + #define dganontika_room_12DL_002738 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12DL_002738" static const ALIGN_ASSET(2) char ganontika_room_12DL_002738[] = dganontika_room_12DL_002738; -#define dganontika_room_12Tex_007160 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_007160" -static const ALIGN_ASSET(2) char ganontika_room_12Tex_007160[] = dganontika_room_12Tex_007160; - #define dganontika_room_12DL_002AB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12DL_002AB8" static const ALIGN_ASSET(2) char ganontika_room_12DL_002AB8[] = dganontika_room_12DL_002AB8; #define dganontika_room_12DL_002C60 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12DL_002C60" static const ALIGN_ASSET(2) char ganontika_room_12DL_002C60[] = dganontika_room_12DL_002C60; -#define dganontika_room_12Tex_006960 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_006960" -static const ALIGN_ASSET(2) char ganontika_room_12Tex_006960[] = dganontika_room_12Tex_006960; - -#define dganontika_room_12TLUT_005140 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12TLUT_005140" -static const ALIGN_ASSET(2) char ganontika_room_12TLUT_005140[] = dganontika_room_12TLUT_005140; - #define dganontika_room_12DL_008F90 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12DL_008F90" static const ALIGN_ASSET(2) char ganontika_room_12DL_008F90[] = dganontika_room_12DL_008F90; -#define dganontika_room_12Tex_009270 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_009270" -static const ALIGN_ASSET(2) char ganontika_room_12Tex_009270[] = dganontika_room_12Tex_009270; - #define dganontika_room_12DL_0031A0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12DL_0031A0" static const ALIGN_ASSET(2) char ganontika_room_12DL_0031A0[] = dganontika_room_12DL_0031A0; -#define dganontika_room_12Tex_005960 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_005960" -static const ALIGN_ASSET(2) char ganontika_room_12Tex_005960[] = dganontika_room_12Tex_005960; - #define dganontika_room_12DL_003D30 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12DL_003D30" static const ALIGN_ASSET(2) char ganontika_room_12DL_003D30[] = dganontika_room_12DL_003D30; -#define dganontika_room_12Tex_005160 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_005160" -static const ALIGN_ASSET(2) char ganontika_room_12Tex_005160[] = dganontika_room_12Tex_005160; - #define dganontika_room_12DL_004A08 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12DL_004A08" static const ALIGN_ASSET(2) char ganontika_room_12DL_004A08[] = dganontika_room_12DL_004A08; @@ -60,14 +66,8 @@ static const ALIGN_ASSET(2) char ganontika_room_12DL_000330[] = dganontika_room_ #define dganontika_room_12DL_001928 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12DL_001928" static const ALIGN_ASSET(2) char ganontika_room_12DL_001928[] = dganontika_room_12DL_001928; -#define dganontika_room_12Tex_006160 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_006160" -static const ALIGN_ASSET(2) char ganontika_room_12Tex_006160[] = dganontika_room_12Tex_006160; - #define dganontika_room_12DL_009178 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12DL_009178" static const ALIGN_ASSET(2) char ganontika_room_12DL_009178[] = dganontika_room_12DL_009178; -#define dganontika_room_12Tex_00A270 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_00A270" -static const ALIGN_ASSET(2) char ganontika_room_12Tex_00A270[] = dganontika_room_12Tex_00A270; - #endif // DUNGEONS_GANONTIKA_ROOM_12_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_13.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_13.h index fa2e49496..8daa86500 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_13.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_13.h @@ -3,8 +3,20 @@ #include "align_asset_macro.h" -#define dganontika_room_13DL_001260 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13DL_001260" -static const ALIGN_ASSET(2) char ganontika_room_13DL_001260[] = dganontika_room_13DL_001260; +#define dganontika_room_13Tex_004340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13Tex_004340" +static const ALIGN_ASSET(2) char ganontika_room_13Tex_004340[] = dganontika_room_13Tex_004340; + +#define dganontika_room_13Tex_004B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13Tex_004B40" +static const ALIGN_ASSET(2) char ganontika_room_13Tex_004B40[] = dganontika_room_13Tex_004B40; + +#define dganontika_room_13Tex_005340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13Tex_005340" +static const ALIGN_ASSET(2) char ganontika_room_13Tex_005340[] = dganontika_room_13Tex_005340; + +#define dganontika_room_13Tex_005B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13Tex_005B40" +static const ALIGN_ASSET(2) char ganontika_room_13Tex_005B40[] = dganontika_room_13Tex_005B40; + +#define dganontika_room_13Tex_006340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13Tex_006340" +static const ALIGN_ASSET(2) char ganontika_room_13Tex_006340[] = dganontika_room_13Tex_006340; #define dganontika_room_13Tex_006B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13Tex_006B40" static const ALIGN_ASSET(2) char ganontika_room_13Tex_006B40[] = dganontika_room_13Tex_006B40; @@ -12,24 +24,12 @@ static const ALIGN_ASSET(2) char ganontika_room_13Tex_006B40[] = dganontika_room #define dganontika_room_13Tex_006D40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13Tex_006D40" static const ALIGN_ASSET(2) char ganontika_room_13Tex_006D40[] = dganontika_room_13Tex_006D40; -#define dganontika_room_13Tex_006340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13Tex_006340" -static const ALIGN_ASSET(2) char ganontika_room_13Tex_006340[] = dganontika_room_13Tex_006340; - -#define dganontika_room_13Tex_004B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13Tex_004B40" -static const ALIGN_ASSET(2) char ganontika_room_13Tex_004B40[] = dganontika_room_13Tex_004B40; - -#define dganontika_room_13Tex_005B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13Tex_005B40" -static const ALIGN_ASSET(2) char ganontika_room_13Tex_005B40[] = dganontika_room_13Tex_005B40; - -#define dganontika_room_13Tex_004340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13Tex_004340" -static const ALIGN_ASSET(2) char ganontika_room_13Tex_004340[] = dganontika_room_13Tex_004340; +#define dganontika_room_13DL_001260 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13DL_001260" +static const ALIGN_ASSET(2) char ganontika_room_13DL_001260[] = dganontika_room_13DL_001260; #define dganontika_room_13DL_0024F8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13DL_0024F8" static const ALIGN_ASSET(2) char ganontika_room_13DL_0024F8[] = dganontika_room_13DL_0024F8; -#define dganontika_room_13Tex_005340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13Tex_005340" -static const ALIGN_ASSET(2) char ganontika_room_13Tex_005340[] = dganontika_room_13Tex_005340; - #define dganontika_room_13DL_002CF0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13DL_002CF0" static const ALIGN_ASSET(2) char ganontika_room_13DL_002CF0[] = dganontika_room_13DL_002CF0; diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_14.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_14.h index 221eace9f..b80f26bb2 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_14.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_14.h @@ -3,8 +3,17 @@ #include "align_asset_macro.h" -#define dganontika_room_14DL_000918 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14DL_000918" -static const ALIGN_ASSET(2) char ganontika_room_14DL_000918[] = dganontika_room_14DL_000918; +#define dganontika_room_14Tex_004FB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_004FB8" +static const ALIGN_ASSET(2) char ganontika_room_14Tex_004FB8[] = dganontika_room_14Tex_004FB8; + +#define dganontika_room_14Tex_0057B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_0057B8" +static const ALIGN_ASSET(2) char ganontika_room_14Tex_0057B8[] = dganontika_room_14Tex_0057B8; + +#define dganontika_room_14Tex_005FB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_005FB8" +static const ALIGN_ASSET(2) char ganontika_room_14Tex_005FB8[] = dganontika_room_14Tex_005FB8; + +#define dganontika_room_14Tex_0067B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_0067B8" +static const ALIGN_ASSET(2) char ganontika_room_14Tex_0067B8[] = dganontika_room_14Tex_0067B8; #define dganontika_room_14Tex_0077B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_0077B8" static const ALIGN_ASSET(2) char ganontika_room_14Tex_0077B8[] = dganontika_room_14Tex_0077B8; @@ -12,8 +21,17 @@ static const ALIGN_ASSET(2) char ganontika_room_14Tex_0077B8[] = dganontika_room #define dganontika_room_14Tex_007BB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_007BB8" static const ALIGN_ASSET(2) char ganontika_room_14Tex_007BB8[] = dganontika_room_14Tex_007BB8; -#define dganontika_room_14Tex_0057B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_0057B8" -static const ALIGN_ASSET(2) char ganontika_room_14Tex_0057B8[] = dganontika_room_14Tex_0057B8; +#define dganontika_room_14Tex_0089C8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_0089C8" +static const ALIGN_ASSET(2) char ganontika_room_14Tex_0089C8[] = dganontika_room_14Tex_0089C8; + +#define dganontika_room_14Tex_0099C8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_0099C8" +static const ALIGN_ASSET(2) char ganontika_room_14Tex_0099C8[] = dganontika_room_14Tex_0099C8; + +#define dganontika_room_14TLUT_004F98 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14TLUT_004F98" +static const ALIGN_ASSET(2) char ganontika_room_14TLUT_004F98[] = dganontika_room_14TLUT_004F98; + +#define dganontika_room_14DL_000918 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14DL_000918" +static const ALIGN_ASSET(2) char ganontika_room_14DL_000918[] = dganontika_room_14DL_000918; #define dganontika_room_14DL_001110 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14DL_001110" static const ALIGN_ASSET(2) char ganontika_room_14DL_001110[] = dganontika_room_14DL_001110; @@ -33,38 +51,20 @@ static const ALIGN_ASSET(2) char ganontika_room_14DL_0036E8[] = dganontika_room_ #define dganontika_room_14DL_004920 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14DL_004920" static const ALIGN_ASSET(2) char ganontika_room_14DL_004920[] = dganontika_room_14DL_004920; -#define dganontika_room_14Tex_0067B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_0067B8" -static const ALIGN_ASSET(2) char ganontika_room_14Tex_0067B8[] = dganontika_room_14Tex_0067B8; - #define dganontika_room_14DL_004BF8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14DL_004BF8" static const ALIGN_ASSET(2) char ganontika_room_14DL_004BF8[] = dganontika_room_14DL_004BF8; -#define dganontika_room_14Tex_005FB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_005FB8" -static const ALIGN_ASSET(2) char ganontika_room_14Tex_005FB8[] = dganontika_room_14Tex_005FB8; - -#define dganontika_room_14TLUT_004F98 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14TLUT_004F98" -static const ALIGN_ASSET(2) char ganontika_room_14TLUT_004F98[] = dganontika_room_14TLUT_004F98; - #define dganontika_room_14DL_0085F0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14DL_0085F0" static const ALIGN_ASSET(2) char ganontika_room_14DL_0085F0[] = dganontika_room_14DL_0085F0; -#define dganontika_room_14Tex_0089C8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_0089C8" -static const ALIGN_ASSET(2) char ganontika_room_14Tex_0089C8[] = dganontika_room_14Tex_0089C8; - #define dganontika_room_14DL_0003D0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14DL_0003D0" static const ALIGN_ASSET(2) char ganontika_room_14DL_0003D0[] = dganontika_room_14DL_0003D0; #define dganontika_room_14DL_004E38 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14DL_004E38" static const ALIGN_ASSET(2) char ganontika_room_14DL_004E38[] = dganontika_room_14DL_004E38; -#define dganontika_room_14Tex_004FB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_004FB8" -static const ALIGN_ASSET(2) char ganontika_room_14Tex_004FB8[] = dganontika_room_14Tex_004FB8; - #define dganontika_room_14DL_008888 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14DL_008888" static const ALIGN_ASSET(2) char ganontika_room_14DL_008888[] = dganontika_room_14DL_008888; -#define dganontika_room_14Tex_0099C8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_0099C8" -static const ALIGN_ASSET(2) char ganontika_room_14Tex_0099C8[] = dganontika_room_14Tex_0099C8; - #endif // DUNGEONS_GANONTIKA_ROOM_14_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_15.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_15.h index 60c463138..7bb282617 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_15.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_15.h @@ -3,8 +3,20 @@ #include "align_asset_macro.h" -#define dganontika_room_15DL_001260 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15DL_001260" -static const ALIGN_ASSET(2) char ganontika_room_15DL_001260[] = dganontika_room_15DL_001260; +#define dganontika_room_15Tex_004340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15Tex_004340" +static const ALIGN_ASSET(2) char ganontika_room_15Tex_004340[] = dganontika_room_15Tex_004340; + +#define dganontika_room_15Tex_004B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15Tex_004B40" +static const ALIGN_ASSET(2) char ganontika_room_15Tex_004B40[] = dganontika_room_15Tex_004B40; + +#define dganontika_room_15Tex_005340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15Tex_005340" +static const ALIGN_ASSET(2) char ganontika_room_15Tex_005340[] = dganontika_room_15Tex_005340; + +#define dganontika_room_15Tex_005B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15Tex_005B40" +static const ALIGN_ASSET(2) char ganontika_room_15Tex_005B40[] = dganontika_room_15Tex_005B40; + +#define dganontika_room_15Tex_006340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15Tex_006340" +static const ALIGN_ASSET(2) char ganontika_room_15Tex_006340[] = dganontika_room_15Tex_006340; #define dganontika_room_15Tex_006B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15Tex_006B40" static const ALIGN_ASSET(2) char ganontika_room_15Tex_006B40[] = dganontika_room_15Tex_006B40; @@ -12,24 +24,12 @@ static const ALIGN_ASSET(2) char ganontika_room_15Tex_006B40[] = dganontika_room #define dganontika_room_15Tex_006D40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15Tex_006D40" static const ALIGN_ASSET(2) char ganontika_room_15Tex_006D40[] = dganontika_room_15Tex_006D40; -#define dganontika_room_15Tex_006340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15Tex_006340" -static const ALIGN_ASSET(2) char ganontika_room_15Tex_006340[] = dganontika_room_15Tex_006340; - -#define dganontika_room_15Tex_004B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15Tex_004B40" -static const ALIGN_ASSET(2) char ganontika_room_15Tex_004B40[] = dganontika_room_15Tex_004B40; - -#define dganontika_room_15Tex_005B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15Tex_005B40" -static const ALIGN_ASSET(2) char ganontika_room_15Tex_005B40[] = dganontika_room_15Tex_005B40; - -#define dganontika_room_15Tex_004340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15Tex_004340" -static const ALIGN_ASSET(2) char ganontika_room_15Tex_004340[] = dganontika_room_15Tex_004340; +#define dganontika_room_15DL_001260 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15DL_001260" +static const ALIGN_ASSET(2) char ganontika_room_15DL_001260[] = dganontika_room_15DL_001260; #define dganontika_room_15DL_0024F8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15DL_0024F8" static const ALIGN_ASSET(2) char ganontika_room_15DL_0024F8[] = dganontika_room_15DL_0024F8; -#define dganontika_room_15Tex_005340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15Tex_005340" -static const ALIGN_ASSET(2) char ganontika_room_15Tex_005340[] = dganontika_room_15Tex_005340; - #define dganontika_room_15DL_002CF0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15DL_002CF0" static const ALIGN_ASSET(2) char ganontika_room_15DL_002CF0[] = dganontika_room_15DL_002CF0; diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_16.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_16.h index 7b0b5e713..84950473a 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_16.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_16.h @@ -3,20 +3,20 @@ #include "align_asset_macro.h" -#define dganontika_room_16DL_0006F0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_16DL_0006F0" -static const ALIGN_ASSET(2) char ganontika_room_16DL_0006F0[] = dganontika_room_16DL_0006F0; - #define dganontika_room_16Tex_001630 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_16Tex_001630" static const ALIGN_ASSET(2) char ganontika_room_16Tex_001630[] = dganontika_room_16Tex_001630; +#define dganontika_room_16Tex_002630 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_16Tex_002630" +static const ALIGN_ASSET(2) char ganontika_room_16Tex_002630[] = dganontika_room_16Tex_002630; + +#define dganontika_room_16DL_0006F0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_16DL_0006F0" +static const ALIGN_ASSET(2) char ganontika_room_16DL_0006F0[] = dganontika_room_16DL_0006F0; + #define dganontika_room_16DL_000E80 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_16DL_000E80" static const ALIGN_ASSET(2) char ganontika_room_16DL_000E80[] = dganontika_room_16DL_000E80; #define dganontika_room_16DL_001288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_16DL_001288" static const ALIGN_ASSET(2) char ganontika_room_16DL_001288[] = dganontika_room_16DL_001288; -#define dganontika_room_16Tex_002630 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_16Tex_002630" -static const ALIGN_ASSET(2) char ganontika_room_16Tex_002630[] = dganontika_room_16Tex_002630; - #endif // DUNGEONS_GANONTIKA_ROOM_16_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_17.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_17.h index 81a2bef39..83da2d0a8 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_17.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_17.h @@ -3,36 +3,39 @@ #include "align_asset_macro.h" -#define dganontika_room_17DL_000B30 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17DL_000B30" -static const ALIGN_ASSET(2) char ganontika_room_17DL_000B30[] = dganontika_room_17DL_000B30; - -#define dganontika_room_17Tex_005618 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_005618" -static const ALIGN_ASSET(2) char ganontika_room_17Tex_005618[] = dganontika_room_17Tex_005618; - -#define dganontika_room_17Tex_007618 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_007618" -static const ALIGN_ASSET(2) char ganontika_room_17Tex_007618[] = dganontika_room_17Tex_007618; - #define dganontika_room_17Tex_002A18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_002A18" static const ALIGN_ASSET(2) char ganontika_room_17Tex_002A18[] = dganontika_room_17Tex_002A18; -#define dganontika_room_17DL_0023B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17DL_0023B8" -static const ALIGN_ASSET(2) char ganontika_room_17DL_0023B8[] = dganontika_room_17DL_0023B8; - -#define dganontika_room_17Tex_004E18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_004E18" -static const ALIGN_ASSET(2) char ganontika_room_17Tex_004E18[] = dganontika_room_17Tex_004E18; - -#define dganontika_room_17Tex_003E18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_003E18" -static const ALIGN_ASSET(2) char ganontika_room_17Tex_003E18[] = dganontika_room_17Tex_003E18; - #define dganontika_room_17Tex_002E18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_002E18" static const ALIGN_ASSET(2) char ganontika_room_17Tex_002E18[] = dganontika_room_17Tex_002E18; -#define dganontika_room_17DL_001448 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17DL_001448" -static const ALIGN_ASSET(2) char ganontika_room_17DL_001448[] = dganontika_room_17DL_001448; +#define dganontika_room_17Tex_003E18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_003E18" +static const ALIGN_ASSET(2) char ganontika_room_17Tex_003E18[] = dganontika_room_17Tex_003E18; + +#define dganontika_room_17Tex_004E18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_004E18" +static const ALIGN_ASSET(2) char ganontika_room_17Tex_004E18[] = dganontika_room_17Tex_004E18; + +#define dganontika_room_17Tex_005618 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_005618" +static const ALIGN_ASSET(2) char ganontika_room_17Tex_005618[] = dganontika_room_17Tex_005618; + +#define dganontika_room_17Tex_006618 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_006618" +static const ALIGN_ASSET(2) char ganontika_room_17Tex_006618[] = dganontika_room_17Tex_006618; #define dganontika_room_17Tex_006E18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_006E18" static const ALIGN_ASSET(2) char ganontika_room_17Tex_006E18[] = dganontika_room_17Tex_006E18; +#define dganontika_room_17Tex_007618 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_007618" +static const ALIGN_ASSET(2) char ganontika_room_17Tex_007618[] = dganontika_room_17Tex_007618; + +#define dganontika_room_17DL_000B30 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17DL_000B30" +static const ALIGN_ASSET(2) char ganontika_room_17DL_000B30[] = dganontika_room_17DL_000B30; + +#define dganontika_room_17DL_0023B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17DL_0023B8" +static const ALIGN_ASSET(2) char ganontika_room_17DL_0023B8[] = dganontika_room_17DL_0023B8; + +#define dganontika_room_17DL_001448 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17DL_001448" +static const ALIGN_ASSET(2) char ganontika_room_17DL_001448[] = dganontika_room_17DL_001448; + #define dganontika_room_17DL_001720 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17DL_001720" static const ALIGN_ASSET(2) char ganontika_room_17DL_001720[] = dganontika_room_17DL_001720; @@ -45,8 +48,5 @@ static const ALIGN_ASSET(2) char ganontika_room_17DL_001DE0[] = dganontika_room_ #define dganontika_room_17DL_002908 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17DL_002908" static const ALIGN_ASSET(2) char ganontika_room_17DL_002908[] = dganontika_room_17DL_002908; -#define dganontika_room_17Tex_006618 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_006618" -static const ALIGN_ASSET(2) char ganontika_room_17Tex_006618[] = dganontika_room_17Tex_006618; - #endif // DUNGEONS_GANONTIKA_ROOM_17_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_18.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_18.h index b124eeff2..ef497a9b5 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_18.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_18.h @@ -3,59 +3,11 @@ #include "align_asset_macro.h" -#define dganontika_room_18DL_002E80 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_002E80" -static const ALIGN_ASSET(2) char ganontika_room_18DL_002E80[] = dganontika_room_18DL_002E80; - #define dganontika_room_18Tex_004380 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_004380" static const ALIGN_ASSET(2) char ganontika_room_18Tex_004380[] = dganontika_room_18Tex_004380; -#define dganontika_room_18DL_0028E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_0028E0" -static const ALIGN_ASSET(2) char ganontika_room_18DL_0028E0[] = dganontika_room_18DL_0028E0; - -#define dganontika_room_18Tex_007F80 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_007F80" -static const ALIGN_ASSET(2) char ganontika_room_18Tex_007F80[] = dganontika_room_18Tex_007F80; - -#define dganontika_room_18DL_001720 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_001720" -static const ALIGN_ASSET(2) char ganontika_room_18DL_001720[] = dganontika_room_18DL_001720; - -#define dganontika_room_18Tex_009980 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_009980" -static const ALIGN_ASSET(2) char ganontika_room_18Tex_009980[] = dganontika_room_18Tex_009980; - -#define dganontika_room_18TLUT_004360 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18TLUT_004360" -static const ALIGN_ASSET(2) char ganontika_room_18TLUT_004360[] = dganontika_room_18TLUT_004360; - -#define dganontika_room_18DL_00B5B0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_00B5B0" -static const ALIGN_ASSET(2) char ganontika_room_18DL_00B5B0[] = dganontika_room_18DL_00B5B0; - -#define dganontika_room_18Tex_00B6E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_00B6E0" -static const ALIGN_ASSET(2) char ganontika_room_18Tex_00B6E0[] = dganontika_room_18Tex_00B6E0; - -#define dganontika_room_18DL_001FC8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_001FC8" -static const ALIGN_ASSET(2) char ganontika_room_18DL_001FC8[] = dganontika_room_18DL_001FC8; - -#define dganontika_room_18DL_003108 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_003108" -static const ALIGN_ASSET(2) char ganontika_room_18DL_003108[] = dganontika_room_18DL_003108; - -#define dganontika_room_18Tex_00A380 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_00A380" -static const ALIGN_ASSET(2) char ganontika_room_18Tex_00A380[] = dganontika_room_18Tex_00A380; - -#define dganontika_room_18DL_003530 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_003530" -static const ALIGN_ASSET(2) char ganontika_room_18DL_003530[] = dganontika_room_18DL_003530; - -#define dganontika_room_18Tex_009180 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_009180" -static const ALIGN_ASSET(2) char ganontika_room_18Tex_009180[] = dganontika_room_18Tex_009180; - -#define dganontika_room_18Tex_008F80 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_008F80" -static const ALIGN_ASSET(2) char ganontika_room_18Tex_008F80[] = dganontika_room_18Tex_008F80; - -#define dganontika_room_18DL_003B70 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_003B70" -static const ALIGN_ASSET(2) char ganontika_room_18DL_003B70[] = dganontika_room_18DL_003B70; - -#define dganontika_room_18Tex_00A180 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_00A180" -static const ALIGN_ASSET(2) char ganontika_room_18Tex_00A180[] = dganontika_room_18Tex_00A180; - -#define dganontika_room_18DL_003E48 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_003E48" -static const ALIGN_ASSET(2) char ganontika_room_18DL_003E48[] = dganontika_room_18DL_003E48; +#define dganontika_room_18Tex_005380 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_005380" +static const ALIGN_ASSET(2) char ganontika_room_18Tex_005380[] = dganontika_room_18Tex_005380; #define dganontika_room_18Tex_005780 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_005780" static const ALIGN_ASSET(2) char ganontika_room_18Tex_005780[] = dganontika_room_18Tex_005780; @@ -66,14 +18,62 @@ static const ALIGN_ASSET(2) char ganontika_room_18Tex_006780[] = dganontika_room #define dganontika_room_18Tex_007780 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_007780" static const ALIGN_ASSET(2) char ganontika_room_18Tex_007780[] = dganontika_room_18Tex_007780; +#define dganontika_room_18Tex_007F80 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_007F80" +static const ALIGN_ASSET(2) char ganontika_room_18Tex_007F80[] = dganontika_room_18Tex_007F80; + +#define dganontika_room_18Tex_008F80 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_008F80" +static const ALIGN_ASSET(2) char ganontika_room_18Tex_008F80[] = dganontika_room_18Tex_008F80; + +#define dganontika_room_18Tex_009180 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_009180" +static const ALIGN_ASSET(2) char ganontika_room_18Tex_009180[] = dganontika_room_18Tex_009180; + +#define dganontika_room_18Tex_009980 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_009980" +static const ALIGN_ASSET(2) char ganontika_room_18Tex_009980[] = dganontika_room_18Tex_009980; + +#define dganontika_room_18Tex_00A180 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_00A180" +static const ALIGN_ASSET(2) char ganontika_room_18Tex_00A180[] = dganontika_room_18Tex_00A180; + +#define dganontika_room_18Tex_00A380 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_00A380" +static const ALIGN_ASSET(2) char ganontika_room_18Tex_00A380[] = dganontika_room_18Tex_00A380; + +#define dganontika_room_18Tex_00B6E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_00B6E0" +static const ALIGN_ASSET(2) char ganontika_room_18Tex_00B6E0[] = dganontika_room_18Tex_00B6E0; + +#define dganontika_room_18TLUT_004360 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18TLUT_004360" +static const ALIGN_ASSET(2) char ganontika_room_18TLUT_004360[] = dganontika_room_18TLUT_004360; + +#define dganontika_room_18DL_002E80 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_002E80" +static const ALIGN_ASSET(2) char ganontika_room_18DL_002E80[] = dganontika_room_18DL_002E80; + +#define dganontika_room_18DL_0028E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_0028E0" +static const ALIGN_ASSET(2) char ganontika_room_18DL_0028E0[] = dganontika_room_18DL_0028E0; + +#define dganontika_room_18DL_001720 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_001720" +static const ALIGN_ASSET(2) char ganontika_room_18DL_001720[] = dganontika_room_18DL_001720; + +#define dganontika_room_18DL_00B5B0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_00B5B0" +static const ALIGN_ASSET(2) char ganontika_room_18DL_00B5B0[] = dganontika_room_18DL_00B5B0; + +#define dganontika_room_18DL_001FC8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_001FC8" +static const ALIGN_ASSET(2) char ganontika_room_18DL_001FC8[] = dganontika_room_18DL_001FC8; + +#define dganontika_room_18DL_003108 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_003108" +static const ALIGN_ASSET(2) char ganontika_room_18DL_003108[] = dganontika_room_18DL_003108; + +#define dganontika_room_18DL_003530 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_003530" +static const ALIGN_ASSET(2) char ganontika_room_18DL_003530[] = dganontika_room_18DL_003530; + +#define dganontika_room_18DL_003B70 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_003B70" +static const ALIGN_ASSET(2) char ganontika_room_18DL_003B70[] = dganontika_room_18DL_003B70; + +#define dganontika_room_18DL_003E48 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_003E48" +static const ALIGN_ASSET(2) char ganontika_room_18DL_003E48[] = dganontika_room_18DL_003E48; + #define dganontika_room_18DL_004188 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_004188" static const ALIGN_ASSET(2) char ganontika_room_18DL_004188[] = dganontika_room_18DL_004188; #define dganontika_room_18DL_000D70 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_000D70" static const ALIGN_ASSET(2) char ganontika_room_18DL_000D70[] = dganontika_room_18DL_000D70; -#define dganontika_room_18Tex_005380 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_005380" -static const ALIGN_ASSET(2) char ganontika_room_18Tex_005380[] = dganontika_room_18Tex_005380; - #endif // DUNGEONS_GANONTIKA_ROOM_18_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_19.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_19.h index 44c804312..f1ba3ed21 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_19.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_19.h @@ -3,8 +3,20 @@ #include "align_asset_macro.h" -#define dganontika_room_19DL_001260 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19DL_001260" -static const ALIGN_ASSET(2) char ganontika_room_19DL_001260[] = dganontika_room_19DL_001260; +#define dganontika_room_19Tex_004340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19Tex_004340" +static const ALIGN_ASSET(2) char ganontika_room_19Tex_004340[] = dganontika_room_19Tex_004340; + +#define dganontika_room_19Tex_004B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19Tex_004B40" +static const ALIGN_ASSET(2) char ganontika_room_19Tex_004B40[] = dganontika_room_19Tex_004B40; + +#define dganontika_room_19Tex_005340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19Tex_005340" +static const ALIGN_ASSET(2) char ganontika_room_19Tex_005340[] = dganontika_room_19Tex_005340; + +#define dganontika_room_19Tex_005B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19Tex_005B40" +static const ALIGN_ASSET(2) char ganontika_room_19Tex_005B40[] = dganontika_room_19Tex_005B40; + +#define dganontika_room_19Tex_006340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19Tex_006340" +static const ALIGN_ASSET(2) char ganontika_room_19Tex_006340[] = dganontika_room_19Tex_006340; #define dganontika_room_19Tex_006B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19Tex_006B40" static const ALIGN_ASSET(2) char ganontika_room_19Tex_006B40[] = dganontika_room_19Tex_006B40; @@ -12,24 +24,12 @@ static const ALIGN_ASSET(2) char ganontika_room_19Tex_006B40[] = dganontika_room #define dganontika_room_19Tex_006D40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19Tex_006D40" static const ALIGN_ASSET(2) char ganontika_room_19Tex_006D40[] = dganontika_room_19Tex_006D40; -#define dganontika_room_19Tex_006340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19Tex_006340" -static const ALIGN_ASSET(2) char ganontika_room_19Tex_006340[] = dganontika_room_19Tex_006340; - -#define dganontika_room_19Tex_004B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19Tex_004B40" -static const ALIGN_ASSET(2) char ganontika_room_19Tex_004B40[] = dganontika_room_19Tex_004B40; - -#define dganontika_room_19Tex_005B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19Tex_005B40" -static const ALIGN_ASSET(2) char ganontika_room_19Tex_005B40[] = dganontika_room_19Tex_005B40; - -#define dganontika_room_19Tex_004340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19Tex_004340" -static const ALIGN_ASSET(2) char ganontika_room_19Tex_004340[] = dganontika_room_19Tex_004340; +#define dganontika_room_19DL_001260 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19DL_001260" +static const ALIGN_ASSET(2) char ganontika_room_19DL_001260[] = dganontika_room_19DL_001260; #define dganontika_room_19DL_0024F8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19DL_0024F8" static const ALIGN_ASSET(2) char ganontika_room_19DL_0024F8[] = dganontika_room_19DL_0024F8; -#define dganontika_room_19Tex_005340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19Tex_005340" -static const ALIGN_ASSET(2) char ganontika_room_19Tex_005340[] = dganontika_room_19Tex_005340; - #define dganontika_room_19DL_002CF0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19DL_002CF0" static const ALIGN_ASSET(2) char ganontika_room_19DL_002CF0[] = dganontika_room_19DL_002CF0; diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_2.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_2.h index 5e133520a..e7f1682f6 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_2.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_2.h @@ -3,14 +3,32 @@ #include "align_asset_macro.h" -#define dganontika_room_2DL_0006D0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2DL_0006D0" -static const ALIGN_ASSET(2) char ganontika_room_2DL_0006D0[] = dganontika_room_2DL_0006D0; +#define dganontika_room_2Tex_002FD8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_002FD8" +static const ALIGN_ASSET(2) char ganontika_room_2Tex_002FD8[] = dganontika_room_2Tex_002FD8; + +#define dganontika_room_2Tex_0037D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_0037D8" +static const ALIGN_ASSET(2) char ganontika_room_2Tex_0037D8[] = dganontika_room_2Tex_0037D8; + +#define dganontika_room_2Tex_003FD8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_003FD8" +static const ALIGN_ASSET(2) char ganontika_room_2Tex_003FD8[] = dganontika_room_2Tex_003FD8; + +#define dganontika_room_2Tex_0047D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_0047D8" +static const ALIGN_ASSET(2) char ganontika_room_2Tex_0047D8[] = dganontika_room_2Tex_0047D8; #define dganontika_room_2Tex_004FD8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_004FD8" static const ALIGN_ASSET(2) char ganontika_room_2Tex_004FD8[] = dganontika_room_2Tex_004FD8; -#define dganontika_room_2Tex_0047D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_0047D8" -static const ALIGN_ASSET(2) char ganontika_room_2Tex_0047D8[] = dganontika_room_2Tex_0047D8; +#define dganontika_room_2Tex_0057D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_0057D8" +static const ALIGN_ASSET(2) char ganontika_room_2Tex_0057D8[] = dganontika_room_2Tex_0057D8; + +#define dganontika_room_2Tex_005FD8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_005FD8" +static const ALIGN_ASSET(2) char ganontika_room_2Tex_005FD8[] = dganontika_room_2Tex_005FD8; + +#define dganontika_room_2Tex_0067D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_0067D8" +static const ALIGN_ASSET(2) char ganontika_room_2Tex_0067D8[] = dganontika_room_2Tex_0067D8; + +#define dganontika_room_2DL_0006D0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2DL_0006D0" +static const ALIGN_ASSET(2) char ganontika_room_2DL_0006D0[] = dganontika_room_2DL_0006D0; #define dganontika_room_2DL_000D10 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2DL_000D10" static const ALIGN_ASSET(2) char ganontika_room_2DL_000D10[] = dganontika_room_2DL_000D10; @@ -21,36 +39,18 @@ static const ALIGN_ASSET(2) char ganontika_room_2DL_002E70[] = dganontika_room_2 #define dganontika_room_2DL_0014A8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2DL_0014A8" static const ALIGN_ASSET(2) char ganontika_room_2DL_0014A8[] = dganontika_room_2DL_0014A8; -#define dganontika_room_2Tex_0057D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_0057D8" -static const ALIGN_ASSET(2) char ganontika_room_2Tex_0057D8[] = dganontika_room_2Tex_0057D8; - #define dganontika_room_2DL_001B68 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2DL_001B68" static const ALIGN_ASSET(2) char ganontika_room_2DL_001B68[] = dganontika_room_2DL_001B68; -#define dganontika_room_2Tex_002FD8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_002FD8" -static const ALIGN_ASSET(2) char ganontika_room_2Tex_002FD8[] = dganontika_room_2Tex_002FD8; - #define dganontika_room_2DL_001F20 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2DL_001F20" static const ALIGN_ASSET(2) char ganontika_room_2DL_001F20[] = dganontika_room_2DL_001F20; -#define dganontika_room_2Tex_003FD8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_003FD8" -static const ALIGN_ASSET(2) char ganontika_room_2Tex_003FD8[] = dganontika_room_2Tex_003FD8; - #define dganontika_room_2DL_002498 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2DL_002498" static const ALIGN_ASSET(2) char ganontika_room_2DL_002498[] = dganontika_room_2DL_002498; -#define dganontika_room_2Tex_0067D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_0067D8" -static const ALIGN_ASSET(2) char ganontika_room_2Tex_0067D8[] = dganontika_room_2Tex_0067D8; - -#define dganontika_room_2Tex_005FD8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_005FD8" -static const ALIGN_ASSET(2) char ganontika_room_2Tex_005FD8[] = dganontika_room_2Tex_005FD8; - #define dganontika_room_2DL_002AE0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2DL_002AE0" static const ALIGN_ASSET(2) char ganontika_room_2DL_002AE0[] = dganontika_room_2DL_002AE0; -#define dganontika_room_2Tex_0037D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_0037D8" -static const ALIGN_ASSET(2) char ganontika_room_2Tex_0037D8[] = dganontika_room_2Tex_0037D8; - #define dganontika_room_2DL_000F00 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2DL_000F00" static const ALIGN_ASSET(2) char ganontika_room_2DL_000F00[] = dganontika_room_2DL_000F00; diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_3.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_3.h index ca4315f72..e07d368ae 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_3.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_3.h @@ -3,68 +3,68 @@ #include "align_asset_macro.h" -#define dganontika_room_3DL_003410 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3DL_003410" -static const ALIGN_ASSET(2) char ganontika_room_3DL_003410[] = dganontika_room_3DL_003410; +#define dganontika_room_3Tex_003ED8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_003ED8" +static const ALIGN_ASSET(2) char ganontika_room_3Tex_003ED8[] = dganontika_room_3Tex_003ED8; + +#define dganontika_room_3Tex_0046D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_0046D8" +static const ALIGN_ASSET(2) char ganontika_room_3Tex_0046D8[] = dganontika_room_3Tex_0046D8; + +#define dganontika_room_3Tex_004ED8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_004ED8" +static const ALIGN_ASSET(2) char ganontika_room_3Tex_004ED8[] = dganontika_room_3Tex_004ED8; + +#define dganontika_room_3Tex_0056D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_0056D8" +static const ALIGN_ASSET(2) char ganontika_room_3Tex_0056D8[] = dganontika_room_3Tex_0056D8; + +#define dganontika_room_3Tex_005ED8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_005ED8" +static const ALIGN_ASSET(2) char ganontika_room_3Tex_005ED8[] = dganontika_room_3Tex_005ED8; #define dganontika_room_3Tex_0066D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_0066D8" static const ALIGN_ASSET(2) char ganontika_room_3Tex_0066D8[] = dganontika_room_3Tex_0066D8; +#define dganontika_room_3Tex_006ED8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_006ED8" +static const ALIGN_ASSET(2) char ganontika_room_3Tex_006ED8[] = dganontika_room_3Tex_006ED8; + +#define dganontika_room_3Tex_0076D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_0076D8" +static const ALIGN_ASSET(2) char ganontika_room_3Tex_0076D8[] = dganontika_room_3Tex_0076D8; + +#define dganontika_room_3Tex_008A38 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_008A38" +static const ALIGN_ASSET(2) char ganontika_room_3Tex_008A38[] = dganontika_room_3Tex_008A38; + +#define dganontika_room_3TLUT_003EB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3TLUT_003EB8" +static const ALIGN_ASSET(2) char ganontika_room_3TLUT_003EB8[] = dganontika_room_3TLUT_003EB8; + +#define dganontika_room_3DL_003410 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3DL_003410" +static const ALIGN_ASSET(2) char ganontika_room_3DL_003410[] = dganontika_room_3DL_003410; + #define dganontika_room_3DL_003838 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3DL_003838" static const ALIGN_ASSET(2) char ganontika_room_3DL_003838[] = dganontika_room_3DL_003838; #define dganontika_room_3DL_003A60 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3DL_003A60" static const ALIGN_ASSET(2) char ganontika_room_3DL_003A60[] = dganontika_room_3DL_003A60; -#define dganontika_room_3Tex_006ED8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_006ED8" -static const ALIGN_ASSET(2) char ganontika_room_3Tex_006ED8[] = dganontika_room_3Tex_006ED8; - -#define dganontika_room_3TLUT_003EB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3TLUT_003EB8" -static const ALIGN_ASSET(2) char ganontika_room_3TLUT_003EB8[] = dganontika_room_3TLUT_003EB8; - #define dganontika_room_3DL_008910 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3DL_008910" static const ALIGN_ASSET(2) char ganontika_room_3DL_008910[] = dganontika_room_3DL_008910; -#define dganontika_room_3Tex_008A38 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_008A38" -static const ALIGN_ASSET(2) char ganontika_room_3Tex_008A38[] = dganontika_room_3Tex_008A38; - #define dganontika_room_3DL_003D40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3DL_003D40" static const ALIGN_ASSET(2) char ganontika_room_3DL_003D40[] = dganontika_room_3DL_003D40; #define dganontika_room_3DL_000FF0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3DL_000FF0" static const ALIGN_ASSET(2) char ganontika_room_3DL_000FF0[] = dganontika_room_3DL_000FF0; -#define dganontika_room_3Tex_004ED8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_004ED8" -static const ALIGN_ASSET(2) char ganontika_room_3Tex_004ED8[] = dganontika_room_3Tex_004ED8; - #define dganontika_room_3DL_001550 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3DL_001550" static const ALIGN_ASSET(2) char ganontika_room_3DL_001550[] = dganontika_room_3DL_001550; -#define dganontika_room_3Tex_005ED8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_005ED8" -static const ALIGN_ASSET(2) char ganontika_room_3Tex_005ED8[] = dganontika_room_3Tex_005ED8; - -#define dganontika_room_3Tex_0056D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_0056D8" -static const ALIGN_ASSET(2) char ganontika_room_3Tex_0056D8[] = dganontika_room_3Tex_0056D8; - #define dganontika_room_3DL_001990 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3DL_001990" static const ALIGN_ASSET(2) char ganontika_room_3DL_001990[] = dganontika_room_3DL_001990; -#define dganontika_room_3Tex_003ED8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_003ED8" -static const ALIGN_ASSET(2) char ganontika_room_3Tex_003ED8[] = dganontika_room_3Tex_003ED8; - #define dganontika_room_3DL_001C70 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3DL_001C70" static const ALIGN_ASSET(2) char ganontika_room_3DL_001C70[] = dganontika_room_3DL_001C70; -#define dganontika_room_3Tex_0046D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_0046D8" -static const ALIGN_ASSET(2) char ganontika_room_3Tex_0046D8[] = dganontika_room_3Tex_0046D8; - #define dganontika_room_3DL_0028E8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3DL_0028E8" static const ALIGN_ASSET(2) char ganontika_room_3DL_0028E8[] = dganontika_room_3DL_0028E8; #define dganontika_room_3DL_002F48 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3DL_002F48" static const ALIGN_ASSET(2) char ganontika_room_3DL_002F48[] = dganontika_room_3DL_002F48; -#define dganontika_room_3Tex_0076D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_0076D8" -static const ALIGN_ASSET(2) char ganontika_room_3Tex_0076D8[] = dganontika_room_3Tex_0076D8; - #endif // DUNGEONS_GANONTIKA_ROOM_3_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_4.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_4.h index 483128ea0..28162722c 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_4.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_4.h @@ -3,8 +3,20 @@ #include "align_asset_macro.h" -#define dganontika_room_4DL_001440 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4DL_001440" -static const ALIGN_ASSET(2) char ganontika_room_4DL_001440[] = dganontika_room_4DL_001440; +#define dganontika_room_4Tex_004288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4Tex_004288" +static const ALIGN_ASSET(2) char ganontika_room_4Tex_004288[] = dganontika_room_4Tex_004288; + +#define dganontika_room_4Tex_004A88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4Tex_004A88" +static const ALIGN_ASSET(2) char ganontika_room_4Tex_004A88[] = dganontika_room_4Tex_004A88; + +#define dganontika_room_4Tex_005288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4Tex_005288" +static const ALIGN_ASSET(2) char ganontika_room_4Tex_005288[] = dganontika_room_4Tex_005288; + +#define dganontika_room_4Tex_005A88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4Tex_005A88" +static const ALIGN_ASSET(2) char ganontika_room_4Tex_005A88[] = dganontika_room_4Tex_005A88; + +#define dganontika_room_4Tex_006288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4Tex_006288" +static const ALIGN_ASSET(2) char ganontika_room_4Tex_006288[] = dganontika_room_4Tex_006288; #define dganontika_room_4Tex_006A88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4Tex_006A88" static const ALIGN_ASSET(2) char ganontika_room_4Tex_006A88[] = dganontika_room_4Tex_006A88; @@ -12,24 +24,12 @@ static const ALIGN_ASSET(2) char ganontika_room_4Tex_006A88[] = dganontika_room_ #define dganontika_room_4Tex_006C88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4Tex_006C88" static const ALIGN_ASSET(2) char ganontika_room_4Tex_006C88[] = dganontika_room_4Tex_006C88; -#define dganontika_room_4Tex_006288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4Tex_006288" -static const ALIGN_ASSET(2) char ganontika_room_4Tex_006288[] = dganontika_room_4Tex_006288; - -#define dganontika_room_4Tex_004A88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4Tex_004A88" -static const ALIGN_ASSET(2) char ganontika_room_4Tex_004A88[] = dganontika_room_4Tex_004A88; - -#define dganontika_room_4Tex_005A88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4Tex_005A88" -static const ALIGN_ASSET(2) char ganontika_room_4Tex_005A88[] = dganontika_room_4Tex_005A88; - -#define dganontika_room_4Tex_004288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4Tex_004288" -static const ALIGN_ASSET(2) char ganontika_room_4Tex_004288[] = dganontika_room_4Tex_004288; +#define dganontika_room_4DL_001440 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4DL_001440" +static const ALIGN_ASSET(2) char ganontika_room_4DL_001440[] = dganontika_room_4DL_001440; #define dganontika_room_4DL_002850 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4DL_002850" static const ALIGN_ASSET(2) char ganontika_room_4DL_002850[] = dganontika_room_4DL_002850; -#define dganontika_room_4Tex_005288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4Tex_005288" -static const ALIGN_ASSET(2) char ganontika_room_4Tex_005288[] = dganontika_room_4Tex_005288; - #define dganontika_room_4DL_003048 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4DL_003048" static const ALIGN_ASSET(2) char ganontika_room_4DL_003048[] = dganontika_room_4DL_003048; diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_5.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_5.h index 28eebc360..ec1507205 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_5.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_5.h @@ -3,21 +3,36 @@ #include "align_asset_macro.h" -#define dganontika_room_5DL_0005E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5DL_0005E0" -static const ALIGN_ASSET(2) char ganontika_room_5DL_0005E0[] = dganontika_room_5DL_0005E0; +#define dganontika_room_5Tex_003B18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_003B18" +static const ALIGN_ASSET(2) char ganontika_room_5Tex_003B18[] = dganontika_room_5Tex_003B18; + +#define dganontika_room_5Tex_003D18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_003D18" +static const ALIGN_ASSET(2) char ganontika_room_5Tex_003D18[] = dganontika_room_5Tex_003D18; + +#define dganontika_room_5Tex_004518 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_004518" +static const ALIGN_ASSET(2) char ganontika_room_5Tex_004518[] = dganontika_room_5Tex_004518; #define dganontika_room_5Tex_004D18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_004D18" static const ALIGN_ASSET(2) char ganontika_room_5Tex_004D18[] = dganontika_room_5Tex_004D18; +#define dganontika_room_5Tex_005518 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_005518" +static const ALIGN_ASSET(2) char ganontika_room_5Tex_005518[] = dganontika_room_5Tex_005518; + +#define dganontika_room_5Tex_005D18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_005D18" +static const ALIGN_ASSET(2) char ganontika_room_5Tex_005D18[] = dganontika_room_5Tex_005D18; + +#define dganontika_room_5Tex_006518 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_006518" +static const ALIGN_ASSET(2) char ganontika_room_5Tex_006518[] = dganontika_room_5Tex_006518; + +#define dganontika_room_5DL_0005E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5DL_0005E0" +static const ALIGN_ASSET(2) char ganontika_room_5DL_0005E0[] = dganontika_room_5DL_0005E0; + #define dganontika_room_5DL_000930 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5DL_000930" static const ALIGN_ASSET(2) char ganontika_room_5DL_000930[] = dganontika_room_5DL_000930; #define dganontika_room_5DL_001588 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5DL_001588" static const ALIGN_ASSET(2) char ganontika_room_5DL_001588[] = dganontika_room_5DL_001588; -#define dganontika_room_5Tex_006518 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_006518" -static const ALIGN_ASSET(2) char ganontika_room_5Tex_006518[] = dganontika_room_5Tex_006518; - #define dganontika_room_5DL_002678 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5DL_002678" static const ALIGN_ASSET(2) char ganontika_room_5DL_002678[] = dganontika_room_5DL_002678; @@ -27,23 +42,8 @@ static const ALIGN_ASSET(2) char ganontika_room_5DL_002E50[] = dganontika_room_5 #define dganontika_room_5DL_0035A8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5DL_0035A8" static const ALIGN_ASSET(2) char ganontika_room_5DL_0035A8[] = dganontika_room_5DL_0035A8; -#define dganontika_room_5Tex_003B18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_003B18" -static const ALIGN_ASSET(2) char ganontika_room_5Tex_003B18[] = dganontika_room_5Tex_003B18; - -#define dganontika_room_5Tex_003D18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_003D18" -static const ALIGN_ASSET(2) char ganontika_room_5Tex_003D18[] = dganontika_room_5Tex_003D18; - -#define dganontika_room_5Tex_005518 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_005518" -static const ALIGN_ASSET(2) char ganontika_room_5Tex_005518[] = dganontika_room_5Tex_005518; - -#define dganontika_room_5Tex_004518 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_004518" -static const ALIGN_ASSET(2) char ganontika_room_5Tex_004518[] = dganontika_room_5Tex_004518; - #define dganontika_room_5DL_000320 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5DL_000320" static const ALIGN_ASSET(2) char ganontika_room_5DL_000320[] = dganontika_room_5DL_000320; -#define dganontika_room_5Tex_005D18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_005D18" -static const ALIGN_ASSET(2) char ganontika_room_5Tex_005D18[] = dganontika_room_5Tex_005D18; - #endif // DUNGEONS_GANONTIKA_ROOM_5_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_6.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_6.h index 78207ab18..38e6e39fa 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_6.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_6.h @@ -3,11 +3,14 @@ #include "align_asset_macro.h" -#define dganontika_room_6DL_00A250 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6DL_00A250" -static const ALIGN_ASSET(2) char ganontika_room_6DL_00A250[] = dganontika_room_6DL_00A250; +#define dganontika_room_6Tex_00B500 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00B500" +static const ALIGN_ASSET(2) char ganontika_room_6Tex_00B500[] = dganontika_room_6Tex_00B500; -#define dganontika_room_6Tex_00D700 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00D700" -static const ALIGN_ASSET(2) char ganontika_room_6Tex_00D700[] = dganontika_room_6Tex_00D700; +#define dganontika_room_6Tex_00B900 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00B900" +static const ALIGN_ASSET(2) char ganontika_room_6Tex_00B900[] = dganontika_room_6Tex_00B900; + +#define dganontika_room_6Tex_00C100 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00C100" +static const ALIGN_ASSET(2) char ganontika_room_6Tex_00C100[] = dganontika_room_6Tex_00C100; #define dganontika_room_6Tex_00C900 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00C900" static const ALIGN_ASSET(2) char ganontika_room_6Tex_00C900[] = dganontika_room_6Tex_00C900; @@ -18,48 +21,45 @@ static const ALIGN_ASSET(2) char ganontika_room_6Tex_00CB00[] = dganontika_room_ #define dganontika_room_6Tex_00CD00 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00CD00" static const ALIGN_ASSET(2) char ganontika_room_6Tex_00CD00[] = dganontika_room_6Tex_00CD00; +#define dganontika_room_6Tex_00CF00 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00CF00" +static const ALIGN_ASSET(2) char ganontika_room_6Tex_00CF00[] = dganontika_room_6Tex_00CF00; + +#define dganontika_room_6Tex_00D700 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00D700" +static const ALIGN_ASSET(2) char ganontika_room_6Tex_00D700[] = dganontika_room_6Tex_00D700; + +#define dganontika_room_6Tex_00D900 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00D900" +static const ALIGN_ASSET(2) char ganontika_room_6Tex_00D900[] = dganontika_room_6Tex_00D900; + +#define dganontika_room_6Tex_00EC58 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00EC58" +static const ALIGN_ASSET(2) char ganontika_room_6Tex_00EC58[] = dganontika_room_6Tex_00EC58; + +#define dganontika_room_6TLUT_00B4E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6TLUT_00B4E0" +static const ALIGN_ASSET(2) char ganontika_room_6TLUT_00B4E0[] = dganontika_room_6TLUT_00B4E0; + +#define dganontika_room_6DL_00A250 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6DL_00A250" +static const ALIGN_ASSET(2) char ganontika_room_6DL_00A250[] = dganontika_room_6DL_00A250; + #define dganontika_room_6DL_007980 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6DL_007980" static const ALIGN_ASSET(2) char ganontika_room_6DL_007980[] = dganontika_room_6DL_007980; #define dganontika_room_6DL_0018F8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6DL_0018F8" static const ALIGN_ASSET(2) char ganontika_room_6DL_0018F8[] = dganontika_room_6DL_0018F8; -#define dganontika_room_6Tex_00CF00 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00CF00" -static const ALIGN_ASSET(2) char ganontika_room_6Tex_00CF00[] = dganontika_room_6Tex_00CF00; - -#define dganontika_room_6TLUT_00B4E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6TLUT_00B4E0" -static const ALIGN_ASSET(2) char ganontika_room_6TLUT_00B4E0[] = dganontika_room_6TLUT_00B4E0; - #define dganontika_room_6DL_00EB30 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6DL_00EB30" static const ALIGN_ASSET(2) char ganontika_room_6DL_00EB30[] = dganontika_room_6DL_00EB30; -#define dganontika_room_6Tex_00EC58 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00EC58" -static const ALIGN_ASSET(2) char ganontika_room_6Tex_00EC58[] = dganontika_room_6Tex_00EC58; - #define dganontika_room_6DL_0010E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6DL_0010E0" static const ALIGN_ASSET(2) char ganontika_room_6DL_0010E0[] = dganontika_room_6DL_0010E0; -#define dganontika_room_6Tex_00D900 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00D900" -static const ALIGN_ASSET(2) char ganontika_room_6Tex_00D900[] = dganontika_room_6Tex_00D900; - #define dganontika_room_6DL_0015E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6DL_0015E0" static const ALIGN_ASSET(2) char ganontika_room_6DL_0015E0[] = dganontika_room_6DL_0015E0; -#define dganontika_room_6Tex_00C100 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00C100" -static const ALIGN_ASSET(2) char ganontika_room_6Tex_00C100[] = dganontika_room_6Tex_00C100; - #define dganontika_room_6DL_001D18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6DL_001D18" static const ALIGN_ASSET(2) char ganontika_room_6DL_001D18[] = dganontika_room_6DL_001D18; -#define dganontika_room_6Tex_00B500 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00B500" -static const ALIGN_ASSET(2) char ganontika_room_6Tex_00B500[] = dganontika_room_6Tex_00B500; - #define dganontika_room_6DL_0023A0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6DL_0023A0" static const ALIGN_ASSET(2) char ganontika_room_6DL_0023A0[] = dganontika_room_6DL_0023A0; -#define dganontika_room_6Tex_00B900 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00B900" -static const ALIGN_ASSET(2) char ganontika_room_6Tex_00B900[] = dganontika_room_6Tex_00B900; - #define dganontika_room_6DL_002C20 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6DL_002C20" static const ALIGN_ASSET(2) char ganontika_room_6DL_002C20[] = dganontika_room_6DL_002C20; diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_7.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_7.h index 079ee9d6a..f3b8d9e4a 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_7.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_7.h @@ -3,8 +3,20 @@ #include "align_asset_macro.h" -#define dganontika_room_7DL_001440 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7DL_001440" -static const ALIGN_ASSET(2) char ganontika_room_7DL_001440[] = dganontika_room_7DL_001440; +#define dganontika_room_7Tex_004288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7Tex_004288" +static const ALIGN_ASSET(2) char ganontika_room_7Tex_004288[] = dganontika_room_7Tex_004288; + +#define dganontika_room_7Tex_004A88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7Tex_004A88" +static const ALIGN_ASSET(2) char ganontika_room_7Tex_004A88[] = dganontika_room_7Tex_004A88; + +#define dganontika_room_7Tex_005288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7Tex_005288" +static const ALIGN_ASSET(2) char ganontika_room_7Tex_005288[] = dganontika_room_7Tex_005288; + +#define dganontika_room_7Tex_005A88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7Tex_005A88" +static const ALIGN_ASSET(2) char ganontika_room_7Tex_005A88[] = dganontika_room_7Tex_005A88; + +#define dganontika_room_7Tex_006288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7Tex_006288" +static const ALIGN_ASSET(2) char ganontika_room_7Tex_006288[] = dganontika_room_7Tex_006288; #define dganontika_room_7Tex_006A88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7Tex_006A88" static const ALIGN_ASSET(2) char ganontika_room_7Tex_006A88[] = dganontika_room_7Tex_006A88; @@ -12,24 +24,12 @@ static const ALIGN_ASSET(2) char ganontika_room_7Tex_006A88[] = dganontika_room_ #define dganontika_room_7Tex_006C88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7Tex_006C88" static const ALIGN_ASSET(2) char ganontika_room_7Tex_006C88[] = dganontika_room_7Tex_006C88; -#define dganontika_room_7Tex_006288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7Tex_006288" -static const ALIGN_ASSET(2) char ganontika_room_7Tex_006288[] = dganontika_room_7Tex_006288; - -#define dganontika_room_7Tex_004A88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7Tex_004A88" -static const ALIGN_ASSET(2) char ganontika_room_7Tex_004A88[] = dganontika_room_7Tex_004A88; - -#define dganontika_room_7Tex_005A88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7Tex_005A88" -static const ALIGN_ASSET(2) char ganontika_room_7Tex_005A88[] = dganontika_room_7Tex_005A88; - -#define dganontika_room_7Tex_004288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7Tex_004288" -static const ALIGN_ASSET(2) char ganontika_room_7Tex_004288[] = dganontika_room_7Tex_004288; +#define dganontika_room_7DL_001440 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7DL_001440" +static const ALIGN_ASSET(2) char ganontika_room_7DL_001440[] = dganontika_room_7DL_001440; #define dganontika_room_7DL_002850 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7DL_002850" static const ALIGN_ASSET(2) char ganontika_room_7DL_002850[] = dganontika_room_7DL_002850; -#define dganontika_room_7Tex_005288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7Tex_005288" -static const ALIGN_ASSET(2) char ganontika_room_7Tex_005288[] = dganontika_room_7Tex_005288; - #define dganontika_room_7DL_003048 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7DL_003048" static const ALIGN_ASSET(2) char ganontika_room_7DL_003048[] = dganontika_room_7DL_003048; diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_8.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_8.h index 48ecf77a4..73fde17d6 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_8.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_8.h @@ -3,44 +3,44 @@ #include "align_asset_macro.h" +#define dganontika_room_8Tex_0034B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_0034B8" +static const ALIGN_ASSET(2) char ganontika_room_8Tex_0034B8[] = dganontika_room_8Tex_0034B8; + +#define dganontika_room_8Tex_0044B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_0044B8" +static const ALIGN_ASSET(2) char ganontika_room_8Tex_0044B8[] = dganontika_room_8Tex_0044B8; + +#define dganontika_room_8Tex_0054B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_0054B8" +static const ALIGN_ASSET(2) char ganontika_room_8Tex_0054B8[] = dganontika_room_8Tex_0054B8; + +#define dganontika_room_8Tex_005CB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_005CB8" +static const ALIGN_ASSET(2) char ganontika_room_8Tex_005CB8[] = dganontika_room_8Tex_005CB8; + +#define dganontika_room_8Tex_006CB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_006CB8" +static const ALIGN_ASSET(2) char ganontika_room_8Tex_006CB8[] = dganontika_room_8Tex_006CB8; + +#define dganontika_room_8Tex_0074B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_0074B8" +static const ALIGN_ASSET(2) char ganontika_room_8Tex_0074B8[] = dganontika_room_8Tex_0074B8; + +#define dganontika_room_8Tex_008018 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_008018" +static const ALIGN_ASSET(2) char ganontika_room_8Tex_008018[] = dganontika_room_8Tex_008018; + +#define dganontika_room_8TLUT_003498 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8TLUT_003498" +static const ALIGN_ASSET(2) char ganontika_room_8TLUT_003498[] = dganontika_room_8TLUT_003498; + #define dganontika_room_8DL_002EE8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8DL_002EE8" static const ALIGN_ASSET(2) char ganontika_room_8DL_002EE8[] = dganontika_room_8DL_002EE8; #define dganontika_room_8DL_0030B0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8DL_0030B0" static const ALIGN_ASSET(2) char ganontika_room_8DL_0030B0[] = dganontika_room_8DL_0030B0; -#define dganontika_room_8Tex_0074B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_0074B8" -static const ALIGN_ASSET(2) char ganontika_room_8Tex_0074B8[] = dganontika_room_8Tex_0074B8; - -#define dganontika_room_8TLUT_003498 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8TLUT_003498" -static const ALIGN_ASSET(2) char ganontika_room_8TLUT_003498[] = dganontika_room_8TLUT_003498; - #define dganontika_room_8DL_007EF0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8DL_007EF0" static const ALIGN_ASSET(2) char ganontika_room_8DL_007EF0[] = dganontika_room_8DL_007EF0; -#define dganontika_room_8Tex_008018 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_008018" -static const ALIGN_ASSET(2) char ganontika_room_8Tex_008018[] = dganontika_room_8Tex_008018; - #define dganontika_room_8DL_003360 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8DL_003360" static const ALIGN_ASSET(2) char ganontika_room_8DL_003360[] = dganontika_room_8DL_003360; #define dganontika_room_8DL_001DE0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8DL_001DE0" static const ALIGN_ASSET(2) char ganontika_room_8DL_001DE0[] = dganontika_room_8DL_001DE0; -#define dganontika_room_8Tex_0044B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_0044B8" -static const ALIGN_ASSET(2) char ganontika_room_8Tex_0044B8[] = dganontika_room_8Tex_0044B8; - -#define dganontika_room_8Tex_005CB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_005CB8" -static const ALIGN_ASSET(2) char ganontika_room_8Tex_005CB8[] = dganontika_room_8Tex_005CB8; - -#define dganontika_room_8Tex_0034B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_0034B8" -static const ALIGN_ASSET(2) char ganontika_room_8Tex_0034B8[] = dganontika_room_8Tex_0034B8; - -#define dganontika_room_8Tex_0054B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_0054B8" -static const ALIGN_ASSET(2) char ganontika_room_8Tex_0054B8[] = dganontika_room_8Tex_0054B8; - -#define dganontika_room_8Tex_006CB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_006CB8" -static const ALIGN_ASSET(2) char ganontika_room_8Tex_006CB8[] = dganontika_room_8Tex_006CB8; - #endif // DUNGEONS_GANONTIKA_ROOM_8_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_9.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_9.h index 3dc270cf0..85caf1d9b 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_9.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_9.h @@ -3,8 +3,14 @@ #include "align_asset_macro.h" -#define dganontika_room_9DL_001CF0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9DL_001CF0" -static const ALIGN_ASSET(2) char ganontika_room_9DL_001CF0[] = dganontika_room_9DL_001CF0; +#define dganontika_room_9Tex_005488 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_005488" +static const ALIGN_ASSET(2) char ganontika_room_9Tex_005488[] = dganontika_room_9Tex_005488; + +#define dganontika_room_9Tex_006488 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_006488" +static const ALIGN_ASSET(2) char ganontika_room_9Tex_006488[] = dganontika_room_9Tex_006488; + +#define dganontika_room_9Tex_007488 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_007488" +static const ALIGN_ASSET(2) char ganontika_room_9Tex_007488[] = dganontika_room_9Tex_007488; #define dganontika_room_9Tex_007C88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_007C88" static const ALIGN_ASSET(2) char ganontika_room_9Tex_007C88[] = dganontika_room_9Tex_007C88; @@ -12,6 +18,21 @@ static const ALIGN_ASSET(2) char ganontika_room_9Tex_007C88[] = dganontika_room_ #define dganontika_room_9Tex_007E88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_007E88" static const ALIGN_ASSET(2) char ganontika_room_9Tex_007E88[] = dganontika_room_9Tex_007E88; +#define dganontika_room_9Tex_008688 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_008688" +static const ALIGN_ASSET(2) char ganontika_room_9Tex_008688[] = dganontika_room_9Tex_008688; + +#define dganontika_room_9Tex_008E88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_008E88" +static const ALIGN_ASSET(2) char ganontika_room_9Tex_008E88[] = dganontika_room_9Tex_008E88; + +#define dganontika_room_9Tex_009688 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_009688" +static const ALIGN_ASSET(2) char ganontika_room_9Tex_009688[] = dganontika_room_9Tex_009688; + +#define dganontika_room_9Tex_00A818 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_00A818" +static const ALIGN_ASSET(2) char ganontika_room_9Tex_00A818[] = dganontika_room_9Tex_00A818; + +#define dganontika_room_9DL_001CF0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9DL_001CF0" +static const ALIGN_ASSET(2) char ganontika_room_9DL_001CF0[] = dganontika_room_9DL_001CF0; + #define dganontika_room_9DL_002918 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9DL_002918" static const ALIGN_ASSET(2) char ganontika_room_9DL_002918[] = dganontika_room_9DL_002918; @@ -24,18 +45,9 @@ static const ALIGN_ASSET(2) char ganontika_room_9DL_003B90[] = dganontika_room_9 #define dganontika_room_9DL_0049B0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9DL_0049B0" static const ALIGN_ASSET(2) char ganontika_room_9DL_0049B0[] = dganontika_room_9DL_0049B0; -#define dganontika_room_9Tex_008688 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_008688" -static const ALIGN_ASSET(2) char ganontika_room_9Tex_008688[] = dganontika_room_9Tex_008688; - -#define dganontika_room_9Tex_009688 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_009688" -static const ALIGN_ASSET(2) char ganontika_room_9Tex_009688[] = dganontika_room_9Tex_009688; - #define dganontika_room_9DL_004D80 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9DL_004D80" static const ALIGN_ASSET(2) char ganontika_room_9DL_004D80[] = dganontika_room_9DL_004D80; -#define dganontika_room_9Tex_008E88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_008E88" -static const ALIGN_ASSET(2) char ganontika_room_9Tex_008E88[] = dganontika_room_9Tex_008E88; - #define dganontika_room_9DL_005038 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9DL_005038" static const ALIGN_ASSET(2) char ganontika_room_9DL_005038[] = dganontika_room_9DL_005038; @@ -48,23 +60,11 @@ static const ALIGN_ASSET(2) char ganontika_room_9DL_0012F0[] = dganontika_room_9 #define dganontika_room_9DL_0006E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9DL_0006E0" static const ALIGN_ASSET(2) char ganontika_room_9DL_0006E0[] = dganontika_room_9DL_0006E0; -#define dganontika_room_9Tex_005488 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_005488" -static const ALIGN_ASSET(2) char ganontika_room_9Tex_005488[] = dganontika_room_9Tex_005488; - -#define dganontika_room_9Tex_006488 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_006488" -static const ALIGN_ASSET(2) char ganontika_room_9Tex_006488[] = dganontika_room_9Tex_006488; - -#define dganontika_room_9Tex_007488 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_007488" -static const ALIGN_ASSET(2) char ganontika_room_9Tex_007488[] = dganontika_room_9Tex_007488; - #define dganontika_room_9DL_0003A0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9DL_0003A0" static const ALIGN_ASSET(2) char ganontika_room_9DL_0003A0[] = dganontika_room_9DL_0003A0; #define dganontika_room_9DL_00A750 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9DL_00A750" static const ALIGN_ASSET(2) char ganontika_room_9DL_00A750[] = dganontika_room_9DL_00A750; -#define dganontika_room_9Tex_00A818 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_00A818" -static const ALIGN_ASSET(2) char ganontika_room_9Tex_00A818[] = dganontika_room_9Tex_00A818; - #endif // DUNGEONS_GANONTIKA_ROOM_9_H diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_scene.h b/soh/assets/scenes/dungeons/ganontika/ganontika_scene.h index 7eaf3caed..eac57cbce 100644 --- a/soh/assets/scenes/dungeons/ganontika/ganontika_scene.h +++ b/soh/assets/scenes/dungeons/ganontika/ganontika_scene.h @@ -3,6 +3,24 @@ #include "align_asset_macro.h" +#define dganontika_sceneTex_01F580 "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneTex_01F580" +static const ALIGN_ASSET(2) char ganontika_sceneTex_01F580[] = dganontika_sceneTex_01F580; + +#define dganontika_sceneTex_01F780 "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneTex_01F780" +static const ALIGN_ASSET(2) char ganontika_sceneTex_01F780[] = dganontika_sceneTex_01F780; + +#define dganontika_sceneTex_01FF80 "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneTex_01FF80" +static const ALIGN_ASSET(2) char ganontika_sceneTex_01FF80[] = dganontika_sceneTex_01FF80; + +#define dganontika_sceneTex_020380 "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneTex_020380" +static const ALIGN_ASSET(2) char ganontika_sceneTex_020380[] = dganontika_sceneTex_020380; + +#define dganontika_sceneTex_020B80 "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneTex_020B80" +static const ALIGN_ASSET(2) char ganontika_sceneTex_020B80[] = dganontika_sceneTex_020B80; + +#define dganontika_sceneTLUT_01F380 "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneTLUT_01F380" +static const ALIGN_ASSET(2) char ganontika_sceneTLUT_01F380[] = dganontika_sceneTLUT_01F380; + #define dgForestTrialSageCs "__OTR__scenes/nonmq/ganontika_scene/gForestTrialSageCs" static const ALIGN_ASSET(2) char gForestTrialSageCs[] = dgForestTrialSageCs; @@ -45,22 +63,5 @@ static const ALIGN_ASSET(2) char gShadowBarrierCs[] = dgShadowBarrierCs; #define dganontika_sceneCollisionHeader_019EAC "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneCollisionHeader_019EAC" static const ALIGN_ASSET(2) char ganontika_sceneCollisionHeader_019EAC[] = dganontika_sceneCollisionHeader_019EAC; -#define dganontika_sceneTex_01F780 "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneTex_01F780" -static const ALIGN_ASSET(2) char ganontika_sceneTex_01F780[] = dganontika_sceneTex_01F780; - -#define dganontika_sceneTLUT_01F380 "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneTLUT_01F380" -static const ALIGN_ASSET(2) char ganontika_sceneTLUT_01F380[] = dganontika_sceneTLUT_01F380; - -#define dganontika_sceneTex_020380 "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneTex_020380" -static const ALIGN_ASSET(2) char ganontika_sceneTex_020380[] = dganontika_sceneTex_020380; - -#define dganontika_sceneTex_020B80 "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneTex_020B80" -static const ALIGN_ASSET(2) char ganontika_sceneTex_020B80[] = dganontika_sceneTex_020B80; - -#define dganontika_sceneTex_01F580 "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneTex_01F580" -static const ALIGN_ASSET(2) char ganontika_sceneTex_01F580[] = dganontika_sceneTex_01F580; - -#define dganontika_sceneTex_01FF80 "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneTex_01FF80" -static const ALIGN_ASSET(2) char ganontika_sceneTex_01FF80[] = dganontika_sceneTex_01FF80; #endif // DUNGEONS_GANONTIKA_SCENE_H diff --git a/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_0.h b/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_0.h index da4a8200c..0513a70c0 100644 --- a/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_0.h +++ b/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_0.h @@ -3,65 +3,65 @@ #include "align_asset_macro.h" -#define dganontikasonogo_room_0DL_0091C0 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0DL_0091C0" -static const ALIGN_ASSET(2) char ganontikasonogo_room_0DL_0091C0[] = dganontikasonogo_room_0DL_0091C0; - -#define dganontikasonogo_room_0Tex_00B2D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00B2D8" -static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00B2D8[] = dganontikasonogo_room_0Tex_00B2D8; - -#define dganontikasonogo_room_0Tex_00D2D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00D2D8" -static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00D2D8[] = dganontikasonogo_room_0Tex_00D2D8; - -#define dganontikasonogo_room_0Tex_014AD8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_014AD8" -static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_014AD8[] = dganontikasonogo_room_0Tex_014AD8; - -#define dganontikasonogo_room_0Tex_0142D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0142D8" -static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0142D8[] = dganontikasonogo_room_0Tex_0142D8; - -#define dganontikasonogo_room_0Tex_0132D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0132D8" -static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0132D8[] = dganontikasonogo_room_0Tex_0132D8; - -#define dganontikasonogo_room_0Tex_00F2D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00F2D8" -static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00F2D8[] = dganontikasonogo_room_0Tex_00F2D8; - -#define dganontikasonogo_room_0Tex_00E2D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00E2D8" -static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00E2D8[] = dganontikasonogo_room_0Tex_00E2D8; - -#define dganontikasonogo_room_0Tex_00A2D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00A2D8" -static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00A2D8[] = dganontikasonogo_room_0Tex_00A2D8; - -#define dganontikasonogo_room_0Tex_00FAD8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00FAD8" -static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00FAD8[] = dganontikasonogo_room_0Tex_00FAD8; - -#define dganontikasonogo_room_0Tex_0092D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0092D8" +#define dganontikasonogo_room_0Tex_0092D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0092D8" static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0092D8[] = dganontikasonogo_room_0Tex_0092D8; -#define dganontikasonogo_room_0Tex_012AD8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_012AD8" -static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_012AD8[] = dganontikasonogo_room_0Tex_012AD8; +#define dganontikasonogo_room_0Tex_00A2D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00A2D8" +static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00A2D8[] = dganontikasonogo_room_0Tex_00A2D8; -#define dganontikasonogo_room_0TLUT_0092B8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0TLUT_0092B8" -static const ALIGN_ASSET(2) char ganontikasonogo_room_0TLUT_0092B8[] = dganontikasonogo_room_0TLUT_0092B8; +#define dganontikasonogo_room_0Tex_00B2D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00B2D8" +static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00B2D8[] = dganontikasonogo_room_0Tex_00B2D8; -#define dganontikasonogo_room_0Tex_0122D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0122D8" -static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0122D8[] = dganontikasonogo_room_0Tex_0122D8; - -#define dganontikasonogo_room_0Tex_011AD8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_011AD8" -static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_011AD8[] = dganontikasonogo_room_0Tex_011AD8; - -#define dganontikasonogo_room_0Tex_0112D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0112D8" -static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0112D8[] = dganontikasonogo_room_0Tex_0112D8; - -#define dganontikasonogo_room_0Tex_010AD8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_010AD8" -static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_010AD8[] = dganontikasonogo_room_0Tex_010AD8; - -#define dganontikasonogo_room_0Tex_00C2D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00C2D8" +#define dganontikasonogo_room_0Tex_00C2D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00C2D8" static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00C2D8[] = dganontikasonogo_room_0Tex_00C2D8; -#define dganontikasonogo_room_0DL_016B48 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0DL_016B48" -static const ALIGN_ASSET(2) char ganontikasonogo_room_0DL_016B48[] = dganontikasonogo_room_0DL_016B48; +#define dganontikasonogo_room_0Tex_00D2D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00D2D8" +static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00D2D8[] = dganontikasonogo_room_0Tex_00D2D8; -#define dganontikasonogo_room_0Tex_016B78 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_016B78" +#define dganontikasonogo_room_0Tex_00E2D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00E2D8" +static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00E2D8[] = dganontikasonogo_room_0Tex_00E2D8; + +#define dganontikasonogo_room_0Tex_00F2D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00F2D8" +static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00F2D8[] = dganontikasonogo_room_0Tex_00F2D8; + +#define dganontikasonogo_room_0Tex_00FAD8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00FAD8" +static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00FAD8[] = dganontikasonogo_room_0Tex_00FAD8; + +#define dganontikasonogo_room_0Tex_010AD8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_010AD8" +static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_010AD8[] = dganontikasonogo_room_0Tex_010AD8; + +#define dganontikasonogo_room_0Tex_0112D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0112D8" +static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0112D8[] = dganontikasonogo_room_0Tex_0112D8; + +#define dganontikasonogo_room_0Tex_011AD8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_011AD8" +static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_011AD8[] = dganontikasonogo_room_0Tex_011AD8; + +#define dganontikasonogo_room_0Tex_0122D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0122D8" +static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0122D8[] = dganontikasonogo_room_0Tex_0122D8; + +#define dganontikasonogo_room_0Tex_012AD8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_012AD8" +static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_012AD8[] = dganontikasonogo_room_0Tex_012AD8; + +#define dganontikasonogo_room_0Tex_0132D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0132D8" +static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0132D8[] = dganontikasonogo_room_0Tex_0132D8; + +#define dganontikasonogo_room_0Tex_0142D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0142D8" +static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0142D8[] = dganontikasonogo_room_0Tex_0142D8; + +#define dganontikasonogo_room_0Tex_014AD8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_014AD8" +static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_014AD8[] = dganontikasonogo_room_0Tex_014AD8; + +#define dganontikasonogo_room_0Tex_016B78 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_016B78" static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_016B78[] = dganontikasonogo_room_0Tex_016B78; +#define dganontikasonogo_room_0TLUT_0092B8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0TLUT_0092B8" +static const ALIGN_ASSET(2) char ganontikasonogo_room_0TLUT_0092B8[] = dganontikasonogo_room_0TLUT_0092B8; + +#define dganontikasonogo_room_0DL_0091C0 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0DL_0091C0" +static const ALIGN_ASSET(2) char ganontikasonogo_room_0DL_0091C0[] = dganontikasonogo_room_0DL_0091C0; + +#define dganontikasonogo_room_0DL_016B48 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0DL_016B48" +static const ALIGN_ASSET(2) char ganontikasonogo_room_0DL_016B48[] = dganontikasonogo_room_0DL_016B48; + #endif // DUNGEONS_GANONTIKASONOGO_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_1.h b/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_1.h index 6571799a5..7f2b8d872 100644 --- a/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_1.h +++ b/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_1.h @@ -3,23 +3,23 @@ #include "align_asset_macro.h" -#define dganontikasonogo_room_1DL_006BE8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_1DL_006BE8" -static const ALIGN_ASSET(2) char ganontikasonogo_room_1DL_006BE8[] = dganontikasonogo_room_1DL_006BE8; - -#define dganontikasonogo_room_1Tex_006C60 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_1Tex_006C60" +#define dganontikasonogo_room_1Tex_006C60 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_1Tex_006C60" static const ALIGN_ASSET(2) char ganontikasonogo_room_1Tex_006C60[] = dganontikasonogo_room_1Tex_006C60; -#define dganontikasonogo_room_1Tex_007460 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_1Tex_007460" +#define dganontikasonogo_room_1Tex_007460 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_1Tex_007460" static const ALIGN_ASSET(2) char ganontikasonogo_room_1Tex_007460[] = dganontikasonogo_room_1Tex_007460; -#define dganontikasonogo_room_1Tex_008460 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_1Tex_008460" +#define dganontikasonogo_room_1Tex_008460 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_1Tex_008460" static const ALIGN_ASSET(2) char ganontikasonogo_room_1Tex_008460[] = dganontikasonogo_room_1Tex_008460; -#define dganontikasonogo_room_1DL_009710 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_1DL_009710" -static const ALIGN_ASSET(2) char ganontikasonogo_room_1DL_009710[] = dganontikasonogo_room_1DL_009710; - -#define dganontikasonogo_room_1Tex_009720 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_1Tex_009720" +#define dganontikasonogo_room_1Tex_009720 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_1Tex_009720" static const ALIGN_ASSET(2) char ganontikasonogo_room_1Tex_009720[] = dganontikasonogo_room_1Tex_009720; +#define dganontikasonogo_room_1DL_006BE8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_1DL_006BE8" +static const ALIGN_ASSET(2) char ganontikasonogo_room_1DL_006BE8[] = dganontikasonogo_room_1DL_006BE8; + +#define dganontikasonogo_room_1DL_009710 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_1DL_009710" +static const ALIGN_ASSET(2) char ganontikasonogo_room_1DL_009710[] = dganontikasonogo_room_1DL_009710; + #endif // DUNGEONS_GANONTIKASONOGO_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_scene.h b/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_scene.h index 21f8d1cea..59c7469c4 100644 --- a/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_scene.h +++ b/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_scene.h @@ -3,13 +3,14 @@ #include "align_asset_macro.h" -#define dganontikasonogo_sceneCollisionHeader_002ACC "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_sceneCollisionHeader_002ACC" -static const ALIGN_ASSET(2) char ganontikasonogo_sceneCollisionHeader_002ACC[] = dganontikasonogo_sceneCollisionHeader_002ACC; - -#define dganontikasonogo_sceneTex_002B00 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_sceneTex_002B00" +#define dganontikasonogo_sceneTex_002B00 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_sceneTex_002B00" static const ALIGN_ASSET(2) char ganontikasonogo_sceneTex_002B00[] = dganontikasonogo_sceneTex_002B00; -#define dganontikasonogo_sceneTex_003B00 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_sceneTex_003B00" +#define dganontikasonogo_sceneTex_003B00 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_sceneTex_003B00" static const ALIGN_ASSET(2) char ganontikasonogo_sceneTex_003B00[] = dganontikasonogo_sceneTex_003B00; +#define dganontikasonogo_sceneCollisionHeader_002ACC "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_sceneCollisionHeader_002ACC" +static const ALIGN_ASSET(2) char ganontikasonogo_sceneCollisionHeader_002ACC[] = dganontikasonogo_sceneCollisionHeader_002ACC; + + #endif // DUNGEONS_GANONTIKASONOGO_SCENE_H diff --git a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_0.h b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_0.h index f5d03df17..28d9871c5 100644 --- a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_0.h +++ b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_0.h @@ -3,35 +3,35 @@ #include "align_asset_macro.h" -#define dgerudoway_room_0DL_002B58 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_0DL_002B58" -static const ALIGN_ASSET(2) char gerudoway_room_0DL_002B58[] = dgerudoway_room_0DL_002B58; - -#define dgerudoway_room_0DL_004520 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_0DL_004520" -static const ALIGN_ASSET(2) char gerudoway_room_0DL_004520[] = dgerudoway_room_0DL_004520; - -#define dgerudoway_room_0DL_002E68 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_0DL_002E68" -static const ALIGN_ASSET(2) char gerudoway_room_0DL_002E68[] = dgerudoway_room_0DL_002E68; - -#define dgerudoway_room_0DL_0047A0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_0DL_0047A0" -static const ALIGN_ASSET(2) char gerudoway_room_0DL_0047A0[] = dgerudoway_room_0DL_0047A0; - -#define dgerudoway_room_0DL_004BF8 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_0DL_004BF8" -static const ALIGN_ASSET(2) char gerudoway_room_0DL_004BF8[] = dgerudoway_room_0DL_004BF8; - -#define dgerudoway_room_0DL_002858 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_0DL_002858" -static const ALIGN_ASSET(2) char gerudoway_room_0DL_002858[] = dgerudoway_room_0DL_002858; - -#define dgerudoway_room_0DL_002208 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_0DL_002208" -static const ALIGN_ASSET(2) char gerudoway_room_0DL_002208[] = dgerudoway_room_0DL_002208; - -#define dgerudoway_room_0DL_000E70 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_0DL_000E70" -static const ALIGN_ASSET(2) char gerudoway_room_0DL_000E70[] = dgerudoway_room_0DL_000E70; - -#define dgerudoway_room_0Tex_002FB0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_0Tex_002FB0" +#define dgerudoway_room_0Tex_002FB0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_0Tex_002FB0" static const ALIGN_ASSET(2) char gerudoway_room_0Tex_002FB0[] = dgerudoway_room_0Tex_002FB0; -#define dgerudoway_room_0Tex_003FB0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_0Tex_003FB0" +#define dgerudoway_room_0Tex_003FB0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_0Tex_003FB0" static const ALIGN_ASSET(2) char gerudoway_room_0Tex_003FB0[] = dgerudoway_room_0Tex_003FB0; +#define dgerudoway_room_0DL_002B58 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_0DL_002B58" +static const ALIGN_ASSET(2) char gerudoway_room_0DL_002B58[] = dgerudoway_room_0DL_002B58; + +#define dgerudoway_room_0DL_004520 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_0DL_004520" +static const ALIGN_ASSET(2) char gerudoway_room_0DL_004520[] = dgerudoway_room_0DL_004520; + +#define dgerudoway_room_0DL_002E68 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_0DL_002E68" +static const ALIGN_ASSET(2) char gerudoway_room_0DL_002E68[] = dgerudoway_room_0DL_002E68; + +#define dgerudoway_room_0DL_0047A0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_0DL_0047A0" +static const ALIGN_ASSET(2) char gerudoway_room_0DL_0047A0[] = dgerudoway_room_0DL_0047A0; + +#define dgerudoway_room_0DL_004BF8 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_0DL_004BF8" +static const ALIGN_ASSET(2) char gerudoway_room_0DL_004BF8[] = dgerudoway_room_0DL_004BF8; + +#define dgerudoway_room_0DL_002858 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_0DL_002858" +static const ALIGN_ASSET(2) char gerudoway_room_0DL_002858[] = dgerudoway_room_0DL_002858; + +#define dgerudoway_room_0DL_002208 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_0DL_002208" +static const ALIGN_ASSET(2) char gerudoway_room_0DL_002208[] = dgerudoway_room_0DL_002208; + +#define dgerudoway_room_0DL_000E70 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_0DL_000E70" +static const ALIGN_ASSET(2) char gerudoway_room_0DL_000E70[] = dgerudoway_room_0DL_000E70; + #endif // DUNGEONS_GERUDOWAY_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_1.h b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_1.h index 6fc0b66fd..de48f2161 100644 --- a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_1.h +++ b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_1.h @@ -3,49 +3,49 @@ #include "align_asset_macro.h" -#define dgerudoway_room_1DL_001A60 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1DL_001A60" -static const ALIGN_ASSET(2) char gerudoway_room_1DL_001A60[] = dgerudoway_room_1DL_001A60; - -#define dgerudoway_room_1DL_006C80 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1DL_006C80" -static const ALIGN_ASSET(2) char gerudoway_room_1DL_006C80[] = dgerudoway_room_1DL_006C80; - -#define dgerudoway_room_1DL_001D70 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1DL_001D70" -static const ALIGN_ASSET(2) char gerudoway_room_1DL_001D70[] = dgerudoway_room_1DL_001D70; - -#define dgerudoway_room_1DL_006F00 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1DL_006F00" -static const ALIGN_ASSET(2) char gerudoway_room_1DL_006F00[] = dgerudoway_room_1DL_006F00; - -#define dgerudoway_room_1DL_002EC8 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1DL_002EC8" -static const ALIGN_ASSET(2) char gerudoway_room_1DL_002EC8[] = dgerudoway_room_1DL_002EC8; - -#define dgerudoway_room_1Tex_005710 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1Tex_005710" -static const ALIGN_ASSET(2) char gerudoway_room_1Tex_005710[] = dgerudoway_room_1Tex_005710; - -#define dgerudoway_room_1Tex_003F10 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1Tex_003F10" -static const ALIGN_ASSET(2) char gerudoway_room_1Tex_003F10[] = dgerudoway_room_1Tex_003F10; - -#define dgerudoway_room_1Tex_003710 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1Tex_003710" +#define dgerudoway_room_1Tex_003710 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1Tex_003710" static const ALIGN_ASSET(2) char gerudoway_room_1Tex_003710[] = dgerudoway_room_1Tex_003710; -#define dgerudoway_room_1Tex_004710 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1Tex_004710" +#define dgerudoway_room_1Tex_003F10 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1Tex_003F10" +static const ALIGN_ASSET(2) char gerudoway_room_1Tex_003F10[] = dgerudoway_room_1Tex_003F10; + +#define dgerudoway_room_1Tex_004710 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1Tex_004710" static const ALIGN_ASSET(2) char gerudoway_room_1Tex_004710[] = dgerudoway_room_1Tex_004710; -#define dgerudoway_room_1DL_0071B8 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1DL_0071B8" -static const ALIGN_ASSET(2) char gerudoway_room_1DL_0071B8[] = dgerudoway_room_1DL_0071B8; +#define dgerudoway_room_1Tex_005710 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1Tex_005710" +static const ALIGN_ASSET(2) char gerudoway_room_1Tex_005710[] = dgerudoway_room_1Tex_005710; -#define dgerudoway_room_1DL_001178 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1DL_001178" -static const ALIGN_ASSET(2) char gerudoway_room_1DL_001178[] = dgerudoway_room_1DL_001178; - -#define dgerudoway_room_1DL_001710 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1DL_001710" -static const ALIGN_ASSET(2) char gerudoway_room_1DL_001710[] = dgerudoway_room_1DL_001710; - -#define dgerudoway_room_1Tex_006310 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1Tex_006310" -static const ALIGN_ASSET(2) char gerudoway_room_1Tex_006310[] = dgerudoway_room_1Tex_006310; - -#define dgerudoway_room_1Tex_005B10 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1Tex_005B10" +#define dgerudoway_room_1Tex_005B10 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1Tex_005B10" static const ALIGN_ASSET(2) char gerudoway_room_1Tex_005B10[] = dgerudoway_room_1Tex_005B10; -#define dgerudoway_room_1DL_000B90 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1DL_000B90" +#define dgerudoway_room_1Tex_006310 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1Tex_006310" +static const ALIGN_ASSET(2) char gerudoway_room_1Tex_006310[] = dgerudoway_room_1Tex_006310; + +#define dgerudoway_room_1DL_001A60 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1DL_001A60" +static const ALIGN_ASSET(2) char gerudoway_room_1DL_001A60[] = dgerudoway_room_1DL_001A60; + +#define dgerudoway_room_1DL_006C80 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1DL_006C80" +static const ALIGN_ASSET(2) char gerudoway_room_1DL_006C80[] = dgerudoway_room_1DL_006C80; + +#define dgerudoway_room_1DL_001D70 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1DL_001D70" +static const ALIGN_ASSET(2) char gerudoway_room_1DL_001D70[] = dgerudoway_room_1DL_001D70; + +#define dgerudoway_room_1DL_006F00 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1DL_006F00" +static const ALIGN_ASSET(2) char gerudoway_room_1DL_006F00[] = dgerudoway_room_1DL_006F00; + +#define dgerudoway_room_1DL_002EC8 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1DL_002EC8" +static const ALIGN_ASSET(2) char gerudoway_room_1DL_002EC8[] = dgerudoway_room_1DL_002EC8; + +#define dgerudoway_room_1DL_0071B8 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1DL_0071B8" +static const ALIGN_ASSET(2) char gerudoway_room_1DL_0071B8[] = dgerudoway_room_1DL_0071B8; + +#define dgerudoway_room_1DL_001178 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1DL_001178" +static const ALIGN_ASSET(2) char gerudoway_room_1DL_001178[] = dgerudoway_room_1DL_001178; + +#define dgerudoway_room_1DL_001710 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1DL_001710" +static const ALIGN_ASSET(2) char gerudoway_room_1DL_001710[] = dgerudoway_room_1DL_001710; + +#define dgerudoway_room_1DL_000B90 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1DL_000B90" static const ALIGN_ASSET(2) char gerudoway_room_1DL_000B90[] = dgerudoway_room_1DL_000B90; diff --git a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_2.h b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_2.h index e09531528..74282e458 100644 --- a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_2.h +++ b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_2.h @@ -3,34 +3,34 @@ #include "align_asset_macro.h" -#define dgerudoway_room_2DL_001E40 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_2DL_001E40" -static const ALIGN_ASSET(2) char gerudoway_room_2DL_001E40[] = dgerudoway_room_2DL_001E40; - -#define dgerudoway_room_2DL_003410 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_2DL_003410" -static const ALIGN_ASSET(2) char gerudoway_room_2DL_003410[] = dgerudoway_room_2DL_003410; - -#define dgerudoway_room_2DL_002150 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_2DL_002150" -static const ALIGN_ASSET(2) char gerudoway_room_2DL_002150[] = dgerudoway_room_2DL_002150; - -#define dgerudoway_room_2DL_003690 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_2DL_003690" -static const ALIGN_ASSET(2) char gerudoway_room_2DL_003690[] = dgerudoway_room_2DL_003690; - -#define dgerudoway_room_2DL_003CC8 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_2DL_003CC8" -static const ALIGN_ASSET(2) char gerudoway_room_2DL_003CC8[] = dgerudoway_room_2DL_003CC8; - -#define dgerudoway_room_2DL_001518 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_2DL_001518" -static const ALIGN_ASSET(2) char gerudoway_room_2DL_001518[] = dgerudoway_room_2DL_001518; - -#define dgerudoway_room_2DL_001A98 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_2DL_001A98" -static const ALIGN_ASSET(2) char gerudoway_room_2DL_001A98[] = dgerudoway_room_2DL_001A98; - -#define dgerudoway_room_2Tex_002298 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_2Tex_002298" +#define dgerudoway_room_2Tex_002298 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_2Tex_002298" static const ALIGN_ASSET(2) char gerudoway_room_2Tex_002298[] = dgerudoway_room_2Tex_002298; -#define dgerudoway_room_2Tex_002A98 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_2Tex_002A98" +#define dgerudoway_room_2Tex_002A98 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_2Tex_002A98" static const ALIGN_ASSET(2) char gerudoway_room_2Tex_002A98[] = dgerudoway_room_2Tex_002A98; -#define dgerudoway_room_2DL_000E80 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_2DL_000E80" +#define dgerudoway_room_2DL_001E40 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_2DL_001E40" +static const ALIGN_ASSET(2) char gerudoway_room_2DL_001E40[] = dgerudoway_room_2DL_001E40; + +#define dgerudoway_room_2DL_003410 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_2DL_003410" +static const ALIGN_ASSET(2) char gerudoway_room_2DL_003410[] = dgerudoway_room_2DL_003410; + +#define dgerudoway_room_2DL_002150 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_2DL_002150" +static const ALIGN_ASSET(2) char gerudoway_room_2DL_002150[] = dgerudoway_room_2DL_002150; + +#define dgerudoway_room_2DL_003690 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_2DL_003690" +static const ALIGN_ASSET(2) char gerudoway_room_2DL_003690[] = dgerudoway_room_2DL_003690; + +#define dgerudoway_room_2DL_003CC8 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_2DL_003CC8" +static const ALIGN_ASSET(2) char gerudoway_room_2DL_003CC8[] = dgerudoway_room_2DL_003CC8; + +#define dgerudoway_room_2DL_001518 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_2DL_001518" +static const ALIGN_ASSET(2) char gerudoway_room_2DL_001518[] = dgerudoway_room_2DL_001518; + +#define dgerudoway_room_2DL_001A98 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_2DL_001A98" +static const ALIGN_ASSET(2) char gerudoway_room_2DL_001A98[] = dgerudoway_room_2DL_001A98; + +#define dgerudoway_room_2DL_000E80 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_2DL_000E80" static const ALIGN_ASSET(2) char gerudoway_room_2DL_000E80[] = dgerudoway_room_2DL_000E80; diff --git a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_3.h b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_3.h index 52dbc5537..efce766af 100644 --- a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_3.h +++ b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_3.h @@ -3,58 +3,58 @@ #include "align_asset_macro.h" -#define dgerudoway_room_3DL_005540 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3DL_005540" -static const ALIGN_ASSET(2) char gerudoway_room_3DL_005540[] = dgerudoway_room_3DL_005540; - -#define dgerudoway_room_3Tex_009AA0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3Tex_009AA0" -static const ALIGN_ASSET(2) char gerudoway_room_3Tex_009AA0[] = dgerudoway_room_3Tex_009AA0; - -#define dgerudoway_room_3DL_002BA8 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3DL_002BA8" -static const ALIGN_ASSET(2) char gerudoway_room_3DL_002BA8[] = dgerudoway_room_3DL_002BA8; - -#define dgerudoway_room_3Tex_0076A0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3Tex_0076A0" -static const ALIGN_ASSET(2) char gerudoway_room_3Tex_0076A0[] = dgerudoway_room_3Tex_0076A0; - -#define dgerudoway_room_3DL_00A410 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3DL_00A410" -static const ALIGN_ASSET(2) char gerudoway_room_3DL_00A410[] = dgerudoway_room_3DL_00A410; - -#define dgerudoway_room_3DL_002F28 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3DL_002F28" -static const ALIGN_ASSET(2) char gerudoway_room_3DL_002F28[] = dgerudoway_room_3DL_002F28; - -#define dgerudoway_room_3DL_00A690 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3DL_00A690" -static const ALIGN_ASSET(2) char gerudoway_room_3DL_00A690[] = dgerudoway_room_3DL_00A690; - -#define dgerudoway_room_3DL_006640 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3DL_006640" -static const ALIGN_ASSET(2) char gerudoway_room_3DL_006640[] = dgerudoway_room_3DL_006640; - -#define dgerudoway_room_3Tex_008EA0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3Tex_008EA0" -static const ALIGN_ASSET(2) char gerudoway_room_3Tex_008EA0[] = dgerudoway_room_3Tex_008EA0; - -#define dgerudoway_room_3Tex_007EA0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3Tex_007EA0" -static const ALIGN_ASSET(2) char gerudoway_room_3Tex_007EA0[] = dgerudoway_room_3Tex_007EA0; - -#define dgerudoway_room_3Tex_006EA0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3Tex_006EA0" +#define dgerudoway_room_3Tex_006EA0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3Tex_006EA0" static const ALIGN_ASSET(2) char gerudoway_room_3Tex_006EA0[] = dgerudoway_room_3Tex_006EA0; -#define dgerudoway_room_3DL_00B0E8 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3DL_00B0E8" -static const ALIGN_ASSET(2) char gerudoway_room_3DL_00B0E8[] = dgerudoway_room_3DL_00B0E8; +#define dgerudoway_room_3Tex_0076A0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3Tex_0076A0" +static const ALIGN_ASSET(2) char gerudoway_room_3Tex_0076A0[] = dgerudoway_room_3Tex_0076A0; -#define dgerudoway_room_3DL_002658 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3DL_002658" -static const ALIGN_ASSET(2) char gerudoway_room_3DL_002658[] = dgerudoway_room_3DL_002658; +#define dgerudoway_room_3Tex_007EA0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3Tex_007EA0" +static const ALIGN_ASSET(2) char gerudoway_room_3Tex_007EA0[] = dgerudoway_room_3Tex_007EA0; -#define dgerudoway_room_3DL_005378 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3DL_005378" -static const ALIGN_ASSET(2) char gerudoway_room_3DL_005378[] = dgerudoway_room_3DL_005378; +#define dgerudoway_room_3Tex_008EA0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3Tex_008EA0" +static const ALIGN_ASSET(2) char gerudoway_room_3Tex_008EA0[] = dgerudoway_room_3Tex_008EA0; -#define dgerudoway_room_3Tex_0092A0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3Tex_0092A0" +#define dgerudoway_room_3Tex_0092A0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3Tex_0092A0" static const ALIGN_ASSET(2) char gerudoway_room_3Tex_0092A0[] = dgerudoway_room_3Tex_0092A0; -#define dgerudoway_room_3DL_004EA8 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3DL_004EA8" +#define dgerudoway_room_3Tex_009AA0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3Tex_009AA0" +static const ALIGN_ASSET(2) char gerudoway_room_3Tex_009AA0[] = dgerudoway_room_3Tex_009AA0; + +#define dgerudoway_room_3DL_005540 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3DL_005540" +static const ALIGN_ASSET(2) char gerudoway_room_3DL_005540[] = dgerudoway_room_3DL_005540; + +#define dgerudoway_room_3DL_002BA8 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3DL_002BA8" +static const ALIGN_ASSET(2) char gerudoway_room_3DL_002BA8[] = dgerudoway_room_3DL_002BA8; + +#define dgerudoway_room_3DL_00A410 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3DL_00A410" +static const ALIGN_ASSET(2) char gerudoway_room_3DL_00A410[] = dgerudoway_room_3DL_00A410; + +#define dgerudoway_room_3DL_002F28 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3DL_002F28" +static const ALIGN_ASSET(2) char gerudoway_room_3DL_002F28[] = dgerudoway_room_3DL_002F28; + +#define dgerudoway_room_3DL_00A690 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3DL_00A690" +static const ALIGN_ASSET(2) char gerudoway_room_3DL_00A690[] = dgerudoway_room_3DL_00A690; + +#define dgerudoway_room_3DL_006640 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3DL_006640" +static const ALIGN_ASSET(2) char gerudoway_room_3DL_006640[] = dgerudoway_room_3DL_006640; + +#define dgerudoway_room_3DL_00B0E8 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3DL_00B0E8" +static const ALIGN_ASSET(2) char gerudoway_room_3DL_00B0E8[] = dgerudoway_room_3DL_00B0E8; + +#define dgerudoway_room_3DL_002658 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3DL_002658" +static const ALIGN_ASSET(2) char gerudoway_room_3DL_002658[] = dgerudoway_room_3DL_002658; + +#define dgerudoway_room_3DL_005378 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3DL_005378" +static const ALIGN_ASSET(2) char gerudoway_room_3DL_005378[] = dgerudoway_room_3DL_005378; + +#define dgerudoway_room_3DL_004EA8 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3DL_004EA8" static const ALIGN_ASSET(2) char gerudoway_room_3DL_004EA8[] = dgerudoway_room_3DL_004EA8; -#define dgerudoway_room_3DL_001B70 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3DL_001B70" +#define dgerudoway_room_3DL_001B70 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3DL_001B70" static const ALIGN_ASSET(2) char gerudoway_room_3DL_001B70[] = dgerudoway_room_3DL_001B70; -#define dgerudoway_room_3DL_003E80 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3DL_003E80" +#define dgerudoway_room_3DL_003E80 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3DL_003E80" static const ALIGN_ASSET(2) char gerudoway_room_3DL_003E80[] = dgerudoway_room_3DL_003E80; diff --git a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_4.h b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_4.h index 82e861932..c0ae50eb0 100644 --- a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_4.h +++ b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_4.h @@ -3,34 +3,34 @@ #include "align_asset_macro.h" -#define dgerudoway_room_4DL_001BD0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_4DL_001BD0" -static const ALIGN_ASSET(2) char gerudoway_room_4DL_001BD0[] = dgerudoway_room_4DL_001BD0; - -#define dgerudoway_room_4DL_0031A0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_4DL_0031A0" -static const ALIGN_ASSET(2) char gerudoway_room_4DL_0031A0[] = dgerudoway_room_4DL_0031A0; - -#define dgerudoway_room_4DL_001EE0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_4DL_001EE0" -static const ALIGN_ASSET(2) char gerudoway_room_4DL_001EE0[] = dgerudoway_room_4DL_001EE0; - -#define dgerudoway_room_4DL_003420 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_4DL_003420" -static const ALIGN_ASSET(2) char gerudoway_room_4DL_003420[] = dgerudoway_room_4DL_003420; - -#define dgerudoway_room_4DL_0037F8 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_4DL_0037F8" -static const ALIGN_ASSET(2) char gerudoway_room_4DL_0037F8[] = dgerudoway_room_4DL_0037F8; - -#define dgerudoway_room_4DL_0012E8 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_4DL_0012E8" -static const ALIGN_ASSET(2) char gerudoway_room_4DL_0012E8[] = dgerudoway_room_4DL_0012E8; - -#define dgerudoway_room_4DL_001880 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_4DL_001880" -static const ALIGN_ASSET(2) char gerudoway_room_4DL_001880[] = dgerudoway_room_4DL_001880; - -#define dgerudoway_room_4Tex_002828 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_4Tex_002828" -static const ALIGN_ASSET(2) char gerudoway_room_4Tex_002828[] = dgerudoway_room_4Tex_002828; - -#define dgerudoway_room_4Tex_002028 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_4Tex_002028" +#define dgerudoway_room_4Tex_002028 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_4Tex_002028" static const ALIGN_ASSET(2) char gerudoway_room_4Tex_002028[] = dgerudoway_room_4Tex_002028; -#define dgerudoway_room_4DL_000D10 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_4DL_000D10" +#define dgerudoway_room_4Tex_002828 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_4Tex_002828" +static const ALIGN_ASSET(2) char gerudoway_room_4Tex_002828[] = dgerudoway_room_4Tex_002828; + +#define dgerudoway_room_4DL_001BD0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_4DL_001BD0" +static const ALIGN_ASSET(2) char gerudoway_room_4DL_001BD0[] = dgerudoway_room_4DL_001BD0; + +#define dgerudoway_room_4DL_0031A0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_4DL_0031A0" +static const ALIGN_ASSET(2) char gerudoway_room_4DL_0031A0[] = dgerudoway_room_4DL_0031A0; + +#define dgerudoway_room_4DL_001EE0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_4DL_001EE0" +static const ALIGN_ASSET(2) char gerudoway_room_4DL_001EE0[] = dgerudoway_room_4DL_001EE0; + +#define dgerudoway_room_4DL_003420 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_4DL_003420" +static const ALIGN_ASSET(2) char gerudoway_room_4DL_003420[] = dgerudoway_room_4DL_003420; + +#define dgerudoway_room_4DL_0037F8 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_4DL_0037F8" +static const ALIGN_ASSET(2) char gerudoway_room_4DL_0037F8[] = dgerudoway_room_4DL_0037F8; + +#define dgerudoway_room_4DL_0012E8 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_4DL_0012E8" +static const ALIGN_ASSET(2) char gerudoway_room_4DL_0012E8[] = dgerudoway_room_4DL_0012E8; + +#define dgerudoway_room_4DL_001880 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_4DL_001880" +static const ALIGN_ASSET(2) char gerudoway_room_4DL_001880[] = dgerudoway_room_4DL_001880; + +#define dgerudoway_room_4DL_000D10 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_4DL_000D10" static const ALIGN_ASSET(2) char gerudoway_room_4DL_000D10[] = dgerudoway_room_4DL_000D10; diff --git a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_5.h b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_5.h index 61d5121f8..8e3c6ed3c 100644 --- a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_5.h +++ b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_5.h @@ -3,34 +3,34 @@ #include "align_asset_macro.h" -#define dgerudoway_room_5DL_002BA0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_5DL_002BA0" -static const ALIGN_ASSET(2) char gerudoway_room_5DL_002BA0[] = dgerudoway_room_5DL_002BA0; - -#define dgerudoway_room_5DL_004170 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_5DL_004170" -static const ALIGN_ASSET(2) char gerudoway_room_5DL_004170[] = dgerudoway_room_5DL_004170; - -#define dgerudoway_room_5DL_002EB0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_5DL_002EB0" -static const ALIGN_ASSET(2) char gerudoway_room_5DL_002EB0[] = dgerudoway_room_5DL_002EB0; - -#define dgerudoway_room_5DL_0043F0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_5DL_0043F0" -static const ALIGN_ASSET(2) char gerudoway_room_5DL_0043F0[] = dgerudoway_room_5DL_0043F0; - -#define dgerudoway_room_5DL_004C68 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_5DL_004C68" -static const ALIGN_ASSET(2) char gerudoway_room_5DL_004C68[] = dgerudoway_room_5DL_004C68; - -#define dgerudoway_room_5DL_001DE8 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_5DL_001DE8" -static const ALIGN_ASSET(2) char gerudoway_room_5DL_001DE8[] = dgerudoway_room_5DL_001DE8; - -#define dgerudoway_room_5DL_002770 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_5DL_002770" -static const ALIGN_ASSET(2) char gerudoway_room_5DL_002770[] = dgerudoway_room_5DL_002770; - -#define dgerudoway_room_5Tex_002FF8 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_5Tex_002FF8" +#define dgerudoway_room_5Tex_002FF8 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_5Tex_002FF8" static const ALIGN_ASSET(2) char gerudoway_room_5Tex_002FF8[] = dgerudoway_room_5Tex_002FF8; -#define dgerudoway_room_5Tex_0037F8 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_5Tex_0037F8" +#define dgerudoway_room_5Tex_0037F8 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_5Tex_0037F8" static const ALIGN_ASSET(2) char gerudoway_room_5Tex_0037F8[] = dgerudoway_room_5Tex_0037F8; -#define dgerudoway_room_5DL_0014C0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_5DL_0014C0" +#define dgerudoway_room_5DL_002BA0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_5DL_002BA0" +static const ALIGN_ASSET(2) char gerudoway_room_5DL_002BA0[] = dgerudoway_room_5DL_002BA0; + +#define dgerudoway_room_5DL_004170 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_5DL_004170" +static const ALIGN_ASSET(2) char gerudoway_room_5DL_004170[] = dgerudoway_room_5DL_004170; + +#define dgerudoway_room_5DL_002EB0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_5DL_002EB0" +static const ALIGN_ASSET(2) char gerudoway_room_5DL_002EB0[] = dgerudoway_room_5DL_002EB0; + +#define dgerudoway_room_5DL_0043F0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_5DL_0043F0" +static const ALIGN_ASSET(2) char gerudoway_room_5DL_0043F0[] = dgerudoway_room_5DL_0043F0; + +#define dgerudoway_room_5DL_004C68 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_5DL_004C68" +static const ALIGN_ASSET(2) char gerudoway_room_5DL_004C68[] = dgerudoway_room_5DL_004C68; + +#define dgerudoway_room_5DL_001DE8 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_5DL_001DE8" +static const ALIGN_ASSET(2) char gerudoway_room_5DL_001DE8[] = dgerudoway_room_5DL_001DE8; + +#define dgerudoway_room_5DL_002770 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_5DL_002770" +static const ALIGN_ASSET(2) char gerudoway_room_5DL_002770[] = dgerudoway_room_5DL_002770; + +#define dgerudoway_room_5DL_0014C0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_5DL_0014C0" static const ALIGN_ASSET(2) char gerudoway_room_5DL_0014C0[] = dgerudoway_room_5DL_0014C0; diff --git a/soh/assets/scenes/dungeons/gerudoway/gerudoway_scene.h b/soh/assets/scenes/dungeons/gerudoway/gerudoway_scene.h index 8c4fb7e43..c5f3e3b32 100644 --- a/soh/assets/scenes/dungeons/gerudoway/gerudoway_scene.h +++ b/soh/assets/scenes/dungeons/gerudoway/gerudoway_scene.h @@ -3,40 +3,41 @@ #include "align_asset_macro.h" -#define dgThievesHideoutNightEntranceTex "__OTR__scenes/nonmq/gerudoway_scene/gThievesHideoutNightEntranceTex" -static const ALIGN_ASSET(2) char gThievesHideoutNightEntranceTex[] = dgThievesHideoutNightEntranceTex; - -#define dgThievesHideoutDayEntranceTex "__OTR__scenes/nonmq/gerudoway_scene/gThievesHideoutDayEntranceTex" -static const ALIGN_ASSET(2) char gThievesHideoutDayEntranceTex[] = dgThievesHideoutDayEntranceTex; - -#define dgerudoway_sceneCollisionHeader_0074EC "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneCollisionHeader_0074EC" -static const ALIGN_ASSET(2) char gerudoway_sceneCollisionHeader_0074EC[] = dgerudoway_sceneCollisionHeader_0074EC; - -#define dgerudoway_sceneTex_009D20 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_009D20" -static const ALIGN_ASSET(2) char gerudoway_sceneTex_009D20[] = dgerudoway_sceneTex_009D20; - -#define dgerudoway_sceneTex_00A920 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_00A920" -static const ALIGN_ASSET(2) char gerudoway_sceneTex_00A920[] = dgerudoway_sceneTex_00A920; - -#define dgerudoway_sceneTex_00A520 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_00A520" -static const ALIGN_ASSET(2) char gerudoway_sceneTex_00A520[] = dgerudoway_sceneTex_00A520; - -#define dgerudoway_sceneTex_009520 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_009520" -static const ALIGN_ASSET(2) char gerudoway_sceneTex_009520[] = dgerudoway_sceneTex_009520; - -#define dgerudoway_sceneTex_007520 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_007520" +#define dgerudoway_sceneTex_007520 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_007520" static const ALIGN_ASSET(2) char gerudoway_sceneTex_007520[] = dgerudoway_sceneTex_007520; -#define dgerudoway_sceneTex_008520 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_008520" +#define dgerudoway_sceneTex_008520 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_008520" static const ALIGN_ASSET(2) char gerudoway_sceneTex_008520[] = dgerudoway_sceneTex_008520; -#define dgerudoway_sceneTex_008D20 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_008D20" +#define dgerudoway_sceneTex_008D20 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_008D20" static const ALIGN_ASSET(2) char gerudoway_sceneTex_008D20[] = dgerudoway_sceneTex_008D20; -#define dgerudoway_sceneTex_00D120 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_00D120" -static const ALIGN_ASSET(2) char gerudoway_sceneTex_00D120[] = dgerudoway_sceneTex_00D120; +#define dgerudoway_sceneTex_009520 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_009520" +static const ALIGN_ASSET(2) char gerudoway_sceneTex_009520[] = dgerudoway_sceneTex_009520; -#define dgerudoway_sceneTex_00C120 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_00C120" +#define dgerudoway_sceneTex_009D20 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_009D20" +static const ALIGN_ASSET(2) char gerudoway_sceneTex_009D20[] = dgerudoway_sceneTex_009D20; + +#define dgerudoway_sceneTex_00A520 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_00A520" +static const ALIGN_ASSET(2) char gerudoway_sceneTex_00A520[] = dgerudoway_sceneTex_00A520; + +#define dgerudoway_sceneTex_00A920 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_00A920" +static const ALIGN_ASSET(2) char gerudoway_sceneTex_00A920[] = dgerudoway_sceneTex_00A920; + +#define dgerudoway_sceneTex_00C120 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_00C120" static const ALIGN_ASSET(2) char gerudoway_sceneTex_00C120[] = dgerudoway_sceneTex_00C120; +#define dgerudoway_sceneTex_00D120 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_00D120" +static const ALIGN_ASSET(2) char gerudoway_sceneTex_00D120[] = dgerudoway_sceneTex_00D120; + +#define dgThievesHideoutNightEntranceTex "__OTR__scenes/shared/gerudoway_scene/gThievesHideoutNightEntranceTex" +static const ALIGN_ASSET(2) char gThievesHideoutNightEntranceTex[] = dgThievesHideoutNightEntranceTex; + +#define dgThievesHideoutDayEntranceTex "__OTR__scenes/shared/gerudoway_scene/gThievesHideoutDayEntranceTex" +static const ALIGN_ASSET(2) char gThievesHideoutDayEntranceTex[] = dgThievesHideoutDayEntranceTex; + +#define dgerudoway_sceneCollisionHeader_0074EC "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneCollisionHeader_0074EC" +static const ALIGN_ASSET(2) char gerudoway_sceneCollisionHeader_0074EC[] = dgerudoway_sceneCollisionHeader_0074EC; + + #endif // DUNGEONS_GERUDOWAY_SCENE_H diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_0.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_0.h index 7147f7c32..a7701640a 100644 --- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_0.h +++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_0.h @@ -3,30 +3,30 @@ #include "align_asset_macro.h" -#define dice_doukutu_room_0DL_002F20 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0DL_002F20" -static const ALIGN_ASSET(2) char ice_doukutu_room_0DL_002F20[] = dice_doukutu_room_0DL_002F20; - -#define dice_doukutu_room_0Tex_005750 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0Tex_005750" -static const ALIGN_ASSET(2) char ice_doukutu_room_0Tex_005750[] = dice_doukutu_room_0Tex_005750; - -#define dice_doukutu_room_0Tex_004750 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0Tex_004750" -static const ALIGN_ASSET(2) char ice_doukutu_room_0Tex_004750[] = dice_doukutu_room_0Tex_004750; +#define dice_doukutu_room_0Tex_002F50 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0Tex_002F50" +static const ALIGN_ASSET(2) char ice_doukutu_room_0Tex_002F50[] = dice_doukutu_room_0Tex_002F50; #define dice_doukutu_room_0Tex_003F50 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0Tex_003F50" static const ALIGN_ASSET(2) char ice_doukutu_room_0Tex_003F50[] = dice_doukutu_room_0Tex_003F50; -#define dice_doukutu_room_0Tex_002F50 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0Tex_002F50" -static const ALIGN_ASSET(2) char ice_doukutu_room_0Tex_002F50[] = dice_doukutu_room_0Tex_002F50; +#define dice_doukutu_room_0Tex_004750 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0Tex_004750" +static const ALIGN_ASSET(2) char ice_doukutu_room_0Tex_004750[] = dice_doukutu_room_0Tex_004750; + +#define dice_doukutu_room_0Tex_005750 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0Tex_005750" +static const ALIGN_ASSET(2) char ice_doukutu_room_0Tex_005750[] = dice_doukutu_room_0Tex_005750; #define dice_doukutu_room_0Tex_005F50 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0Tex_005F50" static const ALIGN_ASSET(2) char ice_doukutu_room_0Tex_005F50[] = dice_doukutu_room_0Tex_005F50; -#define dice_doukutu_room_0DL_007660 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0DL_007660" -static const ALIGN_ASSET(2) char ice_doukutu_room_0DL_007660[] = dice_doukutu_room_0DL_007660; - #define dice_doukutu_room_0Tex_007678 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0Tex_007678" static const ALIGN_ASSET(2) char ice_doukutu_room_0Tex_007678[] = dice_doukutu_room_0Tex_007678; +#define dice_doukutu_room_0DL_002F20 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0DL_002F20" +static const ALIGN_ASSET(2) char ice_doukutu_room_0DL_002F20[] = dice_doukutu_room_0DL_002F20; + +#define dice_doukutu_room_0DL_007660 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0DL_007660" +static const ALIGN_ASSET(2) char ice_doukutu_room_0DL_007660[] = dice_doukutu_room_0DL_007660; + #define dice_doukutu_room_0Set_000100DL_002F20 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0Set_000100DL_002F20" static const ALIGN_ASSET(2) char ice_doukutu_room_0Set_000100DL_002F20[] = dice_doukutu_room_0Set_000100DL_002F20; diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_1.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_1.h index 4a4b3b00c..5eec36392 100644 --- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_1.h +++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_1.h @@ -3,41 +3,41 @@ #include "align_asset_macro.h" -#define dice_doukutu_room_1DL_0040D8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1DL_0040D8" -static const ALIGN_ASSET(2) char ice_doukutu_room_1DL_0040D8[] = dice_doukutu_room_1DL_0040D8; - #define dice_doukutu_room_1Tex_004110 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_004110" static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_004110[] = dice_doukutu_room_1Tex_004110; -#define dice_doukutu_room_1Tex_006910 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_006910" -static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_006910[] = dice_doukutu_room_1Tex_006910; - -#define dice_doukutu_room_1Tex_005910 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_005910" -static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_005910[] = dice_doukutu_room_1Tex_005910; - #define dice_doukutu_room_1Tex_005110 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_005110" static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_005110[] = dice_doukutu_room_1Tex_005110; -#define dice_doukutu_room_1Tex_008110 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_008110" -static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_008110[] = dice_doukutu_room_1Tex_008110; +#define dice_doukutu_room_1Tex_005910 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_005910" +static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_005910[] = dice_doukutu_room_1Tex_005910; + +#define dice_doukutu_room_1Tex_006910 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_006910" +static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_006910[] = dice_doukutu_room_1Tex_006910; #define dice_doukutu_room_1Tex_007110 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_007110" static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_007110[] = dice_doukutu_room_1Tex_007110; +#define dice_doukutu_room_1Tex_008110 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_008110" +static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_008110[] = dice_doukutu_room_1Tex_008110; + #define dice_doukutu_room_1Tex_009110 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_009110" static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_009110[] = dice_doukutu_room_1Tex_009110; -#define dice_doukutu_room_1DL_00AB10 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1DL_00AB10" -static const ALIGN_ASSET(2) char ice_doukutu_room_1DL_00AB10[] = dice_doukutu_room_1DL_00AB10; - #define dice_doukutu_room_1Tex_00AB30 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_00AB30" static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_00AB30[] = dice_doukutu_room_1Tex_00AB30; +#define dice_doukutu_room_1Tex_00BB30 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_00BB30" +static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_00BB30[] = dice_doukutu_room_1Tex_00BB30; + #define dice_doukutu_room_1Tex_00BD30 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_00BD30" static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_00BD30[] = dice_doukutu_room_1Tex_00BD30; -#define dice_doukutu_room_1Tex_00BB30 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_00BB30" -static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_00BB30[] = dice_doukutu_room_1Tex_00BB30; +#define dice_doukutu_room_1DL_0040D8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1DL_0040D8" +static const ALIGN_ASSET(2) char ice_doukutu_room_1DL_0040D8[] = dice_doukutu_room_1DL_0040D8; + +#define dice_doukutu_room_1DL_00AB10 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1DL_00AB10" +static const ALIGN_ASSET(2) char ice_doukutu_room_1DL_00AB10[] = dice_doukutu_room_1DL_00AB10; #define dice_doukutu_room_1Set_000160DL_0040D8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Set_000160DL_0040D8" static const ALIGN_ASSET(2) char ice_doukutu_room_1Set_000160DL_0040D8[] = dice_doukutu_room_1Set_000160DL_0040D8; diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_10.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_10.h index 71d2a6df2..55bfe89ee 100644 --- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_10.h +++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_10.h @@ -3,21 +3,21 @@ #include "align_asset_macro.h" -#define dice_doukutu_room_10DL_0019F8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_10DL_0019F8" -static const ALIGN_ASSET(2) char ice_doukutu_room_10DL_0019F8[] = dice_doukutu_room_10DL_0019F8; - #define dice_doukutu_room_10Tex_001A28 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_10Tex_001A28" static const ALIGN_ASSET(2) char ice_doukutu_room_10Tex_001A28[] = dice_doukutu_room_10Tex_001A28; #define dice_doukutu_room_10Tex_002A28 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_10Tex_002A28" static const ALIGN_ASSET(2) char ice_doukutu_room_10Tex_002A28[] = dice_doukutu_room_10Tex_002A28; -#define dice_doukutu_room_10DL_003BC8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_10DL_003BC8" -static const ALIGN_ASSET(2) char ice_doukutu_room_10DL_003BC8[] = dice_doukutu_room_10DL_003BC8; - #define dice_doukutu_room_10Tex_003BD8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_10Tex_003BD8" static const ALIGN_ASSET(2) char ice_doukutu_room_10Tex_003BD8[] = dice_doukutu_room_10Tex_003BD8; +#define dice_doukutu_room_10DL_0019F8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_10DL_0019F8" +static const ALIGN_ASSET(2) char ice_doukutu_room_10DL_0019F8[] = dice_doukutu_room_10DL_0019F8; + +#define dice_doukutu_room_10DL_003BC8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_10DL_003BC8" +static const ALIGN_ASSET(2) char ice_doukutu_room_10DL_003BC8[] = dice_doukutu_room_10DL_003BC8; + #define dice_doukutu_room_10Set_000090DL_0019F8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_10Set_000090DL_0019F8" static const ALIGN_ASSET(2) char ice_doukutu_room_10Set_000090DL_0019F8[] = dice_doukutu_room_10Set_000090DL_0019F8; diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_11.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_11.h index 1238986e9..067303c85 100644 --- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_11.h +++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_11.h @@ -3,24 +3,24 @@ #include "align_asset_macro.h" -#define dice_doukutu_room_11DL_0028F8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_11DL_0028F8" -static const ALIGN_ASSET(2) char ice_doukutu_room_11DL_0028F8[] = dice_doukutu_room_11DL_0028F8; - #define dice_doukutu_room_11Tex_002928 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_11Tex_002928" static const ALIGN_ASSET(2) char ice_doukutu_room_11Tex_002928[] = dice_doukutu_room_11Tex_002928; -#define dice_doukutu_room_11Tex_003928 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_11Tex_003928" -static const ALIGN_ASSET(2) char ice_doukutu_room_11Tex_003928[] = dice_doukutu_room_11Tex_003928; - #define dice_doukutu_room_11Tex_003128 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_11Tex_003128" static const ALIGN_ASSET(2) char ice_doukutu_room_11Tex_003128[] = dice_doukutu_room_11Tex_003128; -#define dice_doukutu_room_11DL_004838 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_11DL_004838" -static const ALIGN_ASSET(2) char ice_doukutu_room_11DL_004838[] = dice_doukutu_room_11DL_004838; +#define dice_doukutu_room_11Tex_003928 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_11Tex_003928" +static const ALIGN_ASSET(2) char ice_doukutu_room_11Tex_003928[] = dice_doukutu_room_11Tex_003928; #define dice_doukutu_room_11Tex_004848 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_11Tex_004848" static const ALIGN_ASSET(2) char ice_doukutu_room_11Tex_004848[] = dice_doukutu_room_11Tex_004848; +#define dice_doukutu_room_11DL_0028F8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_11DL_0028F8" +static const ALIGN_ASSET(2) char ice_doukutu_room_11DL_0028F8[] = dice_doukutu_room_11DL_0028F8; + +#define dice_doukutu_room_11DL_004838 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_11DL_004838" +static const ALIGN_ASSET(2) char ice_doukutu_room_11DL_004838[] = dice_doukutu_room_11DL_004838; + #define dice_doukutu_room_11Set_0001B0DL_0028F8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_11Set_0001B0DL_0028F8" static const ALIGN_ASSET(2) char ice_doukutu_room_11Set_0001B0DL_0028F8[] = dice_doukutu_room_11Set_0001B0DL_0028F8; diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_2.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_2.h index 7bc990964..e6207e499 100644 --- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_2.h +++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_2.h @@ -3,24 +3,24 @@ #include "align_asset_macro.h" -#define dice_doukutu_room_2DL_001700 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_2DL_001700" -static const ALIGN_ASSET(2) char ice_doukutu_room_2DL_001700[] = dice_doukutu_room_2DL_001700; - #define dice_doukutu_room_2Tex_001730 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_2Tex_001730" static const ALIGN_ASSET(2) char ice_doukutu_room_2Tex_001730[] = dice_doukutu_room_2Tex_001730; #define dice_doukutu_room_2Tex_002730 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_2Tex_002730" static const ALIGN_ASSET(2) char ice_doukutu_room_2Tex_002730[] = dice_doukutu_room_2Tex_002730; -#define dice_doukutu_room_2DL_003AD8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_2DL_003AD8" -static const ALIGN_ASSET(2) char ice_doukutu_room_2DL_003AD8[] = dice_doukutu_room_2DL_003AD8; - #define dice_doukutu_room_2Tex_003AF8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_2Tex_003AF8" static const ALIGN_ASSET(2) char ice_doukutu_room_2Tex_003AF8[] = dice_doukutu_room_2Tex_003AF8; #define dice_doukutu_room_2Tex_004AF8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_2Tex_004AF8" static const ALIGN_ASSET(2) char ice_doukutu_room_2Tex_004AF8[] = dice_doukutu_room_2Tex_004AF8; +#define dice_doukutu_room_2DL_001700 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_2DL_001700" +static const ALIGN_ASSET(2) char ice_doukutu_room_2DL_001700[] = dice_doukutu_room_2DL_001700; + +#define dice_doukutu_room_2DL_003AD8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_2DL_003AD8" +static const ALIGN_ASSET(2) char ice_doukutu_room_2DL_003AD8[] = dice_doukutu_room_2DL_003AD8; + #define dice_doukutu_room_2Set_000100DL_001700 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_2Set_000100DL_001700" static const ALIGN_ASSET(2) char ice_doukutu_room_2Set_000100DL_001700[] = dice_doukutu_room_2Set_000100DL_001700; diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_3.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_3.h index 28ae55028..05e30d376 100644 --- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_3.h +++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_3.h @@ -3,20 +3,11 @@ #include "align_asset_macro.h" -#define dice_doukutu_room_3DL_0031D8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_3DL_0031D8" -static const ALIGN_ASSET(2) char ice_doukutu_room_3DL_0031D8[] = dice_doukutu_room_3DL_0031D8; - -#define dice_doukutu_room_3Tex_003A08 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_3Tex_003A08" -static const ALIGN_ASSET(2) char ice_doukutu_room_3Tex_003A08[] = dice_doukutu_room_3Tex_003A08; - #define dice_doukutu_room_3Tex_003208 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_3Tex_003208" static const ALIGN_ASSET(2) char ice_doukutu_room_3Tex_003208[] = dice_doukutu_room_3Tex_003208; -#define dice_doukutu_room_3DL_005070 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_3DL_005070" -static const ALIGN_ASSET(2) char ice_doukutu_room_3DL_005070[] = dice_doukutu_room_3DL_005070; - -#define dice_doukutu_room_3Tex_007090 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_3Tex_007090" -static const ALIGN_ASSET(2) char ice_doukutu_room_3Tex_007090[] = dice_doukutu_room_3Tex_007090; +#define dice_doukutu_room_3Tex_003A08 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_3Tex_003A08" +static const ALIGN_ASSET(2) char ice_doukutu_room_3Tex_003A08[] = dice_doukutu_room_3Tex_003A08; #define dice_doukutu_room_3Tex_005090 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_3Tex_005090" static const ALIGN_ASSET(2) char ice_doukutu_room_3Tex_005090[] = dice_doukutu_room_3Tex_005090; @@ -24,6 +15,15 @@ static const ALIGN_ASSET(2) char ice_doukutu_room_3Tex_005090[] = dice_doukutu_r #define dice_doukutu_room_3Tex_006090 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_3Tex_006090" static const ALIGN_ASSET(2) char ice_doukutu_room_3Tex_006090[] = dice_doukutu_room_3Tex_006090; +#define dice_doukutu_room_3Tex_007090 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_3Tex_007090" +static const ALIGN_ASSET(2) char ice_doukutu_room_3Tex_007090[] = dice_doukutu_room_3Tex_007090; + +#define dice_doukutu_room_3DL_0031D8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_3DL_0031D8" +static const ALIGN_ASSET(2) char ice_doukutu_room_3DL_0031D8[] = dice_doukutu_room_3DL_0031D8; + +#define dice_doukutu_room_3DL_005070 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_3DL_005070" +static const ALIGN_ASSET(2) char ice_doukutu_room_3DL_005070[] = dice_doukutu_room_3DL_005070; + #define dice_doukutu_room_3Set_0001D0DL_0031D8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_3Set_0001D0DL_0031D8" static const ALIGN_ASSET(2) char ice_doukutu_room_3Set_0001D0DL_0031D8[] = dice_doukutu_room_3Set_0001D0DL_0031D8; diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_4.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_4.h index c9f1badc9..d40198b48 100644 --- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_4.h +++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_4.h @@ -3,30 +3,30 @@ #include "align_asset_macro.h" -#define dice_doukutu_room_4DL_0028B8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4DL_0028B8" -static const ALIGN_ASSET(2) char ice_doukutu_room_4DL_0028B8[] = dice_doukutu_room_4DL_0028B8; - #define dice_doukutu_room_4Tex_0028E0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4Tex_0028E0" static const ALIGN_ASSET(2) char ice_doukutu_room_4Tex_0028E0[] = dice_doukutu_room_4Tex_0028E0; -#define dice_doukutu_room_4Tex_0038E0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4Tex_0038E0" -static const ALIGN_ASSET(2) char ice_doukutu_room_4Tex_0038E0[] = dice_doukutu_room_4Tex_0038E0; - #define dice_doukutu_room_4Tex_0030E0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4Tex_0030E0" static const ALIGN_ASSET(2) char ice_doukutu_room_4Tex_0030E0[] = dice_doukutu_room_4Tex_0030E0; -#define dice_doukutu_room_4DL_004638 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4DL_004638" -static const ALIGN_ASSET(2) char ice_doukutu_room_4DL_004638[] = dice_doukutu_room_4DL_004638; - -#define dice_doukutu_room_4Tex_005650 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4Tex_005650" -static const ALIGN_ASSET(2) char ice_doukutu_room_4Tex_005650[] = dice_doukutu_room_4Tex_005650; +#define dice_doukutu_room_4Tex_0038E0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4Tex_0038E0" +static const ALIGN_ASSET(2) char ice_doukutu_room_4Tex_0038E0[] = dice_doukutu_room_4Tex_0038E0; #define dice_doukutu_room_4Tex_004650 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4Tex_004650" static const ALIGN_ASSET(2) char ice_doukutu_room_4Tex_004650[] = dice_doukutu_room_4Tex_004650; +#define dice_doukutu_room_4Tex_005650 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4Tex_005650" +static const ALIGN_ASSET(2) char ice_doukutu_room_4Tex_005650[] = dice_doukutu_room_4Tex_005650; + #define dice_doukutu_room_4Tex_006650 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4Tex_006650" static const ALIGN_ASSET(2) char ice_doukutu_room_4Tex_006650[] = dice_doukutu_room_4Tex_006650; +#define dice_doukutu_room_4DL_0028B8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4DL_0028B8" +static const ALIGN_ASSET(2) char ice_doukutu_room_4DL_0028B8[] = dice_doukutu_room_4DL_0028B8; + +#define dice_doukutu_room_4DL_004638 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4DL_004638" +static const ALIGN_ASSET(2) char ice_doukutu_room_4DL_004638[] = dice_doukutu_room_4DL_004638; + #define dice_doukutu_room_4Set_0000F0DL_0028B8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4Set_0000F0DL_0028B8" static const ALIGN_ASSET(2) char ice_doukutu_room_4Set_0000F0DL_0028B8[] = dice_doukutu_room_4Set_0000F0DL_0028B8; diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_5.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_5.h index f0388b36f..613916c9b 100644 --- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_5.h +++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_5.h @@ -3,23 +3,17 @@ #include "align_asset_macro.h" -#define dice_doukutu_room_5DL_004618 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_5DL_004618" -static const ALIGN_ASSET(2) char ice_doukutu_room_5DL_004618[] = dice_doukutu_room_5DL_004618; - #define dice_doukutu_room_5Tex_004648 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_5Tex_004648" static const ALIGN_ASSET(2) char ice_doukutu_room_5Tex_004648[] = dice_doukutu_room_5Tex_004648; -#define dice_doukutu_room_5Tex_006648 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_5Tex_006648" -static const ALIGN_ASSET(2) char ice_doukutu_room_5Tex_006648[] = dice_doukutu_room_5Tex_006648; - #define dice_doukutu_room_5Tex_005648 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_5Tex_005648" static const ALIGN_ASSET(2) char ice_doukutu_room_5Tex_005648[] = dice_doukutu_room_5Tex_005648; #define dice_doukutu_room_5Tex_005E48 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_5Tex_005E48" static const ALIGN_ASSET(2) char ice_doukutu_room_5Tex_005E48[] = dice_doukutu_room_5Tex_005E48; -#define dice_doukutu_room_5DL_007460 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_5DL_007460" -static const ALIGN_ASSET(2) char ice_doukutu_room_5DL_007460[] = dice_doukutu_room_5DL_007460; +#define dice_doukutu_room_5Tex_006648 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_5Tex_006648" +static const ALIGN_ASSET(2) char ice_doukutu_room_5Tex_006648[] = dice_doukutu_room_5Tex_006648; #define dice_doukutu_room_5Tex_007478 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_5Tex_007478" static const ALIGN_ASSET(2) char ice_doukutu_room_5Tex_007478[] = dice_doukutu_room_5Tex_007478; @@ -27,6 +21,12 @@ static const ALIGN_ASSET(2) char ice_doukutu_room_5Tex_007478[] = dice_doukutu_r #define dice_doukutu_room_5Tex_007878 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_5Tex_007878" static const ALIGN_ASSET(2) char ice_doukutu_room_5Tex_007878[] = dice_doukutu_room_5Tex_007878; +#define dice_doukutu_room_5DL_004618 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_5DL_004618" +static const ALIGN_ASSET(2) char ice_doukutu_room_5DL_004618[] = dice_doukutu_room_5DL_004618; + +#define dice_doukutu_room_5DL_007460 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_5DL_007460" +static const ALIGN_ASSET(2) char ice_doukutu_room_5DL_007460[] = dice_doukutu_room_5DL_007460; + #define dice_doukutu_room_5Set_0001C0DL_004618 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_5Set_0001C0DL_004618" static const ALIGN_ASSET(2) char ice_doukutu_room_5Set_0001C0DL_004618[] = dice_doukutu_room_5Set_0001C0DL_004618; diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_6.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_6.h index 7f0f897e4..4ad43b0ad 100644 --- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_6.h +++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_6.h @@ -3,14 +3,14 @@ #include "align_asset_macro.h" -#define dice_doukutu_room_6DL_002980 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_6DL_002980" -static const ALIGN_ASSET(2) char ice_doukutu_room_6DL_002980[] = dice_doukutu_room_6DL_002980; +#define dice_doukutu_room_6Tex_0029B0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_6Tex_0029B0" +static const ALIGN_ASSET(2) char ice_doukutu_room_6Tex_0029B0[] = dice_doukutu_room_6Tex_0029B0; #define dice_doukutu_room_6Tex_0039B0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_6Tex_0039B0" static const ALIGN_ASSET(2) char ice_doukutu_room_6Tex_0039B0[] = dice_doukutu_room_6Tex_0039B0; -#define dice_doukutu_room_6Tex_0029B0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_6Tex_0029B0" -static const ALIGN_ASSET(2) char ice_doukutu_room_6Tex_0029B0[] = dice_doukutu_room_6Tex_0029B0; +#define dice_doukutu_room_6DL_002980 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_6DL_002980" +static const ALIGN_ASSET(2) char ice_doukutu_room_6DL_002980[] = dice_doukutu_room_6DL_002980; #define dice_doukutu_room_6Set_000110DL_002980 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_6Set_000110DL_002980" static const ALIGN_ASSET(2) char ice_doukutu_room_6Set_000110DL_002980[] = dice_doukutu_room_6Set_000110DL_002980; diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_7.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_7.h index f11032e37..c089cbb75 100644 --- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_7.h +++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_7.h @@ -3,21 +3,21 @@ #include "align_asset_macro.h" -#define dice_doukutu_room_7DL_001730 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_7DL_001730" -static const ALIGN_ASSET(2) char ice_doukutu_room_7DL_001730[] = dice_doukutu_room_7DL_001730; - #define dice_doukutu_room_7Tex_001758 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_7Tex_001758" static const ALIGN_ASSET(2) char ice_doukutu_room_7Tex_001758[] = dice_doukutu_room_7Tex_001758; -#define dice_doukutu_room_7DL_0040A8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_7DL_0040A8" -static const ALIGN_ASSET(2) char ice_doukutu_room_7DL_0040A8[] = dice_doukutu_room_7DL_0040A8; - #define dice_doukutu_room_7Tex_0040E8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_7Tex_0040E8" static const ALIGN_ASSET(2) char ice_doukutu_room_7Tex_0040E8[] = dice_doukutu_room_7Tex_0040E8; #define dice_doukutu_room_7Tex_0050E8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_7Tex_0050E8" static const ALIGN_ASSET(2) char ice_doukutu_room_7Tex_0050E8[] = dice_doukutu_room_7Tex_0050E8; +#define dice_doukutu_room_7DL_001730 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_7DL_001730" +static const ALIGN_ASSET(2) char ice_doukutu_room_7DL_001730[] = dice_doukutu_room_7DL_001730; + +#define dice_doukutu_room_7DL_0040A8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_7DL_0040A8" +static const ALIGN_ASSET(2) char ice_doukutu_room_7DL_0040A8[] = dice_doukutu_room_7DL_0040A8; + #define dice_doukutu_room_7Set_0000D0DL_001730 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_7Set_0000D0DL_001730" static const ALIGN_ASSET(2) char ice_doukutu_room_7Set_0000D0DL_001730[] = dice_doukutu_room_7Set_0000D0DL_001730; diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_9.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_9.h index 7a106f565..717ba4885 100644 --- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_9.h +++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_9.h @@ -3,30 +3,30 @@ #include "align_asset_macro.h" -#define dice_doukutu_room_9DL_004468 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9DL_004468" -static const ALIGN_ASSET(2) char ice_doukutu_room_9DL_004468[] = dice_doukutu_room_9DL_004468; - -#define dice_doukutu_room_9Tex_005CA0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9Tex_005CA0" -static const ALIGN_ASSET(2) char ice_doukutu_room_9Tex_005CA0[] = dice_doukutu_room_9Tex_005CA0; - -#define dice_doukutu_room_9Tex_006CA0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9Tex_006CA0" -static const ALIGN_ASSET(2) char ice_doukutu_room_9Tex_006CA0[] = dice_doukutu_room_9Tex_006CA0; - #define dice_doukutu_room_9Tex_0044A0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9Tex_0044A0" static const ALIGN_ASSET(2) char ice_doukutu_room_9Tex_0044A0[] = dice_doukutu_room_9Tex_0044A0; #define dice_doukutu_room_9Tex_0054A0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9Tex_0054A0" static const ALIGN_ASSET(2) char ice_doukutu_room_9Tex_0054A0[] = dice_doukutu_room_9Tex_0054A0; +#define dice_doukutu_room_9Tex_005CA0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9Tex_005CA0" +static const ALIGN_ASSET(2) char ice_doukutu_room_9Tex_005CA0[] = dice_doukutu_room_9Tex_005CA0; + #define dice_doukutu_room_9Tex_0064A0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9Tex_0064A0" static const ALIGN_ASSET(2) char ice_doukutu_room_9Tex_0064A0[] = dice_doukutu_room_9Tex_0064A0; -#define dice_doukutu_room_9DL_007680 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9DL_007680" -static const ALIGN_ASSET(2) char ice_doukutu_room_9DL_007680[] = dice_doukutu_room_9DL_007680; +#define dice_doukutu_room_9Tex_006CA0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9Tex_006CA0" +static const ALIGN_ASSET(2) char ice_doukutu_room_9Tex_006CA0[] = dice_doukutu_room_9Tex_006CA0; #define dice_doukutu_room_9Tex_007690 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9Tex_007690" static const ALIGN_ASSET(2) char ice_doukutu_room_9Tex_007690[] = dice_doukutu_room_9Tex_007690; +#define dice_doukutu_room_9DL_004468 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9DL_004468" +static const ALIGN_ASSET(2) char ice_doukutu_room_9DL_004468[] = dice_doukutu_room_9DL_004468; + +#define dice_doukutu_room_9DL_007680 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9DL_007680" +static const ALIGN_ASSET(2) char ice_doukutu_room_9DL_007680[] = dice_doukutu_room_9DL_007680; + #define dice_doukutu_room_9Set_0001D0DL_004468 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9Set_0001D0DL_004468" static const ALIGN_ASSET(2) char ice_doukutu_room_9Set_0001D0DL_004468[] = dice_doukutu_room_9Set_0001D0DL_004468; diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h index e012f232e..37b5d5bca 100644 --- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h +++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h @@ -3,6 +3,24 @@ #include "align_asset_macro.h" +#define dice_doukutu_sceneTex_00FCC0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneTex_00FCC0" +static const ALIGN_ASSET(2) char ice_doukutu_sceneTex_00FCC0[] = dice_doukutu_sceneTex_00FCC0; + +#define dice_doukutu_sceneTex_0100C0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneTex_0100C0" +static const ALIGN_ASSET(2) char ice_doukutu_sceneTex_0100C0[] = dice_doukutu_sceneTex_0100C0; + +#define dice_doukutu_sceneTex_0108C0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneTex_0108C0" +static const ALIGN_ASSET(2) char ice_doukutu_sceneTex_0108C0[] = dice_doukutu_sceneTex_0108C0; + +#define dice_doukutu_sceneTex_010AC0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneTex_010AC0" +static const ALIGN_ASSET(2) char ice_doukutu_sceneTex_010AC0[] = dice_doukutu_sceneTex_010AC0; + +#define dice_doukutu_sceneTex_010EC0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneTex_010EC0" +static const ALIGN_ASSET(2) char ice_doukutu_sceneTex_010EC0[] = dice_doukutu_sceneTex_010EC0; + +#define dice_doukutu_sceneTLUT_00F8A0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneTLUT_00F8A0" +static const ALIGN_ASSET(2) char ice_doukutu_sceneTLUT_00F8A0[] = dice_doukutu_sceneTLUT_00F8A0; + #define dgIceCavernSerenadeCs "__OTR__scenes/nonmq/ice_doukutu_scene/gIceCavernSerenadeCs" static const ALIGN_ASSET(2) char gIceCavernSerenadeCs[] = dgIceCavernSerenadeCs; @@ -15,24 +33,6 @@ static const ALIGN_ASSET(2) char gIceCavernDayEntranceTex[] = dgIceCavernDayEntr #define dice_doukutu_sceneCollisionHeader_00F668 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneCollisionHeader_00F668" static const ALIGN_ASSET(2) char ice_doukutu_sceneCollisionHeader_00F668[] = dice_doukutu_sceneCollisionHeader_00F668; -#define dice_doukutu_sceneTex_010AC0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneTex_010AC0" -static const ALIGN_ASSET(2) char ice_doukutu_sceneTex_010AC0[] = dice_doukutu_sceneTex_010AC0; - -#define dice_doukutu_sceneTex_00FCC0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneTex_00FCC0" -static const ALIGN_ASSET(2) char ice_doukutu_sceneTex_00FCC0[] = dice_doukutu_sceneTex_00FCC0; - -#define dice_doukutu_sceneTex_0100C0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneTex_0100C0" -static const ALIGN_ASSET(2) char ice_doukutu_sceneTex_0100C0[] = dice_doukutu_sceneTex_0100C0; - -#define dice_doukutu_sceneTex_0108C0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneTex_0108C0" -static const ALIGN_ASSET(2) char ice_doukutu_sceneTex_0108C0[] = dice_doukutu_sceneTex_0108C0; - -#define dice_doukutu_sceneTex_010EC0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneTex_010EC0" -static const ALIGN_ASSET(2) char ice_doukutu_sceneTex_010EC0[] = dice_doukutu_sceneTex_010EC0; - -#define dice_doukutu_sceneTLUT_00F8A0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneTLUT_00F8A0" -static const ALIGN_ASSET(2) char ice_doukutu_sceneTLUT_00F8A0[] = dice_doukutu_sceneTLUT_00F8A0; - #define dice_doukutu_sceneCollisionHeader_00F668 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneCollisionHeader_00F668" diff --git a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_0.h b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_0.h index eb4913db8..804cb8980 100644 --- a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_0.h +++ b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_0.h @@ -3,19 +3,19 @@ #include "align_asset_macro.h" -#define djyasinboss_room_0DL_0007B0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_0DL_0007B0" -static const ALIGN_ASSET(2) char jyasinboss_room_0DL_0007B0[] = djyasinboss_room_0DL_0007B0; - -#define djyasinboss_room_0Tex_0007C8 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_0Tex_0007C8" +#define djyasinboss_room_0Tex_0007C8 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_0Tex_0007C8" static const ALIGN_ASSET(2) char jyasinboss_room_0Tex_0007C8[] = djyasinboss_room_0Tex_0007C8; -#define djyasinboss_room_0Set_000080DL_0007B0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_0Set_000080DL_0007B0" +#define djyasinboss_room_0DL_0007B0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_0DL_0007B0" +static const ALIGN_ASSET(2) char jyasinboss_room_0DL_0007B0[] = djyasinboss_room_0DL_0007B0; + +#define djyasinboss_room_0Set_000080DL_0007B0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_0Set_000080DL_0007B0" static const ALIGN_ASSET(2) char jyasinboss_room_0Set_000080DL_0007B0[] = djyasinboss_room_0Set_000080DL_0007B0; -#define djyasinboss_room_0Set_0000C0DL_0007B0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_0Set_0000C0DL_0007B0" +#define djyasinboss_room_0Set_0000C0DL_0007B0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_0Set_0000C0DL_0007B0" static const ALIGN_ASSET(2) char jyasinboss_room_0Set_0000C0DL_0007B0[] = djyasinboss_room_0Set_0000C0DL_0007B0; -#define djyasinboss_room_0Set_000100DL_0007B0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_0Set_000100DL_0007B0" +#define djyasinboss_room_0Set_000100DL_0007B0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_0Set_000100DL_0007B0" static const ALIGN_ASSET(2) char jyasinboss_room_0Set_000100DL_0007B0[] = djyasinboss_room_0Set_000100DL_0007B0; diff --git a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_1.h b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_1.h index 54aa427bf..2ff5ed5a3 100644 --- a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_1.h +++ b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_1.h @@ -3,40 +3,40 @@ #include "align_asset_macro.h" -#define djyasinboss_room_1DL_002DD0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_1DL_002DD0" -static const ALIGN_ASSET(2) char jyasinboss_room_1DL_002DD0[] = djyasinboss_room_1DL_002DD0; - -#define djyasinboss_room_1Tex_006638 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_1Tex_006638" -static const ALIGN_ASSET(2) char jyasinboss_room_1Tex_006638[] = djyasinboss_room_1Tex_006638; - -#define djyasinboss_room_1Tex_007638 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_1Tex_007638" -static const ALIGN_ASSET(2) char jyasinboss_room_1Tex_007638[] = djyasinboss_room_1Tex_007638; - -#define djyasinboss_room_1Tex_002E38 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_1Tex_002E38" +#define djyasinboss_room_1Tex_002E38 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_1Tex_002E38" static const ALIGN_ASSET(2) char jyasinboss_room_1Tex_002E38[] = djyasinboss_room_1Tex_002E38; -#define djyasinboss_room_1Tex_006E38 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_1Tex_006E38" -static const ALIGN_ASSET(2) char jyasinboss_room_1Tex_006E38[] = djyasinboss_room_1Tex_006E38; - -#define djyasinboss_room_1TLUT_002E18 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_1TLUT_002E18" -static const ALIGN_ASSET(2) char jyasinboss_room_1TLUT_002E18[] = djyasinboss_room_1TLUT_002E18; - -#define djyasinboss_room_1Tex_005638 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_1Tex_005638" -static const ALIGN_ASSET(2) char jyasinboss_room_1Tex_005638[] = djyasinboss_room_1Tex_005638; - -#define djyasinboss_room_1Tex_004E38 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_1Tex_004E38" -static const ALIGN_ASSET(2) char jyasinboss_room_1Tex_004E38[] = djyasinboss_room_1Tex_004E38; - -#define djyasinboss_room_1Tex_003E38 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_1Tex_003E38" +#define djyasinboss_room_1Tex_003E38 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_1Tex_003E38" static const ALIGN_ASSET(2) char jyasinboss_room_1Tex_003E38[] = djyasinboss_room_1Tex_003E38; -#define djyasinboss_room_1Set_0001B0DL_002DD0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_1Set_0001B0DL_002DD0" +#define djyasinboss_room_1Tex_004E38 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_1Tex_004E38" +static const ALIGN_ASSET(2) char jyasinboss_room_1Tex_004E38[] = djyasinboss_room_1Tex_004E38; + +#define djyasinboss_room_1Tex_005638 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_1Tex_005638" +static const ALIGN_ASSET(2) char jyasinboss_room_1Tex_005638[] = djyasinboss_room_1Tex_005638; + +#define djyasinboss_room_1Tex_006638 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_1Tex_006638" +static const ALIGN_ASSET(2) char jyasinboss_room_1Tex_006638[] = djyasinboss_room_1Tex_006638; + +#define djyasinboss_room_1Tex_006E38 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_1Tex_006E38" +static const ALIGN_ASSET(2) char jyasinboss_room_1Tex_006E38[] = djyasinboss_room_1Tex_006E38; + +#define djyasinboss_room_1Tex_007638 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_1Tex_007638" +static const ALIGN_ASSET(2) char jyasinboss_room_1Tex_007638[] = djyasinboss_room_1Tex_007638; + +#define djyasinboss_room_1TLUT_002E18 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_1TLUT_002E18" +static const ALIGN_ASSET(2) char jyasinboss_room_1TLUT_002E18[] = djyasinboss_room_1TLUT_002E18; + +#define djyasinboss_room_1DL_002DD0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_1DL_002DD0" +static const ALIGN_ASSET(2) char jyasinboss_room_1DL_002DD0[] = djyasinboss_room_1DL_002DD0; + +#define djyasinboss_room_1Set_0001B0DL_002DD0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_1Set_0001B0DL_002DD0" static const ALIGN_ASSET(2) char jyasinboss_room_1Set_0001B0DL_002DD0[] = djyasinboss_room_1Set_0001B0DL_002DD0; -#define djyasinboss_room_1Set_000320DL_002DD0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_1Set_000320DL_002DD0" +#define djyasinboss_room_1Set_000320DL_002DD0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_1Set_000320DL_002DD0" static const ALIGN_ASSET(2) char jyasinboss_room_1Set_000320DL_002DD0[] = djyasinboss_room_1Set_000320DL_002DD0; -#define djyasinboss_room_1Set_000490DL_002DD0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_1Set_000490DL_002DD0" +#define djyasinboss_room_1Set_000490DL_002DD0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_1Set_000490DL_002DD0" static const ALIGN_ASSET(2) char jyasinboss_room_1Set_000490DL_002DD0[] = djyasinboss_room_1Set_000490DL_002DD0; diff --git a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_2.h b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_2.h index 3f4dbd064..0aeb1947f 100644 --- a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_2.h +++ b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_2.h @@ -3,25 +3,25 @@ #include "align_asset_macro.h" -#define djyasinboss_room_2DL_0021A0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_2DL_0021A0" -static const ALIGN_ASSET(2) char jyasinboss_room_2DL_0021A0[] = djyasinboss_room_2DL_0021A0; - -#define djyasinboss_room_2Tex_0021C0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_2Tex_0021C0" +#define djyasinboss_room_2Tex_0021C0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_2Tex_0021C0" static const ALIGN_ASSET(2) char jyasinboss_room_2Tex_0021C0[] = djyasinboss_room_2Tex_0021C0; -#define djyasinboss_room_2Tex_0029C0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_2Tex_0029C0" +#define djyasinboss_room_2Tex_0029C0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_2Tex_0029C0" static const ALIGN_ASSET(2) char jyasinboss_room_2Tex_0029C0[] = djyasinboss_room_2Tex_0029C0; -#define djyasinboss_room_2Tex_0039C0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_2Tex_0039C0" +#define djyasinboss_room_2Tex_0039C0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_2Tex_0039C0" static const ALIGN_ASSET(2) char jyasinboss_room_2Tex_0039C0[] = djyasinboss_room_2Tex_0039C0; -#define djyasinboss_room_2Set_0000F0DL_0021A0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_2Set_0000F0DL_0021A0" +#define djyasinboss_room_2DL_0021A0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_2DL_0021A0" +static const ALIGN_ASSET(2) char jyasinboss_room_2DL_0021A0[] = djyasinboss_room_2DL_0021A0; + +#define djyasinboss_room_2Set_0000F0DL_0021A0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_2Set_0000F0DL_0021A0" static const ALIGN_ASSET(2) char jyasinboss_room_2Set_0000F0DL_0021A0[] = djyasinboss_room_2Set_0000F0DL_0021A0; -#define djyasinboss_room_2Set_000130DL_0021A0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_2Set_000130DL_0021A0" +#define djyasinboss_room_2Set_000130DL_0021A0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_2Set_000130DL_0021A0" static const ALIGN_ASSET(2) char jyasinboss_room_2Set_000130DL_0021A0[] = djyasinboss_room_2Set_000130DL_0021A0; -#define djyasinboss_room_2Set_000170DL_0021A0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_2Set_000170DL_0021A0" +#define djyasinboss_room_2Set_000170DL_0021A0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_2Set_000170DL_0021A0" static const ALIGN_ASSET(2) char jyasinboss_room_2Set_000170DL_0021A0[] = djyasinboss_room_2Set_000170DL_0021A0; diff --git a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_3.h b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_3.h index da3f66804..f4ae3cf1d 100644 --- a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_3.h +++ b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_3.h @@ -3,64 +3,64 @@ #include "align_asset_macro.h" -#define djyasinboss_room_3DL_003C88 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3DL_003C88" -static const ALIGN_ASSET(2) char jyasinboss_room_3DL_003C88[] = djyasinboss_room_3DL_003C88; - -#define djyasinboss_room_3Tex_007F00 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_007F00" -static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_007F00[] = djyasinboss_room_3Tex_007F00; - -#define djyasinboss_room_3Tex_008F00 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_008F00" -static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_008F00[] = djyasinboss_room_3Tex_008F00; - -#define djyasinboss_room_3Tex_009F00 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_009F00" -static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_009F00[] = djyasinboss_room_3Tex_009F00; - -#define djyasinboss_room_3TLUT_003EE0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3TLUT_003EE0" -static const ALIGN_ASSET(2) char jyasinboss_room_3TLUT_003EE0[] = djyasinboss_room_3TLUT_003EE0; - -#define djyasinboss_room_3Tex_00A700 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_00A700" -static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_00A700[] = djyasinboss_room_3Tex_00A700; - -#define djyasinboss_room_3Tex_00AF00 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_00AF00" -static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_00AF00[] = djyasinboss_room_3Tex_00AF00; - -#define djyasinboss_room_3Tex_007700 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_007700" -static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_007700[] = djyasinboss_room_3Tex_007700; - -#define djyasinboss_room_3Tex_006700 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_006700" -static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_006700[] = djyasinboss_room_3Tex_006700; - -#define djyasinboss_room_3Tex_005700 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_005700" -static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_005700[] = djyasinboss_room_3Tex_005700; - -#define djyasinboss_room_3TLUT_003CE0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3TLUT_003CE0" -static const ALIGN_ASSET(2) char jyasinboss_room_3TLUT_003CE0[] = djyasinboss_room_3TLUT_003CE0; - -#define djyasinboss_room_3Tex_004700 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_004700" -static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_004700[] = djyasinboss_room_3Tex_004700; - -#define djyasinboss_room_3Tex_004F00 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_004F00" -static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_004F00[] = djyasinboss_room_3Tex_004F00; - -#define djyasinboss_room_3Tex_003F00 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_003F00" +#define djyasinboss_room_3Tex_003F00 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_003F00" static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_003F00[] = djyasinboss_room_3Tex_003F00; -#define djyasinboss_room_3Tex_005300 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_005300" -static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_005300[] = djyasinboss_room_3Tex_005300; - -#define djyasinboss_room_3Tex_004300 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_004300" +#define djyasinboss_room_3Tex_004300 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_004300" static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_004300[] = djyasinboss_room_3Tex_004300; -#define djyasinboss_room_3Tex_005F00 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_005F00" +#define djyasinboss_room_3Tex_004700 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_004700" +static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_004700[] = djyasinboss_room_3Tex_004700; + +#define djyasinboss_room_3Tex_004F00 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_004F00" +static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_004F00[] = djyasinboss_room_3Tex_004F00; + +#define djyasinboss_room_3Tex_005300 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_005300" +static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_005300[] = djyasinboss_room_3Tex_005300; + +#define djyasinboss_room_3Tex_005700 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_005700" +static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_005700[] = djyasinboss_room_3Tex_005700; + +#define djyasinboss_room_3Tex_005F00 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_005F00" static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_005F00[] = djyasinboss_room_3Tex_005F00; -#define djyasinboss_room_3Set_0000A0DL_003C88 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Set_0000A0DL_003C88" +#define djyasinboss_room_3Tex_006700 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_006700" +static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_006700[] = djyasinboss_room_3Tex_006700; + +#define djyasinboss_room_3Tex_007700 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_007700" +static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_007700[] = djyasinboss_room_3Tex_007700; + +#define djyasinboss_room_3Tex_007F00 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_007F00" +static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_007F00[] = djyasinboss_room_3Tex_007F00; + +#define djyasinboss_room_3Tex_008F00 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_008F00" +static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_008F00[] = djyasinboss_room_3Tex_008F00; + +#define djyasinboss_room_3Tex_009F00 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_009F00" +static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_009F00[] = djyasinboss_room_3Tex_009F00; + +#define djyasinboss_room_3Tex_00A700 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_00A700" +static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_00A700[] = djyasinboss_room_3Tex_00A700; + +#define djyasinboss_room_3Tex_00AF00 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_00AF00" +static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_00AF00[] = djyasinboss_room_3Tex_00AF00; + +#define djyasinboss_room_3TLUT_003CE0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3TLUT_003CE0" +static const ALIGN_ASSET(2) char jyasinboss_room_3TLUT_003CE0[] = djyasinboss_room_3TLUT_003CE0; + +#define djyasinboss_room_3TLUT_003EE0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3TLUT_003EE0" +static const ALIGN_ASSET(2) char jyasinboss_room_3TLUT_003EE0[] = djyasinboss_room_3TLUT_003EE0; + +#define djyasinboss_room_3DL_003C88 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3DL_003C88" +static const ALIGN_ASSET(2) char jyasinboss_room_3DL_003C88[] = djyasinboss_room_3DL_003C88; + +#define djyasinboss_room_3Set_0000A0DL_003C88 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Set_0000A0DL_003C88" static const ALIGN_ASSET(2) char jyasinboss_room_3Set_0000A0DL_003C88[] = djyasinboss_room_3Set_0000A0DL_003C88; -#define djyasinboss_room_3Set_000100DL_003C88 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Set_000100DL_003C88" +#define djyasinboss_room_3Set_000100DL_003C88 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Set_000100DL_003C88" static const ALIGN_ASSET(2) char jyasinboss_room_3Set_000100DL_003C88[] = djyasinboss_room_3Set_000100DL_003C88; -#define djyasinboss_room_3Set_000160DL_003C88 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Set_000160DL_003C88" +#define djyasinboss_room_3Set_000160DL_003C88 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Set_000160DL_003C88" static const ALIGN_ASSET(2) char jyasinboss_room_3Set_000160DL_003C88[] = djyasinboss_room_3Set_000160DL_003C88; diff --git a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_scene.h b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_scene.h index a7a1c0aca..5af788597 100644 --- a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_scene.h +++ b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_scene.h @@ -3,26 +3,26 @@ #include "align_asset_macro.h" -#define dgSpiritBossNabooruKnuckleIntroCs "__OTR__scenes/nonmq/jyasinboss_scene/gSpiritBossNabooruKnuckleIntroCs" -static const ALIGN_ASSET(2) char gSpiritBossNabooruKnuckleIntroCs[] = dgSpiritBossNabooruKnuckleIntroCs; - -#define dgSpiritBossNabooruKnuckleDefeatCs "__OTR__scenes/nonmq/jyasinboss_scene/gSpiritBossNabooruKnuckleDefeatCs" -static const ALIGN_ASSET(2) char gSpiritBossNabooruKnuckleDefeatCs[] = dgSpiritBossNabooruKnuckleDefeatCs; - -#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80" -static const ALIGN_ASSET(2) char jyasinboss_sceneCollisionHeader_002B80[] = djyasinboss_sceneCollisionHeader_002B80; - -#define djyasinboss_sceneTex_007CF0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_sceneTex_007CF0" -static const ALIGN_ASSET(2) char jyasinboss_sceneTex_007CF0[] = djyasinboss_sceneTex_007CF0; - -#define djyasinboss_sceneTex_006CF0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_sceneTex_006CF0" +#define djyasinboss_sceneTex_006CF0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_sceneTex_006CF0" static const ALIGN_ASSET(2) char jyasinboss_sceneTex_006CF0[] = djyasinboss_sceneTex_006CF0; -#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80" +#define djyasinboss_sceneTex_007CF0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_sceneTex_007CF0" +static const ALIGN_ASSET(2) char jyasinboss_sceneTex_007CF0[] = djyasinboss_sceneTex_007CF0; -#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80" +#define dgSpiritBossNabooruKnuckleIntroCs "__OTR__scenes/shared/jyasinboss_scene/gSpiritBossNabooruKnuckleIntroCs" +static const ALIGN_ASSET(2) char gSpiritBossNabooruKnuckleIntroCs[] = dgSpiritBossNabooruKnuckleIntroCs; -#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80" +#define dgSpiritBossNabooruKnuckleDefeatCs "__OTR__scenes/shared/jyasinboss_scene/gSpiritBossNabooruKnuckleDefeatCs" +static const ALIGN_ASSET(2) char gSpiritBossNabooruKnuckleDefeatCs[] = dgSpiritBossNabooruKnuckleDefeatCs; + +#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80" +static const ALIGN_ASSET(2) char jyasinboss_sceneCollisionHeader_002B80[] = djyasinboss_sceneCollisionHeader_002B80; + +#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80" + +#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80" + +#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80" #endif // DUNGEONS_JYASINBOSS_SCENE_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_0.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_0.h index e00ddd7da..85f2f40c4 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_0.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_0.h @@ -3,38 +3,50 @@ #include "align_asset_macro.h" -#define djyasinzou_room_0DL_004820 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_004820" -static const ALIGN_ASSET(2) char jyasinzou_room_0DL_004820[] = djyasinzou_room_0DL_004820; - -#define djyasinzou_room_0Tex_00C9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00C9D8" -static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00C9D8[] = djyasinzou_room_0Tex_00C9D8; - -#define djyasinzou_room_0Tex_00F9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00F9D8" -static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00F9D8[] = djyasinzou_room_0Tex_00F9D8; - -#define djyasinzou_room_0Tex_00DDD8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00DDD8" -static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00DDD8[] = djyasinzou_room_0Tex_00DDD8; - -#define djyasinzou_room_0Tex_00E9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00E9D8" -static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00E9D8[] = djyasinzou_room_0Tex_00E9D8; - -#define djyasinzou_room_0Tex_00E1D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00E1D8" -static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00E1D8[] = djyasinzou_room_0Tex_00E1D8; - -#define djyasinzou_room_0Tex_00D5D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00D5D8" -static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00D5D8[] = djyasinzou_room_0Tex_00D5D8; +#define djyasinzou_room_0Tex_00A9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00A9D8" +static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00A9D8[] = djyasinzou_room_0Tex_00A9D8; #define djyasinzou_room_0Tex_00B1D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00B1D8" static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00B1D8[] = djyasinzou_room_0Tex_00B1D8; -#define djyasinzou_room_0DL_005CB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_005CB0" -static const ALIGN_ASSET(2) char jyasinzou_room_0DL_005CB0[] = djyasinzou_room_0DL_005CB0; +#define djyasinzou_room_0Tex_00B9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00B9D8" +static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00B9D8[] = djyasinzou_room_0Tex_00B9D8; #define djyasinzou_room_0Tex_00C1D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00C1D8" static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00C1D8[] = djyasinzou_room_0Tex_00C1D8; -#define djyasinzou_room_0Tex_00B9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00B9D8" -static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00B9D8[] = djyasinzou_room_0Tex_00B9D8; +#define djyasinzou_room_0Tex_00C9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00C9D8" +static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00C9D8[] = djyasinzou_room_0Tex_00C9D8; + +#define djyasinzou_room_0Tex_00D1D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00D1D8" +static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00D1D8[] = djyasinzou_room_0Tex_00D1D8; + +#define djyasinzou_room_0Tex_00D5D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00D5D8" +static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00D5D8[] = djyasinzou_room_0Tex_00D5D8; + +#define djyasinzou_room_0Tex_00DDD8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00DDD8" +static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00DDD8[] = djyasinzou_room_0Tex_00DDD8; + +#define djyasinzou_room_0Tex_00E1D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00E1D8" +static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00E1D8[] = djyasinzou_room_0Tex_00E1D8; + +#define djyasinzou_room_0Tex_00E9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00E9D8" +static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00E9D8[] = djyasinzou_room_0Tex_00E9D8; + +#define djyasinzou_room_0Tex_00F1D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00F1D8" +static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00F1D8[] = djyasinzou_room_0Tex_00F1D8; + +#define djyasinzou_room_0Tex_00F9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00F9D8" +static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00F9D8[] = djyasinzou_room_0Tex_00F9D8; + +#define djyasinzou_room_0Tex_0107E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_0107E8" +static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_0107E8[] = djyasinzou_room_0Tex_0107E8; + +#define djyasinzou_room_0DL_004820 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_004820" +static const ALIGN_ASSET(2) char jyasinzou_room_0DL_004820[] = djyasinzou_room_0DL_004820; + +#define djyasinzou_room_0DL_005CB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_005CB0" +static const ALIGN_ASSET(2) char jyasinzou_room_0DL_005CB0[] = djyasinzou_room_0DL_005CB0; #define djyasinzou_room_0DL_007248 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_007248" static const ALIGN_ASSET(2) char jyasinzou_room_0DL_007248[] = djyasinzou_room_0DL_007248; @@ -51,9 +63,6 @@ static const ALIGN_ASSET(2) char jyasinzou_room_0DL_008200[] = djyasinzou_room_0 #define djyasinzou_room_0DL_008AE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_008AE0" static const ALIGN_ASSET(2) char jyasinzou_room_0DL_008AE0[] = djyasinzou_room_0DL_008AE0; -#define djyasinzou_room_0Tex_00A9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00A9D8" -static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00A9D8[] = djyasinzou_room_0Tex_00A9D8; - #define djyasinzou_room_0DL_006768 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_006768" static const ALIGN_ASSET(2) char jyasinzou_room_0DL_006768[] = djyasinzou_room_0DL_006768; @@ -66,18 +75,9 @@ static const ALIGN_ASSET(2) char jyasinzou_room_0DL_009A08[] = djyasinzou_room_0 #define djyasinzou_room_0DL_0030A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_0030A0" static const ALIGN_ASSET(2) char jyasinzou_room_0DL_0030A0[] = djyasinzou_room_0DL_0030A0; -#define djyasinzou_room_0Tex_00D1D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00D1D8" -static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00D1D8[] = djyasinzou_room_0Tex_00D1D8; - -#define djyasinzou_room_0Tex_00F1D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00F1D8" -static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00F1D8[] = djyasinzou_room_0Tex_00F1D8; - #define djyasinzou_room_0DL_010468 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_010468" static const ALIGN_ASSET(2) char jyasinzou_room_0DL_010468[] = djyasinzou_room_0DL_010468; -#define djyasinzou_room_0Tex_0107E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_0107E8" -static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_0107E8[] = djyasinzou_room_0Tex_0107E8; - #define djyasinzou_room_0DL_00A2B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_00A2B0" static const ALIGN_ASSET(2) char jyasinzou_room_0DL_00A2B0[] = djyasinzou_room_0DL_00A2B0; diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_1.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_1.h index 4b62b8fc0..a18e2e255 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_1.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_1.h @@ -3,20 +3,8 @@ #include "align_asset_macro.h" -#define djyasinzou_room_1DL_0003E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1DL_0003E0" -static const ALIGN_ASSET(2) char jyasinzou_room_1DL_0003E0[] = djyasinzou_room_1DL_0003E0; - -#define djyasinzou_room_1Tex_007348 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_007348" -static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_007348[] = djyasinzou_room_1Tex_007348; - -#define djyasinzou_room_1DL_0025E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1DL_0025E8" -static const ALIGN_ASSET(2) char jyasinzou_room_1DL_0025E8[] = djyasinzou_room_1DL_0025E8; - -#define djyasinzou_room_1Tex_006748 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_006748" -static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_006748[] = djyasinzou_room_1Tex_006748; - -#define djyasinzou_room_1Tex_008B48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_008B48" -static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_008B48[] = djyasinzou_room_1Tex_008B48; +#define djyasinzou_room_1Tex_004F48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_004F48" +static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_004F48[] = djyasinzou_room_1Tex_004F48; #define djyasinzou_room_1Tex_005748 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_005748" static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_005748[] = djyasinzou_room_1Tex_005748; @@ -24,23 +12,35 @@ static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_005748[] = djyasinzou_room_ #define djyasinzou_room_1Tex_005F48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_005F48" static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_005F48[] = djyasinzou_room_1Tex_005F48; -#define djyasinzou_room_1Tex_007B48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_007B48" -static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_007B48[] = djyasinzou_room_1Tex_007B48; +#define djyasinzou_room_1Tex_006748 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_006748" +static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_006748[] = djyasinzou_room_1Tex_006748; #define djyasinzou_room_1Tex_006B48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_006B48" static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_006B48[] = djyasinzou_room_1Tex_006B48; +#define djyasinzou_room_1Tex_007348 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_007348" +static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_007348[] = djyasinzou_room_1Tex_007348; + +#define djyasinzou_room_1Tex_007B48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_007B48" +static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_007B48[] = djyasinzou_room_1Tex_007B48; + #define djyasinzou_room_1Tex_008348 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_008348" static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_008348[] = djyasinzou_room_1Tex_008348; +#define djyasinzou_room_1Tex_008B48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_008B48" +static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_008B48[] = djyasinzou_room_1Tex_008B48; + +#define djyasinzou_room_1DL_0003E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1DL_0003E0" +static const ALIGN_ASSET(2) char jyasinzou_room_1DL_0003E0[] = djyasinzou_room_1DL_0003E0; + +#define djyasinzou_room_1DL_0025E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1DL_0025E8" +static const ALIGN_ASSET(2) char jyasinzou_room_1DL_0025E8[] = djyasinzou_room_1DL_0025E8; + #define djyasinzou_room_1DL_0045E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1DL_0045E8" static const ALIGN_ASSET(2) char jyasinzou_room_1DL_0045E8[] = djyasinzou_room_1DL_0045E8; #define djyasinzou_room_1DL_004D50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1DL_004D50" static const ALIGN_ASSET(2) char jyasinzou_room_1DL_004D50[] = djyasinzou_room_1DL_004D50; -#define djyasinzou_room_1Tex_004F48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_004F48" -static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_004F48[] = djyasinzou_room_1Tex_004F48; - #endif // DUNGEONS_JYASINZOU_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_10.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_10.h index 74e3a8898..98ecf178c 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_10.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_10.h @@ -3,17 +3,8 @@ #include "align_asset_macro.h" -#define djyasinzou_room_10DL_000460 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_000460" -static const ALIGN_ASSET(2) char jyasinzou_room_10DL_000460[] = djyasinzou_room_10DL_000460; - -#define djyasinzou_room_10Tex_0051A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0051A0" -static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0051A0[] = djyasinzou_room_10Tex_0051A0; - -#define djyasinzou_room_10DL_0008F8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_0008F8" -static const ALIGN_ASSET(2) char jyasinzou_room_10DL_0008F8[] = djyasinzou_room_10DL_0008F8; - -#define djyasinzou_room_10Tex_007DA0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_007DA0" -static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_007DA0[] = djyasinzou_room_10Tex_007DA0; +#define djyasinzou_room_10Tex_0031A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0031A0" +static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0031A0[] = djyasinzou_room_10Tex_0031A0; #define djyasinzou_room_10Tex_0041A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0041A0" static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0041A0[] = djyasinzou_room_10Tex_0041A0; @@ -21,30 +12,45 @@ static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0041A0[] = djyasinzou_room #define djyasinzou_room_10Tex_0049A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0049A0" static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0049A0[] = djyasinzou_room_10Tex_0049A0; -#define djyasinzou_room_10DL_002DE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_002DE0" -static const ALIGN_ASSET(2) char jyasinzou_room_10DL_002DE0[] = djyasinzou_room_10DL_002DE0; +#define djyasinzou_room_10Tex_0051A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0051A0" +static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0051A0[] = djyasinzou_room_10Tex_0051A0; -#define djyasinzou_room_10Tex_0079A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0079A0" -static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0079A0[] = djyasinzou_room_10Tex_0079A0; +#define djyasinzou_room_10Tex_0059A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0059A0" +static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0059A0[] = djyasinzou_room_10Tex_0059A0; -#define djyasinzou_room_10DL_000CC0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_000CC0" -static const ALIGN_ASSET(2) char jyasinzou_room_10DL_000CC0[] = djyasinzou_room_10DL_000CC0; - -#define djyasinzou_room_10Tex_0069A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0069A0" -static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0069A0[] = djyasinzou_room_10Tex_0069A0; - -#define djyasinzou_room_10DL_001270 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_001270" -static const ALIGN_ASSET(2) char jyasinzou_room_10DL_001270[] = djyasinzou_room_10DL_001270; +#define djyasinzou_room_10Tex_005DA0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_005DA0" +static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_005DA0[] = djyasinzou_room_10Tex_005DA0; #define djyasinzou_room_10Tex_0065A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0065A0" static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0065A0[] = djyasinzou_room_10Tex_0065A0; +#define djyasinzou_room_10Tex_0069A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0069A0" +static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0069A0[] = djyasinzou_room_10Tex_0069A0; + +#define djyasinzou_room_10Tex_0079A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0079A0" +static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0079A0[] = djyasinzou_room_10Tex_0079A0; + +#define djyasinzou_room_10Tex_007DA0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_007DA0" +static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_007DA0[] = djyasinzou_room_10Tex_007DA0; + +#define djyasinzou_room_10DL_000460 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_000460" +static const ALIGN_ASSET(2) char jyasinzou_room_10DL_000460[] = djyasinzou_room_10DL_000460; + +#define djyasinzou_room_10DL_0008F8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_0008F8" +static const ALIGN_ASSET(2) char jyasinzou_room_10DL_0008F8[] = djyasinzou_room_10DL_0008F8; + +#define djyasinzou_room_10DL_002DE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_002DE0" +static const ALIGN_ASSET(2) char jyasinzou_room_10DL_002DE0[] = djyasinzou_room_10DL_002DE0; + +#define djyasinzou_room_10DL_000CC0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_000CC0" +static const ALIGN_ASSET(2) char jyasinzou_room_10DL_000CC0[] = djyasinzou_room_10DL_000CC0; + +#define djyasinzou_room_10DL_001270 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_001270" +static const ALIGN_ASSET(2) char jyasinzou_room_10DL_001270[] = djyasinzou_room_10DL_001270; + #define djyasinzou_room_10DL_001AA0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_001AA0" static const ALIGN_ASSET(2) char jyasinzou_room_10DL_001AA0[] = djyasinzou_room_10DL_001AA0; -#define djyasinzou_room_10Tex_005DA0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_005DA0" -static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_005DA0[] = djyasinzou_room_10Tex_005DA0; - #define djyasinzou_room_10DL_000E80 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_000E80" static const ALIGN_ASSET(2) char jyasinzou_room_10DL_000E80[] = djyasinzou_room_10DL_000E80; @@ -54,11 +60,5 @@ static const ALIGN_ASSET(2) char jyasinzou_room_10DL_001720[] = djyasinzou_room_ #define djyasinzou_room_10DL_0020C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_0020C8" static const ALIGN_ASSET(2) char jyasinzou_room_10DL_0020C8[] = djyasinzou_room_10DL_0020C8; -#define djyasinzou_room_10Tex_0031A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0031A0" -static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0031A0[] = djyasinzou_room_10Tex_0031A0; - -#define djyasinzou_room_10Tex_0059A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0059A0" -static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0059A0[] = djyasinzou_room_10Tex_0059A0; - #endif // DUNGEONS_JYASINZOU_ROOM_10_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_11.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_11.h index a73341a83..ec6d1703d 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_11.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_11.h @@ -3,14 +3,14 @@ #include "align_asset_macro.h" +#define djyasinzou_room_11Tex_000780 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_11Tex_000780" +static const ALIGN_ASSET(2) char jyasinzou_room_11Tex_000780[] = djyasinzou_room_11Tex_000780; + #define djyasinzou_room_11DL_000E40 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_11DL_000E40" static const ALIGN_ASSET(2) char jyasinzou_room_11DL_000E40[] = djyasinzou_room_11DL_000E40; #define djyasinzou_room_11DL_000530 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_11DL_000530" static const ALIGN_ASSET(2) char jyasinzou_room_11DL_000530[] = djyasinzou_room_11DL_000530; -#define djyasinzou_room_11Tex_000780 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_11Tex_000780" -static const ALIGN_ASSET(2) char jyasinzou_room_11Tex_000780[] = djyasinzou_room_11Tex_000780; - #endif // DUNGEONS_JYASINZOU_ROOM_11_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_12.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_12.h index cf4a8b8fe..d39801bc0 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_12.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_12.h @@ -3,14 +3,14 @@ #include "align_asset_macro.h" -#define djyasinzou_room_12DL_0006B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_12DL_0006B0" -static const ALIGN_ASSET(2) char jyasinzou_room_12DL_0006B0[] = djyasinzou_room_12DL_0006B0; +#define djyasinzou_room_12Tex_0010D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_12Tex_0010D8" +static const ALIGN_ASSET(2) char jyasinzou_room_12Tex_0010D8[] = djyasinzou_room_12Tex_0010D8; #define djyasinzou_room_12Tex_0018D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_12Tex_0018D8" static const ALIGN_ASSET(2) char jyasinzou_room_12Tex_0018D8[] = djyasinzou_room_12Tex_0018D8; -#define djyasinzou_room_12Tex_0010D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_12Tex_0010D8" -static const ALIGN_ASSET(2) char jyasinzou_room_12Tex_0010D8[] = djyasinzou_room_12Tex_0010D8; +#define djyasinzou_room_12DL_0006B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_12DL_0006B0" +static const ALIGN_ASSET(2) char jyasinzou_room_12DL_0006B0[] = djyasinzou_room_12DL_0006B0; #define djyasinzou_room_12DL_000B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_12DL_000B38" static const ALIGN_ASSET(2) char jyasinzou_room_12DL_000B38[] = djyasinzou_room_12DL_000B38; diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_13.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_13.h index 276c78539..0cbc9366b 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_13.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_13.h @@ -3,32 +3,32 @@ #include "align_asset_macro.h" -#define djyasinzou_room_13DL_001B60 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13DL_001B60" -static const ALIGN_ASSET(2) char jyasinzou_room_13DL_001B60[] = djyasinzou_room_13DL_001B60; - -#define djyasinzou_room_13Tex_0044A8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13Tex_0044A8" -static const ALIGN_ASSET(2) char jyasinzou_room_13Tex_0044A8[] = djyasinzou_room_13Tex_0044A8; - #define djyasinzou_room_13Tex_0028A8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13Tex_0028A8" static const ALIGN_ASSET(2) char jyasinzou_room_13Tex_0028A8[] = djyasinzou_room_13Tex_0028A8; #define djyasinzou_room_13Tex_0030A8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13Tex_0030A8" static const ALIGN_ASSET(2) char jyasinzou_room_13Tex_0030A8[] = djyasinzou_room_13Tex_0030A8; +#define djyasinzou_room_13Tex_0038A8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13Tex_0038A8" +static const ALIGN_ASSET(2) char jyasinzou_room_13Tex_0038A8[] = djyasinzou_room_13Tex_0038A8; + #define djyasinzou_room_13Tex_003CA8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13Tex_003CA8" static const ALIGN_ASSET(2) char jyasinzou_room_13Tex_003CA8[] = djyasinzou_room_13Tex_003CA8; -#define djyasinzou_room_13Tex_0050A8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13Tex_0050A8" -static const ALIGN_ASSET(2) char jyasinzou_room_13Tex_0050A8[] = djyasinzou_room_13Tex_0050A8; - -#define djyasinzou_room_13DL_002710 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13DL_002710" -static const ALIGN_ASSET(2) char jyasinzou_room_13DL_002710[] = djyasinzou_room_13DL_002710; - -#define djyasinzou_room_13Tex_0038A8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13Tex_0038A8" -static const ALIGN_ASSET(2) char jyasinzou_room_13Tex_0038A8[] = djyasinzou_room_13Tex_0038A8; +#define djyasinzou_room_13Tex_0044A8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13Tex_0044A8" +static const ALIGN_ASSET(2) char jyasinzou_room_13Tex_0044A8[] = djyasinzou_room_13Tex_0044A8; #define djyasinzou_room_13Tex_004CA8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13Tex_004CA8" static const ALIGN_ASSET(2) char jyasinzou_room_13Tex_004CA8[] = djyasinzou_room_13Tex_004CA8; +#define djyasinzou_room_13Tex_0050A8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13Tex_0050A8" +static const ALIGN_ASSET(2) char jyasinzou_room_13Tex_0050A8[] = djyasinzou_room_13Tex_0050A8; + +#define djyasinzou_room_13DL_001B60 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13DL_001B60" +static const ALIGN_ASSET(2) char jyasinzou_room_13DL_001B60[] = djyasinzou_room_13DL_001B60; + +#define djyasinzou_room_13DL_002710 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13DL_002710" +static const ALIGN_ASSET(2) char jyasinzou_room_13DL_002710[] = djyasinzou_room_13DL_002710; + #endif // DUNGEONS_JYASINZOU_ROOM_13_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_14.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_14.h index 3c47d67ec..ca88adb41 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_14.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_14.h @@ -3,41 +3,41 @@ #include "align_asset_macro.h" -#define djyasinzou_room_14DL_000350 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14DL_000350" -static const ALIGN_ASSET(2) char jyasinzou_room_14DL_000350[] = djyasinzou_room_14DL_000350; +#define djyasinzou_room_14Tex_001CA0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_001CA0" +static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_001CA0[] = djyasinzou_room_14Tex_001CA0; + +#define djyasinzou_room_14Tex_0024A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0024A0" +static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0024A0[] = djyasinzou_room_14Tex_0024A0; + +#define djyasinzou_room_14Tex_0028A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0028A0" +static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0028A0[] = djyasinzou_room_14Tex_0028A0; + +#define djyasinzou_room_14Tex_0030A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0030A0" +static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0030A0[] = djyasinzou_room_14Tex_0030A0; + +#define djyasinzou_room_14Tex_0034A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0034A0" +static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0034A0[] = djyasinzou_room_14Tex_0034A0; #define djyasinzou_room_14Tex_0044A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0044A0" static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0044A0[] = djyasinzou_room_14Tex_0044A0; +#define djyasinzou_room_14DL_000350 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14DL_000350" +static const ALIGN_ASSET(2) char jyasinzou_room_14DL_000350[] = djyasinzou_room_14DL_000350; + #define djyasinzou_room_14DL_000AF8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14DL_000AF8" static const ALIGN_ASSET(2) char jyasinzou_room_14DL_000AF8[] = djyasinzou_room_14DL_000AF8; -#define djyasinzou_room_14Tex_001CA0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_001CA0" -static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_001CA0[] = djyasinzou_room_14Tex_001CA0; - -#define djyasinzou_room_14Tex_0028A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0028A0" -static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0028A0[] = djyasinzou_room_14Tex_0028A0; - #define djyasinzou_room_14DL_001088 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14DL_001088" static const ALIGN_ASSET(2) char jyasinzou_room_14DL_001088[] = djyasinzou_room_14DL_001088; #define djyasinzou_room_14DL_001340 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14DL_001340" static const ALIGN_ASSET(2) char jyasinzou_room_14DL_001340[] = djyasinzou_room_14DL_001340; -#define djyasinzou_room_14Tex_0024A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0024A0" -static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0024A0[] = djyasinzou_room_14Tex_0024A0; - #define djyasinzou_room_14DL_0017D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14DL_0017D8" static const ALIGN_ASSET(2) char jyasinzou_room_14DL_0017D8[] = djyasinzou_room_14DL_0017D8; -#define djyasinzou_room_14Tex_0030A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0030A0" -static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0030A0[] = djyasinzou_room_14Tex_0030A0; - #define djyasinzou_room_14DL_001AE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14DL_001AE0" static const ALIGN_ASSET(2) char jyasinzou_room_14DL_001AE0[] = djyasinzou_room_14DL_001AE0; -#define djyasinzou_room_14Tex_0034A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0034A0" -static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0034A0[] = djyasinzou_room_14Tex_0034A0; - #endif // DUNGEONS_JYASINZOU_ROOM_14_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_15.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_15.h index 65e4639d2..aac7ab8ba 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_15.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_15.h @@ -3,60 +3,60 @@ #include "align_asset_macro.h" -#define djyasinzou_room_15DL_007970 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_007970" -static const ALIGN_ASSET(2) char jyasinzou_room_15DL_007970[] = djyasinzou_room_15DL_007970; - -#define djyasinzou_room_15DL_000DE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_000DE0" -static const ALIGN_ASSET(2) char jyasinzou_room_15DL_000DE0[] = djyasinzou_room_15DL_000DE0; - -#define djyasinzou_room_15Tex_005CE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_005CE8" -static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_005CE8[] = djyasinzou_room_15Tex_005CE8; - -#define djyasinzou_room_15Tex_0053E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_0053E8" -static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_0053E8[] = djyasinzou_room_15Tex_0053E8; - -#define djyasinzou_room_15Tex_0043E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_0043E8" -static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_0043E8[] = djyasinzou_room_15Tex_0043E8; - -#define djyasinzou_room_15Tex_004BE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_004BE8" -static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_004BE8[] = djyasinzou_room_15Tex_004BE8; - -#define djyasinzou_room_15Tex_0060E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_0060E8" -static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_0060E8[] = djyasinzou_room_15Tex_0060E8; - -#define djyasinzou_room_15DL_007BC0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_007BC0" -static const ALIGN_ASSET(2) char jyasinzou_room_15DL_007BC0[] = djyasinzou_room_15DL_007BC0; - -#define djyasinzou_room_15Tex_007C98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_007C98" -static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_007C98[] = djyasinzou_room_15Tex_007C98; - -#define djyasinzou_room_15DL_002950 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_002950" -static const ALIGN_ASSET(2) char jyasinzou_room_15DL_002950[] = djyasinzou_room_15DL_002950; - -#define djyasinzou_room_15Tex_006CE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_006CE8" -static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_006CE8[] = djyasinzou_room_15Tex_006CE8; - -#define djyasinzou_room_15DL_001A68 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_001A68" -static const ALIGN_ASSET(2) char jyasinzou_room_15DL_001A68[] = djyasinzou_room_15DL_001A68; - -#define djyasinzou_room_15Tex_0068E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_0068E8" -static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_0068E8[] = djyasinzou_room_15Tex_0068E8; - -#define djyasinzou_room_15DL_002380 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_002380" -static const ALIGN_ASSET(2) char jyasinzou_room_15DL_002380[] = djyasinzou_room_15DL_002380; - -#define djyasinzou_room_15Tex_005BE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_005BE8" -static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_005BE8[] = djyasinzou_room_15Tex_005BE8; - -#define djyasinzou_room_15DL_002C10 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_002C10" -static const ALIGN_ASSET(2) char jyasinzou_room_15DL_002C10[] = djyasinzou_room_15DL_002C10; - #define djyasinzou_room_15Tex_002FE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_002FE8" static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_002FE8[] = djyasinzou_room_15Tex_002FE8; #define djyasinzou_room_15Tex_003FE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_003FE8" static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_003FE8[] = djyasinzou_room_15Tex_003FE8; +#define djyasinzou_room_15Tex_0043E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_0043E8" +static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_0043E8[] = djyasinzou_room_15Tex_0043E8; + +#define djyasinzou_room_15Tex_004BE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_004BE8" +static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_004BE8[] = djyasinzou_room_15Tex_004BE8; + +#define djyasinzou_room_15Tex_0053E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_0053E8" +static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_0053E8[] = djyasinzou_room_15Tex_0053E8; + +#define djyasinzou_room_15Tex_005BE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_005BE8" +static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_005BE8[] = djyasinzou_room_15Tex_005BE8; + +#define djyasinzou_room_15Tex_005CE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_005CE8" +static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_005CE8[] = djyasinzou_room_15Tex_005CE8; + +#define djyasinzou_room_15Tex_0060E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_0060E8" +static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_0060E8[] = djyasinzou_room_15Tex_0060E8; + +#define djyasinzou_room_15Tex_0068E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_0068E8" +static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_0068E8[] = djyasinzou_room_15Tex_0068E8; + +#define djyasinzou_room_15Tex_006CE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_006CE8" +static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_006CE8[] = djyasinzou_room_15Tex_006CE8; + +#define djyasinzou_room_15Tex_007C98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_007C98" +static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_007C98[] = djyasinzou_room_15Tex_007C98; + +#define djyasinzou_room_15DL_007970 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_007970" +static const ALIGN_ASSET(2) char jyasinzou_room_15DL_007970[] = djyasinzou_room_15DL_007970; + +#define djyasinzou_room_15DL_000DE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_000DE0" +static const ALIGN_ASSET(2) char jyasinzou_room_15DL_000DE0[] = djyasinzou_room_15DL_000DE0; + +#define djyasinzou_room_15DL_007BC0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_007BC0" +static const ALIGN_ASSET(2) char jyasinzou_room_15DL_007BC0[] = djyasinzou_room_15DL_007BC0; + +#define djyasinzou_room_15DL_002950 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_002950" +static const ALIGN_ASSET(2) char jyasinzou_room_15DL_002950[] = djyasinzou_room_15DL_002950; + +#define djyasinzou_room_15DL_001A68 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_001A68" +static const ALIGN_ASSET(2) char jyasinzou_room_15DL_001A68[] = djyasinzou_room_15DL_001A68; + +#define djyasinzou_room_15DL_002380 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_002380" +static const ALIGN_ASSET(2) char jyasinzou_room_15DL_002380[] = djyasinzou_room_15DL_002380; + +#define djyasinzou_room_15DL_002C10 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_002C10" +static const ALIGN_ASSET(2) char jyasinzou_room_15DL_002C10[] = djyasinzou_room_15DL_002C10; + #define djyasinzou_room_15DL_002E90 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_002E90" static const ALIGN_ASSET(2) char jyasinzou_room_15DL_002E90[] = djyasinzou_room_15DL_002E90; diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_16.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_16.h index ac610c97f..fd2e93a5e 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_16.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_16.h @@ -3,21 +3,33 @@ #include "align_asset_macro.h" -#define djyasinzou_room_16DL_0003F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16DL_0003F0" -static const ALIGN_ASSET(2) char jyasinzou_room_16DL_0003F0[] = djyasinzou_room_16DL_0003F0; +#define djyasinzou_room_16Tex_0029B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0029B8" +static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0029B8[] = djyasinzou_room_16Tex_0029B8; + +#define djyasinzou_room_16Tex_0039B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0039B8" +static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0039B8[] = djyasinzou_room_16Tex_0039B8; + +#define djyasinzou_room_16Tex_0041B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0041B8" +static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0041B8[] = djyasinzou_room_16Tex_0041B8; #define djyasinzou_room_16Tex_0045B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0045B8" static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0045B8[] = djyasinzou_room_16Tex_0045B8; +#define djyasinzou_room_16Tex_004DB8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_004DB8" +static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_004DB8[] = djyasinzou_room_16Tex_004DB8; + +#define djyasinzou_room_16Tex_0051B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0051B8" +static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0051B8[] = djyasinzou_room_16Tex_0051B8; + #define djyasinzou_room_16Tex_0059B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0059B8" static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0059B8[] = djyasinzou_room_16Tex_0059B8; +#define djyasinzou_room_16DL_0003F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16DL_0003F0" +static const ALIGN_ASSET(2) char jyasinzou_room_16DL_0003F0[] = djyasinzou_room_16DL_0003F0; + #define djyasinzou_room_16DL_0007E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16DL_0007E0" static const ALIGN_ASSET(2) char jyasinzou_room_16DL_0007E0[] = djyasinzou_room_16DL_0007E0; -#define djyasinzou_room_16Tex_0039B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0039B8" -static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0039B8[] = djyasinzou_room_16Tex_0039B8; - #define djyasinzou_room_16DL_000D90 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16DL_000D90" static const ALIGN_ASSET(2) char jyasinzou_room_16DL_000D90[] = djyasinzou_room_16DL_000D90; @@ -30,12 +42,6 @@ static const ALIGN_ASSET(2) char jyasinzou_room_16DL_0017D0[] = djyasinzou_room_ #define djyasinzou_room_16DL_001B40 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16DL_001B40" static const ALIGN_ASSET(2) char jyasinzou_room_16DL_001B40[] = djyasinzou_room_16DL_001B40; -#define djyasinzou_room_16Tex_0029B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0029B8" -static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0029B8[] = djyasinzou_room_16Tex_0029B8; - -#define djyasinzou_room_16Tex_004DB8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_004DB8" -static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_004DB8[] = djyasinzou_room_16Tex_004DB8; - #define djyasinzou_room_16DL_001DC0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16DL_001DC0" static const ALIGN_ASSET(2) char jyasinzou_room_16DL_001DC0[] = djyasinzou_room_16DL_001DC0; @@ -48,11 +54,5 @@ static const ALIGN_ASSET(2) char jyasinzou_room_16DL_0022C0[] = djyasinzou_room_ #define djyasinzou_room_16DL_002660 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16DL_002660" static const ALIGN_ASSET(2) char jyasinzou_room_16DL_002660[] = djyasinzou_room_16DL_002660; -#define djyasinzou_room_16Tex_0041B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0041B8" -static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0041B8[] = djyasinzou_room_16Tex_0041B8; - -#define djyasinzou_room_16Tex_0051B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0051B8" -static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0051B8[] = djyasinzou_room_16Tex_0051B8; - #endif // DUNGEONS_JYASINZOU_ROOM_16_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_17.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_17.h index face9bba1..65348408e 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_17.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_17.h @@ -3,42 +3,42 @@ #include "align_asset_macro.h" -#define djyasinzou_room_17DL_000980 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17DL_000980" -static const ALIGN_ASSET(2) char jyasinzou_room_17DL_000980[] = djyasinzou_room_17DL_000980; +#define djyasinzou_room_17Tex_005E50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17Tex_005E50" +static const ALIGN_ASSET(2) char jyasinzou_room_17Tex_005E50[] = djyasinzou_room_17Tex_005E50; #define djyasinzou_room_17Tex_006650 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17Tex_006650" static const ALIGN_ASSET(2) char jyasinzou_room_17Tex_006650[] = djyasinzou_room_17Tex_006650; +#define djyasinzou_room_17Tex_006E50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17Tex_006E50" +static const ALIGN_ASSET(2) char jyasinzou_room_17Tex_006E50[] = djyasinzou_room_17Tex_006E50; + +#define djyasinzou_room_17Tex_007250 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17Tex_007250" +static const ALIGN_ASSET(2) char jyasinzou_room_17Tex_007250[] = djyasinzou_room_17Tex_007250; + #define djyasinzou_room_17Tex_007A50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17Tex_007A50" static const ALIGN_ASSET(2) char jyasinzou_room_17Tex_007A50[] = djyasinzou_room_17Tex_007A50; #define djyasinzou_room_17Tex_008250 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17Tex_008250" static const ALIGN_ASSET(2) char jyasinzou_room_17Tex_008250[] = djyasinzou_room_17Tex_008250; +#define djyasinzou_room_17Tex_008A50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17Tex_008A50" +static const ALIGN_ASSET(2) char jyasinzou_room_17Tex_008A50[] = djyasinzou_room_17Tex_008A50; + #define djyasinzou_room_17Tex_008E50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17Tex_008E50" static const ALIGN_ASSET(2) char jyasinzou_room_17Tex_008E50[] = djyasinzou_room_17Tex_008E50; +#define djyasinzou_room_17DL_000980 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17DL_000980" +static const ALIGN_ASSET(2) char jyasinzou_room_17DL_000980[] = djyasinzou_room_17DL_000980; + #define djyasinzou_room_17DL_0011F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17DL_0011F0" static const ALIGN_ASSET(2) char jyasinzou_room_17DL_0011F0[] = djyasinzou_room_17DL_0011F0; -#define djyasinzou_room_17Tex_005E50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17Tex_005E50" -static const ALIGN_ASSET(2) char jyasinzou_room_17Tex_005E50[] = djyasinzou_room_17Tex_005E50; - #define djyasinzou_room_17DL_001850 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17DL_001850" static const ALIGN_ASSET(2) char jyasinzou_room_17DL_001850[] = djyasinzou_room_17DL_001850; -#define djyasinzou_room_17Tex_008A50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17Tex_008A50" -static const ALIGN_ASSET(2) char jyasinzou_room_17Tex_008A50[] = djyasinzou_room_17Tex_008A50; - -#define djyasinzou_room_17Tex_006E50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17Tex_006E50" -static const ALIGN_ASSET(2) char jyasinzou_room_17Tex_006E50[] = djyasinzou_room_17Tex_006E50; - #define djyasinzou_room_17DL_003258 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17DL_003258" static const ALIGN_ASSET(2) char jyasinzou_room_17DL_003258[] = djyasinzou_room_17DL_003258; -#define djyasinzou_room_17Tex_007250 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17Tex_007250" -static const ALIGN_ASSET(2) char jyasinzou_room_17Tex_007250[] = djyasinzou_room_17Tex_007250; - #define djyasinzou_room_17DL_005D38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17DL_005D38" static const ALIGN_ASSET(2) char jyasinzou_room_17DL_005D38[] = djyasinzou_room_17DL_005D38; diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_18.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_18.h index eaf4a1192..a68fd38be 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_18.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_18.h @@ -3,8 +3,20 @@ #include "align_asset_macro.h" -#define djyasinzou_room_18DL_000620 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18DL_000620" -static const ALIGN_ASSET(2) char jyasinzou_room_18DL_000620[] = djyasinzou_room_18DL_000620; +#define djyasinzou_room_18Tex_0020F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_0020F0" +static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0020F0[] = djyasinzou_room_18Tex_0020F0; + +#define djyasinzou_room_18Tex_0028F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_0028F0" +static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0028F0[] = djyasinzou_room_18Tex_0028F0; + +#define djyasinzou_room_18Tex_0030F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_0030F0" +static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0030F0[] = djyasinzou_room_18Tex_0030F0; + +#define djyasinzou_room_18Tex_0034F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_0034F0" +static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0034F0[] = djyasinzou_room_18Tex_0034F0; + +#define djyasinzou_room_18Tex_003CF0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_003CF0" +static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_003CF0[] = djyasinzou_room_18Tex_003CF0; #define djyasinzou_room_18Tex_0044F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_0044F0" static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0044F0[] = djyasinzou_room_18Tex_0044F0; @@ -12,27 +24,24 @@ static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0044F0[] = djyasinzou_room #define djyasinzou_room_18Tex_0048F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_0048F0" static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0048F0[] = djyasinzou_room_18Tex_0048F0; +#define djyasinzou_room_18Tex_0054E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_0054E0" +static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0054E0[] = djyasinzou_room_18Tex_0054E0; + +#define djyasinzou_room_18DL_000620 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18DL_000620" +static const ALIGN_ASSET(2) char jyasinzou_room_18DL_000620[] = djyasinzou_room_18DL_000620; + #define djyasinzou_room_18DL_000D78 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18DL_000D78" static const ALIGN_ASSET(2) char jyasinzou_room_18DL_000D78[] = djyasinzou_room_18DL_000D78; -#define djyasinzou_room_18Tex_0028F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_0028F0" -static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0028F0[] = djyasinzou_room_18Tex_0028F0; - #define djyasinzou_room_18DL_001038 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18DL_001038" static const ALIGN_ASSET(2) char jyasinzou_room_18DL_001038[] = djyasinzou_room_18DL_001038; #define djyasinzou_room_18DL_001418 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18DL_001418" static const ALIGN_ASSET(2) char jyasinzou_room_18DL_001418[] = djyasinzou_room_18DL_001418; -#define djyasinzou_room_18Tex_0034F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_0034F0" -static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0034F0[] = djyasinzou_room_18Tex_0034F0; - #define djyasinzou_room_18DL_001690 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18DL_001690" static const ALIGN_ASSET(2) char jyasinzou_room_18DL_001690[] = djyasinzou_room_18DL_001690; -#define djyasinzou_room_18Tex_0020F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_0020F0" -static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0020F0[] = djyasinzou_room_18Tex_0020F0; - #define djyasinzou_room_18DL_005170 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18DL_005170" static const ALIGN_ASSET(2) char jyasinzou_room_18DL_005170[] = djyasinzou_room_18DL_005170; @@ -42,20 +51,11 @@ static const ALIGN_ASSET(2) char jyasinzou_room_18DL_001900[] = djyasinzou_room_ #define djyasinzou_room_18DL_005408 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18DL_005408" static const ALIGN_ASSET(2) char jyasinzou_room_18DL_005408[] = djyasinzou_room_18DL_005408; -#define djyasinzou_room_18Tex_0054E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_0054E0" -static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0054E0[] = djyasinzou_room_18Tex_0054E0; - #define djyasinzou_room_18DL_001D20 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18DL_001D20" static const ALIGN_ASSET(2) char jyasinzou_room_18DL_001D20[] = djyasinzou_room_18DL_001D20; -#define djyasinzou_room_18Tex_003CF0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_003CF0" -static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_003CF0[] = djyasinzou_room_18Tex_003CF0; - #define djyasinzou_room_18DL_001FA8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18DL_001FA8" static const ALIGN_ASSET(2) char jyasinzou_room_18DL_001FA8[] = djyasinzou_room_18DL_001FA8; -#define djyasinzou_room_18Tex_0030F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_0030F0" -static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0030F0[] = djyasinzou_room_18Tex_0030F0; - #endif // DUNGEONS_JYASINZOU_ROOM_18_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_19.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_19.h index 6e442469b..b97097c8d 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_19.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_19.h @@ -3,14 +3,17 @@ #include "align_asset_macro.h" -#define djyasinzou_room_19DL_0014E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19DL_0014E0" -static const ALIGN_ASSET(2) char jyasinzou_room_19DL_0014E0[] = djyasinzou_room_19DL_0014E0; +#define djyasinzou_room_19Tex_002DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19Tex_002DC8" +static const ALIGN_ASSET(2) char jyasinzou_room_19Tex_002DC8[] = djyasinzou_room_19Tex_002DC8; + +#define djyasinzou_room_19Tex_003DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19Tex_003DC8" +static const ALIGN_ASSET(2) char jyasinzou_room_19Tex_003DC8[] = djyasinzou_room_19Tex_003DC8; #define djyasinzou_room_19Tex_0045C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19Tex_0045C8" static const ALIGN_ASSET(2) char jyasinzou_room_19Tex_0045C8[] = djyasinzou_room_19Tex_0045C8; -#define djyasinzou_room_19Tex_003DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19Tex_003DC8" -static const ALIGN_ASSET(2) char jyasinzou_room_19Tex_003DC8[] = djyasinzou_room_19Tex_003DC8; +#define djyasinzou_room_19Tex_004DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19Tex_004DC8" +static const ALIGN_ASSET(2) char jyasinzou_room_19Tex_004DC8[] = djyasinzou_room_19Tex_004DC8; #define djyasinzou_room_19Tex_0051C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19Tex_0051C8" static const ALIGN_ASSET(2) char jyasinzou_room_19Tex_0051C8[] = djyasinzou_room_19Tex_0051C8; @@ -18,15 +21,12 @@ static const ALIGN_ASSET(2) char jyasinzou_room_19Tex_0051C8[] = djyasinzou_room #define djyasinzou_room_19Tex_0055C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19Tex_0055C8" static const ALIGN_ASSET(2) char jyasinzou_room_19Tex_0055C8[] = djyasinzou_room_19Tex_0055C8; +#define djyasinzou_room_19DL_0014E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19DL_0014E0" +static const ALIGN_ASSET(2) char jyasinzou_room_19DL_0014E0[] = djyasinzou_room_19DL_0014E0; + #define djyasinzou_room_19DL_001FE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19DL_001FE8" static const ALIGN_ASSET(2) char jyasinzou_room_19DL_001FE8[] = djyasinzou_room_19DL_001FE8; -#define djyasinzou_room_19Tex_002DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19Tex_002DC8" -static const ALIGN_ASSET(2) char jyasinzou_room_19Tex_002DC8[] = djyasinzou_room_19Tex_002DC8; - -#define djyasinzou_room_19Tex_004DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19Tex_004DC8" -static const ALIGN_ASSET(2) char jyasinzou_room_19Tex_004DC8[] = djyasinzou_room_19Tex_004DC8; - #define djyasinzou_room_19DL_002268 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19DL_002268" static const ALIGN_ASSET(2) char jyasinzou_room_19DL_002268[] = djyasinzou_room_19DL_002268; diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_2.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_2.h index e93c059d5..90ab76c71 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_2.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_2.h @@ -3,17 +3,29 @@ #include "align_asset_macro.h" -#define djyasinzou_room_2DL_0006F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2DL_0006F0" -static const ALIGN_ASSET(2) char jyasinzou_room_2DL_0006F0[] = djyasinzou_room_2DL_0006F0; +#define djyasinzou_room_2Tex_0023B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_0023B0" +static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_0023B0[] = djyasinzou_room_2Tex_0023B0; + +#define djyasinzou_room_2Tex_0033B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_0033B0" +static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_0033B0[] = djyasinzou_room_2Tex_0033B0; + +#define djyasinzou_room_2Tex_003BB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_003BB0" +static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_003BB0[] = djyasinzou_room_2Tex_003BB0; + +#define djyasinzou_room_2Tex_003FB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_003FB0" +static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_003FB0[] = djyasinzou_room_2Tex_003FB0; #define djyasinzou_room_2Tex_0047B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_0047B0" static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_0047B0[] = djyasinzou_room_2Tex_0047B0; +#define djyasinzou_room_2Tex_004BB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_004BB0" +static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_004BB0[] = djyasinzou_room_2Tex_004BB0; + #define djyasinzou_room_2Tex_0053B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_0053B0" static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_0053B0[] = djyasinzou_room_2Tex_0053B0; -#define djyasinzou_room_2Tex_0033B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_0033B0" -static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_0033B0[] = djyasinzou_room_2Tex_0033B0; +#define djyasinzou_room_2DL_0006F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2DL_0006F0" +static const ALIGN_ASSET(2) char jyasinzou_room_2DL_0006F0[] = djyasinzou_room_2DL_0006F0; #define djyasinzou_room_2DL_000C58 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2DL_000C58" static const ALIGN_ASSET(2) char jyasinzou_room_2DL_000C58[] = djyasinzou_room_2DL_000C58; @@ -21,21 +33,9 @@ static const ALIGN_ASSET(2) char jyasinzou_room_2DL_000C58[] = djyasinzou_room_2 #define djyasinzou_room_2DL_001398 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2DL_001398" static const ALIGN_ASSET(2) char jyasinzou_room_2DL_001398[] = djyasinzou_room_2DL_001398; -#define djyasinzou_room_2Tex_004BB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_004BB0" -static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_004BB0[] = djyasinzou_room_2Tex_004BB0; - #define djyasinzou_room_2DL_001D88 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2DL_001D88" static const ALIGN_ASSET(2) char jyasinzou_room_2DL_001D88[] = djyasinzou_room_2DL_001D88; -#define djyasinzou_room_2Tex_003BB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_003BB0" -static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_003BB0[] = djyasinzou_room_2Tex_003BB0; - -#define djyasinzou_room_2Tex_0023B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_0023B0" -static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_0023B0[] = djyasinzou_room_2Tex_0023B0; - -#define djyasinzou_room_2Tex_003FB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_003FB0" -static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_003FB0[] = djyasinzou_room_2Tex_003FB0; - #define djyasinzou_room_2DL_002170 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2DL_002170" static const ALIGN_ASSET(2) char jyasinzou_room_2DL_002170[] = djyasinzou_room_2DL_002170; diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_20.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_20.h index 9d6ec0806..5a9578848 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_20.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_20.h @@ -3,17 +3,8 @@ #include "align_asset_macro.h" -#define djyasinzou_room_20DL_000460 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_000460" -static const ALIGN_ASSET(2) char jyasinzou_room_20DL_000460[] = djyasinzou_room_20DL_000460; - -#define djyasinzou_room_20Tex_0051B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0051B8" -static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0051B8[] = djyasinzou_room_20Tex_0051B8; - -#define djyasinzou_room_20DL_000908 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_000908" -static const ALIGN_ASSET(2) char jyasinzou_room_20DL_000908[] = djyasinzou_room_20DL_000908; - -#define djyasinzou_room_20Tex_007DB8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_007DB8" -static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_007DB8[] = djyasinzou_room_20Tex_007DB8; +#define djyasinzou_room_20Tex_0031B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0031B8" +static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0031B8[] = djyasinzou_room_20Tex_0031B8; #define djyasinzou_room_20Tex_0041B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0041B8" static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0041B8[] = djyasinzou_room_20Tex_0041B8; @@ -21,44 +12,53 @@ static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0041B8[] = djyasinzou_room #define djyasinzou_room_20Tex_0049B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0049B8" static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0049B8[] = djyasinzou_room_20Tex_0049B8; -#define djyasinzou_room_20DL_000CD8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_000CD8" -static const ALIGN_ASSET(2) char jyasinzou_room_20DL_000CD8[] = djyasinzou_room_20DL_000CD8; +#define djyasinzou_room_20Tex_0051B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0051B8" +static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0051B8[] = djyasinzou_room_20Tex_0051B8; + +#define djyasinzou_room_20Tex_0059B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0059B8" +static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0059B8[] = djyasinzou_room_20Tex_0059B8; + +#define djyasinzou_room_20Tex_005DB8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_005DB8" +static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_005DB8[] = djyasinzou_room_20Tex_005DB8; + +#define djyasinzou_room_20Tex_0065B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0065B8" +static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0065B8[] = djyasinzou_room_20Tex_0065B8; #define djyasinzou_room_20Tex_0069B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0069B8" static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0069B8[] = djyasinzou_room_20Tex_0069B8; +#define djyasinzou_room_20Tex_0079B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0079B8" +static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0079B8[] = djyasinzou_room_20Tex_0079B8; + +#define djyasinzou_room_20Tex_007DB8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_007DB8" +static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_007DB8[] = djyasinzou_room_20Tex_007DB8; + +#define djyasinzou_room_20DL_000460 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_000460" +static const ALIGN_ASSET(2) char jyasinzou_room_20DL_000460[] = djyasinzou_room_20DL_000460; + +#define djyasinzou_room_20DL_000908 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_000908" +static const ALIGN_ASSET(2) char jyasinzou_room_20DL_000908[] = djyasinzou_room_20DL_000908; + +#define djyasinzou_room_20DL_000CD8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_000CD8" +static const ALIGN_ASSET(2) char jyasinzou_room_20DL_000CD8[] = djyasinzou_room_20DL_000CD8; + #define djyasinzou_room_20DL_000E98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_000E98" static const ALIGN_ASSET(2) char jyasinzou_room_20DL_000E98[] = djyasinzou_room_20DL_000E98; #define djyasinzou_room_20DL_001278 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_001278" static const ALIGN_ASSET(2) char jyasinzou_room_20DL_001278[] = djyasinzou_room_20DL_001278; -#define djyasinzou_room_20Tex_0065B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0065B8" -static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0065B8[] = djyasinzou_room_20Tex_0065B8; - #define djyasinzou_room_20DL_001738 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_001738" static const ALIGN_ASSET(2) char jyasinzou_room_20DL_001738[] = djyasinzou_room_20DL_001738; #define djyasinzou_room_20DL_001AB8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_001AB8" static const ALIGN_ASSET(2) char jyasinzou_room_20DL_001AB8[] = djyasinzou_room_20DL_001AB8; -#define djyasinzou_room_20Tex_005DB8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_005DB8" -static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_005DB8[] = djyasinzou_room_20Tex_005DB8; - #define djyasinzou_room_20DL_0020E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_0020E0" static const ALIGN_ASSET(2) char jyasinzou_room_20DL_0020E0[] = djyasinzou_room_20DL_0020E0; -#define djyasinzou_room_20Tex_0031B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0031B8" -static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0031B8[] = djyasinzou_room_20Tex_0031B8; - -#define djyasinzou_room_20Tex_0059B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0059B8" -static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0059B8[] = djyasinzou_room_20Tex_0059B8; - #define djyasinzou_room_20DL_002DF8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_002DF8" static const ALIGN_ASSET(2) char jyasinzou_room_20DL_002DF8[] = djyasinzou_room_20DL_002DF8; -#define djyasinzou_room_20Tex_0079B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0079B8" -static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0079B8[] = djyasinzou_room_20Tex_0079B8; - #endif // DUNGEONS_JYASINZOU_ROOM_20_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_21.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_21.h index 5fe0e9603..89a16f4ed 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_21.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_21.h @@ -3,8 +3,14 @@ #include "align_asset_macro.h" -#define djyasinzou_room_21DL_000A80 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21DL_000A80" -static const ALIGN_ASSET(2) char jyasinzou_room_21DL_000A80[] = djyasinzou_room_21DL_000A80; +#define djyasinzou_room_21Tex_001660 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_001660" +static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_001660[] = djyasinzou_room_21Tex_001660; + +#define djyasinzou_room_21Tex_002660 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_002660" +static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_002660[] = djyasinzou_room_21Tex_002660; + +#define djyasinzou_room_21Tex_002E60 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_002E60" +static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_002E60[] = djyasinzou_room_21Tex_002E60; #define djyasinzou_room_21Tex_003260 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_003260" static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_003260[] = djyasinzou_room_21Tex_003260; @@ -12,21 +18,15 @@ static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_003260[] = djyasinzou_room #define djyasinzou_room_21Tex_003660 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_003660" static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_003660[] = djyasinzou_room_21Tex_003660; -#define djyasinzou_room_21Tex_002660 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_002660" -static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_002660[] = djyasinzou_room_21Tex_002660; - #define djyasinzou_room_21Tex_003E60 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_003E60" static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_003E60[] = djyasinzou_room_21Tex_003E60; +#define djyasinzou_room_21DL_000A80 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21DL_000A80" +static const ALIGN_ASSET(2) char jyasinzou_room_21DL_000A80[] = djyasinzou_room_21DL_000A80; + #define djyasinzou_room_21DL_0012A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21DL_0012A0" static const ALIGN_ASSET(2) char jyasinzou_room_21DL_0012A0[] = djyasinzou_room_21DL_0012A0; -#define djyasinzou_room_21Tex_001660 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_001660" -static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_001660[] = djyasinzou_room_21Tex_001660; - -#define djyasinzou_room_21Tex_002E60 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_002E60" -static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_002E60[] = djyasinzou_room_21Tex_002E60; - #define djyasinzou_room_21DL_001520 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21DL_001520" static const ALIGN_ASSET(2) char jyasinzou_room_21DL_001520[] = djyasinzou_room_21DL_001520; diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_22.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_22.h index fba5c9edc..fe74fc2f3 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_22.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_22.h @@ -3,27 +3,27 @@ #include "align_asset_macro.h" -#define djyasinzou_room_22DL_0005D0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_22DL_0005D0" -static const ALIGN_ASSET(2) char jyasinzou_room_22DL_0005D0[] = djyasinzou_room_22DL_0005D0; - -#define djyasinzou_room_22Tex_002868 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_22Tex_002868" -static const ALIGN_ASSET(2) char jyasinzou_room_22Tex_002868[] = djyasinzou_room_22Tex_002868; +#define djyasinzou_room_22Tex_001468 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_22Tex_001468" +static const ALIGN_ASSET(2) char jyasinzou_room_22Tex_001468[] = djyasinzou_room_22Tex_001468; #define djyasinzou_room_22Tex_001C68 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_22Tex_001C68" static const ALIGN_ASSET(2) char jyasinzou_room_22Tex_001C68[] = djyasinzou_room_22Tex_001C68; -#define djyasinzou_room_22DL_000B30 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_22DL_000B30" -static const ALIGN_ASSET(2) char jyasinzou_room_22DL_000B30[] = djyasinzou_room_22DL_000B30; - #define djyasinzou_room_22Tex_002468 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_22Tex_002468" static const ALIGN_ASSET(2) char jyasinzou_room_22Tex_002468[] = djyasinzou_room_22Tex_002468; +#define djyasinzou_room_22Tex_002868 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_22Tex_002868" +static const ALIGN_ASSET(2) char jyasinzou_room_22Tex_002868[] = djyasinzou_room_22Tex_002868; + +#define djyasinzou_room_22DL_0005D0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_22DL_0005D0" +static const ALIGN_ASSET(2) char jyasinzou_room_22DL_0005D0[] = djyasinzou_room_22DL_0005D0; + +#define djyasinzou_room_22DL_000B30 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_22DL_000B30" +static const ALIGN_ASSET(2) char jyasinzou_room_22DL_000B30[] = djyasinzou_room_22DL_000B30; + #define djyasinzou_room_22DL_000E48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_22DL_000E48" static const ALIGN_ASSET(2) char jyasinzou_room_22DL_000E48[] = djyasinzou_room_22DL_000E48; -#define djyasinzou_room_22Tex_001468 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_22Tex_001468" -static const ALIGN_ASSET(2) char jyasinzou_room_22Tex_001468[] = djyasinzou_room_22Tex_001468; - #define djyasinzou_room_22DL_0012C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_22DL_0012C8" static const ALIGN_ASSET(2) char jyasinzou_room_22DL_0012C8[] = djyasinzou_room_22DL_0012C8; diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_23.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_23.h index aa252158c..f8f789a98 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_23.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_23.h @@ -3,60 +3,63 @@ #include "align_asset_macro.h" -#define djyasinzou_room_23DL_000B48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_000B48" -static const ALIGN_ASSET(2) char jyasinzou_room_23DL_000B48[] = djyasinzou_room_23DL_000B48; - -#define djyasinzou_room_23Tex_006038 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_006038" -static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_006038[] = djyasinzou_room_23Tex_006038; - #define djyasinzou_room_23Tex_004438 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_004438" static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_004438[] = djyasinzou_room_23Tex_004438; -#define djyasinzou_room_23Tex_008838 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_008838" -static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_008838[] = djyasinzou_room_23Tex_008838; - -#define djyasinzou_room_23DL_0010A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_0010A0" -static const ALIGN_ASSET(2) char jyasinzou_room_23DL_0010A0[] = djyasinzou_room_23DL_0010A0; - -#define djyasinzou_room_23Tex_006438 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_006438" -static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_006438[] = djyasinzou_room_23Tex_006438; - -#define djyasinzou_room_23DL_0012E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_0012E0" -static const ALIGN_ASSET(2) char jyasinzou_room_23DL_0012E0[] = djyasinzou_room_23DL_0012E0; - #define djyasinzou_room_23Tex_004C38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_004C38" static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_004C38[] = djyasinzou_room_23Tex_004C38; -#define djyasinzou_room_23DL_001550 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_001550" -static const ALIGN_ASSET(2) char jyasinzou_room_23DL_001550[] = djyasinzou_room_23DL_001550; +#define djyasinzou_room_23Tex_005438 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_005438" +static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_005438[] = djyasinzou_room_23Tex_005438; #define djyasinzou_room_23Tex_005838 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_005838" static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_005838[] = djyasinzou_room_23Tex_005838; -#define djyasinzou_room_23DL_001800 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_001800" -static const ALIGN_ASSET(2) char jyasinzou_room_23DL_001800[] = djyasinzou_room_23DL_001800; +#define djyasinzou_room_23Tex_006038 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_006038" +static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_006038[] = djyasinzou_room_23Tex_006038; + +#define djyasinzou_room_23Tex_006438 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_006438" +static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_006438[] = djyasinzou_room_23Tex_006438; + +#define djyasinzou_room_23Tex_006C38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_006C38" +static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_006C38[] = djyasinzou_room_23Tex_006C38; + +#define djyasinzou_room_23Tex_007438 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_007438" +static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_007438[] = djyasinzou_room_23Tex_007438; #define djyasinzou_room_23Tex_007C38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_007C38" static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_007C38[] = djyasinzou_room_23Tex_007C38; +#define djyasinzou_room_23Tex_008038 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_008038" +static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_008038[] = djyasinzou_room_23Tex_008038; + +#define djyasinzou_room_23Tex_008838 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_008838" +static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_008838[] = djyasinzou_room_23Tex_008838; + +#define djyasinzou_room_23DL_000B48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_000B48" +static const ALIGN_ASSET(2) char jyasinzou_room_23DL_000B48[] = djyasinzou_room_23DL_000B48; + +#define djyasinzou_room_23DL_0010A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_0010A0" +static const ALIGN_ASSET(2) char jyasinzou_room_23DL_0010A0[] = djyasinzou_room_23DL_0010A0; + +#define djyasinzou_room_23DL_0012E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_0012E0" +static const ALIGN_ASSET(2) char jyasinzou_room_23DL_0012E0[] = djyasinzou_room_23DL_0012E0; + +#define djyasinzou_room_23DL_001550 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_001550" +static const ALIGN_ASSET(2) char jyasinzou_room_23DL_001550[] = djyasinzou_room_23DL_001550; + +#define djyasinzou_room_23DL_001800 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_001800" +static const ALIGN_ASSET(2) char jyasinzou_room_23DL_001800[] = djyasinzou_room_23DL_001800; + #define djyasinzou_room_23DL_001AE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_001AE8" static const ALIGN_ASSET(2) char jyasinzou_room_23DL_001AE8[] = djyasinzou_room_23DL_001AE8; #define djyasinzou_room_23DL_001E00 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_001E00" static const ALIGN_ASSET(2) char jyasinzou_room_23DL_001E00[] = djyasinzou_room_23DL_001E00; -#define djyasinzou_room_23Tex_008038 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_008038" -static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_008038[] = djyasinzou_room_23Tex_008038; - -#define djyasinzou_room_23Tex_007438 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_007438" -static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_007438[] = djyasinzou_room_23Tex_007438; - #define djyasinzou_room_23DL_002B10 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_002B10" static const ALIGN_ASSET(2) char jyasinzou_room_23DL_002B10[] = djyasinzou_room_23DL_002B10; -#define djyasinzou_room_23Tex_006C38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_006C38" -static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_006C38[] = djyasinzou_room_23Tex_006C38; - #define djyasinzou_room_23DL_009140 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_009140" static const ALIGN_ASSET(2) char jyasinzou_room_23DL_009140[] = djyasinzou_room_23DL_009140; @@ -69,9 +72,6 @@ static const ALIGN_ASSET(2) char jyasinzou_room_23DL_0004F0[] = djyasinzou_room_ #define djyasinzou_room_23DL_003DE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_003DE0" static const ALIGN_ASSET(2) char jyasinzou_room_23DL_003DE0[] = djyasinzou_room_23DL_003DE0; -#define djyasinzou_room_23Tex_005438 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_005438" -static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_005438[] = djyasinzou_room_23Tex_005438; - #define djyasinzou_room_23DL_004258 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_004258" static const ALIGN_ASSET(2) char jyasinzou_room_23DL_004258[] = djyasinzou_room_23DL_004258; diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_24.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_24.h index 8cfeb6901..14ceaf04c 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_24.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_24.h @@ -3,44 +3,44 @@ #include "align_asset_macro.h" -#define djyasinzou_room_24DL_000A30 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24DL_000A30" -static const ALIGN_ASSET(2) char jyasinzou_room_24DL_000A30[] = djyasinzou_room_24DL_000A30; +#define djyasinzou_room_24Tex_001B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_001B38" +static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_001B38[] = djyasinzou_room_24Tex_001B38; -#define djyasinzou_room_24Tex_004B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_004B38" -static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_004B38[] = djyasinzou_room_24Tex_004B38; +#define djyasinzou_room_24Tex_002B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_002B38" +static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_002B38[] = djyasinzou_room_24Tex_002B38; #define djyasinzou_room_24Tex_003338 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_003338" static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_003338[] = djyasinzou_room_24Tex_003338; -#define djyasinzou_room_24Tex_004338 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_004338" -static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_004338[] = djyasinzou_room_24Tex_004338; +#define djyasinzou_room_24Tex_003B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_003B38" +static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_003B38[] = djyasinzou_room_24Tex_003B38; #define djyasinzou_room_24Tex_003F38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_003F38" static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_003F38[] = djyasinzou_room_24Tex_003F38; +#define djyasinzou_room_24Tex_004338 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_004338" +static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_004338[] = djyasinzou_room_24Tex_004338; + +#define djyasinzou_room_24Tex_004B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_004B38" +static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_004B38[] = djyasinzou_room_24Tex_004B38; + +#define djyasinzou_room_24Tex_0054D0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_0054D0" +static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_0054D0[] = djyasinzou_room_24Tex_0054D0; + +#define djyasinzou_room_24DL_000A30 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24DL_000A30" +static const ALIGN_ASSET(2) char jyasinzou_room_24DL_000A30[] = djyasinzou_room_24DL_000A30; + #define djyasinzou_room_24DL_001390 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24DL_001390" static const ALIGN_ASSET(2) char jyasinzou_room_24DL_001390[] = djyasinzou_room_24DL_001390; -#define djyasinzou_room_24Tex_001B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_001B38" -static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_001B38[] = djyasinzou_room_24Tex_001B38; - -#define djyasinzou_room_24Tex_003B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_003B38" -static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_003B38[] = djyasinzou_room_24Tex_003B38; - #define djyasinzou_room_24DL_001610 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24DL_001610" static const ALIGN_ASSET(2) char jyasinzou_room_24DL_001610[] = djyasinzou_room_24DL_001610; #define djyasinzou_room_24DL_001950 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24DL_001950" static const ALIGN_ASSET(2) char jyasinzou_room_24DL_001950[] = djyasinzou_room_24DL_001950; -#define djyasinzou_room_24Tex_002B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_002B38" -static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_002B38[] = djyasinzou_room_24Tex_002B38; - #define djyasinzou_room_24DL_005400 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24DL_005400" static const ALIGN_ASSET(2) char jyasinzou_room_24DL_005400[] = djyasinzou_room_24DL_005400; -#define djyasinzou_room_24Tex_0054D0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_0054D0" -static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_0054D0[] = djyasinzou_room_24Tex_0054D0; - #endif // DUNGEONS_JYASINZOU_ROOM_24_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_25.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_25.h index 1c6fcf821..5e20f5867 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_25.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_25.h @@ -3,45 +3,105 @@ #include "align_asset_macro.h" -#define djyasinzou_room_25DL_000620 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_000620" -static const ALIGN_ASSET(2) char jyasinzou_room_25DL_000620[] = djyasinzou_room_25DL_000620; +#define djyasinzou_room_25Tex_00BA98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00BA98" +static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00BA98[] = djyasinzou_room_25Tex_00BA98; -#define djyasinzou_room_25Tex_015398 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_015398" -static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_015398[] = djyasinzou_room_25Tex_015398; - -#define djyasinzou_room_25DL_000F10 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_000F10" -static const ALIGN_ASSET(2) char jyasinzou_room_25DL_000F10[] = djyasinzou_room_25DL_000F10; - -#define djyasinzou_room_25Tex_011398 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_011398" -static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_011398[] = djyasinzou_room_25Tex_011398; +#define djyasinzou_room_25Tex_00BE98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00BE98" +static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00BE98[] = djyasinzou_room_25Tex_00BE98; #define djyasinzou_room_25Tex_00CE98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00CE98" static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00CE98[] = djyasinzou_room_25Tex_00CE98; +#define djyasinzou_room_25Tex_00D698 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00D698" +static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00D698[] = djyasinzou_room_25Tex_00D698; + +#define djyasinzou_room_25Tex_00DA98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00DA98" +static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00DA98[] = djyasinzou_room_25Tex_00DA98; + +#define djyasinzou_room_25Tex_00DE98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00DE98" +static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00DE98[] = djyasinzou_room_25Tex_00DE98; + #define djyasinzou_room_25Tex_00E698 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00E698" static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00E698[] = djyasinzou_room_25Tex_00E698; +#define djyasinzou_room_25Tex_00EE98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00EE98" +static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00EE98[] = djyasinzou_room_25Tex_00EE98; + +#define djyasinzou_room_25Tex_00F298 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00F298" +static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00F298[] = djyasinzou_room_25Tex_00F298; + +#define djyasinzou_room_25Tex_00F698 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00F698" +static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00F698[] = djyasinzou_room_25Tex_00F698; + +#define djyasinzou_room_25Tex_00FE98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00FE98" +static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00FE98[] = djyasinzou_room_25Tex_00FE98; + +#define djyasinzou_room_25Tex_00FF98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00FF98" +static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00FF98[] = djyasinzou_room_25Tex_00FF98; + +#define djyasinzou_room_25Tex_010398 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_010398" +static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_010398[] = djyasinzou_room_25Tex_010398; + +#define djyasinzou_room_25Tex_010798 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_010798" +static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_010798[] = djyasinzou_room_25Tex_010798; + +#define djyasinzou_room_25Tex_010B98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_010B98" +static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_010B98[] = djyasinzou_room_25Tex_010B98; + +#define djyasinzou_room_25Tex_010F98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_010F98" +static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_010F98[] = djyasinzou_room_25Tex_010F98; + +#define djyasinzou_room_25Tex_011398 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_011398" +static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_011398[] = djyasinzou_room_25Tex_011398; + +#define djyasinzou_room_25Tex_011798 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_011798" +static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_011798[] = djyasinzou_room_25Tex_011798; + +#define djyasinzou_room_25Tex_011F98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_011F98" +static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_011F98[] = djyasinzou_room_25Tex_011F98; + +#define djyasinzou_room_25Tex_012798 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_012798" +static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_012798[] = djyasinzou_room_25Tex_012798; + +#define djyasinzou_room_25Tex_012B98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_012B98" +static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_012B98[] = djyasinzou_room_25Tex_012B98; + +#define djyasinzou_room_25Tex_013398 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_013398" +static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_013398[] = djyasinzou_room_25Tex_013398; + +#define djyasinzou_room_25Tex_013B98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_013B98" +static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_013B98[] = djyasinzou_room_25Tex_013B98; + +#define djyasinzou_room_25Tex_014398 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_014398" +static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_014398[] = djyasinzou_room_25Tex_014398; + #define djyasinzou_room_25Tex_014798 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_014798" static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_014798[] = djyasinzou_room_25Tex_014798; +#define djyasinzou_room_25Tex_014F98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_014F98" +static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_014F98[] = djyasinzou_room_25Tex_014F98; + +#define djyasinzou_room_25Tex_015398 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_015398" +static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_015398[] = djyasinzou_room_25Tex_015398; + +#define djyasinzou_room_25TLUT_00B8A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25TLUT_00B8A0" +static const ALIGN_ASSET(2) char jyasinzou_room_25TLUT_00B8A0[] = djyasinzou_room_25TLUT_00B8A0; + +#define djyasinzou_room_25DL_000620 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_000620" +static const ALIGN_ASSET(2) char jyasinzou_room_25DL_000620[] = djyasinzou_room_25DL_000620; + +#define djyasinzou_room_25DL_000F10 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_000F10" +static const ALIGN_ASSET(2) char jyasinzou_room_25DL_000F10[] = djyasinzou_room_25DL_000F10; + #define djyasinzou_room_25DL_0019A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_0019A0" static const ALIGN_ASSET(2) char jyasinzou_room_25DL_0019A0[] = djyasinzou_room_25DL_0019A0; #define djyasinzou_room_25DL_001E00 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_001E00" static const ALIGN_ASSET(2) char jyasinzou_room_25DL_001E00[] = djyasinzou_room_25DL_001E00; -#define djyasinzou_room_25Tex_013398 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_013398" -static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_013398[] = djyasinzou_room_25Tex_013398; - -#define djyasinzou_room_25Tex_011F98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_011F98" -static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_011F98[] = djyasinzou_room_25Tex_011F98; - #define djyasinzou_room_25DL_002418 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_002418" static const ALIGN_ASSET(2) char jyasinzou_room_25DL_002418[] = djyasinzou_room_25DL_002418; -#define djyasinzou_room_25Tex_011798 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_011798" -static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_011798[] = djyasinzou_room_25Tex_011798; - #define djyasinzou_room_25DL_002610 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_002610" static const ALIGN_ASSET(2) char jyasinzou_room_25DL_002610[] = djyasinzou_room_25DL_002610; @@ -54,21 +114,12 @@ static const ALIGN_ASSET(2) char jyasinzou_room_25DL_002A00[] = djyasinzou_room_ #define djyasinzou_room_25DL_002C78 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_002C78" static const ALIGN_ASSET(2) char jyasinzou_room_25DL_002C78[] = djyasinzou_room_25DL_002C78; -#define djyasinzou_room_25Tex_00BA98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00BA98" -static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00BA98[] = djyasinzou_room_25Tex_00BA98; - #define djyasinzou_room_25DL_002ED8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_002ED8" static const ALIGN_ASSET(2) char jyasinzou_room_25DL_002ED8[] = djyasinzou_room_25DL_002ED8; -#define djyasinzou_room_25Tex_014398 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_014398" -static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_014398[] = djyasinzou_room_25Tex_014398; - #define djyasinzou_room_25DL_003298 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_003298" static const ALIGN_ASSET(2) char jyasinzou_room_25DL_003298[] = djyasinzou_room_25DL_003298; -#define djyasinzou_room_25Tex_00DE98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00DE98" -static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00DE98[] = djyasinzou_room_25Tex_00DE98; - #define djyasinzou_room_25DL_0034D0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_0034D0" static const ALIGN_ASSET(2) char jyasinzou_room_25DL_0034D0[] = djyasinzou_room_25DL_0034D0; @@ -78,15 +129,6 @@ static const ALIGN_ASSET(2) char jyasinzou_room_25DL_0038F0[] = djyasinzou_room_ #define djyasinzou_room_25DL_0041F8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_0041F8" static const ALIGN_ASSET(2) char jyasinzou_room_25DL_0041F8[] = djyasinzou_room_25DL_0041F8; -#define djyasinzou_room_25Tex_012B98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_012B98" -static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_012B98[] = djyasinzou_room_25Tex_012B98; - -#define djyasinzou_room_25Tex_012798 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_012798" -static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_012798[] = djyasinzou_room_25Tex_012798; - -#define djyasinzou_room_25Tex_013B98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_013B98" -static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_013B98[] = djyasinzou_room_25Tex_013B98; - #define djyasinzou_room_25DL_004B60 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_004B60" static const ALIGN_ASSET(2) char jyasinzou_room_25DL_004B60[] = djyasinzou_room_25DL_004B60; @@ -99,89 +141,47 @@ static const ALIGN_ASSET(2) char jyasinzou_room_25DL_005050[] = djyasinzou_room_ #define djyasinzou_room_25DL_005340 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_005340" static const ALIGN_ASSET(2) char jyasinzou_room_25DL_005340[] = djyasinzou_room_25DL_005340; -#define djyasinzou_room_25Tex_00DA98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00DA98" -static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00DA98[] = djyasinzou_room_25Tex_00DA98; - -#define djyasinzou_room_25TLUT_00B8A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25TLUT_00B8A0" -static const ALIGN_ASSET(2) char jyasinzou_room_25TLUT_00B8A0[] = djyasinzou_room_25TLUT_00B8A0; - #define djyasinzou_room_25DL_005670 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_005670" static const ALIGN_ASSET(2) char jyasinzou_room_25DL_005670[] = djyasinzou_room_25DL_005670; -#define djyasinzou_room_25Tex_010398 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_010398" -static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_010398[] = djyasinzou_room_25Tex_010398; - #define djyasinzou_room_25DL_0059D0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_0059D0" static const ALIGN_ASSET(2) char jyasinzou_room_25DL_0059D0[] = djyasinzou_room_25DL_0059D0; #define djyasinzou_room_25DL_005E28 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_005E28" static const ALIGN_ASSET(2) char jyasinzou_room_25DL_005E28[] = djyasinzou_room_25DL_005E28; -#define djyasinzou_room_25Tex_00F698 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00F698" -static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00F698[] = djyasinzou_room_25Tex_00F698; - #define djyasinzou_room_25DL_006400 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_006400" static const ALIGN_ASSET(2) char jyasinzou_room_25DL_006400[] = djyasinzou_room_25DL_006400; #define djyasinzou_room_25DL_006E18 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_006E18" static const ALIGN_ASSET(2) char jyasinzou_room_25DL_006E18[] = djyasinzou_room_25DL_006E18; -#define djyasinzou_room_25Tex_00F298 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00F298" -static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00F298[] = djyasinzou_room_25Tex_00F298; - -#define djyasinzou_room_25Tex_010798 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_010798" -static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_010798[] = djyasinzou_room_25Tex_010798; - #define djyasinzou_room_25DL_0076A8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_0076A8" static const ALIGN_ASSET(2) char jyasinzou_room_25DL_0076A8[] = djyasinzou_room_25DL_0076A8; -#define djyasinzou_room_25Tex_010B98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_010B98" -static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_010B98[] = djyasinzou_room_25Tex_010B98; - #define djyasinzou_room_25DL_007958 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_007958" static const ALIGN_ASSET(2) char jyasinzou_room_25DL_007958[] = djyasinzou_room_25DL_007958; -#define djyasinzou_room_25Tex_00FE98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00FE98" -static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00FE98[] = djyasinzou_room_25Tex_00FE98; - #define djyasinzou_room_25DL_007DF0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_007DF0" static const ALIGN_ASSET(2) char jyasinzou_room_25DL_007DF0[] = djyasinzou_room_25DL_007DF0; #define djyasinzou_room_25DL_0083F8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_0083F8" static const ALIGN_ASSET(2) char jyasinzou_room_25DL_0083F8[] = djyasinzou_room_25DL_0083F8; -#define djyasinzou_room_25Tex_00FF98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00FF98" -static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00FF98[] = djyasinzou_room_25Tex_00FF98; - -#define djyasinzou_room_25Tex_010F98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_010F98" -static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_010F98[] = djyasinzou_room_25Tex_010F98; - #define djyasinzou_room_25DL_008C30 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_008C30" static const ALIGN_ASSET(2) char jyasinzou_room_25DL_008C30[] = djyasinzou_room_25DL_008C30; #define djyasinzou_room_25DL_009010 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_009010" static const ALIGN_ASSET(2) char jyasinzou_room_25DL_009010[] = djyasinzou_room_25DL_009010; -#define djyasinzou_room_25Tex_00EE98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00EE98" -static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00EE98[] = djyasinzou_room_25Tex_00EE98; - #define djyasinzou_room_25DL_009248 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_009248" static const ALIGN_ASSET(2) char jyasinzou_room_25DL_009248[] = djyasinzou_room_25DL_009248; #define djyasinzou_room_25DL_00A0E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_00A0E0" static const ALIGN_ASSET(2) char jyasinzou_room_25DL_00A0E0[] = djyasinzou_room_25DL_00A0E0; -#define djyasinzou_room_25Tex_00D698 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00D698" -static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00D698[] = djyasinzou_room_25Tex_00D698; - -#define djyasinzou_room_25Tex_014F98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_014F98" -static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_014F98[] = djyasinzou_room_25Tex_014F98; - #define djyasinzou_room_25DL_00B540 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_00B540" static const ALIGN_ASSET(2) char jyasinzou_room_25DL_00B540[] = djyasinzou_room_25DL_00B540; -#define djyasinzou_room_25Tex_00BE98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00BE98" -static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00BE98[] = djyasinzou_room_25Tex_00BE98; - #endif // DUNGEONS_JYASINZOU_ROOM_25_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_26.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_26.h index 9d9f96be5..be788a764 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_26.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_26.h @@ -3,14 +3,47 @@ #include "align_asset_macro.h" -#define djyasinzou_room_26DL_005468 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_005468" -static const ALIGN_ASSET(2) char jyasinzou_room_26DL_005468[] = djyasinzou_room_26DL_005468; +#define djyasinzou_room_26Tex_006CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_006CC8" +static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_006CC8[] = djyasinzou_room_26Tex_006CC8; + +#define djyasinzou_room_26Tex_0070C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_0070C8" +static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_0070C8[] = djyasinzou_room_26Tex_0070C8; + +#define djyasinzou_room_26Tex_0080C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_0080C8" +static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_0080C8[] = djyasinzou_room_26Tex_0080C8; + +#define djyasinzou_room_26Tex_0082C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_0082C8" +static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_0082C8[] = djyasinzou_room_26Tex_0082C8; + +#define djyasinzou_room_26Tex_008AC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_008AC8" +static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_008AC8[] = djyasinzou_room_26Tex_008AC8; + +#define djyasinzou_room_26Tex_008CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_008CC8" +static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_008CC8[] = djyasinzou_room_26Tex_008CC8; + +#define djyasinzou_room_26Tex_0094C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_0094C8" +static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_0094C8[] = djyasinzou_room_26Tex_0094C8; + +#define djyasinzou_room_26Tex_009CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_009CC8" +static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_009CC8[] = djyasinzou_room_26Tex_009CC8; + +#define djyasinzou_room_26Tex_00A0C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00A0C8" +static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00A0C8[] = djyasinzou_room_26Tex_00A0C8; #define djyasinzou_room_26Tex_00A8C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00A8C8" static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00A8C8[] = djyasinzou_room_26Tex_00A8C8; -#define djyasinzou_room_26Tex_008CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_008CC8" -static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_008CC8[] = djyasinzou_room_26Tex_008CC8; +#define djyasinzou_room_26Tex_00ACC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00ACC8" +static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00ACC8[] = djyasinzou_room_26Tex_00ACC8; + +#define djyasinzou_room_26Tex_00B4C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00B4C8" +static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00B4C8[] = djyasinzou_room_26Tex_00B4C8; + +#define djyasinzou_room_26Tex_00C2F8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00C2F8" +static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00C2F8[] = djyasinzou_room_26Tex_00C2F8; + +#define djyasinzou_room_26DL_005468 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_005468" +static const ALIGN_ASSET(2) char jyasinzou_room_26DL_005468[] = djyasinzou_room_26DL_005468; #define djyasinzou_room_26DL_001AD0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_001AD0" static const ALIGN_ASSET(2) char jyasinzou_room_26DL_001AD0[] = djyasinzou_room_26DL_001AD0; @@ -18,9 +51,6 @@ static const ALIGN_ASSET(2) char jyasinzou_room_26DL_001AD0[] = djyasinzou_room_ #define djyasinzou_room_26DL_002290 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_002290" static const ALIGN_ASSET(2) char jyasinzou_room_26DL_002290[] = djyasinzou_room_26DL_002290; -#define djyasinzou_room_26Tex_008AC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_008AC8" -static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_008AC8[] = djyasinzou_room_26Tex_008AC8; - #define djyasinzou_room_26DL_0028C0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_0028C0" static const ALIGN_ASSET(2) char jyasinzou_room_26DL_0028C0[] = djyasinzou_room_26DL_0028C0; @@ -48,39 +78,12 @@ static const ALIGN_ASSET(2) char jyasinzou_room_26DL_0035B0[] = djyasinzou_room_ #define djyasinzou_room_26DL_0046A8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_0046A8" static const ALIGN_ASSET(2) char jyasinzou_room_26DL_0046A8[] = djyasinzou_room_26DL_0046A8; -#define djyasinzou_room_26Tex_00A0C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00A0C8" -static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00A0C8[] = djyasinzou_room_26Tex_00A0C8; - -#define djyasinzou_room_26Tex_0080C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_0080C8" -static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_0080C8[] = djyasinzou_room_26Tex_0080C8; - -#define djyasinzou_room_26Tex_00ACC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00ACC8" -static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00ACC8[] = djyasinzou_room_26Tex_00ACC8; - -#define djyasinzou_room_26Tex_0082C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_0082C8" -static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_0082C8[] = djyasinzou_room_26Tex_0082C8; - -#define djyasinzou_room_26Tex_00B4C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00B4C8" -static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00B4C8[] = djyasinzou_room_26Tex_00B4C8; - -#define djyasinzou_room_26Tex_0094C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_0094C8" -static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_0094C8[] = djyasinzou_room_26Tex_0094C8; - -#define djyasinzou_room_26Tex_009CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_009CC8" -static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_009CC8[] = djyasinzou_room_26Tex_009CC8; - #define djyasinzou_room_26DL_00C200 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_00C200" static const ALIGN_ASSET(2) char jyasinzou_room_26DL_00C200[] = djyasinzou_room_26DL_00C200; -#define djyasinzou_room_26Tex_00C2F8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00C2F8" -static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00C2F8[] = djyasinzou_room_26Tex_00C2F8; - #define djyasinzou_room_26DL_005A80 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_005A80" static const ALIGN_ASSET(2) char jyasinzou_room_26DL_005A80[] = djyasinzou_room_26DL_005A80; -#define djyasinzou_room_26Tex_006CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_006CC8" -static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_006CC8[] = djyasinzou_room_26Tex_006CC8; - #define djyasinzou_room_26DL_005D20 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_005D20" static const ALIGN_ASSET(2) char jyasinzou_room_26DL_005D20[] = djyasinzou_room_26DL_005D20; @@ -90,9 +93,6 @@ static const ALIGN_ASSET(2) char jyasinzou_room_26DL_005FF0[] = djyasinzou_room_ #define djyasinzou_room_26DL_006560 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_006560" static const ALIGN_ASSET(2) char jyasinzou_room_26DL_006560[] = djyasinzou_room_26DL_006560; -#define djyasinzou_room_26Tex_0070C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_0070C8" -static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_0070C8[] = djyasinzou_room_26Tex_0070C8; - #define djyasinzou_room_26DL_006A98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_006A98" static const ALIGN_ASSET(2) char jyasinzou_room_26DL_006A98[] = djyasinzou_room_26DL_006A98; diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_27.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_27.h index 071317efe..ddcd8f0bc 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_27.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_27.h @@ -3,6 +3,15 @@ #include "align_asset_macro.h" +#define djyasinzou_room_27Tex_004310 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_27Tex_004310" +static const ALIGN_ASSET(2) char jyasinzou_room_27Tex_004310[] = djyasinzou_room_27Tex_004310; + +#define djyasinzou_room_27Tex_004B10 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_27Tex_004B10" +static const ALIGN_ASSET(2) char jyasinzou_room_27Tex_004B10[] = djyasinzou_room_27Tex_004B10; + +#define djyasinzou_room_27Tex_004F10 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_27Tex_004F10" +static const ALIGN_ASSET(2) char jyasinzou_room_27Tex_004F10[] = djyasinzou_room_27Tex_004F10; + #define djyasinzou_room_27DL_000598 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_27DL_000598" static const ALIGN_ASSET(2) char jyasinzou_room_27DL_000598[] = djyasinzou_room_27DL_000598; @@ -24,20 +33,11 @@ static const ALIGN_ASSET(2) char jyasinzou_room_27DL_001120[] = djyasinzou_room_ #define djyasinzou_room_27DL_001CB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_27DL_001CB0" static const ALIGN_ASSET(2) char jyasinzou_room_27DL_001CB0[] = djyasinzou_room_27DL_001CB0; -#define djyasinzou_room_27Tex_004310 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_27Tex_004310" -static const ALIGN_ASSET(2) char jyasinzou_room_27Tex_004310[] = djyasinzou_room_27Tex_004310; - -#define djyasinzou_room_27Tex_004F10 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_27Tex_004F10" -static const ALIGN_ASSET(2) char jyasinzou_room_27Tex_004F10[] = djyasinzou_room_27Tex_004F10; - #define djyasinzou_room_27DL_003138 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_27DL_003138" static const ALIGN_ASSET(2) char jyasinzou_room_27DL_003138[] = djyasinzou_room_27DL_003138; #define djyasinzou_room_27DL_004150 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_27DL_004150" static const ALIGN_ASSET(2) char jyasinzou_room_27DL_004150[] = djyasinzou_room_27DL_004150; -#define djyasinzou_room_27Tex_004B10 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_27Tex_004B10" -static const ALIGN_ASSET(2) char jyasinzou_room_27Tex_004B10[] = djyasinzou_room_27Tex_004B10; - #endif // DUNGEONS_JYASINZOU_ROOM_27_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_28.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_28.h index 70b76b61f..3a06d2535 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_28.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_28.h @@ -3,38 +3,47 @@ #include "align_asset_macro.h" -#define djyasinzou_room_28DL_000D00 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_000D00" -static const ALIGN_ASSET(2) char jyasinzou_room_28DL_000D00[] = djyasinzou_room_28DL_000D00; - -#define djyasinzou_room_28Tex_007530 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_007530" -static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_007530[] = djyasinzou_room_28Tex_007530; - -#define djyasinzou_room_28Tex_005130 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_005130" -static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_005130[] = djyasinzou_room_28Tex_005130; - -#define djyasinzou_room_28Tex_007E30 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_007E30" -static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_007E30[] = djyasinzou_room_28Tex_007E30; - -#define djyasinzou_room_28DL_001708 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_001708" -static const ALIGN_ASSET(2) char jyasinzou_room_28DL_001708[] = djyasinzou_room_28DL_001708; - -#define djyasinzou_room_28Tex_008630 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_008630" -static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_008630[] = djyasinzou_room_28Tex_008630; - #define djyasinzou_room_28Tex_004130 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_004130" static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_004130[] = djyasinzou_room_28Tex_004130; #define djyasinzou_room_28Tex_004930 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_004930" static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_004930[] = djyasinzou_room_28Tex_004930; -#define djyasinzou_room_28DL_0028A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_0028A0" -static const ALIGN_ASSET(2) char jyasinzou_room_28DL_0028A0[] = djyasinzou_room_28DL_0028A0; +#define djyasinzou_room_28Tex_005130 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_005130" +static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_005130[] = djyasinzou_room_28Tex_005130; + +#define djyasinzou_room_28Tex_005930 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_005930" +static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_005930[] = djyasinzou_room_28Tex_005930; + +#define djyasinzou_room_28Tex_006130 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_006130" +static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_006130[] = djyasinzou_room_28Tex_006130; + +#define djyasinzou_room_28Tex_006530 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_006530" +static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_006530[] = djyasinzou_room_28Tex_006530; + +#define djyasinzou_room_28Tex_007530 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_007530" +static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_007530[] = djyasinzou_room_28Tex_007530; + +#define djyasinzou_room_28Tex_007930 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_007930" +static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_007930[] = djyasinzou_room_28Tex_007930; #define djyasinzou_room_28Tex_007A30 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_007A30" static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_007A30[] = djyasinzou_room_28Tex_007A30; -#define djyasinzou_room_28Tex_007930 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_007930" -static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_007930[] = djyasinzou_room_28Tex_007930; +#define djyasinzou_room_28Tex_007E30 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_007E30" +static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_007E30[] = djyasinzou_room_28Tex_007E30; + +#define djyasinzou_room_28Tex_008630 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_008630" +static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_008630[] = djyasinzou_room_28Tex_008630; + +#define djyasinzou_room_28DL_000D00 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_000D00" +static const ALIGN_ASSET(2) char jyasinzou_room_28DL_000D00[] = djyasinzou_room_28DL_000D00; + +#define djyasinzou_room_28DL_001708 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_001708" +static const ALIGN_ASSET(2) char jyasinzou_room_28DL_001708[] = djyasinzou_room_28DL_001708; + +#define djyasinzou_room_28DL_0028A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_0028A0" +static const ALIGN_ASSET(2) char jyasinzou_room_28DL_0028A0[] = djyasinzou_room_28DL_0028A0; #define djyasinzou_room_28DL_0032F8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_0032F8" static const ALIGN_ASSET(2) char jyasinzou_room_28DL_0032F8[] = djyasinzou_room_28DL_0032F8; @@ -42,17 +51,8 @@ static const ALIGN_ASSET(2) char jyasinzou_room_28DL_0032F8[] = djyasinzou_room_ #define djyasinzou_room_28DL_0035D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_0035D8" static const ALIGN_ASSET(2) char jyasinzou_room_28DL_0035D8[] = djyasinzou_room_28DL_0035D8; -#define djyasinzou_room_28Tex_006530 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_006530" -static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_006530[] = djyasinzou_room_28Tex_006530; - #define djyasinzou_room_28DL_003E18 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_003E18" static const ALIGN_ASSET(2) char jyasinzou_room_28DL_003E18[] = djyasinzou_room_28DL_003E18; -#define djyasinzou_room_28Tex_006130 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_006130" -static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_006130[] = djyasinzou_room_28Tex_006130; - -#define djyasinzou_room_28Tex_005930 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_005930" -static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_005930[] = djyasinzou_room_28Tex_005930; - #endif // DUNGEONS_JYASINZOU_ROOM_28_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_3.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_3.h index 64354c57e..d8f9f58c4 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_3.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_3.h @@ -3,27 +3,27 @@ #include "align_asset_macro.h" -#define djyasinzou_room_3DL_001588 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3DL_001588" -static const ALIGN_ASSET(2) char jyasinzou_room_3DL_001588[] = djyasinzou_room_3DL_001588; - -#define djyasinzou_room_3Tex_0033C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3Tex_0033C8" -static const ALIGN_ASSET(2) char jyasinzou_room_3Tex_0033C8[] = djyasinzou_room_3Tex_0033C8; - -#define djyasinzou_room_3DL_001B98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3DL_001B98" -static const ALIGN_ASSET(2) char jyasinzou_room_3DL_001B98[] = djyasinzou_room_3DL_001B98; +#define djyasinzou_room_3Tex_001FC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3Tex_001FC8" +static const ALIGN_ASSET(2) char jyasinzou_room_3Tex_001FC8[] = djyasinzou_room_3Tex_001FC8; #define djyasinzou_room_3Tex_0023C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3Tex_0023C8" static const ALIGN_ASSET(2) char jyasinzou_room_3Tex_0023C8[] = djyasinzou_room_3Tex_0023C8; -#define djyasinzou_room_3Tex_001FC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3Tex_001FC8" -static const ALIGN_ASSET(2) char jyasinzou_room_3Tex_001FC8[] = djyasinzou_room_3Tex_001FC8; +#define djyasinzou_room_3Tex_002BC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3Tex_002BC8" +static const ALIGN_ASSET(2) char jyasinzou_room_3Tex_002BC8[] = djyasinzou_room_3Tex_002BC8; + +#define djyasinzou_room_3Tex_0033C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3Tex_0033C8" +static const ALIGN_ASSET(2) char jyasinzou_room_3Tex_0033C8[] = djyasinzou_room_3Tex_0033C8; + +#define djyasinzou_room_3DL_001588 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3DL_001588" +static const ALIGN_ASSET(2) char jyasinzou_room_3DL_001588[] = djyasinzou_room_3DL_001588; + +#define djyasinzou_room_3DL_001B98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3DL_001B98" +static const ALIGN_ASSET(2) char jyasinzou_room_3DL_001B98[] = djyasinzou_room_3DL_001B98; #define djyasinzou_room_3DL_000A70 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3DL_000A70" static const ALIGN_ASSET(2) char jyasinzou_room_3DL_000A70[] = djyasinzou_room_3DL_000A70; -#define djyasinzou_room_3Tex_002BC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3Tex_002BC8" -static const ALIGN_ASSET(2) char jyasinzou_room_3Tex_002BC8[] = djyasinzou_room_3Tex_002BC8; - #define djyasinzou_room_3DL_001150 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3DL_001150" static const ALIGN_ASSET(2) char jyasinzou_room_3DL_001150[] = djyasinzou_room_3DL_001150; diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_4.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_4.h index 36735173e..ce93be029 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_4.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_4.h @@ -3,48 +3,48 @@ #include "align_asset_macro.h" -#define djyasinzou_room_4DL_000A80 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4DL_000A80" -static const ALIGN_ASSET(2) char jyasinzou_room_4DL_000A80[] = djyasinzou_room_4DL_000A80; - -#define djyasinzou_room_4Tex_004698 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_004698" -static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_004698[] = djyasinzou_room_4Tex_004698; - -#define djyasinzou_room_4Tex_005B98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_005B98" -static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_005B98[] = djyasinzou_room_4Tex_005B98; +#define djyasinzou_room_4Tex_003698 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_003698" +static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_003698[] = djyasinzou_room_4Tex_003698; #define djyasinzou_room_4Tex_003E98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_003E98" static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_003E98[] = djyasinzou_room_4Tex_003E98; -#define djyasinzou_room_4Tex_006798 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_006798" -static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_006798[] = djyasinzou_room_4Tex_006798; - -#define djyasinzou_room_4DL_001240 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4DL_001240" -static const ALIGN_ASSET(2) char jyasinzou_room_4DL_001240[] = djyasinzou_room_4DL_001240; - -#define djyasinzou_room_4Tex_005698 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_005698" -static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_005698[] = djyasinzou_room_4Tex_005698; - -#define djyasinzou_room_4DL_001858 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4DL_001858" -static const ALIGN_ASSET(2) char jyasinzou_room_4DL_001858[] = djyasinzou_room_4DL_001858; - -#define djyasinzou_room_4Tex_005798 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_005798" -static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_005798[] = djyasinzou_room_4Tex_005798; +#define djyasinzou_room_4Tex_004698 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_004698" +static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_004698[] = djyasinzou_room_4Tex_004698; #define djyasinzou_room_4Tex_004E98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_004E98" static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_004E98[] = djyasinzou_room_4Tex_004E98; -#define djyasinzou_room_4DL_001D50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4DL_001D50" -static const ALIGN_ASSET(2) char jyasinzou_room_4DL_001D50[] = djyasinzou_room_4DL_001D50; +#define djyasinzou_room_4Tex_005698 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_005698" +static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_005698[] = djyasinzou_room_4Tex_005698; + +#define djyasinzou_room_4Tex_005798 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_005798" +static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_005798[] = djyasinzou_room_4Tex_005798; + +#define djyasinzou_room_4Tex_005B98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_005B98" +static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_005B98[] = djyasinzou_room_4Tex_005B98; #define djyasinzou_room_4Tex_006398 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_006398" static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_006398[] = djyasinzou_room_4Tex_006398; +#define djyasinzou_room_4Tex_006798 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_006798" +static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_006798[] = djyasinzou_room_4Tex_006798; + +#define djyasinzou_room_4DL_000A80 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4DL_000A80" +static const ALIGN_ASSET(2) char jyasinzou_room_4DL_000A80[] = djyasinzou_room_4DL_000A80; + +#define djyasinzou_room_4DL_001240 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4DL_001240" +static const ALIGN_ASSET(2) char jyasinzou_room_4DL_001240[] = djyasinzou_room_4DL_001240; + +#define djyasinzou_room_4DL_001858 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4DL_001858" +static const ALIGN_ASSET(2) char jyasinzou_room_4DL_001858[] = djyasinzou_room_4DL_001858; + +#define djyasinzou_room_4DL_001D50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4DL_001D50" +static const ALIGN_ASSET(2) char jyasinzou_room_4DL_001D50[] = djyasinzou_room_4DL_001D50; + #define djyasinzou_room_4DL_002648 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4DL_002648" static const ALIGN_ASSET(2) char jyasinzou_room_4DL_002648[] = djyasinzou_room_4DL_002648; -#define djyasinzou_room_4Tex_003698 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_003698" -static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_003698[] = djyasinzou_room_4Tex_003698; - #define djyasinzou_room_4DL_002090 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4DL_002090" static const ALIGN_ASSET(2) char jyasinzou_room_4DL_002090[] = djyasinzou_room_4DL_002090; diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_5.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_5.h index 5425cf527..f6338782c 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_5.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_5.h @@ -3,71 +3,104 @@ #include "align_asset_macro.h" -#define djyasinzou_room_5DL_001850 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_001850" -static const ALIGN_ASSET(2) char jyasinzou_room_5DL_001850[] = djyasinzou_room_5DL_001850; +#define djyasinzou_room_5Tex_00CBC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00CBC8" +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00CBC8[] = djyasinzou_room_5Tex_00CBC8; + +#define djyasinzou_room_5Tex_00CFC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00CFC8" +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00CFC8[] = djyasinzou_room_5Tex_00CFC8; #define djyasinzou_room_5Tex_00D7C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00D7C8" static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00D7C8[] = djyasinzou_room_5Tex_00D7C8; +#define djyasinzou_room_5Tex_00DBC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00DBC8" +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00DBC8[] = djyasinzou_room_5Tex_00DBC8; + +#define djyasinzou_room_5Tex_00DFC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00DFC8" +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00DFC8[] = djyasinzou_room_5Tex_00DFC8; + +#define djyasinzou_room_5Tex_00E7C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00E7C8" +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00E7C8[] = djyasinzou_room_5Tex_00E7C8; + +#define djyasinzou_room_5Tex_00EFC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00EFC8" +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00EFC8[] = djyasinzou_room_5Tex_00EFC8; + +#define djyasinzou_room_5Tex_00F3C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00F3C8" +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00F3C8[] = djyasinzou_room_5Tex_00F3C8; + +#define djyasinzou_room_5Tex_00F7C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00F7C8" +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00F7C8[] = djyasinzou_room_5Tex_00F7C8; + +#define djyasinzou_room_5Tex_00FFC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00FFC8" +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00FFC8[] = djyasinzou_room_5Tex_00FFC8; + +#define djyasinzou_room_5Tex_0100C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0100C8" +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0100C8[] = djyasinzou_room_5Tex_0100C8; + +#define djyasinzou_room_5Tex_0108C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0108C8" +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0108C8[] = djyasinzou_room_5Tex_0108C8; + +#define djyasinzou_room_5Tex_010CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_010CC8" +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_010CC8[] = djyasinzou_room_5Tex_010CC8; + +#define djyasinzou_room_5Tex_0110C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0110C8" +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0110C8[] = djyasinzou_room_5Tex_0110C8; + +#define djyasinzou_room_5Tex_0114C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0114C8" +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0114C8[] = djyasinzou_room_5Tex_0114C8; + +#define djyasinzou_room_5Tex_0118C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0118C8" +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0118C8[] = djyasinzou_room_5Tex_0118C8; + +#define djyasinzou_room_5Tex_011CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_011CC8" +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_011CC8[] = djyasinzou_room_5Tex_011CC8; + +#define djyasinzou_room_5Tex_0124C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0124C8" +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0124C8[] = djyasinzou_room_5Tex_0124C8; + +#define djyasinzou_room_5Tex_012CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_012CC8" +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_012CC8[] = djyasinzou_room_5Tex_012CC8; + +#define djyasinzou_room_5Tex_0134C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0134C8" +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0134C8[] = djyasinzou_room_5Tex_0134C8; + +#define djyasinzou_room_5Tex_0138C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0138C8" +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0138C8[] = djyasinzou_room_5Tex_0138C8; + +#define djyasinzou_room_5Tex_0140C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0140C8" +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0140C8[] = djyasinzou_room_5Tex_0140C8; + +#define djyasinzou_room_5Tex_0148C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0148C8" +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0148C8[] = djyasinzou_room_5Tex_0148C8; + +#define djyasinzou_room_5Tex_0150C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0150C8" +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0150C8[] = djyasinzou_room_5Tex_0150C8; + #define djyasinzou_room_5Tex_0158C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0158C8" static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0158C8[] = djyasinzou_room_5Tex_0158C8; #define djyasinzou_room_5Tex_015CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_015CC8" static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_015CC8[] = djyasinzou_room_5Tex_015CC8; -#define djyasinzou_room_5Tex_0140C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0140C8" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0140C8[] = djyasinzou_room_5Tex_0140C8; +#define djyasinzou_room_5Tex_016808 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_016808" +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_016808[] = djyasinzou_room_5Tex_016808; -#define djyasinzou_room_5Tex_0134C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0134C8" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0134C8[] = djyasinzou_room_5Tex_0134C8; - -#define djyasinzou_room_5Tex_00DFC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00DFC8" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00DFC8[] = djyasinzou_room_5Tex_00DFC8; - -#define djyasinzou_room_5Tex_0150C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0150C8" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0150C8[] = djyasinzou_room_5Tex_0150C8; - -#define djyasinzou_room_5Tex_012CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_012CC8" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_012CC8[] = djyasinzou_room_5Tex_012CC8; - -#define djyasinzou_room_5Tex_0124C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0124C8" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0124C8[] = djyasinzou_room_5Tex_0124C8; - -#define djyasinzou_room_5Tex_00CFC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00CFC8" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00CFC8[] = djyasinzou_room_5Tex_00CFC8; - -#define djyasinzou_room_5Tex_00E7C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00E7C8" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00E7C8[] = djyasinzou_room_5Tex_00E7C8; - -#define djyasinzou_room_5Tex_0148C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0148C8" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0148C8[] = djyasinzou_room_5Tex_0148C8; - -#define djyasinzou_room_5DL_0034C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_0034C8" -static const ALIGN_ASSET(2) char jyasinzou_room_5DL_0034C8[] = djyasinzou_room_5DL_0034C8; - -#define djyasinzou_room_5Tex_00EFC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00EFC8" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00EFC8[] = djyasinzou_room_5Tex_00EFC8; - -#define djyasinzou_room_5DL_003C50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_003C50" -static const ALIGN_ASSET(2) char jyasinzou_room_5DL_003C50[] = djyasinzou_room_5DL_003C50; - -#define djyasinzou_room_5Tex_00DBC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00DBC8" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00DBC8[] = djyasinzou_room_5Tex_00DBC8; +#define djyasinzou_room_5Tex_017008 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_017008" +static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_017008[] = djyasinzou_room_5Tex_017008; #define djyasinzou_room_5TLUT_00C9B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5TLUT_00C9B0" static const ALIGN_ASSET(2) char jyasinzou_room_5TLUT_00C9B0[] = djyasinzou_room_5TLUT_00C9B0; -#define djyasinzou_room_5Tex_00FFC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00FFC8" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00FFC8[] = djyasinzou_room_5Tex_00FFC8; +#define djyasinzou_room_5TLUT_00CBA8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5TLUT_00CBA8" +static const ALIGN_ASSET(2) char jyasinzou_room_5TLUT_00CBA8[] = djyasinzou_room_5TLUT_00CBA8; -#define djyasinzou_room_5Tex_0108C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0108C8" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0108C8[] = djyasinzou_room_5Tex_0108C8; +#define djyasinzou_room_5DL_001850 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_001850" +static const ALIGN_ASSET(2) char jyasinzou_room_5DL_001850[] = djyasinzou_room_5DL_001850; -#define djyasinzou_room_5Tex_0118C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0118C8" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0118C8[] = djyasinzou_room_5Tex_0118C8; +#define djyasinzou_room_5DL_0034C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_0034C8" +static const ALIGN_ASSET(2) char jyasinzou_room_5DL_0034C8[] = djyasinzou_room_5DL_0034C8; -#define djyasinzou_room_5Tex_0114C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0114C8" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0114C8[] = djyasinzou_room_5Tex_0114C8; +#define djyasinzou_room_5DL_003C50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_003C50" +static const ALIGN_ASSET(2) char jyasinzou_room_5DL_003C50[] = djyasinzou_room_5DL_003C50; #define djyasinzou_room_5DL_004480 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_004480" static const ALIGN_ASSET(2) char jyasinzou_room_5DL_004480[] = djyasinzou_room_5DL_004480; @@ -75,39 +108,18 @@ static const ALIGN_ASSET(2) char jyasinzou_room_5DL_004480[] = djyasinzou_room_5 #define djyasinzou_room_5DL_005070 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_005070" static const ALIGN_ASSET(2) char jyasinzou_room_5DL_005070[] = djyasinzou_room_5DL_005070; -#define djyasinzou_room_5Tex_00F3C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00F3C8" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00F3C8[] = djyasinzou_room_5Tex_00F3C8; - -#define djyasinzou_room_5Tex_0100C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0100C8" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0100C8[] = djyasinzou_room_5Tex_0100C8; - #define djyasinzou_room_5DL_005B30 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_005B30" static const ALIGN_ASSET(2) char jyasinzou_room_5DL_005B30[] = djyasinzou_room_5DL_005B30; -#define djyasinzou_room_5Tex_011CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_011CC8" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_011CC8[] = djyasinzou_room_5Tex_011CC8; - -#define djyasinzou_room_5TLUT_00CBA8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5TLUT_00CBA8" -static const ALIGN_ASSET(2) char jyasinzou_room_5TLUT_00CBA8[] = djyasinzou_room_5TLUT_00CBA8; - #define djyasinzou_room_5DL_0165B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_0165B0" static const ALIGN_ASSET(2) char jyasinzou_room_5DL_0165B0[] = djyasinzou_room_5DL_0165B0; -#define djyasinzou_room_5Tex_016808 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_016808" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_016808[] = djyasinzou_room_5Tex_016808; - #define djyasinzou_room_5DL_0060E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_0060E8" static const ALIGN_ASSET(2) char jyasinzou_room_5DL_0060E8[] = djyasinzou_room_5DL_0060E8; #define djyasinzou_room_5DL_006F48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_006F48" static const ALIGN_ASSET(2) char jyasinzou_room_5DL_006F48[] = djyasinzou_room_5DL_006F48; -#define djyasinzou_room_5Tex_00F7C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00F7C8" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00F7C8[] = djyasinzou_room_5Tex_00F7C8; - -#define djyasinzou_room_5Tex_0110C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0110C8" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0110C8[] = djyasinzou_room_5Tex_0110C8; - #define djyasinzou_room_5DL_007E18 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_007E18" static const ALIGN_ASSET(2) char jyasinzou_room_5DL_007E18[] = djyasinzou_room_5DL_007E18; @@ -132,9 +144,6 @@ static const ALIGN_ASSET(2) char jyasinzou_room_5DL_0093B8[] = djyasinzou_room_5 #define djyasinzou_room_5DL_009688 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_009688" static const ALIGN_ASSET(2) char jyasinzou_room_5DL_009688[] = djyasinzou_room_5DL_009688; -#define djyasinzou_room_5Tex_0138C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0138C8" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0138C8[] = djyasinzou_room_5Tex_0138C8; - #define djyasinzou_room_5DL_00A018 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_00A018" static const ALIGN_ASSET(2) char jyasinzou_room_5DL_00A018[] = djyasinzou_room_5DL_00A018; @@ -147,12 +156,6 @@ static const ALIGN_ASSET(2) char jyasinzou_room_5DL_00B428[] = djyasinzou_room_5 #define djyasinzou_room_5DL_00BC70 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_00BC70" static const ALIGN_ASSET(2) char jyasinzou_room_5DL_00BC70[] = djyasinzou_room_5DL_00BC70; -#define djyasinzou_room_5Tex_010CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_010CC8" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_010CC8[] = djyasinzou_room_5Tex_010CC8; - -#define djyasinzou_room_5Tex_00CBC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00CBC8" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00CBC8[] = djyasinzou_room_5Tex_00CBC8; - #define djyasinzou_room_5DL_00C0E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_00C0E8" static const ALIGN_ASSET(2) char jyasinzou_room_5DL_00C0E8[] = djyasinzou_room_5DL_00C0E8; @@ -162,8 +165,5 @@ static const ALIGN_ASSET(2) char jyasinzou_room_5DL_00C638[] = djyasinzou_room_5 #define djyasinzou_room_5DL_016730 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_016730" static const ALIGN_ASSET(2) char jyasinzou_room_5DL_016730[] = djyasinzou_room_5DL_016730; -#define djyasinzou_room_5Tex_017008 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_017008" -static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_017008[] = djyasinzou_room_5Tex_017008; - #endif // DUNGEONS_JYASINZOU_ROOM_5_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_6.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_6.h index 36fc78839..8c4a85895 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_6.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_6.h @@ -3,11 +3,8 @@ #include "align_asset_macro.h" -#define djyasinzou_room_6DL_000340 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6DL_000340" -static const ALIGN_ASSET(2) char jyasinzou_room_6DL_000340[] = djyasinzou_room_6DL_000340; - -#define djyasinzou_room_6DL_0014D0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6DL_0014D0" -static const ALIGN_ASSET(2) char jyasinzou_room_6DL_0014D0[] = djyasinzou_room_6DL_0014D0; +#define djyasinzou_room_6Tex_002BE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6Tex_002BE8" +static const ALIGN_ASSET(2) char jyasinzou_room_6Tex_002BE8[] = djyasinzou_room_6Tex_002BE8; #define djyasinzou_room_6Tex_0033E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6Tex_0033E8" static const ALIGN_ASSET(2) char jyasinzou_room_6Tex_0033E8[] = djyasinzou_room_6Tex_0033E8; @@ -15,18 +12,21 @@ static const ALIGN_ASSET(2) char jyasinzou_room_6Tex_0033E8[] = djyasinzou_room_ #define djyasinzou_room_6Tex_0037E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6Tex_0037E8" static const ALIGN_ASSET(2) char jyasinzou_room_6Tex_0037E8[] = djyasinzou_room_6Tex_0037E8; -#define djyasinzou_room_6DL_001EC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6DL_001EC8" -static const ALIGN_ASSET(2) char jyasinzou_room_6DL_001EC8[] = djyasinzou_room_6DL_001EC8; - #define djyasinzou_room_6Tex_003FE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6Tex_003FE8" static const ALIGN_ASSET(2) char jyasinzou_room_6Tex_003FE8[] = djyasinzou_room_6Tex_003FE8; +#define djyasinzou_room_6DL_000340 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6DL_000340" +static const ALIGN_ASSET(2) char jyasinzou_room_6DL_000340[] = djyasinzou_room_6DL_000340; + +#define djyasinzou_room_6DL_0014D0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6DL_0014D0" +static const ALIGN_ASSET(2) char jyasinzou_room_6DL_0014D0[] = djyasinzou_room_6DL_0014D0; + +#define djyasinzou_room_6DL_001EC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6DL_001EC8" +static const ALIGN_ASSET(2) char jyasinzou_room_6DL_001EC8[] = djyasinzou_room_6DL_001EC8; + #define djyasinzou_room_6DL_002420 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6DL_002420" static const ALIGN_ASSET(2) char jyasinzou_room_6DL_002420[] = djyasinzou_room_6DL_002420; -#define djyasinzou_room_6Tex_002BE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6Tex_002BE8" -static const ALIGN_ASSET(2) char jyasinzou_room_6Tex_002BE8[] = djyasinzou_room_6Tex_002BE8; - #define djyasinzou_room_6DL_002950 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6DL_002950" static const ALIGN_ASSET(2) char jyasinzou_room_6DL_002950[] = djyasinzou_room_6DL_002950; diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_7.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_7.h index 2485cf2f5..8a4b789d5 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_7.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_7.h @@ -3,15 +3,24 @@ #include "align_asset_macro.h" -#define djyasinzou_room_7DL_000390 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7DL_000390" -static const ALIGN_ASSET(2) char jyasinzou_room_7DL_000390[] = djyasinzou_room_7DL_000390; - #define djyasinzou_room_7Tex_002908 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7Tex_002908" static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_002908[] = djyasinzou_room_7Tex_002908; +#define djyasinzou_room_7Tex_003908 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7Tex_003908" +static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_003908[] = djyasinzou_room_7Tex_003908; + +#define djyasinzou_room_7Tex_004108 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7Tex_004108" +static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_004108[] = djyasinzou_room_7Tex_004108; + #define djyasinzou_room_7Tex_004908 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7Tex_004908" static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_004908[] = djyasinzou_room_7Tex_004908; +#define djyasinzou_room_7Tex_004D08 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7Tex_004D08" +static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_004D08[] = djyasinzou_room_7Tex_004D08; + +#define djyasinzou_room_7DL_000390 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7DL_000390" +static const ALIGN_ASSET(2) char jyasinzou_room_7DL_000390[] = djyasinzou_room_7DL_000390; + #define djyasinzou_room_7DL_000610 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7DL_000610" static const ALIGN_ASSET(2) char jyasinzou_room_7DL_000610[] = djyasinzou_room_7DL_000610; @@ -30,15 +39,9 @@ static const ALIGN_ASSET(2) char jyasinzou_room_7DL_001010[] = djyasinzou_room_7 #define djyasinzou_room_7DL_001310 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7DL_001310" static const ALIGN_ASSET(2) char jyasinzou_room_7DL_001310[] = djyasinzou_room_7DL_001310; -#define djyasinzou_room_7Tex_003908 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7Tex_003908" -static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_003908[] = djyasinzou_room_7Tex_003908; - #define djyasinzou_room_7DL_001980 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7DL_001980" static const ALIGN_ASSET(2) char jyasinzou_room_7DL_001980[] = djyasinzou_room_7DL_001980; -#define djyasinzou_room_7Tex_004108 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7Tex_004108" -static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_004108[] = djyasinzou_room_7Tex_004108; - #define djyasinzou_room_7DL_001FD8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7DL_001FD8" static const ALIGN_ASSET(2) char jyasinzou_room_7DL_001FD8[] = djyasinzou_room_7DL_001FD8; @@ -48,8 +51,5 @@ static const ALIGN_ASSET(2) char jyasinzou_room_7DL_002340[] = djyasinzou_room_7 #define djyasinzou_room_7DL_002630 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7DL_002630" static const ALIGN_ASSET(2) char jyasinzou_room_7DL_002630[] = djyasinzou_room_7DL_002630; -#define djyasinzou_room_7Tex_004D08 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7Tex_004D08" -static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_004D08[] = djyasinzou_room_7Tex_004D08; - #endif // DUNGEONS_JYASINZOU_ROOM_7_H diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_8.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_8.h index 508a1b411..8f443d188 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_8.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_8.h @@ -3,32 +3,41 @@ #include "align_asset_macro.h" -#define djyasinzou_room_8DL_0009F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_0009F0" -static const ALIGN_ASSET(2) char jyasinzou_room_8DL_0009F0[] = djyasinzou_room_8DL_0009F0; +#define djyasinzou_room_8Tex_003A50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_003A50" +static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_003A50[] = djyasinzou_room_8Tex_003A50; -#define djyasinzou_room_8Tex_007250 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_007250" -static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_007250[] = djyasinzou_room_8Tex_007250; +#define djyasinzou_room_8Tex_004250 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_004250" +static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_004250[] = djyasinzou_room_8Tex_004250; -#define djyasinzou_room_8DL_0018D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_0018D8" -static const ALIGN_ASSET(2) char jyasinzou_room_8DL_0018D8[] = djyasinzou_room_8DL_0018D8; +#define djyasinzou_room_8Tex_004A50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_004A50" +static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_004A50[] = djyasinzou_room_8Tex_004A50; -#define djyasinzou_room_8Tex_006A50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_006A50" -static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_006A50[] = djyasinzou_room_8Tex_006A50; +#define djyasinzou_room_8Tex_004E50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_004E50" +static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_004E50[] = djyasinzou_room_8Tex_004E50; #define djyasinzou_room_8Tex_005650 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_005650" static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_005650[] = djyasinzou_room_8Tex_005650; -#define djyasinzou_room_8Tex_006250 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_006250" -static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_006250[] = djyasinzou_room_8Tex_006250; - -#define djyasinzou_room_8DL_0036E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_0036E8" -static const ALIGN_ASSET(2) char jyasinzou_room_8DL_0036E8[] = djyasinzou_room_8DL_0036E8; - #define djyasinzou_room_8Tex_005E50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_005E50" static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_005E50[] = djyasinzou_room_8Tex_005E50; -#define djyasinzou_room_8Tex_004A50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_004A50" -static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_004A50[] = djyasinzou_room_8Tex_004A50; +#define djyasinzou_room_8Tex_006250 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_006250" +static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_006250[] = djyasinzou_room_8Tex_006250; + +#define djyasinzou_room_8Tex_006A50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_006A50" +static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_006A50[] = djyasinzou_room_8Tex_006A50; + +#define djyasinzou_room_8Tex_007250 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_007250" +static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_007250[] = djyasinzou_room_8Tex_007250; + +#define djyasinzou_room_8DL_0009F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_0009F0" +static const ALIGN_ASSET(2) char jyasinzou_room_8DL_0009F0[] = djyasinzou_room_8DL_0009F0; + +#define djyasinzou_room_8DL_0018D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_0018D8" +static const ALIGN_ASSET(2) char jyasinzou_room_8DL_0018D8[] = djyasinzou_room_8DL_0018D8; + +#define djyasinzou_room_8DL_0036E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_0036E8" +static const ALIGN_ASSET(2) char jyasinzou_room_8DL_0036E8[] = djyasinzou_room_8DL_0036E8; #define djyasinzou_room_8DL_002350 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_002350" static const ALIGN_ASSET(2) char jyasinzou_room_8DL_002350[] = djyasinzou_room_8DL_002350; @@ -36,24 +45,15 @@ static const ALIGN_ASSET(2) char jyasinzou_room_8DL_002350[] = djyasinzou_room_8 #define djyasinzou_room_8DL_002720 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_002720" static const ALIGN_ASSET(2) char jyasinzou_room_8DL_002720[] = djyasinzou_room_8DL_002720; -#define djyasinzou_room_8Tex_003A50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_003A50" -static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_003A50[] = djyasinzou_room_8Tex_003A50; - #define djyasinzou_room_8DL_0028E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_0028E0" static const ALIGN_ASSET(2) char jyasinzou_room_8DL_0028E0[] = djyasinzou_room_8DL_0028E0; -#define djyasinzou_room_8Tex_004E50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_004E50" -static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_004E50[] = djyasinzou_room_8Tex_004E50; - #define djyasinzou_room_8DL_002B90 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_002B90" static const ALIGN_ASSET(2) char jyasinzou_room_8DL_002B90[] = djyasinzou_room_8DL_002B90; #define djyasinzou_room_8DL_002D70 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_002D70" static const ALIGN_ASSET(2) char jyasinzou_room_8DL_002D70[] = djyasinzou_room_8DL_002D70; -#define djyasinzou_room_8Tex_004250 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_004250" -static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_004250[] = djyasinzou_room_8Tex_004250; - #define djyasinzou_room_8DL_007ED0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_007ED0" static const ALIGN_ASSET(2) char jyasinzou_room_8DL_007ED0[] = djyasinzou_room_8DL_007ED0; diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_9.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_9.h index fdbd749c8..5ad9d38cb 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_9.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_9.h @@ -3,14 +3,17 @@ #include "align_asset_macro.h" -#define djyasinzou_room_9DL_0014E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9DL_0014E0" -static const ALIGN_ASSET(2) char jyasinzou_room_9DL_0014E0[] = djyasinzou_room_9DL_0014E0; +#define djyasinzou_room_9Tex_002DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_002DC8" +static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_002DC8[] = djyasinzou_room_9Tex_002DC8; + +#define djyasinzou_room_9Tex_003DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_003DC8" +static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_003DC8[] = djyasinzou_room_9Tex_003DC8; #define djyasinzou_room_9Tex_0045C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_0045C8" static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_0045C8[] = djyasinzou_room_9Tex_0045C8; -#define djyasinzou_room_9Tex_003DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_003DC8" -static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_003DC8[] = djyasinzou_room_9Tex_003DC8; +#define djyasinzou_room_9Tex_004DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_004DC8" +static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_004DC8[] = djyasinzou_room_9Tex_004DC8; #define djyasinzou_room_9Tex_0051C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_0051C8" static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_0051C8[] = djyasinzou_room_9Tex_0051C8; @@ -18,15 +21,12 @@ static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_0051C8[] = djyasinzou_room_ #define djyasinzou_room_9Tex_0055C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_0055C8" static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_0055C8[] = djyasinzou_room_9Tex_0055C8; +#define djyasinzou_room_9DL_0014E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9DL_0014E0" +static const ALIGN_ASSET(2) char jyasinzou_room_9DL_0014E0[] = djyasinzou_room_9DL_0014E0; + #define djyasinzou_room_9DL_001FE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9DL_001FE8" static const ALIGN_ASSET(2) char jyasinzou_room_9DL_001FE8[] = djyasinzou_room_9DL_001FE8; -#define djyasinzou_room_9Tex_002DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_002DC8" -static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_002DC8[] = djyasinzou_room_9Tex_002DC8; - -#define djyasinzou_room_9Tex_004DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_004DC8" -static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_004DC8[] = djyasinzou_room_9Tex_004DC8; - #define djyasinzou_room_9DL_002268 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9DL_002268" static const ALIGN_ASSET(2) char jyasinzou_room_9DL_002268[] = djyasinzou_room_9DL_002268; diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_scene.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_scene.h index fa52d8cac..17d673a35 100644 --- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_scene.h +++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_scene.h @@ -3,6 +3,27 @@ #include "align_asset_macro.h" +#define djyasinzou_sceneTex_018820 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTex_018820" +static const ALIGN_ASSET(2) char jyasinzou_sceneTex_018820[] = djyasinzou_sceneTex_018820; + +#define djyasinzou_sceneTex_019120 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTex_019120" +static const ALIGN_ASSET(2) char jyasinzou_sceneTex_019120[] = djyasinzou_sceneTex_019120; + +#define djyasinzou_sceneTex_019320 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTex_019320" +static const ALIGN_ASSET(2) char jyasinzou_sceneTex_019320[] = djyasinzou_sceneTex_019320; + +#define djyasinzou_sceneTLUT_017BE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTLUT_017BE0" +static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_017BE0[] = djyasinzou_sceneTLUT_017BE0; + +#define djyasinzou_sceneTLUT_017DE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTLUT_017DE0" +static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_017DE0[] = djyasinzou_sceneTLUT_017DE0; + +#define djyasinzou_sceneTLUT_017FE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTLUT_017FE0" +static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_017FE0[] = djyasinzou_sceneTLUT_017FE0; + +#define djyasinzou_sceneTLUT_018000 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTLUT_018000" +static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_018000[] = djyasinzou_sceneTLUT_018000; + #define dgSpiritTempleDayEntranceTex "__OTR__scenes/nonmq/jyasinzou_scene/gSpiritTempleDayEntranceTex" static const ALIGN_ASSET(2) char gSpiritTempleDayEntranceTex[] = dgSpiritTempleDayEntranceTex; @@ -12,25 +33,5 @@ static const ALIGN_ASSET(2) char gSpiritTempleNightEntranceTex[] = dgSpiritTempl #define djyasinzou_sceneCollisionHeader_01680C "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneCollisionHeader_01680C" static const ALIGN_ASSET(2) char jyasinzou_sceneCollisionHeader_01680C[] = djyasinzou_sceneCollisionHeader_01680C; -#define djyasinzou_sceneTLUT_017BE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTLUT_017BE0" -static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_017BE0[] = djyasinzou_sceneTLUT_017BE0; - -#define djyasinzou_sceneTLUT_018000 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTLUT_018000" -static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_018000[] = djyasinzou_sceneTLUT_018000; - -#define djyasinzou_sceneTex_019320 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTex_019320" -static const ALIGN_ASSET(2) char jyasinzou_sceneTex_019320[] = djyasinzou_sceneTex_019320; - -#define djyasinzou_sceneTex_018820 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTex_018820" -static const ALIGN_ASSET(2) char jyasinzou_sceneTex_018820[] = djyasinzou_sceneTex_018820; - -#define djyasinzou_sceneTLUT_017DE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTLUT_017DE0" -static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_017DE0[] = djyasinzou_sceneTLUT_017DE0; - -#define djyasinzou_sceneTLUT_017FE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTLUT_017FE0" -static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_017FE0[] = djyasinzou_sceneTLUT_017FE0; - -#define djyasinzou_sceneTex_019120 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTex_019120" -static const ALIGN_ASSET(2) char jyasinzou_sceneTex_019120[] = djyasinzou_sceneTex_019120; #endif // DUNGEONS_JYASINZOU_SCENE_H diff --git a/soh/assets/scenes/dungeons/men/men_room_0.h b/soh/assets/scenes/dungeons/men/men_room_0.h index 05524589e..241bd8af9 100644 --- a/soh/assets/scenes/dungeons/men/men_room_0.h +++ b/soh/assets/scenes/dungeons/men/men_room_0.h @@ -3,6 +3,45 @@ #include "align_asset_macro.h" +#define dmen_room_0Tex_008138 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_008138" +static const ALIGN_ASSET(2) char men_room_0Tex_008138[] = dmen_room_0Tex_008138; + +#define dmen_room_0Tex_008938 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_008938" +static const ALIGN_ASSET(2) char men_room_0Tex_008938[] = dmen_room_0Tex_008938; + +#define dmen_room_0Tex_009138 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_009138" +static const ALIGN_ASSET(2) char men_room_0Tex_009138[] = dmen_room_0Tex_009138; + +#define dmen_room_0Tex_009538 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_009538" +static const ALIGN_ASSET(2) char men_room_0Tex_009538[] = dmen_room_0Tex_009538; + +#define dmen_room_0Tex_009D38 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_009D38" +static const ALIGN_ASSET(2) char men_room_0Tex_009D38[] = dmen_room_0Tex_009D38; + +#define dmen_room_0Tex_00A538 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00A538" +static const ALIGN_ASSET(2) char men_room_0Tex_00A538[] = dmen_room_0Tex_00A538; + +#define dmen_room_0Tex_00B538 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00B538" +static const ALIGN_ASSET(2) char men_room_0Tex_00B538[] = dmen_room_0Tex_00B538; + +#define dmen_room_0Tex_00BD38 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00BD38" +static const ALIGN_ASSET(2) char men_room_0Tex_00BD38[] = dmen_room_0Tex_00BD38; + +#define dmen_room_0Tex_00C538 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00C538" +static const ALIGN_ASSET(2) char men_room_0Tex_00C538[] = dmen_room_0Tex_00C538; + +#define dmen_room_0Tex_00D538 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00D538" +static const ALIGN_ASSET(2) char men_room_0Tex_00D538[] = dmen_room_0Tex_00D538; + +#define dmen_room_0Tex_00DD38 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00DD38" +static const ALIGN_ASSET(2) char men_room_0Tex_00DD38[] = dmen_room_0Tex_00DD38; + +#define dmen_room_0Tex_00ED38 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00ED38" +static const ALIGN_ASSET(2) char men_room_0Tex_00ED38[] = dmen_room_0Tex_00ED38; + +#define dmen_room_0Tex_00F538 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00F538" +static const ALIGN_ASSET(2) char men_room_0Tex_00F538[] = dmen_room_0Tex_00F538; + #define dgMenDL_008118 "__OTR__scenes/nonmq/men_scene/gMenDL_008118" static const ALIGN_ASSET(2) char gMenDL_008118[] = dgMenDL_008118; @@ -15,50 +54,11 @@ static const ALIGN_ASSET(2) char men_room_0DL_00FEA0[] = dmen_room_0DL_00FEA0; #define dmen_room_0DL_002AD0 "__OTR__scenes/nonmq/men_scene/men_room_0DL_002AD0" static const ALIGN_ASSET(2) char men_room_0DL_002AD0[] = dmen_room_0DL_002AD0; -#define dmen_room_0Tex_00ED38 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00ED38" -static const ALIGN_ASSET(2) char men_room_0Tex_00ED38[] = dmen_room_0Tex_00ED38; - -#define dmen_room_0Tex_00D538 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00D538" -static const ALIGN_ASSET(2) char men_room_0Tex_00D538[] = dmen_room_0Tex_00D538; - -#define dmen_room_0Tex_008138 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_008138" -static const ALIGN_ASSET(2) char men_room_0Tex_008138[] = dmen_room_0Tex_008138; - -#define dmen_room_0Tex_00F538 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00F538" -static const ALIGN_ASSET(2) char men_room_0Tex_00F538[] = dmen_room_0Tex_00F538; - -#define dmen_room_0Tex_00BD38 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00BD38" -static const ALIGN_ASSET(2) char men_room_0Tex_00BD38[] = dmen_room_0Tex_00BD38; - -#define dmen_room_0Tex_00B538 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00B538" -static const ALIGN_ASSET(2) char men_room_0Tex_00B538[] = dmen_room_0Tex_00B538; - -#define dmen_room_0Tex_009D38 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_009D38" -static const ALIGN_ASSET(2) char men_room_0Tex_009D38[] = dmen_room_0Tex_009D38; - -#define dmen_room_0Tex_009138 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_009138" -static const ALIGN_ASSET(2) char men_room_0Tex_009138[] = dmen_room_0Tex_009138; - #define dmen_room_0DL_0066D0 "__OTR__scenes/nonmq/men_scene/men_room_0DL_0066D0" static const ALIGN_ASSET(2) char men_room_0DL_0066D0[] = dmen_room_0DL_0066D0; -#define dmen_room_0Tex_00DD38 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00DD38" -static const ALIGN_ASSET(2) char men_room_0Tex_00DD38[] = dmen_room_0Tex_00DD38; - -#define dmen_room_0Tex_009538 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_009538" -static const ALIGN_ASSET(2) char men_room_0Tex_009538[] = dmen_room_0Tex_009538; - -#define dmen_room_0Tex_00C538 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00C538" -static const ALIGN_ASSET(2) char men_room_0Tex_00C538[] = dmen_room_0Tex_00C538; - -#define dmen_room_0Tex_00A538 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00A538" -static const ALIGN_ASSET(2) char men_room_0Tex_00A538[] = dmen_room_0Tex_00A538; - #define dmen_room_0DL_007FD8 "__OTR__scenes/nonmq/men_scene/men_room_0DL_007FD8" static const ALIGN_ASSET(2) char men_room_0DL_007FD8[] = dmen_room_0DL_007FD8; -#define dmen_room_0Tex_008938 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_008938" -static const ALIGN_ASSET(2) char men_room_0Tex_008938[] = dmen_room_0Tex_008938; - #endif // DUNGEONS_MEN_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/men/men_room_1.h b/soh/assets/scenes/dungeons/men/men_room_1.h index 093fde806..cd08e4a69 100644 --- a/soh/assets/scenes/dungeons/men/men_room_1.h +++ b/soh/assets/scenes/dungeons/men/men_room_1.h @@ -3,17 +3,8 @@ #include "align_asset_macro.h" -#define dmen_room_1DL_001DA8 "__OTR__scenes/nonmq/men_scene/men_room_1DL_001DA8" -static const ALIGN_ASSET(2) char men_room_1DL_001DA8[] = dmen_room_1DL_001DA8; - -#define dmen_room_1Tex_008A70 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_008A70" -static const ALIGN_ASSET(2) char men_room_1Tex_008A70[] = dmen_room_1Tex_008A70; - -#define dmen_room_1Tex_005A70 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_005A70" -static const ALIGN_ASSET(2) char men_room_1Tex_005A70[] = dmen_room_1Tex_005A70; - -#define dmen_room_1DL_0023A8 "__OTR__scenes/nonmq/men_scene/men_room_1DL_0023A8" -static const ALIGN_ASSET(2) char men_room_1DL_0023A8[] = dmen_room_1DL_0023A8; +#define dmen_room_1Tex_004270 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_004270" +static const ALIGN_ASSET(2) char men_room_1Tex_004270[] = dmen_room_1Tex_004270; #define dmen_room_1Tex_004A70 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_004A70" static const ALIGN_ASSET(2) char men_room_1Tex_004A70[] = dmen_room_1Tex_004A70; @@ -21,12 +12,33 @@ static const ALIGN_ASSET(2) char men_room_1Tex_004A70[] = dmen_room_1Tex_004A70; #define dmen_room_1Tex_005270 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_005270" static const ALIGN_ASSET(2) char men_room_1Tex_005270[] = dmen_room_1Tex_005270; -#define dmen_room_1DL_002BD0 "__OTR__scenes/nonmq/men_scene/men_room_1DL_002BD0" -static const ALIGN_ASSET(2) char men_room_1DL_002BD0[] = dmen_room_1DL_002BD0; +#define dmen_room_1Tex_005A70 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_005A70" +static const ALIGN_ASSET(2) char men_room_1Tex_005A70[] = dmen_room_1Tex_005A70; #define dmen_room_1Tex_006270 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_006270" static const ALIGN_ASSET(2) char men_room_1Tex_006270[] = dmen_room_1Tex_006270; +#define dmen_room_1Tex_006A70 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_006A70" +static const ALIGN_ASSET(2) char men_room_1Tex_006A70[] = dmen_room_1Tex_006A70; + +#define dmen_room_1Tex_007270 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_007270" +static const ALIGN_ASSET(2) char men_room_1Tex_007270[] = dmen_room_1Tex_007270; + +#define dmen_room_1Tex_007A70 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_007A70" +static const ALIGN_ASSET(2) char men_room_1Tex_007A70[] = dmen_room_1Tex_007A70; + +#define dmen_room_1Tex_008A70 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_008A70" +static const ALIGN_ASSET(2) char men_room_1Tex_008A70[] = dmen_room_1Tex_008A70; + +#define dmen_room_1DL_001DA8 "__OTR__scenes/nonmq/men_scene/men_room_1DL_001DA8" +static const ALIGN_ASSET(2) char men_room_1DL_001DA8[] = dmen_room_1DL_001DA8; + +#define dmen_room_1DL_0023A8 "__OTR__scenes/nonmq/men_scene/men_room_1DL_0023A8" +static const ALIGN_ASSET(2) char men_room_1DL_0023A8[] = dmen_room_1DL_0023A8; + +#define dmen_room_1DL_002BD0 "__OTR__scenes/nonmq/men_scene/men_room_1DL_002BD0" +static const ALIGN_ASSET(2) char men_room_1DL_002BD0[] = dmen_room_1DL_002BD0; + #define dmen_room_1DL_002FC8 "__OTR__scenes/nonmq/men_scene/men_room_1DL_002FC8" static const ALIGN_ASSET(2) char men_room_1DL_002FC8[] = dmen_room_1DL_002FC8; @@ -42,26 +54,14 @@ static const ALIGN_ASSET(2) char men_room_1DL_003C88[] = dmen_room_1DL_003C88; #define dmen_room_1DL_003F40 "__OTR__scenes/nonmq/men_scene/men_room_1DL_003F40" static const ALIGN_ASSET(2) char men_room_1DL_003F40[] = dmen_room_1DL_003F40; -#define dmen_room_1Tex_004270 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_004270" -static const ALIGN_ASSET(2) char men_room_1Tex_004270[] = dmen_room_1Tex_004270; - #define dmen_room_1DL_004150 "__OTR__scenes/nonmq/men_scene/men_room_1DL_004150" static const ALIGN_ASSET(2) char men_room_1DL_004150[] = dmen_room_1DL_004150; -#define dmen_room_1Tex_006A70 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_006A70" -static const ALIGN_ASSET(2) char men_room_1Tex_006A70[] = dmen_room_1Tex_006A70; - #define dmen_room_1DL_001AB0 "__OTR__scenes/nonmq/men_scene/men_room_1DL_001AB0" static const ALIGN_ASSET(2) char men_room_1DL_001AB0[] = dmen_room_1DL_001AB0; -#define dmen_room_1Tex_007A70 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_007A70" -static const ALIGN_ASSET(2) char men_room_1Tex_007A70[] = dmen_room_1Tex_007A70; - #define dmen_room_1DL_000B70 "__OTR__scenes/nonmq/men_scene/men_room_1DL_000B70" static const ALIGN_ASSET(2) char men_room_1DL_000B70[] = dmen_room_1DL_000B70; -#define dmen_room_1Tex_007270 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_007270" -static const ALIGN_ASSET(2) char men_room_1Tex_007270[] = dmen_room_1Tex_007270; - #endif // DUNGEONS_MEN_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/men/men_room_10.h b/soh/assets/scenes/dungeons/men/men_room_10.h index a278ee7c2..925378867 100644 --- a/soh/assets/scenes/dungeons/men/men_room_10.h +++ b/soh/assets/scenes/dungeons/men/men_room_10.h @@ -3,50 +3,50 @@ #include "align_asset_macro.h" +#define dmen_room_10Tex_002448 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_002448" +static const ALIGN_ASSET(2) char men_room_10Tex_002448[] = dmen_room_10Tex_002448; + +#define dmen_room_10Tex_002C48 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_002C48" +static const ALIGN_ASSET(2) char men_room_10Tex_002C48[] = dmen_room_10Tex_002C48; + +#define dmen_room_10Tex_003448 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_003448" +static const ALIGN_ASSET(2) char men_room_10Tex_003448[] = dmen_room_10Tex_003448; + +#define dmen_room_10Tex_003C48 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_003C48" +static const ALIGN_ASSET(2) char men_room_10Tex_003C48[] = dmen_room_10Tex_003C48; + +#define dmen_room_10Tex_004448 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_004448" +static const ALIGN_ASSET(2) char men_room_10Tex_004448[] = dmen_room_10Tex_004448; + +#define dmen_room_10Tex_004C48 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_004C48" +static const ALIGN_ASSET(2) char men_room_10Tex_004C48[] = dmen_room_10Tex_004C48; + +#define dmen_room_10Tex_005448 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_005448" +static const ALIGN_ASSET(2) char men_room_10Tex_005448[] = dmen_room_10Tex_005448; + #define dmen_room_10DL_000280 "__OTR__scenes/nonmq/men_scene/men_room_10DL_000280" static const ALIGN_ASSET(2) char men_room_10DL_000280[] = dmen_room_10DL_000280; #define dmen_room_10DL_000928 "__OTR__scenes/nonmq/men_scene/men_room_10DL_000928" static const ALIGN_ASSET(2) char men_room_10DL_000928[] = dmen_room_10DL_000928; -#define dmen_room_10Tex_004C48 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_004C48" -static const ALIGN_ASSET(2) char men_room_10Tex_004C48[] = dmen_room_10Tex_004C48; - #define dmen_room_10DL_001398 "__OTR__scenes/nonmq/men_scene/men_room_10DL_001398" static const ALIGN_ASSET(2) char men_room_10DL_001398[] = dmen_room_10DL_001398; -#define dmen_room_10Tex_005448 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_005448" -static const ALIGN_ASSET(2) char men_room_10Tex_005448[] = dmen_room_10Tex_005448; - #define dmen_room_10DL_000C78 "__OTR__scenes/nonmq/men_scene/men_room_10DL_000C78" static const ALIGN_ASSET(2) char men_room_10DL_000C78[] = dmen_room_10DL_000C78; #define dmen_room_10DL_001AA8 "__OTR__scenes/nonmq/men_scene/men_room_10DL_001AA8" static const ALIGN_ASSET(2) char men_room_10DL_001AA8[] = dmen_room_10DL_001AA8; -#define dmen_room_10Tex_002448 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_002448" -static const ALIGN_ASSET(2) char men_room_10Tex_002448[] = dmen_room_10Tex_002448; - -#define dmen_room_10Tex_003C48 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_003C48" -static const ALIGN_ASSET(2) char men_room_10Tex_003C48[] = dmen_room_10Tex_003C48; - #define dmen_room_10DL_001EE8 "__OTR__scenes/nonmq/men_scene/men_room_10DL_001EE8" static const ALIGN_ASSET(2) char men_room_10DL_001EE8[] = dmen_room_10DL_001EE8; -#define dmen_room_10Tex_002C48 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_002C48" -static const ALIGN_ASSET(2) char men_room_10Tex_002C48[] = dmen_room_10Tex_002C48; - #define dmen_room_10DL_002138 "__OTR__scenes/nonmq/men_scene/men_room_10DL_002138" static const ALIGN_ASSET(2) char men_room_10DL_002138[] = dmen_room_10DL_002138; -#define dmen_room_10Tex_003448 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_003448" -static const ALIGN_ASSET(2) char men_room_10Tex_003448[] = dmen_room_10Tex_003448; - #define dmen_room_10DL_002340 "__OTR__scenes/nonmq/men_scene/men_room_10DL_002340" static const ALIGN_ASSET(2) char men_room_10DL_002340[] = dmen_room_10DL_002340; -#define dmen_room_10Tex_004448 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_004448" -static const ALIGN_ASSET(2) char men_room_10Tex_004448[] = dmen_room_10Tex_004448; - #endif // DUNGEONS_MEN_ROOM_10_H diff --git a/soh/assets/scenes/dungeons/men/men_room_2.h b/soh/assets/scenes/dungeons/men/men_room_2.h index b8fdadd96..2cb455b74 100644 --- a/soh/assets/scenes/dungeons/men/men_room_2.h +++ b/soh/assets/scenes/dungeons/men/men_room_2.h @@ -3,21 +3,24 @@ #include "align_asset_macro.h" -#define dmen_room_2DL_000580 "__OTR__scenes/nonmq/men_scene/men_room_2DL_000580" -static const ALIGN_ASSET(2) char men_room_2DL_000580[] = dmen_room_2DL_000580; +#define dmen_room_2Tex_003C48 "__OTR__scenes/nonmq/men_scene/men_room_2Tex_003C48" +static const ALIGN_ASSET(2) char men_room_2Tex_003C48[] = dmen_room_2Tex_003C48; #define dmen_room_2Tex_004448 "__OTR__scenes/nonmq/men_scene/men_room_2Tex_004448" static const ALIGN_ASSET(2) char men_room_2Tex_004448[] = dmen_room_2Tex_004448; +#define dmen_room_2Tex_004C48 "__OTR__scenes/nonmq/men_scene/men_room_2Tex_004C48" +static const ALIGN_ASSET(2) char men_room_2Tex_004C48[] = dmen_room_2Tex_004C48; + +#define dmen_room_2DL_000580 "__OTR__scenes/nonmq/men_scene/men_room_2DL_000580" +static const ALIGN_ASSET(2) char men_room_2DL_000580[] = dmen_room_2DL_000580; + #define dmen_room_2DL_001300 "__OTR__scenes/nonmq/men_scene/men_room_2DL_001300" static const ALIGN_ASSET(2) char men_room_2DL_001300[] = dmen_room_2DL_001300; #define dmen_room_2DL_000940 "__OTR__scenes/nonmq/men_scene/men_room_2DL_000940" static const ALIGN_ASSET(2) char men_room_2DL_000940[] = dmen_room_2DL_000940; -#define dmen_room_2Tex_004C48 "__OTR__scenes/nonmq/men_scene/men_room_2Tex_004C48" -static const ALIGN_ASSET(2) char men_room_2Tex_004C48[] = dmen_room_2Tex_004C48; - #define dmen_room_2DL_001C30 "__OTR__scenes/nonmq/men_scene/men_room_2DL_001C30" static const ALIGN_ASSET(2) char men_room_2DL_001C30[] = dmen_room_2DL_001C30; @@ -33,8 +36,5 @@ static const ALIGN_ASSET(2) char men_room_2DL_002FA0[] = dmen_room_2DL_002FA0; #define dmen_room_2DL_003928 "__OTR__scenes/nonmq/men_scene/men_room_2DL_003928" static const ALIGN_ASSET(2) char men_room_2DL_003928[] = dmen_room_2DL_003928; -#define dmen_room_2Tex_003C48 "__OTR__scenes/nonmq/men_scene/men_room_2Tex_003C48" -static const ALIGN_ASSET(2) char men_room_2Tex_003C48[] = dmen_room_2Tex_003C48; - #endif // DUNGEONS_MEN_ROOM_2_H diff --git a/soh/assets/scenes/dungeons/men/men_room_3.h b/soh/assets/scenes/dungeons/men/men_room_3.h index d839e5cf4..b58f84712 100644 --- a/soh/assets/scenes/dungeons/men/men_room_3.h +++ b/soh/assets/scenes/dungeons/men/men_room_3.h @@ -3,32 +3,32 @@ #include "align_asset_macro.h" -#define dmen_room_3DL_001740 "__OTR__scenes/nonmq/men_scene/men_room_3DL_001740" -static const ALIGN_ASSET(2) char men_room_3DL_001740[] = dmen_room_3DL_001740; +#define dmen_room_3Tex_003850 "__OTR__scenes/nonmq/men_scene/men_room_3Tex_003850" +static const ALIGN_ASSET(2) char men_room_3Tex_003850[] = dmen_room_3Tex_003850; #define dmen_room_3Tex_004050 "__OTR__scenes/nonmq/men_scene/men_room_3Tex_004050" static const ALIGN_ASSET(2) char men_room_3Tex_004050[] = dmen_room_3Tex_004050; -#define dmen_room_3Tex_003850 "__OTR__scenes/nonmq/men_scene/men_room_3Tex_003850" -static const ALIGN_ASSET(2) char men_room_3Tex_003850[] = dmen_room_3Tex_003850; - -#define dmen_room_3Tex_007450 "__OTR__scenes/nonmq/men_scene/men_room_3Tex_007450" -static const ALIGN_ASSET(2) char men_room_3Tex_007450[] = dmen_room_3Tex_007450; +#define dmen_room_3Tex_004850 "__OTR__scenes/nonmq/men_scene/men_room_3Tex_004850" +static const ALIGN_ASSET(2) char men_room_3Tex_004850[] = dmen_room_3Tex_004850; #define dmen_room_3Tex_005050 "__OTR__scenes/nonmq/men_scene/men_room_3Tex_005050" static const ALIGN_ASSET(2) char men_room_3Tex_005050[] = dmen_room_3Tex_005050; +#define dmen_room_3Tex_005850 "__OTR__scenes/nonmq/men_scene/men_room_3Tex_005850" +static const ALIGN_ASSET(2) char men_room_3Tex_005850[] = dmen_room_3Tex_005850; + #define dmen_room_3Tex_005C50 "__OTR__scenes/nonmq/men_scene/men_room_3Tex_005C50" static const ALIGN_ASSET(2) char men_room_3Tex_005C50[] = dmen_room_3Tex_005C50; #define dmen_room_3Tex_006450 "__OTR__scenes/nonmq/men_scene/men_room_3Tex_006450" static const ALIGN_ASSET(2) char men_room_3Tex_006450[] = dmen_room_3Tex_006450; -#define dmen_room_3Tex_005850 "__OTR__scenes/nonmq/men_scene/men_room_3Tex_005850" -static const ALIGN_ASSET(2) char men_room_3Tex_005850[] = dmen_room_3Tex_005850; +#define dmen_room_3Tex_007450 "__OTR__scenes/nonmq/men_scene/men_room_3Tex_007450" +static const ALIGN_ASSET(2) char men_room_3Tex_007450[] = dmen_room_3Tex_007450; -#define dmen_room_3Tex_004850 "__OTR__scenes/nonmq/men_scene/men_room_3Tex_004850" -static const ALIGN_ASSET(2) char men_room_3Tex_004850[] = dmen_room_3Tex_004850; +#define dmen_room_3DL_001740 "__OTR__scenes/nonmq/men_scene/men_room_3DL_001740" +static const ALIGN_ASSET(2) char men_room_3DL_001740[] = dmen_room_3DL_001740; #define dmen_room_3DL_002768 "__OTR__scenes/nonmq/men_scene/men_room_3DL_002768" static const ALIGN_ASSET(2) char men_room_3DL_002768[] = dmen_room_3DL_002768; diff --git a/soh/assets/scenes/dungeons/men/men_room_4.h b/soh/assets/scenes/dungeons/men/men_room_4.h index c59cad6e3..663c19522 100644 --- a/soh/assets/scenes/dungeons/men/men_room_4.h +++ b/soh/assets/scenes/dungeons/men/men_room_4.h @@ -3,20 +3,32 @@ #include "align_asset_macro.h" -#define dmen_room_4DL_003EF8 "__OTR__scenes/nonmq/men_scene/men_room_4DL_003EF8" -static const ALIGN_ASSET(2) char men_room_4DL_003EF8[] = dmen_room_4DL_003EF8; +#define dmen_room_4Tex_0051E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0051E0" +static const ALIGN_ASSET(2) char men_room_4Tex_0051E0[] = dmen_room_4Tex_0051E0; -#define dmen_room_4Tex_0099E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0099E0" -static const ALIGN_ASSET(2) char men_room_4Tex_0099E0[] = dmen_room_4Tex_0099E0; +#define dmen_room_4Tex_0059E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0059E0" +static const ALIGN_ASSET(2) char men_room_4Tex_0059E0[] = dmen_room_4Tex_0059E0; -#define dmen_room_4DL_0046B0 "__OTR__scenes/nonmq/men_scene/men_room_4DL_0046B0" -static const ALIGN_ASSET(2) char men_room_4DL_0046B0[] = dmen_room_4DL_0046B0; +#define dmen_room_4Tex_0061E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0061E0" +static const ALIGN_ASSET(2) char men_room_4Tex_0061E0[] = dmen_room_4Tex_0061E0; #define dmen_room_4Tex_0071E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0071E0" static const ALIGN_ASSET(2) char men_room_4Tex_0071E0[] = dmen_room_4Tex_0071E0; -#define dmen_room_4Tex_0061E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0061E0" -static const ALIGN_ASSET(2) char men_room_4Tex_0061E0[] = dmen_room_4Tex_0061E0; +#define dmen_room_4Tex_0081E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0081E0" +static const ALIGN_ASSET(2) char men_room_4Tex_0081E0[] = dmen_room_4Tex_0081E0; + +#define dmen_room_4Tex_0089E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0089E0" +static const ALIGN_ASSET(2) char men_room_4Tex_0089E0[] = dmen_room_4Tex_0089E0; + +#define dmen_room_4Tex_0099E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0099E0" +static const ALIGN_ASSET(2) char men_room_4Tex_0099E0[] = dmen_room_4Tex_0099E0; + +#define dmen_room_4DL_003EF8 "__OTR__scenes/nonmq/men_scene/men_room_4DL_003EF8" +static const ALIGN_ASSET(2) char men_room_4DL_003EF8[] = dmen_room_4DL_003EF8; + +#define dmen_room_4DL_0046B0 "__OTR__scenes/nonmq/men_scene/men_room_4DL_0046B0" +static const ALIGN_ASSET(2) char men_room_4DL_0046B0[] = dmen_room_4DL_0046B0; #define dmen_room_4DL_004C30 "__OTR__scenes/nonmq/men_scene/men_room_4DL_004C30" static const ALIGN_ASSET(2) char men_room_4DL_004C30[] = dmen_room_4DL_004C30; @@ -24,26 +36,14 @@ static const ALIGN_ASSET(2) char men_room_4DL_004C30[] = dmen_room_4DL_004C30; #define dmen_room_4DL_005068 "__OTR__scenes/nonmq/men_scene/men_room_4DL_005068" static const ALIGN_ASSET(2) char men_room_4DL_005068[] = dmen_room_4DL_005068; -#define dmen_room_4Tex_0051E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0051E0" -static const ALIGN_ASSET(2) char men_room_4Tex_0051E0[] = dmen_room_4Tex_0051E0; - #define dmen_room_4DL_000B10 "__OTR__scenes/nonmq/men_scene/men_room_4DL_000B10" static const ALIGN_ASSET(2) char men_room_4DL_000B10[] = dmen_room_4DL_000B10; -#define dmen_room_4Tex_0081E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0081E0" -static const ALIGN_ASSET(2) char men_room_4Tex_0081E0[] = dmen_room_4Tex_0081E0; - #define dmen_room_4DL_0015C8 "__OTR__scenes/nonmq/men_scene/men_room_4DL_0015C8" static const ALIGN_ASSET(2) char men_room_4DL_0015C8[] = dmen_room_4DL_0015C8; #define dmen_room_4DL_002F40 "__OTR__scenes/nonmq/men_scene/men_room_4DL_002F40" static const ALIGN_ASSET(2) char men_room_4DL_002F40[] = dmen_room_4DL_002F40; -#define dmen_room_4Tex_0089E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0089E0" -static const ALIGN_ASSET(2) char men_room_4Tex_0089E0[] = dmen_room_4Tex_0089E0; - -#define dmen_room_4Tex_0059E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0059E0" -static const ALIGN_ASSET(2) char men_room_4Tex_0059E0[] = dmen_room_4Tex_0059E0; - #endif // DUNGEONS_MEN_ROOM_4_H diff --git a/soh/assets/scenes/dungeons/men/men_room_5.h b/soh/assets/scenes/dungeons/men/men_room_5.h index f54f3e7d8..d2ecdda88 100644 --- a/soh/assets/scenes/dungeons/men/men_room_5.h +++ b/soh/assets/scenes/dungeons/men/men_room_5.h @@ -3,29 +3,29 @@ #include "align_asset_macro.h" -#define dmen_room_5DL_001230 "__OTR__scenes/nonmq/men_scene/men_room_5DL_001230" -static const ALIGN_ASSET(2) char men_room_5DL_001230[] = dmen_room_5DL_001230; +#define dmen_room_5Tex_002418 "__OTR__scenes/nonmq/men_scene/men_room_5Tex_002418" +static const ALIGN_ASSET(2) char men_room_5Tex_002418[] = dmen_room_5Tex_002418; -#define dmen_room_5Tex_003818 "__OTR__scenes/nonmq/men_scene/men_room_5Tex_003818" -static const ALIGN_ASSET(2) char men_room_5Tex_003818[] = dmen_room_5Tex_003818; +#define dmen_room_5Tex_002C18 "__OTR__scenes/nonmq/men_scene/men_room_5Tex_002C18" +static const ALIGN_ASSET(2) char men_room_5Tex_002C18[] = dmen_room_5Tex_002C18; #define dmen_room_5Tex_003018 "__OTR__scenes/nonmq/men_scene/men_room_5Tex_003018" static const ALIGN_ASSET(2) char men_room_5Tex_003018[] = dmen_room_5Tex_003018; +#define dmen_room_5Tex_003818 "__OTR__scenes/nonmq/men_scene/men_room_5Tex_003818" +static const ALIGN_ASSET(2) char men_room_5Tex_003818[] = dmen_room_5Tex_003818; + #define dmen_room_5Tex_004018 "__OTR__scenes/nonmq/men_scene/men_room_5Tex_004018" static const ALIGN_ASSET(2) char men_room_5Tex_004018[] = dmen_room_5Tex_004018; #define dmen_room_5Tex_004818 "__OTR__scenes/nonmq/men_scene/men_room_5Tex_004818" static const ALIGN_ASSET(2) char men_room_5Tex_004818[] = dmen_room_5Tex_004818; -#define dmen_room_5Tex_002C18 "__OTR__scenes/nonmq/men_scene/men_room_5Tex_002C18" -static const ALIGN_ASSET(2) char men_room_5Tex_002C18[] = dmen_room_5Tex_002C18; +#define dmen_room_5DL_001230 "__OTR__scenes/nonmq/men_scene/men_room_5DL_001230" +static const ALIGN_ASSET(2) char men_room_5DL_001230[] = dmen_room_5DL_001230; #define dmen_room_5DL_002128 "__OTR__scenes/nonmq/men_scene/men_room_5DL_002128" static const ALIGN_ASSET(2) char men_room_5DL_002128[] = dmen_room_5DL_002128; -#define dmen_room_5Tex_002418 "__OTR__scenes/nonmq/men_scene/men_room_5Tex_002418" -static const ALIGN_ASSET(2) char men_room_5Tex_002418[] = dmen_room_5Tex_002418; - #endif // DUNGEONS_MEN_ROOM_5_H diff --git a/soh/assets/scenes/dungeons/men/men_room_6.h b/soh/assets/scenes/dungeons/men/men_room_6.h index bd50f88b8..b1cb11937 100644 --- a/soh/assets/scenes/dungeons/men/men_room_6.h +++ b/soh/assets/scenes/dungeons/men/men_room_6.h @@ -3,62 +3,62 @@ #include "align_asset_macro.h" -#define dmen_room_6DL_0003D0 "__OTR__scenes/nonmq/men_scene/men_room_6DL_0003D0" -static const ALIGN_ASSET(2) char men_room_6DL_0003D0[] = dmen_room_6DL_0003D0; +#define dmen_room_6Tex_003F78 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_003F78" +static const ALIGN_ASSET(2) char men_room_6Tex_003F78[] = dmen_room_6Tex_003F78; + +#define dmen_room_6Tex_004778 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_004778" +static const ALIGN_ASSET(2) char men_room_6Tex_004778[] = dmen_room_6Tex_004778; + +#define dmen_room_6Tex_004F78 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_004F78" +static const ALIGN_ASSET(2) char men_room_6Tex_004F78[] = dmen_room_6Tex_004F78; + +#define dmen_room_6Tex_005378 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_005378" +static const ALIGN_ASSET(2) char men_room_6Tex_005378[] = dmen_room_6Tex_005378; + +#define dmen_room_6Tex_005B78 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_005B78" +static const ALIGN_ASSET(2) char men_room_6Tex_005B78[] = dmen_room_6Tex_005B78; #define dmen_room_6Tex_006378 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_006378" static const ALIGN_ASSET(2) char men_room_6Tex_006378[] = dmen_room_6Tex_006378; +#define dmen_room_6Tex_006B78 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_006B78" +static const ALIGN_ASSET(2) char men_room_6Tex_006B78[] = dmen_room_6Tex_006B78; + +#define dmen_room_6Tex_007378 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_007378" +static const ALIGN_ASSET(2) char men_room_6Tex_007378[] = dmen_room_6Tex_007378; + +#define dmen_room_6Tex_007778 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_007778" +static const ALIGN_ASSET(2) char men_room_6Tex_007778[] = dmen_room_6Tex_007778; + +#define dmen_room_6DL_0003D0 "__OTR__scenes/nonmq/men_scene/men_room_6DL_0003D0" +static const ALIGN_ASSET(2) char men_room_6DL_0003D0[] = dmen_room_6DL_0003D0; + #define dmen_room_6DL_001068 "__OTR__scenes/nonmq/men_scene/men_room_6DL_001068" static const ALIGN_ASSET(2) char men_room_6DL_001068[] = dmen_room_6DL_001068; #define dmen_room_6DL_000C68 "__OTR__scenes/nonmq/men_scene/men_room_6DL_000C68" static const ALIGN_ASSET(2) char men_room_6DL_000C68[] = dmen_room_6DL_000C68; -#define dmen_room_6Tex_004F78 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_004F78" -static const ALIGN_ASSET(2) char men_room_6Tex_004F78[] = dmen_room_6Tex_004F78; - #define dmen_room_6DL_0013D0 "__OTR__scenes/nonmq/men_scene/men_room_6DL_0013D0" static const ALIGN_ASSET(2) char men_room_6DL_0013D0[] = dmen_room_6DL_0013D0; -#define dmen_room_6Tex_007378 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_007378" -static const ALIGN_ASSET(2) char men_room_6Tex_007378[] = dmen_room_6Tex_007378; - #define dmen_room_6DL_0017B8 "__OTR__scenes/nonmq/men_scene/men_room_6DL_0017B8" static const ALIGN_ASSET(2) char men_room_6DL_0017B8[] = dmen_room_6DL_0017B8; #define dmen_room_6DL_003B90 "__OTR__scenes/nonmq/men_scene/men_room_6DL_003B90" static const ALIGN_ASSET(2) char men_room_6DL_003B90[] = dmen_room_6DL_003B90; -#define dmen_room_6Tex_003F78 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_003F78" -static const ALIGN_ASSET(2) char men_room_6Tex_003F78[] = dmen_room_6Tex_003F78; - #define dmen_room_6DL_002530 "__OTR__scenes/nonmq/men_scene/men_room_6DL_002530" static const ALIGN_ASSET(2) char men_room_6DL_002530[] = dmen_room_6DL_002530; -#define dmen_room_6Tex_005B78 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_005B78" -static const ALIGN_ASSET(2) char men_room_6Tex_005B78[] = dmen_room_6Tex_005B78; - #define dmen_room_6DL_002DE8 "__OTR__scenes/nonmq/men_scene/men_room_6DL_002DE8" static const ALIGN_ASSET(2) char men_room_6DL_002DE8[] = dmen_room_6DL_002DE8; -#define dmen_room_6Tex_007778 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_007778" -static const ALIGN_ASSET(2) char men_room_6Tex_007778[] = dmen_room_6Tex_007778; - -#define dmen_room_6Tex_006B78 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_006B78" -static const ALIGN_ASSET(2) char men_room_6Tex_006B78[] = dmen_room_6Tex_006B78; - #define dmen_room_6DL_0034F0 "__OTR__scenes/nonmq/men_scene/men_room_6DL_0034F0" static const ALIGN_ASSET(2) char men_room_6DL_0034F0[] = dmen_room_6DL_0034F0; -#define dmen_room_6Tex_004778 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_004778" -static const ALIGN_ASSET(2) char men_room_6Tex_004778[] = dmen_room_6Tex_004778; - #define dmen_room_6DL_003E60 "__OTR__scenes/nonmq/men_scene/men_room_6DL_003E60" static const ALIGN_ASSET(2) char men_room_6DL_003E60[] = dmen_room_6DL_003E60; -#define dmen_room_6Tex_005378 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_005378" -static const ALIGN_ASSET(2) char men_room_6Tex_005378[] = dmen_room_6Tex_005378; - #endif // DUNGEONS_MEN_ROOM_6_H diff --git a/soh/assets/scenes/dungeons/men/men_room_7.h b/soh/assets/scenes/dungeons/men/men_room_7.h index 7c9fc3602..89036fdce 100644 --- a/soh/assets/scenes/dungeons/men/men_room_7.h +++ b/soh/assets/scenes/dungeons/men/men_room_7.h @@ -3,41 +3,41 @@ #include "align_asset_macro.h" -#define dmen_room_7DL_0035D8 "__OTR__scenes/nonmq/men_scene/men_room_7DL_0035D8" -static const ALIGN_ASSET(2) char men_room_7DL_0035D8[] = dmen_room_7DL_0035D8; - -#define dmen_room_7Tex_004AB8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_004AB8" -static const ALIGN_ASSET(2) char men_room_7Tex_004AB8[] = dmen_room_7Tex_004AB8; - -#define dmen_room_7DL_003348 "__OTR__scenes/nonmq/men_scene/men_room_7DL_003348" -static const ALIGN_ASSET(2) char men_room_7DL_003348[] = dmen_room_7DL_003348; - -#define dmen_room_7Tex_0062B8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_0062B8" -static const ALIGN_ASSET(2) char men_room_7Tex_0062B8[] = dmen_room_7Tex_0062B8; - -#define dmen_room_7DL_001EC0 "__OTR__scenes/nonmq/men_scene/men_room_7DL_001EC0" -static const ALIGN_ASSET(2) char men_room_7DL_001EC0[] = dmen_room_7DL_001EC0; - -#define dmen_room_7Tex_0052B8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_0052B8" -static const ALIGN_ASSET(2) char men_room_7Tex_0052B8[] = dmen_room_7Tex_0052B8; - -#define dmen_room_7Tex_0072B8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_0072B8" -static const ALIGN_ASSET(2) char men_room_7Tex_0072B8[] = dmen_room_7Tex_0072B8; - -#define dmen_room_7Tex_0042B8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_0042B8" -static const ALIGN_ASSET(2) char men_room_7Tex_0042B8[] = dmen_room_7Tex_0042B8; - -#define dmen_room_7Tex_007AB8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_007AB8" -static const ALIGN_ASSET(2) char men_room_7Tex_007AB8[] = dmen_room_7Tex_007AB8; +#define dmen_room_7Tex_0036B8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_0036B8" +static const ALIGN_ASSET(2) char men_room_7Tex_0036B8[] = dmen_room_7Tex_0036B8; #define dmen_room_7Tex_003AB8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_003AB8" static const ALIGN_ASSET(2) char men_room_7Tex_003AB8[] = dmen_room_7Tex_003AB8; +#define dmen_room_7Tex_0042B8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_0042B8" +static const ALIGN_ASSET(2) char men_room_7Tex_0042B8[] = dmen_room_7Tex_0042B8; + +#define dmen_room_7Tex_004AB8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_004AB8" +static const ALIGN_ASSET(2) char men_room_7Tex_004AB8[] = dmen_room_7Tex_004AB8; + +#define dmen_room_7Tex_0052B8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_0052B8" +static const ALIGN_ASSET(2) char men_room_7Tex_0052B8[] = dmen_room_7Tex_0052B8; + #define dmen_room_7Tex_005AB8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_005AB8" static const ALIGN_ASSET(2) char men_room_7Tex_005AB8[] = dmen_room_7Tex_005AB8; -#define dmen_room_7Tex_0036B8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_0036B8" -static const ALIGN_ASSET(2) char men_room_7Tex_0036B8[] = dmen_room_7Tex_0036B8; +#define dmen_room_7Tex_0062B8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_0062B8" +static const ALIGN_ASSET(2) char men_room_7Tex_0062B8[] = dmen_room_7Tex_0062B8; + +#define dmen_room_7Tex_0072B8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_0072B8" +static const ALIGN_ASSET(2) char men_room_7Tex_0072B8[] = dmen_room_7Tex_0072B8; + +#define dmen_room_7Tex_007AB8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_007AB8" +static const ALIGN_ASSET(2) char men_room_7Tex_007AB8[] = dmen_room_7Tex_007AB8; + +#define dmen_room_7DL_0035D8 "__OTR__scenes/nonmq/men_scene/men_room_7DL_0035D8" +static const ALIGN_ASSET(2) char men_room_7DL_0035D8[] = dmen_room_7DL_0035D8; + +#define dmen_room_7DL_003348 "__OTR__scenes/nonmq/men_scene/men_room_7DL_003348" +static const ALIGN_ASSET(2) char men_room_7DL_003348[] = dmen_room_7DL_003348; + +#define dmen_room_7DL_001EC0 "__OTR__scenes/nonmq/men_scene/men_room_7DL_001EC0" +static const ALIGN_ASSET(2) char men_room_7DL_001EC0[] = dmen_room_7DL_001EC0; #endif // DUNGEONS_MEN_ROOM_7_H diff --git a/soh/assets/scenes/dungeons/men/men_room_8.h b/soh/assets/scenes/dungeons/men/men_room_8.h index 115e55fec..0b74cf0cd 100644 --- a/soh/assets/scenes/dungeons/men/men_room_8.h +++ b/soh/assets/scenes/dungeons/men/men_room_8.h @@ -3,21 +3,33 @@ #include "align_asset_macro.h" -#define dmen_room_8DL_003EB0 "__OTR__scenes/nonmq/men_scene/men_room_8DL_003EB0" -static const ALIGN_ASSET(2) char men_room_8DL_003EB0[] = dmen_room_8DL_003EB0; +#define dmen_room_8Tex_005D30 "__OTR__scenes/nonmq/men_scene/men_room_8Tex_005D30" +static const ALIGN_ASSET(2) char men_room_8Tex_005D30[] = dmen_room_8Tex_005D30; #define dmen_room_8Tex_006530 "__OTR__scenes/nonmq/men_scene/men_room_8Tex_006530" static const ALIGN_ASSET(2) char men_room_8Tex_006530[] = dmen_room_8Tex_006530; +#define dmen_room_8Tex_006D30 "__OTR__scenes/nonmq/men_scene/men_room_8Tex_006D30" +static const ALIGN_ASSET(2) char men_room_8Tex_006D30[] = dmen_room_8Tex_006D30; + +#define dmen_room_8Tex_007530 "__OTR__scenes/nonmq/men_scene/men_room_8Tex_007530" +static const ALIGN_ASSET(2) char men_room_8Tex_007530[] = dmen_room_8Tex_007530; + +#define dmen_room_8Tex_007630 "__OTR__scenes/nonmq/men_scene/men_room_8Tex_007630" +static const ALIGN_ASSET(2) char men_room_8Tex_007630[] = dmen_room_8Tex_007630; + +#define dmen_room_8Tex_007E30 "__OTR__scenes/nonmq/men_scene/men_room_8Tex_007E30" +static const ALIGN_ASSET(2) char men_room_8Tex_007E30[] = dmen_room_8Tex_007E30; + +#define dmen_room_8DL_003EB0 "__OTR__scenes/nonmq/men_scene/men_room_8DL_003EB0" +static const ALIGN_ASSET(2) char men_room_8DL_003EB0[] = dmen_room_8DL_003EB0; + #define dmen_room_8DL_000330 "__OTR__scenes/nonmq/men_scene/men_room_8DL_000330" static const ALIGN_ASSET(2) char men_room_8DL_000330[] = dmen_room_8DL_000330; #define dmen_room_8DL_004E08 "__OTR__scenes/nonmq/men_scene/men_room_8DL_004E08" static const ALIGN_ASSET(2) char men_room_8DL_004E08[] = dmen_room_8DL_004E08; -#define dmen_room_8Tex_005D30 "__OTR__scenes/nonmq/men_scene/men_room_8Tex_005D30" -static const ALIGN_ASSET(2) char men_room_8Tex_005D30[] = dmen_room_8Tex_005D30; - #define dmen_room_8DL_005470 "__OTR__scenes/nonmq/men_scene/men_room_8DL_005470" static const ALIGN_ASSET(2) char men_room_8DL_005470[] = dmen_room_8DL_005470; @@ -27,26 +39,14 @@ static const ALIGN_ASSET(2) char men_room_8DL_0055F0[] = dmen_room_8DL_0055F0; #define dmen_room_8DL_005A08 "__OTR__scenes/nonmq/men_scene/men_room_8DL_005A08" static const ALIGN_ASSET(2) char men_room_8DL_005A08[] = dmen_room_8DL_005A08; -#define dmen_room_8Tex_007630 "__OTR__scenes/nonmq/men_scene/men_room_8Tex_007630" -static const ALIGN_ASSET(2) char men_room_8Tex_007630[] = dmen_room_8Tex_007630; - #define dmen_room_8DL_005C20 "__OTR__scenes/nonmq/men_scene/men_room_8DL_005C20" static const ALIGN_ASSET(2) char men_room_8DL_005C20[] = dmen_room_8DL_005C20; #define dmen_room_8DL_002690 "__OTR__scenes/nonmq/men_scene/men_room_8DL_002690" static const ALIGN_ASSET(2) char men_room_8DL_002690[] = dmen_room_8DL_002690; -#define dmen_room_8Tex_007530 "__OTR__scenes/nonmq/men_scene/men_room_8Tex_007530" -static const ALIGN_ASSET(2) char men_room_8Tex_007530[] = dmen_room_8Tex_007530; - #define dmen_room_8DL_000EC0 "__OTR__scenes/nonmq/men_scene/men_room_8DL_000EC0" static const ALIGN_ASSET(2) char men_room_8DL_000EC0[] = dmen_room_8DL_000EC0; -#define dmen_room_8Tex_007E30 "__OTR__scenes/nonmq/men_scene/men_room_8Tex_007E30" -static const ALIGN_ASSET(2) char men_room_8Tex_007E30[] = dmen_room_8Tex_007E30; - -#define dmen_room_8Tex_006D30 "__OTR__scenes/nonmq/men_scene/men_room_8Tex_006D30" -static const ALIGN_ASSET(2) char men_room_8Tex_006D30[] = dmen_room_8Tex_006D30; - #endif // DUNGEONS_MEN_ROOM_8_H diff --git a/soh/assets/scenes/dungeons/men/men_room_9.h b/soh/assets/scenes/dungeons/men/men_room_9.h index 5252fe02a..f3fb23fe9 100644 --- a/soh/assets/scenes/dungeons/men/men_room_9.h +++ b/soh/assets/scenes/dungeons/men/men_room_9.h @@ -3,12 +3,21 @@ #include "align_asset_macro.h" -#define dmen_room_9DL_000700 "__OTR__scenes/nonmq/men_scene/men_room_9DL_000700" -static const ALIGN_ASSET(2) char men_room_9DL_000700[] = dmen_room_9DL_000700; +#define dmen_room_9Tex_001AB0 "__OTR__scenes/nonmq/men_scene/men_room_9Tex_001AB0" +static const ALIGN_ASSET(2) char men_room_9Tex_001AB0[] = dmen_room_9Tex_001AB0; #define dmen_room_9Tex_0022B0 "__OTR__scenes/nonmq/men_scene/men_room_9Tex_0022B0" static const ALIGN_ASSET(2) char men_room_9Tex_0022B0[] = dmen_room_9Tex_0022B0; +#define dmen_room_9Tex_0026B0 "__OTR__scenes/nonmq/men_scene/men_room_9Tex_0026B0" +static const ALIGN_ASSET(2) char men_room_9Tex_0026B0[] = dmen_room_9Tex_0026B0; + +#define dmen_room_9Tex_003070 "__OTR__scenes/nonmq/men_scene/men_room_9Tex_003070" +static const ALIGN_ASSET(2) char men_room_9Tex_003070[] = dmen_room_9Tex_003070; + +#define dmen_room_9DL_000700 "__OTR__scenes/nonmq/men_scene/men_room_9DL_000700" +static const ALIGN_ASSET(2) char men_room_9DL_000700[] = dmen_room_9DL_000700; + #define dmen_room_9DL_000B30 "__OTR__scenes/nonmq/men_scene/men_room_9DL_000B30" static const ALIGN_ASSET(2) char men_room_9DL_000B30[] = dmen_room_9DL_000B30; @@ -18,20 +27,11 @@ static const ALIGN_ASSET(2) char men_room_9DL_000D68[] = dmen_room_9DL_000D68; #define dmen_room_9DL_002F80 "__OTR__scenes/nonmq/men_scene/men_room_9DL_002F80" static const ALIGN_ASSET(2) char men_room_9DL_002F80[] = dmen_room_9DL_002F80; -#define dmen_room_9Tex_003070 "__OTR__scenes/nonmq/men_scene/men_room_9Tex_003070" -static const ALIGN_ASSET(2) char men_room_9Tex_003070[] = dmen_room_9Tex_003070; - #define dmen_room_9DL_0014E8 "__OTR__scenes/nonmq/men_scene/men_room_9DL_0014E8" static const ALIGN_ASSET(2) char men_room_9DL_0014E8[] = dmen_room_9DL_0014E8; -#define dmen_room_9Tex_0026B0 "__OTR__scenes/nonmq/men_scene/men_room_9Tex_0026B0" -static const ALIGN_ASSET(2) char men_room_9Tex_0026B0[] = dmen_room_9Tex_0026B0; - #define dmen_room_9DL_0019C0 "__OTR__scenes/nonmq/men_scene/men_room_9DL_0019C0" static const ALIGN_ASSET(2) char men_room_9DL_0019C0[] = dmen_room_9DL_0019C0; -#define dmen_room_9Tex_001AB0 "__OTR__scenes/nonmq/men_scene/men_room_9Tex_001AB0" -static const ALIGN_ASSET(2) char men_room_9Tex_001AB0[] = dmen_room_9Tex_001AB0; - #endif // DUNGEONS_MEN_ROOM_9_H diff --git a/soh/assets/scenes/dungeons/men/men_scene.h b/soh/assets/scenes/dungeons/men/men_scene.h index bd22d86f3..98cb3a849 100644 --- a/soh/assets/scenes/dungeons/men/men_scene.h +++ b/soh/assets/scenes/dungeons/men/men_scene.h @@ -3,6 +3,15 @@ #include "align_asset_macro.h" +#define dmen_sceneTex_0108C0 "__OTR__scenes/nonmq/men_scene/men_sceneTex_0108C0" +static const ALIGN_ASSET(2) char men_sceneTex_0108C0[] = dmen_sceneTex_0108C0; + +#define dmen_sceneTex_010CC0 "__OTR__scenes/nonmq/men_scene/men_sceneTex_010CC0" +static const ALIGN_ASSET(2) char men_sceneTex_010CC0[] = dmen_sceneTex_010CC0; + +#define dmen_sceneTLUT_00F6C0 "__OTR__scenes/nonmq/men_scene/men_sceneTLUT_00F6C0" +static const ALIGN_ASSET(2) char men_sceneTLUT_00F6C0[] = dmen_sceneTLUT_00F6C0; + #define dgGTGDayEntranceTex "__OTR__scenes/nonmq/men_scene/gGTGDayEntranceTex" static const ALIGN_ASSET(2) char gGTGDayEntranceTex[] = dgGTGDayEntranceTex; @@ -12,13 +21,5 @@ static const ALIGN_ASSET(2) char gGTGNightEntranceTex[] = dgGTGNightEntranceTex; #define dmen_sceneCollisionHeader_00F690 "__OTR__scenes/nonmq/men_scene/men_sceneCollisionHeader_00F690" static const ALIGN_ASSET(2) char men_sceneCollisionHeader_00F690[] = dmen_sceneCollisionHeader_00F690; -#define dmen_sceneTLUT_00F6C0 "__OTR__scenes/nonmq/men_scene/men_sceneTLUT_00F6C0" -static const ALIGN_ASSET(2) char men_sceneTLUT_00F6C0[] = dmen_sceneTLUT_00F6C0; - -#define dmen_sceneTex_010CC0 "__OTR__scenes/nonmq/men_scene/men_sceneTex_010CC0" -static const ALIGN_ASSET(2) char men_sceneTex_010CC0[] = dmen_sceneTex_010CC0; - -#define dmen_sceneTex_0108C0 "__OTR__scenes/nonmq/men_scene/men_sceneTex_0108C0" -static const ALIGN_ASSET(2) char men_sceneTex_0108C0[] = dmen_sceneTex_0108C0; #endif // DUNGEONS_MEN_SCENE_H diff --git a/soh/assets/scenes/dungeons/moribossroom/moribossroom_room_0.h b/soh/assets/scenes/dungeons/moribossroom/moribossroom_room_0.h index 5afbf3fd6..f21d2f809 100644 --- a/soh/assets/scenes/dungeons/moribossroom/moribossroom_room_0.h +++ b/soh/assets/scenes/dungeons/moribossroom/moribossroom_room_0.h @@ -3,23 +3,23 @@ #include "align_asset_macro.h" -#define dmoribossroom_room_0DL_003888 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_0DL_003888" -static const ALIGN_ASSET(2) char moribossroom_room_0DL_003888[] = dmoribossroom_room_0DL_003888; - -#define dmoribossroom_room_0Tex_0038B8 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_0Tex_0038B8" +#define dmoribossroom_room_0Tex_0038B8 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_0Tex_0038B8" static const ALIGN_ASSET(2) char moribossroom_room_0Tex_0038B8[] = dmoribossroom_room_0Tex_0038B8; -#define dmoribossroom_room_0Tex_0054B8 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_0Tex_0054B8" -static const ALIGN_ASSET(2) char moribossroom_room_0Tex_0054B8[] = dmoribossroom_room_0Tex_0054B8; - -#define dmoribossroom_room_0Tex_0044B8 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_0Tex_0044B8" -static const ALIGN_ASSET(2) char moribossroom_room_0Tex_0044B8[] = dmoribossroom_room_0Tex_0044B8; - -#define dmoribossroom_room_0Tex_0040B8 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_0Tex_0040B8" +#define dmoribossroom_room_0Tex_0040B8 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_0Tex_0040B8" static const ALIGN_ASSET(2) char moribossroom_room_0Tex_0040B8[] = dmoribossroom_room_0Tex_0040B8; -#define dmoribossroom_room_0Tex_0056B8 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_0Tex_0056B8" +#define dmoribossroom_room_0Tex_0044B8 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_0Tex_0044B8" +static const ALIGN_ASSET(2) char moribossroom_room_0Tex_0044B8[] = dmoribossroom_room_0Tex_0044B8; + +#define dmoribossroom_room_0Tex_0054B8 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_0Tex_0054B8" +static const ALIGN_ASSET(2) char moribossroom_room_0Tex_0054B8[] = dmoribossroom_room_0Tex_0054B8; + +#define dmoribossroom_room_0Tex_0056B8 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_0Tex_0056B8" static const ALIGN_ASSET(2) char moribossroom_room_0Tex_0056B8[] = dmoribossroom_room_0Tex_0056B8; +#define dmoribossroom_room_0DL_003888 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_0DL_003888" +static const ALIGN_ASSET(2) char moribossroom_room_0DL_003888[] = dmoribossroom_room_0DL_003888; + #endif // DUNGEONS_MORIBOSSROOM_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/moribossroom/moribossroom_room_1.h b/soh/assets/scenes/dungeons/moribossroom/moribossroom_room_1.h index 1b6eea9fa..4fe66c879 100644 --- a/soh/assets/scenes/dungeons/moribossroom/moribossroom_room_1.h +++ b/soh/assets/scenes/dungeons/moribossroom/moribossroom_room_1.h @@ -3,53 +3,53 @@ #include "align_asset_macro.h" -#define dmoribossroom_room_1DL_0067D0 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1DL_0067D0" -static const ALIGN_ASSET(2) char moribossroom_room_1DL_0067D0[] = dmoribossroom_room_1DL_0067D0; - -#define dmoribossroom_room_1Tex_007A20 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_007A20" -static const ALIGN_ASSET(2) char moribossroom_room_1Tex_007A20[] = dmoribossroom_room_1Tex_007A20; - -#define dmoribossroom_room_1Tex_006A20 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_006A20" +#define dmoribossroom_room_1Tex_006A20 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_006A20" static const ALIGN_ASSET(2) char moribossroom_room_1Tex_006A20[] = dmoribossroom_room_1Tex_006A20; -#define dmoribossroom_room_1Tex_009B20 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_009B20" -static const ALIGN_ASSET(2) char moribossroom_room_1Tex_009B20[] = dmoribossroom_room_1Tex_009B20; +#define dmoribossroom_room_1Tex_007A20 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_007A20" +static const ALIGN_ASSET(2) char moribossroom_room_1Tex_007A20[] = dmoribossroom_room_1Tex_007A20; -#define dmoribossroom_room_1Tex_009A20 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_009A20" -static const ALIGN_ASSET(2) char moribossroom_room_1Tex_009A20[] = dmoribossroom_room_1Tex_009A20; - -#define dmoribossroom_room_1Tex_00CD20 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_00CD20" -static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00CD20[] = dmoribossroom_room_1Tex_00CD20; - -#define dmoribossroom_room_1TLUT_006828 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1TLUT_006828" -static const ALIGN_ASSET(2) char moribossroom_room_1TLUT_006828[] = dmoribossroom_room_1TLUT_006828; - -#define dmoribossroom_room_1Tex_00C520 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_00C520" -static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00C520[] = dmoribossroom_room_1Tex_00C520; - -#define dmoribossroom_room_1Tex_00BD20 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_00BD20" -static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00BD20[] = dmoribossroom_room_1Tex_00BD20; - -#define dmoribossroom_room_1Tex_00AD20 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_00AD20" -static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00AD20[] = dmoribossroom_room_1Tex_00AD20; - -#define dmoribossroom_room_1Tex_00A520 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_00A520" -static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00A520[] = dmoribossroom_room_1Tex_00A520; - -#define dmoribossroom_room_1Tex_009D20 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_009D20" -static const ALIGN_ASSET(2) char moribossroom_room_1Tex_009D20[] = dmoribossroom_room_1Tex_009D20; - -#define dmoribossroom_room_1Tex_008A20 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_008A20" +#define dmoribossroom_room_1Tex_008A20 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_008A20" static const ALIGN_ASSET(2) char moribossroom_room_1Tex_008A20[] = dmoribossroom_room_1Tex_008A20; -#define dmoribossroom_room_1Tex_00B520 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_00B520" +#define dmoribossroom_room_1Tex_009A20 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_009A20" +static const ALIGN_ASSET(2) char moribossroom_room_1Tex_009A20[] = dmoribossroom_room_1Tex_009A20; + +#define dmoribossroom_room_1Tex_009B20 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_009B20" +static const ALIGN_ASSET(2) char moribossroom_room_1Tex_009B20[] = dmoribossroom_room_1Tex_009B20; + +#define dmoribossroom_room_1Tex_009D20 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_009D20" +static const ALIGN_ASSET(2) char moribossroom_room_1Tex_009D20[] = dmoribossroom_room_1Tex_009D20; + +#define dmoribossroom_room_1Tex_00A520 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_00A520" +static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00A520[] = dmoribossroom_room_1Tex_00A520; + +#define dmoribossroom_room_1Tex_00AD20 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_00AD20" +static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00AD20[] = dmoribossroom_room_1Tex_00AD20; + +#define dmoribossroom_room_1Tex_00B520 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_00B520" static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00B520[] = dmoribossroom_room_1Tex_00B520; -#define dmoribossroom_room_1DL_00D698 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1DL_00D698" -static const ALIGN_ASSET(2) char moribossroom_room_1DL_00D698[] = dmoribossroom_room_1DL_00D698; +#define dmoribossroom_room_1Tex_00BD20 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_00BD20" +static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00BD20[] = dmoribossroom_room_1Tex_00BD20; -#define dmoribossroom_room_1Tex_00D6A8 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_00D6A8" +#define dmoribossroom_room_1Tex_00C520 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_00C520" +static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00C520[] = dmoribossroom_room_1Tex_00C520; + +#define dmoribossroom_room_1Tex_00CD20 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_00CD20" +static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00CD20[] = dmoribossroom_room_1Tex_00CD20; + +#define dmoribossroom_room_1Tex_00D6A8 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_00D6A8" static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00D6A8[] = dmoribossroom_room_1Tex_00D6A8; +#define dmoribossroom_room_1TLUT_006828 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1TLUT_006828" +static const ALIGN_ASSET(2) char moribossroom_room_1TLUT_006828[] = dmoribossroom_room_1TLUT_006828; + +#define dmoribossroom_room_1DL_0067D0 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1DL_0067D0" +static const ALIGN_ASSET(2) char moribossroom_room_1DL_0067D0[] = dmoribossroom_room_1DL_0067D0; + +#define dmoribossroom_room_1DL_00D698 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1DL_00D698" +static const ALIGN_ASSET(2) char moribossroom_room_1DL_00D698[] = dmoribossroom_room_1DL_00D698; + #endif // DUNGEONS_MORIBOSSROOM_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/moribossroom/moribossroom_scene.h b/soh/assets/scenes/dungeons/moribossroom/moribossroom_scene.h index f80bcabd6..8a770172c 100644 --- a/soh/assets/scenes/dungeons/moribossroom/moribossroom_scene.h +++ b/soh/assets/scenes/dungeons/moribossroom/moribossroom_scene.h @@ -3,16 +3,17 @@ #include "align_asset_macro.h" -#define dmoribossroom_sceneCollisionHeader_000B1C "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_sceneCollisionHeader_000B1C" -static const ALIGN_ASSET(2) char moribossroom_sceneCollisionHeader_000B1C[] = dmoribossroom_sceneCollisionHeader_000B1C; - -#define dmoribossroom_sceneTex_000CF8 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_sceneTex_000CF8" +#define dmoribossroom_sceneTex_000CF8 "__OTR__scenes/shared/moribossroom_scene/moribossroom_sceneTex_000CF8" static const ALIGN_ASSET(2) char moribossroom_sceneTex_000CF8[] = dmoribossroom_sceneTex_000CF8; -#define dmoribossroom_sceneTLUT_000B50 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_sceneTLUT_000B50" -static const ALIGN_ASSET(2) char moribossroom_sceneTLUT_000B50[] = dmoribossroom_sceneTLUT_000B50; - -#define dmoribossroom_sceneTex_0010F8 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_sceneTex_0010F8" +#define dmoribossroom_sceneTex_0010F8 "__OTR__scenes/shared/moribossroom_scene/moribossroom_sceneTex_0010F8" static const ALIGN_ASSET(2) char moribossroom_sceneTex_0010F8[] = dmoribossroom_sceneTex_0010F8; +#define dmoribossroom_sceneTLUT_000B50 "__OTR__scenes/shared/moribossroom_scene/moribossroom_sceneTLUT_000B50" +static const ALIGN_ASSET(2) char moribossroom_sceneTLUT_000B50[] = dmoribossroom_sceneTLUT_000B50; + +#define dmoribossroom_sceneCollisionHeader_000B1C "__OTR__scenes/shared/moribossroom_scene/moribossroom_sceneCollisionHeader_000B1C" +static const ALIGN_ASSET(2) char moribossroom_sceneCollisionHeader_000B1C[] = dmoribossroom_sceneCollisionHeader_000B1C; + + #endif // DUNGEONS_MORIBOSSROOM_SCENE_H diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_0.h b/soh/assets/scenes/dungeons/ydan/ydan_room_0.h index dba7964c4..96ab43b00 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_room_0.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_room_0.h @@ -3,90 +3,90 @@ #include "align_asset_macro.h" -#define dydan_room_0DL_006D88 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_006D88" -static const ALIGN_ASSET(2) char ydan_room_0DL_006D88[] = dydan_room_0DL_006D88; - -#define dydan_room_0Tex_00A5C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00A5C0" -static const ALIGN_ASSET(2) char ydan_room_0Tex_00A5C0[] = dydan_room_0Tex_00A5C0; - -#define dydan_room_0Tex_00D5C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00D5C0" -static const ALIGN_ASSET(2) char ydan_room_0Tex_00D5C0[] = dydan_room_0Tex_00D5C0; - -#define dydan_room_0Tex_00A1C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00A1C0" -static const ALIGN_ASSET(2) char ydan_room_0Tex_00A1C0[] = dydan_room_0Tex_00A1C0; - -#define dydan_room_0Tex_0099C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_0099C0" -static const ALIGN_ASSET(2) char ydan_room_0Tex_0099C0[] = dydan_room_0Tex_0099C0; - -#define dydan_room_0DL_012E30 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_012E30" -static const ALIGN_ASSET(2) char ydan_room_0DL_012E30[] = dydan_room_0DL_012E30; - -#define dydan_room_0Tex_013F48 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_013F48" -static const ALIGN_ASSET(2) char ydan_room_0Tex_013F48[] = dydan_room_0Tex_013F48; - -#define dydan_room_0DL_012CA8 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_012CA8" -static const ALIGN_ASSET(2) char ydan_room_0DL_012CA8[] = dydan_room_0DL_012CA8; - -#define dydan_room_0Tex_012F48 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_012F48" -static const ALIGN_ASSET(2) char ydan_room_0Tex_012F48[] = dydan_room_0Tex_012F48; - -#define dydan_room_0DL_005E60 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_005E60" -static const ALIGN_ASSET(2) char ydan_room_0DL_005E60[] = dydan_room_0DL_005E60; - #define dydan_room_0Tex_0071C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_0071C0" static const ALIGN_ASSET(2) char ydan_room_0Tex_0071C0[] = dydan_room_0Tex_0071C0; #define dydan_room_0Tex_0081C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_0081C0" static const ALIGN_ASSET(2) char ydan_room_0Tex_0081C0[] = dydan_room_0Tex_0081C0; +#define dydan_room_0Tex_0091C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_0091C0" +static const ALIGN_ASSET(2) char ydan_room_0Tex_0091C0[] = dydan_room_0Tex_0091C0; + +#define dydan_room_0Tex_0099C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_0099C0" +static const ALIGN_ASSET(2) char ydan_room_0Tex_0099C0[] = dydan_room_0Tex_0099C0; + +#define dydan_room_0Tex_00A1C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00A1C0" +static const ALIGN_ASSET(2) char ydan_room_0Tex_00A1C0[] = dydan_room_0Tex_00A1C0; + +#define dydan_room_0Tex_00A5C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00A5C0" +static const ALIGN_ASSET(2) char ydan_room_0Tex_00A5C0[] = dydan_room_0Tex_00A5C0; + +#define dydan_room_0Tex_00ADC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00ADC0" +static const ALIGN_ASSET(2) char ydan_room_0Tex_00ADC0[] = dydan_room_0Tex_00ADC0; + +#define dydan_room_0Tex_00B5C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00B5C0" +static const ALIGN_ASSET(2) char ydan_room_0Tex_00B5C0[] = dydan_room_0Tex_00B5C0; + +#define dydan_room_0Tex_00BDC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00BDC0" +static const ALIGN_ASSET(2) char ydan_room_0Tex_00BDC0[] = dydan_room_0Tex_00BDC0; + +#define dydan_room_0Tex_00C5C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00C5C0" +static const ALIGN_ASSET(2) char ydan_room_0Tex_00C5C0[] = dydan_room_0Tex_00C5C0; + +#define dydan_room_0Tex_00CDC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00CDC0" +static const ALIGN_ASSET(2) char ydan_room_0Tex_00CDC0[] = dydan_room_0Tex_00CDC0; + +#define dydan_room_0Tex_00D5C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00D5C0" +static const ALIGN_ASSET(2) char ydan_room_0Tex_00D5C0[] = dydan_room_0Tex_00D5C0; + +#define dydan_room_0Tex_00D9C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00D9C0" +static const ALIGN_ASSET(2) char ydan_room_0Tex_00D9C0[] = dydan_room_0Tex_00D9C0; + +#define dydan_room_0Tex_00E1C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00E1C0" +static const ALIGN_ASSET(2) char ydan_room_0Tex_00E1C0[] = dydan_room_0Tex_00E1C0; + +#define dydan_room_0Tex_00E9C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00E9C0" +static const ALIGN_ASSET(2) char ydan_room_0Tex_00E9C0[] = dydan_room_0Tex_00E9C0; + +#define dydan_room_0Tex_00F1C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00F1C0" +static const ALIGN_ASSET(2) char ydan_room_0Tex_00F1C0[] = dydan_room_0Tex_00F1C0; + #define dydan_room_0Tex_00F9C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00F9C0" static const ALIGN_ASSET(2) char ydan_room_0Tex_00F9C0[] = dydan_room_0Tex_00F9C0; -#define dydan_room_0DL_0124C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_0124C0" -static const ALIGN_ASSET(2) char ydan_room_0DL_0124C0[] = dydan_room_0DL_0124C0; +#define dydan_room_0Tex_0109C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_0109C0" +static const ALIGN_ASSET(2) char ydan_room_0Tex_0109C0[] = dydan_room_0Tex_0109C0; + +#define dydan_room_0Tex_012F48 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_012F48" +static const ALIGN_ASSET(2) char ydan_room_0Tex_012F48[] = dydan_room_0Tex_012F48; + +#define dydan_room_0Tex_013F48 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_013F48" +static const ALIGN_ASSET(2) char ydan_room_0Tex_013F48[] = dydan_room_0Tex_013F48; #define dydan_room_0Tex_014348 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_014348" static const ALIGN_ASSET(2) char ydan_room_0Tex_014348[] = dydan_room_0Tex_014348; +#define dydan_room_0DL_006D88 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_006D88" +static const ALIGN_ASSET(2) char ydan_room_0DL_006D88[] = dydan_room_0DL_006D88; + +#define dydan_room_0DL_012E30 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_012E30" +static const ALIGN_ASSET(2) char ydan_room_0DL_012E30[] = dydan_room_0DL_012E30; + +#define dydan_room_0DL_012CA8 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_012CA8" +static const ALIGN_ASSET(2) char ydan_room_0DL_012CA8[] = dydan_room_0DL_012CA8; + +#define dydan_room_0DL_005E60 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_005E60" +static const ALIGN_ASSET(2) char ydan_room_0DL_005E60[] = dydan_room_0DL_005E60; + +#define dydan_room_0DL_0124C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_0124C0" +static const ALIGN_ASSET(2) char ydan_room_0DL_0124C0[] = dydan_room_0DL_0124C0; + #define dydan_room_0DL_006798 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_006798" static const ALIGN_ASSET(2) char ydan_room_0DL_006798[] = dydan_room_0DL_006798; #define dydan_room_0DL_003450 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_003450" static const ALIGN_ASSET(2) char ydan_room_0DL_003450[] = dydan_room_0DL_003450; -#define dydan_room_0Tex_0091C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_0091C0" -static const ALIGN_ASSET(2) char ydan_room_0Tex_0091C0[] = dydan_room_0Tex_0091C0; - -#define dydan_room_0Tex_00E1C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00E1C0" -static const ALIGN_ASSET(2) char ydan_room_0Tex_00E1C0[] = dydan_room_0Tex_00E1C0; - -#define dydan_room_0Tex_0109C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_0109C0" -static const ALIGN_ASSET(2) char ydan_room_0Tex_0109C0[] = dydan_room_0Tex_0109C0; - -#define dydan_room_0Tex_00D9C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00D9C0" -static const ALIGN_ASSET(2) char ydan_room_0Tex_00D9C0[] = dydan_room_0Tex_00D9C0; - -#define dydan_room_0Tex_00C5C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00C5C0" -static const ALIGN_ASSET(2) char ydan_room_0Tex_00C5C0[] = dydan_room_0Tex_00C5C0; - -#define dydan_room_0Tex_00B5C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00B5C0" -static const ALIGN_ASSET(2) char ydan_room_0Tex_00B5C0[] = dydan_room_0Tex_00B5C0; - -#define dydan_room_0Tex_00F1C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00F1C0" -static const ALIGN_ASSET(2) char ydan_room_0Tex_00F1C0[] = dydan_room_0Tex_00F1C0; - -#define dydan_room_0Tex_00E9C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00E9C0" -static const ALIGN_ASSET(2) char ydan_room_0Tex_00E9C0[] = dydan_room_0Tex_00E9C0; - -#define dydan_room_0Tex_00CDC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00CDC0" -static const ALIGN_ASSET(2) char ydan_room_0Tex_00CDC0[] = dydan_room_0Tex_00CDC0; - -#define dydan_room_0Tex_00BDC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00BDC0" -static const ALIGN_ASSET(2) char ydan_room_0Tex_00BDC0[] = dydan_room_0Tex_00BDC0; - -#define dydan_room_0Tex_00ADC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00ADC0" -static const ALIGN_ASSET(2) char ydan_room_0Tex_00ADC0[] = dydan_room_0Tex_00ADC0; - #define dydan_room_0DL_011290 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_011290" static const ALIGN_ASSET(2) char ydan_room_0DL_011290[] = dydan_room_0DL_011290; diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_1.h b/soh/assets/scenes/dungeons/ydan/ydan_room_1.h index 3e225d8a1..7d9143896 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_room_1.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_room_1.h @@ -3,8 +3,8 @@ #include "align_asset_macro.h" -#define dydan_room_1DL_000A40 "__OTR__scenes/nonmq/ydan_scene/ydan_room_1DL_000A40" -static const ALIGN_ASSET(2) char ydan_room_1DL_000A40[] = dydan_room_1DL_000A40; +#define dydan_room_1Tex_000F98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_1Tex_000F98" +static const ALIGN_ASSET(2) char ydan_room_1Tex_000F98[] = dydan_room_1Tex_000F98; #define dydan_room_1Tex_001798 "__OTR__scenes/nonmq/ydan_scene/ydan_room_1Tex_001798" static const ALIGN_ASSET(2) char ydan_room_1Tex_001798[] = dydan_room_1Tex_001798; @@ -12,17 +12,17 @@ static const ALIGN_ASSET(2) char ydan_room_1Tex_001798[] = dydan_room_1Tex_00179 #define dydan_room_1Tex_001F98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_1Tex_001F98" static const ALIGN_ASSET(2) char ydan_room_1Tex_001F98[] = dydan_room_1Tex_001F98; -#define dydan_room_1Tex_000F98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_1Tex_000F98" -static const ALIGN_ASSET(2) char ydan_room_1Tex_000F98[] = dydan_room_1Tex_000F98; - #define dydan_room_1Tex_002798 "__OTR__scenes/nonmq/ydan_scene/ydan_room_1Tex_002798" static const ALIGN_ASSET(2) char ydan_room_1Tex_002798[] = dydan_room_1Tex_002798; -#define dydan_room_1DL_003110 "__OTR__scenes/nonmq/ydan_scene/ydan_room_1DL_003110" -static const ALIGN_ASSET(2) char ydan_room_1DL_003110[] = dydan_room_1DL_003110; - #define dydan_room_1Tex_003200 "__OTR__scenes/nonmq/ydan_scene/ydan_room_1Tex_003200" static const ALIGN_ASSET(2) char ydan_room_1Tex_003200[] = dydan_room_1Tex_003200; +#define dydan_room_1DL_000A40 "__OTR__scenes/nonmq/ydan_scene/ydan_room_1DL_000A40" +static const ALIGN_ASSET(2) char ydan_room_1DL_000A40[] = dydan_room_1DL_000A40; + +#define dydan_room_1DL_003110 "__OTR__scenes/nonmq/ydan_scene/ydan_room_1DL_003110" +static const ALIGN_ASSET(2) char ydan_room_1DL_003110[] = dydan_room_1DL_003110; + #endif // DUNGEONS_YDAN_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_10.h b/soh/assets/scenes/dungeons/ydan/ydan_room_10.h index d73939069..4696cb959 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_room_10.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_room_10.h @@ -3,9 +3,6 @@ #include "align_asset_macro.h" -#define dydan_room_10DL_001370 "__OTR__scenes/nonmq/ydan_scene/ydan_room_10DL_001370" -static const ALIGN_ASSET(2) char ydan_room_10DL_001370[] = dydan_room_10DL_001370; - #define dydan_room_10Tex_001BE0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_10Tex_001BE0" static const ALIGN_ASSET(2) char ydan_room_10Tex_001BE0[] = dydan_room_10Tex_001BE0; @@ -18,11 +15,14 @@ static const ALIGN_ASSET(2) char ydan_room_10Tex_002BE0[] = dydan_room_10Tex_002 #define dydan_room_10Tex_0033E0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_10Tex_0033E0" static const ALIGN_ASSET(2) char ydan_room_10Tex_0033E0[] = dydan_room_10Tex_0033E0; -#define dydan_room_10DL_003D20 "__OTR__scenes/nonmq/ydan_scene/ydan_room_10DL_003D20" -static const ALIGN_ASSET(2) char ydan_room_10DL_003D20[] = dydan_room_10DL_003D20; - #define dydan_room_10Tex_003DF8 "__OTR__scenes/nonmq/ydan_scene/ydan_room_10Tex_003DF8" static const ALIGN_ASSET(2) char ydan_room_10Tex_003DF8[] = dydan_room_10Tex_003DF8; +#define dydan_room_10DL_001370 "__OTR__scenes/nonmq/ydan_scene/ydan_room_10DL_001370" +static const ALIGN_ASSET(2) char ydan_room_10DL_001370[] = dydan_room_10DL_001370; + +#define dydan_room_10DL_003D20 "__OTR__scenes/nonmq/ydan_scene/ydan_room_10DL_003D20" +static const ALIGN_ASSET(2) char ydan_room_10DL_003D20[] = dydan_room_10DL_003D20; + #endif // DUNGEONS_YDAN_ROOM_10_H diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_11.h b/soh/assets/scenes/dungeons/ydan/ydan_room_11.h index 5648b2afc..c2d603257 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_room_11.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_room_11.h @@ -3,26 +3,26 @@ #include "align_asset_macro.h" -#define dydan_room_11DL_002D90 "__OTR__scenes/nonmq/ydan_scene/ydan_room_11DL_002D90" -static const ALIGN_ASSET(2) char ydan_room_11DL_002D90[] = dydan_room_11DL_002D90; - -#define dydan_room_11Tex_0054D8 "__OTR__scenes/nonmq/ydan_scene/ydan_room_11Tex_0054D8" -static const ALIGN_ASSET(2) char ydan_room_11Tex_0054D8[] = dydan_room_11Tex_0054D8; +#define dydan_room_11Tex_003CD8 "__OTR__scenes/nonmq/ydan_scene/ydan_room_11Tex_003CD8" +static const ALIGN_ASSET(2) char ydan_room_11Tex_003CD8[] = dydan_room_11Tex_003CD8; #define dydan_room_11Tex_0044D8 "__OTR__scenes/nonmq/ydan_scene/ydan_room_11Tex_0044D8" static const ALIGN_ASSET(2) char ydan_room_11Tex_0044D8[] = dydan_room_11Tex_0044D8; +#define dydan_room_11Tex_0054D8 "__OTR__scenes/nonmq/ydan_scene/ydan_room_11Tex_0054D8" +static const ALIGN_ASSET(2) char ydan_room_11Tex_0054D8[] = dydan_room_11Tex_0054D8; + #define dydan_room_11Tex_005CD8 "__OTR__scenes/nonmq/ydan_scene/ydan_room_11Tex_005CD8" static const ALIGN_ASSET(2) char ydan_room_11Tex_005CD8[] = dydan_room_11Tex_005CD8; -#define dydan_room_11Tex_003CD8 "__OTR__scenes/nonmq/ydan_scene/ydan_room_11Tex_003CD8" -static const ALIGN_ASSET(2) char ydan_room_11Tex_003CD8[] = dydan_room_11Tex_003CD8; - -#define dydan_room_11DL_006730 "__OTR__scenes/nonmq/ydan_scene/ydan_room_11DL_006730" -static const ALIGN_ASSET(2) char ydan_room_11DL_006730[] = dydan_room_11DL_006730; - #define dydan_room_11Tex_006968 "__OTR__scenes/nonmq/ydan_scene/ydan_room_11Tex_006968" static const ALIGN_ASSET(2) char ydan_room_11Tex_006968[] = dydan_room_11Tex_006968; +#define dydan_room_11DL_002D90 "__OTR__scenes/nonmq/ydan_scene/ydan_room_11DL_002D90" +static const ALIGN_ASSET(2) char ydan_room_11DL_002D90[] = dydan_room_11DL_002D90; + +#define dydan_room_11DL_006730 "__OTR__scenes/nonmq/ydan_scene/ydan_room_11DL_006730" +static const ALIGN_ASSET(2) char ydan_room_11DL_006730[] = dydan_room_11DL_006730; + #endif // DUNGEONS_YDAN_ROOM_11_H diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_2.h b/soh/assets/scenes/dungeons/ydan/ydan_room_2.h index 3d7fe0edc..704cee1d1 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_room_2.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_room_2.h @@ -3,32 +3,32 @@ #include "align_asset_macro.h" -#define dydan_room_2DL_001160 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2DL_001160" -static const ALIGN_ASSET(2) char ydan_room_2DL_001160[] = dydan_room_2DL_001160; - #define dydan_room_2Tex_001D08 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2Tex_001D08" static const ALIGN_ASSET(2) char ydan_room_2Tex_001D08[] = dydan_room_2Tex_001D08; -#define dydan_room_2Tex_002D08 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2Tex_002D08" -static const ALIGN_ASSET(2) char ydan_room_2Tex_002D08[] = dydan_room_2Tex_002D08; - -#define dydan_room_2Tex_004508 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2Tex_004508" -static const ALIGN_ASSET(2) char ydan_room_2Tex_004508[] = dydan_room_2Tex_004508; - #define dydan_room_2Tex_002508 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2Tex_002508" static const ALIGN_ASSET(2) char ydan_room_2Tex_002508[] = dydan_room_2Tex_002508; -#define dydan_room_2Tex_003D08 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2Tex_003D08" -static const ALIGN_ASSET(2) char ydan_room_2Tex_003D08[] = dydan_room_2Tex_003D08; +#define dydan_room_2Tex_002D08 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2Tex_002D08" +static const ALIGN_ASSET(2) char ydan_room_2Tex_002D08[] = dydan_room_2Tex_002D08; #define dydan_room_2Tex_003508 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2Tex_003508" static const ALIGN_ASSET(2) char ydan_room_2Tex_003508[] = dydan_room_2Tex_003508; -#define dydan_room_2DL_004E50 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2DL_004E50" -static const ALIGN_ASSET(2) char ydan_room_2DL_004E50[] = dydan_room_2DL_004E50; +#define dydan_room_2Tex_003D08 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2Tex_003D08" +static const ALIGN_ASSET(2) char ydan_room_2Tex_003D08[] = dydan_room_2Tex_003D08; + +#define dydan_room_2Tex_004508 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2Tex_004508" +static const ALIGN_ASSET(2) char ydan_room_2Tex_004508[] = dydan_room_2Tex_004508; #define dydan_room_2Tex_004F28 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2Tex_004F28" static const ALIGN_ASSET(2) char ydan_room_2Tex_004F28[] = dydan_room_2Tex_004F28; +#define dydan_room_2DL_001160 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2DL_001160" +static const ALIGN_ASSET(2) char ydan_room_2DL_001160[] = dydan_room_2DL_001160; + +#define dydan_room_2DL_004E50 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2DL_004E50" +static const ALIGN_ASSET(2) char ydan_room_2DL_004E50[] = dydan_room_2DL_004E50; + #endif // DUNGEONS_YDAN_ROOM_2_H diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_3.h b/soh/assets/scenes/dungeons/ydan/ydan_room_3.h index 22d270141..7e0643741 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_room_3.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_room_3.h @@ -3,77 +3,41 @@ #include "align_asset_macro.h" -#define dydan_room_3DL_000F00 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_000F00" -static const ALIGN_ASSET(2) char ydan_room_3DL_000F00[] = dydan_room_3DL_000F00; - -#define dydan_room_3Tex_008CC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_008CC0" -static const ALIGN_ASSET(2) char ydan_room_3Tex_008CC0[] = dydan_room_3Tex_008CC0; - -#define dydan_room_3DL_005160 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_005160" -static const ALIGN_ASSET(2) char ydan_room_3DL_005160[] = dydan_room_3DL_005160; +#define dydan_room_3Tex_0074C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_0074C0" +static const ALIGN_ASSET(2) char ydan_room_3Tex_0074C0[] = dydan_room_3Tex_0074C0; #define dydan_room_3Tex_0084C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_0084C0" static const ALIGN_ASSET(2) char ydan_room_3Tex_0084C0[] = dydan_room_3Tex_0084C0; +#define dydan_room_3Tex_008CC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_008CC0" +static const ALIGN_ASSET(2) char ydan_room_3Tex_008CC0[] = dydan_room_3Tex_008CC0; + #define dydan_room_3Tex_0094C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_0094C0" static const ALIGN_ASSET(2) char ydan_room_3Tex_0094C0[] = dydan_room_3Tex_0094C0; -#define dydan_room_3DL_0106E0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_0106E0" -static const ALIGN_ASSET(2) char ydan_room_3DL_0106E0[] = dydan_room_3DL_0106E0; +#define dydan_room_3Tex_009CC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_009CC0" +static const ALIGN_ASSET(2) char ydan_room_3Tex_009CC0[] = dydan_room_3Tex_009CC0; -#define dydan_room_3Tex_011DB0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_011DB0" -static const ALIGN_ASSET(2) char ydan_room_3Tex_011DB0[] = dydan_room_3Tex_011DB0; +#define dydan_room_3Tex_00A0C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00A0C0" +static const ALIGN_ASSET(2) char ydan_room_3Tex_00A0C0[] = dydan_room_3Tex_00A0C0; -#define dydan_room_3Tex_0131B0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_0131B0" -static const ALIGN_ASSET(2) char ydan_room_3Tex_0131B0[] = dydan_room_3Tex_0131B0; +#define dydan_room_3Tex_00A8C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00A8C0" +static const ALIGN_ASSET(2) char ydan_room_3Tex_00A8C0[] = dydan_room_3Tex_00A8C0; -#define dydan_room_3DL_005EC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_005EC0" -static const ALIGN_ASSET(2) char ydan_room_3DL_005EC0[] = dydan_room_3DL_005EC0; +#define dydan_room_3Tex_00B0C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00B0C0" +static const ALIGN_ASSET(2) char ydan_room_3Tex_00B0C0[] = dydan_room_3Tex_00B0C0; -#define dydan_room_3Tex_00F8C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00F8C0" -static const ALIGN_ASSET(2) char ydan_room_3Tex_00F8C0[] = dydan_room_3Tex_00F8C0; +#define dydan_room_3Tex_00B4C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00B4C0" +static const ALIGN_ASSET(2) char ydan_room_3Tex_00B4C0[] = dydan_room_3Tex_00B4C0; #define dydan_room_3Tex_00B8C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00B8C0" static const ALIGN_ASSET(2) char ydan_room_3Tex_00B8C0[] = dydan_room_3Tex_00B8C0; -#define dydan_room_3Tex_00D8C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00D8C0" -static const ALIGN_ASSET(2) char ydan_room_3Tex_00D8C0[] = dydan_room_3Tex_00D8C0; +#define dydan_room_3Tex_00C0C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00C0C0" +static const ALIGN_ASSET(2) char ydan_room_3Tex_00C0C0[] = dydan_room_3Tex_00C0C0; -#define dydan_room_3DL_0116C8 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_0116C8" -static const ALIGN_ASSET(2) char ydan_room_3DL_0116C8[] = dydan_room_3DL_0116C8; - -#define dydan_room_3DL_006B18 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_006B18" -static const ALIGN_ASSET(2) char ydan_room_3DL_006B18[] = dydan_room_3DL_006B18; - -#define dydan_room_3Tex_0074C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_0074C0" -static const ALIGN_ASSET(2) char ydan_room_3Tex_0074C0[] = dydan_room_3Tex_0074C0; - -#define dydan_room_3Tex_00E8C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00E8C0" -static const ALIGN_ASSET(2) char ydan_room_3Tex_00E8C0[] = dydan_room_3Tex_00E8C0; - -#define dydan_room_3DL_007208 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_007208" -static const ALIGN_ASSET(2) char ydan_room_3DL_007208[] = dydan_room_3DL_007208; - -#define dydan_room_3Tex_00E0C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00E0C0" -static const ALIGN_ASSET(2) char ydan_room_3Tex_00E0C0[] = dydan_room_3Tex_00E0C0; - -#define dydan_room_3DL_011AC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_011AC0" -static const ALIGN_ASSET(2) char ydan_room_3DL_011AC0[] = dydan_room_3DL_011AC0; - -#define dydan_room_3DL_011C68 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_011C68" -static const ALIGN_ASSET(2) char ydan_room_3DL_011C68[] = dydan_room_3DL_011C68; - -#define dydan_room_3Tex_012DB0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_012DB0" -static const ALIGN_ASSET(2) char ydan_room_3Tex_012DB0[] = dydan_room_3Tex_012DB0; - -#define dydan_room_3DL_010B48 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_010B48" -static const ALIGN_ASSET(2) char ydan_room_3DL_010B48[] = dydan_room_3DL_010B48; - -#define dydan_room_3DL_003408 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_003408" -static const ALIGN_ASSET(2) char ydan_room_3DL_003408[] = dydan_room_3DL_003408; - -#define dydan_room_3Tex_00A0C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00A0C0" -static const ALIGN_ASSET(2) char ydan_room_3Tex_00A0C0[] = dydan_room_3Tex_00A0C0; +#define dydan_room_3Tex_00C8C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00C8C0" +static const ALIGN_ASSET(2) char ydan_room_3Tex_00C8C0[] = dydan_room_3Tex_00C8C0; #define dydan_room_3Tex_00D0C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00D0C0" static const ALIGN_ASSET(2) char ydan_room_3Tex_00D0C0[] = dydan_room_3Tex_00D0C0; @@ -81,23 +45,59 @@ static const ALIGN_ASSET(2) char ydan_room_3Tex_00D0C0[] = dydan_room_3Tex_00D0C #define dydan_room_3Tex_00D4C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00D4C0" static const ALIGN_ASSET(2) char ydan_room_3Tex_00D4C0[] = dydan_room_3Tex_00D4C0; -#define dydan_room_3Tex_009CC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_009CC0" -static const ALIGN_ASSET(2) char ydan_room_3Tex_009CC0[] = dydan_room_3Tex_009CC0; +#define dydan_room_3Tex_00D8C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00D8C0" +static const ALIGN_ASSET(2) char ydan_room_3Tex_00D8C0[] = dydan_room_3Tex_00D8C0; -#define dydan_room_3Tex_00B4C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00B4C0" -static const ALIGN_ASSET(2) char ydan_room_3Tex_00B4C0[] = dydan_room_3Tex_00B4C0; +#define dydan_room_3Tex_00E0C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00E0C0" +static const ALIGN_ASSET(2) char ydan_room_3Tex_00E0C0[] = dydan_room_3Tex_00E0C0; -#define dydan_room_3Tex_00A8C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00A8C0" -static const ALIGN_ASSET(2) char ydan_room_3Tex_00A8C0[] = dydan_room_3Tex_00A8C0; +#define dydan_room_3Tex_00E8C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00E8C0" +static const ALIGN_ASSET(2) char ydan_room_3Tex_00E8C0[] = dydan_room_3Tex_00E8C0; -#define dydan_room_3Tex_00C8C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00C8C0" -static const ALIGN_ASSET(2) char ydan_room_3Tex_00C8C0[] = dydan_room_3Tex_00C8C0; +#define dydan_room_3Tex_00F8C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00F8C0" +static const ALIGN_ASSET(2) char ydan_room_3Tex_00F8C0[] = dydan_room_3Tex_00F8C0; -#define dydan_room_3Tex_00C0C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00C0C0" -static const ALIGN_ASSET(2) char ydan_room_3Tex_00C0C0[] = dydan_room_3Tex_00C0C0; +#define dydan_room_3Tex_011DB0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_011DB0" +static const ALIGN_ASSET(2) char ydan_room_3Tex_011DB0[] = dydan_room_3Tex_011DB0; -#define dydan_room_3Tex_00B0C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00B0C0" -static const ALIGN_ASSET(2) char ydan_room_3Tex_00B0C0[] = dydan_room_3Tex_00B0C0; +#define dydan_room_3Tex_012DB0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_012DB0" +static const ALIGN_ASSET(2) char ydan_room_3Tex_012DB0[] = dydan_room_3Tex_012DB0; + +#define dydan_room_3Tex_0131B0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_0131B0" +static const ALIGN_ASSET(2) char ydan_room_3Tex_0131B0[] = dydan_room_3Tex_0131B0; + +#define dydan_room_3DL_000F00 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_000F00" +static const ALIGN_ASSET(2) char ydan_room_3DL_000F00[] = dydan_room_3DL_000F00; + +#define dydan_room_3DL_005160 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_005160" +static const ALIGN_ASSET(2) char ydan_room_3DL_005160[] = dydan_room_3DL_005160; + +#define dydan_room_3DL_0106E0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_0106E0" +static const ALIGN_ASSET(2) char ydan_room_3DL_0106E0[] = dydan_room_3DL_0106E0; + +#define dydan_room_3DL_005EC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_005EC0" +static const ALIGN_ASSET(2) char ydan_room_3DL_005EC0[] = dydan_room_3DL_005EC0; + +#define dydan_room_3DL_0116C8 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_0116C8" +static const ALIGN_ASSET(2) char ydan_room_3DL_0116C8[] = dydan_room_3DL_0116C8; + +#define dydan_room_3DL_006B18 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_006B18" +static const ALIGN_ASSET(2) char ydan_room_3DL_006B18[] = dydan_room_3DL_006B18; + +#define dydan_room_3DL_007208 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_007208" +static const ALIGN_ASSET(2) char ydan_room_3DL_007208[] = dydan_room_3DL_007208; + +#define dydan_room_3DL_011AC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_011AC0" +static const ALIGN_ASSET(2) char ydan_room_3DL_011AC0[] = dydan_room_3DL_011AC0; + +#define dydan_room_3DL_011C68 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_011C68" +static const ALIGN_ASSET(2) char ydan_room_3DL_011C68[] = dydan_room_3DL_011C68; + +#define dydan_room_3DL_010B48 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_010B48" +static const ALIGN_ASSET(2) char ydan_room_3DL_010B48[] = dydan_room_3DL_010B48; + +#define dydan_room_3DL_003408 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_003408" +static const ALIGN_ASSET(2) char ydan_room_3DL_003408[] = dydan_room_3DL_003408; #endif // DUNGEONS_YDAN_ROOM_3_H diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_4.h b/soh/assets/scenes/dungeons/ydan/ydan_room_4.h index fcc583137..505a5b79d 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_room_4.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_room_4.h @@ -3,26 +3,26 @@ #include "align_asset_macro.h" -#define dydan_room_4DL_003B20 "__OTR__scenes/nonmq/ydan_scene/ydan_room_4DL_003B20" -static const ALIGN_ASSET(2) char ydan_room_4DL_003B20[] = dydan_room_4DL_003B20; - -#define dydan_room_4Tex_003C28 "__OTR__scenes/nonmq/ydan_scene/ydan_room_4Tex_003C28" -static const ALIGN_ASSET(2) char ydan_room_4Tex_003C28[] = dydan_room_4Tex_003C28; - -#define dydan_room_4DL_001080 "__OTR__scenes/nonmq/ydan_scene/ydan_room_4DL_001080" -static const ALIGN_ASSET(2) char ydan_room_4DL_001080[] = dydan_room_4DL_001080; - -#define dydan_room_4Tex_002920 "__OTR__scenes/nonmq/ydan_scene/ydan_room_4Tex_002920" -static const ALIGN_ASSET(2) char ydan_room_4Tex_002920[] = dydan_room_4Tex_002920; - -#define dydan_room_4Tex_003120 "__OTR__scenes/nonmq/ydan_scene/ydan_room_4Tex_003120" -static const ALIGN_ASSET(2) char ydan_room_4Tex_003120[] = dydan_room_4Tex_003120; - #define dydan_room_4Tex_001920 "__OTR__scenes/nonmq/ydan_scene/ydan_room_4Tex_001920" static const ALIGN_ASSET(2) char ydan_room_4Tex_001920[] = dydan_room_4Tex_001920; #define dydan_room_4Tex_002120 "__OTR__scenes/nonmq/ydan_scene/ydan_room_4Tex_002120" static const ALIGN_ASSET(2) char ydan_room_4Tex_002120[] = dydan_room_4Tex_002120; +#define dydan_room_4Tex_002920 "__OTR__scenes/nonmq/ydan_scene/ydan_room_4Tex_002920" +static const ALIGN_ASSET(2) char ydan_room_4Tex_002920[] = dydan_room_4Tex_002920; + +#define dydan_room_4Tex_003120 "__OTR__scenes/nonmq/ydan_scene/ydan_room_4Tex_003120" +static const ALIGN_ASSET(2) char ydan_room_4Tex_003120[] = dydan_room_4Tex_003120; + +#define dydan_room_4Tex_003C28 "__OTR__scenes/nonmq/ydan_scene/ydan_room_4Tex_003C28" +static const ALIGN_ASSET(2) char ydan_room_4Tex_003C28[] = dydan_room_4Tex_003C28; + +#define dydan_room_4DL_003B20 "__OTR__scenes/nonmq/ydan_scene/ydan_room_4DL_003B20" +static const ALIGN_ASSET(2) char ydan_room_4DL_003B20[] = dydan_room_4DL_003B20; + +#define dydan_room_4DL_001080 "__OTR__scenes/nonmq/ydan_scene/ydan_room_4DL_001080" +static const ALIGN_ASSET(2) char ydan_room_4DL_001080[] = dydan_room_4DL_001080; + #endif // DUNGEONS_YDAN_ROOM_4_H diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_5.h b/soh/assets/scenes/dungeons/ydan/ydan_room_5.h index 342e2eb4c..cb8556415 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_room_5.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_room_5.h @@ -3,44 +3,44 @@ #include "align_asset_macro.h" -#define dydan_room_5DL_003C98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5DL_003C98" -static const ALIGN_ASSET(2) char ydan_room_5DL_003C98[] = dydan_room_5DL_003C98; - #define dydan_room_5Tex_003F88 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_003F88" static const ALIGN_ASSET(2) char ydan_room_5Tex_003F88[] = dydan_room_5Tex_003F88; -#define dydan_room_5DL_0022F0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5DL_0022F0" -static const ALIGN_ASSET(2) char ydan_room_5DL_0022F0[] = dydan_room_5DL_0022F0; - -#define dydan_room_5Tex_006B88 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_006B88" -static const ALIGN_ASSET(2) char ydan_room_5Tex_006B88[] = dydan_room_5Tex_006B88; +#define dydan_room_5Tex_004788 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_004788" +static const ALIGN_ASSET(2) char ydan_room_5Tex_004788[] = dydan_room_5Tex_004788; #define dydan_room_5Tex_004F88 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_004F88" static const ALIGN_ASSET(2) char ydan_room_5Tex_004F88[] = dydan_room_5Tex_004F88; -#define dydan_room_5Tex_007B88 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_007B88" -static const ALIGN_ASSET(2) char ydan_room_5Tex_007B88[] = dydan_room_5Tex_007B88; - -#define dydan_room_5Tex_004788 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_004788" -static const ALIGN_ASSET(2) char ydan_room_5Tex_004788[] = dydan_room_5Tex_004788; - #define dydan_room_5Tex_005788 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_005788" static const ALIGN_ASSET(2) char ydan_room_5Tex_005788[] = dydan_room_5Tex_005788; #define dydan_room_5Tex_005B88 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_005B88" static const ALIGN_ASSET(2) char ydan_room_5Tex_005B88[] = dydan_room_5Tex_005B88; -#define dydan_room_5Tex_007388 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_007388" -static const ALIGN_ASSET(2) char ydan_room_5Tex_007388[] = dydan_room_5Tex_007388; +#define dydan_room_5Tex_006388 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_006388" +static const ALIGN_ASSET(2) char ydan_room_5Tex_006388[] = dydan_room_5Tex_006388; + +#define dydan_room_5Tex_006B88 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_006B88" +static const ALIGN_ASSET(2) char ydan_room_5Tex_006B88[] = dydan_room_5Tex_006B88; #define dydan_room_5Tex_006F88 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_006F88" static const ALIGN_ASSET(2) char ydan_room_5Tex_006F88[] = dydan_room_5Tex_006F88; -#define dydan_room_5Tex_006388 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_006388" -static const ALIGN_ASSET(2) char ydan_room_5Tex_006388[] = dydan_room_5Tex_006388; +#define dydan_room_5Tex_007388 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_007388" +static const ALIGN_ASSET(2) char ydan_room_5Tex_007388[] = dydan_room_5Tex_007388; #define dydan_room_5Tex_007788 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_007788" static const ALIGN_ASSET(2) char ydan_room_5Tex_007788[] = dydan_room_5Tex_007788; +#define dydan_room_5Tex_007B88 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_007B88" +static const ALIGN_ASSET(2) char ydan_room_5Tex_007B88[] = dydan_room_5Tex_007B88; + +#define dydan_room_5DL_003C98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5DL_003C98" +static const ALIGN_ASSET(2) char ydan_room_5DL_003C98[] = dydan_room_5DL_003C98; + +#define dydan_room_5DL_0022F0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5DL_0022F0" +static const ALIGN_ASSET(2) char ydan_room_5DL_0022F0[] = dydan_room_5DL_0022F0; + #endif // DUNGEONS_YDAN_ROOM_5_H diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_6.h b/soh/assets/scenes/dungeons/ydan/ydan_room_6.h index f88e5f7cb..4aecb4df0 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_room_6.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_room_6.h @@ -3,26 +3,26 @@ #include "align_asset_macro.h" -#define dydan_room_6DL_001430 "__OTR__scenes/nonmq/ydan_scene/ydan_room_6DL_001430" -static const ALIGN_ASSET(2) char ydan_room_6DL_001430[] = dydan_room_6DL_001430; - #define dydan_room_6Tex_001F00 "__OTR__scenes/nonmq/ydan_scene/ydan_room_6Tex_001F00" static const ALIGN_ASSET(2) char ydan_room_6Tex_001F00[] = dydan_room_6Tex_001F00; -#define dydan_room_6Tex_003700 "__OTR__scenes/nonmq/ydan_scene/ydan_room_6Tex_003700" -static const ALIGN_ASSET(2) char ydan_room_6Tex_003700[] = dydan_room_6Tex_003700; - -#define dydan_room_6Tex_002F00 "__OTR__scenes/nonmq/ydan_scene/ydan_room_6Tex_002F00" -static const ALIGN_ASSET(2) char ydan_room_6Tex_002F00[] = dydan_room_6Tex_002F00; - -#define dydan_room_6Tex_004700 "__OTR__scenes/nonmq/ydan_scene/ydan_room_6Tex_004700" -static const ALIGN_ASSET(2) char ydan_room_6Tex_004700[] = dydan_room_6Tex_004700; - #define dydan_room_6Tex_002700 "__OTR__scenes/nonmq/ydan_scene/ydan_room_6Tex_002700" static const ALIGN_ASSET(2) char ydan_room_6Tex_002700[] = dydan_room_6Tex_002700; +#define dydan_room_6Tex_002F00 "__OTR__scenes/nonmq/ydan_scene/ydan_room_6Tex_002F00" +static const ALIGN_ASSET(2) char ydan_room_6Tex_002F00[] = dydan_room_6Tex_002F00; + +#define dydan_room_6Tex_003700 "__OTR__scenes/nonmq/ydan_scene/ydan_room_6Tex_003700" +static const ALIGN_ASSET(2) char ydan_room_6Tex_003700[] = dydan_room_6Tex_003700; + #define dydan_room_6Tex_003F00 "__OTR__scenes/nonmq/ydan_scene/ydan_room_6Tex_003F00" static const ALIGN_ASSET(2) char ydan_room_6Tex_003F00[] = dydan_room_6Tex_003F00; +#define dydan_room_6Tex_004700 "__OTR__scenes/nonmq/ydan_scene/ydan_room_6Tex_004700" +static const ALIGN_ASSET(2) char ydan_room_6Tex_004700[] = dydan_room_6Tex_004700; + +#define dydan_room_6DL_001430 "__OTR__scenes/nonmq/ydan_scene/ydan_room_6DL_001430" +static const ALIGN_ASSET(2) char ydan_room_6DL_001430[] = dydan_room_6DL_001430; + #endif // DUNGEONS_YDAN_ROOM_6_H diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_7.h b/soh/assets/scenes/dungeons/ydan/ydan_room_7.h index 5f127f93d..37d60f5a0 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_room_7.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_room_7.h @@ -3,47 +3,47 @@ #include "align_asset_macro.h" -#define dydan_room_7DL_0079C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7DL_0079C0" -static const ALIGN_ASSET(2) char ydan_room_7DL_0079C0[] = dydan_room_7DL_0079C0; - -#define dydan_room_7Tex_007A98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_007A98" -static const ALIGN_ASSET(2) char ydan_room_7Tex_007A98[] = dydan_room_7Tex_007A98; - -#define dydan_room_7DL_001DE0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7DL_001DE0" -static const ALIGN_ASSET(2) char ydan_room_7DL_001DE0[] = dydan_room_7DL_001DE0; - -#define dydan_room_7Tex_004C98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_004C98" -static const ALIGN_ASSET(2) char ydan_room_7Tex_004C98[] = dydan_room_7Tex_004C98; - -#define dydan_room_7Tex_006098 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_006098" -static const ALIGN_ASSET(2) char ydan_room_7Tex_006098[] = dydan_room_7Tex_006098; - -#define dydan_room_7Tex_005898 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_005898" -static const ALIGN_ASSET(2) char ydan_room_7Tex_005898[] = dydan_room_7Tex_005898; - #define dydan_room_7Tex_002C98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_002C98" static const ALIGN_ASSET(2) char ydan_room_7Tex_002C98[] = dydan_room_7Tex_002C98; -#define dydan_room_7Tex_007098 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_007098" -static const ALIGN_ASSET(2) char ydan_room_7Tex_007098[] = dydan_room_7Tex_007098; - #define dydan_room_7Tex_003498 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_003498" static const ALIGN_ASSET(2) char ydan_room_7Tex_003498[] = dydan_room_7Tex_003498; -#define dydan_room_7Tex_006C98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_006C98" -static const ALIGN_ASSET(2) char ydan_room_7Tex_006C98[] = dydan_room_7Tex_006C98; - -#define dydan_room_7Tex_005498 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_005498" -static const ALIGN_ASSET(2) char ydan_room_7Tex_005498[] = dydan_room_7Tex_005498; - #define dydan_room_7Tex_003C98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_003C98" static const ALIGN_ASSET(2) char ydan_room_7Tex_003C98[] = dydan_room_7Tex_003C98; -#define dydan_room_7Tex_006898 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_006898" -static const ALIGN_ASSET(2) char ydan_room_7Tex_006898[] = dydan_room_7Tex_006898; - #define dydan_room_7Tex_004498 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_004498" static const ALIGN_ASSET(2) char ydan_room_7Tex_004498[] = dydan_room_7Tex_004498; +#define dydan_room_7Tex_004C98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_004C98" +static const ALIGN_ASSET(2) char ydan_room_7Tex_004C98[] = dydan_room_7Tex_004C98; + +#define dydan_room_7Tex_005498 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_005498" +static const ALIGN_ASSET(2) char ydan_room_7Tex_005498[] = dydan_room_7Tex_005498; + +#define dydan_room_7Tex_005898 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_005898" +static const ALIGN_ASSET(2) char ydan_room_7Tex_005898[] = dydan_room_7Tex_005898; + +#define dydan_room_7Tex_006098 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_006098" +static const ALIGN_ASSET(2) char ydan_room_7Tex_006098[] = dydan_room_7Tex_006098; + +#define dydan_room_7Tex_006898 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_006898" +static const ALIGN_ASSET(2) char ydan_room_7Tex_006898[] = dydan_room_7Tex_006898; + +#define dydan_room_7Tex_006C98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_006C98" +static const ALIGN_ASSET(2) char ydan_room_7Tex_006C98[] = dydan_room_7Tex_006C98; + +#define dydan_room_7Tex_007098 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_007098" +static const ALIGN_ASSET(2) char ydan_room_7Tex_007098[] = dydan_room_7Tex_007098; + +#define dydan_room_7Tex_007A98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_007A98" +static const ALIGN_ASSET(2) char ydan_room_7Tex_007A98[] = dydan_room_7Tex_007A98; + +#define dydan_room_7DL_0079C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7DL_0079C0" +static const ALIGN_ASSET(2) char ydan_room_7DL_0079C0[] = dydan_room_7DL_0079C0; + +#define dydan_room_7DL_001DE0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7DL_001DE0" +static const ALIGN_ASSET(2) char ydan_room_7DL_001DE0[] = dydan_room_7DL_001DE0; + #endif // DUNGEONS_YDAN_ROOM_7_H diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_8.h b/soh/assets/scenes/dungeons/ydan/ydan_room_8.h index 6af3f1fbf..181a85ad3 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_room_8.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_room_8.h @@ -3,11 +3,11 @@ #include "align_asset_macro.h" -#define dydan_room_8DL_000760 "__OTR__scenes/nonmq/ydan_scene/ydan_room_8DL_000760" -static const ALIGN_ASSET(2) char ydan_room_8DL_000760[] = dydan_room_8DL_000760; - #define dydan_room_8Tex_000988 "__OTR__scenes/nonmq/ydan_scene/ydan_room_8Tex_000988" static const ALIGN_ASSET(2) char ydan_room_8Tex_000988[] = dydan_room_8Tex_000988; +#define dydan_room_8DL_000760 "__OTR__scenes/nonmq/ydan_scene/ydan_room_8DL_000760" +static const ALIGN_ASSET(2) char ydan_room_8DL_000760[] = dydan_room_8DL_000760; + #endif // DUNGEONS_YDAN_ROOM_8_H diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_9.h b/soh/assets/scenes/dungeons/ydan/ydan_room_9.h index e6cea1c90..fd63bd09d 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_room_9.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_room_9.h @@ -3,8 +3,8 @@ #include "align_asset_macro.h" -#define dydan_room_9DL_002290 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9DL_002290" -static const ALIGN_ASSET(2) char ydan_room_9DL_002290[] = dydan_room_9DL_002290; +#define dydan_room_9Tex_002480 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_002480" +static const ALIGN_ASSET(2) char ydan_room_9Tex_002480[] = dydan_room_9Tex_002480; #define dydan_room_9Tex_002C80 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_002C80" static const ALIGN_ASSET(2) char ydan_room_9Tex_002C80[] = dydan_room_9Tex_002C80; @@ -12,29 +12,17 @@ static const ALIGN_ASSET(2) char ydan_room_9Tex_002C80[] = dydan_room_9Tex_002C8 #define dydan_room_9Tex_003480 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_003480" static const ALIGN_ASSET(2) char ydan_room_9Tex_003480[] = dydan_room_9Tex_003480; -#define dydan_room_9DL_007368 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9DL_007368" -static const ALIGN_ASSET(2) char ydan_room_9DL_007368[] = dydan_room_9DL_007368; +#define dydan_room_9Tex_003C80 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_003C80" +static const ALIGN_ASSET(2) char ydan_room_9Tex_003C80[] = dydan_room_9Tex_003C80; -#define dydan_room_9Tex_008898 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_008898" -static const ALIGN_ASSET(2) char ydan_room_9Tex_008898[] = dydan_room_9Tex_008898; - -#define dydan_room_9DL_006EA0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9DL_006EA0" -static const ALIGN_ASSET(2) char ydan_room_9DL_006EA0[] = dydan_room_9DL_006EA0; - -#define dydan_room_9Tex_007498 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_007498" -static const ALIGN_ASSET(2) char ydan_room_9Tex_007498[] = dydan_room_9Tex_007498; - -#define dydan_room_9DL_0013E0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9DL_0013E0" -static const ALIGN_ASSET(2) char ydan_room_9DL_0013E0[] = dydan_room_9DL_0013E0; - -#define dydan_room_9Tex_002480 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_002480" -static const ALIGN_ASSET(2) char ydan_room_9Tex_002480[] = dydan_room_9Tex_002480; +#define dydan_room_9Tex_004480 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_004480" +static const ALIGN_ASSET(2) char ydan_room_9Tex_004480[] = dydan_room_9Tex_004480; #define dydan_room_9Tex_004C80 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_004C80" static const ALIGN_ASSET(2) char ydan_room_9Tex_004C80[] = dydan_room_9Tex_004C80; -#define dydan_room_9Tex_003C80 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_003C80" -static const ALIGN_ASSET(2) char ydan_room_9Tex_003C80[] = dydan_room_9Tex_003C80; +#define dydan_room_9Tex_005480 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_005480" +static const ALIGN_ASSET(2) char ydan_room_9Tex_005480[] = dydan_room_9Tex_005480; #define dydan_room_9Tex_005C80 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_005C80" static const ALIGN_ASSET(2) char ydan_room_9Tex_005C80[] = dydan_room_9Tex_005C80; @@ -42,17 +30,29 @@ static const ALIGN_ASSET(2) char ydan_room_9Tex_005C80[] = dydan_room_9Tex_005C8 #define dydan_room_9Tex_006480 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_006480" static const ALIGN_ASSET(2) char ydan_room_9Tex_006480[] = dydan_room_9Tex_006480; -#define dydan_room_9Tex_005480 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_005480" -static const ALIGN_ASSET(2) char ydan_room_9Tex_005480[] = dydan_room_9Tex_005480; - -#define dydan_room_9Tex_004480 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_004480" -static const ALIGN_ASSET(2) char ydan_room_9Tex_004480[] = dydan_room_9Tex_004480; - -#define dydan_room_9DL_0070E0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9DL_0070E0" -static const ALIGN_ASSET(2) char ydan_room_9DL_0070E0[] = dydan_room_9DL_0070E0; +#define dydan_room_9Tex_007498 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_007498" +static const ALIGN_ASSET(2) char ydan_room_9Tex_007498[] = dydan_room_9Tex_007498; #define dydan_room_9Tex_008498 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_008498" static const ALIGN_ASSET(2) char ydan_room_9Tex_008498[] = dydan_room_9Tex_008498; +#define dydan_room_9Tex_008898 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_008898" +static const ALIGN_ASSET(2) char ydan_room_9Tex_008898[] = dydan_room_9Tex_008898; + +#define dydan_room_9DL_002290 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9DL_002290" +static const ALIGN_ASSET(2) char ydan_room_9DL_002290[] = dydan_room_9DL_002290; + +#define dydan_room_9DL_007368 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9DL_007368" +static const ALIGN_ASSET(2) char ydan_room_9DL_007368[] = dydan_room_9DL_007368; + +#define dydan_room_9DL_006EA0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9DL_006EA0" +static const ALIGN_ASSET(2) char ydan_room_9DL_006EA0[] = dydan_room_9DL_006EA0; + +#define dydan_room_9DL_0013E0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9DL_0013E0" +static const ALIGN_ASSET(2) char ydan_room_9DL_0013E0[] = dydan_room_9DL_0013E0; + +#define dydan_room_9DL_0070E0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9DL_0070E0" +static const ALIGN_ASSET(2) char ydan_room_9DL_0070E0[] = dydan_room_9DL_0070E0; + #endif // DUNGEONS_YDAN_ROOM_9_H diff --git a/soh/assets/scenes/dungeons/ydan/ydan_scene.h b/soh/assets/scenes/dungeons/ydan/ydan_scene.h index a906e44a0..38bcf804d 100644 --- a/soh/assets/scenes/dungeons/ydan/ydan_scene.h +++ b/soh/assets/scenes/dungeons/ydan/ydan_scene.h @@ -3,6 +3,9 @@ #include "align_asset_macro.h" +#define dydan_sceneTLUT_00B810 "__OTR__scenes/nonmq/ydan_scene/ydan_sceneTLUT_00B810" +static const ALIGN_ASSET(2) char ydan_sceneTLUT_00B810[] = dydan_sceneTLUT_00B810; + #define dgDekuTreeIntroCs "__OTR__scenes/nonmq/ydan_scene/gDekuTreeIntroCs" static const ALIGN_ASSET(2) char gDekuTreeIntroCs[] = dgDekuTreeIntroCs; @@ -15,7 +18,5 @@ static const ALIGN_ASSET(2) char gYdanTex_00CA18[] = dgYdanTex_00CA18; #define dydan_sceneCollisionHeader_00B618 "__OTR__scenes/nonmq/ydan_scene/ydan_sceneCollisionHeader_00B618" static const ALIGN_ASSET(2) char ydan_sceneCollisionHeader_00B618[] = dydan_sceneCollisionHeader_00B618; -#define dydan_sceneTLUT_00B810 "__OTR__scenes/nonmq/ydan_scene/ydan_sceneTLUT_00B810" -static const ALIGN_ASSET(2) char ydan_sceneTLUT_00B810[] = dydan_sceneTLUT_00B810; #endif // DUNGEONS_YDAN_SCENE_H diff --git a/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_room_0.h b/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_room_0.h index b04378f32..4db4ce0b8 100644 --- a/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_room_0.h +++ b/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_room_0.h @@ -3,38 +3,38 @@ #include "align_asset_macro.h" -#define dydan_boss_room_0DL_001780 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_0DL_001780" -static const ALIGN_ASSET(2) char ydan_boss_room_0DL_001780[] = dydan_boss_room_0DL_001780; - -#define dydan_boss_room_0Tex_002790 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_0Tex_002790" -static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_002790[] = dydan_boss_room_0Tex_002790; - -#define dydan_boss_room_0Tex_003790 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_0Tex_003790" -static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_003790[] = dydan_boss_room_0Tex_003790; - -#define dydan_boss_room_0Tex_003F90 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_0Tex_003F90" -static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_003F90[] = dydan_boss_room_0Tex_003F90; - -#define dydan_boss_room_0Tex_002F90 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_0Tex_002F90" -static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_002F90[] = dydan_boss_room_0Tex_002F90; - -#define dydan_boss_room_0Tex_001F90 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_0Tex_001F90" -static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_001F90[] = dydan_boss_room_0Tex_001F90; - -#define dydan_boss_room_0Tex_001790 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_0Tex_001790" +#define dydan_boss_room_0Tex_001790 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_0Tex_001790" static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_001790[] = dydan_boss_room_0Tex_001790; -#define dydan_boss_room_0DL_004BE0 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_0DL_004BE0" -static const ALIGN_ASSET(2) char ydan_boss_room_0DL_004BE0[] = dydan_boss_room_0DL_004BE0; +#define dydan_boss_room_0Tex_001F90 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_0Tex_001F90" +static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_001F90[] = dydan_boss_room_0Tex_001F90; -#define dydan_boss_room_0Tex_005FF0 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_0Tex_005FF0" -static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_005FF0[] = dydan_boss_room_0Tex_005FF0; +#define dydan_boss_room_0Tex_002790 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_0Tex_002790" +static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_002790[] = dydan_boss_room_0Tex_002790; -#define dydan_boss_room_0Tex_004BF0 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_0Tex_004BF0" +#define dydan_boss_room_0Tex_002F90 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_0Tex_002F90" +static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_002F90[] = dydan_boss_room_0Tex_002F90; + +#define dydan_boss_room_0Tex_003790 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_0Tex_003790" +static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_003790[] = dydan_boss_room_0Tex_003790; + +#define dydan_boss_room_0Tex_003F90 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_0Tex_003F90" +static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_003F90[] = dydan_boss_room_0Tex_003F90; + +#define dydan_boss_room_0Tex_004BF0 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_0Tex_004BF0" static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_004BF0[] = dydan_boss_room_0Tex_004BF0; -#define dydan_boss_room_0Tex_005BF0 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_0Tex_005BF0" +#define dydan_boss_room_0Tex_005BF0 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_0Tex_005BF0" static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_005BF0[] = dydan_boss_room_0Tex_005BF0; +#define dydan_boss_room_0Tex_005FF0 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_0Tex_005FF0" +static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_005FF0[] = dydan_boss_room_0Tex_005FF0; + +#define dydan_boss_room_0DL_001780 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_0DL_001780" +static const ALIGN_ASSET(2) char ydan_boss_room_0DL_001780[] = dydan_boss_room_0DL_001780; + +#define dydan_boss_room_0DL_004BE0 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_0DL_004BE0" +static const ALIGN_ASSET(2) char ydan_boss_room_0DL_004BE0[] = dydan_boss_room_0DL_004BE0; + #endif // DUNGEONS_YDAN_BOSS_ROOM_0_H diff --git a/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_room_1.h b/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_room_1.h index 8547b762f..ee2e0b288 100644 --- a/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_room_1.h +++ b/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_room_1.h @@ -3,23 +3,23 @@ #include "align_asset_macro.h" -#define dydan_boss_room_1DL_003B28 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_1DL_003B28" -static const ALIGN_ASSET(2) char ydan_boss_room_1DL_003B28[] = dydan_boss_room_1DL_003B28; - -#define dydan_boss_room_1Tex_004B38 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_1Tex_004B38" -static const ALIGN_ASSET(2) char ydan_boss_room_1Tex_004B38[] = dydan_boss_room_1Tex_004B38; - -#define dydan_boss_room_1Tex_003B38 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_1Tex_003B38" +#define dydan_boss_room_1Tex_003B38 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_1Tex_003B38" static const ALIGN_ASSET(2) char ydan_boss_room_1Tex_003B38[] = dydan_boss_room_1Tex_003B38; -#define dydan_boss_room_1Tex_005338 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_1Tex_005338" +#define dydan_boss_room_1Tex_004B38 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_1Tex_004B38" +static const ALIGN_ASSET(2) char ydan_boss_room_1Tex_004B38[] = dydan_boss_room_1Tex_004B38; + +#define dydan_boss_room_1Tex_005338 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_1Tex_005338" static const ALIGN_ASSET(2) char ydan_boss_room_1Tex_005338[] = dydan_boss_room_1Tex_005338; -#define dydan_boss_room_1DL_005FD8 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_1DL_005FD8" -static const ALIGN_ASSET(2) char ydan_boss_room_1DL_005FD8[] = dydan_boss_room_1DL_005FD8; - -#define dydan_boss_room_1Tex_005FE8 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_1Tex_005FE8" +#define dydan_boss_room_1Tex_005FE8 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_1Tex_005FE8" static const ALIGN_ASSET(2) char ydan_boss_room_1Tex_005FE8[] = dydan_boss_room_1Tex_005FE8; +#define dydan_boss_room_1DL_003B28 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_1DL_003B28" +static const ALIGN_ASSET(2) char ydan_boss_room_1DL_003B28[] = dydan_boss_room_1DL_003B28; + +#define dydan_boss_room_1DL_005FD8 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_1DL_005FD8" +static const ALIGN_ASSET(2) char ydan_boss_room_1DL_005FD8[] = dydan_boss_room_1DL_005FD8; + #endif // DUNGEONS_YDAN_BOSS_ROOM_1_H diff --git a/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_scene.h b/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_scene.h index 6a3c7ba69..d48a322a7 100644 --- a/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_scene.h +++ b/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_scene.h @@ -3,13 +3,14 @@ #include "align_asset_macro.h" -#define dydan_boss_sceneCollisionHeader_000CFC "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_sceneCollisionHeader_000CFC" -static const ALIGN_ASSET(2) char ydan_boss_sceneCollisionHeader_000CFC[] = dydan_boss_sceneCollisionHeader_000CFC; - -#define dydan_boss_sceneTLUT_000D30 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_sceneTLUT_000D30" -static const ALIGN_ASSET(2) char ydan_boss_sceneTLUT_000D30[] = dydan_boss_sceneTLUT_000D30; - -#define dydan_boss_sceneTex_000F38 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_sceneTex_000F38" +#define dydan_boss_sceneTex_000F38 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_sceneTex_000F38" static const ALIGN_ASSET(2) char ydan_boss_sceneTex_000F38[] = dydan_boss_sceneTex_000F38; +#define dydan_boss_sceneTLUT_000D30 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_sceneTLUT_000D30" +static const ALIGN_ASSET(2) char ydan_boss_sceneTLUT_000D30[] = dydan_boss_sceneTLUT_000D30; + +#define dydan_boss_sceneCollisionHeader_000CFC "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_sceneCollisionHeader_000CFC" +static const ALIGN_ASSET(2) char ydan_boss_sceneCollisionHeader_000CFC[] = dydan_boss_sceneCollisionHeader_000CFC; + + #endif // DUNGEONS_YDAN_BOSS_SCENE_H diff --git a/soh/assets/scenes/indoors/bowling/bowling_room_0.h b/soh/assets/scenes/indoors/bowling/bowling_room_0.h index a82819b68..1f3ea54cb 100644 --- a/soh/assets/scenes/indoors/bowling/bowling_room_0.h +++ b/soh/assets/scenes/indoors/bowling/bowling_room_0.h @@ -3,10 +3,10 @@ #include "align_asset_macro.h" -#define dbowling_room_0DL_004D90 "__OTR__scenes/nonmq/bowling_scene/bowling_room_0DL_004D90" +#define dbowling_room_0DL_004D90 "__OTR__scenes/shared/bowling_scene/bowling_room_0DL_004D90" static const ALIGN_ASSET(2) char bowling_room_0DL_004D90[] = dbowling_room_0DL_004D90; -#define dbowling_room_0DL_0061A8 "__OTR__scenes/nonmq/bowling_scene/bowling_room_0DL_0061A8" +#define dbowling_room_0DL_0061A8 "__OTR__scenes/shared/bowling_scene/bowling_room_0DL_0061A8" static const ALIGN_ASSET(2) char bowling_room_0DL_0061A8[] = dbowling_room_0DL_0061A8; diff --git a/soh/assets/scenes/indoors/bowling/bowling_scene.h b/soh/assets/scenes/indoors/bowling/bowling_scene.h index ed0cb984b..f999c0dd5 100644 --- a/soh/assets/scenes/indoors/bowling/bowling_scene.h +++ b/soh/assets/scenes/indoors/bowling/bowling_scene.h @@ -3,91 +3,92 @@ #include "align_asset_macro.h" -#define dbowling_sceneCollisionHeader_001A74 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneCollisionHeader_001A74" -static const ALIGN_ASSET(2) char bowling_sceneCollisionHeader_001A74[] = dbowling_sceneCollisionHeader_001A74; - -#define dbowling_sceneTex_00DB20 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_00DB20" -static const ALIGN_ASSET(2) char bowling_sceneTex_00DB20[] = dbowling_sceneTex_00DB20; - -#define dbowling_sceneTex_00BF20 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_00BF20" -static const ALIGN_ASSET(2) char bowling_sceneTex_00BF20[] = dbowling_sceneTex_00BF20; - -#define dbowling_sceneTex_009120 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_009120" -static const ALIGN_ASSET(2) char bowling_sceneTex_009120[] = dbowling_sceneTex_009120; - -#define dbowling_sceneTex_008920 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_008920" -static const ALIGN_ASSET(2) char bowling_sceneTex_008920[] = dbowling_sceneTex_008920; - -#define dbowling_sceneTex_00D720 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_00D720" -static const ALIGN_ASSET(2) char bowling_sceneTex_00D720[] = dbowling_sceneTex_00D720; - -#define dbowling_sceneTex_008120 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_008120" -static const ALIGN_ASSET(2) char bowling_sceneTex_008120[] = dbowling_sceneTex_008120; - -#define dbowling_sceneTex_00A120 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_00A120" -static const ALIGN_ASSET(2) char bowling_sceneTex_00A120[] = dbowling_sceneTex_00A120; - -#define dbowling_sceneTex_006120 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_006120" -static const ALIGN_ASSET(2) char bowling_sceneTex_006120[] = dbowling_sceneTex_006120; - -#define dbowling_sceneTex_005920 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_005920" -static const ALIGN_ASSET(2) char bowling_sceneTex_005920[] = dbowling_sceneTex_005920; - -#define dbowling_sceneTex_005320 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_005320" -static const ALIGN_ASSET(2) char bowling_sceneTex_005320[] = dbowling_sceneTex_005320; - -#define dbowling_sceneTex_005120 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_005120" -static const ALIGN_ASSET(2) char bowling_sceneTex_005120[] = dbowling_sceneTex_005120; - -#define dbowling_sceneTex_003720 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_003720" -static const ALIGN_ASSET(2) char bowling_sceneTex_003720[] = dbowling_sceneTex_003720; - -#define dbowling_sceneTex_004F20 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_004F20" -static const ALIGN_ASSET(2) char bowling_sceneTex_004F20[] = dbowling_sceneTex_004F20; - -#define dbowling_sceneTex_002F20 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_002F20" -static const ALIGN_ASSET(2) char bowling_sceneTex_002F20[] = dbowling_sceneTex_002F20; - -#define dbowling_sceneTex_002720 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_002720" -static const ALIGN_ASSET(2) char bowling_sceneTex_002720[] = dbowling_sceneTex_002720; - -#define dbowling_sceneTex_0022A0 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_0022A0" -static const ALIGN_ASSET(2) char bowling_sceneTex_0022A0[] = dbowling_sceneTex_0022A0; - -#define dbowling_sceneTex_005520 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_005520" -static const ALIGN_ASSET(2) char bowling_sceneTex_005520[] = dbowling_sceneTex_005520; - -#define dbowling_sceneTex_002320 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_002320" -static const ALIGN_ASSET(2) char bowling_sceneTex_002320[] = dbowling_sceneTex_002320; - -#define dbowling_sceneTex_001AA0 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_001AA0" +#define dbowling_sceneTex_001AA0 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_001AA0" static const ALIGN_ASSET(2) char bowling_sceneTex_001AA0[] = dbowling_sceneTex_001AA0; -#define dbowling_sceneTex_00C720 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_00C720" -static const ALIGN_ASSET(2) char bowling_sceneTex_00C720[] = dbowling_sceneTex_00C720; +#define dbowling_sceneTex_0022A0 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_0022A0" +static const ALIGN_ASSET(2) char bowling_sceneTex_0022A0[] = dbowling_sceneTex_0022A0; -#define dbowling_sceneTex_00B720 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_00B720" -static const ALIGN_ASSET(2) char bowling_sceneTex_00B720[] = dbowling_sceneTex_00B720; +#define dbowling_sceneTex_002320 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_002320" +static const ALIGN_ASSET(2) char bowling_sceneTex_002320[] = dbowling_sceneTex_002320; -#define dbowling_sceneTex_00BB20 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_00BB20" -static const ALIGN_ASSET(2) char bowling_sceneTex_00BB20[] = dbowling_sceneTex_00BB20; +#define dbowling_sceneTex_002720 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_002720" +static const ALIGN_ASSET(2) char bowling_sceneTex_002720[] = dbowling_sceneTex_002720; -#define dbowling_sceneTex_00AF20 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_00AF20" -static const ALIGN_ASSET(2) char bowling_sceneTex_00AF20[] = dbowling_sceneTex_00AF20; +#define dbowling_sceneTex_002F20 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_002F20" +static const ALIGN_ASSET(2) char bowling_sceneTex_002F20[] = dbowling_sceneTex_002F20; -#define dbowling_sceneTex_00A920 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_00A920" -static const ALIGN_ASSET(2) char bowling_sceneTex_00A920[] = dbowling_sceneTex_00A920; +#define dbowling_sceneTex_003720 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_003720" +static const ALIGN_ASSET(2) char bowling_sceneTex_003720[] = dbowling_sceneTex_003720; -#define dbowling_sceneTex_00AB20 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_00AB20" -static const ALIGN_ASSET(2) char bowling_sceneTex_00AB20[] = dbowling_sceneTex_00AB20; - -#define dbowling_sceneTex_004720 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_004720" +#define dbowling_sceneTex_004720 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_004720" static const ALIGN_ASSET(2) char bowling_sceneTex_004720[] = dbowling_sceneTex_004720; -#define dbowling_sceneTex_007120 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_007120" +#define dbowling_sceneTex_004F20 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_004F20" +static const ALIGN_ASSET(2) char bowling_sceneTex_004F20[] = dbowling_sceneTex_004F20; + +#define dbowling_sceneTex_005120 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_005120" +static const ALIGN_ASSET(2) char bowling_sceneTex_005120[] = dbowling_sceneTex_005120; + +#define dbowling_sceneTex_005320 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_005320" +static const ALIGN_ASSET(2) char bowling_sceneTex_005320[] = dbowling_sceneTex_005320; + +#define dbowling_sceneTex_005520 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_005520" +static const ALIGN_ASSET(2) char bowling_sceneTex_005520[] = dbowling_sceneTex_005520; + +#define dbowling_sceneTex_005920 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_005920" +static const ALIGN_ASSET(2) char bowling_sceneTex_005920[] = dbowling_sceneTex_005920; + +#define dbowling_sceneTex_006120 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_006120" +static const ALIGN_ASSET(2) char bowling_sceneTex_006120[] = dbowling_sceneTex_006120; + +#define dbowling_sceneTex_007120 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_007120" static const ALIGN_ASSET(2) char bowling_sceneTex_007120[] = dbowling_sceneTex_007120; -#define dbowling_sceneTex_00AD20 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_00AD20" +#define dbowling_sceneTex_008120 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_008120" +static const ALIGN_ASSET(2) char bowling_sceneTex_008120[] = dbowling_sceneTex_008120; + +#define dbowling_sceneTex_008920 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_008920" +static const ALIGN_ASSET(2) char bowling_sceneTex_008920[] = dbowling_sceneTex_008920; + +#define dbowling_sceneTex_009120 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_009120" +static const ALIGN_ASSET(2) char bowling_sceneTex_009120[] = dbowling_sceneTex_009120; + +#define dbowling_sceneTex_00A120 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_00A120" +static const ALIGN_ASSET(2) char bowling_sceneTex_00A120[] = dbowling_sceneTex_00A120; + +#define dbowling_sceneTex_00A920 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_00A920" +static const ALIGN_ASSET(2) char bowling_sceneTex_00A920[] = dbowling_sceneTex_00A920; + +#define dbowling_sceneTex_00AB20 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_00AB20" +static const ALIGN_ASSET(2) char bowling_sceneTex_00AB20[] = dbowling_sceneTex_00AB20; + +#define dbowling_sceneTex_00AD20 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_00AD20" static const ALIGN_ASSET(2) char bowling_sceneTex_00AD20[] = dbowling_sceneTex_00AD20; +#define dbowling_sceneTex_00AF20 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_00AF20" +static const ALIGN_ASSET(2) char bowling_sceneTex_00AF20[] = dbowling_sceneTex_00AF20; + +#define dbowling_sceneTex_00B720 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_00B720" +static const ALIGN_ASSET(2) char bowling_sceneTex_00B720[] = dbowling_sceneTex_00B720; + +#define dbowling_sceneTex_00BB20 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_00BB20" +static const ALIGN_ASSET(2) char bowling_sceneTex_00BB20[] = dbowling_sceneTex_00BB20; + +#define dbowling_sceneTex_00BF20 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_00BF20" +static const ALIGN_ASSET(2) char bowling_sceneTex_00BF20[] = dbowling_sceneTex_00BF20; + +#define dbowling_sceneTex_00C720 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_00C720" +static const ALIGN_ASSET(2) char bowling_sceneTex_00C720[] = dbowling_sceneTex_00C720; + +#define dbowling_sceneTex_00D720 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_00D720" +static const ALIGN_ASSET(2) char bowling_sceneTex_00D720[] = dbowling_sceneTex_00D720; + +#define dbowling_sceneTex_00DB20 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_00DB20" +static const ALIGN_ASSET(2) char bowling_sceneTex_00DB20[] = dbowling_sceneTex_00DB20; + +#define dbowling_sceneCollisionHeader_001A74 "__OTR__scenes/shared/bowling_scene/bowling_sceneCollisionHeader_001A74" +static const ALIGN_ASSET(2) char bowling_sceneCollisionHeader_001A74[] = dbowling_sceneCollisionHeader_001A74; + + #endif // INDOORS_BOWLING_SCENE_H diff --git a/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_room_0.h b/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_room_0.h index 1d6f2c369..fc08681b6 100644 --- a/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_room_0.h +++ b/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_room_0.h @@ -3,28 +3,28 @@ #include "align_asset_macro.h" -#define ddaiyousei_izumi_room_0DL_002BB8 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_room_0DL_002BB8" +#define ddaiyousei_izumi_room_0DL_002BB8 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_room_0DL_002BB8" static const ALIGN_ASSET(2) char daiyousei_izumi_room_0DL_002BB8[] = ddaiyousei_izumi_room_0DL_002BB8; -#define ddaiyousei_izumi_room_0DL_0038F8 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_room_0DL_0038F8" +#define ddaiyousei_izumi_room_0DL_0038F8 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_room_0DL_0038F8" static const ALIGN_ASSET(2) char daiyousei_izumi_room_0DL_0038F8[] = ddaiyousei_izumi_room_0DL_0038F8; -#define ddaiyousei_izumi_room_0Set_000160DL_002BB8 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_000160DL_002BB8" +#define ddaiyousei_izumi_room_0Set_000160DL_002BB8 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_000160DL_002BB8" static const ALIGN_ASSET(2) char daiyousei_izumi_room_0Set_000160DL_002BB8[] = ddaiyousei_izumi_room_0Set_000160DL_002BB8; -#define ddaiyousei_izumi_room_0Set_000160DL_0038F8 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_000160DL_0038F8" +#define ddaiyousei_izumi_room_0Set_000160DL_0038F8 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_000160DL_0038F8" static const ALIGN_ASSET(2) char daiyousei_izumi_room_0Set_000160DL_0038F8[] = ddaiyousei_izumi_room_0Set_000160DL_0038F8; -#define ddaiyousei_izumi_room_0Set_0001E0DL_002BB8 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_0001E0DL_002BB8" +#define ddaiyousei_izumi_room_0Set_0001E0DL_002BB8 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_0001E0DL_002BB8" static const ALIGN_ASSET(2) char daiyousei_izumi_room_0Set_0001E0DL_002BB8[] = ddaiyousei_izumi_room_0Set_0001E0DL_002BB8; -#define ddaiyousei_izumi_room_0Set_0001E0DL_0038F8 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_0001E0DL_0038F8" +#define ddaiyousei_izumi_room_0Set_0001E0DL_0038F8 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_0001E0DL_0038F8" static const ALIGN_ASSET(2) char daiyousei_izumi_room_0Set_0001E0DL_0038F8[] = ddaiyousei_izumi_room_0Set_0001E0DL_0038F8; -#define ddaiyousei_izumi_room_0Set_000260DL_002BB8 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_000260DL_002BB8" +#define ddaiyousei_izumi_room_0Set_000260DL_002BB8 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_000260DL_002BB8" static const ALIGN_ASSET(2) char daiyousei_izumi_room_0Set_000260DL_002BB8[] = ddaiyousei_izumi_room_0Set_000260DL_002BB8; -#define ddaiyousei_izumi_room_0Set_000260DL_0038F8 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_000260DL_0038F8" +#define ddaiyousei_izumi_room_0Set_000260DL_0038F8 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_000260DL_0038F8" static const ALIGN_ASSET(2) char daiyousei_izumi_room_0Set_000260DL_0038F8[] = ddaiyousei_izumi_room_0Set_000260DL_0038F8; diff --git a/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h b/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h index 30ff0b896..0d1d3e385 100644 --- a/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h +++ b/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h @@ -3,65 +3,65 @@ #include "align_asset_macro.h" -#define dgGreatFairyMagicCs "__OTR__scenes/nonmq/daiyousei_izumi_scene/gGreatFairyMagicCs" -static const ALIGN_ASSET(2) char gGreatFairyMagicCs[] = dgGreatFairyMagicCs; - -#define dgGreatFairyDoubleMagicCs "__OTR__scenes/nonmq/daiyousei_izumi_scene/gGreatFairyDoubleMagicCs" -static const ALIGN_ASSET(2) char gGreatFairyDoubleMagicCs[] = dgGreatFairyDoubleMagicCs; - -#define dgGreatFairyDoubleDefenseCs "__OTR__scenes/nonmq/daiyousei_izumi_scene/gGreatFairyDoubleDefenseCs" -static const ALIGN_ASSET(2) char gGreatFairyDoubleDefenseCs[] = dgGreatFairyDoubleDefenseCs; - -#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4" -static const ALIGN_ASSET(2) char daiyousei_izumi_sceneCollisionHeader_0043A4[] = ddaiyousei_izumi_sceneCollisionHeader_0043A4; - -#define ddaiyousei_izumi_sceneTex_00D800 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00D800" -static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00D800[] = ddaiyousei_izumi_sceneTex_00D800; - -#define ddaiyousei_izumi_sceneTex_009000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_009000" -static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_009000[] = ddaiyousei_izumi_sceneTex_009000; - -#define ddaiyousei_izumi_sceneTex_008000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_008000" -static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_008000[] = ddaiyousei_izumi_sceneTex_008000; - -#define ddaiyousei_izumi_sceneTex_007000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_007000" -static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_007000[] = ddaiyousei_izumi_sceneTex_007000; - -#define ddaiyousei_izumi_sceneTex_005000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_005000" -static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_005000[] = ddaiyousei_izumi_sceneTex_005000; - -#define ddaiyousei_izumi_sceneTex_00B000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00B000" -static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00B000[] = ddaiyousei_izumi_sceneTex_00B000; - -#define ddaiyousei_izumi_sceneTex_00D000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00D000" -static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00D000[] = ddaiyousei_izumi_sceneTex_00D000; - -#define ddaiyousei_izumi_sceneTex_00A800 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00A800" -static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00A800[] = ddaiyousei_izumi_sceneTex_00A800; - -#define ddaiyousei_izumi_sceneTex_005800 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_005800" -static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_005800[] = ddaiyousei_izumi_sceneTex_005800; - -#define ddaiyousei_izumi_sceneTex_004800 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_004800" +#define ddaiyousei_izumi_sceneTex_004800 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_004800" static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_004800[] = ddaiyousei_izumi_sceneTex_004800; -#define ddaiyousei_izumi_sceneTex_00C000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00C000" -static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00C000[] = ddaiyousei_izumi_sceneTex_00C000; +#define ddaiyousei_izumi_sceneTex_005000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_005000" +static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_005000[] = ddaiyousei_izumi_sceneTex_005000; -#define ddaiyousei_izumi_sceneTex_00A000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00A000" -static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00A000[] = ddaiyousei_izumi_sceneTex_00A000; +#define ddaiyousei_izumi_sceneTex_005800 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_005800" +static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_005800[] = ddaiyousei_izumi_sceneTex_005800; -#define ddaiyousei_izumi_sceneTex_00C800 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00C800" -static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00C800[] = ddaiyousei_izumi_sceneTex_00C800; - -#define ddaiyousei_izumi_sceneTex_006000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_006000" +#define ddaiyousei_izumi_sceneTex_006000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_006000" static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_006000[] = ddaiyousei_izumi_sceneTex_006000; -#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4" +#define ddaiyousei_izumi_sceneTex_007000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_007000" +static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_007000[] = ddaiyousei_izumi_sceneTex_007000; -#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4" +#define ddaiyousei_izumi_sceneTex_008000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_008000" +static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_008000[] = ddaiyousei_izumi_sceneTex_008000; -#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4" +#define ddaiyousei_izumi_sceneTex_009000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_009000" +static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_009000[] = ddaiyousei_izumi_sceneTex_009000; + +#define ddaiyousei_izumi_sceneTex_00A000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00A000" +static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00A000[] = ddaiyousei_izumi_sceneTex_00A000; + +#define ddaiyousei_izumi_sceneTex_00A800 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00A800" +static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00A800[] = ddaiyousei_izumi_sceneTex_00A800; + +#define ddaiyousei_izumi_sceneTex_00B000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00B000" +static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00B000[] = ddaiyousei_izumi_sceneTex_00B000; + +#define ddaiyousei_izumi_sceneTex_00C000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00C000" +static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00C000[] = ddaiyousei_izumi_sceneTex_00C000; + +#define ddaiyousei_izumi_sceneTex_00C800 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00C800" +static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00C800[] = ddaiyousei_izumi_sceneTex_00C800; + +#define ddaiyousei_izumi_sceneTex_00D000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00D000" +static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00D000[] = ddaiyousei_izumi_sceneTex_00D000; + +#define ddaiyousei_izumi_sceneTex_00D800 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00D800" +static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00D800[] = ddaiyousei_izumi_sceneTex_00D800; + +#define dgGreatFairyMagicCs "__OTR__scenes/shared/daiyousei_izumi_scene/gGreatFairyMagicCs" +static const ALIGN_ASSET(2) char gGreatFairyMagicCs[] = dgGreatFairyMagicCs; + +#define dgGreatFairyDoubleMagicCs "__OTR__scenes/shared/daiyousei_izumi_scene/gGreatFairyDoubleMagicCs" +static const ALIGN_ASSET(2) char gGreatFairyDoubleMagicCs[] = dgGreatFairyDoubleMagicCs; + +#define dgGreatFairyDoubleDefenseCs "__OTR__scenes/shared/daiyousei_izumi_scene/gGreatFairyDoubleDefenseCs" +static const ALIGN_ASSET(2) char gGreatFairyDoubleDefenseCs[] = dgGreatFairyDoubleDefenseCs; + +#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4" +static const ALIGN_ASSET(2) char daiyousei_izumi_sceneCollisionHeader_0043A4[] = ddaiyousei_izumi_sceneCollisionHeader_0043A4; + +#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4" + +#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4" + +#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4" #endif // INDOORS_DAIYOUSEI_IZUMI_SCENE_H diff --git a/soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_room_0.h b/soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_room_0.h index 74be5a6b5..a192bfce4 100644 --- a/soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_room_0.h +++ b/soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_room_0.h @@ -3,43 +3,43 @@ #include "align_asset_macro.h" -#define dhairal_niwa_room_0DL_000390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_000390" +#define dhairal_niwa_room_0DL_000390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_000390" static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_000390[] = dhairal_niwa_room_0DL_000390; -#define dhairal_niwa_room_0DL_0095E0 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_0095E0" +#define dhairal_niwa_room_0DL_0095E0 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_0095E0" static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_0095E0[] = dhairal_niwa_room_0DL_0095E0; -#define dhairal_niwa_room_0DL_001D98 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_001D98" +#define dhairal_niwa_room_0DL_001D98 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_001D98" static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_001D98[] = dhairal_niwa_room_0DL_001D98; -#define dhairal_niwa_room_0DL_009958 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_009958" +#define dhairal_niwa_room_0DL_009958 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_009958" static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_009958[] = dhairal_niwa_room_0DL_009958; -#define dhairal_niwa_room_0DL_002DE8 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_002DE8" +#define dhairal_niwa_room_0DL_002DE8 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_002DE8" static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_002DE8[] = dhairal_niwa_room_0DL_002DE8; -#define dhairal_niwa_room_0DL_003CE0 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_003CE0" +#define dhairal_niwa_room_0DL_003CE0 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_003CE0" static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_003CE0[] = dhairal_niwa_room_0DL_003CE0; -#define dhairal_niwa_room_0DL_00A2E8 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_00A2E8" +#define dhairal_niwa_room_0DL_00A2E8 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_00A2E8" static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_00A2E8[] = dhairal_niwa_room_0DL_00A2E8; -#define dhairal_niwa_room_0DL_005188 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_005188" +#define dhairal_niwa_room_0DL_005188 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_005188" static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_005188[] = dhairal_niwa_room_0DL_005188; -#define dhairal_niwa_room_0DL_006330 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_006330" +#define dhairal_niwa_room_0DL_006330 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_006330" static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_006330[] = dhairal_niwa_room_0DL_006330; -#define dhairal_niwa_room_0DL_00A630 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_00A630" +#define dhairal_niwa_room_0DL_00A630 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_00A630" static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_00A630[] = dhairal_niwa_room_0DL_00A630; -#define dhairal_niwa_room_0DL_0082C8 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_0082C8" +#define dhairal_niwa_room_0DL_0082C8 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_0082C8" static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_0082C8[] = dhairal_niwa_room_0DL_0082C8; -#define dhairal_niwa_room_0DL_0090A8 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_0090A8" +#define dhairal_niwa_room_0DL_0090A8 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_0090A8" static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_0090A8[] = dhairal_niwa_room_0DL_0090A8; -#define dhairal_niwa_room_0DL_00A7E0 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_00A7E0" +#define dhairal_niwa_room_0DL_00A7E0 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_00A7E0" static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_00A7E0[] = dhairal_niwa_room_0DL_00A7E0; diff --git a/soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_scene.h b/soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_scene.h index 8f5aaa3b6..ea7122295 100644 --- a/soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_scene.h +++ b/soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_scene.h @@ -3,73 +3,74 @@ #include "align_asset_macro.h" -#define dhairal_niwa_sceneCollisionHeader_0030B0 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneCollisionHeader_0030B0" -static const ALIGN_ASSET(2) char hairal_niwa_sceneCollisionHeader_0030B0[] = dhairal_niwa_sceneCollisionHeader_0030B0; - -#define dhairal_niwa_sceneTex_007390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_007390" -static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_007390[] = dhairal_niwa_sceneTex_007390; - -#define dhairal_niwa_sceneTex_003390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_003390" +#define dhairal_niwa_sceneTex_003390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_003390" static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_003390[] = dhairal_niwa_sceneTex_003390; -#define dhairal_niwa_sceneTex_008B90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_008B90" -static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_008B90[] = dhairal_niwa_sceneTex_008B90; - -#define dhairal_niwa_sceneTex_005390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_005390" -static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_005390[] = dhairal_niwa_sceneTex_005390; - -#define dhairal_niwa_sceneTex_00D390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00D390" -static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00D390[] = dhairal_niwa_sceneTex_00D390; - -#define dhairal_niwa_sceneTex_004B90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_004B90" -static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_004B90[] = dhairal_niwa_sceneTex_004B90; - -#define dhairal_niwa_sceneTex_00EB90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00EB90" -static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00EB90[] = dhairal_niwa_sceneTex_00EB90; - -#define dhairal_niwa_sceneTex_00F390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00F390" -static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00F390[] = dhairal_niwa_sceneTex_00F390; - -#define dhairal_niwa_sceneTex_010390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_010390" -static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_010390[] = dhairal_niwa_sceneTex_010390; - -#define dhairal_niwa_sceneTex_00FB90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00FB90" -static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00FB90[] = dhairal_niwa_sceneTex_00FB90; - -#define dhairal_niwa_sceneTex_009390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_009390" -static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_009390[] = dhairal_niwa_sceneTex_009390; - -#define dhairal_niwa_sceneTex_007B90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_007B90" -static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_007B90[] = dhairal_niwa_sceneTex_007B90; - -#define dhairal_niwa_sceneTex_006390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_006390" -static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_006390[] = dhairal_niwa_sceneTex_006390; - -#define dhairal_niwa_sceneTex_00CB90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00CB90" -static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00CB90[] = dhairal_niwa_sceneTex_00CB90; - -#define dhairal_niwa_sceneTex_00B390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00B390" -static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00B390[] = dhairal_niwa_sceneTex_00B390; - -#define dhairal_niwa_sceneTex_00AB90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00AB90" -static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00AB90[] = dhairal_niwa_sceneTex_00AB90; - -#define dhairal_niwa_sceneTex_00DB90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00DB90" -static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00DB90[] = dhairal_niwa_sceneTex_00DB90; - -#define dhairal_niwa_sceneTex_00C390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00C390" -static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00C390[] = dhairal_niwa_sceneTex_00C390; - -#define dhairal_niwa_sceneTex_00BB90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00BB90" -static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00BB90[] = dhairal_niwa_sceneTex_00BB90; - -#define dhairal_niwa_sceneTex_009B90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_009B90" -static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_009B90[] = dhairal_niwa_sceneTex_009B90; - -#define dhairal_niwa_sceneTex_005B90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_005B90" -static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_005B90[] = dhairal_niwa_sceneTex_005B90; - -#define dhairal_niwa_sceneTex_003B90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_003B90" +#define dhairal_niwa_sceneTex_003B90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_003B90" static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_003B90[] = dhairal_niwa_sceneTex_003B90; +#define dhairal_niwa_sceneTex_004B90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_004B90" +static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_004B90[] = dhairal_niwa_sceneTex_004B90; + +#define dhairal_niwa_sceneTex_005390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_005390" +static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_005390[] = dhairal_niwa_sceneTex_005390; + +#define dhairal_niwa_sceneTex_005B90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_005B90" +static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_005B90[] = dhairal_niwa_sceneTex_005B90; + +#define dhairal_niwa_sceneTex_006390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_006390" +static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_006390[] = dhairal_niwa_sceneTex_006390; + +#define dhairal_niwa_sceneTex_007390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_007390" +static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_007390[] = dhairal_niwa_sceneTex_007390; + +#define dhairal_niwa_sceneTex_007B90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_007B90" +static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_007B90[] = dhairal_niwa_sceneTex_007B90; + +#define dhairal_niwa_sceneTex_008B90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_008B90" +static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_008B90[] = dhairal_niwa_sceneTex_008B90; + +#define dhairal_niwa_sceneTex_009390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_009390" +static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_009390[] = dhairal_niwa_sceneTex_009390; + +#define dhairal_niwa_sceneTex_009B90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_009B90" +static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_009B90[] = dhairal_niwa_sceneTex_009B90; + +#define dhairal_niwa_sceneTex_00AB90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00AB90" +static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00AB90[] = dhairal_niwa_sceneTex_00AB90; + +#define dhairal_niwa_sceneTex_00B390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00B390" +static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00B390[] = dhairal_niwa_sceneTex_00B390; + +#define dhairal_niwa_sceneTex_00BB90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00BB90" +static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00BB90[] = dhairal_niwa_sceneTex_00BB90; + +#define dhairal_niwa_sceneTex_00C390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00C390" +static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00C390[] = dhairal_niwa_sceneTex_00C390; + +#define dhairal_niwa_sceneTex_00CB90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00CB90" +static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00CB90[] = dhairal_niwa_sceneTex_00CB90; + +#define dhairal_niwa_sceneTex_00D390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00D390" +static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00D390[] = dhairal_niwa_sceneTex_00D390; + +#define dhairal_niwa_sceneTex_00DB90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00DB90" +static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00DB90[] = dhairal_niwa_sceneTex_00DB90; + +#define dhairal_niwa_sceneTex_00EB90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00EB90" +static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00EB90[] = dhairal_niwa_sceneTex_00EB90; + +#define dhairal_niwa_sceneTex_00F390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00F390" +static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00F390[] = dhairal_niwa_sceneTex_00F390; + +#define dhairal_niwa_sceneTex_00FB90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00FB90" +static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00FB90[] = dhairal_niwa_sceneTex_00FB90; + +#define dhairal_niwa_sceneTex_010390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_010390" +static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_010390[] = dhairal_niwa_sceneTex_010390; + +#define dhairal_niwa_sceneCollisionHeader_0030B0 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneCollisionHeader_0030B0" +static const ALIGN_ASSET(2) char hairal_niwa_sceneCollisionHeader_0030B0[] = dhairal_niwa_sceneCollisionHeader_0030B0; + + #endif // INDOORS_HAIRAL_NIWA_SCENE_H diff --git a/soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_room_0.h b/soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_room_0.h index 12b7e190c..b9f854ae0 100644 --- a/soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_room_0.h +++ b/soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_room_0.h @@ -3,77 +3,77 @@ #include "align_asset_macro.h" -#define dhairal_niwa2_room_0DL_008708 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0DL_008708" -static const ALIGN_ASSET(2) char hairal_niwa2_room_0DL_008708[] = dhairal_niwa2_room_0DL_008708; - -#define dhairal_niwa2_room_0Tex_00AF50 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00AF50" -static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00AF50[] = dhairal_niwa2_room_0Tex_00AF50; - -#define dhairal_niwa2_room_0Tex_008750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_008750" +#define dhairal_niwa2_room_0Tex_008750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_008750" static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_008750[] = dhairal_niwa2_room_0Tex_008750; -#define dhairal_niwa2_room_0Tex_00C750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00C750" -static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00C750[] = dhairal_niwa2_room_0Tex_00C750; - -#define dhairal_niwa2_room_0Tex_008F50 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_008F50" +#define dhairal_niwa2_room_0Tex_008F50 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_008F50" static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_008F50[] = dhairal_niwa2_room_0Tex_008F50; -#define dhairal_niwa2_room_0Tex_012750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_012750" -static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_012750[] = dhairal_niwa2_room_0Tex_012750; - -#define dhairal_niwa2_room_0Tex_00CF50 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00CF50" -static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00CF50[] = dhairal_niwa2_room_0Tex_00CF50; - -#define dhairal_niwa2_room_0Tex_00B750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00B750" -static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00B750[] = dhairal_niwa2_room_0Tex_00B750; - -#define dhairal_niwa2_room_0Tex_010F50 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_010F50" -static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_010F50[] = dhairal_niwa2_room_0Tex_010F50; - -#define dhairal_niwa2_room_0Tex_011750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_011750" -static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_011750[] = dhairal_niwa2_room_0Tex_011750; - -#define dhairal_niwa2_room_0Tex_009F50 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_009F50" -static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_009F50[] = dhairal_niwa2_room_0Tex_009F50; - -#define dhairal_niwa2_room_0Tex_011F50 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_011F50" -static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_011F50[] = dhairal_niwa2_room_0Tex_011F50; - -#define dhairal_niwa2_room_0Tex_00EF50 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00EF50" -static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00EF50[] = dhairal_niwa2_room_0Tex_00EF50; - -#define dhairal_niwa2_room_0Tex_00E750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00E750" -static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00E750[] = dhairal_niwa2_room_0Tex_00E750; - -#define dhairal_niwa2_room_0Tex_00FF50 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00FF50" -static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00FF50[] = dhairal_niwa2_room_0Tex_00FF50; - -#define dhairal_niwa2_room_0Tex_00F750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00F750" -static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00F750[] = dhairal_niwa2_room_0Tex_00F750; - -#define dhairal_niwa2_room_0Tex_00D750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00D750" -static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00D750[] = dhairal_niwa2_room_0Tex_00D750; - -#define dhairal_niwa2_room_0Tex_009750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_009750" +#define dhairal_niwa2_room_0Tex_009750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_009750" static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_009750[] = dhairal_niwa2_room_0Tex_009750; -#define dhairal_niwa2_room_0DL_014BC8 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0DL_014BC8" -static const ALIGN_ASSET(2) char hairal_niwa2_room_0DL_014BC8[] = dhairal_niwa2_room_0DL_014BC8; +#define dhairal_niwa2_room_0Tex_009F50 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_009F50" +static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_009F50[] = dhairal_niwa2_room_0Tex_009F50; -#define dhairal_niwa2_room_0Tex_0173F8 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_0173F8" -static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_0173F8[] = dhairal_niwa2_room_0Tex_0173F8; +#define dhairal_niwa2_room_0Tex_00AF50 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00AF50" +static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00AF50[] = dhairal_niwa2_room_0Tex_00AF50; -#define dhairal_niwa2_room_0Tex_015BF8 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_015BF8" +#define dhairal_niwa2_room_0Tex_00B750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00B750" +static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00B750[] = dhairal_niwa2_room_0Tex_00B750; + +#define dhairal_niwa2_room_0Tex_00C750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00C750" +static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00C750[] = dhairal_niwa2_room_0Tex_00C750; + +#define dhairal_niwa2_room_0Tex_00CF50 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00CF50" +static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00CF50[] = dhairal_niwa2_room_0Tex_00CF50; + +#define dhairal_niwa2_room_0Tex_00D750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00D750" +static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00D750[] = dhairal_niwa2_room_0Tex_00D750; + +#define dhairal_niwa2_room_0Tex_00E750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00E750" +static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00E750[] = dhairal_niwa2_room_0Tex_00E750; + +#define dhairal_niwa2_room_0Tex_00EF50 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00EF50" +static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00EF50[] = dhairal_niwa2_room_0Tex_00EF50; + +#define dhairal_niwa2_room_0Tex_00F750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00F750" +static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00F750[] = dhairal_niwa2_room_0Tex_00F750; + +#define dhairal_niwa2_room_0Tex_00FF50 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00FF50" +static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00FF50[] = dhairal_niwa2_room_0Tex_00FF50; + +#define dhairal_niwa2_room_0Tex_010F50 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_010F50" +static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_010F50[] = dhairal_niwa2_room_0Tex_010F50; + +#define dhairal_niwa2_room_0Tex_011750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_011750" +static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_011750[] = dhairal_niwa2_room_0Tex_011750; + +#define dhairal_niwa2_room_0Tex_011F50 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_011F50" +static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_011F50[] = dhairal_niwa2_room_0Tex_011F50; + +#define dhairal_niwa2_room_0Tex_012750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_012750" +static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_012750[] = dhairal_niwa2_room_0Tex_012750; + +#define dhairal_niwa2_room_0Tex_014BF8 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_014BF8" +static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_014BF8[] = dhairal_niwa2_room_0Tex_014BF8; + +#define dhairal_niwa2_room_0Tex_015BF8 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_015BF8" static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_015BF8[] = dhairal_niwa2_room_0Tex_015BF8; -#define dhairal_niwa2_room_0Tex_016BF8 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_016BF8" -static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_016BF8[] = dhairal_niwa2_room_0Tex_016BF8; - -#define dhairal_niwa2_room_0Tex_0163F8 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_0163F8" +#define dhairal_niwa2_room_0Tex_0163F8 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_0163F8" static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_0163F8[] = dhairal_niwa2_room_0Tex_0163F8; -#define dhairal_niwa2_room_0Tex_014BF8 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_014BF8" -static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_014BF8[] = dhairal_niwa2_room_0Tex_014BF8; +#define dhairal_niwa2_room_0Tex_016BF8 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_016BF8" +static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_016BF8[] = dhairal_niwa2_room_0Tex_016BF8; + +#define dhairal_niwa2_room_0Tex_0173F8 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_0173F8" +static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_0173F8[] = dhairal_niwa2_room_0Tex_0173F8; + +#define dhairal_niwa2_room_0DL_008708 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0DL_008708" +static const ALIGN_ASSET(2) char hairal_niwa2_room_0DL_008708[] = dhairal_niwa2_room_0DL_008708; + +#define dhairal_niwa2_room_0DL_014BC8 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0DL_014BC8" +static const ALIGN_ASSET(2) char hairal_niwa2_room_0DL_014BC8[] = dhairal_niwa2_room_0DL_014BC8; #endif // INDOORS_HAIRAL_NIWA2_ROOM_0_H diff --git a/soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_scene.h b/soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_scene.h index 46f96ae0d..58cc670e9 100644 --- a/soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_scene.h +++ b/soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dhairal_niwa2_sceneCollisionHeader_002CD8 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_sceneCollisionHeader_002CD8" +#define dhairal_niwa2_sceneCollisionHeader_002CD8 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_sceneCollisionHeader_002CD8" static const ALIGN_ASSET(2) char hairal_niwa2_sceneCollisionHeader_002CD8[] = dhairal_niwa2_sceneCollisionHeader_002CD8; diff --git a/soh/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_room_0.h b/soh/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_room_0.h index aaa3313fe..80799e7e4 100644 --- a/soh/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_room_0.h +++ b/soh/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_room_0.h @@ -3,10 +3,10 @@ #include "align_asset_macro.h" -#define dhairal_niwa_n_room_0DL_002FE8 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_room_0DL_002FE8" +#define dhairal_niwa_n_room_0DL_002FE8 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_room_0DL_002FE8" static const ALIGN_ASSET(2) char hairal_niwa_n_room_0DL_002FE8[] = dhairal_niwa_n_room_0DL_002FE8; -#define dhairal_niwa_n_room_0DL_003608 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_room_0DL_003608" +#define dhairal_niwa_n_room_0DL_003608 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_room_0DL_003608" static const ALIGN_ASSET(2) char hairal_niwa_n_room_0DL_003608[] = dhairal_niwa_n_room_0DL_003608; diff --git a/soh/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_scene.h b/soh/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_scene.h index 572c26609..a86460789 100644 --- a/soh/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_scene.h +++ b/soh/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_scene.h @@ -3,46 +3,47 @@ #include "align_asset_macro.h" -#define dhairal_niwa_n_sceneCollisionHeader_0010C4 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneCollisionHeader_0010C4" -static const ALIGN_ASSET(2) char hairal_niwa_n_sceneCollisionHeader_0010C4[] = dhairal_niwa_n_sceneCollisionHeader_0010C4; - -#define dhairal_niwa_n_sceneTex_0038F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0038F0" -static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0038F0[] = dhairal_niwa_n_sceneTex_0038F0; - -#define dhairal_niwa_n_sceneTex_0010F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0010F0" +#define dhairal_niwa_n_sceneTex_0010F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0010F0" static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0010F0[] = dhairal_niwa_n_sceneTex_0010F0; -#define dhairal_niwa_n_sceneTex_0050F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0050F0" -static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0050F0[] = dhairal_niwa_n_sceneTex_0050F0; - -#define dhairal_niwa_n_sceneTex_0020F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0020F0" -static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0020F0[] = dhairal_niwa_n_sceneTex_0020F0; - -#define dhairal_niwa_n_sceneTex_0068F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0068F0" -static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0068F0[] = dhairal_niwa_n_sceneTex_0068F0; - -#define dhairal_niwa_n_sceneTex_0070F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0070F0" -static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0070F0[] = dhairal_niwa_n_sceneTex_0070F0; - -#define dhairal_niwa_n_sceneTex_0080F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0080F0" -static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0080F0[] = dhairal_niwa_n_sceneTex_0080F0; - -#define dhairal_niwa_n_sceneTex_0078F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0078F0" -static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0078F0[] = dhairal_niwa_n_sceneTex_0078F0; - -#define dhairal_niwa_n_sceneTex_0058F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0058F0" -static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0058F0[] = dhairal_niwa_n_sceneTex_0058F0; - -#define dhairal_niwa_n_sceneTex_0040F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0040F0" -static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0040F0[] = dhairal_niwa_n_sceneTex_0040F0; - -#define dhairal_niwa_n_sceneTex_0028F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0028F0" -static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0028F0[] = dhairal_niwa_n_sceneTex_0028F0; - -#define dhairal_niwa_n_sceneTex_0060F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0060F0" -static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0060F0[] = dhairal_niwa_n_sceneTex_0060F0; - -#define dhairal_niwa_n_sceneTex_0018F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0018F0" +#define dhairal_niwa_n_sceneTex_0018F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0018F0" static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0018F0[] = dhairal_niwa_n_sceneTex_0018F0; +#define dhairal_niwa_n_sceneTex_0020F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0020F0" +static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0020F0[] = dhairal_niwa_n_sceneTex_0020F0; + +#define dhairal_niwa_n_sceneTex_0028F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0028F0" +static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0028F0[] = dhairal_niwa_n_sceneTex_0028F0; + +#define dhairal_niwa_n_sceneTex_0038F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0038F0" +static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0038F0[] = dhairal_niwa_n_sceneTex_0038F0; + +#define dhairal_niwa_n_sceneTex_0040F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0040F0" +static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0040F0[] = dhairal_niwa_n_sceneTex_0040F0; + +#define dhairal_niwa_n_sceneTex_0050F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0050F0" +static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0050F0[] = dhairal_niwa_n_sceneTex_0050F0; + +#define dhairal_niwa_n_sceneTex_0058F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0058F0" +static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0058F0[] = dhairal_niwa_n_sceneTex_0058F0; + +#define dhairal_niwa_n_sceneTex_0060F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0060F0" +static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0060F0[] = dhairal_niwa_n_sceneTex_0060F0; + +#define dhairal_niwa_n_sceneTex_0068F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0068F0" +static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0068F0[] = dhairal_niwa_n_sceneTex_0068F0; + +#define dhairal_niwa_n_sceneTex_0070F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0070F0" +static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0070F0[] = dhairal_niwa_n_sceneTex_0070F0; + +#define dhairal_niwa_n_sceneTex_0078F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0078F0" +static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0078F0[] = dhairal_niwa_n_sceneTex_0078F0; + +#define dhairal_niwa_n_sceneTex_0080F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0080F0" +static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0080F0[] = dhairal_niwa_n_sceneTex_0080F0; + +#define dhairal_niwa_n_sceneCollisionHeader_0010C4 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneCollisionHeader_0010C4" +static const ALIGN_ASSET(2) char hairal_niwa_n_sceneCollisionHeader_0010C4[] = dhairal_niwa_n_sceneCollisionHeader_0010C4; + + #endif // INDOORS_HAIRAL_NIWA_N_SCENE_H diff --git a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_0.h b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_0.h index a078f2c1e..d4313f6d2 100644 --- a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_0.h +++ b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_0.h @@ -3,32 +3,32 @@ #include "align_asset_macro.h" -#define dhakasitarelay_room_0DL_003218 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_0DL_003218" -static const ALIGN_ASSET(2) char hakasitarelay_room_0DL_003218[] = dhakasitarelay_room_0DL_003218; - -#define dhakasitarelay_room_0Tex_003248 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_0Tex_003248" +#define dhakasitarelay_room_0Tex_003248 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_0Tex_003248" static const ALIGN_ASSET(2) char hakasitarelay_room_0Tex_003248[] = dhakasitarelay_room_0Tex_003248; -#define dhakasitarelay_room_0Tex_004448 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_0Tex_004448" -static const ALIGN_ASSET(2) char hakasitarelay_room_0Tex_004448[] = dhakasitarelay_room_0Tex_004448; - -#define dhakasitarelay_room_0Tex_005448 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_0Tex_005448" -static const ALIGN_ASSET(2) char hakasitarelay_room_0Tex_005448[] = dhakasitarelay_room_0Tex_005448; - -#define dhakasitarelay_room_0Tex_005848 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_0Tex_005848" -static const ALIGN_ASSET(2) char hakasitarelay_room_0Tex_005848[] = dhakasitarelay_room_0Tex_005848; - -#define dhakasitarelay_room_0Tex_004C48 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_0Tex_004C48" -static const ALIGN_ASSET(2) char hakasitarelay_room_0Tex_004C48[] = dhakasitarelay_room_0Tex_004C48; - -#define dhakasitarelay_room_0Tex_003448 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_0Tex_003448" +#define dhakasitarelay_room_0Tex_003448 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_0Tex_003448" static const ALIGN_ASSET(2) char hakasitarelay_room_0Tex_003448[] = dhakasitarelay_room_0Tex_003448; -#define dhakasitarelay_room_0DL_0062A8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_0DL_0062A8" -static const ALIGN_ASSET(2) char hakasitarelay_room_0DL_0062A8[] = dhakasitarelay_room_0DL_0062A8; +#define dhakasitarelay_room_0Tex_004448 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_0Tex_004448" +static const ALIGN_ASSET(2) char hakasitarelay_room_0Tex_004448[] = dhakasitarelay_room_0Tex_004448; -#define dhakasitarelay_room_0Tex_0062B8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_0Tex_0062B8" +#define dhakasitarelay_room_0Tex_004C48 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_0Tex_004C48" +static const ALIGN_ASSET(2) char hakasitarelay_room_0Tex_004C48[] = dhakasitarelay_room_0Tex_004C48; + +#define dhakasitarelay_room_0Tex_005448 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_0Tex_005448" +static const ALIGN_ASSET(2) char hakasitarelay_room_0Tex_005448[] = dhakasitarelay_room_0Tex_005448; + +#define dhakasitarelay_room_0Tex_005848 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_0Tex_005848" +static const ALIGN_ASSET(2) char hakasitarelay_room_0Tex_005848[] = dhakasitarelay_room_0Tex_005848; + +#define dhakasitarelay_room_0Tex_0062B8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_0Tex_0062B8" static const ALIGN_ASSET(2) char hakasitarelay_room_0Tex_0062B8[] = dhakasitarelay_room_0Tex_0062B8; +#define dhakasitarelay_room_0DL_003218 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_0DL_003218" +static const ALIGN_ASSET(2) char hakasitarelay_room_0DL_003218[] = dhakasitarelay_room_0DL_003218; + +#define dhakasitarelay_room_0DL_0062A8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_0DL_0062A8" +static const ALIGN_ASSET(2) char hakasitarelay_room_0DL_0062A8[] = dhakasitarelay_room_0DL_0062A8; + #endif // INDOORS_HAKASITARELAY_ROOM_0_H diff --git a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_1.h b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_1.h index 8fda0afa6..5c544115c 100644 --- a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_1.h +++ b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_1.h @@ -3,26 +3,26 @@ #include "align_asset_macro.h" -#define dhakasitarelay_room_1DL_003F00 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_1DL_003F00" -static const ALIGN_ASSET(2) char hakasitarelay_room_1DL_003F00[] = dhakasitarelay_room_1DL_003F00; - -#define dhakasitarelay_room_1Tex_004720 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_1Tex_004720" -static const ALIGN_ASSET(2) char hakasitarelay_room_1Tex_004720[] = dhakasitarelay_room_1Tex_004720; - -#define dhakasitarelay_room_1Tex_003F20 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_1Tex_003F20" +#define dhakasitarelay_room_1Tex_003F20 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_1Tex_003F20" static const ALIGN_ASSET(2) char hakasitarelay_room_1Tex_003F20[] = dhakasitarelay_room_1Tex_003F20; -#define dhakasitarelay_room_1Tex_004320 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_1Tex_004320" +#define dhakasitarelay_room_1Tex_004320 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_1Tex_004320" static const ALIGN_ASSET(2) char hakasitarelay_room_1Tex_004320[] = dhakasitarelay_room_1Tex_004320; -#define dhakasitarelay_room_1Tex_005F20 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_1Tex_005F20" -static const ALIGN_ASSET(2) char hakasitarelay_room_1Tex_005F20[] = dhakasitarelay_room_1Tex_005F20; +#define dhakasitarelay_room_1Tex_004720 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_1Tex_004720" +static const ALIGN_ASSET(2) char hakasitarelay_room_1Tex_004720[] = dhakasitarelay_room_1Tex_004720; -#define dhakasitarelay_room_1Tex_005720 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_1Tex_005720" +#define dhakasitarelay_room_1Tex_005720 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_1Tex_005720" static const ALIGN_ASSET(2) char hakasitarelay_room_1Tex_005720[] = dhakasitarelay_room_1Tex_005720; -#define dhakasitarelay_room_1Tex_006320 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_1Tex_006320" +#define dhakasitarelay_room_1Tex_005F20 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_1Tex_005F20" +static const ALIGN_ASSET(2) char hakasitarelay_room_1Tex_005F20[] = dhakasitarelay_room_1Tex_005F20; + +#define dhakasitarelay_room_1Tex_006320 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_1Tex_006320" static const ALIGN_ASSET(2) char hakasitarelay_room_1Tex_006320[] = dhakasitarelay_room_1Tex_006320; +#define dhakasitarelay_room_1DL_003F00 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_1DL_003F00" +static const ALIGN_ASSET(2) char hakasitarelay_room_1DL_003F00[] = dhakasitarelay_room_1DL_003F00; + #endif // INDOORS_HAKASITARELAY_ROOM_1_H diff --git a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_2.h b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_2.h index e4e766d67..809cce603 100644 --- a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_2.h +++ b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_2.h @@ -3,29 +3,29 @@ #include "align_asset_macro.h" -#define dhakasitarelay_room_2DL_005478 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_2DL_005478" -static const ALIGN_ASSET(2) char hakasitarelay_room_2DL_005478[] = dhakasitarelay_room_2DL_005478; - -#define dhakasitarelay_room_2Tex_005CA8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_2Tex_005CA8" -static const ALIGN_ASSET(2) char hakasitarelay_room_2Tex_005CA8[] = dhakasitarelay_room_2Tex_005CA8; - -#define dhakasitarelay_room_2Tex_0058A8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_2Tex_0058A8" -static const ALIGN_ASSET(2) char hakasitarelay_room_2Tex_0058A8[] = dhakasitarelay_room_2Tex_0058A8; - -#define dhakasitarelay_room_2Tex_0054A8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_2Tex_0054A8" +#define dhakasitarelay_room_2Tex_0054A8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_2Tex_0054A8" static const ALIGN_ASSET(2) char hakasitarelay_room_2Tex_0054A8[] = dhakasitarelay_room_2Tex_0054A8; -#define dhakasitarelay_room_2Tex_006CA8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_2Tex_006CA8" +#define dhakasitarelay_room_2Tex_0058A8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_2Tex_0058A8" +static const ALIGN_ASSET(2) char hakasitarelay_room_2Tex_0058A8[] = dhakasitarelay_room_2Tex_0058A8; + +#define dhakasitarelay_room_2Tex_005CA8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_2Tex_005CA8" +static const ALIGN_ASSET(2) char hakasitarelay_room_2Tex_005CA8[] = dhakasitarelay_room_2Tex_005CA8; + +#define dhakasitarelay_room_2Tex_006CA8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_2Tex_006CA8" static const ALIGN_ASSET(2) char hakasitarelay_room_2Tex_006CA8[] = dhakasitarelay_room_2Tex_006CA8; -#define dhakasitarelay_room_2Tex_007CA8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_2Tex_007CA8" -static const ALIGN_ASSET(2) char hakasitarelay_room_2Tex_007CA8[] = dhakasitarelay_room_2Tex_007CA8; - -#define dhakasitarelay_room_2Tex_0074A8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_2Tex_0074A8" +#define dhakasitarelay_room_2Tex_0074A8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_2Tex_0074A8" static const ALIGN_ASSET(2) char hakasitarelay_room_2Tex_0074A8[] = dhakasitarelay_room_2Tex_0074A8; -#define dhakasitarelay_room_2Tex_0080A8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_2Tex_0080A8" +#define dhakasitarelay_room_2Tex_007CA8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_2Tex_007CA8" +static const ALIGN_ASSET(2) char hakasitarelay_room_2Tex_007CA8[] = dhakasitarelay_room_2Tex_007CA8; + +#define dhakasitarelay_room_2Tex_0080A8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_2Tex_0080A8" static const ALIGN_ASSET(2) char hakasitarelay_room_2Tex_0080A8[] = dhakasitarelay_room_2Tex_0080A8; +#define dhakasitarelay_room_2DL_005478 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_2DL_005478" +static const ALIGN_ASSET(2) char hakasitarelay_room_2DL_005478[] = dhakasitarelay_room_2DL_005478; + #endif // INDOORS_HAKASITARELAY_ROOM_2_H diff --git a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_3.h b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_3.h index 5b52cffd5..bb48d9531 100644 --- a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_3.h +++ b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_3.h @@ -3,32 +3,32 @@ #include "align_asset_macro.h" -#define dhakasitarelay_room_3DL_0056B0 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_3DL_0056B0" -static const ALIGN_ASSET(2) char hakasitarelay_room_3DL_0056B0[] = dhakasitarelay_room_3DL_0056B0; - -#define dhakasitarelay_room_3Tex_0060E0 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_3Tex_0060E0" -static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_0060E0[] = dhakasitarelay_room_3Tex_0060E0; - -#define dhakasitarelay_room_3Tex_0056E0 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_3Tex_0056E0" +#define dhakasitarelay_room_3Tex_0056E0 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_3Tex_0056E0" static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_0056E0[] = dhakasitarelay_room_3Tex_0056E0; -#define dhakasitarelay_room_3Tex_0084E0 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_3Tex_0084E0" -static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_0084E0[] = dhakasitarelay_room_3Tex_0084E0; - -#define dhakasitarelay_room_3Tex_005EE0 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_3Tex_005EE0" -static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_005EE0[] = dhakasitarelay_room_3Tex_005EE0; - -#define dhakasitarelay_room_3Tex_005AE0 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_3Tex_005AE0" +#define dhakasitarelay_room_3Tex_005AE0 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_3Tex_005AE0" static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_005AE0[] = dhakasitarelay_room_3Tex_005AE0; -#define dhakasitarelay_room_3Tex_007CE0 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_3Tex_007CE0" -static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_007CE0[] = dhakasitarelay_room_3Tex_007CE0; +#define dhakasitarelay_room_3Tex_005EE0 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_3Tex_005EE0" +static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_005EE0[] = dhakasitarelay_room_3Tex_005EE0; -#define dhakasitarelay_room_3Tex_0078E0 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_3Tex_0078E0" +#define dhakasitarelay_room_3Tex_0060E0 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_3Tex_0060E0" +static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_0060E0[] = dhakasitarelay_room_3Tex_0060E0; + +#define dhakasitarelay_room_3Tex_0070E0 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_3Tex_0070E0" +static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_0070E0[] = dhakasitarelay_room_3Tex_0070E0; + +#define dhakasitarelay_room_3Tex_0078E0 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_3Tex_0078E0" static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_0078E0[] = dhakasitarelay_room_3Tex_0078E0; -#define dhakasitarelay_room_3Tex_0070E0 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_3Tex_0070E0" -static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_0070E0[] = dhakasitarelay_room_3Tex_0070E0; +#define dhakasitarelay_room_3Tex_007CE0 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_3Tex_007CE0" +static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_007CE0[] = dhakasitarelay_room_3Tex_007CE0; + +#define dhakasitarelay_room_3Tex_0084E0 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_3Tex_0084E0" +static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_0084E0[] = dhakasitarelay_room_3Tex_0084E0; + +#define dhakasitarelay_room_3DL_0056B0 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_3DL_0056B0" +static const ALIGN_ASSET(2) char hakasitarelay_room_3DL_0056B0[] = dhakasitarelay_room_3DL_0056B0; #endif // INDOORS_HAKASITARELAY_ROOM_3_H diff --git a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_4.h b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_4.h index db978106f..0c2f5e951 100644 --- a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_4.h +++ b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_4.h @@ -3,26 +3,26 @@ #include "align_asset_macro.h" -#define dhakasitarelay_room_4DL_001E60 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_4DL_001E60" -static const ALIGN_ASSET(2) char hakasitarelay_room_4DL_001E60[] = dhakasitarelay_room_4DL_001E60; - -#define dhakasitarelay_room_4Tex_003480 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_4Tex_003480" -static const ALIGN_ASSET(2) char hakasitarelay_room_4Tex_003480[] = dhakasitarelay_room_4Tex_003480; - -#define dhakasitarelay_room_4Tex_003080 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_4Tex_003080" -static const ALIGN_ASSET(2) char hakasitarelay_room_4Tex_003080[] = dhakasitarelay_room_4Tex_003080; - -#define dhakasitarelay_room_4Tex_003C80 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_4Tex_003C80" -static const ALIGN_ASSET(2) char hakasitarelay_room_4Tex_003C80[] = dhakasitarelay_room_4Tex_003C80; - -#define dhakasitarelay_room_4Tex_002080 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_4Tex_002080" -static const ALIGN_ASSET(2) char hakasitarelay_room_4Tex_002080[] = dhakasitarelay_room_4Tex_002080; - -#define dhakasitarelay_room_4Tex_001E80 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_4Tex_001E80" +#define dhakasitarelay_room_4Tex_001E80 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_4Tex_001E80" static const ALIGN_ASSET(2) char hakasitarelay_room_4Tex_001E80[] = dhakasitarelay_room_4Tex_001E80; -#define dhakasitarelay_room_4Tex_002880 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_4Tex_002880" +#define dhakasitarelay_room_4Tex_002080 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_4Tex_002080" +static const ALIGN_ASSET(2) char hakasitarelay_room_4Tex_002080[] = dhakasitarelay_room_4Tex_002080; + +#define dhakasitarelay_room_4Tex_002880 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_4Tex_002880" static const ALIGN_ASSET(2) char hakasitarelay_room_4Tex_002880[] = dhakasitarelay_room_4Tex_002880; +#define dhakasitarelay_room_4Tex_003080 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_4Tex_003080" +static const ALIGN_ASSET(2) char hakasitarelay_room_4Tex_003080[] = dhakasitarelay_room_4Tex_003080; + +#define dhakasitarelay_room_4Tex_003480 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_4Tex_003480" +static const ALIGN_ASSET(2) char hakasitarelay_room_4Tex_003480[] = dhakasitarelay_room_4Tex_003480; + +#define dhakasitarelay_room_4Tex_003C80 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_4Tex_003C80" +static const ALIGN_ASSET(2) char hakasitarelay_room_4Tex_003C80[] = dhakasitarelay_room_4Tex_003C80; + +#define dhakasitarelay_room_4DL_001E60 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_4DL_001E60" +static const ALIGN_ASSET(2) char hakasitarelay_room_4DL_001E60[] = dhakasitarelay_room_4DL_001E60; + #endif // INDOORS_HAKASITARELAY_ROOM_4_H diff --git a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_5.h b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_5.h index 748218312..7121f6705 100644 --- a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_5.h +++ b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_5.h @@ -3,26 +3,26 @@ #include "align_asset_macro.h" -#define dhakasitarelay_room_5DL_001C08 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_5DL_001C08" -static const ALIGN_ASSET(2) char hakasitarelay_room_5DL_001C08[] = dhakasitarelay_room_5DL_001C08; - -#define dhakasitarelay_room_5Tex_003C48 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_5Tex_003C48" -static const ALIGN_ASSET(2) char hakasitarelay_room_5Tex_003C48[] = dhakasitarelay_room_5Tex_003C48; - -#define dhakasitarelay_room_5Tex_002448 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_5Tex_002448" -static const ALIGN_ASSET(2) char hakasitarelay_room_5Tex_002448[] = dhakasitarelay_room_5Tex_002448; - -#define dhakasitarelay_room_5TLUT_001C28 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_5TLUT_001C28" -static const ALIGN_ASSET(2) char hakasitarelay_room_5TLUT_001C28[] = dhakasitarelay_room_5TLUT_001C28; - -#define dhakasitarelay_room_5Tex_001C48 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_5Tex_001C48" +#define dhakasitarelay_room_5Tex_001C48 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_5Tex_001C48" static const ALIGN_ASSET(2) char hakasitarelay_room_5Tex_001C48[] = dhakasitarelay_room_5Tex_001C48; -#define dhakasitarelay_room_5Tex_003448 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_5Tex_003448" +#define dhakasitarelay_room_5Tex_002448 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_5Tex_002448" +static const ALIGN_ASSET(2) char hakasitarelay_room_5Tex_002448[] = dhakasitarelay_room_5Tex_002448; + +#define dhakasitarelay_room_5Tex_002C48 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_5Tex_002C48" +static const ALIGN_ASSET(2) char hakasitarelay_room_5Tex_002C48[] = dhakasitarelay_room_5Tex_002C48; + +#define dhakasitarelay_room_5Tex_003448 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_5Tex_003448" static const ALIGN_ASSET(2) char hakasitarelay_room_5Tex_003448[] = dhakasitarelay_room_5Tex_003448; -#define dhakasitarelay_room_5Tex_002C48 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_5Tex_002C48" -static const ALIGN_ASSET(2) char hakasitarelay_room_5Tex_002C48[] = dhakasitarelay_room_5Tex_002C48; +#define dhakasitarelay_room_5Tex_003C48 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_5Tex_003C48" +static const ALIGN_ASSET(2) char hakasitarelay_room_5Tex_003C48[] = dhakasitarelay_room_5Tex_003C48; + +#define dhakasitarelay_room_5TLUT_001C28 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_5TLUT_001C28" +static const ALIGN_ASSET(2) char hakasitarelay_room_5TLUT_001C28[] = dhakasitarelay_room_5TLUT_001C28; + +#define dhakasitarelay_room_5DL_001C08 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_5DL_001C08" +static const ALIGN_ASSET(2) char hakasitarelay_room_5DL_001C08[] = dhakasitarelay_room_5DL_001C08; #endif // INDOORS_HAKASITARELAY_ROOM_5_H diff --git a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_6.h b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_6.h index edfae4957..8c1538f9c 100644 --- a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_6.h +++ b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_6.h @@ -3,38 +3,38 @@ #include "align_asset_macro.h" -#define dhakasitarelay_room_6DL_004168 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_6DL_004168" -static const ALIGN_ASSET(2) char hakasitarelay_room_6DL_004168[] = dhakasitarelay_room_6DL_004168; - -#define dhakasitarelay_room_6Tex_006AA8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_6Tex_006AA8" -static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_006AA8[] = dhakasitarelay_room_6Tex_006AA8; - -#define dhakasitarelay_room_6Tex_0042A8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_6Tex_0042A8" -static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_0042A8[] = dhakasitarelay_room_6Tex_0042A8; - -#define dhakasitarelay_room_6Tex_005EA8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_6Tex_005EA8" -static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_005EA8[] = dhakasitarelay_room_6Tex_005EA8; - -#define dhakasitarelay_room_6Tex_0056A8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_6Tex_0056A8" -static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_0056A8[] = dhakasitarelay_room_6Tex_0056A8; - -#define dhakasitarelay_room_6Tex_0066A8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_6Tex_0066A8" -static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_0066A8[] = dhakasitarelay_room_6Tex_0066A8; - -#define dhakasitarelay_room_6Tex_0072A8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_6Tex_0072A8" -static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_0072A8[] = dhakasitarelay_room_6Tex_0072A8; - -#define dhakasitarelay_room_6Tex_004EA8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_6Tex_004EA8" -static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_004EA8[] = dhakasitarelay_room_6Tex_004EA8; - -#define dhakasitarelay_room_6TLUT_004188 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_6TLUT_004188" -static const ALIGN_ASSET(2) char hakasitarelay_room_6TLUT_004188[] = dhakasitarelay_room_6TLUT_004188; - -#define dhakasitarelay_room_6Tex_0041A8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_6Tex_0041A8" +#define dhakasitarelay_room_6Tex_0041A8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_6Tex_0041A8" static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_0041A8[] = dhakasitarelay_room_6Tex_0041A8; -#define dhakasitarelay_room_6Tex_004AA8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_6Tex_004AA8" +#define dhakasitarelay_room_6Tex_0042A8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_6Tex_0042A8" +static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_0042A8[] = dhakasitarelay_room_6Tex_0042A8; + +#define dhakasitarelay_room_6Tex_004AA8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_6Tex_004AA8" static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_004AA8[] = dhakasitarelay_room_6Tex_004AA8; +#define dhakasitarelay_room_6Tex_004EA8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_6Tex_004EA8" +static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_004EA8[] = dhakasitarelay_room_6Tex_004EA8; + +#define dhakasitarelay_room_6Tex_0056A8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_6Tex_0056A8" +static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_0056A8[] = dhakasitarelay_room_6Tex_0056A8; + +#define dhakasitarelay_room_6Tex_005EA8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_6Tex_005EA8" +static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_005EA8[] = dhakasitarelay_room_6Tex_005EA8; + +#define dhakasitarelay_room_6Tex_0066A8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_6Tex_0066A8" +static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_0066A8[] = dhakasitarelay_room_6Tex_0066A8; + +#define dhakasitarelay_room_6Tex_006AA8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_6Tex_006AA8" +static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_006AA8[] = dhakasitarelay_room_6Tex_006AA8; + +#define dhakasitarelay_room_6Tex_0072A8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_6Tex_0072A8" +static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_0072A8[] = dhakasitarelay_room_6Tex_0072A8; + +#define dhakasitarelay_room_6TLUT_004188 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_6TLUT_004188" +static const ALIGN_ASSET(2) char hakasitarelay_room_6TLUT_004188[] = dhakasitarelay_room_6TLUT_004188; + +#define dhakasitarelay_room_6DL_004168 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_6DL_004168" +static const ALIGN_ASSET(2) char hakasitarelay_room_6DL_004168[] = dhakasitarelay_room_6DL_004168; + #endif // INDOORS_HAKASITARELAY_ROOM_6_H diff --git a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_scene.h b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_scene.h index da196ba5c..2c510675f 100644 --- a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_scene.h +++ b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_scene.h @@ -3,19 +3,19 @@ #include "align_asset_macro.h" -#define dhakasitarelay_sceneCollisionHeader_00C04C "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_sceneCollisionHeader_00C04C" -static const ALIGN_ASSET(2) char hakasitarelay_sceneCollisionHeader_00C04C[] = dhakasitarelay_sceneCollisionHeader_00C04C; - -#define dgSongOfStormsCs "__OTR__scenes/nonmq/hakasitarelay_scene/gSongOfStormsCs" -static const ALIGN_ASSET(2) char gSongOfStormsCs[] = dgSongOfStormsCs; - -#define dhakasitarelay_sceneTex_00D880 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_sceneTex_00D880" -static const ALIGN_ASSET(2) char hakasitarelay_sceneTex_00D880[] = dhakasitarelay_sceneTex_00D880; - -#define dhakasitarelay_sceneTex_00C080 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_sceneTex_00C080" +#define dhakasitarelay_sceneTex_00C080 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_sceneTex_00C080" static const ALIGN_ASSET(2) char hakasitarelay_sceneTex_00C080[] = dhakasitarelay_sceneTex_00C080; -#define dhakasitarelay_sceneTex_00D080 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_sceneTex_00D080" +#define dhakasitarelay_sceneTex_00D080 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_sceneTex_00D080" static const ALIGN_ASSET(2) char hakasitarelay_sceneTex_00D080[] = dhakasitarelay_sceneTex_00D080; +#define dhakasitarelay_sceneTex_00D880 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_sceneTex_00D880" +static const ALIGN_ASSET(2) char hakasitarelay_sceneTex_00D880[] = dhakasitarelay_sceneTex_00D880; + +#define dhakasitarelay_sceneCollisionHeader_00C04C "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_sceneCollisionHeader_00C04C" +static const ALIGN_ASSET(2) char hakasitarelay_sceneCollisionHeader_00C04C[] = dhakasitarelay_sceneCollisionHeader_00C04C; + +#define dgSongOfStormsCs "__OTR__scenes/shared/hakasitarelay_scene/gSongOfStormsCs" +static const ALIGN_ASSET(2) char gSongOfStormsCs[] = dgSongOfStormsCs; + #endif // INDOORS_HAKASITARELAY_SCENE_H diff --git a/soh/assets/scenes/indoors/hut/hut_room_0.h b/soh/assets/scenes/indoors/hut/hut_room_0.h index 3aaa9aae4..7af91cd61 100644 --- a/soh/assets/scenes/indoors/hut/hut_room_0.h +++ b/soh/assets/scenes/indoors/hut/hut_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dhut_room_0DL_003D58 "__OTR__scenes/nonmq/hut_scene/hut_room_0DL_003D58" +#define dhut_room_0DL_003D58 "__OTR__scenes/shared/hut_scene/hut_room_0DL_003D58" static const ALIGN_ASSET(2) char hut_room_0DL_003D58[] = dhut_room_0DL_003D58; diff --git a/soh/assets/scenes/indoors/hut/hut_scene.h b/soh/assets/scenes/indoors/hut/hut_scene.h index 5f767efae..635cfec46 100644 --- a/soh/assets/scenes/indoors/hut/hut_scene.h +++ b/soh/assets/scenes/indoors/hut/hut_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dhut_sceneCollisionHeader_0004DC "__OTR__scenes/nonmq/hut_scene/hut_sceneCollisionHeader_0004DC" +#define dhut_sceneCollisionHeader_0004DC "__OTR__scenes/shared/hut_scene/hut_sceneCollisionHeader_0004DC" static const ALIGN_ASSET(2) char hut_sceneCollisionHeader_0004DC[] = dhut_sceneCollisionHeader_0004DC; diff --git a/soh/assets/scenes/indoors/hylia_labo/hylia_labo_room_0.h b/soh/assets/scenes/indoors/hylia_labo/hylia_labo_room_0.h index 385754807..73cc07803 100644 --- a/soh/assets/scenes/indoors/hylia_labo/hylia_labo_room_0.h +++ b/soh/assets/scenes/indoors/hylia_labo/hylia_labo_room_0.h @@ -3,67 +3,67 @@ #include "align_asset_macro.h" -#define dhylia_labo_room_0DL_007460 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_007460" +#define dhylia_labo_room_0DL_007460 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_007460" static const ALIGN_ASSET(2) char hylia_labo_room_0DL_007460[] = dhylia_labo_room_0DL_007460; -#define dhylia_labo_room_0DL_002318 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_002318" +#define dhylia_labo_room_0DL_002318 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_002318" static const ALIGN_ASSET(2) char hylia_labo_room_0DL_002318[] = dhylia_labo_room_0DL_002318; -#define dhylia_labo_room_0DL_003500 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_003500" +#define dhylia_labo_room_0DL_003500 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_003500" static const ALIGN_ASSET(2) char hylia_labo_room_0DL_003500[] = dhylia_labo_room_0DL_003500; -#define dhylia_labo_room_0DL_001E10 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_001E10" +#define dhylia_labo_room_0DL_001E10 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_001E10" static const ALIGN_ASSET(2) char hylia_labo_room_0DL_001E10[] = dhylia_labo_room_0DL_001E10; -#define dhylia_labo_room_0DL_006CE0 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_006CE0" +#define dhylia_labo_room_0DL_006CE0 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_006CE0" static const ALIGN_ASSET(2) char hylia_labo_room_0DL_006CE0[] = dhylia_labo_room_0DL_006CE0; -#define dhylia_labo_room_0DL_002A30 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_002A30" +#define dhylia_labo_room_0DL_002A30 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_002A30" static const ALIGN_ASSET(2) char hylia_labo_room_0DL_002A30[] = dhylia_labo_room_0DL_002A30; -#define dhylia_labo_room_0DL_001500 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_001500" +#define dhylia_labo_room_0DL_001500 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_001500" static const ALIGN_ASSET(2) char hylia_labo_room_0DL_001500[] = dhylia_labo_room_0DL_001500; -#define dhylia_labo_room_0DL_000AC0 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_000AC0" +#define dhylia_labo_room_0DL_000AC0 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_000AC0" static const ALIGN_ASSET(2) char hylia_labo_room_0DL_000AC0[] = dhylia_labo_room_0DL_000AC0; -#define dhylia_labo_room_0DL_005120 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_005120" +#define dhylia_labo_room_0DL_005120 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_005120" static const ALIGN_ASSET(2) char hylia_labo_room_0DL_005120[] = dhylia_labo_room_0DL_005120; -#define dhylia_labo_room_0DL_001318 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_001318" +#define dhylia_labo_room_0DL_001318 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_001318" static const ALIGN_ASSET(2) char hylia_labo_room_0DL_001318[] = dhylia_labo_room_0DL_001318; -#define dhylia_labo_room_0DL_005738 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_005738" +#define dhylia_labo_room_0DL_005738 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_005738" static const ALIGN_ASSET(2) char hylia_labo_room_0DL_005738[] = dhylia_labo_room_0DL_005738; -#define dhylia_labo_room_0DL_003C80 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_003C80" +#define dhylia_labo_room_0DL_003C80 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_003C80" static const ALIGN_ASSET(2) char hylia_labo_room_0DL_003C80[] = dhylia_labo_room_0DL_003C80; -#define dhylia_labo_room_0DL_001AB8 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_001AB8" +#define dhylia_labo_room_0DL_001AB8 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_001AB8" static const ALIGN_ASSET(2) char hylia_labo_room_0DL_001AB8[] = dhylia_labo_room_0DL_001AB8; -#define dhylia_labo_room_0DL_0002C0 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_0002C0" +#define dhylia_labo_room_0DL_0002C0 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_0002C0" static const ALIGN_ASSET(2) char hylia_labo_room_0DL_0002C0[] = dhylia_labo_room_0DL_0002C0; -#define dhylia_labo_room_0DL_0039F0 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_0039F0" +#define dhylia_labo_room_0DL_0039F0 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_0039F0" static const ALIGN_ASSET(2) char hylia_labo_room_0DL_0039F0[] = dhylia_labo_room_0DL_0039F0; -#define dhylia_labo_room_0DL_005F20 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_005F20" +#define dhylia_labo_room_0DL_005F20 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_005F20" static const ALIGN_ASSET(2) char hylia_labo_room_0DL_005F20[] = dhylia_labo_room_0DL_005F20; -#define dhylia_labo_room_0DL_004610 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_004610" +#define dhylia_labo_room_0DL_004610 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_004610" static const ALIGN_ASSET(2) char hylia_labo_room_0DL_004610[] = dhylia_labo_room_0DL_004610; -#define dhylia_labo_room_0DL_0048B0 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_0048B0" +#define dhylia_labo_room_0DL_0048B0 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_0048B0" static const ALIGN_ASSET(2) char hylia_labo_room_0DL_0048B0[] = dhylia_labo_room_0DL_0048B0; -#define dhylia_labo_room_0DL_004A80 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_004A80" +#define dhylia_labo_room_0DL_004A80 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_004A80" static const ALIGN_ASSET(2) char hylia_labo_room_0DL_004A80[] = dhylia_labo_room_0DL_004A80; -#define dhylia_labo_room_0DL_005A38 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_005A38" +#define dhylia_labo_room_0DL_005A38 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_005A38" static const ALIGN_ASSET(2) char hylia_labo_room_0DL_005A38[] = dhylia_labo_room_0DL_005A38; -#define dhylia_labo_room_0DL_0040E0 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_0040E0" +#define dhylia_labo_room_0DL_0040E0 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_0040E0" static const ALIGN_ASSET(2) char hylia_labo_room_0DL_0040E0[] = dhylia_labo_room_0DL_0040E0; diff --git a/soh/assets/scenes/indoors/hylia_labo/hylia_labo_scene.h b/soh/assets/scenes/indoors/hylia_labo/hylia_labo_scene.h index a724a2d64..6979a6535 100644 --- a/soh/assets/scenes/indoors/hylia_labo/hylia_labo_scene.h +++ b/soh/assets/scenes/indoors/hylia_labo/hylia_labo_scene.h @@ -3,100 +3,101 @@ #include "align_asset_macro.h" -#define dhylia_labo_sceneCollisionHeader_00105C "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneCollisionHeader_00105C" -static const ALIGN_ASSET(2) char hylia_labo_sceneCollisionHeader_00105C[] = dhylia_labo_sceneCollisionHeader_00105C; - -#define dhylia_labo_sceneTex_001090 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_001090" +#define dhylia_labo_sceneTex_001090 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_001090" static const ALIGN_ASSET(2) char hylia_labo_sceneTex_001090[] = dhylia_labo_sceneTex_001090; -#define dhylia_labo_sceneTex_00F890 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_00F890" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00F890[] = dhylia_labo_sceneTex_00F890; - -#define dhylia_labo_sceneTex_00B090 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_00B090" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00B090[] = dhylia_labo_sceneTex_00B090; - -#define dhylia_labo_sceneTex_006990 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_006990" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_006990[] = dhylia_labo_sceneTex_006990; - -#define dhylia_labo_sceneTex_00C890 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_00C890" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00C890[] = dhylia_labo_sceneTex_00C890; - -#define dhylia_labo_sceneTex_007D90 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_007D90" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_007D90[] = dhylia_labo_sceneTex_007D90; - -#define dhylia_labo_sceneTex_005490 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_005490" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_005490[] = dhylia_labo_sceneTex_005490; - -#define dhylia_labo_sceneTex_003490 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_003490" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_003490[] = dhylia_labo_sceneTex_003490; - -#define dhylia_labo_sceneTex_00C090 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_00C090" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00C090[] = dhylia_labo_sceneTex_00C090; - -#define dhylia_labo_sceneTex_006190 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_006190" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_006190[] = dhylia_labo_sceneTex_006190; - -#define dhylia_labo_sceneTex_00E890 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_00E890" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00E890[] = dhylia_labo_sceneTex_00E890; - -#define dhylia_labo_sceneTex_010490 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_010490" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_010490[] = dhylia_labo_sceneTex_010490; - -#define dhylia_labo_sceneTex_008790 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_008790" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_008790[] = dhylia_labo_sceneTex_008790; - -#define dhylia_labo_sceneTex_010890 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_010890" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_010890[] = dhylia_labo_sceneTex_010890; - -#define dhylia_labo_sceneTex_006090 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_006090" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_006090[] = dhylia_labo_sceneTex_006090; - -#define dhylia_labo_sceneTex_00D890 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_00D890" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00D890[] = dhylia_labo_sceneTex_00D890; - -#define dhylia_labo_sceneTex_009790 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_009790" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_009790[] = dhylia_labo_sceneTex_009790; - -#define dhylia_labo_sceneTex_00D090 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_00D090" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00D090[] = dhylia_labo_sceneTex_00D090; - -#define dhylia_labo_sceneTex_003C90 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_003C90" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_003C90[] = dhylia_labo_sceneTex_003C90; - -#define dhylia_labo_sceneTex_002490 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_002490" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_002490[] = dhylia_labo_sceneTex_002490; - -#define dhylia_labo_sceneTex_008590 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_008590" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_008590[] = dhylia_labo_sceneTex_008590; - -#define dhylia_labo_sceneTex_006D90 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_006D90" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_006D90[] = dhylia_labo_sceneTex_006D90; - -#define dhylia_labo_sceneTex_009C90 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_009C90" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_009C90[] = dhylia_labo_sceneTex_009C90; - -#define dhylia_labo_sceneTex_005C90 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_005C90" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_005C90[] = dhylia_labo_sceneTex_005C90; - -#define dhylia_labo_sceneTex_00A090 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_00A090" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00A090[] = dhylia_labo_sceneTex_00A090; - -#define dhylia_labo_sceneTex_009A90 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_009A90" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_009A90[] = dhylia_labo_sceneTex_009A90; - -#define dhylia_labo_sceneTex_009990 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_009990" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_009990[] = dhylia_labo_sceneTex_009990; - -#define dhylia_labo_sceneTex_001490 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_001490" +#define dhylia_labo_sceneTex_001490 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_001490" static const ALIGN_ASSET(2) char hylia_labo_sceneTex_001490[] = dhylia_labo_sceneTex_001490; -#define dhylia_labo_sceneTex_004C90 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_004C90" +#define dhylia_labo_sceneTex_002490 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_002490" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_002490[] = dhylia_labo_sceneTex_002490; + +#define dhylia_labo_sceneTex_003490 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_003490" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_003490[] = dhylia_labo_sceneTex_003490; + +#define dhylia_labo_sceneTex_003C90 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_003C90" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_003C90[] = dhylia_labo_sceneTex_003C90; + +#define dhylia_labo_sceneTex_004C90 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_004C90" static const ALIGN_ASSET(2) char hylia_labo_sceneTex_004C90[] = dhylia_labo_sceneTex_004C90; -#define dhylia_labo_sceneTex_010090 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_010090" -static const ALIGN_ASSET(2) char hylia_labo_sceneTex_010090[] = dhylia_labo_sceneTex_010090; +#define dhylia_labo_sceneTex_005490 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_005490" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_005490[] = dhylia_labo_sceneTex_005490; -#define dhylia_labo_sceneTex_00E090 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_00E090" +#define dhylia_labo_sceneTex_005C90 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_005C90" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_005C90[] = dhylia_labo_sceneTex_005C90; + +#define dhylia_labo_sceneTex_006090 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_006090" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_006090[] = dhylia_labo_sceneTex_006090; + +#define dhylia_labo_sceneTex_006190 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_006190" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_006190[] = dhylia_labo_sceneTex_006190; + +#define dhylia_labo_sceneTex_006990 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_006990" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_006990[] = dhylia_labo_sceneTex_006990; + +#define dhylia_labo_sceneTex_006D90 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_006D90" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_006D90[] = dhylia_labo_sceneTex_006D90; + +#define dhylia_labo_sceneTex_007D90 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_007D90" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_007D90[] = dhylia_labo_sceneTex_007D90; + +#define dhylia_labo_sceneTex_008590 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_008590" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_008590[] = dhylia_labo_sceneTex_008590; + +#define dhylia_labo_sceneTex_008790 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_008790" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_008790[] = dhylia_labo_sceneTex_008790; + +#define dhylia_labo_sceneTex_009790 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_009790" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_009790[] = dhylia_labo_sceneTex_009790; + +#define dhylia_labo_sceneTex_009990 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_009990" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_009990[] = dhylia_labo_sceneTex_009990; + +#define dhylia_labo_sceneTex_009A90 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_009A90" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_009A90[] = dhylia_labo_sceneTex_009A90; + +#define dhylia_labo_sceneTex_009C90 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_009C90" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_009C90[] = dhylia_labo_sceneTex_009C90; + +#define dhylia_labo_sceneTex_00A090 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_00A090" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00A090[] = dhylia_labo_sceneTex_00A090; + +#define dhylia_labo_sceneTex_00B090 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_00B090" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00B090[] = dhylia_labo_sceneTex_00B090; + +#define dhylia_labo_sceneTex_00C090 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_00C090" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00C090[] = dhylia_labo_sceneTex_00C090; + +#define dhylia_labo_sceneTex_00C890 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_00C890" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00C890[] = dhylia_labo_sceneTex_00C890; + +#define dhylia_labo_sceneTex_00D090 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_00D090" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00D090[] = dhylia_labo_sceneTex_00D090; + +#define dhylia_labo_sceneTex_00D890 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_00D890" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00D890[] = dhylia_labo_sceneTex_00D890; + +#define dhylia_labo_sceneTex_00E090 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_00E090" static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00E090[] = dhylia_labo_sceneTex_00E090; +#define dhylia_labo_sceneTex_00E890 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_00E890" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00E890[] = dhylia_labo_sceneTex_00E890; + +#define dhylia_labo_sceneTex_00F890 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_00F890" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00F890[] = dhylia_labo_sceneTex_00F890; + +#define dhylia_labo_sceneTex_010090 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_010090" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_010090[] = dhylia_labo_sceneTex_010090; + +#define dhylia_labo_sceneTex_010490 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_010490" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_010490[] = dhylia_labo_sceneTex_010490; + +#define dhylia_labo_sceneTex_010890 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_010890" +static const ALIGN_ASSET(2) char hylia_labo_sceneTex_010890[] = dhylia_labo_sceneTex_010890; + +#define dhylia_labo_sceneCollisionHeader_00105C "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneCollisionHeader_00105C" +static const ALIGN_ASSET(2) char hylia_labo_sceneCollisionHeader_00105C[] = dhylia_labo_sceneCollisionHeader_00105C; + + #endif // INDOORS_HYLIA_LABO_SCENE_H diff --git a/soh/assets/scenes/indoors/impa/impa_room_0.h b/soh/assets/scenes/indoors/impa/impa_room_0.h index 0a522fb7d..521d34deb 100644 --- a/soh/assets/scenes/indoors/impa/impa_room_0.h +++ b/soh/assets/scenes/indoors/impa/impa_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dimpa_room_0DL_001758 "__OTR__scenes/nonmq/impa_scene/impa_room_0DL_001758" +#define dimpa_room_0DL_001758 "__OTR__scenes/shared/impa_scene/impa_room_0DL_001758" static const ALIGN_ASSET(2) char impa_room_0DL_001758[] = dimpa_room_0DL_001758; diff --git a/soh/assets/scenes/indoors/impa/impa_scene.h b/soh/assets/scenes/indoors/impa/impa_scene.h index bcc2aea15..8f4a58a77 100644 --- a/soh/assets/scenes/indoors/impa/impa_scene.h +++ b/soh/assets/scenes/indoors/impa/impa_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dimpa_sceneCollisionHeader_000CE0 "__OTR__scenes/nonmq/impa_scene/impa_sceneCollisionHeader_000CE0" +#define dimpa_sceneCollisionHeader_000CE0 "__OTR__scenes/shared/impa_scene/impa_sceneCollisionHeader_000CE0" static const ALIGN_ASSET(2) char impa_sceneCollisionHeader_000CE0[] = dimpa_sceneCollisionHeader_000CE0; diff --git a/soh/assets/scenes/indoors/kakariko/kakariko_room_0.h b/soh/assets/scenes/indoors/kakariko/kakariko_room_0.h index 36e99e7ac..ce26a5fab 100644 --- a/soh/assets/scenes/indoors/kakariko/kakariko_room_0.h +++ b/soh/assets/scenes/indoors/kakariko/kakariko_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dkakariko_room_0DL_005760 "__OTR__scenes/nonmq/kakariko_scene/kakariko_room_0DL_005760" +#define dkakariko_room_0DL_005760 "__OTR__scenes/shared/kakariko_scene/kakariko_room_0DL_005760" static const ALIGN_ASSET(2) char kakariko_room_0DL_005760[] = dkakariko_room_0DL_005760; diff --git a/soh/assets/scenes/indoors/kakariko/kakariko_scene.h b/soh/assets/scenes/indoors/kakariko/kakariko_scene.h index 19727894a..e8b73026e 100644 --- a/soh/assets/scenes/indoors/kakariko/kakariko_scene.h +++ b/soh/assets/scenes/indoors/kakariko/kakariko_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dkakariko_sceneCollisionHeader_000E68 "__OTR__scenes/nonmq/kakariko_scene/kakariko_sceneCollisionHeader_000E68" +#define dkakariko_sceneCollisionHeader_000E68 "__OTR__scenes/shared/kakariko_scene/kakariko_sceneCollisionHeader_000E68" static const ALIGN_ASSET(2) char kakariko_sceneCollisionHeader_000E68[] = dkakariko_sceneCollisionHeader_000E68; diff --git a/soh/assets/scenes/indoors/kenjyanoma/kenjyanoma_room_0.h b/soh/assets/scenes/indoors/kenjyanoma/kenjyanoma_room_0.h index fe67f2766..db447294a 100644 --- a/soh/assets/scenes/indoors/kenjyanoma/kenjyanoma_room_0.h +++ b/soh/assets/scenes/indoors/kenjyanoma/kenjyanoma_room_0.h @@ -3,85 +3,85 @@ #include "align_asset_macro.h" -#define dkenjyanoma_room_0DL_001608 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0DL_001608" -static const ALIGN_ASSET(2) char kenjyanoma_room_0DL_001608[] = dkenjyanoma_room_0DL_001608; - -#define dkenjyanoma_room_0Tex_00D618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_00D618" -static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_00D618[] = dkenjyanoma_room_0Tex_00D618; - -#define dkenjyanoma_room_0Tex_00C618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_00C618" -static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_00C618[] = dkenjyanoma_room_0Tex_00C618; - -#define dkenjyanoma_room_0Tex_00B618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_00B618" -static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_00B618[] = dkenjyanoma_room_0Tex_00B618; - -#define dkenjyanoma_room_0Tex_00A618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_00A618" -static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_00A618[] = dkenjyanoma_room_0Tex_00A618; - -#define dkenjyanoma_room_0Tex_009618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_009618" -static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_009618[] = dkenjyanoma_room_0Tex_009618; - -#define dkenjyanoma_room_0Tex_008618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_008618" -static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_008618[] = dkenjyanoma_room_0Tex_008618; - -#define dkenjyanoma_room_0Tex_007618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_007618" -static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_007618[] = dkenjyanoma_room_0Tex_007618; - -#define dkenjyanoma_room_0Tex_006618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_006618" -static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_006618[] = dkenjyanoma_room_0Tex_006618; - -#define dkenjyanoma_room_0Tex_005618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_005618" -static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_005618[] = dkenjyanoma_room_0Tex_005618; - -#define dkenjyanoma_room_0Tex_004618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_004618" -static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_004618[] = dkenjyanoma_room_0Tex_004618; - -#define dkenjyanoma_room_0Tex_003618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_003618" -static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_003618[] = dkenjyanoma_room_0Tex_003618; - -#define dkenjyanoma_room_0Tex_002618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_002618" -static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_002618[] = dkenjyanoma_room_0Tex_002618; - -#define dkenjyanoma_room_0Tex_001618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_001618" +#define dkenjyanoma_room_0Tex_001618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_001618" static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_001618[] = dkenjyanoma_room_0Tex_001618; -#define dkenjyanoma_room_0DL_010CD8 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0DL_010CD8" -static const ALIGN_ASSET(2) char kenjyanoma_room_0DL_010CD8[] = dkenjyanoma_room_0DL_010CD8; +#define dkenjyanoma_room_0Tex_002618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_002618" +static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_002618[] = dkenjyanoma_room_0Tex_002618; -#define dkenjyanoma_room_0Tex_010CE8 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_010CE8" +#define dkenjyanoma_room_0Tex_003618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_003618" +static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_003618[] = dkenjyanoma_room_0Tex_003618; + +#define dkenjyanoma_room_0Tex_004618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_004618" +static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_004618[] = dkenjyanoma_room_0Tex_004618; + +#define dkenjyanoma_room_0Tex_005618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_005618" +static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_005618[] = dkenjyanoma_room_0Tex_005618; + +#define dkenjyanoma_room_0Tex_006618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_006618" +static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_006618[] = dkenjyanoma_room_0Tex_006618; + +#define dkenjyanoma_room_0Tex_007618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_007618" +static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_007618[] = dkenjyanoma_room_0Tex_007618; + +#define dkenjyanoma_room_0Tex_008618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_008618" +static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_008618[] = dkenjyanoma_room_0Tex_008618; + +#define dkenjyanoma_room_0Tex_009618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_009618" +static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_009618[] = dkenjyanoma_room_0Tex_009618; + +#define dkenjyanoma_room_0Tex_00A618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_00A618" +static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_00A618[] = dkenjyanoma_room_0Tex_00A618; + +#define dkenjyanoma_room_0Tex_00B618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_00B618" +static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_00B618[] = dkenjyanoma_room_0Tex_00B618; + +#define dkenjyanoma_room_0Tex_00C618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_00C618" +static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_00C618[] = dkenjyanoma_room_0Tex_00C618; + +#define dkenjyanoma_room_0Tex_00D618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_00D618" +static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_00D618[] = dkenjyanoma_room_0Tex_00D618; + +#define dkenjyanoma_room_0Tex_010CE8 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_010CE8" static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_010CE8[] = dkenjyanoma_room_0Tex_010CE8; -#define dkenjyanoma_room_0Tex_012D08 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_012D08" -static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_012D08[] = dkenjyanoma_room_0Tex_012D08; - -#define dkenjyanoma_room_0Tex_012508 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_012508" -static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_012508[] = dkenjyanoma_room_0Tex_012508; - -#define dkenjyanoma_room_0Tex_0114E8 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_0114E8" +#define dkenjyanoma_room_0Tex_0114E8 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_0114E8" static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_0114E8[] = dkenjyanoma_room_0Tex_0114E8; -#define dkenjyanoma_room_0Tex_011CE8 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_011CE8" +#define dkenjyanoma_room_0Tex_011CE8 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_011CE8" static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_011CE8[] = dkenjyanoma_room_0Tex_011CE8; -#define dkenjyanoma_room_0Tex_011D08 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_011D08" +#define dkenjyanoma_room_0Tex_011D08 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_011D08" static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_011D08[] = dkenjyanoma_room_0Tex_011D08; -#define dkenjyanoma_room_0Set_000110DL_001608 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Set_000110DL_001608" +#define dkenjyanoma_room_0Tex_012508 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_012508" +static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_012508[] = dkenjyanoma_room_0Tex_012508; + +#define dkenjyanoma_room_0Tex_012D08 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_012D08" +static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_012D08[] = dkenjyanoma_room_0Tex_012D08; + +#define dkenjyanoma_room_0DL_001608 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0DL_001608" +static const ALIGN_ASSET(2) char kenjyanoma_room_0DL_001608[] = dkenjyanoma_room_0DL_001608; + +#define dkenjyanoma_room_0DL_010CD8 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0DL_010CD8" +static const ALIGN_ASSET(2) char kenjyanoma_room_0DL_010CD8[] = dkenjyanoma_room_0DL_010CD8; + +#define dkenjyanoma_room_0Set_000110DL_001608 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Set_000110DL_001608" static const ALIGN_ASSET(2) char kenjyanoma_room_0Set_000110DL_001608[] = dkenjyanoma_room_0Set_000110DL_001608; -#define dkenjyanoma_room_0Set_000110DL_010CD8 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Set_000110DL_010CD8" +#define dkenjyanoma_room_0Set_000110DL_010CD8 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Set_000110DL_010CD8" static const ALIGN_ASSET(2) char kenjyanoma_room_0Set_000110DL_010CD8[] = dkenjyanoma_room_0Set_000110DL_010CD8; -#define dkenjyanoma_room_0Set_000180DL_001608 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Set_000180DL_001608" +#define dkenjyanoma_room_0Set_000180DL_001608 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Set_000180DL_001608" static const ALIGN_ASSET(2) char kenjyanoma_room_0Set_000180DL_001608[] = dkenjyanoma_room_0Set_000180DL_001608; -#define dkenjyanoma_room_0Set_000180DL_010CD8 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Set_000180DL_010CD8" +#define dkenjyanoma_room_0Set_000180DL_010CD8 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Set_000180DL_010CD8" static const ALIGN_ASSET(2) char kenjyanoma_room_0Set_000180DL_010CD8[] = dkenjyanoma_room_0Set_000180DL_010CD8; -#define dkenjyanoma_room_0Set_000230DL_001608 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Set_000230DL_001608" +#define dkenjyanoma_room_0Set_000230DL_001608 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Set_000230DL_001608" static const ALIGN_ASSET(2) char kenjyanoma_room_0Set_000230DL_001608[] = dkenjyanoma_room_0Set_000230DL_001608; -#define dkenjyanoma_room_0Set_000230DL_010CD8 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Set_000230DL_010CD8" +#define dkenjyanoma_room_0Set_000230DL_010CD8 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Set_000230DL_010CD8" static const ALIGN_ASSET(2) char kenjyanoma_room_0Set_000230DL_010CD8[] = dkenjyanoma_room_0Set_000230DL_010CD8; diff --git a/soh/assets/scenes/indoors/kenjyanoma/kenjyanoma_scene.h b/soh/assets/scenes/indoors/kenjyanoma/kenjyanoma_scene.h index 1132c6f2e..91b555e62 100644 --- a/soh/assets/scenes/indoors/kenjyanoma/kenjyanoma_scene.h +++ b/soh/assets/scenes/indoors/kenjyanoma/kenjyanoma_scene.h @@ -3,14 +3,14 @@ #include "align_asset_macro.h" -#define dkenjyanoma_sceneCollisionHeader_00359C "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_sceneCollisionHeader_00359C" +#define dkenjyanoma_sceneCollisionHeader_00359C "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_sceneCollisionHeader_00359C" static const ALIGN_ASSET(2) char kenjyanoma_sceneCollisionHeader_00359C[] = dkenjyanoma_sceneCollisionHeader_00359C; -#define dkenjyanoma_sceneCollisionHeader_00359C "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_sceneCollisionHeader_00359C" +#define dkenjyanoma_sceneCollisionHeader_00359C "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_sceneCollisionHeader_00359C" -#define dkenjyanoma_sceneCollisionHeader_00359C "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_sceneCollisionHeader_00359C" +#define dkenjyanoma_sceneCollisionHeader_00359C "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_sceneCollisionHeader_00359C" -#define dkenjyanoma_sceneCollisionHeader_00359C "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_sceneCollisionHeader_00359C" +#define dkenjyanoma_sceneCollisionHeader_00359C "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_sceneCollisionHeader_00359C" #endif // INDOORS_KENJYANOMA_SCENE_H diff --git a/soh/assets/scenes/indoors/kokiri_home/kokiri_home_room_0.h b/soh/assets/scenes/indoors/kokiri_home/kokiri_home_room_0.h index 764cb901a..4047eecce 100644 --- a/soh/assets/scenes/indoors/kokiri_home/kokiri_home_room_0.h +++ b/soh/assets/scenes/indoors/kokiri_home/kokiri_home_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dkokiri_home_room_0DL_006398 "__OTR__scenes/nonmq/kokiri_home_scene/kokiri_home_room_0DL_006398" +#define dkokiri_home_room_0DL_006398 "__OTR__scenes/shared/kokiri_home_scene/kokiri_home_room_0DL_006398" static const ALIGN_ASSET(2) char kokiri_home_room_0DL_006398[] = dkokiri_home_room_0DL_006398; diff --git a/soh/assets/scenes/indoors/kokiri_home/kokiri_home_scene.h b/soh/assets/scenes/indoors/kokiri_home/kokiri_home_scene.h index faadb2ff9..161beb2be 100644 --- a/soh/assets/scenes/indoors/kokiri_home/kokiri_home_scene.h +++ b/soh/assets/scenes/indoors/kokiri_home/kokiri_home_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dkokiri_home_sceneCollisionHeader_000C8C "__OTR__scenes/nonmq/kokiri_home_scene/kokiri_home_sceneCollisionHeader_000C8C" +#define dkokiri_home_sceneCollisionHeader_000C8C "__OTR__scenes/shared/kokiri_home_scene/kokiri_home_sceneCollisionHeader_000C8C" static const ALIGN_ASSET(2) char kokiri_home_sceneCollisionHeader_000C8C[] = dkokiri_home_sceneCollisionHeader_000C8C; diff --git a/soh/assets/scenes/indoors/kokiri_home3/kokiri_home3_room_0.h b/soh/assets/scenes/indoors/kokiri_home3/kokiri_home3_room_0.h index b0a16b9f3..d88b86806 100644 --- a/soh/assets/scenes/indoors/kokiri_home3/kokiri_home3_room_0.h +++ b/soh/assets/scenes/indoors/kokiri_home3/kokiri_home3_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dkokiri_home3_room_0DL_036590 "__OTR__scenes/nonmq/kokiri_home3_scene/kokiri_home3_room_0DL_036590" +#define dkokiri_home3_room_0DL_036590 "__OTR__scenes/shared/kokiri_home3_scene/kokiri_home3_room_0DL_036590" static const ALIGN_ASSET(2) char kokiri_home3_room_0DL_036590[] = dkokiri_home3_room_0DL_036590; diff --git a/soh/assets/scenes/indoors/kokiri_home3/kokiri_home3_scene.h b/soh/assets/scenes/indoors/kokiri_home3/kokiri_home3_scene.h index fa6597995..a301dbf7d 100644 --- a/soh/assets/scenes/indoors/kokiri_home3/kokiri_home3_scene.h +++ b/soh/assets/scenes/indoors/kokiri_home3/kokiri_home3_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dkokiri_home3_sceneCollisionHeader_001774 "__OTR__scenes/nonmq/kokiri_home3_scene/kokiri_home3_sceneCollisionHeader_001774" +#define dkokiri_home3_sceneCollisionHeader_001774 "__OTR__scenes/shared/kokiri_home3_scene/kokiri_home3_sceneCollisionHeader_001774" static const ALIGN_ASSET(2) char kokiri_home3_sceneCollisionHeader_001774[] = dkokiri_home3_sceneCollisionHeader_001774; diff --git a/soh/assets/scenes/indoors/kokiri_home4/kokiri_home4_room_0.h b/soh/assets/scenes/indoors/kokiri_home4/kokiri_home4_room_0.h index e954d48dc..75cb26571 100644 --- a/soh/assets/scenes/indoors/kokiri_home4/kokiri_home4_room_0.h +++ b/soh/assets/scenes/indoors/kokiri_home4/kokiri_home4_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dkokiri_home4_room_0DL_0388B8 "__OTR__scenes/nonmq/kokiri_home4_scene/kokiri_home4_room_0DL_0388B8" +#define dkokiri_home4_room_0DL_0388B8 "__OTR__scenes/shared/kokiri_home4_scene/kokiri_home4_room_0DL_0388B8" static const ALIGN_ASSET(2) char kokiri_home4_room_0DL_0388B8[] = dkokiri_home4_room_0DL_0388B8; diff --git a/soh/assets/scenes/indoors/kokiri_home4/kokiri_home4_scene.h b/soh/assets/scenes/indoors/kokiri_home4/kokiri_home4_scene.h index ed244364d..35ddc7159 100644 --- a/soh/assets/scenes/indoors/kokiri_home4/kokiri_home4_scene.h +++ b/soh/assets/scenes/indoors/kokiri_home4/kokiri_home4_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dkokiri_home4_sceneCollisionHeader_001A84 "__OTR__scenes/nonmq/kokiri_home4_scene/kokiri_home4_sceneCollisionHeader_001A84" +#define dkokiri_home4_sceneCollisionHeader_001A84 "__OTR__scenes/shared/kokiri_home4_scene/kokiri_home4_sceneCollisionHeader_001A84" static const ALIGN_ASSET(2) char kokiri_home4_sceneCollisionHeader_001A84[] = dkokiri_home4_sceneCollisionHeader_001A84; diff --git a/soh/assets/scenes/indoors/kokiri_home5/kokiri_home5_room_0.h b/soh/assets/scenes/indoors/kokiri_home5/kokiri_home5_room_0.h index e5aacdf16..11f182e1b 100644 --- a/soh/assets/scenes/indoors/kokiri_home5/kokiri_home5_room_0.h +++ b/soh/assets/scenes/indoors/kokiri_home5/kokiri_home5_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dkokiri_home5_room_0DL_030EE8 "__OTR__scenes/nonmq/kokiri_home5_scene/kokiri_home5_room_0DL_030EE8" +#define dkokiri_home5_room_0DL_030EE8 "__OTR__scenes/shared/kokiri_home5_scene/kokiri_home5_room_0DL_030EE8" static const ALIGN_ASSET(2) char kokiri_home5_room_0DL_030EE8[] = dkokiri_home5_room_0DL_030EE8; diff --git a/soh/assets/scenes/indoors/kokiri_home5/kokiri_home5_scene.h b/soh/assets/scenes/indoors/kokiri_home5/kokiri_home5_scene.h index 250287b76..7662bafb8 100644 --- a/soh/assets/scenes/indoors/kokiri_home5/kokiri_home5_scene.h +++ b/soh/assets/scenes/indoors/kokiri_home5/kokiri_home5_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dkokiri_home5_sceneCollisionHeader_0013DC "__OTR__scenes/nonmq/kokiri_home5_scene/kokiri_home5_sceneCollisionHeader_0013DC" +#define dkokiri_home5_sceneCollisionHeader_0013DC "__OTR__scenes/shared/kokiri_home5_scene/kokiri_home5_sceneCollisionHeader_0013DC" static const ALIGN_ASSET(2) char kokiri_home5_sceneCollisionHeader_0013DC[] = dkokiri_home5_sceneCollisionHeader_0013DC; diff --git a/soh/assets/scenes/indoors/labo/labo_room_0.h b/soh/assets/scenes/indoors/labo/labo_room_0.h index e632c604b..652f90af7 100644 --- a/soh/assets/scenes/indoors/labo/labo_room_0.h +++ b/soh/assets/scenes/indoors/labo/labo_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dlabo_room_0DL_006E50 "__OTR__scenes/nonmq/labo_scene/labo_room_0DL_006E50" +#define dlabo_room_0DL_006E50 "__OTR__scenes/shared/labo_scene/labo_room_0DL_006E50" static const ALIGN_ASSET(2) char labo_room_0DL_006E50[] = dlabo_room_0DL_006E50; diff --git a/soh/assets/scenes/indoors/labo/labo_scene.h b/soh/assets/scenes/indoors/labo/labo_scene.h index f9a048f59..ca9cd8332 100644 --- a/soh/assets/scenes/indoors/labo/labo_scene.h +++ b/soh/assets/scenes/indoors/labo/labo_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dlabo_sceneCollisionHeader_000EC4 "__OTR__scenes/nonmq/labo_scene/labo_sceneCollisionHeader_000EC4" +#define dlabo_sceneCollisionHeader_000EC4 "__OTR__scenes/shared/labo_scene/labo_sceneCollisionHeader_000EC4" static const ALIGN_ASSET(2) char labo_sceneCollisionHeader_000EC4[] = dlabo_sceneCollisionHeader_000EC4; diff --git a/soh/assets/scenes/indoors/link_home/link_home_room_0.h b/soh/assets/scenes/indoors/link_home/link_home_room_0.h index 084b00855..18015eaa2 100644 --- a/soh/assets/scenes/indoors/link_home/link_home_room_0.h +++ b/soh/assets/scenes/indoors/link_home/link_home_room_0.h @@ -3,13 +3,13 @@ #include "align_asset_macro.h" -#define dlink_home_room_0DL_0023A8 "__OTR__scenes/nonmq/link_home_scene/link_home_room_0DL_0023A8" +#define dlink_home_room_0DL_0023A8 "__OTR__scenes/shared/link_home_scene/link_home_room_0DL_0023A8" static const ALIGN_ASSET(2) char link_home_room_0DL_0023A8[] = dlink_home_room_0DL_0023A8; -#define dlink_home_room_0Set_002400DL_0023A8 "__OTR__scenes/nonmq/link_home_scene/link_home_room_0Set_002400DL_0023A8" +#define dlink_home_room_0Set_002400DL_0023A8 "__OTR__scenes/shared/link_home_scene/link_home_room_0Set_002400DL_0023A8" static const ALIGN_ASSET(2) char link_home_room_0Set_002400DL_0023A8[] = dlink_home_room_0Set_002400DL_0023A8; -#define dlink_home_room_0Set_002440DL_0023A8 "__OTR__scenes/nonmq/link_home_scene/link_home_room_0Set_002440DL_0023A8" +#define dlink_home_room_0Set_002440DL_0023A8 "__OTR__scenes/shared/link_home_scene/link_home_room_0Set_002440DL_0023A8" static const ALIGN_ASSET(2) char link_home_room_0Set_002440DL_0023A8[] = dlink_home_room_0Set_002440DL_0023A8; diff --git a/soh/assets/scenes/indoors/link_home/link_home_scene.h b/soh/assets/scenes/indoors/link_home/link_home_scene.h index d66349aa0..ad5cbeae0 100644 --- a/soh/assets/scenes/indoors/link_home/link_home_scene.h +++ b/soh/assets/scenes/indoors/link_home/link_home_scene.h @@ -3,12 +3,12 @@ #include "align_asset_macro.h" -#define dlink_home_sceneCollisionHeader_000E4C "__OTR__scenes/nonmq/link_home_scene/link_home_sceneCollisionHeader_000E4C" +#define dlink_home_sceneCollisionHeader_000E4C "__OTR__scenes/shared/link_home_scene/link_home_sceneCollisionHeader_000E4C" static const ALIGN_ASSET(2) char link_home_sceneCollisionHeader_000E4C[] = dlink_home_sceneCollisionHeader_000E4C; -#define dlink_home_sceneCollisionHeader_000E4C "__OTR__scenes/nonmq/link_home_scene/link_home_sceneCollisionHeader_000E4C" +#define dlink_home_sceneCollisionHeader_000E4C "__OTR__scenes/shared/link_home_scene/link_home_sceneCollisionHeader_000E4C" -#define dlink_home_sceneCollisionHeader_000E4C "__OTR__scenes/nonmq/link_home_scene/link_home_sceneCollisionHeader_000E4C" +#define dlink_home_sceneCollisionHeader_000E4C "__OTR__scenes/shared/link_home_scene/link_home_sceneCollisionHeader_000E4C" #endif // INDOORS_LINK_HOME_SCENE_H diff --git a/soh/assets/scenes/indoors/mahouya/mahouya_room_0.h b/soh/assets/scenes/indoors/mahouya/mahouya_room_0.h index 8fbc38d42..a5aef9955 100644 --- a/soh/assets/scenes/indoors/mahouya/mahouya_room_0.h +++ b/soh/assets/scenes/indoors/mahouya/mahouya_room_0.h @@ -3,10 +3,10 @@ #include "align_asset_macro.h" -#define dmahouya_room_0DL_006548 "__OTR__scenes/nonmq/mahouya_scene/mahouya_room_0DL_006548" +#define dmahouya_room_0DL_006548 "__OTR__scenes/shared/mahouya_scene/mahouya_room_0DL_006548" static const ALIGN_ASSET(2) char mahouya_room_0DL_006548[] = dmahouya_room_0DL_006548; -#define dmahouya_room_0DL_006A78 "__OTR__scenes/nonmq/mahouya_scene/mahouya_room_0DL_006A78" +#define dmahouya_room_0DL_006A78 "__OTR__scenes/shared/mahouya_scene/mahouya_room_0DL_006A78" static const ALIGN_ASSET(2) char mahouya_room_0DL_006A78[] = dmahouya_room_0DL_006A78; diff --git a/soh/assets/scenes/indoors/mahouya/mahouya_scene.h b/soh/assets/scenes/indoors/mahouya/mahouya_scene.h index 0e558bcfd..a7744e3e1 100644 --- a/soh/assets/scenes/indoors/mahouya/mahouya_scene.h +++ b/soh/assets/scenes/indoors/mahouya/mahouya_scene.h @@ -3,46 +3,47 @@ #include "align_asset_macro.h" -#define dmahouya_sceneCollisionHeader_0009F4 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneCollisionHeader_0009F4" -static const ALIGN_ASSET(2) char mahouya_sceneCollisionHeader_0009F4[] = dmahouya_sceneCollisionHeader_0009F4; - -#define dmahouya_sceneTex_009A20 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_009A20" -static const ALIGN_ASSET(2) char mahouya_sceneTex_009A20[] = dmahouya_sceneTex_009A20; - -#define dmahouya_sceneTex_007A20 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_007A20" -static const ALIGN_ASSET(2) char mahouya_sceneTex_007A20[] = dmahouya_sceneTex_007A20; - -#define dmahouya_sceneTex_009220 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_009220" -static const ALIGN_ASSET(2) char mahouya_sceneTex_009220[] = dmahouya_sceneTex_009220; - -#define dmahouya_sceneTex_001A20 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_001A20" -static const ALIGN_ASSET(2) char mahouya_sceneTex_001A20[] = dmahouya_sceneTex_001A20; - -#define dmahouya_sceneTex_001220 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_001220" -static const ALIGN_ASSET(2) char mahouya_sceneTex_001220[] = dmahouya_sceneTex_001220; - -#define dmahouya_sceneTex_006220 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_006220" -static const ALIGN_ASSET(2) char mahouya_sceneTex_006220[] = dmahouya_sceneTex_006220; - -#define dmahouya_sceneTex_007220 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_007220" -static const ALIGN_ASSET(2) char mahouya_sceneTex_007220[] = dmahouya_sceneTex_007220; - -#define dmahouya_sceneTex_005220 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_005220" -static const ALIGN_ASSET(2) char mahouya_sceneTex_005220[] = dmahouya_sceneTex_005220; - -#define dmahouya_sceneTex_004A20 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_004A20" -static const ALIGN_ASSET(2) char mahouya_sceneTex_004A20[] = dmahouya_sceneTex_004A20; - -#define dmahouya_sceneTex_000A20 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_000A20" +#define dmahouya_sceneTex_000A20 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_000A20" static const ALIGN_ASSET(2) char mahouya_sceneTex_000A20[] = dmahouya_sceneTex_000A20; -#define dmahouya_sceneTex_003A20 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_003A20" -static const ALIGN_ASSET(2) char mahouya_sceneTex_003A20[] = dmahouya_sceneTex_003A20; +#define dmahouya_sceneTex_001220 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_001220" +static const ALIGN_ASSET(2) char mahouya_sceneTex_001220[] = dmahouya_sceneTex_001220; -#define dmahouya_sceneTex_002A20 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_002A20" +#define dmahouya_sceneTex_001A20 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_001A20" +static const ALIGN_ASSET(2) char mahouya_sceneTex_001A20[] = dmahouya_sceneTex_001A20; + +#define dmahouya_sceneTex_002A20 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_002A20" static const ALIGN_ASSET(2) char mahouya_sceneTex_002A20[] = dmahouya_sceneTex_002A20; -#define dmahouya_sceneTex_008A20 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_008A20" +#define dmahouya_sceneTex_003A20 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_003A20" +static const ALIGN_ASSET(2) char mahouya_sceneTex_003A20[] = dmahouya_sceneTex_003A20; + +#define dmahouya_sceneTex_004A20 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_004A20" +static const ALIGN_ASSET(2) char mahouya_sceneTex_004A20[] = dmahouya_sceneTex_004A20; + +#define dmahouya_sceneTex_005220 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_005220" +static const ALIGN_ASSET(2) char mahouya_sceneTex_005220[] = dmahouya_sceneTex_005220; + +#define dmahouya_sceneTex_006220 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_006220" +static const ALIGN_ASSET(2) char mahouya_sceneTex_006220[] = dmahouya_sceneTex_006220; + +#define dmahouya_sceneTex_007220 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_007220" +static const ALIGN_ASSET(2) char mahouya_sceneTex_007220[] = dmahouya_sceneTex_007220; + +#define dmahouya_sceneTex_007A20 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_007A20" +static const ALIGN_ASSET(2) char mahouya_sceneTex_007A20[] = dmahouya_sceneTex_007A20; + +#define dmahouya_sceneTex_008A20 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_008A20" static const ALIGN_ASSET(2) char mahouya_sceneTex_008A20[] = dmahouya_sceneTex_008A20; +#define dmahouya_sceneTex_009220 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_009220" +static const ALIGN_ASSET(2) char mahouya_sceneTex_009220[] = dmahouya_sceneTex_009220; + +#define dmahouya_sceneTex_009A20 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_009A20" +static const ALIGN_ASSET(2) char mahouya_sceneTex_009A20[] = dmahouya_sceneTex_009A20; + +#define dmahouya_sceneCollisionHeader_0009F4 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneCollisionHeader_0009F4" +static const ALIGN_ASSET(2) char mahouya_sceneCollisionHeader_0009F4[] = dmahouya_sceneCollisionHeader_0009F4; + + #endif // INDOORS_MAHOUYA_SCENE_H diff --git a/soh/assets/scenes/indoors/malon_stable/malon_stable_room_0.h b/soh/assets/scenes/indoors/malon_stable/malon_stable_room_0.h index 7d95fae4d..406a7bb38 100644 --- a/soh/assets/scenes/indoors/malon_stable/malon_stable_room_0.h +++ b/soh/assets/scenes/indoors/malon_stable/malon_stable_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dmalon_stable_room_0DL_008A00 "__OTR__scenes/nonmq/malon_stable_scene/malon_stable_room_0DL_008A00" +#define dmalon_stable_room_0DL_008A00 "__OTR__scenes/shared/malon_stable_scene/malon_stable_room_0DL_008A00" static const ALIGN_ASSET(2) char malon_stable_room_0DL_008A00[] = dmalon_stable_room_0DL_008A00; diff --git a/soh/assets/scenes/indoors/malon_stable/malon_stable_scene.h b/soh/assets/scenes/indoors/malon_stable/malon_stable_scene.h index c8006d866..47584f2ac 100644 --- a/soh/assets/scenes/indoors/malon_stable/malon_stable_scene.h +++ b/soh/assets/scenes/indoors/malon_stable/malon_stable_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dmalon_stable_sceneCollisionHeader_000644 "__OTR__scenes/nonmq/malon_stable_scene/malon_stable_sceneCollisionHeader_000644" +#define dmalon_stable_sceneCollisionHeader_000644 "__OTR__scenes/shared/malon_stable_scene/malon_stable_sceneCollisionHeader_000644" static const ALIGN_ASSET(2) char malon_stable_sceneCollisionHeader_000644[] = dmalon_stable_sceneCollisionHeader_000644; diff --git a/soh/assets/scenes/indoors/miharigoya/miharigoya_room_0.h b/soh/assets/scenes/indoors/miharigoya/miharigoya_room_0.h index d532f22de..1a6098751 100644 --- a/soh/assets/scenes/indoors/miharigoya/miharigoya_room_0.h +++ b/soh/assets/scenes/indoors/miharigoya/miharigoya_room_0.h @@ -3,88 +3,88 @@ #include "align_asset_macro.h" -#define dgMiharigoyaBlob_0038D8 "__OTR__scenes/nonmq/miharigoya_room_0/gMiharigoyaBlob_0038D8" +#define dgMiharigoyaBlob_0038D8 "__OTR__scenes/shared/miharigoya_room_0/gMiharigoyaBlob_0038D8" static const ALIGN_ASSET(2) char gMiharigoyaBlob_0038D8[] = dgMiharigoyaBlob_0038D8; -#define dmiharigoya_room_0DL_003820 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_003820" +#define dmiharigoya_room_0DL_003820 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_003820" static const ALIGN_ASSET(2) char miharigoya_room_0DL_003820[] = dmiharigoya_room_0DL_003820; -#define dmiharigoya_room_0DL_0036A8 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_0036A8" +#define dmiharigoya_room_0DL_0036A8 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_0036A8" static const ALIGN_ASSET(2) char miharigoya_room_0DL_0036A8[] = dmiharigoya_room_0DL_0036A8; -#define dmiharigoya_room_0DL_002F30 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_002F30" +#define dmiharigoya_room_0DL_002F30 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_002F30" static const ALIGN_ASSET(2) char miharigoya_room_0DL_002F30[] = dmiharigoya_room_0DL_002F30; -#define dmiharigoya_room_0DL_002A10 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_002A10" +#define dmiharigoya_room_0DL_002A10 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_002A10" static const ALIGN_ASSET(2) char miharigoya_room_0DL_002A10[] = dmiharigoya_room_0DL_002A10; -#define dmiharigoya_room_0DL_003490 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_003490" +#define dmiharigoya_room_0DL_003490 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_003490" static const ALIGN_ASSET(2) char miharigoya_room_0DL_003490[] = dmiharigoya_room_0DL_003490; -#define dmiharigoya_room_0DL_000FE0 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_000FE0" +#define dmiharigoya_room_0DL_000FE0 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_000FE0" static const ALIGN_ASSET(2) char miharigoya_room_0DL_000FE0[] = dmiharigoya_room_0DL_000FE0; -#define dmiharigoya_room_0DL_001F48 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_001F48" +#define dmiharigoya_room_0DL_001F48 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_001F48" static const ALIGN_ASSET(2) char miharigoya_room_0DL_001F48[] = dmiharigoya_room_0DL_001F48; -#define dmiharigoya_room_0DL_002778 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_002778" +#define dmiharigoya_room_0DL_002778 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_002778" static const ALIGN_ASSET(2) char miharigoya_room_0DL_002778[] = dmiharigoya_room_0DL_002778; -#define dmiharigoya_room_0DL_000A68 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_000A68" +#define dmiharigoya_room_0DL_000A68 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_000A68" static const ALIGN_ASSET(2) char miharigoya_room_0DL_000A68[] = dmiharigoya_room_0DL_000A68; -#define dmiharigoya_room_0DL_003C40 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_003C40" +#define dmiharigoya_room_0DL_003C40 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_003C40" static const ALIGN_ASSET(2) char miharigoya_room_0DL_003C40[] = dmiharigoya_room_0DL_003C40; -#define dmiharigoya_room_0DL_000E60 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_000E60" +#define dmiharigoya_room_0DL_000E60 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_000E60" static const ALIGN_ASSET(2) char miharigoya_room_0DL_000E60[] = dmiharigoya_room_0DL_000E60; -#define dmiharigoya_room_0DL_000660 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_000660" +#define dmiharigoya_room_0DL_000660 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_000660" static const ALIGN_ASSET(2) char miharigoya_room_0DL_000660[] = dmiharigoya_room_0DL_000660; -#define dmiharigoya_room_0DL_002C60 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_002C60" +#define dmiharigoya_room_0DL_002C60 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_002C60" static const ALIGN_ASSET(2) char miharigoya_room_0DL_002C60[] = dmiharigoya_room_0DL_002C60; -#define dgMiharigoyaDL_003DA0 "__OTR__scenes/nonmq/miharigoya_scene/gMiharigoyaDL_003DA0" +#define dgMiharigoyaDL_003DA0 "__OTR__scenes/shared/miharigoya_scene/gMiharigoyaDL_003DA0" static const ALIGN_ASSET(2) char gMiharigoyaDL_003DA0[] = dgMiharigoyaDL_003DA0; -#define dmiharigoya_room_0Set_000470DL_003820 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_003820" +#define dmiharigoya_room_0Set_000470DL_003820 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_003820" static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_003820[] = dmiharigoya_room_0Set_000470DL_003820; -#define dmiharigoya_room_0Set_000470DL_0036A8 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_0036A8" +#define dmiharigoya_room_0Set_000470DL_0036A8 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_0036A8" static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_0036A8[] = dmiharigoya_room_0Set_000470DL_0036A8; -#define dmiharigoya_room_0Set_000470DL_002F30 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_002F30" +#define dmiharigoya_room_0Set_000470DL_002F30 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_002F30" static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_002F30[] = dmiharigoya_room_0Set_000470DL_002F30; -#define dmiharigoya_room_0Set_000470DL_002A10 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_002A10" +#define dmiharigoya_room_0Set_000470DL_002A10 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_002A10" static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_002A10[] = dmiharigoya_room_0Set_000470DL_002A10; -#define dmiharigoya_room_0Set_000470DL_003490 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_003490" +#define dmiharigoya_room_0Set_000470DL_003490 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_003490" static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_003490[] = dmiharigoya_room_0Set_000470DL_003490; -#define dmiharigoya_room_0Set_000470DL_000FE0 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_000FE0" +#define dmiharigoya_room_0Set_000470DL_000FE0 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_000FE0" static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_000FE0[] = dmiharigoya_room_0Set_000470DL_000FE0; -#define dmiharigoya_room_0Set_000470DL_001F48 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_001F48" +#define dmiharigoya_room_0Set_000470DL_001F48 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_001F48" static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_001F48[] = dmiharigoya_room_0Set_000470DL_001F48; -#define dmiharigoya_room_0Set_000470DL_002778 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_002778" +#define dmiharigoya_room_0Set_000470DL_002778 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_002778" static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_002778[] = dmiharigoya_room_0Set_000470DL_002778; -#define dmiharigoya_room_0Set_000470DL_000A68 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_000A68" +#define dmiharigoya_room_0Set_000470DL_000A68 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_000A68" static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_000A68[] = dmiharigoya_room_0Set_000470DL_000A68; -#define dmiharigoya_room_0Set_000470DL_003C40 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_003C40" +#define dmiharigoya_room_0Set_000470DL_003C40 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_003C40" static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_003C40[] = dmiharigoya_room_0Set_000470DL_003C40; -#define dmiharigoya_room_0Set_000470DL_000E60 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_000E60" +#define dmiharigoya_room_0Set_000470DL_000E60 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_000E60" static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_000E60[] = dmiharigoya_room_0Set_000470DL_000E60; -#define dmiharigoya_room_0Set_000470DL_000660 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_000660" +#define dmiharigoya_room_0Set_000470DL_000660 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_000660" static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_000660[] = dmiharigoya_room_0Set_000470DL_000660; -#define dmiharigoya_room_0Set_000470DL_002C60 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_002C60" +#define dmiharigoya_room_0Set_000470DL_002C60 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_002C60" static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_002C60[] = dmiharigoya_room_0Set_000470DL_002C60; diff --git a/soh/assets/scenes/indoors/miharigoya/miharigoya_scene.h b/soh/assets/scenes/indoors/miharigoya/miharigoya_scene.h index f5c92c71e..86eefaa64 100644 --- a/soh/assets/scenes/indoors/miharigoya/miharigoya_scene.h +++ b/soh/assets/scenes/indoors/miharigoya/miharigoya_scene.h @@ -3,64 +3,64 @@ #include "align_asset_macro.h" -#define dgGuardHouseOutSideView2NightTex "__OTR__scenes/nonmq/miharigoya_scene/gGuardHouseOutSideView2NightTex" -static const ALIGN_ASSET(2) char gGuardHouseOutSideView2NightTex[] = dgGuardHouseOutSideView2NightTex; - -#define dgGuardHouseOutSideView2DayTex "__OTR__scenes/nonmq/miharigoya_scene/gGuardHouseOutSideView2DayTex" -static const ALIGN_ASSET(2) char gGuardHouseOutSideView2DayTex[] = dgGuardHouseOutSideView2DayTex; - -#define dgGuardHouseOutSideView1NightTex "__OTR__scenes/nonmq/miharigoya_scene/gGuardHouseOutSideView1NightTex" -static const ALIGN_ASSET(2) char gGuardHouseOutSideView1NightTex[] = dgGuardHouseOutSideView1NightTex; - -#define dgGuardHouseOutSideView1DayTex "__OTR__scenes/nonmq/miharigoya_scene/gGuardHouseOutSideView1DayTex" -static const ALIGN_ASSET(2) char gGuardHouseOutSideView1DayTex[] = dgGuardHouseOutSideView1DayTex; - -#define dmiharigoya_sceneCollisionHeader_000B28 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneCollisionHeader_000B28" -static const ALIGN_ASSET(2) char miharigoya_sceneCollisionHeader_000B28[] = dmiharigoya_sceneCollisionHeader_000B28; - -#define dmiharigoya_sceneTex_004950 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_004950" -static const ALIGN_ASSET(2) char miharigoya_sceneTex_004950[] = dmiharigoya_sceneTex_004950; - -#define dmiharigoya_sceneTex_004550 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_004550" -static const ALIGN_ASSET(2) char miharigoya_sceneTex_004550[] = dmiharigoya_sceneTex_004550; - -#define dmiharigoya_sceneTex_008550 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_008550" -static const ALIGN_ASSET(2) char miharigoya_sceneTex_008550[] = dmiharigoya_sceneTex_008550; - -#define dmiharigoya_sceneTex_008D50 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_008D50" -static const ALIGN_ASSET(2) char miharigoya_sceneTex_008D50[] = dmiharigoya_sceneTex_008D50; - -#define dmiharigoya_sceneTex_007550 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_007550" -static const ALIGN_ASSET(2) char miharigoya_sceneTex_007550[] = dmiharigoya_sceneTex_007550; - -#define dmiharigoya_sceneTex_005950 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_005950" -static const ALIGN_ASSET(2) char miharigoya_sceneTex_005950[] = dmiharigoya_sceneTex_005950; - -#define dmiharigoya_sceneTex_00AD50 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_00AD50" -static const ALIGN_ASSET(2) char miharigoya_sceneTex_00AD50[] = dmiharigoya_sceneTex_00AD50; - -#define dmiharigoya_sceneTex_003350 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_003350" -static const ALIGN_ASSET(2) char miharigoya_sceneTex_003350[] = dmiharigoya_sceneTex_003350; - -#define dmiharigoya_sceneTex_001050 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_001050" -static const ALIGN_ASSET(2) char miharigoya_sceneTex_001050[] = dmiharigoya_sceneTex_001050; - -#define dmiharigoya_sceneTex_009D50 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_009D50" -static const ALIGN_ASSET(2) char miharigoya_sceneTex_009D50[] = dmiharigoya_sceneTex_009D50; - -#define dmiharigoya_sceneTex_005D50 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_005D50" -static const ALIGN_ASSET(2) char miharigoya_sceneTex_005D50[] = dmiharigoya_sceneTex_005D50; - -#define dmiharigoya_sceneTex_001150 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_001150" -static const ALIGN_ASSET(2) char miharigoya_sceneTex_001150[] = dmiharigoya_sceneTex_001150; - -#define dmiharigoya_sceneTex_000C50 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_000C50" +#define dmiharigoya_sceneTex_000C50 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_000C50" static const ALIGN_ASSET(2) char miharigoya_sceneTex_000C50[] = dmiharigoya_sceneTex_000C50; -#define dmiharigoya_sceneTex_00BD50 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_00BD50" +#define dmiharigoya_sceneTex_001050 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_001050" +static const ALIGN_ASSET(2) char miharigoya_sceneTex_001050[] = dmiharigoya_sceneTex_001050; + +#define dmiharigoya_sceneTex_001150 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_001150" +static const ALIGN_ASSET(2) char miharigoya_sceneTex_001150[] = dmiharigoya_sceneTex_001150; + +#define dmiharigoya_sceneTex_003350 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_003350" +static const ALIGN_ASSET(2) char miharigoya_sceneTex_003350[] = dmiharigoya_sceneTex_003350; + +#define dmiharigoya_sceneTex_004550 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_004550" +static const ALIGN_ASSET(2) char miharigoya_sceneTex_004550[] = dmiharigoya_sceneTex_004550; + +#define dmiharigoya_sceneTex_004950 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_004950" +static const ALIGN_ASSET(2) char miharigoya_sceneTex_004950[] = dmiharigoya_sceneTex_004950; + +#define dmiharigoya_sceneTex_005950 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_005950" +static const ALIGN_ASSET(2) char miharigoya_sceneTex_005950[] = dmiharigoya_sceneTex_005950; + +#define dmiharigoya_sceneTex_005D50 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_005D50" +static const ALIGN_ASSET(2) char miharigoya_sceneTex_005D50[] = dmiharigoya_sceneTex_005D50; + +#define dmiharigoya_sceneTex_007550 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_007550" +static const ALIGN_ASSET(2) char miharigoya_sceneTex_007550[] = dmiharigoya_sceneTex_007550; + +#define dmiharigoya_sceneTex_008550 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_008550" +static const ALIGN_ASSET(2) char miharigoya_sceneTex_008550[] = dmiharigoya_sceneTex_008550; + +#define dmiharigoya_sceneTex_008D50 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_008D50" +static const ALIGN_ASSET(2) char miharigoya_sceneTex_008D50[] = dmiharigoya_sceneTex_008D50; + +#define dmiharigoya_sceneTex_009D50 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_009D50" +static const ALIGN_ASSET(2) char miharigoya_sceneTex_009D50[] = dmiharigoya_sceneTex_009D50; + +#define dmiharigoya_sceneTex_00AD50 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_00AD50" +static const ALIGN_ASSET(2) char miharigoya_sceneTex_00AD50[] = dmiharigoya_sceneTex_00AD50; + +#define dmiharigoya_sceneTex_00BD50 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_00BD50" static const ALIGN_ASSET(2) char miharigoya_sceneTex_00BD50[] = dmiharigoya_sceneTex_00BD50; -#define dmiharigoya_sceneCollisionHeader_000B28 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneCollisionHeader_000B28" +#define dgGuardHouseOutSideView2NightTex "__OTR__scenes/shared/miharigoya_scene/gGuardHouseOutSideView2NightTex" +static const ALIGN_ASSET(2) char gGuardHouseOutSideView2NightTex[] = dgGuardHouseOutSideView2NightTex; + +#define dgGuardHouseOutSideView2DayTex "__OTR__scenes/shared/miharigoya_scene/gGuardHouseOutSideView2DayTex" +static const ALIGN_ASSET(2) char gGuardHouseOutSideView2DayTex[] = dgGuardHouseOutSideView2DayTex; + +#define dgGuardHouseOutSideView1NightTex "__OTR__scenes/shared/miharigoya_scene/gGuardHouseOutSideView1NightTex" +static const ALIGN_ASSET(2) char gGuardHouseOutSideView1NightTex[] = dgGuardHouseOutSideView1NightTex; + +#define dgGuardHouseOutSideView1DayTex "__OTR__scenes/shared/miharigoya_scene/gGuardHouseOutSideView1DayTex" +static const ALIGN_ASSET(2) char gGuardHouseOutSideView1DayTex[] = dgGuardHouseOutSideView1DayTex; + +#define dmiharigoya_sceneCollisionHeader_000B28 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneCollisionHeader_000B28" +static const ALIGN_ASSET(2) char miharigoya_sceneCollisionHeader_000B28[] = dmiharigoya_sceneCollisionHeader_000B28; + +#define dmiharigoya_sceneCollisionHeader_000B28 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneCollisionHeader_000B28" #endif // INDOORS_MIHARIGOYA_SCENE_H diff --git a/soh/assets/scenes/indoors/nakaniwa/nakaniwa_room_0.h b/soh/assets/scenes/indoors/nakaniwa/nakaniwa_room_0.h index 7e371da85..6c4d6e38d 100644 --- a/soh/assets/scenes/indoors/nakaniwa/nakaniwa_room_0.h +++ b/soh/assets/scenes/indoors/nakaniwa/nakaniwa_room_0.h @@ -3,121 +3,121 @@ #include "align_asset_macro.h" -#define dnakaniwa_room_0DL_007178 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0DL_007178" -static const ALIGN_ASSET(2) char nakaniwa_room_0DL_007178[] = dnakaniwa_room_0DL_007178; - -#define dnakaniwa_room_0Tex_012618 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_012618" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_012618[] = dnakaniwa_room_0Tex_012618; - -#define dnakaniwa_room_0Tex_00F618 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_00F618" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00F618[] = dnakaniwa_room_0Tex_00F618; - -#define dnakaniwa_room_0Tex_00CE18 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_00CE18" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00CE18[] = dnakaniwa_room_0Tex_00CE18; - -#define dnakaniwa_room_0Tex_00C618 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_00C618" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00C618[] = dnakaniwa_room_0Tex_00C618; - -#define dnakaniwa_room_0Tex_00FE18 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_00FE18" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00FE18[] = dnakaniwa_room_0Tex_00FE18; - -#define dnakaniwa_room_0Tex_011E18 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_011E18" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_011E18[] = dnakaniwa_room_0Tex_011E18; - -#define dnakaniwa_room_0Tex_010618 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_010618" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_010618[] = dnakaniwa_room_0Tex_010618; - -#define dnakaniwa_room_0Tex_00EE18 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_00EE18" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00EE18[] = dnakaniwa_room_0Tex_00EE18; - -#define dnakaniwa_room_0Tex_00DE18 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_00DE18" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00DE18[] = dnakaniwa_room_0Tex_00DE18; - -#define dnakaniwa_room_0Tex_008418 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_008418" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_008418[] = dnakaniwa_room_0Tex_008418; - -#define dnakaniwa_room_0Tex_008218 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_008218" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_008218[] = dnakaniwa_room_0Tex_008218; - -#define dnakaniwa_room_0Tex_007618 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_007618" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_007618[] = dnakaniwa_room_0Tex_007618; - -#define dnakaniwa_room_0Tex_007418 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_007418" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_007418[] = dnakaniwa_room_0Tex_007418; - -#define dnakaniwa_room_0Tex_007218 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_007218" +#define dnakaniwa_room_0Tex_007218 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_007218" static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_007218[] = dnakaniwa_room_0Tex_007218; -#define dnakaniwa_room_0Tex_007A18 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_007A18" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_007A18[] = dnakaniwa_room_0Tex_007A18; +#define dnakaniwa_room_0Tex_007418 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_007418" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_007418[] = dnakaniwa_room_0Tex_007418; -#define dnakaniwa_room_0Tex_008618 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_008618" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_008618[] = dnakaniwa_room_0Tex_008618; +#define dnakaniwa_room_0Tex_007618 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_007618" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_007618[] = dnakaniwa_room_0Tex_007618; -#define dnakaniwa_room_0Tex_007818 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_007818" +#define dnakaniwa_room_0Tex_007818 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_007818" static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_007818[] = dnakaniwa_room_0Tex_007818; -#define dnakaniwa_room_0Tex_009E18 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_009E18" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_009E18[] = dnakaniwa_room_0Tex_009E18; +#define dnakaniwa_room_0Tex_007A18 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_007A18" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_007A18[] = dnakaniwa_room_0Tex_007A18; -#define dnakaniwa_room_0Tex_00E618 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_00E618" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00E618[] = dnakaniwa_room_0Tex_00E618; +#define dnakaniwa_room_0Tex_008218 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_008218" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_008218[] = dnakaniwa_room_0Tex_008218; -#define dnakaniwa_room_0Tex_013618 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_013618" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_013618[] = dnakaniwa_room_0Tex_013618; +#define dnakaniwa_room_0Tex_008418 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_008418" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_008418[] = dnakaniwa_room_0Tex_008418; -#define dnakaniwa_room_0Tex_011618 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_011618" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_011618[] = dnakaniwa_room_0Tex_011618; +#define dnakaniwa_room_0Tex_008618 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_008618" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_008618[] = dnakaniwa_room_0Tex_008618; -#define dnakaniwa_room_0Tex_013E18 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_013E18" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_013E18[] = dnakaniwa_room_0Tex_013E18; - -#define dnakaniwa_room_0Tex_010E18 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_010E18" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_010E18[] = dnakaniwa_room_0Tex_010E18; - -#define dnakaniwa_room_0Tex_012E18 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_012E18" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_012E18[] = dnakaniwa_room_0Tex_012E18; - -#define dnakaniwa_room_0Tex_00B618 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_00B618" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00B618[] = dnakaniwa_room_0Tex_00B618; - -#define dnakaniwa_room_0Tex_00A618 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_00A618" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00A618[] = dnakaniwa_room_0Tex_00A618; - -#define dnakaniwa_room_0Tex_008E18 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_008E18" +#define dnakaniwa_room_0Tex_008E18 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_008E18" static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_008E18[] = dnakaniwa_room_0Tex_008E18; -#define dnakaniwa_room_0DL_014E98 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0DL_014E98" -static const ALIGN_ASSET(2) char nakaniwa_room_0DL_014E98[] = dnakaniwa_room_0DL_014E98; +#define dnakaniwa_room_0Tex_009E18 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_009E18" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_009E18[] = dnakaniwa_room_0Tex_009E18; -#define dnakaniwa_room_0Tex_0166C0 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_0166C0" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_0166C0[] = dnakaniwa_room_0Tex_0166C0; +#define dnakaniwa_room_0Tex_00A618 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_00A618" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00A618[] = dnakaniwa_room_0Tex_00A618; -#define dnakaniwa_room_0Tex_016EC0 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_016EC0" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_016EC0[] = dnakaniwa_room_0Tex_016EC0; +#define dnakaniwa_room_0Tex_00B618 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_00B618" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00B618[] = dnakaniwa_room_0Tex_00B618; -#define dnakaniwa_room_0Tex_0156C0 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_0156C0" -static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_0156C0[] = dnakaniwa_room_0Tex_0156C0; +#define dnakaniwa_room_0Tex_00C618 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_00C618" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00C618[] = dnakaniwa_room_0Tex_00C618; -#define dnakaniwa_room_0Tex_014EC0 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_014EC0" +#define dnakaniwa_room_0Tex_00CE18 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_00CE18" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00CE18[] = dnakaniwa_room_0Tex_00CE18; + +#define dnakaniwa_room_0Tex_00DE18 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_00DE18" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00DE18[] = dnakaniwa_room_0Tex_00DE18; + +#define dnakaniwa_room_0Tex_00E618 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_00E618" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00E618[] = dnakaniwa_room_0Tex_00E618; + +#define dnakaniwa_room_0Tex_00EE18 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_00EE18" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00EE18[] = dnakaniwa_room_0Tex_00EE18; + +#define dnakaniwa_room_0Tex_00F618 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_00F618" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00F618[] = dnakaniwa_room_0Tex_00F618; + +#define dnakaniwa_room_0Tex_00FE18 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_00FE18" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00FE18[] = dnakaniwa_room_0Tex_00FE18; + +#define dnakaniwa_room_0Tex_010618 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_010618" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_010618[] = dnakaniwa_room_0Tex_010618; + +#define dnakaniwa_room_0Tex_010E18 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_010E18" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_010E18[] = dnakaniwa_room_0Tex_010E18; + +#define dnakaniwa_room_0Tex_011618 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_011618" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_011618[] = dnakaniwa_room_0Tex_011618; + +#define dnakaniwa_room_0Tex_011E18 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_011E18" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_011E18[] = dnakaniwa_room_0Tex_011E18; + +#define dnakaniwa_room_0Tex_012618 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_012618" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_012618[] = dnakaniwa_room_0Tex_012618; + +#define dnakaniwa_room_0Tex_012E18 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_012E18" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_012E18[] = dnakaniwa_room_0Tex_012E18; + +#define dnakaniwa_room_0Tex_013618 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_013618" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_013618[] = dnakaniwa_room_0Tex_013618; + +#define dnakaniwa_room_0Tex_013E18 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_013E18" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_013E18[] = dnakaniwa_room_0Tex_013E18; + +#define dnakaniwa_room_0Tex_014EC0 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_014EC0" static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_014EC0[] = dnakaniwa_room_0Tex_014EC0; -#define dnakaniwa_room_0Set_000120DL_007178 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Set_000120DL_007178" +#define dnakaniwa_room_0Tex_0156C0 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_0156C0" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_0156C0[] = dnakaniwa_room_0Tex_0156C0; + +#define dnakaniwa_room_0Tex_0166C0 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_0166C0" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_0166C0[] = dnakaniwa_room_0Tex_0166C0; + +#define dnakaniwa_room_0Tex_016EC0 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_016EC0" +static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_016EC0[] = dnakaniwa_room_0Tex_016EC0; + +#define dnakaniwa_room_0DL_007178 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0DL_007178" +static const ALIGN_ASSET(2) char nakaniwa_room_0DL_007178[] = dnakaniwa_room_0DL_007178; + +#define dnakaniwa_room_0DL_014E98 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0DL_014E98" +static const ALIGN_ASSET(2) char nakaniwa_room_0DL_014E98[] = dnakaniwa_room_0DL_014E98; + +#define dnakaniwa_room_0Set_000120DL_007178 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Set_000120DL_007178" static const ALIGN_ASSET(2) char nakaniwa_room_0Set_000120DL_007178[] = dnakaniwa_room_0Set_000120DL_007178; -#define dnakaniwa_room_0Set_000120DL_014E98 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Set_000120DL_014E98" +#define dnakaniwa_room_0Set_000120DL_014E98 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Set_000120DL_014E98" static const ALIGN_ASSET(2) char nakaniwa_room_0Set_000120DL_014E98[] = dnakaniwa_room_0Set_000120DL_014E98; -#define dnakaniwa_room_0Set_0001B0DL_007178 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Set_0001B0DL_007178" +#define dnakaniwa_room_0Set_0001B0DL_007178 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Set_0001B0DL_007178" static const ALIGN_ASSET(2) char nakaniwa_room_0Set_0001B0DL_007178[] = dnakaniwa_room_0Set_0001B0DL_007178; -#define dnakaniwa_room_0Set_0001B0DL_014E98 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Set_0001B0DL_014E98" +#define dnakaniwa_room_0Set_0001B0DL_014E98 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Set_0001B0DL_014E98" static const ALIGN_ASSET(2) char nakaniwa_room_0Set_0001B0DL_014E98[] = dnakaniwa_room_0Set_0001B0DL_014E98; -#define dnakaniwa_room_0Set_000240DL_007178 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Set_000240DL_007178" +#define dnakaniwa_room_0Set_000240DL_007178 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Set_000240DL_007178" static const ALIGN_ASSET(2) char nakaniwa_room_0Set_000240DL_007178[] = dnakaniwa_room_0Set_000240DL_007178; -#define dnakaniwa_room_0Set_000240DL_014E98 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Set_000240DL_014E98" +#define dnakaniwa_room_0Set_000240DL_014E98 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Set_000240DL_014E98" static const ALIGN_ASSET(2) char nakaniwa_room_0Set_000240DL_014E98[] = dnakaniwa_room_0Set_000240DL_014E98; diff --git a/soh/assets/scenes/indoors/nakaniwa/nakaniwa_scene.h b/soh/assets/scenes/indoors/nakaniwa/nakaniwa_scene.h index c5884e2a6..2bb9ec106 100644 --- a/soh/assets/scenes/indoors/nakaniwa/nakaniwa_scene.h +++ b/soh/assets/scenes/indoors/nakaniwa/nakaniwa_scene.h @@ -3,26 +3,26 @@ #include "align_asset_macro.h" -#define dgZeldasCourtyardGanonCs "__OTR__scenes/nonmq/nakaniwa_scene/gZeldasCourtyardGanonCs" +#define dgZeldasCourtyardGanonCs "__OTR__scenes/shared/nakaniwa_scene/gZeldasCourtyardGanonCs" static const ALIGN_ASSET(2) char gZeldasCourtyardGanonCs[] = dgZeldasCourtyardGanonCs; -#define dgZeldasCourtyardWindowCs "__OTR__scenes/nonmq/nakaniwa_scene/gZeldasCourtyardWindowCs" +#define dgZeldasCourtyardWindowCs "__OTR__scenes/shared/nakaniwa_scene/gZeldasCourtyardWindowCs" static const ALIGN_ASSET(2) char gZeldasCourtyardWindowCs[] = dgZeldasCourtyardWindowCs; -#define dgZeldasCourtyardMeetCs "__OTR__scenes/nonmq/nakaniwa_scene/gZeldasCourtyardMeetCs" +#define dgZeldasCourtyardMeetCs "__OTR__scenes/shared/nakaniwa_scene/gZeldasCourtyardMeetCs" static const ALIGN_ASSET(2) char gZeldasCourtyardMeetCs[] = dgZeldasCourtyardMeetCs; -#define dgZeldasCourtyardLullabyCs "__OTR__scenes/nonmq/nakaniwa_scene/gZeldasCourtyardLullabyCs" +#define dgZeldasCourtyardLullabyCs "__OTR__scenes/shared/nakaniwa_scene/gZeldasCourtyardLullabyCs" static const ALIGN_ASSET(2) char gZeldasCourtyardLullabyCs[] = dgZeldasCourtyardLullabyCs; -#define dnakaniwa_sceneCollisionHeader_001BC8 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_sceneCollisionHeader_001BC8" +#define dnakaniwa_sceneCollisionHeader_001BC8 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_sceneCollisionHeader_001BC8" static const ALIGN_ASSET(2) char nakaniwa_sceneCollisionHeader_001BC8[] = dnakaniwa_sceneCollisionHeader_001BC8; -#define dnakaniwa_sceneCollisionHeader_001BC8 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_sceneCollisionHeader_001BC8" +#define dnakaniwa_sceneCollisionHeader_001BC8 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_sceneCollisionHeader_001BC8" -#define dnakaniwa_sceneCollisionHeader_001BC8 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_sceneCollisionHeader_001BC8" +#define dnakaniwa_sceneCollisionHeader_001BC8 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_sceneCollisionHeader_001BC8" -#define dnakaniwa_sceneCollisionHeader_001BC8 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_sceneCollisionHeader_001BC8" +#define dnakaniwa_sceneCollisionHeader_001BC8 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_sceneCollisionHeader_001BC8" #endif // INDOORS_NAKANIWA_SCENE_H diff --git a/soh/assets/scenes/indoors/syatekijyou/syatekijyou_room_0.h b/soh/assets/scenes/indoors/syatekijyou/syatekijyou_room_0.h index 71a9cc181..b7cd4bbea 100644 --- a/soh/assets/scenes/indoors/syatekijyou/syatekijyou_room_0.h +++ b/soh/assets/scenes/indoors/syatekijyou/syatekijyou_room_0.h @@ -3,28 +3,28 @@ #include "align_asset_macro.h" -#define dsyatekijyou_room_0DL_006548 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_room_0DL_006548" +#define dsyatekijyou_room_0DL_006548 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_room_0DL_006548" static const ALIGN_ASSET(2) char syatekijyou_room_0DL_006548[] = dsyatekijyou_room_0DL_006548; -#define dsyatekijyou_room_0DL_0076D8 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_room_0DL_0076D8" +#define dsyatekijyou_room_0DL_0076D8 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_room_0DL_0076D8" static const ALIGN_ASSET(2) char syatekijyou_room_0DL_0076D8[] = dsyatekijyou_room_0DL_0076D8; -#define dsyatekijyou_room_0Set_0000C0DL_006548 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_room_0Set_0000C0DL_006548" +#define dsyatekijyou_room_0Set_0000C0DL_006548 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_room_0Set_0000C0DL_006548" static const ALIGN_ASSET(2) char syatekijyou_room_0Set_0000C0DL_006548[] = dsyatekijyou_room_0Set_0000C0DL_006548; -#define dsyatekijyou_room_0Set_0000C0DL_0076D8 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_room_0Set_0000C0DL_0076D8" +#define dsyatekijyou_room_0Set_0000C0DL_0076D8 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_room_0Set_0000C0DL_0076D8" static const ALIGN_ASSET(2) char syatekijyou_room_0Set_0000C0DL_0076D8[] = dsyatekijyou_room_0Set_0000C0DL_0076D8; -#define dsyatekijyou_room_0Set_0000F0DL_006548 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_room_0Set_0000F0DL_006548" +#define dsyatekijyou_room_0Set_0000F0DL_006548 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_room_0Set_0000F0DL_006548" static const ALIGN_ASSET(2) char syatekijyou_room_0Set_0000F0DL_006548[] = dsyatekijyou_room_0Set_0000F0DL_006548; -#define dsyatekijyou_room_0Set_0000F0DL_0076D8 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_room_0Set_0000F0DL_0076D8" +#define dsyatekijyou_room_0Set_0000F0DL_0076D8 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_room_0Set_0000F0DL_0076D8" static const ALIGN_ASSET(2) char syatekijyou_room_0Set_0000F0DL_0076D8[] = dsyatekijyou_room_0Set_0000F0DL_0076D8; -#define dsyatekijyou_room_0Set_0001A0DL_006548 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_room_0Set_0001A0DL_006548" +#define dsyatekijyou_room_0Set_0001A0DL_006548 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_room_0Set_0001A0DL_006548" static const ALIGN_ASSET(2) char syatekijyou_room_0Set_0001A0DL_006548[] = dsyatekijyou_room_0Set_0001A0DL_006548; -#define dsyatekijyou_room_0Set_0001A0DL_0076D8 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_room_0Set_0001A0DL_0076D8" +#define dsyatekijyou_room_0Set_0001A0DL_0076D8 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_room_0Set_0001A0DL_0076D8" static const ALIGN_ASSET(2) char syatekijyou_room_0Set_0001A0DL_0076D8[] = dsyatekijyou_room_0Set_0001A0DL_0076D8; diff --git a/soh/assets/scenes/indoors/syatekijyou/syatekijyou_scene.h b/soh/assets/scenes/indoors/syatekijyou/syatekijyou_scene.h index 212daef49..1660bad47 100644 --- a/soh/assets/scenes/indoors/syatekijyou/syatekijyou_scene.h +++ b/soh/assets/scenes/indoors/syatekijyou/syatekijyou_scene.h @@ -3,80 +3,80 @@ #include "align_asset_macro.h" -#define dsyatekijyou_sceneCollisionHeader_001420 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneCollisionHeader_001420" -static const ALIGN_ASSET(2) char syatekijyou_sceneCollisionHeader_001420[] = dsyatekijyou_sceneCollisionHeader_001420; - -#define dsyatekijyou_sceneTex_00A4C0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_00A4C0" -static const ALIGN_ASSET(2) char syatekijyou_sceneTex_00A4C0[] = dsyatekijyou_sceneTex_00A4C0; - -#define dsyatekijyou_sceneTex_002740 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_002740" -static const ALIGN_ASSET(2) char syatekijyou_sceneTex_002740[] = dsyatekijyou_sceneTex_002740; - -#define dsyatekijyou_sceneTex_006CC0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_006CC0" -static const ALIGN_ASSET(2) char syatekijyou_sceneTex_006CC0[] = dsyatekijyou_sceneTex_006CC0; - -#define dsyatekijyou_sceneTex_00B2C0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_00B2C0" -static const ALIGN_ASSET(2) char syatekijyou_sceneTex_00B2C0[] = dsyatekijyou_sceneTex_00B2C0; - -#define dsyatekijyou_sceneTex_00B0C0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_00B0C0" -static const ALIGN_ASSET(2) char syatekijyou_sceneTex_00B0C0[] = dsyatekijyou_sceneTex_00B0C0; - -#define dsyatekijyou_sceneTex_0054C0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_0054C0" -static const ALIGN_ASSET(2) char syatekijyou_sceneTex_0054C0[] = dsyatekijyou_sceneTex_0054C0; - -#define dsyatekijyou_sceneTex_005CC0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_005CC0" -static const ALIGN_ASSET(2) char syatekijyou_sceneTex_005CC0[] = dsyatekijyou_sceneTex_005CC0; - -#define dsyatekijyou_sceneTex_0041C0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_0041C0" -static const ALIGN_ASSET(2) char syatekijyou_sceneTex_0041C0[] = dsyatekijyou_sceneTex_0041C0; - -#define dsyatekijyou_sceneTex_003DC0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_003DC0" -static const ALIGN_ASSET(2) char syatekijyou_sceneTex_003DC0[] = dsyatekijyou_sceneTex_003DC0; - -#define dsyatekijyou_sceneTex_001D40 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_001D40" -static const ALIGN_ASSET(2) char syatekijyou_sceneTex_001D40[] = dsyatekijyou_sceneTex_001D40; - -#define dsyatekijyou_sceneTex_001C40 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_001C40" +#define dsyatekijyou_sceneTex_001C40 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_001C40" static const ALIGN_ASSET(2) char syatekijyou_sceneTex_001C40[] = dsyatekijyou_sceneTex_001C40; -#define dsyatekijyou_sceneTex_002140 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_002140" +#define dsyatekijyou_sceneTex_001D40 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_001D40" +static const ALIGN_ASSET(2) char syatekijyou_sceneTex_001D40[] = dsyatekijyou_sceneTex_001D40; + +#define dsyatekijyou_sceneTex_002140 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_002140" static const ALIGN_ASSET(2) char syatekijyou_sceneTex_002140[] = dsyatekijyou_sceneTex_002140; -#define dsyatekijyou_sceneTex_003940 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_003940" -static const ALIGN_ASSET(2) char syatekijyou_sceneTex_003940[] = dsyatekijyou_sceneTex_003940; - -#define dsyatekijyou_sceneTex_008CC0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_008CC0" -static const ALIGN_ASSET(2) char syatekijyou_sceneTex_008CC0[] = dsyatekijyou_sceneTex_008CC0; - -#define dsyatekijyou_sceneTex_007CC0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_007CC0" -static const ALIGN_ASSET(2) char syatekijyou_sceneTex_007CC0[] = dsyatekijyou_sceneTex_007CC0; - -#define dsyatekijyou_sceneTex_0051C0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_0051C0" -static const ALIGN_ASSET(2) char syatekijyou_sceneTex_0051C0[] = dsyatekijyou_sceneTex_0051C0; - -#define dsyatekijyou_sceneTex_0052C0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_0052C0" -static const ALIGN_ASSET(2) char syatekijyou_sceneTex_0052C0[] = dsyatekijyou_sceneTex_0052C0; - -#define dsyatekijyou_sceneTex_009CC0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_009CC0" -static const ALIGN_ASSET(2) char syatekijyou_sceneTex_009CC0[] = dsyatekijyou_sceneTex_009CC0; - -#define dsyatekijyou_sceneTex_002540 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_002540" +#define dsyatekijyou_sceneTex_002540 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_002540" static const ALIGN_ASSET(2) char syatekijyou_sceneTex_002540[] = dsyatekijyou_sceneTex_002540; -#define dsyatekijyou_sceneTex_0039C0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_0039C0" -static const ALIGN_ASSET(2) char syatekijyou_sceneTex_0039C0[] = dsyatekijyou_sceneTex_0039C0; +#define dsyatekijyou_sceneTex_002740 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_002740" +static const ALIGN_ASSET(2) char syatekijyou_sceneTex_002740[] = dsyatekijyou_sceneTex_002740; -#define dsyatekijyou_sceneTex_00ACC0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_00ACC0" -static const ALIGN_ASSET(2) char syatekijyou_sceneTex_00ACC0[] = dsyatekijyou_sceneTex_00ACC0; - -#define dsyatekijyou_sceneTex_003740 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_003740" +#define dsyatekijyou_sceneTex_003740 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_003740" static const ALIGN_ASSET(2) char syatekijyou_sceneTex_003740[] = dsyatekijyou_sceneTex_003740; -#define dsyatekijyou_sceneCollisionHeader_001420 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneCollisionHeader_001420" +#define dsyatekijyou_sceneTex_003940 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_003940" +static const ALIGN_ASSET(2) char syatekijyou_sceneTex_003940[] = dsyatekijyou_sceneTex_003940; -#define dsyatekijyou_sceneCollisionHeader_001420 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneCollisionHeader_001420" +#define dsyatekijyou_sceneTex_0039C0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_0039C0" +static const ALIGN_ASSET(2) char syatekijyou_sceneTex_0039C0[] = dsyatekijyou_sceneTex_0039C0; -#define dsyatekijyou_sceneCollisionHeader_001420 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneCollisionHeader_001420" +#define dsyatekijyou_sceneTex_003DC0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_003DC0" +static const ALIGN_ASSET(2) char syatekijyou_sceneTex_003DC0[] = dsyatekijyou_sceneTex_003DC0; + +#define dsyatekijyou_sceneTex_0041C0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_0041C0" +static const ALIGN_ASSET(2) char syatekijyou_sceneTex_0041C0[] = dsyatekijyou_sceneTex_0041C0; + +#define dsyatekijyou_sceneTex_0051C0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_0051C0" +static const ALIGN_ASSET(2) char syatekijyou_sceneTex_0051C0[] = dsyatekijyou_sceneTex_0051C0; + +#define dsyatekijyou_sceneTex_0052C0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_0052C0" +static const ALIGN_ASSET(2) char syatekijyou_sceneTex_0052C0[] = dsyatekijyou_sceneTex_0052C0; + +#define dsyatekijyou_sceneTex_0054C0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_0054C0" +static const ALIGN_ASSET(2) char syatekijyou_sceneTex_0054C0[] = dsyatekijyou_sceneTex_0054C0; + +#define dsyatekijyou_sceneTex_005CC0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_005CC0" +static const ALIGN_ASSET(2) char syatekijyou_sceneTex_005CC0[] = dsyatekijyou_sceneTex_005CC0; + +#define dsyatekijyou_sceneTex_006CC0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_006CC0" +static const ALIGN_ASSET(2) char syatekijyou_sceneTex_006CC0[] = dsyatekijyou_sceneTex_006CC0; + +#define dsyatekijyou_sceneTex_007CC0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_007CC0" +static const ALIGN_ASSET(2) char syatekijyou_sceneTex_007CC0[] = dsyatekijyou_sceneTex_007CC0; + +#define dsyatekijyou_sceneTex_008CC0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_008CC0" +static const ALIGN_ASSET(2) char syatekijyou_sceneTex_008CC0[] = dsyatekijyou_sceneTex_008CC0; + +#define dsyatekijyou_sceneTex_009CC0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_009CC0" +static const ALIGN_ASSET(2) char syatekijyou_sceneTex_009CC0[] = dsyatekijyou_sceneTex_009CC0; + +#define dsyatekijyou_sceneTex_00A4C0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_00A4C0" +static const ALIGN_ASSET(2) char syatekijyou_sceneTex_00A4C0[] = dsyatekijyou_sceneTex_00A4C0; + +#define dsyatekijyou_sceneTex_00ACC0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_00ACC0" +static const ALIGN_ASSET(2) char syatekijyou_sceneTex_00ACC0[] = dsyatekijyou_sceneTex_00ACC0; + +#define dsyatekijyou_sceneTex_00B0C0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_00B0C0" +static const ALIGN_ASSET(2) char syatekijyou_sceneTex_00B0C0[] = dsyatekijyou_sceneTex_00B0C0; + +#define dsyatekijyou_sceneTex_00B2C0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_00B2C0" +static const ALIGN_ASSET(2) char syatekijyou_sceneTex_00B2C0[] = dsyatekijyou_sceneTex_00B2C0; + +#define dsyatekijyou_sceneCollisionHeader_001420 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneCollisionHeader_001420" +static const ALIGN_ASSET(2) char syatekijyou_sceneCollisionHeader_001420[] = dsyatekijyou_sceneCollisionHeader_001420; + +#define dsyatekijyou_sceneCollisionHeader_001420 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneCollisionHeader_001420" + +#define dsyatekijyou_sceneCollisionHeader_001420 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneCollisionHeader_001420" + +#define dsyatekijyou_sceneCollisionHeader_001420 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneCollisionHeader_001420" #endif // INDOORS_SYATEKIJYOU_SCENE_H diff --git a/soh/assets/scenes/indoors/takaraya/takaraya_room_0.h b/soh/assets/scenes/indoors/takaraya/takaraya_room_0.h index 22aef3938..258e04cee 100644 --- a/soh/assets/scenes/indoors/takaraya/takaraya_room_0.h +++ b/soh/assets/scenes/indoors/takaraya/takaraya_room_0.h @@ -3,41 +3,41 @@ #include "align_asset_macro.h" -#define dtakaraya_room_0DL_003B98 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0DL_003B98" -static const ALIGN_ASSET(2) char takaraya_room_0DL_003B98[] = dtakaraya_room_0DL_003B98; - -#define dtakaraya_room_0Tex_0083E0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_0083E0" -static const ALIGN_ASSET(2) char takaraya_room_0Tex_0083E0[] = dtakaraya_room_0Tex_0083E0; - -#define dtakaraya_room_0Tex_005BE0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_005BE0" -static const ALIGN_ASSET(2) char takaraya_room_0Tex_005BE0[] = dtakaraya_room_0Tex_005BE0; - -#define dtakaraya_room_0Tex_0073E0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_0073E0" -static const ALIGN_ASSET(2) char takaraya_room_0Tex_0073E0[] = dtakaraya_room_0Tex_0073E0; - -#define dtakaraya_room_0Tex_006BE0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_006BE0" -static const ALIGN_ASSET(2) char takaraya_room_0Tex_006BE0[] = dtakaraya_room_0Tex_006BE0; - -#define dtakaraya_room_0Tex_004BE0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_004BE0" -static const ALIGN_ASSET(2) char takaraya_room_0Tex_004BE0[] = dtakaraya_room_0Tex_004BE0; - -#define dtakaraya_room_0Tex_0043E0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_0043E0" -static const ALIGN_ASSET(2) char takaraya_room_0Tex_0043E0[] = dtakaraya_room_0Tex_0043E0; - -#define dtakaraya_room_0Tex_003BE0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_003BE0" +#define dtakaraya_room_0Tex_003BE0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_003BE0" static const ALIGN_ASSET(2) char takaraya_room_0Tex_003BE0[] = dtakaraya_room_0Tex_003BE0; -#define dtakaraya_room_0Tex_007BE0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_007BE0" -static const ALIGN_ASSET(2) char takaraya_room_0Tex_007BE0[] = dtakaraya_room_0Tex_007BE0; +#define dtakaraya_room_0Tex_0043E0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_0043E0" +static const ALIGN_ASSET(2) char takaraya_room_0Tex_0043E0[] = dtakaraya_room_0Tex_0043E0; -#define dtakaraya_room_0Tex_0063E0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_0063E0" +#define dtakaraya_room_0Tex_004BE0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_004BE0" +static const ALIGN_ASSET(2) char takaraya_room_0Tex_004BE0[] = dtakaraya_room_0Tex_004BE0; + +#define dtakaraya_room_0Tex_005BE0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_005BE0" +static const ALIGN_ASSET(2) char takaraya_room_0Tex_005BE0[] = dtakaraya_room_0Tex_005BE0; + +#define dtakaraya_room_0Tex_0063E0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_0063E0" static const ALIGN_ASSET(2) char takaraya_room_0Tex_0063E0[] = dtakaraya_room_0Tex_0063E0; -#define dtakaraya_room_0DL_0095B0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0DL_0095B0" -static const ALIGN_ASSET(2) char takaraya_room_0DL_0095B0[] = dtakaraya_room_0DL_0095B0; +#define dtakaraya_room_0Tex_006BE0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_006BE0" +static const ALIGN_ASSET(2) char takaraya_room_0Tex_006BE0[] = dtakaraya_room_0Tex_006BE0; -#define dtakaraya_room_0Tex_0095C0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_0095C0" +#define dtakaraya_room_0Tex_0073E0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_0073E0" +static const ALIGN_ASSET(2) char takaraya_room_0Tex_0073E0[] = dtakaraya_room_0Tex_0073E0; + +#define dtakaraya_room_0Tex_007BE0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_007BE0" +static const ALIGN_ASSET(2) char takaraya_room_0Tex_007BE0[] = dtakaraya_room_0Tex_007BE0; + +#define dtakaraya_room_0Tex_0083E0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_0083E0" +static const ALIGN_ASSET(2) char takaraya_room_0Tex_0083E0[] = dtakaraya_room_0Tex_0083E0; + +#define dtakaraya_room_0Tex_0095C0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_0095C0" static const ALIGN_ASSET(2) char takaraya_room_0Tex_0095C0[] = dtakaraya_room_0Tex_0095C0; +#define dtakaraya_room_0DL_003B98 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0DL_003B98" +static const ALIGN_ASSET(2) char takaraya_room_0DL_003B98[] = dtakaraya_room_0DL_003B98; + +#define dtakaraya_room_0DL_0095B0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0DL_0095B0" +static const ALIGN_ASSET(2) char takaraya_room_0DL_0095B0[] = dtakaraya_room_0DL_0095B0; + #endif // INDOORS_TAKARAYA_ROOM_0_H diff --git a/soh/assets/scenes/indoors/takaraya/takaraya_room_1.h b/soh/assets/scenes/indoors/takaraya/takaraya_room_1.h index b66f0c5eb..75ed6ac62 100644 --- a/soh/assets/scenes/indoors/takaraya/takaraya_room_1.h +++ b/soh/assets/scenes/indoors/takaraya/takaraya_room_1.h @@ -3,11 +3,11 @@ #include "align_asset_macro.h" -#define dtakaraya_room_1DL_0017D0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_1DL_0017D0" -static const ALIGN_ASSET(2) char takaraya_room_1DL_0017D0[] = dtakaraya_room_1DL_0017D0; - -#define dtakaraya_room_1Tex_0017F8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_1Tex_0017F8" +#define dtakaraya_room_1Tex_0017F8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_1Tex_0017F8" static const ALIGN_ASSET(2) char takaraya_room_1Tex_0017F8[] = dtakaraya_room_1Tex_0017F8; +#define dtakaraya_room_1DL_0017D0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_1DL_0017D0" +static const ALIGN_ASSET(2) char takaraya_room_1DL_0017D0[] = dtakaraya_room_1DL_0017D0; + #endif // INDOORS_TAKARAYA_ROOM_1_H diff --git a/soh/assets/scenes/indoors/takaraya/takaraya_room_2.h b/soh/assets/scenes/indoors/takaraya/takaraya_room_2.h index 74f70e05b..8aae7695e 100644 --- a/soh/assets/scenes/indoors/takaraya/takaraya_room_2.h +++ b/soh/assets/scenes/indoors/takaraya/takaraya_room_2.h @@ -3,11 +3,11 @@ #include "align_asset_macro.h" -#define dtakaraya_room_2DL_001800 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_2DL_001800" -static const ALIGN_ASSET(2) char takaraya_room_2DL_001800[] = dtakaraya_room_2DL_001800; - -#define dtakaraya_room_2Tex_001828 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_2Tex_001828" +#define dtakaraya_room_2Tex_001828 "__OTR__scenes/shared/takaraya_scene/takaraya_room_2Tex_001828" static const ALIGN_ASSET(2) char takaraya_room_2Tex_001828[] = dtakaraya_room_2Tex_001828; +#define dtakaraya_room_2DL_001800 "__OTR__scenes/shared/takaraya_scene/takaraya_room_2DL_001800" +static const ALIGN_ASSET(2) char takaraya_room_2DL_001800[] = dtakaraya_room_2DL_001800; + #endif // INDOORS_TAKARAYA_ROOM_2_H diff --git a/soh/assets/scenes/indoors/takaraya/takaraya_room_3.h b/soh/assets/scenes/indoors/takaraya/takaraya_room_3.h index edd0d0246..831ec4814 100644 --- a/soh/assets/scenes/indoors/takaraya/takaraya_room_3.h +++ b/soh/assets/scenes/indoors/takaraya/takaraya_room_3.h @@ -3,14 +3,14 @@ #include "align_asset_macro.h" -#define dtakaraya_room_3DL_0017F0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_3DL_0017F0" -static const ALIGN_ASSET(2) char takaraya_room_3DL_0017F0[] = dtakaraya_room_3DL_0017F0; +#define dtakaraya_room_3Tex_001818 "__OTR__scenes/shared/takaraya_scene/takaraya_room_3Tex_001818" +static const ALIGN_ASSET(2) char takaraya_room_3Tex_001818[] = dtakaraya_room_3Tex_001818; -#define dtakaraya_room_3Tex_002018 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_3Tex_002018" +#define dtakaraya_room_3Tex_002018 "__OTR__scenes/shared/takaraya_scene/takaraya_room_3Tex_002018" static const ALIGN_ASSET(2) char takaraya_room_3Tex_002018[] = dtakaraya_room_3Tex_002018; -#define dtakaraya_room_3Tex_001818 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_3Tex_001818" -static const ALIGN_ASSET(2) char takaraya_room_3Tex_001818[] = dtakaraya_room_3Tex_001818; +#define dtakaraya_room_3DL_0017F0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_3DL_0017F0" +static const ALIGN_ASSET(2) char takaraya_room_3DL_0017F0[] = dtakaraya_room_3DL_0017F0; #endif // INDOORS_TAKARAYA_ROOM_3_H diff --git a/soh/assets/scenes/indoors/takaraya/takaraya_room_4.h b/soh/assets/scenes/indoors/takaraya/takaraya_room_4.h index 4052ba32b..2627da1e6 100644 --- a/soh/assets/scenes/indoors/takaraya/takaraya_room_4.h +++ b/soh/assets/scenes/indoors/takaraya/takaraya_room_4.h @@ -3,17 +3,17 @@ #include "align_asset_macro.h" -#define dtakaraya_room_4DL_0017F8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_4DL_0017F8" -static const ALIGN_ASSET(2) char takaraya_room_4DL_0017F8[] = dtakaraya_room_4DL_0017F8; +#define dtakaraya_room_4Tex_001820 "__OTR__scenes/shared/takaraya_scene/takaraya_room_4Tex_001820" +static const ALIGN_ASSET(2) char takaraya_room_4Tex_001820[] = dtakaraya_room_4Tex_001820; -#define dtakaraya_room_4Tex_002020 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_4Tex_002020" +#define dtakaraya_room_4Tex_002020 "__OTR__scenes/shared/takaraya_scene/takaraya_room_4Tex_002020" static const ALIGN_ASSET(2) char takaraya_room_4Tex_002020[] = dtakaraya_room_4Tex_002020; -#define dtakaraya_room_4Tex_002820 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_4Tex_002820" +#define dtakaraya_room_4Tex_002820 "__OTR__scenes/shared/takaraya_scene/takaraya_room_4Tex_002820" static const ALIGN_ASSET(2) char takaraya_room_4Tex_002820[] = dtakaraya_room_4Tex_002820; -#define dtakaraya_room_4Tex_001820 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_4Tex_001820" -static const ALIGN_ASSET(2) char takaraya_room_4Tex_001820[] = dtakaraya_room_4Tex_001820; +#define dtakaraya_room_4DL_0017F8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_4DL_0017F8" +static const ALIGN_ASSET(2) char takaraya_room_4DL_0017F8[] = dtakaraya_room_4DL_0017F8; #endif // INDOORS_TAKARAYA_ROOM_4_H diff --git a/soh/assets/scenes/indoors/takaraya/takaraya_room_5.h b/soh/assets/scenes/indoors/takaraya/takaraya_room_5.h index 15edb2d8e..79fa4aa76 100644 --- a/soh/assets/scenes/indoors/takaraya/takaraya_room_5.h +++ b/soh/assets/scenes/indoors/takaraya/takaraya_room_5.h @@ -3,17 +3,17 @@ #include "align_asset_macro.h" -#define dtakaraya_room_5DL_0017D0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_5DL_0017D0" -static const ALIGN_ASSET(2) char takaraya_room_5DL_0017D0[] = dtakaraya_room_5DL_0017D0; - -#define dtakaraya_room_5Tex_001FF8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_5Tex_001FF8" -static const ALIGN_ASSET(2) char takaraya_room_5Tex_001FF8[] = dtakaraya_room_5Tex_001FF8; - -#define dtakaraya_room_5Tex_0017F8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_5Tex_0017F8" +#define dtakaraya_room_5Tex_0017F8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_5Tex_0017F8" static const ALIGN_ASSET(2) char takaraya_room_5Tex_0017F8[] = dtakaraya_room_5Tex_0017F8; -#define dtakaraya_room_5Tex_0027F8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_5Tex_0027F8" +#define dtakaraya_room_5Tex_001FF8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_5Tex_001FF8" +static const ALIGN_ASSET(2) char takaraya_room_5Tex_001FF8[] = dtakaraya_room_5Tex_001FF8; + +#define dtakaraya_room_5Tex_0027F8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_5Tex_0027F8" static const ALIGN_ASSET(2) char takaraya_room_5Tex_0027F8[] = dtakaraya_room_5Tex_0027F8; +#define dtakaraya_room_5DL_0017D0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_5DL_0017D0" +static const ALIGN_ASSET(2) char takaraya_room_5DL_0017D0[] = dtakaraya_room_5DL_0017D0; + #endif // INDOORS_TAKARAYA_ROOM_5_H diff --git a/soh/assets/scenes/indoors/takaraya/takaraya_room_6.h b/soh/assets/scenes/indoors/takaraya/takaraya_room_6.h index c15d626e8..24e4115de 100644 --- a/soh/assets/scenes/indoors/takaraya/takaraya_room_6.h +++ b/soh/assets/scenes/indoors/takaraya/takaraya_room_6.h @@ -3,17 +3,17 @@ #include "align_asset_macro.h" -#define dtakaraya_room_6DL_0012D0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_6DL_0012D0" -static const ALIGN_ASSET(2) char takaraya_room_6DL_0012D0[] = dtakaraya_room_6DL_0012D0; - -#define dtakaraya_room_6Tex_0022F8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_6Tex_0022F8" -static const ALIGN_ASSET(2) char takaraya_room_6Tex_0022F8[] = dtakaraya_room_6Tex_0022F8; - -#define dtakaraya_room_6Tex_0012F8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_6Tex_0012F8" +#define dtakaraya_room_6Tex_0012F8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_6Tex_0012F8" static const ALIGN_ASSET(2) char takaraya_room_6Tex_0012F8[] = dtakaraya_room_6Tex_0012F8; -#define dtakaraya_room_6Tex_001AF8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_6Tex_001AF8" +#define dtakaraya_room_6Tex_001AF8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_6Tex_001AF8" static const ALIGN_ASSET(2) char takaraya_room_6Tex_001AF8[] = dtakaraya_room_6Tex_001AF8; +#define dtakaraya_room_6Tex_0022F8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_6Tex_0022F8" +static const ALIGN_ASSET(2) char takaraya_room_6Tex_0022F8[] = dtakaraya_room_6Tex_0022F8; + +#define dtakaraya_room_6DL_0012D0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_6DL_0012D0" +static const ALIGN_ASSET(2) char takaraya_room_6DL_0012D0[] = dtakaraya_room_6DL_0012D0; + #endif // INDOORS_TAKARAYA_ROOM_6_H diff --git a/soh/assets/scenes/indoors/takaraya/takaraya_scene.h b/soh/assets/scenes/indoors/takaraya/takaraya_scene.h index 2296cf713..585aa720f 100644 --- a/soh/assets/scenes/indoors/takaraya/takaraya_scene.h +++ b/soh/assets/scenes/indoors/takaraya/takaraya_scene.h @@ -3,19 +3,20 @@ #include "align_asset_macro.h" -#define dtakaraya_sceneCollisionHeader_005178 "__OTR__scenes/nonmq/takaraya_scene/takaraya_sceneCollisionHeader_005178" -static const ALIGN_ASSET(2) char takaraya_sceneCollisionHeader_005178[] = dtakaraya_sceneCollisionHeader_005178; - -#define dtakaraya_sceneTex_0059B0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_sceneTex_0059B0" -static const ALIGN_ASSET(2) char takaraya_sceneTex_0059B0[] = dtakaraya_sceneTex_0059B0; - -#define dtakaraya_sceneTex_0051B0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_sceneTex_0051B0" +#define dtakaraya_sceneTex_0051B0 "__OTR__scenes/shared/takaraya_scene/takaraya_sceneTex_0051B0" static const ALIGN_ASSET(2) char takaraya_sceneTex_0051B0[] = dtakaraya_sceneTex_0051B0; -#define dtakaraya_sceneTex_0069B0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_sceneTex_0069B0" -static const ALIGN_ASSET(2) char takaraya_sceneTex_0069B0[] = dtakaraya_sceneTex_0069B0; +#define dtakaraya_sceneTex_0059B0 "__OTR__scenes/shared/takaraya_scene/takaraya_sceneTex_0059B0" +static const ALIGN_ASSET(2) char takaraya_sceneTex_0059B0[] = dtakaraya_sceneTex_0059B0; -#define dtakaraya_sceneTex_0061B0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_sceneTex_0061B0" +#define dtakaraya_sceneTex_0061B0 "__OTR__scenes/shared/takaraya_scene/takaraya_sceneTex_0061B0" static const ALIGN_ASSET(2) char takaraya_sceneTex_0061B0[] = dtakaraya_sceneTex_0061B0; +#define dtakaraya_sceneTex_0069B0 "__OTR__scenes/shared/takaraya_scene/takaraya_sceneTex_0069B0" +static const ALIGN_ASSET(2) char takaraya_sceneTex_0069B0[] = dtakaraya_sceneTex_0069B0; + +#define dtakaraya_sceneCollisionHeader_005178 "__OTR__scenes/shared/takaraya_scene/takaraya_sceneCollisionHeader_005178" +static const ALIGN_ASSET(2) char takaraya_sceneCollisionHeader_005178[] = dtakaraya_sceneCollisionHeader_005178; + + #endif // INDOORS_TAKARAYA_SCENE_H diff --git a/soh/assets/scenes/indoors/tent/tent_room_0.h b/soh/assets/scenes/indoors/tent/tent_room_0.h index 675c41a39..c361ca4ba 100644 --- a/soh/assets/scenes/indoors/tent/tent_room_0.h +++ b/soh/assets/scenes/indoors/tent/tent_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dtent_room_0DL_00DE30 "__OTR__scenes/nonmq/tent_scene/tent_room_0DL_00DE30" +#define dtent_room_0DL_00DE30 "__OTR__scenes/shared/tent_scene/tent_room_0DL_00DE30" static const ALIGN_ASSET(2) char tent_room_0DL_00DE30[] = dtent_room_0DL_00DE30; diff --git a/soh/assets/scenes/indoors/tent/tent_scene.h b/soh/assets/scenes/indoors/tent/tent_scene.h index 2a01636e4..fd0983180 100644 --- a/soh/assets/scenes/indoors/tent/tent_scene.h +++ b/soh/assets/scenes/indoors/tent/tent_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dtent_sceneCollisionHeader_00064C "__OTR__scenes/nonmq/tent_scene/tent_sceneCollisionHeader_00064C" +#define dtent_sceneCollisionHeader_00064C "__OTR__scenes/shared/tent_scene/tent_sceneCollisionHeader_00064C" static const ALIGN_ASSET(2) char tent_sceneCollisionHeader_00064C[] = dtent_sceneCollisionHeader_00064C; diff --git a/soh/assets/scenes/indoors/tokinoma/tokinoma_room_0.h b/soh/assets/scenes/indoors/tokinoma/tokinoma_room_0.h index d2ac5f07f..0545091c9 100644 --- a/soh/assets/scenes/indoors/tokinoma/tokinoma_room_0.h +++ b/soh/assets/scenes/indoors/tokinoma/tokinoma_room_0.h @@ -3,94 +3,94 @@ #include "align_asset_macro.h" -#define dtokinoma_room_0DL_008128 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0DL_008128" -static const ALIGN_ASSET(2) char tokinoma_room_0DL_008128[] = dtokinoma_room_0DL_008128; - -#define dtokinoma_room_0Tex_0151D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_0151D8" -static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0151D8[] = dtokinoma_room_0Tex_0151D8; - -#define dtokinoma_room_0Tex_0169D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_0169D8" -static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0169D8[] = dtokinoma_room_0Tex_0169D8; - -#define dtokinoma_room_0Tex_0149D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_0149D8" -static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0149D8[] = dtokinoma_room_0Tex_0149D8; - -#define dtokinoma_room_0Tex_0161D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_0161D8" -static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0161D8[] = dtokinoma_room_0Tex_0161D8; - -#define dtokinoma_room_0Tex_0141D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_0141D8" -static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0141D8[] = dtokinoma_room_0Tex_0141D8; - -#define dtokinoma_room_0Tex_0159D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_0159D8" -static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0159D8[] = dtokinoma_room_0Tex_0159D8; - -#define dtokinoma_room_0Tex_0131D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_0131D8" -static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0131D8[] = dtokinoma_room_0Tex_0131D8; - -#define dtokinoma_room_0Tex_0121D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_0121D8" -static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0121D8[] = dtokinoma_room_0Tex_0121D8; - -#define dtokinoma_room_0Tex_0111D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_0111D8" -static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0111D8[] = dtokinoma_room_0Tex_0111D8; - -#define dtokinoma_room_0Tex_0101D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_0101D8" -static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0101D8[] = dtokinoma_room_0Tex_0101D8; - -#define dtokinoma_room_0Tex_00F1D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_00F1D8" -static const ALIGN_ASSET(2) char tokinoma_room_0Tex_00F1D8[] = dtokinoma_room_0Tex_00F1D8; - -#define dtokinoma_room_0Tex_00E1D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_00E1D8" -static const ALIGN_ASSET(2) char tokinoma_room_0Tex_00E1D8[] = dtokinoma_room_0Tex_00E1D8; - -#define dtokinoma_room_0Tex_00D1D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_00D1D8" -static const ALIGN_ASSET(2) char tokinoma_room_0Tex_00D1D8[] = dtokinoma_room_0Tex_00D1D8; - -#define dtokinoma_room_0Tex_00C1D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_00C1D8" -static const ALIGN_ASSET(2) char tokinoma_room_0Tex_00C1D8[] = dtokinoma_room_0Tex_00C1D8; - -#define dtokinoma_room_0Tex_00B1D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_00B1D8" -static const ALIGN_ASSET(2) char tokinoma_room_0Tex_00B1D8[] = dtokinoma_room_0Tex_00B1D8; - -#define dtokinoma_room_0Tex_00A1D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_00A1D8" -static const ALIGN_ASSET(2) char tokinoma_room_0Tex_00A1D8[] = dtokinoma_room_0Tex_00A1D8; - -#define dtokinoma_room_0Tex_0091D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_0091D8" -static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0091D8[] = dtokinoma_room_0Tex_0091D8; - -#define dtokinoma_room_0Tex_0081D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_0081D8" +#define dtokinoma_room_0Tex_0081D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_0081D8" static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0081D8[] = dtokinoma_room_0Tex_0081D8; -#define dtokinoma_room_0Set_000120DL_008128 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Set_000120DL_008128" +#define dtokinoma_room_0Tex_0091D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_0091D8" +static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0091D8[] = dtokinoma_room_0Tex_0091D8; + +#define dtokinoma_room_0Tex_00A1D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_00A1D8" +static const ALIGN_ASSET(2) char tokinoma_room_0Tex_00A1D8[] = dtokinoma_room_0Tex_00A1D8; + +#define dtokinoma_room_0Tex_00B1D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_00B1D8" +static const ALIGN_ASSET(2) char tokinoma_room_0Tex_00B1D8[] = dtokinoma_room_0Tex_00B1D8; + +#define dtokinoma_room_0Tex_00C1D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_00C1D8" +static const ALIGN_ASSET(2) char tokinoma_room_0Tex_00C1D8[] = dtokinoma_room_0Tex_00C1D8; + +#define dtokinoma_room_0Tex_00D1D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_00D1D8" +static const ALIGN_ASSET(2) char tokinoma_room_0Tex_00D1D8[] = dtokinoma_room_0Tex_00D1D8; + +#define dtokinoma_room_0Tex_00E1D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_00E1D8" +static const ALIGN_ASSET(2) char tokinoma_room_0Tex_00E1D8[] = dtokinoma_room_0Tex_00E1D8; + +#define dtokinoma_room_0Tex_00F1D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_00F1D8" +static const ALIGN_ASSET(2) char tokinoma_room_0Tex_00F1D8[] = dtokinoma_room_0Tex_00F1D8; + +#define dtokinoma_room_0Tex_0101D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_0101D8" +static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0101D8[] = dtokinoma_room_0Tex_0101D8; + +#define dtokinoma_room_0Tex_0111D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_0111D8" +static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0111D8[] = dtokinoma_room_0Tex_0111D8; + +#define dtokinoma_room_0Tex_0121D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_0121D8" +static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0121D8[] = dtokinoma_room_0Tex_0121D8; + +#define dtokinoma_room_0Tex_0131D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_0131D8" +static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0131D8[] = dtokinoma_room_0Tex_0131D8; + +#define dtokinoma_room_0Tex_0141D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_0141D8" +static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0141D8[] = dtokinoma_room_0Tex_0141D8; + +#define dtokinoma_room_0Tex_0149D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_0149D8" +static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0149D8[] = dtokinoma_room_0Tex_0149D8; + +#define dtokinoma_room_0Tex_0151D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_0151D8" +static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0151D8[] = dtokinoma_room_0Tex_0151D8; + +#define dtokinoma_room_0Tex_0159D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_0159D8" +static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0159D8[] = dtokinoma_room_0Tex_0159D8; + +#define dtokinoma_room_0Tex_0161D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_0161D8" +static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0161D8[] = dtokinoma_room_0Tex_0161D8; + +#define dtokinoma_room_0Tex_0169D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_0169D8" +static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0169D8[] = dtokinoma_room_0Tex_0169D8; + +#define dtokinoma_room_0DL_008128 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0DL_008128" +static const ALIGN_ASSET(2) char tokinoma_room_0DL_008128[] = dtokinoma_room_0DL_008128; + +#define dtokinoma_room_0Set_000120DL_008128 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Set_000120DL_008128" static const ALIGN_ASSET(2) char tokinoma_room_0Set_000120DL_008128[] = dtokinoma_room_0Set_000120DL_008128; -#define dtokinoma_room_0Set_0001E0DL_008128 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Set_0001E0DL_008128" +#define dtokinoma_room_0Set_0001E0DL_008128 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Set_0001E0DL_008128" static const ALIGN_ASSET(2) char tokinoma_room_0Set_0001E0DL_008128[] = dtokinoma_room_0Set_0001E0DL_008128; -#define dtokinoma_room_0Set_0002F0DL_008128 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Set_0002F0DL_008128" +#define dtokinoma_room_0Set_0002F0DL_008128 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Set_0002F0DL_008128" static const ALIGN_ASSET(2) char tokinoma_room_0Set_0002F0DL_008128[] = dtokinoma_room_0Set_0002F0DL_008128; -#define dtokinoma_room_0Set_0003B0DL_008128 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Set_0003B0DL_008128" +#define dtokinoma_room_0Set_0003B0DL_008128 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Set_0003B0DL_008128" static const ALIGN_ASSET(2) char tokinoma_room_0Set_0003B0DL_008128[] = dtokinoma_room_0Set_0003B0DL_008128; -#define dtokinoma_room_0Set_000430DL_008128 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Set_000430DL_008128" +#define dtokinoma_room_0Set_000430DL_008128 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Set_000430DL_008128" static const ALIGN_ASSET(2) char tokinoma_room_0Set_000430DL_008128[] = dtokinoma_room_0Set_000430DL_008128; -#define dtokinoma_room_0Set_0004B0DL_008128 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Set_0004B0DL_008128" +#define dtokinoma_room_0Set_0004B0DL_008128 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Set_0004B0DL_008128" static const ALIGN_ASSET(2) char tokinoma_room_0Set_0004B0DL_008128[] = dtokinoma_room_0Set_0004B0DL_008128; -#define dtokinoma_room_0Set_000530DL_008128 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Set_000530DL_008128" +#define dtokinoma_room_0Set_000530DL_008128 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Set_000530DL_008128" static const ALIGN_ASSET(2) char tokinoma_room_0Set_000530DL_008128[] = dtokinoma_room_0Set_000530DL_008128; -#define dtokinoma_room_0Set_0005B0DL_008128 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Set_0005B0DL_008128" +#define dtokinoma_room_0Set_0005B0DL_008128 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Set_0005B0DL_008128" static const ALIGN_ASSET(2) char tokinoma_room_0Set_0005B0DL_008128[] = dtokinoma_room_0Set_0005B0DL_008128; -#define dtokinoma_room_0Set_000610DL_008128 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Set_000610DL_008128" +#define dtokinoma_room_0Set_000610DL_008128 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Set_000610DL_008128" static const ALIGN_ASSET(2) char tokinoma_room_0Set_000610DL_008128[] = dtokinoma_room_0Set_000610DL_008128; -#define dtokinoma_room_0Set_000690DL_008128 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Set_000690DL_008128" +#define dtokinoma_room_0Set_000690DL_008128 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Set_000690DL_008128" static const ALIGN_ASSET(2) char tokinoma_room_0Set_000690DL_008128[] = dtokinoma_room_0Set_000690DL_008128; -#define dtokinoma_room_0Set_000270DL_008128 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Set_000270DL_008128" +#define dtokinoma_room_0Set_000270DL_008128 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Set_000270DL_008128" static const ALIGN_ASSET(2) char tokinoma_room_0Set_000270DL_008128[] = dtokinoma_room_0Set_000270DL_008128; diff --git a/soh/assets/scenes/indoors/tokinoma/tokinoma_room_1.h b/soh/assets/scenes/indoors/tokinoma/tokinoma_room_1.h index 929172206..e443a293b 100644 --- a/soh/assets/scenes/indoors/tokinoma/tokinoma_room_1.h +++ b/soh/assets/scenes/indoors/tokinoma/tokinoma_room_1.h @@ -3,94 +3,94 @@ #include "align_asset_macro.h" -#define dtokinoma_room_1DL_0053E0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1DL_0053E0" -static const ALIGN_ASSET(2) char tokinoma_room_1DL_0053E0[] = dtokinoma_room_1DL_0053E0; - -#define dtokinoma_room_1Tex_005858 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Tex_005858" -static const ALIGN_ASSET(2) char tokinoma_room_1Tex_005858[] = dtokinoma_room_1Tex_005858; - -#define dtokinoma_room_1Tex_005658 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Tex_005658" -static const ALIGN_ASSET(2) char tokinoma_room_1Tex_005658[] = dtokinoma_room_1Tex_005658; - -#define dtokinoma_room_1Tex_005458 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Tex_005458" +#define dtokinoma_room_1Tex_005458 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Tex_005458" static const ALIGN_ASSET(2) char tokinoma_room_1Tex_005458[] = dtokinoma_room_1Tex_005458; -#define dtokinoma_room_1DL_006470 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1DL_006470" -static const ALIGN_ASSET(2) char tokinoma_room_1DL_006470[] = dtokinoma_room_1DL_006470; +#define dtokinoma_room_1Tex_005658 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Tex_005658" +static const ALIGN_ASSET(2) char tokinoma_room_1Tex_005658[] = dtokinoma_room_1Tex_005658; -#define dtokinoma_room_1Tex_0068C8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Tex_0068C8" -static const ALIGN_ASSET(2) char tokinoma_room_1Tex_0068C8[] = dtokinoma_room_1Tex_0068C8; +#define dtokinoma_room_1Tex_005858 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Tex_005858" +static const ALIGN_ASSET(2) char tokinoma_room_1Tex_005858[] = dtokinoma_room_1Tex_005858; -#define dtokinoma_room_1Tex_0064C8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Tex_0064C8" -static const ALIGN_ASSET(2) char tokinoma_room_1Tex_0064C8[] = dtokinoma_room_1Tex_0064C8; - -#define dtokinoma_room_1Tex_006488 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Tex_006488" +#define dtokinoma_room_1Tex_006488 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Tex_006488" static const ALIGN_ASSET(2) char tokinoma_room_1Tex_006488[] = dtokinoma_room_1Tex_006488; -#define dtokinoma_room_1Set_000150DL_0053E0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000150DL_0053E0" +#define dtokinoma_room_1Tex_0064C8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Tex_0064C8" +static const ALIGN_ASSET(2) char tokinoma_room_1Tex_0064C8[] = dtokinoma_room_1Tex_0064C8; + +#define dtokinoma_room_1Tex_0068C8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Tex_0068C8" +static const ALIGN_ASSET(2) char tokinoma_room_1Tex_0068C8[] = dtokinoma_room_1Tex_0068C8; + +#define dtokinoma_room_1DL_0053E0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1DL_0053E0" +static const ALIGN_ASSET(2) char tokinoma_room_1DL_0053E0[] = dtokinoma_room_1DL_0053E0; + +#define dtokinoma_room_1DL_006470 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1DL_006470" +static const ALIGN_ASSET(2) char tokinoma_room_1DL_006470[] = dtokinoma_room_1DL_006470; + +#define dtokinoma_room_1Set_000150DL_0053E0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000150DL_0053E0" static const ALIGN_ASSET(2) char tokinoma_room_1Set_000150DL_0053E0[] = dtokinoma_room_1Set_000150DL_0053E0; -#define dtokinoma_room_1Set_000150DL_006470 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000150DL_006470" +#define dtokinoma_room_1Set_000150DL_006470 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000150DL_006470" static const ALIGN_ASSET(2) char tokinoma_room_1Set_000150DL_006470[] = dtokinoma_room_1Set_000150DL_006470; -#define dtokinoma_room_1Set_000240DL_0053E0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000240DL_0053E0" +#define dtokinoma_room_1Set_000240DL_0053E0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000240DL_0053E0" static const ALIGN_ASSET(2) char tokinoma_room_1Set_000240DL_0053E0[] = dtokinoma_room_1Set_000240DL_0053E0; -#define dtokinoma_room_1Set_000240DL_006470 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000240DL_006470" +#define dtokinoma_room_1Set_000240DL_006470 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000240DL_006470" static const ALIGN_ASSET(2) char tokinoma_room_1Set_000240DL_006470[] = dtokinoma_room_1Set_000240DL_006470; -#define dtokinoma_room_1Set_000370DL_0053E0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000370DL_0053E0" +#define dtokinoma_room_1Set_000370DL_0053E0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000370DL_0053E0" static const ALIGN_ASSET(2) char tokinoma_room_1Set_000370DL_0053E0[] = dtokinoma_room_1Set_000370DL_0053E0; -#define dtokinoma_room_1Set_000370DL_006470 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000370DL_006470" +#define dtokinoma_room_1Set_000370DL_006470 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000370DL_006470" static const ALIGN_ASSET(2) char tokinoma_room_1Set_000370DL_006470[] = dtokinoma_room_1Set_000370DL_006470; -#define dtokinoma_room_1Set_000460DL_0053E0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000460DL_0053E0" +#define dtokinoma_room_1Set_000460DL_0053E0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000460DL_0053E0" static const ALIGN_ASSET(2) char tokinoma_room_1Set_000460DL_0053E0[] = dtokinoma_room_1Set_000460DL_0053E0; -#define dtokinoma_room_1Set_000460DL_006470 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000460DL_006470" +#define dtokinoma_room_1Set_000460DL_006470 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000460DL_006470" static const ALIGN_ASSET(2) char tokinoma_room_1Set_000460DL_006470[] = dtokinoma_room_1Set_000460DL_006470; -#define dtokinoma_room_1Set_000520DL_0053E0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000520DL_0053E0" +#define dtokinoma_room_1Set_000520DL_0053E0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000520DL_0053E0" static const ALIGN_ASSET(2) char tokinoma_room_1Set_000520DL_0053E0[] = dtokinoma_room_1Set_000520DL_0053E0; -#define dtokinoma_room_1Set_000520DL_006470 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000520DL_006470" +#define dtokinoma_room_1Set_000520DL_006470 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000520DL_006470" static const ALIGN_ASSET(2) char tokinoma_room_1Set_000520DL_006470[] = dtokinoma_room_1Set_000520DL_006470; -#define dtokinoma_room_1Set_0005D0DL_0053E0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_0005D0DL_0053E0" +#define dtokinoma_room_1Set_0005D0DL_0053E0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_0005D0DL_0053E0" static const ALIGN_ASSET(2) char tokinoma_room_1Set_0005D0DL_0053E0[] = dtokinoma_room_1Set_0005D0DL_0053E0; -#define dtokinoma_room_1Set_0005D0DL_006470 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_0005D0DL_006470" +#define dtokinoma_room_1Set_0005D0DL_006470 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_0005D0DL_006470" static const ALIGN_ASSET(2) char tokinoma_room_1Set_0005D0DL_006470[] = dtokinoma_room_1Set_0005D0DL_006470; -#define dtokinoma_room_1Set_000680DL_0053E0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000680DL_0053E0" +#define dtokinoma_room_1Set_000680DL_0053E0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000680DL_0053E0" static const ALIGN_ASSET(2) char tokinoma_room_1Set_000680DL_0053E0[] = dtokinoma_room_1Set_000680DL_0053E0; -#define dtokinoma_room_1Set_000680DL_006470 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000680DL_006470" +#define dtokinoma_room_1Set_000680DL_006470 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000680DL_006470" static const ALIGN_ASSET(2) char tokinoma_room_1Set_000680DL_006470[] = dtokinoma_room_1Set_000680DL_006470; -#define dtokinoma_room_1Set_000730DL_0053E0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000730DL_0053E0" +#define dtokinoma_room_1Set_000730DL_0053E0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000730DL_0053E0" static const ALIGN_ASSET(2) char tokinoma_room_1Set_000730DL_0053E0[] = dtokinoma_room_1Set_000730DL_0053E0; -#define dtokinoma_room_1Set_000730DL_006470 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000730DL_006470" +#define dtokinoma_room_1Set_000730DL_006470 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000730DL_006470" static const ALIGN_ASSET(2) char tokinoma_room_1Set_000730DL_006470[] = dtokinoma_room_1Set_000730DL_006470; -#define dtokinoma_room_1Set_0007F0DL_0053E0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_0007F0DL_0053E0" +#define dtokinoma_room_1Set_0007F0DL_0053E0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_0007F0DL_0053E0" static const ALIGN_ASSET(2) char tokinoma_room_1Set_0007F0DL_0053E0[] = dtokinoma_room_1Set_0007F0DL_0053E0; -#define dtokinoma_room_1Set_0007F0DL_006470 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_0007F0DL_006470" +#define dtokinoma_room_1Set_0007F0DL_006470 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_0007F0DL_006470" static const ALIGN_ASSET(2) char tokinoma_room_1Set_0007F0DL_006470[] = dtokinoma_room_1Set_0007F0DL_006470; -#define dtokinoma_room_1Set_000890DL_0053E0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000890DL_0053E0" +#define dtokinoma_room_1Set_000890DL_0053E0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000890DL_0053E0" static const ALIGN_ASSET(2) char tokinoma_room_1Set_000890DL_0053E0[] = dtokinoma_room_1Set_000890DL_0053E0; -#define dtokinoma_room_1Set_000890DL_006470 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000890DL_006470" +#define dtokinoma_room_1Set_000890DL_006470 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000890DL_006470" static const ALIGN_ASSET(2) char tokinoma_room_1Set_000890DL_006470[] = dtokinoma_room_1Set_000890DL_006470; -#define dtokinoma_room_1Set_0002B0DL_0053E0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_0002B0DL_0053E0" +#define dtokinoma_room_1Set_0002B0DL_0053E0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_0002B0DL_0053E0" static const ALIGN_ASSET(2) char tokinoma_room_1Set_0002B0DL_0053E0[] = dtokinoma_room_1Set_0002B0DL_0053E0; -#define dtokinoma_room_1Set_0002B0DL_006470 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_0002B0DL_006470" +#define dtokinoma_room_1Set_0002B0DL_006470 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_0002B0DL_006470" static const ALIGN_ASSET(2) char tokinoma_room_1Set_0002B0DL_006470[] = dtokinoma_room_1Set_0002B0DL_006470; diff --git a/soh/assets/scenes/indoors/tokinoma/tokinoma_scene.h b/soh/assets/scenes/indoors/tokinoma/tokinoma_scene.h index 7408f61f9..e23537a01 100644 --- a/soh/assets/scenes/indoors/tokinoma/tokinoma_scene.h +++ b/soh/assets/scenes/indoors/tokinoma/tokinoma_scene.h @@ -3,66 +3,66 @@ #include "align_asset_macro.h" -#define dgTempleOfTimeFirstAdultCs "__OTR__scenes/nonmq/tokinoma_scene/gTempleOfTimeFirstAdultCs" -static const ALIGN_ASSET(2) char gTempleOfTimeFirstAdultCs[] = dgTempleOfTimeFirstAdultCs; - -#define dgTempleOfTimePreludeCs "__OTR__scenes/nonmq/tokinoma_scene/gTempleOfTimePreludeCs" -static const ALIGN_ASSET(2) char gTempleOfTimePreludeCs[] = dgTempleOfTimePreludeCs; - -#define dgTempleOfTimeIntroCs "__OTR__scenes/nonmq/tokinoma_scene/gTempleOfTimeIntroCs" -static const ALIGN_ASSET(2) char gTempleOfTimeIntroCs[] = dgTempleOfTimeIntroCs; - -#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" -static const ALIGN_ASSET(2) char tokinoma_sceneCollisionHeader_0032F8[] = dtokinoma_sceneCollisionHeader_0032F8; - -#define dtokinoma_sceneTex_010FA0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneTex_010FA0" -static const ALIGN_ASSET(2) char tokinoma_sceneTex_010FA0[] = dtokinoma_sceneTex_010FA0; - -#define dtokinoma_sceneTex_011FA0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneTex_011FA0" -static const ALIGN_ASSET(2) char tokinoma_sceneTex_011FA0[] = dtokinoma_sceneTex_011FA0; - -#define dtokinoma_sceneTex_00DFA0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneTex_00DFA0" -static const ALIGN_ASSET(2) char tokinoma_sceneTex_00DFA0[] = dtokinoma_sceneTex_00DFA0; - -#define dtokinoma_sceneTex_00EFA0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneTex_00EFA0" -static const ALIGN_ASSET(2) char tokinoma_sceneTex_00EFA0[] = dtokinoma_sceneTex_00EFA0; - -#define dtokinoma_sceneTex_0107A0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneTex_0107A0" -static const ALIGN_ASSET(2) char tokinoma_sceneTex_0107A0[] = dtokinoma_sceneTex_0107A0; - -#define dtokinoma_sceneTex_00FFA0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneTex_00FFA0" -static const ALIGN_ASSET(2) char tokinoma_sceneTex_00FFA0[] = dtokinoma_sceneTex_00FFA0; - -#define dtokinoma_sceneTex_00D7A0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneTex_00D7A0" -static const ALIGN_ASSET(2) char tokinoma_sceneTex_00D7A0[] = dtokinoma_sceneTex_00D7A0; - -#define dtokinoma_sceneTex_00CFA0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneTex_00CFA0" +#define dtokinoma_sceneTex_00CFA0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneTex_00CFA0" static const ALIGN_ASSET(2) char tokinoma_sceneTex_00CFA0[] = dtokinoma_sceneTex_00CFA0; -#define dtokinoma_sceneTex_0117A0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneTex_0117A0" +#define dtokinoma_sceneTex_00D7A0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneTex_00D7A0" +static const ALIGN_ASSET(2) char tokinoma_sceneTex_00D7A0[] = dtokinoma_sceneTex_00D7A0; + +#define dtokinoma_sceneTex_00DFA0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneTex_00DFA0" +static const ALIGN_ASSET(2) char tokinoma_sceneTex_00DFA0[] = dtokinoma_sceneTex_00DFA0; + +#define dtokinoma_sceneTex_00EFA0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneTex_00EFA0" +static const ALIGN_ASSET(2) char tokinoma_sceneTex_00EFA0[] = dtokinoma_sceneTex_00EFA0; + +#define dtokinoma_sceneTex_00FFA0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneTex_00FFA0" +static const ALIGN_ASSET(2) char tokinoma_sceneTex_00FFA0[] = dtokinoma_sceneTex_00FFA0; + +#define dtokinoma_sceneTex_0107A0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneTex_0107A0" +static const ALIGN_ASSET(2) char tokinoma_sceneTex_0107A0[] = dtokinoma_sceneTex_0107A0; + +#define dtokinoma_sceneTex_010FA0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneTex_010FA0" +static const ALIGN_ASSET(2) char tokinoma_sceneTex_010FA0[] = dtokinoma_sceneTex_010FA0; + +#define dtokinoma_sceneTex_0117A0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneTex_0117A0" static const ALIGN_ASSET(2) char tokinoma_sceneTex_0117A0[] = dtokinoma_sceneTex_0117A0; -#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" +#define dtokinoma_sceneTex_011FA0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneTex_011FA0" +static const ALIGN_ASSET(2) char tokinoma_sceneTex_011FA0[] = dtokinoma_sceneTex_011FA0; -#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" +#define dgTempleOfTimeFirstAdultCs "__OTR__scenes/shared/tokinoma_scene/gTempleOfTimeFirstAdultCs" +static const ALIGN_ASSET(2) char gTempleOfTimeFirstAdultCs[] = dgTempleOfTimeFirstAdultCs; -#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" +#define dgTempleOfTimePreludeCs "__OTR__scenes/shared/tokinoma_scene/gTempleOfTimePreludeCs" +static const ALIGN_ASSET(2) char gTempleOfTimePreludeCs[] = dgTempleOfTimePreludeCs; -#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" +#define dgTempleOfTimeIntroCs "__OTR__scenes/shared/tokinoma_scene/gTempleOfTimeIntroCs" +static const ALIGN_ASSET(2) char gTempleOfTimeIntroCs[] = dgTempleOfTimeIntroCs; -#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" +#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" +static const ALIGN_ASSET(2) char tokinoma_sceneCollisionHeader_0032F8[] = dtokinoma_sceneCollisionHeader_0032F8; -#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" +#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" -#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" +#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" -#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" +#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" -#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" +#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" -#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" +#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" -#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" +#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" + +#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" + +#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" + +#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" + +#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" + +#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8" #endif // INDOORS_TOKINOMA_SCENE_H diff --git a/soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_room_0.h b/soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_room_0.h index baa936861..266b01000 100644 --- a/soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_room_0.h +++ b/soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_room_0.h @@ -3,10 +3,10 @@ #include "align_asset_macro.h" -#define dyousei_izumi_tate_room_0DL_002C10 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_room_0DL_002C10" +#define dyousei_izumi_tate_room_0DL_002C10 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_room_0DL_002C10" static const ALIGN_ASSET(2) char yousei_izumi_tate_room_0DL_002C10[] = dyousei_izumi_tate_room_0DL_002C10; -#define dyousei_izumi_tate_room_0DL_003FB0 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_room_0DL_003FB0" +#define dyousei_izumi_tate_room_0DL_003FB0 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_room_0DL_003FB0" static const ALIGN_ASSET(2) char yousei_izumi_tate_room_0DL_003FB0[] = dyousei_izumi_tate_room_0DL_003FB0; diff --git a/soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_scene.h b/soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_scene.h index 547f8d436..84a038312 100644 --- a/soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_scene.h +++ b/soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_scene.h @@ -3,37 +3,38 @@ #include "align_asset_macro.h" -#define dyousei_izumi_tate_sceneCollisionHeader_001FDC "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneCollisionHeader_001FDC" -static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneCollisionHeader_001FDC[] = dyousei_izumi_tate_sceneCollisionHeader_001FDC; - -#define dyousei_izumi_tate_sceneTex_008010 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_008010" -static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_008010[] = dyousei_izumi_tate_sceneTex_008010; - -#define dyousei_izumi_tate_sceneTex_005010 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_005010" -static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_005010[] = dyousei_izumi_tate_sceneTex_005010; - -#define dyousei_izumi_tate_sceneTex_004810 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_004810" -static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_004810[] = dyousei_izumi_tate_sceneTex_004810; - -#define dyousei_izumi_tate_sceneTex_006010 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_006010" -static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_006010[] = dyousei_izumi_tate_sceneTex_006010; - -#define dyousei_izumi_tate_sceneTex_002810 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_002810" -static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_002810[] = dyousei_izumi_tate_sceneTex_002810; - -#define dyousei_izumi_tate_sceneTex_005810 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_005810" -static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_005810[] = dyousei_izumi_tate_sceneTex_005810; - -#define dyousei_izumi_tate_sceneTex_007810 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_007810" -static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_007810[] = dyousei_izumi_tate_sceneTex_007810; - -#define dyousei_izumi_tate_sceneTex_007010 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_007010" -static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_007010[] = dyousei_izumi_tate_sceneTex_007010; - -#define dyousei_izumi_tate_sceneTex_003810 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_003810" -static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_003810[] = dyousei_izumi_tate_sceneTex_003810; - -#define dyousei_izumi_tate_sceneTex_002010 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_002010" +#define dyousei_izumi_tate_sceneTex_002010 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_002010" static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_002010[] = dyousei_izumi_tate_sceneTex_002010; +#define dyousei_izumi_tate_sceneTex_002810 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_002810" +static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_002810[] = dyousei_izumi_tate_sceneTex_002810; + +#define dyousei_izumi_tate_sceneTex_003810 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_003810" +static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_003810[] = dyousei_izumi_tate_sceneTex_003810; + +#define dyousei_izumi_tate_sceneTex_004810 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_004810" +static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_004810[] = dyousei_izumi_tate_sceneTex_004810; + +#define dyousei_izumi_tate_sceneTex_005010 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_005010" +static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_005010[] = dyousei_izumi_tate_sceneTex_005010; + +#define dyousei_izumi_tate_sceneTex_005810 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_005810" +static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_005810[] = dyousei_izumi_tate_sceneTex_005810; + +#define dyousei_izumi_tate_sceneTex_006010 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_006010" +static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_006010[] = dyousei_izumi_tate_sceneTex_006010; + +#define dyousei_izumi_tate_sceneTex_007010 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_007010" +static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_007010[] = dyousei_izumi_tate_sceneTex_007010; + +#define dyousei_izumi_tate_sceneTex_007810 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_007810" +static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_007810[] = dyousei_izumi_tate_sceneTex_007810; + +#define dyousei_izumi_tate_sceneTex_008010 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_008010" +static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_008010[] = dyousei_izumi_tate_sceneTex_008010; + +#define dyousei_izumi_tate_sceneCollisionHeader_001FDC "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneCollisionHeader_001FDC" +static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneCollisionHeader_001FDC[] = dyousei_izumi_tate_sceneCollisionHeader_001FDC; + + #endif // INDOORS_YOUSEI_IZUMI_TATE_SCENE_H diff --git a/soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_room_0.h b/soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_room_0.h index 20d3a8a22..85f92f582 100644 --- a/soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_room_0.h +++ b/soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_room_0.h @@ -3,28 +3,28 @@ #include "align_asset_macro.h" -#define dyousei_izumi_yoko_room_0DL_002B88 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0DL_002B88" +#define dyousei_izumi_yoko_room_0DL_002B88 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0DL_002B88" static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0DL_002B88[] = dyousei_izumi_yoko_room_0DL_002B88; -#define dyousei_izumi_yoko_room_0DL_003FF8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0DL_003FF8" +#define dyousei_izumi_yoko_room_0DL_003FF8 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0DL_003FF8" static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0DL_003FF8[] = dyousei_izumi_yoko_room_0DL_003FF8; -#define dyousei_izumi_yoko_room_0Set_0000D0DL_002B88 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_0000D0DL_002B88" +#define dyousei_izumi_yoko_room_0Set_0000D0DL_002B88 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_0000D0DL_002B88" static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0Set_0000D0DL_002B88[] = dyousei_izumi_yoko_room_0Set_0000D0DL_002B88; -#define dyousei_izumi_yoko_room_0Set_0000D0DL_003FF8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_0000D0DL_003FF8" +#define dyousei_izumi_yoko_room_0Set_0000D0DL_003FF8 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_0000D0DL_003FF8" static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0Set_0000D0DL_003FF8[] = dyousei_izumi_yoko_room_0Set_0000D0DL_003FF8; -#define dyousei_izumi_yoko_room_0Set_000170DL_002B88 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_000170DL_002B88" +#define dyousei_izumi_yoko_room_0Set_000170DL_002B88 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_000170DL_002B88" static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0Set_000170DL_002B88[] = dyousei_izumi_yoko_room_0Set_000170DL_002B88; -#define dyousei_izumi_yoko_room_0Set_000170DL_003FF8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_000170DL_003FF8" +#define dyousei_izumi_yoko_room_0Set_000170DL_003FF8 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_000170DL_003FF8" static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0Set_000170DL_003FF8[] = dyousei_izumi_yoko_room_0Set_000170DL_003FF8; -#define dyousei_izumi_yoko_room_0Set_000210DL_002B88 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_000210DL_002B88" +#define dyousei_izumi_yoko_room_0Set_000210DL_002B88 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_000210DL_002B88" static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0Set_000210DL_002B88[] = dyousei_izumi_yoko_room_0Set_000210DL_002B88; -#define dyousei_izumi_yoko_room_0Set_000210DL_003FF8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_000210DL_003FF8" +#define dyousei_izumi_yoko_room_0Set_000210DL_003FF8 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_000210DL_003FF8" static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0Set_000210DL_003FF8[] = dyousei_izumi_yoko_room_0Set_000210DL_003FF8; diff --git a/soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h b/soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h index f18210e14..528dae6b7 100644 --- a/soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h +++ b/soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h @@ -3,62 +3,62 @@ #include "align_asset_macro.h" -#define dgGreatFairyFaroresWindCs "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/gGreatFairyFaroresWindCs" -static const ALIGN_ASSET(2) char gGreatFairyFaroresWindCs[] = dgGreatFairyFaroresWindCs; - -#define dgGreatFairyDinsFireCs "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/gGreatFairyDinsFireCs" -static const ALIGN_ASSET(2) char gGreatFairyDinsFireCs[] = dgGreatFairyDinsFireCs; - -#define dgGreatFairyNayrusLoveCs "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/gGreatFairyNayrusLoveCs" -static const ALIGN_ASSET(2) char gGreatFairyNayrusLoveCs[] = dgGreatFairyNayrusLoveCs; - -#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8" -static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneCollisionHeader_0039A8[] = dyousei_izumi_yoko_sceneCollisionHeader_0039A8; - -#define dyousei_izumi_yoko_sceneTex_00C5A0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_00C5A0" -static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_00C5A0[] = dyousei_izumi_yoko_sceneTex_00C5A0; - -#define dyousei_izumi_yoko_sceneTex_0085A0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0085A0" -static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0085A0[] = dyousei_izumi_yoko_sceneTex_0085A0; - -#define dyousei_izumi_yoko_sceneTex_0075A0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0075A0" -static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0075A0[] = dyousei_izumi_yoko_sceneTex_0075A0; - -#define dyousei_izumi_yoko_sceneTex_0065A0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0065A0" -static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0065A0[] = dyousei_izumi_yoko_sceneTex_0065A0; - -#define dyousei_izumi_yoko_sceneTex_0045A0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0045A0" -static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0045A0[] = dyousei_izumi_yoko_sceneTex_0045A0; - -#define dyousei_izumi_yoko_sceneTex_009DA0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_009DA0" -static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_009DA0[] = dyousei_izumi_yoko_sceneTex_009DA0; - -#define dyousei_izumi_yoko_sceneTex_00BDA0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_00BDA0" -static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_00BDA0[] = dyousei_izumi_yoko_sceneTex_00BDA0; - -#define dyousei_izumi_yoko_sceneTex_0095A0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0095A0" -static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0095A0[] = dyousei_izumi_yoko_sceneTex_0095A0; - -#define dyousei_izumi_yoko_sceneTex_004DA0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_004DA0" -static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_004DA0[] = dyousei_izumi_yoko_sceneTex_004DA0; - -#define dyousei_izumi_yoko_sceneTex_003DA0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_003DA0" +#define dyousei_izumi_yoko_sceneTex_003DA0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_003DA0" static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_003DA0[] = dyousei_izumi_yoko_sceneTex_003DA0; -#define dyousei_izumi_yoko_sceneTex_00ADA0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_00ADA0" -static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_00ADA0[] = dyousei_izumi_yoko_sceneTex_00ADA0; +#define dyousei_izumi_yoko_sceneTex_0045A0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0045A0" +static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0045A0[] = dyousei_izumi_yoko_sceneTex_0045A0; -#define dyousei_izumi_yoko_sceneTex_00B5A0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_00B5A0" -static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_00B5A0[] = dyousei_izumi_yoko_sceneTex_00B5A0; +#define dyousei_izumi_yoko_sceneTex_004DA0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_004DA0" +static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_004DA0[] = dyousei_izumi_yoko_sceneTex_004DA0; -#define dyousei_izumi_yoko_sceneTex_0055A0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0055A0" +#define dyousei_izumi_yoko_sceneTex_0055A0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0055A0" static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0055A0[] = dyousei_izumi_yoko_sceneTex_0055A0; -#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8" +#define dyousei_izumi_yoko_sceneTex_0065A0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0065A0" +static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0065A0[] = dyousei_izumi_yoko_sceneTex_0065A0; -#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8" +#define dyousei_izumi_yoko_sceneTex_0075A0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0075A0" +static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0075A0[] = dyousei_izumi_yoko_sceneTex_0075A0; -#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8" +#define dyousei_izumi_yoko_sceneTex_0085A0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0085A0" +static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0085A0[] = dyousei_izumi_yoko_sceneTex_0085A0; + +#define dyousei_izumi_yoko_sceneTex_0095A0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0095A0" +static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0095A0[] = dyousei_izumi_yoko_sceneTex_0095A0; + +#define dyousei_izumi_yoko_sceneTex_009DA0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_009DA0" +static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_009DA0[] = dyousei_izumi_yoko_sceneTex_009DA0; + +#define dyousei_izumi_yoko_sceneTex_00ADA0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_00ADA0" +static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_00ADA0[] = dyousei_izumi_yoko_sceneTex_00ADA0; + +#define dyousei_izumi_yoko_sceneTex_00B5A0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_00B5A0" +static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_00B5A0[] = dyousei_izumi_yoko_sceneTex_00B5A0; + +#define dyousei_izumi_yoko_sceneTex_00BDA0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_00BDA0" +static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_00BDA0[] = dyousei_izumi_yoko_sceneTex_00BDA0; + +#define dyousei_izumi_yoko_sceneTex_00C5A0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_00C5A0" +static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_00C5A0[] = dyousei_izumi_yoko_sceneTex_00C5A0; + +#define dgGreatFairyFaroresWindCs "__OTR__scenes/shared/yousei_izumi_yoko_scene/gGreatFairyFaroresWindCs" +static const ALIGN_ASSET(2) char gGreatFairyFaroresWindCs[] = dgGreatFairyFaroresWindCs; + +#define dgGreatFairyDinsFireCs "__OTR__scenes/shared/yousei_izumi_yoko_scene/gGreatFairyDinsFireCs" +static const ALIGN_ASSET(2) char gGreatFairyDinsFireCs[] = dgGreatFairyDinsFireCs; + +#define dgGreatFairyNayrusLoveCs "__OTR__scenes/shared/yousei_izumi_yoko_scene/gGreatFairyNayrusLoveCs" +static const ALIGN_ASSET(2) char gGreatFairyNayrusLoveCs[] = dgGreatFairyNayrusLoveCs; + +#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8" +static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneCollisionHeader_0039A8[] = dyousei_izumi_yoko_sceneCollisionHeader_0039A8; + +#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8" + +#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8" + +#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8" #endif // INDOORS_YOUSEI_IZUMI_YOKO_SCENE_H diff --git a/soh/assets/scenes/misc/enrui/enrui_room_0.h b/soh/assets/scenes/misc/enrui/enrui_room_0.h index b34bbecaa..f12a2143f 100644 --- a/soh/assets/scenes/misc/enrui/enrui_room_0.h +++ b/soh/assets/scenes/misc/enrui/enrui_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define denrui_room_0DL_000338 "__OTR__scenes/nonmq/enrui_scene/enrui_room_0DL_000338" +#define denrui_room_0DL_000338 "__OTR__scenes/shared/enrui_scene/enrui_room_0DL_000338" static const ALIGN_ASSET(2) char enrui_room_0DL_000338[] = denrui_room_0DL_000338; diff --git a/soh/assets/scenes/misc/enrui/enrui_scene.h b/soh/assets/scenes/misc/enrui/enrui_scene.h index ed6ac652f..4146c34bb 100644 --- a/soh/assets/scenes/misc/enrui/enrui_scene.h +++ b/soh/assets/scenes/misc/enrui/enrui_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define denrui_sceneCollisionHeader_0003B4 "__OTR__scenes/nonmq/enrui_scene/enrui_sceneCollisionHeader_0003B4" +#define denrui_sceneCollisionHeader_0003B4 "__OTR__scenes/shared/enrui_scene/enrui_sceneCollisionHeader_0003B4" static const ALIGN_ASSET(2) char enrui_sceneCollisionHeader_0003B4[] = denrui_sceneCollisionHeader_0003B4; diff --git a/soh/assets/scenes/misc/entra_n/entra_n_room_0.h b/soh/assets/scenes/misc/entra_n/entra_n_room_0.h index 8646b3cd9..1e69fcdde 100644 --- a/soh/assets/scenes/misc/entra_n/entra_n_room_0.h +++ b/soh/assets/scenes/misc/entra_n/entra_n_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dentra_n_room_0DL_000348 "__OTR__scenes/nonmq/entra_n_scene/entra_n_room_0DL_000348" +#define dentra_n_room_0DL_000348 "__OTR__scenes/shared/entra_n_scene/entra_n_room_0DL_000348" static const ALIGN_ASSET(2) char entra_n_room_0DL_000348[] = dentra_n_room_0DL_000348; diff --git a/soh/assets/scenes/misc/entra_n/entra_n_scene.h b/soh/assets/scenes/misc/entra_n/entra_n_scene.h index 611784121..594e5e5eb 100644 --- a/soh/assets/scenes/misc/entra_n/entra_n_scene.h +++ b/soh/assets/scenes/misc/entra_n/entra_n_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dentra_n_sceneCollisionHeader_0003F8 "__OTR__scenes/nonmq/entra_n_scene/entra_n_sceneCollisionHeader_0003F8" +#define dentra_n_sceneCollisionHeader_0003F8 "__OTR__scenes/shared/entra_n_scene/entra_n_sceneCollisionHeader_0003F8" static const ALIGN_ASSET(2) char entra_n_sceneCollisionHeader_0003F8[] = dentra_n_sceneCollisionHeader_0003F8; diff --git a/soh/assets/scenes/misc/hakaana/hakaana_room_0.h b/soh/assets/scenes/misc/hakaana/hakaana_room_0.h index 8dcb6c1a8..252e3f8a7 100644 --- a/soh/assets/scenes/misc/hakaana/hakaana_room_0.h +++ b/soh/assets/scenes/misc/hakaana/hakaana_room_0.h @@ -3,41 +3,41 @@ #include "align_asset_macro.h" -#define dhakaana_room_0DL_002620 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0DL_002620" -static const ALIGN_ASSET(2) char hakaana_room_0DL_002620[] = dhakaana_room_0DL_002620; - -#define dhakaana_room_0Tex_005E58 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_005E58" -static const ALIGN_ASSET(2) char hakaana_room_0Tex_005E58[] = dhakaana_room_0Tex_005E58; - -#define dhakaana_room_0Tex_002658 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_002658" +#define dhakaana_room_0Tex_002658 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_002658" static const ALIGN_ASSET(2) char hakaana_room_0Tex_002658[] = dhakaana_room_0Tex_002658; -#define dhakaana_room_0Tex_005658 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_005658" -static const ALIGN_ASSET(2) char hakaana_room_0Tex_005658[] = dhakaana_room_0Tex_005658; - -#define dhakaana_room_0Tex_003E58 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_003E58" -static const ALIGN_ASSET(2) char hakaana_room_0Tex_003E58[] = dhakaana_room_0Tex_003E58; - -#define dhakaana_room_0Tex_004E58 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_004E58" -static const ALIGN_ASSET(2) char hakaana_room_0Tex_004E58[] = dhakaana_room_0Tex_004E58; - -#define dhakaana_room_0Tex_004658 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_004658" -static const ALIGN_ASSET(2) char hakaana_room_0Tex_004658[] = dhakaana_room_0Tex_004658; - -#define dhakaana_room_0Tex_002E58 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_002E58" +#define dhakaana_room_0Tex_002E58 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_002E58" static const ALIGN_ASSET(2) char hakaana_room_0Tex_002E58[] = dhakaana_room_0Tex_002E58; -#define dhakaana_room_0Tex_003658 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_003658" -static const ALIGN_ASSET(2) char hakaana_room_0Tex_003658[] = dhakaana_room_0Tex_003658; - -#define dhakaana_room_0Tex_003258 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_003258" +#define dhakaana_room_0Tex_003258 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_003258" static const ALIGN_ASSET(2) char hakaana_room_0Tex_003258[] = dhakaana_room_0Tex_003258; -#define dhakaana_room_0DL_0068B8 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0DL_0068B8" -static const ALIGN_ASSET(2) char hakaana_room_0DL_0068B8[] = dhakaana_room_0DL_0068B8; +#define dhakaana_room_0Tex_003658 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_003658" +static const ALIGN_ASSET(2) char hakaana_room_0Tex_003658[] = dhakaana_room_0Tex_003658; -#define dhakaana_room_0Tex_0068C8 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_0068C8" +#define dhakaana_room_0Tex_003E58 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_003E58" +static const ALIGN_ASSET(2) char hakaana_room_0Tex_003E58[] = dhakaana_room_0Tex_003E58; + +#define dhakaana_room_0Tex_004658 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_004658" +static const ALIGN_ASSET(2) char hakaana_room_0Tex_004658[] = dhakaana_room_0Tex_004658; + +#define dhakaana_room_0Tex_004E58 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_004E58" +static const ALIGN_ASSET(2) char hakaana_room_0Tex_004E58[] = dhakaana_room_0Tex_004E58; + +#define dhakaana_room_0Tex_005658 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_005658" +static const ALIGN_ASSET(2) char hakaana_room_0Tex_005658[] = dhakaana_room_0Tex_005658; + +#define dhakaana_room_0Tex_005E58 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_005E58" +static const ALIGN_ASSET(2) char hakaana_room_0Tex_005E58[] = dhakaana_room_0Tex_005E58; + +#define dhakaana_room_0Tex_0068C8 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_0068C8" static const ALIGN_ASSET(2) char hakaana_room_0Tex_0068C8[] = dhakaana_room_0Tex_0068C8; +#define dhakaana_room_0DL_002620 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0DL_002620" +static const ALIGN_ASSET(2) char hakaana_room_0DL_002620[] = dhakaana_room_0DL_002620; + +#define dhakaana_room_0DL_0068B8 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0DL_0068B8" +static const ALIGN_ASSET(2) char hakaana_room_0DL_0068B8[] = dhakaana_room_0DL_0068B8; + #endif // MISC_HAKAANA_ROOM_0_H diff --git a/soh/assets/scenes/misc/hakaana/hakaana_scene.h b/soh/assets/scenes/misc/hakaana/hakaana_scene.h index 3bd09805b..01348d8f2 100644 --- a/soh/assets/scenes/misc/hakaana/hakaana_scene.h +++ b/soh/assets/scenes/misc/hakaana/hakaana_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dhakaana_sceneCollisionHeader_000A60 "__OTR__scenes/nonmq/hakaana_scene/hakaana_sceneCollisionHeader_000A60" +#define dhakaana_sceneCollisionHeader_000A60 "__OTR__scenes/shared/hakaana_scene/hakaana_sceneCollisionHeader_000A60" static const ALIGN_ASSET(2) char hakaana_sceneCollisionHeader_000A60[] = dhakaana_sceneCollisionHeader_000A60; diff --git a/soh/assets/scenes/misc/hakaana2/hakaana2_room_0.h b/soh/assets/scenes/misc/hakaana2/hakaana2_room_0.h index ad9347b0f..991f00c52 100644 --- a/soh/assets/scenes/misc/hakaana2/hakaana2_room_0.h +++ b/soh/assets/scenes/misc/hakaana2/hakaana2_room_0.h @@ -3,10 +3,10 @@ #include "align_asset_macro.h" -#define dhakaana2_room_0DL_005DD8 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_room_0DL_005DD8" +#define dhakaana2_room_0DL_005DD8 "__OTR__scenes/shared/hakaana2_scene/hakaana2_room_0DL_005DD8" static const ALIGN_ASSET(2) char hakaana2_room_0DL_005DD8[] = dhakaana2_room_0DL_005DD8; -#define dhakaana2_room_0DL_0067F8 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_room_0DL_0067F8" +#define dhakaana2_room_0DL_0067F8 "__OTR__scenes/shared/hakaana2_scene/hakaana2_room_0DL_0067F8" static const ALIGN_ASSET(2) char hakaana2_room_0DL_0067F8[] = dhakaana2_room_0DL_0067F8; diff --git a/soh/assets/scenes/misc/hakaana2/hakaana2_scene.h b/soh/assets/scenes/misc/hakaana2/hakaana2_scene.h index 8edaef403..25fae993e 100644 --- a/soh/assets/scenes/misc/hakaana2/hakaana2_scene.h +++ b/soh/assets/scenes/misc/hakaana2/hakaana2_scene.h @@ -3,61 +3,62 @@ #include "align_asset_macro.h" -#define dhakaana2_sceneCollisionHeader_003058 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneCollisionHeader_003058" -static const ALIGN_ASSET(2) char hakaana2_sceneCollisionHeader_003058[] = dhakaana2_sceneCollisionHeader_003058; - -#define dhakaana2_sceneTex_00A890 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_00A890" -static const ALIGN_ASSET(2) char hakaana2_sceneTex_00A890[] = dhakaana2_sceneTex_00A890; - -#define dhakaana2_sceneTex_00C890 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_00C890" -static const ALIGN_ASSET(2) char hakaana2_sceneTex_00C890[] = dhakaana2_sceneTex_00C890; - -#define dhakaana2_sceneTex_009890 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_009890" -static const ALIGN_ASSET(2) char hakaana2_sceneTex_009890[] = dhakaana2_sceneTex_009890; - -#define dhakaana2_sceneTex_007090 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_007090" -static const ALIGN_ASSET(2) char hakaana2_sceneTex_007090[] = dhakaana2_sceneTex_007090; - -#define dhakaana2_sceneTex_00A090 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_00A090" -static const ALIGN_ASSET(2) char hakaana2_sceneTex_00A090[] = dhakaana2_sceneTex_00A090; - -#define dhakaana2_sceneTex_009090 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_009090" -static const ALIGN_ASSET(2) char hakaana2_sceneTex_009090[] = dhakaana2_sceneTex_009090; - -#define dhakaana2_sceneTex_00C090 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_00C090" -static const ALIGN_ASSET(2) char hakaana2_sceneTex_00C090[] = dhakaana2_sceneTex_00C090; - -#define dhakaana2_sceneTex_005890 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_005890" -static const ALIGN_ASSET(2) char hakaana2_sceneTex_005890[] = dhakaana2_sceneTex_005890; - -#define dhakaana2_sceneTex_004890 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_004890" -static const ALIGN_ASSET(2) char hakaana2_sceneTex_004890[] = dhakaana2_sceneTex_004890; - -#define dhakaana2_sceneTex_006090 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_006090" -static const ALIGN_ASSET(2) char hakaana2_sceneTex_006090[] = dhakaana2_sceneTex_006090; - -#define dhakaana2_sceneTex_005090 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_005090" -static const ALIGN_ASSET(2) char hakaana2_sceneTex_005090[] = dhakaana2_sceneTex_005090; - -#define dhakaana2_sceneTex_003090 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_003090" +#define dhakaana2_sceneTex_003090 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_003090" static const ALIGN_ASSET(2) char hakaana2_sceneTex_003090[] = dhakaana2_sceneTex_003090; -#define dhakaana2_sceneTex_004490 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_004490" -static const ALIGN_ASSET(2) char hakaana2_sceneTex_004490[] = dhakaana2_sceneTex_004490; - -#define dhakaana2_sceneTex_003890 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_003890" +#define dhakaana2_sceneTex_003890 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_003890" static const ALIGN_ASSET(2) char hakaana2_sceneTex_003890[] = dhakaana2_sceneTex_003890; -#define dhakaana2_sceneTex_004090 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_004090" +#define dhakaana2_sceneTex_004090 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_004090" static const ALIGN_ASSET(2) char hakaana2_sceneTex_004090[] = dhakaana2_sceneTex_004090; -#define dhakaana2_sceneTex_00B890 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_00B890" -static const ALIGN_ASSET(2) char hakaana2_sceneTex_00B890[] = dhakaana2_sceneTex_00B890; +#define dhakaana2_sceneTex_004490 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_004490" +static const ALIGN_ASSET(2) char hakaana2_sceneTex_004490[] = dhakaana2_sceneTex_004490; -#define dhakaana2_sceneTex_006890 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_006890" +#define dhakaana2_sceneTex_004890 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_004890" +static const ALIGN_ASSET(2) char hakaana2_sceneTex_004890[] = dhakaana2_sceneTex_004890; + +#define dhakaana2_sceneTex_005090 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_005090" +static const ALIGN_ASSET(2) char hakaana2_sceneTex_005090[] = dhakaana2_sceneTex_005090; + +#define dhakaana2_sceneTex_005890 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_005890" +static const ALIGN_ASSET(2) char hakaana2_sceneTex_005890[] = dhakaana2_sceneTex_005890; + +#define dhakaana2_sceneTex_006090 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_006090" +static const ALIGN_ASSET(2) char hakaana2_sceneTex_006090[] = dhakaana2_sceneTex_006090; + +#define dhakaana2_sceneTex_006890 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_006890" static const ALIGN_ASSET(2) char hakaana2_sceneTex_006890[] = dhakaana2_sceneTex_006890; -#define dhakaana2_sceneTex_008090 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_008090" +#define dhakaana2_sceneTex_007090 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_007090" +static const ALIGN_ASSET(2) char hakaana2_sceneTex_007090[] = dhakaana2_sceneTex_007090; + +#define dhakaana2_sceneTex_008090 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_008090" static const ALIGN_ASSET(2) char hakaana2_sceneTex_008090[] = dhakaana2_sceneTex_008090; +#define dhakaana2_sceneTex_009090 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_009090" +static const ALIGN_ASSET(2) char hakaana2_sceneTex_009090[] = dhakaana2_sceneTex_009090; + +#define dhakaana2_sceneTex_009890 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_009890" +static const ALIGN_ASSET(2) char hakaana2_sceneTex_009890[] = dhakaana2_sceneTex_009890; + +#define dhakaana2_sceneTex_00A090 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_00A090" +static const ALIGN_ASSET(2) char hakaana2_sceneTex_00A090[] = dhakaana2_sceneTex_00A090; + +#define dhakaana2_sceneTex_00A890 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_00A890" +static const ALIGN_ASSET(2) char hakaana2_sceneTex_00A890[] = dhakaana2_sceneTex_00A890; + +#define dhakaana2_sceneTex_00B890 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_00B890" +static const ALIGN_ASSET(2) char hakaana2_sceneTex_00B890[] = dhakaana2_sceneTex_00B890; + +#define dhakaana2_sceneTex_00C090 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_00C090" +static const ALIGN_ASSET(2) char hakaana2_sceneTex_00C090[] = dhakaana2_sceneTex_00C090; + +#define dhakaana2_sceneTex_00C890 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_00C890" +static const ALIGN_ASSET(2) char hakaana2_sceneTex_00C890[] = dhakaana2_sceneTex_00C890; + +#define dhakaana2_sceneCollisionHeader_003058 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneCollisionHeader_003058" +static const ALIGN_ASSET(2) char hakaana2_sceneCollisionHeader_003058[] = dhakaana2_sceneCollisionHeader_003058; + + #endif // MISC_HAKAANA2_SCENE_H diff --git a/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_0.h b/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_0.h index c254c0e65..ba1230912 100644 --- a/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_0.h +++ b/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_0.h @@ -3,43 +3,43 @@ #include "align_asset_macro.h" -#define dhakaana_ouke_room_0DL_004F00 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0DL_004F00" -static const ALIGN_ASSET(2) char hakaana_ouke_room_0DL_004F00[] = dhakaana_ouke_room_0DL_004F00; - -#define dhakaana_ouke_room_0Tex_006F30 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0Tex_006F30" -static const ALIGN_ASSET(2) char hakaana_ouke_room_0Tex_006F30[] = dhakaana_ouke_room_0Tex_006F30; - -#define dhakaana_ouke_room_0Tex_006730 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0Tex_006730" -static const ALIGN_ASSET(2) char hakaana_ouke_room_0Tex_006730[] = dhakaana_ouke_room_0Tex_006730; - -#define dhakaana_ouke_room_0Tex_005730 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0Tex_005730" -static const ALIGN_ASSET(2) char hakaana_ouke_room_0Tex_005730[] = dhakaana_ouke_room_0Tex_005730; - -#define dhakaana_ouke_room_0Tex_004F30 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0Tex_004F30" +#define dhakaana_ouke_room_0Tex_004F30 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0Tex_004F30" static const ALIGN_ASSET(2) char hakaana_ouke_room_0Tex_004F30[] = dhakaana_ouke_room_0Tex_004F30; -#define dhakaana_ouke_room_0DL_007FD8 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0DL_007FD8" -static const ALIGN_ASSET(2) char hakaana_ouke_room_0DL_007FD8[] = dhakaana_ouke_room_0DL_007FD8; +#define dhakaana_ouke_room_0Tex_005730 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0Tex_005730" +static const ALIGN_ASSET(2) char hakaana_ouke_room_0Tex_005730[] = dhakaana_ouke_room_0Tex_005730; -#define dhakaana_ouke_room_0Tex_0097F8 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0Tex_0097F8" -static const ALIGN_ASSET(2) char hakaana_ouke_room_0Tex_0097F8[] = dhakaana_ouke_room_0Tex_0097F8; +#define dhakaana_ouke_room_0Tex_006730 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0Tex_006730" +static const ALIGN_ASSET(2) char hakaana_ouke_room_0Tex_006730[] = dhakaana_ouke_room_0Tex_006730; -#define dhakaana_ouke_room_0Tex_007FF8 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0Tex_007FF8" +#define dhakaana_ouke_room_0Tex_006F30 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0Tex_006F30" +static const ALIGN_ASSET(2) char hakaana_ouke_room_0Tex_006F30[] = dhakaana_ouke_room_0Tex_006F30; + +#define dhakaana_ouke_room_0Tex_007FF8 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0Tex_007FF8" static const ALIGN_ASSET(2) char hakaana_ouke_room_0Tex_007FF8[] = dhakaana_ouke_room_0Tex_007FF8; -#define dhakaana_ouke_room_0Tex_008FF8 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0Tex_008FF8" +#define dhakaana_ouke_room_0Tex_008FF8 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0Tex_008FF8" static const ALIGN_ASSET(2) char hakaana_ouke_room_0Tex_008FF8[] = dhakaana_ouke_room_0Tex_008FF8; -#define dhakaana_ouke_room_0Set_000130DL_004F00 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0Set_000130DL_004F00" +#define dhakaana_ouke_room_0Tex_0097F8 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0Tex_0097F8" +static const ALIGN_ASSET(2) char hakaana_ouke_room_0Tex_0097F8[] = dhakaana_ouke_room_0Tex_0097F8; + +#define dhakaana_ouke_room_0DL_004F00 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0DL_004F00" +static const ALIGN_ASSET(2) char hakaana_ouke_room_0DL_004F00[] = dhakaana_ouke_room_0DL_004F00; + +#define dhakaana_ouke_room_0DL_007FD8 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0DL_007FD8" +static const ALIGN_ASSET(2) char hakaana_ouke_room_0DL_007FD8[] = dhakaana_ouke_room_0DL_007FD8; + +#define dhakaana_ouke_room_0Set_000130DL_004F00 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0Set_000130DL_004F00" static const ALIGN_ASSET(2) char hakaana_ouke_room_0Set_000130DL_004F00[] = dhakaana_ouke_room_0Set_000130DL_004F00; -#define dhakaana_ouke_room_0Set_000130DL_007FD8 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0Set_000130DL_007FD8" +#define dhakaana_ouke_room_0Set_000130DL_007FD8 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0Set_000130DL_007FD8" static const ALIGN_ASSET(2) char hakaana_ouke_room_0Set_000130DL_007FD8[] = dhakaana_ouke_room_0Set_000130DL_007FD8; -#define dhakaana_ouke_room_0Set_0001B0DL_004F00 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0Set_0001B0DL_004F00" +#define dhakaana_ouke_room_0Set_0001B0DL_004F00 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0Set_0001B0DL_004F00" static const ALIGN_ASSET(2) char hakaana_ouke_room_0Set_0001B0DL_004F00[] = dhakaana_ouke_room_0Set_0001B0DL_004F00; -#define dhakaana_ouke_room_0Set_0001B0DL_007FD8 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0Set_0001B0DL_007FD8" +#define dhakaana_ouke_room_0Set_0001B0DL_007FD8 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0Set_0001B0DL_007FD8" static const ALIGN_ASSET(2) char hakaana_ouke_room_0Set_0001B0DL_007FD8[] = dhakaana_ouke_room_0Set_0001B0DL_007FD8; diff --git a/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_1.h b/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_1.h index 6a02b4a89..d7df82c0c 100644 --- a/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_1.h +++ b/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_1.h @@ -3,31 +3,31 @@ #include "align_asset_macro.h" -#define dhakaana_ouke_room_1DL_001FA0 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_1DL_001FA0" -static const ALIGN_ASSET(2) char hakaana_ouke_room_1DL_001FA0[] = dhakaana_ouke_room_1DL_001FA0; - -#define dhakaana_ouke_room_1Tex_001FC8 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_1Tex_001FC8" +#define dhakaana_ouke_room_1Tex_001FC8 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_1Tex_001FC8" static const ALIGN_ASSET(2) char hakaana_ouke_room_1Tex_001FC8[] = dhakaana_ouke_room_1Tex_001FC8; -#define dhakaana_ouke_room_1Tex_0027C8 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_1Tex_0027C8" +#define dhakaana_ouke_room_1Tex_0027C8 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_1Tex_0027C8" static const ALIGN_ASSET(2) char hakaana_ouke_room_1Tex_0027C8[] = dhakaana_ouke_room_1Tex_0027C8; -#define dhakaana_ouke_room_1DL_003FF0 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_1DL_003FF0" -static const ALIGN_ASSET(2) char hakaana_ouke_room_1DL_003FF0[] = dhakaana_ouke_room_1DL_003FF0; - -#define dhakaana_ouke_room_1Tex_004000 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_1Tex_004000" +#define dhakaana_ouke_room_1Tex_004000 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_1Tex_004000" static const ALIGN_ASSET(2) char hakaana_ouke_room_1Tex_004000[] = dhakaana_ouke_room_1Tex_004000; -#define dhakaana_ouke_room_1Set_0000C0DL_001FA0 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_1Set_0000C0DL_001FA0" +#define dhakaana_ouke_room_1DL_001FA0 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_1DL_001FA0" +static const ALIGN_ASSET(2) char hakaana_ouke_room_1DL_001FA0[] = dhakaana_ouke_room_1DL_001FA0; + +#define dhakaana_ouke_room_1DL_003FF0 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_1DL_003FF0" +static const ALIGN_ASSET(2) char hakaana_ouke_room_1DL_003FF0[] = dhakaana_ouke_room_1DL_003FF0; + +#define dhakaana_ouke_room_1Set_0000C0DL_001FA0 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_1Set_0000C0DL_001FA0" static const ALIGN_ASSET(2) char hakaana_ouke_room_1Set_0000C0DL_001FA0[] = dhakaana_ouke_room_1Set_0000C0DL_001FA0; -#define dhakaana_ouke_room_1Set_0000C0DL_003FF0 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_1Set_0000C0DL_003FF0" +#define dhakaana_ouke_room_1Set_0000C0DL_003FF0 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_1Set_0000C0DL_003FF0" static const ALIGN_ASSET(2) char hakaana_ouke_room_1Set_0000C0DL_003FF0[] = dhakaana_ouke_room_1Set_0000C0DL_003FF0; -#define dhakaana_ouke_room_1Set_000100DL_001FA0 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_1Set_000100DL_001FA0" +#define dhakaana_ouke_room_1Set_000100DL_001FA0 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_1Set_000100DL_001FA0" static const ALIGN_ASSET(2) char hakaana_ouke_room_1Set_000100DL_001FA0[] = dhakaana_ouke_room_1Set_000100DL_001FA0; -#define dhakaana_ouke_room_1Set_000100DL_003FF0 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_1Set_000100DL_003FF0" +#define dhakaana_ouke_room_1Set_000100DL_003FF0 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_1Set_000100DL_003FF0" static const ALIGN_ASSET(2) char hakaana_ouke_room_1Set_000100DL_003FF0[] = dhakaana_ouke_room_1Set_000100DL_003FF0; diff --git a/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_2.h b/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_2.h index 73f461be5..cd4f6b917 100644 --- a/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_2.h +++ b/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_2.h @@ -3,40 +3,40 @@ #include "align_asset_macro.h" -#define dhakaana_ouke_room_2DL_002738 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2DL_002738" -static const ALIGN_ASSET(2) char hakaana_ouke_room_2DL_002738[] = dhakaana_ouke_room_2DL_002738; - -#define dhakaana_ouke_room_2Tex_003F78 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2Tex_003F78" -static const ALIGN_ASSET(2) char hakaana_ouke_room_2Tex_003F78[] = dhakaana_ouke_room_2Tex_003F78; - -#define dhakaana_ouke_room_2Tex_004778 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2Tex_004778" -static const ALIGN_ASSET(2) char hakaana_ouke_room_2Tex_004778[] = dhakaana_ouke_room_2Tex_004778; - -#define dhakaana_ouke_room_2Tex_002778 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2Tex_002778" +#define dhakaana_ouke_room_2Tex_002778 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2Tex_002778" static const ALIGN_ASSET(2) char hakaana_ouke_room_2Tex_002778[] = dhakaana_ouke_room_2Tex_002778; -#define dhakaana_ouke_room_2Tex_003778 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2Tex_003778" -static const ALIGN_ASSET(2) char hakaana_ouke_room_2Tex_003778[] = dhakaana_ouke_room_2Tex_003778; - -#define dhakaana_ouke_room_2Tex_002F78 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2Tex_002F78" +#define dhakaana_ouke_room_2Tex_002F78 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2Tex_002F78" static const ALIGN_ASSET(2) char hakaana_ouke_room_2Tex_002F78[] = dhakaana_ouke_room_2Tex_002F78; -#define dhakaana_ouke_room_2DL_0050F8 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2DL_0050F8" -static const ALIGN_ASSET(2) char hakaana_ouke_room_2DL_0050F8[] = dhakaana_ouke_room_2DL_0050F8; +#define dhakaana_ouke_room_2Tex_003778 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2Tex_003778" +static const ALIGN_ASSET(2) char hakaana_ouke_room_2Tex_003778[] = dhakaana_ouke_room_2Tex_003778; -#define dhakaana_ouke_room_2Tex_005108 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2Tex_005108" +#define dhakaana_ouke_room_2Tex_003F78 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2Tex_003F78" +static const ALIGN_ASSET(2) char hakaana_ouke_room_2Tex_003F78[] = dhakaana_ouke_room_2Tex_003F78; + +#define dhakaana_ouke_room_2Tex_004778 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2Tex_004778" +static const ALIGN_ASSET(2) char hakaana_ouke_room_2Tex_004778[] = dhakaana_ouke_room_2Tex_004778; + +#define dhakaana_ouke_room_2Tex_005108 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2Tex_005108" static const ALIGN_ASSET(2) char hakaana_ouke_room_2Tex_005108[] = dhakaana_ouke_room_2Tex_005108; -#define dhakaana_ouke_room_2Set_0000C0DL_002738 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2Set_0000C0DL_002738" +#define dhakaana_ouke_room_2DL_002738 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2DL_002738" +static const ALIGN_ASSET(2) char hakaana_ouke_room_2DL_002738[] = dhakaana_ouke_room_2DL_002738; + +#define dhakaana_ouke_room_2DL_0050F8 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2DL_0050F8" +static const ALIGN_ASSET(2) char hakaana_ouke_room_2DL_0050F8[] = dhakaana_ouke_room_2DL_0050F8; + +#define dhakaana_ouke_room_2Set_0000C0DL_002738 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2Set_0000C0DL_002738" static const ALIGN_ASSET(2) char hakaana_ouke_room_2Set_0000C0DL_002738[] = dhakaana_ouke_room_2Set_0000C0DL_002738; -#define dhakaana_ouke_room_2Set_0000C0DL_0050F8 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2Set_0000C0DL_0050F8" +#define dhakaana_ouke_room_2Set_0000C0DL_0050F8 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2Set_0000C0DL_0050F8" static const ALIGN_ASSET(2) char hakaana_ouke_room_2Set_0000C0DL_0050F8[] = dhakaana_ouke_room_2Set_0000C0DL_0050F8; -#define dhakaana_ouke_room_2Set_000140DL_002738 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2Set_000140DL_002738" +#define dhakaana_ouke_room_2Set_000140DL_002738 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2Set_000140DL_002738" static const ALIGN_ASSET(2) char hakaana_ouke_room_2Set_000140DL_002738[] = dhakaana_ouke_room_2Set_000140DL_002738; -#define dhakaana_ouke_room_2Set_000140DL_0050F8 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2Set_000140DL_0050F8" +#define dhakaana_ouke_room_2Set_000140DL_0050F8 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2Set_000140DL_0050F8" static const ALIGN_ASSET(2) char hakaana_ouke_room_2Set_000140DL_0050F8[] = dhakaana_ouke_room_2Set_000140DL_0050F8; diff --git a/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.h b/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.h index 5c791a6c0..3ea0d7d5f 100644 --- a/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.h +++ b/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.h @@ -3,33 +3,33 @@ #include "align_asset_macro.h" -#define dgSunSongGraveSunSongTeachCs "__OTR__scenes/nonmq/hakaana_ouke_scene/gSunSongGraveSunSongTeachCs" -static const ALIGN_ASSET(2) char gSunSongGraveSunSongTeachCs[] = dgSunSongGraveSunSongTeachCs; - -#define dgSunSongGraveSunSongTeachPart2Cs "__OTR__scenes/nonmq/hakaana_ouke_scene/gSunSongGraveSunSongTeachPart2Cs" -static const ALIGN_ASSET(2) char gSunSongGraveSunSongTeachPart2Cs[] = dgSunSongGraveSunSongTeachPart2Cs; - -#define dhakaana_ouke_sceneCollisionHeader_002250 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_sceneCollisionHeader_002250" -static const ALIGN_ASSET(2) char hakaana_ouke_sceneCollisionHeader_002250[] = dhakaana_ouke_sceneCollisionHeader_002250; - -#define dhakaana_ouke_sceneTex_0042E0 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_sceneTex_0042E0" -static const ALIGN_ASSET(2) char hakaana_ouke_sceneTex_0042E0[] = dhakaana_ouke_sceneTex_0042E0; - -#define dhakaana_ouke_sceneTex_003AE0 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_sceneTex_003AE0" -static const ALIGN_ASSET(2) char hakaana_ouke_sceneTex_003AE0[] = dhakaana_ouke_sceneTex_003AE0; - -#define dhakaana_ouke_sceneTex_002EE0 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_sceneTex_002EE0" -static const ALIGN_ASSET(2) char hakaana_ouke_sceneTex_002EE0[] = dhakaana_ouke_sceneTex_002EE0; - -#define dhakaana_ouke_sceneTex_0032E0 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_sceneTex_0032E0" -static const ALIGN_ASSET(2) char hakaana_ouke_sceneTex_0032E0[] = dhakaana_ouke_sceneTex_0032E0; - -#define dhakaana_ouke_sceneTex_002AE0 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_sceneTex_002AE0" +#define dhakaana_ouke_sceneTex_002AE0 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_sceneTex_002AE0" static const ALIGN_ASSET(2) char hakaana_ouke_sceneTex_002AE0[] = dhakaana_ouke_sceneTex_002AE0; -#define dhakaana_ouke_sceneCollisionHeader_002250 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_sceneCollisionHeader_002250" +#define dhakaana_ouke_sceneTex_002EE0 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_sceneTex_002EE0" +static const ALIGN_ASSET(2) char hakaana_ouke_sceneTex_002EE0[] = dhakaana_ouke_sceneTex_002EE0; -#define dhakaana_ouke_sceneCollisionHeader_002250 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_sceneCollisionHeader_002250" +#define dhakaana_ouke_sceneTex_0032E0 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_sceneTex_0032E0" +static const ALIGN_ASSET(2) char hakaana_ouke_sceneTex_0032E0[] = dhakaana_ouke_sceneTex_0032E0; + +#define dhakaana_ouke_sceneTex_003AE0 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_sceneTex_003AE0" +static const ALIGN_ASSET(2) char hakaana_ouke_sceneTex_003AE0[] = dhakaana_ouke_sceneTex_003AE0; + +#define dhakaana_ouke_sceneTex_0042E0 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_sceneTex_0042E0" +static const ALIGN_ASSET(2) char hakaana_ouke_sceneTex_0042E0[] = dhakaana_ouke_sceneTex_0042E0; + +#define dgSunSongGraveSunSongTeachCs "__OTR__scenes/shared/hakaana_ouke_scene/gSunSongGraveSunSongTeachCs" +static const ALIGN_ASSET(2) char gSunSongGraveSunSongTeachCs[] = dgSunSongGraveSunSongTeachCs; + +#define dgSunSongGraveSunSongTeachPart2Cs "__OTR__scenes/shared/hakaana_ouke_scene/gSunSongGraveSunSongTeachPart2Cs" +static const ALIGN_ASSET(2) char gSunSongGraveSunSongTeachPart2Cs[] = dgSunSongGraveSunSongTeachPart2Cs; + +#define dhakaana_ouke_sceneCollisionHeader_002250 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_sceneCollisionHeader_002250" +static const ALIGN_ASSET(2) char hakaana_ouke_sceneCollisionHeader_002250[] = dhakaana_ouke_sceneCollisionHeader_002250; + +#define dhakaana_ouke_sceneCollisionHeader_002250 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_sceneCollisionHeader_002250" + +#define dhakaana_ouke_sceneCollisionHeader_002250 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_sceneCollisionHeader_002250" #endif // MISC_HAKAANA_OUKE_SCENE_H diff --git a/soh/assets/scenes/misc/hiral_demo/hiral_demo_room_0.h b/soh/assets/scenes/misc/hiral_demo/hiral_demo_room_0.h index a0ccc89c3..badd377e5 100644 --- a/soh/assets/scenes/misc/hiral_demo/hiral_demo_room_0.h +++ b/soh/assets/scenes/misc/hiral_demo/hiral_demo_room_0.h @@ -3,34 +3,34 @@ #include "align_asset_macro.h" -#define dhiral_demo_room_0DL_000630 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_room_0DL_000630" +#define dhiral_demo_room_0DL_000630 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_room_0DL_000630" static const ALIGN_ASSET(2) char hiral_demo_room_0DL_000630[] = dhiral_demo_room_0DL_000630; -#define dhiral_demo_room_0Set_0001E0DL_000630 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_room_0Set_0001E0DL_000630" +#define dhiral_demo_room_0Set_0001E0DL_000630 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_room_0Set_0001E0DL_000630" static const ALIGN_ASSET(2) char hiral_demo_room_0Set_0001E0DL_000630[] = dhiral_demo_room_0Set_0001E0DL_000630; -#define dhiral_demo_room_0Set_000270DL_000630 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_room_0Set_000270DL_000630" +#define dhiral_demo_room_0Set_000270DL_000630 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_room_0Set_000270DL_000630" static const ALIGN_ASSET(2) char hiral_demo_room_0Set_000270DL_000630[] = dhiral_demo_room_0Set_000270DL_000630; -#define dhiral_demo_room_0Set_0002E0DL_000630 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_room_0Set_0002E0DL_000630" +#define dhiral_demo_room_0Set_0002E0DL_000630 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_room_0Set_0002E0DL_000630" static const ALIGN_ASSET(2) char hiral_demo_room_0Set_0002E0DL_000630[] = dhiral_demo_room_0Set_0002E0DL_000630; -#define dhiral_demo_room_0Set_000380DL_000630 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_room_0Set_000380DL_000630" +#define dhiral_demo_room_0Set_000380DL_000630 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_room_0Set_000380DL_000630" static const ALIGN_ASSET(2) char hiral_demo_room_0Set_000380DL_000630[] = dhiral_demo_room_0Set_000380DL_000630; -#define dhiral_demo_room_0Set_0003E0DL_000630 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_room_0Set_0003E0DL_000630" +#define dhiral_demo_room_0Set_0003E0DL_000630 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_room_0Set_0003E0DL_000630" static const ALIGN_ASSET(2) char hiral_demo_room_0Set_0003E0DL_000630[] = dhiral_demo_room_0Set_0003E0DL_000630; -#define dhiral_demo_room_0Set_000450DL_000630 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_room_0Set_000450DL_000630" +#define dhiral_demo_room_0Set_000450DL_000630 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_room_0Set_000450DL_000630" static const ALIGN_ASSET(2) char hiral_demo_room_0Set_000450DL_000630[] = dhiral_demo_room_0Set_000450DL_000630; -#define dhiral_demo_room_0Set_0004C0DL_000630 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_room_0Set_0004C0DL_000630" +#define dhiral_demo_room_0Set_0004C0DL_000630 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_room_0Set_0004C0DL_000630" static const ALIGN_ASSET(2) char hiral_demo_room_0Set_0004C0DL_000630[] = dhiral_demo_room_0Set_0004C0DL_000630; -#define dhiral_demo_room_0Set_000530DL_000630 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_room_0Set_000530DL_000630" +#define dhiral_demo_room_0Set_000530DL_000630 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_room_0Set_000530DL_000630" static const ALIGN_ASSET(2) char hiral_demo_room_0Set_000530DL_000630[] = dhiral_demo_room_0Set_000530DL_000630; -#define dhiral_demo_room_0Set_0005D0DL_000630 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_room_0Set_0005D0DL_000630" +#define dhiral_demo_room_0Set_0005D0DL_000630 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_room_0Set_0005D0DL_000630" static const ALIGN_ASSET(2) char hiral_demo_room_0Set_0005D0DL_000630[] = dhiral_demo_room_0Set_0005D0DL_000630; diff --git a/soh/assets/scenes/misc/hiral_demo/hiral_demo_scene.h b/soh/assets/scenes/misc/hiral_demo/hiral_demo_scene.h index 3c10c20bc..cbe9ec2a7 100644 --- a/soh/assets/scenes/misc/hiral_demo/hiral_demo_scene.h +++ b/soh/assets/scenes/misc/hiral_demo/hiral_demo_scene.h @@ -3,26 +3,26 @@ #include "align_asset_macro.h" -#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548" +#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548" static const ALIGN_ASSET(2) char hiral_demo_sceneCollisionHeader_003548[] = dhiral_demo_sceneCollisionHeader_003548; -#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548" +#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548" -#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548" +#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548" -#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548" +#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548" -#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548" +#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548" -#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548" +#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548" -#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548" +#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548" -#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548" +#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548" -#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548" +#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548" -#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548" +#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548" #endif // MISC_HIRAL_DEMO_SCENE_H diff --git a/soh/assets/scenes/misc/kakariko3/kakariko3_room_0.h b/soh/assets/scenes/misc/kakariko3/kakariko3_room_0.h index 5fcf29417..d69d171ff 100644 --- a/soh/assets/scenes/misc/kakariko3/kakariko3_room_0.h +++ b/soh/assets/scenes/misc/kakariko3/kakariko3_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dkakariko3_room_0DL_004D20 "__OTR__scenes/nonmq/kakariko3_scene/kakariko3_room_0DL_004D20" +#define dkakariko3_room_0DL_004D20 "__OTR__scenes/shared/kakariko3_scene/kakariko3_room_0DL_004D20" static const ALIGN_ASSET(2) char kakariko3_room_0DL_004D20[] = dkakariko3_room_0DL_004D20; diff --git a/soh/assets/scenes/misc/kakariko3/kakariko3_scene.h b/soh/assets/scenes/misc/kakariko3/kakariko3_scene.h index 9a8f07f3c..36acc9207 100644 --- a/soh/assets/scenes/misc/kakariko3/kakariko3_scene.h +++ b/soh/assets/scenes/misc/kakariko3/kakariko3_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dkakariko3_sceneCollisionHeader_000808 "__OTR__scenes/nonmq/kakariko3_scene/kakariko3_sceneCollisionHeader_000808" +#define dkakariko3_sceneCollisionHeader_000808 "__OTR__scenes/shared/kakariko3_scene/kakariko3_sceneCollisionHeader_000808" static const ALIGN_ASSET(2) char kakariko3_sceneCollisionHeader_000808[] = dkakariko3_sceneCollisionHeader_000808; diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_0.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_0.h index 8a867b685..d743fffe3 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_0.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_0.h @@ -3,52 +3,52 @@ #include "align_asset_macro.h" -#define dkakusiana_room_0DL_0064A0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0DL_0064A0" -static const ALIGN_ASSET(2) char kakusiana_room_0DL_0064A0[] = dkakusiana_room_0DL_0064A0; - -#define dkakusiana_room_0DL_0021C0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0DL_0021C0" -static const ALIGN_ASSET(2) char kakusiana_room_0DL_0021C0[] = dkakusiana_room_0DL_0021C0; - -#define dkakusiana_room_0DL_0069F0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0DL_0069F0" -static const ALIGN_ASSET(2) char kakusiana_room_0DL_0069F0[] = dkakusiana_room_0DL_0069F0; - -#define dkakusiana_room_0DL_000E58 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0DL_000E58" -static const ALIGN_ASSET(2) char kakusiana_room_0DL_000E58[] = dkakusiana_room_0DL_000E58; - -#define dkakusiana_room_0Tex_005AA0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0Tex_005AA0" -static const ALIGN_ASSET(2) char kakusiana_room_0Tex_005AA0[] = dkakusiana_room_0Tex_005AA0; - -#define dkakusiana_room_0DL_0066A8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0DL_0066A8" -static const ALIGN_ASSET(2) char kakusiana_room_0DL_0066A8[] = dkakusiana_room_0DL_0066A8; - -#define dkakusiana_room_0DL_001DC8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0DL_001DC8" -static const ALIGN_ASSET(2) char kakusiana_room_0DL_001DC8[] = dkakusiana_room_0DL_001DC8; - -#define dkakusiana_room_0Tex_0042A0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0Tex_0042A0" -static const ALIGN_ASSET(2) char kakusiana_room_0Tex_0042A0[] = dkakusiana_room_0Tex_0042A0; - -#define dkakusiana_room_0Tex_0032A0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0Tex_0032A0" -static const ALIGN_ASSET(2) char kakusiana_room_0Tex_0032A0[] = dkakusiana_room_0Tex_0032A0; - -#define dkakusiana_room_0Tex_0022A0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0Tex_0022A0" +#define dkakusiana_room_0Tex_0022A0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0Tex_0022A0" static const ALIGN_ASSET(2) char kakusiana_room_0Tex_0022A0[] = dkakusiana_room_0Tex_0022A0; -#define dkakusiana_room_0DL_0007D0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0DL_0007D0" -static const ALIGN_ASSET(2) char kakusiana_room_0DL_0007D0[] = dkakusiana_room_0DL_0007D0; +#define dkakusiana_room_0Tex_0032A0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0Tex_0032A0" +static const ALIGN_ASSET(2) char kakusiana_room_0Tex_0032A0[] = dkakusiana_room_0Tex_0032A0; -#define dkakusiana_room_0Tex_004AA0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0Tex_004AA0" +#define dkakusiana_room_0Tex_0042A0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0Tex_0042A0" +static const ALIGN_ASSET(2) char kakusiana_room_0Tex_0042A0[] = dkakusiana_room_0Tex_0042A0; + +#define dkakusiana_room_0Tex_004AA0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0Tex_004AA0" static const ALIGN_ASSET(2) char kakusiana_room_0Tex_004AA0[] = dkakusiana_room_0Tex_004AA0; -#define dkakusiana_room_0DL_006838 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0DL_006838" -static const ALIGN_ASSET(2) char kakusiana_room_0DL_006838[] = dkakusiana_room_0DL_006838; +#define dkakusiana_room_0Tex_005AA0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0Tex_005AA0" +static const ALIGN_ASSET(2) char kakusiana_room_0Tex_005AA0[] = dkakusiana_room_0Tex_005AA0; -#define dkakusiana_room_0Tex_006AA0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0Tex_006AA0" +#define dkakusiana_room_0Tex_006AA0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0Tex_006AA0" static const ALIGN_ASSET(2) char kakusiana_room_0Tex_006AA0[] = dkakusiana_room_0Tex_006AA0; -#define dkakusiana_room_0DL_001600 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0DL_001600" +#define dkakusiana_room_0DL_0064A0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0DL_0064A0" +static const ALIGN_ASSET(2) char kakusiana_room_0DL_0064A0[] = dkakusiana_room_0DL_0064A0; + +#define dkakusiana_room_0DL_0021C0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0DL_0021C0" +static const ALIGN_ASSET(2) char kakusiana_room_0DL_0021C0[] = dkakusiana_room_0DL_0021C0; + +#define dkakusiana_room_0DL_0069F0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0DL_0069F0" +static const ALIGN_ASSET(2) char kakusiana_room_0DL_0069F0[] = dkakusiana_room_0DL_0069F0; + +#define dkakusiana_room_0DL_000E58 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0DL_000E58" +static const ALIGN_ASSET(2) char kakusiana_room_0DL_000E58[] = dkakusiana_room_0DL_000E58; + +#define dkakusiana_room_0DL_0066A8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0DL_0066A8" +static const ALIGN_ASSET(2) char kakusiana_room_0DL_0066A8[] = dkakusiana_room_0DL_0066A8; + +#define dkakusiana_room_0DL_001DC8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0DL_001DC8" +static const ALIGN_ASSET(2) char kakusiana_room_0DL_001DC8[] = dkakusiana_room_0DL_001DC8; + +#define dkakusiana_room_0DL_0007D0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0DL_0007D0" +static const ALIGN_ASSET(2) char kakusiana_room_0DL_0007D0[] = dkakusiana_room_0DL_0007D0; + +#define dkakusiana_room_0DL_006838 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0DL_006838" +static const ALIGN_ASSET(2) char kakusiana_room_0DL_006838[] = dkakusiana_room_0DL_006838; + +#define dkakusiana_room_0DL_001600 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0DL_001600" static const ALIGN_ASSET(2) char kakusiana_room_0DL_001600[] = dkakusiana_room_0DL_001600; -#define dkakusiana_room_0DL_0013B8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0DL_0013B8" +#define dkakusiana_room_0DL_0013B8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0DL_0013B8" static const ALIGN_ASSET(2) char kakusiana_room_0DL_0013B8[] = dkakusiana_room_0DL_0013B8; diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_1.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_1.h index e6fedee9f..66b31f787 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_1.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_1.h @@ -3,43 +3,43 @@ #include "align_asset_macro.h" -#define dkakusiana_room_1DL_004420 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1DL_004420" -static const ALIGN_ASSET(2) char kakusiana_room_1DL_004420[] = dkakusiana_room_1DL_004420; - -#define dkakusiana_room_1DL_001280 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1DL_001280" -static const ALIGN_ASSET(2) char kakusiana_room_1DL_001280[] = dkakusiana_room_1DL_001280; - -#define dkakusiana_room_1Tex_003218 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1Tex_003218" -static const ALIGN_ASSET(2) char kakusiana_room_1Tex_003218[] = dkakusiana_room_1Tex_003218; - -#define dkakusiana_room_1DL_004870 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1DL_004870" -static const ALIGN_ASSET(2) char kakusiana_room_1DL_004870[] = dkakusiana_room_1DL_004870; - -#define dkakusiana_room_1Tex_004990 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1Tex_004990" -static const ALIGN_ASSET(2) char kakusiana_room_1Tex_004990[] = dkakusiana_room_1Tex_004990; - -#define dkakusiana_room_1DL_0006E0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1DL_0006E0" -static const ALIGN_ASSET(2) char kakusiana_room_1DL_0006E0[] = dkakusiana_room_1DL_0006E0; - -#define dkakusiana_room_1Tex_001A18 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1Tex_001A18" +#define dkakusiana_room_1Tex_001A18 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1Tex_001A18" static const ALIGN_ASSET(2) char kakusiana_room_1Tex_001A18[] = dkakusiana_room_1Tex_001A18; -#define dkakusiana_room_1DL_0016F8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1DL_0016F8" -static const ALIGN_ASSET(2) char kakusiana_room_1DL_0016F8[] = dkakusiana_room_1DL_0016F8; - -#define dkakusiana_room_1Tex_002A18 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1Tex_002A18" +#define dkakusiana_room_1Tex_002A18 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1Tex_002A18" static const ALIGN_ASSET(2) char kakusiana_room_1Tex_002A18[] = dkakusiana_room_1Tex_002A18; -#define dkakusiana_room_1DL_001560 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1DL_001560" +#define dkakusiana_room_1Tex_003218 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1Tex_003218" +static const ALIGN_ASSET(2) char kakusiana_room_1Tex_003218[] = dkakusiana_room_1Tex_003218; + +#define dkakusiana_room_1Tex_004990 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1Tex_004990" +static const ALIGN_ASSET(2) char kakusiana_room_1Tex_004990[] = dkakusiana_room_1Tex_004990; + +#define dkakusiana_room_1DL_004420 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1DL_004420" +static const ALIGN_ASSET(2) char kakusiana_room_1DL_004420[] = dkakusiana_room_1DL_004420; + +#define dkakusiana_room_1DL_001280 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1DL_001280" +static const ALIGN_ASSET(2) char kakusiana_room_1DL_001280[] = dkakusiana_room_1DL_001280; + +#define dkakusiana_room_1DL_004870 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1DL_004870" +static const ALIGN_ASSET(2) char kakusiana_room_1DL_004870[] = dkakusiana_room_1DL_004870; + +#define dkakusiana_room_1DL_0006E0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1DL_0006E0" +static const ALIGN_ASSET(2) char kakusiana_room_1DL_0006E0[] = dkakusiana_room_1DL_0006E0; + +#define dkakusiana_room_1DL_0016F8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1DL_0016F8" +static const ALIGN_ASSET(2) char kakusiana_room_1DL_0016F8[] = dkakusiana_room_1DL_0016F8; + +#define dkakusiana_room_1DL_001560 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1DL_001560" static const ALIGN_ASSET(2) char kakusiana_room_1DL_001560[] = dkakusiana_room_1DL_001560; -#define dkakusiana_room_1DL_001938 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1DL_001938" +#define dkakusiana_room_1DL_001938 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1DL_001938" static const ALIGN_ASSET(2) char kakusiana_room_1DL_001938[] = dkakusiana_room_1DL_001938; -#define dkakusiana_room_1DL_0045E8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1DL_0045E8" +#define dkakusiana_room_1DL_0045E8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1DL_0045E8" static const ALIGN_ASSET(2) char kakusiana_room_1DL_0045E8[] = dkakusiana_room_1DL_0045E8; -#define dkakusiana_room_1DL_000BE8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1DL_000BE8" +#define dkakusiana_room_1DL_000BE8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1DL_000BE8" static const ALIGN_ASSET(2) char kakusiana_room_1DL_000BE8[] = dkakusiana_room_1DL_000BE8; diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_10.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_10.h index 7aa366fa9..267c3c805 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_10.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_10.h @@ -3,50 +3,50 @@ #include "align_asset_macro.h" -#define dkakusiana_room_10DL_004DE0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10DL_004DE0" -static const ALIGN_ASSET(2) char kakusiana_room_10DL_004DE0[] = dkakusiana_room_10DL_004DE0; - -#define dkakusiana_room_10DL_001330 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10DL_001330" -static const ALIGN_ASSET(2) char kakusiana_room_10DL_001330[] = dkakusiana_room_10DL_001330; - -#define dkakusiana_room_10Tex_0017E0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10Tex_0017E0" +#define dkakusiana_room_10Tex_0017E0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10Tex_0017E0" static const ALIGN_ASSET(2) char kakusiana_room_10Tex_0017E0[] = dkakusiana_room_10Tex_0017E0; -#define dkakusiana_room_10Tex_0027E0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10Tex_0027E0" -static const ALIGN_ASSET(2) char kakusiana_room_10Tex_0027E0[] = dkakusiana_room_10Tex_0027E0; - -#define dkakusiana_room_10DL_001088 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10DL_001088" -static const ALIGN_ASSET(2) char kakusiana_room_10DL_001088[] = dkakusiana_room_10DL_001088; - -#define dkakusiana_room_10Tex_003BE0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10Tex_003BE0" -static const ALIGN_ASSET(2) char kakusiana_room_10Tex_003BE0[] = dkakusiana_room_10Tex_003BE0; - -#define dkakusiana_room_10DL_004FB8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10DL_004FB8" -static const ALIGN_ASSET(2) char kakusiana_room_10DL_004FB8[] = dkakusiana_room_10DL_004FB8; - -#define dkakusiana_room_10Tex_005228 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10Tex_005228" -static const ALIGN_ASSET(2) char kakusiana_room_10Tex_005228[] = dkakusiana_room_10Tex_005228; - -#define dkakusiana_room_10DL_001538 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10DL_001538" -static const ALIGN_ASSET(2) char kakusiana_room_10DL_001538[] = dkakusiana_room_10DL_001538; - -#define dkakusiana_room_10DL_001700 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10DL_001700" -static const ALIGN_ASSET(2) char kakusiana_room_10DL_001700[] = dkakusiana_room_10DL_001700; - -#define dkakusiana_room_10DL_005180 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10DL_005180" -static const ALIGN_ASSET(2) char kakusiana_room_10DL_005180[] = dkakusiana_room_10DL_005180; - -#define dkakusiana_room_10DL_000D18 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10DL_000D18" -static const ALIGN_ASSET(2) char kakusiana_room_10DL_000D18[] = dkakusiana_room_10DL_000D18; - -#define dkakusiana_room_10Tex_001FE0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10Tex_001FE0" +#define dkakusiana_room_10Tex_001FE0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10Tex_001FE0" static const ALIGN_ASSET(2) char kakusiana_room_10Tex_001FE0[] = dkakusiana_room_10Tex_001FE0; -#define dkakusiana_room_10DL_000700 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10DL_000700" -static const ALIGN_ASSET(2) char kakusiana_room_10DL_000700[] = dkakusiana_room_10DL_000700; +#define dkakusiana_room_10Tex_0027E0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10Tex_0027E0" +static const ALIGN_ASSET(2) char kakusiana_room_10Tex_0027E0[] = dkakusiana_room_10Tex_0027E0; -#define dkakusiana_room_10Tex_002BE0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10Tex_002BE0" +#define dkakusiana_room_10Tex_002BE0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10Tex_002BE0" static const ALIGN_ASSET(2) char kakusiana_room_10Tex_002BE0[] = dkakusiana_room_10Tex_002BE0; +#define dkakusiana_room_10Tex_003BE0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10Tex_003BE0" +static const ALIGN_ASSET(2) char kakusiana_room_10Tex_003BE0[] = dkakusiana_room_10Tex_003BE0; + +#define dkakusiana_room_10Tex_005228 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10Tex_005228" +static const ALIGN_ASSET(2) char kakusiana_room_10Tex_005228[] = dkakusiana_room_10Tex_005228; + +#define dkakusiana_room_10DL_004DE0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10DL_004DE0" +static const ALIGN_ASSET(2) char kakusiana_room_10DL_004DE0[] = dkakusiana_room_10DL_004DE0; + +#define dkakusiana_room_10DL_001330 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10DL_001330" +static const ALIGN_ASSET(2) char kakusiana_room_10DL_001330[] = dkakusiana_room_10DL_001330; + +#define dkakusiana_room_10DL_001088 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10DL_001088" +static const ALIGN_ASSET(2) char kakusiana_room_10DL_001088[] = dkakusiana_room_10DL_001088; + +#define dkakusiana_room_10DL_004FB8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10DL_004FB8" +static const ALIGN_ASSET(2) char kakusiana_room_10DL_004FB8[] = dkakusiana_room_10DL_004FB8; + +#define dkakusiana_room_10DL_001538 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10DL_001538" +static const ALIGN_ASSET(2) char kakusiana_room_10DL_001538[] = dkakusiana_room_10DL_001538; + +#define dkakusiana_room_10DL_001700 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10DL_001700" +static const ALIGN_ASSET(2) char kakusiana_room_10DL_001700[] = dkakusiana_room_10DL_001700; + +#define dkakusiana_room_10DL_005180 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10DL_005180" +static const ALIGN_ASSET(2) char kakusiana_room_10DL_005180[] = dkakusiana_room_10DL_005180; + +#define dkakusiana_room_10DL_000D18 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10DL_000D18" +static const ALIGN_ASSET(2) char kakusiana_room_10DL_000D18[] = dkakusiana_room_10DL_000D18; + +#define dkakusiana_room_10DL_000700 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10DL_000700" +static const ALIGN_ASSET(2) char kakusiana_room_10DL_000700[] = dkakusiana_room_10DL_000700; + #endif // MISC_KAKUSIANA_ROOM_10_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_11.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_11.h index dee4a680e..1b33c8b71 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_11.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_11.h @@ -3,53 +3,53 @@ #include "align_asset_macro.h" -#define dkakusiana_room_11DL_008250 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11DL_008250" -static const ALIGN_ASSET(2) char kakusiana_room_11DL_008250[] = dkakusiana_room_11DL_008250; - -#define dkakusiana_room_11DL_0006D0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11DL_0006D0" -static const ALIGN_ASSET(2) char kakusiana_room_11DL_0006D0[] = dkakusiana_room_11DL_0006D0; - -#define dkakusiana_room_11Tex_005048 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11Tex_005048" -static const ALIGN_ASSET(2) char kakusiana_room_11Tex_005048[] = dkakusiana_room_11Tex_005048; - -#define dkakusiana_room_11Tex_002848 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11Tex_002848" +#define dkakusiana_room_11Tex_002848 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11Tex_002848" static const ALIGN_ASSET(2) char kakusiana_room_11Tex_002848[] = dkakusiana_room_11Tex_002848; -#define dkakusiana_room_11DL_000340 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11DL_000340" -static const ALIGN_ASSET(2) char kakusiana_room_11DL_000340[] = dkakusiana_room_11DL_000340; +#define dkakusiana_room_11Tex_003048 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11Tex_003048" +static const ALIGN_ASSET(2) char kakusiana_room_11Tex_003048[] = dkakusiana_room_11Tex_003048; -#define dkakusiana_room_11DL_0023E8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11DL_0023E8" -static const ALIGN_ASSET(2) char kakusiana_room_11DL_0023E8[] = dkakusiana_room_11DL_0023E8; - -#define dkakusiana_room_11Tex_006848 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11Tex_006848" -static const ALIGN_ASSET(2) char kakusiana_room_11Tex_006848[] = dkakusiana_room_11Tex_006848; - -#define dkakusiana_room_11Tex_005848 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11Tex_005848" -static const ALIGN_ASSET(2) char kakusiana_room_11Tex_005848[] = dkakusiana_room_11Tex_005848; - -#define dkakusiana_room_11Tex_007848 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11Tex_007848" -static const ALIGN_ASSET(2) char kakusiana_room_11Tex_007848[] = dkakusiana_room_11Tex_007848; - -#define dkakusiana_room_11DL_0085C0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11DL_0085C0" -static const ALIGN_ASSET(2) char kakusiana_room_11DL_0085C0[] = dkakusiana_room_11DL_0085C0; - -#define dkakusiana_room_11DL_001430 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11DL_001430" -static const ALIGN_ASSET(2) char kakusiana_room_11DL_001430[] = dkakusiana_room_11DL_001430; - -#define dkakusiana_room_11DL_008418 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11DL_008418" -static const ALIGN_ASSET(2) char kakusiana_room_11DL_008418[] = dkakusiana_room_11DL_008418; - -#define dkakusiana_room_11DL_001728 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11DL_001728" -static const ALIGN_ASSET(2) char kakusiana_room_11DL_001728[] = dkakusiana_room_11DL_001728; - -#define dkakusiana_room_11DL_001068 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11DL_001068" -static const ALIGN_ASSET(2) char kakusiana_room_11DL_001068[] = dkakusiana_room_11DL_001068; - -#define dkakusiana_room_11Tex_004048 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11Tex_004048" +#define dkakusiana_room_11Tex_004048 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11Tex_004048" static const ALIGN_ASSET(2) char kakusiana_room_11Tex_004048[] = dkakusiana_room_11Tex_004048; -#define dkakusiana_room_11Tex_003048 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11Tex_003048" -static const ALIGN_ASSET(2) char kakusiana_room_11Tex_003048[] = dkakusiana_room_11Tex_003048; +#define dkakusiana_room_11Tex_005048 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11Tex_005048" +static const ALIGN_ASSET(2) char kakusiana_room_11Tex_005048[] = dkakusiana_room_11Tex_005048; + +#define dkakusiana_room_11Tex_005848 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11Tex_005848" +static const ALIGN_ASSET(2) char kakusiana_room_11Tex_005848[] = dkakusiana_room_11Tex_005848; + +#define dkakusiana_room_11Tex_006848 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11Tex_006848" +static const ALIGN_ASSET(2) char kakusiana_room_11Tex_006848[] = dkakusiana_room_11Tex_006848; + +#define dkakusiana_room_11Tex_007848 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11Tex_007848" +static const ALIGN_ASSET(2) char kakusiana_room_11Tex_007848[] = dkakusiana_room_11Tex_007848; + +#define dkakusiana_room_11DL_008250 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11DL_008250" +static const ALIGN_ASSET(2) char kakusiana_room_11DL_008250[] = dkakusiana_room_11DL_008250; + +#define dkakusiana_room_11DL_0006D0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11DL_0006D0" +static const ALIGN_ASSET(2) char kakusiana_room_11DL_0006D0[] = dkakusiana_room_11DL_0006D0; + +#define dkakusiana_room_11DL_000340 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11DL_000340" +static const ALIGN_ASSET(2) char kakusiana_room_11DL_000340[] = dkakusiana_room_11DL_000340; + +#define dkakusiana_room_11DL_0023E8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11DL_0023E8" +static const ALIGN_ASSET(2) char kakusiana_room_11DL_0023E8[] = dkakusiana_room_11DL_0023E8; + +#define dkakusiana_room_11DL_0085C0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11DL_0085C0" +static const ALIGN_ASSET(2) char kakusiana_room_11DL_0085C0[] = dkakusiana_room_11DL_0085C0; + +#define dkakusiana_room_11DL_001430 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11DL_001430" +static const ALIGN_ASSET(2) char kakusiana_room_11DL_001430[] = dkakusiana_room_11DL_001430; + +#define dkakusiana_room_11DL_008418 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11DL_008418" +static const ALIGN_ASSET(2) char kakusiana_room_11DL_008418[] = dkakusiana_room_11DL_008418; + +#define dkakusiana_room_11DL_001728 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11DL_001728" +static const ALIGN_ASSET(2) char kakusiana_room_11DL_001728[] = dkakusiana_room_11DL_001728; + +#define dkakusiana_room_11DL_001068 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11DL_001068" +static const ALIGN_ASSET(2) char kakusiana_room_11DL_001068[] = dkakusiana_room_11DL_001068; #endif // MISC_KAKUSIANA_ROOM_11_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_12.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_12.h index c69ea90bd..9c30a8148 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_12.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_12.h @@ -3,53 +3,53 @@ #include "align_asset_macro.h" -#define dkakusiana_room_12DL_0079F0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_0079F0" -static const ALIGN_ASSET(2) char kakusiana_room_12DL_0079F0[] = dkakusiana_room_12DL_0079F0; - -#define dkakusiana_room_12DL_0004A0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_0004A0" -static const ALIGN_ASSET(2) char kakusiana_room_12DL_0004A0[] = dkakusiana_room_12DL_0004A0; - -#define dkakusiana_room_12Tex_0047F0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12Tex_0047F0" -static const ALIGN_ASSET(2) char kakusiana_room_12Tex_0047F0[] = dkakusiana_room_12Tex_0047F0; - -#define dkakusiana_room_12Tex_001FF0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12Tex_001FF0" +#define dkakusiana_room_12Tex_001FF0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12Tex_001FF0" static const ALIGN_ASSET(2) char kakusiana_room_12Tex_001FF0[] = dkakusiana_room_12Tex_001FF0; -#define dkakusiana_room_12DL_000270 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_000270" -static const ALIGN_ASSET(2) char kakusiana_room_12DL_000270[] = dkakusiana_room_12DL_000270; +#define dkakusiana_room_12Tex_0027F0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12Tex_0027F0" +static const ALIGN_ASSET(2) char kakusiana_room_12Tex_0027F0[] = dkakusiana_room_12Tex_0027F0; -#define dkakusiana_room_12DL_001C28 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_001C28" -static const ALIGN_ASSET(2) char kakusiana_room_12DL_001C28[] = dkakusiana_room_12DL_001C28; - -#define dkakusiana_room_12Tex_004FF0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12Tex_004FF0" -static const ALIGN_ASSET(2) char kakusiana_room_12Tex_004FF0[] = dkakusiana_room_12Tex_004FF0; - -#define dkakusiana_room_12Tex_005FF0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12Tex_005FF0" -static const ALIGN_ASSET(2) char kakusiana_room_12Tex_005FF0[] = dkakusiana_room_12Tex_005FF0; - -#define dkakusiana_room_12Tex_006FF0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12Tex_006FF0" -static const ALIGN_ASSET(2) char kakusiana_room_12Tex_006FF0[] = dkakusiana_room_12Tex_006FF0; - -#define dkakusiana_room_12DL_007D60 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_007D60" -static const ALIGN_ASSET(2) char kakusiana_room_12DL_007D60[] = dkakusiana_room_12DL_007D60; - -#define dkakusiana_room_12DL_000ED0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_000ED0" -static const ALIGN_ASSET(2) char kakusiana_room_12DL_000ED0[] = dkakusiana_room_12DL_000ED0; - -#define dkakusiana_room_12DL_007BB8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_007BB8" -static const ALIGN_ASSET(2) char kakusiana_room_12DL_007BB8[] = dkakusiana_room_12DL_007BB8; - -#define dkakusiana_room_12DL_0011C8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_0011C8" -static const ALIGN_ASSET(2) char kakusiana_room_12DL_0011C8[] = dkakusiana_room_12DL_0011C8; - -#define dkakusiana_room_12DL_000BA8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_000BA8" -static const ALIGN_ASSET(2) char kakusiana_room_12DL_000BA8[] = dkakusiana_room_12DL_000BA8; - -#define dkakusiana_room_12Tex_0037F0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12Tex_0037F0" +#define dkakusiana_room_12Tex_0037F0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12Tex_0037F0" static const ALIGN_ASSET(2) char kakusiana_room_12Tex_0037F0[] = dkakusiana_room_12Tex_0037F0; -#define dkakusiana_room_12Tex_0027F0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12Tex_0027F0" -static const ALIGN_ASSET(2) char kakusiana_room_12Tex_0027F0[] = dkakusiana_room_12Tex_0027F0; +#define dkakusiana_room_12Tex_0047F0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12Tex_0047F0" +static const ALIGN_ASSET(2) char kakusiana_room_12Tex_0047F0[] = dkakusiana_room_12Tex_0047F0; + +#define dkakusiana_room_12Tex_004FF0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12Tex_004FF0" +static const ALIGN_ASSET(2) char kakusiana_room_12Tex_004FF0[] = dkakusiana_room_12Tex_004FF0; + +#define dkakusiana_room_12Tex_005FF0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12Tex_005FF0" +static const ALIGN_ASSET(2) char kakusiana_room_12Tex_005FF0[] = dkakusiana_room_12Tex_005FF0; + +#define dkakusiana_room_12Tex_006FF0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12Tex_006FF0" +static const ALIGN_ASSET(2) char kakusiana_room_12Tex_006FF0[] = dkakusiana_room_12Tex_006FF0; + +#define dkakusiana_room_12DL_0079F0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_0079F0" +static const ALIGN_ASSET(2) char kakusiana_room_12DL_0079F0[] = dkakusiana_room_12DL_0079F0; + +#define dkakusiana_room_12DL_0004A0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_0004A0" +static const ALIGN_ASSET(2) char kakusiana_room_12DL_0004A0[] = dkakusiana_room_12DL_0004A0; + +#define dkakusiana_room_12DL_000270 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_000270" +static const ALIGN_ASSET(2) char kakusiana_room_12DL_000270[] = dkakusiana_room_12DL_000270; + +#define dkakusiana_room_12DL_001C28 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_001C28" +static const ALIGN_ASSET(2) char kakusiana_room_12DL_001C28[] = dkakusiana_room_12DL_001C28; + +#define dkakusiana_room_12DL_007D60 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_007D60" +static const ALIGN_ASSET(2) char kakusiana_room_12DL_007D60[] = dkakusiana_room_12DL_007D60; + +#define dkakusiana_room_12DL_000ED0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_000ED0" +static const ALIGN_ASSET(2) char kakusiana_room_12DL_000ED0[] = dkakusiana_room_12DL_000ED0; + +#define dkakusiana_room_12DL_007BB8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_007BB8" +static const ALIGN_ASSET(2) char kakusiana_room_12DL_007BB8[] = dkakusiana_room_12DL_007BB8; + +#define dkakusiana_room_12DL_0011C8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_0011C8" +static const ALIGN_ASSET(2) char kakusiana_room_12DL_0011C8[] = dkakusiana_room_12DL_0011C8; + +#define dkakusiana_room_12DL_000BA8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_000BA8" +static const ALIGN_ASSET(2) char kakusiana_room_12DL_000BA8[] = dkakusiana_room_12DL_000BA8; #endif // MISC_KAKUSIANA_ROOM_12_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_13.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_13.h index 780ac7437..ed41508c3 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_13.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_13.h @@ -3,47 +3,47 @@ #include "align_asset_macro.h" -#define dkakusiana_room_13DL_004350 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_004350" -static const ALIGN_ASSET(2) char kakusiana_room_13DL_004350[] = dkakusiana_room_13DL_004350; - -#define dkakusiana_room_13DL_000FF8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_000FF8" -static const ALIGN_ASSET(2) char kakusiana_room_13DL_000FF8[] = dkakusiana_room_13DL_000FF8; - -#define dkakusiana_room_13Tex_003950 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13Tex_003950" -static const ALIGN_ASSET(2) char kakusiana_room_13Tex_003950[] = dkakusiana_room_13Tex_003950; - -#define dkakusiana_room_13DL_004C50 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_004C50" -static const ALIGN_ASSET(2) char kakusiana_room_13DL_004C50[] = dkakusiana_room_13DL_004C50; - -#define dkakusiana_room_13Tex_005EC8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13Tex_005EC8" -static const ALIGN_ASSET(2) char kakusiana_room_13Tex_005EC8[] = dkakusiana_room_13Tex_005EC8; - -#define dkakusiana_room_13Tex_004EC8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13Tex_004EC8" -static const ALIGN_ASSET(2) char kakusiana_room_13Tex_004EC8[] = dkakusiana_room_13Tex_004EC8; - -#define dkakusiana_room_13DL_001208 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_001208" -static const ALIGN_ASSET(2) char kakusiana_room_13DL_001208[] = dkakusiana_room_13DL_001208; - -#define dkakusiana_room_13DL_0013D0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_0013D0" -static const ALIGN_ASSET(2) char kakusiana_room_13DL_0013D0[] = dkakusiana_room_13DL_0013D0; - -#define dkakusiana_room_13DL_004518 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_004518" -static const ALIGN_ASSET(2) char kakusiana_room_13DL_004518[] = dkakusiana_room_13DL_004518; - -#define dkakusiana_room_13DL_000C08 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_000C08" -static const ALIGN_ASSET(2) char kakusiana_room_13DL_000C08[] = dkakusiana_room_13DL_000C08; - -#define dkakusiana_room_13Tex_001950 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13Tex_001950" +#define dkakusiana_room_13Tex_001950 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13Tex_001950" static const ALIGN_ASSET(2) char kakusiana_room_13Tex_001950[] = dkakusiana_room_13Tex_001950; -#define dkakusiana_room_13DL_0006F0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_0006F0" +#define dkakusiana_room_13Tex_002950 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13Tex_002950" +static const ALIGN_ASSET(2) char kakusiana_room_13Tex_002950[] = dkakusiana_room_13Tex_002950; + +#define dkakusiana_room_13Tex_003950 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13Tex_003950" +static const ALIGN_ASSET(2) char kakusiana_room_13Tex_003950[] = dkakusiana_room_13Tex_003950; + +#define dkakusiana_room_13Tex_004EC8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13Tex_004EC8" +static const ALIGN_ASSET(2) char kakusiana_room_13Tex_004EC8[] = dkakusiana_room_13Tex_004EC8; + +#define dkakusiana_room_13Tex_005EC8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13Tex_005EC8" +static const ALIGN_ASSET(2) char kakusiana_room_13Tex_005EC8[] = dkakusiana_room_13Tex_005EC8; + +#define dkakusiana_room_13DL_004350 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_004350" +static const ALIGN_ASSET(2) char kakusiana_room_13DL_004350[] = dkakusiana_room_13DL_004350; + +#define dkakusiana_room_13DL_000FF8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_000FF8" +static const ALIGN_ASSET(2) char kakusiana_room_13DL_000FF8[] = dkakusiana_room_13DL_000FF8; + +#define dkakusiana_room_13DL_004C50 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_004C50" +static const ALIGN_ASSET(2) char kakusiana_room_13DL_004C50[] = dkakusiana_room_13DL_004C50; + +#define dkakusiana_room_13DL_001208 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_001208" +static const ALIGN_ASSET(2) char kakusiana_room_13DL_001208[] = dkakusiana_room_13DL_001208; + +#define dkakusiana_room_13DL_0013D0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_0013D0" +static const ALIGN_ASSET(2) char kakusiana_room_13DL_0013D0[] = dkakusiana_room_13DL_0013D0; + +#define dkakusiana_room_13DL_004518 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_004518" +static const ALIGN_ASSET(2) char kakusiana_room_13DL_004518[] = dkakusiana_room_13DL_004518; + +#define dkakusiana_room_13DL_000C08 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_000C08" +static const ALIGN_ASSET(2) char kakusiana_room_13DL_000C08[] = dkakusiana_room_13DL_000C08; + +#define dkakusiana_room_13DL_0006F0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_0006F0" static const ALIGN_ASSET(2) char kakusiana_room_13DL_0006F0[] = dkakusiana_room_13DL_0006F0; -#define dkakusiana_room_13DL_0017B8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_0017B8" +#define dkakusiana_room_13DL_0017B8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_0017B8" static const ALIGN_ASSET(2) char kakusiana_room_13DL_0017B8[] = dkakusiana_room_13DL_0017B8; -#define dkakusiana_room_13Tex_002950 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13Tex_002950" -static const ALIGN_ASSET(2) char kakusiana_room_13Tex_002950[] = dkakusiana_room_13Tex_002950; - #endif // MISC_KAKUSIANA_ROOM_13_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_2.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_2.h index f03a320f5..621fac263 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_2.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_2.h @@ -3,29 +3,29 @@ #include "align_asset_macro.h" -#define dkakusiana_room_2DL_002650 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_2DL_002650" -static const ALIGN_ASSET(2) char kakusiana_room_2DL_002650[] = dkakusiana_room_2DL_002650; +#define dkakusiana_room_2Tex_001448 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_2Tex_001448" +static const ALIGN_ASSET(2) char kakusiana_room_2Tex_001448[] = dkakusiana_room_2Tex_001448; -#define dkakusiana_room_2DL_000F70 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_2DL_000F70" -static const ALIGN_ASSET(2) char kakusiana_room_2DL_000F70[] = dkakusiana_room_2DL_000F70; - -#define dkakusiana_room_2Tex_001C48 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_2Tex_001C48" +#define dkakusiana_room_2Tex_001C48 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_2Tex_001C48" static const ALIGN_ASSET(2) char kakusiana_room_2Tex_001C48[] = dkakusiana_room_2Tex_001C48; -#define dkakusiana_room_2DL_0011B0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_2DL_0011B0" +#define dkakusiana_room_2DL_002650 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_2DL_002650" +static const ALIGN_ASSET(2) char kakusiana_room_2DL_002650[] = dkakusiana_room_2DL_002650; + +#define dkakusiana_room_2DL_000F70 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_2DL_000F70" +static const ALIGN_ASSET(2) char kakusiana_room_2DL_000F70[] = dkakusiana_room_2DL_000F70; + +#define dkakusiana_room_2DL_0011B0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_2DL_0011B0" static const ALIGN_ASSET(2) char kakusiana_room_2DL_0011B0[] = dkakusiana_room_2DL_0011B0; -#define dkakusiana_room_2DL_001378 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_2DL_001378" +#define dkakusiana_room_2DL_001378 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_2DL_001378" static const ALIGN_ASSET(2) char kakusiana_room_2DL_001378[] = dkakusiana_room_2DL_001378; -#define dkakusiana_room_2DL_002818 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_2DL_002818" +#define dkakusiana_room_2DL_002818 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_2DL_002818" static const ALIGN_ASSET(2) char kakusiana_room_2DL_002818[] = dkakusiana_room_2DL_002818; -#define dkakusiana_room_2DL_000A20 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_2DL_000A20" +#define dkakusiana_room_2DL_000A20 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_2DL_000A20" static const ALIGN_ASSET(2) char kakusiana_room_2DL_000A20[] = dkakusiana_room_2DL_000A20; -#define dkakusiana_room_2Tex_001448 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_2Tex_001448" -static const ALIGN_ASSET(2) char kakusiana_room_2Tex_001448[] = dkakusiana_room_2Tex_001448; - #endif // MISC_KAKUSIANA_ROOM_2_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_3.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_3.h index 4ce489cb3..752d7c0d3 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_3.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_3.h @@ -3,41 +3,41 @@ #include "align_asset_macro.h" -#define dkakusiana_room_3DL_003A20 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3DL_003A20" -static const ALIGN_ASSET(2) char kakusiana_room_3DL_003A20[] = dkakusiana_room_3DL_003A20; +#define dkakusiana_room_3Tex_001818 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3Tex_001818" +static const ALIGN_ASSET(2) char kakusiana_room_3Tex_001818[] = dkakusiana_room_3Tex_001818; -#define dkakusiana_room_3DL_0012A0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3DL_0012A0" -static const ALIGN_ASSET(2) char kakusiana_room_3DL_0012A0[] = dkakusiana_room_3DL_0012A0; - -#define dkakusiana_room_3Tex_002818 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3Tex_002818" +#define dkakusiana_room_3Tex_002818 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3Tex_002818" static const ALIGN_ASSET(2) char kakusiana_room_3Tex_002818[] = dkakusiana_room_3Tex_002818; -#define dkakusiana_room_3DL_004008 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3DL_004008" -static const ALIGN_ASSET(2) char kakusiana_room_3DL_004008[] = dkakusiana_room_3DL_004008; - -#define dkakusiana_room_3Tex_004130 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3Tex_004130" +#define dkakusiana_room_3Tex_004130 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3Tex_004130" static const ALIGN_ASSET(2) char kakusiana_room_3Tex_004130[] = dkakusiana_room_3Tex_004130; -#define dkakusiana_room_3DL_003BC8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3DL_003BC8" -static const ALIGN_ASSET(2) char kakusiana_room_3DL_003BC8[] = dkakusiana_room_3DL_003BC8; - -#define dkakusiana_room_3Tex_004930 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3Tex_004930" +#define dkakusiana_room_3Tex_004930 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3Tex_004930" static const ALIGN_ASSET(2) char kakusiana_room_3Tex_004930[] = dkakusiana_room_3Tex_004930; -#define dkakusiana_room_3DL_001580 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3DL_001580" +#define dkakusiana_room_3DL_003A20 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3DL_003A20" +static const ALIGN_ASSET(2) char kakusiana_room_3DL_003A20[] = dkakusiana_room_3DL_003A20; + +#define dkakusiana_room_3DL_0012A0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3DL_0012A0" +static const ALIGN_ASSET(2) char kakusiana_room_3DL_0012A0[] = dkakusiana_room_3DL_0012A0; + +#define dkakusiana_room_3DL_004008 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3DL_004008" +static const ALIGN_ASSET(2) char kakusiana_room_3DL_004008[] = dkakusiana_room_3DL_004008; + +#define dkakusiana_room_3DL_003BC8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3DL_003BC8" +static const ALIGN_ASSET(2) char kakusiana_room_3DL_003BC8[] = dkakusiana_room_3DL_003BC8; + +#define dkakusiana_room_3DL_001580 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3DL_001580" static const ALIGN_ASSET(2) char kakusiana_room_3DL_001580[] = dkakusiana_room_3DL_001580; -#define dkakusiana_room_3DL_001748 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3DL_001748" +#define dkakusiana_room_3DL_001748 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3DL_001748" static const ALIGN_ASSET(2) char kakusiana_room_3DL_001748[] = dkakusiana_room_3DL_001748; -#define dkakusiana_room_3DL_003D80 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3DL_003D80" +#define dkakusiana_room_3DL_003D80 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3DL_003D80" static const ALIGN_ASSET(2) char kakusiana_room_3DL_003D80[] = dkakusiana_room_3DL_003D80; -#define dkakusiana_room_3DL_000AF0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3DL_000AF0" +#define dkakusiana_room_3DL_000AF0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3DL_000AF0" static const ALIGN_ASSET(2) char kakusiana_room_3DL_000AF0[] = dkakusiana_room_3DL_000AF0; -#define dkakusiana_room_3Tex_001818 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3Tex_001818" -static const ALIGN_ASSET(2) char kakusiana_room_3Tex_001818[] = dkakusiana_room_3Tex_001818; - #endif // MISC_KAKUSIANA_ROOM_3_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_4.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_4.h index 914535494..e2cc3703b 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_4.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_4.h @@ -3,47 +3,47 @@ #include "align_asset_macro.h" -#define dkakusiana_room_4DL_004B40 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_004B40" -static const ALIGN_ASSET(2) char kakusiana_room_4DL_004B40[] = dkakusiana_room_4DL_004B40; - -#define dkakusiana_room_4DL_001420 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_001420" -static const ALIGN_ASSET(2) char kakusiana_room_4DL_001420[] = dkakusiana_room_4DL_001420; - -#define dkakusiana_room_4Tex_004138 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4Tex_004138" -static const ALIGN_ASSET(2) char kakusiana_room_4Tex_004138[] = dkakusiana_room_4Tex_004138; - -#define dkakusiana_room_4DL_005690 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_005690" -static const ALIGN_ASSET(2) char kakusiana_room_4DL_005690[] = dkakusiana_room_4DL_005690; - -#define dkakusiana_room_4Tex_006958 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4Tex_006958" -static const ALIGN_ASSET(2) char kakusiana_room_4Tex_006958[] = dkakusiana_room_4Tex_006958; - -#define dkakusiana_room_4Tex_005958 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4Tex_005958" -static const ALIGN_ASSET(2) char kakusiana_room_4Tex_005958[] = dkakusiana_room_4Tex_005958; - -#define dkakusiana_room_4DL_001660 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_001660" -static const ALIGN_ASSET(2) char kakusiana_room_4DL_001660[] = dkakusiana_room_4DL_001660; - -#define dkakusiana_room_4DL_001828 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_001828" -static const ALIGN_ASSET(2) char kakusiana_room_4DL_001828[] = dkakusiana_room_4DL_001828; - -#define dkakusiana_room_4DL_004D08 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_004D08" -static const ALIGN_ASSET(2) char kakusiana_room_4DL_004D08[] = dkakusiana_room_4DL_004D08; - -#define dkakusiana_room_4DL_000FF8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_000FF8" -static const ALIGN_ASSET(2) char kakusiana_room_4DL_000FF8[] = dkakusiana_room_4DL_000FF8; - -#define dkakusiana_room_4DL_000BB0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_000BB0" -static const ALIGN_ASSET(2) char kakusiana_room_4DL_000BB0[] = dkakusiana_room_4DL_000BB0; - -#define dkakusiana_room_4Tex_002138 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4Tex_002138" +#define dkakusiana_room_4Tex_002138 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4Tex_002138" static const ALIGN_ASSET(2) char kakusiana_room_4Tex_002138[] = dkakusiana_room_4Tex_002138; -#define dkakusiana_room_4DL_001F10 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_001F10" -static const ALIGN_ASSET(2) char kakusiana_room_4DL_001F10[] = dkakusiana_room_4DL_001F10; - -#define dkakusiana_room_4Tex_003138 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4Tex_003138" +#define dkakusiana_room_4Tex_003138 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4Tex_003138" static const ALIGN_ASSET(2) char kakusiana_room_4Tex_003138[] = dkakusiana_room_4Tex_003138; +#define dkakusiana_room_4Tex_004138 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4Tex_004138" +static const ALIGN_ASSET(2) char kakusiana_room_4Tex_004138[] = dkakusiana_room_4Tex_004138; + +#define dkakusiana_room_4Tex_005958 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4Tex_005958" +static const ALIGN_ASSET(2) char kakusiana_room_4Tex_005958[] = dkakusiana_room_4Tex_005958; + +#define dkakusiana_room_4Tex_006958 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4Tex_006958" +static const ALIGN_ASSET(2) char kakusiana_room_4Tex_006958[] = dkakusiana_room_4Tex_006958; + +#define dkakusiana_room_4DL_004B40 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_004B40" +static const ALIGN_ASSET(2) char kakusiana_room_4DL_004B40[] = dkakusiana_room_4DL_004B40; + +#define dkakusiana_room_4DL_001420 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_001420" +static const ALIGN_ASSET(2) char kakusiana_room_4DL_001420[] = dkakusiana_room_4DL_001420; + +#define dkakusiana_room_4DL_005690 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_005690" +static const ALIGN_ASSET(2) char kakusiana_room_4DL_005690[] = dkakusiana_room_4DL_005690; + +#define dkakusiana_room_4DL_001660 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_001660" +static const ALIGN_ASSET(2) char kakusiana_room_4DL_001660[] = dkakusiana_room_4DL_001660; + +#define dkakusiana_room_4DL_001828 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_001828" +static const ALIGN_ASSET(2) char kakusiana_room_4DL_001828[] = dkakusiana_room_4DL_001828; + +#define dkakusiana_room_4DL_004D08 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_004D08" +static const ALIGN_ASSET(2) char kakusiana_room_4DL_004D08[] = dkakusiana_room_4DL_004D08; + +#define dkakusiana_room_4DL_000FF8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_000FF8" +static const ALIGN_ASSET(2) char kakusiana_room_4DL_000FF8[] = dkakusiana_room_4DL_000FF8; + +#define dkakusiana_room_4DL_000BB0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_000BB0" +static const ALIGN_ASSET(2) char kakusiana_room_4DL_000BB0[] = dkakusiana_room_4DL_000BB0; + +#define dkakusiana_room_4DL_001F10 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_001F10" +static const ALIGN_ASSET(2) char kakusiana_room_4DL_001F10[] = dkakusiana_room_4DL_001F10; + #endif // MISC_KAKUSIANA_ROOM_4_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_5.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_5.h index 74961eeef..e00cd10da 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_5.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_5.h @@ -3,38 +3,38 @@ #include "align_asset_macro.h" -#define dkakusiana_room_5DL_003A90 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_5DL_003A90" -static const ALIGN_ASSET(2) char kakusiana_room_5DL_003A90[] = dkakusiana_room_5DL_003A90; - -#define dkakusiana_room_5DL_001320 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_5DL_001320" -static const ALIGN_ASSET(2) char kakusiana_room_5DL_001320[] = dkakusiana_room_5DL_001320; - -#define dkakusiana_room_5Tex_001888 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_5Tex_001888" +#define dkakusiana_room_5Tex_001888 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_5Tex_001888" static const ALIGN_ASSET(2) char kakusiana_room_5Tex_001888[] = dkakusiana_room_5Tex_001888; -#define dkakusiana_room_5DL_003C68 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_5DL_003C68" -static const ALIGN_ASSET(2) char kakusiana_room_5DL_003C68[] = dkakusiana_room_5DL_003C68; +#define dkakusiana_room_5Tex_002888 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_5Tex_002888" +static const ALIGN_ASSET(2) char kakusiana_room_5Tex_002888[] = dkakusiana_room_5Tex_002888; -#define dkakusiana_room_5Tex_003ED8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_5Tex_003ED8" +#define dkakusiana_room_5Tex_003ED8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_5Tex_003ED8" static const ALIGN_ASSET(2) char kakusiana_room_5Tex_003ED8[] = dkakusiana_room_5Tex_003ED8; -#define dkakusiana_room_5DL_0015E8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_5DL_0015E8" +#define dkakusiana_room_5DL_003A90 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_5DL_003A90" +static const ALIGN_ASSET(2) char kakusiana_room_5DL_003A90[] = dkakusiana_room_5DL_003A90; + +#define dkakusiana_room_5DL_001320 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_5DL_001320" +static const ALIGN_ASSET(2) char kakusiana_room_5DL_001320[] = dkakusiana_room_5DL_001320; + +#define dkakusiana_room_5DL_003C68 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_5DL_003C68" +static const ALIGN_ASSET(2) char kakusiana_room_5DL_003C68[] = dkakusiana_room_5DL_003C68; + +#define dkakusiana_room_5DL_0015E8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_5DL_0015E8" static const ALIGN_ASSET(2) char kakusiana_room_5DL_0015E8[] = dkakusiana_room_5DL_0015E8; -#define dkakusiana_room_5DL_0017B0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_5DL_0017B0" +#define dkakusiana_room_5DL_0017B0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_5DL_0017B0" static const ALIGN_ASSET(2) char kakusiana_room_5DL_0017B0[] = dkakusiana_room_5DL_0017B0; -#define dkakusiana_room_5DL_003E30 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_5DL_003E30" +#define dkakusiana_room_5DL_003E30 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_5DL_003E30" static const ALIGN_ASSET(2) char kakusiana_room_5DL_003E30[] = dkakusiana_room_5DL_003E30; -#define dkakusiana_room_5DL_000CD8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_5DL_000CD8" +#define dkakusiana_room_5DL_000CD8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_5DL_000CD8" static const ALIGN_ASSET(2) char kakusiana_room_5DL_000CD8[] = dkakusiana_room_5DL_000CD8; -#define dkakusiana_room_5DL_0007D0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_5DL_0007D0" +#define dkakusiana_room_5DL_0007D0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_5DL_0007D0" static const ALIGN_ASSET(2) char kakusiana_room_5DL_0007D0[] = dkakusiana_room_5DL_0007D0; -#define dkakusiana_room_5Tex_002888 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_5Tex_002888" -static const ALIGN_ASSET(2) char kakusiana_room_5Tex_002888[] = dkakusiana_room_5Tex_002888; - #endif // MISC_KAKUSIANA_ROOM_5_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_6.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_6.h index 100b9f7a9..68e4c06d0 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_6.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_6.h @@ -3,44 +3,44 @@ #include "align_asset_macro.h" -#define dkakusiana_room_6DL_0055E0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_0055E0" -static const ALIGN_ASSET(2) char kakusiana_room_6DL_0055E0[] = dkakusiana_room_6DL_0055E0; +#define dkakusiana_room_6Tex_0022E0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6Tex_0022E0" +static const ALIGN_ASSET(2) char kakusiana_room_6Tex_0022E0[] = dkakusiana_room_6Tex_0022E0; -#define dkakusiana_room_6DL_000A98 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_000A98" -static const ALIGN_ASSET(2) char kakusiana_room_6DL_000A98[] = dkakusiana_room_6DL_000A98; - -#define dkakusiana_room_6Tex_0032E0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6Tex_0032E0" +#define dkakusiana_room_6Tex_0032E0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6Tex_0032E0" static const ALIGN_ASSET(2) char kakusiana_room_6Tex_0032E0[] = dkakusiana_room_6Tex_0032E0; -#define dkakusiana_room_6DL_001D78 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_001D78" -static const ALIGN_ASSET(2) char kakusiana_room_6DL_001D78[] = dkakusiana_room_6DL_001D78; - -#define dkakusiana_room_6Tex_004AE0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6Tex_004AE0" -static const ALIGN_ASSET(2) char kakusiana_room_6Tex_004AE0[] = dkakusiana_room_6Tex_004AE0; - -#define dkakusiana_room_6Tex_003AE0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6Tex_003AE0" +#define dkakusiana_room_6Tex_003AE0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6Tex_003AE0" static const ALIGN_ASSET(2) char kakusiana_room_6Tex_003AE0[] = dkakusiana_room_6Tex_003AE0; -#define dkakusiana_room_6DL_005810 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_005810" +#define dkakusiana_room_6Tex_004AE0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6Tex_004AE0" +static const ALIGN_ASSET(2) char kakusiana_room_6Tex_004AE0[] = dkakusiana_room_6Tex_004AE0; + +#define dkakusiana_room_6DL_0055E0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_0055E0" +static const ALIGN_ASSET(2) char kakusiana_room_6DL_0055E0[] = dkakusiana_room_6DL_0055E0; + +#define dkakusiana_room_6DL_000A98 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_000A98" +static const ALIGN_ASSET(2) char kakusiana_room_6DL_000A98[] = dkakusiana_room_6DL_000A98; + +#define dkakusiana_room_6DL_001D78 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_001D78" +static const ALIGN_ASSET(2) char kakusiana_room_6DL_001D78[] = dkakusiana_room_6DL_001D78; + +#define dkakusiana_room_6DL_005810 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_005810" static const ALIGN_ASSET(2) char kakusiana_room_6DL_005810[] = dkakusiana_room_6DL_005810; -#define dkakusiana_room_6DL_001190 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_001190" +#define dkakusiana_room_6DL_001190 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_001190" static const ALIGN_ASSET(2) char kakusiana_room_6DL_001190[] = dkakusiana_room_6DL_001190; -#define dkakusiana_room_6DL_002200 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_002200" +#define dkakusiana_room_6DL_002200 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_002200" static const ALIGN_ASSET(2) char kakusiana_room_6DL_002200[] = dkakusiana_room_6DL_002200; -#define dkakusiana_room_6DL_0059C0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_0059C0" +#define dkakusiana_room_6DL_0059C0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_0059C0" static const ALIGN_ASSET(2) char kakusiana_room_6DL_0059C0[] = dkakusiana_room_6DL_0059C0; -#define dkakusiana_room_6DL_000F48 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_000F48" +#define dkakusiana_room_6DL_000F48 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_000F48" static const ALIGN_ASSET(2) char kakusiana_room_6DL_000F48[] = dkakusiana_room_6DL_000F48; -#define dkakusiana_room_6DL_0006B0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_0006B0" +#define dkakusiana_room_6DL_0006B0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_0006B0" static const ALIGN_ASSET(2) char kakusiana_room_6DL_0006B0[] = dkakusiana_room_6DL_0006B0; -#define dkakusiana_room_6Tex_0022E0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6Tex_0022E0" -static const ALIGN_ASSET(2) char kakusiana_room_6Tex_0022E0[] = dkakusiana_room_6Tex_0022E0; - #endif // MISC_KAKUSIANA_ROOM_6_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_7.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_7.h index 2f7ad9f56..af5a194f5 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_7.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_7.h @@ -3,41 +3,41 @@ #include "align_asset_macro.h" -#define dkakusiana_room_7DL_003D60 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7DL_003D60" -static const ALIGN_ASSET(2) char kakusiana_room_7DL_003D60[] = dkakusiana_room_7DL_003D60; +#define dkakusiana_room_7Tex_001D60 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7Tex_001D60" +static const ALIGN_ASSET(2) char kakusiana_room_7Tex_001D60[] = dkakusiana_room_7Tex_001D60; -#define dkakusiana_room_7DL_0006C8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7DL_0006C8" -static const ALIGN_ASSET(2) char kakusiana_room_7DL_0006C8[] = dkakusiana_room_7DL_0006C8; - -#define dkakusiana_room_7Tex_002B60 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7Tex_002B60" -static const ALIGN_ASSET(2) char kakusiana_room_7Tex_002B60[] = dkakusiana_room_7Tex_002B60; - -#define dkakusiana_room_7Tex_002160 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7Tex_002160" +#define dkakusiana_room_7Tex_002160 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7Tex_002160" static const ALIGN_ASSET(2) char kakusiana_room_7Tex_002160[] = dkakusiana_room_7Tex_002160; -#define dkakusiana_room_7DL_000960 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7DL_000960" -static const ALIGN_ASSET(2) char kakusiana_room_7DL_000960[] = dkakusiana_room_7DL_000960; - -#define dkakusiana_room_7DL_000B28 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7DL_000B28" -static const ALIGN_ASSET(2) char kakusiana_room_7DL_000B28[] = dkakusiana_room_7DL_000B28; - -#define dkakusiana_room_7DL_003F28 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7DL_003F28" -static const ALIGN_ASSET(2) char kakusiana_room_7DL_003F28[] = dkakusiana_room_7DL_003F28; - -#define dkakusiana_room_7DL_000290 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7DL_000290" -static const ALIGN_ASSET(2) char kakusiana_room_7DL_000290[] = dkakusiana_room_7DL_000290; - -#define dkakusiana_room_7DL_0015C0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7DL_0015C0" -static const ALIGN_ASSET(2) char kakusiana_room_7DL_0015C0[] = dkakusiana_room_7DL_0015C0; - -#define dkakusiana_room_7Tex_002960 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7Tex_002960" +#define dkakusiana_room_7Tex_002960 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7Tex_002960" static const ALIGN_ASSET(2) char kakusiana_room_7Tex_002960[] = dkakusiana_room_7Tex_002960; -#define dkakusiana_room_7DL_001B88 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7DL_001B88" -static const ALIGN_ASSET(2) char kakusiana_room_7DL_001B88[] = dkakusiana_room_7DL_001B88; +#define dkakusiana_room_7Tex_002B60 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7Tex_002B60" +static const ALIGN_ASSET(2) char kakusiana_room_7Tex_002B60[] = dkakusiana_room_7Tex_002B60; -#define dkakusiana_room_7Tex_001D60 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7Tex_001D60" -static const ALIGN_ASSET(2) char kakusiana_room_7Tex_001D60[] = dkakusiana_room_7Tex_001D60; +#define dkakusiana_room_7DL_003D60 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7DL_003D60" +static const ALIGN_ASSET(2) char kakusiana_room_7DL_003D60[] = dkakusiana_room_7DL_003D60; + +#define dkakusiana_room_7DL_0006C8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7DL_0006C8" +static const ALIGN_ASSET(2) char kakusiana_room_7DL_0006C8[] = dkakusiana_room_7DL_0006C8; + +#define dkakusiana_room_7DL_000960 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7DL_000960" +static const ALIGN_ASSET(2) char kakusiana_room_7DL_000960[] = dkakusiana_room_7DL_000960; + +#define dkakusiana_room_7DL_000B28 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7DL_000B28" +static const ALIGN_ASSET(2) char kakusiana_room_7DL_000B28[] = dkakusiana_room_7DL_000B28; + +#define dkakusiana_room_7DL_003F28 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7DL_003F28" +static const ALIGN_ASSET(2) char kakusiana_room_7DL_003F28[] = dkakusiana_room_7DL_003F28; + +#define dkakusiana_room_7DL_000290 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7DL_000290" +static const ALIGN_ASSET(2) char kakusiana_room_7DL_000290[] = dkakusiana_room_7DL_000290; + +#define dkakusiana_room_7DL_0015C0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7DL_0015C0" +static const ALIGN_ASSET(2) char kakusiana_room_7DL_0015C0[] = dkakusiana_room_7DL_0015C0; + +#define dkakusiana_room_7DL_001B88 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7DL_001B88" +static const ALIGN_ASSET(2) char kakusiana_room_7DL_001B88[] = dkakusiana_room_7DL_001B88; #endif // MISC_KAKUSIANA_ROOM_7_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_8.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_8.h index 14325312f..78362fa3b 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_8.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_8.h @@ -3,32 +3,32 @@ #include "align_asset_macro.h" -#define dkakusiana_room_8DL_0033C0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8DL_0033C0" -static const ALIGN_ASSET(2) char kakusiana_room_8DL_0033C0[] = dkakusiana_room_8DL_0033C0; +#define dkakusiana_room_8Tex_0019C0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8Tex_0019C0" +static const ALIGN_ASSET(2) char kakusiana_room_8Tex_0019C0[] = dkakusiana_room_8Tex_0019C0; -#define dkakusiana_room_8DL_0014B8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8DL_0014B8" -static const ALIGN_ASSET(2) char kakusiana_room_8DL_0014B8[] = dkakusiana_room_8DL_0014B8; - -#define dkakusiana_room_8Tex_0029C0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8Tex_0029C0" +#define dkakusiana_room_8Tex_0029C0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8Tex_0029C0" static const ALIGN_ASSET(2) char kakusiana_room_8Tex_0029C0[] = dkakusiana_room_8Tex_0029C0; -#define dkakusiana_room_8DL_001720 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8DL_001720" +#define dkakusiana_room_8DL_0033C0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8DL_0033C0" +static const ALIGN_ASSET(2) char kakusiana_room_8DL_0033C0[] = dkakusiana_room_8DL_0033C0; + +#define dkakusiana_room_8DL_0014B8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8DL_0014B8" +static const ALIGN_ASSET(2) char kakusiana_room_8DL_0014B8[] = dkakusiana_room_8DL_0014B8; + +#define dkakusiana_room_8DL_001720 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8DL_001720" static const ALIGN_ASSET(2) char kakusiana_room_8DL_001720[] = dkakusiana_room_8DL_001720; -#define dkakusiana_room_8DL_0018E8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8DL_0018E8" +#define dkakusiana_room_8DL_0018E8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8DL_0018E8" static const ALIGN_ASSET(2) char kakusiana_room_8DL_0018E8[] = dkakusiana_room_8DL_0018E8; -#define dkakusiana_room_8DL_003588 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8DL_003588" +#define dkakusiana_room_8DL_003588 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8DL_003588" static const ALIGN_ASSET(2) char kakusiana_room_8DL_003588[] = dkakusiana_room_8DL_003588; -#define dkakusiana_room_8DL_001048 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8DL_001048" +#define dkakusiana_room_8DL_001048 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8DL_001048" static const ALIGN_ASSET(2) char kakusiana_room_8DL_001048[] = dkakusiana_room_8DL_001048; -#define dkakusiana_room_8DL_000B20 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8DL_000B20" +#define dkakusiana_room_8DL_000B20 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8DL_000B20" static const ALIGN_ASSET(2) char kakusiana_room_8DL_000B20[] = dkakusiana_room_8DL_000B20; -#define dkakusiana_room_8Tex_0019C0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8Tex_0019C0" -static const ALIGN_ASSET(2) char kakusiana_room_8Tex_0019C0[] = dkakusiana_room_8Tex_0019C0; - #endif // MISC_KAKUSIANA_ROOM_8_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_9.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_9.h index 088fd8dfa..0196fc23b 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_9.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_9.h @@ -3,44 +3,44 @@ #include "align_asset_macro.h" -#define dkakusiana_room_9DL_005640 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_005640" -static const ALIGN_ASSET(2) char kakusiana_room_9DL_005640[] = dkakusiana_room_9DL_005640; +#define dkakusiana_room_9Tex_002340 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9Tex_002340" +static const ALIGN_ASSET(2) char kakusiana_room_9Tex_002340[] = dkakusiana_room_9Tex_002340; -#define dkakusiana_room_9DL_000AC8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_000AC8" -static const ALIGN_ASSET(2) char kakusiana_room_9DL_000AC8[] = dkakusiana_room_9DL_000AC8; - -#define dkakusiana_room_9Tex_003340 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9Tex_003340" +#define dkakusiana_room_9Tex_003340 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9Tex_003340" static const ALIGN_ASSET(2) char kakusiana_room_9Tex_003340[] = dkakusiana_room_9Tex_003340; -#define dkakusiana_room_9DL_001DD0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_001DD0" -static const ALIGN_ASSET(2) char kakusiana_room_9DL_001DD0[] = dkakusiana_room_9DL_001DD0; - -#define dkakusiana_room_9Tex_004B40 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9Tex_004B40" -static const ALIGN_ASSET(2) char kakusiana_room_9Tex_004B40[] = dkakusiana_room_9Tex_004B40; - -#define dkakusiana_room_9Tex_003B40 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9Tex_003B40" +#define dkakusiana_room_9Tex_003B40 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9Tex_003B40" static const ALIGN_ASSET(2) char kakusiana_room_9Tex_003B40[] = dkakusiana_room_9Tex_003B40; -#define dkakusiana_room_9DL_005870 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_005870" +#define dkakusiana_room_9Tex_004B40 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9Tex_004B40" +static const ALIGN_ASSET(2) char kakusiana_room_9Tex_004B40[] = dkakusiana_room_9Tex_004B40; + +#define dkakusiana_room_9DL_005640 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_005640" +static const ALIGN_ASSET(2) char kakusiana_room_9DL_005640[] = dkakusiana_room_9DL_005640; + +#define dkakusiana_room_9DL_000AC8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_000AC8" +static const ALIGN_ASSET(2) char kakusiana_room_9DL_000AC8[] = dkakusiana_room_9DL_000AC8; + +#define dkakusiana_room_9DL_001DD0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_001DD0" +static const ALIGN_ASSET(2) char kakusiana_room_9DL_001DD0[] = dkakusiana_room_9DL_001DD0; + +#define dkakusiana_room_9DL_005870 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_005870" static const ALIGN_ASSET(2) char kakusiana_room_9DL_005870[] = dkakusiana_room_9DL_005870; -#define dkakusiana_room_9DL_0011C8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_0011C8" +#define dkakusiana_room_9DL_0011C8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_0011C8" static const ALIGN_ASSET(2) char kakusiana_room_9DL_0011C8[] = dkakusiana_room_9DL_0011C8; -#define dkakusiana_room_9DL_002260 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_002260" +#define dkakusiana_room_9DL_002260 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_002260" static const ALIGN_ASSET(2) char kakusiana_room_9DL_002260[] = dkakusiana_room_9DL_002260; -#define dkakusiana_room_9DL_005A20 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_005A20" +#define dkakusiana_room_9DL_005A20 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_005A20" static const ALIGN_ASSET(2) char kakusiana_room_9DL_005A20[] = dkakusiana_room_9DL_005A20; -#define dkakusiana_room_9DL_000F80 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_000F80" +#define dkakusiana_room_9DL_000F80 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_000F80" static const ALIGN_ASSET(2) char kakusiana_room_9DL_000F80[] = dkakusiana_room_9DL_000F80; -#define dkakusiana_room_9DL_0006E0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_0006E0" +#define dkakusiana_room_9DL_0006E0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_0006E0" static const ALIGN_ASSET(2) char kakusiana_room_9DL_0006E0[] = dkakusiana_room_9DL_0006E0; -#define dkakusiana_room_9Tex_002340 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9Tex_002340" -static const ALIGN_ASSET(2) char kakusiana_room_9Tex_002340[] = dkakusiana_room_9Tex_002340; - #endif // MISC_KAKUSIANA_ROOM_9_H diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_scene.h b/soh/assets/scenes/misc/kakusiana/kakusiana_scene.h index 2f6012fb8..09c3ba321 100644 --- a/soh/assets/scenes/misc/kakusiana/kakusiana_scene.h +++ b/soh/assets/scenes/misc/kakusiana/kakusiana_scene.h @@ -3,16 +3,17 @@ #include "align_asset_macro.h" -#define dkakusiana_sceneCollisionHeader_00B7F0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_sceneCollisionHeader_00B7F0" -static const ALIGN_ASSET(2) char kakusiana_sceneCollisionHeader_00B7F0[] = dkakusiana_sceneCollisionHeader_00B7F0; - -#define dkakusiana_sceneTex_00C020 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_sceneTex_00C020" -static const ALIGN_ASSET(2) char kakusiana_sceneTex_00C020[] = dkakusiana_sceneTex_00C020; - -#define dkakusiana_sceneTex_00B820 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_sceneTex_00B820" +#define dkakusiana_sceneTex_00B820 "__OTR__scenes/shared/kakusiana_scene/kakusiana_sceneTex_00B820" static const ALIGN_ASSET(2) char kakusiana_sceneTex_00B820[] = dkakusiana_sceneTex_00B820; -#define dkakusiana_sceneTex_00D020 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_sceneTex_00D020" +#define dkakusiana_sceneTex_00C020 "__OTR__scenes/shared/kakusiana_scene/kakusiana_sceneTex_00C020" +static const ALIGN_ASSET(2) char kakusiana_sceneTex_00C020[] = dkakusiana_sceneTex_00C020; + +#define dkakusiana_sceneTex_00D020 "__OTR__scenes/shared/kakusiana_scene/kakusiana_sceneTex_00D020" static const ALIGN_ASSET(2) char kakusiana_sceneTex_00D020[] = dkakusiana_sceneTex_00D020; +#define dkakusiana_sceneCollisionHeader_00B7F0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_sceneCollisionHeader_00B7F0" +static const ALIGN_ASSET(2) char kakusiana_sceneCollisionHeader_00B7F0[] = dkakusiana_sceneCollisionHeader_00B7F0; + + #endif // MISC_KAKUSIANA_SCENE_H diff --git a/soh/assets/scenes/misc/kinsuta/kinsuta_room_0.h b/soh/assets/scenes/misc/kinsuta/kinsuta_room_0.h index cbe5c6663..4f82f4aed 100644 --- a/soh/assets/scenes/misc/kinsuta/kinsuta_room_0.h +++ b/soh/assets/scenes/misc/kinsuta/kinsuta_room_0.h @@ -3,73 +3,73 @@ #include "align_asset_macro.h" -#define dgKinsutaDL_0030B0 "__OTR__scenes/nonmq/kinsuta_scene/gKinsutaDL_0030B0" -static const ALIGN_ASSET(2) char gKinsutaDL_0030B0[] = dgKinsutaDL_0030B0; - -#define dgKinsutaDL_00B088 "__OTR__scenes/nonmq/kinsuta_scene/gKinsutaDL_00B088" -static const ALIGN_ASSET(2) char gKinsutaDL_00B088[] = dgKinsutaDL_00B088; - -#define dkinsuta_room_0DL_002BC8 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0DL_002BC8" -static const ALIGN_ASSET(2) char kinsuta_room_0DL_002BC8[] = dkinsuta_room_0DL_002BC8; - -#define dkinsuta_room_0Tex_009D10 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0Tex_009D10" -static const ALIGN_ASSET(2) char kinsuta_room_0Tex_009D10[] = dkinsuta_room_0Tex_009D10; - -#define dkinsuta_room_0Tex_008D10 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0Tex_008D10" -static const ALIGN_ASSET(2) char kinsuta_room_0Tex_008D10[] = dkinsuta_room_0Tex_008D10; - -#define dkinsuta_room_0Tex_006910 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0Tex_006910" -static const ALIGN_ASSET(2) char kinsuta_room_0Tex_006910[] = dkinsuta_room_0Tex_006910; - -#define dkinsuta_room_0DL_000CF0 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0DL_000CF0" -static const ALIGN_ASSET(2) char kinsuta_room_0DL_000CF0[] = dkinsuta_room_0DL_000CF0; - -#define dkinsuta_room_0DL_0013E8 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0DL_0013E8" -static const ALIGN_ASSET(2) char kinsuta_room_0DL_0013E8[] = dkinsuta_room_0DL_0013E8; - -#define dkinsuta_room_0Tex_003110 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0Tex_003110" +#define dkinsuta_room_0Tex_003110 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0Tex_003110" static const ALIGN_ASSET(2) char kinsuta_room_0Tex_003110[] = dkinsuta_room_0Tex_003110; -#define dkinsuta_room_0TLUT_0030F0 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0TLUT_0030F0" -static const ALIGN_ASSET(2) char kinsuta_room_0TLUT_0030F0[] = dkinsuta_room_0TLUT_0030F0; - -#define dkinsuta_room_0DL_0002E0 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0DL_0002E0" -static const ALIGN_ASSET(2) char kinsuta_room_0DL_0002E0[] = dkinsuta_room_0DL_0002E0; - -#define dkinsuta_room_0Tex_008910 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0Tex_008910" -static const ALIGN_ASSET(2) char kinsuta_room_0Tex_008910[] = dkinsuta_room_0Tex_008910; - -#define dkinsuta_room_0DL_00ACE0 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0DL_00ACE0" -static const ALIGN_ASSET(2) char kinsuta_room_0DL_00ACE0[] = dkinsuta_room_0DL_00ACE0; - -#define dkinsuta_room_0Tex_00D098 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0Tex_00D098" -static const ALIGN_ASSET(2) char kinsuta_room_0Tex_00D098[] = dkinsuta_room_0Tex_00D098; - -#define dkinsuta_room_0Tex_00C098 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0Tex_00C098" -static const ALIGN_ASSET(2) char kinsuta_room_0Tex_00C098[] = dkinsuta_room_0Tex_00C098; - -#define dkinsuta_room_0Tex_00B098 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0Tex_00B098" -static const ALIGN_ASSET(2) char kinsuta_room_0Tex_00B098[] = dkinsuta_room_0Tex_00B098; - -#define dkinsuta_room_0DL_001B38 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0DL_001B38" -static const ALIGN_ASSET(2) char kinsuta_room_0DL_001B38[] = dkinsuta_room_0DL_001B38; - -#define dkinsuta_room_0Tex_005910 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0Tex_005910" -static const ALIGN_ASSET(2) char kinsuta_room_0Tex_005910[] = dkinsuta_room_0Tex_005910; - -#define dkinsuta_room_0Tex_004910 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0Tex_004910" -static const ALIGN_ASSET(2) char kinsuta_room_0Tex_004910[] = dkinsuta_room_0Tex_004910; - -#define dkinsuta_room_0Tex_003910 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0Tex_003910" +#define dkinsuta_room_0Tex_003910 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0Tex_003910" static const ALIGN_ASSET(2) char kinsuta_room_0Tex_003910[] = dkinsuta_room_0Tex_003910; -#define dkinsuta_room_0DL_002FD8 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0DL_002FD8" -static const ALIGN_ASSET(2) char kinsuta_room_0DL_002FD8[] = dkinsuta_room_0DL_002FD8; +#define dkinsuta_room_0Tex_004910 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0Tex_004910" +static const ALIGN_ASSET(2) char kinsuta_room_0Tex_004910[] = dkinsuta_room_0Tex_004910; -#define dkinsuta_room_0Tex_007910 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0Tex_007910" +#define dkinsuta_room_0Tex_005910 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0Tex_005910" +static const ALIGN_ASSET(2) char kinsuta_room_0Tex_005910[] = dkinsuta_room_0Tex_005910; + +#define dkinsuta_room_0Tex_006910 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0Tex_006910" +static const ALIGN_ASSET(2) char kinsuta_room_0Tex_006910[] = dkinsuta_room_0Tex_006910; + +#define dkinsuta_room_0Tex_007910 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0Tex_007910" static const ALIGN_ASSET(2) char kinsuta_room_0Tex_007910[] = dkinsuta_room_0Tex_007910; -#define dkinsuta_room_0DL_001F78 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0DL_001F78" +#define dkinsuta_room_0Tex_008910 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0Tex_008910" +static const ALIGN_ASSET(2) char kinsuta_room_0Tex_008910[] = dkinsuta_room_0Tex_008910; + +#define dkinsuta_room_0Tex_008D10 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0Tex_008D10" +static const ALIGN_ASSET(2) char kinsuta_room_0Tex_008D10[] = dkinsuta_room_0Tex_008D10; + +#define dkinsuta_room_0Tex_009D10 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0Tex_009D10" +static const ALIGN_ASSET(2) char kinsuta_room_0Tex_009D10[] = dkinsuta_room_0Tex_009D10; + +#define dkinsuta_room_0Tex_00B098 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0Tex_00B098" +static const ALIGN_ASSET(2) char kinsuta_room_0Tex_00B098[] = dkinsuta_room_0Tex_00B098; + +#define dkinsuta_room_0Tex_00C098 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0Tex_00C098" +static const ALIGN_ASSET(2) char kinsuta_room_0Tex_00C098[] = dkinsuta_room_0Tex_00C098; + +#define dkinsuta_room_0Tex_00D098 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0Tex_00D098" +static const ALIGN_ASSET(2) char kinsuta_room_0Tex_00D098[] = dkinsuta_room_0Tex_00D098; + +#define dkinsuta_room_0TLUT_0030F0 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0TLUT_0030F0" +static const ALIGN_ASSET(2) char kinsuta_room_0TLUT_0030F0[] = dkinsuta_room_0TLUT_0030F0; + +#define dgKinsutaDL_0030B0 "__OTR__scenes/shared/kinsuta_scene/gKinsutaDL_0030B0" +static const ALIGN_ASSET(2) char gKinsutaDL_0030B0[] = dgKinsutaDL_0030B0; + +#define dgKinsutaDL_00B088 "__OTR__scenes/shared/kinsuta_scene/gKinsutaDL_00B088" +static const ALIGN_ASSET(2) char gKinsutaDL_00B088[] = dgKinsutaDL_00B088; + +#define dkinsuta_room_0DL_002BC8 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0DL_002BC8" +static const ALIGN_ASSET(2) char kinsuta_room_0DL_002BC8[] = dkinsuta_room_0DL_002BC8; + +#define dkinsuta_room_0DL_000CF0 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0DL_000CF0" +static const ALIGN_ASSET(2) char kinsuta_room_0DL_000CF0[] = dkinsuta_room_0DL_000CF0; + +#define dkinsuta_room_0DL_0013E8 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0DL_0013E8" +static const ALIGN_ASSET(2) char kinsuta_room_0DL_0013E8[] = dkinsuta_room_0DL_0013E8; + +#define dkinsuta_room_0DL_0002E0 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0DL_0002E0" +static const ALIGN_ASSET(2) char kinsuta_room_0DL_0002E0[] = dkinsuta_room_0DL_0002E0; + +#define dkinsuta_room_0DL_00ACE0 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0DL_00ACE0" +static const ALIGN_ASSET(2) char kinsuta_room_0DL_00ACE0[] = dkinsuta_room_0DL_00ACE0; + +#define dkinsuta_room_0DL_001B38 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0DL_001B38" +static const ALIGN_ASSET(2) char kinsuta_room_0DL_001B38[] = dkinsuta_room_0DL_001B38; + +#define dkinsuta_room_0DL_002FD8 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0DL_002FD8" +static const ALIGN_ASSET(2) char kinsuta_room_0DL_002FD8[] = dkinsuta_room_0DL_002FD8; + +#define dkinsuta_room_0DL_001F78 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0DL_001F78" static const ALIGN_ASSET(2) char kinsuta_room_0DL_001F78[] = dkinsuta_room_0DL_001F78; diff --git a/soh/assets/scenes/misc/kinsuta/kinsuta_scene.h b/soh/assets/scenes/misc/kinsuta/kinsuta_scene.h index bbdca758c..e6399d910 100644 --- a/soh/assets/scenes/misc/kinsuta/kinsuta_scene.h +++ b/soh/assets/scenes/misc/kinsuta/kinsuta_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dkinsuta_sceneCollisionHeader_0015E4 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_sceneCollisionHeader_0015E4" +#define dkinsuta_sceneCollisionHeader_0015E4 "__OTR__scenes/shared/kinsuta_scene/kinsuta_sceneCollisionHeader_0015E4" static const ALIGN_ASSET(2) char kinsuta_sceneCollisionHeader_0015E4[] = dkinsuta_sceneCollisionHeader_0015E4; diff --git a/soh/assets/scenes/misc/market_alley/market_alley_room_0.h b/soh/assets/scenes/misc/market_alley/market_alley_room_0.h index 4ba06910d..7fbb750c9 100644 --- a/soh/assets/scenes/misc/market_alley/market_alley_room_0.h +++ b/soh/assets/scenes/misc/market_alley/market_alley_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dmarket_alley_room_0DL_075688 "__OTR__scenes/nonmq/market_alley_scene/market_alley_room_0DL_075688" +#define dmarket_alley_room_0DL_075688 "__OTR__scenes/shared/market_alley_scene/market_alley_room_0DL_075688" static const ALIGN_ASSET(2) char market_alley_room_0DL_075688[] = dmarket_alley_room_0DL_075688; diff --git a/soh/assets/scenes/misc/market_alley/market_alley_scene.h b/soh/assets/scenes/misc/market_alley/market_alley_scene.h index 161022752..2d1fa0063 100644 --- a/soh/assets/scenes/misc/market_alley/market_alley_scene.h +++ b/soh/assets/scenes/misc/market_alley/market_alley_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dmarket_alley_sceneCollisionHeader_001218 "__OTR__scenes/nonmq/market_alley_scene/market_alley_sceneCollisionHeader_001218" +#define dmarket_alley_sceneCollisionHeader_001218 "__OTR__scenes/shared/market_alley_scene/market_alley_sceneCollisionHeader_001218" static const ALIGN_ASSET(2) char market_alley_sceneCollisionHeader_001218[] = dmarket_alley_sceneCollisionHeader_001218; diff --git a/soh/assets/scenes/misc/market_alley_n/market_alley_n_room_0.h b/soh/assets/scenes/misc/market_alley_n/market_alley_n_room_0.h index 00e40edfb..2913ad34b 100644 --- a/soh/assets/scenes/misc/market_alley_n/market_alley_n_room_0.h +++ b/soh/assets/scenes/misc/market_alley_n/market_alley_n_room_0.h @@ -3,10 +3,10 @@ #include "align_asset_macro.h" -#define dmarket_alley_n_room_0DL_075678 "__OTR__scenes/nonmq/market_alley_n_scene/market_alley_n_room_0DL_075678" +#define dmarket_alley_n_room_0DL_075678 "__OTR__scenes/shared/market_alley_n_scene/market_alley_n_room_0DL_075678" static const ALIGN_ASSET(2) char market_alley_n_room_0DL_075678[] = dmarket_alley_n_room_0DL_075678; -#define dmarket_alley_n_room_0DL_0756E0 "__OTR__scenes/nonmq/market_alley_n_scene/market_alley_n_room_0DL_0756E0" +#define dmarket_alley_n_room_0DL_0756E0 "__OTR__scenes/shared/market_alley_n_scene/market_alley_n_room_0DL_0756E0" static const ALIGN_ASSET(2) char market_alley_n_room_0DL_0756E0[] = dmarket_alley_n_room_0DL_0756E0; diff --git a/soh/assets/scenes/misc/market_alley_n/market_alley_n_scene.h b/soh/assets/scenes/misc/market_alley_n/market_alley_n_scene.h index 9970570aa..43c0b61a6 100644 --- a/soh/assets/scenes/misc/market_alley_n/market_alley_n_scene.h +++ b/soh/assets/scenes/misc/market_alley_n/market_alley_n_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dmarket_alley_n_sceneCollisionHeader_0012C0 "__OTR__scenes/nonmq/market_alley_n_scene/market_alley_n_sceneCollisionHeader_0012C0" +#define dmarket_alley_n_sceneCollisionHeader_0012C0 "__OTR__scenes/shared/market_alley_n_scene/market_alley_n_sceneCollisionHeader_0012C0" static const ALIGN_ASSET(2) char market_alley_n_sceneCollisionHeader_0012C0[] = dmarket_alley_n_sceneCollisionHeader_0012C0; diff --git a/soh/assets/scenes/misc/market_day/market_day_room_0.h b/soh/assets/scenes/misc/market_day/market_day_room_0.h index e14f8afc5..958874451 100644 --- a/soh/assets/scenes/misc/market_day/market_day_room_0.h +++ b/soh/assets/scenes/misc/market_day/market_day_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dmarket_day_room_0DL_0057D8 "__OTR__scenes/nonmq/market_day_scene/market_day_room_0DL_0057D8" +#define dmarket_day_room_0DL_0057D8 "__OTR__scenes/shared/market_day_scene/market_day_room_0DL_0057D8" static const ALIGN_ASSET(2) char market_day_room_0DL_0057D8[] = dmarket_day_room_0DL_0057D8; diff --git a/soh/assets/scenes/misc/market_day/market_day_scene.h b/soh/assets/scenes/misc/market_day/market_day_scene.h index 8ffdbc87a..29349aa1e 100644 --- a/soh/assets/scenes/misc/market_day/market_day_scene.h +++ b/soh/assets/scenes/misc/market_day/market_day_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dmarket_day_sceneCollisionHeader_002640 "__OTR__scenes/nonmq/market_day_scene/market_day_sceneCollisionHeader_002640" +#define dmarket_day_sceneCollisionHeader_002640 "__OTR__scenes/shared/market_day_scene/market_day_sceneCollisionHeader_002640" static const ALIGN_ASSET(2) char market_day_sceneCollisionHeader_002640[] = dmarket_day_sceneCollisionHeader_002640; diff --git a/soh/assets/scenes/misc/market_night/market_night_room_0.h b/soh/assets/scenes/misc/market_night/market_night_room_0.h index e43f72027..e564e9880 100644 --- a/soh/assets/scenes/misc/market_night/market_night_room_0.h +++ b/soh/assets/scenes/misc/market_night/market_night_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dmarket_night_room_0DL_005708 "__OTR__scenes/nonmq/market_night_scene/market_night_room_0DL_005708" +#define dmarket_night_room_0DL_005708 "__OTR__scenes/shared/market_night_scene/market_night_room_0DL_005708" static const ALIGN_ASSET(2) char market_night_room_0DL_005708[] = dmarket_night_room_0DL_005708; diff --git a/soh/assets/scenes/misc/market_night/market_night_scene.h b/soh/assets/scenes/misc/market_night/market_night_scene.h index 6ad9157a7..4ddc59865 100644 --- a/soh/assets/scenes/misc/market_night/market_night_scene.h +++ b/soh/assets/scenes/misc/market_night/market_night_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dmarket_night_sceneCollisionHeader_0025F8 "__OTR__scenes/nonmq/market_night_scene/market_night_sceneCollisionHeader_0025F8" +#define dmarket_night_sceneCollisionHeader_0025F8 "__OTR__scenes/shared/market_night_scene/market_night_sceneCollisionHeader_0025F8" static const ALIGN_ASSET(2) char market_night_sceneCollisionHeader_0025F8[] = dmarket_night_sceneCollisionHeader_0025F8; diff --git a/soh/assets/scenes/misc/market_ruins/market_ruins_room_0.h b/soh/assets/scenes/misc/market_ruins/market_ruins_room_0.h index 0ba874a26..d73e66afd 100644 --- a/soh/assets/scenes/misc/market_ruins/market_ruins_room_0.h +++ b/soh/assets/scenes/misc/market_ruins/market_ruins_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dmarket_ruins_room_0DL_0027B0 "__OTR__scenes/nonmq/market_ruins_scene/market_ruins_room_0DL_0027B0" +#define dmarket_ruins_room_0DL_0027B0 "__OTR__scenes/shared/market_ruins_scene/market_ruins_room_0DL_0027B0" static const ALIGN_ASSET(2) char market_ruins_room_0DL_0027B0[] = dmarket_ruins_room_0DL_0027B0; diff --git a/soh/assets/scenes/misc/market_ruins/market_ruins_scene.h b/soh/assets/scenes/misc/market_ruins/market_ruins_scene.h index 0d475a584..ba7210027 100644 --- a/soh/assets/scenes/misc/market_ruins/market_ruins_scene.h +++ b/soh/assets/scenes/misc/market_ruins/market_ruins_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dmarket_ruins_sceneCollisionHeader_0015F8 "__OTR__scenes/nonmq/market_ruins_scene/market_ruins_sceneCollisionHeader_0015F8" +#define dmarket_ruins_sceneCollisionHeader_0015F8 "__OTR__scenes/shared/market_ruins_scene/market_ruins_sceneCollisionHeader_0015F8" static const ALIGN_ASSET(2) char market_ruins_sceneCollisionHeader_0015F8[] = dmarket_ruins_sceneCollisionHeader_0015F8; diff --git a/soh/assets/scenes/misc/shrine/shrine_room_0.h b/soh/assets/scenes/misc/shrine/shrine_room_0.h index fd3ca932b..3dd6b9070 100644 --- a/soh/assets/scenes/misc/shrine/shrine_room_0.h +++ b/soh/assets/scenes/misc/shrine/shrine_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dshrine_room_0DL_007AE0 "__OTR__scenes/nonmq/shrine_scene/shrine_room_0DL_007AE0" +#define dshrine_room_0DL_007AE0 "__OTR__scenes/shared/shrine_scene/shrine_room_0DL_007AE0" static const ALIGN_ASSET(2) char shrine_room_0DL_007AE0[] = dshrine_room_0DL_007AE0; diff --git a/soh/assets/scenes/misc/shrine/shrine_scene.h b/soh/assets/scenes/misc/shrine/shrine_scene.h index bd9dc02d4..658d77d1b 100644 --- a/soh/assets/scenes/misc/shrine/shrine_scene.h +++ b/soh/assets/scenes/misc/shrine/shrine_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dshrine_sceneCollisionHeader_0014AC "__OTR__scenes/nonmq/shrine_scene/shrine_sceneCollisionHeader_0014AC" +#define dshrine_sceneCollisionHeader_0014AC "__OTR__scenes/shared/shrine_scene/shrine_sceneCollisionHeader_0014AC" static const ALIGN_ASSET(2) char shrine_sceneCollisionHeader_0014AC[] = dshrine_sceneCollisionHeader_0014AC; diff --git a/soh/assets/scenes/misc/shrine_n/shrine_n_room_0.h b/soh/assets/scenes/misc/shrine_n/shrine_n_room_0.h index e0503d5f5..1968bfc4b 100644 --- a/soh/assets/scenes/misc/shrine_n/shrine_n_room_0.h +++ b/soh/assets/scenes/misc/shrine_n/shrine_n_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dshrine_n_room_0DL_007B00 "__OTR__scenes/nonmq/shrine_n_scene/shrine_n_room_0DL_007B00" +#define dshrine_n_room_0DL_007B00 "__OTR__scenes/shared/shrine_n_scene/shrine_n_room_0DL_007B00" static const ALIGN_ASSET(2) char shrine_n_room_0DL_007B00[] = dshrine_n_room_0DL_007B00; diff --git a/soh/assets/scenes/misc/shrine_n/shrine_n_scene.h b/soh/assets/scenes/misc/shrine_n/shrine_n_scene.h index d7fd0dd1e..a093a2586 100644 --- a/soh/assets/scenes/misc/shrine_n/shrine_n_scene.h +++ b/soh/assets/scenes/misc/shrine_n/shrine_n_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dshrine_n_sceneCollisionHeader_0014D4 "__OTR__scenes/nonmq/shrine_n_scene/shrine_n_sceneCollisionHeader_0014D4" +#define dshrine_n_sceneCollisionHeader_0014D4 "__OTR__scenes/shared/shrine_n_scene/shrine_n_sceneCollisionHeader_0014D4" static const ALIGN_ASSET(2) char shrine_n_sceneCollisionHeader_0014D4[] = dshrine_n_sceneCollisionHeader_0014D4; diff --git a/soh/assets/scenes/misc/shrine_r/shrine_r_room_0.h b/soh/assets/scenes/misc/shrine_r/shrine_r_room_0.h index c70d0d3b2..028e602eb 100644 --- a/soh/assets/scenes/misc/shrine_r/shrine_r_room_0.h +++ b/soh/assets/scenes/misc/shrine_r/shrine_r_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dshrine_r_room_0DL_007AE0 "__OTR__scenes/nonmq/shrine_r_scene/shrine_r_room_0DL_007AE0" +#define dshrine_r_room_0DL_007AE0 "__OTR__scenes/shared/shrine_r_scene/shrine_r_room_0DL_007AE0" static const ALIGN_ASSET(2) char shrine_r_room_0DL_007AE0[] = dshrine_r_room_0DL_007AE0; diff --git a/soh/assets/scenes/misc/shrine_r/shrine_r_scene.h b/soh/assets/scenes/misc/shrine_r/shrine_r_scene.h index 70faee9ee..aba84bd9f 100644 --- a/soh/assets/scenes/misc/shrine_r/shrine_r_scene.h +++ b/soh/assets/scenes/misc/shrine_r/shrine_r_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dshrine_r_sceneCollisionHeader_00145C "__OTR__scenes/nonmq/shrine_r_scene/shrine_r_sceneCollisionHeader_00145C" +#define dshrine_r_sceneCollisionHeader_00145C "__OTR__scenes/shared/shrine_r_scene/shrine_r_sceneCollisionHeader_00145C" static const ALIGN_ASSET(2) char shrine_r_sceneCollisionHeader_00145C[] = dshrine_r_sceneCollisionHeader_00145C; diff --git a/soh/assets/scenes/misc/turibori/turibori_room_0.h b/soh/assets/scenes/misc/turibori/turibori_room_0.h index d9e764478..bad57b5e0 100644 --- a/soh/assets/scenes/misc/turibori/turibori_room_0.h +++ b/soh/assets/scenes/misc/turibori/turibori_room_0.h @@ -3,10 +3,10 @@ #include "align_asset_macro.h" -#define dturibori_room_0DL_0056F8 "__OTR__scenes/nonmq/turibori_scene/turibori_room_0DL_0056F8" +#define dturibori_room_0DL_0056F8 "__OTR__scenes/shared/turibori_scene/turibori_room_0DL_0056F8" static const ALIGN_ASSET(2) char turibori_room_0DL_0056F8[] = dturibori_room_0DL_0056F8; -#define dturibori_room_0DL_006740 "__OTR__scenes/nonmq/turibori_scene/turibori_room_0DL_006740" +#define dturibori_room_0DL_006740 "__OTR__scenes/shared/turibori_scene/turibori_room_0DL_006740" static const ALIGN_ASSET(2) char turibori_room_0DL_006740[] = dturibori_room_0DL_006740; diff --git a/soh/assets/scenes/misc/turibori/turibori_scene.h b/soh/assets/scenes/misc/turibori/turibori_scene.h index 156ed9c2f..93d2cb245 100644 --- a/soh/assets/scenes/misc/turibori/turibori_scene.h +++ b/soh/assets/scenes/misc/turibori/turibori_scene.h @@ -3,88 +3,89 @@ #include "align_asset_macro.h" -#define dturibori_sceneCollisionHeader_001CAC "__OTR__scenes/nonmq/turibori_scene/turibori_sceneCollisionHeader_001CAC" -static const ALIGN_ASSET(2) char turibori_sceneCollisionHeader_001CAC[] = dturibori_sceneCollisionHeader_001CAC; - -#define dturibori_sceneTex_0094E0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_0094E0" -static const ALIGN_ASSET(2) char turibori_sceneTex_0094E0[] = dturibori_sceneTex_0094E0; - -#define dturibori_sceneTex_0104E0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_0104E0" -static const ALIGN_ASSET(2) char turibori_sceneTex_0104E0[] = dturibori_sceneTex_0104E0; - -#define dturibori_sceneTex_00CCE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_00CCE0" -static const ALIGN_ASSET(2) char turibori_sceneTex_00CCE0[] = dturibori_sceneTex_00CCE0; - -#define dturibori_sceneTex_004CE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_004CE0" -static const ALIGN_ASSET(2) char turibori_sceneTex_004CE0[] = dturibori_sceneTex_004CE0; - -#define dturibori_sceneTex_004DE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_004DE0" -static const ALIGN_ASSET(2) char turibori_sceneTex_004DE0[] = dturibori_sceneTex_004DE0; - -#define dturibori_sceneTex_007FE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_007FE0" -static const ALIGN_ASSET(2) char turibori_sceneTex_007FE0[] = dturibori_sceneTex_007FE0; - -#define dturibori_sceneTex_009CE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_009CE0" -static const ALIGN_ASSET(2) char turibori_sceneTex_009CE0[] = dturibori_sceneTex_009CE0; - -#define dturibori_sceneTex_0081E0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_0081E0" -static const ALIGN_ASSET(2) char turibori_sceneTex_0081E0[] = dturibori_sceneTex_0081E0; - -#define dturibori_sceneTex_0059E0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_0059E0" -static const ALIGN_ASSET(2) char turibori_sceneTex_0059E0[] = dturibori_sceneTex_0059E0; - -#define dturibori_sceneTex_00ACE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_00ACE0" -static const ALIGN_ASSET(2) char turibori_sceneTex_00ACE0[] = dturibori_sceneTex_00ACE0; - -#define dturibori_sceneTex_00FCE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_00FCE0" -static const ALIGN_ASSET(2) char turibori_sceneTex_00FCE0[] = dturibori_sceneTex_00FCE0; - -#define dturibori_sceneTex_006BE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_006BE0" -static const ALIGN_ASSET(2) char turibori_sceneTex_006BE0[] = dturibori_sceneTex_006BE0; - -#define dturibori_sceneTex_001CE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_001CE0" +#define dturibori_sceneTex_001CE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_001CE0" static const ALIGN_ASSET(2) char turibori_sceneTex_001CE0[] = dturibori_sceneTex_001CE0; -#define dturibori_sceneTex_0116E0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_0116E0" -static const ALIGN_ASSET(2) char turibori_sceneTex_0116E0[] = dturibori_sceneTex_0116E0; - -#define dturibori_sceneTex_00ECE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_00ECE0" -static const ALIGN_ASSET(2) char turibori_sceneTex_00ECE0[] = dturibori_sceneTex_00ECE0; - -#define dturibori_sceneTex_0114E0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_0114E0" -static const ALIGN_ASSET(2) char turibori_sceneTex_0114E0[] = dturibori_sceneTex_0114E0; - -#define dturibori_sceneTex_003CE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_003CE0" -static const ALIGN_ASSET(2) char turibori_sceneTex_003CE0[] = dturibori_sceneTex_003CE0; - -#define dturibori_sceneTex_002CE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_002CE0" +#define dturibori_sceneTex_002CE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_002CE0" static const ALIGN_ASSET(2) char turibori_sceneTex_002CE0[] = dturibori_sceneTex_002CE0; -#define dturibori_sceneTex_00DCE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_00DCE0" -static const ALIGN_ASSET(2) char turibori_sceneTex_00DCE0[] = dturibori_sceneTex_00DCE0; +#define dturibori_sceneTex_003CE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_003CE0" +static const ALIGN_ASSET(2) char turibori_sceneTex_003CE0[] = dturibori_sceneTex_003CE0; -#define dturibori_sceneTex_00BCE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_00BCE0" -static const ALIGN_ASSET(2) char turibori_sceneTex_00BCE0[] = dturibori_sceneTex_00BCE0; +#define dturibori_sceneTex_004CE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_004CE0" +static const ALIGN_ASSET(2) char turibori_sceneTex_004CE0[] = dturibori_sceneTex_004CE0; -#define dturibori_sceneTex_00F4E0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_00F4E0" -static const ALIGN_ASSET(2) char turibori_sceneTex_00F4E0[] = dturibori_sceneTex_00F4E0; +#define dturibori_sceneTex_004DE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_004DE0" +static const ALIGN_ASSET(2) char turibori_sceneTex_004DE0[] = dturibori_sceneTex_004DE0; -#define dturibori_sceneTex_0069E0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_0069E0" -static const ALIGN_ASSET(2) char turibori_sceneTex_0069E0[] = dturibori_sceneTex_0069E0; - -#define dturibori_sceneTex_0051E0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_0051E0" +#define dturibori_sceneTex_0051E0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_0051E0" static const ALIGN_ASSET(2) char turibori_sceneTex_0051E0[] = dturibori_sceneTex_0051E0; -#define dturibori_sceneTex_007BE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_007BE0" +#define dturibori_sceneTex_0059E0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_0059E0" +static const ALIGN_ASSET(2) char turibori_sceneTex_0059E0[] = dturibori_sceneTex_0059E0; + +#define dturibori_sceneTex_0069E0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_0069E0" +static const ALIGN_ASSET(2) char turibori_sceneTex_0069E0[] = dturibori_sceneTex_0069E0; + +#define dturibori_sceneTex_006BE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_006BE0" +static const ALIGN_ASSET(2) char turibori_sceneTex_006BE0[] = dturibori_sceneTex_006BE0; + +#define dturibori_sceneTex_007BE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_007BE0" static const ALIGN_ASSET(2) char turibori_sceneTex_007BE0[] = dturibori_sceneTex_007BE0; -#define dturibori_sceneTex_0091E0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_0091E0" +#define dturibori_sceneTex_007FE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_007FE0" +static const ALIGN_ASSET(2) char turibori_sceneTex_007FE0[] = dturibori_sceneTex_007FE0; + +#define dturibori_sceneTex_0081E0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_0081E0" +static const ALIGN_ASSET(2) char turibori_sceneTex_0081E0[] = dturibori_sceneTex_0081E0; + +#define dturibori_sceneTex_0091E0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_0091E0" static const ALIGN_ASSET(2) char turibori_sceneTex_0091E0[] = dturibori_sceneTex_0091E0; -#define dturibori_sceneTex_0092E0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_0092E0" +#define dturibori_sceneTex_0092E0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_0092E0" static const ALIGN_ASSET(2) char turibori_sceneTex_0092E0[] = dturibori_sceneTex_0092E0; -#define dturibori_sceneTex_00E4E0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_00E4E0" +#define dturibori_sceneTex_0094E0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_0094E0" +static const ALIGN_ASSET(2) char turibori_sceneTex_0094E0[] = dturibori_sceneTex_0094E0; + +#define dturibori_sceneTex_009CE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_009CE0" +static const ALIGN_ASSET(2) char turibori_sceneTex_009CE0[] = dturibori_sceneTex_009CE0; + +#define dturibori_sceneTex_00ACE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_00ACE0" +static const ALIGN_ASSET(2) char turibori_sceneTex_00ACE0[] = dturibori_sceneTex_00ACE0; + +#define dturibori_sceneTex_00BCE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_00BCE0" +static const ALIGN_ASSET(2) char turibori_sceneTex_00BCE0[] = dturibori_sceneTex_00BCE0; + +#define dturibori_sceneTex_00CCE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_00CCE0" +static const ALIGN_ASSET(2) char turibori_sceneTex_00CCE0[] = dturibori_sceneTex_00CCE0; + +#define dturibori_sceneTex_00DCE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_00DCE0" +static const ALIGN_ASSET(2) char turibori_sceneTex_00DCE0[] = dturibori_sceneTex_00DCE0; + +#define dturibori_sceneTex_00E4E0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_00E4E0" static const ALIGN_ASSET(2) char turibori_sceneTex_00E4E0[] = dturibori_sceneTex_00E4E0; +#define dturibori_sceneTex_00ECE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_00ECE0" +static const ALIGN_ASSET(2) char turibori_sceneTex_00ECE0[] = dturibori_sceneTex_00ECE0; + +#define dturibori_sceneTex_00F4E0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_00F4E0" +static const ALIGN_ASSET(2) char turibori_sceneTex_00F4E0[] = dturibori_sceneTex_00F4E0; + +#define dturibori_sceneTex_00FCE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_00FCE0" +static const ALIGN_ASSET(2) char turibori_sceneTex_00FCE0[] = dturibori_sceneTex_00FCE0; + +#define dturibori_sceneTex_0104E0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_0104E0" +static const ALIGN_ASSET(2) char turibori_sceneTex_0104E0[] = dturibori_sceneTex_0104E0; + +#define dturibori_sceneTex_0114E0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_0114E0" +static const ALIGN_ASSET(2) char turibori_sceneTex_0114E0[] = dturibori_sceneTex_0114E0; + +#define dturibori_sceneTex_0116E0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_0116E0" +static const ALIGN_ASSET(2) char turibori_sceneTex_0116E0[] = dturibori_sceneTex_0116E0; + +#define dturibori_sceneCollisionHeader_001CAC "__OTR__scenes/shared/turibori_scene/turibori_sceneCollisionHeader_001CAC" +static const ALIGN_ASSET(2) char turibori_sceneCollisionHeader_001CAC[] = dturibori_sceneCollisionHeader_001CAC; + + #endif // MISC_TURIBORI_SCENE_H diff --git a/soh/assets/scenes/overworld/entra/entra_room_0.h b/soh/assets/scenes/overworld/entra/entra_room_0.h index 257d35e86..cca9f69c7 100644 --- a/soh/assets/scenes/overworld/entra/entra_room_0.h +++ b/soh/assets/scenes/overworld/entra/entra_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dentra_room_0DL_000348 "__OTR__scenes/nonmq/entra_scene/entra_room_0DL_000348" +#define dentra_room_0DL_000348 "__OTR__scenes/shared/entra_scene/entra_room_0DL_000348" static const ALIGN_ASSET(2) char entra_room_0DL_000348[] = dentra_room_0DL_000348; diff --git a/soh/assets/scenes/overworld/entra/entra_scene.h b/soh/assets/scenes/overworld/entra/entra_scene.h index 7ebc1f8ed..1d1ec1a0c 100644 --- a/soh/assets/scenes/overworld/entra/entra_scene.h +++ b/soh/assets/scenes/overworld/entra/entra_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dentra_sceneCollisionHeader_0003B4 "__OTR__scenes/nonmq/entra_scene/entra_sceneCollisionHeader_0003B4" +#define dentra_sceneCollisionHeader_0003B4 "__OTR__scenes/shared/entra_scene/entra_sceneCollisionHeader_0003B4" static const ALIGN_ASSET(2) char entra_sceneCollisionHeader_0003B4[] = dentra_sceneCollisionHeader_0003B4; diff --git a/soh/assets/scenes/overworld/souko/souko_room_0.h b/soh/assets/scenes/overworld/souko/souko_room_0.h index 252d0c920..df6a2adb9 100644 --- a/soh/assets/scenes/overworld/souko/souko_room_0.h +++ b/soh/assets/scenes/overworld/souko/souko_room_0.h @@ -3,61 +3,61 @@ #include "align_asset_macro.h" -#define dsouko_room_0DL_001E30 "__OTR__scenes/nonmq/souko_scene/souko_room_0DL_001E30" -static const ALIGN_ASSET(2) char souko_room_0DL_001E30[] = dsouko_room_0DL_001E30; - -#define dsouko_room_0Tex_0064F8 "__OTR__scenes/nonmq/souko_scene/souko_room_0Tex_0064F8" -static const ALIGN_ASSET(2) char souko_room_0Tex_0064F8[] = dsouko_room_0Tex_0064F8; - -#define dsouko_room_0DL_003950 "__OTR__scenes/nonmq/souko_scene/souko_room_0DL_003950" -static const ALIGN_ASSET(2) char souko_room_0DL_003950[] = dsouko_room_0DL_003950; - -#define dsouko_room_0Tex_006CF8 "__OTR__scenes/nonmq/souko_scene/souko_room_0Tex_006CF8" -static const ALIGN_ASSET(2) char souko_room_0Tex_006CF8[] = dsouko_room_0Tex_006CF8; - -#define dsouko_room_0Tex_0070F8 "__OTR__scenes/nonmq/souko_scene/souko_room_0Tex_0070F8" -static const ALIGN_ASSET(2) char souko_room_0Tex_0070F8[] = dsouko_room_0Tex_0070F8; - -#define dsouko_room_0DL_009440 "__OTR__scenes/nonmq/souko_scene/souko_room_0DL_009440" -static const ALIGN_ASSET(2) char souko_room_0DL_009440[] = dsouko_room_0DL_009440; - -#define dsouko_room_0DL_000FE0 "__OTR__scenes/nonmq/souko_scene/souko_room_0DL_000FE0" -static const ALIGN_ASSET(2) char souko_room_0DL_000FE0[] = dsouko_room_0DL_000FE0; - -#define dsouko_room_0Tex_0090F8 "__OTR__scenes/nonmq/souko_scene/souko_room_0Tex_0090F8" -static const ALIGN_ASSET(2) char souko_room_0Tex_0090F8[] = dsouko_room_0Tex_0090F8; - -#define dsouko_room_0DL_0016C0 "__OTR__scenes/nonmq/souko_scene/souko_room_0DL_0016C0" -static const ALIGN_ASSET(2) char souko_room_0DL_0016C0[] = dsouko_room_0DL_0016C0; - -#define dsouko_room_0DL_004A40 "__OTR__scenes/nonmq/souko_scene/souko_room_0DL_004A40" -static const ALIGN_ASSET(2) char souko_room_0DL_004A40[] = dsouko_room_0DL_004A40; - -#define dsouko_room_0Tex_005CF8 "__OTR__scenes/nonmq/souko_scene/souko_room_0Tex_005CF8" -static const ALIGN_ASSET(2) char souko_room_0Tex_005CF8[] = dsouko_room_0Tex_005CF8; - -#define dsouko_room_0DL_001908 "__OTR__scenes/nonmq/souko_scene/souko_room_0DL_001908" -static const ALIGN_ASSET(2) char souko_room_0DL_001908[] = dsouko_room_0DL_001908; - -#define dsouko_room_0DL_0052A0 "__OTR__scenes/nonmq/souko_scene/souko_room_0DL_0052A0" -static const ALIGN_ASSET(2) char souko_room_0DL_0052A0[] = dsouko_room_0DL_0052A0; - -#define dsouko_room_0DL_0008B0 "__OTR__scenes/nonmq/souko_scene/souko_room_0DL_0008B0" -static const ALIGN_ASSET(2) char souko_room_0DL_0008B0[] = dsouko_room_0DL_0008B0; - -#define dsouko_room_0Tex_0054F8 "__OTR__scenes/nonmq/souko_scene/souko_room_0Tex_0054F8" +#define dsouko_room_0Tex_0054F8 "__OTR__scenes/shared/souko_scene/souko_room_0Tex_0054F8" static const ALIGN_ASSET(2) char souko_room_0Tex_0054F8[] = dsouko_room_0Tex_0054F8; -#define dsouko_room_0DL_002480 "__OTR__scenes/nonmq/souko_scene/souko_room_0DL_002480" -static const ALIGN_ASSET(2) char souko_room_0DL_002480[] = dsouko_room_0DL_002480; +#define dsouko_room_0Tex_005CF8 "__OTR__scenes/shared/souko_scene/souko_room_0Tex_005CF8" +static const ALIGN_ASSET(2) char souko_room_0Tex_005CF8[] = dsouko_room_0Tex_005CF8; -#define dsouko_room_0Tex_0080F8 "__OTR__scenes/nonmq/souko_scene/souko_room_0Tex_0080F8" -static const ALIGN_ASSET(2) char souko_room_0Tex_0080F8[] = dsouko_room_0Tex_0080F8; +#define dsouko_room_0Tex_0064F8 "__OTR__scenes/shared/souko_scene/souko_room_0Tex_0064F8" +static const ALIGN_ASSET(2) char souko_room_0Tex_0064F8[] = dsouko_room_0Tex_0064F8; -#define dsouko_room_0Tex_0078F8 "__OTR__scenes/nonmq/souko_scene/souko_room_0Tex_0078F8" +#define dsouko_room_0Tex_006CF8 "__OTR__scenes/shared/souko_scene/souko_room_0Tex_006CF8" +static const ALIGN_ASSET(2) char souko_room_0Tex_006CF8[] = dsouko_room_0Tex_006CF8; + +#define dsouko_room_0Tex_0070F8 "__OTR__scenes/shared/souko_scene/souko_room_0Tex_0070F8" +static const ALIGN_ASSET(2) char souko_room_0Tex_0070F8[] = dsouko_room_0Tex_0070F8; + +#define dsouko_room_0Tex_0078F8 "__OTR__scenes/shared/souko_scene/souko_room_0Tex_0078F8" static const ALIGN_ASSET(2) char souko_room_0Tex_0078F8[] = dsouko_room_0Tex_0078F8; -#define dsouko_room_0DL_000C58 "__OTR__scenes/nonmq/souko_scene/souko_room_0DL_000C58" +#define dsouko_room_0Tex_0080F8 "__OTR__scenes/shared/souko_scene/souko_room_0Tex_0080F8" +static const ALIGN_ASSET(2) char souko_room_0Tex_0080F8[] = dsouko_room_0Tex_0080F8; + +#define dsouko_room_0Tex_0090F8 "__OTR__scenes/shared/souko_scene/souko_room_0Tex_0090F8" +static const ALIGN_ASSET(2) char souko_room_0Tex_0090F8[] = dsouko_room_0Tex_0090F8; + +#define dsouko_room_0DL_001E30 "__OTR__scenes/shared/souko_scene/souko_room_0DL_001E30" +static const ALIGN_ASSET(2) char souko_room_0DL_001E30[] = dsouko_room_0DL_001E30; + +#define dsouko_room_0DL_003950 "__OTR__scenes/shared/souko_scene/souko_room_0DL_003950" +static const ALIGN_ASSET(2) char souko_room_0DL_003950[] = dsouko_room_0DL_003950; + +#define dsouko_room_0DL_009440 "__OTR__scenes/shared/souko_scene/souko_room_0DL_009440" +static const ALIGN_ASSET(2) char souko_room_0DL_009440[] = dsouko_room_0DL_009440; + +#define dsouko_room_0DL_000FE0 "__OTR__scenes/shared/souko_scene/souko_room_0DL_000FE0" +static const ALIGN_ASSET(2) char souko_room_0DL_000FE0[] = dsouko_room_0DL_000FE0; + +#define dsouko_room_0DL_0016C0 "__OTR__scenes/shared/souko_scene/souko_room_0DL_0016C0" +static const ALIGN_ASSET(2) char souko_room_0DL_0016C0[] = dsouko_room_0DL_0016C0; + +#define dsouko_room_0DL_004A40 "__OTR__scenes/shared/souko_scene/souko_room_0DL_004A40" +static const ALIGN_ASSET(2) char souko_room_0DL_004A40[] = dsouko_room_0DL_004A40; + +#define dsouko_room_0DL_001908 "__OTR__scenes/shared/souko_scene/souko_room_0DL_001908" +static const ALIGN_ASSET(2) char souko_room_0DL_001908[] = dsouko_room_0DL_001908; + +#define dsouko_room_0DL_0052A0 "__OTR__scenes/shared/souko_scene/souko_room_0DL_0052A0" +static const ALIGN_ASSET(2) char souko_room_0DL_0052A0[] = dsouko_room_0DL_0052A0; + +#define dsouko_room_0DL_0008B0 "__OTR__scenes/shared/souko_scene/souko_room_0DL_0008B0" +static const ALIGN_ASSET(2) char souko_room_0DL_0008B0[] = dsouko_room_0DL_0008B0; + +#define dsouko_room_0DL_002480 "__OTR__scenes/shared/souko_scene/souko_room_0DL_002480" +static const ALIGN_ASSET(2) char souko_room_0DL_002480[] = dsouko_room_0DL_002480; + +#define dsouko_room_0DL_000C58 "__OTR__scenes/shared/souko_scene/souko_room_0DL_000C58" static const ALIGN_ASSET(2) char souko_room_0DL_000C58[] = dsouko_room_0DL_000C58; diff --git a/soh/assets/scenes/overworld/souko/souko_room_1.h b/soh/assets/scenes/overworld/souko/souko_room_1.h index 8ac7d1eba..8f527d119 100644 --- a/soh/assets/scenes/overworld/souko/souko_room_1.h +++ b/soh/assets/scenes/overworld/souko/souko_room_1.h @@ -3,76 +3,76 @@ #include "align_asset_macro.h" -#define dsouko_room_1DL_003A00 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_003A00" -static const ALIGN_ASSET(2) char souko_room_1DL_003A00[] = dsouko_room_1DL_003A00; - -#define dsouko_room_1Tex_005918 "__OTR__scenes/nonmq/souko_scene/souko_room_1Tex_005918" -static const ALIGN_ASSET(2) char souko_room_1Tex_005918[] = dsouko_room_1Tex_005918; - -#define dsouko_room_1Tex_007118 "__OTR__scenes/nonmq/souko_scene/souko_room_1Tex_007118" -static const ALIGN_ASSET(2) char souko_room_1Tex_007118[] = dsouko_room_1Tex_007118; - -#define dsouko_room_1DL_009B08 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_009B08" -static const ALIGN_ASSET(2) char souko_room_1DL_009B08[] = dsouko_room_1DL_009B08; - -#define dsouko_room_1Tex_009F28 "__OTR__scenes/nonmq/souko_scene/souko_room_1Tex_009F28" -static const ALIGN_ASSET(2) char souko_room_1Tex_009F28[] = dsouko_room_1Tex_009F28; - -#define dsouko_room_1DL_0040C8 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_0040C8" -static const ALIGN_ASSET(2) char souko_room_1DL_0040C8[] = dsouko_room_1DL_0040C8; - -#define dsouko_room_1DL_009DC0 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_009DC0" -static const ALIGN_ASSET(2) char souko_room_1DL_009DC0[] = dsouko_room_1DL_009DC0; - -#define dsouko_room_1DL_001288 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_001288" -static const ALIGN_ASSET(2) char souko_room_1DL_001288[] = dsouko_room_1DL_001288; - -#define dsouko_room_1DL_001DF0 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_001DF0" -static const ALIGN_ASSET(2) char souko_room_1DL_001DF0[] = dsouko_room_1DL_001DF0; - -#define dsouko_room_1DL_004F50 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_004F50" -static const ALIGN_ASSET(2) char souko_room_1DL_004F50[] = dsouko_room_1DL_004F50; - -#define dsouko_room_1DL_0022B0 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_0022B0" -static const ALIGN_ASSET(2) char souko_room_1DL_0022B0[] = dsouko_room_1DL_0022B0; - -#define dsouko_room_1Tex_006118 "__OTR__scenes/nonmq/souko_scene/souko_room_1Tex_006118" -static const ALIGN_ASSET(2) char souko_room_1Tex_006118[] = dsouko_room_1Tex_006118; - -#define dsouko_room_1DL_0097E0 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_0097E0" -static const ALIGN_ASSET(2) char souko_room_1DL_0097E0[] = dsouko_room_1DL_0097E0; - -#define dsouko_room_1Tex_00A128 "__OTR__scenes/nonmq/souko_scene/souko_room_1Tex_00A128" -static const ALIGN_ASSET(2) char souko_room_1Tex_00A128[] = dsouko_room_1Tex_00A128; - -#define dsouko_room_1Tex_00A228 "__OTR__scenes/nonmq/souko_scene/souko_room_1Tex_00A228" -static const ALIGN_ASSET(2) char souko_room_1Tex_00A228[] = dsouko_room_1Tex_00A228; - -#define dsouko_room_1DL_002590 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_002590" -static const ALIGN_ASSET(2) char souko_room_1DL_002590[] = dsouko_room_1DL_002590; - -#define dsouko_room_1DL_004790 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_004790" -static const ALIGN_ASSET(2) char souko_room_1DL_004790[] = dsouko_room_1DL_004790; - -#define dsouko_room_1Tex_008D18 "__OTR__scenes/nonmq/souko_scene/souko_room_1Tex_008D18" -static const ALIGN_ASSET(2) char souko_room_1Tex_008D18[] = dsouko_room_1Tex_008D18; - -#define dsouko_room_1DL_000890 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_000890" -static const ALIGN_ASSET(2) char souko_room_1DL_000890[] = dsouko_room_1DL_000890; - -#define dsouko_room_1Tex_005118 "__OTR__scenes/nonmq/souko_scene/souko_room_1Tex_005118" +#define dsouko_room_1Tex_005118 "__OTR__scenes/shared/souko_scene/souko_room_1Tex_005118" static const ALIGN_ASSET(2) char souko_room_1Tex_005118[] = dsouko_room_1Tex_005118; -#define dsouko_room_1DL_0029C8 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_0029C8" -static const ALIGN_ASSET(2) char souko_room_1DL_0029C8[] = dsouko_room_1DL_0029C8; +#define dsouko_room_1Tex_005918 "__OTR__scenes/shared/souko_scene/souko_room_1Tex_005918" +static const ALIGN_ASSET(2) char souko_room_1Tex_005918[] = dsouko_room_1Tex_005918; -#define dsouko_room_1Tex_007D18 "__OTR__scenes/nonmq/souko_scene/souko_room_1Tex_007D18" -static const ALIGN_ASSET(2) char souko_room_1Tex_007D18[] = dsouko_room_1Tex_007D18; +#define dsouko_room_1Tex_006118 "__OTR__scenes/shared/souko_scene/souko_room_1Tex_006118" +static const ALIGN_ASSET(2) char souko_room_1Tex_006118[] = dsouko_room_1Tex_006118; -#define dsouko_room_1Tex_007518 "__OTR__scenes/nonmq/souko_scene/souko_room_1Tex_007518" +#define dsouko_room_1Tex_007118 "__OTR__scenes/shared/souko_scene/souko_room_1Tex_007118" +static const ALIGN_ASSET(2) char souko_room_1Tex_007118[] = dsouko_room_1Tex_007118; + +#define dsouko_room_1Tex_007518 "__OTR__scenes/shared/souko_scene/souko_room_1Tex_007518" static const ALIGN_ASSET(2) char souko_room_1Tex_007518[] = dsouko_room_1Tex_007518; -#define dsouko_room_1DL_000FB8 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_000FB8" +#define dsouko_room_1Tex_007D18 "__OTR__scenes/shared/souko_scene/souko_room_1Tex_007D18" +static const ALIGN_ASSET(2) char souko_room_1Tex_007D18[] = dsouko_room_1Tex_007D18; + +#define dsouko_room_1Tex_008D18 "__OTR__scenes/shared/souko_scene/souko_room_1Tex_008D18" +static const ALIGN_ASSET(2) char souko_room_1Tex_008D18[] = dsouko_room_1Tex_008D18; + +#define dsouko_room_1Tex_009F28 "__OTR__scenes/shared/souko_scene/souko_room_1Tex_009F28" +static const ALIGN_ASSET(2) char souko_room_1Tex_009F28[] = dsouko_room_1Tex_009F28; + +#define dsouko_room_1Tex_00A128 "__OTR__scenes/shared/souko_scene/souko_room_1Tex_00A128" +static const ALIGN_ASSET(2) char souko_room_1Tex_00A128[] = dsouko_room_1Tex_00A128; + +#define dsouko_room_1Tex_00A228 "__OTR__scenes/shared/souko_scene/souko_room_1Tex_00A228" +static const ALIGN_ASSET(2) char souko_room_1Tex_00A228[] = dsouko_room_1Tex_00A228; + +#define dsouko_room_1DL_003A00 "__OTR__scenes/shared/souko_scene/souko_room_1DL_003A00" +static const ALIGN_ASSET(2) char souko_room_1DL_003A00[] = dsouko_room_1DL_003A00; + +#define dsouko_room_1DL_009B08 "__OTR__scenes/shared/souko_scene/souko_room_1DL_009B08" +static const ALIGN_ASSET(2) char souko_room_1DL_009B08[] = dsouko_room_1DL_009B08; + +#define dsouko_room_1DL_0040C8 "__OTR__scenes/shared/souko_scene/souko_room_1DL_0040C8" +static const ALIGN_ASSET(2) char souko_room_1DL_0040C8[] = dsouko_room_1DL_0040C8; + +#define dsouko_room_1DL_009DC0 "__OTR__scenes/shared/souko_scene/souko_room_1DL_009DC0" +static const ALIGN_ASSET(2) char souko_room_1DL_009DC0[] = dsouko_room_1DL_009DC0; + +#define dsouko_room_1DL_001288 "__OTR__scenes/shared/souko_scene/souko_room_1DL_001288" +static const ALIGN_ASSET(2) char souko_room_1DL_001288[] = dsouko_room_1DL_001288; + +#define dsouko_room_1DL_001DF0 "__OTR__scenes/shared/souko_scene/souko_room_1DL_001DF0" +static const ALIGN_ASSET(2) char souko_room_1DL_001DF0[] = dsouko_room_1DL_001DF0; + +#define dsouko_room_1DL_004F50 "__OTR__scenes/shared/souko_scene/souko_room_1DL_004F50" +static const ALIGN_ASSET(2) char souko_room_1DL_004F50[] = dsouko_room_1DL_004F50; + +#define dsouko_room_1DL_0022B0 "__OTR__scenes/shared/souko_scene/souko_room_1DL_0022B0" +static const ALIGN_ASSET(2) char souko_room_1DL_0022B0[] = dsouko_room_1DL_0022B0; + +#define dsouko_room_1DL_0097E0 "__OTR__scenes/shared/souko_scene/souko_room_1DL_0097E0" +static const ALIGN_ASSET(2) char souko_room_1DL_0097E0[] = dsouko_room_1DL_0097E0; + +#define dsouko_room_1DL_002590 "__OTR__scenes/shared/souko_scene/souko_room_1DL_002590" +static const ALIGN_ASSET(2) char souko_room_1DL_002590[] = dsouko_room_1DL_002590; + +#define dsouko_room_1DL_004790 "__OTR__scenes/shared/souko_scene/souko_room_1DL_004790" +static const ALIGN_ASSET(2) char souko_room_1DL_004790[] = dsouko_room_1DL_004790; + +#define dsouko_room_1DL_000890 "__OTR__scenes/shared/souko_scene/souko_room_1DL_000890" +static const ALIGN_ASSET(2) char souko_room_1DL_000890[] = dsouko_room_1DL_000890; + +#define dsouko_room_1DL_0029C8 "__OTR__scenes/shared/souko_scene/souko_room_1DL_0029C8" +static const ALIGN_ASSET(2) char souko_room_1DL_0029C8[] = dsouko_room_1DL_0029C8; + +#define dsouko_room_1DL_000FB8 "__OTR__scenes/shared/souko_scene/souko_room_1DL_000FB8" static const ALIGN_ASSET(2) char souko_room_1DL_000FB8[] = dsouko_room_1DL_000FB8; diff --git a/soh/assets/scenes/overworld/souko/souko_room_2.h b/soh/assets/scenes/overworld/souko/souko_room_2.h index 5c33d1ea9..905a5ef0e 100644 --- a/soh/assets/scenes/overworld/souko/souko_room_2.h +++ b/soh/assets/scenes/overworld/souko/souko_room_2.h @@ -3,49 +3,49 @@ #include "align_asset_macro.h" -#define dsouko_room_2DL_007C20 "__OTR__scenes/nonmq/souko_scene/souko_room_2DL_007C20" -static const ALIGN_ASSET(2) char souko_room_2DL_007C20[] = dsouko_room_2DL_007C20; - -#define dsouko_room_2DL_0009D0 "__OTR__scenes/nonmq/souko_scene/souko_room_2DL_0009D0" -static const ALIGN_ASSET(2) char souko_room_2DL_0009D0[] = dsouko_room_2DL_0009D0; - -#define dsouko_room_2DL_0030F8 "__OTR__scenes/nonmq/souko_scene/souko_room_2DL_0030F8" -static const ALIGN_ASSET(2) char souko_room_2DL_0030F8[] = dsouko_room_2DL_0030F8; - -#define dsouko_room_2Tex_0062E0 "__OTR__scenes/nonmq/souko_scene/souko_room_2Tex_0062E0" -static const ALIGN_ASSET(2) char souko_room_2Tex_0062E0[] = dsouko_room_2Tex_0062E0; - -#define dsouko_room_2Tex_005AE0 "__OTR__scenes/nonmq/souko_scene/souko_room_2Tex_005AE0" -static const ALIGN_ASSET(2) char souko_room_2Tex_005AE0[] = dsouko_room_2Tex_005AE0; - -#define dsouko_room_2Tex_0052E0 "__OTR__scenes/nonmq/souko_scene/souko_room_2Tex_0052E0" -static const ALIGN_ASSET(2) char souko_room_2Tex_0052E0[] = dsouko_room_2Tex_0052E0; - -#define dsouko_room_2Tex_006AE0 "__OTR__scenes/nonmq/souko_scene/souko_room_2Tex_006AE0" -static const ALIGN_ASSET(2) char souko_room_2Tex_006AE0[] = dsouko_room_2Tex_006AE0; - -#define dsouko_room_2Tex_004EE0 "__OTR__scenes/nonmq/souko_scene/souko_room_2Tex_004EE0" +#define dsouko_room_2Tex_004EE0 "__OTR__scenes/shared/souko_scene/souko_room_2Tex_004EE0" static const ALIGN_ASSET(2) char souko_room_2Tex_004EE0[] = dsouko_room_2Tex_004EE0; -#define dsouko_room_2DL_007E90 "__OTR__scenes/nonmq/souko_scene/souko_room_2DL_007E90" -static const ALIGN_ASSET(2) char souko_room_2DL_007E90[] = dsouko_room_2DL_007E90; +#define dsouko_room_2Tex_0052E0 "__OTR__scenes/shared/souko_scene/souko_room_2Tex_0052E0" +static const ALIGN_ASSET(2) char souko_room_2Tex_0052E0[] = dsouko_room_2Tex_0052E0; -#define dsouko_room_2Tex_007F78 "__OTR__scenes/nonmq/souko_scene/souko_room_2Tex_007F78" +#define dsouko_room_2Tex_005AE0 "__OTR__scenes/shared/souko_scene/souko_room_2Tex_005AE0" +static const ALIGN_ASSET(2) char souko_room_2Tex_005AE0[] = dsouko_room_2Tex_005AE0; + +#define dsouko_room_2Tex_0062E0 "__OTR__scenes/shared/souko_scene/souko_room_2Tex_0062E0" +static const ALIGN_ASSET(2) char souko_room_2Tex_0062E0[] = dsouko_room_2Tex_0062E0; + +#define dsouko_room_2Tex_006AE0 "__OTR__scenes/shared/souko_scene/souko_room_2Tex_006AE0" +static const ALIGN_ASSET(2) char souko_room_2Tex_006AE0[] = dsouko_room_2Tex_006AE0; + +#define dsouko_room_2Tex_007F78 "__OTR__scenes/shared/souko_scene/souko_room_2Tex_007F78" static const ALIGN_ASSET(2) char souko_room_2Tex_007F78[] = dsouko_room_2Tex_007F78; -#define dsouko_room_2DL_0044C8 "__OTR__scenes/nonmq/souko_scene/souko_room_2DL_0044C8" +#define dsouko_room_2DL_007C20 "__OTR__scenes/shared/souko_scene/souko_room_2DL_007C20" +static const ALIGN_ASSET(2) char souko_room_2DL_007C20[] = dsouko_room_2DL_007C20; + +#define dsouko_room_2DL_0009D0 "__OTR__scenes/shared/souko_scene/souko_room_2DL_0009D0" +static const ALIGN_ASSET(2) char souko_room_2DL_0009D0[] = dsouko_room_2DL_0009D0; + +#define dsouko_room_2DL_0030F8 "__OTR__scenes/shared/souko_scene/souko_room_2DL_0030F8" +static const ALIGN_ASSET(2) char souko_room_2DL_0030F8[] = dsouko_room_2DL_0030F8; + +#define dsouko_room_2DL_007E90 "__OTR__scenes/shared/souko_scene/souko_room_2DL_007E90" +static const ALIGN_ASSET(2) char souko_room_2DL_007E90[] = dsouko_room_2DL_007E90; + +#define dsouko_room_2DL_0044C8 "__OTR__scenes/shared/souko_scene/souko_room_2DL_0044C8" static const ALIGN_ASSET(2) char souko_room_2DL_0044C8[] = dsouko_room_2DL_0044C8; -#define dsouko_room_2DL_004B10 "__OTR__scenes/nonmq/souko_scene/souko_room_2DL_004B10" +#define dsouko_room_2DL_004B10 "__OTR__scenes/shared/souko_scene/souko_room_2DL_004B10" static const ALIGN_ASSET(2) char souko_room_2DL_004B10[] = dsouko_room_2DL_004B10; -#define dsouko_room_2DL_0002B0 "__OTR__scenes/nonmq/souko_scene/souko_room_2DL_0002B0" +#define dsouko_room_2DL_0002B0 "__OTR__scenes/shared/souko_scene/souko_room_2DL_0002B0" static const ALIGN_ASSET(2) char souko_room_2DL_0002B0[] = dsouko_room_2DL_0002B0; -#define dsouko_room_2DL_0015E0 "__OTR__scenes/nonmq/souko_scene/souko_room_2DL_0015E0" +#define dsouko_room_2DL_0015E0 "__OTR__scenes/shared/souko_scene/souko_room_2DL_0015E0" static const ALIGN_ASSET(2) char souko_room_2DL_0015E0[] = dsouko_room_2DL_0015E0; -#define dsouko_room_2DL_000EF8 "__OTR__scenes/nonmq/souko_scene/souko_room_2DL_000EF8" +#define dsouko_room_2DL_000EF8 "__OTR__scenes/shared/souko_scene/souko_room_2DL_000EF8" static const ALIGN_ASSET(2) char souko_room_2DL_000EF8[] = dsouko_room_2DL_000EF8; diff --git a/soh/assets/scenes/overworld/souko/souko_scene.h b/soh/assets/scenes/overworld/souko/souko_scene.h index 8dfad318a..db7092836 100644 --- a/soh/assets/scenes/overworld/souko/souko_scene.h +++ b/soh/assets/scenes/overworld/souko/souko_scene.h @@ -3,25 +3,26 @@ #include "align_asset_macro.h" -#define dgLonLonHouseDayEntranceTex "__OTR__scenes/nonmq/souko_scene/gLonLonHouseDayEntranceTex" -static const ALIGN_ASSET(2) char gLonLonHouseDayEntranceTex[] = dgLonLonHouseDayEntranceTex; - -#define dgLonLonHouseNightEntranceTex "__OTR__scenes/nonmq/souko_scene/gLonLonHouseNightEntranceTex" -static const ALIGN_ASSET(2) char gLonLonHouseNightEntranceTex[] = dgLonLonHouseNightEntranceTex; - -#define dsouko_sceneCollisionHeader_0043E0 "__OTR__scenes/nonmq/souko_scene/souko_sceneCollisionHeader_0043E0" -static const ALIGN_ASSET(2) char souko_sceneCollisionHeader_0043E0[] = dsouko_sceneCollisionHeader_0043E0; - -#define dsouko_sceneTex_005C10 "__OTR__scenes/nonmq/souko_scene/souko_sceneTex_005C10" -static const ALIGN_ASSET(2) char souko_sceneTex_005C10[] = dsouko_sceneTex_005C10; - -#define dsouko_sceneTex_004C10 "__OTR__scenes/nonmq/souko_scene/souko_sceneTex_004C10" -static const ALIGN_ASSET(2) char souko_sceneTex_004C10[] = dsouko_sceneTex_004C10; - -#define dsouko_sceneTex_004410 "__OTR__scenes/nonmq/souko_scene/souko_sceneTex_004410" +#define dsouko_sceneTex_004410 "__OTR__scenes/shared/souko_scene/souko_sceneTex_004410" static const ALIGN_ASSET(2) char souko_sceneTex_004410[] = dsouko_sceneTex_004410; -#define dsouko_sceneTex_005410 "__OTR__scenes/nonmq/souko_scene/souko_sceneTex_005410" +#define dsouko_sceneTex_004C10 "__OTR__scenes/shared/souko_scene/souko_sceneTex_004C10" +static const ALIGN_ASSET(2) char souko_sceneTex_004C10[] = dsouko_sceneTex_004C10; + +#define dsouko_sceneTex_005410 "__OTR__scenes/shared/souko_scene/souko_sceneTex_005410" static const ALIGN_ASSET(2) char souko_sceneTex_005410[] = dsouko_sceneTex_005410; +#define dsouko_sceneTex_005C10 "__OTR__scenes/shared/souko_scene/souko_sceneTex_005C10" +static const ALIGN_ASSET(2) char souko_sceneTex_005C10[] = dsouko_sceneTex_005C10; + +#define dgLonLonHouseDayEntranceTex "__OTR__scenes/shared/souko_scene/gLonLonHouseDayEntranceTex" +static const ALIGN_ASSET(2) char gLonLonHouseDayEntranceTex[] = dgLonLonHouseDayEntranceTex; + +#define dgLonLonHouseNightEntranceTex "__OTR__scenes/shared/souko_scene/gLonLonHouseNightEntranceTex" +static const ALIGN_ASSET(2) char gLonLonHouseNightEntranceTex[] = dgLonLonHouseNightEntranceTex; + +#define dsouko_sceneCollisionHeader_0043E0 "__OTR__scenes/shared/souko_scene/souko_sceneCollisionHeader_0043E0" +static const ALIGN_ASSET(2) char souko_sceneCollisionHeader_0043E0[] = dsouko_sceneCollisionHeader_0043E0; + + #endif // OVERWORLD_SOUKO_SCENE_H diff --git a/soh/assets/scenes/overworld/spot00/spot00_room_0.h b/soh/assets/scenes/overworld/spot00/spot00_room_0.h index 619c13111..26af6bc4c 100644 --- a/soh/assets/scenes/overworld/spot00/spot00_room_0.h +++ b/soh/assets/scenes/overworld/spot00/spot00_room_0.h @@ -3,1339 +3,1339 @@ #include "align_asset_macro.h" -#define dspot00_room_0DL_013250 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_013250" +#define dspot00_room_0DL_013250 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_013250" static const ALIGN_ASSET(2) char spot00_room_0DL_013250[] = dspot00_room_0DL_013250; -#define dspot00_room_0DL_0139A8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_0139A8" +#define dspot00_room_0DL_0139A8 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_0139A8" static const ALIGN_ASSET(2) char spot00_room_0DL_0139A8[] = dspot00_room_0DL_0139A8; -#define dspot00_room_0DL_0143C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_0143C8" +#define dspot00_room_0DL_0143C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_0143C8" static const ALIGN_ASSET(2) char spot00_room_0DL_0143C8[] = dspot00_room_0DL_0143C8; -#define dspot00_room_0DL_015100 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_015100" +#define dspot00_room_0DL_015100 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_015100" static const ALIGN_ASSET(2) char spot00_room_0DL_015100[] = dspot00_room_0DL_015100; -#define dspot00_room_0DL_014E28 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_014E28" +#define dspot00_room_0DL_014E28 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_014E28" static const ALIGN_ASSET(2) char spot00_room_0DL_014E28[] = dspot00_room_0DL_014E28; -#define dspot00_room_0DL_008448 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_008448" +#define dspot00_room_0DL_008448 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_008448" static const ALIGN_ASSET(2) char spot00_room_0DL_008448[] = dspot00_room_0DL_008448; -#define dspot00_room_0DL_012C38 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_012C38" +#define dspot00_room_0DL_012C38 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_012C38" static const ALIGN_ASSET(2) char spot00_room_0DL_012C38[] = dspot00_room_0DL_012C38; -#define dspot00_room_0DL_012E18 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_012E18" +#define dspot00_room_0DL_012E18 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_012E18" static const ALIGN_ASSET(2) char spot00_room_0DL_012E18[] = dspot00_room_0DL_012E18; -#define dspot00_room_0DL_002790 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_002790" +#define dspot00_room_0DL_002790 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_002790" static const ALIGN_ASSET(2) char spot00_room_0DL_002790[] = dspot00_room_0DL_002790; -#define dspot00_room_0DL_003338 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_003338" +#define dspot00_room_0DL_003338 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_003338" static const ALIGN_ASSET(2) char spot00_room_0DL_003338[] = dspot00_room_0DL_003338; -#define dspot00_room_0DL_003ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_003ED0" +#define dspot00_room_0DL_003ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_003ED0" static const ALIGN_ASSET(2) char spot00_room_0DL_003ED0[] = dspot00_room_0DL_003ED0; -#define dspot00_room_0DL_005030 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_005030" +#define dspot00_room_0DL_005030 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_005030" static const ALIGN_ASSET(2) char spot00_room_0DL_005030[] = dspot00_room_0DL_005030; -#define dspot00_room_0DL_005850 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_005850" +#define dspot00_room_0DL_005850 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_005850" static const ALIGN_ASSET(2) char spot00_room_0DL_005850[] = dspot00_room_0DL_005850; -#define dspot00_room_0DL_005BC0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_005BC0" +#define dspot00_room_0DL_005BC0 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_005BC0" static const ALIGN_ASSET(2) char spot00_room_0DL_005BC0[] = dspot00_room_0DL_005BC0; -#define dspot00_room_0DL_005E78 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_005E78" +#define dspot00_room_0DL_005E78 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_005E78" static const ALIGN_ASSET(2) char spot00_room_0DL_005E78[] = dspot00_room_0DL_005E78; -#define dspot00_room_0DL_0067C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_0067C8" +#define dspot00_room_0DL_0067C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_0067C8" static const ALIGN_ASSET(2) char spot00_room_0DL_0067C8[] = dspot00_room_0DL_0067C8; -#define dspot00_room_0DL_006ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_006ED0" +#define dspot00_room_0DL_006ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_006ED0" static const ALIGN_ASSET(2) char spot00_room_0DL_006ED0[] = dspot00_room_0DL_006ED0; -#define dspot00_room_0DL_007230 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_007230" +#define dspot00_room_0DL_007230 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_007230" static const ALIGN_ASSET(2) char spot00_room_0DL_007230[] = dspot00_room_0DL_007230; -#define dspot00_room_0DL_008ED8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_008ED8" +#define dspot00_room_0DL_008ED8 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_008ED8" static const ALIGN_ASSET(2) char spot00_room_0DL_008ED8[] = dspot00_room_0DL_008ED8; -#define dspot00_room_0DL_0093A0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_0093A0" +#define dspot00_room_0DL_0093A0 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_0093A0" static const ALIGN_ASSET(2) char spot00_room_0DL_0093A0[] = dspot00_room_0DL_0093A0; -#define dspot00_room_0DL_009D10 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_009D10" +#define dspot00_room_0DL_009D10 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_009D10" static const ALIGN_ASSET(2) char spot00_room_0DL_009D10[] = dspot00_room_0DL_009D10; -#define dspot00_room_0DL_00AD00 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00AD00" +#define dspot00_room_0DL_00AD00 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00AD00" static const ALIGN_ASSET(2) char spot00_room_0DL_00AD00[] = dspot00_room_0DL_00AD00; -#define dspot00_room_0DL_00B520 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00B520" +#define dspot00_room_0DL_00B520 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00B520" static const ALIGN_ASSET(2) char spot00_room_0DL_00B520[] = dspot00_room_0DL_00B520; -#define dspot00_room_0DL_00B8B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00B8B0" +#define dspot00_room_0DL_00B8B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00B8B0" static const ALIGN_ASSET(2) char spot00_room_0DL_00B8B0[] = dspot00_room_0DL_00B8B0; -#define dspot00_room_0DL_00BD20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00BD20" +#define dspot00_room_0DL_00BD20 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00BD20" static const ALIGN_ASSET(2) char spot00_room_0DL_00BD20[] = dspot00_room_0DL_00BD20; -#define dspot00_room_0DL_00CEB8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00CEB8" +#define dspot00_room_0DL_00CEB8 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00CEB8" static const ALIGN_ASSET(2) char spot00_room_0DL_00CEB8[] = dspot00_room_0DL_00CEB8; -#define dspot00_room_0DL_00D980 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00D980" +#define dspot00_room_0DL_00D980 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00D980" static const ALIGN_ASSET(2) char spot00_room_0DL_00D980[] = dspot00_room_0DL_00D980; -#define dspot00_room_0DL_00DD70 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00DD70" +#define dspot00_room_0DL_00DD70 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00DD70" static const ALIGN_ASSET(2) char spot00_room_0DL_00DD70[] = dspot00_room_0DL_00DD70; -#define dspot00_room_0DL_00DFA8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00DFA8" +#define dspot00_room_0DL_00DFA8 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00DFA8" static const ALIGN_ASSET(2) char spot00_room_0DL_00DFA8[] = dspot00_room_0DL_00DFA8; -#define dspot00_room_0DL_00E7B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00E7B0" +#define dspot00_room_0DL_00E7B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00E7B0" static const ALIGN_ASSET(2) char spot00_room_0DL_00E7B0[] = dspot00_room_0DL_00E7B0; -#define dspot00_room_0DL_00F3F8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00F3F8" +#define dspot00_room_0DL_00F3F8 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00F3F8" static const ALIGN_ASSET(2) char spot00_room_0DL_00F3F8[] = dspot00_room_0DL_00F3F8; -#define dspot00_room_0DL_00FB50 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00FB50" +#define dspot00_room_0DL_00FB50 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00FB50" static const ALIGN_ASSET(2) char spot00_room_0DL_00FB50[] = dspot00_room_0DL_00FB50; -#define dspot00_room_0DL_00FE98 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00FE98" +#define dspot00_room_0DL_00FE98 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00FE98" static const ALIGN_ASSET(2) char spot00_room_0DL_00FE98[] = dspot00_room_0DL_00FE98; -#define dspot00_room_0DL_0127B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_0127B8" +#define dspot00_room_0DL_0127B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_0127B8" static const ALIGN_ASSET(2) char spot00_room_0DL_0127B8[] = dspot00_room_0DL_0127B8; -#define dspot00_room_0DL_00E328 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00E328" +#define dspot00_room_0DL_00E328 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00E328" static const ALIGN_ASSET(2) char spot00_room_0DL_00E328[] = dspot00_room_0DL_00E328; -#define dspot00_room_0DL_0112B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_0112B8" +#define dspot00_room_0DL_0112B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_0112B8" static const ALIGN_ASSET(2) char spot00_room_0DL_0112B8[] = dspot00_room_0DL_0112B8; -#define dspot00_room_0DL_0121D0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_0121D0" +#define dspot00_room_0DL_0121D0 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_0121D0" static const ALIGN_ASSET(2) char spot00_room_0DL_0121D0[] = dspot00_room_0DL_0121D0; -#define dspot00_room_0DL_012B20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_012B20" +#define dspot00_room_0DL_012B20 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_012B20" static const ALIGN_ASSET(2) char spot00_room_0DL_012B20[] = dspot00_room_0DL_012B20; -#define dspot00_room_0Set_000C50DL_013250 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_013250" +#define dspot00_room_0Set_000C50DL_013250 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_013250" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_013250[] = dspot00_room_0Set_000C50DL_013250; -#define dspot00_room_0Set_000C50DL_0139A8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_0139A8" +#define dspot00_room_0Set_000C50DL_0139A8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_0139A8" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_0139A8[] = dspot00_room_0Set_000C50DL_0139A8; -#define dspot00_room_0Set_000C50DL_0143C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_0143C8" +#define dspot00_room_0Set_000C50DL_0143C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_0143C8" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_0143C8[] = dspot00_room_0Set_000C50DL_0143C8; -#define dspot00_room_0Set_000C50DL_015100 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_015100" +#define dspot00_room_0Set_000C50DL_015100 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_015100" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_015100[] = dspot00_room_0Set_000C50DL_015100; -#define dspot00_room_0Set_000C50DL_014E28 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_014E28" +#define dspot00_room_0Set_000C50DL_014E28 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_014E28" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_014E28[] = dspot00_room_0Set_000C50DL_014E28; -#define dspot00_room_0Set_000C50DL_008448 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_008448" +#define dspot00_room_0Set_000C50DL_008448 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_008448" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_008448[] = dspot00_room_0Set_000C50DL_008448; -#define dspot00_room_0Set_000C50DL_012C38 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_012C38" +#define dspot00_room_0Set_000C50DL_012C38 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_012C38" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_012C38[] = dspot00_room_0Set_000C50DL_012C38; -#define dspot00_room_0Set_000C50DL_012E18 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_012E18" +#define dspot00_room_0Set_000C50DL_012E18 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_012E18" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_012E18[] = dspot00_room_0Set_000C50DL_012E18; -#define dspot00_room_0Set_000C50DL_002790 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_002790" +#define dspot00_room_0Set_000C50DL_002790 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_002790" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_002790[] = dspot00_room_0Set_000C50DL_002790; -#define dspot00_room_0Set_000C50DL_003338 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_003338" +#define dspot00_room_0Set_000C50DL_003338 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_003338" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_003338[] = dspot00_room_0Set_000C50DL_003338; -#define dspot00_room_0Set_000C50DL_003ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_003ED0" +#define dspot00_room_0Set_000C50DL_003ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_003ED0" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_003ED0[] = dspot00_room_0Set_000C50DL_003ED0; -#define dspot00_room_0Set_000C50DL_005030 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_005030" +#define dspot00_room_0Set_000C50DL_005030 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_005030" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_005030[] = dspot00_room_0Set_000C50DL_005030; -#define dspot00_room_0Set_000C50DL_005850 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_005850" +#define dspot00_room_0Set_000C50DL_005850 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_005850" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_005850[] = dspot00_room_0Set_000C50DL_005850; -#define dspot00_room_0Set_000C50DL_005BC0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_005BC0" +#define dspot00_room_0Set_000C50DL_005BC0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_005BC0" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_005BC0[] = dspot00_room_0Set_000C50DL_005BC0; -#define dspot00_room_0Set_000C50DL_005E78 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_005E78" +#define dspot00_room_0Set_000C50DL_005E78 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_005E78" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_005E78[] = dspot00_room_0Set_000C50DL_005E78; -#define dspot00_room_0Set_000C50DL_0067C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_0067C8" +#define dspot00_room_0Set_000C50DL_0067C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_0067C8" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_0067C8[] = dspot00_room_0Set_000C50DL_0067C8; -#define dspot00_room_0Set_000C50DL_006ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_006ED0" +#define dspot00_room_0Set_000C50DL_006ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_006ED0" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_006ED0[] = dspot00_room_0Set_000C50DL_006ED0; -#define dspot00_room_0Set_000C50DL_007230 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_007230" +#define dspot00_room_0Set_000C50DL_007230 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_007230" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_007230[] = dspot00_room_0Set_000C50DL_007230; -#define dspot00_room_0Set_000C50DL_008ED8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_008ED8" +#define dspot00_room_0Set_000C50DL_008ED8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_008ED8" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_008ED8[] = dspot00_room_0Set_000C50DL_008ED8; -#define dspot00_room_0Set_000C50DL_0093A0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_0093A0" +#define dspot00_room_0Set_000C50DL_0093A0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_0093A0" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_0093A0[] = dspot00_room_0Set_000C50DL_0093A0; -#define dspot00_room_0Set_000C50DL_009D10 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_009D10" +#define dspot00_room_0Set_000C50DL_009D10 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_009D10" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_009D10[] = dspot00_room_0Set_000C50DL_009D10; -#define dspot00_room_0Set_000C50DL_00AD00 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00AD00" +#define dspot00_room_0Set_000C50DL_00AD00 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00AD00" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00AD00[] = dspot00_room_0Set_000C50DL_00AD00; -#define dspot00_room_0Set_000C50DL_00B520 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00B520" +#define dspot00_room_0Set_000C50DL_00B520 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00B520" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00B520[] = dspot00_room_0Set_000C50DL_00B520; -#define dspot00_room_0Set_000C50DL_00B8B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00B8B0" +#define dspot00_room_0Set_000C50DL_00B8B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00B8B0" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00B8B0[] = dspot00_room_0Set_000C50DL_00B8B0; -#define dspot00_room_0Set_000C50DL_00BD20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00BD20" +#define dspot00_room_0Set_000C50DL_00BD20 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00BD20" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00BD20[] = dspot00_room_0Set_000C50DL_00BD20; -#define dspot00_room_0Set_000C50DL_00CEB8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00CEB8" +#define dspot00_room_0Set_000C50DL_00CEB8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00CEB8" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00CEB8[] = dspot00_room_0Set_000C50DL_00CEB8; -#define dspot00_room_0Set_000C50DL_00D980 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00D980" +#define dspot00_room_0Set_000C50DL_00D980 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00D980" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00D980[] = dspot00_room_0Set_000C50DL_00D980; -#define dspot00_room_0Set_000C50DL_00DD70 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00DD70" +#define dspot00_room_0Set_000C50DL_00DD70 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00DD70" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00DD70[] = dspot00_room_0Set_000C50DL_00DD70; -#define dspot00_room_0Set_000C50DL_00DFA8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00DFA8" +#define dspot00_room_0Set_000C50DL_00DFA8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00DFA8" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00DFA8[] = dspot00_room_0Set_000C50DL_00DFA8; -#define dspot00_room_0Set_000C50DL_00E7B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00E7B0" +#define dspot00_room_0Set_000C50DL_00E7B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00E7B0" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00E7B0[] = dspot00_room_0Set_000C50DL_00E7B0; -#define dspot00_room_0Set_000C50DL_00F3F8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00F3F8" +#define dspot00_room_0Set_000C50DL_00F3F8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00F3F8" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00F3F8[] = dspot00_room_0Set_000C50DL_00F3F8; -#define dspot00_room_0Set_000C50DL_00FB50 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00FB50" +#define dspot00_room_0Set_000C50DL_00FB50 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00FB50" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00FB50[] = dspot00_room_0Set_000C50DL_00FB50; -#define dspot00_room_0Set_000C50DL_00FE98 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00FE98" +#define dspot00_room_0Set_000C50DL_00FE98 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00FE98" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00FE98[] = dspot00_room_0Set_000C50DL_00FE98; -#define dspot00_room_0Set_000C50DL_0127B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_0127B8" +#define dspot00_room_0Set_000C50DL_0127B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_0127B8" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_0127B8[] = dspot00_room_0Set_000C50DL_0127B8; -#define dspot00_room_0Set_000C50DL_00E328 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00E328" +#define dspot00_room_0Set_000C50DL_00E328 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00E328" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00E328[] = dspot00_room_0Set_000C50DL_00E328; -#define dspot00_room_0Set_000C50DL_0112B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_0112B8" +#define dspot00_room_0Set_000C50DL_0112B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_0112B8" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_0112B8[] = dspot00_room_0Set_000C50DL_0112B8; -#define dspot00_room_0Set_000C50DL_0121D0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_0121D0" +#define dspot00_room_0Set_000C50DL_0121D0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_0121D0" static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_0121D0[] = dspot00_room_0Set_000C50DL_0121D0; -#define dspot00_room_0Set_000770DL_013250 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_013250" +#define dspot00_room_0Set_000770DL_013250 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_013250" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_013250[] = dspot00_room_0Set_000770DL_013250; -#define dspot00_room_0Set_000770DL_0139A8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_0139A8" +#define dspot00_room_0Set_000770DL_0139A8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_0139A8" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_0139A8[] = dspot00_room_0Set_000770DL_0139A8; -#define dspot00_room_0Set_000770DL_0143C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_0143C8" +#define dspot00_room_0Set_000770DL_0143C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_0143C8" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_0143C8[] = dspot00_room_0Set_000770DL_0143C8; -#define dspot00_room_0Set_000770DL_015100 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_015100" +#define dspot00_room_0Set_000770DL_015100 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_015100" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_015100[] = dspot00_room_0Set_000770DL_015100; -#define dspot00_room_0Set_000770DL_014E28 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_014E28" +#define dspot00_room_0Set_000770DL_014E28 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_014E28" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_014E28[] = dspot00_room_0Set_000770DL_014E28; -#define dspot00_room_0Set_000770DL_008448 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_008448" +#define dspot00_room_0Set_000770DL_008448 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_008448" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_008448[] = dspot00_room_0Set_000770DL_008448; -#define dspot00_room_0Set_000770DL_012C38 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_012C38" +#define dspot00_room_0Set_000770DL_012C38 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_012C38" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_012C38[] = dspot00_room_0Set_000770DL_012C38; -#define dspot00_room_0Set_000770DL_012E18 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_012E18" +#define dspot00_room_0Set_000770DL_012E18 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_012E18" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_012E18[] = dspot00_room_0Set_000770DL_012E18; -#define dspot00_room_0Set_000770DL_002790 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_002790" +#define dspot00_room_0Set_000770DL_002790 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_002790" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_002790[] = dspot00_room_0Set_000770DL_002790; -#define dspot00_room_0Set_000770DL_003338 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_003338" +#define dspot00_room_0Set_000770DL_003338 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_003338" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_003338[] = dspot00_room_0Set_000770DL_003338; -#define dspot00_room_0Set_000770DL_003ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_003ED0" +#define dspot00_room_0Set_000770DL_003ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_003ED0" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_003ED0[] = dspot00_room_0Set_000770DL_003ED0; -#define dspot00_room_0Set_000770DL_005030 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_005030" +#define dspot00_room_0Set_000770DL_005030 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_005030" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_005030[] = dspot00_room_0Set_000770DL_005030; -#define dspot00_room_0Set_000770DL_005850 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_005850" +#define dspot00_room_0Set_000770DL_005850 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_005850" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_005850[] = dspot00_room_0Set_000770DL_005850; -#define dspot00_room_0Set_000770DL_005BC0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_005BC0" +#define dspot00_room_0Set_000770DL_005BC0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_005BC0" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_005BC0[] = dspot00_room_0Set_000770DL_005BC0; -#define dspot00_room_0Set_000770DL_005E78 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_005E78" +#define dspot00_room_0Set_000770DL_005E78 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_005E78" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_005E78[] = dspot00_room_0Set_000770DL_005E78; -#define dspot00_room_0Set_000770DL_0067C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_0067C8" +#define dspot00_room_0Set_000770DL_0067C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_0067C8" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_0067C8[] = dspot00_room_0Set_000770DL_0067C8; -#define dspot00_room_0Set_000770DL_006ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_006ED0" +#define dspot00_room_0Set_000770DL_006ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_006ED0" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_006ED0[] = dspot00_room_0Set_000770DL_006ED0; -#define dspot00_room_0Set_000770DL_007230 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_007230" +#define dspot00_room_0Set_000770DL_007230 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_007230" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_007230[] = dspot00_room_0Set_000770DL_007230; -#define dspot00_room_0Set_000770DL_008ED8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_008ED8" +#define dspot00_room_0Set_000770DL_008ED8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_008ED8" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_008ED8[] = dspot00_room_0Set_000770DL_008ED8; -#define dspot00_room_0Set_000770DL_0093A0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_0093A0" +#define dspot00_room_0Set_000770DL_0093A0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_0093A0" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_0093A0[] = dspot00_room_0Set_000770DL_0093A0; -#define dspot00_room_0Set_000770DL_009D10 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_009D10" +#define dspot00_room_0Set_000770DL_009D10 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_009D10" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_009D10[] = dspot00_room_0Set_000770DL_009D10; -#define dspot00_room_0Set_000770DL_00AD00 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00AD00" +#define dspot00_room_0Set_000770DL_00AD00 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00AD00" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00AD00[] = dspot00_room_0Set_000770DL_00AD00; -#define dspot00_room_0Set_000770DL_00B520 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00B520" +#define dspot00_room_0Set_000770DL_00B520 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00B520" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00B520[] = dspot00_room_0Set_000770DL_00B520; -#define dspot00_room_0Set_000770DL_00B8B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00B8B0" +#define dspot00_room_0Set_000770DL_00B8B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00B8B0" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00B8B0[] = dspot00_room_0Set_000770DL_00B8B0; -#define dspot00_room_0Set_000770DL_00BD20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00BD20" +#define dspot00_room_0Set_000770DL_00BD20 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00BD20" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00BD20[] = dspot00_room_0Set_000770DL_00BD20; -#define dspot00_room_0Set_000770DL_00CEB8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00CEB8" +#define dspot00_room_0Set_000770DL_00CEB8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00CEB8" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00CEB8[] = dspot00_room_0Set_000770DL_00CEB8; -#define dspot00_room_0Set_000770DL_00D980 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00D980" +#define dspot00_room_0Set_000770DL_00D980 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00D980" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00D980[] = dspot00_room_0Set_000770DL_00D980; -#define dspot00_room_0Set_000770DL_00DD70 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00DD70" +#define dspot00_room_0Set_000770DL_00DD70 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00DD70" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00DD70[] = dspot00_room_0Set_000770DL_00DD70; -#define dspot00_room_0Set_000770DL_00DFA8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00DFA8" +#define dspot00_room_0Set_000770DL_00DFA8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00DFA8" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00DFA8[] = dspot00_room_0Set_000770DL_00DFA8; -#define dspot00_room_0Set_000770DL_00E7B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00E7B0" +#define dspot00_room_0Set_000770DL_00E7B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00E7B0" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00E7B0[] = dspot00_room_0Set_000770DL_00E7B0; -#define dspot00_room_0Set_000770DL_00F3F8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00F3F8" +#define dspot00_room_0Set_000770DL_00F3F8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00F3F8" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00F3F8[] = dspot00_room_0Set_000770DL_00F3F8; -#define dspot00_room_0Set_000770DL_00FB50 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00FB50" +#define dspot00_room_0Set_000770DL_00FB50 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00FB50" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00FB50[] = dspot00_room_0Set_000770DL_00FB50; -#define dspot00_room_0Set_000770DL_00FE98 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00FE98" +#define dspot00_room_0Set_000770DL_00FE98 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00FE98" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00FE98[] = dspot00_room_0Set_000770DL_00FE98; -#define dspot00_room_0Set_000770DL_0127B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_0127B8" +#define dspot00_room_0Set_000770DL_0127B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_0127B8" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_0127B8[] = dspot00_room_0Set_000770DL_0127B8; -#define dspot00_room_0Set_000770DL_00E328 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00E328" +#define dspot00_room_0Set_000770DL_00E328 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00E328" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00E328[] = dspot00_room_0Set_000770DL_00E328; -#define dspot00_room_0Set_000770DL_0112B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_0112B8" +#define dspot00_room_0Set_000770DL_0112B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_0112B8" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_0112B8[] = dspot00_room_0Set_000770DL_0112B8; -#define dspot00_room_0Set_000770DL_0121D0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_0121D0" +#define dspot00_room_0Set_000770DL_0121D0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_0121D0" static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_0121D0[] = dspot00_room_0Set_000770DL_0121D0; -#define dspot00_room_0Set_001120DL_013250 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_013250" +#define dspot00_room_0Set_001120DL_013250 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_013250" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_013250[] = dspot00_room_0Set_001120DL_013250; -#define dspot00_room_0Set_001120DL_0139A8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_0139A8" +#define dspot00_room_0Set_001120DL_0139A8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_0139A8" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_0139A8[] = dspot00_room_0Set_001120DL_0139A8; -#define dspot00_room_0Set_001120DL_0143C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_0143C8" +#define dspot00_room_0Set_001120DL_0143C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_0143C8" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_0143C8[] = dspot00_room_0Set_001120DL_0143C8; -#define dspot00_room_0Set_001120DL_015100 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_015100" +#define dspot00_room_0Set_001120DL_015100 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_015100" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_015100[] = dspot00_room_0Set_001120DL_015100; -#define dspot00_room_0Set_001120DL_014E28 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_014E28" +#define dspot00_room_0Set_001120DL_014E28 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_014E28" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_014E28[] = dspot00_room_0Set_001120DL_014E28; -#define dspot00_room_0Set_001120DL_008448 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_008448" +#define dspot00_room_0Set_001120DL_008448 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_008448" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_008448[] = dspot00_room_0Set_001120DL_008448; -#define dspot00_room_0Set_001120DL_012C38 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_012C38" +#define dspot00_room_0Set_001120DL_012C38 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_012C38" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_012C38[] = dspot00_room_0Set_001120DL_012C38; -#define dspot00_room_0Set_001120DL_012E18 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_012E18" +#define dspot00_room_0Set_001120DL_012E18 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_012E18" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_012E18[] = dspot00_room_0Set_001120DL_012E18; -#define dspot00_room_0Set_001120DL_002790 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_002790" +#define dspot00_room_0Set_001120DL_002790 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_002790" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_002790[] = dspot00_room_0Set_001120DL_002790; -#define dspot00_room_0Set_001120DL_003338 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_003338" +#define dspot00_room_0Set_001120DL_003338 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_003338" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_003338[] = dspot00_room_0Set_001120DL_003338; -#define dspot00_room_0Set_001120DL_003ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_003ED0" +#define dspot00_room_0Set_001120DL_003ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_003ED0" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_003ED0[] = dspot00_room_0Set_001120DL_003ED0; -#define dspot00_room_0Set_001120DL_005030 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_005030" +#define dspot00_room_0Set_001120DL_005030 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_005030" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_005030[] = dspot00_room_0Set_001120DL_005030; -#define dspot00_room_0Set_001120DL_005850 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_005850" +#define dspot00_room_0Set_001120DL_005850 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_005850" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_005850[] = dspot00_room_0Set_001120DL_005850; -#define dspot00_room_0Set_001120DL_005BC0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_005BC0" +#define dspot00_room_0Set_001120DL_005BC0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_005BC0" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_005BC0[] = dspot00_room_0Set_001120DL_005BC0; -#define dspot00_room_0Set_001120DL_005E78 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_005E78" +#define dspot00_room_0Set_001120DL_005E78 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_005E78" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_005E78[] = dspot00_room_0Set_001120DL_005E78; -#define dspot00_room_0Set_001120DL_0067C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_0067C8" +#define dspot00_room_0Set_001120DL_0067C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_0067C8" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_0067C8[] = dspot00_room_0Set_001120DL_0067C8; -#define dspot00_room_0Set_001120DL_006ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_006ED0" +#define dspot00_room_0Set_001120DL_006ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_006ED0" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_006ED0[] = dspot00_room_0Set_001120DL_006ED0; -#define dspot00_room_0Set_001120DL_007230 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_007230" +#define dspot00_room_0Set_001120DL_007230 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_007230" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_007230[] = dspot00_room_0Set_001120DL_007230; -#define dspot00_room_0Set_001120DL_008ED8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_008ED8" +#define dspot00_room_0Set_001120DL_008ED8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_008ED8" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_008ED8[] = dspot00_room_0Set_001120DL_008ED8; -#define dspot00_room_0Set_001120DL_0093A0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_0093A0" +#define dspot00_room_0Set_001120DL_0093A0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_0093A0" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_0093A0[] = dspot00_room_0Set_001120DL_0093A0; -#define dspot00_room_0Set_001120DL_009D10 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_009D10" +#define dspot00_room_0Set_001120DL_009D10 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_009D10" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_009D10[] = dspot00_room_0Set_001120DL_009D10; -#define dspot00_room_0Set_001120DL_00AD00 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00AD00" +#define dspot00_room_0Set_001120DL_00AD00 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00AD00" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00AD00[] = dspot00_room_0Set_001120DL_00AD00; -#define dspot00_room_0Set_001120DL_00B520 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00B520" +#define dspot00_room_0Set_001120DL_00B520 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00B520" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00B520[] = dspot00_room_0Set_001120DL_00B520; -#define dspot00_room_0Set_001120DL_00B8B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00B8B0" +#define dspot00_room_0Set_001120DL_00B8B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00B8B0" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00B8B0[] = dspot00_room_0Set_001120DL_00B8B0; -#define dspot00_room_0Set_001120DL_00BD20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00BD20" +#define dspot00_room_0Set_001120DL_00BD20 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00BD20" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00BD20[] = dspot00_room_0Set_001120DL_00BD20; -#define dspot00_room_0Set_001120DL_00CEB8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00CEB8" +#define dspot00_room_0Set_001120DL_00CEB8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00CEB8" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00CEB8[] = dspot00_room_0Set_001120DL_00CEB8; -#define dspot00_room_0Set_001120DL_00D980 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00D980" +#define dspot00_room_0Set_001120DL_00D980 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00D980" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00D980[] = dspot00_room_0Set_001120DL_00D980; -#define dspot00_room_0Set_001120DL_00DD70 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00DD70" +#define dspot00_room_0Set_001120DL_00DD70 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00DD70" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00DD70[] = dspot00_room_0Set_001120DL_00DD70; -#define dspot00_room_0Set_001120DL_00DFA8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00DFA8" +#define dspot00_room_0Set_001120DL_00DFA8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00DFA8" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00DFA8[] = dspot00_room_0Set_001120DL_00DFA8; -#define dspot00_room_0Set_001120DL_00E7B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00E7B0" +#define dspot00_room_0Set_001120DL_00E7B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00E7B0" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00E7B0[] = dspot00_room_0Set_001120DL_00E7B0; -#define dspot00_room_0Set_001120DL_00F3F8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00F3F8" +#define dspot00_room_0Set_001120DL_00F3F8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00F3F8" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00F3F8[] = dspot00_room_0Set_001120DL_00F3F8; -#define dspot00_room_0Set_001120DL_00FB50 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00FB50" +#define dspot00_room_0Set_001120DL_00FB50 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00FB50" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00FB50[] = dspot00_room_0Set_001120DL_00FB50; -#define dspot00_room_0Set_001120DL_00FE98 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00FE98" +#define dspot00_room_0Set_001120DL_00FE98 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00FE98" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00FE98[] = dspot00_room_0Set_001120DL_00FE98; -#define dspot00_room_0Set_001120DL_0127B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_0127B8" +#define dspot00_room_0Set_001120DL_0127B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_0127B8" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_0127B8[] = dspot00_room_0Set_001120DL_0127B8; -#define dspot00_room_0Set_001120DL_00E328 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00E328" +#define dspot00_room_0Set_001120DL_00E328 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00E328" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00E328[] = dspot00_room_0Set_001120DL_00E328; -#define dspot00_room_0Set_001120DL_0112B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_0112B8" +#define dspot00_room_0Set_001120DL_0112B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_0112B8" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_0112B8[] = dspot00_room_0Set_001120DL_0112B8; -#define dspot00_room_0Set_001120DL_0121D0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_0121D0" +#define dspot00_room_0Set_001120DL_0121D0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_0121D0" static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_0121D0[] = dspot00_room_0Set_001120DL_0121D0; -#define dspot00_room_0Set_0011F0DL_013250 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_013250" +#define dspot00_room_0Set_0011F0DL_013250 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_013250" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_013250[] = dspot00_room_0Set_0011F0DL_013250; -#define dspot00_room_0Set_0011F0DL_0139A8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_0139A8" +#define dspot00_room_0Set_0011F0DL_0139A8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_0139A8" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_0139A8[] = dspot00_room_0Set_0011F0DL_0139A8; -#define dspot00_room_0Set_0011F0DL_0143C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_0143C8" +#define dspot00_room_0Set_0011F0DL_0143C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_0143C8" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_0143C8[] = dspot00_room_0Set_0011F0DL_0143C8; -#define dspot00_room_0Set_0011F0DL_015100 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_015100" +#define dspot00_room_0Set_0011F0DL_015100 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_015100" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_015100[] = dspot00_room_0Set_0011F0DL_015100; -#define dspot00_room_0Set_0011F0DL_014E28 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_014E28" +#define dspot00_room_0Set_0011F0DL_014E28 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_014E28" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_014E28[] = dspot00_room_0Set_0011F0DL_014E28; -#define dspot00_room_0Set_0011F0DL_008448 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_008448" +#define dspot00_room_0Set_0011F0DL_008448 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_008448" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_008448[] = dspot00_room_0Set_0011F0DL_008448; -#define dspot00_room_0Set_0011F0DL_012C38 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_012C38" +#define dspot00_room_0Set_0011F0DL_012C38 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_012C38" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_012C38[] = dspot00_room_0Set_0011F0DL_012C38; -#define dspot00_room_0Set_0011F0DL_012E18 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_012E18" +#define dspot00_room_0Set_0011F0DL_012E18 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_012E18" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_012E18[] = dspot00_room_0Set_0011F0DL_012E18; -#define dspot00_room_0Set_0011F0DL_002790 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_002790" +#define dspot00_room_0Set_0011F0DL_002790 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_002790" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_002790[] = dspot00_room_0Set_0011F0DL_002790; -#define dspot00_room_0Set_0011F0DL_003338 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_003338" +#define dspot00_room_0Set_0011F0DL_003338 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_003338" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_003338[] = dspot00_room_0Set_0011F0DL_003338; -#define dspot00_room_0Set_0011F0DL_003ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_003ED0" +#define dspot00_room_0Set_0011F0DL_003ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_003ED0" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_003ED0[] = dspot00_room_0Set_0011F0DL_003ED0; -#define dspot00_room_0Set_0011F0DL_005030 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_005030" +#define dspot00_room_0Set_0011F0DL_005030 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_005030" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_005030[] = dspot00_room_0Set_0011F0DL_005030; -#define dspot00_room_0Set_0011F0DL_005850 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_005850" +#define dspot00_room_0Set_0011F0DL_005850 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_005850" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_005850[] = dspot00_room_0Set_0011F0DL_005850; -#define dspot00_room_0Set_0011F0DL_005BC0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_005BC0" +#define dspot00_room_0Set_0011F0DL_005BC0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_005BC0" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_005BC0[] = dspot00_room_0Set_0011F0DL_005BC0; -#define dspot00_room_0Set_0011F0DL_005E78 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_005E78" +#define dspot00_room_0Set_0011F0DL_005E78 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_005E78" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_005E78[] = dspot00_room_0Set_0011F0DL_005E78; -#define dspot00_room_0Set_0011F0DL_0067C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_0067C8" +#define dspot00_room_0Set_0011F0DL_0067C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_0067C8" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_0067C8[] = dspot00_room_0Set_0011F0DL_0067C8; -#define dspot00_room_0Set_0011F0DL_006ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_006ED0" +#define dspot00_room_0Set_0011F0DL_006ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_006ED0" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_006ED0[] = dspot00_room_0Set_0011F0DL_006ED0; -#define dspot00_room_0Set_0011F0DL_007230 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_007230" +#define dspot00_room_0Set_0011F0DL_007230 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_007230" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_007230[] = dspot00_room_0Set_0011F0DL_007230; -#define dspot00_room_0Set_0011F0DL_008ED8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_008ED8" +#define dspot00_room_0Set_0011F0DL_008ED8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_008ED8" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_008ED8[] = dspot00_room_0Set_0011F0DL_008ED8; -#define dspot00_room_0Set_0011F0DL_0093A0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_0093A0" +#define dspot00_room_0Set_0011F0DL_0093A0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_0093A0" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_0093A0[] = dspot00_room_0Set_0011F0DL_0093A0; -#define dspot00_room_0Set_0011F0DL_009D10 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_009D10" +#define dspot00_room_0Set_0011F0DL_009D10 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_009D10" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_009D10[] = dspot00_room_0Set_0011F0DL_009D10; -#define dspot00_room_0Set_0011F0DL_00AD00 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00AD00" +#define dspot00_room_0Set_0011F0DL_00AD00 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00AD00" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00AD00[] = dspot00_room_0Set_0011F0DL_00AD00; -#define dspot00_room_0Set_0011F0DL_00B520 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00B520" +#define dspot00_room_0Set_0011F0DL_00B520 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00B520" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00B520[] = dspot00_room_0Set_0011F0DL_00B520; -#define dspot00_room_0Set_0011F0DL_00B8B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00B8B0" +#define dspot00_room_0Set_0011F0DL_00B8B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00B8B0" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00B8B0[] = dspot00_room_0Set_0011F0DL_00B8B0; -#define dspot00_room_0Set_0011F0DL_00BD20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00BD20" +#define dspot00_room_0Set_0011F0DL_00BD20 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00BD20" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00BD20[] = dspot00_room_0Set_0011F0DL_00BD20; -#define dspot00_room_0Set_0011F0DL_00CEB8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00CEB8" +#define dspot00_room_0Set_0011F0DL_00CEB8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00CEB8" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00CEB8[] = dspot00_room_0Set_0011F0DL_00CEB8; -#define dspot00_room_0Set_0011F0DL_00D980 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00D980" +#define dspot00_room_0Set_0011F0DL_00D980 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00D980" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00D980[] = dspot00_room_0Set_0011F0DL_00D980; -#define dspot00_room_0Set_0011F0DL_00DD70 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00DD70" +#define dspot00_room_0Set_0011F0DL_00DD70 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00DD70" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00DD70[] = dspot00_room_0Set_0011F0DL_00DD70; -#define dspot00_room_0Set_0011F0DL_00DFA8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00DFA8" +#define dspot00_room_0Set_0011F0DL_00DFA8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00DFA8" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00DFA8[] = dspot00_room_0Set_0011F0DL_00DFA8; -#define dspot00_room_0Set_0011F0DL_00E7B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00E7B0" +#define dspot00_room_0Set_0011F0DL_00E7B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00E7B0" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00E7B0[] = dspot00_room_0Set_0011F0DL_00E7B0; -#define dspot00_room_0Set_0011F0DL_00F3F8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00F3F8" +#define dspot00_room_0Set_0011F0DL_00F3F8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00F3F8" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00F3F8[] = dspot00_room_0Set_0011F0DL_00F3F8; -#define dspot00_room_0Set_0011F0DL_00FB50 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00FB50" +#define dspot00_room_0Set_0011F0DL_00FB50 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00FB50" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00FB50[] = dspot00_room_0Set_0011F0DL_00FB50; -#define dspot00_room_0Set_0011F0DL_00FE98 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00FE98" +#define dspot00_room_0Set_0011F0DL_00FE98 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00FE98" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00FE98[] = dspot00_room_0Set_0011F0DL_00FE98; -#define dspot00_room_0Set_0011F0DL_0127B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_0127B8" +#define dspot00_room_0Set_0011F0DL_0127B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_0127B8" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_0127B8[] = dspot00_room_0Set_0011F0DL_0127B8; -#define dspot00_room_0Set_0011F0DL_00E328 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00E328" +#define dspot00_room_0Set_0011F0DL_00E328 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00E328" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00E328[] = dspot00_room_0Set_0011F0DL_00E328; -#define dspot00_room_0Set_0011F0DL_0112B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_0112B8" +#define dspot00_room_0Set_0011F0DL_0112B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_0112B8" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_0112B8[] = dspot00_room_0Set_0011F0DL_0112B8; -#define dspot00_room_0Set_0011F0DL_0121D0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_0121D0" +#define dspot00_room_0Set_0011F0DL_0121D0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_0121D0" static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_0121D0[] = dspot00_room_0Set_0011F0DL_0121D0; -#define dspot00_room_0Set_0012C0DL_013250 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_013250" +#define dspot00_room_0Set_0012C0DL_013250 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_013250" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_013250[] = dspot00_room_0Set_0012C0DL_013250; -#define dspot00_room_0Set_0012C0DL_0139A8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_0139A8" +#define dspot00_room_0Set_0012C0DL_0139A8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_0139A8" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_0139A8[] = dspot00_room_0Set_0012C0DL_0139A8; -#define dspot00_room_0Set_0012C0DL_0143C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_0143C8" +#define dspot00_room_0Set_0012C0DL_0143C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_0143C8" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_0143C8[] = dspot00_room_0Set_0012C0DL_0143C8; -#define dspot00_room_0Set_0012C0DL_015100 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_015100" +#define dspot00_room_0Set_0012C0DL_015100 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_015100" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_015100[] = dspot00_room_0Set_0012C0DL_015100; -#define dspot00_room_0Set_0012C0DL_014E28 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_014E28" +#define dspot00_room_0Set_0012C0DL_014E28 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_014E28" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_014E28[] = dspot00_room_0Set_0012C0DL_014E28; -#define dspot00_room_0Set_0012C0DL_008448 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_008448" +#define dspot00_room_0Set_0012C0DL_008448 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_008448" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_008448[] = dspot00_room_0Set_0012C0DL_008448; -#define dspot00_room_0Set_0012C0DL_012C38 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_012C38" +#define dspot00_room_0Set_0012C0DL_012C38 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_012C38" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_012C38[] = dspot00_room_0Set_0012C0DL_012C38; -#define dspot00_room_0Set_0012C0DL_012E18 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_012E18" +#define dspot00_room_0Set_0012C0DL_012E18 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_012E18" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_012E18[] = dspot00_room_0Set_0012C0DL_012E18; -#define dspot00_room_0Set_0012C0DL_002790 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_002790" +#define dspot00_room_0Set_0012C0DL_002790 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_002790" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_002790[] = dspot00_room_0Set_0012C0DL_002790; -#define dspot00_room_0Set_0012C0DL_003338 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_003338" +#define dspot00_room_0Set_0012C0DL_003338 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_003338" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_003338[] = dspot00_room_0Set_0012C0DL_003338; -#define dspot00_room_0Set_0012C0DL_003ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_003ED0" +#define dspot00_room_0Set_0012C0DL_003ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_003ED0" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_003ED0[] = dspot00_room_0Set_0012C0DL_003ED0; -#define dspot00_room_0Set_0012C0DL_005030 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_005030" +#define dspot00_room_0Set_0012C0DL_005030 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_005030" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_005030[] = dspot00_room_0Set_0012C0DL_005030; -#define dspot00_room_0Set_0012C0DL_005850 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_005850" +#define dspot00_room_0Set_0012C0DL_005850 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_005850" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_005850[] = dspot00_room_0Set_0012C0DL_005850; -#define dspot00_room_0Set_0012C0DL_005BC0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_005BC0" +#define dspot00_room_0Set_0012C0DL_005BC0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_005BC0" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_005BC0[] = dspot00_room_0Set_0012C0DL_005BC0; -#define dspot00_room_0Set_0012C0DL_005E78 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_005E78" +#define dspot00_room_0Set_0012C0DL_005E78 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_005E78" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_005E78[] = dspot00_room_0Set_0012C0DL_005E78; -#define dspot00_room_0Set_0012C0DL_0067C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_0067C8" +#define dspot00_room_0Set_0012C0DL_0067C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_0067C8" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_0067C8[] = dspot00_room_0Set_0012C0DL_0067C8; -#define dspot00_room_0Set_0012C0DL_006ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_006ED0" +#define dspot00_room_0Set_0012C0DL_006ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_006ED0" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_006ED0[] = dspot00_room_0Set_0012C0DL_006ED0; -#define dspot00_room_0Set_0012C0DL_007230 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_007230" +#define dspot00_room_0Set_0012C0DL_007230 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_007230" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_007230[] = dspot00_room_0Set_0012C0DL_007230; -#define dspot00_room_0Set_0012C0DL_008ED8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_008ED8" +#define dspot00_room_0Set_0012C0DL_008ED8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_008ED8" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_008ED8[] = dspot00_room_0Set_0012C0DL_008ED8; -#define dspot00_room_0Set_0012C0DL_0093A0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_0093A0" +#define dspot00_room_0Set_0012C0DL_0093A0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_0093A0" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_0093A0[] = dspot00_room_0Set_0012C0DL_0093A0; -#define dspot00_room_0Set_0012C0DL_009D10 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_009D10" +#define dspot00_room_0Set_0012C0DL_009D10 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_009D10" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_009D10[] = dspot00_room_0Set_0012C0DL_009D10; -#define dspot00_room_0Set_0012C0DL_00AD00 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00AD00" +#define dspot00_room_0Set_0012C0DL_00AD00 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00AD00" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00AD00[] = dspot00_room_0Set_0012C0DL_00AD00; -#define dspot00_room_0Set_0012C0DL_00B520 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00B520" +#define dspot00_room_0Set_0012C0DL_00B520 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00B520" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00B520[] = dspot00_room_0Set_0012C0DL_00B520; -#define dspot00_room_0Set_0012C0DL_00B8B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00B8B0" +#define dspot00_room_0Set_0012C0DL_00B8B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00B8B0" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00B8B0[] = dspot00_room_0Set_0012C0DL_00B8B0; -#define dspot00_room_0Set_0012C0DL_00BD20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00BD20" +#define dspot00_room_0Set_0012C0DL_00BD20 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00BD20" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00BD20[] = dspot00_room_0Set_0012C0DL_00BD20; -#define dspot00_room_0Set_0012C0DL_00CEB8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00CEB8" +#define dspot00_room_0Set_0012C0DL_00CEB8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00CEB8" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00CEB8[] = dspot00_room_0Set_0012C0DL_00CEB8; -#define dspot00_room_0Set_0012C0DL_00D980 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00D980" +#define dspot00_room_0Set_0012C0DL_00D980 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00D980" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00D980[] = dspot00_room_0Set_0012C0DL_00D980; -#define dspot00_room_0Set_0012C0DL_00DD70 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00DD70" +#define dspot00_room_0Set_0012C0DL_00DD70 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00DD70" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00DD70[] = dspot00_room_0Set_0012C0DL_00DD70; -#define dspot00_room_0Set_0012C0DL_00DFA8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00DFA8" +#define dspot00_room_0Set_0012C0DL_00DFA8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00DFA8" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00DFA8[] = dspot00_room_0Set_0012C0DL_00DFA8; -#define dspot00_room_0Set_0012C0DL_00E7B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00E7B0" +#define dspot00_room_0Set_0012C0DL_00E7B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00E7B0" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00E7B0[] = dspot00_room_0Set_0012C0DL_00E7B0; -#define dspot00_room_0Set_0012C0DL_00F3F8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00F3F8" +#define dspot00_room_0Set_0012C0DL_00F3F8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00F3F8" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00F3F8[] = dspot00_room_0Set_0012C0DL_00F3F8; -#define dspot00_room_0Set_0012C0DL_00FB50 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00FB50" +#define dspot00_room_0Set_0012C0DL_00FB50 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00FB50" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00FB50[] = dspot00_room_0Set_0012C0DL_00FB50; -#define dspot00_room_0Set_0012C0DL_00FE98 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00FE98" +#define dspot00_room_0Set_0012C0DL_00FE98 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00FE98" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00FE98[] = dspot00_room_0Set_0012C0DL_00FE98; -#define dspot00_room_0Set_0012C0DL_0127B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_0127B8" +#define dspot00_room_0Set_0012C0DL_0127B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_0127B8" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_0127B8[] = dspot00_room_0Set_0012C0DL_0127B8; -#define dspot00_room_0Set_0012C0DL_00E328 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00E328" +#define dspot00_room_0Set_0012C0DL_00E328 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00E328" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00E328[] = dspot00_room_0Set_0012C0DL_00E328; -#define dspot00_room_0Set_0012C0DL_0112B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_0112B8" +#define dspot00_room_0Set_0012C0DL_0112B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_0112B8" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_0112B8[] = dspot00_room_0Set_0012C0DL_0112B8; -#define dspot00_room_0Set_0012C0DL_0121D0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_0121D0" +#define dspot00_room_0Set_0012C0DL_0121D0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_0121D0" static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_0121D0[] = dspot00_room_0Set_0012C0DL_0121D0; -#define dspot00_room_0Set_001360DL_013250 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_013250" +#define dspot00_room_0Set_001360DL_013250 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_013250" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_013250[] = dspot00_room_0Set_001360DL_013250; -#define dspot00_room_0Set_001360DL_0139A8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_0139A8" +#define dspot00_room_0Set_001360DL_0139A8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_0139A8" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_0139A8[] = dspot00_room_0Set_001360DL_0139A8; -#define dspot00_room_0Set_001360DL_0143C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_0143C8" +#define dspot00_room_0Set_001360DL_0143C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_0143C8" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_0143C8[] = dspot00_room_0Set_001360DL_0143C8; -#define dspot00_room_0Set_001360DL_015100 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_015100" +#define dspot00_room_0Set_001360DL_015100 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_015100" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_015100[] = dspot00_room_0Set_001360DL_015100; -#define dspot00_room_0Set_001360DL_014E28 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_014E28" +#define dspot00_room_0Set_001360DL_014E28 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_014E28" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_014E28[] = dspot00_room_0Set_001360DL_014E28; -#define dspot00_room_0Set_001360DL_008448 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_008448" +#define dspot00_room_0Set_001360DL_008448 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_008448" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_008448[] = dspot00_room_0Set_001360DL_008448; -#define dspot00_room_0Set_001360DL_012C38 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_012C38" +#define dspot00_room_0Set_001360DL_012C38 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_012C38" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_012C38[] = dspot00_room_0Set_001360DL_012C38; -#define dspot00_room_0Set_001360DL_012E18 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_012E18" +#define dspot00_room_0Set_001360DL_012E18 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_012E18" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_012E18[] = dspot00_room_0Set_001360DL_012E18; -#define dspot00_room_0Set_001360DL_002790 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_002790" +#define dspot00_room_0Set_001360DL_002790 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_002790" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_002790[] = dspot00_room_0Set_001360DL_002790; -#define dspot00_room_0Set_001360DL_003338 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_003338" +#define dspot00_room_0Set_001360DL_003338 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_003338" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_003338[] = dspot00_room_0Set_001360DL_003338; -#define dspot00_room_0Set_001360DL_003ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_003ED0" +#define dspot00_room_0Set_001360DL_003ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_003ED0" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_003ED0[] = dspot00_room_0Set_001360DL_003ED0; -#define dspot00_room_0Set_001360DL_005030 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_005030" +#define dspot00_room_0Set_001360DL_005030 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_005030" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_005030[] = dspot00_room_0Set_001360DL_005030; -#define dspot00_room_0Set_001360DL_005850 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_005850" +#define dspot00_room_0Set_001360DL_005850 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_005850" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_005850[] = dspot00_room_0Set_001360DL_005850; -#define dspot00_room_0Set_001360DL_005BC0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_005BC0" +#define dspot00_room_0Set_001360DL_005BC0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_005BC0" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_005BC0[] = dspot00_room_0Set_001360DL_005BC0; -#define dspot00_room_0Set_001360DL_005E78 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_005E78" +#define dspot00_room_0Set_001360DL_005E78 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_005E78" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_005E78[] = dspot00_room_0Set_001360DL_005E78; -#define dspot00_room_0Set_001360DL_0067C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_0067C8" +#define dspot00_room_0Set_001360DL_0067C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_0067C8" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_0067C8[] = dspot00_room_0Set_001360DL_0067C8; -#define dspot00_room_0Set_001360DL_006ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_006ED0" +#define dspot00_room_0Set_001360DL_006ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_006ED0" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_006ED0[] = dspot00_room_0Set_001360DL_006ED0; -#define dspot00_room_0Set_001360DL_007230 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_007230" +#define dspot00_room_0Set_001360DL_007230 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_007230" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_007230[] = dspot00_room_0Set_001360DL_007230; -#define dspot00_room_0Set_001360DL_008ED8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_008ED8" +#define dspot00_room_0Set_001360DL_008ED8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_008ED8" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_008ED8[] = dspot00_room_0Set_001360DL_008ED8; -#define dspot00_room_0Set_001360DL_0093A0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_0093A0" +#define dspot00_room_0Set_001360DL_0093A0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_0093A0" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_0093A0[] = dspot00_room_0Set_001360DL_0093A0; -#define dspot00_room_0Set_001360DL_009D10 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_009D10" +#define dspot00_room_0Set_001360DL_009D10 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_009D10" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_009D10[] = dspot00_room_0Set_001360DL_009D10; -#define dspot00_room_0Set_001360DL_00AD00 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00AD00" +#define dspot00_room_0Set_001360DL_00AD00 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00AD00" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00AD00[] = dspot00_room_0Set_001360DL_00AD00; -#define dspot00_room_0Set_001360DL_00B520 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00B520" +#define dspot00_room_0Set_001360DL_00B520 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00B520" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00B520[] = dspot00_room_0Set_001360DL_00B520; -#define dspot00_room_0Set_001360DL_00B8B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00B8B0" +#define dspot00_room_0Set_001360DL_00B8B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00B8B0" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00B8B0[] = dspot00_room_0Set_001360DL_00B8B0; -#define dspot00_room_0Set_001360DL_00BD20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00BD20" +#define dspot00_room_0Set_001360DL_00BD20 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00BD20" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00BD20[] = dspot00_room_0Set_001360DL_00BD20; -#define dspot00_room_0Set_001360DL_00CEB8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00CEB8" +#define dspot00_room_0Set_001360DL_00CEB8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00CEB8" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00CEB8[] = dspot00_room_0Set_001360DL_00CEB8; -#define dspot00_room_0Set_001360DL_00D980 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00D980" +#define dspot00_room_0Set_001360DL_00D980 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00D980" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00D980[] = dspot00_room_0Set_001360DL_00D980; -#define dspot00_room_0Set_001360DL_00DD70 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00DD70" +#define dspot00_room_0Set_001360DL_00DD70 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00DD70" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00DD70[] = dspot00_room_0Set_001360DL_00DD70; -#define dspot00_room_0Set_001360DL_00DFA8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00DFA8" +#define dspot00_room_0Set_001360DL_00DFA8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00DFA8" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00DFA8[] = dspot00_room_0Set_001360DL_00DFA8; -#define dspot00_room_0Set_001360DL_00E7B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00E7B0" +#define dspot00_room_0Set_001360DL_00E7B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00E7B0" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00E7B0[] = dspot00_room_0Set_001360DL_00E7B0; -#define dspot00_room_0Set_001360DL_00F3F8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00F3F8" +#define dspot00_room_0Set_001360DL_00F3F8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00F3F8" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00F3F8[] = dspot00_room_0Set_001360DL_00F3F8; -#define dspot00_room_0Set_001360DL_00FB50 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00FB50" +#define dspot00_room_0Set_001360DL_00FB50 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00FB50" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00FB50[] = dspot00_room_0Set_001360DL_00FB50; -#define dspot00_room_0Set_001360DL_00FE98 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00FE98" +#define dspot00_room_0Set_001360DL_00FE98 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00FE98" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00FE98[] = dspot00_room_0Set_001360DL_00FE98; -#define dspot00_room_0Set_001360DL_0127B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_0127B8" +#define dspot00_room_0Set_001360DL_0127B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_0127B8" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_0127B8[] = dspot00_room_0Set_001360DL_0127B8; -#define dspot00_room_0Set_001360DL_00E328 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00E328" +#define dspot00_room_0Set_001360DL_00E328 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00E328" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00E328[] = dspot00_room_0Set_001360DL_00E328; -#define dspot00_room_0Set_001360DL_0112B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_0112B8" +#define dspot00_room_0Set_001360DL_0112B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_0112B8" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_0112B8[] = dspot00_room_0Set_001360DL_0112B8; -#define dspot00_room_0Set_001360DL_0121D0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_0121D0" +#define dspot00_room_0Set_001360DL_0121D0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_0121D0" static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_0121D0[] = dspot00_room_0Set_001360DL_0121D0; -#define dspot00_room_0Set_001570DL_013250 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_013250" +#define dspot00_room_0Set_001570DL_013250 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_013250" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_013250[] = dspot00_room_0Set_001570DL_013250; -#define dspot00_room_0Set_001570DL_0139A8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_0139A8" +#define dspot00_room_0Set_001570DL_0139A8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_0139A8" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_0139A8[] = dspot00_room_0Set_001570DL_0139A8; -#define dspot00_room_0Set_001570DL_0143C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_0143C8" +#define dspot00_room_0Set_001570DL_0143C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_0143C8" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_0143C8[] = dspot00_room_0Set_001570DL_0143C8; -#define dspot00_room_0Set_001570DL_015100 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_015100" +#define dspot00_room_0Set_001570DL_015100 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_015100" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_015100[] = dspot00_room_0Set_001570DL_015100; -#define dspot00_room_0Set_001570DL_014E28 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_014E28" +#define dspot00_room_0Set_001570DL_014E28 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_014E28" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_014E28[] = dspot00_room_0Set_001570DL_014E28; -#define dspot00_room_0Set_001570DL_008448 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_008448" +#define dspot00_room_0Set_001570DL_008448 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_008448" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_008448[] = dspot00_room_0Set_001570DL_008448; -#define dspot00_room_0Set_001570DL_012C38 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_012C38" +#define dspot00_room_0Set_001570DL_012C38 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_012C38" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_012C38[] = dspot00_room_0Set_001570DL_012C38; -#define dspot00_room_0Set_001570DL_012E18 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_012E18" +#define dspot00_room_0Set_001570DL_012E18 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_012E18" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_012E18[] = dspot00_room_0Set_001570DL_012E18; -#define dspot00_room_0Set_001570DL_002790 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_002790" +#define dspot00_room_0Set_001570DL_002790 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_002790" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_002790[] = dspot00_room_0Set_001570DL_002790; -#define dspot00_room_0Set_001570DL_003338 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_003338" +#define dspot00_room_0Set_001570DL_003338 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_003338" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_003338[] = dspot00_room_0Set_001570DL_003338; -#define dspot00_room_0Set_001570DL_003ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_003ED0" +#define dspot00_room_0Set_001570DL_003ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_003ED0" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_003ED0[] = dspot00_room_0Set_001570DL_003ED0; -#define dspot00_room_0Set_001570DL_005030 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_005030" +#define dspot00_room_0Set_001570DL_005030 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_005030" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_005030[] = dspot00_room_0Set_001570DL_005030; -#define dspot00_room_0Set_001570DL_005850 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_005850" +#define dspot00_room_0Set_001570DL_005850 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_005850" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_005850[] = dspot00_room_0Set_001570DL_005850; -#define dspot00_room_0Set_001570DL_005BC0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_005BC0" +#define dspot00_room_0Set_001570DL_005BC0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_005BC0" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_005BC0[] = dspot00_room_0Set_001570DL_005BC0; -#define dspot00_room_0Set_001570DL_005E78 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_005E78" +#define dspot00_room_0Set_001570DL_005E78 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_005E78" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_005E78[] = dspot00_room_0Set_001570DL_005E78; -#define dspot00_room_0Set_001570DL_0067C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_0067C8" +#define dspot00_room_0Set_001570DL_0067C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_0067C8" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_0067C8[] = dspot00_room_0Set_001570DL_0067C8; -#define dspot00_room_0Set_001570DL_006ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_006ED0" +#define dspot00_room_0Set_001570DL_006ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_006ED0" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_006ED0[] = dspot00_room_0Set_001570DL_006ED0; -#define dspot00_room_0Set_001570DL_007230 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_007230" +#define dspot00_room_0Set_001570DL_007230 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_007230" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_007230[] = dspot00_room_0Set_001570DL_007230; -#define dspot00_room_0Set_001570DL_008ED8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_008ED8" +#define dspot00_room_0Set_001570DL_008ED8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_008ED8" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_008ED8[] = dspot00_room_0Set_001570DL_008ED8; -#define dspot00_room_0Set_001570DL_0093A0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_0093A0" +#define dspot00_room_0Set_001570DL_0093A0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_0093A0" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_0093A0[] = dspot00_room_0Set_001570DL_0093A0; -#define dspot00_room_0Set_001570DL_009D10 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_009D10" +#define dspot00_room_0Set_001570DL_009D10 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_009D10" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_009D10[] = dspot00_room_0Set_001570DL_009D10; -#define dspot00_room_0Set_001570DL_00AD00 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00AD00" +#define dspot00_room_0Set_001570DL_00AD00 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00AD00" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00AD00[] = dspot00_room_0Set_001570DL_00AD00; -#define dspot00_room_0Set_001570DL_00B520 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00B520" +#define dspot00_room_0Set_001570DL_00B520 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00B520" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00B520[] = dspot00_room_0Set_001570DL_00B520; -#define dspot00_room_0Set_001570DL_00B8B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00B8B0" +#define dspot00_room_0Set_001570DL_00B8B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00B8B0" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00B8B0[] = dspot00_room_0Set_001570DL_00B8B0; -#define dspot00_room_0Set_001570DL_00BD20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00BD20" +#define dspot00_room_0Set_001570DL_00BD20 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00BD20" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00BD20[] = dspot00_room_0Set_001570DL_00BD20; -#define dspot00_room_0Set_001570DL_00CEB8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00CEB8" +#define dspot00_room_0Set_001570DL_00CEB8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00CEB8" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00CEB8[] = dspot00_room_0Set_001570DL_00CEB8; -#define dspot00_room_0Set_001570DL_00D980 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00D980" +#define dspot00_room_0Set_001570DL_00D980 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00D980" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00D980[] = dspot00_room_0Set_001570DL_00D980; -#define dspot00_room_0Set_001570DL_00DD70 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00DD70" +#define dspot00_room_0Set_001570DL_00DD70 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00DD70" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00DD70[] = dspot00_room_0Set_001570DL_00DD70; -#define dspot00_room_0Set_001570DL_00DFA8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00DFA8" +#define dspot00_room_0Set_001570DL_00DFA8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00DFA8" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00DFA8[] = dspot00_room_0Set_001570DL_00DFA8; -#define dspot00_room_0Set_001570DL_00E7B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00E7B0" +#define dspot00_room_0Set_001570DL_00E7B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00E7B0" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00E7B0[] = dspot00_room_0Set_001570DL_00E7B0; -#define dspot00_room_0Set_001570DL_00F3F8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00F3F8" +#define dspot00_room_0Set_001570DL_00F3F8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00F3F8" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00F3F8[] = dspot00_room_0Set_001570DL_00F3F8; -#define dspot00_room_0Set_001570DL_00FB50 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00FB50" +#define dspot00_room_0Set_001570DL_00FB50 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00FB50" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00FB50[] = dspot00_room_0Set_001570DL_00FB50; -#define dspot00_room_0Set_001570DL_00FE98 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00FE98" +#define dspot00_room_0Set_001570DL_00FE98 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00FE98" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00FE98[] = dspot00_room_0Set_001570DL_00FE98; -#define dspot00_room_0Set_001570DL_0127B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_0127B8" +#define dspot00_room_0Set_001570DL_0127B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_0127B8" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_0127B8[] = dspot00_room_0Set_001570DL_0127B8; -#define dspot00_room_0Set_001570DL_00E328 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00E328" +#define dspot00_room_0Set_001570DL_00E328 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00E328" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00E328[] = dspot00_room_0Set_001570DL_00E328; -#define dspot00_room_0Set_001570DL_0112B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_0112B8" +#define dspot00_room_0Set_001570DL_0112B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_0112B8" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_0112B8[] = dspot00_room_0Set_001570DL_0112B8; -#define dspot00_room_0Set_001570DL_0121D0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_0121D0" +#define dspot00_room_0Set_001570DL_0121D0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_0121D0" static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_0121D0[] = dspot00_room_0Set_001570DL_0121D0; -#define dspot00_room_0Set_0018D0DL_013250 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_013250" +#define dspot00_room_0Set_0018D0DL_013250 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_013250" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_013250[] = dspot00_room_0Set_0018D0DL_013250; -#define dspot00_room_0Set_0018D0DL_0139A8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_0139A8" +#define dspot00_room_0Set_0018D0DL_0139A8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_0139A8" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_0139A8[] = dspot00_room_0Set_0018D0DL_0139A8; -#define dspot00_room_0Set_0018D0DL_0143C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_0143C8" +#define dspot00_room_0Set_0018D0DL_0143C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_0143C8" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_0143C8[] = dspot00_room_0Set_0018D0DL_0143C8; -#define dspot00_room_0Set_0018D0DL_015100 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_015100" +#define dspot00_room_0Set_0018D0DL_015100 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_015100" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_015100[] = dspot00_room_0Set_0018D0DL_015100; -#define dspot00_room_0Set_0018D0DL_014E28 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_014E28" +#define dspot00_room_0Set_0018D0DL_014E28 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_014E28" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_014E28[] = dspot00_room_0Set_0018D0DL_014E28; -#define dspot00_room_0Set_0018D0DL_008448 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_008448" +#define dspot00_room_0Set_0018D0DL_008448 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_008448" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_008448[] = dspot00_room_0Set_0018D0DL_008448; -#define dspot00_room_0Set_0018D0DL_012C38 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_012C38" +#define dspot00_room_0Set_0018D0DL_012C38 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_012C38" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_012C38[] = dspot00_room_0Set_0018D0DL_012C38; -#define dspot00_room_0Set_0018D0DL_012E18 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_012E18" +#define dspot00_room_0Set_0018D0DL_012E18 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_012E18" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_012E18[] = dspot00_room_0Set_0018D0DL_012E18; -#define dspot00_room_0Set_0018D0DL_002790 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_002790" +#define dspot00_room_0Set_0018D0DL_002790 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_002790" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_002790[] = dspot00_room_0Set_0018D0DL_002790; -#define dspot00_room_0Set_0018D0DL_003338 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_003338" +#define dspot00_room_0Set_0018D0DL_003338 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_003338" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_003338[] = dspot00_room_0Set_0018D0DL_003338; -#define dspot00_room_0Set_0018D0DL_003ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_003ED0" +#define dspot00_room_0Set_0018D0DL_003ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_003ED0" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_003ED0[] = dspot00_room_0Set_0018D0DL_003ED0; -#define dspot00_room_0Set_0018D0DL_005030 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_005030" +#define dspot00_room_0Set_0018D0DL_005030 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_005030" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_005030[] = dspot00_room_0Set_0018D0DL_005030; -#define dspot00_room_0Set_0018D0DL_005850 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_005850" +#define dspot00_room_0Set_0018D0DL_005850 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_005850" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_005850[] = dspot00_room_0Set_0018D0DL_005850; -#define dspot00_room_0Set_0018D0DL_005BC0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_005BC0" +#define dspot00_room_0Set_0018D0DL_005BC0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_005BC0" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_005BC0[] = dspot00_room_0Set_0018D0DL_005BC0; -#define dspot00_room_0Set_0018D0DL_005E78 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_005E78" +#define dspot00_room_0Set_0018D0DL_005E78 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_005E78" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_005E78[] = dspot00_room_0Set_0018D0DL_005E78; -#define dspot00_room_0Set_0018D0DL_0067C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_0067C8" +#define dspot00_room_0Set_0018D0DL_0067C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_0067C8" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_0067C8[] = dspot00_room_0Set_0018D0DL_0067C8; -#define dspot00_room_0Set_0018D0DL_006ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_006ED0" +#define dspot00_room_0Set_0018D0DL_006ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_006ED0" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_006ED0[] = dspot00_room_0Set_0018D0DL_006ED0; -#define dspot00_room_0Set_0018D0DL_007230 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_007230" +#define dspot00_room_0Set_0018D0DL_007230 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_007230" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_007230[] = dspot00_room_0Set_0018D0DL_007230; -#define dspot00_room_0Set_0018D0DL_008ED8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_008ED8" +#define dspot00_room_0Set_0018D0DL_008ED8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_008ED8" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_008ED8[] = dspot00_room_0Set_0018D0DL_008ED8; -#define dspot00_room_0Set_0018D0DL_0093A0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_0093A0" +#define dspot00_room_0Set_0018D0DL_0093A0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_0093A0" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_0093A0[] = dspot00_room_0Set_0018D0DL_0093A0; -#define dspot00_room_0Set_0018D0DL_009D10 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_009D10" +#define dspot00_room_0Set_0018D0DL_009D10 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_009D10" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_009D10[] = dspot00_room_0Set_0018D0DL_009D10; -#define dspot00_room_0Set_0018D0DL_00AD00 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00AD00" +#define dspot00_room_0Set_0018D0DL_00AD00 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00AD00" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00AD00[] = dspot00_room_0Set_0018D0DL_00AD00; -#define dspot00_room_0Set_0018D0DL_00B520 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00B520" +#define dspot00_room_0Set_0018D0DL_00B520 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00B520" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00B520[] = dspot00_room_0Set_0018D0DL_00B520; -#define dspot00_room_0Set_0018D0DL_00B8B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00B8B0" +#define dspot00_room_0Set_0018D0DL_00B8B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00B8B0" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00B8B0[] = dspot00_room_0Set_0018D0DL_00B8B0; -#define dspot00_room_0Set_0018D0DL_00BD20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00BD20" +#define dspot00_room_0Set_0018D0DL_00BD20 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00BD20" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00BD20[] = dspot00_room_0Set_0018D0DL_00BD20; -#define dspot00_room_0Set_0018D0DL_00CEB8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00CEB8" +#define dspot00_room_0Set_0018D0DL_00CEB8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00CEB8" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00CEB8[] = dspot00_room_0Set_0018D0DL_00CEB8; -#define dspot00_room_0Set_0018D0DL_00D980 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00D980" +#define dspot00_room_0Set_0018D0DL_00D980 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00D980" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00D980[] = dspot00_room_0Set_0018D0DL_00D980; -#define dspot00_room_0Set_0018D0DL_00DD70 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00DD70" +#define dspot00_room_0Set_0018D0DL_00DD70 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00DD70" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00DD70[] = dspot00_room_0Set_0018D0DL_00DD70; -#define dspot00_room_0Set_0018D0DL_00DFA8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00DFA8" +#define dspot00_room_0Set_0018D0DL_00DFA8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00DFA8" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00DFA8[] = dspot00_room_0Set_0018D0DL_00DFA8; -#define dspot00_room_0Set_0018D0DL_00E7B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00E7B0" +#define dspot00_room_0Set_0018D0DL_00E7B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00E7B0" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00E7B0[] = dspot00_room_0Set_0018D0DL_00E7B0; -#define dspot00_room_0Set_0018D0DL_00F3F8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00F3F8" +#define dspot00_room_0Set_0018D0DL_00F3F8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00F3F8" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00F3F8[] = dspot00_room_0Set_0018D0DL_00F3F8; -#define dspot00_room_0Set_0018D0DL_00FB50 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00FB50" +#define dspot00_room_0Set_0018D0DL_00FB50 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00FB50" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00FB50[] = dspot00_room_0Set_0018D0DL_00FB50; -#define dspot00_room_0Set_0018D0DL_00FE98 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00FE98" +#define dspot00_room_0Set_0018D0DL_00FE98 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00FE98" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00FE98[] = dspot00_room_0Set_0018D0DL_00FE98; -#define dspot00_room_0Set_0018D0DL_0127B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_0127B8" +#define dspot00_room_0Set_0018D0DL_0127B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_0127B8" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_0127B8[] = dspot00_room_0Set_0018D0DL_0127B8; -#define dspot00_room_0Set_0018D0DL_00E328 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00E328" +#define dspot00_room_0Set_0018D0DL_00E328 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00E328" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00E328[] = dspot00_room_0Set_0018D0DL_00E328; -#define dspot00_room_0Set_0018D0DL_0112B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_0112B8" +#define dspot00_room_0Set_0018D0DL_0112B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_0112B8" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_0112B8[] = dspot00_room_0Set_0018D0DL_0112B8; -#define dspot00_room_0Set_0018D0DL_0121D0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_0121D0" +#define dspot00_room_0Set_0018D0DL_0121D0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_0121D0" static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_0121D0[] = dspot00_room_0Set_0018D0DL_0121D0; -#define dspot00_room_0Set_001920DL_013250 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_013250" +#define dspot00_room_0Set_001920DL_013250 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_013250" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_013250[] = dspot00_room_0Set_001920DL_013250; -#define dspot00_room_0Set_001920DL_0139A8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_0139A8" +#define dspot00_room_0Set_001920DL_0139A8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_0139A8" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_0139A8[] = dspot00_room_0Set_001920DL_0139A8; -#define dspot00_room_0Set_001920DL_0143C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_0143C8" +#define dspot00_room_0Set_001920DL_0143C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_0143C8" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_0143C8[] = dspot00_room_0Set_001920DL_0143C8; -#define dspot00_room_0Set_001920DL_015100 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_015100" +#define dspot00_room_0Set_001920DL_015100 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_015100" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_015100[] = dspot00_room_0Set_001920DL_015100; -#define dspot00_room_0Set_001920DL_014E28 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_014E28" +#define dspot00_room_0Set_001920DL_014E28 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_014E28" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_014E28[] = dspot00_room_0Set_001920DL_014E28; -#define dspot00_room_0Set_001920DL_008448 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_008448" +#define dspot00_room_0Set_001920DL_008448 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_008448" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_008448[] = dspot00_room_0Set_001920DL_008448; -#define dspot00_room_0Set_001920DL_012C38 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_012C38" +#define dspot00_room_0Set_001920DL_012C38 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_012C38" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_012C38[] = dspot00_room_0Set_001920DL_012C38; -#define dspot00_room_0Set_001920DL_012E18 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_012E18" +#define dspot00_room_0Set_001920DL_012E18 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_012E18" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_012E18[] = dspot00_room_0Set_001920DL_012E18; -#define dspot00_room_0Set_001920DL_002790 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_002790" +#define dspot00_room_0Set_001920DL_002790 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_002790" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_002790[] = dspot00_room_0Set_001920DL_002790; -#define dspot00_room_0Set_001920DL_003338 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_003338" +#define dspot00_room_0Set_001920DL_003338 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_003338" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_003338[] = dspot00_room_0Set_001920DL_003338; -#define dspot00_room_0Set_001920DL_003ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_003ED0" +#define dspot00_room_0Set_001920DL_003ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_003ED0" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_003ED0[] = dspot00_room_0Set_001920DL_003ED0; -#define dspot00_room_0Set_001920DL_005030 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_005030" +#define dspot00_room_0Set_001920DL_005030 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_005030" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_005030[] = dspot00_room_0Set_001920DL_005030; -#define dspot00_room_0Set_001920DL_005850 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_005850" +#define dspot00_room_0Set_001920DL_005850 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_005850" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_005850[] = dspot00_room_0Set_001920DL_005850; -#define dspot00_room_0Set_001920DL_005BC0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_005BC0" +#define dspot00_room_0Set_001920DL_005BC0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_005BC0" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_005BC0[] = dspot00_room_0Set_001920DL_005BC0; -#define dspot00_room_0Set_001920DL_005E78 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_005E78" +#define dspot00_room_0Set_001920DL_005E78 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_005E78" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_005E78[] = dspot00_room_0Set_001920DL_005E78; -#define dspot00_room_0Set_001920DL_0067C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_0067C8" +#define dspot00_room_0Set_001920DL_0067C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_0067C8" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_0067C8[] = dspot00_room_0Set_001920DL_0067C8; -#define dspot00_room_0Set_001920DL_006ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_006ED0" +#define dspot00_room_0Set_001920DL_006ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_006ED0" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_006ED0[] = dspot00_room_0Set_001920DL_006ED0; -#define dspot00_room_0Set_001920DL_007230 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_007230" +#define dspot00_room_0Set_001920DL_007230 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_007230" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_007230[] = dspot00_room_0Set_001920DL_007230; -#define dspot00_room_0Set_001920DL_008ED8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_008ED8" +#define dspot00_room_0Set_001920DL_008ED8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_008ED8" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_008ED8[] = dspot00_room_0Set_001920DL_008ED8; -#define dspot00_room_0Set_001920DL_0093A0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_0093A0" +#define dspot00_room_0Set_001920DL_0093A0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_0093A0" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_0093A0[] = dspot00_room_0Set_001920DL_0093A0; -#define dspot00_room_0Set_001920DL_009D10 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_009D10" +#define dspot00_room_0Set_001920DL_009D10 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_009D10" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_009D10[] = dspot00_room_0Set_001920DL_009D10; -#define dspot00_room_0Set_001920DL_00AD00 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00AD00" +#define dspot00_room_0Set_001920DL_00AD00 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00AD00" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00AD00[] = dspot00_room_0Set_001920DL_00AD00; -#define dspot00_room_0Set_001920DL_00B520 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00B520" +#define dspot00_room_0Set_001920DL_00B520 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00B520" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00B520[] = dspot00_room_0Set_001920DL_00B520; -#define dspot00_room_0Set_001920DL_00B8B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00B8B0" +#define dspot00_room_0Set_001920DL_00B8B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00B8B0" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00B8B0[] = dspot00_room_0Set_001920DL_00B8B0; -#define dspot00_room_0Set_001920DL_00BD20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00BD20" +#define dspot00_room_0Set_001920DL_00BD20 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00BD20" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00BD20[] = dspot00_room_0Set_001920DL_00BD20; -#define dspot00_room_0Set_001920DL_00CEB8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00CEB8" +#define dspot00_room_0Set_001920DL_00CEB8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00CEB8" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00CEB8[] = dspot00_room_0Set_001920DL_00CEB8; -#define dspot00_room_0Set_001920DL_00D980 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00D980" +#define dspot00_room_0Set_001920DL_00D980 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00D980" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00D980[] = dspot00_room_0Set_001920DL_00D980; -#define dspot00_room_0Set_001920DL_00DD70 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00DD70" +#define dspot00_room_0Set_001920DL_00DD70 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00DD70" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00DD70[] = dspot00_room_0Set_001920DL_00DD70; -#define dspot00_room_0Set_001920DL_00DFA8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00DFA8" +#define dspot00_room_0Set_001920DL_00DFA8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00DFA8" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00DFA8[] = dspot00_room_0Set_001920DL_00DFA8; -#define dspot00_room_0Set_001920DL_00E7B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00E7B0" +#define dspot00_room_0Set_001920DL_00E7B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00E7B0" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00E7B0[] = dspot00_room_0Set_001920DL_00E7B0; -#define dspot00_room_0Set_001920DL_00F3F8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00F3F8" +#define dspot00_room_0Set_001920DL_00F3F8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00F3F8" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00F3F8[] = dspot00_room_0Set_001920DL_00F3F8; -#define dspot00_room_0Set_001920DL_00FB50 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00FB50" +#define dspot00_room_0Set_001920DL_00FB50 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00FB50" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00FB50[] = dspot00_room_0Set_001920DL_00FB50; -#define dspot00_room_0Set_001920DL_00FE98 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00FE98" +#define dspot00_room_0Set_001920DL_00FE98 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00FE98" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00FE98[] = dspot00_room_0Set_001920DL_00FE98; -#define dspot00_room_0Set_001920DL_0127B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_0127B8" +#define dspot00_room_0Set_001920DL_0127B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_0127B8" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_0127B8[] = dspot00_room_0Set_001920DL_0127B8; -#define dspot00_room_0Set_001920DL_00E328 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00E328" +#define dspot00_room_0Set_001920DL_00E328 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00E328" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00E328[] = dspot00_room_0Set_001920DL_00E328; -#define dspot00_room_0Set_001920DL_0112B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_0112B8" +#define dspot00_room_0Set_001920DL_0112B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_0112B8" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_0112B8[] = dspot00_room_0Set_001920DL_0112B8; -#define dspot00_room_0Set_001920DL_0121D0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_0121D0" +#define dspot00_room_0Set_001920DL_0121D0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_0121D0" static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_0121D0[] = dspot00_room_0Set_001920DL_0121D0; -#define dspot00_room_0Set_001C80DL_013250 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_013250" +#define dspot00_room_0Set_001C80DL_013250 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_013250" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_013250[] = dspot00_room_0Set_001C80DL_013250; -#define dspot00_room_0Set_001C80DL_0139A8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_0139A8" +#define dspot00_room_0Set_001C80DL_0139A8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_0139A8" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_0139A8[] = dspot00_room_0Set_001C80DL_0139A8; -#define dspot00_room_0Set_001C80DL_0143C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_0143C8" +#define dspot00_room_0Set_001C80DL_0143C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_0143C8" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_0143C8[] = dspot00_room_0Set_001C80DL_0143C8; -#define dspot00_room_0Set_001C80DL_015100 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_015100" +#define dspot00_room_0Set_001C80DL_015100 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_015100" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_015100[] = dspot00_room_0Set_001C80DL_015100; -#define dspot00_room_0Set_001C80DL_014E28 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_014E28" +#define dspot00_room_0Set_001C80DL_014E28 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_014E28" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_014E28[] = dspot00_room_0Set_001C80DL_014E28; -#define dspot00_room_0Set_001C80DL_008448 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_008448" +#define dspot00_room_0Set_001C80DL_008448 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_008448" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_008448[] = dspot00_room_0Set_001C80DL_008448; -#define dspot00_room_0Set_001C80DL_012C38 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_012C38" +#define dspot00_room_0Set_001C80DL_012C38 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_012C38" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_012C38[] = dspot00_room_0Set_001C80DL_012C38; -#define dspot00_room_0Set_001C80DL_012E18 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_012E18" +#define dspot00_room_0Set_001C80DL_012E18 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_012E18" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_012E18[] = dspot00_room_0Set_001C80DL_012E18; -#define dspot00_room_0Set_001C80DL_002790 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_002790" +#define dspot00_room_0Set_001C80DL_002790 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_002790" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_002790[] = dspot00_room_0Set_001C80DL_002790; -#define dspot00_room_0Set_001C80DL_003338 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_003338" +#define dspot00_room_0Set_001C80DL_003338 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_003338" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_003338[] = dspot00_room_0Set_001C80DL_003338; -#define dspot00_room_0Set_001C80DL_003ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_003ED0" +#define dspot00_room_0Set_001C80DL_003ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_003ED0" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_003ED0[] = dspot00_room_0Set_001C80DL_003ED0; -#define dspot00_room_0Set_001C80DL_005030 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_005030" +#define dspot00_room_0Set_001C80DL_005030 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_005030" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_005030[] = dspot00_room_0Set_001C80DL_005030; -#define dspot00_room_0Set_001C80DL_005850 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_005850" +#define dspot00_room_0Set_001C80DL_005850 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_005850" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_005850[] = dspot00_room_0Set_001C80DL_005850; -#define dspot00_room_0Set_001C80DL_005BC0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_005BC0" +#define dspot00_room_0Set_001C80DL_005BC0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_005BC0" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_005BC0[] = dspot00_room_0Set_001C80DL_005BC0; -#define dspot00_room_0Set_001C80DL_005E78 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_005E78" +#define dspot00_room_0Set_001C80DL_005E78 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_005E78" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_005E78[] = dspot00_room_0Set_001C80DL_005E78; -#define dspot00_room_0Set_001C80DL_0067C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_0067C8" +#define dspot00_room_0Set_001C80DL_0067C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_0067C8" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_0067C8[] = dspot00_room_0Set_001C80DL_0067C8; -#define dspot00_room_0Set_001C80DL_006ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_006ED0" +#define dspot00_room_0Set_001C80DL_006ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_006ED0" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_006ED0[] = dspot00_room_0Set_001C80DL_006ED0; -#define dspot00_room_0Set_001C80DL_007230 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_007230" +#define dspot00_room_0Set_001C80DL_007230 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_007230" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_007230[] = dspot00_room_0Set_001C80DL_007230; -#define dspot00_room_0Set_001C80DL_008ED8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_008ED8" +#define dspot00_room_0Set_001C80DL_008ED8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_008ED8" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_008ED8[] = dspot00_room_0Set_001C80DL_008ED8; -#define dspot00_room_0Set_001C80DL_0093A0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_0093A0" +#define dspot00_room_0Set_001C80DL_0093A0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_0093A0" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_0093A0[] = dspot00_room_0Set_001C80DL_0093A0; -#define dspot00_room_0Set_001C80DL_009D10 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_009D10" +#define dspot00_room_0Set_001C80DL_009D10 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_009D10" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_009D10[] = dspot00_room_0Set_001C80DL_009D10; -#define dspot00_room_0Set_001C80DL_00AD00 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00AD00" +#define dspot00_room_0Set_001C80DL_00AD00 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00AD00" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00AD00[] = dspot00_room_0Set_001C80DL_00AD00; -#define dspot00_room_0Set_001C80DL_00B520 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00B520" +#define dspot00_room_0Set_001C80DL_00B520 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00B520" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00B520[] = dspot00_room_0Set_001C80DL_00B520; -#define dspot00_room_0Set_001C80DL_00B8B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00B8B0" +#define dspot00_room_0Set_001C80DL_00B8B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00B8B0" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00B8B0[] = dspot00_room_0Set_001C80DL_00B8B0; -#define dspot00_room_0Set_001C80DL_00BD20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00BD20" +#define dspot00_room_0Set_001C80DL_00BD20 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00BD20" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00BD20[] = dspot00_room_0Set_001C80DL_00BD20; -#define dspot00_room_0Set_001C80DL_00CEB8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00CEB8" +#define dspot00_room_0Set_001C80DL_00CEB8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00CEB8" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00CEB8[] = dspot00_room_0Set_001C80DL_00CEB8; -#define dspot00_room_0Set_001C80DL_00D980 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00D980" +#define dspot00_room_0Set_001C80DL_00D980 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00D980" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00D980[] = dspot00_room_0Set_001C80DL_00D980; -#define dspot00_room_0Set_001C80DL_00DD70 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00DD70" +#define dspot00_room_0Set_001C80DL_00DD70 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00DD70" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00DD70[] = dspot00_room_0Set_001C80DL_00DD70; -#define dspot00_room_0Set_001C80DL_00DFA8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00DFA8" +#define dspot00_room_0Set_001C80DL_00DFA8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00DFA8" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00DFA8[] = dspot00_room_0Set_001C80DL_00DFA8; -#define dspot00_room_0Set_001C80DL_00E7B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00E7B0" +#define dspot00_room_0Set_001C80DL_00E7B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00E7B0" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00E7B0[] = dspot00_room_0Set_001C80DL_00E7B0; -#define dspot00_room_0Set_001C80DL_00F3F8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00F3F8" +#define dspot00_room_0Set_001C80DL_00F3F8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00F3F8" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00F3F8[] = dspot00_room_0Set_001C80DL_00F3F8; -#define dspot00_room_0Set_001C80DL_00FB50 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00FB50" +#define dspot00_room_0Set_001C80DL_00FB50 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00FB50" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00FB50[] = dspot00_room_0Set_001C80DL_00FB50; -#define dspot00_room_0Set_001C80DL_00FE98 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00FE98" +#define dspot00_room_0Set_001C80DL_00FE98 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00FE98" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00FE98[] = dspot00_room_0Set_001C80DL_00FE98; -#define dspot00_room_0Set_001C80DL_0127B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_0127B8" +#define dspot00_room_0Set_001C80DL_0127B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_0127B8" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_0127B8[] = dspot00_room_0Set_001C80DL_0127B8; -#define dspot00_room_0Set_001C80DL_00E328 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00E328" +#define dspot00_room_0Set_001C80DL_00E328 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00E328" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00E328[] = dspot00_room_0Set_001C80DL_00E328; -#define dspot00_room_0Set_001C80DL_0112B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_0112B8" +#define dspot00_room_0Set_001C80DL_0112B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_0112B8" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_0112B8[] = dspot00_room_0Set_001C80DL_0112B8; -#define dspot00_room_0Set_001C80DL_0121D0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_0121D0" +#define dspot00_room_0Set_001C80DL_0121D0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_0121D0" static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_0121D0[] = dspot00_room_0Set_001C80DL_0121D0; -#define dspot00_room_0Set_001CF0DL_013250 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_013250" +#define dspot00_room_0Set_001CF0DL_013250 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_013250" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_013250[] = dspot00_room_0Set_001CF0DL_013250; -#define dspot00_room_0Set_001CF0DL_0139A8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_0139A8" +#define dspot00_room_0Set_001CF0DL_0139A8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_0139A8" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_0139A8[] = dspot00_room_0Set_001CF0DL_0139A8; -#define dspot00_room_0Set_001CF0DL_0143C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_0143C8" +#define dspot00_room_0Set_001CF0DL_0143C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_0143C8" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_0143C8[] = dspot00_room_0Set_001CF0DL_0143C8; -#define dspot00_room_0Set_001CF0DL_015100 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_015100" +#define dspot00_room_0Set_001CF0DL_015100 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_015100" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_015100[] = dspot00_room_0Set_001CF0DL_015100; -#define dspot00_room_0Set_001CF0DL_014E28 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_014E28" +#define dspot00_room_0Set_001CF0DL_014E28 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_014E28" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_014E28[] = dspot00_room_0Set_001CF0DL_014E28; -#define dspot00_room_0Set_001CF0DL_008448 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_008448" +#define dspot00_room_0Set_001CF0DL_008448 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_008448" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_008448[] = dspot00_room_0Set_001CF0DL_008448; -#define dspot00_room_0Set_001CF0DL_012C38 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_012C38" +#define dspot00_room_0Set_001CF0DL_012C38 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_012C38" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_012C38[] = dspot00_room_0Set_001CF0DL_012C38; -#define dspot00_room_0Set_001CF0DL_012E18 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_012E18" +#define dspot00_room_0Set_001CF0DL_012E18 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_012E18" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_012E18[] = dspot00_room_0Set_001CF0DL_012E18; -#define dspot00_room_0Set_001CF0DL_002790 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_002790" +#define dspot00_room_0Set_001CF0DL_002790 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_002790" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_002790[] = dspot00_room_0Set_001CF0DL_002790; -#define dspot00_room_0Set_001CF0DL_003338 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_003338" +#define dspot00_room_0Set_001CF0DL_003338 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_003338" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_003338[] = dspot00_room_0Set_001CF0DL_003338; -#define dspot00_room_0Set_001CF0DL_003ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_003ED0" +#define dspot00_room_0Set_001CF0DL_003ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_003ED0" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_003ED0[] = dspot00_room_0Set_001CF0DL_003ED0; -#define dspot00_room_0Set_001CF0DL_005030 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_005030" +#define dspot00_room_0Set_001CF0DL_005030 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_005030" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_005030[] = dspot00_room_0Set_001CF0DL_005030; -#define dspot00_room_0Set_001CF0DL_005850 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_005850" +#define dspot00_room_0Set_001CF0DL_005850 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_005850" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_005850[] = dspot00_room_0Set_001CF0DL_005850; -#define dspot00_room_0Set_001CF0DL_005BC0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_005BC0" +#define dspot00_room_0Set_001CF0DL_005BC0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_005BC0" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_005BC0[] = dspot00_room_0Set_001CF0DL_005BC0; -#define dspot00_room_0Set_001CF0DL_005E78 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_005E78" +#define dspot00_room_0Set_001CF0DL_005E78 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_005E78" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_005E78[] = dspot00_room_0Set_001CF0DL_005E78; -#define dspot00_room_0Set_001CF0DL_0067C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_0067C8" +#define dspot00_room_0Set_001CF0DL_0067C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_0067C8" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_0067C8[] = dspot00_room_0Set_001CF0DL_0067C8; -#define dspot00_room_0Set_001CF0DL_006ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_006ED0" +#define dspot00_room_0Set_001CF0DL_006ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_006ED0" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_006ED0[] = dspot00_room_0Set_001CF0DL_006ED0; -#define dspot00_room_0Set_001CF0DL_007230 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_007230" +#define dspot00_room_0Set_001CF0DL_007230 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_007230" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_007230[] = dspot00_room_0Set_001CF0DL_007230; -#define dspot00_room_0Set_001CF0DL_008ED8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_008ED8" +#define dspot00_room_0Set_001CF0DL_008ED8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_008ED8" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_008ED8[] = dspot00_room_0Set_001CF0DL_008ED8; -#define dspot00_room_0Set_001CF0DL_0093A0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_0093A0" +#define dspot00_room_0Set_001CF0DL_0093A0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_0093A0" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_0093A0[] = dspot00_room_0Set_001CF0DL_0093A0; -#define dspot00_room_0Set_001CF0DL_009D10 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_009D10" +#define dspot00_room_0Set_001CF0DL_009D10 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_009D10" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_009D10[] = dspot00_room_0Set_001CF0DL_009D10; -#define dspot00_room_0Set_001CF0DL_00AD00 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00AD00" +#define dspot00_room_0Set_001CF0DL_00AD00 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00AD00" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00AD00[] = dspot00_room_0Set_001CF0DL_00AD00; -#define dspot00_room_0Set_001CF0DL_00B520 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00B520" +#define dspot00_room_0Set_001CF0DL_00B520 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00B520" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00B520[] = dspot00_room_0Set_001CF0DL_00B520; -#define dspot00_room_0Set_001CF0DL_00B8B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00B8B0" +#define dspot00_room_0Set_001CF0DL_00B8B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00B8B0" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00B8B0[] = dspot00_room_0Set_001CF0DL_00B8B0; -#define dspot00_room_0Set_001CF0DL_00BD20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00BD20" +#define dspot00_room_0Set_001CF0DL_00BD20 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00BD20" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00BD20[] = dspot00_room_0Set_001CF0DL_00BD20; -#define dspot00_room_0Set_001CF0DL_00CEB8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00CEB8" +#define dspot00_room_0Set_001CF0DL_00CEB8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00CEB8" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00CEB8[] = dspot00_room_0Set_001CF0DL_00CEB8; -#define dspot00_room_0Set_001CF0DL_00D980 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00D980" +#define dspot00_room_0Set_001CF0DL_00D980 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00D980" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00D980[] = dspot00_room_0Set_001CF0DL_00D980; -#define dspot00_room_0Set_001CF0DL_00DD70 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00DD70" +#define dspot00_room_0Set_001CF0DL_00DD70 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00DD70" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00DD70[] = dspot00_room_0Set_001CF0DL_00DD70; -#define dspot00_room_0Set_001CF0DL_00DFA8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00DFA8" +#define dspot00_room_0Set_001CF0DL_00DFA8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00DFA8" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00DFA8[] = dspot00_room_0Set_001CF0DL_00DFA8; -#define dspot00_room_0Set_001CF0DL_00E7B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00E7B0" +#define dspot00_room_0Set_001CF0DL_00E7B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00E7B0" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00E7B0[] = dspot00_room_0Set_001CF0DL_00E7B0; -#define dspot00_room_0Set_001CF0DL_00F3F8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00F3F8" +#define dspot00_room_0Set_001CF0DL_00F3F8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00F3F8" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00F3F8[] = dspot00_room_0Set_001CF0DL_00F3F8; -#define dspot00_room_0Set_001CF0DL_00FB50 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00FB50" +#define dspot00_room_0Set_001CF0DL_00FB50 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00FB50" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00FB50[] = dspot00_room_0Set_001CF0DL_00FB50; -#define dspot00_room_0Set_001CF0DL_00FE98 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00FE98" +#define dspot00_room_0Set_001CF0DL_00FE98 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00FE98" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00FE98[] = dspot00_room_0Set_001CF0DL_00FE98; -#define dspot00_room_0Set_001CF0DL_0127B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_0127B8" +#define dspot00_room_0Set_001CF0DL_0127B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_0127B8" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_0127B8[] = dspot00_room_0Set_001CF0DL_0127B8; -#define dspot00_room_0Set_001CF0DL_00E328 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00E328" +#define dspot00_room_0Set_001CF0DL_00E328 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00E328" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00E328[] = dspot00_room_0Set_001CF0DL_00E328; -#define dspot00_room_0Set_001CF0DL_0112B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_0112B8" +#define dspot00_room_0Set_001CF0DL_0112B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_0112B8" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_0112B8[] = dspot00_room_0Set_001CF0DL_0112B8; -#define dspot00_room_0Set_001CF0DL_0121D0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_0121D0" +#define dspot00_room_0Set_001CF0DL_0121D0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_0121D0" static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_0121D0[] = dspot00_room_0Set_001CF0DL_0121D0; diff --git a/soh/assets/scenes/overworld/spot00/spot00_scene.h b/soh/assets/scenes/overworld/spot00/spot00_scene.h index 406a18176..97976e0e7 100644 --- a/soh/assets/scenes/overworld/spot00/spot00_scene.h +++ b/soh/assets/scenes/overworld/spot00/spot00_scene.h @@ -3,207 +3,207 @@ #include "align_asset_macro.h" -#define dgHyruleFieldGetOoTCs "__OTR__scenes/nonmq/spot00_scene/gHyruleFieldGetOoTCs" -static const ALIGN_ASSET(2) char gHyruleFieldGetOoTCs[] = dgHyruleFieldGetOoTCs; - -#define dgHyruleFieldZeldaSongOfTimeCs "__OTR__scenes/nonmq/spot00_scene/gHyruleFieldZeldaSongOfTimeCs" -static const ALIGN_ASSET(2) char gHyruleFieldZeldaSongOfTimeCs[] = dgHyruleFieldZeldaSongOfTimeCs; - -#define dgHyruleFieldEastEponaJumpCs "__OTR__scenes/nonmq/spot00_scene/gHyruleFieldEastEponaJumpCs" -static const ALIGN_ASSET(2) char gHyruleFieldEastEponaJumpCs[] = dgHyruleFieldEastEponaJumpCs; - -#define dgHyruleFieldIntroCs "__OTR__scenes/nonmq/spot00_scene/gHyruleFieldIntroCs" -static const ALIGN_ASSET(2) char gHyruleFieldIntroCs[] = dgHyruleFieldIntroCs; - -#define dgHyruleFieldSouthEponaJumpCs "__OTR__scenes/nonmq/spot00_scene/gHyruleFieldSouthEponaJumpCs" -static const ALIGN_ASSET(2) char gHyruleFieldSouthEponaJumpCs[] = dgHyruleFieldSouthEponaJumpCs; - -#define dgHyruleFieldWestEponaJumpCs "__OTR__scenes/nonmq/spot00_scene/gHyruleFieldWestEponaJumpCs" -static const ALIGN_ASSET(2) char gHyruleFieldWestEponaJumpCs[] = dgHyruleFieldWestEponaJumpCs; - -#define dgHyruleFieldGateEponaJumpCs "__OTR__scenes/nonmq/spot00_scene/gHyruleFieldGateEponaJumpCs" -static const ALIGN_ASSET(2) char gHyruleFieldGateEponaJumpCs[] = dgHyruleFieldGateEponaJumpCs; - -#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464" -static const ALIGN_ASSET(2) char spot00_sceneCollisionHeader_008464[] = dspot00_sceneCollisionHeader_008464; - -#define dspot00_scene_Tex_02A198 "__OTR__scenes/nonmq/spot00_scene/spot00_scene_Tex_02A198" -static const ALIGN_ASSET(2) char spot00_scene_Tex_02A198[] = dspot00_scene_Tex_02A198; - -#define dspot00_sceneTex_025018 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_025018" -static const ALIGN_ASSET(2) char spot00_sceneTex_025018[] = dspot00_sceneTex_025018; - -#define dspot00_sceneTex_023818 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_023818" -static const ALIGN_ASSET(2) char spot00_sceneTex_023818[] = dspot00_sceneTex_023818; - -#define dspot00_sceneTex_024018 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_024018" -static const ALIGN_ASSET(2) char spot00_sceneTex_024018[] = dspot00_sceneTex_024018; - -#define dspot00_sceneTex_022018 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_022018" -static const ALIGN_ASSET(2) char spot00_sceneTex_022018[] = dspot00_sceneTex_022018; - -#define dspot00_sceneTex_020818 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_020818" -static const ALIGN_ASSET(2) char spot00_sceneTex_020818[] = dspot00_sceneTex_020818; - -#define dspot00_sceneTex_024818 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_024818" -static const ALIGN_ASSET(2) char spot00_sceneTex_024818[] = dspot00_sceneTex_024818; - -#define dspot00_sceneTLUT_013D70 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTLUT_013D70" -static const ALIGN_ASSET(2) char spot00_sceneTLUT_013D70[] = dspot00_sceneTLUT_013D70; - -#define dspot00_sceneTex_016698 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_016698" -static const ALIGN_ASSET(2) char spot00_sceneTex_016698[] = dspot00_sceneTex_016698; - -#define dspot00_sceneTex_01BD98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01BD98" -static const ALIGN_ASSET(2) char spot00_sceneTex_01BD98[] = dspot00_sceneTex_01BD98; - -#define dspot00_sceneTex_025818 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_025818" -static const ALIGN_ASSET(2) char spot00_sceneTex_025818[] = dspot00_sceneTex_025818; - -#define dspot00_sceneTex_01BB98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01BB98" -static const ALIGN_ASSET(2) char spot00_sceneTex_01BB98[] = dspot00_sceneTex_01BB98; - -#define dspot00_sceneTex_029F98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_029F98" -static const ALIGN_ASSET(2) char spot00_sceneTex_029F98[] = dspot00_sceneTex_029F98; - -#define dspot00_sceneTex_01F618 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01F618" -static const ALIGN_ASSET(2) char spot00_sceneTex_01F618[] = dspot00_sceneTex_01F618; - -#define dspot00_sceneTex_019398 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_019398" -static const ALIGN_ASSET(2) char spot00_sceneTex_019398[] = dspot00_sceneTex_019398; - -#define dspot00_sceneTex_01F598 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01F598" -static const ALIGN_ASSET(2) char spot00_sceneTex_01F598[] = dspot00_sceneTex_01F598; - -#define dspot00_sceneTex_01F198 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01F198" -static const ALIGN_ASSET(2) char spot00_sceneTex_01F198[] = dspot00_sceneTex_01F198; - -#define dspot00_sceneTex_01E998 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01E998" -static const ALIGN_ASSET(2) char spot00_sceneTex_01E998[] = dspot00_sceneTex_01E998; - -#define dspot00_sceneTex_01AB98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01AB98" -static const ALIGN_ASSET(2) char spot00_sceneTex_01AB98[] = dspot00_sceneTex_01AB98; - -#define dspot00_sceneTex_01B398 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01B398" -static const ALIGN_ASSET(2) char spot00_sceneTex_01B398[] = dspot00_sceneTex_01B398; - -#define dspot00_sceneTex_01D998 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01D998" -static const ALIGN_ASSET(2) char spot00_sceneTex_01D998[] = dspot00_sceneTex_01D998; - -#define dspot00_sceneTex_028198 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_028198" -static const ALIGN_ASSET(2) char spot00_sceneTex_028198[] = dspot00_sceneTex_028198; - -#define dspot00_sceneTex_029598 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_029598" -static const ALIGN_ASSET(2) char spot00_sceneTex_029598[] = dspot00_sceneTex_029598; - -#define dspot00_sceneTex_023018 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_023018" -static const ALIGN_ASSET(2) char spot00_sceneTex_023018[] = dspot00_sceneTex_023018; - -#define dspot00_sceneTex_022818 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_022818" -static const ALIGN_ASSET(2) char spot00_sceneTex_022818[] = dspot00_sceneTex_022818; - -#define dspot00_sceneTex_01C198 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01C198" -static const ALIGN_ASSET(2) char spot00_sceneTex_01C198[] = dspot00_sceneTex_01C198; - -#define dspot00_sceneTex_026898 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_026898" -static const ALIGN_ASSET(2) char spot00_sceneTex_026898[] = dspot00_sceneTex_026898; - -#define dspot00_sceneTex_016A98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_016A98" -static const ALIGN_ASSET(2) char spot00_sceneTex_016A98[] = dspot00_sceneTex_016A98; - -#define dspot00_sceneTex_01D198 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01D198" -static const ALIGN_ASSET(2) char spot00_sceneTex_01D198[] = dspot00_sceneTex_01D198; - -#define dspot00_sceneTex_029D98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_029D98" -static const ALIGN_ASSET(2) char spot00_sceneTex_029D98[] = dspot00_sceneTex_029D98; - -#define dspot00_sceneTex_019B98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_019B98" -static const ALIGN_ASSET(2) char spot00_sceneTex_019B98[] = dspot00_sceneTex_019B98; - -#define dspot00_sceneTex_013D98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_013D98" +#define dspot00_sceneTex_013D98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_013D98" static const ALIGN_ASSET(2) char spot00_sceneTex_013D98[] = dspot00_sceneTex_013D98; -#define dspot00_sceneTex_018B98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_018B98" -static const ALIGN_ASSET(2) char spot00_sceneTex_018B98[] = dspot00_sceneTex_018B98; - -#define dspot00_sceneTex_017B98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_017B98" -static const ALIGN_ASSET(2) char spot00_sceneTex_017B98[] = dspot00_sceneTex_017B98; - -#define dspot00_sceneTex_016B98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_016B98" -static const ALIGN_ASSET(2) char spot00_sceneTex_016B98[] = dspot00_sceneTex_016B98; - -#define dspot00_sceneTex_015E98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_015E98" -static const ALIGN_ASSET(2) char spot00_sceneTex_015E98[] = dspot00_sceneTex_015E98; - -#define dspot00_sceneTex_015D98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_015D98" -static const ALIGN_ASSET(2) char spot00_sceneTex_015D98[] = dspot00_sceneTex_015D98; - -#define dspot00_sceneTex_017398 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_017398" -static const ALIGN_ASSET(2) char spot00_sceneTex_017398[] = dspot00_sceneTex_017398; - -#define dspot00_sceneTex_021818 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_021818" -static const ALIGN_ASSET(2) char spot00_sceneTex_021818[] = dspot00_sceneTex_021818; - -#define dspot00_sceneTex_026098 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_026098" -static const ALIGN_ASSET(2) char spot00_sceneTex_026098[] = dspot00_sceneTex_026098; - -#define dspot00_sceneTex_025898 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_025898" -static const ALIGN_ASSET(2) char spot00_sceneTex_025898[] = dspot00_sceneTex_025898; - -#define dspot00_sceneTex_021018 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_021018" -static const ALIGN_ASSET(2) char spot00_sceneTex_021018[] = dspot00_sceneTex_021018; - -#define dspot00_sceneTex_01C998 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01C998" -static const ALIGN_ASSET(2) char spot00_sceneTex_01C998[] = dspot00_sceneTex_01C998; - -#define dspot00_sceneTex_014998 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_014998" -static const ALIGN_ASSET(2) char spot00_sceneTex_014998[] = dspot00_sceneTex_014998; - -#define dspot00_sceneTex_014598 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_014598" +#define dspot00_sceneTex_014598 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_014598" static const ALIGN_ASSET(2) char spot00_sceneTex_014598[] = dspot00_sceneTex_014598; -#define dspot00_sceneTex_020018 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_020018" -static const ALIGN_ASSET(2) char spot00_sceneTex_020018[] = dspot00_sceneTex_020018; +#define dspot00_sceneTex_014998 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_014998" +static const ALIGN_ASSET(2) char spot00_sceneTex_014998[] = dspot00_sceneTex_014998; -#define dspot00_sceneTex_01F818 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01F818" -static const ALIGN_ASSET(2) char spot00_sceneTex_01F818[] = dspot00_sceneTex_01F818; - -#define dspot00_sceneTex_027D98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_027D98" -static const ALIGN_ASSET(2) char spot00_sceneTex_027D98[] = dspot00_sceneTex_027D98; - -#define dspot00_sceneTex_027998 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_027998" -static const ALIGN_ASSET(2) char spot00_sceneTex_027998[] = dspot00_sceneTex_027998; - -#define dspot00_sceneTex_028598 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_028598" -static const ALIGN_ASSET(2) char spot00_sceneTex_028598[] = dspot00_sceneTex_028598; - -#define dspot00_sceneTex_014D98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_014D98" +#define dspot00_sceneTex_014D98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_014D98" static const ALIGN_ASSET(2) char spot00_sceneTex_014D98[] = dspot00_sceneTex_014D98; -#define dspot00_sceneTex_026998 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_026998" +#define dspot00_sceneTex_015D98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_015D98" +static const ALIGN_ASSET(2) char spot00_sceneTex_015D98[] = dspot00_sceneTex_015D98; + +#define dspot00_sceneTex_015E98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_015E98" +static const ALIGN_ASSET(2) char spot00_sceneTex_015E98[] = dspot00_sceneTex_015E98; + +#define dspot00_sceneTex_016698 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_016698" +static const ALIGN_ASSET(2) char spot00_sceneTex_016698[] = dspot00_sceneTex_016698; + +#define dspot00_sceneTex_016A98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_016A98" +static const ALIGN_ASSET(2) char spot00_sceneTex_016A98[] = dspot00_sceneTex_016A98; + +#define dspot00_sceneTex_016B98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_016B98" +static const ALIGN_ASSET(2) char spot00_sceneTex_016B98[] = dspot00_sceneTex_016B98; + +#define dspot00_sceneTex_017398 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_017398" +static const ALIGN_ASSET(2) char spot00_sceneTex_017398[] = dspot00_sceneTex_017398; + +#define dspot00_sceneTex_017B98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_017B98" +static const ALIGN_ASSET(2) char spot00_sceneTex_017B98[] = dspot00_sceneTex_017B98; + +#define dspot00_sceneTex_018B98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_018B98" +static const ALIGN_ASSET(2) char spot00_sceneTex_018B98[] = dspot00_sceneTex_018B98; + +#define dspot00_sceneTex_019398 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_019398" +static const ALIGN_ASSET(2) char spot00_sceneTex_019398[] = dspot00_sceneTex_019398; + +#define dspot00_sceneTex_019B98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_019B98" +static const ALIGN_ASSET(2) char spot00_sceneTex_019B98[] = dspot00_sceneTex_019B98; + +#define dspot00_sceneTex_01AB98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01AB98" +static const ALIGN_ASSET(2) char spot00_sceneTex_01AB98[] = dspot00_sceneTex_01AB98; + +#define dspot00_sceneTex_01B398 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01B398" +static const ALIGN_ASSET(2) char spot00_sceneTex_01B398[] = dspot00_sceneTex_01B398; + +#define dspot00_sceneTex_01BB98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01BB98" +static const ALIGN_ASSET(2) char spot00_sceneTex_01BB98[] = dspot00_sceneTex_01BB98; + +#define dspot00_sceneTex_01BD98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01BD98" +static const ALIGN_ASSET(2) char spot00_sceneTex_01BD98[] = dspot00_sceneTex_01BD98; + +#define dspot00_sceneTex_01C198 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01C198" +static const ALIGN_ASSET(2) char spot00_sceneTex_01C198[] = dspot00_sceneTex_01C198; + +#define dspot00_sceneTex_01C998 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01C998" +static const ALIGN_ASSET(2) char spot00_sceneTex_01C998[] = dspot00_sceneTex_01C998; + +#define dspot00_sceneTex_01D198 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01D198" +static const ALIGN_ASSET(2) char spot00_sceneTex_01D198[] = dspot00_sceneTex_01D198; + +#define dspot00_sceneTex_01D998 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01D998" +static const ALIGN_ASSET(2) char spot00_sceneTex_01D998[] = dspot00_sceneTex_01D998; + +#define dspot00_sceneTex_01E998 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01E998" +static const ALIGN_ASSET(2) char spot00_sceneTex_01E998[] = dspot00_sceneTex_01E998; + +#define dspot00_sceneTex_01F198 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01F198" +static const ALIGN_ASSET(2) char spot00_sceneTex_01F198[] = dspot00_sceneTex_01F198; + +#define dspot00_sceneTex_01F598 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01F598" +static const ALIGN_ASSET(2) char spot00_sceneTex_01F598[] = dspot00_sceneTex_01F598; + +#define dspot00_sceneTex_01F618 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01F618" +static const ALIGN_ASSET(2) char spot00_sceneTex_01F618[] = dspot00_sceneTex_01F618; + +#define dspot00_sceneTex_01F818 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01F818" +static const ALIGN_ASSET(2) char spot00_sceneTex_01F818[] = dspot00_sceneTex_01F818; + +#define dspot00_sceneTex_020018 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_020018" +static const ALIGN_ASSET(2) char spot00_sceneTex_020018[] = dspot00_sceneTex_020018; + +#define dspot00_sceneTex_020818 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_020818" +static const ALIGN_ASSET(2) char spot00_sceneTex_020818[] = dspot00_sceneTex_020818; + +#define dspot00_sceneTex_021018 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_021018" +static const ALIGN_ASSET(2) char spot00_sceneTex_021018[] = dspot00_sceneTex_021018; + +#define dspot00_sceneTex_021818 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_021818" +static const ALIGN_ASSET(2) char spot00_sceneTex_021818[] = dspot00_sceneTex_021818; + +#define dspot00_sceneTex_022018 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_022018" +static const ALIGN_ASSET(2) char spot00_sceneTex_022018[] = dspot00_sceneTex_022018; + +#define dspot00_sceneTex_022818 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_022818" +static const ALIGN_ASSET(2) char spot00_sceneTex_022818[] = dspot00_sceneTex_022818; + +#define dspot00_sceneTex_023018 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_023018" +static const ALIGN_ASSET(2) char spot00_sceneTex_023018[] = dspot00_sceneTex_023018; + +#define dspot00_sceneTex_023818 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_023818" +static const ALIGN_ASSET(2) char spot00_sceneTex_023818[] = dspot00_sceneTex_023818; + +#define dspot00_sceneTex_024018 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_024018" +static const ALIGN_ASSET(2) char spot00_sceneTex_024018[] = dspot00_sceneTex_024018; + +#define dspot00_sceneTex_024818 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_024818" +static const ALIGN_ASSET(2) char spot00_sceneTex_024818[] = dspot00_sceneTex_024818; + +#define dspot00_sceneTex_025018 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_025018" +static const ALIGN_ASSET(2) char spot00_sceneTex_025018[] = dspot00_sceneTex_025018; + +#define dspot00_sceneTex_025818 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_025818" +static const ALIGN_ASSET(2) char spot00_sceneTex_025818[] = dspot00_sceneTex_025818; + +#define dspot00_sceneTex_025898 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_025898" +static const ALIGN_ASSET(2) char spot00_sceneTex_025898[] = dspot00_sceneTex_025898; + +#define dspot00_sceneTex_026098 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_026098" +static const ALIGN_ASSET(2) char spot00_sceneTex_026098[] = dspot00_sceneTex_026098; + +#define dspot00_sceneTex_026898 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_026898" +static const ALIGN_ASSET(2) char spot00_sceneTex_026898[] = dspot00_sceneTex_026898; + +#define dspot00_sceneTex_026998 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_026998" static const ALIGN_ASSET(2) char spot00_sceneTex_026998[] = dspot00_sceneTex_026998; -#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464" +#define dspot00_sceneTex_027998 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_027998" +static const ALIGN_ASSET(2) char spot00_sceneTex_027998[] = dspot00_sceneTex_027998; -#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464" +#define dspot00_sceneTex_027D98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_027D98" +static const ALIGN_ASSET(2) char spot00_sceneTex_027D98[] = dspot00_sceneTex_027D98; -#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464" +#define dspot00_sceneTex_028198 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_028198" +static const ALIGN_ASSET(2) char spot00_sceneTex_028198[] = dspot00_sceneTex_028198; -#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464" +#define dspot00_sceneTex_028598 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_028598" +static const ALIGN_ASSET(2) char spot00_sceneTex_028598[] = dspot00_sceneTex_028598; -#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464" +#define dspot00_sceneTex_029598 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_029598" +static const ALIGN_ASSET(2) char spot00_sceneTex_029598[] = dspot00_sceneTex_029598; -#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464" +#define dspot00_sceneTex_029D98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_029D98" +static const ALIGN_ASSET(2) char spot00_sceneTex_029D98[] = dspot00_sceneTex_029D98; -#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464" +#define dspot00_sceneTex_029F98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_029F98" +static const ALIGN_ASSET(2) char spot00_sceneTex_029F98[] = dspot00_sceneTex_029F98; -#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464" +#define dspot00_sceneTLUT_013D70 "__OTR__scenes/shared/spot00_scene/spot00_sceneTLUT_013D70" +static const ALIGN_ASSET(2) char spot00_sceneTLUT_013D70[] = dspot00_sceneTLUT_013D70; -#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464" +#define dgHyruleFieldGetOoTCs "__OTR__scenes/shared/spot00_scene/gHyruleFieldGetOoTCs" +static const ALIGN_ASSET(2) char gHyruleFieldGetOoTCs[] = dgHyruleFieldGetOoTCs; -#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464" +#define dgHyruleFieldZeldaSongOfTimeCs "__OTR__scenes/shared/spot00_scene/gHyruleFieldZeldaSongOfTimeCs" +static const ALIGN_ASSET(2) char gHyruleFieldZeldaSongOfTimeCs[] = dgHyruleFieldZeldaSongOfTimeCs; -#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464" +#define dgHyruleFieldEastEponaJumpCs "__OTR__scenes/shared/spot00_scene/gHyruleFieldEastEponaJumpCs" +static const ALIGN_ASSET(2) char gHyruleFieldEastEponaJumpCs[] = dgHyruleFieldEastEponaJumpCs; + +#define dgHyruleFieldIntroCs "__OTR__scenes/shared/spot00_scene/gHyruleFieldIntroCs" +static const ALIGN_ASSET(2) char gHyruleFieldIntroCs[] = dgHyruleFieldIntroCs; + +#define dgHyruleFieldSouthEponaJumpCs "__OTR__scenes/shared/spot00_scene/gHyruleFieldSouthEponaJumpCs" +static const ALIGN_ASSET(2) char gHyruleFieldSouthEponaJumpCs[] = dgHyruleFieldSouthEponaJumpCs; + +#define dgHyruleFieldWestEponaJumpCs "__OTR__scenes/shared/spot00_scene/gHyruleFieldWestEponaJumpCs" +static const ALIGN_ASSET(2) char gHyruleFieldWestEponaJumpCs[] = dgHyruleFieldWestEponaJumpCs; + +#define dgHyruleFieldGateEponaJumpCs "__OTR__scenes/shared/spot00_scene/gHyruleFieldGateEponaJumpCs" +static const ALIGN_ASSET(2) char gHyruleFieldGateEponaJumpCs[] = dgHyruleFieldGateEponaJumpCs; + +#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/shared/spot00_scene/spot00_sceneCollisionHeader_008464" +static const ALIGN_ASSET(2) char spot00_sceneCollisionHeader_008464[] = dspot00_sceneCollisionHeader_008464; + +#define dspot00_scene_Tex_02A198 "__OTR__scenes/shared/spot00_scene/spot00_scene_Tex_02A198" +static const ALIGN_ASSET(2) char spot00_scene_Tex_02A198[] = dspot00_scene_Tex_02A198; + +#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/shared/spot00_scene/spot00_sceneCollisionHeader_008464" + +#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/shared/spot00_scene/spot00_sceneCollisionHeader_008464" + +#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/shared/spot00_scene/spot00_sceneCollisionHeader_008464" + +#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/shared/spot00_scene/spot00_sceneCollisionHeader_008464" + +#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/shared/spot00_scene/spot00_sceneCollisionHeader_008464" + +#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/shared/spot00_scene/spot00_sceneCollisionHeader_008464" + +#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/shared/spot00_scene/spot00_sceneCollisionHeader_008464" + +#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/shared/spot00_scene/spot00_sceneCollisionHeader_008464" + +#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/shared/spot00_scene/spot00_sceneCollisionHeader_008464" + +#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/shared/spot00_scene/spot00_sceneCollisionHeader_008464" + +#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/shared/spot00_scene/spot00_sceneCollisionHeader_008464" #endif // OVERWORLD_SPOT00_SCENE_H diff --git a/soh/assets/scenes/overworld/spot01/spot01_room_0.h b/soh/assets/scenes/overworld/spot01/spot01_room_0.h index bc0e45593..c4a1563ec 100644 --- a/soh/assets/scenes/overworld/spot01/spot01_room_0.h +++ b/soh/assets/scenes/overworld/spot01/spot01_room_0.h @@ -3,547 +3,547 @@ #include "align_asset_macro.h" -#define dgSpot01DL_009E38 "__OTR__scenes/nonmq/spot01_scene/gSpot01DL_009E38" +#define dgSpot01DL_009E38 "__OTR__scenes/shared/spot01_scene/gSpot01DL_009E38" static const ALIGN_ASSET(2) char gSpot01DL_009E38[] = dgSpot01DL_009E38; -#define dspot01_room_0DL_005E48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_005E48" +#define dspot01_room_0DL_005E48 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_005E48" static const ALIGN_ASSET(2) char spot01_room_0DL_005E48[] = dspot01_room_0DL_005E48; -#define dspot01_room_0DL_0024E8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_0024E8" +#define dspot01_room_0DL_0024E8 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_0024E8" static const ALIGN_ASSET(2) char spot01_room_0DL_0024E8[] = dspot01_room_0DL_0024E8; -#define dspot01_room_0DL_001F20 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_001F20" +#define dspot01_room_0DL_001F20 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_001F20" static const ALIGN_ASSET(2) char spot01_room_0DL_001F20[] = dspot01_room_0DL_001F20; -#define dspot01_room_0DL_006758 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_006758" +#define dspot01_room_0DL_006758 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_006758" static const ALIGN_ASSET(2) char spot01_room_0DL_006758[] = dspot01_room_0DL_006758; -#define dspot01_room_0DL_006B18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_006B18" +#define dspot01_room_0DL_006B18 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_006B18" static const ALIGN_ASSET(2) char spot01_room_0DL_006B18[] = dspot01_room_0DL_006B18; -#define dspot01_room_0DL_006EC0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_006EC0" +#define dspot01_room_0DL_006EC0 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_006EC0" static const ALIGN_ASSET(2) char spot01_room_0DL_006EC0[] = dspot01_room_0DL_006EC0; -#define dspot01_room_0DL_007418 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_007418" +#define dspot01_room_0DL_007418 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_007418" static const ALIGN_ASSET(2) char spot01_room_0DL_007418[] = dspot01_room_0DL_007418; -#define dspot01_room_0DL_007888 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_007888" +#define dspot01_room_0DL_007888 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_007888" static const ALIGN_ASSET(2) char spot01_room_0DL_007888[] = dspot01_room_0DL_007888; -#define dspot01_room_0DL_007C18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_007C18" +#define dspot01_room_0DL_007C18 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_007C18" static const ALIGN_ASSET(2) char spot01_room_0DL_007C18[] = dspot01_room_0DL_007C18; -#define dspot01_room_0DL_0086F0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_0086F0" +#define dspot01_room_0DL_0086F0 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_0086F0" static const ALIGN_ASSET(2) char spot01_room_0DL_0086F0[] = dspot01_room_0DL_0086F0; -#define dspot01_room_0DL_003B48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_003B48" +#define dspot01_room_0DL_003B48 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_003B48" static const ALIGN_ASSET(2) char spot01_room_0DL_003B48[] = dspot01_room_0DL_003B48; -#define dspot01_room_0DL_009108 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_009108" +#define dspot01_room_0DL_009108 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_009108" static const ALIGN_ASSET(2) char spot01_room_0DL_009108[] = dspot01_room_0DL_009108; -#define dspot01_room_0DL_004DB0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_004DB0" +#define dspot01_room_0DL_004DB0 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_004DB0" static const ALIGN_ASSET(2) char spot01_room_0DL_004DB0[] = dspot01_room_0DL_004DB0; -#define dspot01_room_0DL_004420 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_004420" +#define dspot01_room_0DL_004420 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_004420" static const ALIGN_ASSET(2) char spot01_room_0DL_004420[] = dspot01_room_0DL_004420; -#define dspot01_room_0DL_0048C8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_0048C8" +#define dspot01_room_0DL_0048C8 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_0048C8" static const ALIGN_ASSET(2) char spot01_room_0DL_0048C8[] = dspot01_room_0DL_0048C8; -#define dspot01_room_0DL_005AD0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_005AD0" +#define dspot01_room_0DL_005AD0 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_005AD0" static const ALIGN_ASSET(2) char spot01_room_0DL_005AD0[] = dspot01_room_0DL_005AD0; -#define dspot01_room_0DL_008EC8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_008EC8" +#define dspot01_room_0DL_008EC8 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_008EC8" static const ALIGN_ASSET(2) char spot01_room_0DL_008EC8[] = dspot01_room_0DL_008EC8; -#define dspot01_room_0DL_009A70 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_009A70" +#define dspot01_room_0DL_009A70 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_009A70" static const ALIGN_ASSET(2) char spot01_room_0DL_009A70[] = dspot01_room_0DL_009A70; -#define dspot01_room_0DL_005680 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_005680" +#define dspot01_room_0DL_005680 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_005680" static const ALIGN_ASSET(2) char spot01_room_0DL_005680[] = dspot01_room_0DL_005680; -#define dspot01_room_0DL_0063A0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_0063A0" +#define dspot01_room_0DL_0063A0 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_0063A0" static const ALIGN_ASSET(2) char spot01_room_0DL_0063A0[] = dspot01_room_0DL_0063A0; -#define dspot01_room_0Set_000C40DL_005E48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_005E48" +#define dspot01_room_0Set_000C40DL_005E48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_005E48" static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_005E48[] = dspot01_room_0Set_000C40DL_005E48; -#define dspot01_room_0Set_000C40DL_0024E8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_0024E8" +#define dspot01_room_0Set_000C40DL_0024E8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_0024E8" static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_0024E8[] = dspot01_room_0Set_000C40DL_0024E8; -#define dspot01_room_0Set_000C40DL_001F20 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_001F20" +#define dspot01_room_0Set_000C40DL_001F20 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_001F20" static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_001F20[] = dspot01_room_0Set_000C40DL_001F20; -#define dspot01_room_0Set_000C40DL_006758 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_006758" +#define dspot01_room_0Set_000C40DL_006758 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_006758" static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_006758[] = dspot01_room_0Set_000C40DL_006758; -#define dspot01_room_0Set_000C40DL_006B18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_006B18" +#define dspot01_room_0Set_000C40DL_006B18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_006B18" static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_006B18[] = dspot01_room_0Set_000C40DL_006B18; -#define dspot01_room_0Set_000C40DL_006EC0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_006EC0" +#define dspot01_room_0Set_000C40DL_006EC0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_006EC0" static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_006EC0[] = dspot01_room_0Set_000C40DL_006EC0; -#define dspot01_room_0Set_000C40DL_007418 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_007418" +#define dspot01_room_0Set_000C40DL_007418 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_007418" static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_007418[] = dspot01_room_0Set_000C40DL_007418; -#define dspot01_room_0Set_000C40DL_007888 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_007888" +#define dspot01_room_0Set_000C40DL_007888 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_007888" static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_007888[] = dspot01_room_0Set_000C40DL_007888; -#define dspot01_room_0Set_000C40DL_007C18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_007C18" +#define dspot01_room_0Set_000C40DL_007C18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_007C18" static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_007C18[] = dspot01_room_0Set_000C40DL_007C18; -#define dspot01_room_0Set_000C40DL_0086F0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_0086F0" +#define dspot01_room_0Set_000C40DL_0086F0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_0086F0" static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_0086F0[] = dspot01_room_0Set_000C40DL_0086F0; -#define dspot01_room_0Set_000C40DL_003B48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_003B48" +#define dspot01_room_0Set_000C40DL_003B48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_003B48" static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_003B48[] = dspot01_room_0Set_000C40DL_003B48; -#define dspot01_room_0Set_000C40DL_009108 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_009108" +#define dspot01_room_0Set_000C40DL_009108 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_009108" static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_009108[] = dspot01_room_0Set_000C40DL_009108; -#define dspot01_room_0Set_000C40DL_004DB0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_004DB0" +#define dspot01_room_0Set_000C40DL_004DB0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_004DB0" static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_004DB0[] = dspot01_room_0Set_000C40DL_004DB0; -#define dspot01_room_0Set_000C40DL_004420 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_004420" +#define dspot01_room_0Set_000C40DL_004420 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_004420" static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_004420[] = dspot01_room_0Set_000C40DL_004420; -#define dspot01_room_0Set_000C40DL_0048C8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_0048C8" +#define dspot01_room_0Set_000C40DL_0048C8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_0048C8" static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_0048C8[] = dspot01_room_0Set_000C40DL_0048C8; -#define dspot01_room_0Set_000C40DL_005AD0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_005AD0" +#define dspot01_room_0Set_000C40DL_005AD0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_005AD0" static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_005AD0[] = dspot01_room_0Set_000C40DL_005AD0; -#define dspot01_room_0Set_000C40DL_008EC8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_008EC8" +#define dspot01_room_0Set_000C40DL_008EC8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_008EC8" static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_008EC8[] = dspot01_room_0Set_000C40DL_008EC8; -#define dspot01_room_0Set_000C40DL_009A70 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_009A70" +#define dspot01_room_0Set_000C40DL_009A70 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_009A70" static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_009A70[] = dspot01_room_0Set_000C40DL_009A70; -#define dspot01_room_0Set_000C40DL_005680 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_005680" +#define dspot01_room_0Set_000C40DL_005680 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_005680" static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_005680[] = dspot01_room_0Set_000C40DL_005680; -#define dspot01_room_0Set_000C40DL_0063A0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_0063A0" +#define dspot01_room_0Set_000C40DL_0063A0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_0063A0" static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_0063A0[] = dspot01_room_0Set_000C40DL_0063A0; -#define dspot01_room_0Set_000570DL_005E48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_005E48" +#define dspot01_room_0Set_000570DL_005E48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_005E48" static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_005E48[] = dspot01_room_0Set_000570DL_005E48; -#define dspot01_room_0Set_000570DL_0024E8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_0024E8" +#define dspot01_room_0Set_000570DL_0024E8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_0024E8" static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_0024E8[] = dspot01_room_0Set_000570DL_0024E8; -#define dspot01_room_0Set_000570DL_001F20 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_001F20" +#define dspot01_room_0Set_000570DL_001F20 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_001F20" static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_001F20[] = dspot01_room_0Set_000570DL_001F20; -#define dspot01_room_0Set_000570DL_006758 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_006758" +#define dspot01_room_0Set_000570DL_006758 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_006758" static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_006758[] = dspot01_room_0Set_000570DL_006758; -#define dspot01_room_0Set_000570DL_006B18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_006B18" +#define dspot01_room_0Set_000570DL_006B18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_006B18" static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_006B18[] = dspot01_room_0Set_000570DL_006B18; -#define dspot01_room_0Set_000570DL_006EC0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_006EC0" +#define dspot01_room_0Set_000570DL_006EC0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_006EC0" static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_006EC0[] = dspot01_room_0Set_000570DL_006EC0; -#define dspot01_room_0Set_000570DL_007418 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_007418" +#define dspot01_room_0Set_000570DL_007418 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_007418" static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_007418[] = dspot01_room_0Set_000570DL_007418; -#define dspot01_room_0Set_000570DL_007888 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_007888" +#define dspot01_room_0Set_000570DL_007888 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_007888" static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_007888[] = dspot01_room_0Set_000570DL_007888; -#define dspot01_room_0Set_000570DL_007C18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_007C18" +#define dspot01_room_0Set_000570DL_007C18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_007C18" static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_007C18[] = dspot01_room_0Set_000570DL_007C18; -#define dspot01_room_0Set_000570DL_0086F0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_0086F0" +#define dspot01_room_0Set_000570DL_0086F0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_0086F0" static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_0086F0[] = dspot01_room_0Set_000570DL_0086F0; -#define dspot01_room_0Set_000570DL_003B48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_003B48" +#define dspot01_room_0Set_000570DL_003B48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_003B48" static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_003B48[] = dspot01_room_0Set_000570DL_003B48; -#define dspot01_room_0Set_000570DL_009108 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_009108" +#define dspot01_room_0Set_000570DL_009108 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_009108" static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_009108[] = dspot01_room_0Set_000570DL_009108; -#define dspot01_room_0Set_000570DL_004DB0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_004DB0" +#define dspot01_room_0Set_000570DL_004DB0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_004DB0" static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_004DB0[] = dspot01_room_0Set_000570DL_004DB0; -#define dspot01_room_0Set_000570DL_004420 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_004420" +#define dspot01_room_0Set_000570DL_004420 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_004420" static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_004420[] = dspot01_room_0Set_000570DL_004420; -#define dspot01_room_0Set_000570DL_0048C8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_0048C8" +#define dspot01_room_0Set_000570DL_0048C8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_0048C8" static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_0048C8[] = dspot01_room_0Set_000570DL_0048C8; -#define dspot01_room_0Set_000570DL_005AD0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_005AD0" +#define dspot01_room_0Set_000570DL_005AD0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_005AD0" static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_005AD0[] = dspot01_room_0Set_000570DL_005AD0; -#define dspot01_room_0Set_000570DL_008EC8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_008EC8" +#define dspot01_room_0Set_000570DL_008EC8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_008EC8" static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_008EC8[] = dspot01_room_0Set_000570DL_008EC8; -#define dspot01_room_0Set_000570DL_009A70 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_009A70" +#define dspot01_room_0Set_000570DL_009A70 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_009A70" static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_009A70[] = dspot01_room_0Set_000570DL_009A70; -#define dspot01_room_0Set_000570DL_005680 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_005680" +#define dspot01_room_0Set_000570DL_005680 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_005680" static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_005680[] = dspot01_room_0Set_000570DL_005680; -#define dspot01_room_0Set_000570DL_0063A0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_0063A0" +#define dspot01_room_0Set_000570DL_0063A0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_0063A0" static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_0063A0[] = dspot01_room_0Set_000570DL_0063A0; -#define dspot01_room_0Set_000900DL_005E48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_005E48" +#define dspot01_room_0Set_000900DL_005E48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_005E48" static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_005E48[] = dspot01_room_0Set_000900DL_005E48; -#define dspot01_room_0Set_000900DL_0024E8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_0024E8" +#define dspot01_room_0Set_000900DL_0024E8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_0024E8" static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_0024E8[] = dspot01_room_0Set_000900DL_0024E8; -#define dspot01_room_0Set_000900DL_001F20 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_001F20" +#define dspot01_room_0Set_000900DL_001F20 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_001F20" static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_001F20[] = dspot01_room_0Set_000900DL_001F20; -#define dspot01_room_0Set_000900DL_006758 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_006758" +#define dspot01_room_0Set_000900DL_006758 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_006758" static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_006758[] = dspot01_room_0Set_000900DL_006758; -#define dspot01_room_0Set_000900DL_006B18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_006B18" +#define dspot01_room_0Set_000900DL_006B18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_006B18" static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_006B18[] = dspot01_room_0Set_000900DL_006B18; -#define dspot01_room_0Set_000900DL_006EC0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_006EC0" +#define dspot01_room_0Set_000900DL_006EC0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_006EC0" static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_006EC0[] = dspot01_room_0Set_000900DL_006EC0; -#define dspot01_room_0Set_000900DL_007418 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_007418" +#define dspot01_room_0Set_000900DL_007418 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_007418" static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_007418[] = dspot01_room_0Set_000900DL_007418; -#define dspot01_room_0Set_000900DL_007888 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_007888" +#define dspot01_room_0Set_000900DL_007888 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_007888" static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_007888[] = dspot01_room_0Set_000900DL_007888; -#define dspot01_room_0Set_000900DL_007C18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_007C18" +#define dspot01_room_0Set_000900DL_007C18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_007C18" static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_007C18[] = dspot01_room_0Set_000900DL_007C18; -#define dspot01_room_0Set_000900DL_0086F0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_0086F0" +#define dspot01_room_0Set_000900DL_0086F0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_0086F0" static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_0086F0[] = dspot01_room_0Set_000900DL_0086F0; -#define dspot01_room_0Set_000900DL_003B48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_003B48" +#define dspot01_room_0Set_000900DL_003B48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_003B48" static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_003B48[] = dspot01_room_0Set_000900DL_003B48; -#define dspot01_room_0Set_000900DL_009108 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_009108" +#define dspot01_room_0Set_000900DL_009108 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_009108" static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_009108[] = dspot01_room_0Set_000900DL_009108; -#define dspot01_room_0Set_000900DL_004DB0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_004DB0" +#define dspot01_room_0Set_000900DL_004DB0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_004DB0" static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_004DB0[] = dspot01_room_0Set_000900DL_004DB0; -#define dspot01_room_0Set_000900DL_004420 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_004420" +#define dspot01_room_0Set_000900DL_004420 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_004420" static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_004420[] = dspot01_room_0Set_000900DL_004420; -#define dspot01_room_0Set_000900DL_0048C8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_0048C8" +#define dspot01_room_0Set_000900DL_0048C8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_0048C8" static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_0048C8[] = dspot01_room_0Set_000900DL_0048C8; -#define dspot01_room_0Set_000900DL_005AD0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_005AD0" +#define dspot01_room_0Set_000900DL_005AD0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_005AD0" static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_005AD0[] = dspot01_room_0Set_000900DL_005AD0; -#define dspot01_room_0Set_000900DL_008EC8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_008EC8" +#define dspot01_room_0Set_000900DL_008EC8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_008EC8" static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_008EC8[] = dspot01_room_0Set_000900DL_008EC8; -#define dspot01_room_0Set_000900DL_009A70 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_009A70" +#define dspot01_room_0Set_000900DL_009A70 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_009A70" static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_009A70[] = dspot01_room_0Set_000900DL_009A70; -#define dspot01_room_0Set_000900DL_005680 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_005680" +#define dspot01_room_0Set_000900DL_005680 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_005680" static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_005680[] = dspot01_room_0Set_000900DL_005680; -#define dspot01_room_0Set_000900DL_0063A0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_0063A0" +#define dspot01_room_0Set_000900DL_0063A0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_0063A0" static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_0063A0[] = dspot01_room_0Set_000900DL_0063A0; -#define dspot01_room_0Set_000FC0DL_005E48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_005E48" +#define dspot01_room_0Set_000FC0DL_005E48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_005E48" static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_005E48[] = dspot01_room_0Set_000FC0DL_005E48; -#define dspot01_room_0Set_000FC0DL_0024E8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_0024E8" +#define dspot01_room_0Set_000FC0DL_0024E8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_0024E8" static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_0024E8[] = dspot01_room_0Set_000FC0DL_0024E8; -#define dspot01_room_0Set_000FC0DL_001F20 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_001F20" +#define dspot01_room_0Set_000FC0DL_001F20 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_001F20" static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_001F20[] = dspot01_room_0Set_000FC0DL_001F20; -#define dspot01_room_0Set_000FC0DL_006758 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_006758" +#define dspot01_room_0Set_000FC0DL_006758 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_006758" static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_006758[] = dspot01_room_0Set_000FC0DL_006758; -#define dspot01_room_0Set_000FC0DL_006B18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_006B18" +#define dspot01_room_0Set_000FC0DL_006B18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_006B18" static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_006B18[] = dspot01_room_0Set_000FC0DL_006B18; -#define dspot01_room_0Set_000FC0DL_006EC0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_006EC0" +#define dspot01_room_0Set_000FC0DL_006EC0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_006EC0" static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_006EC0[] = dspot01_room_0Set_000FC0DL_006EC0; -#define dspot01_room_0Set_000FC0DL_007418 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_007418" +#define dspot01_room_0Set_000FC0DL_007418 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_007418" static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_007418[] = dspot01_room_0Set_000FC0DL_007418; -#define dspot01_room_0Set_000FC0DL_007888 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_007888" +#define dspot01_room_0Set_000FC0DL_007888 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_007888" static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_007888[] = dspot01_room_0Set_000FC0DL_007888; -#define dspot01_room_0Set_000FC0DL_007C18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_007C18" +#define dspot01_room_0Set_000FC0DL_007C18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_007C18" static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_007C18[] = dspot01_room_0Set_000FC0DL_007C18; -#define dspot01_room_0Set_000FC0DL_0086F0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_0086F0" +#define dspot01_room_0Set_000FC0DL_0086F0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_0086F0" static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_0086F0[] = dspot01_room_0Set_000FC0DL_0086F0; -#define dspot01_room_0Set_000FC0DL_003B48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_003B48" +#define dspot01_room_0Set_000FC0DL_003B48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_003B48" static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_003B48[] = dspot01_room_0Set_000FC0DL_003B48; -#define dspot01_room_0Set_000FC0DL_009108 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_009108" +#define dspot01_room_0Set_000FC0DL_009108 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_009108" static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_009108[] = dspot01_room_0Set_000FC0DL_009108; -#define dspot01_room_0Set_000FC0DL_004DB0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_004DB0" +#define dspot01_room_0Set_000FC0DL_004DB0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_004DB0" static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_004DB0[] = dspot01_room_0Set_000FC0DL_004DB0; -#define dspot01_room_0Set_000FC0DL_004420 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_004420" +#define dspot01_room_0Set_000FC0DL_004420 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_004420" static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_004420[] = dspot01_room_0Set_000FC0DL_004420; -#define dspot01_room_0Set_000FC0DL_0048C8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_0048C8" +#define dspot01_room_0Set_000FC0DL_0048C8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_0048C8" static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_0048C8[] = dspot01_room_0Set_000FC0DL_0048C8; -#define dspot01_room_0Set_000FC0DL_005AD0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_005AD0" +#define dspot01_room_0Set_000FC0DL_005AD0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_005AD0" static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_005AD0[] = dspot01_room_0Set_000FC0DL_005AD0; -#define dspot01_room_0Set_000FC0DL_008EC8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_008EC8" +#define dspot01_room_0Set_000FC0DL_008EC8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_008EC8" static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_008EC8[] = dspot01_room_0Set_000FC0DL_008EC8; -#define dspot01_room_0Set_000FC0DL_009A70 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_009A70" +#define dspot01_room_0Set_000FC0DL_009A70 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_009A70" static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_009A70[] = dspot01_room_0Set_000FC0DL_009A70; -#define dspot01_room_0Set_000FC0DL_005680 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_005680" +#define dspot01_room_0Set_000FC0DL_005680 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_005680" static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_005680[] = dspot01_room_0Set_000FC0DL_005680; -#define dspot01_room_0Set_000FC0DL_0063A0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_0063A0" +#define dspot01_room_0Set_000FC0DL_0063A0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_0063A0" static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_0063A0[] = dspot01_room_0Set_000FC0DL_0063A0; -#define dspot01_room_0Set_0011F0DL_005E48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_005E48" +#define dspot01_room_0Set_0011F0DL_005E48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_005E48" static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_005E48[] = dspot01_room_0Set_0011F0DL_005E48; -#define dspot01_room_0Set_0011F0DL_0024E8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_0024E8" +#define dspot01_room_0Set_0011F0DL_0024E8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_0024E8" static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_0024E8[] = dspot01_room_0Set_0011F0DL_0024E8; -#define dspot01_room_0Set_0011F0DL_001F20 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_001F20" +#define dspot01_room_0Set_0011F0DL_001F20 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_001F20" static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_001F20[] = dspot01_room_0Set_0011F0DL_001F20; -#define dspot01_room_0Set_0011F0DL_006758 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_006758" +#define dspot01_room_0Set_0011F0DL_006758 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_006758" static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_006758[] = dspot01_room_0Set_0011F0DL_006758; -#define dspot01_room_0Set_0011F0DL_006B18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_006B18" +#define dspot01_room_0Set_0011F0DL_006B18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_006B18" static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_006B18[] = dspot01_room_0Set_0011F0DL_006B18; -#define dspot01_room_0Set_0011F0DL_006EC0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_006EC0" +#define dspot01_room_0Set_0011F0DL_006EC0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_006EC0" static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_006EC0[] = dspot01_room_0Set_0011F0DL_006EC0; -#define dspot01_room_0Set_0011F0DL_007418 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_007418" +#define dspot01_room_0Set_0011F0DL_007418 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_007418" static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_007418[] = dspot01_room_0Set_0011F0DL_007418; -#define dspot01_room_0Set_0011F0DL_007888 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_007888" +#define dspot01_room_0Set_0011F0DL_007888 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_007888" static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_007888[] = dspot01_room_0Set_0011F0DL_007888; -#define dspot01_room_0Set_0011F0DL_007C18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_007C18" +#define dspot01_room_0Set_0011F0DL_007C18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_007C18" static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_007C18[] = dspot01_room_0Set_0011F0DL_007C18; -#define dspot01_room_0Set_0011F0DL_0086F0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_0086F0" +#define dspot01_room_0Set_0011F0DL_0086F0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_0086F0" static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_0086F0[] = dspot01_room_0Set_0011F0DL_0086F0; -#define dspot01_room_0Set_0011F0DL_003B48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_003B48" +#define dspot01_room_0Set_0011F0DL_003B48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_003B48" static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_003B48[] = dspot01_room_0Set_0011F0DL_003B48; -#define dspot01_room_0Set_0011F0DL_009108 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_009108" +#define dspot01_room_0Set_0011F0DL_009108 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_009108" static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_009108[] = dspot01_room_0Set_0011F0DL_009108; -#define dspot01_room_0Set_0011F0DL_004DB0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_004DB0" +#define dspot01_room_0Set_0011F0DL_004DB0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_004DB0" static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_004DB0[] = dspot01_room_0Set_0011F0DL_004DB0; -#define dspot01_room_0Set_0011F0DL_004420 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_004420" +#define dspot01_room_0Set_0011F0DL_004420 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_004420" static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_004420[] = dspot01_room_0Set_0011F0DL_004420; -#define dspot01_room_0Set_0011F0DL_0048C8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_0048C8" +#define dspot01_room_0Set_0011F0DL_0048C8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_0048C8" static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_0048C8[] = dspot01_room_0Set_0011F0DL_0048C8; -#define dspot01_room_0Set_0011F0DL_005AD0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_005AD0" +#define dspot01_room_0Set_0011F0DL_005AD0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_005AD0" static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_005AD0[] = dspot01_room_0Set_0011F0DL_005AD0; -#define dspot01_room_0Set_0011F0DL_008EC8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_008EC8" +#define dspot01_room_0Set_0011F0DL_008EC8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_008EC8" static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_008EC8[] = dspot01_room_0Set_0011F0DL_008EC8; -#define dspot01_room_0Set_0011F0DL_009A70 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_009A70" +#define dspot01_room_0Set_0011F0DL_009A70 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_009A70" static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_009A70[] = dspot01_room_0Set_0011F0DL_009A70; -#define dspot01_room_0Set_0011F0DL_005680 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_005680" +#define dspot01_room_0Set_0011F0DL_005680 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_005680" static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_005680[] = dspot01_room_0Set_0011F0DL_005680; -#define dspot01_room_0Set_0011F0DL_0063A0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_0063A0" +#define dspot01_room_0Set_0011F0DL_0063A0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_0063A0" static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_0063A0[] = dspot01_room_0Set_0011F0DL_0063A0; -#define dspot01_room_0Set_001390DL_005E48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_005E48" +#define dspot01_room_0Set_001390DL_005E48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_005E48" static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_005E48[] = dspot01_room_0Set_001390DL_005E48; -#define dspot01_room_0Set_001390DL_0024E8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_0024E8" +#define dspot01_room_0Set_001390DL_0024E8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_0024E8" static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_0024E8[] = dspot01_room_0Set_001390DL_0024E8; -#define dspot01_room_0Set_001390DL_001F20 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_001F20" +#define dspot01_room_0Set_001390DL_001F20 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_001F20" static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_001F20[] = dspot01_room_0Set_001390DL_001F20; -#define dspot01_room_0Set_001390DL_006758 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_006758" +#define dspot01_room_0Set_001390DL_006758 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_006758" static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_006758[] = dspot01_room_0Set_001390DL_006758; -#define dspot01_room_0Set_001390DL_006B18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_006B18" +#define dspot01_room_0Set_001390DL_006B18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_006B18" static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_006B18[] = dspot01_room_0Set_001390DL_006B18; -#define dspot01_room_0Set_001390DL_006EC0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_006EC0" +#define dspot01_room_0Set_001390DL_006EC0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_006EC0" static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_006EC0[] = dspot01_room_0Set_001390DL_006EC0; -#define dspot01_room_0Set_001390DL_007418 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_007418" +#define dspot01_room_0Set_001390DL_007418 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_007418" static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_007418[] = dspot01_room_0Set_001390DL_007418; -#define dspot01_room_0Set_001390DL_007888 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_007888" +#define dspot01_room_0Set_001390DL_007888 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_007888" static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_007888[] = dspot01_room_0Set_001390DL_007888; -#define dspot01_room_0Set_001390DL_007C18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_007C18" +#define dspot01_room_0Set_001390DL_007C18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_007C18" static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_007C18[] = dspot01_room_0Set_001390DL_007C18; -#define dspot01_room_0Set_001390DL_0086F0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_0086F0" +#define dspot01_room_0Set_001390DL_0086F0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_0086F0" static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_0086F0[] = dspot01_room_0Set_001390DL_0086F0; -#define dspot01_room_0Set_001390DL_003B48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_003B48" +#define dspot01_room_0Set_001390DL_003B48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_003B48" static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_003B48[] = dspot01_room_0Set_001390DL_003B48; -#define dspot01_room_0Set_001390DL_009108 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_009108" +#define dspot01_room_0Set_001390DL_009108 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_009108" static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_009108[] = dspot01_room_0Set_001390DL_009108; -#define dspot01_room_0Set_001390DL_004DB0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_004DB0" +#define dspot01_room_0Set_001390DL_004DB0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_004DB0" static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_004DB0[] = dspot01_room_0Set_001390DL_004DB0; -#define dspot01_room_0Set_001390DL_004420 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_004420" +#define dspot01_room_0Set_001390DL_004420 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_004420" static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_004420[] = dspot01_room_0Set_001390DL_004420; -#define dspot01_room_0Set_001390DL_0048C8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_0048C8" +#define dspot01_room_0Set_001390DL_0048C8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_0048C8" static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_0048C8[] = dspot01_room_0Set_001390DL_0048C8; -#define dspot01_room_0Set_001390DL_005AD0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_005AD0" +#define dspot01_room_0Set_001390DL_005AD0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_005AD0" static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_005AD0[] = dspot01_room_0Set_001390DL_005AD0; -#define dspot01_room_0Set_001390DL_008EC8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_008EC8" +#define dspot01_room_0Set_001390DL_008EC8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_008EC8" static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_008EC8[] = dspot01_room_0Set_001390DL_008EC8; -#define dspot01_room_0Set_001390DL_009A70 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_009A70" +#define dspot01_room_0Set_001390DL_009A70 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_009A70" static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_009A70[] = dspot01_room_0Set_001390DL_009A70; -#define dspot01_room_0Set_001390DL_005680 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_005680" +#define dspot01_room_0Set_001390DL_005680 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_005680" static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_005680[] = dspot01_room_0Set_001390DL_005680; -#define dspot01_room_0Set_001390DL_0063A0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_0063A0" +#define dspot01_room_0Set_001390DL_0063A0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_0063A0" static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_0063A0[] = dspot01_room_0Set_001390DL_0063A0; -#define dspot01_room_0Set_001480DL_005E48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_005E48" +#define dspot01_room_0Set_001480DL_005E48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_005E48" static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_005E48[] = dspot01_room_0Set_001480DL_005E48; -#define dspot01_room_0Set_001480DL_0024E8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_0024E8" +#define dspot01_room_0Set_001480DL_0024E8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_0024E8" static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_0024E8[] = dspot01_room_0Set_001480DL_0024E8; -#define dspot01_room_0Set_001480DL_001F20 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_001F20" +#define dspot01_room_0Set_001480DL_001F20 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_001F20" static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_001F20[] = dspot01_room_0Set_001480DL_001F20; -#define dspot01_room_0Set_001480DL_006758 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_006758" +#define dspot01_room_0Set_001480DL_006758 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_006758" static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_006758[] = dspot01_room_0Set_001480DL_006758; -#define dspot01_room_0Set_001480DL_006B18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_006B18" +#define dspot01_room_0Set_001480DL_006B18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_006B18" static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_006B18[] = dspot01_room_0Set_001480DL_006B18; -#define dspot01_room_0Set_001480DL_006EC0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_006EC0" +#define dspot01_room_0Set_001480DL_006EC0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_006EC0" static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_006EC0[] = dspot01_room_0Set_001480DL_006EC0; -#define dspot01_room_0Set_001480DL_007418 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_007418" +#define dspot01_room_0Set_001480DL_007418 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_007418" static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_007418[] = dspot01_room_0Set_001480DL_007418; -#define dspot01_room_0Set_001480DL_007888 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_007888" +#define dspot01_room_0Set_001480DL_007888 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_007888" static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_007888[] = dspot01_room_0Set_001480DL_007888; -#define dspot01_room_0Set_001480DL_007C18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_007C18" +#define dspot01_room_0Set_001480DL_007C18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_007C18" static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_007C18[] = dspot01_room_0Set_001480DL_007C18; -#define dspot01_room_0Set_001480DL_0086F0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_0086F0" +#define dspot01_room_0Set_001480DL_0086F0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_0086F0" static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_0086F0[] = dspot01_room_0Set_001480DL_0086F0; -#define dspot01_room_0Set_001480DL_003B48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_003B48" +#define dspot01_room_0Set_001480DL_003B48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_003B48" static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_003B48[] = dspot01_room_0Set_001480DL_003B48; -#define dspot01_room_0Set_001480DL_009108 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_009108" +#define dspot01_room_0Set_001480DL_009108 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_009108" static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_009108[] = dspot01_room_0Set_001480DL_009108; -#define dspot01_room_0Set_001480DL_004DB0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_004DB0" +#define dspot01_room_0Set_001480DL_004DB0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_004DB0" static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_004DB0[] = dspot01_room_0Set_001480DL_004DB0; -#define dspot01_room_0Set_001480DL_004420 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_004420" +#define dspot01_room_0Set_001480DL_004420 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_004420" static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_004420[] = dspot01_room_0Set_001480DL_004420; -#define dspot01_room_0Set_001480DL_0048C8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_0048C8" +#define dspot01_room_0Set_001480DL_0048C8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_0048C8" static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_0048C8[] = dspot01_room_0Set_001480DL_0048C8; -#define dspot01_room_0Set_001480DL_005AD0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_005AD0" +#define dspot01_room_0Set_001480DL_005AD0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_005AD0" static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_005AD0[] = dspot01_room_0Set_001480DL_005AD0; -#define dspot01_room_0Set_001480DL_008EC8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_008EC8" +#define dspot01_room_0Set_001480DL_008EC8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_008EC8" static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_008EC8[] = dspot01_room_0Set_001480DL_008EC8; -#define dspot01_room_0Set_001480DL_009A70 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_009A70" +#define dspot01_room_0Set_001480DL_009A70 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_009A70" static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_009A70[] = dspot01_room_0Set_001480DL_009A70; -#define dspot01_room_0Set_001480DL_005680 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_005680" +#define dspot01_room_0Set_001480DL_005680 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_005680" static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_005680[] = dspot01_room_0Set_001480DL_005680; -#define dspot01_room_0Set_001480DL_0063A0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_0063A0" +#define dspot01_room_0Set_001480DL_0063A0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_0063A0" static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_0063A0[] = dspot01_room_0Set_001480DL_0063A0; -#define dspot01_room_0Set_001630DL_005E48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_005E48" +#define dspot01_room_0Set_001630DL_005E48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_005E48" static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_005E48[] = dspot01_room_0Set_001630DL_005E48; -#define dspot01_room_0Set_001630DL_0024E8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_0024E8" +#define dspot01_room_0Set_001630DL_0024E8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_0024E8" static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_0024E8[] = dspot01_room_0Set_001630DL_0024E8; -#define dspot01_room_0Set_001630DL_001F20 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_001F20" +#define dspot01_room_0Set_001630DL_001F20 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_001F20" static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_001F20[] = dspot01_room_0Set_001630DL_001F20; -#define dspot01_room_0Set_001630DL_006758 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_006758" +#define dspot01_room_0Set_001630DL_006758 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_006758" static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_006758[] = dspot01_room_0Set_001630DL_006758; -#define dspot01_room_0Set_001630DL_006B18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_006B18" +#define dspot01_room_0Set_001630DL_006B18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_006B18" static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_006B18[] = dspot01_room_0Set_001630DL_006B18; -#define dspot01_room_0Set_001630DL_006EC0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_006EC0" +#define dspot01_room_0Set_001630DL_006EC0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_006EC0" static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_006EC0[] = dspot01_room_0Set_001630DL_006EC0; -#define dspot01_room_0Set_001630DL_007418 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_007418" +#define dspot01_room_0Set_001630DL_007418 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_007418" static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_007418[] = dspot01_room_0Set_001630DL_007418; -#define dspot01_room_0Set_001630DL_007888 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_007888" +#define dspot01_room_0Set_001630DL_007888 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_007888" static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_007888[] = dspot01_room_0Set_001630DL_007888; -#define dspot01_room_0Set_001630DL_007C18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_007C18" +#define dspot01_room_0Set_001630DL_007C18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_007C18" static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_007C18[] = dspot01_room_0Set_001630DL_007C18; -#define dspot01_room_0Set_001630DL_0086F0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_0086F0" +#define dspot01_room_0Set_001630DL_0086F0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_0086F0" static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_0086F0[] = dspot01_room_0Set_001630DL_0086F0; -#define dspot01_room_0Set_001630DL_003B48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_003B48" +#define dspot01_room_0Set_001630DL_003B48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_003B48" static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_003B48[] = dspot01_room_0Set_001630DL_003B48; -#define dspot01_room_0Set_001630DL_009108 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_009108" +#define dspot01_room_0Set_001630DL_009108 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_009108" static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_009108[] = dspot01_room_0Set_001630DL_009108; -#define dspot01_room_0Set_001630DL_004DB0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_004DB0" +#define dspot01_room_0Set_001630DL_004DB0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_004DB0" static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_004DB0[] = dspot01_room_0Set_001630DL_004DB0; -#define dspot01_room_0Set_001630DL_004420 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_004420" +#define dspot01_room_0Set_001630DL_004420 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_004420" static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_004420[] = dspot01_room_0Set_001630DL_004420; -#define dspot01_room_0Set_001630DL_0048C8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_0048C8" +#define dspot01_room_0Set_001630DL_0048C8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_0048C8" static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_0048C8[] = dspot01_room_0Set_001630DL_0048C8; -#define dspot01_room_0Set_001630DL_005AD0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_005AD0" +#define dspot01_room_0Set_001630DL_005AD0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_005AD0" static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_005AD0[] = dspot01_room_0Set_001630DL_005AD0; -#define dspot01_room_0Set_001630DL_008EC8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_008EC8" +#define dspot01_room_0Set_001630DL_008EC8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_008EC8" static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_008EC8[] = dspot01_room_0Set_001630DL_008EC8; -#define dspot01_room_0Set_001630DL_009A70 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_009A70" +#define dspot01_room_0Set_001630DL_009A70 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_009A70" static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_009A70[] = dspot01_room_0Set_001630DL_009A70; -#define dspot01_room_0Set_001630DL_005680 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_005680" +#define dspot01_room_0Set_001630DL_005680 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_005680" static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_005680[] = dspot01_room_0Set_001630DL_005680; -#define dspot01_room_0Set_001630DL_0063A0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_0063A0" +#define dspot01_room_0Set_001630DL_0063A0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_0063A0" static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_0063A0[] = dspot01_room_0Set_001630DL_0063A0; diff --git a/soh/assets/scenes/overworld/spot01/spot01_scene.h b/soh/assets/scenes/overworld/spot01/spot01_scene.h index cb85b2f94..658387028 100644 --- a/soh/assets/scenes/overworld/spot01/spot01_scene.h +++ b/soh/assets/scenes/overworld/spot01/spot01_scene.h @@ -3,147 +3,147 @@ #include "align_asset_macro.h" -#define dgKakarikoVillageIntroCs "__OTR__scenes/nonmq/spot01_scene/gKakarikoVillageIntroCs" -static const ALIGN_ASSET(2) char gKakarikoVillageIntroCs[] = dgKakarikoVillageIntroCs; - -#define dgKakarikoVillageDayWindowTex "__OTR__scenes/nonmq/spot01_scene/gKakarikoVillageDayWindowTex" -static const ALIGN_ASSET(2) char gKakarikoVillageDayWindowTex[] = dgKakarikoVillageDayWindowTex; - -#define dgKakarikoVillageNightWindowTex "__OTR__scenes/nonmq/spot01_scene/gKakarikoVillageNightWindowTex" -static const ALIGN_ASSET(2) char gKakarikoVillageNightWindowTex[] = dgKakarikoVillageNightWindowTex; - -#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/nonmq/spot01_scene/spot01_sceneCollisionHeader_004A1C" -static const ALIGN_ASSET(2) char spot01_sceneCollisionHeader_004A1C[] = dspot01_sceneCollisionHeader_004A1C; - -#define dspot01_sceneTex_013B50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_013B50" -static const ALIGN_ASSET(2) char spot01_sceneTex_013B50[] = dspot01_sceneTex_013B50; - -#define dspot01_sceneTex_012B50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_012B50" -static const ALIGN_ASSET(2) char spot01_sceneTex_012B50[] = dspot01_sceneTex_012B50; - -#define dspot01_sceneTex_00AA50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00AA50" +#define dspot01_sceneTex_00AA50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00AA50" static const ALIGN_ASSET(2) char spot01_sceneTex_00AA50[] = dspot01_sceneTex_00AA50; -#define dspot01_sceneTex_018B50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_018B50" -static const ALIGN_ASSET(2) char spot01_sceneTex_018B50[] = dspot01_sceneTex_018B50; - -#define dspot01_sceneTex_019350 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_019350" -static const ALIGN_ASSET(2) char spot01_sceneTex_019350[] = dspot01_sceneTex_019350; - -#define dspot01_sceneTex_01B750 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_01B750" -static const ALIGN_ASSET(2) char spot01_sceneTex_01B750[] = dspot01_sceneTex_01B750; - -#define dspot01_sceneTex_017B50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_017B50" -static const ALIGN_ASSET(2) char spot01_sceneTex_017B50[] = dspot01_sceneTex_017B50; - -#define dspot01_sceneTLUT_00A870 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTLUT_00A870" -static const ALIGN_ASSET(2) char spot01_sceneTLUT_00A870[] = dspot01_sceneTLUT_00A870; - -#define dspot01_sceneTex_00E550 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00E550" -static const ALIGN_ASSET(2) char spot01_sceneTex_00E550[] = dspot01_sceneTex_00E550; - -#define dspot01_sceneTex_00CD50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00CD50" -static const ALIGN_ASSET(2) char spot01_sceneTex_00CD50[] = dspot01_sceneTex_00CD50; - -#define dspot01_sceneTex_012950 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_012950" -static const ALIGN_ASSET(2) char spot01_sceneTex_012950[] = dspot01_sceneTex_012950; - -#define dspot01_sceneTex_01BF50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_01BF50" -static const ALIGN_ASSET(2) char spot01_sceneTex_01BF50[] = dspot01_sceneTex_01BF50; - -#define dspot01_sceneTex_00BF50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00BF50" -static const ALIGN_ASSET(2) char spot01_sceneTex_00BF50[] = dspot01_sceneTex_00BF50; - -#define dspot01_sceneTex_00C950 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00C950" -static const ALIGN_ASSET(2) char spot01_sceneTex_00C950[] = dspot01_sceneTex_00C950; - -#define dspot01_sceneTex_014F50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_014F50" -static const ALIGN_ASSET(2) char spot01_sceneTex_014F50[] = dspot01_sceneTex_014F50; - -#define dspot01_sceneTex_014B50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_014B50" -static const ALIGN_ASSET(2) char spot01_sceneTex_014B50[] = dspot01_sceneTex_014B50; - -#define dspot01_sceneTex_00B750 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00B750" -static const ALIGN_ASSET(2) char spot01_sceneTex_00B750[] = dspot01_sceneTex_00B750; - -#define dspot01_sceneTex_019B50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_019B50" -static const ALIGN_ASSET(2) char spot01_sceneTex_019B50[] = dspot01_sceneTex_019B50; - -#define dspot01_sceneTex_00C750 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00C750" -static const ALIGN_ASSET(2) char spot01_sceneTex_00C750[] = dspot01_sceneTex_00C750; - -#define dspot01_sceneTex_014750 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_014750" -static const ALIGN_ASSET(2) char spot01_sceneTex_014750[] = dspot01_sceneTex_014750; - -#define dspot01_sceneTex_014350 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_014350" -static const ALIGN_ASSET(2) char spot01_sceneTex_014350[] = dspot01_sceneTex_014350; - -#define dspot01_sceneTex_015350 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_015350" -static const ALIGN_ASSET(2) char spot01_sceneTex_015350[] = dspot01_sceneTex_015350; - -#define dspot01_sceneTex_01AF50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_01AF50" -static const ALIGN_ASSET(2) char spot01_sceneTex_01AF50[] = dspot01_sceneTex_01AF50; - -#define dspot01_sceneTex_00ED50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00ED50" -static const ALIGN_ASSET(2) char spot01_sceneTex_00ED50[] = dspot01_sceneTex_00ED50; - -#define dspot01_sceneTLUT_00AA28 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTLUT_00AA28" -static const ALIGN_ASSET(2) char spot01_sceneTLUT_00AA28[] = dspot01_sceneTLUT_00AA28; - -#define dspot01_sceneTex_00D550 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00D550" -static const ALIGN_ASSET(2) char spot01_sceneTex_00D550[] = dspot01_sceneTex_00D550; - -#define dspot01_sceneTex_00DD50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00DD50" -static const ALIGN_ASSET(2) char spot01_sceneTex_00DD50[] = dspot01_sceneTex_00DD50; - -#define dspot01_sceneTex_011950 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_011950" -static const ALIGN_ASSET(2) char spot01_sceneTex_011950[] = dspot01_sceneTex_011950; - -#define dspot01_sceneTex_01A750 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_01A750" -static const ALIGN_ASSET(2) char spot01_sceneTex_01A750[] = dspot01_sceneTex_01A750; - -#define dspot01_sceneTex_019F50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_019F50" -static const ALIGN_ASSET(2) char spot01_sceneTex_019F50[] = dspot01_sceneTex_019F50; - -#define dspot01_sceneTex_018350 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_018350" -static const ALIGN_ASSET(2) char spot01_sceneTex_018350[] = dspot01_sceneTex_018350; - -#define dspot01_sceneTex_00BB50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00BB50" -static const ALIGN_ASSET(2) char spot01_sceneTex_00BB50[] = dspot01_sceneTex_00BB50; - -#define dspot01_sceneTex_010950 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_010950" -static const ALIGN_ASSET(2) char spot01_sceneTex_010950[] = dspot01_sceneTex_010950; - -#define dspot01_sceneTex_010150 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_010150" -static const ALIGN_ASSET(2) char spot01_sceneTex_010150[] = dspot01_sceneTex_010150; - -#define dspot01_sceneTex_00F950 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00F950" -static const ALIGN_ASSET(2) char spot01_sceneTex_00F950[] = dspot01_sceneTex_00F950; - -#define dspot01_sceneTex_00F550 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00F550" -static const ALIGN_ASSET(2) char spot01_sceneTex_00F550[] = dspot01_sceneTex_00F550; - -#define dspot01_sceneTex_00B350 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00B350" -static const ALIGN_ASSET(2) char spot01_sceneTex_00B350[] = dspot01_sceneTex_00B350; - -#define dspot01_sceneTex_00B250 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00B250" +#define dspot01_sceneTex_00B250 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00B250" static const ALIGN_ASSET(2) char spot01_sceneTex_00B250[] = dspot01_sceneTex_00B250; -#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/nonmq/spot01_scene/spot01_sceneCollisionHeader_004A1C" +#define dspot01_sceneTex_00B350 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00B350" +static const ALIGN_ASSET(2) char spot01_sceneTex_00B350[] = dspot01_sceneTex_00B350; -#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/nonmq/spot01_scene/spot01_sceneCollisionHeader_004A1C" +#define dspot01_sceneTex_00B750 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00B750" +static const ALIGN_ASSET(2) char spot01_sceneTex_00B750[] = dspot01_sceneTex_00B750; -#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/nonmq/spot01_scene/spot01_sceneCollisionHeader_004A1C" +#define dspot01_sceneTex_00BB50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00BB50" +static const ALIGN_ASSET(2) char spot01_sceneTex_00BB50[] = dspot01_sceneTex_00BB50; -#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/nonmq/spot01_scene/spot01_sceneCollisionHeader_004A1C" +#define dspot01_sceneTex_00BF50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00BF50" +static const ALIGN_ASSET(2) char spot01_sceneTex_00BF50[] = dspot01_sceneTex_00BF50; -#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/nonmq/spot01_scene/spot01_sceneCollisionHeader_004A1C" +#define dspot01_sceneTex_00C750 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00C750" +static const ALIGN_ASSET(2) char spot01_sceneTex_00C750[] = dspot01_sceneTex_00C750; -#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/nonmq/spot01_scene/spot01_sceneCollisionHeader_004A1C" +#define dspot01_sceneTex_00C950 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00C950" +static const ALIGN_ASSET(2) char spot01_sceneTex_00C950[] = dspot01_sceneTex_00C950; -#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/nonmq/spot01_scene/spot01_sceneCollisionHeader_004A1C" +#define dspot01_sceneTex_00CD50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00CD50" +static const ALIGN_ASSET(2) char spot01_sceneTex_00CD50[] = dspot01_sceneTex_00CD50; -#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/nonmq/spot01_scene/spot01_sceneCollisionHeader_004A1C" +#define dspot01_sceneTex_00D550 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00D550" +static const ALIGN_ASSET(2) char spot01_sceneTex_00D550[] = dspot01_sceneTex_00D550; + +#define dspot01_sceneTex_00DD50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00DD50" +static const ALIGN_ASSET(2) char spot01_sceneTex_00DD50[] = dspot01_sceneTex_00DD50; + +#define dspot01_sceneTex_00E550 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00E550" +static const ALIGN_ASSET(2) char spot01_sceneTex_00E550[] = dspot01_sceneTex_00E550; + +#define dspot01_sceneTex_00ED50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00ED50" +static const ALIGN_ASSET(2) char spot01_sceneTex_00ED50[] = dspot01_sceneTex_00ED50; + +#define dspot01_sceneTex_00F550 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00F550" +static const ALIGN_ASSET(2) char spot01_sceneTex_00F550[] = dspot01_sceneTex_00F550; + +#define dspot01_sceneTex_00F950 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00F950" +static const ALIGN_ASSET(2) char spot01_sceneTex_00F950[] = dspot01_sceneTex_00F950; + +#define dspot01_sceneTex_010150 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_010150" +static const ALIGN_ASSET(2) char spot01_sceneTex_010150[] = dspot01_sceneTex_010150; + +#define dspot01_sceneTex_010950 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_010950" +static const ALIGN_ASSET(2) char spot01_sceneTex_010950[] = dspot01_sceneTex_010950; + +#define dspot01_sceneTex_011950 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_011950" +static const ALIGN_ASSET(2) char spot01_sceneTex_011950[] = dspot01_sceneTex_011950; + +#define dspot01_sceneTex_012950 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_012950" +static const ALIGN_ASSET(2) char spot01_sceneTex_012950[] = dspot01_sceneTex_012950; + +#define dspot01_sceneTex_012B50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_012B50" +static const ALIGN_ASSET(2) char spot01_sceneTex_012B50[] = dspot01_sceneTex_012B50; + +#define dspot01_sceneTex_013B50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_013B50" +static const ALIGN_ASSET(2) char spot01_sceneTex_013B50[] = dspot01_sceneTex_013B50; + +#define dspot01_sceneTex_014350 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_014350" +static const ALIGN_ASSET(2) char spot01_sceneTex_014350[] = dspot01_sceneTex_014350; + +#define dspot01_sceneTex_014750 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_014750" +static const ALIGN_ASSET(2) char spot01_sceneTex_014750[] = dspot01_sceneTex_014750; + +#define dspot01_sceneTex_014B50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_014B50" +static const ALIGN_ASSET(2) char spot01_sceneTex_014B50[] = dspot01_sceneTex_014B50; + +#define dspot01_sceneTex_014F50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_014F50" +static const ALIGN_ASSET(2) char spot01_sceneTex_014F50[] = dspot01_sceneTex_014F50; + +#define dspot01_sceneTex_015350 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_015350" +static const ALIGN_ASSET(2) char spot01_sceneTex_015350[] = dspot01_sceneTex_015350; + +#define dspot01_sceneTex_017B50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_017B50" +static const ALIGN_ASSET(2) char spot01_sceneTex_017B50[] = dspot01_sceneTex_017B50; + +#define dspot01_sceneTex_018350 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_018350" +static const ALIGN_ASSET(2) char spot01_sceneTex_018350[] = dspot01_sceneTex_018350; + +#define dspot01_sceneTex_018B50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_018B50" +static const ALIGN_ASSET(2) char spot01_sceneTex_018B50[] = dspot01_sceneTex_018B50; + +#define dspot01_sceneTex_019350 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_019350" +static const ALIGN_ASSET(2) char spot01_sceneTex_019350[] = dspot01_sceneTex_019350; + +#define dspot01_sceneTex_019B50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_019B50" +static const ALIGN_ASSET(2) char spot01_sceneTex_019B50[] = dspot01_sceneTex_019B50; + +#define dspot01_sceneTex_019F50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_019F50" +static const ALIGN_ASSET(2) char spot01_sceneTex_019F50[] = dspot01_sceneTex_019F50; + +#define dspot01_sceneTex_01A750 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_01A750" +static const ALIGN_ASSET(2) char spot01_sceneTex_01A750[] = dspot01_sceneTex_01A750; + +#define dspot01_sceneTex_01AF50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_01AF50" +static const ALIGN_ASSET(2) char spot01_sceneTex_01AF50[] = dspot01_sceneTex_01AF50; + +#define dspot01_sceneTex_01B750 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_01B750" +static const ALIGN_ASSET(2) char spot01_sceneTex_01B750[] = dspot01_sceneTex_01B750; + +#define dspot01_sceneTex_01BF50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_01BF50" +static const ALIGN_ASSET(2) char spot01_sceneTex_01BF50[] = dspot01_sceneTex_01BF50; + +#define dspot01_sceneTLUT_00A870 "__OTR__scenes/shared/spot01_scene/spot01_sceneTLUT_00A870" +static const ALIGN_ASSET(2) char spot01_sceneTLUT_00A870[] = dspot01_sceneTLUT_00A870; + +#define dspot01_sceneTLUT_00AA28 "__OTR__scenes/shared/spot01_scene/spot01_sceneTLUT_00AA28" +static const ALIGN_ASSET(2) char spot01_sceneTLUT_00AA28[] = dspot01_sceneTLUT_00AA28; + +#define dgKakarikoVillageIntroCs "__OTR__scenes/shared/spot01_scene/gKakarikoVillageIntroCs" +static const ALIGN_ASSET(2) char gKakarikoVillageIntroCs[] = dgKakarikoVillageIntroCs; + +#define dgKakarikoVillageDayWindowTex "__OTR__scenes/shared/spot01_scene/gKakarikoVillageDayWindowTex" +static const ALIGN_ASSET(2) char gKakarikoVillageDayWindowTex[] = dgKakarikoVillageDayWindowTex; + +#define dgKakarikoVillageNightWindowTex "__OTR__scenes/shared/spot01_scene/gKakarikoVillageNightWindowTex" +static const ALIGN_ASSET(2) char gKakarikoVillageNightWindowTex[] = dgKakarikoVillageNightWindowTex; + +#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/shared/spot01_scene/spot01_sceneCollisionHeader_004A1C" +static const ALIGN_ASSET(2) char spot01_sceneCollisionHeader_004A1C[] = dspot01_sceneCollisionHeader_004A1C; + +#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/shared/spot01_scene/spot01_sceneCollisionHeader_004A1C" + +#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/shared/spot01_scene/spot01_sceneCollisionHeader_004A1C" + +#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/shared/spot01_scene/spot01_sceneCollisionHeader_004A1C" + +#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/shared/spot01_scene/spot01_sceneCollisionHeader_004A1C" + +#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/shared/spot01_scene/spot01_sceneCollisionHeader_004A1C" + +#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/shared/spot01_scene/spot01_sceneCollisionHeader_004A1C" + +#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/shared/spot01_scene/spot01_sceneCollisionHeader_004A1C" + +#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/shared/spot01_scene/spot01_sceneCollisionHeader_004A1C" #endif // OVERWORLD_SPOT01_SCENE_H diff --git a/soh/assets/scenes/overworld/spot02/spot02_room_0.h b/soh/assets/scenes/overworld/spot02/spot02_room_0.h index 138c85057..9cfc90a0b 100644 --- a/soh/assets/scenes/overworld/spot02/spot02_room_0.h +++ b/soh/assets/scenes/overworld/spot02/spot02_room_0.h @@ -3,169 +3,169 @@ #include "align_asset_macro.h" -#define dgSpot02DL_0026D0 "__OTR__scenes/nonmq/spot02_scene/gSpot02DL_0026D0" +#define dgSpot02DL_0026D0 "__OTR__scenes/shared/spot02_scene/gSpot02DL_0026D0" static const ALIGN_ASSET(2) char gSpot02DL_0026D0[] = dgSpot02DL_0026D0; -#define dspot02_room_0DL_0025E0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0DL_0025E0" +#define dspot02_room_0DL_0025E0 "__OTR__scenes/shared/spot02_scene/spot02_room_0DL_0025E0" static const ALIGN_ASSET(2) char spot02_room_0DL_0025E0[] = dspot02_room_0DL_0025E0; -#define dspot02_room_0DL_001AB0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0DL_001AB0" +#define dspot02_room_0DL_001AB0 "__OTR__scenes/shared/spot02_scene/spot02_room_0DL_001AB0" static const ALIGN_ASSET(2) char spot02_room_0DL_001AB0[] = dspot02_room_0DL_001AB0; -#define dspot02_room_0DL_001D18 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0DL_001D18" +#define dspot02_room_0DL_001D18 "__OTR__scenes/shared/spot02_scene/spot02_room_0DL_001D18" static const ALIGN_ASSET(2) char spot02_room_0DL_001D18[] = dspot02_room_0DL_001D18; -#define dspot02_room_0DL_001480 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0DL_001480" +#define dspot02_room_0DL_001480 "__OTR__scenes/shared/spot02_scene/spot02_room_0DL_001480" static const ALIGN_ASSET(2) char spot02_room_0DL_001480[] = dspot02_room_0DL_001480; -#define dspot02_room_0DL_000D70 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0DL_000D70" +#define dspot02_room_0DL_000D70 "__OTR__scenes/shared/spot02_scene/spot02_room_0DL_000D70" static const ALIGN_ASSET(2) char spot02_room_0DL_000D70[] = dspot02_room_0DL_000D70; -#define dspot02_room_0DL_002230 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0DL_002230" +#define dspot02_room_0DL_002230 "__OTR__scenes/shared/spot02_scene/spot02_room_0DL_002230" static const ALIGN_ASSET(2) char spot02_room_0DL_002230[] = dspot02_room_0DL_002230; -#define dspot02_room_0DL_002030 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0DL_002030" +#define dspot02_room_0DL_002030 "__OTR__scenes/shared/spot02_scene/spot02_room_0DL_002030" static const ALIGN_ASSET(2) char spot02_room_0DL_002030[] = dspot02_room_0DL_002030; -#define dspot02_room_0DL_000AB0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0DL_000AB0" +#define dspot02_room_0DL_000AB0 "__OTR__scenes/shared/spot02_scene/spot02_room_0DL_000AB0" static const ALIGN_ASSET(2) char spot02_room_0DL_000AB0[] = dspot02_room_0DL_000AB0; -#define dspot02_room_0DL_001170 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0DL_001170" +#define dspot02_room_0DL_001170 "__OTR__scenes/shared/spot02_scene/spot02_room_0DL_001170" static const ALIGN_ASSET(2) char spot02_room_0DL_001170[] = dspot02_room_0DL_001170; -#define dspot02_room_0Set_000650DL_0025E0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000650DL_0025E0" +#define dspot02_room_0Set_000650DL_0025E0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000650DL_0025E0" static const ALIGN_ASSET(2) char spot02_room_0Set_000650DL_0025E0[] = dspot02_room_0Set_000650DL_0025E0; -#define dspot02_room_0Set_000650DL_001AB0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000650DL_001AB0" +#define dspot02_room_0Set_000650DL_001AB0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000650DL_001AB0" static const ALIGN_ASSET(2) char spot02_room_0Set_000650DL_001AB0[] = dspot02_room_0Set_000650DL_001AB0; -#define dspot02_room_0Set_000650DL_001D18 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000650DL_001D18" +#define dspot02_room_0Set_000650DL_001D18 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000650DL_001D18" static const ALIGN_ASSET(2) char spot02_room_0Set_000650DL_001D18[] = dspot02_room_0Set_000650DL_001D18; -#define dspot02_room_0Set_000650DL_001480 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000650DL_001480" +#define dspot02_room_0Set_000650DL_001480 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000650DL_001480" static const ALIGN_ASSET(2) char spot02_room_0Set_000650DL_001480[] = dspot02_room_0Set_000650DL_001480; -#define dspot02_room_0Set_000650DL_000D70 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000650DL_000D70" +#define dspot02_room_0Set_000650DL_000D70 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000650DL_000D70" static const ALIGN_ASSET(2) char spot02_room_0Set_000650DL_000D70[] = dspot02_room_0Set_000650DL_000D70; -#define dspot02_room_0Set_000650DL_002230 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000650DL_002230" +#define dspot02_room_0Set_000650DL_002230 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000650DL_002230" static const ALIGN_ASSET(2) char spot02_room_0Set_000650DL_002230[] = dspot02_room_0Set_000650DL_002230; -#define dspot02_room_0Set_000650DL_002030 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000650DL_002030" +#define dspot02_room_0Set_000650DL_002030 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000650DL_002030" static const ALIGN_ASSET(2) char spot02_room_0Set_000650DL_002030[] = dspot02_room_0Set_000650DL_002030; -#define dspot02_room_0Set_000650DL_000AB0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000650DL_000AB0" +#define dspot02_room_0Set_000650DL_000AB0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000650DL_000AB0" static const ALIGN_ASSET(2) char spot02_room_0Set_000650DL_000AB0[] = dspot02_room_0Set_000650DL_000AB0; -#define dspot02_room_0Set_000650DL_001170 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000650DL_001170" +#define dspot02_room_0Set_000650DL_001170 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000650DL_001170" static const ALIGN_ASSET(2) char spot02_room_0Set_000650DL_001170[] = dspot02_room_0Set_000650DL_001170; -#define dspot02_room_0Set_000290DL_0025E0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000290DL_0025E0" +#define dspot02_room_0Set_000290DL_0025E0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000290DL_0025E0" static const ALIGN_ASSET(2) char spot02_room_0Set_000290DL_0025E0[] = dspot02_room_0Set_000290DL_0025E0; -#define dspot02_room_0Set_000290DL_001AB0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000290DL_001AB0" +#define dspot02_room_0Set_000290DL_001AB0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000290DL_001AB0" static const ALIGN_ASSET(2) char spot02_room_0Set_000290DL_001AB0[] = dspot02_room_0Set_000290DL_001AB0; -#define dspot02_room_0Set_000290DL_001D18 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000290DL_001D18" +#define dspot02_room_0Set_000290DL_001D18 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000290DL_001D18" static const ALIGN_ASSET(2) char spot02_room_0Set_000290DL_001D18[] = dspot02_room_0Set_000290DL_001D18; -#define dspot02_room_0Set_000290DL_001480 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000290DL_001480" +#define dspot02_room_0Set_000290DL_001480 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000290DL_001480" static const ALIGN_ASSET(2) char spot02_room_0Set_000290DL_001480[] = dspot02_room_0Set_000290DL_001480; -#define dspot02_room_0Set_000290DL_000D70 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000290DL_000D70" +#define dspot02_room_0Set_000290DL_000D70 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000290DL_000D70" static const ALIGN_ASSET(2) char spot02_room_0Set_000290DL_000D70[] = dspot02_room_0Set_000290DL_000D70; -#define dspot02_room_0Set_000290DL_002230 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000290DL_002230" +#define dspot02_room_0Set_000290DL_002230 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000290DL_002230" static const ALIGN_ASSET(2) char spot02_room_0Set_000290DL_002230[] = dspot02_room_0Set_000290DL_002230; -#define dspot02_room_0Set_000290DL_002030 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000290DL_002030" +#define dspot02_room_0Set_000290DL_002030 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000290DL_002030" static const ALIGN_ASSET(2) char spot02_room_0Set_000290DL_002030[] = dspot02_room_0Set_000290DL_002030; -#define dspot02_room_0Set_000290DL_000AB0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000290DL_000AB0" +#define dspot02_room_0Set_000290DL_000AB0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000290DL_000AB0" static const ALIGN_ASSET(2) char spot02_room_0Set_000290DL_000AB0[] = dspot02_room_0Set_000290DL_000AB0; -#define dspot02_room_0Set_000290DL_001170 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000290DL_001170" +#define dspot02_room_0Set_000290DL_001170 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000290DL_001170" static const ALIGN_ASSET(2) char spot02_room_0Set_000290DL_001170[] = dspot02_room_0Set_000290DL_001170; -#define dspot02_room_0Set_000470DL_0025E0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000470DL_0025E0" +#define dspot02_room_0Set_000470DL_0025E0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000470DL_0025E0" static const ALIGN_ASSET(2) char spot02_room_0Set_000470DL_0025E0[] = dspot02_room_0Set_000470DL_0025E0; -#define dspot02_room_0Set_000470DL_001AB0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000470DL_001AB0" +#define dspot02_room_0Set_000470DL_001AB0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000470DL_001AB0" static const ALIGN_ASSET(2) char spot02_room_0Set_000470DL_001AB0[] = dspot02_room_0Set_000470DL_001AB0; -#define dspot02_room_0Set_000470DL_001D18 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000470DL_001D18" +#define dspot02_room_0Set_000470DL_001D18 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000470DL_001D18" static const ALIGN_ASSET(2) char spot02_room_0Set_000470DL_001D18[] = dspot02_room_0Set_000470DL_001D18; -#define dspot02_room_0Set_000470DL_001480 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000470DL_001480" +#define dspot02_room_0Set_000470DL_001480 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000470DL_001480" static const ALIGN_ASSET(2) char spot02_room_0Set_000470DL_001480[] = dspot02_room_0Set_000470DL_001480; -#define dspot02_room_0Set_000470DL_000D70 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000470DL_000D70" +#define dspot02_room_0Set_000470DL_000D70 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000470DL_000D70" static const ALIGN_ASSET(2) char spot02_room_0Set_000470DL_000D70[] = dspot02_room_0Set_000470DL_000D70; -#define dspot02_room_0Set_000470DL_002230 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000470DL_002230" +#define dspot02_room_0Set_000470DL_002230 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000470DL_002230" static const ALIGN_ASSET(2) char spot02_room_0Set_000470DL_002230[] = dspot02_room_0Set_000470DL_002230; -#define dspot02_room_0Set_000470DL_002030 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000470DL_002030" +#define dspot02_room_0Set_000470DL_002030 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000470DL_002030" static const ALIGN_ASSET(2) char spot02_room_0Set_000470DL_002030[] = dspot02_room_0Set_000470DL_002030; -#define dspot02_room_0Set_000470DL_000AB0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000470DL_000AB0" +#define dspot02_room_0Set_000470DL_000AB0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000470DL_000AB0" static const ALIGN_ASSET(2) char spot02_room_0Set_000470DL_000AB0[] = dspot02_room_0Set_000470DL_000AB0; -#define dspot02_room_0Set_000470DL_001170 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000470DL_001170" +#define dspot02_room_0Set_000470DL_001170 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000470DL_001170" static const ALIGN_ASSET(2) char spot02_room_0Set_000470DL_001170[] = dspot02_room_0Set_000470DL_001170; -#define dspot02_room_0Set_000830DL_0025E0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000830DL_0025E0" +#define dspot02_room_0Set_000830DL_0025E0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000830DL_0025E0" static const ALIGN_ASSET(2) char spot02_room_0Set_000830DL_0025E0[] = dspot02_room_0Set_000830DL_0025E0; -#define dspot02_room_0Set_000830DL_001AB0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000830DL_001AB0" +#define dspot02_room_0Set_000830DL_001AB0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000830DL_001AB0" static const ALIGN_ASSET(2) char spot02_room_0Set_000830DL_001AB0[] = dspot02_room_0Set_000830DL_001AB0; -#define dspot02_room_0Set_000830DL_001D18 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000830DL_001D18" +#define dspot02_room_0Set_000830DL_001D18 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000830DL_001D18" static const ALIGN_ASSET(2) char spot02_room_0Set_000830DL_001D18[] = dspot02_room_0Set_000830DL_001D18; -#define dspot02_room_0Set_000830DL_001480 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000830DL_001480" +#define dspot02_room_0Set_000830DL_001480 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000830DL_001480" static const ALIGN_ASSET(2) char spot02_room_0Set_000830DL_001480[] = dspot02_room_0Set_000830DL_001480; -#define dspot02_room_0Set_000830DL_000D70 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000830DL_000D70" +#define dspot02_room_0Set_000830DL_000D70 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000830DL_000D70" static const ALIGN_ASSET(2) char spot02_room_0Set_000830DL_000D70[] = dspot02_room_0Set_000830DL_000D70; -#define dspot02_room_0Set_000830DL_002230 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000830DL_002230" +#define dspot02_room_0Set_000830DL_002230 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000830DL_002230" static const ALIGN_ASSET(2) char spot02_room_0Set_000830DL_002230[] = dspot02_room_0Set_000830DL_002230; -#define dspot02_room_0Set_000830DL_002030 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000830DL_002030" +#define dspot02_room_0Set_000830DL_002030 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000830DL_002030" static const ALIGN_ASSET(2) char spot02_room_0Set_000830DL_002030[] = dspot02_room_0Set_000830DL_002030; -#define dspot02_room_0Set_000830DL_000AB0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000830DL_000AB0" +#define dspot02_room_0Set_000830DL_000AB0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000830DL_000AB0" static const ALIGN_ASSET(2) char spot02_room_0Set_000830DL_000AB0[] = dspot02_room_0Set_000830DL_000AB0; -#define dspot02_room_0Set_000830DL_001170 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000830DL_001170" +#define dspot02_room_0Set_000830DL_001170 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000830DL_001170" static const ALIGN_ASSET(2) char spot02_room_0Set_000830DL_001170[] = dspot02_room_0Set_000830DL_001170; -#define dspot02_room_0Set_000900DL_0025E0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000900DL_0025E0" +#define dspot02_room_0Set_000900DL_0025E0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000900DL_0025E0" static const ALIGN_ASSET(2) char spot02_room_0Set_000900DL_0025E0[] = dspot02_room_0Set_000900DL_0025E0; -#define dspot02_room_0Set_000900DL_001AB0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000900DL_001AB0" +#define dspot02_room_0Set_000900DL_001AB0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000900DL_001AB0" static const ALIGN_ASSET(2) char spot02_room_0Set_000900DL_001AB0[] = dspot02_room_0Set_000900DL_001AB0; -#define dspot02_room_0Set_000900DL_001D18 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000900DL_001D18" +#define dspot02_room_0Set_000900DL_001D18 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000900DL_001D18" static const ALIGN_ASSET(2) char spot02_room_0Set_000900DL_001D18[] = dspot02_room_0Set_000900DL_001D18; -#define dspot02_room_0Set_000900DL_001480 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000900DL_001480" +#define dspot02_room_0Set_000900DL_001480 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000900DL_001480" static const ALIGN_ASSET(2) char spot02_room_0Set_000900DL_001480[] = dspot02_room_0Set_000900DL_001480; -#define dspot02_room_0Set_000900DL_000D70 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000900DL_000D70" +#define dspot02_room_0Set_000900DL_000D70 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000900DL_000D70" static const ALIGN_ASSET(2) char spot02_room_0Set_000900DL_000D70[] = dspot02_room_0Set_000900DL_000D70; -#define dspot02_room_0Set_000900DL_002230 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000900DL_002230" +#define dspot02_room_0Set_000900DL_002230 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000900DL_002230" static const ALIGN_ASSET(2) char spot02_room_0Set_000900DL_002230[] = dspot02_room_0Set_000900DL_002230; -#define dspot02_room_0Set_000900DL_002030 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000900DL_002030" +#define dspot02_room_0Set_000900DL_002030 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000900DL_002030" static const ALIGN_ASSET(2) char spot02_room_0Set_000900DL_002030[] = dspot02_room_0Set_000900DL_002030; -#define dspot02_room_0Set_000900DL_000AB0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000900DL_000AB0" +#define dspot02_room_0Set_000900DL_000AB0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000900DL_000AB0" static const ALIGN_ASSET(2) char spot02_room_0Set_000900DL_000AB0[] = dspot02_room_0Set_000900DL_000AB0; -#define dspot02_room_0Set_000900DL_001170 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000900DL_001170" +#define dspot02_room_0Set_000900DL_001170 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000900DL_001170" static const ALIGN_ASSET(2) char spot02_room_0Set_000900DL_001170[] = dspot02_room_0Set_000900DL_001170; diff --git a/soh/assets/scenes/overworld/spot02/spot02_room_1.h b/soh/assets/scenes/overworld/spot02/spot02_room_1.h index 76f7763cf..4f5ac445d 100644 --- a/soh/assets/scenes/overworld/spot02/spot02_room_1.h +++ b/soh/assets/scenes/overworld/spot02/spot02_room_1.h @@ -3,526 +3,526 @@ #include "align_asset_macro.h" -#define dspot02_room_1DL_0071A8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_0071A8" -static const ALIGN_ASSET(2) char spot02_room_1DL_0071A8[] = dspot02_room_1DL_0071A8; - -#define dspot02_room_1Tex_016D08 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_016D08" -static const ALIGN_ASSET(2) char spot02_room_1Tex_016D08[] = dspot02_room_1Tex_016D08; - -#define dspot02_room_1DL_001F20 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_001F20" -static const ALIGN_ASSET(2) char spot02_room_1DL_001F20[] = dspot02_room_1DL_001F20; - -#define dspot02_room_1Tex_014508 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_014508" -static const ALIGN_ASSET(2) char spot02_room_1Tex_014508[] = dspot02_room_1Tex_014508; - -#define dspot02_room_1TLUT_008EE0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1TLUT_008EE0" -static const ALIGN_ASSET(2) char spot02_room_1TLUT_008EE0[] = dspot02_room_1TLUT_008EE0; - -#define dspot02_room_1Tex_013508 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_013508" -static const ALIGN_ASSET(2) char spot02_room_1Tex_013508[] = dspot02_room_1Tex_013508; - -#define dspot02_room_1Tex_014D08 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_014D08" -static const ALIGN_ASSET(2) char spot02_room_1Tex_014D08[] = dspot02_room_1Tex_014D08; - -#define dspot02_room_1Tex_012D08 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_012D08" -static const ALIGN_ASSET(2) char spot02_room_1Tex_012D08[] = dspot02_room_1Tex_012D08; - -#define dspot02_room_1Tex_012508 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_012508" -static const ALIGN_ASSET(2) char spot02_room_1Tex_012508[] = dspot02_room_1Tex_012508; - -#define dspot02_room_1DL_005A68 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_005A68" -static const ALIGN_ASSET(2) char spot02_room_1DL_005A68[] = dspot02_room_1DL_005A68; - -#define dspot02_room_1Tex_00CD08 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_00CD08" -static const ALIGN_ASSET(2) char spot02_room_1Tex_00CD08[] = dspot02_room_1Tex_00CD08; - -#define dspot02_room_1DL_01A358 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_01A358" -static const ALIGN_ASSET(2) char spot02_room_1DL_01A358[] = dspot02_room_1DL_01A358; - -#define dspot02_room_1Tex_01B690 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_01B690" -static const ALIGN_ASSET(2) char spot02_room_1Tex_01B690[] = dspot02_room_1Tex_01B690; - -#define dspot02_room_1DL_003068 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_003068" -static const ALIGN_ASSET(2) char spot02_room_1DL_003068[] = dspot02_room_1DL_003068; - -#define dspot02_room_1Tex_008F08 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_008F08" +#define dspot02_room_1Tex_008F08 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_008F08" static const ALIGN_ASSET(2) char spot02_room_1Tex_008F08[] = dspot02_room_1Tex_008F08; -#define dspot02_room_1Tex_010D08 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_010D08" -static const ALIGN_ASSET(2) char spot02_room_1Tex_010D08[] = dspot02_room_1Tex_010D08; - -#define dspot02_room_1Tex_00E108 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_00E108" -static const ALIGN_ASSET(2) char spot02_room_1Tex_00E108[] = dspot02_room_1Tex_00E108; - -#define dspot02_room_1Tex_010B08 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_010B08" -static const ALIGN_ASSET(2) char spot02_room_1Tex_010B08[] = dspot02_room_1Tex_010B08; - -#define dspot02_room_1Tex_00F308 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_00F308" -static const ALIGN_ASSET(2) char spot02_room_1Tex_00F308[] = dspot02_room_1Tex_00F308; - -#define dspot02_room_1Tex_00EB08 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_00EB08" -static const ALIGN_ASSET(2) char spot02_room_1Tex_00EB08[] = dspot02_room_1Tex_00EB08; - -#define dspot02_room_1Tex_010308 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_010308" -static const ALIGN_ASSET(2) char spot02_room_1Tex_010308[] = dspot02_room_1Tex_010308; - -#define dspot02_room_1Tex_009708 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_009708" +#define dspot02_room_1Tex_009708 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_009708" static const ALIGN_ASSET(2) char spot02_room_1Tex_009708[] = dspot02_room_1Tex_009708; -#define dspot02_room_1DL_007770 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_007770" -static const ALIGN_ASSET(2) char spot02_room_1DL_007770[] = dspot02_room_1DL_007770; - -#define dspot02_room_1Tex_00C108 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_00C108" -static const ALIGN_ASSET(2) char spot02_room_1Tex_00C108[] = dspot02_room_1Tex_00C108; - -#define dspot02_room_1Tex_009908 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_009908" +#define dspot02_room_1Tex_009908 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_009908" static const ALIGN_ASSET(2) char spot02_room_1Tex_009908[] = dspot02_room_1Tex_009908; -#define dspot02_room_1DL_01A508 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_01A508" -static const ALIGN_ASSET(2) char spot02_room_1DL_01A508[] = dspot02_room_1DL_01A508; - -#define dspot02_room_1Tex_01D790 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_01D790" -static const ALIGN_ASSET(2) char spot02_room_1Tex_01D790[] = dspot02_room_1Tex_01D790; - -#define dspot02_room_1DL_0065B0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_0065B0" -static const ALIGN_ASSET(2) char spot02_room_1DL_0065B0[] = dspot02_room_1DL_0065B0; - -#define dspot02_room_1Tex_018988 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_018988" -static const ALIGN_ASSET(2) char spot02_room_1Tex_018988[] = dspot02_room_1Tex_018988; - -#define dspot02_room_1Tex_017588 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_017588" -static const ALIGN_ASSET(2) char spot02_room_1Tex_017588[] = dspot02_room_1Tex_017588; - -#define dspot02_room_1DL_0040F0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_0040F0" -static const ALIGN_ASSET(2) char spot02_room_1DL_0040F0[] = dspot02_room_1DL_0040F0; - -#define dspot02_room_1DL_003F20 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_003F20" -static const ALIGN_ASSET(2) char spot02_room_1DL_003F20[] = dspot02_room_1DL_003F20; - -#define dspot02_room_1Tex_011508 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_011508" -static const ALIGN_ASSET(2) char spot02_room_1Tex_011508[] = dspot02_room_1Tex_011508; - -#define dspot02_room_1DL_006F78 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_006F78" -static const ALIGN_ASSET(2) char spot02_room_1DL_006F78[] = dspot02_room_1DL_006F78; - -#define dspot02_room_1Tex_00B108 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_00B108" -static const ALIGN_ASSET(2) char spot02_room_1Tex_00B108[] = dspot02_room_1Tex_00B108; - -#define dspot02_room_1DL_003BC0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_003BC0" -static const ALIGN_ASSET(2) char spot02_room_1DL_003BC0[] = dspot02_room_1DL_003BC0; - -#define dspot02_room_1Tex_016D88 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_016D88" -static const ALIGN_ASSET(2) char spot02_room_1Tex_016D88[] = dspot02_room_1Tex_016D88; - -#define dspot02_room_1Tex_00E308 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_00E308" -static const ALIGN_ASSET(2) char spot02_room_1Tex_00E308[] = dspot02_room_1Tex_00E308; - -#define dspot02_room_1DL_008DE8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_008DE8" -static const ALIGN_ASSET(2) char spot02_room_1DL_008DE8[] = dspot02_room_1DL_008DE8; - -#define dspot02_room_1DL_01B618 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_01B618" -static const ALIGN_ASSET(2) char spot02_room_1DL_01B618[] = dspot02_room_1DL_01B618; - -#define dspot02_room_1DL_019F60 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_019F60" -static const ALIGN_ASSET(2) char spot02_room_1DL_019F60[] = dspot02_room_1DL_019F60; - -#define dspot02_room_1Tex_01C790 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_01C790" -static const ALIGN_ASSET(2) char spot02_room_1Tex_01C790[] = dspot02_room_1Tex_01C790; - -#define dspot02_room_1DL_007460 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_007460" -static const ALIGN_ASSET(2) char spot02_room_1DL_007460[] = dspot02_room_1DL_007460; - -#define dspot02_room_1Tex_00A908 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_00A908" +#define dspot02_room_1Tex_00A908 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_00A908" static const ALIGN_ASSET(2) char spot02_room_1Tex_00A908[] = dspot02_room_1Tex_00A908; -#define dspot02_room_1DL_0042A8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_0042A8" -static const ALIGN_ASSET(2) char spot02_room_1DL_0042A8[] = dspot02_room_1DL_0042A8; +#define dspot02_room_1Tex_00B108 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_00B108" +static const ALIGN_ASSET(2) char spot02_room_1Tex_00B108[] = dspot02_room_1Tex_00B108; -#define dspot02_room_1DL_01AA80 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_01AA80" -static const ALIGN_ASSET(2) char spot02_room_1DL_01AA80[] = dspot02_room_1DL_01AA80; +#define dspot02_room_1Tex_00C108 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_00C108" +static const ALIGN_ASSET(2) char spot02_room_1Tex_00C108[] = dspot02_room_1Tex_00C108; -#define dspot02_room_1Tex_01C290 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_01C290" -static const ALIGN_ASSET(2) char spot02_room_1Tex_01C290[] = dspot02_room_1Tex_01C290; - -#define dspot02_room_1Tex_01BE90 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_01BE90" -static const ALIGN_ASSET(2) char spot02_room_1Tex_01BE90[] = dspot02_room_1Tex_01BE90; - -#define dspot02_room_1DL_005250 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_005250" -static const ALIGN_ASSET(2) char spot02_room_1DL_005250[] = dspot02_room_1DL_005250; - -#define dspot02_room_1Tex_00DD08 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_00DD08" -static const ALIGN_ASSET(2) char spot02_room_1Tex_00DD08[] = dspot02_room_1Tex_00DD08; - -#define dspot02_room_1DL_01B178 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_01B178" -static const ALIGN_ASSET(2) char spot02_room_1DL_01B178[] = dspot02_room_1DL_01B178; - -#define dspot02_room_1Tex_01C690 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_01C690" -static const ALIGN_ASSET(2) char spot02_room_1Tex_01C690[] = dspot02_room_1Tex_01C690; - -#define dspot02_room_1DL_005730 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_005730" -static const ALIGN_ASSET(2) char spot02_room_1DL_005730[] = dspot02_room_1DL_005730; - -#define dspot02_room_1Tex_015D08 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_015D08" -static const ALIGN_ASSET(2) char spot02_room_1Tex_015D08[] = dspot02_room_1Tex_015D08; - -#define dspot02_room_1DL_006C48 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_006C48" -static const ALIGN_ASSET(2) char spot02_room_1DL_006C48[] = dspot02_room_1DL_006C48; - -#define dspot02_room_1Tex_00C508 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_00C508" +#define dspot02_room_1Tex_00C508 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_00C508" static const ALIGN_ASSET(2) char spot02_room_1Tex_00C508[] = dspot02_room_1Tex_00C508; -#define dspot02_room_1TLUT_008EB8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1TLUT_008EB8" -static const ALIGN_ASSET(2) char spot02_room_1TLUT_008EB8[] = dspot02_room_1TLUT_008EB8; +#define dspot02_room_1Tex_00CD08 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_00CD08" +static const ALIGN_ASSET(2) char spot02_room_1Tex_00CD08[] = dspot02_room_1Tex_00CD08; -#define dspot02_room_1DL_007990 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_007990" -static const ALIGN_ASSET(2) char spot02_room_1DL_007990[] = dspot02_room_1DL_007990; +#define dspot02_room_1Tex_00DD08 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_00DD08" +static const ALIGN_ASSET(2) char spot02_room_1Tex_00DD08[] = dspot02_room_1Tex_00DD08; -#define dspot02_room_1Tex_017988 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_017988" +#define dspot02_room_1Tex_00E108 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_00E108" +static const ALIGN_ASSET(2) char spot02_room_1Tex_00E108[] = dspot02_room_1Tex_00E108; + +#define dspot02_room_1Tex_00E308 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_00E308" +static const ALIGN_ASSET(2) char spot02_room_1Tex_00E308[] = dspot02_room_1Tex_00E308; + +#define dspot02_room_1Tex_00EB08 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_00EB08" +static const ALIGN_ASSET(2) char spot02_room_1Tex_00EB08[] = dspot02_room_1Tex_00EB08; + +#define dspot02_room_1Tex_00F308 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_00F308" +static const ALIGN_ASSET(2) char spot02_room_1Tex_00F308[] = dspot02_room_1Tex_00F308; + +#define dspot02_room_1Tex_010308 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_010308" +static const ALIGN_ASSET(2) char spot02_room_1Tex_010308[] = dspot02_room_1Tex_010308; + +#define dspot02_room_1Tex_010B08 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_010B08" +static const ALIGN_ASSET(2) char spot02_room_1Tex_010B08[] = dspot02_room_1Tex_010B08; + +#define dspot02_room_1Tex_010D08 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_010D08" +static const ALIGN_ASSET(2) char spot02_room_1Tex_010D08[] = dspot02_room_1Tex_010D08; + +#define dspot02_room_1Tex_011508 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_011508" +static const ALIGN_ASSET(2) char spot02_room_1Tex_011508[] = dspot02_room_1Tex_011508; + +#define dspot02_room_1Tex_012508 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_012508" +static const ALIGN_ASSET(2) char spot02_room_1Tex_012508[] = dspot02_room_1Tex_012508; + +#define dspot02_room_1Tex_012D08 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_012D08" +static const ALIGN_ASSET(2) char spot02_room_1Tex_012D08[] = dspot02_room_1Tex_012D08; + +#define dspot02_room_1Tex_013508 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_013508" +static const ALIGN_ASSET(2) char spot02_room_1Tex_013508[] = dspot02_room_1Tex_013508; + +#define dspot02_room_1Tex_014508 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_014508" +static const ALIGN_ASSET(2) char spot02_room_1Tex_014508[] = dspot02_room_1Tex_014508; + +#define dspot02_room_1Tex_014D08 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_014D08" +static const ALIGN_ASSET(2) char spot02_room_1Tex_014D08[] = dspot02_room_1Tex_014D08; + +#define dspot02_room_1Tex_015D08 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_015D08" +static const ALIGN_ASSET(2) char spot02_room_1Tex_015D08[] = dspot02_room_1Tex_015D08; + +#define dspot02_room_1Tex_016D08 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_016D08" +static const ALIGN_ASSET(2) char spot02_room_1Tex_016D08[] = dspot02_room_1Tex_016D08; + +#define dspot02_room_1Tex_016D88 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_016D88" +static const ALIGN_ASSET(2) char spot02_room_1Tex_016D88[] = dspot02_room_1Tex_016D88; + +#define dspot02_room_1Tex_017588 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_017588" +static const ALIGN_ASSET(2) char spot02_room_1Tex_017588[] = dspot02_room_1Tex_017588; + +#define dspot02_room_1Tex_017988 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_017988" static const ALIGN_ASSET(2) char spot02_room_1Tex_017988[] = dspot02_room_1Tex_017988; -#define dspot02_room_1Set_000C70DL_0071A8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_0071A8" +#define dspot02_room_1Tex_018988 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_018988" +static const ALIGN_ASSET(2) char spot02_room_1Tex_018988[] = dspot02_room_1Tex_018988; + +#define dspot02_room_1Tex_01B690 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_01B690" +static const ALIGN_ASSET(2) char spot02_room_1Tex_01B690[] = dspot02_room_1Tex_01B690; + +#define dspot02_room_1Tex_01BE90 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_01BE90" +static const ALIGN_ASSET(2) char spot02_room_1Tex_01BE90[] = dspot02_room_1Tex_01BE90; + +#define dspot02_room_1Tex_01C290 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_01C290" +static const ALIGN_ASSET(2) char spot02_room_1Tex_01C290[] = dspot02_room_1Tex_01C290; + +#define dspot02_room_1Tex_01C690 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_01C690" +static const ALIGN_ASSET(2) char spot02_room_1Tex_01C690[] = dspot02_room_1Tex_01C690; + +#define dspot02_room_1Tex_01C790 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_01C790" +static const ALIGN_ASSET(2) char spot02_room_1Tex_01C790[] = dspot02_room_1Tex_01C790; + +#define dspot02_room_1Tex_01D790 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_01D790" +static const ALIGN_ASSET(2) char spot02_room_1Tex_01D790[] = dspot02_room_1Tex_01D790; + +#define dspot02_room_1TLUT_008EB8 "__OTR__scenes/shared/spot02_scene/spot02_room_1TLUT_008EB8" +static const ALIGN_ASSET(2) char spot02_room_1TLUT_008EB8[] = dspot02_room_1TLUT_008EB8; + +#define dspot02_room_1TLUT_008EE0 "__OTR__scenes/shared/spot02_scene/spot02_room_1TLUT_008EE0" +static const ALIGN_ASSET(2) char spot02_room_1TLUT_008EE0[] = dspot02_room_1TLUT_008EE0; + +#define dspot02_room_1DL_0071A8 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_0071A8" +static const ALIGN_ASSET(2) char spot02_room_1DL_0071A8[] = dspot02_room_1DL_0071A8; + +#define dspot02_room_1DL_001F20 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_001F20" +static const ALIGN_ASSET(2) char spot02_room_1DL_001F20[] = dspot02_room_1DL_001F20; + +#define dspot02_room_1DL_005A68 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_005A68" +static const ALIGN_ASSET(2) char spot02_room_1DL_005A68[] = dspot02_room_1DL_005A68; + +#define dspot02_room_1DL_01A358 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_01A358" +static const ALIGN_ASSET(2) char spot02_room_1DL_01A358[] = dspot02_room_1DL_01A358; + +#define dspot02_room_1DL_003068 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_003068" +static const ALIGN_ASSET(2) char spot02_room_1DL_003068[] = dspot02_room_1DL_003068; + +#define dspot02_room_1DL_007770 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_007770" +static const ALIGN_ASSET(2) char spot02_room_1DL_007770[] = dspot02_room_1DL_007770; + +#define dspot02_room_1DL_01A508 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_01A508" +static const ALIGN_ASSET(2) char spot02_room_1DL_01A508[] = dspot02_room_1DL_01A508; + +#define dspot02_room_1DL_0065B0 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_0065B0" +static const ALIGN_ASSET(2) char spot02_room_1DL_0065B0[] = dspot02_room_1DL_0065B0; + +#define dspot02_room_1DL_0040F0 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_0040F0" +static const ALIGN_ASSET(2) char spot02_room_1DL_0040F0[] = dspot02_room_1DL_0040F0; + +#define dspot02_room_1DL_003F20 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_003F20" +static const ALIGN_ASSET(2) char spot02_room_1DL_003F20[] = dspot02_room_1DL_003F20; + +#define dspot02_room_1DL_006F78 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_006F78" +static const ALIGN_ASSET(2) char spot02_room_1DL_006F78[] = dspot02_room_1DL_006F78; + +#define dspot02_room_1DL_003BC0 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_003BC0" +static const ALIGN_ASSET(2) char spot02_room_1DL_003BC0[] = dspot02_room_1DL_003BC0; + +#define dspot02_room_1DL_008DE8 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_008DE8" +static const ALIGN_ASSET(2) char spot02_room_1DL_008DE8[] = dspot02_room_1DL_008DE8; + +#define dspot02_room_1DL_01B618 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_01B618" +static const ALIGN_ASSET(2) char spot02_room_1DL_01B618[] = dspot02_room_1DL_01B618; + +#define dspot02_room_1DL_019F60 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_019F60" +static const ALIGN_ASSET(2) char spot02_room_1DL_019F60[] = dspot02_room_1DL_019F60; + +#define dspot02_room_1DL_007460 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_007460" +static const ALIGN_ASSET(2) char spot02_room_1DL_007460[] = dspot02_room_1DL_007460; + +#define dspot02_room_1DL_0042A8 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_0042A8" +static const ALIGN_ASSET(2) char spot02_room_1DL_0042A8[] = dspot02_room_1DL_0042A8; + +#define dspot02_room_1DL_01AA80 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_01AA80" +static const ALIGN_ASSET(2) char spot02_room_1DL_01AA80[] = dspot02_room_1DL_01AA80; + +#define dspot02_room_1DL_005250 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_005250" +static const ALIGN_ASSET(2) char spot02_room_1DL_005250[] = dspot02_room_1DL_005250; + +#define dspot02_room_1DL_01B178 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_01B178" +static const ALIGN_ASSET(2) char spot02_room_1DL_01B178[] = dspot02_room_1DL_01B178; + +#define dspot02_room_1DL_005730 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_005730" +static const ALIGN_ASSET(2) char spot02_room_1DL_005730[] = dspot02_room_1DL_005730; + +#define dspot02_room_1DL_006C48 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_006C48" +static const ALIGN_ASSET(2) char spot02_room_1DL_006C48[] = dspot02_room_1DL_006C48; + +#define dspot02_room_1DL_007990 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_007990" +static const ALIGN_ASSET(2) char spot02_room_1DL_007990[] = dspot02_room_1DL_007990; + +#define dspot02_room_1Set_000C70DL_0071A8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_0071A8" static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_0071A8[] = dspot02_room_1Set_000C70DL_0071A8; -#define dspot02_room_1Set_000C70DL_001F20 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_001F20" +#define dspot02_room_1Set_000C70DL_001F20 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_001F20" static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_001F20[] = dspot02_room_1Set_000C70DL_001F20; -#define dspot02_room_1Set_000C70DL_005A68 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_005A68" +#define dspot02_room_1Set_000C70DL_005A68 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_005A68" static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_005A68[] = dspot02_room_1Set_000C70DL_005A68; -#define dspot02_room_1Set_000C70DL_01A358 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_01A358" +#define dspot02_room_1Set_000C70DL_01A358 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_01A358" static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_01A358[] = dspot02_room_1Set_000C70DL_01A358; -#define dspot02_room_1Set_000C70DL_003068 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_003068" +#define dspot02_room_1Set_000C70DL_003068 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_003068" static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_003068[] = dspot02_room_1Set_000C70DL_003068; -#define dspot02_room_1Set_000C70DL_007770 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_007770" +#define dspot02_room_1Set_000C70DL_007770 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_007770" static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_007770[] = dspot02_room_1Set_000C70DL_007770; -#define dspot02_room_1Set_000C70DL_01A508 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_01A508" +#define dspot02_room_1Set_000C70DL_01A508 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_01A508" static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_01A508[] = dspot02_room_1Set_000C70DL_01A508; -#define dspot02_room_1Set_000C70DL_0065B0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_0065B0" +#define dspot02_room_1Set_000C70DL_0065B0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_0065B0" static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_0065B0[] = dspot02_room_1Set_000C70DL_0065B0; -#define dspot02_room_1Set_000C70DL_0040F0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_0040F0" +#define dspot02_room_1Set_000C70DL_0040F0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_0040F0" static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_0040F0[] = dspot02_room_1Set_000C70DL_0040F0; -#define dspot02_room_1Set_000C70DL_003F20 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_003F20" +#define dspot02_room_1Set_000C70DL_003F20 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_003F20" static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_003F20[] = dspot02_room_1Set_000C70DL_003F20; -#define dspot02_room_1Set_000C70DL_006F78 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_006F78" +#define dspot02_room_1Set_000C70DL_006F78 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_006F78" static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_006F78[] = dspot02_room_1Set_000C70DL_006F78; -#define dspot02_room_1Set_000C70DL_003BC0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_003BC0" +#define dspot02_room_1Set_000C70DL_003BC0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_003BC0" static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_003BC0[] = dspot02_room_1Set_000C70DL_003BC0; -#define dspot02_room_1Set_000C70DL_008DE8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_008DE8" +#define dspot02_room_1Set_000C70DL_008DE8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_008DE8" static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_008DE8[] = dspot02_room_1Set_000C70DL_008DE8; -#define dspot02_room_1Set_000C70DL_01B618 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_01B618" +#define dspot02_room_1Set_000C70DL_01B618 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_01B618" static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_01B618[] = dspot02_room_1Set_000C70DL_01B618; -#define dspot02_room_1Set_000C70DL_019F60 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_019F60" +#define dspot02_room_1Set_000C70DL_019F60 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_019F60" static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_019F60[] = dspot02_room_1Set_000C70DL_019F60; -#define dspot02_room_1Set_000C70DL_007460 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_007460" +#define dspot02_room_1Set_000C70DL_007460 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_007460" static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_007460[] = dspot02_room_1Set_000C70DL_007460; -#define dspot02_room_1Set_000C70DL_0042A8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_0042A8" +#define dspot02_room_1Set_000C70DL_0042A8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_0042A8" static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_0042A8[] = dspot02_room_1Set_000C70DL_0042A8; -#define dspot02_room_1Set_000C70DL_01AA80 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_01AA80" +#define dspot02_room_1Set_000C70DL_01AA80 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_01AA80" static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_01AA80[] = dspot02_room_1Set_000C70DL_01AA80; -#define dspot02_room_1Set_000C70DL_005250 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_005250" +#define dspot02_room_1Set_000C70DL_005250 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_005250" static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_005250[] = dspot02_room_1Set_000C70DL_005250; -#define dspot02_room_1Set_000C70DL_01B178 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_01B178" +#define dspot02_room_1Set_000C70DL_01B178 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_01B178" static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_01B178[] = dspot02_room_1Set_000C70DL_01B178; -#define dspot02_room_1Set_000C70DL_005730 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_005730" +#define dspot02_room_1Set_000C70DL_005730 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_005730" static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_005730[] = dspot02_room_1Set_000C70DL_005730; -#define dspot02_room_1Set_000C70DL_006C48 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_006C48" +#define dspot02_room_1Set_000C70DL_006C48 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_006C48" static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_006C48[] = dspot02_room_1Set_000C70DL_006C48; -#define dspot02_room_1Set_000C70DL_007990 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_007990" +#define dspot02_room_1Set_000C70DL_007990 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_007990" static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_007990[] = dspot02_room_1Set_000C70DL_007990; -#define dspot02_room_1Set_000490DL_0071A8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_0071A8" +#define dspot02_room_1Set_000490DL_0071A8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_0071A8" static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_0071A8[] = dspot02_room_1Set_000490DL_0071A8; -#define dspot02_room_1Set_000490DL_001F20 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_001F20" +#define dspot02_room_1Set_000490DL_001F20 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_001F20" static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_001F20[] = dspot02_room_1Set_000490DL_001F20; -#define dspot02_room_1Set_000490DL_005A68 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_005A68" +#define dspot02_room_1Set_000490DL_005A68 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_005A68" static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_005A68[] = dspot02_room_1Set_000490DL_005A68; -#define dspot02_room_1Set_000490DL_01A358 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_01A358" +#define dspot02_room_1Set_000490DL_01A358 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_01A358" static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_01A358[] = dspot02_room_1Set_000490DL_01A358; -#define dspot02_room_1Set_000490DL_003068 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_003068" +#define dspot02_room_1Set_000490DL_003068 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_003068" static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_003068[] = dspot02_room_1Set_000490DL_003068; -#define dspot02_room_1Set_000490DL_007770 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_007770" +#define dspot02_room_1Set_000490DL_007770 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_007770" static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_007770[] = dspot02_room_1Set_000490DL_007770; -#define dspot02_room_1Set_000490DL_01A508 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_01A508" +#define dspot02_room_1Set_000490DL_01A508 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_01A508" static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_01A508[] = dspot02_room_1Set_000490DL_01A508; -#define dspot02_room_1Set_000490DL_0065B0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_0065B0" +#define dspot02_room_1Set_000490DL_0065B0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_0065B0" static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_0065B0[] = dspot02_room_1Set_000490DL_0065B0; -#define dspot02_room_1Set_000490DL_0040F0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_0040F0" +#define dspot02_room_1Set_000490DL_0040F0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_0040F0" static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_0040F0[] = dspot02_room_1Set_000490DL_0040F0; -#define dspot02_room_1Set_000490DL_003F20 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_003F20" +#define dspot02_room_1Set_000490DL_003F20 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_003F20" static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_003F20[] = dspot02_room_1Set_000490DL_003F20; -#define dspot02_room_1Set_000490DL_006F78 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_006F78" +#define dspot02_room_1Set_000490DL_006F78 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_006F78" static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_006F78[] = dspot02_room_1Set_000490DL_006F78; -#define dspot02_room_1Set_000490DL_003BC0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_003BC0" +#define dspot02_room_1Set_000490DL_003BC0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_003BC0" static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_003BC0[] = dspot02_room_1Set_000490DL_003BC0; -#define dspot02_room_1Set_000490DL_008DE8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_008DE8" +#define dspot02_room_1Set_000490DL_008DE8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_008DE8" static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_008DE8[] = dspot02_room_1Set_000490DL_008DE8; -#define dspot02_room_1Set_000490DL_01B618 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_01B618" +#define dspot02_room_1Set_000490DL_01B618 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_01B618" static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_01B618[] = dspot02_room_1Set_000490DL_01B618; -#define dspot02_room_1Set_000490DL_019F60 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_019F60" +#define dspot02_room_1Set_000490DL_019F60 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_019F60" static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_019F60[] = dspot02_room_1Set_000490DL_019F60; -#define dspot02_room_1Set_000490DL_007460 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_007460" +#define dspot02_room_1Set_000490DL_007460 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_007460" static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_007460[] = dspot02_room_1Set_000490DL_007460; -#define dspot02_room_1Set_000490DL_0042A8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_0042A8" +#define dspot02_room_1Set_000490DL_0042A8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_0042A8" static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_0042A8[] = dspot02_room_1Set_000490DL_0042A8; -#define dspot02_room_1Set_000490DL_01AA80 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_01AA80" +#define dspot02_room_1Set_000490DL_01AA80 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_01AA80" static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_01AA80[] = dspot02_room_1Set_000490DL_01AA80; -#define dspot02_room_1Set_000490DL_005250 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_005250" +#define dspot02_room_1Set_000490DL_005250 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_005250" static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_005250[] = dspot02_room_1Set_000490DL_005250; -#define dspot02_room_1Set_000490DL_01B178 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_01B178" +#define dspot02_room_1Set_000490DL_01B178 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_01B178" static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_01B178[] = dspot02_room_1Set_000490DL_01B178; -#define dspot02_room_1Set_000490DL_005730 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_005730" +#define dspot02_room_1Set_000490DL_005730 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_005730" static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_005730[] = dspot02_room_1Set_000490DL_005730; -#define dspot02_room_1Set_000490DL_006C48 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_006C48" +#define dspot02_room_1Set_000490DL_006C48 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_006C48" static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_006C48[] = dspot02_room_1Set_000490DL_006C48; -#define dspot02_room_1Set_000490DL_007990 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_007990" +#define dspot02_room_1Set_000490DL_007990 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_007990" static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_007990[] = dspot02_room_1Set_000490DL_007990; -#define dspot02_room_1Set_000880DL_0071A8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_0071A8" +#define dspot02_room_1Set_000880DL_0071A8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_0071A8" static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_0071A8[] = dspot02_room_1Set_000880DL_0071A8; -#define dspot02_room_1Set_000880DL_001F20 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_001F20" +#define dspot02_room_1Set_000880DL_001F20 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_001F20" static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_001F20[] = dspot02_room_1Set_000880DL_001F20; -#define dspot02_room_1Set_000880DL_005A68 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_005A68" +#define dspot02_room_1Set_000880DL_005A68 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_005A68" static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_005A68[] = dspot02_room_1Set_000880DL_005A68; -#define dspot02_room_1Set_000880DL_01A358 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_01A358" +#define dspot02_room_1Set_000880DL_01A358 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_01A358" static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_01A358[] = dspot02_room_1Set_000880DL_01A358; -#define dspot02_room_1Set_000880DL_003068 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_003068" +#define dspot02_room_1Set_000880DL_003068 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_003068" static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_003068[] = dspot02_room_1Set_000880DL_003068; -#define dspot02_room_1Set_000880DL_007770 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_007770" +#define dspot02_room_1Set_000880DL_007770 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_007770" static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_007770[] = dspot02_room_1Set_000880DL_007770; -#define dspot02_room_1Set_000880DL_01A508 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_01A508" +#define dspot02_room_1Set_000880DL_01A508 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_01A508" static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_01A508[] = dspot02_room_1Set_000880DL_01A508; -#define dspot02_room_1Set_000880DL_0065B0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_0065B0" +#define dspot02_room_1Set_000880DL_0065B0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_0065B0" static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_0065B0[] = dspot02_room_1Set_000880DL_0065B0; -#define dspot02_room_1Set_000880DL_0040F0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_0040F0" +#define dspot02_room_1Set_000880DL_0040F0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_0040F0" static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_0040F0[] = dspot02_room_1Set_000880DL_0040F0; -#define dspot02_room_1Set_000880DL_003F20 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_003F20" +#define dspot02_room_1Set_000880DL_003F20 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_003F20" static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_003F20[] = dspot02_room_1Set_000880DL_003F20; -#define dspot02_room_1Set_000880DL_006F78 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_006F78" +#define dspot02_room_1Set_000880DL_006F78 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_006F78" static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_006F78[] = dspot02_room_1Set_000880DL_006F78; -#define dspot02_room_1Set_000880DL_003BC0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_003BC0" +#define dspot02_room_1Set_000880DL_003BC0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_003BC0" static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_003BC0[] = dspot02_room_1Set_000880DL_003BC0; -#define dspot02_room_1Set_000880DL_008DE8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_008DE8" +#define dspot02_room_1Set_000880DL_008DE8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_008DE8" static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_008DE8[] = dspot02_room_1Set_000880DL_008DE8; -#define dspot02_room_1Set_000880DL_01B618 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_01B618" +#define dspot02_room_1Set_000880DL_01B618 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_01B618" static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_01B618[] = dspot02_room_1Set_000880DL_01B618; -#define dspot02_room_1Set_000880DL_019F60 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_019F60" +#define dspot02_room_1Set_000880DL_019F60 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_019F60" static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_019F60[] = dspot02_room_1Set_000880DL_019F60; -#define dspot02_room_1Set_000880DL_007460 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_007460" +#define dspot02_room_1Set_000880DL_007460 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_007460" static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_007460[] = dspot02_room_1Set_000880DL_007460; -#define dspot02_room_1Set_000880DL_0042A8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_0042A8" +#define dspot02_room_1Set_000880DL_0042A8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_0042A8" static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_0042A8[] = dspot02_room_1Set_000880DL_0042A8; -#define dspot02_room_1Set_000880DL_01AA80 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_01AA80" +#define dspot02_room_1Set_000880DL_01AA80 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_01AA80" static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_01AA80[] = dspot02_room_1Set_000880DL_01AA80; -#define dspot02_room_1Set_000880DL_005250 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_005250" +#define dspot02_room_1Set_000880DL_005250 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_005250" static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_005250[] = dspot02_room_1Set_000880DL_005250; -#define dspot02_room_1Set_000880DL_01B178 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_01B178" +#define dspot02_room_1Set_000880DL_01B178 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_01B178" static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_01B178[] = dspot02_room_1Set_000880DL_01B178; -#define dspot02_room_1Set_000880DL_005730 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_005730" +#define dspot02_room_1Set_000880DL_005730 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_005730" static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_005730[] = dspot02_room_1Set_000880DL_005730; -#define dspot02_room_1Set_000880DL_006C48 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_006C48" +#define dspot02_room_1Set_000880DL_006C48 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_006C48" static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_006C48[] = dspot02_room_1Set_000880DL_006C48; -#define dspot02_room_1Set_000880DL_007990 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_007990" +#define dspot02_room_1Set_000880DL_007990 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_007990" static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_007990[] = dspot02_room_1Set_000880DL_007990; -#define dspot02_room_1Set_001010DL_0071A8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_0071A8" +#define dspot02_room_1Set_001010DL_0071A8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_0071A8" static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_0071A8[] = dspot02_room_1Set_001010DL_0071A8; -#define dspot02_room_1Set_001010DL_001F20 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_001F20" +#define dspot02_room_1Set_001010DL_001F20 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_001F20" static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_001F20[] = dspot02_room_1Set_001010DL_001F20; -#define dspot02_room_1Set_001010DL_005A68 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_005A68" +#define dspot02_room_1Set_001010DL_005A68 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_005A68" static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_005A68[] = dspot02_room_1Set_001010DL_005A68; -#define dspot02_room_1Set_001010DL_01A358 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_01A358" +#define dspot02_room_1Set_001010DL_01A358 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_01A358" static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_01A358[] = dspot02_room_1Set_001010DL_01A358; -#define dspot02_room_1Set_001010DL_003068 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_003068" +#define dspot02_room_1Set_001010DL_003068 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_003068" static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_003068[] = dspot02_room_1Set_001010DL_003068; -#define dspot02_room_1Set_001010DL_007770 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_007770" +#define dspot02_room_1Set_001010DL_007770 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_007770" static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_007770[] = dspot02_room_1Set_001010DL_007770; -#define dspot02_room_1Set_001010DL_01A508 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_01A508" +#define dspot02_room_1Set_001010DL_01A508 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_01A508" static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_01A508[] = dspot02_room_1Set_001010DL_01A508; -#define dspot02_room_1Set_001010DL_0065B0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_0065B0" +#define dspot02_room_1Set_001010DL_0065B0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_0065B0" static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_0065B0[] = dspot02_room_1Set_001010DL_0065B0; -#define dspot02_room_1Set_001010DL_0040F0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_0040F0" +#define dspot02_room_1Set_001010DL_0040F0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_0040F0" static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_0040F0[] = dspot02_room_1Set_001010DL_0040F0; -#define dspot02_room_1Set_001010DL_003F20 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_003F20" +#define dspot02_room_1Set_001010DL_003F20 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_003F20" static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_003F20[] = dspot02_room_1Set_001010DL_003F20; -#define dspot02_room_1Set_001010DL_006F78 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_006F78" +#define dspot02_room_1Set_001010DL_006F78 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_006F78" static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_006F78[] = dspot02_room_1Set_001010DL_006F78; -#define dspot02_room_1Set_001010DL_003BC0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_003BC0" +#define dspot02_room_1Set_001010DL_003BC0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_003BC0" static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_003BC0[] = dspot02_room_1Set_001010DL_003BC0; -#define dspot02_room_1Set_001010DL_008DE8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_008DE8" +#define dspot02_room_1Set_001010DL_008DE8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_008DE8" static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_008DE8[] = dspot02_room_1Set_001010DL_008DE8; -#define dspot02_room_1Set_001010DL_01B618 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_01B618" +#define dspot02_room_1Set_001010DL_01B618 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_01B618" static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_01B618[] = dspot02_room_1Set_001010DL_01B618; -#define dspot02_room_1Set_001010DL_019F60 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_019F60" +#define dspot02_room_1Set_001010DL_019F60 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_019F60" static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_019F60[] = dspot02_room_1Set_001010DL_019F60; -#define dspot02_room_1Set_001010DL_007460 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_007460" +#define dspot02_room_1Set_001010DL_007460 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_007460" static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_007460[] = dspot02_room_1Set_001010DL_007460; -#define dspot02_room_1Set_001010DL_0042A8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_0042A8" +#define dspot02_room_1Set_001010DL_0042A8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_0042A8" static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_0042A8[] = dspot02_room_1Set_001010DL_0042A8; -#define dspot02_room_1Set_001010DL_01AA80 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_01AA80" +#define dspot02_room_1Set_001010DL_01AA80 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_01AA80" static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_01AA80[] = dspot02_room_1Set_001010DL_01AA80; -#define dspot02_room_1Set_001010DL_005250 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_005250" +#define dspot02_room_1Set_001010DL_005250 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_005250" static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_005250[] = dspot02_room_1Set_001010DL_005250; -#define dspot02_room_1Set_001010DL_01B178 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_01B178" +#define dspot02_room_1Set_001010DL_01B178 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_01B178" static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_01B178[] = dspot02_room_1Set_001010DL_01B178; -#define dspot02_room_1Set_001010DL_005730 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_005730" +#define dspot02_room_1Set_001010DL_005730 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_005730" static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_005730[] = dspot02_room_1Set_001010DL_005730; -#define dspot02_room_1Set_001010DL_006C48 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_006C48" +#define dspot02_room_1Set_001010DL_006C48 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_006C48" static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_006C48[] = dspot02_room_1Set_001010DL_006C48; -#define dspot02_room_1Set_001010DL_007990 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_007990" +#define dspot02_room_1Set_001010DL_007990 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_007990" static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_007990[] = dspot02_room_1Set_001010DL_007990; -#define dspot02_room_1Set_001260DL_0071A8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_0071A8" +#define dspot02_room_1Set_001260DL_0071A8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_0071A8" static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_0071A8[] = dspot02_room_1Set_001260DL_0071A8; -#define dspot02_room_1Set_001260DL_001F20 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_001F20" +#define dspot02_room_1Set_001260DL_001F20 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_001F20" static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_001F20[] = dspot02_room_1Set_001260DL_001F20; -#define dspot02_room_1Set_001260DL_005A68 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_005A68" +#define dspot02_room_1Set_001260DL_005A68 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_005A68" static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_005A68[] = dspot02_room_1Set_001260DL_005A68; -#define dspot02_room_1Set_001260DL_01A358 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_01A358" +#define dspot02_room_1Set_001260DL_01A358 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_01A358" static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_01A358[] = dspot02_room_1Set_001260DL_01A358; -#define dspot02_room_1Set_001260DL_003068 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_003068" +#define dspot02_room_1Set_001260DL_003068 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_003068" static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_003068[] = dspot02_room_1Set_001260DL_003068; -#define dspot02_room_1Set_001260DL_007770 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_007770" +#define dspot02_room_1Set_001260DL_007770 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_007770" static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_007770[] = dspot02_room_1Set_001260DL_007770; -#define dspot02_room_1Set_001260DL_01A508 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_01A508" +#define dspot02_room_1Set_001260DL_01A508 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_01A508" static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_01A508[] = dspot02_room_1Set_001260DL_01A508; -#define dspot02_room_1Set_001260DL_0065B0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_0065B0" +#define dspot02_room_1Set_001260DL_0065B0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_0065B0" static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_0065B0[] = dspot02_room_1Set_001260DL_0065B0; -#define dspot02_room_1Set_001260DL_0040F0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_0040F0" +#define dspot02_room_1Set_001260DL_0040F0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_0040F0" static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_0040F0[] = dspot02_room_1Set_001260DL_0040F0; -#define dspot02_room_1Set_001260DL_003F20 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_003F20" +#define dspot02_room_1Set_001260DL_003F20 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_003F20" static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_003F20[] = dspot02_room_1Set_001260DL_003F20; -#define dspot02_room_1Set_001260DL_006F78 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_006F78" +#define dspot02_room_1Set_001260DL_006F78 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_006F78" static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_006F78[] = dspot02_room_1Set_001260DL_006F78; -#define dspot02_room_1Set_001260DL_003BC0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_003BC0" +#define dspot02_room_1Set_001260DL_003BC0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_003BC0" static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_003BC0[] = dspot02_room_1Set_001260DL_003BC0; -#define dspot02_room_1Set_001260DL_008DE8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_008DE8" +#define dspot02_room_1Set_001260DL_008DE8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_008DE8" static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_008DE8[] = dspot02_room_1Set_001260DL_008DE8; -#define dspot02_room_1Set_001260DL_01B618 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_01B618" +#define dspot02_room_1Set_001260DL_01B618 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_01B618" static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_01B618[] = dspot02_room_1Set_001260DL_01B618; -#define dspot02_room_1Set_001260DL_019F60 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_019F60" +#define dspot02_room_1Set_001260DL_019F60 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_019F60" static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_019F60[] = dspot02_room_1Set_001260DL_019F60; -#define dspot02_room_1Set_001260DL_007460 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_007460" +#define dspot02_room_1Set_001260DL_007460 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_007460" static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_007460[] = dspot02_room_1Set_001260DL_007460; -#define dspot02_room_1Set_001260DL_0042A8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_0042A8" +#define dspot02_room_1Set_001260DL_0042A8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_0042A8" static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_0042A8[] = dspot02_room_1Set_001260DL_0042A8; -#define dspot02_room_1Set_001260DL_01AA80 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_01AA80" +#define dspot02_room_1Set_001260DL_01AA80 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_01AA80" static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_01AA80[] = dspot02_room_1Set_001260DL_01AA80; -#define dspot02_room_1Set_001260DL_005250 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_005250" +#define dspot02_room_1Set_001260DL_005250 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_005250" static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_005250[] = dspot02_room_1Set_001260DL_005250; -#define dspot02_room_1Set_001260DL_01B178 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_01B178" +#define dspot02_room_1Set_001260DL_01B178 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_01B178" static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_01B178[] = dspot02_room_1Set_001260DL_01B178; -#define dspot02_room_1Set_001260DL_005730 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_005730" +#define dspot02_room_1Set_001260DL_005730 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_005730" static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_005730[] = dspot02_room_1Set_001260DL_005730; -#define dspot02_room_1Set_001260DL_006C48 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_006C48" +#define dspot02_room_1Set_001260DL_006C48 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_006C48" static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_006C48[] = dspot02_room_1Set_001260DL_006C48; -#define dspot02_room_1Set_001260DL_007990 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_007990" +#define dspot02_room_1Set_001260DL_007990 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_007990" static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_007990[] = dspot02_room_1Set_001260DL_007990; diff --git a/soh/assets/scenes/overworld/spot02/spot02_scene.h b/soh/assets/scenes/overworld/spot02/spot02_scene.h index 47ce5c69a..2835db8fc 100644 --- a/soh/assets/scenes/overworld/spot02/spot02_scene.h +++ b/soh/assets/scenes/overworld/spot02/spot02_scene.h @@ -3,60 +3,60 @@ #include "align_asset_macro.h" -#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneCollisionHeader_003C54" -static const ALIGN_ASSET(2) char spot02_sceneCollisionHeader_003C54[] = dspot02_sceneCollisionHeader_003C54; - -#define dspot02_scene_Cs_003C80 "__OTR__scenes/nonmq/spot02_scene/spot02_scene_Cs_003C80" -static const ALIGN_ASSET(2) char spot02_scene_Cs_003C80[] = dspot02_scene_Cs_003C80; - -#define dspot02_scene_Cs_005020 "__OTR__scenes/nonmq/spot02_scene/spot02_scene_Cs_005020" -static const ALIGN_ASSET(2) char spot02_scene_Cs_005020[] = dspot02_scene_Cs_005020; - -#define dgGraveyardIntroCs "__OTR__scenes/nonmq/spot02_scene/gGraveyardIntroCs" -static const ALIGN_ASSET(2) char gGraveyardIntroCs[] = dgGraveyardIntroCs; - -#define dspot02_sceneTex_009E80 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneTex_009E80" -static const ALIGN_ASSET(2) char spot02_sceneTex_009E80[] = dspot02_sceneTex_009E80; - -#define dspot02_sceneTex_007E80 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneTex_007E80" -static const ALIGN_ASSET(2) char spot02_sceneTex_007E80[] = dspot02_sceneTex_007E80; - -#define dspot02_sceneTex_007280 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneTex_007280" +#define dspot02_sceneTex_007280 "__OTR__scenes/shared/spot02_scene/spot02_sceneTex_007280" static const ALIGN_ASSET(2) char spot02_sceneTex_007280[] = dspot02_sceneTex_007280; -#define dspot02_sceneTex_007A80 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneTex_007A80" +#define dspot02_sceneTex_007A80 "__OTR__scenes/shared/spot02_scene/spot02_sceneTex_007A80" static const ALIGN_ASSET(2) char spot02_sceneTex_007A80[] = dspot02_sceneTex_007A80; -#define dspot02_sceneTex_00B080 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneTex_00B080" -static const ALIGN_ASSET(2) char spot02_sceneTex_00B080[] = dspot02_sceneTex_00B080; +#define dspot02_sceneTex_007E80 "__OTR__scenes/shared/spot02_scene/spot02_sceneTex_007E80" +static const ALIGN_ASSET(2) char spot02_sceneTex_007E80[] = dspot02_sceneTex_007E80; -#define dspot02_sceneTex_00AE80 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneTex_00AE80" -static const ALIGN_ASSET(2) char spot02_sceneTex_00AE80[] = dspot02_sceneTex_00AE80; - -#define dspot02_sceneTex_008E80 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneTex_008E80" -static const ALIGN_ASSET(2) char spot02_sceneTex_008E80[] = dspot02_sceneTex_008E80; - -#define dspot02_sceneTex_008680 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneTex_008680" +#define dspot02_sceneTex_008680 "__OTR__scenes/shared/spot02_scene/spot02_sceneTex_008680" static const ALIGN_ASSET(2) char spot02_sceneTex_008680[] = dspot02_sceneTex_008680; -#define dspot02_sceneTex_00A280 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneTex_00A280" +#define dspot02_sceneTex_008E80 "__OTR__scenes/shared/spot02_scene/spot02_sceneTex_008E80" +static const ALIGN_ASSET(2) char spot02_sceneTex_008E80[] = dspot02_sceneTex_008E80; + +#define dspot02_sceneTex_009E80 "__OTR__scenes/shared/spot02_scene/spot02_sceneTex_009E80" +static const ALIGN_ASSET(2) char spot02_sceneTex_009E80[] = dspot02_sceneTex_009E80; + +#define dspot02_sceneTex_00A280 "__OTR__scenes/shared/spot02_scene/spot02_sceneTex_00A280" static const ALIGN_ASSET(2) char spot02_sceneTex_00A280[] = dspot02_sceneTex_00A280; -#define dspot02_sceneTex_00AA80 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneTex_00AA80" +#define dspot02_sceneTex_00AA80 "__OTR__scenes/shared/spot02_scene/spot02_sceneTex_00AA80" static const ALIGN_ASSET(2) char spot02_sceneTex_00AA80[] = dspot02_sceneTex_00AA80; -#define dspot02_sceneTex_00B880 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneTex_00B880" +#define dspot02_sceneTex_00AE80 "__OTR__scenes/shared/spot02_scene/spot02_sceneTex_00AE80" +static const ALIGN_ASSET(2) char spot02_sceneTex_00AE80[] = dspot02_sceneTex_00AE80; + +#define dspot02_sceneTex_00B080 "__OTR__scenes/shared/spot02_scene/spot02_sceneTex_00B080" +static const ALIGN_ASSET(2) char spot02_sceneTex_00B080[] = dspot02_sceneTex_00B080; + +#define dspot02_sceneTex_00B880 "__OTR__scenes/shared/spot02_scene/spot02_sceneTex_00B880" static const ALIGN_ASSET(2) char spot02_sceneTex_00B880[] = dspot02_sceneTex_00B880; -#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneCollisionHeader_003C54" +#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/shared/spot02_scene/spot02_sceneCollisionHeader_003C54" +static const ALIGN_ASSET(2) char spot02_sceneCollisionHeader_003C54[] = dspot02_sceneCollisionHeader_003C54; -#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneCollisionHeader_003C54" +#define dspot02_scene_Cs_003C80 "__OTR__scenes/shared/spot02_scene/spot02_scene_Cs_003C80" +static const ALIGN_ASSET(2) char spot02_scene_Cs_003C80[] = dspot02_scene_Cs_003C80; -#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneCollisionHeader_003C54" +#define dspot02_scene_Cs_005020 "__OTR__scenes/shared/spot02_scene/spot02_scene_Cs_005020" +static const ALIGN_ASSET(2) char spot02_scene_Cs_005020[] = dspot02_scene_Cs_005020; -#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneCollisionHeader_003C54" +#define dgGraveyardIntroCs "__OTR__scenes/shared/spot02_scene/gGraveyardIntroCs" +static const ALIGN_ASSET(2) char gGraveyardIntroCs[] = dgGraveyardIntroCs; -#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneCollisionHeader_003C54" +#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/shared/spot02_scene/spot02_sceneCollisionHeader_003C54" + +#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/shared/spot02_scene/spot02_sceneCollisionHeader_003C54" + +#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/shared/spot02_scene/spot02_sceneCollisionHeader_003C54" + +#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/shared/spot02_scene/spot02_sceneCollisionHeader_003C54" + +#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/shared/spot02_scene/spot02_sceneCollisionHeader_003C54" #endif // OVERWORLD_SPOT02_SCENE_H diff --git a/soh/assets/scenes/overworld/spot03/spot03_room_0.h b/soh/assets/scenes/overworld/spot03/spot03_room_0.h index e8d8bd6db..53d18f416 100644 --- a/soh/assets/scenes/overworld/spot03/spot03_room_0.h +++ b/soh/assets/scenes/overworld/spot03/spot03_room_0.h @@ -3,109 +3,109 @@ #include "align_asset_macro.h" -#define dspot03_room_0DL_009660 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_009660" -static const ALIGN_ASSET(2) char spot03_room_0DL_009660[] = dspot03_room_0DL_009660; - -#define dspot03_room_0DL_001460 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_001460" -static const ALIGN_ASSET(2) char spot03_room_0DL_001460[] = dspot03_room_0DL_001460; - -#define dspot03_room_0DL_00C4B0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_00C4B0" -static const ALIGN_ASSET(2) char spot03_room_0DL_00C4B0[] = dspot03_room_0DL_00C4B0; - -#define dspot03_room_0Tex_00D180 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Tex_00D180" -static const ALIGN_ASSET(2) char spot03_room_0Tex_00D180[] = dspot03_room_0Tex_00D180; - -#define dspot03_room_0DL_008248 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_008248" -static const ALIGN_ASSET(2) char spot03_room_0DL_008248[] = dspot03_room_0DL_008248; - -#define dspot03_room_0Tex_00A3B0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Tex_00A3B0" -static const ALIGN_ASSET(2) char spot03_room_0Tex_00A3B0[] = dspot03_room_0Tex_00A3B0; - -#define dspot03_room_0DL_007A80 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_007A80" -static const ALIGN_ASSET(2) char spot03_room_0DL_007A80[] = dspot03_room_0DL_007A80; - -#define dspot03_room_0Tex_00ABB0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Tex_00ABB0" -static const ALIGN_ASSET(2) char spot03_room_0Tex_00ABB0[] = dspot03_room_0Tex_00ABB0; - -#define dspot03_room_0Tex_00BBB0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Tex_00BBB0" -static const ALIGN_ASSET(2) char spot03_room_0Tex_00BBB0[] = dspot03_room_0Tex_00BBB0; - -#define dspot03_room_0DL_0022F0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_0022F0" -static const ALIGN_ASSET(2) char spot03_room_0DL_0022F0[] = dspot03_room_0DL_0022F0; - -#define dspot03_room_0Tex_0097B0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Tex_0097B0" +#define dspot03_room_0Tex_0097B0 "__OTR__scenes/shared/spot03_scene/spot03_room_0Tex_0097B0" static const ALIGN_ASSET(2) char spot03_room_0Tex_0097B0[] = dspot03_room_0Tex_0097B0; -#define dspot03_room_0DL_003298 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_003298" -static const ALIGN_ASSET(2) char spot03_room_0DL_003298[] = dspot03_room_0DL_003298; - -#define dspot03_room_0Tex_009BB0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Tex_009BB0" +#define dspot03_room_0Tex_009BB0 "__OTR__scenes/shared/spot03_scene/spot03_room_0Tex_009BB0" static const ALIGN_ASSET(2) char spot03_room_0Tex_009BB0[] = dspot03_room_0Tex_009BB0; -#define dspot03_room_0DL_004658 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_004658" -static const ALIGN_ASSET(2) char spot03_room_0DL_004658[] = dspot03_room_0DL_004658; +#define dspot03_room_0Tex_00A3B0 "__OTR__scenes/shared/spot03_scene/spot03_room_0Tex_00A3B0" +static const ALIGN_ASSET(2) char spot03_room_0Tex_00A3B0[] = dspot03_room_0Tex_00A3B0; -#define dspot03_room_0DL_0054D8 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_0054D8" -static const ALIGN_ASSET(2) char spot03_room_0DL_0054D8[] = dspot03_room_0DL_0054D8; +#define dspot03_room_0Tex_00ABB0 "__OTR__scenes/shared/spot03_scene/spot03_room_0Tex_00ABB0" +static const ALIGN_ASSET(2) char spot03_room_0Tex_00ABB0[] = dspot03_room_0Tex_00ABB0; -#define dspot03_room_0DL_006508 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_006508" -static const ALIGN_ASSET(2) char spot03_room_0DL_006508[] = dspot03_room_0DL_006508; +#define dspot03_room_0Tex_00BBB0 "__OTR__scenes/shared/spot03_scene/spot03_room_0Tex_00BBB0" +static const ALIGN_ASSET(2) char spot03_room_0Tex_00BBB0[] = dspot03_room_0Tex_00BBB0; -#define dspot03_room_0DL_007478 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_007478" -static const ALIGN_ASSET(2) char spot03_room_0DL_007478[] = dspot03_room_0DL_007478; - -#define dspot03_room_0DL_008B88 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_008B88" -static const ALIGN_ASSET(2) char spot03_room_0DL_008B88[] = dspot03_room_0DL_008B88; - -#define dspot03_room_0Tex_00BFB0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Tex_00BFB0" +#define dspot03_room_0Tex_00BFB0 "__OTR__scenes/shared/spot03_scene/spot03_room_0Tex_00BFB0" static const ALIGN_ASSET(2) char spot03_room_0Tex_00BFB0[] = dspot03_room_0Tex_00BFB0; -#define dspot03_room_0DL_009330 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_009330" +#define dspot03_room_0Tex_00D180 "__OTR__scenes/shared/spot03_scene/spot03_room_0Tex_00D180" +static const ALIGN_ASSET(2) char spot03_room_0Tex_00D180[] = dspot03_room_0Tex_00D180; + +#define dspot03_room_0DL_009660 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_009660" +static const ALIGN_ASSET(2) char spot03_room_0DL_009660[] = dspot03_room_0DL_009660; + +#define dspot03_room_0DL_001460 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_001460" +static const ALIGN_ASSET(2) char spot03_room_0DL_001460[] = dspot03_room_0DL_001460; + +#define dspot03_room_0DL_00C4B0 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_00C4B0" +static const ALIGN_ASSET(2) char spot03_room_0DL_00C4B0[] = dspot03_room_0DL_00C4B0; + +#define dspot03_room_0DL_008248 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_008248" +static const ALIGN_ASSET(2) char spot03_room_0DL_008248[] = dspot03_room_0DL_008248; + +#define dspot03_room_0DL_007A80 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_007A80" +static const ALIGN_ASSET(2) char spot03_room_0DL_007A80[] = dspot03_room_0DL_007A80; + +#define dspot03_room_0DL_0022F0 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_0022F0" +static const ALIGN_ASSET(2) char spot03_room_0DL_0022F0[] = dspot03_room_0DL_0022F0; + +#define dspot03_room_0DL_003298 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_003298" +static const ALIGN_ASSET(2) char spot03_room_0DL_003298[] = dspot03_room_0DL_003298; + +#define dspot03_room_0DL_004658 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_004658" +static const ALIGN_ASSET(2) char spot03_room_0DL_004658[] = dspot03_room_0DL_004658; + +#define dspot03_room_0DL_0054D8 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_0054D8" +static const ALIGN_ASSET(2) char spot03_room_0DL_0054D8[] = dspot03_room_0DL_0054D8; + +#define dspot03_room_0DL_006508 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_006508" +static const ALIGN_ASSET(2) char spot03_room_0DL_006508[] = dspot03_room_0DL_006508; + +#define dspot03_room_0DL_007478 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_007478" +static const ALIGN_ASSET(2) char spot03_room_0DL_007478[] = dspot03_room_0DL_007478; + +#define dspot03_room_0DL_008B88 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_008B88" +static const ALIGN_ASSET(2) char spot03_room_0DL_008B88[] = dspot03_room_0DL_008B88; + +#define dspot03_room_0DL_009330 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_009330" static const ALIGN_ASSET(2) char spot03_room_0DL_009330[] = dspot03_room_0DL_009330; -#define dspot03_room_0DL_00CEB0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_00CEB0" +#define dspot03_room_0DL_00CEB0 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_00CEB0" static const ALIGN_ASSET(2) char spot03_room_0DL_00CEB0[] = dspot03_room_0DL_00CEB0; -#define dspot03_room_0Set_000580DL_009660 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_009660" +#define dspot03_room_0Set_000580DL_009660 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_009660" static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_009660[] = dspot03_room_0Set_000580DL_009660; -#define dspot03_room_0Set_000580DL_001460 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_001460" +#define dspot03_room_0Set_000580DL_001460 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_001460" static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_001460[] = dspot03_room_0Set_000580DL_001460; -#define dspot03_room_0Set_000580DL_00C4B0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_00C4B0" +#define dspot03_room_0Set_000580DL_00C4B0 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_00C4B0" static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_00C4B0[] = dspot03_room_0Set_000580DL_00C4B0; -#define dspot03_room_0Set_000580DL_008248 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_008248" +#define dspot03_room_0Set_000580DL_008248 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_008248" static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_008248[] = dspot03_room_0Set_000580DL_008248; -#define dspot03_room_0Set_000580DL_007A80 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_007A80" +#define dspot03_room_0Set_000580DL_007A80 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_007A80" static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_007A80[] = dspot03_room_0Set_000580DL_007A80; -#define dspot03_room_0Set_000580DL_0022F0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_0022F0" +#define dspot03_room_0Set_000580DL_0022F0 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_0022F0" static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_0022F0[] = dspot03_room_0Set_000580DL_0022F0; -#define dspot03_room_0Set_000580DL_003298 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_003298" +#define dspot03_room_0Set_000580DL_003298 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_003298" static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_003298[] = dspot03_room_0Set_000580DL_003298; -#define dspot03_room_0Set_000580DL_004658 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_004658" +#define dspot03_room_0Set_000580DL_004658 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_004658" static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_004658[] = dspot03_room_0Set_000580DL_004658; -#define dspot03_room_0Set_000580DL_0054D8 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_0054D8" +#define dspot03_room_0Set_000580DL_0054D8 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_0054D8" static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_0054D8[] = dspot03_room_0Set_000580DL_0054D8; -#define dspot03_room_0Set_000580DL_006508 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_006508" +#define dspot03_room_0Set_000580DL_006508 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_006508" static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_006508[] = dspot03_room_0Set_000580DL_006508; -#define dspot03_room_0Set_000580DL_007478 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_007478" +#define dspot03_room_0Set_000580DL_007478 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_007478" static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_007478[] = dspot03_room_0Set_000580DL_007478; -#define dspot03_room_0Set_000580DL_008B88 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_008B88" +#define dspot03_room_0Set_000580DL_008B88 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_008B88" static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_008B88[] = dspot03_room_0Set_000580DL_008B88; -#define dspot03_room_0Set_000580DL_009330 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_009330" +#define dspot03_room_0Set_000580DL_009330 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_009330" static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_009330[] = dspot03_room_0Set_000580DL_009330; -#define dspot03_room_0Set_000580DL_00CEB0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_00CEB0" +#define dspot03_room_0Set_000580DL_00CEB0 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_00CEB0" static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_00CEB0[] = dspot03_room_0Set_000580DL_00CEB0; diff --git a/soh/assets/scenes/overworld/spot03/spot03_room_1.h b/soh/assets/scenes/overworld/spot03/spot03_room_1.h index 4d5a1cfe8..c5b4367d1 100644 --- a/soh/assets/scenes/overworld/spot03/spot03_room_1.h +++ b/soh/assets/scenes/overworld/spot03/spot03_room_1.h @@ -3,88 +3,88 @@ #include "align_asset_macro.h" -#define dgSpot03DL_0074E8 "__OTR__scenes/nonmq/spot03_scene/gSpot03DL_0074E8" -static const ALIGN_ASSET(2) char gSpot03DL_0074E8[] = dgSpot03DL_0074E8; - -#define dspot03_room_1DL_004F98 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1DL_004F98" -static const ALIGN_ASSET(2) char spot03_room_1DL_004F98[] = dspot03_room_1DL_004F98; - -#define dspot03_room_1DL_000750 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1DL_000750" -static const ALIGN_ASSET(2) char spot03_room_1DL_000750[] = dspot03_room_1DL_000750; - -#define dspot03_room_1DL_001078 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1DL_001078" -static const ALIGN_ASSET(2) char spot03_room_1DL_001078[] = dspot03_room_1DL_001078; - -#define dspot03_room_1DL_001AA8 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1DL_001AA8" -static const ALIGN_ASSET(2) char spot03_room_1DL_001AA8[] = dspot03_room_1DL_001AA8; - -#define dspot03_room_1DL_003658 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1DL_003658" -static const ALIGN_ASSET(2) char spot03_room_1DL_003658[] = dspot03_room_1DL_003658; - -#define dspot03_room_1DL_0023E0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1DL_0023E0" -static const ALIGN_ASSET(2) char spot03_room_1DL_0023E0[] = dspot03_room_1DL_0023E0; - -#define dspot03_room_1Tex_0058D8 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Tex_0058D8" -static const ALIGN_ASSET(2) char spot03_room_1Tex_0058D8[] = dspot03_room_1Tex_0058D8; - -#define dspot03_room_1Tex_0050D8 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Tex_0050D8" +#define dspot03_room_1Tex_0050D8 "__OTR__scenes/shared/spot03_scene/spot03_room_1Tex_0050D8" static const ALIGN_ASSET(2) char spot03_room_1Tex_0050D8[] = dspot03_room_1Tex_0050D8; -#define dspot03_room_1Tex_0062D8 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Tex_0062D8" -static const ALIGN_ASSET(2) char spot03_room_1Tex_0062D8[] = dspot03_room_1Tex_0062D8; +#define dspot03_room_1Tex_0058D8 "__OTR__scenes/shared/spot03_scene/spot03_room_1Tex_0058D8" +static const ALIGN_ASSET(2) char spot03_room_1Tex_0058D8[] = dspot03_room_1Tex_0058D8; -#define dspot03_room_1DL_0043D0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1DL_0043D0" -static const ALIGN_ASSET(2) char spot03_room_1DL_0043D0[] = dspot03_room_1DL_0043D0; - -#define dspot03_room_1DL_002CB0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1DL_002CB0" -static const ALIGN_ASSET(2) char spot03_room_1DL_002CB0[] = dspot03_room_1DL_002CB0; - -#define dspot03_room_1Tex_005ED8 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Tex_005ED8" -static const ALIGN_ASSET(2) char spot03_room_1Tex_005ED8[] = dspot03_room_1Tex_005ED8; - -#define dspot03_room_1Tex_005CD8 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Tex_005CD8" +#define dspot03_room_1Tex_005CD8 "__OTR__scenes/shared/spot03_scene/spot03_room_1Tex_005CD8" static const ALIGN_ASSET(2) char spot03_room_1Tex_005CD8[] = dspot03_room_1Tex_005CD8; -#define dspot03_room_1DL_0047C0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1DL_0047C0" +#define dspot03_room_1Tex_005ED8 "__OTR__scenes/shared/spot03_scene/spot03_room_1Tex_005ED8" +static const ALIGN_ASSET(2) char spot03_room_1Tex_005ED8[] = dspot03_room_1Tex_005ED8; + +#define dspot03_room_1Tex_0062D8 "__OTR__scenes/shared/spot03_scene/spot03_room_1Tex_0062D8" +static const ALIGN_ASSET(2) char spot03_room_1Tex_0062D8[] = dspot03_room_1Tex_0062D8; + +#define dgSpot03DL_0074E8 "__OTR__scenes/shared/spot03_scene/gSpot03DL_0074E8" +static const ALIGN_ASSET(2) char gSpot03DL_0074E8[] = dgSpot03DL_0074E8; + +#define dspot03_room_1DL_004F98 "__OTR__scenes/shared/spot03_scene/spot03_room_1DL_004F98" +static const ALIGN_ASSET(2) char spot03_room_1DL_004F98[] = dspot03_room_1DL_004F98; + +#define dspot03_room_1DL_000750 "__OTR__scenes/shared/spot03_scene/spot03_room_1DL_000750" +static const ALIGN_ASSET(2) char spot03_room_1DL_000750[] = dspot03_room_1DL_000750; + +#define dspot03_room_1DL_001078 "__OTR__scenes/shared/spot03_scene/spot03_room_1DL_001078" +static const ALIGN_ASSET(2) char spot03_room_1DL_001078[] = dspot03_room_1DL_001078; + +#define dspot03_room_1DL_001AA8 "__OTR__scenes/shared/spot03_scene/spot03_room_1DL_001AA8" +static const ALIGN_ASSET(2) char spot03_room_1DL_001AA8[] = dspot03_room_1DL_001AA8; + +#define dspot03_room_1DL_003658 "__OTR__scenes/shared/spot03_scene/spot03_room_1DL_003658" +static const ALIGN_ASSET(2) char spot03_room_1DL_003658[] = dspot03_room_1DL_003658; + +#define dspot03_room_1DL_0023E0 "__OTR__scenes/shared/spot03_scene/spot03_room_1DL_0023E0" +static const ALIGN_ASSET(2) char spot03_room_1DL_0023E0[] = dspot03_room_1DL_0023E0; + +#define dspot03_room_1DL_0043D0 "__OTR__scenes/shared/spot03_scene/spot03_room_1DL_0043D0" +static const ALIGN_ASSET(2) char spot03_room_1DL_0043D0[] = dspot03_room_1DL_0043D0; + +#define dspot03_room_1DL_002CB0 "__OTR__scenes/shared/spot03_scene/spot03_room_1DL_002CB0" +static const ALIGN_ASSET(2) char spot03_room_1DL_002CB0[] = dspot03_room_1DL_002CB0; + +#define dspot03_room_1DL_0047C0 "__OTR__scenes/shared/spot03_scene/spot03_room_1DL_0047C0" static const ALIGN_ASSET(2) char spot03_room_1DL_0047C0[] = dspot03_room_1DL_0047C0; -#define dspot03_room_1DL_004C88 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1DL_004C88" +#define dspot03_room_1DL_004C88 "__OTR__scenes/shared/spot03_scene/spot03_room_1DL_004C88" static const ALIGN_ASSET(2) char spot03_room_1DL_004C88[] = dspot03_room_1DL_004C88; -#define dspot03_room_1DL_007210 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1DL_007210" +#define dspot03_room_1DL_007210 "__OTR__scenes/shared/spot03_scene/spot03_room_1DL_007210" static const ALIGN_ASSET(2) char spot03_room_1DL_007210[] = dspot03_room_1DL_007210; -#define dspot03_room_1Set_0001E0DL_004F98 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Set_0001E0DL_004F98" +#define dspot03_room_1Set_0001E0DL_004F98 "__OTR__scenes/shared/spot03_scene/spot03_room_1Set_0001E0DL_004F98" static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_004F98[] = dspot03_room_1Set_0001E0DL_004F98; -#define dspot03_room_1Set_0001E0DL_000750 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Set_0001E0DL_000750" +#define dspot03_room_1Set_0001E0DL_000750 "__OTR__scenes/shared/spot03_scene/spot03_room_1Set_0001E0DL_000750" static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_000750[] = dspot03_room_1Set_0001E0DL_000750; -#define dspot03_room_1Set_0001E0DL_001078 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Set_0001E0DL_001078" +#define dspot03_room_1Set_0001E0DL_001078 "__OTR__scenes/shared/spot03_scene/spot03_room_1Set_0001E0DL_001078" static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_001078[] = dspot03_room_1Set_0001E0DL_001078; -#define dspot03_room_1Set_0001E0DL_001AA8 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Set_0001E0DL_001AA8" +#define dspot03_room_1Set_0001E0DL_001AA8 "__OTR__scenes/shared/spot03_scene/spot03_room_1Set_0001E0DL_001AA8" static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_001AA8[] = dspot03_room_1Set_0001E0DL_001AA8; -#define dspot03_room_1Set_0001E0DL_003658 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Set_0001E0DL_003658" +#define dspot03_room_1Set_0001E0DL_003658 "__OTR__scenes/shared/spot03_scene/spot03_room_1Set_0001E0DL_003658" static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_003658[] = dspot03_room_1Set_0001E0DL_003658; -#define dspot03_room_1Set_0001E0DL_0023E0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Set_0001E0DL_0023E0" +#define dspot03_room_1Set_0001E0DL_0023E0 "__OTR__scenes/shared/spot03_scene/spot03_room_1Set_0001E0DL_0023E0" static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_0023E0[] = dspot03_room_1Set_0001E0DL_0023E0; -#define dspot03_room_1Set_0001E0DL_0043D0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Set_0001E0DL_0043D0" +#define dspot03_room_1Set_0001E0DL_0043D0 "__OTR__scenes/shared/spot03_scene/spot03_room_1Set_0001E0DL_0043D0" static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_0043D0[] = dspot03_room_1Set_0001E0DL_0043D0; -#define dspot03_room_1Set_0001E0DL_002CB0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Set_0001E0DL_002CB0" +#define dspot03_room_1Set_0001E0DL_002CB0 "__OTR__scenes/shared/spot03_scene/spot03_room_1Set_0001E0DL_002CB0" static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_002CB0[] = dspot03_room_1Set_0001E0DL_002CB0; -#define dspot03_room_1Set_0001E0DL_0047C0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Set_0001E0DL_0047C0" +#define dspot03_room_1Set_0001E0DL_0047C0 "__OTR__scenes/shared/spot03_scene/spot03_room_1Set_0001E0DL_0047C0" static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_0047C0[] = dspot03_room_1Set_0001E0DL_0047C0; -#define dspot03_room_1Set_0001E0DL_004C88 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Set_0001E0DL_004C88" +#define dspot03_room_1Set_0001E0DL_004C88 "__OTR__scenes/shared/spot03_scene/spot03_room_1Set_0001E0DL_004C88" static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_004C88[] = dspot03_room_1Set_0001E0DL_004C88; -#define dspot03_room_1Set_0001E0DL_007210 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Set_0001E0DL_007210" +#define dspot03_room_1Set_0001E0DL_007210 "__OTR__scenes/shared/spot03_scene/spot03_room_1Set_0001E0DL_007210" static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_007210[] = dspot03_room_1Set_0001E0DL_007210; diff --git a/soh/assets/scenes/overworld/spot03/spot03_scene.h b/soh/assets/scenes/overworld/spot03/spot03_scene.h index 477894324..8e7060047 100644 --- a/soh/assets/scenes/overworld/spot03/spot03_scene.h +++ b/soh/assets/scenes/overworld/spot03/spot03_scene.h @@ -3,52 +3,52 @@ #include "align_asset_macro.h" -#define dspot03_sceneCollisionHeader_006580 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneCollisionHeader_006580" -static const ALIGN_ASSET(2) char spot03_sceneCollisionHeader_006580[] = dspot03_sceneCollisionHeader_006580; - -#define dspot03_sceneTex_007D58 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTex_007D58" -static const ALIGN_ASSET(2) char spot03_sceneTex_007D58[] = dspot03_sceneTex_007D58; - -#define dspot03_sceneTex_00A558 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTex_00A558" -static const ALIGN_ASSET(2) char spot03_sceneTex_00A558[] = dspot03_sceneTex_00A558; - -#define dspot03_sceneTex_009D58 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTex_009D58" -static const ALIGN_ASSET(2) char spot03_sceneTex_009D58[] = dspot03_sceneTex_009D58; - -#define dspot03_sceneTex_006D58 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTex_006D58" +#define dspot03_sceneTex_006D58 "__OTR__scenes/shared/spot03_scene/spot03_sceneTex_006D58" static const ALIGN_ASSET(2) char spot03_sceneTex_006D58[] = dspot03_sceneTex_006D58; -#define dspot03_sceneTLUT_006920 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTLUT_006920" -static const ALIGN_ASSET(2) char spot03_sceneTLUT_006920[] = dspot03_sceneTLUT_006920; - -#define dspot03_sceneTLUT_006B28 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTLUT_006B28" -static const ALIGN_ASSET(2) char spot03_sceneTLUT_006B28[] = dspot03_sceneTLUT_006B28; - -#define dspot03_sceneTex_00AD58 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTex_00AD58" -static const ALIGN_ASSET(2) char spot03_sceneTex_00AD58[] = dspot03_sceneTex_00AD58; - -#define dspot03_sceneTex_008558 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTex_008558" -static const ALIGN_ASSET(2) char spot03_sceneTex_008558[] = dspot03_sceneTex_008558; - -#define dspot03_sceneTex_009558 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTex_009558" -static const ALIGN_ASSET(2) char spot03_sceneTex_009558[] = dspot03_sceneTex_009558; - -#define dspot03_sceneTLUT_006D30 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTLUT_006D30" -static const ALIGN_ASSET(2) char spot03_sceneTLUT_006D30[] = dspot03_sceneTLUT_006D30; - -#define dspot03_sceneTex_007958 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTex_007958" -static const ALIGN_ASSET(2) char spot03_sceneTex_007958[] = dspot03_sceneTex_007958; - -#define dspot03_sceneTex_007158 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTex_007158" +#define dspot03_sceneTex_007158 "__OTR__scenes/shared/spot03_scene/spot03_sceneTex_007158" static const ALIGN_ASSET(2) char spot03_sceneTex_007158[] = dspot03_sceneTex_007158; -#define dspot03_sceneTex_007558 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTex_007558" +#define dspot03_sceneTex_007558 "__OTR__scenes/shared/spot03_scene/spot03_sceneTex_007558" static const ALIGN_ASSET(2) char spot03_sceneTex_007558[] = dspot03_sceneTex_007558; -#define dspot03_sceneTex_008D58 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTex_008D58" +#define dspot03_sceneTex_007958 "__OTR__scenes/shared/spot03_scene/spot03_sceneTex_007958" +static const ALIGN_ASSET(2) char spot03_sceneTex_007958[] = dspot03_sceneTex_007958; + +#define dspot03_sceneTex_007D58 "__OTR__scenes/shared/spot03_scene/spot03_sceneTex_007D58" +static const ALIGN_ASSET(2) char spot03_sceneTex_007D58[] = dspot03_sceneTex_007D58; + +#define dspot03_sceneTex_008558 "__OTR__scenes/shared/spot03_scene/spot03_sceneTex_008558" +static const ALIGN_ASSET(2) char spot03_sceneTex_008558[] = dspot03_sceneTex_008558; + +#define dspot03_sceneTex_008D58 "__OTR__scenes/shared/spot03_scene/spot03_sceneTex_008D58" static const ALIGN_ASSET(2) char spot03_sceneTex_008D58[] = dspot03_sceneTex_008D58; -#define dspot03_sceneCollisionHeader_006580 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneCollisionHeader_006580" +#define dspot03_sceneTex_009558 "__OTR__scenes/shared/spot03_scene/spot03_sceneTex_009558" +static const ALIGN_ASSET(2) char spot03_sceneTex_009558[] = dspot03_sceneTex_009558; + +#define dspot03_sceneTex_009D58 "__OTR__scenes/shared/spot03_scene/spot03_sceneTex_009D58" +static const ALIGN_ASSET(2) char spot03_sceneTex_009D58[] = dspot03_sceneTex_009D58; + +#define dspot03_sceneTex_00A558 "__OTR__scenes/shared/spot03_scene/spot03_sceneTex_00A558" +static const ALIGN_ASSET(2) char spot03_sceneTex_00A558[] = dspot03_sceneTex_00A558; + +#define dspot03_sceneTex_00AD58 "__OTR__scenes/shared/spot03_scene/spot03_sceneTex_00AD58" +static const ALIGN_ASSET(2) char spot03_sceneTex_00AD58[] = dspot03_sceneTex_00AD58; + +#define dspot03_sceneTLUT_006920 "__OTR__scenes/shared/spot03_scene/spot03_sceneTLUT_006920" +static const ALIGN_ASSET(2) char spot03_sceneTLUT_006920[] = dspot03_sceneTLUT_006920; + +#define dspot03_sceneTLUT_006B28 "__OTR__scenes/shared/spot03_scene/spot03_sceneTLUT_006B28" +static const ALIGN_ASSET(2) char spot03_sceneTLUT_006B28[] = dspot03_sceneTLUT_006B28; + +#define dspot03_sceneTLUT_006D30 "__OTR__scenes/shared/spot03_scene/spot03_sceneTLUT_006D30" +static const ALIGN_ASSET(2) char spot03_sceneTLUT_006D30[] = dspot03_sceneTLUT_006D30; + +#define dspot03_sceneCollisionHeader_006580 "__OTR__scenes/shared/spot03_scene/spot03_sceneCollisionHeader_006580" +static const ALIGN_ASSET(2) char spot03_sceneCollisionHeader_006580[] = dspot03_sceneCollisionHeader_006580; + +#define dspot03_sceneCollisionHeader_006580 "__OTR__scenes/shared/spot03_scene/spot03_sceneCollisionHeader_006580" #endif // OVERWORLD_SPOT03_SCENE_H diff --git a/soh/assets/scenes/overworld/spot04/spot04_room_0.h b/soh/assets/scenes/overworld/spot04/spot04_room_0.h index a457f0932..316b0fa6a 100644 --- a/soh/assets/scenes/overworld/spot04/spot04_room_0.h +++ b/soh/assets/scenes/overworld/spot04/spot04_room_0.h @@ -3,940 +3,940 @@ #include "align_asset_macro.h" -#define dspot04_room_0DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_008ED8" -static const ALIGN_ASSET(2) char spot04_room_0DL_008ED8[] = dspot04_room_0DL_008ED8; - -#define dspot04_room_0Tex_013F08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_013F08" -static const ALIGN_ASSET(2) char spot04_room_0Tex_013F08[] = dspot04_room_0Tex_013F08; - -#define dspot04_room_0Tex_011D08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_011D08" -static const ALIGN_ASSET(2) char spot04_room_0Tex_011D08[] = dspot04_room_0Tex_011D08; - -#define dspot04_room_0Tex_015B08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_015B08" -static const ALIGN_ASSET(2) char spot04_room_0Tex_015B08[] = dspot04_room_0Tex_015B08; - -#define dspot04_room_0DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_0187F0" -static const ALIGN_ASSET(2) char spot04_room_0DL_0187F0[] = dspot04_room_0DL_0187F0; - -#define dspot04_room_0Tex_01A290 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_01A290" -static const ALIGN_ASSET(2) char spot04_room_0Tex_01A290[] = dspot04_room_0Tex_01A290; - -#define dspot04_room_0DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_007A20" -static const ALIGN_ASSET(2) char spot04_room_0DL_007A20[] = dspot04_room_0DL_007A20; - -#define dspot04_room_0Tex_00FD08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00FD08" -static const ALIGN_ASSET(2) char spot04_room_0Tex_00FD08[] = dspot04_room_0Tex_00FD08; - -#define dspot04_room_0Tex_00F508 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00F508" -static const ALIGN_ASSET(2) char spot04_room_0Tex_00F508[] = dspot04_room_0Tex_00F508; - -#define dspot04_room_0Tex_00F108 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00F108" -static const ALIGN_ASSET(2) char spot04_room_0Tex_00F108[] = dspot04_room_0Tex_00F108; - -#define dspot04_room_0Tex_010D08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_010D08" -static const ALIGN_ASSET(2) char spot04_room_0Tex_010D08[] = dspot04_room_0Tex_010D08; - -#define dspot04_room_0Tex_00E108 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00E108" -static const ALIGN_ASSET(2) char spot04_room_0Tex_00E108[] = dspot04_room_0Tex_00E108; - -#define dspot04_room_0Tex_00BF08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00BF08" +#define dspot04_room_0Tex_00BF08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00BF08" static const ALIGN_ASSET(2) char spot04_room_0Tex_00BF08[] = dspot04_room_0Tex_00BF08; -#define dspot04_room_0Tex_00E908 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00E908" -static const ALIGN_ASSET(2) char spot04_room_0Tex_00E908[] = dspot04_room_0Tex_00E908; - -#define dspot04_room_0DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_018490" -static const ALIGN_ASSET(2) char spot04_room_0DL_018490[] = dspot04_room_0DL_018490; - -#define dspot04_room_0Tex_01A490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_01A490" -static const ALIGN_ASSET(2) char spot04_room_0Tex_01A490[] = dspot04_room_0Tex_01A490; - -#define dspot04_room_0Tex_01AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_01AE90" -static const ALIGN_ASSET(2) char spot04_room_0Tex_01AE90[] = dspot04_room_0Tex_01AE90; - -#define dspot04_room_0Tex_01AC90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_01AC90" -static const ALIGN_ASSET(2) char spot04_room_0Tex_01AC90[] = dspot04_room_0Tex_01AC90; - -#define dspot04_room_0DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_008638" -static const ALIGN_ASSET(2) char spot04_room_0DL_008638[] = dspot04_room_0DL_008638; - -#define dspot04_room_0Tex_016908 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_016908" -static const ALIGN_ASSET(2) char spot04_room_0Tex_016908[] = dspot04_room_0Tex_016908; - -#define dspot04_room_0DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_00A080" -static const ALIGN_ASSET(2) char spot04_room_0DL_00A080[] = dspot04_room_0DL_00A080; - -#define dspot04_room_0DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_017BD0" -static const ALIGN_ASSET(2) char spot04_room_0DL_017BD0[] = dspot04_room_0DL_017BD0; - -#define dspot04_room_0Tex_018A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_018A90" -static const ALIGN_ASSET(2) char spot04_room_0Tex_018A90[] = dspot04_room_0Tex_018A90; - -#define dspot04_room_0DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_004860" -static const ALIGN_ASSET(2) char spot04_room_0DL_004860[] = dspot04_room_0DL_004860; - -#define dspot04_room_0DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_018048" -static const ALIGN_ASSET(2) char spot04_room_0DL_018048[] = dspot04_room_0DL_018048; - -#define dspot04_room_0Tex_019A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_019A90" -static const ALIGN_ASSET(2) char spot04_room_0Tex_019A90[] = dspot04_room_0Tex_019A90; - -#define dspot04_room_0Tex_019290 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_019290" -static const ALIGN_ASSET(2) char spot04_room_0Tex_019290[] = dspot04_room_0Tex_019290; - -#define dspot04_room_0DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_00AE90" -static const ALIGN_ASSET(2) char spot04_room_0DL_00AE90[] = dspot04_room_0DL_00AE90; - -#define dspot04_room_0DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_002A10" -static const ALIGN_ASSET(2) char spot04_room_0DL_002A10[] = dspot04_room_0DL_002A10; - -#define dspot04_room_0Tex_013108 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_013108" -static const ALIGN_ASSET(2) char spot04_room_0Tex_013108[] = dspot04_room_0Tex_013108; - -#define dspot04_room_0Tex_012F08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_012F08" -static const ALIGN_ASSET(2) char spot04_room_0Tex_012F08[] = dspot04_room_0Tex_012F08; - -#define dspot04_room_0DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_005A80" -static const ALIGN_ASSET(2) char spot04_room_0DL_005A80[] = dspot04_room_0DL_005A80; - -#define dspot04_room_0Tex_015308 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_015308" -static const ALIGN_ASSET(2) char spot04_room_0Tex_015308[] = dspot04_room_0Tex_015308; - -#define dspot04_room_0Tex_014B08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_014B08" -static const ALIGN_ASSET(2) char spot04_room_0Tex_014B08[] = dspot04_room_0Tex_014B08; - -#define dspot04_room_0DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_00B280" -static const ALIGN_ASSET(2) char spot04_room_0DL_00B280[] = dspot04_room_0DL_00B280; - -#define dspot04_room_0Tex_017108 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_017108" -static const ALIGN_ASSET(2) char spot04_room_0Tex_017108[] = dspot04_room_0Tex_017108; - -#define dspot04_room_0Tex_00D908 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00D908" -static const ALIGN_ASSET(2) char spot04_room_0Tex_00D908[] = dspot04_room_0Tex_00D908; - -#define dspot04_room_0DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_00B8F8" -static const ALIGN_ASSET(2) char spot04_room_0DL_00B8F8[] = dspot04_room_0DL_00B8F8; - -#define dspot04_room_0Tex_016D08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_016D08" -static const ALIGN_ASSET(2) char spot04_room_0Tex_016D08[] = dspot04_room_0Tex_016D08; - -#define dspot04_room_0Tex_013308 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_013308" -static const ALIGN_ASSET(2) char spot04_room_0Tex_013308[] = dspot04_room_0Tex_013308; - -#define dspot04_room_0DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_0189A8" -static const ALIGN_ASSET(2) char spot04_room_0DL_0189A8[] = dspot04_room_0DL_0189A8; - -#define dspot04_room_0Tex_01B090 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_01B090" -static const ALIGN_ASSET(2) char spot04_room_0Tex_01B090[] = dspot04_room_0Tex_01B090; - -#define dspot04_room_0DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_00BD98" -static const ALIGN_ASSET(2) char spot04_room_0DL_00BD98[] = dspot04_room_0DL_00BD98; - -#define dspot04_room_0Tex_011F08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_011F08" -static const ALIGN_ASSET(2) char spot04_room_0Tex_011F08[] = dspot04_room_0Tex_011F08; - -#define dspot04_room_0DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_006280" -static const ALIGN_ASSET(2) char spot04_room_0DL_006280[] = dspot04_room_0DL_006280; - -#define dspot04_room_0Tex_00CF08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00CF08" -static const ALIGN_ASSET(2) char spot04_room_0Tex_00CF08[] = dspot04_room_0Tex_00CF08; - -#define dspot04_room_0DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_006C10" -static const ALIGN_ASSET(2) char spot04_room_0DL_006C10[] = dspot04_room_0DL_006C10; - -#define dspot04_room_0Tex_00D408 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00D408" -static const ALIGN_ASSET(2) char spot04_room_0Tex_00D408[] = dspot04_room_0Tex_00D408; - -#define dspot04_room_0Tex_00D308 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00D308" -static const ALIGN_ASSET(2) char spot04_room_0Tex_00D308[] = dspot04_room_0Tex_00D308; - -#define dspot04_room_0Tex_015D08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_015D08" -static const ALIGN_ASSET(2) char spot04_room_0Tex_015D08[] = dspot04_room_0Tex_015D08; - -#define dspot04_room_0DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_009740" -static const ALIGN_ASSET(2) char spot04_room_0DL_009740[] = dspot04_room_0DL_009740; - -#define dspot04_room_0Tex_016508 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_016508" -static const ALIGN_ASSET(2) char spot04_room_0Tex_016508[] = dspot04_room_0Tex_016508; - -#define dspot04_room_0DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_00A808" -static const ALIGN_ASSET(2) char spot04_room_0DL_00A808[] = dspot04_room_0DL_00A808; - -#define dspot04_room_0Tex_016108 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_016108" -static const ALIGN_ASSET(2) char spot04_room_0Tex_016108[] = dspot04_room_0Tex_016108; - -#define dspot04_room_0Tex_00D508 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00D508" -static const ALIGN_ASSET(2) char spot04_room_0Tex_00D508[] = dspot04_room_0Tex_00D508; - -#define dspot04_room_0DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_0055C0" -static const ALIGN_ASSET(2) char spot04_room_0DL_0055C0[] = dspot04_room_0DL_0055C0; - -#define dspot04_room_0Tex_00C708 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00C708" +#define dspot04_room_0Tex_00C708 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00C708" static const ALIGN_ASSET(2) char spot04_room_0Tex_00C708[] = dspot04_room_0Tex_00C708; -#define dspot04_room_0Tex_00CB08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00CB08" +#define dspot04_room_0Tex_00CB08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00CB08" static const ALIGN_ASSET(2) char spot04_room_0Tex_00CB08[] = dspot04_room_0Tex_00CB08; -#define dspot04_room_0Tex_013708 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_013708" +#define dspot04_room_0Tex_00CF08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00CF08" +static const ALIGN_ASSET(2) char spot04_room_0Tex_00CF08[] = dspot04_room_0Tex_00CF08; + +#define dspot04_room_0Tex_00D308 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00D308" +static const ALIGN_ASSET(2) char spot04_room_0Tex_00D308[] = dspot04_room_0Tex_00D308; + +#define dspot04_room_0Tex_00D408 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00D408" +static const ALIGN_ASSET(2) char spot04_room_0Tex_00D408[] = dspot04_room_0Tex_00D408; + +#define dspot04_room_0Tex_00D508 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00D508" +static const ALIGN_ASSET(2) char spot04_room_0Tex_00D508[] = dspot04_room_0Tex_00D508; + +#define dspot04_room_0Tex_00D908 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00D908" +static const ALIGN_ASSET(2) char spot04_room_0Tex_00D908[] = dspot04_room_0Tex_00D908; + +#define dspot04_room_0Tex_00E108 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00E108" +static const ALIGN_ASSET(2) char spot04_room_0Tex_00E108[] = dspot04_room_0Tex_00E108; + +#define dspot04_room_0Tex_00E908 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00E908" +static const ALIGN_ASSET(2) char spot04_room_0Tex_00E908[] = dspot04_room_0Tex_00E908; + +#define dspot04_room_0Tex_00F108 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00F108" +static const ALIGN_ASSET(2) char spot04_room_0Tex_00F108[] = dspot04_room_0Tex_00F108; + +#define dspot04_room_0Tex_00F508 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00F508" +static const ALIGN_ASSET(2) char spot04_room_0Tex_00F508[] = dspot04_room_0Tex_00F508; + +#define dspot04_room_0Tex_00FD08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00FD08" +static const ALIGN_ASSET(2) char spot04_room_0Tex_00FD08[] = dspot04_room_0Tex_00FD08; + +#define dspot04_room_0Tex_010D08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_010D08" +static const ALIGN_ASSET(2) char spot04_room_0Tex_010D08[] = dspot04_room_0Tex_010D08; + +#define dspot04_room_0Tex_011D08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_011D08" +static const ALIGN_ASSET(2) char spot04_room_0Tex_011D08[] = dspot04_room_0Tex_011D08; + +#define dspot04_room_0Tex_011F08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_011F08" +static const ALIGN_ASSET(2) char spot04_room_0Tex_011F08[] = dspot04_room_0Tex_011F08; + +#define dspot04_room_0Tex_012F08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_012F08" +static const ALIGN_ASSET(2) char spot04_room_0Tex_012F08[] = dspot04_room_0Tex_012F08; + +#define dspot04_room_0Tex_013108 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_013108" +static const ALIGN_ASSET(2) char spot04_room_0Tex_013108[] = dspot04_room_0Tex_013108; + +#define dspot04_room_0Tex_013308 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_013308" +static const ALIGN_ASSET(2) char spot04_room_0Tex_013308[] = dspot04_room_0Tex_013308; + +#define dspot04_room_0Tex_013708 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_013708" static const ALIGN_ASSET(2) char spot04_room_0Tex_013708[] = dspot04_room_0Tex_013708; -#define dspot04_room_0Tex_014308 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_014308" +#define dspot04_room_0Tex_013F08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_013F08" +static const ALIGN_ASSET(2) char spot04_room_0Tex_013F08[] = dspot04_room_0Tex_013F08; + +#define dspot04_room_0Tex_014308 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_014308" static const ALIGN_ASSET(2) char spot04_room_0Tex_014308[] = dspot04_room_0Tex_014308; -#define dspot04_room_0Set_0006B0DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_008ED8" +#define dspot04_room_0Tex_014B08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_014B08" +static const ALIGN_ASSET(2) char spot04_room_0Tex_014B08[] = dspot04_room_0Tex_014B08; + +#define dspot04_room_0Tex_015308 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_015308" +static const ALIGN_ASSET(2) char spot04_room_0Tex_015308[] = dspot04_room_0Tex_015308; + +#define dspot04_room_0Tex_015B08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_015B08" +static const ALIGN_ASSET(2) char spot04_room_0Tex_015B08[] = dspot04_room_0Tex_015B08; + +#define dspot04_room_0Tex_015D08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_015D08" +static const ALIGN_ASSET(2) char spot04_room_0Tex_015D08[] = dspot04_room_0Tex_015D08; + +#define dspot04_room_0Tex_016108 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_016108" +static const ALIGN_ASSET(2) char spot04_room_0Tex_016108[] = dspot04_room_0Tex_016108; + +#define dspot04_room_0Tex_016508 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_016508" +static const ALIGN_ASSET(2) char spot04_room_0Tex_016508[] = dspot04_room_0Tex_016508; + +#define dspot04_room_0Tex_016908 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_016908" +static const ALIGN_ASSET(2) char spot04_room_0Tex_016908[] = dspot04_room_0Tex_016908; + +#define dspot04_room_0Tex_016D08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_016D08" +static const ALIGN_ASSET(2) char spot04_room_0Tex_016D08[] = dspot04_room_0Tex_016D08; + +#define dspot04_room_0Tex_017108 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_017108" +static const ALIGN_ASSET(2) char spot04_room_0Tex_017108[] = dspot04_room_0Tex_017108; + +#define dspot04_room_0Tex_018A90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_018A90" +static const ALIGN_ASSET(2) char spot04_room_0Tex_018A90[] = dspot04_room_0Tex_018A90; + +#define dspot04_room_0Tex_019290 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_019290" +static const ALIGN_ASSET(2) char spot04_room_0Tex_019290[] = dspot04_room_0Tex_019290; + +#define dspot04_room_0Tex_019A90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_019A90" +static const ALIGN_ASSET(2) char spot04_room_0Tex_019A90[] = dspot04_room_0Tex_019A90; + +#define dspot04_room_0Tex_01A290 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_01A290" +static const ALIGN_ASSET(2) char spot04_room_0Tex_01A290[] = dspot04_room_0Tex_01A290; + +#define dspot04_room_0Tex_01A490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_01A490" +static const ALIGN_ASSET(2) char spot04_room_0Tex_01A490[] = dspot04_room_0Tex_01A490; + +#define dspot04_room_0Tex_01AC90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_01AC90" +static const ALIGN_ASSET(2) char spot04_room_0Tex_01AC90[] = dspot04_room_0Tex_01AC90; + +#define dspot04_room_0Tex_01AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_01AE90" +static const ALIGN_ASSET(2) char spot04_room_0Tex_01AE90[] = dspot04_room_0Tex_01AE90; + +#define dspot04_room_0Tex_01B090 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_01B090" +static const ALIGN_ASSET(2) char spot04_room_0Tex_01B090[] = dspot04_room_0Tex_01B090; + +#define dspot04_room_0DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_008ED8" +static const ALIGN_ASSET(2) char spot04_room_0DL_008ED8[] = dspot04_room_0DL_008ED8; + +#define dspot04_room_0DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_0187F0" +static const ALIGN_ASSET(2) char spot04_room_0DL_0187F0[] = dspot04_room_0DL_0187F0; + +#define dspot04_room_0DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_007A20" +static const ALIGN_ASSET(2) char spot04_room_0DL_007A20[] = dspot04_room_0DL_007A20; + +#define dspot04_room_0DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_018490" +static const ALIGN_ASSET(2) char spot04_room_0DL_018490[] = dspot04_room_0DL_018490; + +#define dspot04_room_0DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_008638" +static const ALIGN_ASSET(2) char spot04_room_0DL_008638[] = dspot04_room_0DL_008638; + +#define dspot04_room_0DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_00A080" +static const ALIGN_ASSET(2) char spot04_room_0DL_00A080[] = dspot04_room_0DL_00A080; + +#define dspot04_room_0DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_017BD0" +static const ALIGN_ASSET(2) char spot04_room_0DL_017BD0[] = dspot04_room_0DL_017BD0; + +#define dspot04_room_0DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_004860" +static const ALIGN_ASSET(2) char spot04_room_0DL_004860[] = dspot04_room_0DL_004860; + +#define dspot04_room_0DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_018048" +static const ALIGN_ASSET(2) char spot04_room_0DL_018048[] = dspot04_room_0DL_018048; + +#define dspot04_room_0DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_00AE90" +static const ALIGN_ASSET(2) char spot04_room_0DL_00AE90[] = dspot04_room_0DL_00AE90; + +#define dspot04_room_0DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_002A10" +static const ALIGN_ASSET(2) char spot04_room_0DL_002A10[] = dspot04_room_0DL_002A10; + +#define dspot04_room_0DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_005A80" +static const ALIGN_ASSET(2) char spot04_room_0DL_005A80[] = dspot04_room_0DL_005A80; + +#define dspot04_room_0DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_00B280" +static const ALIGN_ASSET(2) char spot04_room_0DL_00B280[] = dspot04_room_0DL_00B280; + +#define dspot04_room_0DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_00B8F8" +static const ALIGN_ASSET(2) char spot04_room_0DL_00B8F8[] = dspot04_room_0DL_00B8F8; + +#define dspot04_room_0DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_0189A8" +static const ALIGN_ASSET(2) char spot04_room_0DL_0189A8[] = dspot04_room_0DL_0189A8; + +#define dspot04_room_0DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_00BD98" +static const ALIGN_ASSET(2) char spot04_room_0DL_00BD98[] = dspot04_room_0DL_00BD98; + +#define dspot04_room_0DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_006280" +static const ALIGN_ASSET(2) char spot04_room_0DL_006280[] = dspot04_room_0DL_006280; + +#define dspot04_room_0DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_006C10" +static const ALIGN_ASSET(2) char spot04_room_0DL_006C10[] = dspot04_room_0DL_006C10; + +#define dspot04_room_0DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_009740" +static const ALIGN_ASSET(2) char spot04_room_0DL_009740[] = dspot04_room_0DL_009740; + +#define dspot04_room_0DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_00A808" +static const ALIGN_ASSET(2) char spot04_room_0DL_00A808[] = dspot04_room_0DL_00A808; + +#define dspot04_room_0DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_0055C0" +static const ALIGN_ASSET(2) char spot04_room_0DL_0055C0[] = dspot04_room_0DL_0055C0; + +#define dspot04_room_0Set_0006B0DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_008ED8" static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_008ED8[] = dspot04_room_0Set_0006B0DL_008ED8; -#define dspot04_room_0Set_0006B0DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_0187F0" +#define dspot04_room_0Set_0006B0DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_0187F0" static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_0187F0[] = dspot04_room_0Set_0006B0DL_0187F0; -#define dspot04_room_0Set_0006B0DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_007A20" +#define dspot04_room_0Set_0006B0DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_007A20" static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_007A20[] = dspot04_room_0Set_0006B0DL_007A20; -#define dspot04_room_0Set_0006B0DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_018490" +#define dspot04_room_0Set_0006B0DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_018490" static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_018490[] = dspot04_room_0Set_0006B0DL_018490; -#define dspot04_room_0Set_0006B0DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_008638" +#define dspot04_room_0Set_0006B0DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_008638" static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_008638[] = dspot04_room_0Set_0006B0DL_008638; -#define dspot04_room_0Set_0006B0DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_00A080" +#define dspot04_room_0Set_0006B0DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_00A080" static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_00A080[] = dspot04_room_0Set_0006B0DL_00A080; -#define dspot04_room_0Set_0006B0DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_017BD0" +#define dspot04_room_0Set_0006B0DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_017BD0" static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_017BD0[] = dspot04_room_0Set_0006B0DL_017BD0; -#define dspot04_room_0Set_0006B0DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_004860" +#define dspot04_room_0Set_0006B0DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_004860" static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_004860[] = dspot04_room_0Set_0006B0DL_004860; -#define dspot04_room_0Set_0006B0DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_018048" +#define dspot04_room_0Set_0006B0DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_018048" static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_018048[] = dspot04_room_0Set_0006B0DL_018048; -#define dspot04_room_0Set_0006B0DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_00AE90" +#define dspot04_room_0Set_0006B0DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_00AE90" static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_00AE90[] = dspot04_room_0Set_0006B0DL_00AE90; -#define dspot04_room_0Set_0006B0DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_002A10" +#define dspot04_room_0Set_0006B0DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_002A10" static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_002A10[] = dspot04_room_0Set_0006B0DL_002A10; -#define dspot04_room_0Set_0006B0DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_005A80" +#define dspot04_room_0Set_0006B0DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_005A80" static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_005A80[] = dspot04_room_0Set_0006B0DL_005A80; -#define dspot04_room_0Set_0006B0DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_00B280" +#define dspot04_room_0Set_0006B0DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_00B280" static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_00B280[] = dspot04_room_0Set_0006B0DL_00B280; -#define dspot04_room_0Set_0006B0DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_00B8F8" +#define dspot04_room_0Set_0006B0DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_00B8F8" static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_00B8F8[] = dspot04_room_0Set_0006B0DL_00B8F8; -#define dspot04_room_0Set_0006B0DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_0189A8" +#define dspot04_room_0Set_0006B0DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_0189A8" static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_0189A8[] = dspot04_room_0Set_0006B0DL_0189A8; -#define dspot04_room_0Set_0006B0DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_00BD98" +#define dspot04_room_0Set_0006B0DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_00BD98" static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_00BD98[] = dspot04_room_0Set_0006B0DL_00BD98; -#define dspot04_room_0Set_0006B0DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_006280" +#define dspot04_room_0Set_0006B0DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_006280" static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_006280[] = dspot04_room_0Set_0006B0DL_006280; -#define dspot04_room_0Set_0006B0DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_006C10" +#define dspot04_room_0Set_0006B0DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_006C10" static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_006C10[] = dspot04_room_0Set_0006B0DL_006C10; -#define dspot04_room_0Set_0006B0DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_009740" +#define dspot04_room_0Set_0006B0DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_009740" static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_009740[] = dspot04_room_0Set_0006B0DL_009740; -#define dspot04_room_0Set_0006B0DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_00A808" +#define dspot04_room_0Set_0006B0DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_00A808" static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_00A808[] = dspot04_room_0Set_0006B0DL_00A808; -#define dspot04_room_0Set_0006B0DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_0055C0" +#define dspot04_room_0Set_0006B0DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_0055C0" static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_0055C0[] = dspot04_room_0Set_0006B0DL_0055C0; -#define dspot04_room_0Set_000940DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_008ED8" +#define dspot04_room_0Set_000940DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_008ED8" static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_008ED8[] = dspot04_room_0Set_000940DL_008ED8; -#define dspot04_room_0Set_000940DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_0187F0" +#define dspot04_room_0Set_000940DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_0187F0" static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_0187F0[] = dspot04_room_0Set_000940DL_0187F0; -#define dspot04_room_0Set_000940DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_007A20" +#define dspot04_room_0Set_000940DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_007A20" static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_007A20[] = dspot04_room_0Set_000940DL_007A20; -#define dspot04_room_0Set_000940DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_018490" +#define dspot04_room_0Set_000940DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_018490" static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_018490[] = dspot04_room_0Set_000940DL_018490; -#define dspot04_room_0Set_000940DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_008638" +#define dspot04_room_0Set_000940DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_008638" static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_008638[] = dspot04_room_0Set_000940DL_008638; -#define dspot04_room_0Set_000940DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_00A080" +#define dspot04_room_0Set_000940DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_00A080" static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_00A080[] = dspot04_room_0Set_000940DL_00A080; -#define dspot04_room_0Set_000940DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_017BD0" +#define dspot04_room_0Set_000940DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_017BD0" static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_017BD0[] = dspot04_room_0Set_000940DL_017BD0; -#define dspot04_room_0Set_000940DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_004860" +#define dspot04_room_0Set_000940DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_004860" static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_004860[] = dspot04_room_0Set_000940DL_004860; -#define dspot04_room_0Set_000940DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_018048" +#define dspot04_room_0Set_000940DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_018048" static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_018048[] = dspot04_room_0Set_000940DL_018048; -#define dspot04_room_0Set_000940DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_00AE90" +#define dspot04_room_0Set_000940DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_00AE90" static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_00AE90[] = dspot04_room_0Set_000940DL_00AE90; -#define dspot04_room_0Set_000940DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_002A10" +#define dspot04_room_0Set_000940DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_002A10" static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_002A10[] = dspot04_room_0Set_000940DL_002A10; -#define dspot04_room_0Set_000940DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_005A80" +#define dspot04_room_0Set_000940DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_005A80" static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_005A80[] = dspot04_room_0Set_000940DL_005A80; -#define dspot04_room_0Set_000940DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_00B280" +#define dspot04_room_0Set_000940DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_00B280" static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_00B280[] = dspot04_room_0Set_000940DL_00B280; -#define dspot04_room_0Set_000940DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_00B8F8" +#define dspot04_room_0Set_000940DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_00B8F8" static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_00B8F8[] = dspot04_room_0Set_000940DL_00B8F8; -#define dspot04_room_0Set_000940DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_0189A8" +#define dspot04_room_0Set_000940DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_0189A8" static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_0189A8[] = dspot04_room_0Set_000940DL_0189A8; -#define dspot04_room_0Set_000940DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_00BD98" +#define dspot04_room_0Set_000940DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_00BD98" static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_00BD98[] = dspot04_room_0Set_000940DL_00BD98; -#define dspot04_room_0Set_000940DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_006280" +#define dspot04_room_0Set_000940DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_006280" static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_006280[] = dspot04_room_0Set_000940DL_006280; -#define dspot04_room_0Set_000940DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_006C10" +#define dspot04_room_0Set_000940DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_006C10" static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_006C10[] = dspot04_room_0Set_000940DL_006C10; -#define dspot04_room_0Set_000940DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_009740" +#define dspot04_room_0Set_000940DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_009740" static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_009740[] = dspot04_room_0Set_000940DL_009740; -#define dspot04_room_0Set_000940DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_00A808" +#define dspot04_room_0Set_000940DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_00A808" static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_00A808[] = dspot04_room_0Set_000940DL_00A808; -#define dspot04_room_0Set_000940DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_0055C0" +#define dspot04_room_0Set_000940DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_0055C0" static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_0055C0[] = dspot04_room_0Set_000940DL_0055C0; -#define dspot04_room_0Set_000BA0DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_008ED8" +#define dspot04_room_0Set_000BA0DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_008ED8" static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_008ED8[] = dspot04_room_0Set_000BA0DL_008ED8; -#define dspot04_room_0Set_000BA0DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_0187F0" +#define dspot04_room_0Set_000BA0DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_0187F0" static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_0187F0[] = dspot04_room_0Set_000BA0DL_0187F0; -#define dspot04_room_0Set_000BA0DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_007A20" +#define dspot04_room_0Set_000BA0DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_007A20" static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_007A20[] = dspot04_room_0Set_000BA0DL_007A20; -#define dspot04_room_0Set_000BA0DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_018490" +#define dspot04_room_0Set_000BA0DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_018490" static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_018490[] = dspot04_room_0Set_000BA0DL_018490; -#define dspot04_room_0Set_000BA0DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_008638" +#define dspot04_room_0Set_000BA0DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_008638" static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_008638[] = dspot04_room_0Set_000BA0DL_008638; -#define dspot04_room_0Set_000BA0DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_00A080" +#define dspot04_room_0Set_000BA0DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_00A080" static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_00A080[] = dspot04_room_0Set_000BA0DL_00A080; -#define dspot04_room_0Set_000BA0DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_017BD0" +#define dspot04_room_0Set_000BA0DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_017BD0" static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_017BD0[] = dspot04_room_0Set_000BA0DL_017BD0; -#define dspot04_room_0Set_000BA0DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_004860" +#define dspot04_room_0Set_000BA0DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_004860" static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_004860[] = dspot04_room_0Set_000BA0DL_004860; -#define dspot04_room_0Set_000BA0DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_018048" +#define dspot04_room_0Set_000BA0DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_018048" static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_018048[] = dspot04_room_0Set_000BA0DL_018048; -#define dspot04_room_0Set_000BA0DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_00AE90" +#define dspot04_room_0Set_000BA0DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_00AE90" static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_00AE90[] = dspot04_room_0Set_000BA0DL_00AE90; -#define dspot04_room_0Set_000BA0DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_002A10" +#define dspot04_room_0Set_000BA0DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_002A10" static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_002A10[] = dspot04_room_0Set_000BA0DL_002A10; -#define dspot04_room_0Set_000BA0DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_005A80" +#define dspot04_room_0Set_000BA0DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_005A80" static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_005A80[] = dspot04_room_0Set_000BA0DL_005A80; -#define dspot04_room_0Set_000BA0DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_00B280" +#define dspot04_room_0Set_000BA0DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_00B280" static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_00B280[] = dspot04_room_0Set_000BA0DL_00B280; -#define dspot04_room_0Set_000BA0DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_00B8F8" +#define dspot04_room_0Set_000BA0DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_00B8F8" static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_00B8F8[] = dspot04_room_0Set_000BA0DL_00B8F8; -#define dspot04_room_0Set_000BA0DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_0189A8" +#define dspot04_room_0Set_000BA0DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_0189A8" static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_0189A8[] = dspot04_room_0Set_000BA0DL_0189A8; -#define dspot04_room_0Set_000BA0DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_00BD98" +#define dspot04_room_0Set_000BA0DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_00BD98" static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_00BD98[] = dspot04_room_0Set_000BA0DL_00BD98; -#define dspot04_room_0Set_000BA0DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_006280" +#define dspot04_room_0Set_000BA0DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_006280" static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_006280[] = dspot04_room_0Set_000BA0DL_006280; -#define dspot04_room_0Set_000BA0DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_006C10" +#define dspot04_room_0Set_000BA0DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_006C10" static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_006C10[] = dspot04_room_0Set_000BA0DL_006C10; -#define dspot04_room_0Set_000BA0DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_009740" +#define dspot04_room_0Set_000BA0DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_009740" static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_009740[] = dspot04_room_0Set_000BA0DL_009740; -#define dspot04_room_0Set_000BA0DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_00A808" +#define dspot04_room_0Set_000BA0DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_00A808" static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_00A808[] = dspot04_room_0Set_000BA0DL_00A808; -#define dspot04_room_0Set_000BA0DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_0055C0" +#define dspot04_room_0Set_000BA0DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_0055C0" static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_0055C0[] = dspot04_room_0Set_000BA0DL_0055C0; -#define dspot04_room_0Set_000BD0DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_008ED8" +#define dspot04_room_0Set_000BD0DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_008ED8" static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_008ED8[] = dspot04_room_0Set_000BD0DL_008ED8; -#define dspot04_room_0Set_000BD0DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_0187F0" +#define dspot04_room_0Set_000BD0DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_0187F0" static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_0187F0[] = dspot04_room_0Set_000BD0DL_0187F0; -#define dspot04_room_0Set_000BD0DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_007A20" +#define dspot04_room_0Set_000BD0DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_007A20" static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_007A20[] = dspot04_room_0Set_000BD0DL_007A20; -#define dspot04_room_0Set_000BD0DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_018490" +#define dspot04_room_0Set_000BD0DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_018490" static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_018490[] = dspot04_room_0Set_000BD0DL_018490; -#define dspot04_room_0Set_000BD0DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_008638" +#define dspot04_room_0Set_000BD0DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_008638" static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_008638[] = dspot04_room_0Set_000BD0DL_008638; -#define dspot04_room_0Set_000BD0DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_00A080" +#define dspot04_room_0Set_000BD0DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_00A080" static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_00A080[] = dspot04_room_0Set_000BD0DL_00A080; -#define dspot04_room_0Set_000BD0DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_017BD0" +#define dspot04_room_0Set_000BD0DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_017BD0" static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_017BD0[] = dspot04_room_0Set_000BD0DL_017BD0; -#define dspot04_room_0Set_000BD0DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_004860" +#define dspot04_room_0Set_000BD0DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_004860" static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_004860[] = dspot04_room_0Set_000BD0DL_004860; -#define dspot04_room_0Set_000BD0DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_018048" +#define dspot04_room_0Set_000BD0DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_018048" static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_018048[] = dspot04_room_0Set_000BD0DL_018048; -#define dspot04_room_0Set_000BD0DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_00AE90" +#define dspot04_room_0Set_000BD0DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_00AE90" static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_00AE90[] = dspot04_room_0Set_000BD0DL_00AE90; -#define dspot04_room_0Set_000BD0DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_002A10" +#define dspot04_room_0Set_000BD0DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_002A10" static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_002A10[] = dspot04_room_0Set_000BD0DL_002A10; -#define dspot04_room_0Set_000BD0DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_005A80" +#define dspot04_room_0Set_000BD0DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_005A80" static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_005A80[] = dspot04_room_0Set_000BD0DL_005A80; -#define dspot04_room_0Set_000BD0DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_00B280" +#define dspot04_room_0Set_000BD0DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_00B280" static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_00B280[] = dspot04_room_0Set_000BD0DL_00B280; -#define dspot04_room_0Set_000BD0DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_00B8F8" +#define dspot04_room_0Set_000BD0DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_00B8F8" static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_00B8F8[] = dspot04_room_0Set_000BD0DL_00B8F8; -#define dspot04_room_0Set_000BD0DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_0189A8" +#define dspot04_room_0Set_000BD0DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_0189A8" static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_0189A8[] = dspot04_room_0Set_000BD0DL_0189A8; -#define dspot04_room_0Set_000BD0DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_00BD98" +#define dspot04_room_0Set_000BD0DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_00BD98" static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_00BD98[] = dspot04_room_0Set_000BD0DL_00BD98; -#define dspot04_room_0Set_000BD0DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_006280" +#define dspot04_room_0Set_000BD0DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_006280" static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_006280[] = dspot04_room_0Set_000BD0DL_006280; -#define dspot04_room_0Set_000BD0DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_006C10" +#define dspot04_room_0Set_000BD0DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_006C10" static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_006C10[] = dspot04_room_0Set_000BD0DL_006C10; -#define dspot04_room_0Set_000BD0DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_009740" +#define dspot04_room_0Set_000BD0DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_009740" static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_009740[] = dspot04_room_0Set_000BD0DL_009740; -#define dspot04_room_0Set_000BD0DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_00A808" +#define dspot04_room_0Set_000BD0DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_00A808" static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_00A808[] = dspot04_room_0Set_000BD0DL_00A808; -#define dspot04_room_0Set_000BD0DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_0055C0" +#define dspot04_room_0Set_000BD0DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_0055C0" static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_0055C0[] = dspot04_room_0Set_000BD0DL_0055C0; -#define dspot04_room_0Set_000C00DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_008ED8" +#define dspot04_room_0Set_000C00DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_008ED8" static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_008ED8[] = dspot04_room_0Set_000C00DL_008ED8; -#define dspot04_room_0Set_000C00DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_0187F0" +#define dspot04_room_0Set_000C00DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_0187F0" static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_0187F0[] = dspot04_room_0Set_000C00DL_0187F0; -#define dspot04_room_0Set_000C00DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_007A20" +#define dspot04_room_0Set_000C00DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_007A20" static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_007A20[] = dspot04_room_0Set_000C00DL_007A20; -#define dspot04_room_0Set_000C00DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_018490" +#define dspot04_room_0Set_000C00DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_018490" static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_018490[] = dspot04_room_0Set_000C00DL_018490; -#define dspot04_room_0Set_000C00DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_008638" +#define dspot04_room_0Set_000C00DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_008638" static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_008638[] = dspot04_room_0Set_000C00DL_008638; -#define dspot04_room_0Set_000C00DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_00A080" +#define dspot04_room_0Set_000C00DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_00A080" static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_00A080[] = dspot04_room_0Set_000C00DL_00A080; -#define dspot04_room_0Set_000C00DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_017BD0" +#define dspot04_room_0Set_000C00DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_017BD0" static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_017BD0[] = dspot04_room_0Set_000C00DL_017BD0; -#define dspot04_room_0Set_000C00DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_004860" +#define dspot04_room_0Set_000C00DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_004860" static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_004860[] = dspot04_room_0Set_000C00DL_004860; -#define dspot04_room_0Set_000C00DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_018048" +#define dspot04_room_0Set_000C00DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_018048" static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_018048[] = dspot04_room_0Set_000C00DL_018048; -#define dspot04_room_0Set_000C00DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_00AE90" +#define dspot04_room_0Set_000C00DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_00AE90" static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_00AE90[] = dspot04_room_0Set_000C00DL_00AE90; -#define dspot04_room_0Set_000C00DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_002A10" +#define dspot04_room_0Set_000C00DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_002A10" static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_002A10[] = dspot04_room_0Set_000C00DL_002A10; -#define dspot04_room_0Set_000C00DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_005A80" +#define dspot04_room_0Set_000C00DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_005A80" static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_005A80[] = dspot04_room_0Set_000C00DL_005A80; -#define dspot04_room_0Set_000C00DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_00B280" +#define dspot04_room_0Set_000C00DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_00B280" static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_00B280[] = dspot04_room_0Set_000C00DL_00B280; -#define dspot04_room_0Set_000C00DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_00B8F8" +#define dspot04_room_0Set_000C00DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_00B8F8" static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_00B8F8[] = dspot04_room_0Set_000C00DL_00B8F8; -#define dspot04_room_0Set_000C00DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_0189A8" +#define dspot04_room_0Set_000C00DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_0189A8" static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_0189A8[] = dspot04_room_0Set_000C00DL_0189A8; -#define dspot04_room_0Set_000C00DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_00BD98" +#define dspot04_room_0Set_000C00DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_00BD98" static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_00BD98[] = dspot04_room_0Set_000C00DL_00BD98; -#define dspot04_room_0Set_000C00DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_006280" +#define dspot04_room_0Set_000C00DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_006280" static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_006280[] = dspot04_room_0Set_000C00DL_006280; -#define dspot04_room_0Set_000C00DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_006C10" +#define dspot04_room_0Set_000C00DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_006C10" static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_006C10[] = dspot04_room_0Set_000C00DL_006C10; -#define dspot04_room_0Set_000C00DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_009740" +#define dspot04_room_0Set_000C00DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_009740" static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_009740[] = dspot04_room_0Set_000C00DL_009740; -#define dspot04_room_0Set_000C00DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_00A808" +#define dspot04_room_0Set_000C00DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_00A808" static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_00A808[] = dspot04_room_0Set_000C00DL_00A808; -#define dspot04_room_0Set_000C00DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_0055C0" +#define dspot04_room_0Set_000C00DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_0055C0" static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_0055C0[] = dspot04_room_0Set_000C00DL_0055C0; -#define dspot04_room_0Set_000C30DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_008ED8" +#define dspot04_room_0Set_000C30DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_008ED8" static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_008ED8[] = dspot04_room_0Set_000C30DL_008ED8; -#define dspot04_room_0Set_000C30DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_0187F0" +#define dspot04_room_0Set_000C30DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_0187F0" static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_0187F0[] = dspot04_room_0Set_000C30DL_0187F0; -#define dspot04_room_0Set_000C30DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_007A20" +#define dspot04_room_0Set_000C30DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_007A20" static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_007A20[] = dspot04_room_0Set_000C30DL_007A20; -#define dspot04_room_0Set_000C30DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_018490" +#define dspot04_room_0Set_000C30DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_018490" static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_018490[] = dspot04_room_0Set_000C30DL_018490; -#define dspot04_room_0Set_000C30DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_008638" +#define dspot04_room_0Set_000C30DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_008638" static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_008638[] = dspot04_room_0Set_000C30DL_008638; -#define dspot04_room_0Set_000C30DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_00A080" +#define dspot04_room_0Set_000C30DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_00A080" static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_00A080[] = dspot04_room_0Set_000C30DL_00A080; -#define dspot04_room_0Set_000C30DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_017BD0" +#define dspot04_room_0Set_000C30DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_017BD0" static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_017BD0[] = dspot04_room_0Set_000C30DL_017BD0; -#define dspot04_room_0Set_000C30DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_004860" +#define dspot04_room_0Set_000C30DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_004860" static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_004860[] = dspot04_room_0Set_000C30DL_004860; -#define dspot04_room_0Set_000C30DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_018048" +#define dspot04_room_0Set_000C30DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_018048" static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_018048[] = dspot04_room_0Set_000C30DL_018048; -#define dspot04_room_0Set_000C30DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_00AE90" +#define dspot04_room_0Set_000C30DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_00AE90" static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_00AE90[] = dspot04_room_0Set_000C30DL_00AE90; -#define dspot04_room_0Set_000C30DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_002A10" +#define dspot04_room_0Set_000C30DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_002A10" static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_002A10[] = dspot04_room_0Set_000C30DL_002A10; -#define dspot04_room_0Set_000C30DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_005A80" +#define dspot04_room_0Set_000C30DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_005A80" static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_005A80[] = dspot04_room_0Set_000C30DL_005A80; -#define dspot04_room_0Set_000C30DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_00B280" +#define dspot04_room_0Set_000C30DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_00B280" static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_00B280[] = dspot04_room_0Set_000C30DL_00B280; -#define dspot04_room_0Set_000C30DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_00B8F8" +#define dspot04_room_0Set_000C30DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_00B8F8" static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_00B8F8[] = dspot04_room_0Set_000C30DL_00B8F8; -#define dspot04_room_0Set_000C30DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_0189A8" +#define dspot04_room_0Set_000C30DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_0189A8" static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_0189A8[] = dspot04_room_0Set_000C30DL_0189A8; -#define dspot04_room_0Set_000C30DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_00BD98" +#define dspot04_room_0Set_000C30DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_00BD98" static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_00BD98[] = dspot04_room_0Set_000C30DL_00BD98; -#define dspot04_room_0Set_000C30DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_006280" +#define dspot04_room_0Set_000C30DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_006280" static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_006280[] = dspot04_room_0Set_000C30DL_006280; -#define dspot04_room_0Set_000C30DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_006C10" +#define dspot04_room_0Set_000C30DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_006C10" static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_006C10[] = dspot04_room_0Set_000C30DL_006C10; -#define dspot04_room_0Set_000C30DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_009740" +#define dspot04_room_0Set_000C30DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_009740" static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_009740[] = dspot04_room_0Set_000C30DL_009740; -#define dspot04_room_0Set_000C30DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_00A808" +#define dspot04_room_0Set_000C30DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_00A808" static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_00A808[] = dspot04_room_0Set_000C30DL_00A808; -#define dspot04_room_0Set_000C30DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_0055C0" +#define dspot04_room_0Set_000C30DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_0055C0" static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_0055C0[] = dspot04_room_0Set_000C30DL_0055C0; -#define dspot04_room_0Set_000E60DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_008ED8" +#define dspot04_room_0Set_000E60DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_008ED8" static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_008ED8[] = dspot04_room_0Set_000E60DL_008ED8; -#define dspot04_room_0Set_000E60DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_0187F0" +#define dspot04_room_0Set_000E60DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_0187F0" static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_0187F0[] = dspot04_room_0Set_000E60DL_0187F0; -#define dspot04_room_0Set_000E60DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_007A20" +#define dspot04_room_0Set_000E60DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_007A20" static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_007A20[] = dspot04_room_0Set_000E60DL_007A20; -#define dspot04_room_0Set_000E60DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_018490" +#define dspot04_room_0Set_000E60DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_018490" static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_018490[] = dspot04_room_0Set_000E60DL_018490; -#define dspot04_room_0Set_000E60DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_008638" +#define dspot04_room_0Set_000E60DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_008638" static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_008638[] = dspot04_room_0Set_000E60DL_008638; -#define dspot04_room_0Set_000E60DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_00A080" +#define dspot04_room_0Set_000E60DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_00A080" static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_00A080[] = dspot04_room_0Set_000E60DL_00A080; -#define dspot04_room_0Set_000E60DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_017BD0" +#define dspot04_room_0Set_000E60DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_017BD0" static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_017BD0[] = dspot04_room_0Set_000E60DL_017BD0; -#define dspot04_room_0Set_000E60DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_004860" +#define dspot04_room_0Set_000E60DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_004860" static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_004860[] = dspot04_room_0Set_000E60DL_004860; -#define dspot04_room_0Set_000E60DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_018048" +#define dspot04_room_0Set_000E60DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_018048" static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_018048[] = dspot04_room_0Set_000E60DL_018048; -#define dspot04_room_0Set_000E60DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_00AE90" +#define dspot04_room_0Set_000E60DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_00AE90" static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_00AE90[] = dspot04_room_0Set_000E60DL_00AE90; -#define dspot04_room_0Set_000E60DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_002A10" +#define dspot04_room_0Set_000E60DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_002A10" static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_002A10[] = dspot04_room_0Set_000E60DL_002A10; -#define dspot04_room_0Set_000E60DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_005A80" +#define dspot04_room_0Set_000E60DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_005A80" static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_005A80[] = dspot04_room_0Set_000E60DL_005A80; -#define dspot04_room_0Set_000E60DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_00B280" +#define dspot04_room_0Set_000E60DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_00B280" static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_00B280[] = dspot04_room_0Set_000E60DL_00B280; -#define dspot04_room_0Set_000E60DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_00B8F8" +#define dspot04_room_0Set_000E60DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_00B8F8" static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_00B8F8[] = dspot04_room_0Set_000E60DL_00B8F8; -#define dspot04_room_0Set_000E60DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_0189A8" +#define dspot04_room_0Set_000E60DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_0189A8" static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_0189A8[] = dspot04_room_0Set_000E60DL_0189A8; -#define dspot04_room_0Set_000E60DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_00BD98" +#define dspot04_room_0Set_000E60DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_00BD98" static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_00BD98[] = dspot04_room_0Set_000E60DL_00BD98; -#define dspot04_room_0Set_000E60DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_006280" +#define dspot04_room_0Set_000E60DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_006280" static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_006280[] = dspot04_room_0Set_000E60DL_006280; -#define dspot04_room_0Set_000E60DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_006C10" +#define dspot04_room_0Set_000E60DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_006C10" static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_006C10[] = dspot04_room_0Set_000E60DL_006C10; -#define dspot04_room_0Set_000E60DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_009740" +#define dspot04_room_0Set_000E60DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_009740" static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_009740[] = dspot04_room_0Set_000E60DL_009740; -#define dspot04_room_0Set_000E60DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_00A808" +#define dspot04_room_0Set_000E60DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_00A808" static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_00A808[] = dspot04_room_0Set_000E60DL_00A808; -#define dspot04_room_0Set_000E60DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_0055C0" +#define dspot04_room_0Set_000E60DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_0055C0" static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_0055C0[] = dspot04_room_0Set_000E60DL_0055C0; -#define dspot04_room_0Set_000ED0DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_008ED8" +#define dspot04_room_0Set_000ED0DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_008ED8" static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_008ED8[] = dspot04_room_0Set_000ED0DL_008ED8; -#define dspot04_room_0Set_000ED0DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_0187F0" +#define dspot04_room_0Set_000ED0DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_0187F0" static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_0187F0[] = dspot04_room_0Set_000ED0DL_0187F0; -#define dspot04_room_0Set_000ED0DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_007A20" +#define dspot04_room_0Set_000ED0DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_007A20" static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_007A20[] = dspot04_room_0Set_000ED0DL_007A20; -#define dspot04_room_0Set_000ED0DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_018490" +#define dspot04_room_0Set_000ED0DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_018490" static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_018490[] = dspot04_room_0Set_000ED0DL_018490; -#define dspot04_room_0Set_000ED0DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_008638" +#define dspot04_room_0Set_000ED0DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_008638" static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_008638[] = dspot04_room_0Set_000ED0DL_008638; -#define dspot04_room_0Set_000ED0DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_00A080" +#define dspot04_room_0Set_000ED0DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_00A080" static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_00A080[] = dspot04_room_0Set_000ED0DL_00A080; -#define dspot04_room_0Set_000ED0DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_017BD0" +#define dspot04_room_0Set_000ED0DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_017BD0" static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_017BD0[] = dspot04_room_0Set_000ED0DL_017BD0; -#define dspot04_room_0Set_000ED0DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_004860" +#define dspot04_room_0Set_000ED0DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_004860" static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_004860[] = dspot04_room_0Set_000ED0DL_004860; -#define dspot04_room_0Set_000ED0DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_018048" +#define dspot04_room_0Set_000ED0DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_018048" static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_018048[] = dspot04_room_0Set_000ED0DL_018048; -#define dspot04_room_0Set_000ED0DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_00AE90" +#define dspot04_room_0Set_000ED0DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_00AE90" static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_00AE90[] = dspot04_room_0Set_000ED0DL_00AE90; -#define dspot04_room_0Set_000ED0DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_002A10" +#define dspot04_room_0Set_000ED0DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_002A10" static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_002A10[] = dspot04_room_0Set_000ED0DL_002A10; -#define dspot04_room_0Set_000ED0DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_005A80" +#define dspot04_room_0Set_000ED0DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_005A80" static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_005A80[] = dspot04_room_0Set_000ED0DL_005A80; -#define dspot04_room_0Set_000ED0DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_00B280" +#define dspot04_room_0Set_000ED0DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_00B280" static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_00B280[] = dspot04_room_0Set_000ED0DL_00B280; -#define dspot04_room_0Set_000ED0DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_00B8F8" +#define dspot04_room_0Set_000ED0DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_00B8F8" static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_00B8F8[] = dspot04_room_0Set_000ED0DL_00B8F8; -#define dspot04_room_0Set_000ED0DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_0189A8" +#define dspot04_room_0Set_000ED0DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_0189A8" static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_0189A8[] = dspot04_room_0Set_000ED0DL_0189A8; -#define dspot04_room_0Set_000ED0DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_00BD98" +#define dspot04_room_0Set_000ED0DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_00BD98" static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_00BD98[] = dspot04_room_0Set_000ED0DL_00BD98; -#define dspot04_room_0Set_000ED0DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_006280" +#define dspot04_room_0Set_000ED0DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_006280" static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_006280[] = dspot04_room_0Set_000ED0DL_006280; -#define dspot04_room_0Set_000ED0DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_006C10" +#define dspot04_room_0Set_000ED0DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_006C10" static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_006C10[] = dspot04_room_0Set_000ED0DL_006C10; -#define dspot04_room_0Set_000ED0DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_009740" +#define dspot04_room_0Set_000ED0DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_009740" static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_009740[] = dspot04_room_0Set_000ED0DL_009740; -#define dspot04_room_0Set_000ED0DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_00A808" +#define dspot04_room_0Set_000ED0DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_00A808" static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_00A808[] = dspot04_room_0Set_000ED0DL_00A808; -#define dspot04_room_0Set_000ED0DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_0055C0" +#define dspot04_room_0Set_000ED0DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_0055C0" static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_0055C0[] = dspot04_room_0Set_000ED0DL_0055C0; -#define dspot04_room_0Set_000F40DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_008ED8" +#define dspot04_room_0Set_000F40DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_008ED8" static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_008ED8[] = dspot04_room_0Set_000F40DL_008ED8; -#define dspot04_room_0Set_000F40DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_0187F0" +#define dspot04_room_0Set_000F40DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_0187F0" static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_0187F0[] = dspot04_room_0Set_000F40DL_0187F0; -#define dspot04_room_0Set_000F40DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_007A20" +#define dspot04_room_0Set_000F40DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_007A20" static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_007A20[] = dspot04_room_0Set_000F40DL_007A20; -#define dspot04_room_0Set_000F40DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_018490" +#define dspot04_room_0Set_000F40DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_018490" static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_018490[] = dspot04_room_0Set_000F40DL_018490; -#define dspot04_room_0Set_000F40DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_008638" +#define dspot04_room_0Set_000F40DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_008638" static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_008638[] = dspot04_room_0Set_000F40DL_008638; -#define dspot04_room_0Set_000F40DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_00A080" +#define dspot04_room_0Set_000F40DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_00A080" static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_00A080[] = dspot04_room_0Set_000F40DL_00A080; -#define dspot04_room_0Set_000F40DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_017BD0" +#define dspot04_room_0Set_000F40DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_017BD0" static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_017BD0[] = dspot04_room_0Set_000F40DL_017BD0; -#define dspot04_room_0Set_000F40DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_004860" +#define dspot04_room_0Set_000F40DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_004860" static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_004860[] = dspot04_room_0Set_000F40DL_004860; -#define dspot04_room_0Set_000F40DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_018048" +#define dspot04_room_0Set_000F40DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_018048" static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_018048[] = dspot04_room_0Set_000F40DL_018048; -#define dspot04_room_0Set_000F40DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_00AE90" +#define dspot04_room_0Set_000F40DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_00AE90" static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_00AE90[] = dspot04_room_0Set_000F40DL_00AE90; -#define dspot04_room_0Set_000F40DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_002A10" +#define dspot04_room_0Set_000F40DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_002A10" static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_002A10[] = dspot04_room_0Set_000F40DL_002A10; -#define dspot04_room_0Set_000F40DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_005A80" +#define dspot04_room_0Set_000F40DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_005A80" static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_005A80[] = dspot04_room_0Set_000F40DL_005A80; -#define dspot04_room_0Set_000F40DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_00B280" +#define dspot04_room_0Set_000F40DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_00B280" static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_00B280[] = dspot04_room_0Set_000F40DL_00B280; -#define dspot04_room_0Set_000F40DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_00B8F8" +#define dspot04_room_0Set_000F40DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_00B8F8" static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_00B8F8[] = dspot04_room_0Set_000F40DL_00B8F8; -#define dspot04_room_0Set_000F40DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_0189A8" +#define dspot04_room_0Set_000F40DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_0189A8" static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_0189A8[] = dspot04_room_0Set_000F40DL_0189A8; -#define dspot04_room_0Set_000F40DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_00BD98" +#define dspot04_room_0Set_000F40DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_00BD98" static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_00BD98[] = dspot04_room_0Set_000F40DL_00BD98; -#define dspot04_room_0Set_000F40DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_006280" +#define dspot04_room_0Set_000F40DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_006280" static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_006280[] = dspot04_room_0Set_000F40DL_006280; -#define dspot04_room_0Set_000F40DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_006C10" +#define dspot04_room_0Set_000F40DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_006C10" static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_006C10[] = dspot04_room_0Set_000F40DL_006C10; -#define dspot04_room_0Set_000F40DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_009740" +#define dspot04_room_0Set_000F40DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_009740" static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_009740[] = dspot04_room_0Set_000F40DL_009740; -#define dspot04_room_0Set_000F40DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_00A808" +#define dspot04_room_0Set_000F40DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_00A808" static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_00A808[] = dspot04_room_0Set_000F40DL_00A808; -#define dspot04_room_0Set_000F40DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_0055C0" +#define dspot04_room_0Set_000F40DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_0055C0" static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_0055C0[] = dspot04_room_0Set_000F40DL_0055C0; -#define dspot04_room_0Set_000F80DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_008ED8" +#define dspot04_room_0Set_000F80DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_008ED8" static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_008ED8[] = dspot04_room_0Set_000F80DL_008ED8; -#define dspot04_room_0Set_000F80DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_0187F0" +#define dspot04_room_0Set_000F80DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_0187F0" static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_0187F0[] = dspot04_room_0Set_000F80DL_0187F0; -#define dspot04_room_0Set_000F80DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_007A20" +#define dspot04_room_0Set_000F80DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_007A20" static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_007A20[] = dspot04_room_0Set_000F80DL_007A20; -#define dspot04_room_0Set_000F80DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_018490" +#define dspot04_room_0Set_000F80DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_018490" static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_018490[] = dspot04_room_0Set_000F80DL_018490; -#define dspot04_room_0Set_000F80DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_008638" +#define dspot04_room_0Set_000F80DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_008638" static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_008638[] = dspot04_room_0Set_000F80DL_008638; -#define dspot04_room_0Set_000F80DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_00A080" +#define dspot04_room_0Set_000F80DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_00A080" static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_00A080[] = dspot04_room_0Set_000F80DL_00A080; -#define dspot04_room_0Set_000F80DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_017BD0" +#define dspot04_room_0Set_000F80DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_017BD0" static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_017BD0[] = dspot04_room_0Set_000F80DL_017BD0; -#define dspot04_room_0Set_000F80DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_004860" +#define dspot04_room_0Set_000F80DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_004860" static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_004860[] = dspot04_room_0Set_000F80DL_004860; -#define dspot04_room_0Set_000F80DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_018048" +#define dspot04_room_0Set_000F80DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_018048" static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_018048[] = dspot04_room_0Set_000F80DL_018048; -#define dspot04_room_0Set_000F80DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_00AE90" +#define dspot04_room_0Set_000F80DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_00AE90" static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_00AE90[] = dspot04_room_0Set_000F80DL_00AE90; -#define dspot04_room_0Set_000F80DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_002A10" +#define dspot04_room_0Set_000F80DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_002A10" static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_002A10[] = dspot04_room_0Set_000F80DL_002A10; -#define dspot04_room_0Set_000F80DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_005A80" +#define dspot04_room_0Set_000F80DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_005A80" static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_005A80[] = dspot04_room_0Set_000F80DL_005A80; -#define dspot04_room_0Set_000F80DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_00B280" +#define dspot04_room_0Set_000F80DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_00B280" static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_00B280[] = dspot04_room_0Set_000F80DL_00B280; -#define dspot04_room_0Set_000F80DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_00B8F8" +#define dspot04_room_0Set_000F80DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_00B8F8" static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_00B8F8[] = dspot04_room_0Set_000F80DL_00B8F8; -#define dspot04_room_0Set_000F80DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_0189A8" +#define dspot04_room_0Set_000F80DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_0189A8" static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_0189A8[] = dspot04_room_0Set_000F80DL_0189A8; -#define dspot04_room_0Set_000F80DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_00BD98" +#define dspot04_room_0Set_000F80DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_00BD98" static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_00BD98[] = dspot04_room_0Set_000F80DL_00BD98; -#define dspot04_room_0Set_000F80DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_006280" +#define dspot04_room_0Set_000F80DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_006280" static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_006280[] = dspot04_room_0Set_000F80DL_006280; -#define dspot04_room_0Set_000F80DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_006C10" +#define dspot04_room_0Set_000F80DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_006C10" static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_006C10[] = dspot04_room_0Set_000F80DL_006C10; -#define dspot04_room_0Set_000F80DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_009740" +#define dspot04_room_0Set_000F80DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_009740" static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_009740[] = dspot04_room_0Set_000F80DL_009740; -#define dspot04_room_0Set_000F80DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_00A808" +#define dspot04_room_0Set_000F80DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_00A808" static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_00A808[] = dspot04_room_0Set_000F80DL_00A808; -#define dspot04_room_0Set_000F80DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_0055C0" +#define dspot04_room_0Set_000F80DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_0055C0" static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_0055C0[] = dspot04_room_0Set_000F80DL_0055C0; -#define dspot04_room_0Set_0011F0DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_008ED8" +#define dspot04_room_0Set_0011F0DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_008ED8" static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_008ED8[] = dspot04_room_0Set_0011F0DL_008ED8; -#define dspot04_room_0Set_0011F0DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_0187F0" +#define dspot04_room_0Set_0011F0DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_0187F0" static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_0187F0[] = dspot04_room_0Set_0011F0DL_0187F0; -#define dspot04_room_0Set_0011F0DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_007A20" +#define dspot04_room_0Set_0011F0DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_007A20" static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_007A20[] = dspot04_room_0Set_0011F0DL_007A20; -#define dspot04_room_0Set_0011F0DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_018490" +#define dspot04_room_0Set_0011F0DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_018490" static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_018490[] = dspot04_room_0Set_0011F0DL_018490; -#define dspot04_room_0Set_0011F0DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_008638" +#define dspot04_room_0Set_0011F0DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_008638" static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_008638[] = dspot04_room_0Set_0011F0DL_008638; -#define dspot04_room_0Set_0011F0DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_00A080" +#define dspot04_room_0Set_0011F0DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_00A080" static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_00A080[] = dspot04_room_0Set_0011F0DL_00A080; -#define dspot04_room_0Set_0011F0DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_017BD0" +#define dspot04_room_0Set_0011F0DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_017BD0" static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_017BD0[] = dspot04_room_0Set_0011F0DL_017BD0; -#define dspot04_room_0Set_0011F0DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_004860" +#define dspot04_room_0Set_0011F0DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_004860" static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_004860[] = dspot04_room_0Set_0011F0DL_004860; -#define dspot04_room_0Set_0011F0DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_018048" +#define dspot04_room_0Set_0011F0DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_018048" static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_018048[] = dspot04_room_0Set_0011F0DL_018048; -#define dspot04_room_0Set_0011F0DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_00AE90" +#define dspot04_room_0Set_0011F0DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_00AE90" static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_00AE90[] = dspot04_room_0Set_0011F0DL_00AE90; -#define dspot04_room_0Set_0011F0DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_002A10" +#define dspot04_room_0Set_0011F0DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_002A10" static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_002A10[] = dspot04_room_0Set_0011F0DL_002A10; -#define dspot04_room_0Set_0011F0DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_005A80" +#define dspot04_room_0Set_0011F0DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_005A80" static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_005A80[] = dspot04_room_0Set_0011F0DL_005A80; -#define dspot04_room_0Set_0011F0DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_00B280" +#define dspot04_room_0Set_0011F0DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_00B280" static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_00B280[] = dspot04_room_0Set_0011F0DL_00B280; -#define dspot04_room_0Set_0011F0DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_00B8F8" +#define dspot04_room_0Set_0011F0DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_00B8F8" static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_00B8F8[] = dspot04_room_0Set_0011F0DL_00B8F8; -#define dspot04_room_0Set_0011F0DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_0189A8" +#define dspot04_room_0Set_0011F0DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_0189A8" static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_0189A8[] = dspot04_room_0Set_0011F0DL_0189A8; -#define dspot04_room_0Set_0011F0DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_00BD98" +#define dspot04_room_0Set_0011F0DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_00BD98" static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_00BD98[] = dspot04_room_0Set_0011F0DL_00BD98; -#define dspot04_room_0Set_0011F0DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_006280" +#define dspot04_room_0Set_0011F0DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_006280" static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_006280[] = dspot04_room_0Set_0011F0DL_006280; -#define dspot04_room_0Set_0011F0DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_006C10" +#define dspot04_room_0Set_0011F0DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_006C10" static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_006C10[] = dspot04_room_0Set_0011F0DL_006C10; -#define dspot04_room_0Set_0011F0DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_009740" +#define dspot04_room_0Set_0011F0DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_009740" static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_009740[] = dspot04_room_0Set_0011F0DL_009740; -#define dspot04_room_0Set_0011F0DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_00A808" +#define dspot04_room_0Set_0011F0DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_00A808" static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_00A808[] = dspot04_room_0Set_0011F0DL_00A808; -#define dspot04_room_0Set_0011F0DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_0055C0" +#define dspot04_room_0Set_0011F0DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_0055C0" static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_0055C0[] = dspot04_room_0Set_0011F0DL_0055C0; -#define dspot04_room_0Set_001240DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_008ED8" +#define dspot04_room_0Set_001240DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_008ED8" static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_008ED8[] = dspot04_room_0Set_001240DL_008ED8; -#define dspot04_room_0Set_001240DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_0187F0" +#define dspot04_room_0Set_001240DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_0187F0" static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_0187F0[] = dspot04_room_0Set_001240DL_0187F0; -#define dspot04_room_0Set_001240DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_007A20" +#define dspot04_room_0Set_001240DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_007A20" static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_007A20[] = dspot04_room_0Set_001240DL_007A20; -#define dspot04_room_0Set_001240DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_018490" +#define dspot04_room_0Set_001240DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_018490" static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_018490[] = dspot04_room_0Set_001240DL_018490; -#define dspot04_room_0Set_001240DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_008638" +#define dspot04_room_0Set_001240DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_008638" static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_008638[] = dspot04_room_0Set_001240DL_008638; -#define dspot04_room_0Set_001240DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_00A080" +#define dspot04_room_0Set_001240DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_00A080" static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_00A080[] = dspot04_room_0Set_001240DL_00A080; -#define dspot04_room_0Set_001240DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_017BD0" +#define dspot04_room_0Set_001240DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_017BD0" static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_017BD0[] = dspot04_room_0Set_001240DL_017BD0; -#define dspot04_room_0Set_001240DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_004860" +#define dspot04_room_0Set_001240DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_004860" static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_004860[] = dspot04_room_0Set_001240DL_004860; -#define dspot04_room_0Set_001240DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_018048" +#define dspot04_room_0Set_001240DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_018048" static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_018048[] = dspot04_room_0Set_001240DL_018048; -#define dspot04_room_0Set_001240DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_00AE90" +#define dspot04_room_0Set_001240DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_00AE90" static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_00AE90[] = dspot04_room_0Set_001240DL_00AE90; -#define dspot04_room_0Set_001240DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_002A10" +#define dspot04_room_0Set_001240DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_002A10" static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_002A10[] = dspot04_room_0Set_001240DL_002A10; -#define dspot04_room_0Set_001240DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_005A80" +#define dspot04_room_0Set_001240DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_005A80" static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_005A80[] = dspot04_room_0Set_001240DL_005A80; -#define dspot04_room_0Set_001240DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_00B280" +#define dspot04_room_0Set_001240DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_00B280" static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_00B280[] = dspot04_room_0Set_001240DL_00B280; -#define dspot04_room_0Set_001240DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_00B8F8" +#define dspot04_room_0Set_001240DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_00B8F8" static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_00B8F8[] = dspot04_room_0Set_001240DL_00B8F8; -#define dspot04_room_0Set_001240DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_0189A8" +#define dspot04_room_0Set_001240DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_0189A8" static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_0189A8[] = dspot04_room_0Set_001240DL_0189A8; -#define dspot04_room_0Set_001240DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_00BD98" +#define dspot04_room_0Set_001240DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_00BD98" static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_00BD98[] = dspot04_room_0Set_001240DL_00BD98; -#define dspot04_room_0Set_001240DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_006280" +#define dspot04_room_0Set_001240DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_006280" static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_006280[] = dspot04_room_0Set_001240DL_006280; -#define dspot04_room_0Set_001240DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_006C10" +#define dspot04_room_0Set_001240DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_006C10" static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_006C10[] = dspot04_room_0Set_001240DL_006C10; -#define dspot04_room_0Set_001240DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_009740" +#define dspot04_room_0Set_001240DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_009740" static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_009740[] = dspot04_room_0Set_001240DL_009740; -#define dspot04_room_0Set_001240DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_00A808" +#define dspot04_room_0Set_001240DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_00A808" static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_00A808[] = dspot04_room_0Set_001240DL_00A808; -#define dspot04_room_0Set_001240DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_0055C0" +#define dspot04_room_0Set_001240DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_0055C0" static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_0055C0[] = dspot04_room_0Set_001240DL_0055C0; diff --git a/soh/assets/scenes/overworld/spot04/spot04_room_1.h b/soh/assets/scenes/overworld/spot04/spot04_room_1.h index 098b2c293..4f0c0e633 100644 --- a/soh/assets/scenes/overworld/spot04/spot04_room_1.h +++ b/soh/assets/scenes/overworld/spot04/spot04_room_1.h @@ -3,220 +3,220 @@ #include "align_asset_macro.h" -#define dspot04_room_1DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1DL_0018D0" -static const ALIGN_ASSET(2) char spot04_room_1DL_0018D0[] = dspot04_room_1DL_0018D0; - -#define dspot04_room_1Tex_0056A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Tex_0056A8" -static const ALIGN_ASSET(2) char spot04_room_1Tex_0056A8[] = dspot04_room_1Tex_0056A8; - -#define dspot04_room_1DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1DL_007810" -static const ALIGN_ASSET(2) char spot04_room_1DL_007810[] = dspot04_room_1DL_007810; - -#define dspot04_room_1Tex_007D78 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Tex_007D78" -static const ALIGN_ASSET(2) char spot04_room_1Tex_007D78[] = dspot04_room_1Tex_007D78; - -#define dspot04_room_1DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1DL_004D48" -static const ALIGN_ASSET(2) char spot04_room_1DL_004D48[] = dspot04_room_1DL_004D48; - -#define dspot04_room_1DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1DL_004218" -static const ALIGN_ASSET(2) char spot04_room_1DL_004218[] = dspot04_room_1DL_004218; - -#define dspot04_room_1Tex_004EA8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Tex_004EA8" +#define dspot04_room_1Tex_004EA8 "__OTR__scenes/shared/spot04_scene/spot04_room_1Tex_004EA8" static const ALIGN_ASSET(2) char spot04_room_1Tex_004EA8[] = dspot04_room_1Tex_004EA8; -#define dspot04_room_1Tex_0052A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Tex_0052A8" +#define dspot04_room_1Tex_0052A8 "__OTR__scenes/shared/spot04_scene/spot04_room_1Tex_0052A8" static const ALIGN_ASSET(2) char spot04_room_1Tex_0052A8[] = dspot04_room_1Tex_0052A8; -#define dspot04_room_1Tex_0066A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Tex_0066A8" +#define dspot04_room_1Tex_0056A8 "__OTR__scenes/shared/spot04_scene/spot04_room_1Tex_0056A8" +static const ALIGN_ASSET(2) char spot04_room_1Tex_0056A8[] = dspot04_room_1Tex_0056A8; + +#define dspot04_room_1Tex_0066A8 "__OTR__scenes/shared/spot04_scene/spot04_room_1Tex_0066A8" static const ALIGN_ASSET(2) char spot04_room_1Tex_0066A8[] = dspot04_room_1Tex_0066A8; -#define dspot04_room_1Tex_006EA8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Tex_006EA8" +#define dspot04_room_1Tex_006EA8 "__OTR__scenes/shared/spot04_scene/spot04_room_1Tex_006EA8" static const ALIGN_ASSET(2) char spot04_room_1Tex_006EA8[] = dspot04_room_1Tex_006EA8; -#define dspot04_room_1DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1DL_007A90" -static const ALIGN_ASSET(2) char spot04_room_1DL_007A90[] = dspot04_room_1DL_007A90; - -#define dspot04_room_1Tex_007B78 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Tex_007B78" +#define dspot04_room_1Tex_007B78 "__OTR__scenes/shared/spot04_scene/spot04_room_1Tex_007B78" static const ALIGN_ASSET(2) char spot04_room_1Tex_007B78[] = dspot04_room_1Tex_007B78; -#define dspot04_room_1Set_000160DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000160DL_0018D0" +#define dspot04_room_1Tex_007D78 "__OTR__scenes/shared/spot04_scene/spot04_room_1Tex_007D78" +static const ALIGN_ASSET(2) char spot04_room_1Tex_007D78[] = dspot04_room_1Tex_007D78; + +#define dspot04_room_1DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1DL_0018D0" +static const ALIGN_ASSET(2) char spot04_room_1DL_0018D0[] = dspot04_room_1DL_0018D0; + +#define dspot04_room_1DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1DL_007810" +static const ALIGN_ASSET(2) char spot04_room_1DL_007810[] = dspot04_room_1DL_007810; + +#define dspot04_room_1DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1DL_004D48" +static const ALIGN_ASSET(2) char spot04_room_1DL_004D48[] = dspot04_room_1DL_004D48; + +#define dspot04_room_1DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1DL_004218" +static const ALIGN_ASSET(2) char spot04_room_1DL_004218[] = dspot04_room_1DL_004218; + +#define dspot04_room_1DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1DL_007A90" +static const ALIGN_ASSET(2) char spot04_room_1DL_007A90[] = dspot04_room_1DL_007A90; + +#define dspot04_room_1Set_000160DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000160DL_0018D0" static const ALIGN_ASSET(2) char spot04_room_1Set_000160DL_0018D0[] = dspot04_room_1Set_000160DL_0018D0; -#define dspot04_room_1Set_000160DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000160DL_007810" +#define dspot04_room_1Set_000160DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000160DL_007810" static const ALIGN_ASSET(2) char spot04_room_1Set_000160DL_007810[] = dspot04_room_1Set_000160DL_007810; -#define dspot04_room_1Set_000160DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000160DL_004D48" +#define dspot04_room_1Set_000160DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000160DL_004D48" static const ALIGN_ASSET(2) char spot04_room_1Set_000160DL_004D48[] = dspot04_room_1Set_000160DL_004D48; -#define dspot04_room_1Set_000160DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000160DL_004218" +#define dspot04_room_1Set_000160DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000160DL_004218" static const ALIGN_ASSET(2) char spot04_room_1Set_000160DL_004218[] = dspot04_room_1Set_000160DL_004218; -#define dspot04_room_1Set_000160DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000160DL_007A90" +#define dspot04_room_1Set_000160DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000160DL_007A90" static const ALIGN_ASSET(2) char spot04_room_1Set_000160DL_007A90[] = dspot04_room_1Set_000160DL_007A90; -#define dspot04_room_1Set_000250DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000250DL_0018D0" +#define dspot04_room_1Set_000250DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000250DL_0018D0" static const ALIGN_ASSET(2) char spot04_room_1Set_000250DL_0018D0[] = dspot04_room_1Set_000250DL_0018D0; -#define dspot04_room_1Set_000250DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000250DL_007810" +#define dspot04_room_1Set_000250DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000250DL_007810" static const ALIGN_ASSET(2) char spot04_room_1Set_000250DL_007810[] = dspot04_room_1Set_000250DL_007810; -#define dspot04_room_1Set_000250DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000250DL_004D48" +#define dspot04_room_1Set_000250DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000250DL_004D48" static const ALIGN_ASSET(2) char spot04_room_1Set_000250DL_004D48[] = dspot04_room_1Set_000250DL_004D48; -#define dspot04_room_1Set_000250DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000250DL_004218" +#define dspot04_room_1Set_000250DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000250DL_004218" static const ALIGN_ASSET(2) char spot04_room_1Set_000250DL_004218[] = dspot04_room_1Set_000250DL_004218; -#define dspot04_room_1Set_000250DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000250DL_007A90" +#define dspot04_room_1Set_000250DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000250DL_007A90" static const ALIGN_ASSET(2) char spot04_room_1Set_000250DL_007A90[] = dspot04_room_1Set_000250DL_007A90; -#define dspot04_room_1Set_0002F0DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_0002F0DL_0018D0" +#define dspot04_room_1Set_0002F0DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_0002F0DL_0018D0" static const ALIGN_ASSET(2) char spot04_room_1Set_0002F0DL_0018D0[] = dspot04_room_1Set_0002F0DL_0018D0; -#define dspot04_room_1Set_0002F0DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_0002F0DL_007810" +#define dspot04_room_1Set_0002F0DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_0002F0DL_007810" static const ALIGN_ASSET(2) char spot04_room_1Set_0002F0DL_007810[] = dspot04_room_1Set_0002F0DL_007810; -#define dspot04_room_1Set_0002F0DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_0002F0DL_004D48" +#define dspot04_room_1Set_0002F0DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_0002F0DL_004D48" static const ALIGN_ASSET(2) char spot04_room_1Set_0002F0DL_004D48[] = dspot04_room_1Set_0002F0DL_004D48; -#define dspot04_room_1Set_0002F0DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_0002F0DL_004218" +#define dspot04_room_1Set_0002F0DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_0002F0DL_004218" static const ALIGN_ASSET(2) char spot04_room_1Set_0002F0DL_004218[] = dspot04_room_1Set_0002F0DL_004218; -#define dspot04_room_1Set_0002F0DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_0002F0DL_007A90" +#define dspot04_room_1Set_0002F0DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_0002F0DL_007A90" static const ALIGN_ASSET(2) char spot04_room_1Set_0002F0DL_007A90[] = dspot04_room_1Set_0002F0DL_007A90; -#define dspot04_room_1Set_000370DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000370DL_0018D0" +#define dspot04_room_1Set_000370DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000370DL_0018D0" static const ALIGN_ASSET(2) char spot04_room_1Set_000370DL_0018D0[] = dspot04_room_1Set_000370DL_0018D0; -#define dspot04_room_1Set_000370DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000370DL_007810" +#define dspot04_room_1Set_000370DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000370DL_007810" static const ALIGN_ASSET(2) char spot04_room_1Set_000370DL_007810[] = dspot04_room_1Set_000370DL_007810; -#define dspot04_room_1Set_000370DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000370DL_004D48" +#define dspot04_room_1Set_000370DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000370DL_004D48" static const ALIGN_ASSET(2) char spot04_room_1Set_000370DL_004D48[] = dspot04_room_1Set_000370DL_004D48; -#define dspot04_room_1Set_000370DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000370DL_004218" +#define dspot04_room_1Set_000370DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000370DL_004218" static const ALIGN_ASSET(2) char spot04_room_1Set_000370DL_004218[] = dspot04_room_1Set_000370DL_004218; -#define dspot04_room_1Set_000370DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000370DL_007A90" +#define dspot04_room_1Set_000370DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000370DL_007A90" static const ALIGN_ASSET(2) char spot04_room_1Set_000370DL_007A90[] = dspot04_room_1Set_000370DL_007A90; -#define dspot04_room_1Set_000400DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000400DL_0018D0" +#define dspot04_room_1Set_000400DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000400DL_0018D0" static const ALIGN_ASSET(2) char spot04_room_1Set_000400DL_0018D0[] = dspot04_room_1Set_000400DL_0018D0; -#define dspot04_room_1Set_000400DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000400DL_007810" +#define dspot04_room_1Set_000400DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000400DL_007810" static const ALIGN_ASSET(2) char spot04_room_1Set_000400DL_007810[] = dspot04_room_1Set_000400DL_007810; -#define dspot04_room_1Set_000400DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000400DL_004D48" +#define dspot04_room_1Set_000400DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000400DL_004D48" static const ALIGN_ASSET(2) char spot04_room_1Set_000400DL_004D48[] = dspot04_room_1Set_000400DL_004D48; -#define dspot04_room_1Set_000400DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000400DL_004218" +#define dspot04_room_1Set_000400DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000400DL_004218" static const ALIGN_ASSET(2) char spot04_room_1Set_000400DL_004218[] = dspot04_room_1Set_000400DL_004218; -#define dspot04_room_1Set_000400DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000400DL_007A90" +#define dspot04_room_1Set_000400DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000400DL_007A90" static const ALIGN_ASSET(2) char spot04_room_1Set_000400DL_007A90[] = dspot04_room_1Set_000400DL_007A90; -#define dspot04_room_1Set_0004A0DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_0004A0DL_0018D0" +#define dspot04_room_1Set_0004A0DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_0004A0DL_0018D0" static const ALIGN_ASSET(2) char spot04_room_1Set_0004A0DL_0018D0[] = dspot04_room_1Set_0004A0DL_0018D0; -#define dspot04_room_1Set_0004A0DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_0004A0DL_007810" +#define dspot04_room_1Set_0004A0DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_0004A0DL_007810" static const ALIGN_ASSET(2) char spot04_room_1Set_0004A0DL_007810[] = dspot04_room_1Set_0004A0DL_007810; -#define dspot04_room_1Set_0004A0DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_0004A0DL_004D48" +#define dspot04_room_1Set_0004A0DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_0004A0DL_004D48" static const ALIGN_ASSET(2) char spot04_room_1Set_0004A0DL_004D48[] = dspot04_room_1Set_0004A0DL_004D48; -#define dspot04_room_1Set_0004A0DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_0004A0DL_004218" +#define dspot04_room_1Set_0004A0DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_0004A0DL_004218" static const ALIGN_ASSET(2) char spot04_room_1Set_0004A0DL_004218[] = dspot04_room_1Set_0004A0DL_004218; -#define dspot04_room_1Set_0004A0DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_0004A0DL_007A90" +#define dspot04_room_1Set_0004A0DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_0004A0DL_007A90" static const ALIGN_ASSET(2) char spot04_room_1Set_0004A0DL_007A90[] = dspot04_room_1Set_0004A0DL_007A90; -#define dspot04_room_1Set_000510DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000510DL_0018D0" +#define dspot04_room_1Set_000510DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000510DL_0018D0" static const ALIGN_ASSET(2) char spot04_room_1Set_000510DL_0018D0[] = dspot04_room_1Set_000510DL_0018D0; -#define dspot04_room_1Set_000510DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000510DL_007810" +#define dspot04_room_1Set_000510DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000510DL_007810" static const ALIGN_ASSET(2) char spot04_room_1Set_000510DL_007810[] = dspot04_room_1Set_000510DL_007810; -#define dspot04_room_1Set_000510DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000510DL_004D48" +#define dspot04_room_1Set_000510DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000510DL_004D48" static const ALIGN_ASSET(2) char spot04_room_1Set_000510DL_004D48[] = dspot04_room_1Set_000510DL_004D48; -#define dspot04_room_1Set_000510DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000510DL_004218" +#define dspot04_room_1Set_000510DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000510DL_004218" static const ALIGN_ASSET(2) char spot04_room_1Set_000510DL_004218[] = dspot04_room_1Set_000510DL_004218; -#define dspot04_room_1Set_000510DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000510DL_007A90" +#define dspot04_room_1Set_000510DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000510DL_007A90" static const ALIGN_ASSET(2) char spot04_room_1Set_000510DL_007A90[] = dspot04_room_1Set_000510DL_007A90; -#define dspot04_room_1Set_000640DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000640DL_0018D0" +#define dspot04_room_1Set_000640DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000640DL_0018D0" static const ALIGN_ASSET(2) char spot04_room_1Set_000640DL_0018D0[] = dspot04_room_1Set_000640DL_0018D0; -#define dspot04_room_1Set_000640DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000640DL_007810" +#define dspot04_room_1Set_000640DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000640DL_007810" static const ALIGN_ASSET(2) char spot04_room_1Set_000640DL_007810[] = dspot04_room_1Set_000640DL_007810; -#define dspot04_room_1Set_000640DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000640DL_004D48" +#define dspot04_room_1Set_000640DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000640DL_004D48" static const ALIGN_ASSET(2) char spot04_room_1Set_000640DL_004D48[] = dspot04_room_1Set_000640DL_004D48; -#define dspot04_room_1Set_000640DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000640DL_004218" +#define dspot04_room_1Set_000640DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000640DL_004218" static const ALIGN_ASSET(2) char spot04_room_1Set_000640DL_004218[] = dspot04_room_1Set_000640DL_004218; -#define dspot04_room_1Set_000640DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000640DL_007A90" +#define dspot04_room_1Set_000640DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000640DL_007A90" static const ALIGN_ASSET(2) char spot04_room_1Set_000640DL_007A90[] = dspot04_room_1Set_000640DL_007A90; -#define dspot04_room_1Set_000770DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000770DL_0018D0" +#define dspot04_room_1Set_000770DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000770DL_0018D0" static const ALIGN_ASSET(2) char spot04_room_1Set_000770DL_0018D0[] = dspot04_room_1Set_000770DL_0018D0; -#define dspot04_room_1Set_000770DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000770DL_007810" +#define dspot04_room_1Set_000770DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000770DL_007810" static const ALIGN_ASSET(2) char spot04_room_1Set_000770DL_007810[] = dspot04_room_1Set_000770DL_007810; -#define dspot04_room_1Set_000770DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000770DL_004D48" +#define dspot04_room_1Set_000770DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000770DL_004D48" static const ALIGN_ASSET(2) char spot04_room_1Set_000770DL_004D48[] = dspot04_room_1Set_000770DL_004D48; -#define dspot04_room_1Set_000770DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000770DL_004218" +#define dspot04_room_1Set_000770DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000770DL_004218" static const ALIGN_ASSET(2) char spot04_room_1Set_000770DL_004218[] = dspot04_room_1Set_000770DL_004218; -#define dspot04_room_1Set_000770DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000770DL_007A90" +#define dspot04_room_1Set_000770DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000770DL_007A90" static const ALIGN_ASSET(2) char spot04_room_1Set_000770DL_007A90[] = dspot04_room_1Set_000770DL_007A90; -#define dspot04_room_1Set_000800DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000800DL_0018D0" +#define dspot04_room_1Set_000800DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000800DL_0018D0" static const ALIGN_ASSET(2) char spot04_room_1Set_000800DL_0018D0[] = dspot04_room_1Set_000800DL_0018D0; -#define dspot04_room_1Set_000800DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000800DL_007810" +#define dspot04_room_1Set_000800DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000800DL_007810" static const ALIGN_ASSET(2) char spot04_room_1Set_000800DL_007810[] = dspot04_room_1Set_000800DL_007810; -#define dspot04_room_1Set_000800DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000800DL_004D48" +#define dspot04_room_1Set_000800DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000800DL_004D48" static const ALIGN_ASSET(2) char spot04_room_1Set_000800DL_004D48[] = dspot04_room_1Set_000800DL_004D48; -#define dspot04_room_1Set_000800DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000800DL_004218" +#define dspot04_room_1Set_000800DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000800DL_004218" static const ALIGN_ASSET(2) char spot04_room_1Set_000800DL_004218[] = dspot04_room_1Set_000800DL_004218; -#define dspot04_room_1Set_000800DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000800DL_007A90" +#define dspot04_room_1Set_000800DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000800DL_007A90" static const ALIGN_ASSET(2) char spot04_room_1Set_000800DL_007A90[] = dspot04_room_1Set_000800DL_007A90; -#define dspot04_room_1Set_000860DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000860DL_0018D0" +#define dspot04_room_1Set_000860DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000860DL_0018D0" static const ALIGN_ASSET(2) char spot04_room_1Set_000860DL_0018D0[] = dspot04_room_1Set_000860DL_0018D0; -#define dspot04_room_1Set_000860DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000860DL_007810" +#define dspot04_room_1Set_000860DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000860DL_007810" static const ALIGN_ASSET(2) char spot04_room_1Set_000860DL_007810[] = dspot04_room_1Set_000860DL_007810; -#define dspot04_room_1Set_000860DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000860DL_004D48" +#define dspot04_room_1Set_000860DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000860DL_004D48" static const ALIGN_ASSET(2) char spot04_room_1Set_000860DL_004D48[] = dspot04_room_1Set_000860DL_004D48; -#define dspot04_room_1Set_000860DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000860DL_004218" +#define dspot04_room_1Set_000860DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000860DL_004218" static const ALIGN_ASSET(2) char spot04_room_1Set_000860DL_004218[] = dspot04_room_1Set_000860DL_004218; -#define dspot04_room_1Set_000860DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000860DL_007A90" +#define dspot04_room_1Set_000860DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000860DL_007A90" static const ALIGN_ASSET(2) char spot04_room_1Set_000860DL_007A90[] = dspot04_room_1Set_000860DL_007A90; -#define dspot04_room_1Set_000900DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000900DL_0018D0" +#define dspot04_room_1Set_000900DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000900DL_0018D0" static const ALIGN_ASSET(2) char spot04_room_1Set_000900DL_0018D0[] = dspot04_room_1Set_000900DL_0018D0; -#define dspot04_room_1Set_000900DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000900DL_007810" +#define dspot04_room_1Set_000900DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000900DL_007810" static const ALIGN_ASSET(2) char spot04_room_1Set_000900DL_007810[] = dspot04_room_1Set_000900DL_007810; -#define dspot04_room_1Set_000900DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000900DL_004D48" +#define dspot04_room_1Set_000900DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000900DL_004D48" static const ALIGN_ASSET(2) char spot04_room_1Set_000900DL_004D48[] = dspot04_room_1Set_000900DL_004D48; -#define dspot04_room_1Set_000900DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000900DL_004218" +#define dspot04_room_1Set_000900DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000900DL_004218" static const ALIGN_ASSET(2) char spot04_room_1Set_000900DL_004218[] = dspot04_room_1Set_000900DL_004218; -#define dspot04_room_1Set_000900DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000900DL_007A90" +#define dspot04_room_1Set_000900DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000900DL_007A90" static const ALIGN_ASSET(2) char spot04_room_1Set_000900DL_007A90[] = dspot04_room_1Set_000900DL_007A90; diff --git a/soh/assets/scenes/overworld/spot04/spot04_room_2.h b/soh/assets/scenes/overworld/spot04/spot04_room_2.h index e7f76b047..c3185dc3e 100644 --- a/soh/assets/scenes/overworld/spot04/spot04_room_2.h +++ b/soh/assets/scenes/overworld/spot04/spot04_room_2.h @@ -3,343 +3,343 @@ #include "align_asset_macro.h" -#define dgSpot04DL_002BB8 "__OTR__scenes/nonmq/spot04_scene/gSpot04DL_002BB8" -static const ALIGN_ASSET(2) char gSpot04DL_002BB8[] = dgSpot04DL_002BB8; - -#define dgSpot04DL_005058 "__OTR__scenes/nonmq/spot04_scene/gSpot04DL_005058" -static const ALIGN_ASSET(2) char gSpot04DL_005058[] = dgSpot04DL_005058; - -#define dspot04_room_2DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2DL_000840" -static const ALIGN_ASSET(2) char spot04_room_2DL_000840[] = dspot04_room_2DL_000840; - -#define dspot04_room_2DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2DL_004F80" -static const ALIGN_ASSET(2) char spot04_room_2DL_004F80[] = dspot04_room_2DL_004F80; - -#define dspot04_room_2DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2DL_001AC0" -static const ALIGN_ASSET(2) char spot04_room_2DL_001AC0[] = dspot04_room_2DL_001AC0; - -#define dspot04_room_2DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2DL_001378" -static const ALIGN_ASSET(2) char spot04_room_2DL_001378[] = dspot04_room_2DL_001378; - -#define dspot04_room_2Tex_002BF8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Tex_002BF8" +#define dspot04_room_2Tex_002BF8 "__OTR__scenes/shared/spot04_scene/spot04_room_2Tex_002BF8" static const ALIGN_ASSET(2) char spot04_room_2Tex_002BF8[] = dspot04_room_2Tex_002BF8; -#define dspot04_room_2Tex_002DF8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Tex_002DF8" +#define dspot04_room_2Tex_002DF8 "__OTR__scenes/shared/spot04_scene/spot04_room_2Tex_002DF8" static const ALIGN_ASSET(2) char spot04_room_2Tex_002DF8[] = dspot04_room_2Tex_002DF8; -#define dspot04_room_2DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2DL_002730" -static const ALIGN_ASSET(2) char spot04_room_2DL_002730[] = dspot04_room_2DL_002730; - -#define dspot04_room_2Tex_0033F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Tex_0033F8" -static const ALIGN_ASSET(2) char spot04_room_2Tex_0033F8[] = dspot04_room_2Tex_0033F8; - -#define dspot04_room_2Tex_003BF8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Tex_003BF8" -static const ALIGN_ASSET(2) char spot04_room_2Tex_003BF8[] = dspot04_room_2Tex_003BF8; - -#define dspot04_room_2DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2DL_002AD0" -static const ALIGN_ASSET(2) char spot04_room_2DL_002AD0[] = dspot04_room_2DL_002AD0; - -#define dspot04_room_2Tex_0045F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Tex_0045F8" -static const ALIGN_ASSET(2) char spot04_room_2Tex_0045F8[] = dspot04_room_2Tex_0045F8; - -#define dspot04_room_2DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2DL_001EC0" -static const ALIGN_ASSET(2) char spot04_room_2DL_001EC0[] = dspot04_room_2DL_001EC0; - -#define dspot04_room_2Tex_0043F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Tex_0043F8" -static const ALIGN_ASSET(2) char spot04_room_2Tex_0043F8[] = dspot04_room_2Tex_0043F8; - -#define dspot04_room_2DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2DL_002338" -static const ALIGN_ASSET(2) char spot04_room_2DL_002338[] = dspot04_room_2DL_002338; - -#define dspot04_room_2Tex_002FF8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Tex_002FF8" +#define dspot04_room_2Tex_002FF8 "__OTR__scenes/shared/spot04_scene/spot04_room_2Tex_002FF8" static const ALIGN_ASSET(2) char spot04_room_2Tex_002FF8[] = dspot04_room_2Tex_002FF8; -#define dspot04_room_2Set_0001D0DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0001D0DL_000840" +#define dspot04_room_2Tex_0033F8 "__OTR__scenes/shared/spot04_scene/spot04_room_2Tex_0033F8" +static const ALIGN_ASSET(2) char spot04_room_2Tex_0033F8[] = dspot04_room_2Tex_0033F8; + +#define dspot04_room_2Tex_003BF8 "__OTR__scenes/shared/spot04_scene/spot04_room_2Tex_003BF8" +static const ALIGN_ASSET(2) char spot04_room_2Tex_003BF8[] = dspot04_room_2Tex_003BF8; + +#define dspot04_room_2Tex_0043F8 "__OTR__scenes/shared/spot04_scene/spot04_room_2Tex_0043F8" +static const ALIGN_ASSET(2) char spot04_room_2Tex_0043F8[] = dspot04_room_2Tex_0043F8; + +#define dspot04_room_2Tex_0045F8 "__OTR__scenes/shared/spot04_scene/spot04_room_2Tex_0045F8" +static const ALIGN_ASSET(2) char spot04_room_2Tex_0045F8[] = dspot04_room_2Tex_0045F8; + +#define dgSpot04DL_002BB8 "__OTR__scenes/shared/spot04_scene/gSpot04DL_002BB8" +static const ALIGN_ASSET(2) char gSpot04DL_002BB8[] = dgSpot04DL_002BB8; + +#define dgSpot04DL_005058 "__OTR__scenes/shared/spot04_scene/gSpot04DL_005058" +static const ALIGN_ASSET(2) char gSpot04DL_005058[] = dgSpot04DL_005058; + +#define dspot04_room_2DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2DL_000840" +static const ALIGN_ASSET(2) char spot04_room_2DL_000840[] = dspot04_room_2DL_000840; + +#define dspot04_room_2DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2DL_004F80" +static const ALIGN_ASSET(2) char spot04_room_2DL_004F80[] = dspot04_room_2DL_004F80; + +#define dspot04_room_2DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2DL_001AC0" +static const ALIGN_ASSET(2) char spot04_room_2DL_001AC0[] = dspot04_room_2DL_001AC0; + +#define dspot04_room_2DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2DL_001378" +static const ALIGN_ASSET(2) char spot04_room_2DL_001378[] = dspot04_room_2DL_001378; + +#define dspot04_room_2DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2DL_002730" +static const ALIGN_ASSET(2) char spot04_room_2DL_002730[] = dspot04_room_2DL_002730; + +#define dspot04_room_2DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2DL_002AD0" +static const ALIGN_ASSET(2) char spot04_room_2DL_002AD0[] = dspot04_room_2DL_002AD0; + +#define dspot04_room_2DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2DL_001EC0" +static const ALIGN_ASSET(2) char spot04_room_2DL_001EC0[] = dspot04_room_2DL_001EC0; + +#define dspot04_room_2DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2DL_002338" +static const ALIGN_ASSET(2) char spot04_room_2DL_002338[] = dspot04_room_2DL_002338; + +#define dspot04_room_2Set_0001D0DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0001D0DL_000840" static const ALIGN_ASSET(2) char spot04_room_2Set_0001D0DL_000840[] = dspot04_room_2Set_0001D0DL_000840; -#define dspot04_room_2Set_0001D0DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0001D0DL_004F80" +#define dspot04_room_2Set_0001D0DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0001D0DL_004F80" static const ALIGN_ASSET(2) char spot04_room_2Set_0001D0DL_004F80[] = dspot04_room_2Set_0001D0DL_004F80; -#define dspot04_room_2Set_0001D0DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0001D0DL_001AC0" +#define dspot04_room_2Set_0001D0DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0001D0DL_001AC0" static const ALIGN_ASSET(2) char spot04_room_2Set_0001D0DL_001AC0[] = dspot04_room_2Set_0001D0DL_001AC0; -#define dspot04_room_2Set_0001D0DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0001D0DL_001378" +#define dspot04_room_2Set_0001D0DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0001D0DL_001378" static const ALIGN_ASSET(2) char spot04_room_2Set_0001D0DL_001378[] = dspot04_room_2Set_0001D0DL_001378; -#define dspot04_room_2Set_0001D0DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0001D0DL_002730" +#define dspot04_room_2Set_0001D0DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0001D0DL_002730" static const ALIGN_ASSET(2) char spot04_room_2Set_0001D0DL_002730[] = dspot04_room_2Set_0001D0DL_002730; -#define dspot04_room_2Set_0001D0DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0001D0DL_002AD0" +#define dspot04_room_2Set_0001D0DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0001D0DL_002AD0" static const ALIGN_ASSET(2) char spot04_room_2Set_0001D0DL_002AD0[] = dspot04_room_2Set_0001D0DL_002AD0; -#define dspot04_room_2Set_0001D0DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0001D0DL_001EC0" +#define dspot04_room_2Set_0001D0DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0001D0DL_001EC0" static const ALIGN_ASSET(2) char spot04_room_2Set_0001D0DL_001EC0[] = dspot04_room_2Set_0001D0DL_001EC0; -#define dspot04_room_2Set_0001D0DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0001D0DL_002338" +#define dspot04_room_2Set_0001D0DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0001D0DL_002338" static const ALIGN_ASSET(2) char spot04_room_2Set_0001D0DL_002338[] = dspot04_room_2Set_0001D0DL_002338; -#define dspot04_room_2Set_000200DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000200DL_000840" +#define dspot04_room_2Set_000200DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000200DL_000840" static const ALIGN_ASSET(2) char spot04_room_2Set_000200DL_000840[] = dspot04_room_2Set_000200DL_000840; -#define dspot04_room_2Set_000200DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000200DL_004F80" +#define dspot04_room_2Set_000200DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000200DL_004F80" static const ALIGN_ASSET(2) char spot04_room_2Set_000200DL_004F80[] = dspot04_room_2Set_000200DL_004F80; -#define dspot04_room_2Set_000200DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000200DL_001AC0" +#define dspot04_room_2Set_000200DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000200DL_001AC0" static const ALIGN_ASSET(2) char spot04_room_2Set_000200DL_001AC0[] = dspot04_room_2Set_000200DL_001AC0; -#define dspot04_room_2Set_000200DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000200DL_001378" +#define dspot04_room_2Set_000200DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000200DL_001378" static const ALIGN_ASSET(2) char spot04_room_2Set_000200DL_001378[] = dspot04_room_2Set_000200DL_001378; -#define dspot04_room_2Set_000200DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000200DL_002730" +#define dspot04_room_2Set_000200DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000200DL_002730" static const ALIGN_ASSET(2) char spot04_room_2Set_000200DL_002730[] = dspot04_room_2Set_000200DL_002730; -#define dspot04_room_2Set_000200DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000200DL_002AD0" +#define dspot04_room_2Set_000200DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000200DL_002AD0" static const ALIGN_ASSET(2) char spot04_room_2Set_000200DL_002AD0[] = dspot04_room_2Set_000200DL_002AD0; -#define dspot04_room_2Set_000200DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000200DL_001EC0" +#define dspot04_room_2Set_000200DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000200DL_001EC0" static const ALIGN_ASSET(2) char spot04_room_2Set_000200DL_001EC0[] = dspot04_room_2Set_000200DL_001EC0; -#define dspot04_room_2Set_000200DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000200DL_002338" +#define dspot04_room_2Set_000200DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000200DL_002338" static const ALIGN_ASSET(2) char spot04_room_2Set_000200DL_002338[] = dspot04_room_2Set_000200DL_002338; -#define dspot04_room_2Set_000230DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000230DL_000840" +#define dspot04_room_2Set_000230DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000230DL_000840" static const ALIGN_ASSET(2) char spot04_room_2Set_000230DL_000840[] = dspot04_room_2Set_000230DL_000840; -#define dspot04_room_2Set_000230DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000230DL_004F80" +#define dspot04_room_2Set_000230DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000230DL_004F80" static const ALIGN_ASSET(2) char spot04_room_2Set_000230DL_004F80[] = dspot04_room_2Set_000230DL_004F80; -#define dspot04_room_2Set_000230DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000230DL_001AC0" +#define dspot04_room_2Set_000230DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000230DL_001AC0" static const ALIGN_ASSET(2) char spot04_room_2Set_000230DL_001AC0[] = dspot04_room_2Set_000230DL_001AC0; -#define dspot04_room_2Set_000230DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000230DL_001378" +#define dspot04_room_2Set_000230DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000230DL_001378" static const ALIGN_ASSET(2) char spot04_room_2Set_000230DL_001378[] = dspot04_room_2Set_000230DL_001378; -#define dspot04_room_2Set_000230DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000230DL_002730" +#define dspot04_room_2Set_000230DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000230DL_002730" static const ALIGN_ASSET(2) char spot04_room_2Set_000230DL_002730[] = dspot04_room_2Set_000230DL_002730; -#define dspot04_room_2Set_000230DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000230DL_002AD0" +#define dspot04_room_2Set_000230DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000230DL_002AD0" static const ALIGN_ASSET(2) char spot04_room_2Set_000230DL_002AD0[] = dspot04_room_2Set_000230DL_002AD0; -#define dspot04_room_2Set_000230DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000230DL_001EC0" +#define dspot04_room_2Set_000230DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000230DL_001EC0" static const ALIGN_ASSET(2) char spot04_room_2Set_000230DL_001EC0[] = dspot04_room_2Set_000230DL_001EC0; -#define dspot04_room_2Set_000230DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000230DL_002338" +#define dspot04_room_2Set_000230DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000230DL_002338" static const ALIGN_ASSET(2) char spot04_room_2Set_000230DL_002338[] = dspot04_room_2Set_000230DL_002338; -#define dspot04_room_2Set_000260DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000260DL_000840" +#define dspot04_room_2Set_000260DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000260DL_000840" static const ALIGN_ASSET(2) char spot04_room_2Set_000260DL_000840[] = dspot04_room_2Set_000260DL_000840; -#define dspot04_room_2Set_000260DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000260DL_004F80" +#define dspot04_room_2Set_000260DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000260DL_004F80" static const ALIGN_ASSET(2) char spot04_room_2Set_000260DL_004F80[] = dspot04_room_2Set_000260DL_004F80; -#define dspot04_room_2Set_000260DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000260DL_001AC0" +#define dspot04_room_2Set_000260DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000260DL_001AC0" static const ALIGN_ASSET(2) char spot04_room_2Set_000260DL_001AC0[] = dspot04_room_2Set_000260DL_001AC0; -#define dspot04_room_2Set_000260DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000260DL_001378" +#define dspot04_room_2Set_000260DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000260DL_001378" static const ALIGN_ASSET(2) char spot04_room_2Set_000260DL_001378[] = dspot04_room_2Set_000260DL_001378; -#define dspot04_room_2Set_000260DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000260DL_002730" +#define dspot04_room_2Set_000260DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000260DL_002730" static const ALIGN_ASSET(2) char spot04_room_2Set_000260DL_002730[] = dspot04_room_2Set_000260DL_002730; -#define dspot04_room_2Set_000260DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000260DL_002AD0" +#define dspot04_room_2Set_000260DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000260DL_002AD0" static const ALIGN_ASSET(2) char spot04_room_2Set_000260DL_002AD0[] = dspot04_room_2Set_000260DL_002AD0; -#define dspot04_room_2Set_000260DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000260DL_001EC0" +#define dspot04_room_2Set_000260DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000260DL_001EC0" static const ALIGN_ASSET(2) char spot04_room_2Set_000260DL_001EC0[] = dspot04_room_2Set_000260DL_001EC0; -#define dspot04_room_2Set_000260DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000260DL_002338" +#define dspot04_room_2Set_000260DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000260DL_002338" static const ALIGN_ASSET(2) char spot04_room_2Set_000260DL_002338[] = dspot04_room_2Set_000260DL_002338; -#define dspot04_room_2Set_000290DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000290DL_000840" +#define dspot04_room_2Set_000290DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000290DL_000840" static const ALIGN_ASSET(2) char spot04_room_2Set_000290DL_000840[] = dspot04_room_2Set_000290DL_000840; -#define dspot04_room_2Set_000290DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000290DL_004F80" +#define dspot04_room_2Set_000290DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000290DL_004F80" static const ALIGN_ASSET(2) char spot04_room_2Set_000290DL_004F80[] = dspot04_room_2Set_000290DL_004F80; -#define dspot04_room_2Set_000290DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000290DL_001AC0" +#define dspot04_room_2Set_000290DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000290DL_001AC0" static const ALIGN_ASSET(2) char spot04_room_2Set_000290DL_001AC0[] = dspot04_room_2Set_000290DL_001AC0; -#define dspot04_room_2Set_000290DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000290DL_001378" +#define dspot04_room_2Set_000290DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000290DL_001378" static const ALIGN_ASSET(2) char spot04_room_2Set_000290DL_001378[] = dspot04_room_2Set_000290DL_001378; -#define dspot04_room_2Set_000290DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000290DL_002730" +#define dspot04_room_2Set_000290DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000290DL_002730" static const ALIGN_ASSET(2) char spot04_room_2Set_000290DL_002730[] = dspot04_room_2Set_000290DL_002730; -#define dspot04_room_2Set_000290DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000290DL_002AD0" +#define dspot04_room_2Set_000290DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000290DL_002AD0" static const ALIGN_ASSET(2) char spot04_room_2Set_000290DL_002AD0[] = dspot04_room_2Set_000290DL_002AD0; -#define dspot04_room_2Set_000290DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000290DL_001EC0" +#define dspot04_room_2Set_000290DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000290DL_001EC0" static const ALIGN_ASSET(2) char spot04_room_2Set_000290DL_001EC0[] = dspot04_room_2Set_000290DL_001EC0; -#define dspot04_room_2Set_000290DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000290DL_002338" +#define dspot04_room_2Set_000290DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000290DL_002338" static const ALIGN_ASSET(2) char spot04_room_2Set_000290DL_002338[] = dspot04_room_2Set_000290DL_002338; -#define dspot04_room_2Set_0002C0DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002C0DL_000840" +#define dspot04_room_2Set_0002C0DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002C0DL_000840" static const ALIGN_ASSET(2) char spot04_room_2Set_0002C0DL_000840[] = dspot04_room_2Set_0002C0DL_000840; -#define dspot04_room_2Set_0002C0DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002C0DL_004F80" +#define dspot04_room_2Set_0002C0DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002C0DL_004F80" static const ALIGN_ASSET(2) char spot04_room_2Set_0002C0DL_004F80[] = dspot04_room_2Set_0002C0DL_004F80; -#define dspot04_room_2Set_0002C0DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002C0DL_001AC0" +#define dspot04_room_2Set_0002C0DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002C0DL_001AC0" static const ALIGN_ASSET(2) char spot04_room_2Set_0002C0DL_001AC0[] = dspot04_room_2Set_0002C0DL_001AC0; -#define dspot04_room_2Set_0002C0DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002C0DL_001378" +#define dspot04_room_2Set_0002C0DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002C0DL_001378" static const ALIGN_ASSET(2) char spot04_room_2Set_0002C0DL_001378[] = dspot04_room_2Set_0002C0DL_001378; -#define dspot04_room_2Set_0002C0DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002C0DL_002730" +#define dspot04_room_2Set_0002C0DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002C0DL_002730" static const ALIGN_ASSET(2) char spot04_room_2Set_0002C0DL_002730[] = dspot04_room_2Set_0002C0DL_002730; -#define dspot04_room_2Set_0002C0DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002C0DL_002AD0" +#define dspot04_room_2Set_0002C0DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002C0DL_002AD0" static const ALIGN_ASSET(2) char spot04_room_2Set_0002C0DL_002AD0[] = dspot04_room_2Set_0002C0DL_002AD0; -#define dspot04_room_2Set_0002C0DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002C0DL_001EC0" +#define dspot04_room_2Set_0002C0DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002C0DL_001EC0" static const ALIGN_ASSET(2) char spot04_room_2Set_0002C0DL_001EC0[] = dspot04_room_2Set_0002C0DL_001EC0; -#define dspot04_room_2Set_0002C0DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002C0DL_002338" +#define dspot04_room_2Set_0002C0DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002C0DL_002338" static const ALIGN_ASSET(2) char spot04_room_2Set_0002C0DL_002338[] = dspot04_room_2Set_0002C0DL_002338; -#define dspot04_room_2Set_0002F0DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002F0DL_000840" +#define dspot04_room_2Set_0002F0DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002F0DL_000840" static const ALIGN_ASSET(2) char spot04_room_2Set_0002F0DL_000840[] = dspot04_room_2Set_0002F0DL_000840; -#define dspot04_room_2Set_0002F0DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002F0DL_004F80" +#define dspot04_room_2Set_0002F0DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002F0DL_004F80" static const ALIGN_ASSET(2) char spot04_room_2Set_0002F0DL_004F80[] = dspot04_room_2Set_0002F0DL_004F80; -#define dspot04_room_2Set_0002F0DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002F0DL_001AC0" +#define dspot04_room_2Set_0002F0DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002F0DL_001AC0" static const ALIGN_ASSET(2) char spot04_room_2Set_0002F0DL_001AC0[] = dspot04_room_2Set_0002F0DL_001AC0; -#define dspot04_room_2Set_0002F0DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002F0DL_001378" +#define dspot04_room_2Set_0002F0DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002F0DL_001378" static const ALIGN_ASSET(2) char spot04_room_2Set_0002F0DL_001378[] = dspot04_room_2Set_0002F0DL_001378; -#define dspot04_room_2Set_0002F0DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002F0DL_002730" +#define dspot04_room_2Set_0002F0DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002F0DL_002730" static const ALIGN_ASSET(2) char spot04_room_2Set_0002F0DL_002730[] = dspot04_room_2Set_0002F0DL_002730; -#define dspot04_room_2Set_0002F0DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002F0DL_002AD0" +#define dspot04_room_2Set_0002F0DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002F0DL_002AD0" static const ALIGN_ASSET(2) char spot04_room_2Set_0002F0DL_002AD0[] = dspot04_room_2Set_0002F0DL_002AD0; -#define dspot04_room_2Set_0002F0DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002F0DL_001EC0" +#define dspot04_room_2Set_0002F0DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002F0DL_001EC0" static const ALIGN_ASSET(2) char spot04_room_2Set_0002F0DL_001EC0[] = dspot04_room_2Set_0002F0DL_001EC0; -#define dspot04_room_2Set_0002F0DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002F0DL_002338" +#define dspot04_room_2Set_0002F0DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002F0DL_002338" static const ALIGN_ASSET(2) char spot04_room_2Set_0002F0DL_002338[] = dspot04_room_2Set_0002F0DL_002338; -#define dspot04_room_2Set_000320DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000320DL_000840" +#define dspot04_room_2Set_000320DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000320DL_000840" static const ALIGN_ASSET(2) char spot04_room_2Set_000320DL_000840[] = dspot04_room_2Set_000320DL_000840; -#define dspot04_room_2Set_000320DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000320DL_004F80" +#define dspot04_room_2Set_000320DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000320DL_004F80" static const ALIGN_ASSET(2) char spot04_room_2Set_000320DL_004F80[] = dspot04_room_2Set_000320DL_004F80; -#define dspot04_room_2Set_000320DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000320DL_001AC0" +#define dspot04_room_2Set_000320DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000320DL_001AC0" static const ALIGN_ASSET(2) char spot04_room_2Set_000320DL_001AC0[] = dspot04_room_2Set_000320DL_001AC0; -#define dspot04_room_2Set_000320DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000320DL_001378" +#define dspot04_room_2Set_000320DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000320DL_001378" static const ALIGN_ASSET(2) char spot04_room_2Set_000320DL_001378[] = dspot04_room_2Set_000320DL_001378; -#define dspot04_room_2Set_000320DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000320DL_002730" +#define dspot04_room_2Set_000320DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000320DL_002730" static const ALIGN_ASSET(2) char spot04_room_2Set_000320DL_002730[] = dspot04_room_2Set_000320DL_002730; -#define dspot04_room_2Set_000320DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000320DL_002AD0" +#define dspot04_room_2Set_000320DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000320DL_002AD0" static const ALIGN_ASSET(2) char spot04_room_2Set_000320DL_002AD0[] = dspot04_room_2Set_000320DL_002AD0; -#define dspot04_room_2Set_000320DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000320DL_001EC0" +#define dspot04_room_2Set_000320DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000320DL_001EC0" static const ALIGN_ASSET(2) char spot04_room_2Set_000320DL_001EC0[] = dspot04_room_2Set_000320DL_001EC0; -#define dspot04_room_2Set_000320DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000320DL_002338" +#define dspot04_room_2Set_000320DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000320DL_002338" static const ALIGN_ASSET(2) char spot04_room_2Set_000320DL_002338[] = dspot04_room_2Set_000320DL_002338; -#define dspot04_room_2Set_000350DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000350DL_000840" +#define dspot04_room_2Set_000350DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000350DL_000840" static const ALIGN_ASSET(2) char spot04_room_2Set_000350DL_000840[] = dspot04_room_2Set_000350DL_000840; -#define dspot04_room_2Set_000350DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000350DL_004F80" +#define dspot04_room_2Set_000350DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000350DL_004F80" static const ALIGN_ASSET(2) char spot04_room_2Set_000350DL_004F80[] = dspot04_room_2Set_000350DL_004F80; -#define dspot04_room_2Set_000350DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000350DL_001AC0" +#define dspot04_room_2Set_000350DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000350DL_001AC0" static const ALIGN_ASSET(2) char spot04_room_2Set_000350DL_001AC0[] = dspot04_room_2Set_000350DL_001AC0; -#define dspot04_room_2Set_000350DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000350DL_001378" +#define dspot04_room_2Set_000350DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000350DL_001378" static const ALIGN_ASSET(2) char spot04_room_2Set_000350DL_001378[] = dspot04_room_2Set_000350DL_001378; -#define dspot04_room_2Set_000350DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000350DL_002730" +#define dspot04_room_2Set_000350DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000350DL_002730" static const ALIGN_ASSET(2) char spot04_room_2Set_000350DL_002730[] = dspot04_room_2Set_000350DL_002730; -#define dspot04_room_2Set_000350DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000350DL_002AD0" +#define dspot04_room_2Set_000350DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000350DL_002AD0" static const ALIGN_ASSET(2) char spot04_room_2Set_000350DL_002AD0[] = dspot04_room_2Set_000350DL_002AD0; -#define dspot04_room_2Set_000350DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000350DL_001EC0" +#define dspot04_room_2Set_000350DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000350DL_001EC0" static const ALIGN_ASSET(2) char spot04_room_2Set_000350DL_001EC0[] = dspot04_room_2Set_000350DL_001EC0; -#define dspot04_room_2Set_000350DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000350DL_002338" +#define dspot04_room_2Set_000350DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000350DL_002338" static const ALIGN_ASSET(2) char spot04_room_2Set_000350DL_002338[] = dspot04_room_2Set_000350DL_002338; -#define dspot04_room_2Set_000380DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000380DL_000840" +#define dspot04_room_2Set_000380DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000380DL_000840" static const ALIGN_ASSET(2) char spot04_room_2Set_000380DL_000840[] = dspot04_room_2Set_000380DL_000840; -#define dspot04_room_2Set_000380DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000380DL_004F80" +#define dspot04_room_2Set_000380DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000380DL_004F80" static const ALIGN_ASSET(2) char spot04_room_2Set_000380DL_004F80[] = dspot04_room_2Set_000380DL_004F80; -#define dspot04_room_2Set_000380DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000380DL_001AC0" +#define dspot04_room_2Set_000380DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000380DL_001AC0" static const ALIGN_ASSET(2) char spot04_room_2Set_000380DL_001AC0[] = dspot04_room_2Set_000380DL_001AC0; -#define dspot04_room_2Set_000380DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000380DL_001378" +#define dspot04_room_2Set_000380DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000380DL_001378" static const ALIGN_ASSET(2) char spot04_room_2Set_000380DL_001378[] = dspot04_room_2Set_000380DL_001378; -#define dspot04_room_2Set_000380DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000380DL_002730" +#define dspot04_room_2Set_000380DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000380DL_002730" static const ALIGN_ASSET(2) char spot04_room_2Set_000380DL_002730[] = dspot04_room_2Set_000380DL_002730; -#define dspot04_room_2Set_000380DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000380DL_002AD0" +#define dspot04_room_2Set_000380DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000380DL_002AD0" static const ALIGN_ASSET(2) char spot04_room_2Set_000380DL_002AD0[] = dspot04_room_2Set_000380DL_002AD0; -#define dspot04_room_2Set_000380DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000380DL_001EC0" +#define dspot04_room_2Set_000380DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000380DL_001EC0" static const ALIGN_ASSET(2) char spot04_room_2Set_000380DL_001EC0[] = dspot04_room_2Set_000380DL_001EC0; -#define dspot04_room_2Set_000380DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000380DL_002338" +#define dspot04_room_2Set_000380DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000380DL_002338" static const ALIGN_ASSET(2) char spot04_room_2Set_000380DL_002338[] = dspot04_room_2Set_000380DL_002338; -#define dspot04_room_2Set_0003B0DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003B0DL_000840" +#define dspot04_room_2Set_0003B0DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003B0DL_000840" static const ALIGN_ASSET(2) char spot04_room_2Set_0003B0DL_000840[] = dspot04_room_2Set_0003B0DL_000840; -#define dspot04_room_2Set_0003B0DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003B0DL_004F80" +#define dspot04_room_2Set_0003B0DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003B0DL_004F80" static const ALIGN_ASSET(2) char spot04_room_2Set_0003B0DL_004F80[] = dspot04_room_2Set_0003B0DL_004F80; -#define dspot04_room_2Set_0003B0DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003B0DL_001AC0" +#define dspot04_room_2Set_0003B0DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003B0DL_001AC0" static const ALIGN_ASSET(2) char spot04_room_2Set_0003B0DL_001AC0[] = dspot04_room_2Set_0003B0DL_001AC0; -#define dspot04_room_2Set_0003B0DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003B0DL_001378" +#define dspot04_room_2Set_0003B0DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003B0DL_001378" static const ALIGN_ASSET(2) char spot04_room_2Set_0003B0DL_001378[] = dspot04_room_2Set_0003B0DL_001378; -#define dspot04_room_2Set_0003B0DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003B0DL_002730" +#define dspot04_room_2Set_0003B0DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003B0DL_002730" static const ALIGN_ASSET(2) char spot04_room_2Set_0003B0DL_002730[] = dspot04_room_2Set_0003B0DL_002730; -#define dspot04_room_2Set_0003B0DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003B0DL_002AD0" +#define dspot04_room_2Set_0003B0DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003B0DL_002AD0" static const ALIGN_ASSET(2) char spot04_room_2Set_0003B0DL_002AD0[] = dspot04_room_2Set_0003B0DL_002AD0; -#define dspot04_room_2Set_0003B0DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003B0DL_001EC0" +#define dspot04_room_2Set_0003B0DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003B0DL_001EC0" static const ALIGN_ASSET(2) char spot04_room_2Set_0003B0DL_001EC0[] = dspot04_room_2Set_0003B0DL_001EC0; -#define dspot04_room_2Set_0003B0DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003B0DL_002338" +#define dspot04_room_2Set_0003B0DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003B0DL_002338" static const ALIGN_ASSET(2) char spot04_room_2Set_0003B0DL_002338[] = dspot04_room_2Set_0003B0DL_002338; -#define dspot04_room_2Set_0003E0DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003E0DL_000840" +#define dspot04_room_2Set_0003E0DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003E0DL_000840" static const ALIGN_ASSET(2) char spot04_room_2Set_0003E0DL_000840[] = dspot04_room_2Set_0003E0DL_000840; -#define dspot04_room_2Set_0003E0DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003E0DL_004F80" +#define dspot04_room_2Set_0003E0DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003E0DL_004F80" static const ALIGN_ASSET(2) char spot04_room_2Set_0003E0DL_004F80[] = dspot04_room_2Set_0003E0DL_004F80; -#define dspot04_room_2Set_0003E0DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003E0DL_001AC0" +#define dspot04_room_2Set_0003E0DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003E0DL_001AC0" static const ALIGN_ASSET(2) char spot04_room_2Set_0003E0DL_001AC0[] = dspot04_room_2Set_0003E0DL_001AC0; -#define dspot04_room_2Set_0003E0DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003E0DL_001378" +#define dspot04_room_2Set_0003E0DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003E0DL_001378" static const ALIGN_ASSET(2) char spot04_room_2Set_0003E0DL_001378[] = dspot04_room_2Set_0003E0DL_001378; -#define dspot04_room_2Set_0003E0DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003E0DL_002730" +#define dspot04_room_2Set_0003E0DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003E0DL_002730" static const ALIGN_ASSET(2) char spot04_room_2Set_0003E0DL_002730[] = dspot04_room_2Set_0003E0DL_002730; -#define dspot04_room_2Set_0003E0DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003E0DL_002AD0" +#define dspot04_room_2Set_0003E0DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003E0DL_002AD0" static const ALIGN_ASSET(2) char spot04_room_2Set_0003E0DL_002AD0[] = dspot04_room_2Set_0003E0DL_002AD0; -#define dspot04_room_2Set_0003E0DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003E0DL_001EC0" +#define dspot04_room_2Set_0003E0DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003E0DL_001EC0" static const ALIGN_ASSET(2) char spot04_room_2Set_0003E0DL_001EC0[] = dspot04_room_2Set_0003E0DL_001EC0; -#define dspot04_room_2Set_0003E0DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003E0DL_002338" +#define dspot04_room_2Set_0003E0DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003E0DL_002338" static const ALIGN_ASSET(2) char spot04_room_2Set_0003E0DL_002338[] = dspot04_room_2Set_0003E0DL_002338; diff --git a/soh/assets/scenes/overworld/spot04/spot04_scene.h b/soh/assets/scenes/overworld/spot04/spot04_scene.h index 80cea7dca..46da19dd3 100644 --- a/soh/assets/scenes/overworld/spot04/spot04_scene.h +++ b/soh/assets/scenes/overworld/spot04/spot04_scene.h @@ -3,59 +3,59 @@ #include "align_asset_macro.h" -#define dgKokiriForestDekuSproutCs "__OTR__scenes/nonmq/spot04_scene/gKokiriForestDekuSproutCs" -static const ALIGN_ASSET(2) char gKokiriForestDekuSproutCs[] = dgKokiriForestDekuSproutCs; - -#define dgSpot04Cs_10E20 "__OTR__scenes/nonmq/spot04_scene/gSpot04Cs_10E20" -static const ALIGN_ASSET(2) char gSpot04Cs_10E20[] = dgSpot04Cs_10E20; - -#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918" -static const ALIGN_ASSET(2) char spot04_sceneCollisionHeader_008918[] = dspot04_sceneCollisionHeader_008918; - -#define dspot04_sceneTLUT_00E010 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneTLUT_00E010" -static const ALIGN_ASSET(2) char spot04_sceneTLUT_00E010[] = dspot04_sceneTLUT_00E010; - -#define dspot04_sceneTex_010618 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneTex_010618" -static const ALIGN_ASSET(2) char spot04_sceneTex_010618[] = dspot04_sceneTex_010618; - -#define dspot04_sceneTex_00FE18 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneTex_00FE18" -static const ALIGN_ASSET(2) char spot04_sceneTex_00FE18[] = dspot04_sceneTex_00FE18; - -#define dspot04_sceneTex_00F218 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneTex_00F218" -static const ALIGN_ASSET(2) char spot04_sceneTex_00F218[] = dspot04_sceneTex_00F218; - -#define dspot04_sceneTex_00EA18 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneTex_00EA18" -static const ALIGN_ASSET(2) char spot04_sceneTex_00EA18[] = dspot04_sceneTex_00EA18; - -#define dspot04_sceneTex_00E218 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneTex_00E218" +#define dspot04_sceneTex_00E218 "__OTR__scenes/shared/spot04_scene/spot04_sceneTex_00E218" static const ALIGN_ASSET(2) char spot04_sceneTex_00E218[] = dspot04_sceneTex_00E218; -#define dspot04_sceneTex_00FA18 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneTex_00FA18" +#define dspot04_sceneTex_00EA18 "__OTR__scenes/shared/spot04_scene/spot04_sceneTex_00EA18" +static const ALIGN_ASSET(2) char spot04_sceneTex_00EA18[] = dspot04_sceneTex_00EA18; + +#define dspot04_sceneTex_00F218 "__OTR__scenes/shared/spot04_scene/spot04_sceneTex_00F218" +static const ALIGN_ASSET(2) char spot04_sceneTex_00F218[] = dspot04_sceneTex_00F218; + +#define dspot04_sceneTex_00FA18 "__OTR__scenes/shared/spot04_scene/spot04_sceneTex_00FA18" static const ALIGN_ASSET(2) char spot04_sceneTex_00FA18[] = dspot04_sceneTex_00FA18; -#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918" +#define dspot04_sceneTex_00FE18 "__OTR__scenes/shared/spot04_scene/spot04_sceneTex_00FE18" +static const ALIGN_ASSET(2) char spot04_sceneTex_00FE18[] = dspot04_sceneTex_00FE18; -#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918" +#define dspot04_sceneTex_010618 "__OTR__scenes/shared/spot04_scene/spot04_sceneTex_010618" +static const ALIGN_ASSET(2) char spot04_sceneTex_010618[] = dspot04_sceneTex_010618; -#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918" +#define dspot04_sceneTLUT_00E010 "__OTR__scenes/shared/spot04_scene/spot04_sceneTLUT_00E010" +static const ALIGN_ASSET(2) char spot04_sceneTLUT_00E010[] = dspot04_sceneTLUT_00E010; -#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918" +#define dgKokiriForestDekuSproutCs "__OTR__scenes/shared/spot04_scene/gKokiriForestDekuSproutCs" +static const ALIGN_ASSET(2) char gKokiriForestDekuSproutCs[] = dgKokiriForestDekuSproutCs; -#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918" +#define dgSpot04Cs_10E20 "__OTR__scenes/shared/spot04_scene/gSpot04Cs_10E20" +static const ALIGN_ASSET(2) char gSpot04Cs_10E20[] = dgSpot04Cs_10E20; -#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918" +#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918" +static const ALIGN_ASSET(2) char spot04_sceneCollisionHeader_008918[] = dspot04_sceneCollisionHeader_008918; -#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918" +#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918" -#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918" +#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918" -#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918" +#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918" -#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918" +#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918" -#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918" +#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918" -#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918" +#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918" + +#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918" + +#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918" + +#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918" + +#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918" + +#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918" + +#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918" #endif // OVERWORLD_SPOT04_SCENE_H diff --git a/soh/assets/scenes/overworld/spot05/spot05_room_0.h b/soh/assets/scenes/overworld/spot05/spot05_room_0.h index 4e1415ed2..a66341b26 100644 --- a/soh/assets/scenes/overworld/spot05/spot05_room_0.h +++ b/soh/assets/scenes/overworld/spot05/spot05_room_0.h @@ -3,226 +3,226 @@ #include "align_asset_macro.h" -#define dgSpot05DL_009A60 "__OTR__scenes/nonmq/spot05_scene/gSpot05DL_009A60" +#define dgSpot05DL_009A60 "__OTR__scenes/shared/spot05_scene/gSpot05DL_009A60" static const ALIGN_ASSET(2) char gSpot05DL_009A60[] = dgSpot05DL_009A60; -#define dgSpot05DL_009EE0 "__OTR__scenes/nonmq/spot05_scene/gSpot05DL_009EE0" +#define dgSpot05DL_009EE0 "__OTR__scenes/shared/spot05_scene/gSpot05DL_009EE0" static const ALIGN_ASSET(2) char gSpot05DL_009EE0[] = dgSpot05DL_009EE0; -#define dspot05_room_0DL_009928 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_009928" +#define dspot05_room_0DL_009928 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_009928" static const ALIGN_ASSET(2) char spot05_room_0DL_009928[] = dspot05_room_0DL_009928; -#define dspot05_room_0DL_005670 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_005670" +#define dspot05_room_0DL_005670 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_005670" static const ALIGN_ASSET(2) char spot05_room_0DL_005670[] = dspot05_room_0DL_005670; -#define dspot05_room_0DL_009BB0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_009BB0" +#define dspot05_room_0DL_009BB0 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_009BB0" static const ALIGN_ASSET(2) char spot05_room_0DL_009BB0[] = dspot05_room_0DL_009BB0; -#define dspot05_room_0DL_0084C8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_0084C8" +#define dspot05_room_0DL_0084C8 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_0084C8" static const ALIGN_ASSET(2) char spot05_room_0DL_0084C8[] = dspot05_room_0DL_0084C8; -#define dspot05_room_0DL_0095D8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_0095D8" +#define dspot05_room_0DL_0095D8 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_0095D8" static const ALIGN_ASSET(2) char spot05_room_0DL_0095D8[] = dspot05_room_0DL_0095D8; -#define dspot05_room_0DL_009098 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_009098" +#define dspot05_room_0DL_009098 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_009098" static const ALIGN_ASSET(2) char spot05_room_0DL_009098[] = dspot05_room_0DL_009098; -#define dspot05_room_0DL_008970 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_008970" +#define dspot05_room_0DL_008970 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_008970" static const ALIGN_ASSET(2) char spot05_room_0DL_008970[] = dspot05_room_0DL_008970; -#define dspot05_room_0DL_0015B0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_0015B0" +#define dspot05_room_0DL_0015B0 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_0015B0" static const ALIGN_ASSET(2) char spot05_room_0DL_0015B0[] = dspot05_room_0DL_0015B0; -#define dspot05_room_0DL_001CD8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_001CD8" +#define dspot05_room_0DL_001CD8 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_001CD8" static const ALIGN_ASSET(2) char spot05_room_0DL_001CD8[] = dspot05_room_0DL_001CD8; -#define dspot05_room_0DL_002200 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_002200" +#define dspot05_room_0DL_002200 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_002200" static const ALIGN_ASSET(2) char spot05_room_0DL_002200[] = dspot05_room_0DL_002200; -#define dspot05_room_0DL_0026B0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_0026B0" +#define dspot05_room_0DL_0026B0 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_0026B0" static const ALIGN_ASSET(2) char spot05_room_0DL_0026B0[] = dspot05_room_0DL_0026B0; -#define dspot05_room_0DL_002BC8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_002BC8" +#define dspot05_room_0DL_002BC8 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_002BC8" static const ALIGN_ASSET(2) char spot05_room_0DL_002BC8[] = dspot05_room_0DL_002BC8; -#define dspot05_room_0DL_003618 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_003618" +#define dspot05_room_0DL_003618 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_003618" static const ALIGN_ASSET(2) char spot05_room_0DL_003618[] = dspot05_room_0DL_003618; -#define dspot05_room_0DL_003D88 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_003D88" +#define dspot05_room_0DL_003D88 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_003D88" static const ALIGN_ASSET(2) char spot05_room_0DL_003D88[] = dspot05_room_0DL_003D88; -#define dspot05_room_0DL_007F00 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_007F00" +#define dspot05_room_0DL_007F00 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_007F00" static const ALIGN_ASSET(2) char spot05_room_0DL_007F00[] = dspot05_room_0DL_007F00; -#define dspot05_room_0DL_007620 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_007620" +#define dspot05_room_0DL_007620 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_007620" static const ALIGN_ASSET(2) char spot05_room_0DL_007620[] = dspot05_room_0DL_007620; -#define dspot05_room_0DL_006EC8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_006EC8" +#define dspot05_room_0DL_006EC8 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_006EC8" static const ALIGN_ASSET(2) char spot05_room_0DL_006EC8[] = dspot05_room_0DL_006EC8; -#define dspot05_room_0DL_009DF0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_009DF0" +#define dspot05_room_0DL_009DF0 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_009DF0" static const ALIGN_ASSET(2) char spot05_room_0DL_009DF0[] = dspot05_room_0DL_009DF0; -#define dspot05_room_0Set_000340DL_009928 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_009928" +#define dspot05_room_0Set_000340DL_009928 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_009928" static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_009928[] = dspot05_room_0Set_000340DL_009928; -#define dspot05_room_0Set_000340DL_005670 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_005670" +#define dspot05_room_0Set_000340DL_005670 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_005670" static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_005670[] = dspot05_room_0Set_000340DL_005670; -#define dspot05_room_0Set_000340DL_009BB0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_009BB0" +#define dspot05_room_0Set_000340DL_009BB0 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_009BB0" static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_009BB0[] = dspot05_room_0Set_000340DL_009BB0; -#define dspot05_room_0Set_000340DL_0084C8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_0084C8" +#define dspot05_room_0Set_000340DL_0084C8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_0084C8" static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_0084C8[] = dspot05_room_0Set_000340DL_0084C8; -#define dspot05_room_0Set_000340DL_0095D8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_0095D8" +#define dspot05_room_0Set_000340DL_0095D8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_0095D8" static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_0095D8[] = dspot05_room_0Set_000340DL_0095D8; -#define dspot05_room_0Set_000340DL_009098 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_009098" +#define dspot05_room_0Set_000340DL_009098 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_009098" static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_009098[] = dspot05_room_0Set_000340DL_009098; -#define dspot05_room_0Set_000340DL_008970 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_008970" +#define dspot05_room_0Set_000340DL_008970 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_008970" static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_008970[] = dspot05_room_0Set_000340DL_008970; -#define dspot05_room_0Set_000340DL_0015B0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_0015B0" +#define dspot05_room_0Set_000340DL_0015B0 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_0015B0" static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_0015B0[] = dspot05_room_0Set_000340DL_0015B0; -#define dspot05_room_0Set_000340DL_001CD8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_001CD8" +#define dspot05_room_0Set_000340DL_001CD8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_001CD8" static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_001CD8[] = dspot05_room_0Set_000340DL_001CD8; -#define dspot05_room_0Set_000340DL_002200 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_002200" +#define dspot05_room_0Set_000340DL_002200 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_002200" static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_002200[] = dspot05_room_0Set_000340DL_002200; -#define dspot05_room_0Set_000340DL_0026B0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_0026B0" +#define dspot05_room_0Set_000340DL_0026B0 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_0026B0" static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_0026B0[] = dspot05_room_0Set_000340DL_0026B0; -#define dspot05_room_0Set_000340DL_002BC8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_002BC8" +#define dspot05_room_0Set_000340DL_002BC8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_002BC8" static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_002BC8[] = dspot05_room_0Set_000340DL_002BC8; -#define dspot05_room_0Set_000340DL_003618 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_003618" +#define dspot05_room_0Set_000340DL_003618 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_003618" static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_003618[] = dspot05_room_0Set_000340DL_003618; -#define dspot05_room_0Set_000340DL_003D88 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_003D88" +#define dspot05_room_0Set_000340DL_003D88 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_003D88" static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_003D88[] = dspot05_room_0Set_000340DL_003D88; -#define dspot05_room_0Set_000340DL_007F00 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_007F00" +#define dspot05_room_0Set_000340DL_007F00 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_007F00" static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_007F00[] = dspot05_room_0Set_000340DL_007F00; -#define dspot05_room_0Set_000340DL_007620 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_007620" +#define dspot05_room_0Set_000340DL_007620 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_007620" static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_007620[] = dspot05_room_0Set_000340DL_007620; -#define dspot05_room_0Set_000340DL_006EC8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_006EC8" +#define dspot05_room_0Set_000340DL_006EC8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_006EC8" static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_006EC8[] = dspot05_room_0Set_000340DL_006EC8; -#define dspot05_room_0Set_000340DL_009DF0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_009DF0" +#define dspot05_room_0Set_000340DL_009DF0 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_009DF0" static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_009DF0[] = dspot05_room_0Set_000340DL_009DF0; -#define dspot05_room_0Set_000530DL_009928 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_009928" +#define dspot05_room_0Set_000530DL_009928 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_009928" static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_009928[] = dspot05_room_0Set_000530DL_009928; -#define dspot05_room_0Set_000530DL_005670 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_005670" +#define dspot05_room_0Set_000530DL_005670 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_005670" static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_005670[] = dspot05_room_0Set_000530DL_005670; -#define dspot05_room_0Set_000530DL_009BB0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_009BB0" +#define dspot05_room_0Set_000530DL_009BB0 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_009BB0" static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_009BB0[] = dspot05_room_0Set_000530DL_009BB0; -#define dspot05_room_0Set_000530DL_0084C8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_0084C8" +#define dspot05_room_0Set_000530DL_0084C8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_0084C8" static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_0084C8[] = dspot05_room_0Set_000530DL_0084C8; -#define dspot05_room_0Set_000530DL_0095D8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_0095D8" +#define dspot05_room_0Set_000530DL_0095D8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_0095D8" static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_0095D8[] = dspot05_room_0Set_000530DL_0095D8; -#define dspot05_room_0Set_000530DL_009098 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_009098" +#define dspot05_room_0Set_000530DL_009098 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_009098" static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_009098[] = dspot05_room_0Set_000530DL_009098; -#define dspot05_room_0Set_000530DL_008970 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_008970" +#define dspot05_room_0Set_000530DL_008970 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_008970" static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_008970[] = dspot05_room_0Set_000530DL_008970; -#define dspot05_room_0Set_000530DL_0015B0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_0015B0" +#define dspot05_room_0Set_000530DL_0015B0 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_0015B0" static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_0015B0[] = dspot05_room_0Set_000530DL_0015B0; -#define dspot05_room_0Set_000530DL_001CD8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_001CD8" +#define dspot05_room_0Set_000530DL_001CD8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_001CD8" static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_001CD8[] = dspot05_room_0Set_000530DL_001CD8; -#define dspot05_room_0Set_000530DL_002200 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_002200" +#define dspot05_room_0Set_000530DL_002200 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_002200" static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_002200[] = dspot05_room_0Set_000530DL_002200; -#define dspot05_room_0Set_000530DL_0026B0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_0026B0" +#define dspot05_room_0Set_000530DL_0026B0 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_0026B0" static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_0026B0[] = dspot05_room_0Set_000530DL_0026B0; -#define dspot05_room_0Set_000530DL_002BC8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_002BC8" +#define dspot05_room_0Set_000530DL_002BC8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_002BC8" static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_002BC8[] = dspot05_room_0Set_000530DL_002BC8; -#define dspot05_room_0Set_000530DL_003618 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_003618" +#define dspot05_room_0Set_000530DL_003618 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_003618" static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_003618[] = dspot05_room_0Set_000530DL_003618; -#define dspot05_room_0Set_000530DL_003D88 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_003D88" +#define dspot05_room_0Set_000530DL_003D88 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_003D88" static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_003D88[] = dspot05_room_0Set_000530DL_003D88; -#define dspot05_room_0Set_000530DL_007F00 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_007F00" +#define dspot05_room_0Set_000530DL_007F00 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_007F00" static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_007F00[] = dspot05_room_0Set_000530DL_007F00; -#define dspot05_room_0Set_000530DL_007620 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_007620" +#define dspot05_room_0Set_000530DL_007620 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_007620" static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_007620[] = dspot05_room_0Set_000530DL_007620; -#define dspot05_room_0Set_000530DL_006EC8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_006EC8" +#define dspot05_room_0Set_000530DL_006EC8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_006EC8" static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_006EC8[] = dspot05_room_0Set_000530DL_006EC8; -#define dspot05_room_0Set_000530DL_009DF0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_009DF0" +#define dspot05_room_0Set_000530DL_009DF0 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_009DF0" static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_009DF0[] = dspot05_room_0Set_000530DL_009DF0; -#define dspot05_room_0Set_0005D0DL_009928 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_009928" +#define dspot05_room_0Set_0005D0DL_009928 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_009928" static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_009928[] = dspot05_room_0Set_0005D0DL_009928; -#define dspot05_room_0Set_0005D0DL_005670 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_005670" +#define dspot05_room_0Set_0005D0DL_005670 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_005670" static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_005670[] = dspot05_room_0Set_0005D0DL_005670; -#define dspot05_room_0Set_0005D0DL_009BB0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_009BB0" +#define dspot05_room_0Set_0005D0DL_009BB0 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_009BB0" static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_009BB0[] = dspot05_room_0Set_0005D0DL_009BB0; -#define dspot05_room_0Set_0005D0DL_0084C8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_0084C8" +#define dspot05_room_0Set_0005D0DL_0084C8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_0084C8" static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_0084C8[] = dspot05_room_0Set_0005D0DL_0084C8; -#define dspot05_room_0Set_0005D0DL_0095D8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_0095D8" +#define dspot05_room_0Set_0005D0DL_0095D8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_0095D8" static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_0095D8[] = dspot05_room_0Set_0005D0DL_0095D8; -#define dspot05_room_0Set_0005D0DL_009098 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_009098" +#define dspot05_room_0Set_0005D0DL_009098 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_009098" static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_009098[] = dspot05_room_0Set_0005D0DL_009098; -#define dspot05_room_0Set_0005D0DL_008970 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_008970" +#define dspot05_room_0Set_0005D0DL_008970 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_008970" static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_008970[] = dspot05_room_0Set_0005D0DL_008970; -#define dspot05_room_0Set_0005D0DL_0015B0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_0015B0" +#define dspot05_room_0Set_0005D0DL_0015B0 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_0015B0" static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_0015B0[] = dspot05_room_0Set_0005D0DL_0015B0; -#define dspot05_room_0Set_0005D0DL_001CD8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_001CD8" +#define dspot05_room_0Set_0005D0DL_001CD8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_001CD8" static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_001CD8[] = dspot05_room_0Set_0005D0DL_001CD8; -#define dspot05_room_0Set_0005D0DL_002200 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_002200" +#define dspot05_room_0Set_0005D0DL_002200 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_002200" static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_002200[] = dspot05_room_0Set_0005D0DL_002200; -#define dspot05_room_0Set_0005D0DL_0026B0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_0026B0" +#define dspot05_room_0Set_0005D0DL_0026B0 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_0026B0" static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_0026B0[] = dspot05_room_0Set_0005D0DL_0026B0; -#define dspot05_room_0Set_0005D0DL_002BC8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_002BC8" +#define dspot05_room_0Set_0005D0DL_002BC8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_002BC8" static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_002BC8[] = dspot05_room_0Set_0005D0DL_002BC8; -#define dspot05_room_0Set_0005D0DL_003618 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_003618" +#define dspot05_room_0Set_0005D0DL_003618 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_003618" static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_003618[] = dspot05_room_0Set_0005D0DL_003618; -#define dspot05_room_0Set_0005D0DL_003D88 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_003D88" +#define dspot05_room_0Set_0005D0DL_003D88 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_003D88" static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_003D88[] = dspot05_room_0Set_0005D0DL_003D88; -#define dspot05_room_0Set_0005D0DL_007F00 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_007F00" +#define dspot05_room_0Set_0005D0DL_007F00 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_007F00" static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_007F00[] = dspot05_room_0Set_0005D0DL_007F00; -#define dspot05_room_0Set_0005D0DL_007620 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_007620" +#define dspot05_room_0Set_0005D0DL_007620 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_007620" static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_007620[] = dspot05_room_0Set_0005D0DL_007620; -#define dspot05_room_0Set_0005D0DL_006EC8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_006EC8" +#define dspot05_room_0Set_0005D0DL_006EC8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_006EC8" static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_006EC8[] = dspot05_room_0Set_0005D0DL_006EC8; -#define dspot05_room_0Set_0005D0DL_009DF0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_009DF0" +#define dspot05_room_0Set_0005D0DL_009DF0 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_009DF0" static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_009DF0[] = dspot05_room_0Set_0005D0DL_009DF0; diff --git a/soh/assets/scenes/overworld/spot05/spot05_scene.h b/soh/assets/scenes/overworld/spot05/spot05_scene.h index b0aa7b0cf..b7d36a23a 100644 --- a/soh/assets/scenes/overworld/spot05/spot05_scene.h +++ b/soh/assets/scenes/overworld/spot05/spot05_scene.h @@ -3,101 +3,101 @@ #include "align_asset_macro.h" -#define dgMinuetCs "__OTR__scenes/nonmq/spot05_scene/gMinuetCs" -static const ALIGN_ASSET(2) char gMinuetCs[] = dgMinuetCs; - -#define dspot05_scene_Cs_005730 "__OTR__scenes/nonmq/spot05_scene/spot05_scene_Cs_005730" -static const ALIGN_ASSET(2) char spot05_scene_Cs_005730[] = dspot05_scene_Cs_005730; - -#define dspot05_sceneCollisionHeader_003F4C "__OTR__scenes/nonmq/spot05_scene/spot05_sceneCollisionHeader_003F4C" -static const ALIGN_ASSET(2) char spot05_sceneCollisionHeader_003F4C[] = dspot05_sceneCollisionHeader_003F4C; - -#define dspot05_sceneTex_010B60 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_010B60" -static const ALIGN_ASSET(2) char spot05_sceneTex_010B60[] = dspot05_sceneTex_010B60; - -#define dspot05_sceneTex_00E360 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_00E360" -static const ALIGN_ASSET(2) char spot05_sceneTex_00E360[] = dspot05_sceneTex_00E360; - -#define dspot05_sceneTex_00D360 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_00D360" -static const ALIGN_ASSET(2) char spot05_sceneTex_00D360[] = dspot05_sceneTex_00D360; - -#define dspot05_sceneTex_00A160 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_00A160" -static const ALIGN_ASSET(2) char spot05_sceneTex_00A160[] = dspot05_sceneTex_00A160; - -#define dspot05_sceneTex_009160 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_009160" -static const ALIGN_ASSET(2) char spot05_sceneTex_009160[] = dspot05_sceneTex_009160; - -#define dspot05_sceneTLUT_006BC0 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTLUT_006BC0" -static const ALIGN_ASSET(2) char spot05_sceneTLUT_006BC0[] = dspot05_sceneTLUT_006BC0; - -#define dspot05_sceneTex_008D60 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_008D60" -static const ALIGN_ASSET(2) char spot05_sceneTex_008D60[] = dspot05_sceneTex_008D60; - -#define dspot05_sceneTex_009960 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_009960" -static const ALIGN_ASSET(2) char spot05_sceneTex_009960[] = dspot05_sceneTex_009960; - -#define dspot05_sceneTex_009560 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_009560" -static const ALIGN_ASSET(2) char spot05_sceneTex_009560[] = dspot05_sceneTex_009560; - -#define dspot05_sceneTex_00F360 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_00F360" -static const ALIGN_ASSET(2) char spot05_sceneTex_00F360[] = dspot05_sceneTex_00F360; - -#define dspot05_sceneTex_00EB60 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_00EB60" -static const ALIGN_ASSET(2) char spot05_sceneTex_00EB60[] = dspot05_sceneTex_00EB60; - -#define dspot05_sceneTex_014B60 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_014B60" -static const ALIGN_ASSET(2) char spot05_sceneTex_014B60[] = dspot05_sceneTex_014B60; - -#define dspot05_sceneTex_00CB60 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_00CB60" -static const ALIGN_ASSET(2) char spot05_sceneTex_00CB60[] = dspot05_sceneTex_00CB60; - -#define dspot05_sceneTex_012B60 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_012B60" -static const ALIGN_ASSET(2) char spot05_sceneTex_012B60[] = dspot05_sceneTex_012B60; - -#define dspot05_sceneTex_007D60 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_007D60" -static const ALIGN_ASSET(2) char spot05_sceneTex_007D60[] = dspot05_sceneTex_007D60; - -#define dspot05_sceneTex_00B160 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_00B160" -static const ALIGN_ASSET(2) char spot05_sceneTex_00B160[] = dspot05_sceneTex_00B160; - -#define dspot05_sceneTex_006D60 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_006D60" +#define dspot05_sceneTex_006D60 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_006D60" static const ALIGN_ASSET(2) char spot05_sceneTex_006D60[] = dspot05_sceneTex_006D60; -#define dspot05_sceneTex_00BB60 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_00BB60" -static const ALIGN_ASSET(2) char spot05_sceneTex_00BB60[] = dspot05_sceneTex_00BB60; +#define dspot05_sceneTex_007D60 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_007D60" +static const ALIGN_ASSET(2) char spot05_sceneTex_007D60[] = dspot05_sceneTex_007D60; -#define dspot05_sceneTex_00B960 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_00B960" +#define dspot05_sceneTex_008D60 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_008D60" +static const ALIGN_ASSET(2) char spot05_sceneTex_008D60[] = dspot05_sceneTex_008D60; + +#define dspot05_sceneTex_009160 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_009160" +static const ALIGN_ASSET(2) char spot05_sceneTex_009160[] = dspot05_sceneTex_009160; + +#define dspot05_sceneTex_009560 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_009560" +static const ALIGN_ASSET(2) char spot05_sceneTex_009560[] = dspot05_sceneTex_009560; + +#define dspot05_sceneTex_009960 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_009960" +static const ALIGN_ASSET(2) char spot05_sceneTex_009960[] = dspot05_sceneTex_009960; + +#define dspot05_sceneTex_00A160 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_00A160" +static const ALIGN_ASSET(2) char spot05_sceneTex_00A160[] = dspot05_sceneTex_00A160; + +#define dspot05_sceneTex_00B160 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_00B160" +static const ALIGN_ASSET(2) char spot05_sceneTex_00B160[] = dspot05_sceneTex_00B160; + +#define dspot05_sceneTex_00B960 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_00B960" static const ALIGN_ASSET(2) char spot05_sceneTex_00B960[] = dspot05_sceneTex_00B960; -#define dspot05_sceneTex_014360 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_014360" -static const ALIGN_ASSET(2) char spot05_sceneTex_014360[] = dspot05_sceneTex_014360; +#define dspot05_sceneTex_00BB60 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_00BB60" +static const ALIGN_ASSET(2) char spot05_sceneTex_00BB60[] = dspot05_sceneTex_00BB60; -#define dspot05_sceneTex_012360 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_012360" -static const ALIGN_ASSET(2) char spot05_sceneTex_012360[] = dspot05_sceneTex_012360; +#define dspot05_sceneTex_00CB60 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_00CB60" +static const ALIGN_ASSET(2) char spot05_sceneTex_00CB60[] = dspot05_sceneTex_00CB60; -#define dspot05_sceneTex_011360 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_011360" -static const ALIGN_ASSET(2) char spot05_sceneTex_011360[] = dspot05_sceneTex_011360; +#define dspot05_sceneTex_00D360 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_00D360" +static const ALIGN_ASSET(2) char spot05_sceneTex_00D360[] = dspot05_sceneTex_00D360; -#define dspot05_sceneTex_013B60 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_013B60" -static const ALIGN_ASSET(2) char spot05_sceneTex_013B60[] = dspot05_sceneTex_013B60; - -#define dspot05_sceneTex_013360 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_013360" -static const ALIGN_ASSET(2) char spot05_sceneTex_013360[] = dspot05_sceneTex_013360; - -#define dspot05_sceneTex_00DB60 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_00DB60" +#define dspot05_sceneTex_00DB60 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_00DB60" static const ALIGN_ASSET(2) char spot05_sceneTex_00DB60[] = dspot05_sceneTex_00DB60; -#define dspot05_sceneTex_00FB60 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_00FB60" +#define dspot05_sceneTex_00E360 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_00E360" +static const ALIGN_ASSET(2) char spot05_sceneTex_00E360[] = dspot05_sceneTex_00E360; + +#define dspot05_sceneTex_00EB60 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_00EB60" +static const ALIGN_ASSET(2) char spot05_sceneTex_00EB60[] = dspot05_sceneTex_00EB60; + +#define dspot05_sceneTex_00F360 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_00F360" +static const ALIGN_ASSET(2) char spot05_sceneTex_00F360[] = dspot05_sceneTex_00F360; + +#define dspot05_sceneTex_00FB60 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_00FB60" static const ALIGN_ASSET(2) char spot05_sceneTex_00FB60[] = dspot05_sceneTex_00FB60; -#define dspot05_sceneTex_010360 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_010360" +#define dspot05_sceneTex_010360 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_010360" static const ALIGN_ASSET(2) char spot05_sceneTex_010360[] = dspot05_sceneTex_010360; -#define dspot05_sceneCollisionHeader_003F4C "__OTR__scenes/nonmq/spot05_scene/spot05_sceneCollisionHeader_003F4C" +#define dspot05_sceneTex_010B60 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_010B60" +static const ALIGN_ASSET(2) char spot05_sceneTex_010B60[] = dspot05_sceneTex_010B60; -#define dspot05_sceneCollisionHeader_003F4C "__OTR__scenes/nonmq/spot05_scene/spot05_sceneCollisionHeader_003F4C" +#define dspot05_sceneTex_011360 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_011360" +static const ALIGN_ASSET(2) char spot05_sceneTex_011360[] = dspot05_sceneTex_011360; -#define dspot05_sceneCollisionHeader_003F4C "__OTR__scenes/nonmq/spot05_scene/spot05_sceneCollisionHeader_003F4C" +#define dspot05_sceneTex_012360 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_012360" +static const ALIGN_ASSET(2) char spot05_sceneTex_012360[] = dspot05_sceneTex_012360; + +#define dspot05_sceneTex_012B60 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_012B60" +static const ALIGN_ASSET(2) char spot05_sceneTex_012B60[] = dspot05_sceneTex_012B60; + +#define dspot05_sceneTex_013360 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_013360" +static const ALIGN_ASSET(2) char spot05_sceneTex_013360[] = dspot05_sceneTex_013360; + +#define dspot05_sceneTex_013B60 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_013B60" +static const ALIGN_ASSET(2) char spot05_sceneTex_013B60[] = dspot05_sceneTex_013B60; + +#define dspot05_sceneTex_014360 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_014360" +static const ALIGN_ASSET(2) char spot05_sceneTex_014360[] = dspot05_sceneTex_014360; + +#define dspot05_sceneTex_014B60 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_014B60" +static const ALIGN_ASSET(2) char spot05_sceneTex_014B60[] = dspot05_sceneTex_014B60; + +#define dspot05_sceneTLUT_006BC0 "__OTR__scenes/shared/spot05_scene/spot05_sceneTLUT_006BC0" +static const ALIGN_ASSET(2) char spot05_sceneTLUT_006BC0[] = dspot05_sceneTLUT_006BC0; + +#define dgMinuetCs "__OTR__scenes/shared/spot05_scene/gMinuetCs" +static const ALIGN_ASSET(2) char gMinuetCs[] = dgMinuetCs; + +#define dspot05_scene_Cs_005730 "__OTR__scenes/shared/spot05_scene/spot05_scene_Cs_005730" +static const ALIGN_ASSET(2) char spot05_scene_Cs_005730[] = dspot05_scene_Cs_005730; + +#define dspot05_sceneCollisionHeader_003F4C "__OTR__scenes/shared/spot05_scene/spot05_sceneCollisionHeader_003F4C" +static const ALIGN_ASSET(2) char spot05_sceneCollisionHeader_003F4C[] = dspot05_sceneCollisionHeader_003F4C; + +#define dspot05_sceneCollisionHeader_003F4C "__OTR__scenes/shared/spot05_scene/spot05_sceneCollisionHeader_003F4C" + +#define dspot05_sceneCollisionHeader_003F4C "__OTR__scenes/shared/spot05_scene/spot05_sceneCollisionHeader_003F4C" + +#define dspot05_sceneCollisionHeader_003F4C "__OTR__scenes/shared/spot05_scene/spot05_sceneCollisionHeader_003F4C" #endif // OVERWORLD_SPOT05_SCENE_H diff --git a/soh/assets/scenes/overworld/spot06/spot06_room_0.h b/soh/assets/scenes/overworld/spot06/spot06_room_0.h index a77e30617..b87033c66 100644 --- a/soh/assets/scenes/overworld/spot06/spot06_room_0.h +++ b/soh/assets/scenes/overworld/spot06/spot06_room_0.h @@ -3,226 +3,226 @@ #include "align_asset_macro.h" -#define dgSpot06DL_00A400 "__OTR__scenes/nonmq/spot06_scene/gSpot06DL_00A400" +#define dgSpot06DL_00A400 "__OTR__scenes/shared/spot06_scene/gSpot06DL_00A400" static const ALIGN_ASSET(2) char gSpot06DL_00A400[] = dgSpot06DL_00A400; -#define dgSpot06DL_00A608 "__OTR__scenes/nonmq/spot06_scene/gSpot06DL_00A608" +#define dgSpot06DL_00A608 "__OTR__scenes/shared/spot06_scene/gSpot06DL_00A608" static const ALIGN_ASSET(2) char gSpot06DL_00A608[] = dgSpot06DL_00A608; -#define dspot06_room_0DL_003270 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_003270" +#define dspot06_room_0DL_003270 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_003270" static const ALIGN_ASSET(2) char spot06_room_0DL_003270[] = dspot06_room_0DL_003270; -#define dspot06_room_0DL_001240 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_001240" +#define dspot06_room_0DL_001240 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_001240" static const ALIGN_ASSET(2) char spot06_room_0DL_001240[] = dspot06_room_0DL_001240; -#define dspot06_room_0DL_009CA8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_009CA8" +#define dspot06_room_0DL_009CA8 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_009CA8" static const ALIGN_ASSET(2) char spot06_room_0DL_009CA8[] = dspot06_room_0DL_009CA8; -#define dspot06_room_0DL_006358 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_006358" +#define dspot06_room_0DL_006358 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_006358" static const ALIGN_ASSET(2) char spot06_room_0DL_006358[] = dspot06_room_0DL_006358; -#define dspot06_room_0DL_006C80 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_006C80" +#define dspot06_room_0DL_006C80 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_006C80" static const ALIGN_ASSET(2) char spot06_room_0DL_006C80[] = dspot06_room_0DL_006C80; -#define dspot06_room_0DL_007DF8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_007DF8" +#define dspot06_room_0DL_007DF8 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_007DF8" static const ALIGN_ASSET(2) char spot06_room_0DL_007DF8[] = dspot06_room_0DL_007DF8; -#define dspot06_room_0DL_003EF8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_003EF8" +#define dspot06_room_0DL_003EF8 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_003EF8" static const ALIGN_ASSET(2) char spot06_room_0DL_003EF8[] = dspot06_room_0DL_003EF8; -#define dspot06_room_0DL_004AF0 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_004AF0" +#define dspot06_room_0DL_004AF0 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_004AF0" static const ALIGN_ASSET(2) char spot06_room_0DL_004AF0[] = dspot06_room_0DL_004AF0; -#define dspot06_room_0DL_004EC8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_004EC8" +#define dspot06_room_0DL_004EC8 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_004EC8" static const ALIGN_ASSET(2) char spot06_room_0DL_004EC8[] = dspot06_room_0DL_004EC8; -#define dspot06_room_0DL_0059C0 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_0059C0" +#define dspot06_room_0DL_0059C0 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_0059C0" static const ALIGN_ASSET(2) char spot06_room_0DL_0059C0[] = dspot06_room_0DL_0059C0; -#define dspot06_room_0DL_001628 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_001628" +#define dspot06_room_0DL_001628 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_001628" static const ALIGN_ASSET(2) char spot06_room_0DL_001628[] = dspot06_room_0DL_001628; -#define dspot06_room_0DL_002040 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_002040" +#define dspot06_room_0DL_002040 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_002040" static const ALIGN_ASSET(2) char spot06_room_0DL_002040[] = dspot06_room_0DL_002040; -#define dspot06_room_0DL_0098C8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_0098C8" +#define dspot06_room_0DL_0098C8 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_0098C8" static const ALIGN_ASSET(2) char spot06_room_0DL_0098C8[] = dspot06_room_0DL_0098C8; -#define dspot06_room_0DL_008ED0 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_008ED0" +#define dspot06_room_0DL_008ED0 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_008ED0" static const ALIGN_ASSET(2) char spot06_room_0DL_008ED0[] = dspot06_room_0DL_008ED0; -#define dspot06_room_0DL_008858 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_008858" +#define dspot06_room_0DL_008858 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_008858" static const ALIGN_ASSET(2) char spot06_room_0DL_008858[] = dspot06_room_0DL_008858; -#define dspot06_room_0DL_00A148 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_00A148" +#define dspot06_room_0DL_00A148 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_00A148" static const ALIGN_ASSET(2) char spot06_room_0DL_00A148[] = dspot06_room_0DL_00A148; -#define dspot06_room_0DL_009510 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_009510" +#define dspot06_room_0DL_009510 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_009510" static const ALIGN_ASSET(2) char spot06_room_0DL_009510[] = dspot06_room_0DL_009510; -#define dspot06_room_0DL_00A550 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_00A550" +#define dspot06_room_0DL_00A550 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_00A550" static const ALIGN_ASSET(2) char spot06_room_0DL_00A550[] = dspot06_room_0DL_00A550; -#define dspot06_room_0Set_000520DL_003270 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_003270" +#define dspot06_room_0Set_000520DL_003270 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_003270" static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_003270[] = dspot06_room_0Set_000520DL_003270; -#define dspot06_room_0Set_000520DL_001240 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_001240" +#define dspot06_room_0Set_000520DL_001240 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_001240" static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_001240[] = dspot06_room_0Set_000520DL_001240; -#define dspot06_room_0Set_000520DL_009CA8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_009CA8" +#define dspot06_room_0Set_000520DL_009CA8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_009CA8" static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_009CA8[] = dspot06_room_0Set_000520DL_009CA8; -#define dspot06_room_0Set_000520DL_006358 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_006358" +#define dspot06_room_0Set_000520DL_006358 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_006358" static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_006358[] = dspot06_room_0Set_000520DL_006358; -#define dspot06_room_0Set_000520DL_006C80 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_006C80" +#define dspot06_room_0Set_000520DL_006C80 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_006C80" static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_006C80[] = dspot06_room_0Set_000520DL_006C80; -#define dspot06_room_0Set_000520DL_007DF8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_007DF8" +#define dspot06_room_0Set_000520DL_007DF8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_007DF8" static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_007DF8[] = dspot06_room_0Set_000520DL_007DF8; -#define dspot06_room_0Set_000520DL_003EF8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_003EF8" +#define dspot06_room_0Set_000520DL_003EF8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_003EF8" static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_003EF8[] = dspot06_room_0Set_000520DL_003EF8; -#define dspot06_room_0Set_000520DL_004AF0 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_004AF0" +#define dspot06_room_0Set_000520DL_004AF0 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_004AF0" static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_004AF0[] = dspot06_room_0Set_000520DL_004AF0; -#define dspot06_room_0Set_000520DL_004EC8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_004EC8" +#define dspot06_room_0Set_000520DL_004EC8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_004EC8" static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_004EC8[] = dspot06_room_0Set_000520DL_004EC8; -#define dspot06_room_0Set_000520DL_0059C0 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_0059C0" +#define dspot06_room_0Set_000520DL_0059C0 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_0059C0" static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_0059C0[] = dspot06_room_0Set_000520DL_0059C0; -#define dspot06_room_0Set_000520DL_001628 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_001628" +#define dspot06_room_0Set_000520DL_001628 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_001628" static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_001628[] = dspot06_room_0Set_000520DL_001628; -#define dspot06_room_0Set_000520DL_002040 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_002040" +#define dspot06_room_0Set_000520DL_002040 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_002040" static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_002040[] = dspot06_room_0Set_000520DL_002040; -#define dspot06_room_0Set_000520DL_0098C8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_0098C8" +#define dspot06_room_0Set_000520DL_0098C8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_0098C8" static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_0098C8[] = dspot06_room_0Set_000520DL_0098C8; -#define dspot06_room_0Set_000520DL_008ED0 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_008ED0" +#define dspot06_room_0Set_000520DL_008ED0 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_008ED0" static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_008ED0[] = dspot06_room_0Set_000520DL_008ED0; -#define dspot06_room_0Set_000520DL_008858 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_008858" +#define dspot06_room_0Set_000520DL_008858 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_008858" static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_008858[] = dspot06_room_0Set_000520DL_008858; -#define dspot06_room_0Set_000520DL_00A148 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_00A148" +#define dspot06_room_0Set_000520DL_00A148 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_00A148" static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_00A148[] = dspot06_room_0Set_000520DL_00A148; -#define dspot06_room_0Set_000520DL_009510 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_009510" +#define dspot06_room_0Set_000520DL_009510 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_009510" static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_009510[] = dspot06_room_0Set_000520DL_009510; -#define dspot06_room_0Set_000520DL_00A550 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_00A550" +#define dspot06_room_0Set_000520DL_00A550 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_00A550" static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_00A550[] = dspot06_room_0Set_000520DL_00A550; -#define dspot06_room_0Set_000840DL_003270 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_003270" +#define dspot06_room_0Set_000840DL_003270 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_003270" static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_003270[] = dspot06_room_0Set_000840DL_003270; -#define dspot06_room_0Set_000840DL_001240 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_001240" +#define dspot06_room_0Set_000840DL_001240 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_001240" static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_001240[] = dspot06_room_0Set_000840DL_001240; -#define dspot06_room_0Set_000840DL_009CA8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_009CA8" +#define dspot06_room_0Set_000840DL_009CA8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_009CA8" static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_009CA8[] = dspot06_room_0Set_000840DL_009CA8; -#define dspot06_room_0Set_000840DL_006358 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_006358" +#define dspot06_room_0Set_000840DL_006358 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_006358" static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_006358[] = dspot06_room_0Set_000840DL_006358; -#define dspot06_room_0Set_000840DL_006C80 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_006C80" +#define dspot06_room_0Set_000840DL_006C80 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_006C80" static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_006C80[] = dspot06_room_0Set_000840DL_006C80; -#define dspot06_room_0Set_000840DL_007DF8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_007DF8" +#define dspot06_room_0Set_000840DL_007DF8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_007DF8" static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_007DF8[] = dspot06_room_0Set_000840DL_007DF8; -#define dspot06_room_0Set_000840DL_003EF8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_003EF8" +#define dspot06_room_0Set_000840DL_003EF8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_003EF8" static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_003EF8[] = dspot06_room_0Set_000840DL_003EF8; -#define dspot06_room_0Set_000840DL_004AF0 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_004AF0" +#define dspot06_room_0Set_000840DL_004AF0 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_004AF0" static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_004AF0[] = dspot06_room_0Set_000840DL_004AF0; -#define dspot06_room_0Set_000840DL_004EC8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_004EC8" +#define dspot06_room_0Set_000840DL_004EC8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_004EC8" static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_004EC8[] = dspot06_room_0Set_000840DL_004EC8; -#define dspot06_room_0Set_000840DL_0059C0 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_0059C0" +#define dspot06_room_0Set_000840DL_0059C0 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_0059C0" static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_0059C0[] = dspot06_room_0Set_000840DL_0059C0; -#define dspot06_room_0Set_000840DL_001628 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_001628" +#define dspot06_room_0Set_000840DL_001628 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_001628" static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_001628[] = dspot06_room_0Set_000840DL_001628; -#define dspot06_room_0Set_000840DL_002040 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_002040" +#define dspot06_room_0Set_000840DL_002040 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_002040" static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_002040[] = dspot06_room_0Set_000840DL_002040; -#define dspot06_room_0Set_000840DL_0098C8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_0098C8" +#define dspot06_room_0Set_000840DL_0098C8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_0098C8" static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_0098C8[] = dspot06_room_0Set_000840DL_0098C8; -#define dspot06_room_0Set_000840DL_008ED0 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_008ED0" +#define dspot06_room_0Set_000840DL_008ED0 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_008ED0" static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_008ED0[] = dspot06_room_0Set_000840DL_008ED0; -#define dspot06_room_0Set_000840DL_008858 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_008858" +#define dspot06_room_0Set_000840DL_008858 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_008858" static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_008858[] = dspot06_room_0Set_000840DL_008858; -#define dspot06_room_0Set_000840DL_00A148 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_00A148" +#define dspot06_room_0Set_000840DL_00A148 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_00A148" static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_00A148[] = dspot06_room_0Set_000840DL_00A148; -#define dspot06_room_0Set_000840DL_009510 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_009510" +#define dspot06_room_0Set_000840DL_009510 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_009510" static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_009510[] = dspot06_room_0Set_000840DL_009510; -#define dspot06_room_0Set_000840DL_00A550 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_00A550" +#define dspot06_room_0Set_000840DL_00A550 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_00A550" static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_00A550[] = dspot06_room_0Set_000840DL_00A550; -#define dspot06_room_0Set_000920DL_003270 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_003270" +#define dspot06_room_0Set_000920DL_003270 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_003270" static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_003270[] = dspot06_room_0Set_000920DL_003270; -#define dspot06_room_0Set_000920DL_001240 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_001240" +#define dspot06_room_0Set_000920DL_001240 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_001240" static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_001240[] = dspot06_room_0Set_000920DL_001240; -#define dspot06_room_0Set_000920DL_009CA8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_009CA8" +#define dspot06_room_0Set_000920DL_009CA8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_009CA8" static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_009CA8[] = dspot06_room_0Set_000920DL_009CA8; -#define dspot06_room_0Set_000920DL_006358 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_006358" +#define dspot06_room_0Set_000920DL_006358 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_006358" static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_006358[] = dspot06_room_0Set_000920DL_006358; -#define dspot06_room_0Set_000920DL_006C80 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_006C80" +#define dspot06_room_0Set_000920DL_006C80 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_006C80" static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_006C80[] = dspot06_room_0Set_000920DL_006C80; -#define dspot06_room_0Set_000920DL_007DF8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_007DF8" +#define dspot06_room_0Set_000920DL_007DF8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_007DF8" static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_007DF8[] = dspot06_room_0Set_000920DL_007DF8; -#define dspot06_room_0Set_000920DL_003EF8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_003EF8" +#define dspot06_room_0Set_000920DL_003EF8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_003EF8" static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_003EF8[] = dspot06_room_0Set_000920DL_003EF8; -#define dspot06_room_0Set_000920DL_004AF0 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_004AF0" +#define dspot06_room_0Set_000920DL_004AF0 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_004AF0" static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_004AF0[] = dspot06_room_0Set_000920DL_004AF0; -#define dspot06_room_0Set_000920DL_004EC8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_004EC8" +#define dspot06_room_0Set_000920DL_004EC8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_004EC8" static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_004EC8[] = dspot06_room_0Set_000920DL_004EC8; -#define dspot06_room_0Set_000920DL_0059C0 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_0059C0" +#define dspot06_room_0Set_000920DL_0059C0 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_0059C0" static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_0059C0[] = dspot06_room_0Set_000920DL_0059C0; -#define dspot06_room_0Set_000920DL_001628 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_001628" +#define dspot06_room_0Set_000920DL_001628 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_001628" static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_001628[] = dspot06_room_0Set_000920DL_001628; -#define dspot06_room_0Set_000920DL_002040 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_002040" +#define dspot06_room_0Set_000920DL_002040 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_002040" static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_002040[] = dspot06_room_0Set_000920DL_002040; -#define dspot06_room_0Set_000920DL_0098C8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_0098C8" +#define dspot06_room_0Set_000920DL_0098C8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_0098C8" static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_0098C8[] = dspot06_room_0Set_000920DL_0098C8; -#define dspot06_room_0Set_000920DL_008ED0 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_008ED0" +#define dspot06_room_0Set_000920DL_008ED0 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_008ED0" static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_008ED0[] = dspot06_room_0Set_000920DL_008ED0; -#define dspot06_room_0Set_000920DL_008858 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_008858" +#define dspot06_room_0Set_000920DL_008858 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_008858" static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_008858[] = dspot06_room_0Set_000920DL_008858; -#define dspot06_room_0Set_000920DL_00A148 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_00A148" +#define dspot06_room_0Set_000920DL_00A148 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_00A148" static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_00A148[] = dspot06_room_0Set_000920DL_00A148; -#define dspot06_room_0Set_000920DL_009510 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_009510" +#define dspot06_room_0Set_000920DL_009510 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_009510" static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_009510[] = dspot06_room_0Set_000920DL_009510; -#define dspot06_room_0Set_000920DL_00A550 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_00A550" +#define dspot06_room_0Set_000920DL_00A550 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_00A550" static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_00A550[] = dspot06_room_0Set_000920DL_00A550; diff --git a/soh/assets/scenes/overworld/spot06/spot06_scene.h b/soh/assets/scenes/overworld/spot06/spot06_scene.h index 66ed29664..c83f95b23 100644 --- a/soh/assets/scenes/overworld/spot06/spot06_scene.h +++ b/soh/assets/scenes/overworld/spot06/spot06_scene.h @@ -3,152 +3,152 @@ #include "align_asset_macro.h" -#define dgLakeHyliaFireArrowsCS "__OTR__scenes/nonmq/spot06_scene/gLakeHyliaFireArrowsCS" -static const ALIGN_ASSET(2) char gLakeHyliaFireArrowsCS[] = dgLakeHyliaFireArrowsCS; - -#define dgLakeHyliaOwlCs "__OTR__scenes/nonmq/spot06_scene/gLakeHyliaOwlCs" -static const ALIGN_ASSET(2) char gLakeHyliaOwlCs[] = dgLakeHyliaOwlCs; - -#define dgLakeHyliaIntroCs "__OTR__scenes/nonmq/spot06_scene/gLakeHyliaIntroCs" -static const ALIGN_ASSET(2) char gLakeHyliaIntroCs[] = dgLakeHyliaIntroCs; - -#define dspot06_sceneCollisionHeader_0055AC "__OTR__scenes/nonmq/spot06_scene/spot06_sceneCollisionHeader_0055AC" -static const ALIGN_ASSET(2) char spot06_sceneCollisionHeader_0055AC[] = dspot06_sceneCollisionHeader_0055AC; - -#define dspot06_sceneTex_0170B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0170B8" -static const ALIGN_ASSET(2) char spot06_sceneTex_0170B8[] = dspot06_sceneTex_0170B8; - -#define dspot06_sceneTex_010EB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_010EB8" -static const ALIGN_ASSET(2) char spot06_sceneTex_010EB8[] = dspot06_sceneTex_010EB8; - -#define dspot06_sceneTex_018CB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_018CB8" -static const ALIGN_ASSET(2) char spot06_sceneTex_018CB8[] = dspot06_sceneTex_018CB8; - -#define dspot06_sceneTex_0184B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0184B8" -static const ALIGN_ASSET(2) char spot06_sceneTex_0184B8[] = dspot06_sceneTex_0184B8; - -#define dspot06_sceneTex_016CB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_016CB8" -static const ALIGN_ASSET(2) char spot06_sceneTex_016CB8[] = dspot06_sceneTex_016CB8; - -#define dspot06_sceneTex_00AAB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00AAB8" -static const ALIGN_ASSET(2) char spot06_sceneTex_00AAB8[] = dspot06_sceneTex_00AAB8; - -#define dspot06_sceneTex_014CB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_014CB8" -static const ALIGN_ASSET(2) char spot06_sceneTex_014CB8[] = dspot06_sceneTex_014CB8; - -#define dspot06_sceneTex_0122B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0122B8" -static const ALIGN_ASSET(2) char spot06_sceneTex_0122B8[] = dspot06_sceneTex_0122B8; - -#define dspot06_sceneTex_0126B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0126B8" -static const ALIGN_ASSET(2) char spot06_sceneTex_0126B8[] = dspot06_sceneTex_0126B8; - -#define dspot06_sceneTex_011EB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_011EB8" -static const ALIGN_ASSET(2) char spot06_sceneTex_011EB8[] = dspot06_sceneTex_011EB8; - -#define dspot06_sceneTex_0130B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0130B8" -static const ALIGN_ASSET(2) char spot06_sceneTex_0130B8[] = dspot06_sceneTex_0130B8; - -#define dspot06_sceneTex_012EB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_012EB8" -static const ALIGN_ASSET(2) char spot06_sceneTex_012EB8[] = dspot06_sceneTex_012EB8; - -#define dspot06_sceneTex_008438 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_008438" -static const ALIGN_ASSET(2) char spot06_sceneTex_008438[] = dspot06_sceneTex_008438; - -#define dspot06_sceneTex_0140B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0140B8" -static const ALIGN_ASSET(2) char spot06_sceneTex_0140B8[] = dspot06_sceneTex_0140B8; - -#define dspot06_sceneTex_01A4B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_01A4B8" -static const ALIGN_ASSET(2) char spot06_sceneTex_01A4B8[] = dspot06_sceneTex_01A4B8; - -#define dspot06_sceneTex_0178B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0178B8" -static const ALIGN_ASSET(2) char spot06_sceneTex_0178B8[] = dspot06_sceneTex_0178B8; - -#define dspot06_sceneTex_00B6B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00B6B8" -static const ALIGN_ASSET(2) char spot06_sceneTex_00B6B8[] = dspot06_sceneTex_00B6B8; - -#define dspot06_sceneTex_0164B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0164B8" -static const ALIGN_ASSET(2) char spot06_sceneTex_0164B8[] = dspot06_sceneTex_0164B8; - -#define dspot06_sceneTex_0148B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0148B8" -static const ALIGN_ASSET(2) char spot06_sceneTex_0148B8[] = dspot06_sceneTex_0148B8; - -#define dspot06_sceneTex_00FEB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00FEB8" -static const ALIGN_ASSET(2) char spot06_sceneTex_00FEB8[] = dspot06_sceneTex_00FEB8; - -#define dspot06_sceneTex_0116B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0116B8" -static const ALIGN_ASSET(2) char spot06_sceneTex_0116B8[] = dspot06_sceneTex_0116B8; - -#define dspot06_sceneTex_00BEB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00BEB8" -static const ALIGN_ASSET(2) char spot06_sceneTex_00BEB8[] = dspot06_sceneTex_00BEB8; - -#define dspot06_sceneTex_017CB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_017CB8" -static const ALIGN_ASSET(2) char spot06_sceneTex_017CB8[] = dspot06_sceneTex_017CB8; - -#define dspot06_sceneTLUT_007C10 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTLUT_007C10" -static const ALIGN_ASSET(2) char spot06_sceneTLUT_007C10[] = dspot06_sceneTLUT_007C10; - -#define dspot06_sceneTex_0154B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0154B8" -static const ALIGN_ASSET(2) char spot06_sceneTex_0154B8[] = dspot06_sceneTex_0154B8; - -#define dspot06_sceneTex_015CB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_015CB8" -static const ALIGN_ASSET(2) char spot06_sceneTex_015CB8[] = dspot06_sceneTex_015CB8; - -#define dspot06_sceneTex_0194B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0194B8" -static const ALIGN_ASSET(2) char spot06_sceneTex_0194B8[] = dspot06_sceneTex_0194B8; - -#define dspot06_sceneTex_00F4B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00F4B8" -static const ALIGN_ASSET(2) char spot06_sceneTex_00F4B8[] = dspot06_sceneTex_00F4B8; - -#define dspot06_sceneTex_00F6B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00F6B8" -static const ALIGN_ASSET(2) char spot06_sceneTex_00F6B8[] = dspot06_sceneTex_00F6B8; - -#define dspot06_sceneTex_00DCB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00DCB8" -static const ALIGN_ASSET(2) char spot06_sceneTex_00DCB8[] = dspot06_sceneTex_00DCB8; - -#define dspot06_sceneTex_008038 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_008038" -static const ALIGN_ASSET(2) char spot06_sceneTex_008038[] = dspot06_sceneTex_008038; - -#define dspot06_sceneTex_007C38 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_007C38" +#define dspot06_sceneTex_007C38 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_007C38" static const ALIGN_ASSET(2) char spot06_sceneTex_007C38[] = dspot06_sceneTex_007C38; -#define dspot06_sceneTex_01ACB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_01ACB8" -static const ALIGN_ASSET(2) char spot06_sceneTex_01ACB8[] = dspot06_sceneTex_01ACB8; +#define dspot06_sceneTex_008038 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_008038" +static const ALIGN_ASSET(2) char spot06_sceneTex_008038[] = dspot06_sceneTex_008038; -#define dspot06_sceneTex_00CCB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00CCB8" -static const ALIGN_ASSET(2) char spot06_sceneTex_00CCB8[] = dspot06_sceneTex_00CCB8; +#define dspot06_sceneTex_008438 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_008438" +static const ALIGN_ASSET(2) char spot06_sceneTex_008438[] = dspot06_sceneTex_008438; -#define dspot06_sceneTex_00ECB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00ECB8" -static const ALIGN_ASSET(2) char spot06_sceneTex_00ECB8[] = dspot06_sceneTex_00ECB8; - -#define dspot06_sceneTex_00AEB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00AEB8" -static const ALIGN_ASSET(2) char spot06_sceneTex_00AEB8[] = dspot06_sceneTex_00AEB8; - -#define dspot06_sceneTex_0098B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0098B8" -static const ALIGN_ASSET(2) char spot06_sceneTex_0098B8[] = dspot06_sceneTex_0098B8; - -#define dspot06_sceneTex_009AB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_009AB8" -static const ALIGN_ASSET(2) char spot06_sceneTex_009AB8[] = dspot06_sceneTex_009AB8; - -#define dspot06_sceneTex_009838 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_009838" -static const ALIGN_ASSET(2) char spot06_sceneTex_009838[] = dspot06_sceneTex_009838; - -#define dspot06_sceneTex_008838 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_008838" +#define dspot06_sceneTex_008838 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_008838" static const ALIGN_ASSET(2) char spot06_sceneTex_008838[] = dspot06_sceneTex_008838; -#define dspot06_sceneTex_00C4B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00C4B8" -static const ALIGN_ASSET(2) char spot06_sceneTex_00C4B8[] = dspot06_sceneTex_00C4B8; +#define dspot06_sceneTex_009838 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_009838" +static const ALIGN_ASSET(2) char spot06_sceneTex_009838[] = dspot06_sceneTex_009838; -#define dspot06_sceneTex_00C2B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00C2B8" -static const ALIGN_ASSET(2) char spot06_sceneTex_00C2B8[] = dspot06_sceneTex_00C2B8; +#define dspot06_sceneTex_0098B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0098B8" +static const ALIGN_ASSET(2) char spot06_sceneTex_0098B8[] = dspot06_sceneTex_0098B8; -#define dspot06_sceneTex_00BAB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00BAB8" +#define dspot06_sceneTex_009AB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_009AB8" +static const ALIGN_ASSET(2) char spot06_sceneTex_009AB8[] = dspot06_sceneTex_009AB8; + +#define dspot06_sceneTex_00AAB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00AAB8" +static const ALIGN_ASSET(2) char spot06_sceneTex_00AAB8[] = dspot06_sceneTex_00AAB8; + +#define dspot06_sceneTex_00AEB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00AEB8" +static const ALIGN_ASSET(2) char spot06_sceneTex_00AEB8[] = dspot06_sceneTex_00AEB8; + +#define dspot06_sceneTex_00B6B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00B6B8" +static const ALIGN_ASSET(2) char spot06_sceneTex_00B6B8[] = dspot06_sceneTex_00B6B8; + +#define dspot06_sceneTex_00BAB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00BAB8" static const ALIGN_ASSET(2) char spot06_sceneTex_00BAB8[] = dspot06_sceneTex_00BAB8; -#define dspot06_sceneCollisionHeader_0055AC "__OTR__scenes/nonmq/spot06_scene/spot06_sceneCollisionHeader_0055AC" +#define dspot06_sceneTex_00BEB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00BEB8" +static const ALIGN_ASSET(2) char spot06_sceneTex_00BEB8[] = dspot06_sceneTex_00BEB8; -#define dspot06_sceneCollisionHeader_0055AC "__OTR__scenes/nonmq/spot06_scene/spot06_sceneCollisionHeader_0055AC" +#define dspot06_sceneTex_00C2B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00C2B8" +static const ALIGN_ASSET(2) char spot06_sceneTex_00C2B8[] = dspot06_sceneTex_00C2B8; -#define dspot06_sceneCollisionHeader_0055AC "__OTR__scenes/nonmq/spot06_scene/spot06_sceneCollisionHeader_0055AC" +#define dspot06_sceneTex_00C4B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00C4B8" +static const ALIGN_ASSET(2) char spot06_sceneTex_00C4B8[] = dspot06_sceneTex_00C4B8; + +#define dspot06_sceneTex_00CCB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00CCB8" +static const ALIGN_ASSET(2) char spot06_sceneTex_00CCB8[] = dspot06_sceneTex_00CCB8; + +#define dspot06_sceneTex_00DCB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00DCB8" +static const ALIGN_ASSET(2) char spot06_sceneTex_00DCB8[] = dspot06_sceneTex_00DCB8; + +#define dspot06_sceneTex_00ECB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00ECB8" +static const ALIGN_ASSET(2) char spot06_sceneTex_00ECB8[] = dspot06_sceneTex_00ECB8; + +#define dspot06_sceneTex_00F4B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00F4B8" +static const ALIGN_ASSET(2) char spot06_sceneTex_00F4B8[] = dspot06_sceneTex_00F4B8; + +#define dspot06_sceneTex_00F6B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00F6B8" +static const ALIGN_ASSET(2) char spot06_sceneTex_00F6B8[] = dspot06_sceneTex_00F6B8; + +#define dspot06_sceneTex_00FEB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00FEB8" +static const ALIGN_ASSET(2) char spot06_sceneTex_00FEB8[] = dspot06_sceneTex_00FEB8; + +#define dspot06_sceneTex_010EB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_010EB8" +static const ALIGN_ASSET(2) char spot06_sceneTex_010EB8[] = dspot06_sceneTex_010EB8; + +#define dspot06_sceneTex_0116B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0116B8" +static const ALIGN_ASSET(2) char spot06_sceneTex_0116B8[] = dspot06_sceneTex_0116B8; + +#define dspot06_sceneTex_011EB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_011EB8" +static const ALIGN_ASSET(2) char spot06_sceneTex_011EB8[] = dspot06_sceneTex_011EB8; + +#define dspot06_sceneTex_0122B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0122B8" +static const ALIGN_ASSET(2) char spot06_sceneTex_0122B8[] = dspot06_sceneTex_0122B8; + +#define dspot06_sceneTex_0126B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0126B8" +static const ALIGN_ASSET(2) char spot06_sceneTex_0126B8[] = dspot06_sceneTex_0126B8; + +#define dspot06_sceneTex_012EB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_012EB8" +static const ALIGN_ASSET(2) char spot06_sceneTex_012EB8[] = dspot06_sceneTex_012EB8; + +#define dspot06_sceneTex_0130B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0130B8" +static const ALIGN_ASSET(2) char spot06_sceneTex_0130B8[] = dspot06_sceneTex_0130B8; + +#define dspot06_sceneTex_0140B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0140B8" +static const ALIGN_ASSET(2) char spot06_sceneTex_0140B8[] = dspot06_sceneTex_0140B8; + +#define dspot06_sceneTex_0148B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0148B8" +static const ALIGN_ASSET(2) char spot06_sceneTex_0148B8[] = dspot06_sceneTex_0148B8; + +#define dspot06_sceneTex_014CB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_014CB8" +static const ALIGN_ASSET(2) char spot06_sceneTex_014CB8[] = dspot06_sceneTex_014CB8; + +#define dspot06_sceneTex_0154B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0154B8" +static const ALIGN_ASSET(2) char spot06_sceneTex_0154B8[] = dspot06_sceneTex_0154B8; + +#define dspot06_sceneTex_015CB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_015CB8" +static const ALIGN_ASSET(2) char spot06_sceneTex_015CB8[] = dspot06_sceneTex_015CB8; + +#define dspot06_sceneTex_0164B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0164B8" +static const ALIGN_ASSET(2) char spot06_sceneTex_0164B8[] = dspot06_sceneTex_0164B8; + +#define dspot06_sceneTex_016CB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_016CB8" +static const ALIGN_ASSET(2) char spot06_sceneTex_016CB8[] = dspot06_sceneTex_016CB8; + +#define dspot06_sceneTex_0170B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0170B8" +static const ALIGN_ASSET(2) char spot06_sceneTex_0170B8[] = dspot06_sceneTex_0170B8; + +#define dspot06_sceneTex_0178B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0178B8" +static const ALIGN_ASSET(2) char spot06_sceneTex_0178B8[] = dspot06_sceneTex_0178B8; + +#define dspot06_sceneTex_017CB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_017CB8" +static const ALIGN_ASSET(2) char spot06_sceneTex_017CB8[] = dspot06_sceneTex_017CB8; + +#define dspot06_sceneTex_0184B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0184B8" +static const ALIGN_ASSET(2) char spot06_sceneTex_0184B8[] = dspot06_sceneTex_0184B8; + +#define dspot06_sceneTex_018CB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_018CB8" +static const ALIGN_ASSET(2) char spot06_sceneTex_018CB8[] = dspot06_sceneTex_018CB8; + +#define dspot06_sceneTex_0194B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0194B8" +static const ALIGN_ASSET(2) char spot06_sceneTex_0194B8[] = dspot06_sceneTex_0194B8; + +#define dspot06_sceneTex_01A4B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_01A4B8" +static const ALIGN_ASSET(2) char spot06_sceneTex_01A4B8[] = dspot06_sceneTex_01A4B8; + +#define dspot06_sceneTex_01ACB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_01ACB8" +static const ALIGN_ASSET(2) char spot06_sceneTex_01ACB8[] = dspot06_sceneTex_01ACB8; + +#define dspot06_sceneTLUT_007C10 "__OTR__scenes/shared/spot06_scene/spot06_sceneTLUT_007C10" +static const ALIGN_ASSET(2) char spot06_sceneTLUT_007C10[] = dspot06_sceneTLUT_007C10; + +#define dgLakeHyliaFireArrowsCS "__OTR__scenes/shared/spot06_scene/gLakeHyliaFireArrowsCS" +static const ALIGN_ASSET(2) char gLakeHyliaFireArrowsCS[] = dgLakeHyliaFireArrowsCS; + +#define dgLakeHyliaOwlCs "__OTR__scenes/shared/spot06_scene/gLakeHyliaOwlCs" +static const ALIGN_ASSET(2) char gLakeHyliaOwlCs[] = dgLakeHyliaOwlCs; + +#define dgLakeHyliaIntroCs "__OTR__scenes/shared/spot06_scene/gLakeHyliaIntroCs" +static const ALIGN_ASSET(2) char gLakeHyliaIntroCs[] = dgLakeHyliaIntroCs; + +#define dspot06_sceneCollisionHeader_0055AC "__OTR__scenes/shared/spot06_scene/spot06_sceneCollisionHeader_0055AC" +static const ALIGN_ASSET(2) char spot06_sceneCollisionHeader_0055AC[] = dspot06_sceneCollisionHeader_0055AC; + +#define dspot06_sceneCollisionHeader_0055AC "__OTR__scenes/shared/spot06_scene/spot06_sceneCollisionHeader_0055AC" + +#define dspot06_sceneCollisionHeader_0055AC "__OTR__scenes/shared/spot06_scene/spot06_sceneCollisionHeader_0055AC" + +#define dspot06_sceneCollisionHeader_0055AC "__OTR__scenes/shared/spot06_scene/spot06_sceneCollisionHeader_0055AC" #endif // OVERWORLD_SPOT06_SCENE_H diff --git a/soh/assets/scenes/overworld/spot07/spot07_room_0.h b/soh/assets/scenes/overworld/spot07/spot07_room_0.h index 4e7dbb8c3..4aaf46121 100644 --- a/soh/assets/scenes/overworld/spot07/spot07_room_0.h +++ b/soh/assets/scenes/overworld/spot07/spot07_room_0.h @@ -3,130 +3,130 @@ #include "align_asset_macro.h" -#define dspot07_room_0DL_0034B0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_0034B0" -static const ALIGN_ASSET(2) char spot07_room_0DL_0034B0[] = dspot07_room_0DL_0034B0; - -#define dspot07_room_0DL_002A28 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_002A28" -static const ALIGN_ASSET(2) char spot07_room_0DL_002A28[] = dspot07_room_0DL_002A28; - -#define dspot07_room_0DL_002100 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_002100" -static const ALIGN_ASSET(2) char spot07_room_0DL_002100[] = dspot07_room_0DL_002100; - -#define dspot07_room_0DL_0004D0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_0004D0" -static const ALIGN_ASSET(2) char spot07_room_0DL_0004D0[] = dspot07_room_0DL_0004D0; - -#define dspot07_room_0DL_0026F0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_0026F0" -static const ALIGN_ASSET(2) char spot07_room_0DL_0026F0[] = dspot07_room_0DL_0026F0; - -#define dspot07_room_0DL_002E48 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_002E48" -static const ALIGN_ASSET(2) char spot07_room_0DL_002E48[] = dspot07_room_0DL_002E48; - -#define dspot07_room_0DL_001260 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_001260" -static const ALIGN_ASSET(2) char spot07_room_0DL_001260[] = dspot07_room_0DL_001260; - -#define dspot07_room_0DL_001870 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_001870" -static const ALIGN_ASSET(2) char spot07_room_0DL_001870[] = dspot07_room_0DL_001870; - -#define dspot07_room_0DL_0061E8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_0061E8" -static const ALIGN_ASSET(2) char spot07_room_0DL_0061E8[] = dspot07_room_0DL_0061E8; - -#define dspot07_room_0DL_000BA8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_000BA8" -static const ALIGN_ASSET(2) char spot07_room_0DL_000BA8[] = dspot07_room_0DL_000BA8; - -#define dspot07_room_0Tex_005748 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Tex_005748" -static const ALIGN_ASSET(2) char spot07_room_0Tex_005748[] = dspot07_room_0Tex_005748; - -#define dspot07_room_0DL_006010 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_006010" -static const ALIGN_ASSET(2) char spot07_room_0DL_006010[] = dspot07_room_0DL_006010; - -#define dspot07_room_0DL_000838 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_000838" -static const ALIGN_ASSET(2) char spot07_room_0DL_000838[] = dspot07_room_0DL_000838; - -#define dspot07_room_0Tex_004F48 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Tex_004F48" -static const ALIGN_ASSET(2) char spot07_room_0Tex_004F48[] = dspot07_room_0Tex_004F48; - -#define dspot07_room_0Tex_004748 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Tex_004748" +#define dspot07_room_0Tex_004748 "__OTR__scenes/shared/spot07_scene/spot07_room_0Tex_004748" static const ALIGN_ASSET(2) char spot07_room_0Tex_004748[] = dspot07_room_0Tex_004748; -#define dspot07_room_0DL_003EA8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_003EA8" +#define dspot07_room_0Tex_004F48 "__OTR__scenes/shared/spot07_scene/spot07_room_0Tex_004F48" +static const ALIGN_ASSET(2) char spot07_room_0Tex_004F48[] = dspot07_room_0Tex_004F48; + +#define dspot07_room_0Tex_005748 "__OTR__scenes/shared/spot07_scene/spot07_room_0Tex_005748" +static const ALIGN_ASSET(2) char spot07_room_0Tex_005748[] = dspot07_room_0Tex_005748; + +#define dspot07_room_0DL_0034B0 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_0034B0" +static const ALIGN_ASSET(2) char spot07_room_0DL_0034B0[] = dspot07_room_0DL_0034B0; + +#define dspot07_room_0DL_002A28 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_002A28" +static const ALIGN_ASSET(2) char spot07_room_0DL_002A28[] = dspot07_room_0DL_002A28; + +#define dspot07_room_0DL_002100 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_002100" +static const ALIGN_ASSET(2) char spot07_room_0DL_002100[] = dspot07_room_0DL_002100; + +#define dspot07_room_0DL_0004D0 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_0004D0" +static const ALIGN_ASSET(2) char spot07_room_0DL_0004D0[] = dspot07_room_0DL_0004D0; + +#define dspot07_room_0DL_0026F0 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_0026F0" +static const ALIGN_ASSET(2) char spot07_room_0DL_0026F0[] = dspot07_room_0DL_0026F0; + +#define dspot07_room_0DL_002E48 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_002E48" +static const ALIGN_ASSET(2) char spot07_room_0DL_002E48[] = dspot07_room_0DL_002E48; + +#define dspot07_room_0DL_001260 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_001260" +static const ALIGN_ASSET(2) char spot07_room_0DL_001260[] = dspot07_room_0DL_001260; + +#define dspot07_room_0DL_001870 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_001870" +static const ALIGN_ASSET(2) char spot07_room_0DL_001870[] = dspot07_room_0DL_001870; + +#define dspot07_room_0DL_0061E8 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_0061E8" +static const ALIGN_ASSET(2) char spot07_room_0DL_0061E8[] = dspot07_room_0DL_0061E8; + +#define dspot07_room_0DL_000BA8 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_000BA8" +static const ALIGN_ASSET(2) char spot07_room_0DL_000BA8[] = dspot07_room_0DL_000BA8; + +#define dspot07_room_0DL_006010 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_006010" +static const ALIGN_ASSET(2) char spot07_room_0DL_006010[] = dspot07_room_0DL_006010; + +#define dspot07_room_0DL_000838 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_000838" +static const ALIGN_ASSET(2) char spot07_room_0DL_000838[] = dspot07_room_0DL_000838; + +#define dspot07_room_0DL_003EA8 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_003EA8" static const ALIGN_ASSET(2) char spot07_room_0DL_003EA8[] = dspot07_room_0DL_003EA8; -#define dspot07_room_0Set_000220DL_0034B0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_0034B0" +#define dspot07_room_0Set_000220DL_0034B0 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_0034B0" static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_0034B0[] = dspot07_room_0Set_000220DL_0034B0; -#define dspot07_room_0Set_000220DL_002A28 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_002A28" +#define dspot07_room_0Set_000220DL_002A28 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_002A28" static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_002A28[] = dspot07_room_0Set_000220DL_002A28; -#define dspot07_room_0Set_000220DL_002100 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_002100" +#define dspot07_room_0Set_000220DL_002100 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_002100" static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_002100[] = dspot07_room_0Set_000220DL_002100; -#define dspot07_room_0Set_000220DL_0004D0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_0004D0" +#define dspot07_room_0Set_000220DL_0004D0 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_0004D0" static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_0004D0[] = dspot07_room_0Set_000220DL_0004D0; -#define dspot07_room_0Set_000220DL_0026F0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_0026F0" +#define dspot07_room_0Set_000220DL_0026F0 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_0026F0" static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_0026F0[] = dspot07_room_0Set_000220DL_0026F0; -#define dspot07_room_0Set_000220DL_002E48 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_002E48" +#define dspot07_room_0Set_000220DL_002E48 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_002E48" static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_002E48[] = dspot07_room_0Set_000220DL_002E48; -#define dspot07_room_0Set_000220DL_001260 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_001260" +#define dspot07_room_0Set_000220DL_001260 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_001260" static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_001260[] = dspot07_room_0Set_000220DL_001260; -#define dspot07_room_0Set_000220DL_001870 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_001870" +#define dspot07_room_0Set_000220DL_001870 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_001870" static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_001870[] = dspot07_room_0Set_000220DL_001870; -#define dspot07_room_0Set_000220DL_0061E8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_0061E8" +#define dspot07_room_0Set_000220DL_0061E8 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_0061E8" static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_0061E8[] = dspot07_room_0Set_000220DL_0061E8; -#define dspot07_room_0Set_000220DL_000BA8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_000BA8" +#define dspot07_room_0Set_000220DL_000BA8 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_000BA8" static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_000BA8[] = dspot07_room_0Set_000220DL_000BA8; -#define dspot07_room_0Set_000220DL_006010 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_006010" +#define dspot07_room_0Set_000220DL_006010 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_006010" static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_006010[] = dspot07_room_0Set_000220DL_006010; -#define dspot07_room_0Set_000220DL_000838 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_000838" +#define dspot07_room_0Set_000220DL_000838 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_000838" static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_000838[] = dspot07_room_0Set_000220DL_000838; -#define dspot07_room_0Set_000220DL_003EA8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_003EA8" +#define dspot07_room_0Set_000220DL_003EA8 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_003EA8" static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_003EA8[] = dspot07_room_0Set_000220DL_003EA8; -#define dspot07_room_0Set_000300DL_0034B0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_0034B0" +#define dspot07_room_0Set_000300DL_0034B0 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_0034B0" static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_0034B0[] = dspot07_room_0Set_000300DL_0034B0; -#define dspot07_room_0Set_000300DL_002A28 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_002A28" +#define dspot07_room_0Set_000300DL_002A28 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_002A28" static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_002A28[] = dspot07_room_0Set_000300DL_002A28; -#define dspot07_room_0Set_000300DL_002100 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_002100" +#define dspot07_room_0Set_000300DL_002100 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_002100" static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_002100[] = dspot07_room_0Set_000300DL_002100; -#define dspot07_room_0Set_000300DL_0004D0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_0004D0" +#define dspot07_room_0Set_000300DL_0004D0 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_0004D0" static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_0004D0[] = dspot07_room_0Set_000300DL_0004D0; -#define dspot07_room_0Set_000300DL_0026F0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_0026F0" +#define dspot07_room_0Set_000300DL_0026F0 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_0026F0" static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_0026F0[] = dspot07_room_0Set_000300DL_0026F0; -#define dspot07_room_0Set_000300DL_002E48 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_002E48" +#define dspot07_room_0Set_000300DL_002E48 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_002E48" static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_002E48[] = dspot07_room_0Set_000300DL_002E48; -#define dspot07_room_0Set_000300DL_001260 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_001260" +#define dspot07_room_0Set_000300DL_001260 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_001260" static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_001260[] = dspot07_room_0Set_000300DL_001260; -#define dspot07_room_0Set_000300DL_001870 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_001870" +#define dspot07_room_0Set_000300DL_001870 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_001870" static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_001870[] = dspot07_room_0Set_000300DL_001870; -#define dspot07_room_0Set_000300DL_0061E8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_0061E8" +#define dspot07_room_0Set_000300DL_0061E8 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_0061E8" static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_0061E8[] = dspot07_room_0Set_000300DL_0061E8; -#define dspot07_room_0Set_000300DL_000BA8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_000BA8" +#define dspot07_room_0Set_000300DL_000BA8 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_000BA8" static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_000BA8[] = dspot07_room_0Set_000300DL_000BA8; -#define dspot07_room_0Set_000300DL_006010 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_006010" +#define dspot07_room_0Set_000300DL_006010 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_006010" static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_006010[] = dspot07_room_0Set_000300DL_006010; -#define dspot07_room_0Set_000300DL_000838 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_000838" +#define dspot07_room_0Set_000300DL_000838 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_000838" static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_000838[] = dspot07_room_0Set_000300DL_000838; -#define dspot07_room_0Set_000300DL_003EA8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_003EA8" +#define dspot07_room_0Set_000300DL_003EA8 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_003EA8" static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_003EA8[] = dspot07_room_0Set_000300DL_003EA8; diff --git a/soh/assets/scenes/overworld/spot07/spot07_room_1.h b/soh/assets/scenes/overworld/spot07/spot07_room_1.h index a0b7fcb20..cabab5c7e 100644 --- a/soh/assets/scenes/overworld/spot07/spot07_room_1.h +++ b/soh/assets/scenes/overworld/spot07/spot07_room_1.h @@ -3,238 +3,238 @@ #include "align_asset_macro.h" -#define dspot07_room_1DL_004860 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_004860" -static const ALIGN_ASSET(2) char spot07_room_1DL_004860[] = dspot07_room_1DL_004860; - -#define dspot07_room_1DL_001838 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_001838" -static const ALIGN_ASSET(2) char spot07_room_1DL_001838[] = dspot07_room_1DL_001838; - -#define dspot07_room_1Tex_00A3D8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Tex_00A3D8" -static const ALIGN_ASSET(2) char spot07_room_1Tex_00A3D8[] = dspot07_room_1Tex_00A3D8; - -#define dspot07_room_1Tex_009BD8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Tex_009BD8" -static const ALIGN_ASSET(2) char spot07_room_1Tex_009BD8[] = dspot07_room_1Tex_009BD8; - -#define dspot07_room_1DL_0068E0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_0068E0" -static const ALIGN_ASSET(2) char spot07_room_1DL_0068E0[] = dspot07_room_1DL_0068E0; - -#define dspot07_room_1DL_00BEC0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_00BEC0" -static const ALIGN_ASSET(2) char spot07_room_1DL_00BEC0[] = dspot07_room_1DL_00BEC0; - -#define dspot07_room_1DL_00C0A0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_00C0A0" -static const ALIGN_ASSET(2) char spot07_room_1DL_00C0A0[] = dspot07_room_1DL_00C0A0; - -#define dspot07_room_1DL_0038A0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_0038A0" -static const ALIGN_ASSET(2) char spot07_room_1DL_0038A0[] = dspot07_room_1DL_0038A0; - -#define dspot07_room_1DL_003BE0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_003BE0" -static const ALIGN_ASSET(2) char spot07_room_1DL_003BE0[] = dspot07_room_1DL_003BE0; - -#define dspot07_room_1DL_003EE0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_003EE0" -static const ALIGN_ASSET(2) char spot07_room_1DL_003EE0[] = dspot07_room_1DL_003EE0; - -#define dspot07_room_1DL_004200 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_004200" -static const ALIGN_ASSET(2) char spot07_room_1DL_004200[] = dspot07_room_1DL_004200; - -#define dspot07_room_1DL_004508 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_004508" -static const ALIGN_ASSET(2) char spot07_room_1DL_004508[] = dspot07_room_1DL_004508; - -#define dspot07_room_1Tex_0097D8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Tex_0097D8" -static const ALIGN_ASSET(2) char spot07_room_1Tex_0097D8[] = dspot07_room_1Tex_0097D8; - -#define dspot07_room_1DL_004B98 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_004B98" -static const ALIGN_ASSET(2) char spot07_room_1DL_004B98[] = dspot07_room_1DL_004B98; - -#define dspot07_room_1Tex_0093D8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Tex_0093D8" -static const ALIGN_ASSET(2) char spot07_room_1Tex_0093D8[] = dspot07_room_1Tex_0093D8; - -#define dspot07_room_1DL_004E70 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_004E70" -static const ALIGN_ASSET(2) char spot07_room_1DL_004E70[] = dspot07_room_1DL_004E70; - -#define dspot07_room_1Tex_008FD8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Tex_008FD8" -static const ALIGN_ASSET(2) char spot07_room_1Tex_008FD8[] = dspot07_room_1Tex_008FD8; - -#define dspot07_room_1DL_005160 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_005160" -static const ALIGN_ASSET(2) char spot07_room_1DL_005160[] = dspot07_room_1DL_005160; - -#define dspot07_room_1DL_0053D0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_0053D0" -static const ALIGN_ASSET(2) char spot07_room_1DL_0053D0[] = dspot07_room_1DL_0053D0; - -#define dspot07_room_1Tex_008BD8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Tex_008BD8" -static const ALIGN_ASSET(2) char spot07_room_1Tex_008BD8[] = dspot07_room_1Tex_008BD8; - -#define dspot07_room_1DL_0035B0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_0035B0" -static const ALIGN_ASSET(2) char spot07_room_1DL_0035B0[] = dspot07_room_1DL_0035B0; - -#define dspot07_room_1DL_005D08 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_005D08" -static const ALIGN_ASSET(2) char spot07_room_1DL_005D08[] = dspot07_room_1DL_005D08; - -#define dspot07_room_1DL_005AB8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_005AB8" -static const ALIGN_ASSET(2) char spot07_room_1DL_005AB8[] = dspot07_room_1DL_005AB8; - -#define dspot07_room_1DL_002710 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_002710" -static const ALIGN_ASSET(2) char spot07_room_1DL_002710[] = dspot07_room_1DL_002710; - -#define dspot07_room_1Tex_007ED8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Tex_007ED8" -static const ALIGN_ASSET(2) char spot07_room_1Tex_007ED8[] = dspot07_room_1Tex_007ED8; - -#define dspot07_room_1Tex_0076D8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Tex_0076D8" +#define dspot07_room_1Tex_0076D8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Tex_0076D8" static const ALIGN_ASSET(2) char spot07_room_1Tex_0076D8[] = dspot07_room_1Tex_0076D8; -#define dspot07_room_1Tex_008AD8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Tex_008AD8" -static const ALIGN_ASSET(2) char spot07_room_1Tex_008AD8[] = dspot07_room_1Tex_008AD8; +#define dspot07_room_1Tex_007ED8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Tex_007ED8" +static const ALIGN_ASSET(2) char spot07_room_1Tex_007ED8[] = dspot07_room_1Tex_007ED8; -#define dspot07_room_1Tex_0086D8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Tex_0086D8" +#define dspot07_room_1Tex_0086D8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Tex_0086D8" static const ALIGN_ASSET(2) char spot07_room_1Tex_0086D8[] = dspot07_room_1Tex_0086D8; -#define dspot07_room_1DL_00BCE0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_00BCE0" -static const ALIGN_ASSET(2) char spot07_room_1DL_00BCE0[] = dspot07_room_1DL_00BCE0; +#define dspot07_room_1Tex_008AD8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Tex_008AD8" +static const ALIGN_ASSET(2) char spot07_room_1Tex_008AD8[] = dspot07_room_1Tex_008AD8; -#define dspot07_room_1Tex_00C1A0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Tex_00C1A0" -static const ALIGN_ASSET(2) char spot07_room_1Tex_00C1A0[] = dspot07_room_1Tex_00C1A0; +#define dspot07_room_1Tex_008BD8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Tex_008BD8" +static const ALIGN_ASSET(2) char spot07_room_1Tex_008BD8[] = dspot07_room_1Tex_008BD8; -#define dspot07_room_1DL_005798 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_005798" -static const ALIGN_ASSET(2) char spot07_room_1DL_005798[] = dspot07_room_1DL_005798; +#define dspot07_room_1Tex_008FD8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Tex_008FD8" +static const ALIGN_ASSET(2) char spot07_room_1Tex_008FD8[] = dspot07_room_1Tex_008FD8; -#define dspot07_room_1DL_0012C0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_0012C0" -static const ALIGN_ASSET(2) char spot07_room_1DL_0012C0[] = dspot07_room_1DL_0012C0; +#define dspot07_room_1Tex_0093D8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Tex_0093D8" +static const ALIGN_ASSET(2) char spot07_room_1Tex_0093D8[] = dspot07_room_1Tex_0093D8; -#define dspot07_room_1DL_007488 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_007488" -static const ALIGN_ASSET(2) char spot07_room_1DL_007488[] = dspot07_room_1DL_007488; +#define dspot07_room_1Tex_0097D8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Tex_0097D8" +static const ALIGN_ASSET(2) char spot07_room_1Tex_0097D8[] = dspot07_room_1Tex_0097D8; -#define dspot07_room_1Tex_00ABD8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Tex_00ABD8" +#define dspot07_room_1Tex_009BD8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Tex_009BD8" +static const ALIGN_ASSET(2) char spot07_room_1Tex_009BD8[] = dspot07_room_1Tex_009BD8; + +#define dspot07_room_1Tex_00A3D8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Tex_00A3D8" +static const ALIGN_ASSET(2) char spot07_room_1Tex_00A3D8[] = dspot07_room_1Tex_00A3D8; + +#define dspot07_room_1Tex_00ABD8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Tex_00ABD8" static const ALIGN_ASSET(2) char spot07_room_1Tex_00ABD8[] = dspot07_room_1Tex_00ABD8; -#define dspot07_room_1Set_000360DL_004860 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_004860" +#define dspot07_room_1Tex_00C1A0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Tex_00C1A0" +static const ALIGN_ASSET(2) char spot07_room_1Tex_00C1A0[] = dspot07_room_1Tex_00C1A0; + +#define dspot07_room_1DL_004860 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_004860" +static const ALIGN_ASSET(2) char spot07_room_1DL_004860[] = dspot07_room_1DL_004860; + +#define dspot07_room_1DL_001838 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_001838" +static const ALIGN_ASSET(2) char spot07_room_1DL_001838[] = dspot07_room_1DL_001838; + +#define dspot07_room_1DL_0068E0 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_0068E0" +static const ALIGN_ASSET(2) char spot07_room_1DL_0068E0[] = dspot07_room_1DL_0068E0; + +#define dspot07_room_1DL_00BEC0 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_00BEC0" +static const ALIGN_ASSET(2) char spot07_room_1DL_00BEC0[] = dspot07_room_1DL_00BEC0; + +#define dspot07_room_1DL_00C0A0 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_00C0A0" +static const ALIGN_ASSET(2) char spot07_room_1DL_00C0A0[] = dspot07_room_1DL_00C0A0; + +#define dspot07_room_1DL_0038A0 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_0038A0" +static const ALIGN_ASSET(2) char spot07_room_1DL_0038A0[] = dspot07_room_1DL_0038A0; + +#define dspot07_room_1DL_003BE0 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_003BE0" +static const ALIGN_ASSET(2) char spot07_room_1DL_003BE0[] = dspot07_room_1DL_003BE0; + +#define dspot07_room_1DL_003EE0 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_003EE0" +static const ALIGN_ASSET(2) char spot07_room_1DL_003EE0[] = dspot07_room_1DL_003EE0; + +#define dspot07_room_1DL_004200 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_004200" +static const ALIGN_ASSET(2) char spot07_room_1DL_004200[] = dspot07_room_1DL_004200; + +#define dspot07_room_1DL_004508 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_004508" +static const ALIGN_ASSET(2) char spot07_room_1DL_004508[] = dspot07_room_1DL_004508; + +#define dspot07_room_1DL_004B98 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_004B98" +static const ALIGN_ASSET(2) char spot07_room_1DL_004B98[] = dspot07_room_1DL_004B98; + +#define dspot07_room_1DL_004E70 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_004E70" +static const ALIGN_ASSET(2) char spot07_room_1DL_004E70[] = dspot07_room_1DL_004E70; + +#define dspot07_room_1DL_005160 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_005160" +static const ALIGN_ASSET(2) char spot07_room_1DL_005160[] = dspot07_room_1DL_005160; + +#define dspot07_room_1DL_0053D0 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_0053D0" +static const ALIGN_ASSET(2) char spot07_room_1DL_0053D0[] = dspot07_room_1DL_0053D0; + +#define dspot07_room_1DL_0035B0 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_0035B0" +static const ALIGN_ASSET(2) char spot07_room_1DL_0035B0[] = dspot07_room_1DL_0035B0; + +#define dspot07_room_1DL_005D08 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_005D08" +static const ALIGN_ASSET(2) char spot07_room_1DL_005D08[] = dspot07_room_1DL_005D08; + +#define dspot07_room_1DL_005AB8 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_005AB8" +static const ALIGN_ASSET(2) char spot07_room_1DL_005AB8[] = dspot07_room_1DL_005AB8; + +#define dspot07_room_1DL_002710 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_002710" +static const ALIGN_ASSET(2) char spot07_room_1DL_002710[] = dspot07_room_1DL_002710; + +#define dspot07_room_1DL_00BCE0 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_00BCE0" +static const ALIGN_ASSET(2) char spot07_room_1DL_00BCE0[] = dspot07_room_1DL_00BCE0; + +#define dspot07_room_1DL_005798 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_005798" +static const ALIGN_ASSET(2) char spot07_room_1DL_005798[] = dspot07_room_1DL_005798; + +#define dspot07_room_1DL_0012C0 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_0012C0" +static const ALIGN_ASSET(2) char spot07_room_1DL_0012C0[] = dspot07_room_1DL_0012C0; + +#define dspot07_room_1DL_007488 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_007488" +static const ALIGN_ASSET(2) char spot07_room_1DL_007488[] = dspot07_room_1DL_007488; + +#define dspot07_room_1Set_000360DL_004860 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_004860" static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_004860[] = dspot07_room_1Set_000360DL_004860; -#define dspot07_room_1Set_000360DL_001838 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_001838" +#define dspot07_room_1Set_000360DL_001838 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_001838" static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_001838[] = dspot07_room_1Set_000360DL_001838; -#define dspot07_room_1Set_000360DL_0068E0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_0068E0" +#define dspot07_room_1Set_000360DL_0068E0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_0068E0" static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_0068E0[] = dspot07_room_1Set_000360DL_0068E0; -#define dspot07_room_1Set_000360DL_00BEC0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_00BEC0" +#define dspot07_room_1Set_000360DL_00BEC0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_00BEC0" static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_00BEC0[] = dspot07_room_1Set_000360DL_00BEC0; -#define dspot07_room_1Set_000360DL_00C0A0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_00C0A0" +#define dspot07_room_1Set_000360DL_00C0A0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_00C0A0" static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_00C0A0[] = dspot07_room_1Set_000360DL_00C0A0; -#define dspot07_room_1Set_000360DL_0038A0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_0038A0" +#define dspot07_room_1Set_000360DL_0038A0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_0038A0" static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_0038A0[] = dspot07_room_1Set_000360DL_0038A0; -#define dspot07_room_1Set_000360DL_003BE0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_003BE0" +#define dspot07_room_1Set_000360DL_003BE0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_003BE0" static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_003BE0[] = dspot07_room_1Set_000360DL_003BE0; -#define dspot07_room_1Set_000360DL_003EE0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_003EE0" +#define dspot07_room_1Set_000360DL_003EE0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_003EE0" static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_003EE0[] = dspot07_room_1Set_000360DL_003EE0; -#define dspot07_room_1Set_000360DL_004200 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_004200" +#define dspot07_room_1Set_000360DL_004200 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_004200" static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_004200[] = dspot07_room_1Set_000360DL_004200; -#define dspot07_room_1Set_000360DL_004508 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_004508" +#define dspot07_room_1Set_000360DL_004508 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_004508" static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_004508[] = dspot07_room_1Set_000360DL_004508; -#define dspot07_room_1Set_000360DL_004B98 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_004B98" +#define dspot07_room_1Set_000360DL_004B98 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_004B98" static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_004B98[] = dspot07_room_1Set_000360DL_004B98; -#define dspot07_room_1Set_000360DL_004E70 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_004E70" +#define dspot07_room_1Set_000360DL_004E70 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_004E70" static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_004E70[] = dspot07_room_1Set_000360DL_004E70; -#define dspot07_room_1Set_000360DL_005160 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_005160" +#define dspot07_room_1Set_000360DL_005160 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_005160" static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_005160[] = dspot07_room_1Set_000360DL_005160; -#define dspot07_room_1Set_000360DL_0053D0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_0053D0" +#define dspot07_room_1Set_000360DL_0053D0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_0053D0" static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_0053D0[] = dspot07_room_1Set_000360DL_0053D0; -#define dspot07_room_1Set_000360DL_0035B0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_0035B0" +#define dspot07_room_1Set_000360DL_0035B0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_0035B0" static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_0035B0[] = dspot07_room_1Set_000360DL_0035B0; -#define dspot07_room_1Set_000360DL_005D08 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_005D08" +#define dspot07_room_1Set_000360DL_005D08 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_005D08" static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_005D08[] = dspot07_room_1Set_000360DL_005D08; -#define dspot07_room_1Set_000360DL_005AB8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_005AB8" +#define dspot07_room_1Set_000360DL_005AB8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_005AB8" static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_005AB8[] = dspot07_room_1Set_000360DL_005AB8; -#define dspot07_room_1Set_000360DL_002710 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_002710" +#define dspot07_room_1Set_000360DL_002710 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_002710" static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_002710[] = dspot07_room_1Set_000360DL_002710; -#define dspot07_room_1Set_000360DL_00BCE0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_00BCE0" +#define dspot07_room_1Set_000360DL_00BCE0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_00BCE0" static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_00BCE0[] = dspot07_room_1Set_000360DL_00BCE0; -#define dspot07_room_1Set_000360DL_005798 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_005798" +#define dspot07_room_1Set_000360DL_005798 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_005798" static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_005798[] = dspot07_room_1Set_000360DL_005798; -#define dspot07_room_1Set_000360DL_0012C0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_0012C0" +#define dspot07_room_1Set_000360DL_0012C0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_0012C0" static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_0012C0[] = dspot07_room_1Set_000360DL_0012C0; -#define dspot07_room_1Set_000360DL_007488 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_007488" +#define dspot07_room_1Set_000360DL_007488 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_007488" static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_007488[] = dspot07_room_1Set_000360DL_007488; -#define dspot07_room_1Set_0004C0DL_004860 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_004860" +#define dspot07_room_1Set_0004C0DL_004860 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_004860" static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_004860[] = dspot07_room_1Set_0004C0DL_004860; -#define dspot07_room_1Set_0004C0DL_001838 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_001838" +#define dspot07_room_1Set_0004C0DL_001838 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_001838" static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_001838[] = dspot07_room_1Set_0004C0DL_001838; -#define dspot07_room_1Set_0004C0DL_0068E0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_0068E0" +#define dspot07_room_1Set_0004C0DL_0068E0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_0068E0" static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_0068E0[] = dspot07_room_1Set_0004C0DL_0068E0; -#define dspot07_room_1Set_0004C0DL_00BEC0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_00BEC0" +#define dspot07_room_1Set_0004C0DL_00BEC0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_00BEC0" static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_00BEC0[] = dspot07_room_1Set_0004C0DL_00BEC0; -#define dspot07_room_1Set_0004C0DL_00C0A0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_00C0A0" +#define dspot07_room_1Set_0004C0DL_00C0A0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_00C0A0" static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_00C0A0[] = dspot07_room_1Set_0004C0DL_00C0A0; -#define dspot07_room_1Set_0004C0DL_0038A0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_0038A0" +#define dspot07_room_1Set_0004C0DL_0038A0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_0038A0" static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_0038A0[] = dspot07_room_1Set_0004C0DL_0038A0; -#define dspot07_room_1Set_0004C0DL_003BE0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_003BE0" +#define dspot07_room_1Set_0004C0DL_003BE0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_003BE0" static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_003BE0[] = dspot07_room_1Set_0004C0DL_003BE0; -#define dspot07_room_1Set_0004C0DL_003EE0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_003EE0" +#define dspot07_room_1Set_0004C0DL_003EE0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_003EE0" static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_003EE0[] = dspot07_room_1Set_0004C0DL_003EE0; -#define dspot07_room_1Set_0004C0DL_004200 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_004200" +#define dspot07_room_1Set_0004C0DL_004200 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_004200" static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_004200[] = dspot07_room_1Set_0004C0DL_004200; -#define dspot07_room_1Set_0004C0DL_004508 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_004508" +#define dspot07_room_1Set_0004C0DL_004508 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_004508" static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_004508[] = dspot07_room_1Set_0004C0DL_004508; -#define dspot07_room_1Set_0004C0DL_004B98 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_004B98" +#define dspot07_room_1Set_0004C0DL_004B98 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_004B98" static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_004B98[] = dspot07_room_1Set_0004C0DL_004B98; -#define dspot07_room_1Set_0004C0DL_004E70 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_004E70" +#define dspot07_room_1Set_0004C0DL_004E70 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_004E70" static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_004E70[] = dspot07_room_1Set_0004C0DL_004E70; -#define dspot07_room_1Set_0004C0DL_005160 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_005160" +#define dspot07_room_1Set_0004C0DL_005160 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_005160" static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_005160[] = dspot07_room_1Set_0004C0DL_005160; -#define dspot07_room_1Set_0004C0DL_0053D0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_0053D0" +#define dspot07_room_1Set_0004C0DL_0053D0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_0053D0" static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_0053D0[] = dspot07_room_1Set_0004C0DL_0053D0; -#define dspot07_room_1Set_0004C0DL_0035B0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_0035B0" +#define dspot07_room_1Set_0004C0DL_0035B0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_0035B0" static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_0035B0[] = dspot07_room_1Set_0004C0DL_0035B0; -#define dspot07_room_1Set_0004C0DL_005D08 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_005D08" +#define dspot07_room_1Set_0004C0DL_005D08 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_005D08" static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_005D08[] = dspot07_room_1Set_0004C0DL_005D08; -#define dspot07_room_1Set_0004C0DL_005AB8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_005AB8" +#define dspot07_room_1Set_0004C0DL_005AB8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_005AB8" static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_005AB8[] = dspot07_room_1Set_0004C0DL_005AB8; -#define dspot07_room_1Set_0004C0DL_002710 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_002710" +#define dspot07_room_1Set_0004C0DL_002710 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_002710" static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_002710[] = dspot07_room_1Set_0004C0DL_002710; -#define dspot07_room_1Set_0004C0DL_00BCE0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_00BCE0" +#define dspot07_room_1Set_0004C0DL_00BCE0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_00BCE0" static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_00BCE0[] = dspot07_room_1Set_0004C0DL_00BCE0; -#define dspot07_room_1Set_0004C0DL_005798 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_005798" +#define dspot07_room_1Set_0004C0DL_005798 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_005798" static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_005798[] = dspot07_room_1Set_0004C0DL_005798; -#define dspot07_room_1Set_0004C0DL_0012C0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_0012C0" +#define dspot07_room_1Set_0004C0DL_0012C0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_0012C0" static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_0012C0[] = dspot07_room_1Set_0004C0DL_0012C0; -#define dspot07_room_1Set_0004C0DL_007488 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_007488" +#define dspot07_room_1Set_0004C0DL_007488 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_007488" static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_007488[] = dspot07_room_1Set_0004C0DL_007488; diff --git a/soh/assets/scenes/overworld/spot07/spot07_scene.h b/soh/assets/scenes/overworld/spot07/spot07_scene.h index a7bdc1f78..dc5ff60f7 100644 --- a/soh/assets/scenes/overworld/spot07/spot07_scene.h +++ b/soh/assets/scenes/overworld/spot07/spot07_scene.h @@ -3,72 +3,72 @@ #include "align_asset_macro.h" -#define dgZorasDomainIntroCs "__OTR__scenes/nonmq/spot07_scene/gZorasDomainIntroCs" -static const ALIGN_ASSET(2) char gZorasDomainIntroCs[] = dgZorasDomainIntroCs; - -#define dgZorasDomainDayEntranceTex "__OTR__scenes/nonmq/spot07_scene/gZorasDomainDayEntranceTex" -static const ALIGN_ASSET(2) char gZorasDomainDayEntranceTex[] = dgZorasDomainDayEntranceTex; - -#define dgZorasDomainNightEntranceTex "__OTR__scenes/nonmq/spot07_scene/gZorasDomainNightEntranceTex" -static const ALIGN_ASSET(2) char gZorasDomainNightEntranceTex[] = dgZorasDomainNightEntranceTex; - -#define dspot07_sceneCollisionHeader_003824 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneCollisionHeader_003824" -static const ALIGN_ASSET(2) char spot07_sceneCollisionHeader_003824[] = dspot07_sceneCollisionHeader_003824; - -#define dspot07_sceneTex_009418 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_009418" -static const ALIGN_ASSET(2) char spot07_sceneTex_009418[] = dspot07_sceneTex_009418; - -#define dspot07_sceneTex_009018 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_009018" -static const ALIGN_ASSET(2) char spot07_sceneTex_009018[] = dspot07_sceneTex_009018; - -#define dspot07_sceneTLUT_003F70 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTLUT_003F70" -static const ALIGN_ASSET(2) char spot07_sceneTLUT_003F70[] = dspot07_sceneTLUT_003F70; - -#define dspot07_sceneTex_006398 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_006398" -static const ALIGN_ASSET(2) char spot07_sceneTex_006398[] = dspot07_sceneTex_006398; - -#define dspot07_sceneTex_005798 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_005798" -static const ALIGN_ASSET(2) char spot07_sceneTex_005798[] = dspot07_sceneTex_005798; - -#define dspot07_sceneTex_005398 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_005398" -static const ALIGN_ASSET(2) char spot07_sceneTex_005398[] = dspot07_sceneTex_005398; - -#define dspot07_sceneTex_004F98 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_004F98" -static const ALIGN_ASSET(2) char spot07_sceneTex_004F98[] = dspot07_sceneTex_004F98; - -#define dspot07_sceneTex_007798 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_007798" -static const ALIGN_ASSET(2) char spot07_sceneTex_007798[] = dspot07_sceneTex_007798; - -#define dspot07_sceneTex_006F98 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_006F98" -static const ALIGN_ASSET(2) char spot07_sceneTex_006F98[] = dspot07_sceneTex_006F98; - -#define dspot07_sceneTex_006798 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_006798" -static const ALIGN_ASSET(2) char spot07_sceneTex_006798[] = dspot07_sceneTex_006798; - -#define dspot07_sceneTex_003F98 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_003F98" +#define dspot07_sceneTex_003F98 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_003F98" static const ALIGN_ASSET(2) char spot07_sceneTex_003F98[] = dspot07_sceneTex_003F98; -#define dspot07_sceneTex_007F98 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_007F98" -static const ALIGN_ASSET(2) char spot07_sceneTex_007F98[] = dspot07_sceneTex_007F98; +#define dspot07_sceneTex_004F98 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_004F98" +static const ALIGN_ASSET(2) char spot07_sceneTex_004F98[] = dspot07_sceneTex_004F98; -#define dspot07_sceneTex_008798 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_008798" -static const ALIGN_ASSET(2) char spot07_sceneTex_008798[] = dspot07_sceneTex_008798; +#define dspot07_sceneTex_005398 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_005398" +static const ALIGN_ASSET(2) char spot07_sceneTex_005398[] = dspot07_sceneTex_005398; -#define dspot07_sceneTex_007B98 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_007B98" -static const ALIGN_ASSET(2) char spot07_sceneTex_007B98[] = dspot07_sceneTex_007B98; +#define dspot07_sceneTex_005798 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_005798" +static const ALIGN_ASSET(2) char spot07_sceneTex_005798[] = dspot07_sceneTex_005798; -#define dspot07_sceneTex_006B98 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_006B98" -static const ALIGN_ASSET(2) char spot07_sceneTex_006B98[] = dspot07_sceneTex_006B98; - -#define dspot07_sceneTex_005F98 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_005F98" -static const ALIGN_ASSET(2) char spot07_sceneTex_005F98[] = dspot07_sceneTex_005F98; - -#define dspot07_sceneTex_005B98 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_005B98" +#define dspot07_sceneTex_005B98 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_005B98" static const ALIGN_ASSET(2) char spot07_sceneTex_005B98[] = dspot07_sceneTex_005B98; -#define dspot07_sceneCollisionHeader_003824 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneCollisionHeader_003824" +#define dspot07_sceneTex_005F98 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_005F98" +static const ALIGN_ASSET(2) char spot07_sceneTex_005F98[] = dspot07_sceneTex_005F98; -#define dspot07_sceneCollisionHeader_003824 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneCollisionHeader_003824" +#define dspot07_sceneTex_006398 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_006398" +static const ALIGN_ASSET(2) char spot07_sceneTex_006398[] = dspot07_sceneTex_006398; + +#define dspot07_sceneTex_006798 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_006798" +static const ALIGN_ASSET(2) char spot07_sceneTex_006798[] = dspot07_sceneTex_006798; + +#define dspot07_sceneTex_006B98 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_006B98" +static const ALIGN_ASSET(2) char spot07_sceneTex_006B98[] = dspot07_sceneTex_006B98; + +#define dspot07_sceneTex_006F98 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_006F98" +static const ALIGN_ASSET(2) char spot07_sceneTex_006F98[] = dspot07_sceneTex_006F98; + +#define dspot07_sceneTex_007798 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_007798" +static const ALIGN_ASSET(2) char spot07_sceneTex_007798[] = dspot07_sceneTex_007798; + +#define dspot07_sceneTex_007B98 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_007B98" +static const ALIGN_ASSET(2) char spot07_sceneTex_007B98[] = dspot07_sceneTex_007B98; + +#define dspot07_sceneTex_007F98 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_007F98" +static const ALIGN_ASSET(2) char spot07_sceneTex_007F98[] = dspot07_sceneTex_007F98; + +#define dspot07_sceneTex_008798 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_008798" +static const ALIGN_ASSET(2) char spot07_sceneTex_008798[] = dspot07_sceneTex_008798; + +#define dspot07_sceneTex_009018 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_009018" +static const ALIGN_ASSET(2) char spot07_sceneTex_009018[] = dspot07_sceneTex_009018; + +#define dspot07_sceneTex_009418 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_009418" +static const ALIGN_ASSET(2) char spot07_sceneTex_009418[] = dspot07_sceneTex_009418; + +#define dspot07_sceneTLUT_003F70 "__OTR__scenes/shared/spot07_scene/spot07_sceneTLUT_003F70" +static const ALIGN_ASSET(2) char spot07_sceneTLUT_003F70[] = dspot07_sceneTLUT_003F70; + +#define dgZorasDomainIntroCs "__OTR__scenes/shared/spot07_scene/gZorasDomainIntroCs" +static const ALIGN_ASSET(2) char gZorasDomainIntroCs[] = dgZorasDomainIntroCs; + +#define dgZorasDomainDayEntranceTex "__OTR__scenes/shared/spot07_scene/gZorasDomainDayEntranceTex" +static const ALIGN_ASSET(2) char gZorasDomainDayEntranceTex[] = dgZorasDomainDayEntranceTex; + +#define dgZorasDomainNightEntranceTex "__OTR__scenes/shared/spot07_scene/gZorasDomainNightEntranceTex" +static const ALIGN_ASSET(2) char gZorasDomainNightEntranceTex[] = dgZorasDomainNightEntranceTex; + +#define dspot07_sceneCollisionHeader_003824 "__OTR__scenes/shared/spot07_scene/spot07_sceneCollisionHeader_003824" +static const ALIGN_ASSET(2) char spot07_sceneCollisionHeader_003824[] = dspot07_sceneCollisionHeader_003824; + +#define dspot07_sceneCollisionHeader_003824 "__OTR__scenes/shared/spot07_scene/spot07_sceneCollisionHeader_003824" + +#define dspot07_sceneCollisionHeader_003824 "__OTR__scenes/shared/spot07_scene/spot07_sceneCollisionHeader_003824" #endif // OVERWORLD_SPOT07_SCENE_H diff --git a/soh/assets/scenes/overworld/spot08/spot08_room_0.h b/soh/assets/scenes/overworld/spot08/spot08_room_0.h index aaec4510f..d2629f414 100644 --- a/soh/assets/scenes/overworld/spot08/spot08_room_0.h +++ b/soh/assets/scenes/overworld/spot08/spot08_room_0.h @@ -3,382 +3,382 @@ #include "align_asset_macro.h" -#define dspot08_room_0DL_0051E8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_0051E8" +#define dspot08_room_0DL_0051E8 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_0051E8" static const ALIGN_ASSET(2) char spot08_room_0DL_0051E8[] = dspot08_room_0DL_0051E8; -#define dspot08_room_0DL_000DC0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_000DC0" +#define dspot08_room_0DL_000DC0 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_000DC0" static const ALIGN_ASSET(2) char spot08_room_0DL_000DC0[] = dspot08_room_0DL_000DC0; -#define dspot08_room_0DL_007840 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_007840" +#define dspot08_room_0DL_007840 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_007840" static const ALIGN_ASSET(2) char spot08_room_0DL_007840[] = dspot08_room_0DL_007840; -#define dspot08_room_0DL_001068 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_001068" +#define dspot08_room_0DL_001068 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_001068" static const ALIGN_ASSET(2) char spot08_room_0DL_001068[] = dspot08_room_0DL_001068; -#define dspot08_room_0DL_0079F0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_0079F0" +#define dspot08_room_0DL_0079F0 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_0079F0" static const ALIGN_ASSET(2) char spot08_room_0DL_0079F0[] = dspot08_room_0DL_0079F0; -#define dspot08_room_0DL_0013B8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_0013B8" +#define dspot08_room_0DL_0013B8 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_0013B8" static const ALIGN_ASSET(2) char spot08_room_0DL_0013B8[] = dspot08_room_0DL_0013B8; -#define dspot08_room_0DL_007BA0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_007BA0" +#define dspot08_room_0DL_007BA0 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_007BA0" static const ALIGN_ASSET(2) char spot08_room_0DL_007BA0[] = dspot08_room_0DL_007BA0; -#define dspot08_room_0DL_005B00 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_005B00" +#define dspot08_room_0DL_005B00 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_005B00" static const ALIGN_ASSET(2) char spot08_room_0DL_005B00[] = dspot08_room_0DL_005B00; -#define dspot08_room_0DL_007478 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_007478" +#define dspot08_room_0DL_007478 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_007478" static const ALIGN_ASSET(2) char spot08_room_0DL_007478[] = dspot08_room_0DL_007478; -#define dspot08_room_0DL_001978 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_001978" +#define dspot08_room_0DL_001978 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_001978" static const ALIGN_ASSET(2) char spot08_room_0DL_001978[] = dspot08_room_0DL_001978; -#define dspot08_room_0DL_002120 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_002120" +#define dspot08_room_0DL_002120 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_002120" static const ALIGN_ASSET(2) char spot08_room_0DL_002120[] = dspot08_room_0DL_002120; -#define dspot08_room_0DL_002538 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_002538" +#define dspot08_room_0DL_002538 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_002538" static const ALIGN_ASSET(2) char spot08_room_0DL_002538[] = dspot08_room_0DL_002538; -#define dspot08_room_0DL_006120 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_006120" +#define dspot08_room_0DL_006120 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_006120" static const ALIGN_ASSET(2) char spot08_room_0DL_006120[] = dspot08_room_0DL_006120; -#define dspot08_room_0DL_0066F8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_0066F8" +#define dspot08_room_0DL_0066F8 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_0066F8" static const ALIGN_ASSET(2) char spot08_room_0DL_0066F8[] = dspot08_room_0DL_0066F8; -#define dspot08_room_0DL_006C48 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_006C48" +#define dspot08_room_0DL_006C48 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_006C48" static const ALIGN_ASSET(2) char spot08_room_0DL_006C48[] = dspot08_room_0DL_006C48; -#define dspot08_room_0DL_003048 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_003048" +#define dspot08_room_0DL_003048 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_003048" static const ALIGN_ASSET(2) char spot08_room_0DL_003048[] = dspot08_room_0DL_003048; -#define dspot08_room_0DL_0015F0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_0015F0" +#define dspot08_room_0DL_0015F0 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_0015F0" static const ALIGN_ASSET(2) char spot08_room_0DL_0015F0[] = dspot08_room_0DL_0015F0; -#define dspot08_room_0DL_007D30 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_007D30" +#define dspot08_room_0DL_007D30 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_007D30" static const ALIGN_ASSET(2) char spot08_room_0DL_007D30[] = dspot08_room_0DL_007D30; -#define dspot08_room_0DL_007FE8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_007FE8" +#define dspot08_room_0DL_007FE8 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_007FE8" static const ALIGN_ASSET(2) char spot08_room_0DL_007FE8[] = dspot08_room_0DL_007FE8; -#define dspot08_room_0DL_0048B0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_0048B0" +#define dspot08_room_0DL_0048B0 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_0048B0" static const ALIGN_ASSET(2) char spot08_room_0DL_0048B0[] = dspot08_room_0DL_0048B0; -#define dspot08_room_0DL_0069C0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_0069C0" +#define dspot08_room_0DL_0069C0 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_0069C0" static const ALIGN_ASSET(2) char spot08_room_0DL_0069C0[] = dspot08_room_0DL_0069C0; -#define dspot08_room_0Set_000700DL_0051E8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_0051E8" +#define dspot08_room_0Set_000700DL_0051E8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_0051E8" static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_0051E8[] = dspot08_room_0Set_000700DL_0051E8; -#define dspot08_room_0Set_000700DL_000DC0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_000DC0" +#define dspot08_room_0Set_000700DL_000DC0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_000DC0" static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_000DC0[] = dspot08_room_0Set_000700DL_000DC0; -#define dspot08_room_0Set_000700DL_007840 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_007840" +#define dspot08_room_0Set_000700DL_007840 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_007840" static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_007840[] = dspot08_room_0Set_000700DL_007840; -#define dspot08_room_0Set_000700DL_001068 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_001068" +#define dspot08_room_0Set_000700DL_001068 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_001068" static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_001068[] = dspot08_room_0Set_000700DL_001068; -#define dspot08_room_0Set_000700DL_0079F0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_0079F0" +#define dspot08_room_0Set_000700DL_0079F0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_0079F0" static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_0079F0[] = dspot08_room_0Set_000700DL_0079F0; -#define dspot08_room_0Set_000700DL_0013B8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_0013B8" +#define dspot08_room_0Set_000700DL_0013B8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_0013B8" static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_0013B8[] = dspot08_room_0Set_000700DL_0013B8; -#define dspot08_room_0Set_000700DL_007BA0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_007BA0" +#define dspot08_room_0Set_000700DL_007BA0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_007BA0" static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_007BA0[] = dspot08_room_0Set_000700DL_007BA0; -#define dspot08_room_0Set_000700DL_005B00 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_005B00" +#define dspot08_room_0Set_000700DL_005B00 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_005B00" static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_005B00[] = dspot08_room_0Set_000700DL_005B00; -#define dspot08_room_0Set_000700DL_007478 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_007478" +#define dspot08_room_0Set_000700DL_007478 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_007478" static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_007478[] = dspot08_room_0Set_000700DL_007478; -#define dspot08_room_0Set_000700DL_001978 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_001978" +#define dspot08_room_0Set_000700DL_001978 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_001978" static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_001978[] = dspot08_room_0Set_000700DL_001978; -#define dspot08_room_0Set_000700DL_002120 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_002120" +#define dspot08_room_0Set_000700DL_002120 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_002120" static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_002120[] = dspot08_room_0Set_000700DL_002120; -#define dspot08_room_0Set_000700DL_002538 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_002538" +#define dspot08_room_0Set_000700DL_002538 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_002538" static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_002538[] = dspot08_room_0Set_000700DL_002538; -#define dspot08_room_0Set_000700DL_006120 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_006120" +#define dspot08_room_0Set_000700DL_006120 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_006120" static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_006120[] = dspot08_room_0Set_000700DL_006120; -#define dspot08_room_0Set_000700DL_0066F8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_0066F8" +#define dspot08_room_0Set_000700DL_0066F8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_0066F8" static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_0066F8[] = dspot08_room_0Set_000700DL_0066F8; -#define dspot08_room_0Set_000700DL_006C48 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_006C48" +#define dspot08_room_0Set_000700DL_006C48 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_006C48" static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_006C48[] = dspot08_room_0Set_000700DL_006C48; -#define dspot08_room_0Set_000700DL_003048 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_003048" +#define dspot08_room_0Set_000700DL_003048 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_003048" static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_003048[] = dspot08_room_0Set_000700DL_003048; -#define dspot08_room_0Set_000700DL_0015F0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_0015F0" +#define dspot08_room_0Set_000700DL_0015F0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_0015F0" static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_0015F0[] = dspot08_room_0Set_000700DL_0015F0; -#define dspot08_room_0Set_000700DL_007D30 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_007D30" +#define dspot08_room_0Set_000700DL_007D30 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_007D30" static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_007D30[] = dspot08_room_0Set_000700DL_007D30; -#define dspot08_room_0Set_000700DL_007FE8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_007FE8" +#define dspot08_room_0Set_000700DL_007FE8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_007FE8" static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_007FE8[] = dspot08_room_0Set_000700DL_007FE8; -#define dspot08_room_0Set_000700DL_0048B0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_0048B0" +#define dspot08_room_0Set_000700DL_0048B0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_0048B0" static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_0048B0[] = dspot08_room_0Set_000700DL_0048B0; -#define dspot08_room_0Set_000700DL_0069C0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_0069C0" +#define dspot08_room_0Set_000700DL_0069C0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_0069C0" static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_0069C0[] = dspot08_room_0Set_000700DL_0069C0; -#define dspot08_room_0Set_000330DL_0051E8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_0051E8" +#define dspot08_room_0Set_000330DL_0051E8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_0051E8" static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_0051E8[] = dspot08_room_0Set_000330DL_0051E8; -#define dspot08_room_0Set_000330DL_000DC0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_000DC0" +#define dspot08_room_0Set_000330DL_000DC0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_000DC0" static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_000DC0[] = dspot08_room_0Set_000330DL_000DC0; -#define dspot08_room_0Set_000330DL_007840 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_007840" +#define dspot08_room_0Set_000330DL_007840 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_007840" static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_007840[] = dspot08_room_0Set_000330DL_007840; -#define dspot08_room_0Set_000330DL_001068 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_001068" +#define dspot08_room_0Set_000330DL_001068 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_001068" static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_001068[] = dspot08_room_0Set_000330DL_001068; -#define dspot08_room_0Set_000330DL_0079F0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_0079F0" +#define dspot08_room_0Set_000330DL_0079F0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_0079F0" static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_0079F0[] = dspot08_room_0Set_000330DL_0079F0; -#define dspot08_room_0Set_000330DL_0013B8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_0013B8" +#define dspot08_room_0Set_000330DL_0013B8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_0013B8" static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_0013B8[] = dspot08_room_0Set_000330DL_0013B8; -#define dspot08_room_0Set_000330DL_007BA0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_007BA0" +#define dspot08_room_0Set_000330DL_007BA0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_007BA0" static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_007BA0[] = dspot08_room_0Set_000330DL_007BA0; -#define dspot08_room_0Set_000330DL_005B00 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_005B00" +#define dspot08_room_0Set_000330DL_005B00 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_005B00" static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_005B00[] = dspot08_room_0Set_000330DL_005B00; -#define dspot08_room_0Set_000330DL_007478 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_007478" +#define dspot08_room_0Set_000330DL_007478 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_007478" static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_007478[] = dspot08_room_0Set_000330DL_007478; -#define dspot08_room_0Set_000330DL_001978 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_001978" +#define dspot08_room_0Set_000330DL_001978 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_001978" static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_001978[] = dspot08_room_0Set_000330DL_001978; -#define dspot08_room_0Set_000330DL_002120 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_002120" +#define dspot08_room_0Set_000330DL_002120 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_002120" static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_002120[] = dspot08_room_0Set_000330DL_002120; -#define dspot08_room_0Set_000330DL_002538 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_002538" +#define dspot08_room_0Set_000330DL_002538 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_002538" static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_002538[] = dspot08_room_0Set_000330DL_002538; -#define dspot08_room_0Set_000330DL_006120 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_006120" +#define dspot08_room_0Set_000330DL_006120 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_006120" static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_006120[] = dspot08_room_0Set_000330DL_006120; -#define dspot08_room_0Set_000330DL_0066F8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_0066F8" +#define dspot08_room_0Set_000330DL_0066F8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_0066F8" static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_0066F8[] = dspot08_room_0Set_000330DL_0066F8; -#define dspot08_room_0Set_000330DL_006C48 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_006C48" +#define dspot08_room_0Set_000330DL_006C48 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_006C48" static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_006C48[] = dspot08_room_0Set_000330DL_006C48; -#define dspot08_room_0Set_000330DL_003048 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_003048" +#define dspot08_room_0Set_000330DL_003048 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_003048" static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_003048[] = dspot08_room_0Set_000330DL_003048; -#define dspot08_room_0Set_000330DL_0015F0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_0015F0" +#define dspot08_room_0Set_000330DL_0015F0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_0015F0" static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_0015F0[] = dspot08_room_0Set_000330DL_0015F0; -#define dspot08_room_0Set_000330DL_007D30 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_007D30" +#define dspot08_room_0Set_000330DL_007D30 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_007D30" static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_007D30[] = dspot08_room_0Set_000330DL_007D30; -#define dspot08_room_0Set_000330DL_007FE8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_007FE8" +#define dspot08_room_0Set_000330DL_007FE8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_007FE8" static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_007FE8[] = dspot08_room_0Set_000330DL_007FE8; -#define dspot08_room_0Set_000330DL_0048B0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_0048B0" +#define dspot08_room_0Set_000330DL_0048B0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_0048B0" static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_0048B0[] = dspot08_room_0Set_000330DL_0048B0; -#define dspot08_room_0Set_000330DL_0069C0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_0069C0" +#define dspot08_room_0Set_000330DL_0069C0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_0069C0" static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_0069C0[] = dspot08_room_0Set_000330DL_0069C0; -#define dspot08_room_0Set_0008E0DL_0051E8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_0051E8" +#define dspot08_room_0Set_0008E0DL_0051E8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_0051E8" static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_0051E8[] = dspot08_room_0Set_0008E0DL_0051E8; -#define dspot08_room_0Set_0008E0DL_000DC0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_000DC0" +#define dspot08_room_0Set_0008E0DL_000DC0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_000DC0" static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_000DC0[] = dspot08_room_0Set_0008E0DL_000DC0; -#define dspot08_room_0Set_0008E0DL_007840 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_007840" +#define dspot08_room_0Set_0008E0DL_007840 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_007840" static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_007840[] = dspot08_room_0Set_0008E0DL_007840; -#define dspot08_room_0Set_0008E0DL_001068 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_001068" +#define dspot08_room_0Set_0008E0DL_001068 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_001068" static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_001068[] = dspot08_room_0Set_0008E0DL_001068; -#define dspot08_room_0Set_0008E0DL_0079F0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_0079F0" +#define dspot08_room_0Set_0008E0DL_0079F0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_0079F0" static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_0079F0[] = dspot08_room_0Set_0008E0DL_0079F0; -#define dspot08_room_0Set_0008E0DL_0013B8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_0013B8" +#define dspot08_room_0Set_0008E0DL_0013B8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_0013B8" static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_0013B8[] = dspot08_room_0Set_0008E0DL_0013B8; -#define dspot08_room_0Set_0008E0DL_007BA0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_007BA0" +#define dspot08_room_0Set_0008E0DL_007BA0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_007BA0" static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_007BA0[] = dspot08_room_0Set_0008E0DL_007BA0; -#define dspot08_room_0Set_0008E0DL_005B00 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_005B00" +#define dspot08_room_0Set_0008E0DL_005B00 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_005B00" static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_005B00[] = dspot08_room_0Set_0008E0DL_005B00; -#define dspot08_room_0Set_0008E0DL_007478 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_007478" +#define dspot08_room_0Set_0008E0DL_007478 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_007478" static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_007478[] = dspot08_room_0Set_0008E0DL_007478; -#define dspot08_room_0Set_0008E0DL_001978 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_001978" +#define dspot08_room_0Set_0008E0DL_001978 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_001978" static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_001978[] = dspot08_room_0Set_0008E0DL_001978; -#define dspot08_room_0Set_0008E0DL_002120 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_002120" +#define dspot08_room_0Set_0008E0DL_002120 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_002120" static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_002120[] = dspot08_room_0Set_0008E0DL_002120; -#define dspot08_room_0Set_0008E0DL_002538 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_002538" +#define dspot08_room_0Set_0008E0DL_002538 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_002538" static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_002538[] = dspot08_room_0Set_0008E0DL_002538; -#define dspot08_room_0Set_0008E0DL_006120 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_006120" +#define dspot08_room_0Set_0008E0DL_006120 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_006120" static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_006120[] = dspot08_room_0Set_0008E0DL_006120; -#define dspot08_room_0Set_0008E0DL_0066F8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_0066F8" +#define dspot08_room_0Set_0008E0DL_0066F8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_0066F8" static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_0066F8[] = dspot08_room_0Set_0008E0DL_0066F8; -#define dspot08_room_0Set_0008E0DL_006C48 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_006C48" +#define dspot08_room_0Set_0008E0DL_006C48 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_006C48" static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_006C48[] = dspot08_room_0Set_0008E0DL_006C48; -#define dspot08_room_0Set_0008E0DL_003048 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_003048" +#define dspot08_room_0Set_0008E0DL_003048 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_003048" static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_003048[] = dspot08_room_0Set_0008E0DL_003048; -#define dspot08_room_0Set_0008E0DL_0015F0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_0015F0" +#define dspot08_room_0Set_0008E0DL_0015F0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_0015F0" static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_0015F0[] = dspot08_room_0Set_0008E0DL_0015F0; -#define dspot08_room_0Set_0008E0DL_007D30 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_007D30" +#define dspot08_room_0Set_0008E0DL_007D30 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_007D30" static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_007D30[] = dspot08_room_0Set_0008E0DL_007D30; -#define dspot08_room_0Set_0008E0DL_007FE8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_007FE8" +#define dspot08_room_0Set_0008E0DL_007FE8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_007FE8" static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_007FE8[] = dspot08_room_0Set_0008E0DL_007FE8; -#define dspot08_room_0Set_0008E0DL_0048B0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_0048B0" +#define dspot08_room_0Set_0008E0DL_0048B0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_0048B0" static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_0048B0[] = dspot08_room_0Set_0008E0DL_0048B0; -#define dspot08_room_0Set_0008E0DL_0069C0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_0069C0" +#define dspot08_room_0Set_0008E0DL_0069C0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_0069C0" static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_0069C0[] = dspot08_room_0Set_0008E0DL_0069C0; -#define dspot08_room_0Set_0009A0DL_0051E8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_0051E8" +#define dspot08_room_0Set_0009A0DL_0051E8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_0051E8" static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_0051E8[] = dspot08_room_0Set_0009A0DL_0051E8; -#define dspot08_room_0Set_0009A0DL_000DC0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_000DC0" +#define dspot08_room_0Set_0009A0DL_000DC0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_000DC0" static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_000DC0[] = dspot08_room_0Set_0009A0DL_000DC0; -#define dspot08_room_0Set_0009A0DL_007840 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_007840" +#define dspot08_room_0Set_0009A0DL_007840 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_007840" static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_007840[] = dspot08_room_0Set_0009A0DL_007840; -#define dspot08_room_0Set_0009A0DL_001068 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_001068" +#define dspot08_room_0Set_0009A0DL_001068 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_001068" static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_001068[] = dspot08_room_0Set_0009A0DL_001068; -#define dspot08_room_0Set_0009A0DL_0079F0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_0079F0" +#define dspot08_room_0Set_0009A0DL_0079F0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_0079F0" static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_0079F0[] = dspot08_room_0Set_0009A0DL_0079F0; -#define dspot08_room_0Set_0009A0DL_0013B8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_0013B8" +#define dspot08_room_0Set_0009A0DL_0013B8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_0013B8" static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_0013B8[] = dspot08_room_0Set_0009A0DL_0013B8; -#define dspot08_room_0Set_0009A0DL_007BA0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_007BA0" +#define dspot08_room_0Set_0009A0DL_007BA0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_007BA0" static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_007BA0[] = dspot08_room_0Set_0009A0DL_007BA0; -#define dspot08_room_0Set_0009A0DL_005B00 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_005B00" +#define dspot08_room_0Set_0009A0DL_005B00 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_005B00" static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_005B00[] = dspot08_room_0Set_0009A0DL_005B00; -#define dspot08_room_0Set_0009A0DL_007478 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_007478" +#define dspot08_room_0Set_0009A0DL_007478 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_007478" static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_007478[] = dspot08_room_0Set_0009A0DL_007478; -#define dspot08_room_0Set_0009A0DL_001978 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_001978" +#define dspot08_room_0Set_0009A0DL_001978 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_001978" static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_001978[] = dspot08_room_0Set_0009A0DL_001978; -#define dspot08_room_0Set_0009A0DL_002120 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_002120" +#define dspot08_room_0Set_0009A0DL_002120 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_002120" static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_002120[] = dspot08_room_0Set_0009A0DL_002120; -#define dspot08_room_0Set_0009A0DL_002538 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_002538" +#define dspot08_room_0Set_0009A0DL_002538 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_002538" static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_002538[] = dspot08_room_0Set_0009A0DL_002538; -#define dspot08_room_0Set_0009A0DL_006120 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_006120" +#define dspot08_room_0Set_0009A0DL_006120 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_006120" static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_006120[] = dspot08_room_0Set_0009A0DL_006120; -#define dspot08_room_0Set_0009A0DL_0066F8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_0066F8" +#define dspot08_room_0Set_0009A0DL_0066F8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_0066F8" static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_0066F8[] = dspot08_room_0Set_0009A0DL_0066F8; -#define dspot08_room_0Set_0009A0DL_006C48 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_006C48" +#define dspot08_room_0Set_0009A0DL_006C48 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_006C48" static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_006C48[] = dspot08_room_0Set_0009A0DL_006C48; -#define dspot08_room_0Set_0009A0DL_003048 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_003048" +#define dspot08_room_0Set_0009A0DL_003048 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_003048" static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_003048[] = dspot08_room_0Set_0009A0DL_003048; -#define dspot08_room_0Set_0009A0DL_0015F0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_0015F0" +#define dspot08_room_0Set_0009A0DL_0015F0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_0015F0" static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_0015F0[] = dspot08_room_0Set_0009A0DL_0015F0; -#define dspot08_room_0Set_0009A0DL_007D30 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_007D30" +#define dspot08_room_0Set_0009A0DL_007D30 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_007D30" static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_007D30[] = dspot08_room_0Set_0009A0DL_007D30; -#define dspot08_room_0Set_0009A0DL_007FE8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_007FE8" +#define dspot08_room_0Set_0009A0DL_007FE8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_007FE8" static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_007FE8[] = dspot08_room_0Set_0009A0DL_007FE8; -#define dspot08_room_0Set_0009A0DL_0048B0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_0048B0" +#define dspot08_room_0Set_0009A0DL_0048B0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_0048B0" static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_0048B0[] = dspot08_room_0Set_0009A0DL_0048B0; -#define dspot08_room_0Set_0009A0DL_0069C0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_0069C0" +#define dspot08_room_0Set_0009A0DL_0069C0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_0069C0" static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_0069C0[] = dspot08_room_0Set_0009A0DL_0069C0; -#define dspot08_room_0Set_000AD0DL_0051E8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_0051E8" +#define dspot08_room_0Set_000AD0DL_0051E8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_0051E8" static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_0051E8[] = dspot08_room_0Set_000AD0DL_0051E8; -#define dspot08_room_0Set_000AD0DL_000DC0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_000DC0" +#define dspot08_room_0Set_000AD0DL_000DC0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_000DC0" static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_000DC0[] = dspot08_room_0Set_000AD0DL_000DC0; -#define dspot08_room_0Set_000AD0DL_007840 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_007840" +#define dspot08_room_0Set_000AD0DL_007840 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_007840" static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_007840[] = dspot08_room_0Set_000AD0DL_007840; -#define dspot08_room_0Set_000AD0DL_001068 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_001068" +#define dspot08_room_0Set_000AD0DL_001068 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_001068" static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_001068[] = dspot08_room_0Set_000AD0DL_001068; -#define dspot08_room_0Set_000AD0DL_0079F0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_0079F0" +#define dspot08_room_0Set_000AD0DL_0079F0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_0079F0" static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_0079F0[] = dspot08_room_0Set_000AD0DL_0079F0; -#define dspot08_room_0Set_000AD0DL_0013B8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_0013B8" +#define dspot08_room_0Set_000AD0DL_0013B8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_0013B8" static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_0013B8[] = dspot08_room_0Set_000AD0DL_0013B8; -#define dspot08_room_0Set_000AD0DL_007BA0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_007BA0" +#define dspot08_room_0Set_000AD0DL_007BA0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_007BA0" static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_007BA0[] = dspot08_room_0Set_000AD0DL_007BA0; -#define dspot08_room_0Set_000AD0DL_005B00 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_005B00" +#define dspot08_room_0Set_000AD0DL_005B00 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_005B00" static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_005B00[] = dspot08_room_0Set_000AD0DL_005B00; -#define dspot08_room_0Set_000AD0DL_007478 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_007478" +#define dspot08_room_0Set_000AD0DL_007478 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_007478" static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_007478[] = dspot08_room_0Set_000AD0DL_007478; -#define dspot08_room_0Set_000AD0DL_001978 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_001978" +#define dspot08_room_0Set_000AD0DL_001978 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_001978" static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_001978[] = dspot08_room_0Set_000AD0DL_001978; -#define dspot08_room_0Set_000AD0DL_002120 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_002120" +#define dspot08_room_0Set_000AD0DL_002120 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_002120" static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_002120[] = dspot08_room_0Set_000AD0DL_002120; -#define dspot08_room_0Set_000AD0DL_002538 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_002538" +#define dspot08_room_0Set_000AD0DL_002538 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_002538" static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_002538[] = dspot08_room_0Set_000AD0DL_002538; -#define dspot08_room_0Set_000AD0DL_006120 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_006120" +#define dspot08_room_0Set_000AD0DL_006120 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_006120" static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_006120[] = dspot08_room_0Set_000AD0DL_006120; -#define dspot08_room_0Set_000AD0DL_0066F8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_0066F8" +#define dspot08_room_0Set_000AD0DL_0066F8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_0066F8" static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_0066F8[] = dspot08_room_0Set_000AD0DL_0066F8; -#define dspot08_room_0Set_000AD0DL_006C48 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_006C48" +#define dspot08_room_0Set_000AD0DL_006C48 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_006C48" static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_006C48[] = dspot08_room_0Set_000AD0DL_006C48; -#define dspot08_room_0Set_000AD0DL_003048 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_003048" +#define dspot08_room_0Set_000AD0DL_003048 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_003048" static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_003048[] = dspot08_room_0Set_000AD0DL_003048; -#define dspot08_room_0Set_000AD0DL_0015F0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_0015F0" +#define dspot08_room_0Set_000AD0DL_0015F0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_0015F0" static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_0015F0[] = dspot08_room_0Set_000AD0DL_0015F0; -#define dspot08_room_0Set_000AD0DL_007D30 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_007D30" +#define dspot08_room_0Set_000AD0DL_007D30 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_007D30" static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_007D30[] = dspot08_room_0Set_000AD0DL_007D30; -#define dspot08_room_0Set_000AD0DL_007FE8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_007FE8" +#define dspot08_room_0Set_000AD0DL_007FE8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_007FE8" static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_007FE8[] = dspot08_room_0Set_000AD0DL_007FE8; -#define dspot08_room_0Set_000AD0DL_0048B0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_0048B0" +#define dspot08_room_0Set_000AD0DL_0048B0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_0048B0" static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_0048B0[] = dspot08_room_0Set_000AD0DL_0048B0; -#define dspot08_room_0Set_000AD0DL_0069C0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_0069C0" +#define dspot08_room_0Set_000AD0DL_0069C0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_0069C0" static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_0069C0[] = dspot08_room_0Set_000AD0DL_0069C0; diff --git a/soh/assets/scenes/overworld/spot08/spot08_scene.h b/soh/assets/scenes/overworld/spot08/spot08_scene.h index 76f13d7b8..b8667ff4b 100644 --- a/soh/assets/scenes/overworld/spot08/spot08_scene.h +++ b/soh/assets/scenes/overworld/spot08/spot08_scene.h @@ -3,102 +3,102 @@ #include "align_asset_macro.h" -#define dgZorasFountainIntroCs "__OTR__scenes/nonmq/spot08_scene/gZorasFountainIntroCs" -static const ALIGN_ASSET(2) char gZorasFountainIntroCs[] = dgZorasFountainIntroCs; - -#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneCollisionHeader_002CE0" -static const ALIGN_ASSET(2) char spot08_sceneCollisionHeader_002CE0[] = dspot08_sceneCollisionHeader_002CE0; - -#define dspot08_sceneTex_0081A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_0081A0" -static const ALIGN_ASSET(2) char spot08_sceneTex_0081A0[] = dspot08_sceneTex_0081A0; - -#define dspot08_sceneTLUT_004CC0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTLUT_004CC0" -static const ALIGN_ASSET(2) char spot08_sceneTLUT_004CC0[] = dspot08_sceneTLUT_004CC0; - -#define dspot08_sceneTex_0069A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_0069A0" -static const ALIGN_ASSET(2) char spot08_sceneTex_0069A0[] = dspot08_sceneTex_0069A0; - -#define dspot08_sceneTex_0109A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_0109A0" -static const ALIGN_ASSET(2) char spot08_sceneTex_0109A0[] = dspot08_sceneTex_0109A0; - -#define dspot08_sceneTex_004DA0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_004DA0" +#define dspot08_sceneTex_004DA0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_004DA0" static const ALIGN_ASSET(2) char spot08_sceneTex_004DA0[] = dspot08_sceneTex_004DA0; -#define dspot08_sceneTex_00B9A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_00B9A0" -static const ALIGN_ASSET(2) char spot08_sceneTex_00B9A0[] = dspot08_sceneTex_00B9A0; - -#define dspot08_sceneTLUT_004D38 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTLUT_004D38" -static const ALIGN_ASSET(2) char spot08_sceneTLUT_004D38[] = dspot08_sceneTLUT_004D38; - -#define dspot08_sceneTex_00A9A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_00A9A0" -static const ALIGN_ASSET(2) char spot08_sceneTex_00A9A0[] = dspot08_sceneTex_00A9A0; - -#define dspot08_sceneTex_005DA0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_005DA0" +#define dspot08_sceneTex_005DA0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_005DA0" static const ALIGN_ASSET(2) char spot08_sceneTex_005DA0[] = dspot08_sceneTex_005DA0; -#define dspot08_sceneTex_00D1A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_00D1A0" -static const ALIGN_ASSET(2) char spot08_sceneTex_00D1A0[] = dspot08_sceneTex_00D1A0; - -#define dspot08_sceneTex_00C1A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_00C1A0" -static const ALIGN_ASSET(2) char spot08_sceneTex_00C1A0[] = dspot08_sceneTex_00C1A0; - -#define dspot08_sceneTex_010AA0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_010AA0" -static const ALIGN_ASSET(2) char spot08_sceneTex_010AA0[] = dspot08_sceneTex_010AA0; - -#define dspot08_sceneTex_0061A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_0061A0" +#define dspot08_sceneTex_0061A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_0061A0" static const ALIGN_ASSET(2) char spot08_sceneTex_0061A0[] = dspot08_sceneTex_0061A0; -#define dspot08_sceneTex_010EA0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_010EA0" -static const ALIGN_ASSET(2) char spot08_sceneTex_010EA0[] = dspot08_sceneTex_010EA0; +#define dspot08_sceneTex_0069A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_0069A0" +static const ALIGN_ASSET(2) char spot08_sceneTex_0069A0[] = dspot08_sceneTex_0069A0; -#define dspot08_sceneTex_00B1A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_00B1A0" -static const ALIGN_ASSET(2) char spot08_sceneTex_00B1A0[] = dspot08_sceneTex_00B1A0; - -#define dspot08_sceneTLUT_004D10 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTLUT_004D10" -static const ALIGN_ASSET(2) char spot08_sceneTLUT_004D10[] = dspot08_sceneTLUT_004D10; - -#define dspot08_sceneTex_00F1A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_00F1A0" -static const ALIGN_ASSET(2) char spot08_sceneTex_00F1A0[] = dspot08_sceneTex_00F1A0; - -#define dspot08_sceneTLUT_004D60 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTLUT_004D60" -static const ALIGN_ASSET(2) char spot08_sceneTLUT_004D60[] = dspot08_sceneTLUT_004D60; - -#define dspot08_sceneTex_00A1A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_00A1A0" -static const ALIGN_ASSET(2) char spot08_sceneTex_00A1A0[] = dspot08_sceneTex_00A1A0; - -#define dspot08_sceneTLUT_004CE8 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTLUT_004CE8" -static const ALIGN_ASSET(2) char spot08_sceneTLUT_004CE8[] = dspot08_sceneTLUT_004CE8; - -#define dspot08_sceneTex_00E1A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_00E1A0" -static const ALIGN_ASSET(2) char spot08_sceneTex_00E1A0[] = dspot08_sceneTex_00E1A0; - -#define dspot08_sceneTex_0091A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_0091A0" -static const ALIGN_ASSET(2) char spot08_sceneTex_0091A0[] = dspot08_sceneTex_0091A0; - -#define dspot08_sceneTex_0101A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_0101A0" -static const ALIGN_ASSET(2) char spot08_sceneTex_0101A0[] = dspot08_sceneTex_0101A0; - -#define dspot08_sceneTex_00F9A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_00F9A0" -static const ALIGN_ASSET(2) char spot08_sceneTex_00F9A0[] = dspot08_sceneTex_00F9A0; - -#define dspot08_sceneTLUT_004D80 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTLUT_004D80" -static const ALIGN_ASSET(2) char spot08_sceneTLUT_004D80[] = dspot08_sceneTLUT_004D80; - -#define dspot08_sceneTex_0089A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_0089A0" -static const ALIGN_ASSET(2) char spot08_sceneTex_0089A0[] = dspot08_sceneTex_0089A0; - -#define dspot08_sceneTex_0071A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_0071A0" +#define dspot08_sceneTex_0071A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_0071A0" static const ALIGN_ASSET(2) char spot08_sceneTex_0071A0[] = dspot08_sceneTex_0071A0; -#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneCollisionHeader_002CE0" +#define dspot08_sceneTex_0081A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_0081A0" +static const ALIGN_ASSET(2) char spot08_sceneTex_0081A0[] = dspot08_sceneTex_0081A0; -#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneCollisionHeader_002CE0" +#define dspot08_sceneTex_0089A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_0089A0" +static const ALIGN_ASSET(2) char spot08_sceneTex_0089A0[] = dspot08_sceneTex_0089A0; -#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneCollisionHeader_002CE0" +#define dspot08_sceneTex_0091A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_0091A0" +static const ALIGN_ASSET(2) char spot08_sceneTex_0091A0[] = dspot08_sceneTex_0091A0; -#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneCollisionHeader_002CE0" +#define dspot08_sceneTex_00A1A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_00A1A0" +static const ALIGN_ASSET(2) char spot08_sceneTex_00A1A0[] = dspot08_sceneTex_00A1A0; -#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneCollisionHeader_002CE0" +#define dspot08_sceneTex_00A9A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_00A9A0" +static const ALIGN_ASSET(2) char spot08_sceneTex_00A9A0[] = dspot08_sceneTex_00A9A0; + +#define dspot08_sceneTex_00B1A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_00B1A0" +static const ALIGN_ASSET(2) char spot08_sceneTex_00B1A0[] = dspot08_sceneTex_00B1A0; + +#define dspot08_sceneTex_00B9A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_00B9A0" +static const ALIGN_ASSET(2) char spot08_sceneTex_00B9A0[] = dspot08_sceneTex_00B9A0; + +#define dspot08_sceneTex_00C1A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_00C1A0" +static const ALIGN_ASSET(2) char spot08_sceneTex_00C1A0[] = dspot08_sceneTex_00C1A0; + +#define dspot08_sceneTex_00D1A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_00D1A0" +static const ALIGN_ASSET(2) char spot08_sceneTex_00D1A0[] = dspot08_sceneTex_00D1A0; + +#define dspot08_sceneTex_00E1A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_00E1A0" +static const ALIGN_ASSET(2) char spot08_sceneTex_00E1A0[] = dspot08_sceneTex_00E1A0; + +#define dspot08_sceneTex_00F1A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_00F1A0" +static const ALIGN_ASSET(2) char spot08_sceneTex_00F1A0[] = dspot08_sceneTex_00F1A0; + +#define dspot08_sceneTex_00F9A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_00F9A0" +static const ALIGN_ASSET(2) char spot08_sceneTex_00F9A0[] = dspot08_sceneTex_00F9A0; + +#define dspot08_sceneTex_0101A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_0101A0" +static const ALIGN_ASSET(2) char spot08_sceneTex_0101A0[] = dspot08_sceneTex_0101A0; + +#define dspot08_sceneTex_0109A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_0109A0" +static const ALIGN_ASSET(2) char spot08_sceneTex_0109A0[] = dspot08_sceneTex_0109A0; + +#define dspot08_sceneTex_010AA0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_010AA0" +static const ALIGN_ASSET(2) char spot08_sceneTex_010AA0[] = dspot08_sceneTex_010AA0; + +#define dspot08_sceneTex_010EA0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_010EA0" +static const ALIGN_ASSET(2) char spot08_sceneTex_010EA0[] = dspot08_sceneTex_010EA0; + +#define dspot08_sceneTLUT_004CC0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTLUT_004CC0" +static const ALIGN_ASSET(2) char spot08_sceneTLUT_004CC0[] = dspot08_sceneTLUT_004CC0; + +#define dspot08_sceneTLUT_004CE8 "__OTR__scenes/shared/spot08_scene/spot08_sceneTLUT_004CE8" +static const ALIGN_ASSET(2) char spot08_sceneTLUT_004CE8[] = dspot08_sceneTLUT_004CE8; + +#define dspot08_sceneTLUT_004D10 "__OTR__scenes/shared/spot08_scene/spot08_sceneTLUT_004D10" +static const ALIGN_ASSET(2) char spot08_sceneTLUT_004D10[] = dspot08_sceneTLUT_004D10; + +#define dspot08_sceneTLUT_004D38 "__OTR__scenes/shared/spot08_scene/spot08_sceneTLUT_004D38" +static const ALIGN_ASSET(2) char spot08_sceneTLUT_004D38[] = dspot08_sceneTLUT_004D38; + +#define dspot08_sceneTLUT_004D60 "__OTR__scenes/shared/spot08_scene/spot08_sceneTLUT_004D60" +static const ALIGN_ASSET(2) char spot08_sceneTLUT_004D60[] = dspot08_sceneTLUT_004D60; + +#define dspot08_sceneTLUT_004D80 "__OTR__scenes/shared/spot08_scene/spot08_sceneTLUT_004D80" +static const ALIGN_ASSET(2) char spot08_sceneTLUT_004D80[] = dspot08_sceneTLUT_004D80; + +#define dgZorasFountainIntroCs "__OTR__scenes/shared/spot08_scene/gZorasFountainIntroCs" +static const ALIGN_ASSET(2) char gZorasFountainIntroCs[] = dgZorasFountainIntroCs; + +#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/shared/spot08_scene/spot08_sceneCollisionHeader_002CE0" +static const ALIGN_ASSET(2) char spot08_sceneCollisionHeader_002CE0[] = dspot08_sceneCollisionHeader_002CE0; + +#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/shared/spot08_scene/spot08_sceneCollisionHeader_002CE0" + +#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/shared/spot08_scene/spot08_sceneCollisionHeader_002CE0" + +#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/shared/spot08_scene/spot08_sceneCollisionHeader_002CE0" + +#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/shared/spot08_scene/spot08_sceneCollisionHeader_002CE0" + +#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/shared/spot08_scene/spot08_sceneCollisionHeader_002CE0" #endif // OVERWORLD_SPOT08_SCENE_H diff --git a/soh/assets/scenes/overworld/spot09/spot09_room_0.h b/soh/assets/scenes/overworld/spot09/spot09_room_0.h index 2671659b5..8bfbbe779 100644 --- a/soh/assets/scenes/overworld/spot09/spot09_room_0.h +++ b/soh/assets/scenes/overworld/spot09/spot09_room_0.h @@ -3,490 +3,490 @@ #include "align_asset_macro.h" -#define dgSpot09DL_007108 "__OTR__scenes/nonmq/spot09_scene/gSpot09DL_007108" +#define dgSpot09DL_007108 "__OTR__scenes/shared/spot09_scene/gSpot09DL_007108" static const ALIGN_ASSET(2) char gSpot09DL_007108[] = dgSpot09DL_007108; -#define dgSpot09DL_008780 "__OTR__scenes/nonmq/spot09_scene/gSpot09DL_008780" +#define dgSpot09DL_008780 "__OTR__scenes/shared/spot09_scene/gSpot09DL_008780" static const ALIGN_ASSET(2) char gSpot09DL_008780[] = dgSpot09DL_008780; -#define dspot09_room_0DL_0084C0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_0084C0" +#define dspot09_room_0DL_0084C0 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_0084C0" static const ALIGN_ASSET(2) char spot09_room_0DL_0084C0[] = dspot09_room_0DL_0084C0; -#define dspot09_room_0DL_002158 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_002158" +#define dspot09_room_0DL_002158 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_002158" static const ALIGN_ASSET(2) char spot09_room_0DL_002158[] = dspot09_room_0DL_002158; -#define dspot09_room_0DL_002698 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_002698" +#define dspot09_room_0DL_002698 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_002698" static const ALIGN_ASSET(2) char spot09_room_0DL_002698[] = dspot09_room_0DL_002698; -#define dspot09_room_0DL_008108 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_008108" +#define dspot09_room_0DL_008108 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_008108" static const ALIGN_ASSET(2) char spot09_room_0DL_008108[] = dspot09_room_0DL_008108; -#define dspot09_room_0DL_002A70 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_002A70" +#define dspot09_room_0DL_002A70 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_002A70" static const ALIGN_ASSET(2) char spot09_room_0DL_002A70[] = dspot09_room_0DL_002A70; -#define dspot09_room_0DL_002DA8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_002DA8" +#define dspot09_room_0DL_002DA8 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_002DA8" static const ALIGN_ASSET(2) char spot09_room_0DL_002DA8[] = dspot09_room_0DL_002DA8; -#define dspot09_room_0DL_0030D0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_0030D0" +#define dspot09_room_0DL_0030D0 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_0030D0" static const ALIGN_ASSET(2) char spot09_room_0DL_0030D0[] = dspot09_room_0DL_0030D0; -#define dspot09_room_0DL_001550 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_001550" +#define dspot09_room_0DL_001550 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_001550" static const ALIGN_ASSET(2) char spot09_room_0DL_001550[] = dspot09_room_0DL_001550; -#define dspot09_room_0DL_003308 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_003308" +#define dspot09_room_0DL_003308 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_003308" static const ALIGN_ASSET(2) char spot09_room_0DL_003308[] = dspot09_room_0DL_003308; -#define dspot09_room_0DL_003630 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_003630" +#define dspot09_room_0DL_003630 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_003630" static const ALIGN_ASSET(2) char spot09_room_0DL_003630[] = dspot09_room_0DL_003630; -#define dspot09_room_0DL_0017A0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_0017A0" +#define dspot09_room_0DL_0017A0 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_0017A0" static const ALIGN_ASSET(2) char spot09_room_0DL_0017A0[] = dspot09_room_0DL_0017A0; -#define dspot09_room_0DL_001A40 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_001A40" +#define dspot09_room_0DL_001A40 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_001A40" static const ALIGN_ASSET(2) char spot09_room_0DL_001A40[] = dspot09_room_0DL_001A40; -#define dspot09_room_0DL_006F88 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_006F88" +#define dspot09_room_0DL_006F88 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_006F88" static const ALIGN_ASSET(2) char spot09_room_0DL_006F88[] = dspot09_room_0DL_006F88; -#define dspot09_room_0DL_001E98 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_001E98" +#define dspot09_room_0DL_001E98 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_001E98" static const ALIGN_ASSET(2) char spot09_room_0DL_001E98[] = dspot09_room_0DL_001E98; -#define dspot09_room_0DL_001330 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_001330" +#define dspot09_room_0DL_001330 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_001330" static const ALIGN_ASSET(2) char spot09_room_0DL_001330[] = dspot09_room_0DL_001330; -#define dspot09_room_0DL_007FF8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_007FF8" +#define dspot09_room_0DL_007FF8 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_007FF8" static const ALIGN_ASSET(2) char spot09_room_0DL_007FF8[] = dspot09_room_0DL_007FF8; -#define dspot09_room_0DL_008318 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_008318" +#define dspot09_room_0DL_008318 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_008318" static const ALIGN_ASSET(2) char spot09_room_0DL_008318[] = dspot09_room_0DL_008318; -#define dspot09_room_0DL_005C68 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_005C68" +#define dspot09_room_0DL_005C68 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_005C68" static const ALIGN_ASSET(2) char spot09_room_0DL_005C68[] = dspot09_room_0DL_005C68; -#define dspot09_room_0DL_005E80 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_005E80" +#define dspot09_room_0DL_005E80 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_005E80" static const ALIGN_ASSET(2) char spot09_room_0DL_005E80[] = dspot09_room_0DL_005E80; -#define dspot09_room_0DL_0060C8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_0060C8" +#define dspot09_room_0DL_0060C8 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_0060C8" static const ALIGN_ASSET(2) char spot09_room_0DL_0060C8[] = dspot09_room_0DL_0060C8; -#define dspot09_room_0DL_006360 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_006360" +#define dspot09_room_0DL_006360 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_006360" static const ALIGN_ASSET(2) char spot09_room_0DL_006360[] = dspot09_room_0DL_006360; -#define dspot09_room_0DL_0065C0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_0065C0" +#define dspot09_room_0DL_0065C0 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_0065C0" static const ALIGN_ASSET(2) char spot09_room_0DL_0065C0[] = dspot09_room_0DL_0065C0; -#define dspot09_room_0DL_006888 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_006888" +#define dspot09_room_0DL_006888 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_006888" static const ALIGN_ASSET(2) char spot09_room_0DL_006888[] = dspot09_room_0DL_006888; -#define dspot09_room_0DL_006C40 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_006C40" +#define dspot09_room_0DL_006C40 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_006C40" static const ALIGN_ASSET(2) char spot09_room_0DL_006C40[] = dspot09_room_0DL_006C40; -#define dspot09_room_0DL_007530 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_007530" +#define dspot09_room_0DL_007530 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_007530" static const ALIGN_ASSET(2) char spot09_room_0DL_007530[] = dspot09_room_0DL_007530; -#define dspot09_room_0DL_008698 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_008698" +#define dspot09_room_0DL_008698 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_008698" static const ALIGN_ASSET(2) char spot09_room_0DL_008698[] = dspot09_room_0DL_008698; -#define dspot09_room_0DL_003C98 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_003C98" +#define dspot09_room_0DL_003C98 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_003C98" static const ALIGN_ASSET(2) char spot09_room_0DL_003C98[] = dspot09_room_0DL_003C98; -#define dspot09_room_0DL_004540 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_004540" +#define dspot09_room_0DL_004540 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_004540" static const ALIGN_ASSET(2) char spot09_room_0DL_004540[] = dspot09_room_0DL_004540; -#define dspot09_room_0DL_004C00 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_004C00" +#define dspot09_room_0DL_004C00 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_004C00" static const ALIGN_ASSET(2) char spot09_room_0DL_004C00[] = dspot09_room_0DL_004C00; -#define dspot09_room_0DL_005128 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_005128" +#define dspot09_room_0DL_005128 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_005128" static const ALIGN_ASSET(2) char spot09_room_0DL_005128[] = dspot09_room_0DL_005128; -#define dspot09_room_0DL_005598 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_005598" +#define dspot09_room_0DL_005598 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_005598" static const ALIGN_ASSET(2) char spot09_room_0DL_005598[] = dspot09_room_0DL_005598; -#define dspot09_room_0DL_005A08 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_005A08" +#define dspot09_room_0DL_005A08 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_005A08" static const ALIGN_ASSET(2) char spot09_room_0DL_005A08[] = dspot09_room_0DL_005A08; -#define dspot09_room_0Set_000500DL_0084C0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_0084C0" +#define dspot09_room_0Set_000500DL_0084C0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_0084C0" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_0084C0[] = dspot09_room_0Set_000500DL_0084C0; -#define dspot09_room_0Set_000500DL_002158 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_002158" +#define dspot09_room_0Set_000500DL_002158 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_002158" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_002158[] = dspot09_room_0Set_000500DL_002158; -#define dspot09_room_0Set_000500DL_002698 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_002698" +#define dspot09_room_0Set_000500DL_002698 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_002698" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_002698[] = dspot09_room_0Set_000500DL_002698; -#define dspot09_room_0Set_000500DL_008108 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_008108" +#define dspot09_room_0Set_000500DL_008108 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_008108" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_008108[] = dspot09_room_0Set_000500DL_008108; -#define dspot09_room_0Set_000500DL_002A70 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_002A70" +#define dspot09_room_0Set_000500DL_002A70 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_002A70" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_002A70[] = dspot09_room_0Set_000500DL_002A70; -#define dspot09_room_0Set_000500DL_002DA8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_002DA8" +#define dspot09_room_0Set_000500DL_002DA8 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_002DA8" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_002DA8[] = dspot09_room_0Set_000500DL_002DA8; -#define dspot09_room_0Set_000500DL_0030D0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_0030D0" +#define dspot09_room_0Set_000500DL_0030D0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_0030D0" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_0030D0[] = dspot09_room_0Set_000500DL_0030D0; -#define dspot09_room_0Set_000500DL_001550 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_001550" +#define dspot09_room_0Set_000500DL_001550 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_001550" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_001550[] = dspot09_room_0Set_000500DL_001550; -#define dspot09_room_0Set_000500DL_003308 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_003308" +#define dspot09_room_0Set_000500DL_003308 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_003308" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_003308[] = dspot09_room_0Set_000500DL_003308; -#define dspot09_room_0Set_000500DL_003630 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_003630" +#define dspot09_room_0Set_000500DL_003630 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_003630" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_003630[] = dspot09_room_0Set_000500DL_003630; -#define dspot09_room_0Set_000500DL_0017A0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_0017A0" +#define dspot09_room_0Set_000500DL_0017A0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_0017A0" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_0017A0[] = dspot09_room_0Set_000500DL_0017A0; -#define dspot09_room_0Set_000500DL_001A40 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_001A40" +#define dspot09_room_0Set_000500DL_001A40 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_001A40" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_001A40[] = dspot09_room_0Set_000500DL_001A40; -#define dspot09_room_0Set_000500DL_006F88 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_006F88" +#define dspot09_room_0Set_000500DL_006F88 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_006F88" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_006F88[] = dspot09_room_0Set_000500DL_006F88; -#define dspot09_room_0Set_000500DL_001E98 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_001E98" +#define dspot09_room_0Set_000500DL_001E98 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_001E98" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_001E98[] = dspot09_room_0Set_000500DL_001E98; -#define dspot09_room_0Set_000500DL_001330 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_001330" +#define dspot09_room_0Set_000500DL_001330 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_001330" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_001330[] = dspot09_room_0Set_000500DL_001330; -#define dspot09_room_0Set_000500DL_007FF8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_007FF8" +#define dspot09_room_0Set_000500DL_007FF8 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_007FF8" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_007FF8[] = dspot09_room_0Set_000500DL_007FF8; -#define dspot09_room_0Set_000500DL_008318 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_008318" +#define dspot09_room_0Set_000500DL_008318 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_008318" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_008318[] = dspot09_room_0Set_000500DL_008318; -#define dspot09_room_0Set_000500DL_005C68 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_005C68" +#define dspot09_room_0Set_000500DL_005C68 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_005C68" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_005C68[] = dspot09_room_0Set_000500DL_005C68; -#define dspot09_room_0Set_000500DL_005E80 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_005E80" +#define dspot09_room_0Set_000500DL_005E80 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_005E80" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_005E80[] = dspot09_room_0Set_000500DL_005E80; -#define dspot09_room_0Set_000500DL_0060C8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_0060C8" +#define dspot09_room_0Set_000500DL_0060C8 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_0060C8" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_0060C8[] = dspot09_room_0Set_000500DL_0060C8; -#define dspot09_room_0Set_000500DL_006360 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_006360" +#define dspot09_room_0Set_000500DL_006360 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_006360" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_006360[] = dspot09_room_0Set_000500DL_006360; -#define dspot09_room_0Set_000500DL_0065C0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_0065C0" +#define dspot09_room_0Set_000500DL_0065C0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_0065C0" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_0065C0[] = dspot09_room_0Set_000500DL_0065C0; -#define dspot09_room_0Set_000500DL_006888 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_006888" +#define dspot09_room_0Set_000500DL_006888 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_006888" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_006888[] = dspot09_room_0Set_000500DL_006888; -#define dspot09_room_0Set_000500DL_006C40 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_006C40" +#define dspot09_room_0Set_000500DL_006C40 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_006C40" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_006C40[] = dspot09_room_0Set_000500DL_006C40; -#define dspot09_room_0Set_000500DL_007530 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_007530" +#define dspot09_room_0Set_000500DL_007530 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_007530" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_007530[] = dspot09_room_0Set_000500DL_007530; -#define dspot09_room_0Set_000500DL_008698 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_008698" +#define dspot09_room_0Set_000500DL_008698 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_008698" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_008698[] = dspot09_room_0Set_000500DL_008698; -#define dspot09_room_0Set_000500DL_003C98 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_003C98" +#define dspot09_room_0Set_000500DL_003C98 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_003C98" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_003C98[] = dspot09_room_0Set_000500DL_003C98; -#define dspot09_room_0Set_000500DL_004540 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_004540" +#define dspot09_room_0Set_000500DL_004540 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_004540" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_004540[] = dspot09_room_0Set_000500DL_004540; -#define dspot09_room_0Set_000500DL_004C00 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_004C00" +#define dspot09_room_0Set_000500DL_004C00 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_004C00" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_004C00[] = dspot09_room_0Set_000500DL_004C00; -#define dspot09_room_0Set_000500DL_005128 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_005128" +#define dspot09_room_0Set_000500DL_005128 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_005128" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_005128[] = dspot09_room_0Set_000500DL_005128; -#define dspot09_room_0Set_000500DL_005598 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_005598" +#define dspot09_room_0Set_000500DL_005598 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_005598" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_005598[] = dspot09_room_0Set_000500DL_005598; -#define dspot09_room_0Set_000500DL_005A08 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_005A08" +#define dspot09_room_0Set_000500DL_005A08 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_005A08" static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_005A08[] = dspot09_room_0Set_000500DL_005A08; -#define dspot09_room_0Set_000890DL_0084C0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_0084C0" +#define dspot09_room_0Set_000890DL_0084C0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_0084C0" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_0084C0[] = dspot09_room_0Set_000890DL_0084C0; -#define dspot09_room_0Set_000890DL_002158 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_002158" +#define dspot09_room_0Set_000890DL_002158 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_002158" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_002158[] = dspot09_room_0Set_000890DL_002158; -#define dspot09_room_0Set_000890DL_002698 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_002698" +#define dspot09_room_0Set_000890DL_002698 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_002698" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_002698[] = dspot09_room_0Set_000890DL_002698; -#define dspot09_room_0Set_000890DL_008108 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_008108" +#define dspot09_room_0Set_000890DL_008108 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_008108" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_008108[] = dspot09_room_0Set_000890DL_008108; -#define dspot09_room_0Set_000890DL_002A70 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_002A70" +#define dspot09_room_0Set_000890DL_002A70 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_002A70" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_002A70[] = dspot09_room_0Set_000890DL_002A70; -#define dspot09_room_0Set_000890DL_002DA8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_002DA8" +#define dspot09_room_0Set_000890DL_002DA8 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_002DA8" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_002DA8[] = dspot09_room_0Set_000890DL_002DA8; -#define dspot09_room_0Set_000890DL_0030D0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_0030D0" +#define dspot09_room_0Set_000890DL_0030D0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_0030D0" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_0030D0[] = dspot09_room_0Set_000890DL_0030D0; -#define dspot09_room_0Set_000890DL_001550 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_001550" +#define dspot09_room_0Set_000890DL_001550 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_001550" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_001550[] = dspot09_room_0Set_000890DL_001550; -#define dspot09_room_0Set_000890DL_003308 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_003308" +#define dspot09_room_0Set_000890DL_003308 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_003308" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_003308[] = dspot09_room_0Set_000890DL_003308; -#define dspot09_room_0Set_000890DL_003630 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_003630" +#define dspot09_room_0Set_000890DL_003630 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_003630" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_003630[] = dspot09_room_0Set_000890DL_003630; -#define dspot09_room_0Set_000890DL_0017A0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_0017A0" +#define dspot09_room_0Set_000890DL_0017A0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_0017A0" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_0017A0[] = dspot09_room_0Set_000890DL_0017A0; -#define dspot09_room_0Set_000890DL_001A40 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_001A40" +#define dspot09_room_0Set_000890DL_001A40 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_001A40" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_001A40[] = dspot09_room_0Set_000890DL_001A40; -#define dspot09_room_0Set_000890DL_006F88 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_006F88" +#define dspot09_room_0Set_000890DL_006F88 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_006F88" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_006F88[] = dspot09_room_0Set_000890DL_006F88; -#define dspot09_room_0Set_000890DL_001E98 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_001E98" +#define dspot09_room_0Set_000890DL_001E98 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_001E98" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_001E98[] = dspot09_room_0Set_000890DL_001E98; -#define dspot09_room_0Set_000890DL_001330 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_001330" +#define dspot09_room_0Set_000890DL_001330 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_001330" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_001330[] = dspot09_room_0Set_000890DL_001330; -#define dspot09_room_0Set_000890DL_007FF8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_007FF8" +#define dspot09_room_0Set_000890DL_007FF8 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_007FF8" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_007FF8[] = dspot09_room_0Set_000890DL_007FF8; -#define dspot09_room_0Set_000890DL_008318 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_008318" +#define dspot09_room_0Set_000890DL_008318 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_008318" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_008318[] = dspot09_room_0Set_000890DL_008318; -#define dspot09_room_0Set_000890DL_005C68 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_005C68" +#define dspot09_room_0Set_000890DL_005C68 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_005C68" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_005C68[] = dspot09_room_0Set_000890DL_005C68; -#define dspot09_room_0Set_000890DL_005E80 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_005E80" +#define dspot09_room_0Set_000890DL_005E80 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_005E80" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_005E80[] = dspot09_room_0Set_000890DL_005E80; -#define dspot09_room_0Set_000890DL_0060C8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_0060C8" +#define dspot09_room_0Set_000890DL_0060C8 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_0060C8" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_0060C8[] = dspot09_room_0Set_000890DL_0060C8; -#define dspot09_room_0Set_000890DL_006360 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_006360" +#define dspot09_room_0Set_000890DL_006360 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_006360" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_006360[] = dspot09_room_0Set_000890DL_006360; -#define dspot09_room_0Set_000890DL_0065C0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_0065C0" +#define dspot09_room_0Set_000890DL_0065C0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_0065C0" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_0065C0[] = dspot09_room_0Set_000890DL_0065C0; -#define dspot09_room_0Set_000890DL_006888 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_006888" +#define dspot09_room_0Set_000890DL_006888 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_006888" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_006888[] = dspot09_room_0Set_000890DL_006888; -#define dspot09_room_0Set_000890DL_006C40 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_006C40" +#define dspot09_room_0Set_000890DL_006C40 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_006C40" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_006C40[] = dspot09_room_0Set_000890DL_006C40; -#define dspot09_room_0Set_000890DL_007530 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_007530" +#define dspot09_room_0Set_000890DL_007530 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_007530" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_007530[] = dspot09_room_0Set_000890DL_007530; -#define dspot09_room_0Set_000890DL_008698 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_008698" +#define dspot09_room_0Set_000890DL_008698 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_008698" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_008698[] = dspot09_room_0Set_000890DL_008698; -#define dspot09_room_0Set_000890DL_003C98 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_003C98" +#define dspot09_room_0Set_000890DL_003C98 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_003C98" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_003C98[] = dspot09_room_0Set_000890DL_003C98; -#define dspot09_room_0Set_000890DL_004540 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_004540" +#define dspot09_room_0Set_000890DL_004540 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_004540" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_004540[] = dspot09_room_0Set_000890DL_004540; -#define dspot09_room_0Set_000890DL_004C00 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_004C00" +#define dspot09_room_0Set_000890DL_004C00 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_004C00" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_004C00[] = dspot09_room_0Set_000890DL_004C00; -#define dspot09_room_0Set_000890DL_005128 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_005128" +#define dspot09_room_0Set_000890DL_005128 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_005128" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_005128[] = dspot09_room_0Set_000890DL_005128; -#define dspot09_room_0Set_000890DL_005598 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_005598" +#define dspot09_room_0Set_000890DL_005598 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_005598" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_005598[] = dspot09_room_0Set_000890DL_005598; -#define dspot09_room_0Set_000890DL_005A08 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_005A08" +#define dspot09_room_0Set_000890DL_005A08 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_005A08" static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_005A08[] = dspot09_room_0Set_000890DL_005A08; -#define dspot09_room_0Set_000960DL_0084C0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_0084C0" +#define dspot09_room_0Set_000960DL_0084C0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_0084C0" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_0084C0[] = dspot09_room_0Set_000960DL_0084C0; -#define dspot09_room_0Set_000960DL_002158 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_002158" +#define dspot09_room_0Set_000960DL_002158 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_002158" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_002158[] = dspot09_room_0Set_000960DL_002158; -#define dspot09_room_0Set_000960DL_002698 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_002698" +#define dspot09_room_0Set_000960DL_002698 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_002698" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_002698[] = dspot09_room_0Set_000960DL_002698; -#define dspot09_room_0Set_000960DL_008108 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_008108" +#define dspot09_room_0Set_000960DL_008108 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_008108" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_008108[] = dspot09_room_0Set_000960DL_008108; -#define dspot09_room_0Set_000960DL_002A70 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_002A70" +#define dspot09_room_0Set_000960DL_002A70 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_002A70" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_002A70[] = dspot09_room_0Set_000960DL_002A70; -#define dspot09_room_0Set_000960DL_002DA8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_002DA8" +#define dspot09_room_0Set_000960DL_002DA8 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_002DA8" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_002DA8[] = dspot09_room_0Set_000960DL_002DA8; -#define dspot09_room_0Set_000960DL_0030D0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_0030D0" +#define dspot09_room_0Set_000960DL_0030D0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_0030D0" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_0030D0[] = dspot09_room_0Set_000960DL_0030D0; -#define dspot09_room_0Set_000960DL_001550 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_001550" +#define dspot09_room_0Set_000960DL_001550 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_001550" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_001550[] = dspot09_room_0Set_000960DL_001550; -#define dspot09_room_0Set_000960DL_003308 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_003308" +#define dspot09_room_0Set_000960DL_003308 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_003308" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_003308[] = dspot09_room_0Set_000960DL_003308; -#define dspot09_room_0Set_000960DL_003630 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_003630" +#define dspot09_room_0Set_000960DL_003630 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_003630" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_003630[] = dspot09_room_0Set_000960DL_003630; -#define dspot09_room_0Set_000960DL_0017A0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_0017A0" +#define dspot09_room_0Set_000960DL_0017A0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_0017A0" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_0017A0[] = dspot09_room_0Set_000960DL_0017A0; -#define dspot09_room_0Set_000960DL_001A40 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_001A40" +#define dspot09_room_0Set_000960DL_001A40 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_001A40" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_001A40[] = dspot09_room_0Set_000960DL_001A40; -#define dspot09_room_0Set_000960DL_006F88 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_006F88" +#define dspot09_room_0Set_000960DL_006F88 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_006F88" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_006F88[] = dspot09_room_0Set_000960DL_006F88; -#define dspot09_room_0Set_000960DL_001E98 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_001E98" +#define dspot09_room_0Set_000960DL_001E98 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_001E98" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_001E98[] = dspot09_room_0Set_000960DL_001E98; -#define dspot09_room_0Set_000960DL_001330 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_001330" +#define dspot09_room_0Set_000960DL_001330 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_001330" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_001330[] = dspot09_room_0Set_000960DL_001330; -#define dspot09_room_0Set_000960DL_007FF8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_007FF8" +#define dspot09_room_0Set_000960DL_007FF8 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_007FF8" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_007FF8[] = dspot09_room_0Set_000960DL_007FF8; -#define dspot09_room_0Set_000960DL_008318 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_008318" +#define dspot09_room_0Set_000960DL_008318 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_008318" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_008318[] = dspot09_room_0Set_000960DL_008318; -#define dspot09_room_0Set_000960DL_005C68 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_005C68" +#define dspot09_room_0Set_000960DL_005C68 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_005C68" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_005C68[] = dspot09_room_0Set_000960DL_005C68; -#define dspot09_room_0Set_000960DL_005E80 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_005E80" +#define dspot09_room_0Set_000960DL_005E80 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_005E80" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_005E80[] = dspot09_room_0Set_000960DL_005E80; -#define dspot09_room_0Set_000960DL_0060C8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_0060C8" +#define dspot09_room_0Set_000960DL_0060C8 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_0060C8" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_0060C8[] = dspot09_room_0Set_000960DL_0060C8; -#define dspot09_room_0Set_000960DL_006360 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_006360" +#define dspot09_room_0Set_000960DL_006360 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_006360" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_006360[] = dspot09_room_0Set_000960DL_006360; -#define dspot09_room_0Set_000960DL_0065C0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_0065C0" +#define dspot09_room_0Set_000960DL_0065C0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_0065C0" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_0065C0[] = dspot09_room_0Set_000960DL_0065C0; -#define dspot09_room_0Set_000960DL_006888 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_006888" +#define dspot09_room_0Set_000960DL_006888 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_006888" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_006888[] = dspot09_room_0Set_000960DL_006888; -#define dspot09_room_0Set_000960DL_006C40 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_006C40" +#define dspot09_room_0Set_000960DL_006C40 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_006C40" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_006C40[] = dspot09_room_0Set_000960DL_006C40; -#define dspot09_room_0Set_000960DL_007530 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_007530" +#define dspot09_room_0Set_000960DL_007530 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_007530" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_007530[] = dspot09_room_0Set_000960DL_007530; -#define dspot09_room_0Set_000960DL_008698 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_008698" +#define dspot09_room_0Set_000960DL_008698 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_008698" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_008698[] = dspot09_room_0Set_000960DL_008698; -#define dspot09_room_0Set_000960DL_003C98 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_003C98" +#define dspot09_room_0Set_000960DL_003C98 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_003C98" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_003C98[] = dspot09_room_0Set_000960DL_003C98; -#define dspot09_room_0Set_000960DL_004540 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_004540" +#define dspot09_room_0Set_000960DL_004540 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_004540" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_004540[] = dspot09_room_0Set_000960DL_004540; -#define dspot09_room_0Set_000960DL_004C00 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_004C00" +#define dspot09_room_0Set_000960DL_004C00 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_004C00" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_004C00[] = dspot09_room_0Set_000960DL_004C00; -#define dspot09_room_0Set_000960DL_005128 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_005128" +#define dspot09_room_0Set_000960DL_005128 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_005128" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_005128[] = dspot09_room_0Set_000960DL_005128; -#define dspot09_room_0Set_000960DL_005598 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_005598" +#define dspot09_room_0Set_000960DL_005598 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_005598" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_005598[] = dspot09_room_0Set_000960DL_005598; -#define dspot09_room_0Set_000960DL_005A08 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_005A08" +#define dspot09_room_0Set_000960DL_005A08 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_005A08" static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_005A08[] = dspot09_room_0Set_000960DL_005A08; -#define dspot09_room_0Set_000A80DL_0084C0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_0084C0" +#define dspot09_room_0Set_000A80DL_0084C0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_0084C0" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_0084C0[] = dspot09_room_0Set_000A80DL_0084C0; -#define dspot09_room_0Set_000A80DL_002158 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_002158" +#define dspot09_room_0Set_000A80DL_002158 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_002158" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_002158[] = dspot09_room_0Set_000A80DL_002158; -#define dspot09_room_0Set_000A80DL_002698 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_002698" +#define dspot09_room_0Set_000A80DL_002698 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_002698" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_002698[] = dspot09_room_0Set_000A80DL_002698; -#define dspot09_room_0Set_000A80DL_008108 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_008108" +#define dspot09_room_0Set_000A80DL_008108 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_008108" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_008108[] = dspot09_room_0Set_000A80DL_008108; -#define dspot09_room_0Set_000A80DL_002A70 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_002A70" +#define dspot09_room_0Set_000A80DL_002A70 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_002A70" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_002A70[] = dspot09_room_0Set_000A80DL_002A70; -#define dspot09_room_0Set_000A80DL_002DA8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_002DA8" +#define dspot09_room_0Set_000A80DL_002DA8 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_002DA8" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_002DA8[] = dspot09_room_0Set_000A80DL_002DA8; -#define dspot09_room_0Set_000A80DL_0030D0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_0030D0" +#define dspot09_room_0Set_000A80DL_0030D0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_0030D0" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_0030D0[] = dspot09_room_0Set_000A80DL_0030D0; -#define dspot09_room_0Set_000A80DL_001550 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_001550" +#define dspot09_room_0Set_000A80DL_001550 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_001550" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_001550[] = dspot09_room_0Set_000A80DL_001550; -#define dspot09_room_0Set_000A80DL_003308 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_003308" +#define dspot09_room_0Set_000A80DL_003308 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_003308" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_003308[] = dspot09_room_0Set_000A80DL_003308; -#define dspot09_room_0Set_000A80DL_003630 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_003630" +#define dspot09_room_0Set_000A80DL_003630 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_003630" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_003630[] = dspot09_room_0Set_000A80DL_003630; -#define dspot09_room_0Set_000A80DL_0017A0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_0017A0" +#define dspot09_room_0Set_000A80DL_0017A0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_0017A0" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_0017A0[] = dspot09_room_0Set_000A80DL_0017A0; -#define dspot09_room_0Set_000A80DL_001A40 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_001A40" +#define dspot09_room_0Set_000A80DL_001A40 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_001A40" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_001A40[] = dspot09_room_0Set_000A80DL_001A40; -#define dspot09_room_0Set_000A80DL_006F88 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_006F88" +#define dspot09_room_0Set_000A80DL_006F88 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_006F88" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_006F88[] = dspot09_room_0Set_000A80DL_006F88; -#define dspot09_room_0Set_000A80DL_001E98 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_001E98" +#define dspot09_room_0Set_000A80DL_001E98 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_001E98" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_001E98[] = dspot09_room_0Set_000A80DL_001E98; -#define dspot09_room_0Set_000A80DL_001330 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_001330" +#define dspot09_room_0Set_000A80DL_001330 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_001330" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_001330[] = dspot09_room_0Set_000A80DL_001330; -#define dspot09_room_0Set_000A80DL_007FF8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_007FF8" +#define dspot09_room_0Set_000A80DL_007FF8 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_007FF8" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_007FF8[] = dspot09_room_0Set_000A80DL_007FF8; -#define dspot09_room_0Set_000A80DL_008318 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_008318" +#define dspot09_room_0Set_000A80DL_008318 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_008318" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_008318[] = dspot09_room_0Set_000A80DL_008318; -#define dspot09_room_0Set_000A80DL_005C68 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_005C68" +#define dspot09_room_0Set_000A80DL_005C68 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_005C68" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_005C68[] = dspot09_room_0Set_000A80DL_005C68; -#define dspot09_room_0Set_000A80DL_005E80 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_005E80" +#define dspot09_room_0Set_000A80DL_005E80 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_005E80" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_005E80[] = dspot09_room_0Set_000A80DL_005E80; -#define dspot09_room_0Set_000A80DL_0060C8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_0060C8" +#define dspot09_room_0Set_000A80DL_0060C8 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_0060C8" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_0060C8[] = dspot09_room_0Set_000A80DL_0060C8; -#define dspot09_room_0Set_000A80DL_006360 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_006360" +#define dspot09_room_0Set_000A80DL_006360 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_006360" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_006360[] = dspot09_room_0Set_000A80DL_006360; -#define dspot09_room_0Set_000A80DL_0065C0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_0065C0" +#define dspot09_room_0Set_000A80DL_0065C0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_0065C0" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_0065C0[] = dspot09_room_0Set_000A80DL_0065C0; -#define dspot09_room_0Set_000A80DL_006888 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_006888" +#define dspot09_room_0Set_000A80DL_006888 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_006888" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_006888[] = dspot09_room_0Set_000A80DL_006888; -#define dspot09_room_0Set_000A80DL_006C40 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_006C40" +#define dspot09_room_0Set_000A80DL_006C40 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_006C40" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_006C40[] = dspot09_room_0Set_000A80DL_006C40; -#define dspot09_room_0Set_000A80DL_007530 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_007530" +#define dspot09_room_0Set_000A80DL_007530 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_007530" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_007530[] = dspot09_room_0Set_000A80DL_007530; -#define dspot09_room_0Set_000A80DL_008698 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_008698" +#define dspot09_room_0Set_000A80DL_008698 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_008698" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_008698[] = dspot09_room_0Set_000A80DL_008698; -#define dspot09_room_0Set_000A80DL_003C98 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_003C98" +#define dspot09_room_0Set_000A80DL_003C98 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_003C98" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_003C98[] = dspot09_room_0Set_000A80DL_003C98; -#define dspot09_room_0Set_000A80DL_004540 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_004540" +#define dspot09_room_0Set_000A80DL_004540 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_004540" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_004540[] = dspot09_room_0Set_000A80DL_004540; -#define dspot09_room_0Set_000A80DL_004C00 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_004C00" +#define dspot09_room_0Set_000A80DL_004C00 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_004C00" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_004C00[] = dspot09_room_0Set_000A80DL_004C00; -#define dspot09_room_0Set_000A80DL_005128 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_005128" +#define dspot09_room_0Set_000A80DL_005128 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_005128" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_005128[] = dspot09_room_0Set_000A80DL_005128; -#define dspot09_room_0Set_000A80DL_005598 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_005598" +#define dspot09_room_0Set_000A80DL_005598 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_005598" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_005598[] = dspot09_room_0Set_000A80DL_005598; -#define dspot09_room_0Set_000A80DL_005A08 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_005A08" +#define dspot09_room_0Set_000A80DL_005A08 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_005A08" static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_005A08[] = dspot09_room_0Set_000A80DL_005A08; diff --git a/soh/assets/scenes/overworld/spot09/spot09_scene.h b/soh/assets/scenes/overworld/spot09/spot09_scene.h index faf5e298a..8b81e3db3 100644 --- a/soh/assets/scenes/overworld/spot09/spot09_scene.h +++ b/soh/assets/scenes/overworld/spot09/spot09_scene.h @@ -3,88 +3,88 @@ #include "align_asset_macro.h" -#define dgGerudoValleyBridgeJumpFieldFortressCs "__OTR__scenes/nonmq/spot09_scene/gGerudoValleyBridgeJumpFieldFortressCs" -static const ALIGN_ASSET(2) char gGerudoValleyBridgeJumpFieldFortressCs[] = dgGerudoValleyBridgeJumpFieldFortressCs; - -#define dgGerudoValleyBridgeJumpFortressToFieldCs "__OTR__scenes/nonmq/spot09_scene/gGerudoValleyBridgeJumpFortressToFieldCs" -static const ALIGN_ASSET(2) char gGerudoValleyBridgeJumpFortressToFieldCs[] = dgGerudoValleyBridgeJumpFortressToFieldCs; - -#define dgGerudoValleyIntroCs "__OTR__scenes/nonmq/spot09_scene/gGerudoValleyIntroCs" -static const ALIGN_ASSET(2) char gGerudoValleyIntroCs[] = dgGerudoValleyIntroCs; - -#define dspot09_sceneCollisionHeader_002128 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneCollisionHeader_002128" -static const ALIGN_ASSET(2) char spot09_sceneCollisionHeader_002128[] = dspot09_sceneCollisionHeader_002128; - -#define dspot09_sceneTex_006D60 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_006D60" -static const ALIGN_ASSET(2) char spot09_sceneTex_006D60[] = dspot09_sceneTex_006D60; - -#define dspot09_sceneTex_009160 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_009160" -static const ALIGN_ASSET(2) char spot09_sceneTex_009160[] = dspot09_sceneTex_009160; - -#define dspot09_sceneTex_00F960 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_00F960" -static const ALIGN_ASSET(2) char spot09_sceneTex_00F960[] = dspot09_sceneTex_00F960; - -#define dspot09_sceneTex_00D160 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_00D160" -static const ALIGN_ASSET(2) char spot09_sceneTex_00D160[] = dspot09_sceneTex_00D160; - -#define dspot09_sceneTex_006C60 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_006C60" -static const ALIGN_ASSET(2) char spot09_sceneTex_006C60[] = dspot09_sceneTex_006C60; - -#define dspot09_sceneTex_007160 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_007160" -static const ALIGN_ASSET(2) char spot09_sceneTex_007160[] = dspot09_sceneTex_007160; - -#define dspot09_sceneTex_00A960 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_00A960" -static const ALIGN_ASSET(2) char spot09_sceneTex_00A960[] = dspot09_sceneTex_00A960; - -#define dspot09_sceneTex_004460 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_004460" -static const ALIGN_ASSET(2) char spot09_sceneTex_004460[] = dspot09_sceneTex_004460; - -#define dspot09_sceneTex_008160 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_008160" -static const ALIGN_ASSET(2) char spot09_sceneTex_008160[] = dspot09_sceneTex_008160; - -#define dspot09_sceneTex_00C160 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_00C160" -static const ALIGN_ASSET(2) char spot09_sceneTex_00C160[] = dspot09_sceneTex_00C160; - -#define dspot09_sceneTex_005C60 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_005C60" -static const ALIGN_ASSET(2) char spot09_sceneTex_005C60[] = dspot09_sceneTex_005C60; - -#define dspot09_sceneTex_006460 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_006460" -static const ALIGN_ASSET(2) char spot09_sceneTex_006460[] = dspot09_sceneTex_006460; - -#define dspot09_sceneTex_00B960 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_00B960" -static const ALIGN_ASSET(2) char spot09_sceneTex_00B960[] = dspot09_sceneTex_00B960; - -#define dspot09_sceneTex_010960 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_010960" -static const ALIGN_ASSET(2) char spot09_sceneTex_010960[] = dspot09_sceneTex_010960; - -#define dspot09_sceneTex_00A160 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_00A160" -static const ALIGN_ASSET(2) char spot09_sceneTex_00A160[] = dspot09_sceneTex_00A160; - -#define dspot09_sceneTex_00E160 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_00E160" -static const ALIGN_ASSET(2) char spot09_sceneTex_00E160[] = dspot09_sceneTex_00E160; - -#define dspot09_sceneTex_00F160 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_00F160" -static const ALIGN_ASSET(2) char spot09_sceneTex_00F160[] = dspot09_sceneTex_00F160; - -#define dspot09_sceneTex_00E960 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_00E960" -static const ALIGN_ASSET(2) char spot09_sceneTex_00E960[] = dspot09_sceneTex_00E960; - -#define dspot09_sceneTex_005460 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_005460" -static const ALIGN_ASSET(2) char spot09_sceneTex_005460[] = dspot09_sceneTex_005460; - -#define dspot09_sceneTLUT_003440 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTLUT_003440" -static const ALIGN_ASSET(2) char spot09_sceneTLUT_003440[] = dspot09_sceneTLUT_003440; - -#define dspot09_sceneTex_003460 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_003460" +#define dspot09_sceneTex_003460 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_003460" static const ALIGN_ASSET(2) char spot09_sceneTex_003460[] = dspot09_sceneTex_003460; -#define dspot09_sceneCollisionHeader_002128 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneCollisionHeader_002128" +#define dspot09_sceneTex_004460 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_004460" +static const ALIGN_ASSET(2) char spot09_sceneTex_004460[] = dspot09_sceneTex_004460; -#define dspot09_sceneCollisionHeader_002128 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneCollisionHeader_002128" +#define dspot09_sceneTex_005460 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_005460" +static const ALIGN_ASSET(2) char spot09_sceneTex_005460[] = dspot09_sceneTex_005460; -#define dspot09_sceneCollisionHeader_002128 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneCollisionHeader_002128" +#define dspot09_sceneTex_005C60 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_005C60" +static const ALIGN_ASSET(2) char spot09_sceneTex_005C60[] = dspot09_sceneTex_005C60; -#define dspot09_sceneCollisionHeader_002128 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneCollisionHeader_002128" +#define dspot09_sceneTex_006460 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_006460" +static const ALIGN_ASSET(2) char spot09_sceneTex_006460[] = dspot09_sceneTex_006460; + +#define dspot09_sceneTex_006C60 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_006C60" +static const ALIGN_ASSET(2) char spot09_sceneTex_006C60[] = dspot09_sceneTex_006C60; + +#define dspot09_sceneTex_006D60 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_006D60" +static const ALIGN_ASSET(2) char spot09_sceneTex_006D60[] = dspot09_sceneTex_006D60; + +#define dspot09_sceneTex_007160 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_007160" +static const ALIGN_ASSET(2) char spot09_sceneTex_007160[] = dspot09_sceneTex_007160; + +#define dspot09_sceneTex_008160 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_008160" +static const ALIGN_ASSET(2) char spot09_sceneTex_008160[] = dspot09_sceneTex_008160; + +#define dspot09_sceneTex_009160 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_009160" +static const ALIGN_ASSET(2) char spot09_sceneTex_009160[] = dspot09_sceneTex_009160; + +#define dspot09_sceneTex_00A160 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_00A160" +static const ALIGN_ASSET(2) char spot09_sceneTex_00A160[] = dspot09_sceneTex_00A160; + +#define dspot09_sceneTex_00A960 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_00A960" +static const ALIGN_ASSET(2) char spot09_sceneTex_00A960[] = dspot09_sceneTex_00A960; + +#define dspot09_sceneTex_00B960 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_00B960" +static const ALIGN_ASSET(2) char spot09_sceneTex_00B960[] = dspot09_sceneTex_00B960; + +#define dspot09_sceneTex_00C160 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_00C160" +static const ALIGN_ASSET(2) char spot09_sceneTex_00C160[] = dspot09_sceneTex_00C160; + +#define dspot09_sceneTex_00D160 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_00D160" +static const ALIGN_ASSET(2) char spot09_sceneTex_00D160[] = dspot09_sceneTex_00D160; + +#define dspot09_sceneTex_00E160 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_00E160" +static const ALIGN_ASSET(2) char spot09_sceneTex_00E160[] = dspot09_sceneTex_00E160; + +#define dspot09_sceneTex_00E960 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_00E960" +static const ALIGN_ASSET(2) char spot09_sceneTex_00E960[] = dspot09_sceneTex_00E960; + +#define dspot09_sceneTex_00F160 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_00F160" +static const ALIGN_ASSET(2) char spot09_sceneTex_00F160[] = dspot09_sceneTex_00F160; + +#define dspot09_sceneTex_00F960 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_00F960" +static const ALIGN_ASSET(2) char spot09_sceneTex_00F960[] = dspot09_sceneTex_00F960; + +#define dspot09_sceneTex_010960 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_010960" +static const ALIGN_ASSET(2) char spot09_sceneTex_010960[] = dspot09_sceneTex_010960; + +#define dspot09_sceneTLUT_003440 "__OTR__scenes/shared/spot09_scene/spot09_sceneTLUT_003440" +static const ALIGN_ASSET(2) char spot09_sceneTLUT_003440[] = dspot09_sceneTLUT_003440; + +#define dgGerudoValleyBridgeJumpFieldFortressCs "__OTR__scenes/shared/spot09_scene/gGerudoValleyBridgeJumpFieldFortressCs" +static const ALIGN_ASSET(2) char gGerudoValleyBridgeJumpFieldFortressCs[] = dgGerudoValleyBridgeJumpFieldFortressCs; + +#define dgGerudoValleyBridgeJumpFortressToFieldCs "__OTR__scenes/shared/spot09_scene/gGerudoValleyBridgeJumpFortressToFieldCs" +static const ALIGN_ASSET(2) char gGerudoValleyBridgeJumpFortressToFieldCs[] = dgGerudoValleyBridgeJumpFortressToFieldCs; + +#define dgGerudoValleyIntroCs "__OTR__scenes/shared/spot09_scene/gGerudoValleyIntroCs" +static const ALIGN_ASSET(2) char gGerudoValleyIntroCs[] = dgGerudoValleyIntroCs; + +#define dspot09_sceneCollisionHeader_002128 "__OTR__scenes/shared/spot09_scene/spot09_sceneCollisionHeader_002128" +static const ALIGN_ASSET(2) char spot09_sceneCollisionHeader_002128[] = dspot09_sceneCollisionHeader_002128; + +#define dspot09_sceneCollisionHeader_002128 "__OTR__scenes/shared/spot09_scene/spot09_sceneCollisionHeader_002128" + +#define dspot09_sceneCollisionHeader_002128 "__OTR__scenes/shared/spot09_scene/spot09_sceneCollisionHeader_002128" + +#define dspot09_sceneCollisionHeader_002128 "__OTR__scenes/shared/spot09_scene/spot09_sceneCollisionHeader_002128" + +#define dspot09_sceneCollisionHeader_002128 "__OTR__scenes/shared/spot09_scene/spot09_sceneCollisionHeader_002128" #endif // OVERWORLD_SPOT09_SCENE_H diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_0.h b/soh/assets/scenes/overworld/spot10/spot10_room_0.h index 7a299efbc..3b5d66354 100644 --- a/soh/assets/scenes/overworld/spot10/spot10_room_0.h +++ b/soh/assets/scenes/overworld/spot10/spot10_room_0.h @@ -3,13 +3,13 @@ #include "align_asset_macro.h" -#define dspot10_room_0DL_0025B0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_0DL_0025B0" +#define dspot10_room_0DL_0025B0 "__OTR__scenes/shared/spot10_scene/spot10_room_0DL_0025B0" static const ALIGN_ASSET(2) char spot10_room_0DL_0025B0[] = dspot10_room_0DL_0025B0; -#define dspot10_room_0Set_0000B0DL_0025B0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_0Set_0000B0DL_0025B0" +#define dspot10_room_0Set_0000B0DL_0025B0 "__OTR__scenes/shared/spot10_scene/spot10_room_0Set_0000B0DL_0025B0" static const ALIGN_ASSET(2) char spot10_room_0Set_0000B0DL_0025B0[] = dspot10_room_0Set_0000B0DL_0025B0; -#define dspot10_room_0Set_000130DL_0025B0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_0Set_000130DL_0025B0" +#define dspot10_room_0Set_000130DL_0025B0 "__OTR__scenes/shared/spot10_scene/spot10_room_0Set_000130DL_0025B0" static const ALIGN_ASSET(2) char spot10_room_0Set_000130DL_0025B0[] = dspot10_room_0Set_000130DL_0025B0; diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_1.h b/soh/assets/scenes/overworld/spot10/spot10_room_1.h index 9f507333f..0fa0c6bb1 100644 --- a/soh/assets/scenes/overworld/spot10/spot10_room_1.h +++ b/soh/assets/scenes/overworld/spot10/spot10_room_1.h @@ -3,49 +3,49 @@ #include "align_asset_macro.h" -#define dspot10_room_1DL_003B48 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1DL_003B48" -static const ALIGN_ASSET(2) char spot10_room_1DL_003B48[] = dspot10_room_1DL_003B48; - -#define dspot10_room_1Tex_003FA0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_003FA0" -static const ALIGN_ASSET(2) char spot10_room_1Tex_003FA0[] = dspot10_room_1Tex_003FA0; - -#define dspot10_room_1Tex_003BA0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_003BA0" +#define dspot10_room_1Tex_003BA0 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_003BA0" static const ALIGN_ASSET(2) char spot10_room_1Tex_003BA0[] = dspot10_room_1Tex_003BA0; -#define dspot10_room_1Tex_005FA0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_005FA0" -static const ALIGN_ASSET(2) char spot10_room_1Tex_005FA0[] = dspot10_room_1Tex_005FA0; +#define dspot10_room_1Tex_003FA0 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_003FA0" +static const ALIGN_ASSET(2) char spot10_room_1Tex_003FA0[] = dspot10_room_1Tex_003FA0; -#define dspot10_room_1Tex_0067A0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_0067A0" -static const ALIGN_ASSET(2) char spot10_room_1Tex_0067A0[] = dspot10_room_1Tex_0067A0; - -#define dspot10_room_1Tex_006FA0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_006FA0" -static const ALIGN_ASSET(2) char spot10_room_1Tex_006FA0[] = dspot10_room_1Tex_006FA0; - -#define dspot10_room_1Tex_004FA0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_004FA0" -static const ALIGN_ASSET(2) char spot10_room_1Tex_004FA0[] = dspot10_room_1Tex_004FA0; - -#define dspot10_room_1Tex_0047A0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_0047A0" +#define dspot10_room_1Tex_0047A0 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_0047A0" static const ALIGN_ASSET(2) char spot10_room_1Tex_0047A0[] = dspot10_room_1Tex_0047A0; -#define dspot10_room_1DL_007C18 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1DL_007C18" -static const ALIGN_ASSET(2) char spot10_room_1DL_007C18[] = dspot10_room_1DL_007C18; +#define dspot10_room_1Tex_004FA0 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_004FA0" +static const ALIGN_ASSET(2) char spot10_room_1Tex_004FA0[] = dspot10_room_1Tex_004FA0; -#define dspot10_room_1Tex_008030 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_008030" -static const ALIGN_ASSET(2) char spot10_room_1Tex_008030[] = dspot10_room_1Tex_008030; +#define dspot10_room_1Tex_005FA0 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_005FA0" +static const ALIGN_ASSET(2) char spot10_room_1Tex_005FA0[] = dspot10_room_1Tex_005FA0; -#define dspot10_room_1Tex_007C30 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_007C30" +#define dspot10_room_1Tex_0067A0 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_0067A0" +static const ALIGN_ASSET(2) char spot10_room_1Tex_0067A0[] = dspot10_room_1Tex_0067A0; + +#define dspot10_room_1Tex_006FA0 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_006FA0" +static const ALIGN_ASSET(2) char spot10_room_1Tex_006FA0[] = dspot10_room_1Tex_006FA0; + +#define dspot10_room_1Tex_007C30 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_007C30" static const ALIGN_ASSET(2) char spot10_room_1Tex_007C30[] = dspot10_room_1Tex_007C30; -#define dspot10_room_1Set_000110DL_003B48 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Set_000110DL_003B48" +#define dspot10_room_1Tex_008030 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_008030" +static const ALIGN_ASSET(2) char spot10_room_1Tex_008030[] = dspot10_room_1Tex_008030; + +#define dspot10_room_1DL_003B48 "__OTR__scenes/shared/spot10_scene/spot10_room_1DL_003B48" +static const ALIGN_ASSET(2) char spot10_room_1DL_003B48[] = dspot10_room_1DL_003B48; + +#define dspot10_room_1DL_007C18 "__OTR__scenes/shared/spot10_scene/spot10_room_1DL_007C18" +static const ALIGN_ASSET(2) char spot10_room_1DL_007C18[] = dspot10_room_1DL_007C18; + +#define dspot10_room_1Set_000110DL_003B48 "__OTR__scenes/shared/spot10_scene/spot10_room_1Set_000110DL_003B48" static const ALIGN_ASSET(2) char spot10_room_1Set_000110DL_003B48[] = dspot10_room_1Set_000110DL_003B48; -#define dspot10_room_1Set_000110DL_007C18 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Set_000110DL_007C18" +#define dspot10_room_1Set_000110DL_007C18 "__OTR__scenes/shared/spot10_scene/spot10_room_1Set_000110DL_007C18" static const ALIGN_ASSET(2) char spot10_room_1Set_000110DL_007C18[] = dspot10_room_1Set_000110DL_007C18; -#define dspot10_room_1Set_0001A0DL_003B48 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Set_0001A0DL_003B48" +#define dspot10_room_1Set_0001A0DL_003B48 "__OTR__scenes/shared/spot10_scene/spot10_room_1Set_0001A0DL_003B48" static const ALIGN_ASSET(2) char spot10_room_1Set_0001A0DL_003B48[] = dspot10_room_1Set_0001A0DL_003B48; -#define dspot10_room_1Set_0001A0DL_007C18 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Set_0001A0DL_007C18" +#define dspot10_room_1Set_0001A0DL_007C18 "__OTR__scenes/shared/spot10_scene/spot10_room_1Set_0001A0DL_007C18" static const ALIGN_ASSET(2) char spot10_room_1Set_0001A0DL_007C18[] = dspot10_room_1Set_0001A0DL_007C18; diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_2.h b/soh/assets/scenes/overworld/spot10/spot10_room_2.h index 3ccc4dd3d..bba64ebd2 100644 --- a/soh/assets/scenes/overworld/spot10/spot10_room_2.h +++ b/soh/assets/scenes/overworld/spot10/spot10_room_2.h @@ -3,22 +3,22 @@ #include "align_asset_macro.h" -#define dspot10_room_2DL_0023B0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_2DL_0023B0" -static const ALIGN_ASSET(2) char spot10_room_2DL_0023B0[] = dspot10_room_2DL_0023B0; - -#define dspot10_room_2Tex_0043E8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_2Tex_0043E8" -static const ALIGN_ASSET(2) char spot10_room_2Tex_0043E8[] = dspot10_room_2Tex_0043E8; - -#define dspot10_room_2Tex_0023E8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_2Tex_0023E8" +#define dspot10_room_2Tex_0023E8 "__OTR__scenes/shared/spot10_scene/spot10_room_2Tex_0023E8" static const ALIGN_ASSET(2) char spot10_room_2Tex_0023E8[] = dspot10_room_2Tex_0023E8; -#define dspot10_room_2Tex_0033E8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_2Tex_0033E8" +#define dspot10_room_2Tex_0033E8 "__OTR__scenes/shared/spot10_scene/spot10_room_2Tex_0033E8" static const ALIGN_ASSET(2) char spot10_room_2Tex_0033E8[] = dspot10_room_2Tex_0033E8; -#define dspot10_room_2Set_000110DL_0023B0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_2Set_000110DL_0023B0" +#define dspot10_room_2Tex_0043E8 "__OTR__scenes/shared/spot10_scene/spot10_room_2Tex_0043E8" +static const ALIGN_ASSET(2) char spot10_room_2Tex_0043E8[] = dspot10_room_2Tex_0043E8; + +#define dspot10_room_2DL_0023B0 "__OTR__scenes/shared/spot10_scene/spot10_room_2DL_0023B0" +static const ALIGN_ASSET(2) char spot10_room_2DL_0023B0[] = dspot10_room_2DL_0023B0; + +#define dspot10_room_2Set_000110DL_0023B0 "__OTR__scenes/shared/spot10_scene/spot10_room_2Set_000110DL_0023B0" static const ALIGN_ASSET(2) char spot10_room_2Set_000110DL_0023B0[] = dspot10_room_2Set_000110DL_0023B0; -#define dspot10_room_2Set_0001F0DL_0023B0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_2Set_0001F0DL_0023B0" +#define dspot10_room_2Set_0001F0DL_0023B0 "__OTR__scenes/shared/spot10_scene/spot10_room_2Set_0001F0DL_0023B0" static const ALIGN_ASSET(2) char spot10_room_2Set_0001F0DL_0023B0[] = dspot10_room_2Set_0001F0DL_0023B0; diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_3.h b/soh/assets/scenes/overworld/spot10/spot10_room_3.h index b21990ad1..0a20d1ed7 100644 --- a/soh/assets/scenes/overworld/spot10/spot10_room_3.h +++ b/soh/assets/scenes/overworld/spot10/spot10_room_3.h @@ -3,34 +3,34 @@ #include "align_asset_macro.h" -#define dspot10_room_3DL_0028C0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3DL_0028C0" -static const ALIGN_ASSET(2) char spot10_room_3DL_0028C0[] = dspot10_room_3DL_0028C0; - -#define dspot10_room_3Tex_0038F8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3Tex_0038F8" -static const ALIGN_ASSET(2) char spot10_room_3Tex_0038F8[] = dspot10_room_3Tex_0038F8; - -#define dspot10_room_3Tex_0028F8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3Tex_0028F8" +#define dspot10_room_3Tex_0028F8 "__OTR__scenes/shared/spot10_scene/spot10_room_3Tex_0028F8" static const ALIGN_ASSET(2) char spot10_room_3Tex_0028F8[] = dspot10_room_3Tex_0028F8; -#define dspot10_room_3Tex_0048F8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3Tex_0048F8" +#define dspot10_room_3Tex_0038F8 "__OTR__scenes/shared/spot10_scene/spot10_room_3Tex_0038F8" +static const ALIGN_ASSET(2) char spot10_room_3Tex_0038F8[] = dspot10_room_3Tex_0038F8; + +#define dspot10_room_3Tex_0048F8 "__OTR__scenes/shared/spot10_scene/spot10_room_3Tex_0048F8" static const ALIGN_ASSET(2) char spot10_room_3Tex_0048F8[] = dspot10_room_3Tex_0048F8; -#define dspot10_room_3DL_005298 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3DL_005298" -static const ALIGN_ASSET(2) char spot10_room_3DL_005298[] = dspot10_room_3DL_005298; - -#define dspot10_room_3Tex_0052A8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3Tex_0052A8" +#define dspot10_room_3Tex_0052A8 "__OTR__scenes/shared/spot10_scene/spot10_room_3Tex_0052A8" static const ALIGN_ASSET(2) char spot10_room_3Tex_0052A8[] = dspot10_room_3Tex_0052A8; -#define dspot10_room_3Set_000150DL_0028C0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3Set_000150DL_0028C0" +#define dspot10_room_3DL_0028C0 "__OTR__scenes/shared/spot10_scene/spot10_room_3DL_0028C0" +static const ALIGN_ASSET(2) char spot10_room_3DL_0028C0[] = dspot10_room_3DL_0028C0; + +#define dspot10_room_3DL_005298 "__OTR__scenes/shared/spot10_scene/spot10_room_3DL_005298" +static const ALIGN_ASSET(2) char spot10_room_3DL_005298[] = dspot10_room_3DL_005298; + +#define dspot10_room_3Set_000150DL_0028C0 "__OTR__scenes/shared/spot10_scene/spot10_room_3Set_000150DL_0028C0" static const ALIGN_ASSET(2) char spot10_room_3Set_000150DL_0028C0[] = dspot10_room_3Set_000150DL_0028C0; -#define dspot10_room_3Set_000150DL_005298 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3Set_000150DL_005298" +#define dspot10_room_3Set_000150DL_005298 "__OTR__scenes/shared/spot10_scene/spot10_room_3Set_000150DL_005298" static const ALIGN_ASSET(2) char spot10_room_3Set_000150DL_005298[] = dspot10_room_3Set_000150DL_005298; -#define dspot10_room_3Set_000210DL_0028C0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3Set_000210DL_0028C0" +#define dspot10_room_3Set_000210DL_0028C0 "__OTR__scenes/shared/spot10_scene/spot10_room_3Set_000210DL_0028C0" static const ALIGN_ASSET(2) char spot10_room_3Set_000210DL_0028C0[] = dspot10_room_3Set_000210DL_0028C0; -#define dspot10_room_3Set_000210DL_005298 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3Set_000210DL_005298" +#define dspot10_room_3Set_000210DL_005298 "__OTR__scenes/shared/spot10_scene/spot10_room_3Set_000210DL_005298" static const ALIGN_ASSET(2) char spot10_room_3Set_000210DL_005298[] = dspot10_room_3Set_000210DL_005298; diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_4.h b/soh/assets/scenes/overworld/spot10/spot10_room_4.h index 75bebd799..b8c7d4d06 100644 --- a/soh/assets/scenes/overworld/spot10/spot10_room_4.h +++ b/soh/assets/scenes/overworld/spot10/spot10_room_4.h @@ -3,13 +3,13 @@ #include "align_asset_macro.h" -#define dspot10_room_4DL_002490 "__OTR__scenes/nonmq/spot10_scene/spot10_room_4DL_002490" +#define dspot10_room_4DL_002490 "__OTR__scenes/shared/spot10_scene/spot10_room_4DL_002490" static const ALIGN_ASSET(2) char spot10_room_4DL_002490[] = dspot10_room_4DL_002490; -#define dspot10_room_4Set_0000B0DL_002490 "__OTR__scenes/nonmq/spot10_scene/spot10_room_4Set_0000B0DL_002490" +#define dspot10_room_4Set_0000B0DL_002490 "__OTR__scenes/shared/spot10_scene/spot10_room_4Set_0000B0DL_002490" static const ALIGN_ASSET(2) char spot10_room_4Set_0000B0DL_002490[] = dspot10_room_4Set_0000B0DL_002490; -#define dspot10_room_4Set_000130DL_002490 "__OTR__scenes/nonmq/spot10_scene/spot10_room_4Set_000130DL_002490" +#define dspot10_room_4Set_000130DL_002490 "__OTR__scenes/shared/spot10_scene/spot10_room_4Set_000130DL_002490" static const ALIGN_ASSET(2) char spot10_room_4Set_000130DL_002490[] = dspot10_room_4Set_000130DL_002490; diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_5.h b/soh/assets/scenes/overworld/spot10/spot10_room_5.h index 8095b0b86..c805d386c 100644 --- a/soh/assets/scenes/overworld/spot10/spot10_room_5.h +++ b/soh/assets/scenes/overworld/spot10/spot10_room_5.h @@ -3,25 +3,25 @@ #include "align_asset_macro.h" -#define dspot10_room_5DL_003780 "__OTR__scenes/nonmq/spot10_scene/spot10_room_5DL_003780" -static const ALIGN_ASSET(2) char spot10_room_5DL_003780[] = dspot10_room_5DL_003780; - -#define dspot10_room_5Tex_0067F0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_5Tex_0067F0" -static const ALIGN_ASSET(2) char spot10_room_5Tex_0067F0[] = dspot10_room_5Tex_0067F0; - -#define dspot10_room_5Tex_0047F0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_5Tex_0047F0" -static const ALIGN_ASSET(2) char spot10_room_5Tex_0047F0[] = dspot10_room_5Tex_0047F0; - -#define dspot10_room_5Tex_0057F0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_5Tex_0057F0" -static const ALIGN_ASSET(2) char spot10_room_5Tex_0057F0[] = dspot10_room_5Tex_0057F0; - -#define dspot10_room_5Tex_0037F0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_5Tex_0037F0" +#define dspot10_room_5Tex_0037F0 "__OTR__scenes/shared/spot10_scene/spot10_room_5Tex_0037F0" static const ALIGN_ASSET(2) char spot10_room_5Tex_0037F0[] = dspot10_room_5Tex_0037F0; -#define dspot10_room_5Set_0000E0DL_003780 "__OTR__scenes/nonmq/spot10_scene/spot10_room_5Set_0000E0DL_003780" +#define dspot10_room_5Tex_0047F0 "__OTR__scenes/shared/spot10_scene/spot10_room_5Tex_0047F0" +static const ALIGN_ASSET(2) char spot10_room_5Tex_0047F0[] = dspot10_room_5Tex_0047F0; + +#define dspot10_room_5Tex_0057F0 "__OTR__scenes/shared/spot10_scene/spot10_room_5Tex_0057F0" +static const ALIGN_ASSET(2) char spot10_room_5Tex_0057F0[] = dspot10_room_5Tex_0057F0; + +#define dspot10_room_5Tex_0067F0 "__OTR__scenes/shared/spot10_scene/spot10_room_5Tex_0067F0" +static const ALIGN_ASSET(2) char spot10_room_5Tex_0067F0[] = dspot10_room_5Tex_0067F0; + +#define dspot10_room_5DL_003780 "__OTR__scenes/shared/spot10_scene/spot10_room_5DL_003780" +static const ALIGN_ASSET(2) char spot10_room_5DL_003780[] = dspot10_room_5DL_003780; + +#define dspot10_room_5Set_0000E0DL_003780 "__OTR__scenes/shared/spot10_scene/spot10_room_5Set_0000E0DL_003780" static const ALIGN_ASSET(2) char spot10_room_5Set_0000E0DL_003780[] = dspot10_room_5Set_0000E0DL_003780; -#define dspot10_room_5Set_000180DL_003780 "__OTR__scenes/nonmq/spot10_scene/spot10_room_5Set_000180DL_003780" +#define dspot10_room_5Set_000180DL_003780 "__OTR__scenes/shared/spot10_scene/spot10_room_5Set_000180DL_003780" static const ALIGN_ASSET(2) char spot10_room_5Set_000180DL_003780[] = dspot10_room_5Set_000180DL_003780; diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_6.h b/soh/assets/scenes/overworld/spot10/spot10_room_6.h index ff6ea589a..4be7b2210 100644 --- a/soh/assets/scenes/overworld/spot10/spot10_room_6.h +++ b/soh/assets/scenes/overworld/spot10/spot10_room_6.h @@ -3,22 +3,22 @@ #include "align_asset_macro.h" -#define dspot10_room_6DL_0022B8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_6DL_0022B8" -static const ALIGN_ASSET(2) char spot10_room_6DL_0022B8[] = dspot10_room_6DL_0022B8; - -#define dspot10_room_6Tex_0022E8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_6Tex_0022E8" +#define dspot10_room_6Tex_0022E8 "__OTR__scenes/shared/spot10_scene/spot10_room_6Tex_0022E8" static const ALIGN_ASSET(2) char spot10_room_6Tex_0022E8[] = dspot10_room_6Tex_0022E8; -#define dspot10_room_6Tex_002AE8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_6Tex_002AE8" +#define dspot10_room_6Tex_002AE8 "__OTR__scenes/shared/spot10_scene/spot10_room_6Tex_002AE8" static const ALIGN_ASSET(2) char spot10_room_6Tex_002AE8[] = dspot10_room_6Tex_002AE8; -#define dspot10_room_6Tex_0032E8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_6Tex_0032E8" +#define dspot10_room_6Tex_0032E8 "__OTR__scenes/shared/spot10_scene/spot10_room_6Tex_0032E8" static const ALIGN_ASSET(2) char spot10_room_6Tex_0032E8[] = dspot10_room_6Tex_0032E8; -#define dspot10_room_6Set_000100DL_0022B8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_6Set_000100DL_0022B8" +#define dspot10_room_6DL_0022B8 "__OTR__scenes/shared/spot10_scene/spot10_room_6DL_0022B8" +static const ALIGN_ASSET(2) char spot10_room_6DL_0022B8[] = dspot10_room_6DL_0022B8; + +#define dspot10_room_6Set_000100DL_0022B8 "__OTR__scenes/shared/spot10_scene/spot10_room_6Set_000100DL_0022B8" static const ALIGN_ASSET(2) char spot10_room_6Set_000100DL_0022B8[] = dspot10_room_6Set_000100DL_0022B8; -#define dspot10_room_6Set_000190DL_0022B8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_6Set_000190DL_0022B8" +#define dspot10_room_6Set_000190DL_0022B8 "__OTR__scenes/shared/spot10_scene/spot10_room_6Set_000190DL_0022B8" static const ALIGN_ASSET(2) char spot10_room_6Set_000190DL_0022B8[] = dspot10_room_6Set_000190DL_0022B8; diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_7.h b/soh/assets/scenes/overworld/spot10/spot10_room_7.h index 1d9bbf375..37b8c7dfd 100644 --- a/soh/assets/scenes/overworld/spot10/spot10_room_7.h +++ b/soh/assets/scenes/overworld/spot10/spot10_room_7.h @@ -3,13 +3,13 @@ #include "align_asset_macro.h" -#define dspot10_room_7DL_002588 "__OTR__scenes/nonmq/spot10_scene/spot10_room_7DL_002588" +#define dspot10_room_7DL_002588 "__OTR__scenes/shared/spot10_scene/spot10_room_7DL_002588" static const ALIGN_ASSET(2) char spot10_room_7DL_002588[] = dspot10_room_7DL_002588; -#define dspot10_room_7Set_0000F0DL_002588 "__OTR__scenes/nonmq/spot10_scene/spot10_room_7Set_0000F0DL_002588" +#define dspot10_room_7Set_0000F0DL_002588 "__OTR__scenes/shared/spot10_scene/spot10_room_7Set_0000F0DL_002588" static const ALIGN_ASSET(2) char spot10_room_7Set_0000F0DL_002588[] = dspot10_room_7Set_0000F0DL_002588; -#define dspot10_room_7Set_0001B0DL_002588 "__OTR__scenes/nonmq/spot10_scene/spot10_room_7Set_0001B0DL_002588" +#define dspot10_room_7Set_0001B0DL_002588 "__OTR__scenes/shared/spot10_scene/spot10_room_7Set_0001B0DL_002588" static const ALIGN_ASSET(2) char spot10_room_7Set_0001B0DL_002588[] = dspot10_room_7Set_0001B0DL_002588; diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_8.h b/soh/assets/scenes/overworld/spot10/spot10_room_8.h index 656132ca2..6b3ecf1fd 100644 --- a/soh/assets/scenes/overworld/spot10/spot10_room_8.h +++ b/soh/assets/scenes/overworld/spot10/spot10_room_8.h @@ -3,13 +3,13 @@ #include "align_asset_macro.h" -#define dspot10_room_8DL_002630 "__OTR__scenes/nonmq/spot10_scene/spot10_room_8DL_002630" +#define dspot10_room_8DL_002630 "__OTR__scenes/shared/spot10_scene/spot10_room_8DL_002630" static const ALIGN_ASSET(2) char spot10_room_8DL_002630[] = dspot10_room_8DL_002630; -#define dspot10_room_8Set_000120DL_002630 "__OTR__scenes/nonmq/spot10_scene/spot10_room_8Set_000120DL_002630" +#define dspot10_room_8Set_000120DL_002630 "__OTR__scenes/shared/spot10_scene/spot10_room_8Set_000120DL_002630" static const ALIGN_ASSET(2) char spot10_room_8Set_000120DL_002630[] = dspot10_room_8Set_000120DL_002630; -#define dspot10_room_8Set_000200DL_002630 "__OTR__scenes/nonmq/spot10_scene/spot10_room_8Set_000200DL_002630" +#define dspot10_room_8Set_000200DL_002630 "__OTR__scenes/shared/spot10_scene/spot10_room_8Set_000200DL_002630" static const ALIGN_ASSET(2) char spot10_room_8Set_000200DL_002630[] = dspot10_room_8Set_000200DL_002630; diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_9.h b/soh/assets/scenes/overworld/spot10/spot10_room_9.h index 5eebcd9e4..77d308b6f 100644 --- a/soh/assets/scenes/overworld/spot10/spot10_room_9.h +++ b/soh/assets/scenes/overworld/spot10/spot10_room_9.h @@ -3,34 +3,34 @@ #include "align_asset_macro.h" -#define dspot10_room_9DL_001EC0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9DL_001EC0" -static const ALIGN_ASSET(2) char spot10_room_9DL_001EC0[] = dspot10_room_9DL_001EC0; - -#define dspot10_room_9Tex_0026F8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9Tex_0026F8" -static const ALIGN_ASSET(2) char spot10_room_9Tex_0026F8[] = dspot10_room_9Tex_0026F8; - -#define dspot10_room_9Tex_001EF8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9Tex_001EF8" +#define dspot10_room_9Tex_001EF8 "__OTR__scenes/shared/spot10_scene/spot10_room_9Tex_001EF8" static const ALIGN_ASSET(2) char spot10_room_9Tex_001EF8[] = dspot10_room_9Tex_001EF8; -#define dspot10_room_9DL_0033C0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9DL_0033C0" -static const ALIGN_ASSET(2) char spot10_room_9DL_0033C0[] = dspot10_room_9DL_0033C0; +#define dspot10_room_9Tex_0026F8 "__OTR__scenes/shared/spot10_scene/spot10_room_9Tex_0026F8" +static const ALIGN_ASSET(2) char spot10_room_9Tex_0026F8[] = dspot10_room_9Tex_0026F8; -#define dspot10_room_9Tex_0037D8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9Tex_0037D8" -static const ALIGN_ASSET(2) char spot10_room_9Tex_0037D8[] = dspot10_room_9Tex_0037D8; - -#define dspot10_room_9Tex_0033D8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9Tex_0033D8" +#define dspot10_room_9Tex_0033D8 "__OTR__scenes/shared/spot10_scene/spot10_room_9Tex_0033D8" static const ALIGN_ASSET(2) char spot10_room_9Tex_0033D8[] = dspot10_room_9Tex_0033D8; -#define dspot10_room_9Set_0000B0DL_001EC0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9Set_0000B0DL_001EC0" +#define dspot10_room_9Tex_0037D8 "__OTR__scenes/shared/spot10_scene/spot10_room_9Tex_0037D8" +static const ALIGN_ASSET(2) char spot10_room_9Tex_0037D8[] = dspot10_room_9Tex_0037D8; + +#define dspot10_room_9DL_001EC0 "__OTR__scenes/shared/spot10_scene/spot10_room_9DL_001EC0" +static const ALIGN_ASSET(2) char spot10_room_9DL_001EC0[] = dspot10_room_9DL_001EC0; + +#define dspot10_room_9DL_0033C0 "__OTR__scenes/shared/spot10_scene/spot10_room_9DL_0033C0" +static const ALIGN_ASSET(2) char spot10_room_9DL_0033C0[] = dspot10_room_9DL_0033C0; + +#define dspot10_room_9Set_0000B0DL_001EC0 "__OTR__scenes/shared/spot10_scene/spot10_room_9Set_0000B0DL_001EC0" static const ALIGN_ASSET(2) char spot10_room_9Set_0000B0DL_001EC0[] = dspot10_room_9Set_0000B0DL_001EC0; -#define dspot10_room_9Set_0000B0DL_0033C0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9Set_0000B0DL_0033C0" +#define dspot10_room_9Set_0000B0DL_0033C0 "__OTR__scenes/shared/spot10_scene/spot10_room_9Set_0000B0DL_0033C0" static const ALIGN_ASSET(2) char spot10_room_9Set_0000B0DL_0033C0[] = dspot10_room_9Set_0000B0DL_0033C0; -#define dspot10_room_9Set_000140DL_001EC0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9Set_000140DL_001EC0" +#define dspot10_room_9Set_000140DL_001EC0 "__OTR__scenes/shared/spot10_scene/spot10_room_9Set_000140DL_001EC0" static const ALIGN_ASSET(2) char spot10_room_9Set_000140DL_001EC0[] = dspot10_room_9Set_000140DL_001EC0; -#define dspot10_room_9Set_000140DL_0033C0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9Set_000140DL_0033C0" +#define dspot10_room_9Set_000140DL_0033C0 "__OTR__scenes/shared/spot10_scene/spot10_room_9Set_000140DL_0033C0" static const ALIGN_ASSET(2) char spot10_room_9Set_000140DL_0033C0[] = dspot10_room_9Set_000140DL_0033C0; diff --git a/soh/assets/scenes/overworld/spot10/spot10_scene.h b/soh/assets/scenes/overworld/spot10/spot10_scene.h index 7b964f396..da24ca800 100644 --- a/soh/assets/scenes/overworld/spot10/spot10_scene.h +++ b/soh/assets/scenes/overworld/spot10/spot10_scene.h @@ -3,36 +3,36 @@ #include "align_asset_macro.h" -#define dspot10_sceneCollisionHeader_00AC98 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneCollisionHeader_00AC98" -static const ALIGN_ASSET(2) char spot10_sceneCollisionHeader_00AC98[] = dspot10_sceneCollisionHeader_00AC98; - -#define dspot10_sceneTex_00FC30 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneTex_00FC30" -static const ALIGN_ASSET(2) char spot10_sceneTex_00FC30[] = dspot10_sceneTex_00FC30; - -#define dspot10_sceneTex_00EA30 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneTex_00EA30" -static const ALIGN_ASSET(2) char spot10_sceneTex_00EA30[] = dspot10_sceneTex_00EA30; - -#define dspot10_sceneTex_00DA30 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneTex_00DA30" -static const ALIGN_ASSET(2) char spot10_sceneTex_00DA30[] = dspot10_sceneTex_00DA30; - -#define dspot10_sceneTex_00F430 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneTex_00F430" -static const ALIGN_ASSET(2) char spot10_sceneTex_00F430[] = dspot10_sceneTex_00F430; - -#define dspot10_sceneTex_00F230 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneTex_00F230" -static const ALIGN_ASSET(2) char spot10_sceneTex_00F230[] = dspot10_sceneTex_00F230; - -#define dspot10_sceneTex_00C230 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneTex_00C230" +#define dspot10_sceneTex_00C230 "__OTR__scenes/shared/spot10_scene/spot10_sceneTex_00C230" static const ALIGN_ASSET(2) char spot10_sceneTex_00C230[] = dspot10_sceneTex_00C230; -#define dspot10_sceneTex_00CA30 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneTex_00CA30" +#define dspot10_sceneTex_00CA30 "__OTR__scenes/shared/spot10_scene/spot10_sceneTex_00CA30" static const ALIGN_ASSET(2) char spot10_sceneTex_00CA30[] = dspot10_sceneTex_00CA30; -#define dspot10_sceneTex_00D230 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneTex_00D230" +#define dspot10_sceneTex_00D230 "__OTR__scenes/shared/spot10_scene/spot10_sceneTex_00D230" static const ALIGN_ASSET(2) char spot10_sceneTex_00D230[] = dspot10_sceneTex_00D230; -#define dspot10_sceneCollisionHeader_00AC98 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneCollisionHeader_00AC98" +#define dspot10_sceneTex_00DA30 "__OTR__scenes/shared/spot10_scene/spot10_sceneTex_00DA30" +static const ALIGN_ASSET(2) char spot10_sceneTex_00DA30[] = dspot10_sceneTex_00DA30; -#define dspot10_sceneCollisionHeader_00AC98 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneCollisionHeader_00AC98" +#define dspot10_sceneTex_00EA30 "__OTR__scenes/shared/spot10_scene/spot10_sceneTex_00EA30" +static const ALIGN_ASSET(2) char spot10_sceneTex_00EA30[] = dspot10_sceneTex_00EA30; + +#define dspot10_sceneTex_00F230 "__OTR__scenes/shared/spot10_scene/spot10_sceneTex_00F230" +static const ALIGN_ASSET(2) char spot10_sceneTex_00F230[] = dspot10_sceneTex_00F230; + +#define dspot10_sceneTex_00F430 "__OTR__scenes/shared/spot10_scene/spot10_sceneTex_00F430" +static const ALIGN_ASSET(2) char spot10_sceneTex_00F430[] = dspot10_sceneTex_00F430; + +#define dspot10_sceneTex_00FC30 "__OTR__scenes/shared/spot10_scene/spot10_sceneTex_00FC30" +static const ALIGN_ASSET(2) char spot10_sceneTex_00FC30[] = dspot10_sceneTex_00FC30; + +#define dspot10_sceneCollisionHeader_00AC98 "__OTR__scenes/shared/spot10_scene/spot10_sceneCollisionHeader_00AC98" +static const ALIGN_ASSET(2) char spot10_sceneCollisionHeader_00AC98[] = dspot10_sceneCollisionHeader_00AC98; + +#define dspot10_sceneCollisionHeader_00AC98 "__OTR__scenes/shared/spot10_scene/spot10_sceneCollisionHeader_00AC98" + +#define dspot10_sceneCollisionHeader_00AC98 "__OTR__scenes/shared/spot10_scene/spot10_sceneCollisionHeader_00AC98" #endif // OVERWORLD_SPOT10_SCENE_H diff --git a/soh/assets/scenes/overworld/spot11/spot11_room_0.h b/soh/assets/scenes/overworld/spot11/spot11_room_0.h index cbaea5212..dd113f69e 100644 --- a/soh/assets/scenes/overworld/spot11/spot11_room_0.h +++ b/soh/assets/scenes/overworld/spot11/spot11_room_0.h @@ -3,232 +3,232 @@ #include "align_asset_macro.h" -#define dspot11_room_0DL_0037A8 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_0037A8" +#define dspot11_room_0DL_0037A8 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_0037A8" static const ALIGN_ASSET(2) char spot11_room_0DL_0037A8[] = dspot11_room_0DL_0037A8; -#define dspot11_room_0DL_002548 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_002548" +#define dspot11_room_0DL_002548 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_002548" static const ALIGN_ASSET(2) char spot11_room_0DL_002548[] = dspot11_room_0DL_002548; -#define dspot11_room_0DL_0029F0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_0029F0" +#define dspot11_room_0DL_0029F0 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_0029F0" static const ALIGN_ASSET(2) char spot11_room_0DL_0029F0[] = dspot11_room_0DL_0029F0; -#define dspot11_room_0DL_002D68 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_002D68" +#define dspot11_room_0DL_002D68 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_002D68" static const ALIGN_ASSET(2) char spot11_room_0DL_002D68[] = dspot11_room_0DL_002D68; -#define dspot11_room_0DL_008520 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_008520" +#define dspot11_room_0DL_008520 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_008520" static const ALIGN_ASSET(2) char spot11_room_0DL_008520[] = dspot11_room_0DL_008520; -#define dspot11_room_0DL_00A238 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_00A238" +#define dspot11_room_0DL_00A238 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_00A238" static const ALIGN_ASSET(2) char spot11_room_0DL_00A238[] = dspot11_room_0DL_00A238; -#define dspot11_room_0DL_00A478 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_00A478" +#define dspot11_room_0DL_00A478 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_00A478" static const ALIGN_ASSET(2) char spot11_room_0DL_00A478[] = dspot11_room_0DL_00A478; -#define dspot11_room_0DL_00A6D8 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_00A6D8" +#define dspot11_room_0DL_00A6D8 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_00A6D8" static const ALIGN_ASSET(2) char spot11_room_0DL_00A6D8[] = dspot11_room_0DL_00A6D8; -#define dspot11_room_0DL_00A900 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_00A900" +#define dspot11_room_0DL_00A900 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_00A900" static const ALIGN_ASSET(2) char spot11_room_0DL_00A900[] = dspot11_room_0DL_00A900; -#define dspot11_room_0DL_00AB78 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_00AB78" +#define dspot11_room_0DL_00AB78 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_00AB78" static const ALIGN_ASSET(2) char spot11_room_0DL_00AB78[] = dspot11_room_0DL_00AB78; -#define dspot11_room_0DL_00ADB0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_00ADB0" +#define dspot11_room_0DL_00ADB0 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_00ADB0" static const ALIGN_ASSET(2) char spot11_room_0DL_00ADB0[] = dspot11_room_0DL_00ADB0; -#define dspot11_room_0DL_000E40 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_000E40" +#define dspot11_room_0DL_000E40 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_000E40" static const ALIGN_ASSET(2) char spot11_room_0DL_000E40[] = dspot11_room_0DL_000E40; -#define dspot11_room_0DL_001ED0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_001ED0" +#define dspot11_room_0DL_001ED0 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_001ED0" static const ALIGN_ASSET(2) char spot11_room_0DL_001ED0[] = dspot11_room_0DL_001ED0; -#define dspot11_room_0DL_00C3C0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_00C3C0" +#define dspot11_room_0DL_00C3C0 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_00C3C0" static const ALIGN_ASSET(2) char spot11_room_0DL_00C3C0[] = dspot11_room_0DL_00C3C0; -#define dspot11_room_0DL_002FA0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_002FA0" +#define dspot11_room_0DL_002FA0 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_002FA0" static const ALIGN_ASSET(2) char spot11_room_0DL_002FA0[] = dspot11_room_0DL_002FA0; -#define dspot11_room_0DL_003510 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_003510" +#define dspot11_room_0DL_003510 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_003510" static const ALIGN_ASSET(2) char spot11_room_0DL_003510[] = dspot11_room_0DL_003510; -#define dspot11_room_0DL_001578 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_001578" +#define dspot11_room_0DL_001578 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_001578" static const ALIGN_ASSET(2) char spot11_room_0DL_001578[] = dspot11_room_0DL_001578; -#define dspot11_room_0DL_00B5B0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_00B5B0" +#define dspot11_room_0DL_00B5B0 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_00B5B0" static const ALIGN_ASSET(2) char spot11_room_0DL_00B5B0[] = dspot11_room_0DL_00B5B0; -#define dspot11_room_0DL_001138 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_001138" +#define dspot11_room_0DL_001138 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_001138" static const ALIGN_ASSET(2) char spot11_room_0DL_001138[] = dspot11_room_0DL_001138; -#define dspot11_room_0Set_000410DL_0037A8 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_0037A8" +#define dspot11_room_0Set_000410DL_0037A8 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_0037A8" static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_0037A8[] = dspot11_room_0Set_000410DL_0037A8; -#define dspot11_room_0Set_000410DL_002548 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_002548" +#define dspot11_room_0Set_000410DL_002548 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_002548" static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_002548[] = dspot11_room_0Set_000410DL_002548; -#define dspot11_room_0Set_000410DL_0029F0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_0029F0" +#define dspot11_room_0Set_000410DL_0029F0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_0029F0" static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_0029F0[] = dspot11_room_0Set_000410DL_0029F0; -#define dspot11_room_0Set_000410DL_002D68 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_002D68" +#define dspot11_room_0Set_000410DL_002D68 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_002D68" static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_002D68[] = dspot11_room_0Set_000410DL_002D68; -#define dspot11_room_0Set_000410DL_008520 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_008520" +#define dspot11_room_0Set_000410DL_008520 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_008520" static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_008520[] = dspot11_room_0Set_000410DL_008520; -#define dspot11_room_0Set_000410DL_00A238 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_00A238" +#define dspot11_room_0Set_000410DL_00A238 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_00A238" static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_00A238[] = dspot11_room_0Set_000410DL_00A238; -#define dspot11_room_0Set_000410DL_00A478 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_00A478" +#define dspot11_room_0Set_000410DL_00A478 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_00A478" static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_00A478[] = dspot11_room_0Set_000410DL_00A478; -#define dspot11_room_0Set_000410DL_00A6D8 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_00A6D8" +#define dspot11_room_0Set_000410DL_00A6D8 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_00A6D8" static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_00A6D8[] = dspot11_room_0Set_000410DL_00A6D8; -#define dspot11_room_0Set_000410DL_00A900 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_00A900" +#define dspot11_room_0Set_000410DL_00A900 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_00A900" static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_00A900[] = dspot11_room_0Set_000410DL_00A900; -#define dspot11_room_0Set_000410DL_00AB78 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_00AB78" +#define dspot11_room_0Set_000410DL_00AB78 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_00AB78" static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_00AB78[] = dspot11_room_0Set_000410DL_00AB78; -#define dspot11_room_0Set_000410DL_00ADB0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_00ADB0" +#define dspot11_room_0Set_000410DL_00ADB0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_00ADB0" static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_00ADB0[] = dspot11_room_0Set_000410DL_00ADB0; -#define dspot11_room_0Set_000410DL_000E40 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_000E40" +#define dspot11_room_0Set_000410DL_000E40 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_000E40" static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_000E40[] = dspot11_room_0Set_000410DL_000E40; -#define dspot11_room_0Set_000410DL_001ED0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_001ED0" +#define dspot11_room_0Set_000410DL_001ED0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_001ED0" static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_001ED0[] = dspot11_room_0Set_000410DL_001ED0; -#define dspot11_room_0Set_000410DL_00C3C0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_00C3C0" +#define dspot11_room_0Set_000410DL_00C3C0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_00C3C0" static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_00C3C0[] = dspot11_room_0Set_000410DL_00C3C0; -#define dspot11_room_0Set_000410DL_002FA0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_002FA0" +#define dspot11_room_0Set_000410DL_002FA0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_002FA0" static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_002FA0[] = dspot11_room_0Set_000410DL_002FA0; -#define dspot11_room_0Set_000410DL_003510 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_003510" +#define dspot11_room_0Set_000410DL_003510 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_003510" static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_003510[] = dspot11_room_0Set_000410DL_003510; -#define dspot11_room_0Set_000410DL_001578 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_001578" +#define dspot11_room_0Set_000410DL_001578 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_001578" static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_001578[] = dspot11_room_0Set_000410DL_001578; -#define dspot11_room_0Set_000410DL_00B5B0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_00B5B0" +#define dspot11_room_0Set_000410DL_00B5B0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_00B5B0" static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_00B5B0[] = dspot11_room_0Set_000410DL_00B5B0; -#define dspot11_room_0Set_000410DL_001138 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_001138" +#define dspot11_room_0Set_000410DL_001138 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_001138" static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_001138[] = dspot11_room_0Set_000410DL_001138; -#define dspot11_room_0Set_000710DL_0037A8 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_0037A8" +#define dspot11_room_0Set_000710DL_0037A8 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_0037A8" static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_0037A8[] = dspot11_room_0Set_000710DL_0037A8; -#define dspot11_room_0Set_000710DL_002548 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_002548" +#define dspot11_room_0Set_000710DL_002548 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_002548" static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_002548[] = dspot11_room_0Set_000710DL_002548; -#define dspot11_room_0Set_000710DL_0029F0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_0029F0" +#define dspot11_room_0Set_000710DL_0029F0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_0029F0" static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_0029F0[] = dspot11_room_0Set_000710DL_0029F0; -#define dspot11_room_0Set_000710DL_002D68 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_002D68" +#define dspot11_room_0Set_000710DL_002D68 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_002D68" static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_002D68[] = dspot11_room_0Set_000710DL_002D68; -#define dspot11_room_0Set_000710DL_008520 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_008520" +#define dspot11_room_0Set_000710DL_008520 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_008520" static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_008520[] = dspot11_room_0Set_000710DL_008520; -#define dspot11_room_0Set_000710DL_00A238 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_00A238" +#define dspot11_room_0Set_000710DL_00A238 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_00A238" static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_00A238[] = dspot11_room_0Set_000710DL_00A238; -#define dspot11_room_0Set_000710DL_00A478 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_00A478" +#define dspot11_room_0Set_000710DL_00A478 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_00A478" static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_00A478[] = dspot11_room_0Set_000710DL_00A478; -#define dspot11_room_0Set_000710DL_00A6D8 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_00A6D8" +#define dspot11_room_0Set_000710DL_00A6D8 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_00A6D8" static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_00A6D8[] = dspot11_room_0Set_000710DL_00A6D8; -#define dspot11_room_0Set_000710DL_00A900 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_00A900" +#define dspot11_room_0Set_000710DL_00A900 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_00A900" static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_00A900[] = dspot11_room_0Set_000710DL_00A900; -#define dspot11_room_0Set_000710DL_00AB78 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_00AB78" +#define dspot11_room_0Set_000710DL_00AB78 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_00AB78" static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_00AB78[] = dspot11_room_0Set_000710DL_00AB78; -#define dspot11_room_0Set_000710DL_00ADB0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_00ADB0" +#define dspot11_room_0Set_000710DL_00ADB0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_00ADB0" static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_00ADB0[] = dspot11_room_0Set_000710DL_00ADB0; -#define dspot11_room_0Set_000710DL_000E40 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_000E40" +#define dspot11_room_0Set_000710DL_000E40 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_000E40" static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_000E40[] = dspot11_room_0Set_000710DL_000E40; -#define dspot11_room_0Set_000710DL_001ED0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_001ED0" +#define dspot11_room_0Set_000710DL_001ED0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_001ED0" static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_001ED0[] = dspot11_room_0Set_000710DL_001ED0; -#define dspot11_room_0Set_000710DL_00C3C0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_00C3C0" +#define dspot11_room_0Set_000710DL_00C3C0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_00C3C0" static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_00C3C0[] = dspot11_room_0Set_000710DL_00C3C0; -#define dspot11_room_0Set_000710DL_002FA0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_002FA0" +#define dspot11_room_0Set_000710DL_002FA0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_002FA0" static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_002FA0[] = dspot11_room_0Set_000710DL_002FA0; -#define dspot11_room_0Set_000710DL_003510 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_003510" +#define dspot11_room_0Set_000710DL_003510 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_003510" static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_003510[] = dspot11_room_0Set_000710DL_003510; -#define dspot11_room_0Set_000710DL_001578 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_001578" +#define dspot11_room_0Set_000710DL_001578 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_001578" static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_001578[] = dspot11_room_0Set_000710DL_001578; -#define dspot11_room_0Set_000710DL_00B5B0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_00B5B0" +#define dspot11_room_0Set_000710DL_00B5B0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_00B5B0" static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_00B5B0[] = dspot11_room_0Set_000710DL_00B5B0; -#define dspot11_room_0Set_000710DL_001138 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_001138" +#define dspot11_room_0Set_000710DL_001138 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_001138" static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_001138[] = dspot11_room_0Set_000710DL_001138; -#define dspot11_room_0Set_0007F0DL_0037A8 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_0037A8" +#define dspot11_room_0Set_0007F0DL_0037A8 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_0037A8" static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_0037A8[] = dspot11_room_0Set_0007F0DL_0037A8; -#define dspot11_room_0Set_0007F0DL_002548 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_002548" +#define dspot11_room_0Set_0007F0DL_002548 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_002548" static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_002548[] = dspot11_room_0Set_0007F0DL_002548; -#define dspot11_room_0Set_0007F0DL_0029F0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_0029F0" +#define dspot11_room_0Set_0007F0DL_0029F0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_0029F0" static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_0029F0[] = dspot11_room_0Set_0007F0DL_0029F0; -#define dspot11_room_0Set_0007F0DL_002D68 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_002D68" +#define dspot11_room_0Set_0007F0DL_002D68 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_002D68" static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_002D68[] = dspot11_room_0Set_0007F0DL_002D68; -#define dspot11_room_0Set_0007F0DL_008520 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_008520" +#define dspot11_room_0Set_0007F0DL_008520 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_008520" static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_008520[] = dspot11_room_0Set_0007F0DL_008520; -#define dspot11_room_0Set_0007F0DL_00A238 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_00A238" +#define dspot11_room_0Set_0007F0DL_00A238 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_00A238" static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_00A238[] = dspot11_room_0Set_0007F0DL_00A238; -#define dspot11_room_0Set_0007F0DL_00A478 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_00A478" +#define dspot11_room_0Set_0007F0DL_00A478 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_00A478" static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_00A478[] = dspot11_room_0Set_0007F0DL_00A478; -#define dspot11_room_0Set_0007F0DL_00A6D8 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_00A6D8" +#define dspot11_room_0Set_0007F0DL_00A6D8 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_00A6D8" static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_00A6D8[] = dspot11_room_0Set_0007F0DL_00A6D8; -#define dspot11_room_0Set_0007F0DL_00A900 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_00A900" +#define dspot11_room_0Set_0007F0DL_00A900 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_00A900" static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_00A900[] = dspot11_room_0Set_0007F0DL_00A900; -#define dspot11_room_0Set_0007F0DL_00AB78 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_00AB78" +#define dspot11_room_0Set_0007F0DL_00AB78 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_00AB78" static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_00AB78[] = dspot11_room_0Set_0007F0DL_00AB78; -#define dspot11_room_0Set_0007F0DL_00ADB0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_00ADB0" +#define dspot11_room_0Set_0007F0DL_00ADB0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_00ADB0" static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_00ADB0[] = dspot11_room_0Set_0007F0DL_00ADB0; -#define dspot11_room_0Set_0007F0DL_000E40 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_000E40" +#define dspot11_room_0Set_0007F0DL_000E40 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_000E40" static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_000E40[] = dspot11_room_0Set_0007F0DL_000E40; -#define dspot11_room_0Set_0007F0DL_001ED0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_001ED0" +#define dspot11_room_0Set_0007F0DL_001ED0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_001ED0" static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_001ED0[] = dspot11_room_0Set_0007F0DL_001ED0; -#define dspot11_room_0Set_0007F0DL_00C3C0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_00C3C0" +#define dspot11_room_0Set_0007F0DL_00C3C0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_00C3C0" static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_00C3C0[] = dspot11_room_0Set_0007F0DL_00C3C0; -#define dspot11_room_0Set_0007F0DL_002FA0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_002FA0" +#define dspot11_room_0Set_0007F0DL_002FA0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_002FA0" static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_002FA0[] = dspot11_room_0Set_0007F0DL_002FA0; -#define dspot11_room_0Set_0007F0DL_003510 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_003510" +#define dspot11_room_0Set_0007F0DL_003510 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_003510" static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_003510[] = dspot11_room_0Set_0007F0DL_003510; -#define dspot11_room_0Set_0007F0DL_001578 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_001578" +#define dspot11_room_0Set_0007F0DL_001578 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_001578" static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_001578[] = dspot11_room_0Set_0007F0DL_001578; -#define dspot11_room_0Set_0007F0DL_00B5B0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_00B5B0" +#define dspot11_room_0Set_0007F0DL_00B5B0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_00B5B0" static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_00B5B0[] = dspot11_room_0Set_0007F0DL_00B5B0; -#define dspot11_room_0Set_0007F0DL_001138 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_001138" +#define dspot11_room_0Set_0007F0DL_001138 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_001138" static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_001138[] = dspot11_room_0Set_0007F0DL_001138; diff --git a/soh/assets/scenes/overworld/spot11/spot11_scene.h b/soh/assets/scenes/overworld/spot11/spot11_scene.h index 35d42b9f6..865832ed3 100644 --- a/soh/assets/scenes/overworld/spot11/spot11_scene.h +++ b/soh/assets/scenes/overworld/spot11/spot11_scene.h @@ -3,113 +3,113 @@ #include "align_asset_macro.h" -#define dgDesertColossusIntroCs "__OTR__scenes/nonmq/spot11_scene/gDesertColossusIntroCs" -static const ALIGN_ASSET(2) char gDesertColossusIntroCs[] = dgDesertColossusIntroCs; - -#define dspot11_sceneCollisionHeader_004EE4 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneCollisionHeader_004EE4" -static const ALIGN_ASSET(2) char spot11_sceneCollisionHeader_004EE4[] = dspot11_sceneCollisionHeader_004EE4; - -#define dspot11_sceneTex_017CE0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_017CE0" -static const ALIGN_ASSET(2) char spot11_sceneTex_017CE0[] = dspot11_sceneTex_017CE0; - -#define dspot11_sceneTex_0184E0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_0184E0" -static const ALIGN_ASSET(2) char spot11_sceneTex_0184E0[] = dspot11_sceneTex_0184E0; - -#define dspot11_sceneTex_0104E0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_0104E0" -static const ALIGN_ASSET(2) char spot11_sceneTex_0104E0[] = dspot11_sceneTex_0104E0; - -#define dspot11_sceneTex_0174E0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_0174E0" -static const ALIGN_ASSET(2) char spot11_sceneTex_0174E0[] = dspot11_sceneTex_0174E0; - -#define dspot11_sceneTex_0124E0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_0124E0" -static const ALIGN_ASSET(2) char spot11_sceneTex_0124E0[] = dspot11_sceneTex_0124E0; - -#define dspot11_sceneTex_013CE0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_013CE0" -static const ALIGN_ASSET(2) char spot11_sceneTex_013CE0[] = dspot11_sceneTex_013CE0; - -#define dspot11_sceneTex_00F4A0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_00F4A0" -static const ALIGN_ASSET(2) char spot11_sceneTex_00F4A0[] = dspot11_sceneTex_00F4A0; - -#define dspot11_sceneTex_0154E0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_0154E0" -static const ALIGN_ASSET(2) char spot11_sceneTex_0154E0[] = dspot11_sceneTex_0154E0; - -#define dspot11_sceneTex_012CE0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_012CE0" -static const ALIGN_ASSET(2) char spot11_sceneTex_012CE0[] = dspot11_sceneTex_012CE0; - -#define dspot11_sceneTex_011CE0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_011CE0" -static const ALIGN_ASSET(2) char spot11_sceneTex_011CE0[] = dspot11_sceneTex_011CE0; - -#define dspot11_sceneTex_00ECA0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_00ECA0" -static const ALIGN_ASSET(2) char spot11_sceneTex_00ECA0[] = dspot11_sceneTex_00ECA0; - -#define dspot11_sceneTex_00BCA0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_00BCA0" -static const ALIGN_ASSET(2) char spot11_sceneTex_00BCA0[] = dspot11_sceneTex_00BCA0; - -#define dspot11_sceneTex_0134E0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_0134E0" -static const ALIGN_ASSET(2) char spot11_sceneTex_0134E0[] = dspot11_sceneTex_0134E0; - -#define dspot11_sceneTex_00FCE0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_00FCE0" -static const ALIGN_ASSET(2) char spot11_sceneTex_00FCE0[] = dspot11_sceneTex_00FCE0; - -#define dspot11_sceneTex_00B8A0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_00B8A0" -static const ALIGN_ASSET(2) char spot11_sceneTex_00B8A0[] = dspot11_sceneTex_00B8A0; - -#define dspot11_sceneTex_008CA0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_008CA0" -static const ALIGN_ASSET(2) char spot11_sceneTex_008CA0[] = dspot11_sceneTex_008CA0; - -#define dspot11_sceneTex_00D4A0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_00D4A0" -static const ALIGN_ASSET(2) char spot11_sceneTex_00D4A0[] = dspot11_sceneTex_00D4A0; - -#define dspot11_sceneTex_00A0A0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_00A0A0" -static const ALIGN_ASSET(2) char spot11_sceneTex_00A0A0[] = dspot11_sceneTex_00A0A0; - -#define dspot11_sceneTex_0084A0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_0084A0" -static const ALIGN_ASSET(2) char spot11_sceneTex_0084A0[] = dspot11_sceneTex_0084A0; - -#define dspot11_sceneTex_00CCA0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_00CCA0" -static const ALIGN_ASSET(2) char spot11_sceneTex_00CCA0[] = dspot11_sceneTex_00CCA0; - -#define dspot11_sceneTex_00A8A0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_00A8A0" -static const ALIGN_ASSET(2) char spot11_sceneTex_00A8A0[] = dspot11_sceneTex_00A8A0; - -#define dspot11_sceneTex_007CA0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_007CA0" +#define dspot11_sceneTex_007CA0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_007CA0" static const ALIGN_ASSET(2) char spot11_sceneTex_007CA0[] = dspot11_sceneTex_007CA0; -#define dspot11_sceneTex_0090A0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_0090A0" +#define dspot11_sceneTex_0084A0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_0084A0" +static const ALIGN_ASSET(2) char spot11_sceneTex_0084A0[] = dspot11_sceneTex_0084A0; + +#define dspot11_sceneTex_008CA0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_008CA0" +static const ALIGN_ASSET(2) char spot11_sceneTex_008CA0[] = dspot11_sceneTex_008CA0; + +#define dspot11_sceneTex_0090A0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_0090A0" static const ALIGN_ASSET(2) char spot11_sceneTex_0090A0[] = dspot11_sceneTex_0090A0; -#define dspot11_sceneTex_00C4A0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_00C4A0" +#define dspot11_sceneTex_00A0A0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_00A0A0" +static const ALIGN_ASSET(2) char spot11_sceneTex_00A0A0[] = dspot11_sceneTex_00A0A0; + +#define dspot11_sceneTex_00A8A0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_00A8A0" +static const ALIGN_ASSET(2) char spot11_sceneTex_00A8A0[] = dspot11_sceneTex_00A8A0; + +#define dspot11_sceneTex_00B8A0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_00B8A0" +static const ALIGN_ASSET(2) char spot11_sceneTex_00B8A0[] = dspot11_sceneTex_00B8A0; + +#define dspot11_sceneTex_00BCA0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_00BCA0" +static const ALIGN_ASSET(2) char spot11_sceneTex_00BCA0[] = dspot11_sceneTex_00BCA0; + +#define dspot11_sceneTex_00C4A0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_00C4A0" static const ALIGN_ASSET(2) char spot11_sceneTex_00C4A0[] = dspot11_sceneTex_00C4A0; -#define dspot11_sceneTex_016CE0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_016CE0" -static const ALIGN_ASSET(2) char spot11_sceneTex_016CE0[] = dspot11_sceneTex_016CE0; +#define dspot11_sceneTex_00CCA0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_00CCA0" +static const ALIGN_ASSET(2) char spot11_sceneTex_00CCA0[] = dspot11_sceneTex_00CCA0; -#define dspot11_sceneTex_010CE0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_010CE0" -static const ALIGN_ASSET(2) char spot11_sceneTex_010CE0[] = dspot11_sceneTex_010CE0; +#define dspot11_sceneTex_00D4A0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_00D4A0" +static const ALIGN_ASSET(2) char spot11_sceneTex_00D4A0[] = dspot11_sceneTex_00D4A0; -#define dspot11_sceneTex_00FCA0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_00FCA0" -static const ALIGN_ASSET(2) char spot11_sceneTex_00FCA0[] = dspot11_sceneTex_00FCA0; - -#define dspot11_sceneTex_0144E0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_0144E0" -static const ALIGN_ASSET(2) char spot11_sceneTex_0144E0[] = dspot11_sceneTex_0144E0; - -#define dspot11_sceneTex_015CE0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_015CE0" -static const ALIGN_ASSET(2) char spot11_sceneTex_015CE0[] = dspot11_sceneTex_015CE0; - -#define dspot11_sceneTex_018CE0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_018CE0" -static const ALIGN_ASSET(2) char spot11_sceneTex_018CE0[] = dspot11_sceneTex_018CE0; - -#define dspot11_sceneTex_0164E0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_0164E0" -static const ALIGN_ASSET(2) char spot11_sceneTex_0164E0[] = dspot11_sceneTex_0164E0; - -#define dspot11_sceneTex_00DCA0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_00DCA0" +#define dspot11_sceneTex_00DCA0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_00DCA0" static const ALIGN_ASSET(2) char spot11_sceneTex_00DCA0[] = dspot11_sceneTex_00DCA0; -#define dspot11_sceneCollisionHeader_004EE4 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneCollisionHeader_004EE4" +#define dspot11_sceneTex_00ECA0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_00ECA0" +static const ALIGN_ASSET(2) char spot11_sceneTex_00ECA0[] = dspot11_sceneTex_00ECA0; -#define dspot11_sceneCollisionHeader_004EE4 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneCollisionHeader_004EE4" +#define dspot11_sceneTex_00F4A0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_00F4A0" +static const ALIGN_ASSET(2) char spot11_sceneTex_00F4A0[] = dspot11_sceneTex_00F4A0; -#define dspot11_sceneCollisionHeader_004EE4 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneCollisionHeader_004EE4" +#define dspot11_sceneTex_00FCA0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_00FCA0" +static const ALIGN_ASSET(2) char spot11_sceneTex_00FCA0[] = dspot11_sceneTex_00FCA0; + +#define dspot11_sceneTex_00FCE0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_00FCE0" +static const ALIGN_ASSET(2) char spot11_sceneTex_00FCE0[] = dspot11_sceneTex_00FCE0; + +#define dspot11_sceneTex_0104E0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_0104E0" +static const ALIGN_ASSET(2) char spot11_sceneTex_0104E0[] = dspot11_sceneTex_0104E0; + +#define dspot11_sceneTex_010CE0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_010CE0" +static const ALIGN_ASSET(2) char spot11_sceneTex_010CE0[] = dspot11_sceneTex_010CE0; + +#define dspot11_sceneTex_011CE0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_011CE0" +static const ALIGN_ASSET(2) char spot11_sceneTex_011CE0[] = dspot11_sceneTex_011CE0; + +#define dspot11_sceneTex_0124E0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_0124E0" +static const ALIGN_ASSET(2) char spot11_sceneTex_0124E0[] = dspot11_sceneTex_0124E0; + +#define dspot11_sceneTex_012CE0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_012CE0" +static const ALIGN_ASSET(2) char spot11_sceneTex_012CE0[] = dspot11_sceneTex_012CE0; + +#define dspot11_sceneTex_0134E0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_0134E0" +static const ALIGN_ASSET(2) char spot11_sceneTex_0134E0[] = dspot11_sceneTex_0134E0; + +#define dspot11_sceneTex_013CE0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_013CE0" +static const ALIGN_ASSET(2) char spot11_sceneTex_013CE0[] = dspot11_sceneTex_013CE0; + +#define dspot11_sceneTex_0144E0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_0144E0" +static const ALIGN_ASSET(2) char spot11_sceneTex_0144E0[] = dspot11_sceneTex_0144E0; + +#define dspot11_sceneTex_0154E0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_0154E0" +static const ALIGN_ASSET(2) char spot11_sceneTex_0154E0[] = dspot11_sceneTex_0154E0; + +#define dspot11_sceneTex_015CE0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_015CE0" +static const ALIGN_ASSET(2) char spot11_sceneTex_015CE0[] = dspot11_sceneTex_015CE0; + +#define dspot11_sceneTex_0164E0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_0164E0" +static const ALIGN_ASSET(2) char spot11_sceneTex_0164E0[] = dspot11_sceneTex_0164E0; + +#define dspot11_sceneTex_016CE0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_016CE0" +static const ALIGN_ASSET(2) char spot11_sceneTex_016CE0[] = dspot11_sceneTex_016CE0; + +#define dspot11_sceneTex_0174E0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_0174E0" +static const ALIGN_ASSET(2) char spot11_sceneTex_0174E0[] = dspot11_sceneTex_0174E0; + +#define dspot11_sceneTex_017CE0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_017CE0" +static const ALIGN_ASSET(2) char spot11_sceneTex_017CE0[] = dspot11_sceneTex_017CE0; + +#define dspot11_sceneTex_0184E0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_0184E0" +static const ALIGN_ASSET(2) char spot11_sceneTex_0184E0[] = dspot11_sceneTex_0184E0; + +#define dspot11_sceneTex_018CE0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_018CE0" +static const ALIGN_ASSET(2) char spot11_sceneTex_018CE0[] = dspot11_sceneTex_018CE0; + +#define dgDesertColossusIntroCs "__OTR__scenes/shared/spot11_scene/gDesertColossusIntroCs" +static const ALIGN_ASSET(2) char gDesertColossusIntroCs[] = dgDesertColossusIntroCs; + +#define dspot11_sceneCollisionHeader_004EE4 "__OTR__scenes/shared/spot11_scene/spot11_sceneCollisionHeader_004EE4" +static const ALIGN_ASSET(2) char spot11_sceneCollisionHeader_004EE4[] = dspot11_sceneCollisionHeader_004EE4; + +#define dspot11_sceneCollisionHeader_004EE4 "__OTR__scenes/shared/spot11_scene/spot11_sceneCollisionHeader_004EE4" + +#define dspot11_sceneCollisionHeader_004EE4 "__OTR__scenes/shared/spot11_scene/spot11_sceneCollisionHeader_004EE4" + +#define dspot11_sceneCollisionHeader_004EE4 "__OTR__scenes/shared/spot11_scene/spot11_sceneCollisionHeader_004EE4" #endif // OVERWORLD_SPOT11_SCENE_H diff --git a/soh/assets/scenes/overworld/spot12/spot12_room_0.h b/soh/assets/scenes/overworld/spot12/spot12_room_0.h index 056e1178f..ac1000376 100644 --- a/soh/assets/scenes/overworld/spot12/spot12_room_0.h +++ b/soh/assets/scenes/overworld/spot12/spot12_room_0.h @@ -3,430 +3,430 @@ #include "align_asset_macro.h" -#define dspot12_room_0DL_0048A8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_0048A8" -static const ALIGN_ASSET(2) char spot12_room_0DL_0048A8[] = dspot12_room_0DL_0048A8; - -#define dspot12_room_0Tex_00C6B0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_00C6B0" -static const ALIGN_ASSET(2) char spot12_room_0Tex_00C6B0[] = dspot12_room_0Tex_00C6B0; - -#define dspot12_room_0TLUT_008A90 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0TLUT_008A90" -static const ALIGN_ASSET(2) char spot12_room_0TLUT_008A90[] = dspot12_room_0TLUT_008A90; - -#define dspot12_room_0DL_0050F0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_0050F0" -static const ALIGN_ASSET(2) char spot12_room_0DL_0050F0[] = dspot12_room_0DL_0050F0; - -#define dspot12_room_0DL_0055D0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_0055D0" -static const ALIGN_ASSET(2) char spot12_room_0DL_0055D0[] = dspot12_room_0DL_0055D0; - -#define dspot12_room_0DL_005B48 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_005B48" -static const ALIGN_ASSET(2) char spot12_room_0DL_005B48[] = dspot12_room_0DL_005B48; - -#define dspot12_room_0Tex_00EAB0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_00EAB0" -static const ALIGN_ASSET(2) char spot12_room_0Tex_00EAB0[] = dspot12_room_0Tex_00EAB0; - -#define dspot12_room_0DL_0065C8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_0065C8" -static const ALIGN_ASSET(2) char spot12_room_0DL_0065C8[] = dspot12_room_0DL_0065C8; - -#define dspot12_room_0Tex_00A6B0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_00A6B0" -static const ALIGN_ASSET(2) char spot12_room_0Tex_00A6B0[] = dspot12_room_0Tex_00A6B0; - -#define dspot12_room_0DL_006F10 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_006F10" -static const ALIGN_ASSET(2) char spot12_room_0DL_006F10[] = dspot12_room_0DL_006F10; - -#define dspot12_room_0DL_00FA10 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_00FA10" -static const ALIGN_ASSET(2) char spot12_room_0DL_00FA10[] = dspot12_room_0DL_00FA10; - -#define dspot12_room_0DL_004CC8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_004CC8" -static const ALIGN_ASSET(2) char spot12_room_0DL_004CC8[] = dspot12_room_0DL_004CC8; - -#define dspot12_room_0DL_008000 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_008000" -static const ALIGN_ASSET(2) char spot12_room_0DL_008000[] = dspot12_room_0DL_008000; - -#define dspot12_room_0Tex_008AB0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_008AB0" +#define dspot12_room_0Tex_008AB0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_008AB0" static const ALIGN_ASSET(2) char spot12_room_0Tex_008AB0[] = dspot12_room_0Tex_008AB0; -#define dspot12_room_0Tex_0096B0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_0096B0" -static const ALIGN_ASSET(2) char spot12_room_0Tex_0096B0[] = dspot12_room_0Tex_0096B0; - -#define dspot12_room_0Tex_00CAB0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_00CAB0" -static const ALIGN_ASSET(2) char spot12_room_0Tex_00CAB0[] = dspot12_room_0Tex_00CAB0; - -#define dspot12_room_0Tex_00B6B0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_00B6B0" -static const ALIGN_ASSET(2) char spot12_room_0Tex_00B6B0[] = dspot12_room_0Tex_00B6B0; - -#define dspot12_room_0Tex_009EB0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_009EB0" -static const ALIGN_ASSET(2) char spot12_room_0Tex_009EB0[] = dspot12_room_0Tex_009EB0; - -#define dspot12_room_0DL_00F740 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_00F740" -static const ALIGN_ASSET(2) char spot12_room_0DL_00F740[] = dspot12_room_0DL_00F740; - -#define dspot12_room_0Tex_00FDB8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_00FDB8" -static const ALIGN_ASSET(2) char spot12_room_0Tex_00FDB8[] = dspot12_room_0Tex_00FDB8; - -#define dspot12_room_0Tex_00FD78 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_00FD78" -static const ALIGN_ASSET(2) char spot12_room_0Tex_00FD78[] = dspot12_room_0Tex_00FD78; - -#define dspot12_room_0DL_001F40 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_001F40" -static const ALIGN_ASSET(2) char spot12_room_0DL_001F40[] = dspot12_room_0DL_001F40; - -#define dspot12_room_0DL_001AE0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_001AE0" -static const ALIGN_ASSET(2) char spot12_room_0DL_001AE0[] = dspot12_room_0DL_001AE0; - -#define dspot12_room_0DL_001D30 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_001D30" -static const ALIGN_ASSET(2) char spot12_room_0DL_001D30[] = dspot12_room_0DL_001D30; - -#define dspot12_room_0DL_0014F0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_0014F0" -static const ALIGN_ASSET(2) char spot12_room_0DL_0014F0[] = dspot12_room_0DL_0014F0; - -#define dspot12_room_0Tex_00BEB0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_00BEB0" -static const ALIGN_ASSET(2) char spot12_room_0Tex_00BEB0[] = dspot12_room_0Tex_00BEB0; - -#define dspot12_room_0Tex_00D2B0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_00D2B0" -static const ALIGN_ASSET(2) char spot12_room_0Tex_00D2B0[] = dspot12_room_0Tex_00D2B0; - -#define dspot12_room_0DL_003970 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_003970" -static const ALIGN_ASSET(2) char spot12_room_0DL_003970[] = dspot12_room_0DL_003970; - -#define dspot12_room_0Tex_00E2B0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_00E2B0" -static const ALIGN_ASSET(2) char spot12_room_0Tex_00E2B0[] = dspot12_room_0Tex_00E2B0; - -#define dspot12_room_0Tex_0092B0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_0092B0" +#define dspot12_room_0Tex_0092B0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_0092B0" static const ALIGN_ASSET(2) char spot12_room_0Tex_0092B0[] = dspot12_room_0Tex_0092B0; -#define dspot12_room_0DL_00F430 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_00F430" -static const ALIGN_ASSET(2) char spot12_room_0DL_00F430[] = dspot12_room_0DL_00F430; +#define dspot12_room_0Tex_0096B0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_0096B0" +static const ALIGN_ASSET(2) char spot12_room_0Tex_0096B0[] = dspot12_room_0Tex_0096B0; -#define dspot12_room_0Tex_0105B8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_0105B8" +#define dspot12_room_0Tex_009EB0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_009EB0" +static const ALIGN_ASSET(2) char spot12_room_0Tex_009EB0[] = dspot12_room_0Tex_009EB0; + +#define dspot12_room_0Tex_00A6B0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_00A6B0" +static const ALIGN_ASSET(2) char spot12_room_0Tex_00A6B0[] = dspot12_room_0Tex_00A6B0; + +#define dspot12_room_0Tex_00B6B0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_00B6B0" +static const ALIGN_ASSET(2) char spot12_room_0Tex_00B6B0[] = dspot12_room_0Tex_00B6B0; + +#define dspot12_room_0Tex_00BEB0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_00BEB0" +static const ALIGN_ASSET(2) char spot12_room_0Tex_00BEB0[] = dspot12_room_0Tex_00BEB0; + +#define dspot12_room_0Tex_00C6B0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_00C6B0" +static const ALIGN_ASSET(2) char spot12_room_0Tex_00C6B0[] = dspot12_room_0Tex_00C6B0; + +#define dspot12_room_0Tex_00CAB0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_00CAB0" +static const ALIGN_ASSET(2) char spot12_room_0Tex_00CAB0[] = dspot12_room_0Tex_00CAB0; + +#define dspot12_room_0Tex_00D2B0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_00D2B0" +static const ALIGN_ASSET(2) char spot12_room_0Tex_00D2B0[] = dspot12_room_0Tex_00D2B0; + +#define dspot12_room_0Tex_00E2B0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_00E2B0" +static const ALIGN_ASSET(2) char spot12_room_0Tex_00E2B0[] = dspot12_room_0Tex_00E2B0; + +#define dspot12_room_0Tex_00EAB0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_00EAB0" +static const ALIGN_ASSET(2) char spot12_room_0Tex_00EAB0[] = dspot12_room_0Tex_00EAB0; + +#define dspot12_room_0Tex_00FD78 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_00FD78" +static const ALIGN_ASSET(2) char spot12_room_0Tex_00FD78[] = dspot12_room_0Tex_00FD78; + +#define dspot12_room_0Tex_00FDB8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_00FDB8" +static const ALIGN_ASSET(2) char spot12_room_0Tex_00FDB8[] = dspot12_room_0Tex_00FDB8; + +#define dspot12_room_0Tex_0105B8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_0105B8" static const ALIGN_ASSET(2) char spot12_room_0Tex_0105B8[] = dspot12_room_0Tex_0105B8; -#define dspot12_room_0DL_008620 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_008620" +#define dspot12_room_0TLUT_008A90 "__OTR__scenes/shared/spot12_scene/spot12_room_0TLUT_008A90" +static const ALIGN_ASSET(2) char spot12_room_0TLUT_008A90[] = dspot12_room_0TLUT_008A90; + +#define dspot12_room_0DL_0048A8 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_0048A8" +static const ALIGN_ASSET(2) char spot12_room_0DL_0048A8[] = dspot12_room_0DL_0048A8; + +#define dspot12_room_0DL_0050F0 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_0050F0" +static const ALIGN_ASSET(2) char spot12_room_0DL_0050F0[] = dspot12_room_0DL_0050F0; + +#define dspot12_room_0DL_0055D0 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_0055D0" +static const ALIGN_ASSET(2) char spot12_room_0DL_0055D0[] = dspot12_room_0DL_0055D0; + +#define dspot12_room_0DL_005B48 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_005B48" +static const ALIGN_ASSET(2) char spot12_room_0DL_005B48[] = dspot12_room_0DL_005B48; + +#define dspot12_room_0DL_0065C8 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_0065C8" +static const ALIGN_ASSET(2) char spot12_room_0DL_0065C8[] = dspot12_room_0DL_0065C8; + +#define dspot12_room_0DL_006F10 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_006F10" +static const ALIGN_ASSET(2) char spot12_room_0DL_006F10[] = dspot12_room_0DL_006F10; + +#define dspot12_room_0DL_00FA10 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_00FA10" +static const ALIGN_ASSET(2) char spot12_room_0DL_00FA10[] = dspot12_room_0DL_00FA10; + +#define dspot12_room_0DL_004CC8 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_004CC8" +static const ALIGN_ASSET(2) char spot12_room_0DL_004CC8[] = dspot12_room_0DL_004CC8; + +#define dspot12_room_0DL_008000 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_008000" +static const ALIGN_ASSET(2) char spot12_room_0DL_008000[] = dspot12_room_0DL_008000; + +#define dspot12_room_0DL_00F740 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_00F740" +static const ALIGN_ASSET(2) char spot12_room_0DL_00F740[] = dspot12_room_0DL_00F740; + +#define dspot12_room_0DL_001F40 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_001F40" +static const ALIGN_ASSET(2) char spot12_room_0DL_001F40[] = dspot12_room_0DL_001F40; + +#define dspot12_room_0DL_001AE0 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_001AE0" +static const ALIGN_ASSET(2) char spot12_room_0DL_001AE0[] = dspot12_room_0DL_001AE0; + +#define dspot12_room_0DL_001D30 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_001D30" +static const ALIGN_ASSET(2) char spot12_room_0DL_001D30[] = dspot12_room_0DL_001D30; + +#define dspot12_room_0DL_0014F0 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_0014F0" +static const ALIGN_ASSET(2) char spot12_room_0DL_0014F0[] = dspot12_room_0DL_0014F0; + +#define dspot12_room_0DL_003970 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_003970" +static const ALIGN_ASSET(2) char spot12_room_0DL_003970[] = dspot12_room_0DL_003970; + +#define dspot12_room_0DL_00F430 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_00F430" +static const ALIGN_ASSET(2) char spot12_room_0DL_00F430[] = dspot12_room_0DL_00F430; + +#define dspot12_room_0DL_008620 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_008620" static const ALIGN_ASSET(2) char spot12_room_0DL_008620[] = dspot12_room_0DL_008620; -#define dspot12_room_0DL_000B60 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_000B60" +#define dspot12_room_0DL_000B60 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_000B60" static const ALIGN_ASSET(2) char spot12_room_0DL_000B60[] = dspot12_room_0DL_000B60; -#define dspot12_room_0DL_0088C8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_0088C8" +#define dspot12_room_0DL_0088C8 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_0088C8" static const ALIGN_ASSET(2) char spot12_room_0DL_0088C8[] = dspot12_room_0DL_0088C8; -#define dspot12_room_0DL_00FC80 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_00FC80" +#define dspot12_room_0DL_00FC80 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_00FC80" static const ALIGN_ASSET(2) char spot12_room_0DL_00FC80[] = dspot12_room_0DL_00FC80; -#define dspot12_room_0DL_007640 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_007640" +#define dspot12_room_0DL_007640 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_007640" static const ALIGN_ASSET(2) char spot12_room_0DL_007640[] = dspot12_room_0DL_007640; -#define dspot12_room_0Set_000300DL_0048A8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_0048A8" +#define dspot12_room_0Set_000300DL_0048A8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_0048A8" static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_0048A8[] = dspot12_room_0Set_000300DL_0048A8; -#define dspot12_room_0Set_000300DL_0050F0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_0050F0" +#define dspot12_room_0Set_000300DL_0050F0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_0050F0" static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_0050F0[] = dspot12_room_0Set_000300DL_0050F0; -#define dspot12_room_0Set_000300DL_0055D0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_0055D0" +#define dspot12_room_0Set_000300DL_0055D0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_0055D0" static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_0055D0[] = dspot12_room_0Set_000300DL_0055D0; -#define dspot12_room_0Set_000300DL_005B48 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_005B48" +#define dspot12_room_0Set_000300DL_005B48 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_005B48" static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_005B48[] = dspot12_room_0Set_000300DL_005B48; -#define dspot12_room_0Set_000300DL_0065C8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_0065C8" +#define dspot12_room_0Set_000300DL_0065C8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_0065C8" static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_0065C8[] = dspot12_room_0Set_000300DL_0065C8; -#define dspot12_room_0Set_000300DL_006F10 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_006F10" +#define dspot12_room_0Set_000300DL_006F10 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_006F10" static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_006F10[] = dspot12_room_0Set_000300DL_006F10; -#define dspot12_room_0Set_000300DL_00FA10 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_00FA10" +#define dspot12_room_0Set_000300DL_00FA10 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_00FA10" static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_00FA10[] = dspot12_room_0Set_000300DL_00FA10; -#define dspot12_room_0Set_000300DL_004CC8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_004CC8" +#define dspot12_room_0Set_000300DL_004CC8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_004CC8" static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_004CC8[] = dspot12_room_0Set_000300DL_004CC8; -#define dspot12_room_0Set_000300DL_008000 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_008000" +#define dspot12_room_0Set_000300DL_008000 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_008000" static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_008000[] = dspot12_room_0Set_000300DL_008000; -#define dspot12_room_0Set_000300DL_00F740 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_00F740" +#define dspot12_room_0Set_000300DL_00F740 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_00F740" static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_00F740[] = dspot12_room_0Set_000300DL_00F740; -#define dspot12_room_0Set_000300DL_001F40 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_001F40" +#define dspot12_room_0Set_000300DL_001F40 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_001F40" static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_001F40[] = dspot12_room_0Set_000300DL_001F40; -#define dspot12_room_0Set_000300DL_001AE0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_001AE0" +#define dspot12_room_0Set_000300DL_001AE0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_001AE0" static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_001AE0[] = dspot12_room_0Set_000300DL_001AE0; -#define dspot12_room_0Set_000300DL_001D30 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_001D30" +#define dspot12_room_0Set_000300DL_001D30 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_001D30" static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_001D30[] = dspot12_room_0Set_000300DL_001D30; -#define dspot12_room_0Set_000300DL_0014F0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_0014F0" +#define dspot12_room_0Set_000300DL_0014F0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_0014F0" static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_0014F0[] = dspot12_room_0Set_000300DL_0014F0; -#define dspot12_room_0Set_000300DL_003970 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_003970" +#define dspot12_room_0Set_000300DL_003970 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_003970" static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_003970[] = dspot12_room_0Set_000300DL_003970; -#define dspot12_room_0Set_000300DL_00F430 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_00F430" +#define dspot12_room_0Set_000300DL_00F430 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_00F430" static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_00F430[] = dspot12_room_0Set_000300DL_00F430; -#define dspot12_room_0Set_000300DL_008620 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_008620" +#define dspot12_room_0Set_000300DL_008620 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_008620" static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_008620[] = dspot12_room_0Set_000300DL_008620; -#define dspot12_room_0Set_000300DL_000B60 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_000B60" +#define dspot12_room_0Set_000300DL_000B60 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_000B60" static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_000B60[] = dspot12_room_0Set_000300DL_000B60; -#define dspot12_room_0Set_000300DL_0088C8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_0088C8" +#define dspot12_room_0Set_000300DL_0088C8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_0088C8" static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_0088C8[] = dspot12_room_0Set_000300DL_0088C8; -#define dspot12_room_0Set_000300DL_00FC80 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_00FC80" +#define dspot12_room_0Set_000300DL_00FC80 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_00FC80" static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_00FC80[] = dspot12_room_0Set_000300DL_00FC80; -#define dspot12_room_0Set_000300DL_007640 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_007640" +#define dspot12_room_0Set_000300DL_007640 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_007640" static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_007640[] = dspot12_room_0Set_000300DL_007640; -#define dspot12_room_0Set_000540DL_0048A8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_0048A8" +#define dspot12_room_0Set_000540DL_0048A8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_0048A8" static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_0048A8[] = dspot12_room_0Set_000540DL_0048A8; -#define dspot12_room_0Set_000540DL_0050F0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_0050F0" +#define dspot12_room_0Set_000540DL_0050F0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_0050F0" static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_0050F0[] = dspot12_room_0Set_000540DL_0050F0; -#define dspot12_room_0Set_000540DL_0055D0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_0055D0" +#define dspot12_room_0Set_000540DL_0055D0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_0055D0" static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_0055D0[] = dspot12_room_0Set_000540DL_0055D0; -#define dspot12_room_0Set_000540DL_005B48 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_005B48" +#define dspot12_room_0Set_000540DL_005B48 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_005B48" static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_005B48[] = dspot12_room_0Set_000540DL_005B48; -#define dspot12_room_0Set_000540DL_0065C8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_0065C8" +#define dspot12_room_0Set_000540DL_0065C8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_0065C8" static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_0065C8[] = dspot12_room_0Set_000540DL_0065C8; -#define dspot12_room_0Set_000540DL_006F10 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_006F10" +#define dspot12_room_0Set_000540DL_006F10 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_006F10" static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_006F10[] = dspot12_room_0Set_000540DL_006F10; -#define dspot12_room_0Set_000540DL_00FA10 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_00FA10" +#define dspot12_room_0Set_000540DL_00FA10 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_00FA10" static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_00FA10[] = dspot12_room_0Set_000540DL_00FA10; -#define dspot12_room_0Set_000540DL_004CC8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_004CC8" +#define dspot12_room_0Set_000540DL_004CC8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_004CC8" static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_004CC8[] = dspot12_room_0Set_000540DL_004CC8; -#define dspot12_room_0Set_000540DL_008000 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_008000" +#define dspot12_room_0Set_000540DL_008000 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_008000" static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_008000[] = dspot12_room_0Set_000540DL_008000; -#define dspot12_room_0Set_000540DL_00F740 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_00F740" +#define dspot12_room_0Set_000540DL_00F740 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_00F740" static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_00F740[] = dspot12_room_0Set_000540DL_00F740; -#define dspot12_room_0Set_000540DL_001F40 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_001F40" +#define dspot12_room_0Set_000540DL_001F40 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_001F40" static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_001F40[] = dspot12_room_0Set_000540DL_001F40; -#define dspot12_room_0Set_000540DL_001AE0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_001AE0" +#define dspot12_room_0Set_000540DL_001AE0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_001AE0" static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_001AE0[] = dspot12_room_0Set_000540DL_001AE0; -#define dspot12_room_0Set_000540DL_001D30 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_001D30" +#define dspot12_room_0Set_000540DL_001D30 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_001D30" static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_001D30[] = dspot12_room_0Set_000540DL_001D30; -#define dspot12_room_0Set_000540DL_0014F0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_0014F0" +#define dspot12_room_0Set_000540DL_0014F0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_0014F0" static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_0014F0[] = dspot12_room_0Set_000540DL_0014F0; -#define dspot12_room_0Set_000540DL_003970 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_003970" +#define dspot12_room_0Set_000540DL_003970 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_003970" static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_003970[] = dspot12_room_0Set_000540DL_003970; -#define dspot12_room_0Set_000540DL_00F430 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_00F430" +#define dspot12_room_0Set_000540DL_00F430 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_00F430" static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_00F430[] = dspot12_room_0Set_000540DL_00F430; -#define dspot12_room_0Set_000540DL_008620 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_008620" +#define dspot12_room_0Set_000540DL_008620 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_008620" static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_008620[] = dspot12_room_0Set_000540DL_008620; -#define dspot12_room_0Set_000540DL_000B60 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_000B60" +#define dspot12_room_0Set_000540DL_000B60 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_000B60" static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_000B60[] = dspot12_room_0Set_000540DL_000B60; -#define dspot12_room_0Set_000540DL_0088C8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_0088C8" +#define dspot12_room_0Set_000540DL_0088C8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_0088C8" static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_0088C8[] = dspot12_room_0Set_000540DL_0088C8; -#define dspot12_room_0Set_000540DL_00FC80 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_00FC80" +#define dspot12_room_0Set_000540DL_00FC80 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_00FC80" static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_00FC80[] = dspot12_room_0Set_000540DL_00FC80; -#define dspot12_room_0Set_000540DL_007640 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_007640" +#define dspot12_room_0Set_000540DL_007640 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_007640" static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_007640[] = dspot12_room_0Set_000540DL_007640; -#define dspot12_room_0Set_000790DL_0048A8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_0048A8" +#define dspot12_room_0Set_000790DL_0048A8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_0048A8" static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_0048A8[] = dspot12_room_0Set_000790DL_0048A8; -#define dspot12_room_0Set_000790DL_0050F0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_0050F0" +#define dspot12_room_0Set_000790DL_0050F0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_0050F0" static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_0050F0[] = dspot12_room_0Set_000790DL_0050F0; -#define dspot12_room_0Set_000790DL_0055D0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_0055D0" +#define dspot12_room_0Set_000790DL_0055D0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_0055D0" static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_0055D0[] = dspot12_room_0Set_000790DL_0055D0; -#define dspot12_room_0Set_000790DL_005B48 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_005B48" +#define dspot12_room_0Set_000790DL_005B48 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_005B48" static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_005B48[] = dspot12_room_0Set_000790DL_005B48; -#define dspot12_room_0Set_000790DL_0065C8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_0065C8" +#define dspot12_room_0Set_000790DL_0065C8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_0065C8" static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_0065C8[] = dspot12_room_0Set_000790DL_0065C8; -#define dspot12_room_0Set_000790DL_006F10 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_006F10" +#define dspot12_room_0Set_000790DL_006F10 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_006F10" static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_006F10[] = dspot12_room_0Set_000790DL_006F10; -#define dspot12_room_0Set_000790DL_00FA10 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_00FA10" +#define dspot12_room_0Set_000790DL_00FA10 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_00FA10" static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_00FA10[] = dspot12_room_0Set_000790DL_00FA10; -#define dspot12_room_0Set_000790DL_004CC8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_004CC8" +#define dspot12_room_0Set_000790DL_004CC8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_004CC8" static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_004CC8[] = dspot12_room_0Set_000790DL_004CC8; -#define dspot12_room_0Set_000790DL_008000 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_008000" +#define dspot12_room_0Set_000790DL_008000 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_008000" static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_008000[] = dspot12_room_0Set_000790DL_008000; -#define dspot12_room_0Set_000790DL_00F740 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_00F740" +#define dspot12_room_0Set_000790DL_00F740 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_00F740" static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_00F740[] = dspot12_room_0Set_000790DL_00F740; -#define dspot12_room_0Set_000790DL_001F40 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_001F40" +#define dspot12_room_0Set_000790DL_001F40 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_001F40" static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_001F40[] = dspot12_room_0Set_000790DL_001F40; -#define dspot12_room_0Set_000790DL_001AE0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_001AE0" +#define dspot12_room_0Set_000790DL_001AE0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_001AE0" static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_001AE0[] = dspot12_room_0Set_000790DL_001AE0; -#define dspot12_room_0Set_000790DL_001D30 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_001D30" +#define dspot12_room_0Set_000790DL_001D30 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_001D30" static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_001D30[] = dspot12_room_0Set_000790DL_001D30; -#define dspot12_room_0Set_000790DL_0014F0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_0014F0" +#define dspot12_room_0Set_000790DL_0014F0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_0014F0" static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_0014F0[] = dspot12_room_0Set_000790DL_0014F0; -#define dspot12_room_0Set_000790DL_003970 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_003970" +#define dspot12_room_0Set_000790DL_003970 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_003970" static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_003970[] = dspot12_room_0Set_000790DL_003970; -#define dspot12_room_0Set_000790DL_00F430 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_00F430" +#define dspot12_room_0Set_000790DL_00F430 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_00F430" static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_00F430[] = dspot12_room_0Set_000790DL_00F430; -#define dspot12_room_0Set_000790DL_008620 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_008620" +#define dspot12_room_0Set_000790DL_008620 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_008620" static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_008620[] = dspot12_room_0Set_000790DL_008620; -#define dspot12_room_0Set_000790DL_000B60 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_000B60" +#define dspot12_room_0Set_000790DL_000B60 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_000B60" static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_000B60[] = dspot12_room_0Set_000790DL_000B60; -#define dspot12_room_0Set_000790DL_0088C8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_0088C8" +#define dspot12_room_0Set_000790DL_0088C8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_0088C8" static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_0088C8[] = dspot12_room_0Set_000790DL_0088C8; -#define dspot12_room_0Set_000790DL_00FC80 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_00FC80" +#define dspot12_room_0Set_000790DL_00FC80 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_00FC80" static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_00FC80[] = dspot12_room_0Set_000790DL_00FC80; -#define dspot12_room_0Set_000790DL_007640 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_007640" +#define dspot12_room_0Set_000790DL_007640 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_007640" static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_007640[] = dspot12_room_0Set_000790DL_007640; -#define dspot12_room_0Set_000860DL_0048A8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_0048A8" +#define dspot12_room_0Set_000860DL_0048A8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_0048A8" static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_0048A8[] = dspot12_room_0Set_000860DL_0048A8; -#define dspot12_room_0Set_000860DL_0050F0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_0050F0" +#define dspot12_room_0Set_000860DL_0050F0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_0050F0" static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_0050F0[] = dspot12_room_0Set_000860DL_0050F0; -#define dspot12_room_0Set_000860DL_0055D0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_0055D0" +#define dspot12_room_0Set_000860DL_0055D0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_0055D0" static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_0055D0[] = dspot12_room_0Set_000860DL_0055D0; -#define dspot12_room_0Set_000860DL_005B48 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_005B48" +#define dspot12_room_0Set_000860DL_005B48 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_005B48" static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_005B48[] = dspot12_room_0Set_000860DL_005B48; -#define dspot12_room_0Set_000860DL_0065C8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_0065C8" +#define dspot12_room_0Set_000860DL_0065C8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_0065C8" static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_0065C8[] = dspot12_room_0Set_000860DL_0065C8; -#define dspot12_room_0Set_000860DL_006F10 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_006F10" +#define dspot12_room_0Set_000860DL_006F10 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_006F10" static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_006F10[] = dspot12_room_0Set_000860DL_006F10; -#define dspot12_room_0Set_000860DL_00FA10 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_00FA10" +#define dspot12_room_0Set_000860DL_00FA10 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_00FA10" static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_00FA10[] = dspot12_room_0Set_000860DL_00FA10; -#define dspot12_room_0Set_000860DL_004CC8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_004CC8" +#define dspot12_room_0Set_000860DL_004CC8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_004CC8" static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_004CC8[] = dspot12_room_0Set_000860DL_004CC8; -#define dspot12_room_0Set_000860DL_008000 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_008000" +#define dspot12_room_0Set_000860DL_008000 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_008000" static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_008000[] = dspot12_room_0Set_000860DL_008000; -#define dspot12_room_0Set_000860DL_00F740 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_00F740" +#define dspot12_room_0Set_000860DL_00F740 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_00F740" static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_00F740[] = dspot12_room_0Set_000860DL_00F740; -#define dspot12_room_0Set_000860DL_001F40 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_001F40" +#define dspot12_room_0Set_000860DL_001F40 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_001F40" static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_001F40[] = dspot12_room_0Set_000860DL_001F40; -#define dspot12_room_0Set_000860DL_001AE0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_001AE0" +#define dspot12_room_0Set_000860DL_001AE0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_001AE0" static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_001AE0[] = dspot12_room_0Set_000860DL_001AE0; -#define dspot12_room_0Set_000860DL_001D30 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_001D30" +#define dspot12_room_0Set_000860DL_001D30 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_001D30" static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_001D30[] = dspot12_room_0Set_000860DL_001D30; -#define dspot12_room_0Set_000860DL_0014F0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_0014F0" +#define dspot12_room_0Set_000860DL_0014F0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_0014F0" static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_0014F0[] = dspot12_room_0Set_000860DL_0014F0; -#define dspot12_room_0Set_000860DL_003970 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_003970" +#define dspot12_room_0Set_000860DL_003970 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_003970" static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_003970[] = dspot12_room_0Set_000860DL_003970; -#define dspot12_room_0Set_000860DL_00F430 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_00F430" +#define dspot12_room_0Set_000860DL_00F430 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_00F430" static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_00F430[] = dspot12_room_0Set_000860DL_00F430; -#define dspot12_room_0Set_000860DL_008620 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_008620" +#define dspot12_room_0Set_000860DL_008620 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_008620" static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_008620[] = dspot12_room_0Set_000860DL_008620; -#define dspot12_room_0Set_000860DL_000B60 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_000B60" +#define dspot12_room_0Set_000860DL_000B60 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_000B60" static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_000B60[] = dspot12_room_0Set_000860DL_000B60; -#define dspot12_room_0Set_000860DL_0088C8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_0088C8" +#define dspot12_room_0Set_000860DL_0088C8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_0088C8" static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_0088C8[] = dspot12_room_0Set_000860DL_0088C8; -#define dspot12_room_0Set_000860DL_00FC80 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_00FC80" +#define dspot12_room_0Set_000860DL_00FC80 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_00FC80" static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_00FC80[] = dspot12_room_0Set_000860DL_00FC80; -#define dspot12_room_0Set_000860DL_007640 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_007640" +#define dspot12_room_0Set_000860DL_007640 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_007640" static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_007640[] = dspot12_room_0Set_000860DL_007640; -#define dspot12_room_0Set_0008C0DL_0048A8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_0048A8" +#define dspot12_room_0Set_0008C0DL_0048A8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_0048A8" static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_0048A8[] = dspot12_room_0Set_0008C0DL_0048A8; -#define dspot12_room_0Set_0008C0DL_0050F0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_0050F0" +#define dspot12_room_0Set_0008C0DL_0050F0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_0050F0" static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_0050F0[] = dspot12_room_0Set_0008C0DL_0050F0; -#define dspot12_room_0Set_0008C0DL_0055D0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_0055D0" +#define dspot12_room_0Set_0008C0DL_0055D0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_0055D0" static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_0055D0[] = dspot12_room_0Set_0008C0DL_0055D0; -#define dspot12_room_0Set_0008C0DL_005B48 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_005B48" +#define dspot12_room_0Set_0008C0DL_005B48 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_005B48" static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_005B48[] = dspot12_room_0Set_0008C0DL_005B48; -#define dspot12_room_0Set_0008C0DL_0065C8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_0065C8" +#define dspot12_room_0Set_0008C0DL_0065C8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_0065C8" static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_0065C8[] = dspot12_room_0Set_0008C0DL_0065C8; -#define dspot12_room_0Set_0008C0DL_006F10 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_006F10" +#define dspot12_room_0Set_0008C0DL_006F10 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_006F10" static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_006F10[] = dspot12_room_0Set_0008C0DL_006F10; -#define dspot12_room_0Set_0008C0DL_00FA10 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_00FA10" +#define dspot12_room_0Set_0008C0DL_00FA10 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_00FA10" static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_00FA10[] = dspot12_room_0Set_0008C0DL_00FA10; -#define dspot12_room_0Set_0008C0DL_004CC8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_004CC8" +#define dspot12_room_0Set_0008C0DL_004CC8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_004CC8" static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_004CC8[] = dspot12_room_0Set_0008C0DL_004CC8; -#define dspot12_room_0Set_0008C0DL_008000 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_008000" +#define dspot12_room_0Set_0008C0DL_008000 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_008000" static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_008000[] = dspot12_room_0Set_0008C0DL_008000; -#define dspot12_room_0Set_0008C0DL_00F740 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_00F740" +#define dspot12_room_0Set_0008C0DL_00F740 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_00F740" static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_00F740[] = dspot12_room_0Set_0008C0DL_00F740; -#define dspot12_room_0Set_0008C0DL_001F40 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_001F40" +#define dspot12_room_0Set_0008C0DL_001F40 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_001F40" static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_001F40[] = dspot12_room_0Set_0008C0DL_001F40; -#define dspot12_room_0Set_0008C0DL_001AE0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_001AE0" +#define dspot12_room_0Set_0008C0DL_001AE0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_001AE0" static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_001AE0[] = dspot12_room_0Set_0008C0DL_001AE0; -#define dspot12_room_0Set_0008C0DL_001D30 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_001D30" +#define dspot12_room_0Set_0008C0DL_001D30 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_001D30" static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_001D30[] = dspot12_room_0Set_0008C0DL_001D30; -#define dspot12_room_0Set_0008C0DL_0014F0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_0014F0" +#define dspot12_room_0Set_0008C0DL_0014F0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_0014F0" static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_0014F0[] = dspot12_room_0Set_0008C0DL_0014F0; -#define dspot12_room_0Set_0008C0DL_003970 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_003970" +#define dspot12_room_0Set_0008C0DL_003970 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_003970" static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_003970[] = dspot12_room_0Set_0008C0DL_003970; -#define dspot12_room_0Set_0008C0DL_00F430 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_00F430" +#define dspot12_room_0Set_0008C0DL_00F430 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_00F430" static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_00F430[] = dspot12_room_0Set_0008C0DL_00F430; -#define dspot12_room_0Set_0008C0DL_008620 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_008620" +#define dspot12_room_0Set_0008C0DL_008620 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_008620" static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_008620[] = dspot12_room_0Set_0008C0DL_008620; -#define dspot12_room_0Set_0008C0DL_000B60 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_000B60" +#define dspot12_room_0Set_0008C0DL_000B60 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_000B60" static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_000B60[] = dspot12_room_0Set_0008C0DL_000B60; -#define dspot12_room_0Set_0008C0DL_0088C8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_0088C8" +#define dspot12_room_0Set_0008C0DL_0088C8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_0088C8" static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_0088C8[] = dspot12_room_0Set_0008C0DL_0088C8; -#define dspot12_room_0Set_0008C0DL_00FC80 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_00FC80" +#define dspot12_room_0Set_0008C0DL_00FC80 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_00FC80" static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_00FC80[] = dspot12_room_0Set_0008C0DL_00FC80; -#define dspot12_room_0Set_0008C0DL_007640 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_007640" +#define dspot12_room_0Set_0008C0DL_007640 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_007640" static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_007640[] = dspot12_room_0Set_0008C0DL_007640; diff --git a/soh/assets/scenes/overworld/spot12/spot12_room_1.h b/soh/assets/scenes/overworld/spot12/spot12_room_1.h index d6f478f38..89e0e3fc2 100644 --- a/soh/assets/scenes/overworld/spot12/spot12_room_1.h +++ b/soh/assets/scenes/overworld/spot12/spot12_room_1.h @@ -3,211 +3,211 @@ #include "align_asset_macro.h" -#define dspot12_room_1DL_0050A0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1DL_0050A0" -static const ALIGN_ASSET(2) char spot12_room_1DL_0050A0[] = dspot12_room_1DL_0050A0; - -#define dspot12_room_1DL_0026A8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1DL_0026A8" -static const ALIGN_ASSET(2) char spot12_room_1DL_0026A8[] = dspot12_room_1DL_0026A8; - -#define dspot12_room_1DL_002DB0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1DL_002DB0" -static const ALIGN_ASSET(2) char spot12_room_1DL_002DB0[] = dspot12_room_1DL_002DB0; - -#define dspot12_room_1Tex_009E38 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Tex_009E38" -static const ALIGN_ASSET(2) char spot12_room_1Tex_009E38[] = dspot12_room_1Tex_009E38; - -#define dspot12_room_1Tex_00A638 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Tex_00A638" -static const ALIGN_ASSET(2) char spot12_room_1Tex_00A638[] = dspot12_room_1Tex_00A638; - -#define dspot12_room_1DL_001180 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1DL_001180" -static const ALIGN_ASSET(2) char spot12_room_1DL_001180[] = dspot12_room_1DL_001180; - -#define dspot12_room_1Tex_008E38 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Tex_008E38" -static const ALIGN_ASSET(2) char spot12_room_1Tex_008E38[] = dspot12_room_1Tex_008E38; - -#define dspot12_room_1Tex_007638 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Tex_007638" -static const ALIGN_ASSET(2) char spot12_room_1Tex_007638[] = dspot12_room_1Tex_007638; - -#define dspot12_room_1Tex_006638 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Tex_006638" -static const ALIGN_ASSET(2) char spot12_room_1Tex_006638[] = dspot12_room_1Tex_006638; - -#define dspot12_room_1DL_0034E8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1DL_0034E8" -static const ALIGN_ASSET(2) char spot12_room_1DL_0034E8[] = dspot12_room_1DL_0034E8; - -#define dspot12_room_1Tex_007E38 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Tex_007E38" -static const ALIGN_ASSET(2) char spot12_room_1Tex_007E38[] = dspot12_room_1Tex_007E38; - -#define dspot12_room_1DL_004798 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1DL_004798" -static const ALIGN_ASSET(2) char spot12_room_1DL_004798[] = dspot12_room_1DL_004798; - -#define dspot12_room_1DL_003E40 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1DL_003E40" -static const ALIGN_ASSET(2) char spot12_room_1DL_003E40[] = dspot12_room_1DL_003E40; - -#define dspot12_room_1DL_00AF80 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1DL_00AF80" -static const ALIGN_ASSET(2) char spot12_room_1DL_00AF80[] = dspot12_room_1DL_00AF80; - -#define dspot12_room_1Tex_00B8A0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Tex_00B8A0" -static const ALIGN_ASSET(2) char spot12_room_1Tex_00B8A0[] = dspot12_room_1Tex_00B8A0; - -#define dspot12_room_1Tex_00B0A0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Tex_00B0A0" -static const ALIGN_ASSET(2) char spot12_room_1Tex_00B0A0[] = dspot12_room_1Tex_00B0A0; - -#define dspot12_room_1DL_001E58 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1DL_001E58" -static const ALIGN_ASSET(2) char spot12_room_1DL_001E58[] = dspot12_room_1DL_001E58; - -#define dspot12_room_1DL_002A60 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1DL_002A60" -static const ALIGN_ASSET(2) char spot12_room_1DL_002A60[] = dspot12_room_1DL_002A60; - -#define dspot12_room_1Tex_005638 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Tex_005638" +#define dspot12_room_1Tex_005638 "__OTR__scenes/shared/spot12_scene/spot12_room_1Tex_005638" static const ALIGN_ASSET(2) char spot12_room_1Tex_005638[] = dspot12_room_1Tex_005638; -#define dspot12_room_1Set_000200DL_0050A0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000200DL_0050A0" +#define dspot12_room_1Tex_006638 "__OTR__scenes/shared/spot12_scene/spot12_room_1Tex_006638" +static const ALIGN_ASSET(2) char spot12_room_1Tex_006638[] = dspot12_room_1Tex_006638; + +#define dspot12_room_1Tex_007638 "__OTR__scenes/shared/spot12_scene/spot12_room_1Tex_007638" +static const ALIGN_ASSET(2) char spot12_room_1Tex_007638[] = dspot12_room_1Tex_007638; + +#define dspot12_room_1Tex_007E38 "__OTR__scenes/shared/spot12_scene/spot12_room_1Tex_007E38" +static const ALIGN_ASSET(2) char spot12_room_1Tex_007E38[] = dspot12_room_1Tex_007E38; + +#define dspot12_room_1Tex_008E38 "__OTR__scenes/shared/spot12_scene/spot12_room_1Tex_008E38" +static const ALIGN_ASSET(2) char spot12_room_1Tex_008E38[] = dspot12_room_1Tex_008E38; + +#define dspot12_room_1Tex_009E38 "__OTR__scenes/shared/spot12_scene/spot12_room_1Tex_009E38" +static const ALIGN_ASSET(2) char spot12_room_1Tex_009E38[] = dspot12_room_1Tex_009E38; + +#define dspot12_room_1Tex_00A638 "__OTR__scenes/shared/spot12_scene/spot12_room_1Tex_00A638" +static const ALIGN_ASSET(2) char spot12_room_1Tex_00A638[] = dspot12_room_1Tex_00A638; + +#define dspot12_room_1Tex_00B0A0 "__OTR__scenes/shared/spot12_scene/spot12_room_1Tex_00B0A0" +static const ALIGN_ASSET(2) char spot12_room_1Tex_00B0A0[] = dspot12_room_1Tex_00B0A0; + +#define dspot12_room_1Tex_00B8A0 "__OTR__scenes/shared/spot12_scene/spot12_room_1Tex_00B8A0" +static const ALIGN_ASSET(2) char spot12_room_1Tex_00B8A0[] = dspot12_room_1Tex_00B8A0; + +#define dspot12_room_1DL_0050A0 "__OTR__scenes/shared/spot12_scene/spot12_room_1DL_0050A0" +static const ALIGN_ASSET(2) char spot12_room_1DL_0050A0[] = dspot12_room_1DL_0050A0; + +#define dspot12_room_1DL_0026A8 "__OTR__scenes/shared/spot12_scene/spot12_room_1DL_0026A8" +static const ALIGN_ASSET(2) char spot12_room_1DL_0026A8[] = dspot12_room_1DL_0026A8; + +#define dspot12_room_1DL_002DB0 "__OTR__scenes/shared/spot12_scene/spot12_room_1DL_002DB0" +static const ALIGN_ASSET(2) char spot12_room_1DL_002DB0[] = dspot12_room_1DL_002DB0; + +#define dspot12_room_1DL_001180 "__OTR__scenes/shared/spot12_scene/spot12_room_1DL_001180" +static const ALIGN_ASSET(2) char spot12_room_1DL_001180[] = dspot12_room_1DL_001180; + +#define dspot12_room_1DL_0034E8 "__OTR__scenes/shared/spot12_scene/spot12_room_1DL_0034E8" +static const ALIGN_ASSET(2) char spot12_room_1DL_0034E8[] = dspot12_room_1DL_0034E8; + +#define dspot12_room_1DL_004798 "__OTR__scenes/shared/spot12_scene/spot12_room_1DL_004798" +static const ALIGN_ASSET(2) char spot12_room_1DL_004798[] = dspot12_room_1DL_004798; + +#define dspot12_room_1DL_003E40 "__OTR__scenes/shared/spot12_scene/spot12_room_1DL_003E40" +static const ALIGN_ASSET(2) char spot12_room_1DL_003E40[] = dspot12_room_1DL_003E40; + +#define dspot12_room_1DL_00AF80 "__OTR__scenes/shared/spot12_scene/spot12_room_1DL_00AF80" +static const ALIGN_ASSET(2) char spot12_room_1DL_00AF80[] = dspot12_room_1DL_00AF80; + +#define dspot12_room_1DL_001E58 "__OTR__scenes/shared/spot12_scene/spot12_room_1DL_001E58" +static const ALIGN_ASSET(2) char spot12_room_1DL_001E58[] = dspot12_room_1DL_001E58; + +#define dspot12_room_1DL_002A60 "__OTR__scenes/shared/spot12_scene/spot12_room_1DL_002A60" +static const ALIGN_ASSET(2) char spot12_room_1DL_002A60[] = dspot12_room_1DL_002A60; + +#define dspot12_room_1Set_000200DL_0050A0 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000200DL_0050A0" static const ALIGN_ASSET(2) char spot12_room_1Set_000200DL_0050A0[] = dspot12_room_1Set_000200DL_0050A0; -#define dspot12_room_1Set_000200DL_0026A8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000200DL_0026A8" +#define dspot12_room_1Set_000200DL_0026A8 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000200DL_0026A8" static const ALIGN_ASSET(2) char spot12_room_1Set_000200DL_0026A8[] = dspot12_room_1Set_000200DL_0026A8; -#define dspot12_room_1Set_000200DL_002DB0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000200DL_002DB0" +#define dspot12_room_1Set_000200DL_002DB0 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000200DL_002DB0" static const ALIGN_ASSET(2) char spot12_room_1Set_000200DL_002DB0[] = dspot12_room_1Set_000200DL_002DB0; -#define dspot12_room_1Set_000200DL_001180 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000200DL_001180" +#define dspot12_room_1Set_000200DL_001180 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000200DL_001180" static const ALIGN_ASSET(2) char spot12_room_1Set_000200DL_001180[] = dspot12_room_1Set_000200DL_001180; -#define dspot12_room_1Set_000200DL_0034E8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000200DL_0034E8" +#define dspot12_room_1Set_000200DL_0034E8 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000200DL_0034E8" static const ALIGN_ASSET(2) char spot12_room_1Set_000200DL_0034E8[] = dspot12_room_1Set_000200DL_0034E8; -#define dspot12_room_1Set_000200DL_004798 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000200DL_004798" +#define dspot12_room_1Set_000200DL_004798 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000200DL_004798" static const ALIGN_ASSET(2) char spot12_room_1Set_000200DL_004798[] = dspot12_room_1Set_000200DL_004798; -#define dspot12_room_1Set_000200DL_003E40 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000200DL_003E40" +#define dspot12_room_1Set_000200DL_003E40 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000200DL_003E40" static const ALIGN_ASSET(2) char spot12_room_1Set_000200DL_003E40[] = dspot12_room_1Set_000200DL_003E40; -#define dspot12_room_1Set_000200DL_00AF80 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000200DL_00AF80" +#define dspot12_room_1Set_000200DL_00AF80 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000200DL_00AF80" static const ALIGN_ASSET(2) char spot12_room_1Set_000200DL_00AF80[] = dspot12_room_1Set_000200DL_00AF80; -#define dspot12_room_1Set_000200DL_001E58 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000200DL_001E58" +#define dspot12_room_1Set_000200DL_001E58 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000200DL_001E58" static const ALIGN_ASSET(2) char spot12_room_1Set_000200DL_001E58[] = dspot12_room_1Set_000200DL_001E58; -#define dspot12_room_1Set_000200DL_002A60 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000200DL_002A60" +#define dspot12_room_1Set_000200DL_002A60 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000200DL_002A60" static const ALIGN_ASSET(2) char spot12_room_1Set_000200DL_002A60[] = dspot12_room_1Set_000200DL_002A60; -#define dspot12_room_1Set_0003B0DL_0050A0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0003B0DL_0050A0" +#define dspot12_room_1Set_0003B0DL_0050A0 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0003B0DL_0050A0" static const ALIGN_ASSET(2) char spot12_room_1Set_0003B0DL_0050A0[] = dspot12_room_1Set_0003B0DL_0050A0; -#define dspot12_room_1Set_0003B0DL_0026A8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0003B0DL_0026A8" +#define dspot12_room_1Set_0003B0DL_0026A8 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0003B0DL_0026A8" static const ALIGN_ASSET(2) char spot12_room_1Set_0003B0DL_0026A8[] = dspot12_room_1Set_0003B0DL_0026A8; -#define dspot12_room_1Set_0003B0DL_002DB0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0003B0DL_002DB0" +#define dspot12_room_1Set_0003B0DL_002DB0 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0003B0DL_002DB0" static const ALIGN_ASSET(2) char spot12_room_1Set_0003B0DL_002DB0[] = dspot12_room_1Set_0003B0DL_002DB0; -#define dspot12_room_1Set_0003B0DL_001180 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0003B0DL_001180" +#define dspot12_room_1Set_0003B0DL_001180 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0003B0DL_001180" static const ALIGN_ASSET(2) char spot12_room_1Set_0003B0DL_001180[] = dspot12_room_1Set_0003B0DL_001180; -#define dspot12_room_1Set_0003B0DL_0034E8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0003B0DL_0034E8" +#define dspot12_room_1Set_0003B0DL_0034E8 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0003B0DL_0034E8" static const ALIGN_ASSET(2) char spot12_room_1Set_0003B0DL_0034E8[] = dspot12_room_1Set_0003B0DL_0034E8; -#define dspot12_room_1Set_0003B0DL_004798 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0003B0DL_004798" +#define dspot12_room_1Set_0003B0DL_004798 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0003B0DL_004798" static const ALIGN_ASSET(2) char spot12_room_1Set_0003B0DL_004798[] = dspot12_room_1Set_0003B0DL_004798; -#define dspot12_room_1Set_0003B0DL_003E40 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0003B0DL_003E40" +#define dspot12_room_1Set_0003B0DL_003E40 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0003B0DL_003E40" static const ALIGN_ASSET(2) char spot12_room_1Set_0003B0DL_003E40[] = dspot12_room_1Set_0003B0DL_003E40; -#define dspot12_room_1Set_0003B0DL_00AF80 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0003B0DL_00AF80" +#define dspot12_room_1Set_0003B0DL_00AF80 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0003B0DL_00AF80" static const ALIGN_ASSET(2) char spot12_room_1Set_0003B0DL_00AF80[] = dspot12_room_1Set_0003B0DL_00AF80; -#define dspot12_room_1Set_0003B0DL_001E58 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0003B0DL_001E58" +#define dspot12_room_1Set_0003B0DL_001E58 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0003B0DL_001E58" static const ALIGN_ASSET(2) char spot12_room_1Set_0003B0DL_001E58[] = dspot12_room_1Set_0003B0DL_001E58; -#define dspot12_room_1Set_0003B0DL_002A60 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0003B0DL_002A60" +#define dspot12_room_1Set_0003B0DL_002A60 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0003B0DL_002A60" static const ALIGN_ASSET(2) char spot12_room_1Set_0003B0DL_002A60[] = dspot12_room_1Set_0003B0DL_002A60; -#define dspot12_room_1Set_000500DL_0050A0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000500DL_0050A0" +#define dspot12_room_1Set_000500DL_0050A0 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000500DL_0050A0" static const ALIGN_ASSET(2) char spot12_room_1Set_000500DL_0050A0[] = dspot12_room_1Set_000500DL_0050A0; -#define dspot12_room_1Set_000500DL_0026A8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000500DL_0026A8" +#define dspot12_room_1Set_000500DL_0026A8 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000500DL_0026A8" static const ALIGN_ASSET(2) char spot12_room_1Set_000500DL_0026A8[] = dspot12_room_1Set_000500DL_0026A8; -#define dspot12_room_1Set_000500DL_002DB0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000500DL_002DB0" +#define dspot12_room_1Set_000500DL_002DB0 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000500DL_002DB0" static const ALIGN_ASSET(2) char spot12_room_1Set_000500DL_002DB0[] = dspot12_room_1Set_000500DL_002DB0; -#define dspot12_room_1Set_000500DL_001180 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000500DL_001180" +#define dspot12_room_1Set_000500DL_001180 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000500DL_001180" static const ALIGN_ASSET(2) char spot12_room_1Set_000500DL_001180[] = dspot12_room_1Set_000500DL_001180; -#define dspot12_room_1Set_000500DL_0034E8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000500DL_0034E8" +#define dspot12_room_1Set_000500DL_0034E8 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000500DL_0034E8" static const ALIGN_ASSET(2) char spot12_room_1Set_000500DL_0034E8[] = dspot12_room_1Set_000500DL_0034E8; -#define dspot12_room_1Set_000500DL_004798 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000500DL_004798" +#define dspot12_room_1Set_000500DL_004798 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000500DL_004798" static const ALIGN_ASSET(2) char spot12_room_1Set_000500DL_004798[] = dspot12_room_1Set_000500DL_004798; -#define dspot12_room_1Set_000500DL_003E40 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000500DL_003E40" +#define dspot12_room_1Set_000500DL_003E40 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000500DL_003E40" static const ALIGN_ASSET(2) char spot12_room_1Set_000500DL_003E40[] = dspot12_room_1Set_000500DL_003E40; -#define dspot12_room_1Set_000500DL_00AF80 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000500DL_00AF80" +#define dspot12_room_1Set_000500DL_00AF80 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000500DL_00AF80" static const ALIGN_ASSET(2) char spot12_room_1Set_000500DL_00AF80[] = dspot12_room_1Set_000500DL_00AF80; -#define dspot12_room_1Set_000500DL_001E58 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000500DL_001E58" +#define dspot12_room_1Set_000500DL_001E58 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000500DL_001E58" static const ALIGN_ASSET(2) char spot12_room_1Set_000500DL_001E58[] = dspot12_room_1Set_000500DL_001E58; -#define dspot12_room_1Set_000500DL_002A60 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000500DL_002A60" +#define dspot12_room_1Set_000500DL_002A60 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000500DL_002A60" static const ALIGN_ASSET(2) char spot12_room_1Set_000500DL_002A60[] = dspot12_room_1Set_000500DL_002A60; -#define dspot12_room_1Set_000720DL_0050A0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000720DL_0050A0" +#define dspot12_room_1Set_000720DL_0050A0 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000720DL_0050A0" static const ALIGN_ASSET(2) char spot12_room_1Set_000720DL_0050A0[] = dspot12_room_1Set_000720DL_0050A0; -#define dspot12_room_1Set_000720DL_0026A8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000720DL_0026A8" +#define dspot12_room_1Set_000720DL_0026A8 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000720DL_0026A8" static const ALIGN_ASSET(2) char spot12_room_1Set_000720DL_0026A8[] = dspot12_room_1Set_000720DL_0026A8; -#define dspot12_room_1Set_000720DL_002DB0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000720DL_002DB0" +#define dspot12_room_1Set_000720DL_002DB0 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000720DL_002DB0" static const ALIGN_ASSET(2) char spot12_room_1Set_000720DL_002DB0[] = dspot12_room_1Set_000720DL_002DB0; -#define dspot12_room_1Set_000720DL_001180 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000720DL_001180" +#define dspot12_room_1Set_000720DL_001180 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000720DL_001180" static const ALIGN_ASSET(2) char spot12_room_1Set_000720DL_001180[] = dspot12_room_1Set_000720DL_001180; -#define dspot12_room_1Set_000720DL_0034E8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000720DL_0034E8" +#define dspot12_room_1Set_000720DL_0034E8 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000720DL_0034E8" static const ALIGN_ASSET(2) char spot12_room_1Set_000720DL_0034E8[] = dspot12_room_1Set_000720DL_0034E8; -#define dspot12_room_1Set_000720DL_004798 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000720DL_004798" +#define dspot12_room_1Set_000720DL_004798 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000720DL_004798" static const ALIGN_ASSET(2) char spot12_room_1Set_000720DL_004798[] = dspot12_room_1Set_000720DL_004798; -#define dspot12_room_1Set_000720DL_003E40 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000720DL_003E40" +#define dspot12_room_1Set_000720DL_003E40 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000720DL_003E40" static const ALIGN_ASSET(2) char spot12_room_1Set_000720DL_003E40[] = dspot12_room_1Set_000720DL_003E40; -#define dspot12_room_1Set_000720DL_00AF80 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000720DL_00AF80" +#define dspot12_room_1Set_000720DL_00AF80 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000720DL_00AF80" static const ALIGN_ASSET(2) char spot12_room_1Set_000720DL_00AF80[] = dspot12_room_1Set_000720DL_00AF80; -#define dspot12_room_1Set_000720DL_001E58 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000720DL_001E58" +#define dspot12_room_1Set_000720DL_001E58 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000720DL_001E58" static const ALIGN_ASSET(2) char spot12_room_1Set_000720DL_001E58[] = dspot12_room_1Set_000720DL_001E58; -#define dspot12_room_1Set_000720DL_002A60 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000720DL_002A60" +#define dspot12_room_1Set_000720DL_002A60 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000720DL_002A60" static const ALIGN_ASSET(2) char spot12_room_1Set_000720DL_002A60[] = dspot12_room_1Set_000720DL_002A60; -#define dspot12_room_1Set_0007F0DL_0050A0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0007F0DL_0050A0" +#define dspot12_room_1Set_0007F0DL_0050A0 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0007F0DL_0050A0" static const ALIGN_ASSET(2) char spot12_room_1Set_0007F0DL_0050A0[] = dspot12_room_1Set_0007F0DL_0050A0; -#define dspot12_room_1Set_0007F0DL_0026A8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0007F0DL_0026A8" +#define dspot12_room_1Set_0007F0DL_0026A8 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0007F0DL_0026A8" static const ALIGN_ASSET(2) char spot12_room_1Set_0007F0DL_0026A8[] = dspot12_room_1Set_0007F0DL_0026A8; -#define dspot12_room_1Set_0007F0DL_002DB0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0007F0DL_002DB0" +#define dspot12_room_1Set_0007F0DL_002DB0 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0007F0DL_002DB0" static const ALIGN_ASSET(2) char spot12_room_1Set_0007F0DL_002DB0[] = dspot12_room_1Set_0007F0DL_002DB0; -#define dspot12_room_1Set_0007F0DL_001180 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0007F0DL_001180" +#define dspot12_room_1Set_0007F0DL_001180 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0007F0DL_001180" static const ALIGN_ASSET(2) char spot12_room_1Set_0007F0DL_001180[] = dspot12_room_1Set_0007F0DL_001180; -#define dspot12_room_1Set_0007F0DL_0034E8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0007F0DL_0034E8" +#define dspot12_room_1Set_0007F0DL_0034E8 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0007F0DL_0034E8" static const ALIGN_ASSET(2) char spot12_room_1Set_0007F0DL_0034E8[] = dspot12_room_1Set_0007F0DL_0034E8; -#define dspot12_room_1Set_0007F0DL_004798 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0007F0DL_004798" +#define dspot12_room_1Set_0007F0DL_004798 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0007F0DL_004798" static const ALIGN_ASSET(2) char spot12_room_1Set_0007F0DL_004798[] = dspot12_room_1Set_0007F0DL_004798; -#define dspot12_room_1Set_0007F0DL_003E40 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0007F0DL_003E40" +#define dspot12_room_1Set_0007F0DL_003E40 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0007F0DL_003E40" static const ALIGN_ASSET(2) char spot12_room_1Set_0007F0DL_003E40[] = dspot12_room_1Set_0007F0DL_003E40; -#define dspot12_room_1Set_0007F0DL_00AF80 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0007F0DL_00AF80" +#define dspot12_room_1Set_0007F0DL_00AF80 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0007F0DL_00AF80" static const ALIGN_ASSET(2) char spot12_room_1Set_0007F0DL_00AF80[] = dspot12_room_1Set_0007F0DL_00AF80; -#define dspot12_room_1Set_0007F0DL_001E58 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0007F0DL_001E58" +#define dspot12_room_1Set_0007F0DL_001E58 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0007F0DL_001E58" static const ALIGN_ASSET(2) char spot12_room_1Set_0007F0DL_001E58[] = dspot12_room_1Set_0007F0DL_001E58; -#define dspot12_room_1Set_0007F0DL_002A60 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0007F0DL_002A60" +#define dspot12_room_1Set_0007F0DL_002A60 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0007F0DL_002A60" static const ALIGN_ASSET(2) char spot12_room_1Set_0007F0DL_002A60[] = dspot12_room_1Set_0007F0DL_002A60; diff --git a/soh/assets/scenes/overworld/spot12/spot12_scene.h b/soh/assets/scenes/overworld/spot12/spot12_scene.h index f08278485..df4d41f4a 100644 --- a/soh/assets/scenes/overworld/spot12/spot12_scene.h +++ b/soh/assets/scenes/overworld/spot12/spot12_scene.h @@ -3,66 +3,66 @@ #include "align_asset_macro.h" -#define dgGerudoFortressFirstCaptureCs "__OTR__scenes/nonmq/spot12_scene/gGerudoFortressFirstCaptureCs" -static const ALIGN_ASSET(2) char gGerudoFortressFirstCaptureCs[] = dgGerudoFortressFirstCaptureCs; - -#define dgGerudoFortressIntroCs "__OTR__scenes/nonmq/spot12_scene/gGerudoFortressIntroCs" -static const ALIGN_ASSET(2) char gGerudoFortressIntroCs[] = dgGerudoFortressIntroCs; - -#define dgSpot12_009678Tex "__OTR__scenes/nonmq/spot12_scene/gSpot12_009678Tex" -static const ALIGN_ASSET(2) char gSpot12_009678Tex[] = dgSpot12_009678Tex; - -#define dgSpot12_00DE78Tex "__OTR__scenes/nonmq/spot12_scene/gSpot12_00DE78Tex" -static const ALIGN_ASSET(2) char gSpot12_00DE78Tex[] = dgSpot12_00DE78Tex; - -#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneCollisionHeader_005030" -static const ALIGN_ASSET(2) char spot12_sceneCollisionHeader_005030[] = dspot12_sceneCollisionHeader_005030; - -#define dspot12_sceneTex_008E78 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneTex_008E78" -static const ALIGN_ASSET(2) char spot12_sceneTex_008E78[] = dspot12_sceneTex_008E78; - -#define dspot12_sceneTLUT_006650 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneTLUT_006650" -static const ALIGN_ASSET(2) char spot12_sceneTLUT_006650[] = dspot12_sceneTLUT_006650; - -#define dspot12_sceneTex_00EE78 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneTex_00EE78" -static const ALIGN_ASSET(2) char spot12_sceneTex_00EE78[] = dspot12_sceneTex_00EE78; - -#define dspot12_sceneTex_007678 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneTex_007678" -static const ALIGN_ASSET(2) char spot12_sceneTex_007678[] = dspot12_sceneTex_007678; - -#define dspot12_sceneTex_006678 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneTex_006678" +#define dspot12_sceneTex_006678 "__OTR__scenes/shared/spot12_scene/spot12_sceneTex_006678" static const ALIGN_ASSET(2) char spot12_sceneTex_006678[] = dspot12_sceneTex_006678; -#define dspot12_sceneTex_00C678 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneTex_00C678" -static const ALIGN_ASSET(2) char spot12_sceneTex_00C678[] = dspot12_sceneTex_00C678; +#define dspot12_sceneTex_007678 "__OTR__scenes/shared/spot12_scene/spot12_sceneTex_007678" +static const ALIGN_ASSET(2) char spot12_sceneTex_007678[] = dspot12_sceneTex_007678; -#define dspot12_sceneTex_00B678 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneTex_00B678" -static const ALIGN_ASSET(2) char spot12_sceneTex_00B678[] = dspot12_sceneTex_00B678; - -#define dspot12_sceneTex_00BE78 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneTex_00BE78" -static const ALIGN_ASSET(2) char spot12_sceneTex_00BE78[] = dspot12_sceneTex_00BE78; - -#define dspot12_sceneTex_00CE78 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneTex_00CE78" -static const ALIGN_ASSET(2) char spot12_sceneTex_00CE78[] = dspot12_sceneTex_00CE78; - -#define dspot12_sceneTex_00A678 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneTex_00A678" -static const ALIGN_ASSET(2) char spot12_sceneTex_00A678[] = dspot12_sceneTex_00A678; - -#define dspot12_sceneTex_00D678 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneTex_00D678" -static const ALIGN_ASSET(2) char spot12_sceneTex_00D678[] = dspot12_sceneTex_00D678; - -#define dspot12_sceneTex_008678 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneTex_008678" +#define dspot12_sceneTex_008678 "__OTR__scenes/shared/spot12_scene/spot12_sceneTex_008678" static const ALIGN_ASSET(2) char spot12_sceneTex_008678[] = dspot12_sceneTex_008678; -#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneCollisionHeader_005030" +#define dspot12_sceneTex_008E78 "__OTR__scenes/shared/spot12_scene/spot12_sceneTex_008E78" +static const ALIGN_ASSET(2) char spot12_sceneTex_008E78[] = dspot12_sceneTex_008E78; -#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneCollisionHeader_005030" +#define dspot12_sceneTex_00A678 "__OTR__scenes/shared/spot12_scene/spot12_sceneTex_00A678" +static const ALIGN_ASSET(2) char spot12_sceneTex_00A678[] = dspot12_sceneTex_00A678; -#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneCollisionHeader_005030" +#define dspot12_sceneTex_00B678 "__OTR__scenes/shared/spot12_scene/spot12_sceneTex_00B678" +static const ALIGN_ASSET(2) char spot12_sceneTex_00B678[] = dspot12_sceneTex_00B678; -#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneCollisionHeader_005030" +#define dspot12_sceneTex_00BE78 "__OTR__scenes/shared/spot12_scene/spot12_sceneTex_00BE78" +static const ALIGN_ASSET(2) char spot12_sceneTex_00BE78[] = dspot12_sceneTex_00BE78; -#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneCollisionHeader_005030" +#define dspot12_sceneTex_00C678 "__OTR__scenes/shared/spot12_scene/spot12_sceneTex_00C678" +static const ALIGN_ASSET(2) char spot12_sceneTex_00C678[] = dspot12_sceneTex_00C678; + +#define dspot12_sceneTex_00CE78 "__OTR__scenes/shared/spot12_scene/spot12_sceneTex_00CE78" +static const ALIGN_ASSET(2) char spot12_sceneTex_00CE78[] = dspot12_sceneTex_00CE78; + +#define dspot12_sceneTex_00D678 "__OTR__scenes/shared/spot12_scene/spot12_sceneTex_00D678" +static const ALIGN_ASSET(2) char spot12_sceneTex_00D678[] = dspot12_sceneTex_00D678; + +#define dspot12_sceneTex_00EE78 "__OTR__scenes/shared/spot12_scene/spot12_sceneTex_00EE78" +static const ALIGN_ASSET(2) char spot12_sceneTex_00EE78[] = dspot12_sceneTex_00EE78; + +#define dspot12_sceneTLUT_006650 "__OTR__scenes/shared/spot12_scene/spot12_sceneTLUT_006650" +static const ALIGN_ASSET(2) char spot12_sceneTLUT_006650[] = dspot12_sceneTLUT_006650; + +#define dgGerudoFortressFirstCaptureCs "__OTR__scenes/shared/spot12_scene/gGerudoFortressFirstCaptureCs" +static const ALIGN_ASSET(2) char gGerudoFortressFirstCaptureCs[] = dgGerudoFortressFirstCaptureCs; + +#define dgGerudoFortressIntroCs "__OTR__scenes/shared/spot12_scene/gGerudoFortressIntroCs" +static const ALIGN_ASSET(2) char gGerudoFortressIntroCs[] = dgGerudoFortressIntroCs; + +#define dgSpot12_009678Tex "__OTR__scenes/shared/spot12_scene/gSpot12_009678Tex" +static const ALIGN_ASSET(2) char gSpot12_009678Tex[] = dgSpot12_009678Tex; + +#define dgSpot12_00DE78Tex "__OTR__scenes/shared/spot12_scene/gSpot12_00DE78Tex" +static const ALIGN_ASSET(2) char gSpot12_00DE78Tex[] = dgSpot12_00DE78Tex; + +#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/shared/spot12_scene/spot12_sceneCollisionHeader_005030" +static const ALIGN_ASSET(2) char spot12_sceneCollisionHeader_005030[] = dspot12_sceneCollisionHeader_005030; + +#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/shared/spot12_scene/spot12_sceneCollisionHeader_005030" + +#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/shared/spot12_scene/spot12_sceneCollisionHeader_005030" + +#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/shared/spot12_scene/spot12_sceneCollisionHeader_005030" + +#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/shared/spot12_scene/spot12_sceneCollisionHeader_005030" + +#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/shared/spot12_scene/spot12_sceneCollisionHeader_005030" #endif // OVERWORLD_SPOT12_SCENE_H diff --git a/soh/assets/scenes/overworld/spot13/spot13_room_0.h b/soh/assets/scenes/overworld/spot13/spot13_room_0.h index 95d567382..61954b60e 100644 --- a/soh/assets/scenes/overworld/spot13/spot13_room_0.h +++ b/soh/assets/scenes/overworld/spot13/spot13_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dspot13_room_0DL_0008F8 "__OTR__scenes/nonmq/spot13_scene/spot13_room_0DL_0008F8" +#define dspot13_room_0DL_0008F8 "__OTR__scenes/shared/spot13_scene/spot13_room_0DL_0008F8" static const ALIGN_ASSET(2) char spot13_room_0DL_0008F8[] = dspot13_room_0DL_0008F8; diff --git a/soh/assets/scenes/overworld/spot13/spot13_room_1.h b/soh/assets/scenes/overworld/spot13/spot13_room_1.h index 59bd37305..540ead3a9 100644 --- a/soh/assets/scenes/overworld/spot13/spot13_room_1.h +++ b/soh/assets/scenes/overworld/spot13/spot13_room_1.h @@ -3,86 +3,86 @@ #include "align_asset_macro.h" -#define dspot13_room_1DL_007D68 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1DL_007D68" -static const ALIGN_ASSET(2) char spot13_room_1DL_007D68[] = dspot13_room_1DL_007D68; - -#define dspot13_room_1Tex_00EE08 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_00EE08" -static const ALIGN_ASSET(2) char spot13_room_1Tex_00EE08[] = dspot13_room_1Tex_00EE08; - -#define dspot13_room_1Tex_008608 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_008608" -static const ALIGN_ASSET(2) char spot13_room_1Tex_008608[] = dspot13_room_1Tex_008608; - -#define dspot13_room_1Tex_00C408 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_00C408" -static const ALIGN_ASSET(2) char spot13_room_1Tex_00C408[] = dspot13_room_1Tex_00C408; - -#define dspot13_room_1Tex_00AE08 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_00AE08" -static const ALIGN_ASSET(2) char spot13_room_1Tex_00AE08[] = dspot13_room_1Tex_00AE08; - -#define dspot13_room_1TLUT_007DC0 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1TLUT_007DC0" -static const ALIGN_ASSET(2) char spot13_room_1TLUT_007DC0[] = dspot13_room_1TLUT_007DC0; - -#define dspot13_room_1Tex_00B808 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_00B808" -static const ALIGN_ASSET(2) char spot13_room_1Tex_00B808[] = dspot13_room_1Tex_00B808; - -#define dspot13_room_1TLUT_007DE8 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1TLUT_007DE8" -static const ALIGN_ASSET(2) char spot13_room_1TLUT_007DE8[] = dspot13_room_1TLUT_007DE8; - -#define dspot13_room_1Tex_008A08 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_008A08" -static const ALIGN_ASSET(2) char spot13_room_1Tex_008A08[] = dspot13_room_1Tex_008A08; - -#define dspot13_room_1Tex_007E08 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_007E08" +#define dspot13_room_1Tex_007E08 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_007E08" static const ALIGN_ASSET(2) char spot13_room_1Tex_007E08[] = dspot13_room_1Tex_007E08; -#define dspot13_room_1Tex_009A08 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_009A08" +#define dspot13_room_1Tex_008608 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_008608" +static const ALIGN_ASSET(2) char spot13_room_1Tex_008608[] = dspot13_room_1Tex_008608; + +#define dspot13_room_1Tex_008A08 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_008A08" +static const ALIGN_ASSET(2) char spot13_room_1Tex_008A08[] = dspot13_room_1Tex_008A08; + +#define dspot13_room_1Tex_009A08 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_009A08" static const ALIGN_ASSET(2) char spot13_room_1Tex_009A08[] = dspot13_room_1Tex_009A08; -#define dspot13_room_1Tex_009C08 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_009C08" +#define dspot13_room_1Tex_009C08 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_009C08" static const ALIGN_ASSET(2) char spot13_room_1Tex_009C08[] = dspot13_room_1Tex_009C08; -#define dspot13_room_1Tex_010E08 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_010E08" -static const ALIGN_ASSET(2) char spot13_room_1Tex_010E08[] = dspot13_room_1Tex_010E08; - -#define dspot13_room_1Tex_00A608 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_00A608" -static const ALIGN_ASSET(2) char spot13_room_1Tex_00A608[] = dspot13_room_1Tex_00A608; - -#define dspot13_room_1Tex_00FE08 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_00FE08" -static const ALIGN_ASSET(2) char spot13_room_1Tex_00FE08[] = dspot13_room_1Tex_00FE08; - -#define dspot13_room_1Tex_009E08 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_009E08" +#define dspot13_room_1Tex_009E08 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_009E08" static const ALIGN_ASSET(2) char spot13_room_1Tex_009E08[] = dspot13_room_1Tex_009E08; -#define dspot13_room_1Tex_010608 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_010608" -static const ALIGN_ASSET(2) char spot13_room_1Tex_010608[] = dspot13_room_1Tex_010608; +#define dspot13_room_1Tex_00A608 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_00A608" +static const ALIGN_ASSET(2) char spot13_room_1Tex_00A608[] = dspot13_room_1Tex_00A608; -#define dspot13_room_1Tex_00B608 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_00B608" -static const ALIGN_ASSET(2) char spot13_room_1Tex_00B608[] = dspot13_room_1Tex_00B608; - -#define dspot13_room_1Tex_011208 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_011208" -static const ALIGN_ASSET(2) char spot13_room_1Tex_011208[] = dspot13_room_1Tex_011208; - -#define dspot13_room_1Tex_00C608 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_00C608" -static const ALIGN_ASSET(2) char spot13_room_1Tex_00C608[] = dspot13_room_1Tex_00C608; - -#define dspot13_room_1Tex_00AA08 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_00AA08" +#define dspot13_room_1Tex_00AA08 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_00AA08" static const ALIGN_ASSET(2) char spot13_room_1Tex_00AA08[] = dspot13_room_1Tex_00AA08; -#define dspot13_room_1Tex_00BC08 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_00BC08" +#define dspot13_room_1Tex_00AE08 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_00AE08" +static const ALIGN_ASSET(2) char spot13_room_1Tex_00AE08[] = dspot13_room_1Tex_00AE08; + +#define dspot13_room_1Tex_00B608 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_00B608" +static const ALIGN_ASSET(2) char spot13_room_1Tex_00B608[] = dspot13_room_1Tex_00B608; + +#define dspot13_room_1Tex_00B808 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_00B808" +static const ALIGN_ASSET(2) char spot13_room_1Tex_00B808[] = dspot13_room_1Tex_00B808; + +#define dspot13_room_1Tex_00BC08 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_00BC08" static const ALIGN_ASSET(2) char spot13_room_1Tex_00BC08[] = dspot13_room_1Tex_00BC08; -#define dspot13_room_1Tex_00E608 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_00E608" -static const ALIGN_ASSET(2) char spot13_room_1Tex_00E608[] = dspot13_room_1Tex_00E608; +#define dspot13_room_1Tex_00C408 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_00C408" +static const ALIGN_ASSET(2) char spot13_room_1Tex_00C408[] = dspot13_room_1Tex_00C408; -#define dspot13_room_1Tex_00D608 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_00D608" +#define dspot13_room_1Tex_00C608 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_00C608" +static const ALIGN_ASSET(2) char spot13_room_1Tex_00C608[] = dspot13_room_1Tex_00C608; + +#define dspot13_room_1Tex_00D608 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_00D608" static const ALIGN_ASSET(2) char spot13_room_1Tex_00D608[] = dspot13_room_1Tex_00D608; -#define dspot13_room_1DL_011E28 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1DL_011E28" -static const ALIGN_ASSET(2) char spot13_room_1DL_011E28[] = dspot13_room_1DL_011E28; +#define dspot13_room_1Tex_00E608 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_00E608" +static const ALIGN_ASSET(2) char spot13_room_1Tex_00E608[] = dspot13_room_1Tex_00E608; -#define dspot13_room_1Tex_012240 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_012240" +#define dspot13_room_1Tex_00EE08 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_00EE08" +static const ALIGN_ASSET(2) char spot13_room_1Tex_00EE08[] = dspot13_room_1Tex_00EE08; + +#define dspot13_room_1Tex_00FE08 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_00FE08" +static const ALIGN_ASSET(2) char spot13_room_1Tex_00FE08[] = dspot13_room_1Tex_00FE08; + +#define dspot13_room_1Tex_010608 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_010608" +static const ALIGN_ASSET(2) char spot13_room_1Tex_010608[] = dspot13_room_1Tex_010608; + +#define dspot13_room_1Tex_010E08 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_010E08" +static const ALIGN_ASSET(2) char spot13_room_1Tex_010E08[] = dspot13_room_1Tex_010E08; + +#define dspot13_room_1Tex_011208 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_011208" +static const ALIGN_ASSET(2) char spot13_room_1Tex_011208[] = dspot13_room_1Tex_011208; + +#define dspot13_room_1Tex_011E40 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_011E40" +static const ALIGN_ASSET(2) char spot13_room_1Tex_011E40[] = dspot13_room_1Tex_011E40; + +#define dspot13_room_1Tex_012240 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_012240" static const ALIGN_ASSET(2) char spot13_room_1Tex_012240[] = dspot13_room_1Tex_012240; -#define dspot13_room_1Tex_011E40 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_011E40" -static const ALIGN_ASSET(2) char spot13_room_1Tex_011E40[] = dspot13_room_1Tex_011E40; +#define dspot13_room_1TLUT_007DC0 "__OTR__scenes/shared/spot13_scene/spot13_room_1TLUT_007DC0" +static const ALIGN_ASSET(2) char spot13_room_1TLUT_007DC0[] = dspot13_room_1TLUT_007DC0; + +#define dspot13_room_1TLUT_007DE8 "__OTR__scenes/shared/spot13_scene/spot13_room_1TLUT_007DE8" +static const ALIGN_ASSET(2) char spot13_room_1TLUT_007DE8[] = dspot13_room_1TLUT_007DE8; + +#define dspot13_room_1DL_007D68 "__OTR__scenes/shared/spot13_scene/spot13_room_1DL_007D68" +static const ALIGN_ASSET(2) char spot13_room_1DL_007D68[] = dspot13_room_1DL_007D68; + +#define dspot13_room_1DL_011E28 "__OTR__scenes/shared/spot13_scene/spot13_room_1DL_011E28" +static const ALIGN_ASSET(2) char spot13_room_1DL_011E28[] = dspot13_room_1DL_011E28; #endif // OVERWORLD_SPOT13_ROOM_1_H diff --git a/soh/assets/scenes/overworld/spot13/spot13_scene.h b/soh/assets/scenes/overworld/spot13/spot13_scene.h index a4e7eb89e..68375d20e 100644 --- a/soh/assets/scenes/overworld/spot13/spot13_scene.h +++ b/soh/assets/scenes/overworld/spot13/spot13_scene.h @@ -3,16 +3,17 @@ #include "align_asset_macro.h" -#define dspot13_sceneCollisionHeader_003A00 "__OTR__scenes/nonmq/spot13_scene/spot13_sceneCollisionHeader_003A00" -static const ALIGN_ASSET(2) char spot13_sceneCollisionHeader_003A00[] = dspot13_sceneCollisionHeader_003A00; - -#define dspot13_sceneTex_004E30 "__OTR__scenes/nonmq/spot13_scene/spot13_sceneTex_004E30" -static const ALIGN_ASSET(2) char spot13_sceneTex_004E30[] = dspot13_sceneTex_004E30; - -#define dspot13_sceneTex_003E30 "__OTR__scenes/nonmq/spot13_scene/spot13_sceneTex_003E30" -static const ALIGN_ASSET(2) char spot13_sceneTex_003E30[] = dspot13_sceneTex_003E30; - -#define dspot13_sceneTex_003A30 "__OTR__scenes/nonmq/spot13_scene/spot13_sceneTex_003A30" +#define dspot13_sceneTex_003A30 "__OTR__scenes/shared/spot13_scene/spot13_sceneTex_003A30" static const ALIGN_ASSET(2) char spot13_sceneTex_003A30[] = dspot13_sceneTex_003A30; +#define dspot13_sceneTex_003E30 "__OTR__scenes/shared/spot13_scene/spot13_sceneTex_003E30" +static const ALIGN_ASSET(2) char spot13_sceneTex_003E30[] = dspot13_sceneTex_003E30; + +#define dspot13_sceneTex_004E30 "__OTR__scenes/shared/spot13_scene/spot13_sceneTex_004E30" +static const ALIGN_ASSET(2) char spot13_sceneTex_004E30[] = dspot13_sceneTex_004E30; + +#define dspot13_sceneCollisionHeader_003A00 "__OTR__scenes/shared/spot13_scene/spot13_sceneCollisionHeader_003A00" +static const ALIGN_ASSET(2) char spot13_sceneCollisionHeader_003A00[] = dspot13_sceneCollisionHeader_003A00; + + #endif // OVERWORLD_SPOT13_SCENE_H diff --git a/soh/assets/scenes/overworld/spot15/spot15_room_0.h b/soh/assets/scenes/overworld/spot15/spot15_room_0.h index a0fc18ce3..2cfd661a0 100644 --- a/soh/assets/scenes/overworld/spot15/spot15_room_0.h +++ b/soh/assets/scenes/overworld/spot15/spot15_room_0.h @@ -3,115 +3,115 @@ #include "align_asset_macro.h" -#define dspot15_room_0DL_0093C0 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_0093C0" +#define dspot15_room_0DL_0093C0 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_0093C0" static const ALIGN_ASSET(2) char spot15_room_0DL_0093C0[] = dspot15_room_0DL_0093C0; -#define dspot15_room_0DL_00CBD8 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00CBD8" +#define dspot15_room_0DL_00CBD8 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00CBD8" static const ALIGN_ASSET(2) char spot15_room_0DL_00CBD8[] = dspot15_room_0DL_00CBD8; -#define dspot15_room_0DL_00B1D8 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00B1D8" +#define dspot15_room_0DL_00B1D8 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00B1D8" static const ALIGN_ASSET(2) char spot15_room_0DL_00B1D8[] = dspot15_room_0DL_00B1D8; -#define dspot15_room_0DL_00AB18 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00AB18" +#define dspot15_room_0DL_00AB18 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00AB18" static const ALIGN_ASSET(2) char spot15_room_0DL_00AB18[] = dspot15_room_0DL_00AB18; -#define dspot15_room_0DL_007EE8 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_007EE8" +#define dspot15_room_0DL_007EE8 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_007EE8" static const ALIGN_ASSET(2) char spot15_room_0DL_007EE8[] = dspot15_room_0DL_007EE8; -#define dspot15_room_0DL_0082A0 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_0082A0" +#define dspot15_room_0DL_0082A0 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_0082A0" static const ALIGN_ASSET(2) char spot15_room_0DL_0082A0[] = dspot15_room_0DL_0082A0; -#define dspot15_room_0DL_008728 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_008728" +#define dspot15_room_0DL_008728 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_008728" static const ALIGN_ASSET(2) char spot15_room_0DL_008728[] = dspot15_room_0DL_008728; -#define dspot15_room_0DL_00C0F8 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00C0F8" +#define dspot15_room_0DL_00C0F8 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00C0F8" static const ALIGN_ASSET(2) char spot15_room_0DL_00C0F8[] = dspot15_room_0DL_00C0F8; -#define dspot15_room_0DL_004A78 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_004A78" +#define dspot15_room_0DL_004A78 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_004A78" static const ALIGN_ASSET(2) char spot15_room_0DL_004A78[] = dspot15_room_0DL_004A78; -#define dspot15_room_0DL_00B8A0 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00B8A0" +#define dspot15_room_0DL_00B8A0 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00B8A0" static const ALIGN_ASSET(2) char spot15_room_0DL_00B8A0[] = dspot15_room_0DL_00B8A0; -#define dspot15_room_0DL_001160 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_001160" +#define dspot15_room_0DL_001160 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_001160" static const ALIGN_ASSET(2) char spot15_room_0DL_001160[] = dspot15_room_0DL_001160; -#define dspot15_room_0DL_0019E0 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_0019E0" +#define dspot15_room_0DL_0019E0 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_0019E0" static const ALIGN_ASSET(2) char spot15_room_0DL_0019E0[] = dspot15_room_0DL_0019E0; -#define dspot15_room_0DL_0020E8 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_0020E8" +#define dspot15_room_0DL_0020E8 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_0020E8" static const ALIGN_ASSET(2) char spot15_room_0DL_0020E8[] = dspot15_room_0DL_0020E8; -#define dspot15_room_0DL_0047C0 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_0047C0" +#define dspot15_room_0DL_0047C0 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_0047C0" static const ALIGN_ASSET(2) char spot15_room_0DL_0047C0[] = dspot15_room_0DL_0047C0; -#define dspot15_room_0DL_005550 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_005550" +#define dspot15_room_0DL_005550 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_005550" static const ALIGN_ASSET(2) char spot15_room_0DL_005550[] = dspot15_room_0DL_005550; -#define dspot15_room_0DL_008EF8 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_008EF8" +#define dspot15_room_0DL_008EF8 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_008EF8" static const ALIGN_ASSET(2) char spot15_room_0DL_008EF8[] = dspot15_room_0DL_008EF8; -#define dspot15_room_0DL_00C270 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00C270" +#define dspot15_room_0DL_00C270 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00C270" static const ALIGN_ASSET(2) char spot15_room_0DL_00C270[] = dspot15_room_0DL_00C270; -#define dspot15_room_0DL_003C58 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_003C58" +#define dspot15_room_0DL_003C58 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_003C58" static const ALIGN_ASSET(2) char spot15_room_0DL_003C58[] = dspot15_room_0DL_003C58; -#define dspot15_room_0DL_00BEC0 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00BEC0" +#define dspot15_room_0DL_00BEC0 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00BEC0" static const ALIGN_ASSET(2) char spot15_room_0DL_00BEC0[] = dspot15_room_0DL_00BEC0; -#define dspot15_room_0DL_004588 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_004588" +#define dspot15_room_0DL_004588 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_004588" static const ALIGN_ASSET(2) char spot15_room_0DL_004588[] = dspot15_room_0DL_004588; -#define dspot15_room_0DL_00A118 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00A118" +#define dspot15_room_0DL_00A118 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00A118" static const ALIGN_ASSET(2) char spot15_room_0DL_00A118[] = dspot15_room_0DL_00A118; -#define dspot15_room_0DL_00A5C0 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00A5C0" +#define dspot15_room_0DL_00A5C0 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00A5C0" static const ALIGN_ASSET(2) char spot15_room_0DL_00A5C0[] = dspot15_room_0DL_00A5C0; -#define dspot15_room_0DL_00C748 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00C748" +#define dspot15_room_0DL_00C748 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00C748" static const ALIGN_ASSET(2) char spot15_room_0DL_00C748[] = dspot15_room_0DL_00C748; -#define dspot15_room_0DL_005EB0 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_005EB0" +#define dspot15_room_0DL_005EB0 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_005EB0" static const ALIGN_ASSET(2) char spot15_room_0DL_005EB0[] = dspot15_room_0DL_005EB0; -#define dspot15_room_0DL_006510 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_006510" +#define dspot15_room_0DL_006510 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_006510" static const ALIGN_ASSET(2) char spot15_room_0DL_006510[] = dspot15_room_0DL_006510; -#define dspot15_room_0DL_006A20 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_006A20" +#define dspot15_room_0DL_006A20 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_006A20" static const ALIGN_ASSET(2) char spot15_room_0DL_006A20[] = dspot15_room_0DL_006A20; -#define dspot15_room_0DL_007278 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_007278" +#define dspot15_room_0DL_007278 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_007278" static const ALIGN_ASSET(2) char spot15_room_0DL_007278[] = dspot15_room_0DL_007278; -#define dspot15_room_0DL_007B38 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_007B38" +#define dspot15_room_0DL_007B38 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_007B38" static const ALIGN_ASSET(2) char spot15_room_0DL_007B38[] = dspot15_room_0DL_007B38; -#define dspot15_room_0DL_004E88 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_004E88" +#define dspot15_room_0DL_004E88 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_004E88" static const ALIGN_ASSET(2) char spot15_room_0DL_004E88[] = dspot15_room_0DL_004E88; -#define dspot15_room_0DL_00D098 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00D098" +#define dspot15_room_0DL_00D098 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00D098" static const ALIGN_ASSET(2) char spot15_room_0DL_00D098[] = dspot15_room_0DL_00D098; -#define dspot15_room_0DL_00CE90 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00CE90" +#define dspot15_room_0DL_00CE90 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00CE90" static const ALIGN_ASSET(2) char spot15_room_0DL_00CE90[] = dspot15_room_0DL_00CE90; -#define dspot15_room_0DL_0036D0 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_0036D0" +#define dspot15_room_0DL_0036D0 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_0036D0" static const ALIGN_ASSET(2) char spot15_room_0DL_0036D0[] = dspot15_room_0DL_0036D0; -#define dspot15_room_0DL_0091D8 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_0091D8" +#define dspot15_room_0DL_0091D8 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_0091D8" static const ALIGN_ASSET(2) char spot15_room_0DL_0091D8[] = dspot15_room_0DL_0091D8; -#define dspot15_room_0DL_002C50 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_002C50" +#define dspot15_room_0DL_002C50 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_002C50" static const ALIGN_ASSET(2) char spot15_room_0DL_002C50[] = dspot15_room_0DL_002C50; -#define dspot15_room_0DL_00BBC0 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00BBC0" +#define dspot15_room_0DL_00BBC0 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00BBC0" static const ALIGN_ASSET(2) char spot15_room_0DL_00BBC0[] = dspot15_room_0DL_00BBC0; -#define dspot15_room_0DL_00B628 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00B628" +#define dspot15_room_0DL_00B628 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00B628" static const ALIGN_ASSET(2) char spot15_room_0DL_00B628[] = dspot15_room_0DL_00B628; -#define dspot15_room_0DL_0041F0 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_0041F0" +#define dspot15_room_0DL_0041F0 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_0041F0" static const ALIGN_ASSET(2) char spot15_room_0DL_0041F0[] = dspot15_room_0DL_0041F0; diff --git a/soh/assets/scenes/overworld/spot15/spot15_scene.h b/soh/assets/scenes/overworld/spot15/spot15_scene.h index 73e3adc62..48febaec5 100644 --- a/soh/assets/scenes/overworld/spot15/spot15_scene.h +++ b/soh/assets/scenes/overworld/spot15/spot15_scene.h @@ -3,139 +3,140 @@ #include "align_asset_macro.h" -#define dgHyruleCastleIntroCs "__OTR__scenes/nonmq/spot15_scene/gHyruleCastleIntroCs" -static const ALIGN_ASSET(2) char gHyruleCastleIntroCs[] = dgHyruleCastleIntroCs; - -#define dspot15_sceneCollisionHeader_003CE8 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneCollisionHeader_003CE8" -static const ALIGN_ASSET(2) char spot15_sceneCollisionHeader_003CE8[] = dspot15_sceneCollisionHeader_003CE8; - -#define dspot15_sceneTex_013400 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_013400" -static const ALIGN_ASSET(2) char spot15_sceneTex_013400[] = dspot15_sceneTex_013400; - -#define dspot15_sceneTex_004900 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_004900" -static const ALIGN_ASSET(2) char spot15_sceneTex_004900[] = dspot15_sceneTex_004900; - -#define dspot15_sceneTex_004A00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_004A00" -static const ALIGN_ASSET(2) char spot15_sceneTex_004A00[] = dspot15_sceneTex_004A00; - -#define dspot15_sceneTex_006400 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_006400" -static const ALIGN_ASSET(2) char spot15_sceneTex_006400[] = dspot15_sceneTex_006400; - -#define dspot15_sceneTex_010400 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_010400" -static const ALIGN_ASSET(2) char spot15_sceneTex_010400[] = dspot15_sceneTex_010400; - -#define dspot15_sceneTex_011400 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_011400" -static const ALIGN_ASSET(2) char spot15_sceneTex_011400[] = dspot15_sceneTex_011400; - -#define dspot15_sceneTex_007300 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_007300" -static const ALIGN_ASSET(2) char spot15_sceneTex_007300[] = dspot15_sceneTex_007300; - -#define dspot15_sceneTex_006F00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_006F00" -static const ALIGN_ASSET(2) char spot15_sceneTex_006F00[] = dspot15_sceneTex_006F00; - -#define dspot15_sceneTex_007B00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_007B00" -static const ALIGN_ASSET(2) char spot15_sceneTex_007B00[] = dspot15_sceneTex_007B00; - -#define dspot15_sceneTex_014400 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_014400" -static const ALIGN_ASSET(2) char spot15_sceneTex_014400[] = dspot15_sceneTex_014400; - -#define dspot15_sceneTex_00FC00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_00FC00" -static const ALIGN_ASSET(2) char spot15_sceneTex_00FC00[] = dspot15_sceneTex_00FC00; - -#define dspot15_sceneTex_011C00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_011C00" -static const ALIGN_ASSET(2) char spot15_sceneTex_011C00[] = dspot15_sceneTex_011C00; - -#define dspot15_sceneTex_014C00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_014C00" -static const ALIGN_ASSET(2) char spot15_sceneTex_014C00[] = dspot15_sceneTex_014C00; - -#define dspot15_sceneTex_00DA00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_00DA00" -static const ALIGN_ASSET(2) char spot15_sceneTex_00DA00[] = dspot15_sceneTex_00DA00; - -#define dspot15_sceneTex_007C00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_007C00" -static const ALIGN_ASSET(2) char spot15_sceneTex_007C00[] = dspot15_sceneTex_007C00; - -#define dspot15_sceneTex_009900 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_009900" -static const ALIGN_ASSET(2) char spot15_sceneTex_009900[] = dspot15_sceneTex_009900; - -#define dspot15_sceneTex_00A900 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_00A900" -static const ALIGN_ASSET(2) char spot15_sceneTex_00A900[] = dspot15_sceneTex_00A900; - -#define dspot15_sceneTex_010C00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_010C00" -static const ALIGN_ASSET(2) char spot15_sceneTex_010C00[] = dspot15_sceneTex_010C00; - -#define dspot15_sceneTex_016C00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_016C00" -static const ALIGN_ASSET(2) char spot15_sceneTex_016C00[] = dspot15_sceneTex_016C00; - -#define dspot15_sceneTex_00A100 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_00A100" -static const ALIGN_ASSET(2) char spot15_sceneTex_00A100[] = dspot15_sceneTex_00A100; - -#define dspot15_sceneTex_017400 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_017400" -static const ALIGN_ASSET(2) char spot15_sceneTex_017400[] = dspot15_sceneTex_017400; - -#define dspot15_sceneTex_00EC00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_00EC00" -static const ALIGN_ASSET(2) char spot15_sceneTex_00EC00[] = dspot15_sceneTex_00EC00; - -#define dspot15_sceneTex_008E00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_008E00" -static const ALIGN_ASSET(2) char spot15_sceneTex_008E00[] = dspot15_sceneTex_008E00; - -#define dspot15_sceneTex_015E00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_015E00" -static const ALIGN_ASSET(2) char spot15_sceneTex_015E00[] = dspot15_sceneTex_015E00; - -#define dspot15_sceneTex_00CA00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_00CA00" -static const ALIGN_ASSET(2) char spot15_sceneTex_00CA00[] = dspot15_sceneTex_00CA00; - -#define dspot15_sceneTex_004100 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_004100" +#define dspot15_sceneTex_004100 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_004100" static const ALIGN_ASSET(2) char spot15_sceneTex_004100[] = dspot15_sceneTex_004100; -#define dspot15_sceneTex_00BA00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_00BA00" -static const ALIGN_ASSET(2) char spot15_sceneTex_00BA00[] = dspot15_sceneTex_00BA00; +#define dspot15_sceneTex_004900 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_004900" +static const ALIGN_ASSET(2) char spot15_sceneTex_004900[] = dspot15_sceneTex_004900; -#define dspot15_sceneTex_009800 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_009800" -static const ALIGN_ASSET(2) char spot15_sceneTex_009800[] = dspot15_sceneTex_009800; +#define dspot15_sceneTex_004A00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_004A00" +static const ALIGN_ASSET(2) char spot15_sceneTex_004A00[] = dspot15_sceneTex_004A00; -#define dspot15_sceneTex_015C00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_015C00" -static const ALIGN_ASSET(2) char spot15_sceneTex_015C00[] = dspot15_sceneTex_015C00; - -#define dspot15_sceneTex_018400 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_018400" -static const ALIGN_ASSET(2) char spot15_sceneTex_018400[] = dspot15_sceneTex_018400; - -#define dspot15_sceneTex_00B900 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_00B900" -static const ALIGN_ASSET(2) char spot15_sceneTex_00B900[] = dspot15_sceneTex_00B900; - -#define dspot15_sceneTex_00C200 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_00C200" -static const ALIGN_ASSET(2) char spot15_sceneTex_00C200[] = dspot15_sceneTex_00C200; - -#define dspot15_sceneTex_016600 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_016600" -static const ALIGN_ASSET(2) char spot15_sceneTex_016600[] = dspot15_sceneTex_016600; - -#define dspot15_sceneTex_006D00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_006D00" -static const ALIGN_ASSET(2) char spot15_sceneTex_006D00[] = dspot15_sceneTex_006D00; - -#define dspot15_sceneTex_00EA00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_00EA00" -static const ALIGN_ASSET(2) char spot15_sceneTex_00EA00[] = dspot15_sceneTex_00EA00; - -#define dspot15_sceneTex_012400 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_012400" -static const ALIGN_ASSET(2) char spot15_sceneTex_012400[] = dspot15_sceneTex_012400; - -#define dspot15_sceneTex_005400 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_005400" -static const ALIGN_ASSET(2) char spot15_sceneTex_005400[] = dspot15_sceneTex_005400; - -#define dspot15_sceneTex_007E00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_007E00" -static const ALIGN_ASSET(2) char spot15_sceneTex_007E00[] = dspot15_sceneTex_007E00; - -#define dspot15_sceneTex_017C00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_017C00" -static const ALIGN_ASSET(2) char spot15_sceneTex_017C00[] = dspot15_sceneTex_017C00; - -#define dspot15_sceneTex_006500 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_006500" -static const ALIGN_ASSET(2) char spot15_sceneTex_006500[] = dspot15_sceneTex_006500; - -#define dspot15_sceneTex_009600 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_009600" -static const ALIGN_ASSET(2) char spot15_sceneTex_009600[] = dspot15_sceneTex_009600; - -#define dspot15_sceneTex_004C00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_004C00" +#define dspot15_sceneTex_004C00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_004C00" static const ALIGN_ASSET(2) char spot15_sceneTex_004C00[] = dspot15_sceneTex_004C00; -#define dspot15_sceneTex_016800 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_016800" +#define dspot15_sceneTex_005400 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_005400" +static const ALIGN_ASSET(2) char spot15_sceneTex_005400[] = dspot15_sceneTex_005400; + +#define dspot15_sceneTex_006400 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_006400" +static const ALIGN_ASSET(2) char spot15_sceneTex_006400[] = dspot15_sceneTex_006400; + +#define dspot15_sceneTex_006500 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_006500" +static const ALIGN_ASSET(2) char spot15_sceneTex_006500[] = dspot15_sceneTex_006500; + +#define dspot15_sceneTex_006D00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_006D00" +static const ALIGN_ASSET(2) char spot15_sceneTex_006D00[] = dspot15_sceneTex_006D00; + +#define dspot15_sceneTex_006F00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_006F00" +static const ALIGN_ASSET(2) char spot15_sceneTex_006F00[] = dspot15_sceneTex_006F00; + +#define dspot15_sceneTex_007300 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_007300" +static const ALIGN_ASSET(2) char spot15_sceneTex_007300[] = dspot15_sceneTex_007300; + +#define dspot15_sceneTex_007B00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_007B00" +static const ALIGN_ASSET(2) char spot15_sceneTex_007B00[] = dspot15_sceneTex_007B00; + +#define dspot15_sceneTex_007C00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_007C00" +static const ALIGN_ASSET(2) char spot15_sceneTex_007C00[] = dspot15_sceneTex_007C00; + +#define dspot15_sceneTex_007E00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_007E00" +static const ALIGN_ASSET(2) char spot15_sceneTex_007E00[] = dspot15_sceneTex_007E00; + +#define dspot15_sceneTex_008E00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_008E00" +static const ALIGN_ASSET(2) char spot15_sceneTex_008E00[] = dspot15_sceneTex_008E00; + +#define dspot15_sceneTex_009600 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_009600" +static const ALIGN_ASSET(2) char spot15_sceneTex_009600[] = dspot15_sceneTex_009600; + +#define dspot15_sceneTex_009800 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_009800" +static const ALIGN_ASSET(2) char spot15_sceneTex_009800[] = dspot15_sceneTex_009800; + +#define dspot15_sceneTex_009900 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_009900" +static const ALIGN_ASSET(2) char spot15_sceneTex_009900[] = dspot15_sceneTex_009900; + +#define dspot15_sceneTex_00A100 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_00A100" +static const ALIGN_ASSET(2) char spot15_sceneTex_00A100[] = dspot15_sceneTex_00A100; + +#define dspot15_sceneTex_00A900 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_00A900" +static const ALIGN_ASSET(2) char spot15_sceneTex_00A900[] = dspot15_sceneTex_00A900; + +#define dspot15_sceneTex_00B900 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_00B900" +static const ALIGN_ASSET(2) char spot15_sceneTex_00B900[] = dspot15_sceneTex_00B900; + +#define dspot15_sceneTex_00BA00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_00BA00" +static const ALIGN_ASSET(2) char spot15_sceneTex_00BA00[] = dspot15_sceneTex_00BA00; + +#define dspot15_sceneTex_00C200 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_00C200" +static const ALIGN_ASSET(2) char spot15_sceneTex_00C200[] = dspot15_sceneTex_00C200; + +#define dspot15_sceneTex_00CA00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_00CA00" +static const ALIGN_ASSET(2) char spot15_sceneTex_00CA00[] = dspot15_sceneTex_00CA00; + +#define dspot15_sceneTex_00DA00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_00DA00" +static const ALIGN_ASSET(2) char spot15_sceneTex_00DA00[] = dspot15_sceneTex_00DA00; + +#define dspot15_sceneTex_00EA00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_00EA00" +static const ALIGN_ASSET(2) char spot15_sceneTex_00EA00[] = dspot15_sceneTex_00EA00; + +#define dspot15_sceneTex_00EC00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_00EC00" +static const ALIGN_ASSET(2) char spot15_sceneTex_00EC00[] = dspot15_sceneTex_00EC00; + +#define dspot15_sceneTex_00FC00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_00FC00" +static const ALIGN_ASSET(2) char spot15_sceneTex_00FC00[] = dspot15_sceneTex_00FC00; + +#define dspot15_sceneTex_010400 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_010400" +static const ALIGN_ASSET(2) char spot15_sceneTex_010400[] = dspot15_sceneTex_010400; + +#define dspot15_sceneTex_010C00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_010C00" +static const ALIGN_ASSET(2) char spot15_sceneTex_010C00[] = dspot15_sceneTex_010C00; + +#define dspot15_sceneTex_011400 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_011400" +static const ALIGN_ASSET(2) char spot15_sceneTex_011400[] = dspot15_sceneTex_011400; + +#define dspot15_sceneTex_011C00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_011C00" +static const ALIGN_ASSET(2) char spot15_sceneTex_011C00[] = dspot15_sceneTex_011C00; + +#define dspot15_sceneTex_012400 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_012400" +static const ALIGN_ASSET(2) char spot15_sceneTex_012400[] = dspot15_sceneTex_012400; + +#define dspot15_sceneTex_013400 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_013400" +static const ALIGN_ASSET(2) char spot15_sceneTex_013400[] = dspot15_sceneTex_013400; + +#define dspot15_sceneTex_014400 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_014400" +static const ALIGN_ASSET(2) char spot15_sceneTex_014400[] = dspot15_sceneTex_014400; + +#define dspot15_sceneTex_014C00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_014C00" +static const ALIGN_ASSET(2) char spot15_sceneTex_014C00[] = dspot15_sceneTex_014C00; + +#define dspot15_sceneTex_015C00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_015C00" +static const ALIGN_ASSET(2) char spot15_sceneTex_015C00[] = dspot15_sceneTex_015C00; + +#define dspot15_sceneTex_015E00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_015E00" +static const ALIGN_ASSET(2) char spot15_sceneTex_015E00[] = dspot15_sceneTex_015E00; + +#define dspot15_sceneTex_016600 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_016600" +static const ALIGN_ASSET(2) char spot15_sceneTex_016600[] = dspot15_sceneTex_016600; + +#define dspot15_sceneTex_016800 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_016800" static const ALIGN_ASSET(2) char spot15_sceneTex_016800[] = dspot15_sceneTex_016800; +#define dspot15_sceneTex_016C00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_016C00" +static const ALIGN_ASSET(2) char spot15_sceneTex_016C00[] = dspot15_sceneTex_016C00; + +#define dspot15_sceneTex_017400 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_017400" +static const ALIGN_ASSET(2) char spot15_sceneTex_017400[] = dspot15_sceneTex_017400; + +#define dspot15_sceneTex_017C00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_017C00" +static const ALIGN_ASSET(2) char spot15_sceneTex_017C00[] = dspot15_sceneTex_017C00; + +#define dspot15_sceneTex_018400 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_018400" +static const ALIGN_ASSET(2) char spot15_sceneTex_018400[] = dspot15_sceneTex_018400; + +#define dgHyruleCastleIntroCs "__OTR__scenes/shared/spot15_scene/gHyruleCastleIntroCs" +static const ALIGN_ASSET(2) char gHyruleCastleIntroCs[] = dgHyruleCastleIntroCs; + +#define dspot15_sceneCollisionHeader_003CE8 "__OTR__scenes/shared/spot15_scene/spot15_sceneCollisionHeader_003CE8" +static const ALIGN_ASSET(2) char spot15_sceneCollisionHeader_003CE8[] = dspot15_sceneCollisionHeader_003CE8; + + #endif // OVERWORLD_SPOT15_SCENE_H diff --git a/soh/assets/scenes/overworld/spot16/spot16_room_0.h b/soh/assets/scenes/overworld/spot16/spot16_room_0.h index 7103cc719..81ce6513e 100644 --- a/soh/assets/scenes/overworld/spot16/spot16_room_0.h +++ b/soh/assets/scenes/overworld/spot16/spot16_room_0.h @@ -3,280 +3,280 @@ #include "align_asset_macro.h" -#define dspot16_room_0DL_002A78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_002A78" +#define dspot16_room_0DL_002A78 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_002A78" static const ALIGN_ASSET(2) char spot16_room_0DL_002A78[] = dspot16_room_0DL_002A78; -#define dspot16_room_0DL_00A5A8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_00A5A8" +#define dspot16_room_0DL_00A5A8 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_00A5A8" static const ALIGN_ASSET(2) char spot16_room_0DL_00A5A8[] = dspot16_room_0DL_00A5A8; -#define dspot16_room_0DL_004788 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_004788" +#define dspot16_room_0DL_004788 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_004788" static const ALIGN_ASSET(2) char spot16_room_0DL_004788[] = dspot16_room_0DL_004788; -#define dspot16_room_0DL_00A6F8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_00A6F8" +#define dspot16_room_0DL_00A6F8 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_00A6F8" static const ALIGN_ASSET(2) char spot16_room_0DL_00A6F8[] = dspot16_room_0DL_00A6F8; -#define dspot16_room_0DL_005B98 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_005B98" +#define dspot16_room_0DL_005B98 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_005B98" static const ALIGN_ASSET(2) char spot16_room_0DL_005B98[] = dspot16_room_0DL_005B98; -#define dspot16_room_0DL_009BD0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_009BD0" +#define dspot16_room_0DL_009BD0 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_009BD0" static const ALIGN_ASSET(2) char spot16_room_0DL_009BD0[] = dspot16_room_0DL_009BD0; -#define dspot16_room_0DL_007200 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_007200" +#define dspot16_room_0DL_007200 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_007200" static const ALIGN_ASSET(2) char spot16_room_0DL_007200[] = dspot16_room_0DL_007200; -#define dspot16_room_0DL_00A8E8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_00A8E8" +#define dspot16_room_0DL_00A8E8 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_00A8E8" static const ALIGN_ASSET(2) char spot16_room_0DL_00A8E8[] = dspot16_room_0DL_00A8E8; -#define dspot16_room_0DL_0060E0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_0060E0" +#define dspot16_room_0DL_0060E0 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_0060E0" static const ALIGN_ASSET(2) char spot16_room_0DL_0060E0[] = dspot16_room_0DL_0060E0; -#define dspot16_room_0DL_00A240 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_00A240" +#define dspot16_room_0DL_00A240 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_00A240" static const ALIGN_ASSET(2) char spot16_room_0DL_00A240[] = dspot16_room_0DL_00A240; -#define dspot16_room_0DL_00ABC8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_00ABC8" +#define dspot16_room_0DL_00ABC8 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_00ABC8" static const ALIGN_ASSET(2) char spot16_room_0DL_00ABC8[] = dspot16_room_0DL_00ABC8; -#define dspot16_room_0DL_0066D0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_0066D0" +#define dspot16_room_0DL_0066D0 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_0066D0" static const ALIGN_ASSET(2) char spot16_room_0DL_0066D0[] = dspot16_room_0DL_0066D0; -#define dspot16_room_0DL_007C78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_007C78" +#define dspot16_room_0DL_007C78 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_007C78" static const ALIGN_ASSET(2) char spot16_room_0DL_007C78[] = dspot16_room_0DL_007C78; -#define dspot16_room_0DL_00AA48 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_00AA48" +#define dspot16_room_0DL_00AA48 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_00AA48" static const ALIGN_ASSET(2) char spot16_room_0DL_00AA48[] = dspot16_room_0DL_00AA48; -#define dspot16_room_0Set_000470DL_002A78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_002A78" +#define dspot16_room_0Set_000470DL_002A78 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_002A78" static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_002A78[] = dspot16_room_0Set_000470DL_002A78; -#define dspot16_room_0Set_000470DL_00A5A8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_00A5A8" +#define dspot16_room_0Set_000470DL_00A5A8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_00A5A8" static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_00A5A8[] = dspot16_room_0Set_000470DL_00A5A8; -#define dspot16_room_0Set_000470DL_004788 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_004788" +#define dspot16_room_0Set_000470DL_004788 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_004788" static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_004788[] = dspot16_room_0Set_000470DL_004788; -#define dspot16_room_0Set_000470DL_00A6F8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_00A6F8" +#define dspot16_room_0Set_000470DL_00A6F8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_00A6F8" static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_00A6F8[] = dspot16_room_0Set_000470DL_00A6F8; -#define dspot16_room_0Set_000470DL_005B98 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_005B98" +#define dspot16_room_0Set_000470DL_005B98 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_005B98" static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_005B98[] = dspot16_room_0Set_000470DL_005B98; -#define dspot16_room_0Set_000470DL_009BD0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_009BD0" +#define dspot16_room_0Set_000470DL_009BD0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_009BD0" static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_009BD0[] = dspot16_room_0Set_000470DL_009BD0; -#define dspot16_room_0Set_000470DL_007200 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_007200" +#define dspot16_room_0Set_000470DL_007200 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_007200" static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_007200[] = dspot16_room_0Set_000470DL_007200; -#define dspot16_room_0Set_000470DL_00A8E8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_00A8E8" +#define dspot16_room_0Set_000470DL_00A8E8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_00A8E8" static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_00A8E8[] = dspot16_room_0Set_000470DL_00A8E8; -#define dspot16_room_0Set_000470DL_0060E0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_0060E0" +#define dspot16_room_0Set_000470DL_0060E0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_0060E0" static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_0060E0[] = dspot16_room_0Set_000470DL_0060E0; -#define dspot16_room_0Set_000470DL_00A240 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_00A240" +#define dspot16_room_0Set_000470DL_00A240 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_00A240" static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_00A240[] = dspot16_room_0Set_000470DL_00A240; -#define dspot16_room_0Set_000470DL_00ABC8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_00ABC8" +#define dspot16_room_0Set_000470DL_00ABC8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_00ABC8" static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_00ABC8[] = dspot16_room_0Set_000470DL_00ABC8; -#define dspot16_room_0Set_000470DL_0066D0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_0066D0" +#define dspot16_room_0Set_000470DL_0066D0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_0066D0" static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_0066D0[] = dspot16_room_0Set_000470DL_0066D0; -#define dspot16_room_0Set_000470DL_007C78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_007C78" +#define dspot16_room_0Set_000470DL_007C78 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_007C78" static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_007C78[] = dspot16_room_0Set_000470DL_007C78; -#define dspot16_room_0Set_000940DL_002A78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_002A78" +#define dspot16_room_0Set_000940DL_002A78 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_002A78" static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_002A78[] = dspot16_room_0Set_000940DL_002A78; -#define dspot16_room_0Set_000940DL_00A5A8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_00A5A8" +#define dspot16_room_0Set_000940DL_00A5A8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_00A5A8" static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_00A5A8[] = dspot16_room_0Set_000940DL_00A5A8; -#define dspot16_room_0Set_000940DL_004788 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_004788" +#define dspot16_room_0Set_000940DL_004788 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_004788" static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_004788[] = dspot16_room_0Set_000940DL_004788; -#define dspot16_room_0Set_000940DL_00A6F8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_00A6F8" +#define dspot16_room_0Set_000940DL_00A6F8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_00A6F8" static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_00A6F8[] = dspot16_room_0Set_000940DL_00A6F8; -#define dspot16_room_0Set_000940DL_005B98 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_005B98" +#define dspot16_room_0Set_000940DL_005B98 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_005B98" static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_005B98[] = dspot16_room_0Set_000940DL_005B98; -#define dspot16_room_0Set_000940DL_009BD0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_009BD0" +#define dspot16_room_0Set_000940DL_009BD0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_009BD0" static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_009BD0[] = dspot16_room_0Set_000940DL_009BD0; -#define dspot16_room_0Set_000940DL_007200 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_007200" +#define dspot16_room_0Set_000940DL_007200 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_007200" static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_007200[] = dspot16_room_0Set_000940DL_007200; -#define dspot16_room_0Set_000940DL_00A8E8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_00A8E8" +#define dspot16_room_0Set_000940DL_00A8E8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_00A8E8" static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_00A8E8[] = dspot16_room_0Set_000940DL_00A8E8; -#define dspot16_room_0Set_000940DL_0060E0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_0060E0" +#define dspot16_room_0Set_000940DL_0060E0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_0060E0" static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_0060E0[] = dspot16_room_0Set_000940DL_0060E0; -#define dspot16_room_0Set_000940DL_00A240 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_00A240" +#define dspot16_room_0Set_000940DL_00A240 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_00A240" static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_00A240[] = dspot16_room_0Set_000940DL_00A240; -#define dspot16_room_0Set_000940DL_00ABC8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_00ABC8" +#define dspot16_room_0Set_000940DL_00ABC8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_00ABC8" static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_00ABC8[] = dspot16_room_0Set_000940DL_00ABC8; -#define dspot16_room_0Set_000940DL_0066D0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_0066D0" +#define dspot16_room_0Set_000940DL_0066D0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_0066D0" static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_0066D0[] = dspot16_room_0Set_000940DL_0066D0; -#define dspot16_room_0Set_000940DL_007C78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_007C78" +#define dspot16_room_0Set_000940DL_007C78 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_007C78" static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_007C78[] = dspot16_room_0Set_000940DL_007C78; -#define dspot16_room_0Set_0009B0DL_002A78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_002A78" +#define dspot16_room_0Set_0009B0DL_002A78 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_002A78" static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_002A78[] = dspot16_room_0Set_0009B0DL_002A78; -#define dspot16_room_0Set_0009B0DL_00A5A8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_00A5A8" +#define dspot16_room_0Set_0009B0DL_00A5A8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_00A5A8" static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_00A5A8[] = dspot16_room_0Set_0009B0DL_00A5A8; -#define dspot16_room_0Set_0009B0DL_004788 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_004788" +#define dspot16_room_0Set_0009B0DL_004788 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_004788" static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_004788[] = dspot16_room_0Set_0009B0DL_004788; -#define dspot16_room_0Set_0009B0DL_00A6F8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_00A6F8" +#define dspot16_room_0Set_0009B0DL_00A6F8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_00A6F8" static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_00A6F8[] = dspot16_room_0Set_0009B0DL_00A6F8; -#define dspot16_room_0Set_0009B0DL_005B98 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_005B98" +#define dspot16_room_0Set_0009B0DL_005B98 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_005B98" static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_005B98[] = dspot16_room_0Set_0009B0DL_005B98; -#define dspot16_room_0Set_0009B0DL_009BD0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_009BD0" +#define dspot16_room_0Set_0009B0DL_009BD0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_009BD0" static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_009BD0[] = dspot16_room_0Set_0009B0DL_009BD0; -#define dspot16_room_0Set_0009B0DL_007200 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_007200" +#define dspot16_room_0Set_0009B0DL_007200 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_007200" static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_007200[] = dspot16_room_0Set_0009B0DL_007200; -#define dspot16_room_0Set_0009B0DL_00A8E8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_00A8E8" +#define dspot16_room_0Set_0009B0DL_00A8E8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_00A8E8" static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_00A8E8[] = dspot16_room_0Set_0009B0DL_00A8E8; -#define dspot16_room_0Set_0009B0DL_0060E0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_0060E0" +#define dspot16_room_0Set_0009B0DL_0060E0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_0060E0" static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_0060E0[] = dspot16_room_0Set_0009B0DL_0060E0; -#define dspot16_room_0Set_0009B0DL_00A240 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_00A240" +#define dspot16_room_0Set_0009B0DL_00A240 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_00A240" static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_00A240[] = dspot16_room_0Set_0009B0DL_00A240; -#define dspot16_room_0Set_0009B0DL_00ABC8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_00ABC8" +#define dspot16_room_0Set_0009B0DL_00ABC8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_00ABC8" static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_00ABC8[] = dspot16_room_0Set_0009B0DL_00ABC8; -#define dspot16_room_0Set_0009B0DL_0066D0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_0066D0" +#define dspot16_room_0Set_0009B0DL_0066D0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_0066D0" static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_0066D0[] = dspot16_room_0Set_0009B0DL_0066D0; -#define dspot16_room_0Set_0009B0DL_007C78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_007C78" +#define dspot16_room_0Set_0009B0DL_007C78 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_007C78" static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_007C78[] = dspot16_room_0Set_0009B0DL_007C78; -#define dspot16_room_0Set_000A90DL_002A78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_002A78" +#define dspot16_room_0Set_000A90DL_002A78 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_002A78" static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_002A78[] = dspot16_room_0Set_000A90DL_002A78; -#define dspot16_room_0Set_000A90DL_00A5A8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_00A5A8" +#define dspot16_room_0Set_000A90DL_00A5A8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_00A5A8" static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_00A5A8[] = dspot16_room_0Set_000A90DL_00A5A8; -#define dspot16_room_0Set_000A90DL_004788 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_004788" +#define dspot16_room_0Set_000A90DL_004788 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_004788" static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_004788[] = dspot16_room_0Set_000A90DL_004788; -#define dspot16_room_0Set_000A90DL_00A6F8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_00A6F8" +#define dspot16_room_0Set_000A90DL_00A6F8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_00A6F8" static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_00A6F8[] = dspot16_room_0Set_000A90DL_00A6F8; -#define dspot16_room_0Set_000A90DL_005B98 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_005B98" +#define dspot16_room_0Set_000A90DL_005B98 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_005B98" static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_005B98[] = dspot16_room_0Set_000A90DL_005B98; -#define dspot16_room_0Set_000A90DL_009BD0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_009BD0" +#define dspot16_room_0Set_000A90DL_009BD0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_009BD0" static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_009BD0[] = dspot16_room_0Set_000A90DL_009BD0; -#define dspot16_room_0Set_000A90DL_007200 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_007200" +#define dspot16_room_0Set_000A90DL_007200 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_007200" static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_007200[] = dspot16_room_0Set_000A90DL_007200; -#define dspot16_room_0Set_000A90DL_00A8E8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_00A8E8" +#define dspot16_room_0Set_000A90DL_00A8E8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_00A8E8" static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_00A8E8[] = dspot16_room_0Set_000A90DL_00A8E8; -#define dspot16_room_0Set_000A90DL_0060E0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_0060E0" +#define dspot16_room_0Set_000A90DL_0060E0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_0060E0" static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_0060E0[] = dspot16_room_0Set_000A90DL_0060E0; -#define dspot16_room_0Set_000A90DL_00A240 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_00A240" +#define dspot16_room_0Set_000A90DL_00A240 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_00A240" static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_00A240[] = dspot16_room_0Set_000A90DL_00A240; -#define dspot16_room_0Set_000A90DL_00ABC8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_00ABC8" +#define dspot16_room_0Set_000A90DL_00ABC8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_00ABC8" static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_00ABC8[] = dspot16_room_0Set_000A90DL_00ABC8; -#define dspot16_room_0Set_000A90DL_0066D0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_0066D0" +#define dspot16_room_0Set_000A90DL_0066D0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_0066D0" static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_0066D0[] = dspot16_room_0Set_000A90DL_0066D0; -#define dspot16_room_0Set_000A90DL_007C78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_007C78" +#define dspot16_room_0Set_000A90DL_007C78 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_007C78" static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_007C78[] = dspot16_room_0Set_000A90DL_007C78; -#define dspot16_room_0Set_000B70DL_002A78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_002A78" +#define dspot16_room_0Set_000B70DL_002A78 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_002A78" static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_002A78[] = dspot16_room_0Set_000B70DL_002A78; -#define dspot16_room_0Set_000B70DL_00A5A8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_00A5A8" +#define dspot16_room_0Set_000B70DL_00A5A8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_00A5A8" static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_00A5A8[] = dspot16_room_0Set_000B70DL_00A5A8; -#define dspot16_room_0Set_000B70DL_004788 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_004788" +#define dspot16_room_0Set_000B70DL_004788 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_004788" static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_004788[] = dspot16_room_0Set_000B70DL_004788; -#define dspot16_room_0Set_000B70DL_00A6F8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_00A6F8" +#define dspot16_room_0Set_000B70DL_00A6F8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_00A6F8" static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_00A6F8[] = dspot16_room_0Set_000B70DL_00A6F8; -#define dspot16_room_0Set_000B70DL_005B98 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_005B98" +#define dspot16_room_0Set_000B70DL_005B98 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_005B98" static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_005B98[] = dspot16_room_0Set_000B70DL_005B98; -#define dspot16_room_0Set_000B70DL_009BD0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_009BD0" +#define dspot16_room_0Set_000B70DL_009BD0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_009BD0" static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_009BD0[] = dspot16_room_0Set_000B70DL_009BD0; -#define dspot16_room_0Set_000B70DL_007200 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_007200" +#define dspot16_room_0Set_000B70DL_007200 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_007200" static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_007200[] = dspot16_room_0Set_000B70DL_007200; -#define dspot16_room_0Set_000B70DL_00A8E8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_00A8E8" +#define dspot16_room_0Set_000B70DL_00A8E8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_00A8E8" static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_00A8E8[] = dspot16_room_0Set_000B70DL_00A8E8; -#define dspot16_room_0Set_000B70DL_0060E0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_0060E0" +#define dspot16_room_0Set_000B70DL_0060E0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_0060E0" static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_0060E0[] = dspot16_room_0Set_000B70DL_0060E0; -#define dspot16_room_0Set_000B70DL_00A240 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_00A240" +#define dspot16_room_0Set_000B70DL_00A240 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_00A240" static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_00A240[] = dspot16_room_0Set_000B70DL_00A240; -#define dspot16_room_0Set_000B70DL_00ABC8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_00ABC8" +#define dspot16_room_0Set_000B70DL_00ABC8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_00ABC8" static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_00ABC8[] = dspot16_room_0Set_000B70DL_00ABC8; -#define dspot16_room_0Set_000B70DL_0066D0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_0066D0" +#define dspot16_room_0Set_000B70DL_0066D0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_0066D0" static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_0066D0[] = dspot16_room_0Set_000B70DL_0066D0; -#define dspot16_room_0Set_000B70DL_007C78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_007C78" +#define dspot16_room_0Set_000B70DL_007C78 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_007C78" static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_007C78[] = dspot16_room_0Set_000B70DL_007C78; -#define dspot16_room_0Set_000C00DL_002A78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_002A78" +#define dspot16_room_0Set_000C00DL_002A78 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_002A78" static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_002A78[] = dspot16_room_0Set_000C00DL_002A78; -#define dspot16_room_0Set_000C00DL_00A5A8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_00A5A8" +#define dspot16_room_0Set_000C00DL_00A5A8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_00A5A8" static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_00A5A8[] = dspot16_room_0Set_000C00DL_00A5A8; -#define dspot16_room_0Set_000C00DL_004788 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_004788" +#define dspot16_room_0Set_000C00DL_004788 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_004788" static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_004788[] = dspot16_room_0Set_000C00DL_004788; -#define dspot16_room_0Set_000C00DL_00A6F8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_00A6F8" +#define dspot16_room_0Set_000C00DL_00A6F8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_00A6F8" static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_00A6F8[] = dspot16_room_0Set_000C00DL_00A6F8; -#define dspot16_room_0Set_000C00DL_005B98 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_005B98" +#define dspot16_room_0Set_000C00DL_005B98 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_005B98" static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_005B98[] = dspot16_room_0Set_000C00DL_005B98; -#define dspot16_room_0Set_000C00DL_009BD0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_009BD0" +#define dspot16_room_0Set_000C00DL_009BD0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_009BD0" static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_009BD0[] = dspot16_room_0Set_000C00DL_009BD0; -#define dspot16_room_0Set_000C00DL_007200 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_007200" +#define dspot16_room_0Set_000C00DL_007200 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_007200" static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_007200[] = dspot16_room_0Set_000C00DL_007200; -#define dspot16_room_0Set_000C00DL_00A8E8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_00A8E8" +#define dspot16_room_0Set_000C00DL_00A8E8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_00A8E8" static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_00A8E8[] = dspot16_room_0Set_000C00DL_00A8E8; -#define dspot16_room_0Set_000C00DL_0060E0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_0060E0" +#define dspot16_room_0Set_000C00DL_0060E0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_0060E0" static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_0060E0[] = dspot16_room_0Set_000C00DL_0060E0; -#define dspot16_room_0Set_000C00DL_00A240 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_00A240" +#define dspot16_room_0Set_000C00DL_00A240 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_00A240" static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_00A240[] = dspot16_room_0Set_000C00DL_00A240; -#define dspot16_room_0Set_000C00DL_00ABC8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_00ABC8" +#define dspot16_room_0Set_000C00DL_00ABC8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_00ABC8" static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_00ABC8[] = dspot16_room_0Set_000C00DL_00ABC8; -#define dspot16_room_0Set_000C00DL_0066D0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_0066D0" +#define dspot16_room_0Set_000C00DL_0066D0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_0066D0" static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_0066D0[] = dspot16_room_0Set_000C00DL_0066D0; -#define dspot16_room_0Set_000C00DL_007C78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_007C78" +#define dspot16_room_0Set_000C00DL_007C78 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_007C78" static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_007C78[] = dspot16_room_0Set_000C00DL_007C78; diff --git a/soh/assets/scenes/overworld/spot16/spot16_scene.h b/soh/assets/scenes/overworld/spot16/spot16_scene.h index d288da992..eb9ef0ca5 100644 --- a/soh/assets/scenes/overworld/spot16/spot16_scene.h +++ b/soh/assets/scenes/overworld/spot16/spot16_scene.h @@ -3,137 +3,137 @@ #include "align_asset_macro.h" -#define dgDMTOwlCs "__OTR__scenes/nonmq/spot16_scene/gDMTOwlCs" -static const ALIGN_ASSET(2) char gDMTOwlCs[] = dgDMTOwlCs; - -#define dgDMTIntroCs "__OTR__scenes/nonmq/spot16_scene/gDMTIntroCs" -static const ALIGN_ASSET(2) char gDMTIntroCs[] = dgDMTIntroCs; - -#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneCollisionHeader_003D10" -static const ALIGN_ASSET(2) char spot16_sceneCollisionHeader_003D10[] = dspot16_sceneCollisionHeader_003D10; - -#define dspot16_scene_Tex_01AE98 "__OTR__scenes/nonmq/spot16_scene/spot16_scene_Tex_01AE98" -static const ALIGN_ASSET(2) char spot16_scene_Tex_01AE98[] = dspot16_scene_Tex_01AE98; - -#define dspot16_sceneTex_019698 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_019698" -static const ALIGN_ASSET(2) char spot16_sceneTex_019698[] = dspot16_sceneTex_019698; - -#define dspot16_sceneTex_00CD98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_00CD98" -static const ALIGN_ASSET(2) char spot16_sceneTex_00CD98[] = dspot16_sceneTex_00CD98; - -#define dspot16_sceneTex_015598 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_015598" -static const ALIGN_ASSET(2) char spot16_sceneTex_015598[] = dspot16_sceneTex_015598; - -#define dspot16_sceneTex_016E98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_016E98" -static const ALIGN_ASSET(2) char spot16_sceneTex_016E98[] = dspot16_sceneTex_016E98; - -#define dspot16_sceneTex_008198 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_008198" +#define dspot16_sceneTex_008198 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_008198" static const ALIGN_ASSET(2) char spot16_sceneTex_008198[] = dspot16_sceneTex_008198; -#define dspot16_sceneTex_00AD98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_00AD98" -static const ALIGN_ASSET(2) char spot16_sceneTex_00AD98[] = dspot16_sceneTex_00AD98; - -#define dspot16_sceneTex_009D98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_009D98" -static const ALIGN_ASSET(2) char spot16_sceneTex_009D98[] = dspot16_sceneTex_009D98; - -#define dspot16_sceneTex_00BD98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_00BD98" -static const ALIGN_ASSET(2) char spot16_sceneTex_00BD98[] = dspot16_sceneTex_00BD98; - -#define dspot16_sceneTex_015D98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_015D98" -static const ALIGN_ASSET(2) char spot16_sceneTex_015D98[] = dspot16_sceneTex_015D98; - -#define dspot16_sceneTex_01D698 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_01D698" -static const ALIGN_ASSET(2) char spot16_sceneTex_01D698[] = dspot16_sceneTex_01D698; - -#define dspot16_sceneTex_009198 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_009198" +#define dspot16_sceneTex_009198 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_009198" static const ALIGN_ASSET(2) char spot16_sceneTex_009198[] = dspot16_sceneTex_009198; -#define dspot16_sceneTex_009998 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_009998" +#define dspot16_sceneTex_009998 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_009998" static const ALIGN_ASSET(2) char spot16_sceneTex_009998[] = dspot16_sceneTex_009998; -#define dspot16_sceneTex_01DE98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_01DE98" -static const ALIGN_ASSET(2) char spot16_sceneTex_01DE98[] = dspot16_sceneTex_01DE98; +#define dspot16_sceneTex_009D98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_009D98" +static const ALIGN_ASSET(2) char spot16_sceneTex_009D98[] = dspot16_sceneTex_009D98; -#define dspot16_sceneTex_018E98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_018E98" -static const ALIGN_ASSET(2) char spot16_sceneTex_018E98[] = dspot16_sceneTex_018E98; +#define dspot16_sceneTex_00AD98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_00AD98" +static const ALIGN_ASSET(2) char spot16_sceneTex_00AD98[] = dspot16_sceneTex_00AD98; -#define dspot16_sceneTex_018698 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_018698" -static const ALIGN_ASSET(2) char spot16_sceneTex_018698[] = dspot16_sceneTex_018698; +#define dspot16_sceneTex_00BD98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_00BD98" +static const ALIGN_ASSET(2) char spot16_sceneTex_00BD98[] = dspot16_sceneTex_00BD98; -#define dspot16_sceneTex_014D98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_014D98" -static const ALIGN_ASSET(2) char spot16_sceneTex_014D98[] = dspot16_sceneTex_014D98; +#define dspot16_sceneTex_00CD98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_00CD98" +static const ALIGN_ASSET(2) char spot16_sceneTex_00CD98[] = dspot16_sceneTex_00CD98; -#define dspot16_sceneTex_00E198 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_00E198" -static const ALIGN_ASSET(2) char spot16_sceneTex_00E198[] = dspot16_sceneTex_00E198; - -#define dspot16_sceneTex_015E98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_015E98" -static const ALIGN_ASSET(2) char spot16_sceneTex_015E98[] = dspot16_sceneTex_015E98; - -#define dspot16_sceneTex_011198 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_011198" -static const ALIGN_ASSET(2) char spot16_sceneTex_011198[] = dspot16_sceneTex_011198; - -#define dspot16_sceneTex_011598 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_011598" -static const ALIGN_ASSET(2) char spot16_sceneTex_011598[] = dspot16_sceneTex_011598; - -#define dspot16_sceneTex_013798 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_013798" -static const ALIGN_ASSET(2) char spot16_sceneTex_013798[] = dspot16_sceneTex_013798; - -#define dspot16_sceneTex_00DF98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_00DF98" -static const ALIGN_ASSET(2) char spot16_sceneTex_00DF98[] = dspot16_sceneTex_00DF98; - -#define dspot16_sceneTex_00D398 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_00D398" -static const ALIGN_ASSET(2) char spot16_sceneTex_00D398[] = dspot16_sceneTex_00D398; - -#define dspot16_sceneTex_00CF98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_00CF98" +#define dspot16_sceneTex_00CF98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_00CF98" static const ALIGN_ASSET(2) char spot16_sceneTex_00CF98[] = dspot16_sceneTex_00CF98; -#define dspot16_sceneTex_012798 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_012798" -static const ALIGN_ASSET(2) char spot16_sceneTex_012798[] = dspot16_sceneTex_012798; +#define dspot16_sceneTex_00D398 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_00D398" +static const ALIGN_ASSET(2) char spot16_sceneTex_00D398[] = dspot16_sceneTex_00D398; -#define dspot16_sceneTex_011798 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_011798" -static const ALIGN_ASSET(2) char spot16_sceneTex_011798[] = dspot16_sceneTex_011798; - -#define dspot16_sceneTex_010198 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_010198" -static const ALIGN_ASSET(2) char spot16_sceneTex_010198[] = dspot16_sceneTex_010198; - -#define dspot16_sceneTex_00F198 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_00F198" -static const ALIGN_ASSET(2) char spot16_sceneTex_00F198[] = dspot16_sceneTex_00F198; - -#define dspot16_sceneTex_01B698 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_01B698" -static const ALIGN_ASSET(2) char spot16_sceneTex_01B698[] = dspot16_sceneTex_01B698; - -#define dspot16_sceneTex_017E98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_017E98" -static const ALIGN_ASSET(2) char spot16_sceneTex_017E98[] = dspot16_sceneTex_017E98; - -#define dspot16_sceneTex_019E98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_019E98" -static const ALIGN_ASSET(2) char spot16_sceneTex_019E98[] = dspot16_sceneTex_019E98; - -#define dspot16_sceneTex_01C698 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_01C698" -static const ALIGN_ASSET(2) char spot16_sceneTex_01C698[] = dspot16_sceneTex_01C698; - -#define dspot16_sceneTex_00D798 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_00D798" +#define dspot16_sceneTex_00D798 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_00D798" static const ALIGN_ASSET(2) char spot16_sceneTex_00D798[] = dspot16_sceneTex_00D798; -#define dspot16_sceneTLUT_008170 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTLUT_008170" -static const ALIGN_ASSET(2) char spot16_sceneTLUT_008170[] = dspot16_sceneTLUT_008170; +#define dspot16_sceneTex_00DF98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_00DF98" +static const ALIGN_ASSET(2) char spot16_sceneTex_00DF98[] = dspot16_sceneTex_00DF98; -#define dspot16_sceneTex_013D98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_013D98" -static const ALIGN_ASSET(2) char spot16_sceneTex_013D98[] = dspot16_sceneTex_013D98; +#define dspot16_sceneTex_00E198 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_00E198" +static const ALIGN_ASSET(2) char spot16_sceneTex_00E198[] = dspot16_sceneTex_00E198; -#define dspot16_sceneTex_013998 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_013998" +#define dspot16_sceneTex_00F198 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_00F198" +static const ALIGN_ASSET(2) char spot16_sceneTex_00F198[] = dspot16_sceneTex_00F198; + +#define dspot16_sceneTex_010198 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_010198" +static const ALIGN_ASSET(2) char spot16_sceneTex_010198[] = dspot16_sceneTex_010198; + +#define dspot16_sceneTex_011198 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_011198" +static const ALIGN_ASSET(2) char spot16_sceneTex_011198[] = dspot16_sceneTex_011198; + +#define dspot16_sceneTex_011598 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_011598" +static const ALIGN_ASSET(2) char spot16_sceneTex_011598[] = dspot16_sceneTex_011598; + +#define dspot16_sceneTex_011798 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_011798" +static const ALIGN_ASSET(2) char spot16_sceneTex_011798[] = dspot16_sceneTex_011798; + +#define dspot16_sceneTex_012798 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_012798" +static const ALIGN_ASSET(2) char spot16_sceneTex_012798[] = dspot16_sceneTex_012798; + +#define dspot16_sceneTex_013798 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_013798" +static const ALIGN_ASSET(2) char spot16_sceneTex_013798[] = dspot16_sceneTex_013798; + +#define dspot16_sceneTex_013998 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_013998" static const ALIGN_ASSET(2) char spot16_sceneTex_013998[] = dspot16_sceneTex_013998; -#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneCollisionHeader_003D10" +#define dspot16_sceneTex_013D98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_013D98" +static const ALIGN_ASSET(2) char spot16_sceneTex_013D98[] = dspot16_sceneTex_013D98; -#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneCollisionHeader_003D10" +#define dspot16_sceneTex_014D98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_014D98" +static const ALIGN_ASSET(2) char spot16_sceneTex_014D98[] = dspot16_sceneTex_014D98; -#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneCollisionHeader_003D10" +#define dspot16_sceneTex_015598 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_015598" +static const ALIGN_ASSET(2) char spot16_sceneTex_015598[] = dspot16_sceneTex_015598; -#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneCollisionHeader_003D10" +#define dspot16_sceneTex_015D98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_015D98" +static const ALIGN_ASSET(2) char spot16_sceneTex_015D98[] = dspot16_sceneTex_015D98; -#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneCollisionHeader_003D10" +#define dspot16_sceneTex_015E98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_015E98" +static const ALIGN_ASSET(2) char spot16_sceneTex_015E98[] = dspot16_sceneTex_015E98; -#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneCollisionHeader_003D10" +#define dspot16_sceneTex_016E98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_016E98" +static const ALIGN_ASSET(2) char spot16_sceneTex_016E98[] = dspot16_sceneTex_016E98; + +#define dspot16_sceneTex_017E98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_017E98" +static const ALIGN_ASSET(2) char spot16_sceneTex_017E98[] = dspot16_sceneTex_017E98; + +#define dspot16_sceneTex_018698 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_018698" +static const ALIGN_ASSET(2) char spot16_sceneTex_018698[] = dspot16_sceneTex_018698; + +#define dspot16_sceneTex_018E98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_018E98" +static const ALIGN_ASSET(2) char spot16_sceneTex_018E98[] = dspot16_sceneTex_018E98; + +#define dspot16_sceneTex_019698 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_019698" +static const ALIGN_ASSET(2) char spot16_sceneTex_019698[] = dspot16_sceneTex_019698; + +#define dspot16_sceneTex_019E98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_019E98" +static const ALIGN_ASSET(2) char spot16_sceneTex_019E98[] = dspot16_sceneTex_019E98; + +#define dspot16_sceneTex_01B698 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_01B698" +static const ALIGN_ASSET(2) char spot16_sceneTex_01B698[] = dspot16_sceneTex_01B698; + +#define dspot16_sceneTex_01C698 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_01C698" +static const ALIGN_ASSET(2) char spot16_sceneTex_01C698[] = dspot16_sceneTex_01C698; + +#define dspot16_sceneTex_01D698 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_01D698" +static const ALIGN_ASSET(2) char spot16_sceneTex_01D698[] = dspot16_sceneTex_01D698; + +#define dspot16_sceneTex_01DE98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_01DE98" +static const ALIGN_ASSET(2) char spot16_sceneTex_01DE98[] = dspot16_sceneTex_01DE98; + +#define dspot16_sceneTLUT_008170 "__OTR__scenes/shared/spot16_scene/spot16_sceneTLUT_008170" +static const ALIGN_ASSET(2) char spot16_sceneTLUT_008170[] = dspot16_sceneTLUT_008170; + +#define dgDMTOwlCs "__OTR__scenes/shared/spot16_scene/gDMTOwlCs" +static const ALIGN_ASSET(2) char gDMTOwlCs[] = dgDMTOwlCs; + +#define dgDMTIntroCs "__OTR__scenes/shared/spot16_scene/gDMTIntroCs" +static const ALIGN_ASSET(2) char gDMTIntroCs[] = dgDMTIntroCs; + +#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/shared/spot16_scene/spot16_sceneCollisionHeader_003D10" +static const ALIGN_ASSET(2) char spot16_sceneCollisionHeader_003D10[] = dspot16_sceneCollisionHeader_003D10; + +#define dspot16_scene_Tex_01AE98 "__OTR__scenes/shared/spot16_scene/spot16_scene_Tex_01AE98" +static const ALIGN_ASSET(2) char spot16_scene_Tex_01AE98[] = dspot16_scene_Tex_01AE98; + +#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/shared/spot16_scene/spot16_sceneCollisionHeader_003D10" + +#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/shared/spot16_scene/spot16_sceneCollisionHeader_003D10" + +#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/shared/spot16_scene/spot16_sceneCollisionHeader_003D10" + +#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/shared/spot16_scene/spot16_sceneCollisionHeader_003D10" + +#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/shared/spot16_scene/spot16_sceneCollisionHeader_003D10" + +#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/shared/spot16_scene/spot16_sceneCollisionHeader_003D10" #endif // OVERWORLD_SPOT16_SCENE_H diff --git a/soh/assets/scenes/overworld/spot17/spot17_room_0.h b/soh/assets/scenes/overworld/spot17/spot17_room_0.h index f6fb5cec7..0ec746553 100644 --- a/soh/assets/scenes/overworld/spot17/spot17_room_0.h +++ b/soh/assets/scenes/overworld/spot17/spot17_room_0.h @@ -3,64 +3,64 @@ #include "align_asset_macro.h" -#define dspot17_room_0DL_001D30 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0DL_001D30" -static const ALIGN_ASSET(2) char spot17_room_0DL_001D30[] = dspot17_room_0DL_001D30; - -#define dspot17_room_0DL_001110 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0DL_001110" -static const ALIGN_ASSET(2) char spot17_room_0DL_001110[] = dspot17_room_0DL_001110; - -#define dspot17_room_0Tex_005080 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Tex_005080" -static const ALIGN_ASSET(2) char spot17_room_0Tex_005080[] = dspot17_room_0Tex_005080; - -#define dspot17_room_0Tex_003880 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Tex_003880" +#define dspot17_room_0Tex_003880 "__OTR__scenes/shared/spot17_scene/spot17_room_0Tex_003880" static const ALIGN_ASSET(2) char spot17_room_0Tex_003880[] = dspot17_room_0Tex_003880; -#define dspot17_room_0Tex_004880 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Tex_004880" +#define dspot17_room_0Tex_004880 "__OTR__scenes/shared/spot17_scene/spot17_room_0Tex_004880" static const ALIGN_ASSET(2) char spot17_room_0Tex_004880[] = dspot17_room_0Tex_004880; -#define dspot17_room_0Tex_005880 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Tex_005880" +#define dspot17_room_0Tex_005080 "__OTR__scenes/shared/spot17_scene/spot17_room_0Tex_005080" +static const ALIGN_ASSET(2) char spot17_room_0Tex_005080[] = dspot17_room_0Tex_005080; + +#define dspot17_room_0Tex_005880 "__OTR__scenes/shared/spot17_scene/spot17_room_0Tex_005880" static const ALIGN_ASSET(2) char spot17_room_0Tex_005880[] = dspot17_room_0Tex_005880; -#define dspot17_room_0DL_0027C8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0DL_0027C8" +#define dspot17_room_0DL_001D30 "__OTR__scenes/shared/spot17_scene/spot17_room_0DL_001D30" +static const ALIGN_ASSET(2) char spot17_room_0DL_001D30[] = dspot17_room_0DL_001D30; + +#define dspot17_room_0DL_001110 "__OTR__scenes/shared/spot17_scene/spot17_room_0DL_001110" +static const ALIGN_ASSET(2) char spot17_room_0DL_001110[] = dspot17_room_0DL_001110; + +#define dspot17_room_0DL_0027C8 "__OTR__scenes/shared/spot17_scene/spot17_room_0DL_0027C8" static const ALIGN_ASSET(2) char spot17_room_0DL_0027C8[] = dspot17_room_0DL_0027C8; -#define dspot17_room_0DL_003480 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0DL_003480" +#define dspot17_room_0DL_003480 "__OTR__scenes/shared/spot17_scene/spot17_room_0DL_003480" static const ALIGN_ASSET(2) char spot17_room_0DL_003480[] = dspot17_room_0DL_003480; -#define dspot17_room_0Set_0000C0DL_001D30 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Set_0000C0DL_001D30" +#define dspot17_room_0Set_0000C0DL_001D30 "__OTR__scenes/shared/spot17_scene/spot17_room_0Set_0000C0DL_001D30" static const ALIGN_ASSET(2) char spot17_room_0Set_0000C0DL_001D30[] = dspot17_room_0Set_0000C0DL_001D30; -#define dspot17_room_0Set_0000C0DL_001110 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Set_0000C0DL_001110" +#define dspot17_room_0Set_0000C0DL_001110 "__OTR__scenes/shared/spot17_scene/spot17_room_0Set_0000C0DL_001110" static const ALIGN_ASSET(2) char spot17_room_0Set_0000C0DL_001110[] = dspot17_room_0Set_0000C0DL_001110; -#define dspot17_room_0Set_0000C0DL_0027C8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Set_0000C0DL_0027C8" +#define dspot17_room_0Set_0000C0DL_0027C8 "__OTR__scenes/shared/spot17_scene/spot17_room_0Set_0000C0DL_0027C8" static const ALIGN_ASSET(2) char spot17_room_0Set_0000C0DL_0027C8[] = dspot17_room_0Set_0000C0DL_0027C8; -#define dspot17_room_0Set_0000C0DL_003480 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Set_0000C0DL_003480" +#define dspot17_room_0Set_0000C0DL_003480 "__OTR__scenes/shared/spot17_scene/spot17_room_0Set_0000C0DL_003480" static const ALIGN_ASSET(2) char spot17_room_0Set_0000C0DL_003480[] = dspot17_room_0Set_0000C0DL_003480; -#define dspot17_room_0Set_000120DL_001D30 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Set_000120DL_001D30" +#define dspot17_room_0Set_000120DL_001D30 "__OTR__scenes/shared/spot17_scene/spot17_room_0Set_000120DL_001D30" static const ALIGN_ASSET(2) char spot17_room_0Set_000120DL_001D30[] = dspot17_room_0Set_000120DL_001D30; -#define dspot17_room_0Set_000120DL_001110 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Set_000120DL_001110" +#define dspot17_room_0Set_000120DL_001110 "__OTR__scenes/shared/spot17_scene/spot17_room_0Set_000120DL_001110" static const ALIGN_ASSET(2) char spot17_room_0Set_000120DL_001110[] = dspot17_room_0Set_000120DL_001110; -#define dspot17_room_0Set_000120DL_0027C8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Set_000120DL_0027C8" +#define dspot17_room_0Set_000120DL_0027C8 "__OTR__scenes/shared/spot17_scene/spot17_room_0Set_000120DL_0027C8" static const ALIGN_ASSET(2) char spot17_room_0Set_000120DL_0027C8[] = dspot17_room_0Set_000120DL_0027C8; -#define dspot17_room_0Set_000120DL_003480 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Set_000120DL_003480" +#define dspot17_room_0Set_000120DL_003480 "__OTR__scenes/shared/spot17_scene/spot17_room_0Set_000120DL_003480" static const ALIGN_ASSET(2) char spot17_room_0Set_000120DL_003480[] = dspot17_room_0Set_000120DL_003480; -#define dspot17_room_0Set_000170DL_001D30 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Set_000170DL_001D30" +#define dspot17_room_0Set_000170DL_001D30 "__OTR__scenes/shared/spot17_scene/spot17_room_0Set_000170DL_001D30" static const ALIGN_ASSET(2) char spot17_room_0Set_000170DL_001D30[] = dspot17_room_0Set_000170DL_001D30; -#define dspot17_room_0Set_000170DL_001110 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Set_000170DL_001110" +#define dspot17_room_0Set_000170DL_001110 "__OTR__scenes/shared/spot17_scene/spot17_room_0Set_000170DL_001110" static const ALIGN_ASSET(2) char spot17_room_0Set_000170DL_001110[] = dspot17_room_0Set_000170DL_001110; -#define dspot17_room_0Set_000170DL_0027C8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Set_000170DL_0027C8" +#define dspot17_room_0Set_000170DL_0027C8 "__OTR__scenes/shared/spot17_scene/spot17_room_0Set_000170DL_0027C8" static const ALIGN_ASSET(2) char spot17_room_0Set_000170DL_0027C8[] = dspot17_room_0Set_000170DL_0027C8; -#define dspot17_room_0Set_000170DL_003480 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Set_000170DL_003480" +#define dspot17_room_0Set_000170DL_003480 "__OTR__scenes/shared/spot17_scene/spot17_room_0Set_000170DL_003480" static const ALIGN_ASSET(2) char spot17_room_0Set_000170DL_003480[] = dspot17_room_0Set_000170DL_003480; diff --git a/soh/assets/scenes/overworld/spot17/spot17_room_1.h b/soh/assets/scenes/overworld/spot17/spot17_room_1.h index b47c62986..3dd887130 100644 --- a/soh/assets/scenes/overworld/spot17/spot17_room_1.h +++ b/soh/assets/scenes/overworld/spot17/spot17_room_1.h @@ -3,376 +3,376 @@ #include "align_asset_macro.h" -#define dspot17_room_1DL_010A50 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_010A50" -static const ALIGN_ASSET(2) char spot17_room_1DL_010A50[] = dspot17_room_1DL_010A50; - -#define dspot17_room_1Tex_010E58 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_010E58" -static const ALIGN_ASSET(2) char spot17_room_1Tex_010E58[] = dspot17_room_1Tex_010E58; - -#define dspot17_room_1Tex_011258 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_011258" -static const ALIGN_ASSET(2) char spot17_room_1Tex_011258[] = dspot17_room_1Tex_011258; - -#define dspot17_room_1Tex_011658 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_011658" -static const ALIGN_ASSET(2) char spot17_room_1Tex_011658[] = dspot17_room_1Tex_011658; - -#define dspot17_room_1Tex_011A58 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_011A58" -static const ALIGN_ASSET(2) char spot17_room_1Tex_011A58[] = dspot17_room_1Tex_011A58; - -#define dspot17_room_1DL_00A438 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_00A438" -static const ALIGN_ASSET(2) char spot17_room_1DL_00A438[] = dspot17_room_1DL_00A438; - -#define dspot17_room_1Tex_00F4D8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_00F4D8" -static const ALIGN_ASSET(2) char spot17_room_1Tex_00F4D8[] = dspot17_room_1Tex_00F4D8; - -#define dspot17_room_1DL_007010 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_007010" -static const ALIGN_ASSET(2) char spot17_room_1DL_007010[] = dspot17_room_1DL_007010; - -#define dspot17_room_1DL_0072B0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_0072B0" -static const ALIGN_ASSET(2) char spot17_room_1DL_0072B0[] = dspot17_room_1DL_0072B0; - -#define dspot17_room_1DL_005290 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_005290" -static const ALIGN_ASSET(2) char spot17_room_1DL_005290[] = dspot17_room_1DL_005290; - -#define dspot17_room_1DL_010D10 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_010D10" -static const ALIGN_ASSET(2) char spot17_room_1DL_010D10[] = dspot17_room_1DL_010D10; - -#define dspot17_room_1DL_005E68 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_005E68" -static const ALIGN_ASSET(2) char spot17_room_1DL_005E68[] = dspot17_room_1DL_005E68; - -#define dspot17_room_1DL_002098 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_002098" -static const ALIGN_ASSET(2) char spot17_room_1DL_002098[] = dspot17_room_1DL_002098; - -#define dspot17_room_1Tex_00E8D8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_00E8D8" -static const ALIGN_ASSET(2) char spot17_room_1Tex_00E8D8[] = dspot17_room_1Tex_00E8D8; - -#define dspot17_room_1Tex_00D7D8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_00D7D8" -static const ALIGN_ASSET(2) char spot17_room_1Tex_00D7D8[] = dspot17_room_1Tex_00D7D8; - -#define dspot17_room_1DL_0096B0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_0096B0" -static const ALIGN_ASSET(2) char spot17_room_1DL_0096B0[] = dspot17_room_1DL_0096B0; - -#define dspot17_room_1DL_008868 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_008868" -static const ALIGN_ASSET(2) char spot17_room_1DL_008868[] = dspot17_room_1DL_008868; - -#define dspot17_room_1Tex_00FCD8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_00FCD8" -static const ALIGN_ASSET(2) char spot17_room_1Tex_00FCD8[] = dspot17_room_1Tex_00FCD8; - -#define dspot17_room_1DL_006A00 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_006A00" -static const ALIGN_ASSET(2) char spot17_room_1DL_006A00[] = dspot17_room_1DL_006A00; - -#define dspot17_room_1Tex_00BBD8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_00BBD8" +#define dspot17_room_1Tex_00BBD8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_00BBD8" static const ALIGN_ASSET(2) char spot17_room_1Tex_00BBD8[] = dspot17_room_1Tex_00BBD8; -#define dspot17_room_1Tex_00D3D8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_00D3D8" -static const ALIGN_ASSET(2) char spot17_room_1Tex_00D3D8[] = dspot17_room_1Tex_00D3D8; - -#define dspot17_room_1Tex_00C3D8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_00C3D8" +#define dspot17_room_1Tex_00C3D8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_00C3D8" static const ALIGN_ASSET(2) char spot17_room_1Tex_00C3D8[] = dspot17_room_1Tex_00C3D8; -#define dspot17_room_1DL_009FB0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_009FB0" -static const ALIGN_ASSET(2) char spot17_room_1DL_009FB0[] = dspot17_room_1DL_009FB0; - -#define dspot17_room_1Tex_00F0D8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_00F0D8" -static const ALIGN_ASSET(2) char spot17_room_1Tex_00F0D8[] = dspot17_room_1Tex_00F0D8; - -#define dspot17_room_1DL_010060 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_010060" -static const ALIGN_ASSET(2) char spot17_room_1DL_010060[] = dspot17_room_1DL_010060; - -#define dspot17_room_1Tex_012258 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_012258" -static const ALIGN_ASSET(2) char spot17_room_1Tex_012258[] = dspot17_room_1Tex_012258; - -#define dspot17_room_1DL_010300 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_010300" -static const ALIGN_ASSET(2) char spot17_room_1DL_010300[] = dspot17_room_1DL_010300; - -#define dspot17_room_1DL_0012E8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_0012E8" -static const ALIGN_ASSET(2) char spot17_room_1DL_0012E8[] = dspot17_room_1DL_0012E8; - -#define dspot17_room_1Tex_00ECD8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_00ECD8" -static const ALIGN_ASSET(2) char spot17_room_1Tex_00ECD8[] = dspot17_room_1Tex_00ECD8; - -#define dspot17_room_1DL_000E50 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_000E50" -static const ALIGN_ASSET(2) char spot17_room_1DL_000E50[] = dspot17_room_1DL_000E50; - -#define dspot17_room_1Tex_00CBD8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_00CBD8" +#define dspot17_room_1Tex_00CBD8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_00CBD8" static const ALIGN_ASSET(2) char spot17_room_1Tex_00CBD8[] = dspot17_room_1Tex_00CBD8; -#define dspot17_room_1DL_007B78 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_007B78" -static const ALIGN_ASSET(2) char spot17_room_1DL_007B78[] = dspot17_room_1DL_007B78; +#define dspot17_room_1Tex_00D3D8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_00D3D8" +static const ALIGN_ASSET(2) char spot17_room_1Tex_00D3D8[] = dspot17_room_1Tex_00D3D8; -#define dspot17_room_1Tex_00E7D8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_00E7D8" +#define dspot17_room_1Tex_00D7D8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_00D7D8" +static const ALIGN_ASSET(2) char spot17_room_1Tex_00D7D8[] = dspot17_room_1Tex_00D7D8; + +#define dspot17_room_1Tex_00E7D8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_00E7D8" static const ALIGN_ASSET(2) char spot17_room_1Tex_00E7D8[] = dspot17_room_1Tex_00E7D8; -#define dspot17_room_1DL_005550 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_005550" +#define dspot17_room_1Tex_00E8D8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_00E8D8" +static const ALIGN_ASSET(2) char spot17_room_1Tex_00E8D8[] = dspot17_room_1Tex_00E8D8; + +#define dspot17_room_1Tex_00ECD8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_00ECD8" +static const ALIGN_ASSET(2) char spot17_room_1Tex_00ECD8[] = dspot17_room_1Tex_00ECD8; + +#define dspot17_room_1Tex_00F0D8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_00F0D8" +static const ALIGN_ASSET(2) char spot17_room_1Tex_00F0D8[] = dspot17_room_1Tex_00F0D8; + +#define dspot17_room_1Tex_00F4D8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_00F4D8" +static const ALIGN_ASSET(2) char spot17_room_1Tex_00F4D8[] = dspot17_room_1Tex_00F4D8; + +#define dspot17_room_1Tex_00FCD8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_00FCD8" +static const ALIGN_ASSET(2) char spot17_room_1Tex_00FCD8[] = dspot17_room_1Tex_00FCD8; + +#define dspot17_room_1Tex_010E58 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_010E58" +static const ALIGN_ASSET(2) char spot17_room_1Tex_010E58[] = dspot17_room_1Tex_010E58; + +#define dspot17_room_1Tex_011258 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_011258" +static const ALIGN_ASSET(2) char spot17_room_1Tex_011258[] = dspot17_room_1Tex_011258; + +#define dspot17_room_1Tex_011658 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_011658" +static const ALIGN_ASSET(2) char spot17_room_1Tex_011658[] = dspot17_room_1Tex_011658; + +#define dspot17_room_1Tex_011A58 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_011A58" +static const ALIGN_ASSET(2) char spot17_room_1Tex_011A58[] = dspot17_room_1Tex_011A58; + +#define dspot17_room_1Tex_012258 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_012258" +static const ALIGN_ASSET(2) char spot17_room_1Tex_012258[] = dspot17_room_1Tex_012258; + +#define dspot17_room_1DL_010A50 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_010A50" +static const ALIGN_ASSET(2) char spot17_room_1DL_010A50[] = dspot17_room_1DL_010A50; + +#define dspot17_room_1DL_00A438 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_00A438" +static const ALIGN_ASSET(2) char spot17_room_1DL_00A438[] = dspot17_room_1DL_00A438; + +#define dspot17_room_1DL_007010 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_007010" +static const ALIGN_ASSET(2) char spot17_room_1DL_007010[] = dspot17_room_1DL_007010; + +#define dspot17_room_1DL_0072B0 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_0072B0" +static const ALIGN_ASSET(2) char spot17_room_1DL_0072B0[] = dspot17_room_1DL_0072B0; + +#define dspot17_room_1DL_005290 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_005290" +static const ALIGN_ASSET(2) char spot17_room_1DL_005290[] = dspot17_room_1DL_005290; + +#define dspot17_room_1DL_010D10 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_010D10" +static const ALIGN_ASSET(2) char spot17_room_1DL_010D10[] = dspot17_room_1DL_010D10; + +#define dspot17_room_1DL_005E68 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_005E68" +static const ALIGN_ASSET(2) char spot17_room_1DL_005E68[] = dspot17_room_1DL_005E68; + +#define dspot17_room_1DL_002098 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_002098" +static const ALIGN_ASSET(2) char spot17_room_1DL_002098[] = dspot17_room_1DL_002098; + +#define dspot17_room_1DL_0096B0 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_0096B0" +static const ALIGN_ASSET(2) char spot17_room_1DL_0096B0[] = dspot17_room_1DL_0096B0; + +#define dspot17_room_1DL_008868 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_008868" +static const ALIGN_ASSET(2) char spot17_room_1DL_008868[] = dspot17_room_1DL_008868; + +#define dspot17_room_1DL_006A00 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_006A00" +static const ALIGN_ASSET(2) char spot17_room_1DL_006A00[] = dspot17_room_1DL_006A00; + +#define dspot17_room_1DL_009FB0 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_009FB0" +static const ALIGN_ASSET(2) char spot17_room_1DL_009FB0[] = dspot17_room_1DL_009FB0; + +#define dspot17_room_1DL_010060 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_010060" +static const ALIGN_ASSET(2) char spot17_room_1DL_010060[] = dspot17_room_1DL_010060; + +#define dspot17_room_1DL_010300 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_010300" +static const ALIGN_ASSET(2) char spot17_room_1DL_010300[] = dspot17_room_1DL_010300; + +#define dspot17_room_1DL_0012E8 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_0012E8" +static const ALIGN_ASSET(2) char spot17_room_1DL_0012E8[] = dspot17_room_1DL_0012E8; + +#define dspot17_room_1DL_000E50 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_000E50" +static const ALIGN_ASSET(2) char spot17_room_1DL_000E50[] = dspot17_room_1DL_000E50; + +#define dspot17_room_1DL_007B78 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_007B78" +static const ALIGN_ASSET(2) char spot17_room_1DL_007B78[] = dspot17_room_1DL_007B78; + +#define dspot17_room_1DL_005550 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_005550" static const ALIGN_ASSET(2) char spot17_room_1DL_005550[] = dspot17_room_1DL_005550; -#define dspot17_room_1DL_00AD00 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_00AD00" +#define dspot17_room_1DL_00AD00 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_00AD00" static const ALIGN_ASSET(2) char spot17_room_1DL_00AD00[] = dspot17_room_1DL_00AD00; -#define dspot17_room_1DL_00B4A8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_00B4A8" +#define dspot17_room_1DL_00B4A8 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_00B4A8" static const ALIGN_ASSET(2) char spot17_room_1DL_00B4A8[] = dspot17_room_1DL_00B4A8; -#define dspot17_room_1DL_002938 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_002938" +#define dspot17_room_1DL_002938 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_002938" static const ALIGN_ASSET(2) char spot17_room_1DL_002938[] = dspot17_room_1DL_002938; -#define dspot17_room_1DL_003850 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_003850" +#define dspot17_room_1DL_003850 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_003850" static const ALIGN_ASSET(2) char spot17_room_1DL_003850[] = dspot17_room_1DL_003850; -#define dspot17_room_1DL_001A00 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_001A00" +#define dspot17_room_1DL_001A00 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_001A00" static const ALIGN_ASSET(2) char spot17_room_1DL_001A00[] = dspot17_room_1DL_001A00; -#define dspot17_room_1DL_00A908 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_00A908" +#define dspot17_room_1DL_00A908 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_00A908" static const ALIGN_ASSET(2) char spot17_room_1DL_00A908[] = dspot17_room_1DL_00A908; -#define dspot17_room_1DL_008F98 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_008F98" +#define dspot17_room_1DL_008F98 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_008F98" static const ALIGN_ASSET(2) char spot17_room_1DL_008F98[] = dspot17_room_1DL_008F98; -#define dspot17_room_1DL_009AA0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_009AA0" +#define dspot17_room_1DL_009AA0 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_009AA0" static const ALIGN_ASSET(2) char spot17_room_1DL_009AA0[] = dspot17_room_1DL_009AA0; -#define dspot17_room_1DL_004AC8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_004AC8" +#define dspot17_room_1DL_004AC8 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_004AC8" static const ALIGN_ASSET(2) char spot17_room_1DL_004AC8[] = dspot17_room_1DL_004AC8; -#define dspot17_room_1Set_0004C0DL_010A50 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_010A50" +#define dspot17_room_1Set_0004C0DL_010A50 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_010A50" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_010A50[] = dspot17_room_1Set_0004C0DL_010A50; -#define dspot17_room_1Set_0004C0DL_00A438 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_00A438" +#define dspot17_room_1Set_0004C0DL_00A438 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_00A438" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_00A438[] = dspot17_room_1Set_0004C0DL_00A438; -#define dspot17_room_1Set_0004C0DL_007010 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_007010" +#define dspot17_room_1Set_0004C0DL_007010 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_007010" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_007010[] = dspot17_room_1Set_0004C0DL_007010; -#define dspot17_room_1Set_0004C0DL_0072B0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_0072B0" +#define dspot17_room_1Set_0004C0DL_0072B0 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_0072B0" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_0072B0[] = dspot17_room_1Set_0004C0DL_0072B0; -#define dspot17_room_1Set_0004C0DL_005290 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_005290" +#define dspot17_room_1Set_0004C0DL_005290 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_005290" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_005290[] = dspot17_room_1Set_0004C0DL_005290; -#define dspot17_room_1Set_0004C0DL_010D10 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_010D10" +#define dspot17_room_1Set_0004C0DL_010D10 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_010D10" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_010D10[] = dspot17_room_1Set_0004C0DL_010D10; -#define dspot17_room_1Set_0004C0DL_005E68 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_005E68" +#define dspot17_room_1Set_0004C0DL_005E68 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_005E68" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_005E68[] = dspot17_room_1Set_0004C0DL_005E68; -#define dspot17_room_1Set_0004C0DL_002098 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_002098" +#define dspot17_room_1Set_0004C0DL_002098 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_002098" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_002098[] = dspot17_room_1Set_0004C0DL_002098; -#define dspot17_room_1Set_0004C0DL_0096B0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_0096B0" +#define dspot17_room_1Set_0004C0DL_0096B0 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_0096B0" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_0096B0[] = dspot17_room_1Set_0004C0DL_0096B0; -#define dspot17_room_1Set_0004C0DL_008868 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_008868" +#define dspot17_room_1Set_0004C0DL_008868 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_008868" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_008868[] = dspot17_room_1Set_0004C0DL_008868; -#define dspot17_room_1Set_0004C0DL_006A00 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_006A00" +#define dspot17_room_1Set_0004C0DL_006A00 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_006A00" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_006A00[] = dspot17_room_1Set_0004C0DL_006A00; -#define dspot17_room_1Set_0004C0DL_009FB0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_009FB0" +#define dspot17_room_1Set_0004C0DL_009FB0 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_009FB0" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_009FB0[] = dspot17_room_1Set_0004C0DL_009FB0; -#define dspot17_room_1Set_0004C0DL_010060 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_010060" +#define dspot17_room_1Set_0004C0DL_010060 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_010060" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_010060[] = dspot17_room_1Set_0004C0DL_010060; -#define dspot17_room_1Set_0004C0DL_010300 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_010300" +#define dspot17_room_1Set_0004C0DL_010300 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_010300" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_010300[] = dspot17_room_1Set_0004C0DL_010300; -#define dspot17_room_1Set_0004C0DL_0012E8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_0012E8" +#define dspot17_room_1Set_0004C0DL_0012E8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_0012E8" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_0012E8[] = dspot17_room_1Set_0004C0DL_0012E8; -#define dspot17_room_1Set_0004C0DL_000E50 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_000E50" +#define dspot17_room_1Set_0004C0DL_000E50 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_000E50" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_000E50[] = dspot17_room_1Set_0004C0DL_000E50; -#define dspot17_room_1Set_0004C0DL_007B78 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_007B78" +#define dspot17_room_1Set_0004C0DL_007B78 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_007B78" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_007B78[] = dspot17_room_1Set_0004C0DL_007B78; -#define dspot17_room_1Set_0004C0DL_005550 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_005550" +#define dspot17_room_1Set_0004C0DL_005550 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_005550" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_005550[] = dspot17_room_1Set_0004C0DL_005550; -#define dspot17_room_1Set_0004C0DL_00AD00 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_00AD00" +#define dspot17_room_1Set_0004C0DL_00AD00 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_00AD00" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_00AD00[] = dspot17_room_1Set_0004C0DL_00AD00; -#define dspot17_room_1Set_0004C0DL_00B4A8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_00B4A8" +#define dspot17_room_1Set_0004C0DL_00B4A8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_00B4A8" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_00B4A8[] = dspot17_room_1Set_0004C0DL_00B4A8; -#define dspot17_room_1Set_0004C0DL_002938 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_002938" +#define dspot17_room_1Set_0004C0DL_002938 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_002938" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_002938[] = dspot17_room_1Set_0004C0DL_002938; -#define dspot17_room_1Set_0004C0DL_003850 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_003850" +#define dspot17_room_1Set_0004C0DL_003850 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_003850" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_003850[] = dspot17_room_1Set_0004C0DL_003850; -#define dspot17_room_1Set_0004C0DL_001A00 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_001A00" +#define dspot17_room_1Set_0004C0DL_001A00 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_001A00" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_001A00[] = dspot17_room_1Set_0004C0DL_001A00; -#define dspot17_room_1Set_0004C0DL_00A908 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_00A908" +#define dspot17_room_1Set_0004C0DL_00A908 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_00A908" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_00A908[] = dspot17_room_1Set_0004C0DL_00A908; -#define dspot17_room_1Set_0004C0DL_008F98 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_008F98" +#define dspot17_room_1Set_0004C0DL_008F98 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_008F98" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_008F98[] = dspot17_room_1Set_0004C0DL_008F98; -#define dspot17_room_1Set_0004C0DL_009AA0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_009AA0" +#define dspot17_room_1Set_0004C0DL_009AA0 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_009AA0" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_009AA0[] = dspot17_room_1Set_0004C0DL_009AA0; -#define dspot17_room_1Set_0004C0DL_004AC8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_004AC8" +#define dspot17_room_1Set_0004C0DL_004AC8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_004AC8" static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_004AC8[] = dspot17_room_1Set_0004C0DL_004AC8; -#define dspot17_room_1Set_000830DL_010A50 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_010A50" +#define dspot17_room_1Set_000830DL_010A50 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_010A50" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_010A50[] = dspot17_room_1Set_000830DL_010A50; -#define dspot17_room_1Set_000830DL_00A438 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_00A438" +#define dspot17_room_1Set_000830DL_00A438 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_00A438" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_00A438[] = dspot17_room_1Set_000830DL_00A438; -#define dspot17_room_1Set_000830DL_007010 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_007010" +#define dspot17_room_1Set_000830DL_007010 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_007010" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_007010[] = dspot17_room_1Set_000830DL_007010; -#define dspot17_room_1Set_000830DL_0072B0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_0072B0" +#define dspot17_room_1Set_000830DL_0072B0 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_0072B0" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_0072B0[] = dspot17_room_1Set_000830DL_0072B0; -#define dspot17_room_1Set_000830DL_005290 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_005290" +#define dspot17_room_1Set_000830DL_005290 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_005290" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_005290[] = dspot17_room_1Set_000830DL_005290; -#define dspot17_room_1Set_000830DL_010D10 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_010D10" +#define dspot17_room_1Set_000830DL_010D10 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_010D10" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_010D10[] = dspot17_room_1Set_000830DL_010D10; -#define dspot17_room_1Set_000830DL_005E68 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_005E68" +#define dspot17_room_1Set_000830DL_005E68 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_005E68" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_005E68[] = dspot17_room_1Set_000830DL_005E68; -#define dspot17_room_1Set_000830DL_002098 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_002098" +#define dspot17_room_1Set_000830DL_002098 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_002098" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_002098[] = dspot17_room_1Set_000830DL_002098; -#define dspot17_room_1Set_000830DL_0096B0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_0096B0" +#define dspot17_room_1Set_000830DL_0096B0 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_0096B0" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_0096B0[] = dspot17_room_1Set_000830DL_0096B0; -#define dspot17_room_1Set_000830DL_008868 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_008868" +#define dspot17_room_1Set_000830DL_008868 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_008868" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_008868[] = dspot17_room_1Set_000830DL_008868; -#define dspot17_room_1Set_000830DL_006A00 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_006A00" +#define dspot17_room_1Set_000830DL_006A00 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_006A00" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_006A00[] = dspot17_room_1Set_000830DL_006A00; -#define dspot17_room_1Set_000830DL_009FB0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_009FB0" +#define dspot17_room_1Set_000830DL_009FB0 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_009FB0" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_009FB0[] = dspot17_room_1Set_000830DL_009FB0; -#define dspot17_room_1Set_000830DL_010060 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_010060" +#define dspot17_room_1Set_000830DL_010060 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_010060" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_010060[] = dspot17_room_1Set_000830DL_010060; -#define dspot17_room_1Set_000830DL_010300 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_010300" +#define dspot17_room_1Set_000830DL_010300 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_010300" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_010300[] = dspot17_room_1Set_000830DL_010300; -#define dspot17_room_1Set_000830DL_0012E8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_0012E8" +#define dspot17_room_1Set_000830DL_0012E8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_0012E8" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_0012E8[] = dspot17_room_1Set_000830DL_0012E8; -#define dspot17_room_1Set_000830DL_000E50 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_000E50" +#define dspot17_room_1Set_000830DL_000E50 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_000E50" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_000E50[] = dspot17_room_1Set_000830DL_000E50; -#define dspot17_room_1Set_000830DL_007B78 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_007B78" +#define dspot17_room_1Set_000830DL_007B78 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_007B78" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_007B78[] = dspot17_room_1Set_000830DL_007B78; -#define dspot17_room_1Set_000830DL_005550 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_005550" +#define dspot17_room_1Set_000830DL_005550 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_005550" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_005550[] = dspot17_room_1Set_000830DL_005550; -#define dspot17_room_1Set_000830DL_00AD00 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_00AD00" +#define dspot17_room_1Set_000830DL_00AD00 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_00AD00" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_00AD00[] = dspot17_room_1Set_000830DL_00AD00; -#define dspot17_room_1Set_000830DL_00B4A8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_00B4A8" +#define dspot17_room_1Set_000830DL_00B4A8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_00B4A8" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_00B4A8[] = dspot17_room_1Set_000830DL_00B4A8; -#define dspot17_room_1Set_000830DL_002938 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_002938" +#define dspot17_room_1Set_000830DL_002938 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_002938" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_002938[] = dspot17_room_1Set_000830DL_002938; -#define dspot17_room_1Set_000830DL_003850 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_003850" +#define dspot17_room_1Set_000830DL_003850 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_003850" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_003850[] = dspot17_room_1Set_000830DL_003850; -#define dspot17_room_1Set_000830DL_001A00 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_001A00" +#define dspot17_room_1Set_000830DL_001A00 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_001A00" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_001A00[] = dspot17_room_1Set_000830DL_001A00; -#define dspot17_room_1Set_000830DL_00A908 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_00A908" +#define dspot17_room_1Set_000830DL_00A908 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_00A908" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_00A908[] = dspot17_room_1Set_000830DL_00A908; -#define dspot17_room_1Set_000830DL_008F98 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_008F98" +#define dspot17_room_1Set_000830DL_008F98 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_008F98" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_008F98[] = dspot17_room_1Set_000830DL_008F98; -#define dspot17_room_1Set_000830DL_009AA0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_009AA0" +#define dspot17_room_1Set_000830DL_009AA0 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_009AA0" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_009AA0[] = dspot17_room_1Set_000830DL_009AA0; -#define dspot17_room_1Set_000830DL_004AC8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_004AC8" +#define dspot17_room_1Set_000830DL_004AC8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_004AC8" static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_004AC8[] = dspot17_room_1Set_000830DL_004AC8; -#define dspot17_room_1Set_000940DL_010A50 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_010A50" +#define dspot17_room_1Set_000940DL_010A50 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_010A50" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_010A50[] = dspot17_room_1Set_000940DL_010A50; -#define dspot17_room_1Set_000940DL_00A438 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_00A438" +#define dspot17_room_1Set_000940DL_00A438 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_00A438" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_00A438[] = dspot17_room_1Set_000940DL_00A438; -#define dspot17_room_1Set_000940DL_007010 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_007010" +#define dspot17_room_1Set_000940DL_007010 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_007010" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_007010[] = dspot17_room_1Set_000940DL_007010; -#define dspot17_room_1Set_000940DL_0072B0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_0072B0" +#define dspot17_room_1Set_000940DL_0072B0 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_0072B0" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_0072B0[] = dspot17_room_1Set_000940DL_0072B0; -#define dspot17_room_1Set_000940DL_005290 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_005290" +#define dspot17_room_1Set_000940DL_005290 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_005290" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_005290[] = dspot17_room_1Set_000940DL_005290; -#define dspot17_room_1Set_000940DL_010D10 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_010D10" +#define dspot17_room_1Set_000940DL_010D10 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_010D10" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_010D10[] = dspot17_room_1Set_000940DL_010D10; -#define dspot17_room_1Set_000940DL_005E68 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_005E68" +#define dspot17_room_1Set_000940DL_005E68 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_005E68" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_005E68[] = dspot17_room_1Set_000940DL_005E68; -#define dspot17_room_1Set_000940DL_002098 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_002098" +#define dspot17_room_1Set_000940DL_002098 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_002098" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_002098[] = dspot17_room_1Set_000940DL_002098; -#define dspot17_room_1Set_000940DL_0096B0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_0096B0" +#define dspot17_room_1Set_000940DL_0096B0 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_0096B0" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_0096B0[] = dspot17_room_1Set_000940DL_0096B0; -#define dspot17_room_1Set_000940DL_008868 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_008868" +#define dspot17_room_1Set_000940DL_008868 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_008868" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_008868[] = dspot17_room_1Set_000940DL_008868; -#define dspot17_room_1Set_000940DL_006A00 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_006A00" +#define dspot17_room_1Set_000940DL_006A00 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_006A00" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_006A00[] = dspot17_room_1Set_000940DL_006A00; -#define dspot17_room_1Set_000940DL_009FB0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_009FB0" +#define dspot17_room_1Set_000940DL_009FB0 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_009FB0" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_009FB0[] = dspot17_room_1Set_000940DL_009FB0; -#define dspot17_room_1Set_000940DL_010060 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_010060" +#define dspot17_room_1Set_000940DL_010060 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_010060" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_010060[] = dspot17_room_1Set_000940DL_010060; -#define dspot17_room_1Set_000940DL_010300 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_010300" +#define dspot17_room_1Set_000940DL_010300 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_010300" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_010300[] = dspot17_room_1Set_000940DL_010300; -#define dspot17_room_1Set_000940DL_0012E8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_0012E8" +#define dspot17_room_1Set_000940DL_0012E8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_0012E8" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_0012E8[] = dspot17_room_1Set_000940DL_0012E8; -#define dspot17_room_1Set_000940DL_000E50 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_000E50" +#define dspot17_room_1Set_000940DL_000E50 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_000E50" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_000E50[] = dspot17_room_1Set_000940DL_000E50; -#define dspot17_room_1Set_000940DL_007B78 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_007B78" +#define dspot17_room_1Set_000940DL_007B78 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_007B78" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_007B78[] = dspot17_room_1Set_000940DL_007B78; -#define dspot17_room_1Set_000940DL_005550 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_005550" +#define dspot17_room_1Set_000940DL_005550 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_005550" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_005550[] = dspot17_room_1Set_000940DL_005550; -#define dspot17_room_1Set_000940DL_00AD00 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_00AD00" +#define dspot17_room_1Set_000940DL_00AD00 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_00AD00" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_00AD00[] = dspot17_room_1Set_000940DL_00AD00; -#define dspot17_room_1Set_000940DL_00B4A8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_00B4A8" +#define dspot17_room_1Set_000940DL_00B4A8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_00B4A8" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_00B4A8[] = dspot17_room_1Set_000940DL_00B4A8; -#define dspot17_room_1Set_000940DL_002938 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_002938" +#define dspot17_room_1Set_000940DL_002938 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_002938" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_002938[] = dspot17_room_1Set_000940DL_002938; -#define dspot17_room_1Set_000940DL_003850 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_003850" +#define dspot17_room_1Set_000940DL_003850 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_003850" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_003850[] = dspot17_room_1Set_000940DL_003850; -#define dspot17_room_1Set_000940DL_001A00 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_001A00" +#define dspot17_room_1Set_000940DL_001A00 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_001A00" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_001A00[] = dspot17_room_1Set_000940DL_001A00; -#define dspot17_room_1Set_000940DL_00A908 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_00A908" +#define dspot17_room_1Set_000940DL_00A908 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_00A908" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_00A908[] = dspot17_room_1Set_000940DL_00A908; -#define dspot17_room_1Set_000940DL_008F98 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_008F98" +#define dspot17_room_1Set_000940DL_008F98 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_008F98" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_008F98[] = dspot17_room_1Set_000940DL_008F98; -#define dspot17_room_1Set_000940DL_009AA0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_009AA0" +#define dspot17_room_1Set_000940DL_009AA0 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_009AA0" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_009AA0[] = dspot17_room_1Set_000940DL_009AA0; -#define dspot17_room_1Set_000940DL_004AC8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_004AC8" +#define dspot17_room_1Set_000940DL_004AC8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_004AC8" static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_004AC8[] = dspot17_room_1Set_000940DL_004AC8; diff --git a/soh/assets/scenes/overworld/spot17/spot17_scene.h b/soh/assets/scenes/overworld/spot17/spot17_scene.h index 24f2ff86d..16c783e77 100644 --- a/soh/assets/scenes/overworld/spot17/spot17_scene.h +++ b/soh/assets/scenes/overworld/spot17/spot17_scene.h @@ -3,83 +3,83 @@ #include "align_asset_macro.h" -#define dgDeathMountainCraterBoleroCs "__OTR__scenes/nonmq/spot17_scene/gDeathMountainCraterBoleroCs" -static const ALIGN_ASSET(2) char gDeathMountainCraterBoleroCs[] = dgDeathMountainCraterBoleroCs; - -#define dgDeathMountainCraterIntroCs "__OTR__scenes/nonmq/spot17_scene/gDeathMountainCraterIntroCs" -static const ALIGN_ASSET(2) char gDeathMountainCraterIntroCs[] = dgDeathMountainCraterIntroCs; - -#define dspot17_sceneCollisionHeader_0045A4 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneCollisionHeader_0045A4" -static const ALIGN_ASSET(2) char spot17_sceneCollisionHeader_0045A4[] = dspot17_sceneCollisionHeader_0045A4; - -#define dspot17_sceneTex_007AD8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_007AD8" +#define dspot17_sceneTex_007AD8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_007AD8" static const ALIGN_ASSET(2) char spot17_sceneTex_007AD8[] = dspot17_sceneTex_007AD8; -#define dspot17_sceneTLUT_007890 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTLUT_007890" -static const ALIGN_ASSET(2) char spot17_sceneTLUT_007890[] = dspot17_sceneTLUT_007890; - -#define dspot17_sceneTex_00D6D8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_00D6D8" -static const ALIGN_ASSET(2) char spot17_sceneTex_00D6D8[] = dspot17_sceneTex_00D6D8; - -#define dspot17_sceneTex_00F8D8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_00F8D8" -static const ALIGN_ASSET(2) char spot17_sceneTex_00F8D8[] = dspot17_sceneTex_00F8D8; - -#define dspot17_sceneTex_00F0D8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_00F0D8" -static const ALIGN_ASSET(2) char spot17_sceneTex_00F0D8[] = dspot17_sceneTex_00F0D8; - -#define dspot17_sceneTex_00BED8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_00BED8" -static const ALIGN_ASSET(2) char spot17_sceneTex_00BED8[] = dspot17_sceneTex_00BED8; - -#define dspot17_sceneTex_00A6D8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_00A6D8" -static const ALIGN_ASSET(2) char spot17_sceneTex_00A6D8[] = dspot17_sceneTex_00A6D8; - -#define dspot17_sceneTex_009ED8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_009ED8" -static const ALIGN_ASSET(2) char spot17_sceneTex_009ED8[] = dspot17_sceneTex_009ED8; - -#define dspot17_sceneTex_00FCD8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_00FCD8" -static const ALIGN_ASSET(2) char spot17_sceneTex_00FCD8[] = dspot17_sceneTex_00FCD8; - -#define dspot17_sceneTex_00D8D8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_00D8D8" -static const ALIGN_ASSET(2) char spot17_sceneTex_00D8D8[] = dspot17_sceneTex_00D8D8; - -#define dspot17_sceneTex_008ED8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_008ED8" -static const ALIGN_ASSET(2) char spot17_sceneTex_008ED8[] = dspot17_sceneTex_008ED8; - -#define dspot17_sceneTex_00E0D8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_00E0D8" -static const ALIGN_ASSET(2) char spot17_sceneTex_00E0D8[] = dspot17_sceneTex_00E0D8; - -#define dspot17_sceneTLUT_007AB8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTLUT_007AB8" -static const ALIGN_ASSET(2) char spot17_sceneTLUT_007AB8[] = dspot17_sceneTLUT_007AB8; - -#define dspot17_sceneTex_00B6D8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_00B6D8" -static const ALIGN_ASSET(2) char spot17_sceneTex_00B6D8[] = dspot17_sceneTex_00B6D8; - -#define dspot17_sceneTex_00E8D8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_00E8D8" -static const ALIGN_ASSET(2) char spot17_sceneTex_00E8D8[] = dspot17_sceneTex_00E8D8; - -#define dspot17_sceneTex_00AED8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_00AED8" -static const ALIGN_ASSET(2) char spot17_sceneTex_00AED8[] = dspot17_sceneTex_00AED8; - -#define dspot17_sceneTLUT_007A98 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTLUT_007A98" -static const ALIGN_ASSET(2) char spot17_sceneTLUT_007A98[] = dspot17_sceneTLUT_007A98; - -#define dspot17_sceneTex_0096D8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_0096D8" -static const ALIGN_ASSET(2) char spot17_sceneTex_0096D8[] = dspot17_sceneTex_0096D8; - -#define dspot17_sceneTex_0082D8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_0082D8" +#define dspot17_sceneTex_0082D8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_0082D8" static const ALIGN_ASSET(2) char spot17_sceneTex_0082D8[] = dspot17_sceneTex_0082D8; -#define dspot17_sceneTex_0086D8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_0086D8" +#define dspot17_sceneTex_0086D8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_0086D8" static const ALIGN_ASSET(2) char spot17_sceneTex_0086D8[] = dspot17_sceneTex_0086D8; -#define dspot17_sceneTex_00C6D8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_00C6D8" +#define dspot17_sceneTex_008ED8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_008ED8" +static const ALIGN_ASSET(2) char spot17_sceneTex_008ED8[] = dspot17_sceneTex_008ED8; + +#define dspot17_sceneTex_0096D8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_0096D8" +static const ALIGN_ASSET(2) char spot17_sceneTex_0096D8[] = dspot17_sceneTex_0096D8; + +#define dspot17_sceneTex_009ED8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_009ED8" +static const ALIGN_ASSET(2) char spot17_sceneTex_009ED8[] = dspot17_sceneTex_009ED8; + +#define dspot17_sceneTex_00A6D8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_00A6D8" +static const ALIGN_ASSET(2) char spot17_sceneTex_00A6D8[] = dspot17_sceneTex_00A6D8; + +#define dspot17_sceneTex_00AED8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_00AED8" +static const ALIGN_ASSET(2) char spot17_sceneTex_00AED8[] = dspot17_sceneTex_00AED8; + +#define dspot17_sceneTex_00B6D8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_00B6D8" +static const ALIGN_ASSET(2) char spot17_sceneTex_00B6D8[] = dspot17_sceneTex_00B6D8; + +#define dspot17_sceneTex_00BED8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_00BED8" +static const ALIGN_ASSET(2) char spot17_sceneTex_00BED8[] = dspot17_sceneTex_00BED8; + +#define dspot17_sceneTex_00C6D8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_00C6D8" static const ALIGN_ASSET(2) char spot17_sceneTex_00C6D8[] = dspot17_sceneTex_00C6D8; -#define dspot17_sceneCollisionHeader_0045A4 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneCollisionHeader_0045A4" +#define dspot17_sceneTex_00D6D8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_00D6D8" +static const ALIGN_ASSET(2) char spot17_sceneTex_00D6D8[] = dspot17_sceneTex_00D6D8; -#define dspot17_sceneCollisionHeader_0045A4 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneCollisionHeader_0045A4" +#define dspot17_sceneTex_00D8D8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_00D8D8" +static const ALIGN_ASSET(2) char spot17_sceneTex_00D8D8[] = dspot17_sceneTex_00D8D8; -#define dspot17_sceneCollisionHeader_0045A4 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneCollisionHeader_0045A4" +#define dspot17_sceneTex_00E0D8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_00E0D8" +static const ALIGN_ASSET(2) char spot17_sceneTex_00E0D8[] = dspot17_sceneTex_00E0D8; + +#define dspot17_sceneTex_00E8D8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_00E8D8" +static const ALIGN_ASSET(2) char spot17_sceneTex_00E8D8[] = dspot17_sceneTex_00E8D8; + +#define dspot17_sceneTex_00F0D8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_00F0D8" +static const ALIGN_ASSET(2) char spot17_sceneTex_00F0D8[] = dspot17_sceneTex_00F0D8; + +#define dspot17_sceneTex_00F8D8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_00F8D8" +static const ALIGN_ASSET(2) char spot17_sceneTex_00F8D8[] = dspot17_sceneTex_00F8D8; + +#define dspot17_sceneTex_00FCD8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_00FCD8" +static const ALIGN_ASSET(2) char spot17_sceneTex_00FCD8[] = dspot17_sceneTex_00FCD8; + +#define dspot17_sceneTLUT_007890 "__OTR__scenes/shared/spot17_scene/spot17_sceneTLUT_007890" +static const ALIGN_ASSET(2) char spot17_sceneTLUT_007890[] = dspot17_sceneTLUT_007890; + +#define dspot17_sceneTLUT_007A98 "__OTR__scenes/shared/spot17_scene/spot17_sceneTLUT_007A98" +static const ALIGN_ASSET(2) char spot17_sceneTLUT_007A98[] = dspot17_sceneTLUT_007A98; + +#define dspot17_sceneTLUT_007AB8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTLUT_007AB8" +static const ALIGN_ASSET(2) char spot17_sceneTLUT_007AB8[] = dspot17_sceneTLUT_007AB8; + +#define dgDeathMountainCraterBoleroCs "__OTR__scenes/shared/spot17_scene/gDeathMountainCraterBoleroCs" +static const ALIGN_ASSET(2) char gDeathMountainCraterBoleroCs[] = dgDeathMountainCraterBoleroCs; + +#define dgDeathMountainCraterIntroCs "__OTR__scenes/shared/spot17_scene/gDeathMountainCraterIntroCs" +static const ALIGN_ASSET(2) char gDeathMountainCraterIntroCs[] = dgDeathMountainCraterIntroCs; + +#define dspot17_sceneCollisionHeader_0045A4 "__OTR__scenes/shared/spot17_scene/spot17_sceneCollisionHeader_0045A4" +static const ALIGN_ASSET(2) char spot17_sceneCollisionHeader_0045A4[] = dspot17_sceneCollisionHeader_0045A4; + +#define dspot17_sceneCollisionHeader_0045A4 "__OTR__scenes/shared/spot17_scene/spot17_sceneCollisionHeader_0045A4" + +#define dspot17_sceneCollisionHeader_0045A4 "__OTR__scenes/shared/spot17_scene/spot17_sceneCollisionHeader_0045A4" + +#define dspot17_sceneCollisionHeader_0045A4 "__OTR__scenes/shared/spot17_scene/spot17_sceneCollisionHeader_0045A4" #endif // OVERWORLD_SPOT17_SCENE_H diff --git a/soh/assets/scenes/overworld/spot18/spot18_room_0.h b/soh/assets/scenes/overworld/spot18/spot18_room_0.h index ed7ece37b..a2f9b3cc1 100644 --- a/soh/assets/scenes/overworld/spot18/spot18_room_0.h +++ b/soh/assets/scenes/overworld/spot18/spot18_room_0.h @@ -3,106 +3,106 @@ #include "align_asset_macro.h" -#define dspot18_room_0DL_003238 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0DL_003238" -static const ALIGN_ASSET(2) char spot18_room_0DL_003238[] = dspot18_room_0DL_003238; - -#define dspot18_room_0Tex_009960 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_009960" -static const ALIGN_ASSET(2) char spot18_room_0Tex_009960[] = dspot18_room_0Tex_009960; - -#define dspot18_room_0Tex_00C160 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_00C160" -static const ALIGN_ASSET(2) char spot18_room_0Tex_00C160[] = dspot18_room_0Tex_00C160; - -#define dspot18_room_0Tex_00A960 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_00A960" -static const ALIGN_ASSET(2) char spot18_room_0Tex_00A960[] = dspot18_room_0Tex_00A960; - -#define dspot18_room_0Tex_009160 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_009160" -static const ALIGN_ASSET(2) char spot18_room_0Tex_009160[] = dspot18_room_0Tex_009160; - -#define dspot18_room_0Tex_00B960 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_00B960" -static const ALIGN_ASSET(2) char spot18_room_0Tex_00B960[] = dspot18_room_0Tex_00B960; - -#define dspot18_room_0Tex_006960 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_006960" -static const ALIGN_ASSET(2) char spot18_room_0Tex_006960[] = dspot18_room_0Tex_006960; - -#define dspot18_room_0Tex_008960 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_008960" -static const ALIGN_ASSET(2) char spot18_room_0Tex_008960[] = dspot18_room_0Tex_008960; - -#define dspot18_room_0Tex_005960 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_005960" -static const ALIGN_ASSET(2) char spot18_room_0Tex_005960[] = dspot18_room_0Tex_005960; - -#define dspot18_room_0Tex_00B160 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_00B160" -static const ALIGN_ASSET(2) char spot18_room_0Tex_00B160[] = dspot18_room_0Tex_00B160; - -#define dspot18_room_0Tex_007960 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_007960" -static const ALIGN_ASSET(2) char spot18_room_0Tex_007960[] = dspot18_room_0Tex_007960; - -#define dspot18_room_0Tex_008160 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_008160" -static const ALIGN_ASSET(2) char spot18_room_0Tex_008160[] = dspot18_room_0Tex_008160; - -#define dspot18_room_0Tex_00A160 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_00A160" -static const ALIGN_ASSET(2) char spot18_room_0Tex_00A160[] = dspot18_room_0Tex_00A160; - -#define dspot18_room_0Tex_00C960 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_00C960" -static const ALIGN_ASSET(2) char spot18_room_0Tex_00C960[] = dspot18_room_0Tex_00C960; - -#define dspot18_room_0Tex_007160 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_007160" -static const ALIGN_ASSET(2) char spot18_room_0Tex_007160[] = dspot18_room_0Tex_007160; - -#define dspot18_room_0Tex_004960 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_004960" +#define dspot18_room_0Tex_004960 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_004960" static const ALIGN_ASSET(2) char spot18_room_0Tex_004960[] = dspot18_room_0Tex_004960; -#define dspot18_room_0Tex_005560 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_005560" -static const ALIGN_ASSET(2) char spot18_room_0Tex_005560[] = dspot18_room_0Tex_005560; - -#define dspot18_room_0Tex_005160 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_005160" +#define dspot18_room_0Tex_005160 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_005160" static const ALIGN_ASSET(2) char spot18_room_0Tex_005160[] = dspot18_room_0Tex_005160; -#define dspot18_room_0DL_00DC80 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0DL_00DC80" -static const ALIGN_ASSET(2) char spot18_room_0DL_00DC80[] = dspot18_room_0DL_00DC80; +#define dspot18_room_0Tex_005560 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_005560" +static const ALIGN_ASSET(2) char spot18_room_0Tex_005560[] = dspot18_room_0Tex_005560; -#define dspot18_room_0Tex_00EFC8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_00EFC8" -static const ALIGN_ASSET(2) char spot18_room_0Tex_00EFC8[] = dspot18_room_0Tex_00EFC8; +#define dspot18_room_0Tex_005960 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_005960" +static const ALIGN_ASSET(2) char spot18_room_0Tex_005960[] = dspot18_room_0Tex_005960; -#define dspot18_room_0Tex_00FFC8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_00FFC8" -static const ALIGN_ASSET(2) char spot18_room_0Tex_00FFC8[] = dspot18_room_0Tex_00FFC8; +#define dspot18_room_0Tex_006960 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_006960" +static const ALIGN_ASSET(2) char spot18_room_0Tex_006960[] = dspot18_room_0Tex_006960; -#define dspot18_room_0Tex_0117C8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_0117C8" -static const ALIGN_ASSET(2) char spot18_room_0Tex_0117C8[] = dspot18_room_0Tex_0117C8; +#define dspot18_room_0Tex_007160 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_007160" +static const ALIGN_ASSET(2) char spot18_room_0Tex_007160[] = dspot18_room_0Tex_007160; -#define dspot18_room_0Tex_0107C8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_0107C8" -static const ALIGN_ASSET(2) char spot18_room_0Tex_0107C8[] = dspot18_room_0Tex_0107C8; +#define dspot18_room_0Tex_007960 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_007960" +static const ALIGN_ASSET(2) char spot18_room_0Tex_007960[] = dspot18_room_0Tex_007960; -#define dspot18_room_0Tex_00DFC8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_00DFC8" +#define dspot18_room_0Tex_008160 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_008160" +static const ALIGN_ASSET(2) char spot18_room_0Tex_008160[] = dspot18_room_0Tex_008160; + +#define dspot18_room_0Tex_008960 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_008960" +static const ALIGN_ASSET(2) char spot18_room_0Tex_008960[] = dspot18_room_0Tex_008960; + +#define dspot18_room_0Tex_009160 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_009160" +static const ALIGN_ASSET(2) char spot18_room_0Tex_009160[] = dspot18_room_0Tex_009160; + +#define dspot18_room_0Tex_009960 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_009960" +static const ALIGN_ASSET(2) char spot18_room_0Tex_009960[] = dspot18_room_0Tex_009960; + +#define dspot18_room_0Tex_00A160 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_00A160" +static const ALIGN_ASSET(2) char spot18_room_0Tex_00A160[] = dspot18_room_0Tex_00A160; + +#define dspot18_room_0Tex_00A960 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_00A960" +static const ALIGN_ASSET(2) char spot18_room_0Tex_00A960[] = dspot18_room_0Tex_00A960; + +#define dspot18_room_0Tex_00B160 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_00B160" +static const ALIGN_ASSET(2) char spot18_room_0Tex_00B160[] = dspot18_room_0Tex_00B160; + +#define dspot18_room_0Tex_00B960 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_00B960" +static const ALIGN_ASSET(2) char spot18_room_0Tex_00B960[] = dspot18_room_0Tex_00B960; + +#define dspot18_room_0Tex_00C160 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_00C160" +static const ALIGN_ASSET(2) char spot18_room_0Tex_00C160[] = dspot18_room_0Tex_00C160; + +#define dspot18_room_0Tex_00C960 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_00C960" +static const ALIGN_ASSET(2) char spot18_room_0Tex_00C960[] = dspot18_room_0Tex_00C960; + +#define dspot18_room_0Tex_00DFC8 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_00DFC8" static const ALIGN_ASSET(2) char spot18_room_0Tex_00DFC8[] = dspot18_room_0Tex_00DFC8; -#define dspot18_room_0DL_0013E0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0DL_0013E0" +#define dspot18_room_0Tex_00EFC8 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_00EFC8" +static const ALIGN_ASSET(2) char spot18_room_0Tex_00EFC8[] = dspot18_room_0Tex_00EFC8; + +#define dspot18_room_0Tex_00FFC8 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_00FFC8" +static const ALIGN_ASSET(2) char spot18_room_0Tex_00FFC8[] = dspot18_room_0Tex_00FFC8; + +#define dspot18_room_0Tex_0107C8 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_0107C8" +static const ALIGN_ASSET(2) char spot18_room_0Tex_0107C8[] = dspot18_room_0Tex_0107C8; + +#define dspot18_room_0Tex_0117C8 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_0117C8" +static const ALIGN_ASSET(2) char spot18_room_0Tex_0117C8[] = dspot18_room_0Tex_0117C8; + +#define dspot18_room_0DL_003238 "__OTR__scenes/shared/spot18_scene/spot18_room_0DL_003238" +static const ALIGN_ASSET(2) char spot18_room_0DL_003238[] = dspot18_room_0DL_003238; + +#define dspot18_room_0DL_00DC80 "__OTR__scenes/shared/spot18_scene/spot18_room_0DL_00DC80" +static const ALIGN_ASSET(2) char spot18_room_0DL_00DC80[] = dspot18_room_0DL_00DC80; + +#define dspot18_room_0DL_0013E0 "__OTR__scenes/shared/spot18_scene/spot18_room_0DL_0013E0" static const ALIGN_ASSET(2) char spot18_room_0DL_0013E0[] = dspot18_room_0DL_0013E0; -#define dspot18_room_0Set_0003C0DL_003238 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Set_0003C0DL_003238" +#define dspot18_room_0Set_0003C0DL_003238 "__OTR__scenes/shared/spot18_scene/spot18_room_0Set_0003C0DL_003238" static const ALIGN_ASSET(2) char spot18_room_0Set_0003C0DL_003238[] = dspot18_room_0Set_0003C0DL_003238; -#define dspot18_room_0Set_0003C0DL_00DC80 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Set_0003C0DL_00DC80" +#define dspot18_room_0Set_0003C0DL_00DC80 "__OTR__scenes/shared/spot18_scene/spot18_room_0Set_0003C0DL_00DC80" static const ALIGN_ASSET(2) char spot18_room_0Set_0003C0DL_00DC80[] = dspot18_room_0Set_0003C0DL_00DC80; -#define dspot18_room_0Set_0003C0DL_0013E0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Set_0003C0DL_0013E0" +#define dspot18_room_0Set_0003C0DL_0013E0 "__OTR__scenes/shared/spot18_scene/spot18_room_0Set_0003C0DL_0013E0" static const ALIGN_ASSET(2) char spot18_room_0Set_0003C0DL_0013E0[] = dspot18_room_0Set_0003C0DL_0013E0; -#define dspot18_room_0Set_000730DL_003238 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Set_000730DL_003238" +#define dspot18_room_0Set_000730DL_003238 "__OTR__scenes/shared/spot18_scene/spot18_room_0Set_000730DL_003238" static const ALIGN_ASSET(2) char spot18_room_0Set_000730DL_003238[] = dspot18_room_0Set_000730DL_003238; -#define dspot18_room_0Set_000730DL_00DC80 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Set_000730DL_00DC80" +#define dspot18_room_0Set_000730DL_00DC80 "__OTR__scenes/shared/spot18_scene/spot18_room_0Set_000730DL_00DC80" static const ALIGN_ASSET(2) char spot18_room_0Set_000730DL_00DC80[] = dspot18_room_0Set_000730DL_00DC80; -#define dspot18_room_0Set_000730DL_0013E0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Set_000730DL_0013E0" +#define dspot18_room_0Set_000730DL_0013E0 "__OTR__scenes/shared/spot18_scene/spot18_room_0Set_000730DL_0013E0" static const ALIGN_ASSET(2) char spot18_room_0Set_000730DL_0013E0[] = dspot18_room_0Set_000730DL_0013E0; -#define dspot18_room_0Set_000D10DL_003238 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Set_000D10DL_003238" +#define dspot18_room_0Set_000D10DL_003238 "__OTR__scenes/shared/spot18_scene/spot18_room_0Set_000D10DL_003238" static const ALIGN_ASSET(2) char spot18_room_0Set_000D10DL_003238[] = dspot18_room_0Set_000D10DL_003238; -#define dspot18_room_0Set_000D10DL_00DC80 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Set_000D10DL_00DC80" +#define dspot18_room_0Set_000D10DL_00DC80 "__OTR__scenes/shared/spot18_scene/spot18_room_0Set_000D10DL_00DC80" static const ALIGN_ASSET(2) char spot18_room_0Set_000D10DL_00DC80[] = dspot18_room_0Set_000D10DL_00DC80; -#define dspot18_room_0Set_000D10DL_0013E0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Set_000D10DL_0013E0" +#define dspot18_room_0Set_000D10DL_0013E0 "__OTR__scenes/shared/spot18_scene/spot18_room_0Set_000D10DL_0013E0" static const ALIGN_ASSET(2) char spot18_room_0Set_000D10DL_0013E0[] = dspot18_room_0Set_000D10DL_0013E0; diff --git a/soh/assets/scenes/overworld/spot18/spot18_room_1.h b/soh/assets/scenes/overworld/spot18/spot18_room_1.h index fad61da7e..8f6af81cd 100644 --- a/soh/assets/scenes/overworld/spot18/spot18_room_1.h +++ b/soh/assets/scenes/overworld/spot18/spot18_room_1.h @@ -3,115 +3,115 @@ #include "align_asset_macro.h" -#define dspot18_room_1DL_001A38 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1DL_001A38" -static const ALIGN_ASSET(2) char spot18_room_1DL_001A38[] = dspot18_room_1DL_001A38; - -#define dspot18_room_1DL_0059F0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1DL_0059F0" -static const ALIGN_ASSET(2) char spot18_room_1DL_0059F0[] = dspot18_room_1DL_0059F0; - -#define dspot18_room_1DL_001770 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1DL_001770" -static const ALIGN_ASSET(2) char spot18_room_1DL_001770[] = dspot18_room_1DL_001770; - -#define dspot18_room_1Tex_003068 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Tex_003068" -static const ALIGN_ASSET(2) char spot18_room_1Tex_003068[] = dspot18_room_1Tex_003068; - -#define dspot18_room_1DL_001E60 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1DL_001E60" -static const ALIGN_ASSET(2) char spot18_room_1DL_001E60[] = dspot18_room_1DL_001E60; - -#define dspot18_room_1Tex_004868 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Tex_004868" -static const ALIGN_ASSET(2) char spot18_room_1Tex_004868[] = dspot18_room_1Tex_004868; - -#define dspot18_room_1DL_005CC0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1DL_005CC0" -static const ALIGN_ASSET(2) char spot18_room_1DL_005CC0[] = dspot18_room_1DL_005CC0; - -#define dspot18_room_1Tex_005E00 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Tex_005E00" -static const ALIGN_ASSET(2) char spot18_room_1Tex_005E00[] = dspot18_room_1Tex_005E00; - -#define dspot18_room_1DL_0007D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1DL_0007D0" -static const ALIGN_ASSET(2) char spot18_room_1DL_0007D0[] = dspot18_room_1DL_0007D0; - -#define dspot18_room_1Tex_004068 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Tex_004068" -static const ALIGN_ASSET(2) char spot18_room_1Tex_004068[] = dspot18_room_1Tex_004068; - -#define dspot18_room_1DL_001398 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1DL_001398" -static const ALIGN_ASSET(2) char spot18_room_1DL_001398[] = dspot18_room_1DL_001398; - -#define dspot18_room_1DL_002660 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1DL_002660" -static const ALIGN_ASSET(2) char spot18_room_1DL_002660[] = dspot18_room_1DL_002660; - -#define dspot18_room_1Tex_002868 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Tex_002868" +#define dspot18_room_1Tex_002868 "__OTR__scenes/shared/spot18_scene/spot18_room_1Tex_002868" static const ALIGN_ASSET(2) char spot18_room_1Tex_002868[] = dspot18_room_1Tex_002868; -#define dspot18_room_1Set_000170DL_001A38 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000170DL_001A38" +#define dspot18_room_1Tex_003068 "__OTR__scenes/shared/spot18_scene/spot18_room_1Tex_003068" +static const ALIGN_ASSET(2) char spot18_room_1Tex_003068[] = dspot18_room_1Tex_003068; + +#define dspot18_room_1Tex_004068 "__OTR__scenes/shared/spot18_scene/spot18_room_1Tex_004068" +static const ALIGN_ASSET(2) char spot18_room_1Tex_004068[] = dspot18_room_1Tex_004068; + +#define dspot18_room_1Tex_004868 "__OTR__scenes/shared/spot18_scene/spot18_room_1Tex_004868" +static const ALIGN_ASSET(2) char spot18_room_1Tex_004868[] = dspot18_room_1Tex_004868; + +#define dspot18_room_1Tex_005E00 "__OTR__scenes/shared/spot18_scene/spot18_room_1Tex_005E00" +static const ALIGN_ASSET(2) char spot18_room_1Tex_005E00[] = dspot18_room_1Tex_005E00; + +#define dspot18_room_1DL_001A38 "__OTR__scenes/shared/spot18_scene/spot18_room_1DL_001A38" +static const ALIGN_ASSET(2) char spot18_room_1DL_001A38[] = dspot18_room_1DL_001A38; + +#define dspot18_room_1DL_0059F0 "__OTR__scenes/shared/spot18_scene/spot18_room_1DL_0059F0" +static const ALIGN_ASSET(2) char spot18_room_1DL_0059F0[] = dspot18_room_1DL_0059F0; + +#define dspot18_room_1DL_001770 "__OTR__scenes/shared/spot18_scene/spot18_room_1DL_001770" +static const ALIGN_ASSET(2) char spot18_room_1DL_001770[] = dspot18_room_1DL_001770; + +#define dspot18_room_1DL_001E60 "__OTR__scenes/shared/spot18_scene/spot18_room_1DL_001E60" +static const ALIGN_ASSET(2) char spot18_room_1DL_001E60[] = dspot18_room_1DL_001E60; + +#define dspot18_room_1DL_005CC0 "__OTR__scenes/shared/spot18_scene/spot18_room_1DL_005CC0" +static const ALIGN_ASSET(2) char spot18_room_1DL_005CC0[] = dspot18_room_1DL_005CC0; + +#define dspot18_room_1DL_0007D0 "__OTR__scenes/shared/spot18_scene/spot18_room_1DL_0007D0" +static const ALIGN_ASSET(2) char spot18_room_1DL_0007D0[] = dspot18_room_1DL_0007D0; + +#define dspot18_room_1DL_001398 "__OTR__scenes/shared/spot18_scene/spot18_room_1DL_001398" +static const ALIGN_ASSET(2) char spot18_room_1DL_001398[] = dspot18_room_1DL_001398; + +#define dspot18_room_1DL_002660 "__OTR__scenes/shared/spot18_scene/spot18_room_1DL_002660" +static const ALIGN_ASSET(2) char spot18_room_1DL_002660[] = dspot18_room_1DL_002660; + +#define dspot18_room_1Set_000170DL_001A38 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000170DL_001A38" static const ALIGN_ASSET(2) char spot18_room_1Set_000170DL_001A38[] = dspot18_room_1Set_000170DL_001A38; -#define dspot18_room_1Set_000170DL_0059F0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000170DL_0059F0" +#define dspot18_room_1Set_000170DL_0059F0 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000170DL_0059F0" static const ALIGN_ASSET(2) char spot18_room_1Set_000170DL_0059F0[] = dspot18_room_1Set_000170DL_0059F0; -#define dspot18_room_1Set_000170DL_001770 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000170DL_001770" +#define dspot18_room_1Set_000170DL_001770 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000170DL_001770" static const ALIGN_ASSET(2) char spot18_room_1Set_000170DL_001770[] = dspot18_room_1Set_000170DL_001770; -#define dspot18_room_1Set_000170DL_001E60 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000170DL_001E60" +#define dspot18_room_1Set_000170DL_001E60 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000170DL_001E60" static const ALIGN_ASSET(2) char spot18_room_1Set_000170DL_001E60[] = dspot18_room_1Set_000170DL_001E60; -#define dspot18_room_1Set_000170DL_005CC0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000170DL_005CC0" +#define dspot18_room_1Set_000170DL_005CC0 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000170DL_005CC0" static const ALIGN_ASSET(2) char spot18_room_1Set_000170DL_005CC0[] = dspot18_room_1Set_000170DL_005CC0; -#define dspot18_room_1Set_000170DL_0007D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000170DL_0007D0" +#define dspot18_room_1Set_000170DL_0007D0 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000170DL_0007D0" static const ALIGN_ASSET(2) char spot18_room_1Set_000170DL_0007D0[] = dspot18_room_1Set_000170DL_0007D0; -#define dspot18_room_1Set_000170DL_001398 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000170DL_001398" +#define dspot18_room_1Set_000170DL_001398 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000170DL_001398" static const ALIGN_ASSET(2) char spot18_room_1Set_000170DL_001398[] = dspot18_room_1Set_000170DL_001398; -#define dspot18_room_1Set_000170DL_002660 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000170DL_002660" +#define dspot18_room_1Set_000170DL_002660 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000170DL_002660" static const ALIGN_ASSET(2) char spot18_room_1Set_000170DL_002660[] = dspot18_room_1Set_000170DL_002660; -#define dspot18_room_1Set_000230DL_001A38 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000230DL_001A38" +#define dspot18_room_1Set_000230DL_001A38 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000230DL_001A38" static const ALIGN_ASSET(2) char spot18_room_1Set_000230DL_001A38[] = dspot18_room_1Set_000230DL_001A38; -#define dspot18_room_1Set_000230DL_0059F0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000230DL_0059F0" +#define dspot18_room_1Set_000230DL_0059F0 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000230DL_0059F0" static const ALIGN_ASSET(2) char spot18_room_1Set_000230DL_0059F0[] = dspot18_room_1Set_000230DL_0059F0; -#define dspot18_room_1Set_000230DL_001770 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000230DL_001770" +#define dspot18_room_1Set_000230DL_001770 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000230DL_001770" static const ALIGN_ASSET(2) char spot18_room_1Set_000230DL_001770[] = dspot18_room_1Set_000230DL_001770; -#define dspot18_room_1Set_000230DL_001E60 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000230DL_001E60" +#define dspot18_room_1Set_000230DL_001E60 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000230DL_001E60" static const ALIGN_ASSET(2) char spot18_room_1Set_000230DL_001E60[] = dspot18_room_1Set_000230DL_001E60; -#define dspot18_room_1Set_000230DL_005CC0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000230DL_005CC0" +#define dspot18_room_1Set_000230DL_005CC0 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000230DL_005CC0" static const ALIGN_ASSET(2) char spot18_room_1Set_000230DL_005CC0[] = dspot18_room_1Set_000230DL_005CC0; -#define dspot18_room_1Set_000230DL_0007D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000230DL_0007D0" +#define dspot18_room_1Set_000230DL_0007D0 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000230DL_0007D0" static const ALIGN_ASSET(2) char spot18_room_1Set_000230DL_0007D0[] = dspot18_room_1Set_000230DL_0007D0; -#define dspot18_room_1Set_000230DL_001398 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000230DL_001398" +#define dspot18_room_1Set_000230DL_001398 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000230DL_001398" static const ALIGN_ASSET(2) char spot18_room_1Set_000230DL_001398[] = dspot18_room_1Set_000230DL_001398; -#define dspot18_room_1Set_000230DL_002660 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000230DL_002660" +#define dspot18_room_1Set_000230DL_002660 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000230DL_002660" static const ALIGN_ASSET(2) char spot18_room_1Set_000230DL_002660[] = dspot18_room_1Set_000230DL_002660; -#define dspot18_room_1Set_000300DL_001A38 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000300DL_001A38" +#define dspot18_room_1Set_000300DL_001A38 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000300DL_001A38" static const ALIGN_ASSET(2) char spot18_room_1Set_000300DL_001A38[] = dspot18_room_1Set_000300DL_001A38; -#define dspot18_room_1Set_000300DL_0059F0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000300DL_0059F0" +#define dspot18_room_1Set_000300DL_0059F0 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000300DL_0059F0" static const ALIGN_ASSET(2) char spot18_room_1Set_000300DL_0059F0[] = dspot18_room_1Set_000300DL_0059F0; -#define dspot18_room_1Set_000300DL_001770 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000300DL_001770" +#define dspot18_room_1Set_000300DL_001770 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000300DL_001770" static const ALIGN_ASSET(2) char spot18_room_1Set_000300DL_001770[] = dspot18_room_1Set_000300DL_001770; -#define dspot18_room_1Set_000300DL_001E60 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000300DL_001E60" +#define dspot18_room_1Set_000300DL_001E60 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000300DL_001E60" static const ALIGN_ASSET(2) char spot18_room_1Set_000300DL_001E60[] = dspot18_room_1Set_000300DL_001E60; -#define dspot18_room_1Set_000300DL_005CC0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000300DL_005CC0" +#define dspot18_room_1Set_000300DL_005CC0 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000300DL_005CC0" static const ALIGN_ASSET(2) char spot18_room_1Set_000300DL_005CC0[] = dspot18_room_1Set_000300DL_005CC0; -#define dspot18_room_1Set_000300DL_0007D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000300DL_0007D0" +#define dspot18_room_1Set_000300DL_0007D0 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000300DL_0007D0" static const ALIGN_ASSET(2) char spot18_room_1Set_000300DL_0007D0[] = dspot18_room_1Set_000300DL_0007D0; -#define dspot18_room_1Set_000300DL_001398 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000300DL_001398" +#define dspot18_room_1Set_000300DL_001398 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000300DL_001398" static const ALIGN_ASSET(2) char spot18_room_1Set_000300DL_001398[] = dspot18_room_1Set_000300DL_001398; -#define dspot18_room_1Set_000300DL_002660 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000300DL_002660" +#define dspot18_room_1Set_000300DL_002660 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000300DL_002660" static const ALIGN_ASSET(2) char spot18_room_1Set_000300DL_002660[] = dspot18_room_1Set_000300DL_002660; diff --git a/soh/assets/scenes/overworld/spot18/spot18_room_2.h b/soh/assets/scenes/overworld/spot18/spot18_room_2.h index 71a11385d..4207bcd96 100644 --- a/soh/assets/scenes/overworld/spot18/spot18_room_2.h +++ b/soh/assets/scenes/overworld/spot18/spot18_room_2.h @@ -3,181 +3,181 @@ #include "align_asset_macro.h" -#define dspot18_room_2DL_003F10 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2DL_003F10" -static const ALIGN_ASSET(2) char spot18_room_2DL_003F10[] = dspot18_room_2DL_003F10; - -#define dspot18_room_2Tex_009018 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_009018" -static const ALIGN_ASSET(2) char spot18_room_2Tex_009018[] = dspot18_room_2Tex_009018; - -#define dspot18_room_2DL_00CF58 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2DL_00CF58" -static const ALIGN_ASSET(2) char spot18_room_2DL_00CF58[] = dspot18_room_2DL_00CF58; - -#define dspot18_room_2Tex_00E1A8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_00E1A8" -static const ALIGN_ASSET(2) char spot18_room_2Tex_00E1A8[] = dspot18_room_2Tex_00E1A8; - -#define dspot18_room_2DL_004320 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2DL_004320" -static const ALIGN_ASSET(2) char spot18_room_2DL_004320[] = dspot18_room_2DL_004320; - -#define dspot18_room_2Tex_007818 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_007818" -static const ALIGN_ASSET(2) char spot18_room_2Tex_007818[] = dspot18_room_2Tex_007818; - -#define dspot18_room_2DL_004690 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2DL_004690" -static const ALIGN_ASSET(2) char spot18_room_2DL_004690[] = dspot18_room_2DL_004690; - -#define dspot18_room_2Tex_008018 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_008018" -static const ALIGN_ASSET(2) char spot18_room_2Tex_008018[] = dspot18_room_2Tex_008018; - -#define dspot18_room_2DL_00D0D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2DL_00D0D0" -static const ALIGN_ASSET(2) char spot18_room_2DL_00D0D0[] = dspot18_room_2DL_00D0D0; - -#define dspot18_room_2DL_001FE8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2DL_001FE8" -static const ALIGN_ASSET(2) char spot18_room_2DL_001FE8[] = dspot18_room_2DL_001FE8; - -#define dspot18_room_2Tex_006018 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_006018" -static const ALIGN_ASSET(2) char spot18_room_2Tex_006018[] = dspot18_room_2Tex_006018; - -#define dspot18_room_2Tex_006818 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_006818" -static const ALIGN_ASSET(2) char spot18_room_2Tex_006818[] = dspot18_room_2Tex_006818; - -#define dspot18_room_2DL_003090 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2DL_003090" -static const ALIGN_ASSET(2) char spot18_room_2DL_003090[] = dspot18_room_2DL_003090; - -#define dspot18_room_2Tex_009818 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_009818" -static const ALIGN_ASSET(2) char spot18_room_2Tex_009818[] = dspot18_room_2Tex_009818; - -#define dspot18_room_2Tex_00A818 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_00A818" -static const ALIGN_ASSET(2) char spot18_room_2Tex_00A818[] = dspot18_room_2Tex_00A818; - -#define dspot18_room_2Tex_00B018 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_00B018" -static const ALIGN_ASSET(2) char spot18_room_2Tex_00B018[] = dspot18_room_2Tex_00B018; - -#define dspot18_room_2Tex_008818 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_008818" -static const ALIGN_ASSET(2) char spot18_room_2Tex_008818[] = dspot18_room_2Tex_008818; - -#define dspot18_room_2Tex_004818 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_004818" +#define dspot18_room_2Tex_004818 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_004818" static const ALIGN_ASSET(2) char spot18_room_2Tex_004818[] = dspot18_room_2Tex_004818; -#define dspot18_room_2Tex_007018 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_007018" -static const ALIGN_ASSET(2) char spot18_room_2Tex_007018[] = dspot18_room_2Tex_007018; - -#define dspot18_room_2Tex_00A018 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_00A018" -static const ALIGN_ASSET(2) char spot18_room_2Tex_00A018[] = dspot18_room_2Tex_00A018; - -#define dspot18_room_2Tex_00B818 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_00B818" -static const ALIGN_ASSET(2) char spot18_room_2Tex_00B818[] = dspot18_room_2Tex_00B818; - -#define dspot18_room_2DL_00CBC0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2DL_00CBC0" -static const ALIGN_ASSET(2) char spot18_room_2DL_00CBC0[] = dspot18_room_2DL_00CBC0; - -#define dspot18_room_2Tex_00F1A8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_00F1A8" -static const ALIGN_ASSET(2) char spot18_room_2Tex_00F1A8[] = dspot18_room_2Tex_00F1A8; - -#define dspot18_room_2Tex_0109A8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_0109A8" -static const ALIGN_ASSET(2) char spot18_room_2Tex_0109A8[] = dspot18_room_2Tex_0109A8; - -#define dspot18_room_2Tex_00F9A8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_00F9A8" -static const ALIGN_ASSET(2) char spot18_room_2Tex_00F9A8[] = dspot18_room_2Tex_00F9A8; - -#define dspot18_room_2Tex_00D1A8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_00D1A8" -static const ALIGN_ASSET(2) char spot18_room_2Tex_00D1A8[] = dspot18_room_2Tex_00D1A8; - -#define dspot18_room_2DL_0019D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2DL_0019D0" -static const ALIGN_ASSET(2) char spot18_room_2DL_0019D0[] = dspot18_room_2DL_0019D0; - -#define dspot18_room_2Tex_005818 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_005818" +#define dspot18_room_2Tex_005818 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_005818" static const ALIGN_ASSET(2) char spot18_room_2Tex_005818[] = dspot18_room_2Tex_005818; -#define dspot18_room_2DL_000E30 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2DL_000E30" +#define dspot18_room_2Tex_006018 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_006018" +static const ALIGN_ASSET(2) char spot18_room_2Tex_006018[] = dspot18_room_2Tex_006018; + +#define dspot18_room_2Tex_006818 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_006818" +static const ALIGN_ASSET(2) char spot18_room_2Tex_006818[] = dspot18_room_2Tex_006818; + +#define dspot18_room_2Tex_007018 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_007018" +static const ALIGN_ASSET(2) char spot18_room_2Tex_007018[] = dspot18_room_2Tex_007018; + +#define dspot18_room_2Tex_007818 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_007818" +static const ALIGN_ASSET(2) char spot18_room_2Tex_007818[] = dspot18_room_2Tex_007818; + +#define dspot18_room_2Tex_008018 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_008018" +static const ALIGN_ASSET(2) char spot18_room_2Tex_008018[] = dspot18_room_2Tex_008018; + +#define dspot18_room_2Tex_008818 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_008818" +static const ALIGN_ASSET(2) char spot18_room_2Tex_008818[] = dspot18_room_2Tex_008818; + +#define dspot18_room_2Tex_009018 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_009018" +static const ALIGN_ASSET(2) char spot18_room_2Tex_009018[] = dspot18_room_2Tex_009018; + +#define dspot18_room_2Tex_009818 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_009818" +static const ALIGN_ASSET(2) char spot18_room_2Tex_009818[] = dspot18_room_2Tex_009818; + +#define dspot18_room_2Tex_00A018 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_00A018" +static const ALIGN_ASSET(2) char spot18_room_2Tex_00A018[] = dspot18_room_2Tex_00A018; + +#define dspot18_room_2Tex_00A818 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_00A818" +static const ALIGN_ASSET(2) char spot18_room_2Tex_00A818[] = dspot18_room_2Tex_00A818; + +#define dspot18_room_2Tex_00B018 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_00B018" +static const ALIGN_ASSET(2) char spot18_room_2Tex_00B018[] = dspot18_room_2Tex_00B018; + +#define dspot18_room_2Tex_00B818 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_00B818" +static const ALIGN_ASSET(2) char spot18_room_2Tex_00B818[] = dspot18_room_2Tex_00B818; + +#define dspot18_room_2Tex_00D1A8 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_00D1A8" +static const ALIGN_ASSET(2) char spot18_room_2Tex_00D1A8[] = dspot18_room_2Tex_00D1A8; + +#define dspot18_room_2Tex_00E1A8 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_00E1A8" +static const ALIGN_ASSET(2) char spot18_room_2Tex_00E1A8[] = dspot18_room_2Tex_00E1A8; + +#define dspot18_room_2Tex_00F1A8 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_00F1A8" +static const ALIGN_ASSET(2) char spot18_room_2Tex_00F1A8[] = dspot18_room_2Tex_00F1A8; + +#define dspot18_room_2Tex_00F9A8 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_00F9A8" +static const ALIGN_ASSET(2) char spot18_room_2Tex_00F9A8[] = dspot18_room_2Tex_00F9A8; + +#define dspot18_room_2Tex_0109A8 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_0109A8" +static const ALIGN_ASSET(2) char spot18_room_2Tex_0109A8[] = dspot18_room_2Tex_0109A8; + +#define dspot18_room_2DL_003F10 "__OTR__scenes/shared/spot18_scene/spot18_room_2DL_003F10" +static const ALIGN_ASSET(2) char spot18_room_2DL_003F10[] = dspot18_room_2DL_003F10; + +#define dspot18_room_2DL_00CF58 "__OTR__scenes/shared/spot18_scene/spot18_room_2DL_00CF58" +static const ALIGN_ASSET(2) char spot18_room_2DL_00CF58[] = dspot18_room_2DL_00CF58; + +#define dspot18_room_2DL_004320 "__OTR__scenes/shared/spot18_scene/spot18_room_2DL_004320" +static const ALIGN_ASSET(2) char spot18_room_2DL_004320[] = dspot18_room_2DL_004320; + +#define dspot18_room_2DL_004690 "__OTR__scenes/shared/spot18_scene/spot18_room_2DL_004690" +static const ALIGN_ASSET(2) char spot18_room_2DL_004690[] = dspot18_room_2DL_004690; + +#define dspot18_room_2DL_00D0D0 "__OTR__scenes/shared/spot18_scene/spot18_room_2DL_00D0D0" +static const ALIGN_ASSET(2) char spot18_room_2DL_00D0D0[] = dspot18_room_2DL_00D0D0; + +#define dspot18_room_2DL_001FE8 "__OTR__scenes/shared/spot18_scene/spot18_room_2DL_001FE8" +static const ALIGN_ASSET(2) char spot18_room_2DL_001FE8[] = dspot18_room_2DL_001FE8; + +#define dspot18_room_2DL_003090 "__OTR__scenes/shared/spot18_scene/spot18_room_2DL_003090" +static const ALIGN_ASSET(2) char spot18_room_2DL_003090[] = dspot18_room_2DL_003090; + +#define dspot18_room_2DL_00CBC0 "__OTR__scenes/shared/spot18_scene/spot18_room_2DL_00CBC0" +static const ALIGN_ASSET(2) char spot18_room_2DL_00CBC0[] = dspot18_room_2DL_00CBC0; + +#define dspot18_room_2DL_0019D0 "__OTR__scenes/shared/spot18_scene/spot18_room_2DL_0019D0" +static const ALIGN_ASSET(2) char spot18_room_2DL_0019D0[] = dspot18_room_2DL_0019D0; + +#define dspot18_room_2DL_000E30 "__OTR__scenes/shared/spot18_scene/spot18_room_2DL_000E30" static const ALIGN_ASSET(2) char spot18_room_2DL_000E30[] = dspot18_room_2DL_000E30; -#define dspot18_room_2Set_000150DL_003F10 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000150DL_003F10" +#define dspot18_room_2Set_000150DL_003F10 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000150DL_003F10" static const ALIGN_ASSET(2) char spot18_room_2Set_000150DL_003F10[] = dspot18_room_2Set_000150DL_003F10; -#define dspot18_room_2Set_000150DL_00CF58 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000150DL_00CF58" +#define dspot18_room_2Set_000150DL_00CF58 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000150DL_00CF58" static const ALIGN_ASSET(2) char spot18_room_2Set_000150DL_00CF58[] = dspot18_room_2Set_000150DL_00CF58; -#define dspot18_room_2Set_000150DL_004320 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000150DL_004320" +#define dspot18_room_2Set_000150DL_004320 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000150DL_004320" static const ALIGN_ASSET(2) char spot18_room_2Set_000150DL_004320[] = dspot18_room_2Set_000150DL_004320; -#define dspot18_room_2Set_000150DL_004690 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000150DL_004690" +#define dspot18_room_2Set_000150DL_004690 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000150DL_004690" static const ALIGN_ASSET(2) char spot18_room_2Set_000150DL_004690[] = dspot18_room_2Set_000150DL_004690; -#define dspot18_room_2Set_000150DL_00D0D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000150DL_00D0D0" +#define dspot18_room_2Set_000150DL_00D0D0 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000150DL_00D0D0" static const ALIGN_ASSET(2) char spot18_room_2Set_000150DL_00D0D0[] = dspot18_room_2Set_000150DL_00D0D0; -#define dspot18_room_2Set_000150DL_001FE8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000150DL_001FE8" +#define dspot18_room_2Set_000150DL_001FE8 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000150DL_001FE8" static const ALIGN_ASSET(2) char spot18_room_2Set_000150DL_001FE8[] = dspot18_room_2Set_000150DL_001FE8; -#define dspot18_room_2Set_000150DL_003090 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000150DL_003090" +#define dspot18_room_2Set_000150DL_003090 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000150DL_003090" static const ALIGN_ASSET(2) char spot18_room_2Set_000150DL_003090[] = dspot18_room_2Set_000150DL_003090; -#define dspot18_room_2Set_000150DL_00CBC0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000150DL_00CBC0" +#define dspot18_room_2Set_000150DL_00CBC0 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000150DL_00CBC0" static const ALIGN_ASSET(2) char spot18_room_2Set_000150DL_00CBC0[] = dspot18_room_2Set_000150DL_00CBC0; -#define dspot18_room_2Set_000150DL_0019D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000150DL_0019D0" +#define dspot18_room_2Set_000150DL_0019D0 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000150DL_0019D0" static const ALIGN_ASSET(2) char spot18_room_2Set_000150DL_0019D0[] = dspot18_room_2Set_000150DL_0019D0; -#define dspot18_room_2Set_000150DL_000E30 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000150DL_000E30" +#define dspot18_room_2Set_000150DL_000E30 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000150DL_000E30" static const ALIGN_ASSET(2) char spot18_room_2Set_000150DL_000E30[] = dspot18_room_2Set_000150DL_000E30; -#define dspot18_room_2Set_000200DL_003F10 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000200DL_003F10" +#define dspot18_room_2Set_000200DL_003F10 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000200DL_003F10" static const ALIGN_ASSET(2) char spot18_room_2Set_000200DL_003F10[] = dspot18_room_2Set_000200DL_003F10; -#define dspot18_room_2Set_000200DL_00CF58 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000200DL_00CF58" +#define dspot18_room_2Set_000200DL_00CF58 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000200DL_00CF58" static const ALIGN_ASSET(2) char spot18_room_2Set_000200DL_00CF58[] = dspot18_room_2Set_000200DL_00CF58; -#define dspot18_room_2Set_000200DL_004320 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000200DL_004320" +#define dspot18_room_2Set_000200DL_004320 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000200DL_004320" static const ALIGN_ASSET(2) char spot18_room_2Set_000200DL_004320[] = dspot18_room_2Set_000200DL_004320; -#define dspot18_room_2Set_000200DL_004690 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000200DL_004690" +#define dspot18_room_2Set_000200DL_004690 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000200DL_004690" static const ALIGN_ASSET(2) char spot18_room_2Set_000200DL_004690[] = dspot18_room_2Set_000200DL_004690; -#define dspot18_room_2Set_000200DL_00D0D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000200DL_00D0D0" +#define dspot18_room_2Set_000200DL_00D0D0 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000200DL_00D0D0" static const ALIGN_ASSET(2) char spot18_room_2Set_000200DL_00D0D0[] = dspot18_room_2Set_000200DL_00D0D0; -#define dspot18_room_2Set_000200DL_001FE8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000200DL_001FE8" +#define dspot18_room_2Set_000200DL_001FE8 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000200DL_001FE8" static const ALIGN_ASSET(2) char spot18_room_2Set_000200DL_001FE8[] = dspot18_room_2Set_000200DL_001FE8; -#define dspot18_room_2Set_000200DL_003090 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000200DL_003090" +#define dspot18_room_2Set_000200DL_003090 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000200DL_003090" static const ALIGN_ASSET(2) char spot18_room_2Set_000200DL_003090[] = dspot18_room_2Set_000200DL_003090; -#define dspot18_room_2Set_000200DL_00CBC0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000200DL_00CBC0" +#define dspot18_room_2Set_000200DL_00CBC0 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000200DL_00CBC0" static const ALIGN_ASSET(2) char spot18_room_2Set_000200DL_00CBC0[] = dspot18_room_2Set_000200DL_00CBC0; -#define dspot18_room_2Set_000200DL_0019D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000200DL_0019D0" +#define dspot18_room_2Set_000200DL_0019D0 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000200DL_0019D0" static const ALIGN_ASSET(2) char spot18_room_2Set_000200DL_0019D0[] = dspot18_room_2Set_000200DL_0019D0; -#define dspot18_room_2Set_000200DL_000E30 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000200DL_000E30" +#define dspot18_room_2Set_000200DL_000E30 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000200DL_000E30" static const ALIGN_ASSET(2) char spot18_room_2Set_000200DL_000E30[] = dspot18_room_2Set_000200DL_000E30; -#define dspot18_room_2Set_0002E0DL_003F10 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_0002E0DL_003F10" +#define dspot18_room_2Set_0002E0DL_003F10 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_0002E0DL_003F10" static const ALIGN_ASSET(2) char spot18_room_2Set_0002E0DL_003F10[] = dspot18_room_2Set_0002E0DL_003F10; -#define dspot18_room_2Set_0002E0DL_00CF58 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_0002E0DL_00CF58" +#define dspot18_room_2Set_0002E0DL_00CF58 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_0002E0DL_00CF58" static const ALIGN_ASSET(2) char spot18_room_2Set_0002E0DL_00CF58[] = dspot18_room_2Set_0002E0DL_00CF58; -#define dspot18_room_2Set_0002E0DL_004320 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_0002E0DL_004320" +#define dspot18_room_2Set_0002E0DL_004320 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_0002E0DL_004320" static const ALIGN_ASSET(2) char spot18_room_2Set_0002E0DL_004320[] = dspot18_room_2Set_0002E0DL_004320; -#define dspot18_room_2Set_0002E0DL_004690 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_0002E0DL_004690" +#define dspot18_room_2Set_0002E0DL_004690 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_0002E0DL_004690" static const ALIGN_ASSET(2) char spot18_room_2Set_0002E0DL_004690[] = dspot18_room_2Set_0002E0DL_004690; -#define dspot18_room_2Set_0002E0DL_00D0D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_0002E0DL_00D0D0" +#define dspot18_room_2Set_0002E0DL_00D0D0 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_0002E0DL_00D0D0" static const ALIGN_ASSET(2) char spot18_room_2Set_0002E0DL_00D0D0[] = dspot18_room_2Set_0002E0DL_00D0D0; -#define dspot18_room_2Set_0002E0DL_001FE8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_0002E0DL_001FE8" +#define dspot18_room_2Set_0002E0DL_001FE8 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_0002E0DL_001FE8" static const ALIGN_ASSET(2) char spot18_room_2Set_0002E0DL_001FE8[] = dspot18_room_2Set_0002E0DL_001FE8; -#define dspot18_room_2Set_0002E0DL_003090 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_0002E0DL_003090" +#define dspot18_room_2Set_0002E0DL_003090 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_0002E0DL_003090" static const ALIGN_ASSET(2) char spot18_room_2Set_0002E0DL_003090[] = dspot18_room_2Set_0002E0DL_003090; -#define dspot18_room_2Set_0002E0DL_00CBC0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_0002E0DL_00CBC0" +#define dspot18_room_2Set_0002E0DL_00CBC0 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_0002E0DL_00CBC0" static const ALIGN_ASSET(2) char spot18_room_2Set_0002E0DL_00CBC0[] = dspot18_room_2Set_0002E0DL_00CBC0; -#define dspot18_room_2Set_0002E0DL_0019D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_0002E0DL_0019D0" +#define dspot18_room_2Set_0002E0DL_0019D0 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_0002E0DL_0019D0" static const ALIGN_ASSET(2) char spot18_room_2Set_0002E0DL_0019D0[] = dspot18_room_2Set_0002E0DL_0019D0; -#define dspot18_room_2Set_0002E0DL_000E30 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_0002E0DL_000E30" +#define dspot18_room_2Set_0002E0DL_000E30 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_0002E0DL_000E30" static const ALIGN_ASSET(2) char spot18_room_2Set_0002E0DL_000E30[] = dspot18_room_2Set_0002E0DL_000E30; diff --git a/soh/assets/scenes/overworld/spot18/spot18_room_3.h b/soh/assets/scenes/overworld/spot18/spot18_room_3.h index dd22bb742..ebae0385b 100644 --- a/soh/assets/scenes/overworld/spot18/spot18_room_3.h +++ b/soh/assets/scenes/overworld/spot18/spot18_room_3.h @@ -3,265 +3,265 @@ #include "align_asset_macro.h" -#define dspot18_room_3DL_0014C0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_0014C0" -static const ALIGN_ASSET(2) char spot18_room_3DL_0014C0[] = dspot18_room_3DL_0014C0; - -#define dspot18_room_3Tex_014848 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_014848" -static const ALIGN_ASSET(2) char spot18_room_3Tex_014848[] = dspot18_room_3Tex_014848; - -#define dspot18_room_3Tex_013848 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_013848" -static const ALIGN_ASSET(2) char spot18_room_3Tex_013848[] = dspot18_room_3Tex_013848; - -#define dspot18_room_3Tex_015848 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_015848" -static const ALIGN_ASSET(2) char spot18_room_3Tex_015848[] = dspot18_room_3Tex_015848; - -#define dspot18_room_3Tex_016048 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_016048" -static const ALIGN_ASSET(2) char spot18_room_3Tex_016048[] = dspot18_room_3Tex_016048; - -#define dspot18_room_3Tex_011C48 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_011C48" -static const ALIGN_ASSET(2) char spot18_room_3Tex_011C48[] = dspot18_room_3Tex_011C48; - -#define dspot18_room_3Tex_014048 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_014048" -static const ALIGN_ASSET(2) char spot18_room_3Tex_014048[] = dspot18_room_3Tex_014048; - -#define dspot18_room_3Tex_016C48 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_016C48" -static const ALIGN_ASSET(2) char spot18_room_3Tex_016C48[] = dspot18_room_3Tex_016C48; - -#define dspot18_room_3Tex_012448 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_012448" -static const ALIGN_ASSET(2) char spot18_room_3Tex_012448[] = dspot18_room_3Tex_012448; - -#define dspot18_room_3Tex_012648 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_012648" -static const ALIGN_ASSET(2) char spot18_room_3Tex_012648[] = dspot18_room_3Tex_012648; - -#define dspot18_room_3DL_002B28 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_002B28" -static const ALIGN_ASSET(2) char spot18_room_3DL_002B28[] = dspot18_room_3DL_002B28; - -#define dspot18_room_3Tex_00C048 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_00C048" -static const ALIGN_ASSET(2) char spot18_room_3Tex_00C048[] = dspot18_room_3Tex_00C048; - -#define dspot18_room_3Tex_00C448 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_00C448" -static const ALIGN_ASSET(2) char spot18_room_3Tex_00C448[] = dspot18_room_3Tex_00C448; - -#define dspot18_room_3Tex_00DC48 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_00DC48" -static const ALIGN_ASSET(2) char spot18_room_3Tex_00DC48[] = dspot18_room_3Tex_00DC48; - -#define dspot18_room_3Tex_011448 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_011448" -static const ALIGN_ASSET(2) char spot18_room_3Tex_011448[] = dspot18_room_3Tex_011448; - -#define dspot18_room_3Tex_00E448 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_00E448" -static const ALIGN_ASSET(2) char spot18_room_3Tex_00E448[] = dspot18_room_3Tex_00E448; - -#define dspot18_room_3Tex_015048 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_015048" -static const ALIGN_ASSET(2) char spot18_room_3Tex_015048[] = dspot18_room_3Tex_015048; - -#define dspot18_room_3Tex_017448 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_017448" -static const ALIGN_ASSET(2) char spot18_room_3Tex_017448[] = dspot18_room_3Tex_017448; - -#define dspot18_room_3DL_018610 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_018610" -static const ALIGN_ASSET(2) char spot18_room_3DL_018610[] = dspot18_room_3DL_018610; - -#define dspot18_room_3Tex_0194E8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_0194E8" -static const ALIGN_ASSET(2) char spot18_room_3Tex_0194E8[] = dspot18_room_3Tex_0194E8; - -#define dspot18_room_3Tex_01B4E8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_01B4E8" -static const ALIGN_ASSET(2) char spot18_room_3Tex_01B4E8[] = dspot18_room_3Tex_01B4E8; - -#define dspot18_room_3Tex_01A4E8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_01A4E8" -static const ALIGN_ASSET(2) char spot18_room_3Tex_01A4E8[] = dspot18_room_3Tex_01A4E8; - -#define dspot18_room_3DL_00A0D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_00A0D0" -static const ALIGN_ASSET(2) char spot18_room_3DL_00A0D0[] = dspot18_room_3DL_00A0D0; - -#define dspot18_room_3DL_018F48 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_018F48" -static const ALIGN_ASSET(2) char spot18_room_3DL_018F48[] = dspot18_room_3DL_018F48; - -#define dspot18_room_3Tex_01CCE8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_01CCE8" -static const ALIGN_ASSET(2) char spot18_room_3Tex_01CCE8[] = dspot18_room_3Tex_01CCE8; - -#define dspot18_room_3Tex_01BCE8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_01BCE8" -static const ALIGN_ASSET(2) char spot18_room_3Tex_01BCE8[] = dspot18_room_3Tex_01BCE8; - -#define dspot18_room_3DL_005080 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_005080" -static const ALIGN_ASSET(2) char spot18_room_3DL_005080[] = dspot18_room_3DL_005080; - -#define dspot18_room_3Tex_00BC48 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_00BC48" -static const ALIGN_ASSET(2) char spot18_room_3Tex_00BC48[] = dspot18_room_3Tex_00BC48; - -#define dspot18_room_3Tex_00D848 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_00D848" -static const ALIGN_ASSET(2) char spot18_room_3Tex_00D848[] = dspot18_room_3Tex_00D848; - -#define dspot18_room_3Tex_00C848 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_00C848" -static const ALIGN_ASSET(2) char spot18_room_3Tex_00C848[] = dspot18_room_3Tex_00C848; - -#define dspot18_room_3Tex_010C48 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_010C48" -static const ALIGN_ASSET(2) char spot18_room_3Tex_010C48[] = dspot18_room_3Tex_010C48; - -#define dspot18_room_3Tex_010448 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_010448" -static const ALIGN_ASSET(2) char spot18_room_3Tex_010448[] = dspot18_room_3Tex_010448; - -#define dspot18_room_3Tex_00F448 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_00F448" -static const ALIGN_ASSET(2) char spot18_room_3Tex_00F448[] = dspot18_room_3Tex_00F448; - -#define dspot18_room_3Tex_016848 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_016848" -static const ALIGN_ASSET(2) char spot18_room_3Tex_016848[] = dspot18_room_3Tex_016848; - -#define dspot18_room_3DL_018948 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_018948" -static const ALIGN_ASSET(2) char spot18_room_3DL_018948[] = dspot18_room_3DL_018948; - -#define dspot18_room_3DL_0193D8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_0193D8" -static const ALIGN_ASSET(2) char spot18_room_3DL_0193D8[] = dspot18_room_3DL_0193D8; - -#define dspot18_room_3DL_00ADD0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_00ADD0" -static const ALIGN_ASSET(2) char spot18_room_3DL_00ADD0[] = dspot18_room_3DL_00ADD0; - -#define dspot18_room_3Tex_00B448 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_00B448" +#define dspot18_room_3Tex_00B448 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_00B448" static const ALIGN_ASSET(2) char spot18_room_3Tex_00B448[] = dspot18_room_3Tex_00B448; -#define dspot18_room_3Tex_00EC48 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_00EC48" +#define dspot18_room_3Tex_00BC48 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_00BC48" +static const ALIGN_ASSET(2) char spot18_room_3Tex_00BC48[] = dspot18_room_3Tex_00BC48; + +#define dspot18_room_3Tex_00C048 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_00C048" +static const ALIGN_ASSET(2) char spot18_room_3Tex_00C048[] = dspot18_room_3Tex_00C048; + +#define dspot18_room_3Tex_00C448 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_00C448" +static const ALIGN_ASSET(2) char spot18_room_3Tex_00C448[] = dspot18_room_3Tex_00C448; + +#define dspot18_room_3Tex_00C848 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_00C848" +static const ALIGN_ASSET(2) char spot18_room_3Tex_00C848[] = dspot18_room_3Tex_00C848; + +#define dspot18_room_3Tex_00D848 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_00D848" +static const ALIGN_ASSET(2) char spot18_room_3Tex_00D848[] = dspot18_room_3Tex_00D848; + +#define dspot18_room_3Tex_00DC48 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_00DC48" +static const ALIGN_ASSET(2) char spot18_room_3Tex_00DC48[] = dspot18_room_3Tex_00DC48; + +#define dspot18_room_3Tex_00E448 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_00E448" +static const ALIGN_ASSET(2) char spot18_room_3Tex_00E448[] = dspot18_room_3Tex_00E448; + +#define dspot18_room_3Tex_00EC48 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_00EC48" static const ALIGN_ASSET(2) char spot18_room_3Tex_00EC48[] = dspot18_room_3Tex_00EC48; -#define dspot18_room_3DL_019218 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_019218" -static const ALIGN_ASSET(2) char spot18_room_3DL_019218[] = dspot18_room_3DL_019218; +#define dspot18_room_3Tex_00F448 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_00F448" +static const ALIGN_ASSET(2) char spot18_room_3Tex_00F448[] = dspot18_room_3Tex_00F448; -#define dspot18_room_3DL_00B288 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_00B288" -static const ALIGN_ASSET(2) char spot18_room_3DL_00B288[] = dspot18_room_3DL_00B288; +#define dspot18_room_3Tex_010448 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_010448" +static const ALIGN_ASSET(2) char spot18_room_3Tex_010448[] = dspot18_room_3Tex_010448; -#define dspot18_room_3Tex_012848 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_012848" +#define dspot18_room_3Tex_010C48 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_010C48" +static const ALIGN_ASSET(2) char spot18_room_3Tex_010C48[] = dspot18_room_3Tex_010C48; + +#define dspot18_room_3Tex_011448 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_011448" +static const ALIGN_ASSET(2) char spot18_room_3Tex_011448[] = dspot18_room_3Tex_011448; + +#define dspot18_room_3Tex_011C48 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_011C48" +static const ALIGN_ASSET(2) char spot18_room_3Tex_011C48[] = dspot18_room_3Tex_011C48; + +#define dspot18_room_3Tex_012448 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_012448" +static const ALIGN_ASSET(2) char spot18_room_3Tex_012448[] = dspot18_room_3Tex_012448; + +#define dspot18_room_3Tex_012648 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_012648" +static const ALIGN_ASSET(2) char spot18_room_3Tex_012648[] = dspot18_room_3Tex_012648; + +#define dspot18_room_3Tex_012848 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_012848" static const ALIGN_ASSET(2) char spot18_room_3Tex_012848[] = dspot18_room_3Tex_012848; -#define dspot18_room_3DL_002230 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_002230" +#define dspot18_room_3Tex_013848 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_013848" +static const ALIGN_ASSET(2) char spot18_room_3Tex_013848[] = dspot18_room_3Tex_013848; + +#define dspot18_room_3Tex_014048 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_014048" +static const ALIGN_ASSET(2) char spot18_room_3Tex_014048[] = dspot18_room_3Tex_014048; + +#define dspot18_room_3Tex_014848 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_014848" +static const ALIGN_ASSET(2) char spot18_room_3Tex_014848[] = dspot18_room_3Tex_014848; + +#define dspot18_room_3Tex_015048 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_015048" +static const ALIGN_ASSET(2) char spot18_room_3Tex_015048[] = dspot18_room_3Tex_015048; + +#define dspot18_room_3Tex_015848 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_015848" +static const ALIGN_ASSET(2) char spot18_room_3Tex_015848[] = dspot18_room_3Tex_015848; + +#define dspot18_room_3Tex_016048 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_016048" +static const ALIGN_ASSET(2) char spot18_room_3Tex_016048[] = dspot18_room_3Tex_016048; + +#define dspot18_room_3Tex_016848 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_016848" +static const ALIGN_ASSET(2) char spot18_room_3Tex_016848[] = dspot18_room_3Tex_016848; + +#define dspot18_room_3Tex_016C48 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_016C48" +static const ALIGN_ASSET(2) char spot18_room_3Tex_016C48[] = dspot18_room_3Tex_016C48; + +#define dspot18_room_3Tex_017448 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_017448" +static const ALIGN_ASSET(2) char spot18_room_3Tex_017448[] = dspot18_room_3Tex_017448; + +#define dspot18_room_3Tex_0194E8 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_0194E8" +static const ALIGN_ASSET(2) char spot18_room_3Tex_0194E8[] = dspot18_room_3Tex_0194E8; + +#define dspot18_room_3Tex_01A4E8 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_01A4E8" +static const ALIGN_ASSET(2) char spot18_room_3Tex_01A4E8[] = dspot18_room_3Tex_01A4E8; + +#define dspot18_room_3Tex_01B4E8 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_01B4E8" +static const ALIGN_ASSET(2) char spot18_room_3Tex_01B4E8[] = dspot18_room_3Tex_01B4E8; + +#define dspot18_room_3Tex_01BCE8 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_01BCE8" +static const ALIGN_ASSET(2) char spot18_room_3Tex_01BCE8[] = dspot18_room_3Tex_01BCE8; + +#define dspot18_room_3Tex_01CCE8 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_01CCE8" +static const ALIGN_ASSET(2) char spot18_room_3Tex_01CCE8[] = dspot18_room_3Tex_01CCE8; + +#define dspot18_room_3DL_0014C0 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_0014C0" +static const ALIGN_ASSET(2) char spot18_room_3DL_0014C0[] = dspot18_room_3DL_0014C0; + +#define dspot18_room_3DL_002B28 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_002B28" +static const ALIGN_ASSET(2) char spot18_room_3DL_002B28[] = dspot18_room_3DL_002B28; + +#define dspot18_room_3DL_018610 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_018610" +static const ALIGN_ASSET(2) char spot18_room_3DL_018610[] = dspot18_room_3DL_018610; + +#define dspot18_room_3DL_00A0D0 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_00A0D0" +static const ALIGN_ASSET(2) char spot18_room_3DL_00A0D0[] = dspot18_room_3DL_00A0D0; + +#define dspot18_room_3DL_018F48 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_018F48" +static const ALIGN_ASSET(2) char spot18_room_3DL_018F48[] = dspot18_room_3DL_018F48; + +#define dspot18_room_3DL_005080 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_005080" +static const ALIGN_ASSET(2) char spot18_room_3DL_005080[] = dspot18_room_3DL_005080; + +#define dspot18_room_3DL_018948 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_018948" +static const ALIGN_ASSET(2) char spot18_room_3DL_018948[] = dspot18_room_3DL_018948; + +#define dspot18_room_3DL_0193D8 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_0193D8" +static const ALIGN_ASSET(2) char spot18_room_3DL_0193D8[] = dspot18_room_3DL_0193D8; + +#define dspot18_room_3DL_00ADD0 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_00ADD0" +static const ALIGN_ASSET(2) char spot18_room_3DL_00ADD0[] = dspot18_room_3DL_00ADD0; + +#define dspot18_room_3DL_019218 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_019218" +static const ALIGN_ASSET(2) char spot18_room_3DL_019218[] = dspot18_room_3DL_019218; + +#define dspot18_room_3DL_00B288 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_00B288" +static const ALIGN_ASSET(2) char spot18_room_3DL_00B288[] = dspot18_room_3DL_00B288; + +#define dspot18_room_3DL_002230 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_002230" static const ALIGN_ASSET(2) char spot18_room_3DL_002230[] = dspot18_room_3DL_002230; -#define dspot18_room_3DL_008218 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_008218" +#define dspot18_room_3DL_008218 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_008218" static const ALIGN_ASSET(2) char spot18_room_3DL_008218[] = dspot18_room_3DL_008218; -#define dspot18_room_3DL_018BF8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_018BF8" +#define dspot18_room_3DL_018BF8 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_018BF8" static const ALIGN_ASSET(2) char spot18_room_3DL_018BF8[] = dspot18_room_3DL_018BF8; -#define dspot18_room_3Set_000400DL_0014C0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_0014C0" +#define dspot18_room_3Set_000400DL_0014C0 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_0014C0" static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_0014C0[] = dspot18_room_3Set_000400DL_0014C0; -#define dspot18_room_3Set_000400DL_002B28 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_002B28" +#define dspot18_room_3Set_000400DL_002B28 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_002B28" static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_002B28[] = dspot18_room_3Set_000400DL_002B28; -#define dspot18_room_3Set_000400DL_018610 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_018610" +#define dspot18_room_3Set_000400DL_018610 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_018610" static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_018610[] = dspot18_room_3Set_000400DL_018610; -#define dspot18_room_3Set_000400DL_00A0D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_00A0D0" +#define dspot18_room_3Set_000400DL_00A0D0 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_00A0D0" static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_00A0D0[] = dspot18_room_3Set_000400DL_00A0D0; -#define dspot18_room_3Set_000400DL_018F48 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_018F48" +#define dspot18_room_3Set_000400DL_018F48 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_018F48" static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_018F48[] = dspot18_room_3Set_000400DL_018F48; -#define dspot18_room_3Set_000400DL_005080 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_005080" +#define dspot18_room_3Set_000400DL_005080 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_005080" static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_005080[] = dspot18_room_3Set_000400DL_005080; -#define dspot18_room_3Set_000400DL_018948 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_018948" +#define dspot18_room_3Set_000400DL_018948 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_018948" static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_018948[] = dspot18_room_3Set_000400DL_018948; -#define dspot18_room_3Set_000400DL_0193D8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_0193D8" +#define dspot18_room_3Set_000400DL_0193D8 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_0193D8" static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_0193D8[] = dspot18_room_3Set_000400DL_0193D8; -#define dspot18_room_3Set_000400DL_00ADD0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_00ADD0" +#define dspot18_room_3Set_000400DL_00ADD0 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_00ADD0" static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_00ADD0[] = dspot18_room_3Set_000400DL_00ADD0; -#define dspot18_room_3Set_000400DL_019218 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_019218" +#define dspot18_room_3Set_000400DL_019218 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_019218" static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_019218[] = dspot18_room_3Set_000400DL_019218; -#define dspot18_room_3Set_000400DL_00B288 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_00B288" +#define dspot18_room_3Set_000400DL_00B288 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_00B288" static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_00B288[] = dspot18_room_3Set_000400DL_00B288; -#define dspot18_room_3Set_000400DL_002230 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_002230" +#define dspot18_room_3Set_000400DL_002230 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_002230" static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_002230[] = dspot18_room_3Set_000400DL_002230; -#define dspot18_room_3Set_000400DL_008218 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_008218" +#define dspot18_room_3Set_000400DL_008218 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_008218" static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_008218[] = dspot18_room_3Set_000400DL_008218; -#define dspot18_room_3Set_000400DL_018BF8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_018BF8" +#define dspot18_room_3Set_000400DL_018BF8 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_018BF8" static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_018BF8[] = dspot18_room_3Set_000400DL_018BF8; -#define dspot18_room_3Set_0006C0DL_0014C0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_0014C0" +#define dspot18_room_3Set_0006C0DL_0014C0 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_0014C0" static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_0014C0[] = dspot18_room_3Set_0006C0DL_0014C0; -#define dspot18_room_3Set_0006C0DL_002B28 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_002B28" +#define dspot18_room_3Set_0006C0DL_002B28 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_002B28" static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_002B28[] = dspot18_room_3Set_0006C0DL_002B28; -#define dspot18_room_3Set_0006C0DL_018610 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_018610" +#define dspot18_room_3Set_0006C0DL_018610 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_018610" static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_018610[] = dspot18_room_3Set_0006C0DL_018610; -#define dspot18_room_3Set_0006C0DL_00A0D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_00A0D0" +#define dspot18_room_3Set_0006C0DL_00A0D0 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_00A0D0" static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_00A0D0[] = dspot18_room_3Set_0006C0DL_00A0D0; -#define dspot18_room_3Set_0006C0DL_018F48 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_018F48" +#define dspot18_room_3Set_0006C0DL_018F48 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_018F48" static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_018F48[] = dspot18_room_3Set_0006C0DL_018F48; -#define dspot18_room_3Set_0006C0DL_005080 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_005080" +#define dspot18_room_3Set_0006C0DL_005080 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_005080" static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_005080[] = dspot18_room_3Set_0006C0DL_005080; -#define dspot18_room_3Set_0006C0DL_018948 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_018948" +#define dspot18_room_3Set_0006C0DL_018948 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_018948" static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_018948[] = dspot18_room_3Set_0006C0DL_018948; -#define dspot18_room_3Set_0006C0DL_0193D8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_0193D8" +#define dspot18_room_3Set_0006C0DL_0193D8 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_0193D8" static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_0193D8[] = dspot18_room_3Set_0006C0DL_0193D8; -#define dspot18_room_3Set_0006C0DL_00ADD0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_00ADD0" +#define dspot18_room_3Set_0006C0DL_00ADD0 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_00ADD0" static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_00ADD0[] = dspot18_room_3Set_0006C0DL_00ADD0; -#define dspot18_room_3Set_0006C0DL_019218 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_019218" +#define dspot18_room_3Set_0006C0DL_019218 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_019218" static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_019218[] = dspot18_room_3Set_0006C0DL_019218; -#define dspot18_room_3Set_0006C0DL_00B288 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_00B288" +#define dspot18_room_3Set_0006C0DL_00B288 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_00B288" static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_00B288[] = dspot18_room_3Set_0006C0DL_00B288; -#define dspot18_room_3Set_0006C0DL_002230 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_002230" +#define dspot18_room_3Set_0006C0DL_002230 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_002230" static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_002230[] = dspot18_room_3Set_0006C0DL_002230; -#define dspot18_room_3Set_0006C0DL_008218 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_008218" +#define dspot18_room_3Set_0006C0DL_008218 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_008218" static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_008218[] = dspot18_room_3Set_0006C0DL_008218; -#define dspot18_room_3Set_0006C0DL_018BF8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_018BF8" +#define dspot18_room_3Set_0006C0DL_018BF8 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_018BF8" static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_018BF8[] = dspot18_room_3Set_0006C0DL_018BF8; -#define dspot18_room_3Set_000800DL_0014C0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_0014C0" +#define dspot18_room_3Set_000800DL_0014C0 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_0014C0" static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_0014C0[] = dspot18_room_3Set_000800DL_0014C0; -#define dspot18_room_3Set_000800DL_002B28 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_002B28" +#define dspot18_room_3Set_000800DL_002B28 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_002B28" static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_002B28[] = dspot18_room_3Set_000800DL_002B28; -#define dspot18_room_3Set_000800DL_018610 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_018610" +#define dspot18_room_3Set_000800DL_018610 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_018610" static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_018610[] = dspot18_room_3Set_000800DL_018610; -#define dspot18_room_3Set_000800DL_00A0D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_00A0D0" +#define dspot18_room_3Set_000800DL_00A0D0 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_00A0D0" static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_00A0D0[] = dspot18_room_3Set_000800DL_00A0D0; -#define dspot18_room_3Set_000800DL_018F48 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_018F48" +#define dspot18_room_3Set_000800DL_018F48 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_018F48" static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_018F48[] = dspot18_room_3Set_000800DL_018F48; -#define dspot18_room_3Set_000800DL_005080 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_005080" +#define dspot18_room_3Set_000800DL_005080 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_005080" static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_005080[] = dspot18_room_3Set_000800DL_005080; -#define dspot18_room_3Set_000800DL_018948 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_018948" +#define dspot18_room_3Set_000800DL_018948 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_018948" static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_018948[] = dspot18_room_3Set_000800DL_018948; -#define dspot18_room_3Set_000800DL_0193D8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_0193D8" +#define dspot18_room_3Set_000800DL_0193D8 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_0193D8" static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_0193D8[] = dspot18_room_3Set_000800DL_0193D8; -#define dspot18_room_3Set_000800DL_00ADD0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_00ADD0" +#define dspot18_room_3Set_000800DL_00ADD0 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_00ADD0" static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_00ADD0[] = dspot18_room_3Set_000800DL_00ADD0; -#define dspot18_room_3Set_000800DL_019218 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_019218" +#define dspot18_room_3Set_000800DL_019218 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_019218" static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_019218[] = dspot18_room_3Set_000800DL_019218; -#define dspot18_room_3Set_000800DL_00B288 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_00B288" +#define dspot18_room_3Set_000800DL_00B288 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_00B288" static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_00B288[] = dspot18_room_3Set_000800DL_00B288; -#define dspot18_room_3Set_000800DL_002230 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_002230" +#define dspot18_room_3Set_000800DL_002230 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_002230" static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_002230[] = dspot18_room_3Set_000800DL_002230; -#define dspot18_room_3Set_000800DL_008218 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_008218" +#define dspot18_room_3Set_000800DL_008218 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_008218" static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_008218[] = dspot18_room_3Set_000800DL_008218; -#define dspot18_room_3Set_000800DL_018BF8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_018BF8" +#define dspot18_room_3Set_000800DL_018BF8 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_018BF8" static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_018BF8[] = dspot18_room_3Set_000800DL_018BF8; diff --git a/soh/assets/scenes/overworld/spot18/spot18_scene.h b/soh/assets/scenes/overworld/spot18/spot18_scene.h index f078c9d7f..e7c30767c 100644 --- a/soh/assets/scenes/overworld/spot18/spot18_scene.h +++ b/soh/assets/scenes/overworld/spot18/spot18_scene.h @@ -3,47 +3,47 @@ #include "align_asset_macro.h" -#define dgGoronCityDaruniaCorrectCs "__OTR__scenes/nonmq/spot18_scene/gGoronCityDaruniaCorrectCs" -static const ALIGN_ASSET(2) char gGoronCityDaruniaCorrectCs[] = dgGoronCityDaruniaCorrectCs; - -#define dgGoronCityDarunia01Cs "__OTR__scenes/nonmq/spot18_scene/gGoronCityDarunia01Cs" -static const ALIGN_ASSET(2) char gGoronCityDarunia01Cs[] = dgGoronCityDarunia01Cs; - -#define dgGoronCityDaruniaWrongCs "__OTR__scenes/nonmq/spot18_scene/gGoronCityDaruniaWrongCs" -static const ALIGN_ASSET(2) char gGoronCityDaruniaWrongCs[] = dgGoronCityDaruniaWrongCs; - -#define dgGoronCityIntroCs "__OTR__scenes/nonmq/spot18_scene/gGoronCityIntroCs" -static const ALIGN_ASSET(2) char gGoronCityIntroCs[] = dgGoronCityIntroCs; - -#define dgGoronCityNightEntranceTex "__OTR__scenes/nonmq/spot18_scene/gGoronCityNightEntranceTex" -static const ALIGN_ASSET(2) char gGoronCityNightEntranceTex[] = dgGoronCityNightEntranceTex; - -#define dgGoronCityDayEntranceTex "__OTR__scenes/nonmq/spot18_scene/gGoronCityDayEntranceTex" -static const ALIGN_ASSET(2) char gGoronCityDayEntranceTex[] = dgGoronCityDayEntranceTex; - -#define dspot18_sceneCollisionHeader_0059AC "__OTR__scenes/nonmq/spot18_scene/spot18_sceneCollisionHeader_0059AC" -static const ALIGN_ASSET(2) char spot18_sceneCollisionHeader_0059AC[] = dspot18_sceneCollisionHeader_0059AC; - -#define dspot18_sceneTLUT_0085C0 "__OTR__scenes/nonmq/spot18_scene/spot18_sceneTLUT_0085C0" -static const ALIGN_ASSET(2) char spot18_sceneTLUT_0085C0[] = dspot18_sceneTLUT_0085C0; - -#define dspot18_sceneTex_009C48 "__OTR__scenes/nonmq/spot18_scene/spot18_sceneTex_009C48" -static const ALIGN_ASSET(2) char spot18_sceneTex_009C48[] = dspot18_sceneTex_009C48; - -#define dspot18_sceneTex_009008 "__OTR__scenes/nonmq/spot18_scene/spot18_sceneTex_009008" -static const ALIGN_ASSET(2) char spot18_sceneTex_009008[] = dspot18_sceneTex_009008; - -#define dspot18_sceneTex_0087C8 "__OTR__scenes/nonmq/spot18_scene/spot18_sceneTex_0087C8" +#define dspot18_sceneTex_0087C8 "__OTR__scenes/shared/spot18_scene/spot18_sceneTex_0087C8" static const ALIGN_ASSET(2) char spot18_sceneTex_0087C8[] = dspot18_sceneTex_0087C8; -#define dspot18_sceneTex_009848 "__OTR__scenes/nonmq/spot18_scene/spot18_sceneTex_009848" +#define dspot18_sceneTex_009008 "__OTR__scenes/shared/spot18_scene/spot18_sceneTex_009008" +static const ALIGN_ASSET(2) char spot18_sceneTex_009008[] = dspot18_sceneTex_009008; + +#define dspot18_sceneTex_009848 "__OTR__scenes/shared/spot18_scene/spot18_sceneTex_009848" static const ALIGN_ASSET(2) char spot18_sceneTex_009848[] = dspot18_sceneTex_009848; -#define dspot18_sceneCollisionHeader_0059AC "__OTR__scenes/nonmq/spot18_scene/spot18_sceneCollisionHeader_0059AC" +#define dspot18_sceneTex_009C48 "__OTR__scenes/shared/spot18_scene/spot18_sceneTex_009C48" +static const ALIGN_ASSET(2) char spot18_sceneTex_009C48[] = dspot18_sceneTex_009C48; -#define dspot18_sceneCollisionHeader_0059AC "__OTR__scenes/nonmq/spot18_scene/spot18_sceneCollisionHeader_0059AC" +#define dspot18_sceneTLUT_0085C0 "__OTR__scenes/shared/spot18_scene/spot18_sceneTLUT_0085C0" +static const ALIGN_ASSET(2) char spot18_sceneTLUT_0085C0[] = dspot18_sceneTLUT_0085C0; -#define dspot18_sceneCollisionHeader_0059AC "__OTR__scenes/nonmq/spot18_scene/spot18_sceneCollisionHeader_0059AC" +#define dgGoronCityDaruniaCorrectCs "__OTR__scenes/shared/spot18_scene/gGoronCityDaruniaCorrectCs" +static const ALIGN_ASSET(2) char gGoronCityDaruniaCorrectCs[] = dgGoronCityDaruniaCorrectCs; + +#define dgGoronCityDarunia01Cs "__OTR__scenes/shared/spot18_scene/gGoronCityDarunia01Cs" +static const ALIGN_ASSET(2) char gGoronCityDarunia01Cs[] = dgGoronCityDarunia01Cs; + +#define dgGoronCityDaruniaWrongCs "__OTR__scenes/shared/spot18_scene/gGoronCityDaruniaWrongCs" +static const ALIGN_ASSET(2) char gGoronCityDaruniaWrongCs[] = dgGoronCityDaruniaWrongCs; + +#define dgGoronCityIntroCs "__OTR__scenes/shared/spot18_scene/gGoronCityIntroCs" +static const ALIGN_ASSET(2) char gGoronCityIntroCs[] = dgGoronCityIntroCs; + +#define dgGoronCityNightEntranceTex "__OTR__scenes/shared/spot18_scene/gGoronCityNightEntranceTex" +static const ALIGN_ASSET(2) char gGoronCityNightEntranceTex[] = dgGoronCityNightEntranceTex; + +#define dgGoronCityDayEntranceTex "__OTR__scenes/shared/spot18_scene/gGoronCityDayEntranceTex" +static const ALIGN_ASSET(2) char gGoronCityDayEntranceTex[] = dgGoronCityDayEntranceTex; + +#define dspot18_sceneCollisionHeader_0059AC "__OTR__scenes/shared/spot18_scene/spot18_sceneCollisionHeader_0059AC" +static const ALIGN_ASSET(2) char spot18_sceneCollisionHeader_0059AC[] = dspot18_sceneCollisionHeader_0059AC; + +#define dspot18_sceneCollisionHeader_0059AC "__OTR__scenes/shared/spot18_scene/spot18_sceneCollisionHeader_0059AC" + +#define dspot18_sceneCollisionHeader_0059AC "__OTR__scenes/shared/spot18_scene/spot18_sceneCollisionHeader_0059AC" + +#define dspot18_sceneCollisionHeader_0059AC "__OTR__scenes/shared/spot18_scene/spot18_sceneCollisionHeader_0059AC" #endif // OVERWORLD_SPOT18_SCENE_H diff --git a/soh/assets/scenes/overworld/spot20/spot20_room_0.h b/soh/assets/scenes/overworld/spot20/spot20_room_0.h index d75adc694..25f6cac67 100644 --- a/soh/assets/scenes/overworld/spot20/spot20_room_0.h +++ b/soh/assets/scenes/overworld/spot20/spot20_room_0.h @@ -3,478 +3,478 @@ #include "align_asset_macro.h" -#define dgSpot20DL_005E50 "__OTR__scenes/nonmq/spot20_scene/gSpot20DL_005E50" +#define dgSpot20DL_005E50 "__OTR__scenes/shared/spot20_scene/gSpot20DL_005E50" static const ALIGN_ASSET(2) char gSpot20DL_005E50[] = dgSpot20DL_005E50; -#define dgSpot20DL_0066B8 "__OTR__scenes/nonmq/spot20_scene/gSpot20DL_0066B8" +#define dgSpot20DL_0066B8 "__OTR__scenes/shared/spot20_scene/gSpot20DL_0066B8" static const ALIGN_ASSET(2) char gSpot20DL_0066B8[] = dgSpot20DL_0066B8; -#define dspot20_room_0DL_001880 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_001880" +#define dspot20_room_0DL_001880 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_001880" static const ALIGN_ASSET(2) char spot20_room_0DL_001880[] = dspot20_room_0DL_001880; -#define dspot20_room_0DL_0056B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_0056B8" +#define dspot20_room_0DL_0056B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_0056B8" static const ALIGN_ASSET(2) char spot20_room_0DL_0056B8[] = dspot20_room_0DL_0056B8; -#define dspot20_room_0DL_005C48 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_005C48" +#define dspot20_room_0DL_005C48 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_005C48" static const ALIGN_ASSET(2) char spot20_room_0DL_005C48[] = dspot20_room_0DL_005C48; -#define dspot20_room_0DL_003CA0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_003CA0" +#define dspot20_room_0DL_003CA0 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_003CA0" static const ALIGN_ASSET(2) char spot20_room_0DL_003CA0[] = dspot20_room_0DL_003CA0; -#define dspot20_room_0DL_0033B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_0033B8" +#define dspot20_room_0DL_0033B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_0033B8" static const ALIGN_ASSET(2) char spot20_room_0DL_0033B8[] = dspot20_room_0DL_0033B8; -#define dspot20_room_0DL_004460 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_004460" +#define dspot20_room_0DL_004460 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_004460" static const ALIGN_ASSET(2) char spot20_room_0DL_004460[] = dspot20_room_0DL_004460; -#define dspot20_room_0DL_0065E8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_0065E8" +#define dspot20_room_0DL_0065E8 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_0065E8" static const ALIGN_ASSET(2) char spot20_room_0DL_0065E8[] = dspot20_room_0DL_0065E8; -#define dspot20_room_0DL_004C38 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_004C38" +#define dspot20_room_0DL_004C38 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_004C38" static const ALIGN_ASSET(2) char spot20_room_0DL_004C38[] = dspot20_room_0DL_004C38; -#define dspot20_room_0DL_005140 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_005140" +#define dspot20_room_0DL_005140 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_005140" static const ALIGN_ASSET(2) char spot20_room_0DL_005140[] = dspot20_room_0DL_005140; -#define dspot20_room_0DL_001FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_001FB8" +#define dspot20_room_0DL_001FB8 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_001FB8" static const ALIGN_ASSET(2) char spot20_room_0DL_001FB8[] = dspot20_room_0DL_001FB8; -#define dspot20_room_0DL_002730 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_002730" +#define dspot20_room_0DL_002730 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_002730" static const ALIGN_ASSET(2) char spot20_room_0DL_002730[] = dspot20_room_0DL_002730; -#define dspot20_room_0DL_0062D0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_0062D0" +#define dspot20_room_0DL_0062D0 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_0062D0" static const ALIGN_ASSET(2) char spot20_room_0DL_0062D0[] = dspot20_room_0DL_0062D0; -#define dspot20_room_0DL_002C00 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_002C00" +#define dspot20_room_0DL_002C00 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_002C00" static const ALIGN_ASSET(2) char spot20_room_0DL_002C00[] = dspot20_room_0DL_002C00; -#define dspot20_room_0Set_000630DL_001880 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_001880" +#define dspot20_room_0Set_000630DL_001880 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_001880" static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_001880[] = dspot20_room_0Set_000630DL_001880; -#define dspot20_room_0Set_000630DL_0056B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_0056B8" +#define dspot20_room_0Set_000630DL_0056B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_0056B8" static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_0056B8[] = dspot20_room_0Set_000630DL_0056B8; -#define dspot20_room_0Set_000630DL_005C48 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_005C48" +#define dspot20_room_0Set_000630DL_005C48 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_005C48" static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_005C48[] = dspot20_room_0Set_000630DL_005C48; -#define dspot20_room_0Set_000630DL_003CA0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_003CA0" +#define dspot20_room_0Set_000630DL_003CA0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_003CA0" static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_003CA0[] = dspot20_room_0Set_000630DL_003CA0; -#define dspot20_room_0Set_000630DL_0033B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_0033B8" +#define dspot20_room_0Set_000630DL_0033B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_0033B8" static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_0033B8[] = dspot20_room_0Set_000630DL_0033B8; -#define dspot20_room_0Set_000630DL_004460 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_004460" +#define dspot20_room_0Set_000630DL_004460 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_004460" static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_004460[] = dspot20_room_0Set_000630DL_004460; -#define dspot20_room_0Set_000630DL_0065E8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_0065E8" +#define dspot20_room_0Set_000630DL_0065E8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_0065E8" static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_0065E8[] = dspot20_room_0Set_000630DL_0065E8; -#define dspot20_room_0Set_000630DL_004C38 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_004C38" +#define dspot20_room_0Set_000630DL_004C38 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_004C38" static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_004C38[] = dspot20_room_0Set_000630DL_004C38; -#define dspot20_room_0Set_000630DL_005140 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_005140" +#define dspot20_room_0Set_000630DL_005140 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_005140" static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_005140[] = dspot20_room_0Set_000630DL_005140; -#define dspot20_room_0Set_000630DL_001FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_001FB8" +#define dspot20_room_0Set_000630DL_001FB8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_001FB8" static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_001FB8[] = dspot20_room_0Set_000630DL_001FB8; -#define dspot20_room_0Set_000630DL_002730 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_002730" +#define dspot20_room_0Set_000630DL_002730 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_002730" static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_002730[] = dspot20_room_0Set_000630DL_002730; -#define dspot20_room_0Set_000630DL_0062D0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_0062D0" +#define dspot20_room_0Set_000630DL_0062D0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_0062D0" static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_0062D0[] = dspot20_room_0Set_000630DL_0062D0; -#define dspot20_room_0Set_000630DL_002C00 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_002C00" +#define dspot20_room_0Set_000630DL_002C00 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_002C00" static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_002C00[] = dspot20_room_0Set_000630DL_002C00; -#define dspot20_room_0Set_0002F0DL_001880 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_001880" +#define dspot20_room_0Set_0002F0DL_001880 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_001880" static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_001880[] = dspot20_room_0Set_0002F0DL_001880; -#define dspot20_room_0Set_0002F0DL_0056B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_0056B8" +#define dspot20_room_0Set_0002F0DL_0056B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_0056B8" static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_0056B8[] = dspot20_room_0Set_0002F0DL_0056B8; -#define dspot20_room_0Set_0002F0DL_005C48 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_005C48" +#define dspot20_room_0Set_0002F0DL_005C48 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_005C48" static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_005C48[] = dspot20_room_0Set_0002F0DL_005C48; -#define dspot20_room_0Set_0002F0DL_003CA0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_003CA0" +#define dspot20_room_0Set_0002F0DL_003CA0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_003CA0" static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_003CA0[] = dspot20_room_0Set_0002F0DL_003CA0; -#define dspot20_room_0Set_0002F0DL_0033B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_0033B8" +#define dspot20_room_0Set_0002F0DL_0033B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_0033B8" static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_0033B8[] = dspot20_room_0Set_0002F0DL_0033B8; -#define dspot20_room_0Set_0002F0DL_004460 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_004460" +#define dspot20_room_0Set_0002F0DL_004460 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_004460" static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_004460[] = dspot20_room_0Set_0002F0DL_004460; -#define dspot20_room_0Set_0002F0DL_0065E8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_0065E8" +#define dspot20_room_0Set_0002F0DL_0065E8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_0065E8" static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_0065E8[] = dspot20_room_0Set_0002F0DL_0065E8; -#define dspot20_room_0Set_0002F0DL_004C38 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_004C38" +#define dspot20_room_0Set_0002F0DL_004C38 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_004C38" static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_004C38[] = dspot20_room_0Set_0002F0DL_004C38; -#define dspot20_room_0Set_0002F0DL_005140 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_005140" +#define dspot20_room_0Set_0002F0DL_005140 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_005140" static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_005140[] = dspot20_room_0Set_0002F0DL_005140; -#define dspot20_room_0Set_0002F0DL_001FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_001FB8" +#define dspot20_room_0Set_0002F0DL_001FB8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_001FB8" static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_001FB8[] = dspot20_room_0Set_0002F0DL_001FB8; -#define dspot20_room_0Set_0002F0DL_002730 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_002730" +#define dspot20_room_0Set_0002F0DL_002730 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_002730" static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_002730[] = dspot20_room_0Set_0002F0DL_002730; -#define dspot20_room_0Set_0002F0DL_0062D0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_0062D0" +#define dspot20_room_0Set_0002F0DL_0062D0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_0062D0" static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_0062D0[] = dspot20_room_0Set_0002F0DL_0062D0; -#define dspot20_room_0Set_0002F0DL_002C00 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_002C00" +#define dspot20_room_0Set_0002F0DL_002C00 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_002C00" static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_002C00[] = dspot20_room_0Set_0002F0DL_002C00; -#define dspot20_room_0Set_000500DL_001880 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_001880" +#define dspot20_room_0Set_000500DL_001880 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_001880" static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_001880[] = dspot20_room_0Set_000500DL_001880; -#define dspot20_room_0Set_000500DL_0056B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_0056B8" +#define dspot20_room_0Set_000500DL_0056B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_0056B8" static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_0056B8[] = dspot20_room_0Set_000500DL_0056B8; -#define dspot20_room_0Set_000500DL_005C48 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_005C48" +#define dspot20_room_0Set_000500DL_005C48 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_005C48" static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_005C48[] = dspot20_room_0Set_000500DL_005C48; -#define dspot20_room_0Set_000500DL_003CA0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_003CA0" +#define dspot20_room_0Set_000500DL_003CA0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_003CA0" static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_003CA0[] = dspot20_room_0Set_000500DL_003CA0; -#define dspot20_room_0Set_000500DL_0033B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_0033B8" +#define dspot20_room_0Set_000500DL_0033B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_0033B8" static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_0033B8[] = dspot20_room_0Set_000500DL_0033B8; -#define dspot20_room_0Set_000500DL_004460 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_004460" +#define dspot20_room_0Set_000500DL_004460 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_004460" static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_004460[] = dspot20_room_0Set_000500DL_004460; -#define dspot20_room_0Set_000500DL_0065E8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_0065E8" +#define dspot20_room_0Set_000500DL_0065E8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_0065E8" static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_0065E8[] = dspot20_room_0Set_000500DL_0065E8; -#define dspot20_room_0Set_000500DL_004C38 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_004C38" +#define dspot20_room_0Set_000500DL_004C38 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_004C38" static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_004C38[] = dspot20_room_0Set_000500DL_004C38; -#define dspot20_room_0Set_000500DL_005140 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_005140" +#define dspot20_room_0Set_000500DL_005140 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_005140" static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_005140[] = dspot20_room_0Set_000500DL_005140; -#define dspot20_room_0Set_000500DL_001FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_001FB8" +#define dspot20_room_0Set_000500DL_001FB8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_001FB8" static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_001FB8[] = dspot20_room_0Set_000500DL_001FB8; -#define dspot20_room_0Set_000500DL_002730 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_002730" +#define dspot20_room_0Set_000500DL_002730 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_002730" static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_002730[] = dspot20_room_0Set_000500DL_002730; -#define dspot20_room_0Set_000500DL_0062D0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_0062D0" +#define dspot20_room_0Set_000500DL_0062D0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_0062D0" static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_0062D0[] = dspot20_room_0Set_000500DL_0062D0; -#define dspot20_room_0Set_000500DL_002C00 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_002C00" +#define dspot20_room_0Set_000500DL_002C00 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_002C00" static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_002C00[] = dspot20_room_0Set_000500DL_002C00; -#define dspot20_room_0Set_000860DL_001880 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_001880" +#define dspot20_room_0Set_000860DL_001880 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_001880" static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_001880[] = dspot20_room_0Set_000860DL_001880; -#define dspot20_room_0Set_000860DL_0056B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_0056B8" +#define dspot20_room_0Set_000860DL_0056B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_0056B8" static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_0056B8[] = dspot20_room_0Set_000860DL_0056B8; -#define dspot20_room_0Set_000860DL_005C48 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_005C48" +#define dspot20_room_0Set_000860DL_005C48 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_005C48" static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_005C48[] = dspot20_room_0Set_000860DL_005C48; -#define dspot20_room_0Set_000860DL_003CA0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_003CA0" +#define dspot20_room_0Set_000860DL_003CA0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_003CA0" static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_003CA0[] = dspot20_room_0Set_000860DL_003CA0; -#define dspot20_room_0Set_000860DL_0033B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_0033B8" +#define dspot20_room_0Set_000860DL_0033B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_0033B8" static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_0033B8[] = dspot20_room_0Set_000860DL_0033B8; -#define dspot20_room_0Set_000860DL_004460 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_004460" +#define dspot20_room_0Set_000860DL_004460 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_004460" static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_004460[] = dspot20_room_0Set_000860DL_004460; -#define dspot20_room_0Set_000860DL_0065E8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_0065E8" +#define dspot20_room_0Set_000860DL_0065E8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_0065E8" static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_0065E8[] = dspot20_room_0Set_000860DL_0065E8; -#define dspot20_room_0Set_000860DL_004C38 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_004C38" +#define dspot20_room_0Set_000860DL_004C38 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_004C38" static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_004C38[] = dspot20_room_0Set_000860DL_004C38; -#define dspot20_room_0Set_000860DL_005140 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_005140" +#define dspot20_room_0Set_000860DL_005140 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_005140" static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_005140[] = dspot20_room_0Set_000860DL_005140; -#define dspot20_room_0Set_000860DL_001FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_001FB8" +#define dspot20_room_0Set_000860DL_001FB8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_001FB8" static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_001FB8[] = dspot20_room_0Set_000860DL_001FB8; -#define dspot20_room_0Set_000860DL_002730 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_002730" +#define dspot20_room_0Set_000860DL_002730 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_002730" static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_002730[] = dspot20_room_0Set_000860DL_002730; -#define dspot20_room_0Set_000860DL_0062D0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_0062D0" +#define dspot20_room_0Set_000860DL_0062D0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_0062D0" static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_0062D0[] = dspot20_room_0Set_000860DL_0062D0; -#define dspot20_room_0Set_000860DL_002C00 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_002C00" +#define dspot20_room_0Set_000860DL_002C00 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_002C00" static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_002C00[] = dspot20_room_0Set_000860DL_002C00; -#define dspot20_room_0Set_000980DL_001880 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_001880" +#define dspot20_room_0Set_000980DL_001880 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_001880" static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_001880[] = dspot20_room_0Set_000980DL_001880; -#define dspot20_room_0Set_000980DL_0056B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_0056B8" +#define dspot20_room_0Set_000980DL_0056B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_0056B8" static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_0056B8[] = dspot20_room_0Set_000980DL_0056B8; -#define dspot20_room_0Set_000980DL_005C48 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_005C48" +#define dspot20_room_0Set_000980DL_005C48 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_005C48" static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_005C48[] = dspot20_room_0Set_000980DL_005C48; -#define dspot20_room_0Set_000980DL_003CA0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_003CA0" +#define dspot20_room_0Set_000980DL_003CA0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_003CA0" static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_003CA0[] = dspot20_room_0Set_000980DL_003CA0; -#define dspot20_room_0Set_000980DL_0033B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_0033B8" +#define dspot20_room_0Set_000980DL_0033B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_0033B8" static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_0033B8[] = dspot20_room_0Set_000980DL_0033B8; -#define dspot20_room_0Set_000980DL_004460 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_004460" +#define dspot20_room_0Set_000980DL_004460 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_004460" static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_004460[] = dspot20_room_0Set_000980DL_004460; -#define dspot20_room_0Set_000980DL_0065E8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_0065E8" +#define dspot20_room_0Set_000980DL_0065E8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_0065E8" static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_0065E8[] = dspot20_room_0Set_000980DL_0065E8; -#define dspot20_room_0Set_000980DL_004C38 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_004C38" +#define dspot20_room_0Set_000980DL_004C38 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_004C38" static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_004C38[] = dspot20_room_0Set_000980DL_004C38; -#define dspot20_room_0Set_000980DL_005140 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_005140" +#define dspot20_room_0Set_000980DL_005140 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_005140" static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_005140[] = dspot20_room_0Set_000980DL_005140; -#define dspot20_room_0Set_000980DL_001FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_001FB8" +#define dspot20_room_0Set_000980DL_001FB8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_001FB8" static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_001FB8[] = dspot20_room_0Set_000980DL_001FB8; -#define dspot20_room_0Set_000980DL_002730 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_002730" +#define dspot20_room_0Set_000980DL_002730 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_002730" static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_002730[] = dspot20_room_0Set_000980DL_002730; -#define dspot20_room_0Set_000980DL_0062D0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_0062D0" +#define dspot20_room_0Set_000980DL_0062D0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_0062D0" static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_0062D0[] = dspot20_room_0Set_000980DL_0062D0; -#define dspot20_room_0Set_000980DL_002C00 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_002C00" +#define dspot20_room_0Set_000980DL_002C00 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_002C00" static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_002C00[] = dspot20_room_0Set_000980DL_002C00; -#define dspot20_room_0Set_000AA0DL_001880 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_001880" +#define dspot20_room_0Set_000AA0DL_001880 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_001880" static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_001880[] = dspot20_room_0Set_000AA0DL_001880; -#define dspot20_room_0Set_000AA0DL_0056B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_0056B8" +#define dspot20_room_0Set_000AA0DL_0056B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_0056B8" static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_0056B8[] = dspot20_room_0Set_000AA0DL_0056B8; -#define dspot20_room_0Set_000AA0DL_005C48 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_005C48" +#define dspot20_room_0Set_000AA0DL_005C48 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_005C48" static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_005C48[] = dspot20_room_0Set_000AA0DL_005C48; -#define dspot20_room_0Set_000AA0DL_003CA0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_003CA0" +#define dspot20_room_0Set_000AA0DL_003CA0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_003CA0" static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_003CA0[] = dspot20_room_0Set_000AA0DL_003CA0; -#define dspot20_room_0Set_000AA0DL_0033B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_0033B8" +#define dspot20_room_0Set_000AA0DL_0033B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_0033B8" static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_0033B8[] = dspot20_room_0Set_000AA0DL_0033B8; -#define dspot20_room_0Set_000AA0DL_004460 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_004460" +#define dspot20_room_0Set_000AA0DL_004460 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_004460" static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_004460[] = dspot20_room_0Set_000AA0DL_004460; -#define dspot20_room_0Set_000AA0DL_0065E8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_0065E8" +#define dspot20_room_0Set_000AA0DL_0065E8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_0065E8" static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_0065E8[] = dspot20_room_0Set_000AA0DL_0065E8; -#define dspot20_room_0Set_000AA0DL_004C38 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_004C38" +#define dspot20_room_0Set_000AA0DL_004C38 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_004C38" static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_004C38[] = dspot20_room_0Set_000AA0DL_004C38; -#define dspot20_room_0Set_000AA0DL_005140 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_005140" +#define dspot20_room_0Set_000AA0DL_005140 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_005140" static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_005140[] = dspot20_room_0Set_000AA0DL_005140; -#define dspot20_room_0Set_000AA0DL_001FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_001FB8" +#define dspot20_room_0Set_000AA0DL_001FB8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_001FB8" static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_001FB8[] = dspot20_room_0Set_000AA0DL_001FB8; -#define dspot20_room_0Set_000AA0DL_002730 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_002730" +#define dspot20_room_0Set_000AA0DL_002730 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_002730" static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_002730[] = dspot20_room_0Set_000AA0DL_002730; -#define dspot20_room_0Set_000AA0DL_0062D0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_0062D0" +#define dspot20_room_0Set_000AA0DL_0062D0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_0062D0" static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_0062D0[] = dspot20_room_0Set_000AA0DL_0062D0; -#define dspot20_room_0Set_000AA0DL_002C00 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_002C00" +#define dspot20_room_0Set_000AA0DL_002C00 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_002C00" static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_002C00[] = dspot20_room_0Set_000AA0DL_002C00; -#define dspot20_room_0Set_000C60DL_001880 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_001880" +#define dspot20_room_0Set_000C60DL_001880 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_001880" static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_001880[] = dspot20_room_0Set_000C60DL_001880; -#define dspot20_room_0Set_000C60DL_0056B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_0056B8" +#define dspot20_room_0Set_000C60DL_0056B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_0056B8" static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_0056B8[] = dspot20_room_0Set_000C60DL_0056B8; -#define dspot20_room_0Set_000C60DL_005C48 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_005C48" +#define dspot20_room_0Set_000C60DL_005C48 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_005C48" static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_005C48[] = dspot20_room_0Set_000C60DL_005C48; -#define dspot20_room_0Set_000C60DL_003CA0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_003CA0" +#define dspot20_room_0Set_000C60DL_003CA0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_003CA0" static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_003CA0[] = dspot20_room_0Set_000C60DL_003CA0; -#define dspot20_room_0Set_000C60DL_0033B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_0033B8" +#define dspot20_room_0Set_000C60DL_0033B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_0033B8" static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_0033B8[] = dspot20_room_0Set_000C60DL_0033B8; -#define dspot20_room_0Set_000C60DL_004460 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_004460" +#define dspot20_room_0Set_000C60DL_004460 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_004460" static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_004460[] = dspot20_room_0Set_000C60DL_004460; -#define dspot20_room_0Set_000C60DL_0065E8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_0065E8" +#define dspot20_room_0Set_000C60DL_0065E8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_0065E8" static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_0065E8[] = dspot20_room_0Set_000C60DL_0065E8; -#define dspot20_room_0Set_000C60DL_004C38 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_004C38" +#define dspot20_room_0Set_000C60DL_004C38 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_004C38" static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_004C38[] = dspot20_room_0Set_000C60DL_004C38; -#define dspot20_room_0Set_000C60DL_005140 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_005140" +#define dspot20_room_0Set_000C60DL_005140 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_005140" static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_005140[] = dspot20_room_0Set_000C60DL_005140; -#define dspot20_room_0Set_000C60DL_001FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_001FB8" +#define dspot20_room_0Set_000C60DL_001FB8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_001FB8" static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_001FB8[] = dspot20_room_0Set_000C60DL_001FB8; -#define dspot20_room_0Set_000C60DL_002730 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_002730" +#define dspot20_room_0Set_000C60DL_002730 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_002730" static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_002730[] = dspot20_room_0Set_000C60DL_002730; -#define dspot20_room_0Set_000C60DL_0062D0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_0062D0" +#define dspot20_room_0Set_000C60DL_0062D0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_0062D0" static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_0062D0[] = dspot20_room_0Set_000C60DL_0062D0; -#define dspot20_room_0Set_000C60DL_002C00 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_002C00" +#define dspot20_room_0Set_000C60DL_002C00 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_002C00" static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_002C00[] = dspot20_room_0Set_000C60DL_002C00; -#define dspot20_room_0Set_000E50DL_001880 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_001880" +#define dspot20_room_0Set_000E50DL_001880 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_001880" static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_001880[] = dspot20_room_0Set_000E50DL_001880; -#define dspot20_room_0Set_000E50DL_0056B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_0056B8" +#define dspot20_room_0Set_000E50DL_0056B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_0056B8" static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_0056B8[] = dspot20_room_0Set_000E50DL_0056B8; -#define dspot20_room_0Set_000E50DL_005C48 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_005C48" +#define dspot20_room_0Set_000E50DL_005C48 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_005C48" static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_005C48[] = dspot20_room_0Set_000E50DL_005C48; -#define dspot20_room_0Set_000E50DL_003CA0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_003CA0" +#define dspot20_room_0Set_000E50DL_003CA0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_003CA0" static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_003CA0[] = dspot20_room_0Set_000E50DL_003CA0; -#define dspot20_room_0Set_000E50DL_0033B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_0033B8" +#define dspot20_room_0Set_000E50DL_0033B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_0033B8" static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_0033B8[] = dspot20_room_0Set_000E50DL_0033B8; -#define dspot20_room_0Set_000E50DL_004460 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_004460" +#define dspot20_room_0Set_000E50DL_004460 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_004460" static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_004460[] = dspot20_room_0Set_000E50DL_004460; -#define dspot20_room_0Set_000E50DL_0065E8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_0065E8" +#define dspot20_room_0Set_000E50DL_0065E8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_0065E8" static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_0065E8[] = dspot20_room_0Set_000E50DL_0065E8; -#define dspot20_room_0Set_000E50DL_004C38 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_004C38" +#define dspot20_room_0Set_000E50DL_004C38 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_004C38" static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_004C38[] = dspot20_room_0Set_000E50DL_004C38; -#define dspot20_room_0Set_000E50DL_005140 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_005140" +#define dspot20_room_0Set_000E50DL_005140 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_005140" static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_005140[] = dspot20_room_0Set_000E50DL_005140; -#define dspot20_room_0Set_000E50DL_001FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_001FB8" +#define dspot20_room_0Set_000E50DL_001FB8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_001FB8" static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_001FB8[] = dspot20_room_0Set_000E50DL_001FB8; -#define dspot20_room_0Set_000E50DL_002730 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_002730" +#define dspot20_room_0Set_000E50DL_002730 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_002730" static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_002730[] = dspot20_room_0Set_000E50DL_002730; -#define dspot20_room_0Set_000E50DL_0062D0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_0062D0" +#define dspot20_room_0Set_000E50DL_0062D0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_0062D0" static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_0062D0[] = dspot20_room_0Set_000E50DL_0062D0; -#define dspot20_room_0Set_000E50DL_002C00 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_002C00" +#define dspot20_room_0Set_000E50DL_002C00 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_002C00" static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_002C00[] = dspot20_room_0Set_000E50DL_002C00; -#define dspot20_room_0Set_001040DL_001880 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_001880" +#define dspot20_room_0Set_001040DL_001880 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_001880" static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_001880[] = dspot20_room_0Set_001040DL_001880; -#define dspot20_room_0Set_001040DL_0056B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_0056B8" +#define dspot20_room_0Set_001040DL_0056B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_0056B8" static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_0056B8[] = dspot20_room_0Set_001040DL_0056B8; -#define dspot20_room_0Set_001040DL_005C48 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_005C48" +#define dspot20_room_0Set_001040DL_005C48 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_005C48" static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_005C48[] = dspot20_room_0Set_001040DL_005C48; -#define dspot20_room_0Set_001040DL_003CA0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_003CA0" +#define dspot20_room_0Set_001040DL_003CA0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_003CA0" static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_003CA0[] = dspot20_room_0Set_001040DL_003CA0; -#define dspot20_room_0Set_001040DL_0033B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_0033B8" +#define dspot20_room_0Set_001040DL_0033B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_0033B8" static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_0033B8[] = dspot20_room_0Set_001040DL_0033B8; -#define dspot20_room_0Set_001040DL_004460 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_004460" +#define dspot20_room_0Set_001040DL_004460 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_004460" static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_004460[] = dspot20_room_0Set_001040DL_004460; -#define dspot20_room_0Set_001040DL_0065E8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_0065E8" +#define dspot20_room_0Set_001040DL_0065E8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_0065E8" static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_0065E8[] = dspot20_room_0Set_001040DL_0065E8; -#define dspot20_room_0Set_001040DL_004C38 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_004C38" +#define dspot20_room_0Set_001040DL_004C38 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_004C38" static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_004C38[] = dspot20_room_0Set_001040DL_004C38; -#define dspot20_room_0Set_001040DL_005140 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_005140" +#define dspot20_room_0Set_001040DL_005140 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_005140" static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_005140[] = dspot20_room_0Set_001040DL_005140; -#define dspot20_room_0Set_001040DL_001FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_001FB8" +#define dspot20_room_0Set_001040DL_001FB8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_001FB8" static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_001FB8[] = dspot20_room_0Set_001040DL_001FB8; -#define dspot20_room_0Set_001040DL_002730 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_002730" +#define dspot20_room_0Set_001040DL_002730 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_002730" static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_002730[] = dspot20_room_0Set_001040DL_002730; -#define dspot20_room_0Set_001040DL_0062D0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_0062D0" +#define dspot20_room_0Set_001040DL_0062D0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_0062D0" static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_0062D0[] = dspot20_room_0Set_001040DL_0062D0; -#define dspot20_room_0Set_001040DL_002C00 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_002C00" +#define dspot20_room_0Set_001040DL_002C00 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_002C00" static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_002C00[] = dspot20_room_0Set_001040DL_002C00; -#define dspot20_room_0Set_001170DL_001880 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_001880" +#define dspot20_room_0Set_001170DL_001880 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_001880" static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_001880[] = dspot20_room_0Set_001170DL_001880; -#define dspot20_room_0Set_001170DL_0056B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_0056B8" +#define dspot20_room_0Set_001170DL_0056B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_0056B8" static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_0056B8[] = dspot20_room_0Set_001170DL_0056B8; -#define dspot20_room_0Set_001170DL_005C48 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_005C48" +#define dspot20_room_0Set_001170DL_005C48 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_005C48" static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_005C48[] = dspot20_room_0Set_001170DL_005C48; -#define dspot20_room_0Set_001170DL_003CA0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_003CA0" +#define dspot20_room_0Set_001170DL_003CA0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_003CA0" static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_003CA0[] = dspot20_room_0Set_001170DL_003CA0; -#define dspot20_room_0Set_001170DL_0033B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_0033B8" +#define dspot20_room_0Set_001170DL_0033B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_0033B8" static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_0033B8[] = dspot20_room_0Set_001170DL_0033B8; -#define dspot20_room_0Set_001170DL_004460 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_004460" +#define dspot20_room_0Set_001170DL_004460 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_004460" static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_004460[] = dspot20_room_0Set_001170DL_004460; -#define dspot20_room_0Set_001170DL_0065E8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_0065E8" +#define dspot20_room_0Set_001170DL_0065E8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_0065E8" static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_0065E8[] = dspot20_room_0Set_001170DL_0065E8; -#define dspot20_room_0Set_001170DL_004C38 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_004C38" +#define dspot20_room_0Set_001170DL_004C38 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_004C38" static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_004C38[] = dspot20_room_0Set_001170DL_004C38; -#define dspot20_room_0Set_001170DL_005140 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_005140" +#define dspot20_room_0Set_001170DL_005140 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_005140" static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_005140[] = dspot20_room_0Set_001170DL_005140; -#define dspot20_room_0Set_001170DL_001FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_001FB8" +#define dspot20_room_0Set_001170DL_001FB8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_001FB8" static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_001FB8[] = dspot20_room_0Set_001170DL_001FB8; -#define dspot20_room_0Set_001170DL_002730 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_002730" +#define dspot20_room_0Set_001170DL_002730 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_002730" static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_002730[] = dspot20_room_0Set_001170DL_002730; -#define dspot20_room_0Set_001170DL_0062D0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_0062D0" +#define dspot20_room_0Set_001170DL_0062D0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_0062D0" static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_0062D0[] = dspot20_room_0Set_001170DL_0062D0; -#define dspot20_room_0Set_001170DL_002C00 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_002C00" +#define dspot20_room_0Set_001170DL_002C00 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_002C00" static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_002C00[] = dspot20_room_0Set_001170DL_002C00; -#define dspot20_room_0Set_0013A0DL_001880 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_001880" +#define dspot20_room_0Set_0013A0DL_001880 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_001880" static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_001880[] = dspot20_room_0Set_0013A0DL_001880; -#define dspot20_room_0Set_0013A0DL_0056B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_0056B8" +#define dspot20_room_0Set_0013A0DL_0056B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_0056B8" static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_0056B8[] = dspot20_room_0Set_0013A0DL_0056B8; -#define dspot20_room_0Set_0013A0DL_005C48 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_005C48" +#define dspot20_room_0Set_0013A0DL_005C48 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_005C48" static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_005C48[] = dspot20_room_0Set_0013A0DL_005C48; -#define dspot20_room_0Set_0013A0DL_003CA0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_003CA0" +#define dspot20_room_0Set_0013A0DL_003CA0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_003CA0" static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_003CA0[] = dspot20_room_0Set_0013A0DL_003CA0; -#define dspot20_room_0Set_0013A0DL_0033B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_0033B8" +#define dspot20_room_0Set_0013A0DL_0033B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_0033B8" static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_0033B8[] = dspot20_room_0Set_0013A0DL_0033B8; -#define dspot20_room_0Set_0013A0DL_004460 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_004460" +#define dspot20_room_0Set_0013A0DL_004460 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_004460" static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_004460[] = dspot20_room_0Set_0013A0DL_004460; -#define dspot20_room_0Set_0013A0DL_0065E8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_0065E8" +#define dspot20_room_0Set_0013A0DL_0065E8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_0065E8" static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_0065E8[] = dspot20_room_0Set_0013A0DL_0065E8; -#define dspot20_room_0Set_0013A0DL_004C38 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_004C38" +#define dspot20_room_0Set_0013A0DL_004C38 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_004C38" static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_004C38[] = dspot20_room_0Set_0013A0DL_004C38; -#define dspot20_room_0Set_0013A0DL_005140 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_005140" +#define dspot20_room_0Set_0013A0DL_005140 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_005140" static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_005140[] = dspot20_room_0Set_0013A0DL_005140; -#define dspot20_room_0Set_0013A0DL_001FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_001FB8" +#define dspot20_room_0Set_0013A0DL_001FB8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_001FB8" static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_001FB8[] = dspot20_room_0Set_0013A0DL_001FB8; -#define dspot20_room_0Set_0013A0DL_002730 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_002730" +#define dspot20_room_0Set_0013A0DL_002730 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_002730" static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_002730[] = dspot20_room_0Set_0013A0DL_002730; -#define dspot20_room_0Set_0013A0DL_0062D0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_0062D0" +#define dspot20_room_0Set_0013A0DL_0062D0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_0062D0" static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_0062D0[] = dspot20_room_0Set_0013A0DL_0062D0; -#define dspot20_room_0Set_0013A0DL_002C00 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_002C00" +#define dspot20_room_0Set_0013A0DL_002C00 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_002C00" static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_002C00[] = dspot20_room_0Set_0013A0DL_002C00; diff --git a/soh/assets/scenes/overworld/spot20/spot20_scene.h b/soh/assets/scenes/overworld/spot20/spot20_scene.h index 2434fd180..93e10e23d 100644 --- a/soh/assets/scenes/overworld/spot20/spot20_scene.h +++ b/soh/assets/scenes/overworld/spot20/spot20_scene.h @@ -3,105 +3,105 @@ #include "align_asset_macro.h" -#define dgLonLonRanchIntroCs "__OTR__scenes/nonmq/spot20_scene/gLonLonRanchIntroCs" -static const ALIGN_ASSET(2) char gLonLonRanchIntroCs[] = dgLonLonRanchIntroCs; - -#define dgLonLonRanchDayWindowTex "__OTR__scenes/nonmq/spot20_scene/gLonLonRanchDayWindowTex" -static const ALIGN_ASSET(2) char gLonLonRanchDayWindowTex[] = dgLonLonRanchDayWindowTex; - -#define dgLonLonRangeNightWindowsTex "__OTR__scenes/nonmq/spot20_scene/gLonLonRangeNightWindowsTex" -static const ALIGN_ASSET(2) char gLonLonRangeNightWindowsTex[] = dgLonLonRangeNightWindowsTex; - -#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948" -static const ALIGN_ASSET(2) char spot20_sceneCollisionHeader_002948[] = dspot20_sceneCollisionHeader_002948; - -#define dspot20_sceneTex_00D9E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_00D9E0" -static const ALIGN_ASSET(2) char spot20_sceneTex_00D9E0[] = dspot20_sceneTex_00D9E0; - -#define dspot20_sceneTex_00D1E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_00D1E0" -static const ALIGN_ASSET(2) char spot20_sceneTex_00D1E0[] = dspot20_sceneTex_00D1E0; - -#define dspot20_sceneTex_0069E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_0069E0" -static const ALIGN_ASSET(2) char spot20_sceneTex_0069E0[] = dspot20_sceneTex_0069E0; - -#define dspot20_sceneTLUT_005DB0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTLUT_005DB0" -static const ALIGN_ASSET(2) char spot20_sceneTLUT_005DB0[] = dspot20_sceneTLUT_005DB0; - -#define dspot20_sceneTex_0067E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_0067E0" -static const ALIGN_ASSET(2) char spot20_sceneTex_0067E0[] = dspot20_sceneTex_0067E0; - -#define dspot20_sceneTex_00F9E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_00F9E0" -static const ALIGN_ASSET(2) char spot20_sceneTex_00F9E0[] = dspot20_sceneTex_00F9E0; - -#define dspot20_sceneTex_00C9E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_00C9E0" -static const ALIGN_ASSET(2) char spot20_sceneTex_00C9E0[] = dspot20_sceneTex_00C9E0; - -#define dspot20_sceneTex_00BBE0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_00BBE0" -static const ALIGN_ASSET(2) char spot20_sceneTex_00BBE0[] = dspot20_sceneTex_00BBE0; - -#define dspot20_sceneTex_00BDE0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_00BDE0" -static const ALIGN_ASSET(2) char spot20_sceneTex_00BDE0[] = dspot20_sceneTex_00BDE0; - -#define dspot20_sceneTex_0091E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_0091E0" -static const ALIGN_ASSET(2) char spot20_sceneTex_0091E0[] = dspot20_sceneTex_0091E0; - -#define dspot20_sceneTex_0071E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_0071E0" -static const ALIGN_ASSET(2) char spot20_sceneTex_0071E0[] = dspot20_sceneTex_0071E0; - -#define dspot20_sceneTex_005FE0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_005FE0" +#define dspot20_sceneTex_005FE0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_005FE0" static const ALIGN_ASSET(2) char spot20_sceneTex_005FE0[] = dspot20_sceneTex_005FE0; -#define dspot20_sceneTex_00ABE0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_00ABE0" -static const ALIGN_ASSET(2) char spot20_sceneTex_00ABE0[] = dspot20_sceneTex_00ABE0; +#define dspot20_sceneTex_0067E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_0067E0" +static const ALIGN_ASSET(2) char spot20_sceneTex_0067E0[] = dspot20_sceneTex_0067E0; -#define dspot20_sceneTex_009BE0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_009BE0" -static const ALIGN_ASSET(2) char spot20_sceneTex_009BE0[] = dspot20_sceneTex_009BE0; +#define dspot20_sceneTex_0069E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_0069E0" +static const ALIGN_ASSET(2) char spot20_sceneTex_0069E0[] = dspot20_sceneTex_0069E0; -#define dspot20_sceneTex_00E9E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_00E9E0" -static const ALIGN_ASSET(2) char spot20_sceneTex_00E9E0[] = dspot20_sceneTex_00E9E0; +#define dspot20_sceneTex_0071E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_0071E0" +static const ALIGN_ASSET(2) char spot20_sceneTex_0071E0[] = dspot20_sceneTex_0071E0; -#define dspot20_sceneTex_00E1E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_00E1E0" -static const ALIGN_ASSET(2) char spot20_sceneTex_00E1E0[] = dspot20_sceneTex_00E1E0; +#define dspot20_sceneTex_0091E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_0091E0" +static const ALIGN_ASSET(2) char spot20_sceneTex_0091E0[] = dspot20_sceneTex_0091E0; -#define dspot20_sceneTex_00C1E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_00C1E0" -static const ALIGN_ASSET(2) char spot20_sceneTex_00C1E0[] = dspot20_sceneTex_00C1E0; - -#define dspot20_sceneTLUT_005FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTLUT_005FB8" -static const ALIGN_ASSET(2) char spot20_sceneTLUT_005FB8[] = dspot20_sceneTLUT_005FB8; - -#define dspot20_sceneTex_0093E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_0093E0" +#define dspot20_sceneTex_0093E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_0093E0" static const ALIGN_ASSET(2) char spot20_sceneTex_0093E0[] = dspot20_sceneTex_0093E0; -#define dspot20_sceneTex_00F1E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_00F1E0" +#define dspot20_sceneTex_009BE0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_009BE0" +static const ALIGN_ASSET(2) char spot20_sceneTex_009BE0[] = dspot20_sceneTex_009BE0; + +#define dspot20_sceneTex_00ABE0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_00ABE0" +static const ALIGN_ASSET(2) char spot20_sceneTex_00ABE0[] = dspot20_sceneTex_00ABE0; + +#define dspot20_sceneTex_00BBE0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_00BBE0" +static const ALIGN_ASSET(2) char spot20_sceneTex_00BBE0[] = dspot20_sceneTex_00BBE0; + +#define dspot20_sceneTex_00BDE0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_00BDE0" +static const ALIGN_ASSET(2) char spot20_sceneTex_00BDE0[] = dspot20_sceneTex_00BDE0; + +#define dspot20_sceneTex_00C1E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_00C1E0" +static const ALIGN_ASSET(2) char spot20_sceneTex_00C1E0[] = dspot20_sceneTex_00C1E0; + +#define dspot20_sceneTex_00C9E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_00C9E0" +static const ALIGN_ASSET(2) char spot20_sceneTex_00C9E0[] = dspot20_sceneTex_00C9E0; + +#define dspot20_sceneTex_00D1E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_00D1E0" +static const ALIGN_ASSET(2) char spot20_sceneTex_00D1E0[] = dspot20_sceneTex_00D1E0; + +#define dspot20_sceneTex_00D9E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_00D9E0" +static const ALIGN_ASSET(2) char spot20_sceneTex_00D9E0[] = dspot20_sceneTex_00D9E0; + +#define dspot20_sceneTex_00E1E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_00E1E0" +static const ALIGN_ASSET(2) char spot20_sceneTex_00E1E0[] = dspot20_sceneTex_00E1E0; + +#define dspot20_sceneTex_00E9E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_00E9E0" +static const ALIGN_ASSET(2) char spot20_sceneTex_00E9E0[] = dspot20_sceneTex_00E9E0; + +#define dspot20_sceneTex_00F1E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_00F1E0" static const ALIGN_ASSET(2) char spot20_sceneTex_00F1E0[] = dspot20_sceneTex_00F1E0; -#define dspot20_sceneTex_010BE0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_010BE0" +#define dspot20_sceneTex_00F9E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_00F9E0" +static const ALIGN_ASSET(2) char spot20_sceneTex_00F9E0[] = dspot20_sceneTex_00F9E0; + +#define dspot20_sceneTex_010BE0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_010BE0" static const ALIGN_ASSET(2) char spot20_sceneTex_010BE0[] = dspot20_sceneTex_010BE0; -#define dspot20_sceneTex_010E20 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_010E20" +#define dspot20_sceneTex_010E20 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_010E20" static const ALIGN_ASSET(2) char spot20_sceneTex_010E20[] = dspot20_sceneTex_010E20; -#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948" +#define dspot20_sceneTLUT_005DB0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTLUT_005DB0" +static const ALIGN_ASSET(2) char spot20_sceneTLUT_005DB0[] = dspot20_sceneTLUT_005DB0; -#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948" +#define dspot20_sceneTLUT_005FB8 "__OTR__scenes/shared/spot20_scene/spot20_sceneTLUT_005FB8" +static const ALIGN_ASSET(2) char spot20_sceneTLUT_005FB8[] = dspot20_sceneTLUT_005FB8; -#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948" +#define dgLonLonRanchIntroCs "__OTR__scenes/shared/spot20_scene/gLonLonRanchIntroCs" +static const ALIGN_ASSET(2) char gLonLonRanchIntroCs[] = dgLonLonRanchIntroCs; -#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948" +#define dgLonLonRanchDayWindowTex "__OTR__scenes/shared/spot20_scene/gLonLonRanchDayWindowTex" +static const ALIGN_ASSET(2) char gLonLonRanchDayWindowTex[] = dgLonLonRanchDayWindowTex; -#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948" +#define dgLonLonRangeNightWindowsTex "__OTR__scenes/shared/spot20_scene/gLonLonRangeNightWindowsTex" +static const ALIGN_ASSET(2) char gLonLonRangeNightWindowsTex[] = dgLonLonRangeNightWindowsTex; -#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948" +#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/shared/spot20_scene/spot20_sceneCollisionHeader_002948" +static const ALIGN_ASSET(2) char spot20_sceneCollisionHeader_002948[] = dspot20_sceneCollisionHeader_002948; -#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948" +#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/shared/spot20_scene/spot20_sceneCollisionHeader_002948" -#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948" +#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/shared/spot20_scene/spot20_sceneCollisionHeader_002948" -#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948" +#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/shared/spot20_scene/spot20_sceneCollisionHeader_002948" -#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948" +#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/shared/spot20_scene/spot20_sceneCollisionHeader_002948" -#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948" +#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/shared/spot20_scene/spot20_sceneCollisionHeader_002948" + +#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/shared/spot20_scene/spot20_sceneCollisionHeader_002948" + +#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/shared/spot20_scene/spot20_sceneCollisionHeader_002948" + +#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/shared/spot20_scene/spot20_sceneCollisionHeader_002948" + +#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/shared/spot20_scene/spot20_sceneCollisionHeader_002948" + +#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/shared/spot20_scene/spot20_sceneCollisionHeader_002948" + +#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/shared/spot20_scene/spot20_sceneCollisionHeader_002948" #endif // OVERWORLD_SPOT20_SCENE_H diff --git a/soh/assets/scenes/shops/alley_shop/alley_shop_room_0.h b/soh/assets/scenes/shops/alley_shop/alley_shop_room_0.h index 1bf183c70..46c2754e2 100644 --- a/soh/assets/scenes/shops/alley_shop/alley_shop_room_0.h +++ b/soh/assets/scenes/shops/alley_shop/alley_shop_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dalley_shop_room_0DL_0013E0 "__OTR__scenes/nonmq/alley_shop_scene/alley_shop_room_0DL_0013E0" +#define dalley_shop_room_0DL_0013E0 "__OTR__scenes/shared/alley_shop_scene/alley_shop_room_0DL_0013E0" static const ALIGN_ASSET(2) char alley_shop_room_0DL_0013E0[] = dalley_shop_room_0DL_0013E0; diff --git a/soh/assets/scenes/shops/alley_shop/alley_shop_scene.h b/soh/assets/scenes/shops/alley_shop/alley_shop_scene.h index fa0feb5c0..025066535 100644 --- a/soh/assets/scenes/shops/alley_shop/alley_shop_scene.h +++ b/soh/assets/scenes/shops/alley_shop/alley_shop_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dalley_shop_sceneCollisionHeader_000584 "__OTR__scenes/nonmq/alley_shop_scene/alley_shop_sceneCollisionHeader_000584" +#define dalley_shop_sceneCollisionHeader_000584 "__OTR__scenes/shared/alley_shop_scene/alley_shop_sceneCollisionHeader_000584" static const ALIGN_ASSET(2) char alley_shop_sceneCollisionHeader_000584[] = dalley_shop_sceneCollisionHeader_000584; diff --git a/soh/assets/scenes/shops/drag/drag_room_0.h b/soh/assets/scenes/shops/drag/drag_room_0.h index ee173eca0..267fb20ef 100644 --- a/soh/assets/scenes/shops/drag/drag_room_0.h +++ b/soh/assets/scenes/shops/drag/drag_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define ddrag_room_0DL_006618 "__OTR__scenes/nonmq/drag_scene/drag_room_0DL_006618" +#define ddrag_room_0DL_006618 "__OTR__scenes/shared/drag_scene/drag_room_0DL_006618" static const ALIGN_ASSET(2) char drag_room_0DL_006618[] = ddrag_room_0DL_006618; diff --git a/soh/assets/scenes/shops/drag/drag_scene.h b/soh/assets/scenes/shops/drag/drag_scene.h index c42054d50..693493143 100644 --- a/soh/assets/scenes/shops/drag/drag_scene.h +++ b/soh/assets/scenes/shops/drag/drag_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define ddrag_sceneCollisionHeader_0003C0 "__OTR__scenes/nonmq/drag_scene/drag_sceneCollisionHeader_0003C0" +#define ddrag_sceneCollisionHeader_0003C0 "__OTR__scenes/shared/drag_scene/drag_sceneCollisionHeader_0003C0" static const ALIGN_ASSET(2) char drag_sceneCollisionHeader_0003C0[] = ddrag_sceneCollisionHeader_0003C0; diff --git a/soh/assets/scenes/shops/face_shop/face_shop_room_0.h b/soh/assets/scenes/shops/face_shop/face_shop_room_0.h index ea0d792b4..12e581155 100644 --- a/soh/assets/scenes/shops/face_shop/face_shop_room_0.h +++ b/soh/assets/scenes/shops/face_shop/face_shop_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dface_shop_room_0DL_008E08 "__OTR__scenes/nonmq/face_shop_scene/face_shop_room_0DL_008E08" +#define dface_shop_room_0DL_008E08 "__OTR__scenes/shared/face_shop_scene/face_shop_room_0DL_008E08" static const ALIGN_ASSET(2) char face_shop_room_0DL_008E08[] = dface_shop_room_0DL_008E08; diff --git a/soh/assets/scenes/shops/face_shop/face_shop_scene.h b/soh/assets/scenes/shops/face_shop/face_shop_scene.h index 386a1a2ff..601d58993 100644 --- a/soh/assets/scenes/shops/face_shop/face_shop_scene.h +++ b/soh/assets/scenes/shops/face_shop/face_shop_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dface_shop_sceneCollisionHeader_000338 "__OTR__scenes/nonmq/face_shop_scene/face_shop_sceneCollisionHeader_000338" +#define dface_shop_sceneCollisionHeader_000338 "__OTR__scenes/shared/face_shop_scene/face_shop_sceneCollisionHeader_000338" static const ALIGN_ASSET(2) char face_shop_sceneCollisionHeader_000338[] = dface_shop_sceneCollisionHeader_000338; diff --git a/soh/assets/scenes/shops/golon/golon_room_0.h b/soh/assets/scenes/shops/golon/golon_room_0.h index b4f6c001d..900313def 100644 --- a/soh/assets/scenes/shops/golon/golon_room_0.h +++ b/soh/assets/scenes/shops/golon/golon_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dgolon_room_0DL_0009B0 "__OTR__scenes/nonmq/golon_scene/golon_room_0DL_0009B0" +#define dgolon_room_0DL_0009B0 "__OTR__scenes/shared/golon_scene/golon_room_0DL_0009B0" static const ALIGN_ASSET(2) char golon_room_0DL_0009B0[] = dgolon_room_0DL_0009B0; diff --git a/soh/assets/scenes/shops/golon/golon_scene.h b/soh/assets/scenes/shops/golon/golon_scene.h index aba348670..a102ae1ae 100644 --- a/soh/assets/scenes/shops/golon/golon_scene.h +++ b/soh/assets/scenes/shops/golon/golon_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dgolon_sceneCollisionHeader_000368 "__OTR__scenes/nonmq/golon_scene/golon_sceneCollisionHeader_000368" +#define dgolon_sceneCollisionHeader_000368 "__OTR__scenes/shared/golon_scene/golon_sceneCollisionHeader_000368" static const ALIGN_ASSET(2) char golon_sceneCollisionHeader_000368[] = dgolon_sceneCollisionHeader_000368; diff --git a/soh/assets/scenes/shops/kokiri_shop/kokiri_shop_room_0.h b/soh/assets/scenes/shops/kokiri_shop/kokiri_shop_room_0.h index dc8424b78..7a6ca3f45 100644 --- a/soh/assets/scenes/shops/kokiri_shop/kokiri_shop_room_0.h +++ b/soh/assets/scenes/shops/kokiri_shop/kokiri_shop_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dkokiri_shop_room_0DL_00B428 "__OTR__scenes/nonmq/kokiri_shop_scene/kokiri_shop_room_0DL_00B428" +#define dkokiri_shop_room_0DL_00B428 "__OTR__scenes/shared/kokiri_shop_scene/kokiri_shop_room_0DL_00B428" static const ALIGN_ASSET(2) char kokiri_shop_room_0DL_00B428[] = dkokiri_shop_room_0DL_00B428; diff --git a/soh/assets/scenes/shops/kokiri_shop/kokiri_shop_scene.h b/soh/assets/scenes/shops/kokiri_shop/kokiri_shop_scene.h index adfa7c8ba..fa5bd5ef6 100644 --- a/soh/assets/scenes/shops/kokiri_shop/kokiri_shop_scene.h +++ b/soh/assets/scenes/shops/kokiri_shop/kokiri_shop_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dkokiri_shop_sceneCollisionHeader_000950 "__OTR__scenes/nonmq/kokiri_shop_scene/kokiri_shop_sceneCollisionHeader_000950" +#define dkokiri_shop_sceneCollisionHeader_000950 "__OTR__scenes/shared/kokiri_shop_scene/kokiri_shop_sceneCollisionHeader_000950" static const ALIGN_ASSET(2) char kokiri_shop_sceneCollisionHeader_000950[] = dkokiri_shop_sceneCollisionHeader_000950; diff --git a/soh/assets/scenes/shops/night_shop/night_shop_room_0.h b/soh/assets/scenes/shops/night_shop/night_shop_room_0.h index ea97e50a7..c93f973db 100644 --- a/soh/assets/scenes/shops/night_shop/night_shop_room_0.h +++ b/soh/assets/scenes/shops/night_shop/night_shop_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dnight_shop_room_0DL_003100 "__OTR__scenes/nonmq/night_shop_scene/night_shop_room_0DL_003100" +#define dnight_shop_room_0DL_003100 "__OTR__scenes/shared/night_shop_scene/night_shop_room_0DL_003100" static const ALIGN_ASSET(2) char night_shop_room_0DL_003100[] = dnight_shop_room_0DL_003100; diff --git a/soh/assets/scenes/shops/night_shop/night_shop_scene.h b/soh/assets/scenes/shops/night_shop/night_shop_scene.h index 3b5307dee..737f54873 100644 --- a/soh/assets/scenes/shops/night_shop/night_shop_scene.h +++ b/soh/assets/scenes/shops/night_shop/night_shop_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dnight_shop_sceneCollisionHeader_000644 "__OTR__scenes/nonmq/night_shop_scene/night_shop_sceneCollisionHeader_000644" +#define dnight_shop_sceneCollisionHeader_000644 "__OTR__scenes/shared/night_shop_scene/night_shop_sceneCollisionHeader_000644" static const ALIGN_ASSET(2) char night_shop_sceneCollisionHeader_000644[] = dnight_shop_sceneCollisionHeader_000644; diff --git a/soh/assets/scenes/shops/shop1/shop1_room_0.h b/soh/assets/scenes/shops/shop1/shop1_room_0.h index 1d0a99e90..36955854e 100644 --- a/soh/assets/scenes/shops/shop1/shop1_room_0.h +++ b/soh/assets/scenes/shops/shop1/shop1_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dshop1_room_0DL_003F18 "__OTR__scenes/nonmq/shop1_scene/shop1_room_0DL_003F18" +#define dshop1_room_0DL_003F18 "__OTR__scenes/shared/shop1_scene/shop1_room_0DL_003F18" static const ALIGN_ASSET(2) char shop1_room_0DL_003F18[] = dshop1_room_0DL_003F18; diff --git a/soh/assets/scenes/shops/shop1/shop1_scene.h b/soh/assets/scenes/shops/shop1/shop1_scene.h index d67f59784..cbb75c31f 100644 --- a/soh/assets/scenes/shops/shop1/shop1_scene.h +++ b/soh/assets/scenes/shops/shop1/shop1_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dshop1_sceneCollisionHeader_0002B8 "__OTR__scenes/nonmq/shop1_scene/shop1_sceneCollisionHeader_0002B8" +#define dshop1_sceneCollisionHeader_0002B8 "__OTR__scenes/shared/shop1_scene/shop1_sceneCollisionHeader_0002B8" static const ALIGN_ASSET(2) char shop1_sceneCollisionHeader_0002B8[] = dshop1_sceneCollisionHeader_0002B8; diff --git a/soh/assets/scenes/shops/zoora/zoora_room_0.h b/soh/assets/scenes/shops/zoora/zoora_room_0.h index 7c7ba04e8..d83d3eb24 100644 --- a/soh/assets/scenes/shops/zoora/zoora_room_0.h +++ b/soh/assets/scenes/shops/zoora/zoora_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dzoora_room_0DL_0009C0 "__OTR__scenes/nonmq/zoora_scene/zoora_room_0DL_0009C0" +#define dzoora_room_0DL_0009C0 "__OTR__scenes/shared/zoora_scene/zoora_room_0DL_0009C0" static const ALIGN_ASSET(2) char zoora_room_0DL_0009C0[] = dzoora_room_0DL_0009C0; diff --git a/soh/assets/scenes/shops/zoora/zoora_scene.h b/soh/assets/scenes/shops/zoora/zoora_scene.h index 1cea04bc1..c8fe5385e 100644 --- a/soh/assets/scenes/shops/zoora/zoora_scene.h +++ b/soh/assets/scenes/shops/zoora/zoora_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dzoora_sceneCollisionHeader_000360 "__OTR__scenes/nonmq/zoora_scene/zoora_sceneCollisionHeader_000360" +#define dzoora_sceneCollisionHeader_000360 "__OTR__scenes/shared/zoora_scene/zoora_sceneCollisionHeader_000360" static const ALIGN_ASSET(2) char zoora_sceneCollisionHeader_000360[] = dzoora_sceneCollisionHeader_000360; diff --git a/soh/assets/scenes/test_levels/besitu/besitu_room_0.h b/soh/assets/scenes/test_levels/besitu/besitu_room_0.h index 2afdbb7da..7a2455665 100644 --- a/soh/assets/scenes/test_levels/besitu/besitu_room_0.h +++ b/soh/assets/scenes/test_levels/besitu/besitu_room_0.h @@ -3,29 +3,29 @@ #include "align_asset_macro.h" -#define dbesitu_room_0DL_001C80 "__OTR__scenes/nonmq/besitu_scene/besitu_room_0DL_001C80" -static const ALIGN_ASSET(2) char besitu_room_0DL_001C80[] = dbesitu_room_0DL_001C80; - -#define dbesitu_room_0Tex_001CD8 "__OTR__scenes/nonmq/besitu_scene/besitu_room_0Tex_001CD8" +#define dbesitu_room_0Tex_001CD8 "__OTR__scenes/shared/besitu_scene/besitu_room_0Tex_001CD8" static const ALIGN_ASSET(2) char besitu_room_0Tex_001CD8[] = dbesitu_room_0Tex_001CD8; -#define dbesitu_room_0Tex_004CD8 "__OTR__scenes/nonmq/besitu_scene/besitu_room_0Tex_004CD8" -static const ALIGN_ASSET(2) char besitu_room_0Tex_004CD8[] = dbesitu_room_0Tex_004CD8; +#define dbesitu_room_0Tex_002CD8 "__OTR__scenes/shared/besitu_scene/besitu_room_0Tex_002CD8" +static const ALIGN_ASSET(2) char besitu_room_0Tex_002CD8[] = dbesitu_room_0Tex_002CD8; -#define dbesitu_room_0TLUT_001CB8 "__OTR__scenes/nonmq/besitu_scene/besitu_room_0TLUT_001CB8" -static const ALIGN_ASSET(2) char besitu_room_0TLUT_001CB8[] = dbesitu_room_0TLUT_001CB8; - -#define dbesitu_room_0Tex_003CD8 "__OTR__scenes/nonmq/besitu_scene/besitu_room_0Tex_003CD8" -static const ALIGN_ASSET(2) char besitu_room_0Tex_003CD8[] = dbesitu_room_0Tex_003CD8; - -#define dbesitu_room_0Tex_0034D8 "__OTR__scenes/nonmq/besitu_scene/besitu_room_0Tex_0034D8" +#define dbesitu_room_0Tex_0034D8 "__OTR__scenes/shared/besitu_scene/besitu_room_0Tex_0034D8" static const ALIGN_ASSET(2) char besitu_room_0Tex_0034D8[] = dbesitu_room_0Tex_0034D8; -#define dbesitu_room_0Tex_0044D8 "__OTR__scenes/nonmq/besitu_scene/besitu_room_0Tex_0044D8" +#define dbesitu_room_0Tex_003CD8 "__OTR__scenes/shared/besitu_scene/besitu_room_0Tex_003CD8" +static const ALIGN_ASSET(2) char besitu_room_0Tex_003CD8[] = dbesitu_room_0Tex_003CD8; + +#define dbesitu_room_0Tex_0044D8 "__OTR__scenes/shared/besitu_scene/besitu_room_0Tex_0044D8" static const ALIGN_ASSET(2) char besitu_room_0Tex_0044D8[] = dbesitu_room_0Tex_0044D8; -#define dbesitu_room_0Tex_002CD8 "__OTR__scenes/nonmq/besitu_scene/besitu_room_0Tex_002CD8" -static const ALIGN_ASSET(2) char besitu_room_0Tex_002CD8[] = dbesitu_room_0Tex_002CD8; +#define dbesitu_room_0Tex_004CD8 "__OTR__scenes/shared/besitu_scene/besitu_room_0Tex_004CD8" +static const ALIGN_ASSET(2) char besitu_room_0Tex_004CD8[] = dbesitu_room_0Tex_004CD8; + +#define dbesitu_room_0TLUT_001CB8 "__OTR__scenes/shared/besitu_scene/besitu_room_0TLUT_001CB8" +static const ALIGN_ASSET(2) char besitu_room_0TLUT_001CB8[] = dbesitu_room_0TLUT_001CB8; + +#define dbesitu_room_0DL_001C80 "__OTR__scenes/shared/besitu_scene/besitu_room_0DL_001C80" +static const ALIGN_ASSET(2) char besitu_room_0DL_001C80[] = dbesitu_room_0DL_001C80; #endif // TEST_LEVELS_BESITU_ROOM_0_H diff --git a/soh/assets/scenes/test_levels/besitu/besitu_scene.h b/soh/assets/scenes/test_levels/besitu/besitu_scene.h index 55964d264..e9841944e 100644 --- a/soh/assets/scenes/test_levels/besitu/besitu_scene.h +++ b/soh/assets/scenes/test_levels/besitu/besitu_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dbesitu_sceneCollisionHeader_000478 "__OTR__scenes/nonmq/besitu_scene/besitu_sceneCollisionHeader_000478" +#define dbesitu_sceneCollisionHeader_000478 "__OTR__scenes/shared/besitu_scene/besitu_sceneCollisionHeader_000478" static const ALIGN_ASSET(2) char besitu_sceneCollisionHeader_000478[] = dbesitu_sceneCollisionHeader_000478; diff --git a/soh/assets/scenes/test_levels/depth_test/depth_test_room_0.h b/soh/assets/scenes/test_levels/depth_test/depth_test_room_0.h index 5cbe9ea1c..6fd273039 100644 --- a/soh/assets/scenes/test_levels/depth_test/depth_test_room_0.h +++ b/soh/assets/scenes/test_levels/depth_test/depth_test_room_0.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define ddepth_test_room_0DL_0004A0 "__OTR__scenes/nonmq/depth_test_scene/depth_test_room_0DL_0004A0" +#define ddepth_test_room_0DL_0004A0 "__OTR__scenes/shared/depth_test_scene/depth_test_room_0DL_0004A0" static const ALIGN_ASSET(2) char depth_test_room_0DL_0004A0[] = ddepth_test_room_0DL_0004A0; diff --git a/soh/assets/scenes/test_levels/depth_test/depth_test_scene.h b/soh/assets/scenes/test_levels/depth_test/depth_test_scene.h index 507a79455..0a036df47 100644 --- a/soh/assets/scenes/test_levels/depth_test/depth_test_scene.h +++ b/soh/assets/scenes/test_levels/depth_test/depth_test_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define ddepth_test_sceneCollisionHeader_0002D4 "__OTR__scenes/nonmq/depth_test_scene/depth_test_sceneCollisionHeader_0002D4" +#define ddepth_test_sceneCollisionHeader_0002D4 "__OTR__scenes/shared/depth_test_scene/depth_test_sceneCollisionHeader_0002D4" static const ALIGN_ASSET(2) char depth_test_sceneCollisionHeader_0002D4[] = ddepth_test_sceneCollisionHeader_0002D4; diff --git a/soh/assets/scenes/test_levels/sasatest/sasatest_room_0.h b/soh/assets/scenes/test_levels/sasatest/sasatest_room_0.h index fac20a13e..3a0d07a74 100644 --- a/soh/assets/scenes/test_levels/sasatest/sasatest_room_0.h +++ b/soh/assets/scenes/test_levels/sasatest/sasatest_room_0.h @@ -3,16 +3,16 @@ #include "align_asset_macro.h" -#define dsasatest_room_0DL_001580 "__OTR__scenes/nonmq/sasatest_scene/sasatest_room_0DL_001580" +#define dsasatest_room_0DL_001580 "__OTR__scenes/shared/sasatest_scene/sasatest_room_0DL_001580" static const ALIGN_ASSET(2) char sasatest_room_0DL_001580[] = dsasatest_room_0DL_001580; -#define dsasatest_room_0Set_000310DL_001580 "__OTR__scenes/nonmq/sasatest_scene/sasatest_room_0Set_000310DL_001580" +#define dsasatest_room_0Set_000310DL_001580 "__OTR__scenes/shared/sasatest_scene/sasatest_room_0Set_000310DL_001580" static const ALIGN_ASSET(2) char sasatest_room_0Set_000310DL_001580[] = dsasatest_room_0Set_000310DL_001580; -#define dsasatest_room_0Set_0001C0DL_001580 "__OTR__scenes/nonmq/sasatest_scene/sasatest_room_0Set_0001C0DL_001580" +#define dsasatest_room_0Set_0001C0DL_001580 "__OTR__scenes/shared/sasatest_scene/sasatest_room_0Set_0001C0DL_001580" static const ALIGN_ASSET(2) char sasatest_room_0Set_0001C0DL_001580[] = dsasatest_room_0Set_0001C0DL_001580; -#define dsasatest_room_0Set_000270DL_001580 "__OTR__scenes/nonmq/sasatest_scene/sasatest_room_0Set_000270DL_001580" +#define dsasatest_room_0Set_000270DL_001580 "__OTR__scenes/shared/sasatest_scene/sasatest_room_0Set_000270DL_001580" static const ALIGN_ASSET(2) char sasatest_room_0Set_000270DL_001580[] = dsasatest_room_0Set_000270DL_001580; diff --git a/soh/assets/scenes/test_levels/sasatest/sasatest_scene.h b/soh/assets/scenes/test_levels/sasatest/sasatest_scene.h index 648614986..5a595e6e1 100644 --- a/soh/assets/scenes/test_levels/sasatest/sasatest_scene.h +++ b/soh/assets/scenes/test_levels/sasatest/sasatest_scene.h @@ -3,14 +3,14 @@ #include "align_asset_macro.h" -#define dsasatest_sceneCollisionHeader_002838 "__OTR__scenes/nonmq/sasatest_scene/sasatest_sceneCollisionHeader_002838" +#define dsasatest_sceneCollisionHeader_002838 "__OTR__scenes/shared/sasatest_scene/sasatest_sceneCollisionHeader_002838" static const ALIGN_ASSET(2) char sasatest_sceneCollisionHeader_002838[] = dsasatest_sceneCollisionHeader_002838; -#define dsasatest_sceneCollisionHeader_002838 "__OTR__scenes/nonmq/sasatest_scene/sasatest_sceneCollisionHeader_002838" +#define dsasatest_sceneCollisionHeader_002838 "__OTR__scenes/shared/sasatest_scene/sasatest_sceneCollisionHeader_002838" -#define dsasatest_sceneCollisionHeader_002838 "__OTR__scenes/nonmq/sasatest_scene/sasatest_sceneCollisionHeader_002838" +#define dsasatest_sceneCollisionHeader_002838 "__OTR__scenes/shared/sasatest_scene/sasatest_sceneCollisionHeader_002838" -#define dsasatest_sceneCollisionHeader_002838 "__OTR__scenes/nonmq/sasatest_scene/sasatest_sceneCollisionHeader_002838" +#define dsasatest_sceneCollisionHeader_002838 "__OTR__scenes/shared/sasatest_scene/sasatest_sceneCollisionHeader_002838" #endif // TEST_LEVELS_SASATEST_SCENE_H diff --git a/soh/assets/scenes/test_levels/sutaru/sutaru_room_0.h b/soh/assets/scenes/test_levels/sutaru/sutaru_room_0.h index 42788f6c7..375643e95 100644 --- a/soh/assets/scenes/test_levels/sutaru/sutaru_room_0.h +++ b/soh/assets/scenes/test_levels/sutaru/sutaru_room_0.h @@ -3,29 +3,29 @@ #include "align_asset_macro.h" -#define dsutaru_room_0DL_001B00 "__OTR__scenes/nonmq/sutaru_scene/sutaru_room_0DL_001B00" -static const ALIGN_ASSET(2) char sutaru_room_0DL_001B00[] = dsutaru_room_0DL_001B00; - -#define dsutaru_room_0Tex_0020F0 "__OTR__scenes/nonmq/sutaru_scene/sutaru_room_0Tex_0020F0" +#define dsutaru_room_0Tex_0020F0 "__OTR__scenes/shared/sutaru_scene/sutaru_room_0Tex_0020F0" static const ALIGN_ASSET(2) char sutaru_room_0Tex_0020F0[] = dsutaru_room_0Tex_0020F0; -#define dsutaru_room_0Tex_0028F0 "__OTR__scenes/nonmq/sutaru_scene/sutaru_room_0Tex_0028F0" +#define dsutaru_room_0Tex_0028F0 "__OTR__scenes/shared/sutaru_scene/sutaru_room_0Tex_0028F0" static const ALIGN_ASSET(2) char sutaru_room_0Tex_0028F0[] = dsutaru_room_0Tex_0028F0; -#define dsutaru_room_0Tex_002AF0 "__OTR__scenes/nonmq/sutaru_scene/sutaru_room_0Tex_002AF0" +#define dsutaru_room_0Tex_002AF0 "__OTR__scenes/shared/sutaru_scene/sutaru_room_0Tex_002AF0" static const ALIGN_ASSET(2) char sutaru_room_0Tex_002AF0[] = dsutaru_room_0Tex_002AF0; -#define dsutaru_room_0Tex_003AF0 "__OTR__scenes/nonmq/sutaru_scene/sutaru_room_0Tex_003AF0" +#define dsutaru_room_0Tex_003AF0 "__OTR__scenes/shared/sutaru_scene/sutaru_room_0Tex_003AF0" static const ALIGN_ASSET(2) char sutaru_room_0Tex_003AF0[] = dsutaru_room_0Tex_003AF0; -#define dsutaru_room_0Tex_0042F0 "__OTR__scenes/nonmq/sutaru_scene/sutaru_room_0Tex_0042F0" +#define dsutaru_room_0Tex_0042F0 "__OTR__scenes/shared/sutaru_scene/sutaru_room_0Tex_0042F0" static const ALIGN_ASSET(2) char sutaru_room_0Tex_0042F0[] = dsutaru_room_0Tex_0042F0; -#define dsutaru_room_0Tex_0052F0 "__OTR__scenes/nonmq/sutaru_scene/sutaru_room_0Tex_0052F0" +#define dsutaru_room_0Tex_0052F0 "__OTR__scenes/shared/sutaru_scene/sutaru_room_0Tex_0052F0" static const ALIGN_ASSET(2) char sutaru_room_0Tex_0052F0[] = dsutaru_room_0Tex_0052F0; -#define dsutaru_room_0Tex_0062F0 "__OTR__scenes/nonmq/sutaru_scene/sutaru_room_0Tex_0062F0" +#define dsutaru_room_0Tex_0062F0 "__OTR__scenes/shared/sutaru_scene/sutaru_room_0Tex_0062F0" static const ALIGN_ASSET(2) char sutaru_room_0Tex_0062F0[] = dsutaru_room_0Tex_0062F0; +#define dsutaru_room_0DL_001B00 "__OTR__scenes/shared/sutaru_scene/sutaru_room_0DL_001B00" +static const ALIGN_ASSET(2) char sutaru_room_0DL_001B00[] = dsutaru_room_0DL_001B00; + #endif // TEST_LEVELS_SUTARU_ROOM_0_H diff --git a/soh/assets/scenes/test_levels/sutaru/sutaru_scene.h b/soh/assets/scenes/test_levels/sutaru/sutaru_scene.h index 115c20517..89fde57e6 100644 --- a/soh/assets/scenes/test_levels/sutaru/sutaru_scene.h +++ b/soh/assets/scenes/test_levels/sutaru/sutaru_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dsutaru_sceneCollisionHeader_000B78 "__OTR__scenes/nonmq/sutaru_scene/sutaru_sceneCollisionHeader_000B78" +#define dsutaru_sceneCollisionHeader_000B78 "__OTR__scenes/shared/sutaru_scene/sutaru_sceneCollisionHeader_000B78" static const ALIGN_ASSET(2) char sutaru_sceneCollisionHeader_000B78[] = dsutaru_sceneCollisionHeader_000B78; diff --git a/soh/assets/scenes/test_levels/syotes/syotes_room_0.h b/soh/assets/scenes/test_levels/syotes/syotes_room_0.h index daa4c7b91..3cb0b318a 100644 --- a/soh/assets/scenes/test_levels/syotes/syotes_room_0.h +++ b/soh/assets/scenes/test_levels/syotes/syotes_room_0.h @@ -3,44 +3,44 @@ #include "align_asset_macro.h" -#define dsyotes_room_0DL_0031C8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0DL_0031C8" -static const ALIGN_ASSET(2) char syotes_room_0DL_0031C8[] = dsyotes_room_0DL_0031C8; - -#define dsyotes_room_0Tex_0069E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0069E8" -static const ALIGN_ASSET(2) char syotes_room_0Tex_0069E8[] = dsyotes_room_0Tex_0069E8; - -#define dsyotes_room_0Tex_0079E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0079E8" -static const ALIGN_ASSET(2) char syotes_room_0Tex_0079E8[] = dsyotes_room_0Tex_0079E8; - -#define dsyotes_room_0Tex_0089E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0089E8" -static const ALIGN_ASSET(2) char syotes_room_0Tex_0089E8[] = dsyotes_room_0Tex_0089E8; - -#define dsyotes_room_0Tex_0039E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0039E8" -static const ALIGN_ASSET(2) char syotes_room_0Tex_0039E8[] = dsyotes_room_0Tex_0039E8; - -#define dsyotes_room_0Tex_0031E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0031E8" +#define dsyotes_room_0Tex_0031E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0031E8" static const ALIGN_ASSET(2) char syotes_room_0Tex_0031E8[] = dsyotes_room_0Tex_0031E8; -#define dsyotes_room_0Tex_0061E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0061E8" -static const ALIGN_ASSET(2) char syotes_room_0Tex_0061E8[] = dsyotes_room_0Tex_0061E8; +#define dsyotes_room_0Tex_0039E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0039E8" +static const ALIGN_ASSET(2) char syotes_room_0Tex_0039E8[] = dsyotes_room_0Tex_0039E8; -#define dsyotes_room_0Tex_0041E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0041E8" +#define dsyotes_room_0Tex_0041E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0041E8" static const ALIGN_ASSET(2) char syotes_room_0Tex_0041E8[] = dsyotes_room_0Tex_0041E8; -#define dsyotes_room_0Tex_0099E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0099E8" -static const ALIGN_ASSET(2) char syotes_room_0Tex_0099E8[] = dsyotes_room_0Tex_0099E8; - -#define dsyotes_room_0Tex_00A9E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_00A9E8" -static const ALIGN_ASSET(2) char syotes_room_0Tex_00A9E8[] = dsyotes_room_0Tex_00A9E8; - -#define dsyotes_room_0Tex_0051E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0051E8" +#define dsyotes_room_0Tex_0051E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0051E8" static const ALIGN_ASSET(2) char syotes_room_0Tex_0051E8[] = dsyotes_room_0Tex_0051E8; -#define dsyotes_room_0DL_00BF70 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0DL_00BF70" -static const ALIGN_ASSET(2) char syotes_room_0DL_00BF70[] = dsyotes_room_0DL_00BF70; +#define dsyotes_room_0Tex_0061E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0061E8" +static const ALIGN_ASSET(2) char syotes_room_0Tex_0061E8[] = dsyotes_room_0Tex_0061E8; -#define dsyotes_room_0Tex_00BF80 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_00BF80" +#define dsyotes_room_0Tex_0069E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0069E8" +static const ALIGN_ASSET(2) char syotes_room_0Tex_0069E8[] = dsyotes_room_0Tex_0069E8; + +#define dsyotes_room_0Tex_0079E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0079E8" +static const ALIGN_ASSET(2) char syotes_room_0Tex_0079E8[] = dsyotes_room_0Tex_0079E8; + +#define dsyotes_room_0Tex_0089E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0089E8" +static const ALIGN_ASSET(2) char syotes_room_0Tex_0089E8[] = dsyotes_room_0Tex_0089E8; + +#define dsyotes_room_0Tex_0099E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0099E8" +static const ALIGN_ASSET(2) char syotes_room_0Tex_0099E8[] = dsyotes_room_0Tex_0099E8; + +#define dsyotes_room_0Tex_00A9E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_00A9E8" +static const ALIGN_ASSET(2) char syotes_room_0Tex_00A9E8[] = dsyotes_room_0Tex_00A9E8; + +#define dsyotes_room_0Tex_00BF80 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_00BF80" static const ALIGN_ASSET(2) char syotes_room_0Tex_00BF80[] = dsyotes_room_0Tex_00BF80; +#define dsyotes_room_0DL_0031C8 "__OTR__scenes/shared/syotes_scene/syotes_room_0DL_0031C8" +static const ALIGN_ASSET(2) char syotes_room_0DL_0031C8[] = dsyotes_room_0DL_0031C8; + +#define dsyotes_room_0DL_00BF70 "__OTR__scenes/shared/syotes_scene/syotes_room_0DL_00BF70" +static const ALIGN_ASSET(2) char syotes_room_0DL_00BF70[] = dsyotes_room_0DL_00BF70; + #endif // TEST_LEVELS_SYOTES_ROOM_0_H diff --git a/soh/assets/scenes/test_levels/syotes/syotes_scene.h b/soh/assets/scenes/test_levels/syotes/syotes_scene.h index 62b5bfa0b..83733242a 100644 --- a/soh/assets/scenes/test_levels/syotes/syotes_scene.h +++ b/soh/assets/scenes/test_levels/syotes/syotes_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dsyotes_sceneCollisionHeader_001BD4 "__OTR__scenes/nonmq/syotes_scene/syotes_sceneCollisionHeader_001BD4" +#define dsyotes_sceneCollisionHeader_001BD4 "__OTR__scenes/shared/syotes_scene/syotes_sceneCollisionHeader_001BD4" static const ALIGN_ASSET(2) char syotes_sceneCollisionHeader_001BD4[] = dsyotes_sceneCollisionHeader_001BD4; diff --git a/soh/assets/scenes/test_levels/syotes2/syotes2_room_0.h b/soh/assets/scenes/test_levels/syotes2/syotes2_room_0.h index 3c908c82a..8529deb41 100644 --- a/soh/assets/scenes/test_levels/syotes2/syotes2_room_0.h +++ b/soh/assets/scenes/test_levels/syotes2/syotes2_room_0.h @@ -3,29 +3,29 @@ #include "align_asset_macro.h" -#define dsyotes2_room_0DL_0046B8 "__OTR__scenes/nonmq/syotes2_scene/syotes2_room_0DL_0046B8" -static const ALIGN_ASSET(2) char syotes2_room_0DL_0046B8[] = dsyotes2_room_0DL_0046B8; - -#define dsyotes2_room_0Tex_006EF8 "__OTR__scenes/nonmq/syotes2_scene/syotes2_room_0Tex_006EF8" -static const ALIGN_ASSET(2) char syotes2_room_0Tex_006EF8[] = dsyotes2_room_0Tex_006EF8; - -#define dsyotes2_room_0Tex_0056F8 "__OTR__scenes/nonmq/syotes2_scene/syotes2_room_0Tex_0056F8" -static const ALIGN_ASSET(2) char syotes2_room_0Tex_0056F8[] = dsyotes2_room_0Tex_0056F8; - -#define dsyotes2_room_0Tex_004EF8 "__OTR__scenes/nonmq/syotes2_scene/syotes2_room_0Tex_004EF8" -static const ALIGN_ASSET(2) char syotes2_room_0Tex_004EF8[] = dsyotes2_room_0Tex_004EF8; - -#define dsyotes2_room_0Tex_008EF8 "__OTR__scenes/nonmq/syotes2_scene/syotes2_room_0Tex_008EF8" -static const ALIGN_ASSET(2) char syotes2_room_0Tex_008EF8[] = dsyotes2_room_0Tex_008EF8; - -#define dsyotes2_room_0Tex_0066F8 "__OTR__scenes/nonmq/syotes2_scene/syotes2_room_0Tex_0066F8" -static const ALIGN_ASSET(2) char syotes2_room_0Tex_0066F8[] = dsyotes2_room_0Tex_0066F8; - -#define dsyotes2_room_0Tex_0046F8 "__OTR__scenes/nonmq/syotes2_scene/syotes2_room_0Tex_0046F8" +#define dsyotes2_room_0Tex_0046F8 "__OTR__scenes/shared/syotes2_scene/syotes2_room_0Tex_0046F8" static const ALIGN_ASSET(2) char syotes2_room_0Tex_0046F8[] = dsyotes2_room_0Tex_0046F8; -#define dsyotes2_room_0Tex_007EF8 "__OTR__scenes/nonmq/syotes2_scene/syotes2_room_0Tex_007EF8" +#define dsyotes2_room_0Tex_004EF8 "__OTR__scenes/shared/syotes2_scene/syotes2_room_0Tex_004EF8" +static const ALIGN_ASSET(2) char syotes2_room_0Tex_004EF8[] = dsyotes2_room_0Tex_004EF8; + +#define dsyotes2_room_0Tex_0056F8 "__OTR__scenes/shared/syotes2_scene/syotes2_room_0Tex_0056F8" +static const ALIGN_ASSET(2) char syotes2_room_0Tex_0056F8[] = dsyotes2_room_0Tex_0056F8; + +#define dsyotes2_room_0Tex_0066F8 "__OTR__scenes/shared/syotes2_scene/syotes2_room_0Tex_0066F8" +static const ALIGN_ASSET(2) char syotes2_room_0Tex_0066F8[] = dsyotes2_room_0Tex_0066F8; + +#define dsyotes2_room_0Tex_006EF8 "__OTR__scenes/shared/syotes2_scene/syotes2_room_0Tex_006EF8" +static const ALIGN_ASSET(2) char syotes2_room_0Tex_006EF8[] = dsyotes2_room_0Tex_006EF8; + +#define dsyotes2_room_0Tex_007EF8 "__OTR__scenes/shared/syotes2_scene/syotes2_room_0Tex_007EF8" static const ALIGN_ASSET(2) char syotes2_room_0Tex_007EF8[] = dsyotes2_room_0Tex_007EF8; +#define dsyotes2_room_0Tex_008EF8 "__OTR__scenes/shared/syotes2_scene/syotes2_room_0Tex_008EF8" +static const ALIGN_ASSET(2) char syotes2_room_0Tex_008EF8[] = dsyotes2_room_0Tex_008EF8; + +#define dsyotes2_room_0DL_0046B8 "__OTR__scenes/shared/syotes2_scene/syotes2_room_0DL_0046B8" +static const ALIGN_ASSET(2) char syotes2_room_0DL_0046B8[] = dsyotes2_room_0DL_0046B8; + #endif // TEST_LEVELS_SYOTES2_ROOM_0_H diff --git a/soh/assets/scenes/test_levels/syotes2/syotes2_scene.h b/soh/assets/scenes/test_levels/syotes2/syotes2_scene.h index 99da67035..2280899d7 100644 --- a/soh/assets/scenes/test_levels/syotes2/syotes2_scene.h +++ b/soh/assets/scenes/test_levels/syotes2/syotes2_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dsyotes2_sceneCollisionHeader_002478 "__OTR__scenes/nonmq/syotes2_scene/syotes2_sceneCollisionHeader_002478" +#define dsyotes2_sceneCollisionHeader_002478 "__OTR__scenes/shared/syotes2_scene/syotes2_sceneCollisionHeader_002478" static const ALIGN_ASSET(2) char syotes2_sceneCollisionHeader_002478[] = dsyotes2_sceneCollisionHeader_002478; diff --git a/soh/assets/scenes/test_levels/test01/test01_room_0.h b/soh/assets/scenes/test_levels/test01/test01_room_0.h index 14eeda7a2..dd59a8f07 100644 --- a/soh/assets/scenes/test_levels/test01/test01_room_0.h +++ b/soh/assets/scenes/test_levels/test01/test01_room_0.h @@ -3,26 +3,26 @@ #include "align_asset_macro.h" -#define dtest01_room_0DL_006438 "__OTR__scenes/nonmq/test01_scene/test01_room_0DL_006438" -static const ALIGN_ASSET(2) char test01_room_0DL_006438[] = dtest01_room_0DL_006438; - -#define dtest01_room_0Tex_008490 "__OTR__scenes/nonmq/test01_scene/test01_room_0Tex_008490" -static const ALIGN_ASSET(2) char test01_room_0Tex_008490[] = dtest01_room_0Tex_008490; - -#define dtest01_room_0Tex_007490 "__OTR__scenes/nonmq/test01_scene/test01_room_0Tex_007490" -static const ALIGN_ASSET(2) char test01_room_0Tex_007490[] = dtest01_room_0Tex_007490; - -#define dtest01_room_0Tex_006C90 "__OTR__scenes/nonmq/test01_scene/test01_room_0Tex_006C90" -static const ALIGN_ASSET(2) char test01_room_0Tex_006C90[] = dtest01_room_0Tex_006C90; - -#define dtest01_room_0Tex_006490 "__OTR__scenes/nonmq/test01_scene/test01_room_0Tex_006490" +#define dtest01_room_0Tex_006490 "__OTR__scenes/shared/test01_scene/test01_room_0Tex_006490" static const ALIGN_ASSET(2) char test01_room_0Tex_006490[] = dtest01_room_0Tex_006490; -#define dtest01_room_0DL_0090D8 "__OTR__scenes/nonmq/test01_scene/test01_room_0DL_0090D8" -static const ALIGN_ASSET(2) char test01_room_0DL_0090D8[] = dtest01_room_0DL_0090D8; +#define dtest01_room_0Tex_006C90 "__OTR__scenes/shared/test01_scene/test01_room_0Tex_006C90" +static const ALIGN_ASSET(2) char test01_room_0Tex_006C90[] = dtest01_room_0Tex_006C90; -#define dtest01_room_0Tex_0090E8 "__OTR__scenes/nonmq/test01_scene/test01_room_0Tex_0090E8" +#define dtest01_room_0Tex_007490 "__OTR__scenes/shared/test01_scene/test01_room_0Tex_007490" +static const ALIGN_ASSET(2) char test01_room_0Tex_007490[] = dtest01_room_0Tex_007490; + +#define dtest01_room_0Tex_008490 "__OTR__scenes/shared/test01_scene/test01_room_0Tex_008490" +static const ALIGN_ASSET(2) char test01_room_0Tex_008490[] = dtest01_room_0Tex_008490; + +#define dtest01_room_0Tex_0090E8 "__OTR__scenes/shared/test01_scene/test01_room_0Tex_0090E8" static const ALIGN_ASSET(2) char test01_room_0Tex_0090E8[] = dtest01_room_0Tex_0090E8; +#define dtest01_room_0DL_006438 "__OTR__scenes/shared/test01_scene/test01_room_0DL_006438" +static const ALIGN_ASSET(2) char test01_room_0DL_006438[] = dtest01_room_0DL_006438; + +#define dtest01_room_0DL_0090D8 "__OTR__scenes/shared/test01_scene/test01_room_0DL_0090D8" +static const ALIGN_ASSET(2) char test01_room_0DL_0090D8[] = dtest01_room_0DL_0090D8; + #endif // TEST_LEVELS_TEST01_ROOM_0_H diff --git a/soh/assets/scenes/test_levels/test01/test01_scene.h b/soh/assets/scenes/test_levels/test01/test01_scene.h index a194ec16d..fd1d15ba9 100644 --- a/soh/assets/scenes/test_levels/test01/test01_scene.h +++ b/soh/assets/scenes/test_levels/test01/test01_scene.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dtest01_sceneCollisionHeader_003DEC "__OTR__scenes/nonmq/test01_scene/test01_sceneCollisionHeader_003DEC" +#define dtest01_sceneCollisionHeader_003DEC "__OTR__scenes/shared/test01_scene/test01_sceneCollisionHeader_003DEC" static const ALIGN_ASSET(2) char test01_sceneCollisionHeader_003DEC[] = dtest01_sceneCollisionHeader_003DEC; diff --git a/soh/assets/scenes/test_levels/testroom/testroom_room_0.h b/soh/assets/scenes/test_levels/testroom/testroom_room_0.h index 4854ac076..3291706e6 100644 --- a/soh/assets/scenes/test_levels/testroom/testroom_room_0.h +++ b/soh/assets/scenes/test_levels/testroom/testroom_room_0.h @@ -3,23 +3,23 @@ #include "align_asset_macro.h" -#define dtestroom_room_0DL_000A50 "__OTR__scenes/nonmq/testroom_scene/testroom_room_0DL_000A50" -static const ALIGN_ASSET(2) char testroom_room_0DL_000A50[] = dtestroom_room_0DL_000A50; - -#define dtestroom_room_0Tex_000E00 "__OTR__scenes/nonmq/testroom_scene/testroom_room_0Tex_000E00" +#define dtestroom_room_0Tex_000E00 "__OTR__scenes/shared/testroom_scene/testroom_room_0Tex_000E00" static const ALIGN_ASSET(2) char testroom_room_0Tex_000E00[] = dtestroom_room_0Tex_000E00; -#define dtestroom_room_0Tex_001600 "__OTR__scenes/nonmq/testroom_scene/testroom_room_0Tex_001600" +#define dtestroom_room_0Tex_001600 "__OTR__scenes/shared/testroom_scene/testroom_room_0Tex_001600" static const ALIGN_ASSET(2) char testroom_room_0Tex_001600[] = dtestroom_room_0Tex_001600; -#define dtestroom_room_0Tex_002600 "__OTR__scenes/nonmq/testroom_scene/testroom_room_0Tex_002600" +#define dtestroom_room_0Tex_002600 "__OTR__scenes/shared/testroom_scene/testroom_room_0Tex_002600" static const ALIGN_ASSET(2) char testroom_room_0Tex_002600[] = dtestroom_room_0Tex_002600; -#define dtestroom_room_0Tex_002E00 "__OTR__scenes/nonmq/testroom_scene/testroom_room_0Tex_002E00" +#define dtestroom_room_0Tex_002E00 "__OTR__scenes/shared/testroom_scene/testroom_room_0Tex_002E00" static const ALIGN_ASSET(2) char testroom_room_0Tex_002E00[] = dtestroom_room_0Tex_002E00; -#define dtestroom_room_0Tex_003E00 "__OTR__scenes/nonmq/testroom_scene/testroom_room_0Tex_003E00" +#define dtestroom_room_0Tex_003E00 "__OTR__scenes/shared/testroom_scene/testroom_room_0Tex_003E00" static const ALIGN_ASSET(2) char testroom_room_0Tex_003E00[] = dtestroom_room_0Tex_003E00; +#define dtestroom_room_0DL_000A50 "__OTR__scenes/shared/testroom_scene/testroom_room_0DL_000A50" +static const ALIGN_ASSET(2) char testroom_room_0DL_000A50[] = dtestroom_room_0DL_000A50; + #endif // TEST_LEVELS_TESTROOM_ROOM_0_H diff --git a/soh/assets/scenes/test_levels/testroom/testroom_room_1.h b/soh/assets/scenes/test_levels/testroom/testroom_room_1.h index 94efd01c2..1b3abaef7 100644 --- a/soh/assets/scenes/test_levels/testroom/testroom_room_1.h +++ b/soh/assets/scenes/test_levels/testroom/testroom_room_1.h @@ -3,17 +3,17 @@ #include "align_asset_macro.h" -#define dtestroom_room_1DL_000970 "__OTR__scenes/nonmq/testroom_scene/testroom_room_1DL_000970" -static const ALIGN_ASSET(2) char testroom_room_1DL_000970[] = dtestroom_room_1DL_000970; - -#define dtestroom_room_1Tex_000BE8 "__OTR__scenes/nonmq/testroom_scene/testroom_room_1Tex_000BE8" +#define dtestroom_room_1Tex_000BE8 "__OTR__scenes/shared/testroom_scene/testroom_room_1Tex_000BE8" static const ALIGN_ASSET(2) char testroom_room_1Tex_000BE8[] = dtestroom_room_1Tex_000BE8; -#define dtestroom_room_1Tex_0013E8 "__OTR__scenes/nonmq/testroom_scene/testroom_room_1Tex_0013E8" +#define dtestroom_room_1Tex_0013E8 "__OTR__scenes/shared/testroom_scene/testroom_room_1Tex_0013E8" static const ALIGN_ASSET(2) char testroom_room_1Tex_0013E8[] = dtestroom_room_1Tex_0013E8; -#define dtestroom_room_1Tex_001BE8 "__OTR__scenes/nonmq/testroom_scene/testroom_room_1Tex_001BE8" +#define dtestroom_room_1Tex_001BE8 "__OTR__scenes/shared/testroom_scene/testroom_room_1Tex_001BE8" static const ALIGN_ASSET(2) char testroom_room_1Tex_001BE8[] = dtestroom_room_1Tex_001BE8; +#define dtestroom_room_1DL_000970 "__OTR__scenes/shared/testroom_scene/testroom_room_1DL_000970" +static const ALIGN_ASSET(2) char testroom_room_1DL_000970[] = dtestroom_room_1DL_000970; + #endif // TEST_LEVELS_TESTROOM_ROOM_1_H diff --git a/soh/assets/scenes/test_levels/testroom/testroom_room_2.h b/soh/assets/scenes/test_levels/testroom/testroom_room_2.h index 22874c780..990e3fcec 100644 --- a/soh/assets/scenes/test_levels/testroom/testroom_room_2.h +++ b/soh/assets/scenes/test_levels/testroom/testroom_room_2.h @@ -3,20 +3,20 @@ #include "align_asset_macro.h" -#define dtestroom_room_2DL_001590 "__OTR__scenes/nonmq/testroom_scene/testroom_room_2DL_001590" -static const ALIGN_ASSET(2) char testroom_room_2DL_001590[] = dtestroom_room_2DL_001590; - -#define dtestroom_room_2Tex_001A78 "__OTR__scenes/nonmq/testroom_scene/testroom_room_2Tex_001A78" +#define dtestroom_room_2Tex_001A78 "__OTR__scenes/shared/testroom_scene/testroom_room_2Tex_001A78" static const ALIGN_ASSET(2) char testroom_room_2Tex_001A78[] = dtestroom_room_2Tex_001A78; -#define dtestroom_room_2TLUT_001A58 "__OTR__scenes/nonmq/testroom_scene/testroom_room_2TLUT_001A58" -static const ALIGN_ASSET(2) char testroom_room_2TLUT_001A58[] = dtestroom_room_2TLUT_001A58; - -#define dtestroom_room_2Tex_002278 "__OTR__scenes/nonmq/testroom_scene/testroom_room_2Tex_002278" +#define dtestroom_room_2Tex_002278 "__OTR__scenes/shared/testroom_scene/testroom_room_2Tex_002278" static const ALIGN_ASSET(2) char testroom_room_2Tex_002278[] = dtestroom_room_2Tex_002278; -#define dtestroom_room_2Tex_002A78 "__OTR__scenes/nonmq/testroom_scene/testroom_room_2Tex_002A78" +#define dtestroom_room_2Tex_002A78 "__OTR__scenes/shared/testroom_scene/testroom_room_2Tex_002A78" static const ALIGN_ASSET(2) char testroom_room_2Tex_002A78[] = dtestroom_room_2Tex_002A78; +#define dtestroom_room_2TLUT_001A58 "__OTR__scenes/shared/testroom_scene/testroom_room_2TLUT_001A58" +static const ALIGN_ASSET(2) char testroom_room_2TLUT_001A58[] = dtestroom_room_2TLUT_001A58; + +#define dtestroom_room_2DL_001590 "__OTR__scenes/shared/testroom_scene/testroom_room_2DL_001590" +static const ALIGN_ASSET(2) char testroom_room_2DL_001590[] = dtestroom_room_2DL_001590; + #endif // TEST_LEVELS_TESTROOM_ROOM_2_H diff --git a/soh/assets/scenes/test_levels/testroom/testroom_room_3.h b/soh/assets/scenes/test_levels/testroom/testroom_room_3.h index 13f748780..fb3873b15 100644 --- a/soh/assets/scenes/test_levels/testroom/testroom_room_3.h +++ b/soh/assets/scenes/test_levels/testroom/testroom_room_3.h @@ -3,20 +3,20 @@ #include "align_asset_macro.h" -#define dtestroom_room_3DL_000730 "__OTR__scenes/nonmq/testroom_scene/testroom_room_3DL_000730" -static const ALIGN_ASSET(2) char testroom_room_3DL_000730[] = dtestroom_room_3DL_000730; - -#define dtestroom_room_3Tex_000A18 "__OTR__scenes/nonmq/testroom_scene/testroom_room_3Tex_000A18" +#define dtestroom_room_3Tex_000A18 "__OTR__scenes/shared/testroom_scene/testroom_room_3Tex_000A18" static const ALIGN_ASSET(2) char testroom_room_3Tex_000A18[] = dtestroom_room_3Tex_000A18; -#define dtestroom_room_3Tex_001218 "__OTR__scenes/nonmq/testroom_scene/testroom_room_3Tex_001218" +#define dtestroom_room_3Tex_001218 "__OTR__scenes/shared/testroom_scene/testroom_room_3Tex_001218" static const ALIGN_ASSET(2) char testroom_room_3Tex_001218[] = dtestroom_room_3Tex_001218; -#define dtestroom_room_3Tex_002218 "__OTR__scenes/nonmq/testroom_scene/testroom_room_3Tex_002218" +#define dtestroom_room_3Tex_002218 "__OTR__scenes/shared/testroom_scene/testroom_room_3Tex_002218" static const ALIGN_ASSET(2) char testroom_room_3Tex_002218[] = dtestroom_room_3Tex_002218; -#define dtestroom_room_3Tex_003218 "__OTR__scenes/nonmq/testroom_scene/testroom_room_3Tex_003218" +#define dtestroom_room_3Tex_003218 "__OTR__scenes/shared/testroom_scene/testroom_room_3Tex_003218" static const ALIGN_ASSET(2) char testroom_room_3Tex_003218[] = dtestroom_room_3Tex_003218; +#define dtestroom_room_3DL_000730 "__OTR__scenes/shared/testroom_scene/testroom_room_3DL_000730" +static const ALIGN_ASSET(2) char testroom_room_3DL_000730[] = dtestroom_room_3DL_000730; + #endif // TEST_LEVELS_TESTROOM_ROOM_3_H diff --git a/soh/assets/scenes/test_levels/testroom/testroom_room_4.h b/soh/assets/scenes/test_levels/testroom/testroom_room_4.h index 55eb7df18..6bb6d097a 100644 --- a/soh/assets/scenes/test_levels/testroom/testroom_room_4.h +++ b/soh/assets/scenes/test_levels/testroom/testroom_room_4.h @@ -3,7 +3,7 @@ #include "align_asset_macro.h" -#define dtestroom_room_4DL_0001F0 "__OTR__scenes/nonmq/testroom_scene/testroom_room_4DL_0001F0" +#define dtestroom_room_4DL_0001F0 "__OTR__scenes/shared/testroom_scene/testroom_room_4DL_0001F0" static const ALIGN_ASSET(2) char testroom_room_4DL_0001F0[] = dtestroom_room_4DL_0001F0; diff --git a/soh/assets/scenes/test_levels/testroom/testroom_scene.h b/soh/assets/scenes/test_levels/testroom/testroom_scene.h index 4ef8caafd..4b45eb3f9 100644 --- a/soh/assets/scenes/test_levels/testroom/testroom_scene.h +++ b/soh/assets/scenes/test_levels/testroom/testroom_scene.h @@ -3,16 +3,17 @@ #include "align_asset_macro.h" -#define dtestroom_sceneCollisionHeader_0021D4 "__OTR__scenes/nonmq/testroom_scene/testroom_sceneCollisionHeader_0021D4" -static const ALIGN_ASSET(2) char testroom_sceneCollisionHeader_0021D4[] = dtestroom_sceneCollisionHeader_0021D4; - -#define dtestroom_sceneTex_002200 "__OTR__scenes/nonmq/testroom_scene/testroom_sceneTex_002200" +#define dtestroom_sceneTex_002200 "__OTR__scenes/shared/testroom_scene/testroom_sceneTex_002200" static const ALIGN_ASSET(2) char testroom_sceneTex_002200[] = dtestroom_sceneTex_002200; -#define dtestroom_sceneTex_002A00 "__OTR__scenes/nonmq/testroom_scene/testroom_sceneTex_002A00" +#define dtestroom_sceneTex_002A00 "__OTR__scenes/shared/testroom_scene/testroom_sceneTex_002A00" static const ALIGN_ASSET(2) char testroom_sceneTex_002A00[] = dtestroom_sceneTex_002A00; -#define dtestroom_sceneTex_003A00 "__OTR__scenes/nonmq/testroom_scene/testroom_sceneTex_003A00" +#define dtestroom_sceneTex_003A00 "__OTR__scenes/shared/testroom_scene/testroom_sceneTex_003A00" static const ALIGN_ASSET(2) char testroom_sceneTex_003A00[] = dtestroom_sceneTex_003A00; +#define dtestroom_sceneCollisionHeader_0021D4 "__OTR__scenes/shared/testroom_scene/testroom_sceneCollisionHeader_0021D4" +static const ALIGN_ASSET(2) char testroom_sceneCollisionHeader_0021D4[] = dtestroom_sceneCollisionHeader_0021D4; + + #endif // TEST_LEVELS_TESTROOM_SCENE_H diff --git a/soh/assets/textures/nintendo_rogo_static/nintendo_rogo_static.h b/soh/assets/textures/nintendo_rogo_static/nintendo_rogo_static.h index 978b0cd13..d91945ffc 100644 --- a/soh/assets/textures/nintendo_rogo_static/nintendo_rogo_static.h +++ b/soh/assets/textures/nintendo_rogo_static/nintendo_rogo_static.h @@ -3,6 +3,9 @@ #include "align_asset_macro.h" +#define dnintendo_rogo_staticTex_0029C0 "__OTR__textures/nintendo_rogo_static/nintendo_rogo_staticTex_0029C0" +static const ALIGN_ASSET(2) char nintendo_rogo_staticTex_0029C0[] = dnintendo_rogo_staticTex_0029C0; + #define dnintendo_rogo_static_Tex_000000 "__OTR__textures/nintendo_rogo_static/nintendo_rogo_static_Tex_000000" static const ALIGN_ASSET(2) char nintendo_rogo_static_Tex_000000[] = dnintendo_rogo_static_Tex_000000; @@ -12,7 +15,4 @@ static const ALIGN_ASSET(2) char nintendo_rogo_static_Tex_001800[] = dnintendo_r #define dgNintendo64LogoDL "__OTR__textures/nintendo_rogo_static/gNintendo64LogoDL" static const ALIGN_ASSET(2) char gNintendo64LogoDL[] = dgNintendo64LogoDL; -#define dnintendo_rogo_staticTex_0029C0 "__OTR__textures/nintendo_rogo_static/nintendo_rogo_staticTex_0029C0" -static const ALIGN_ASSET(2) char nintendo_rogo_staticTex_0029C0[] = dnintendo_rogo_staticTex_0029C0; - #endif // TEXTURES_NINTENDO_ROGO_STATIC_H diff --git a/soh/assets/xml/GC_MQ_D/objects/object_mo.xml b/soh/assets/xml/GC_MQ_D/objects/object_mo.xml index f25286df8..f31a345d6 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_mo.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_mo.xml @@ -79,7 +79,7 @@ - + diff --git a/soh/assets/xml/GC_MQ_D/overlays/ovl_Boss_Dodongo.xml b/soh/assets/xml/GC_MQ_D/overlays/ovl_Boss_Dodongo.xml index f2ee5b7b8..0e2c84f57 100644 --- a/soh/assets/xml/GC_MQ_D/overlays/ovl_Boss_Dodongo.xml +++ b/soh/assets/xml/GC_MQ_D/overlays/ovl_Boss_Dodongo.xml @@ -1,6 +1,6 @@ - + diff --git a/soh/assets/xml/GC_MQ_PAL_F/objects/object_mo.xml b/soh/assets/xml/GC_MQ_PAL_F/objects/object_mo.xml index 2a6247c9f..b4528ef31 100644 --- a/soh/assets/xml/GC_MQ_PAL_F/objects/object_mo.xml +++ b/soh/assets/xml/GC_MQ_PAL_F/objects/object_mo.xml @@ -8,7 +8,7 @@ - + @@ -69,17 +69,17 @@ - + - + - + diff --git a/soh/assets/xml/GC_MQ_PAL_F/overlays/ovl_Boss_Dodongo.xml b/soh/assets/xml/GC_MQ_PAL_F/overlays/ovl_Boss_Dodongo.xml index 0e1303c17..8a1c4ee94 100644 --- a/soh/assets/xml/GC_MQ_PAL_F/overlays/ovl_Boss_Dodongo.xml +++ b/soh/assets/xml/GC_MQ_PAL_F/overlays/ovl_Boss_Dodongo.xml @@ -1,6 +1,6 @@ - - + + diff --git a/soh/assets/xml/GC_MQ_PAL_F/text/message_data_static.xml b/soh/assets/xml/GC_MQ_PAL_F/text/message_data_static.xml index 400a27e27..5241e3ef7 100644 --- a/soh/assets/xml/GC_MQ_PAL_F/text/message_data_static.xml +++ b/soh/assets/xml/GC_MQ_PAL_F/text/message_data_static.xml @@ -1,14 +1,14 @@ - + - + - + - + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_mo.xml b/soh/assets/xml/GC_NMQ_D/objects/object_mo.xml index 2a6247c9f..b4528ef31 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_mo.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_mo.xml @@ -8,7 +8,7 @@ - + @@ -69,17 +69,17 @@ - + - + - + diff --git a/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Dodongo.xml b/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Dodongo.xml index f6a52f044..d31e4abcc 100644 --- a/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Dodongo.xml +++ b/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Dodongo.xml @@ -1,6 +1,6 @@ - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_mo.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_mo.xml index 2a6247c9f..b4528ef31 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_mo.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_mo.xml @@ -8,7 +8,7 @@ - + @@ -69,17 +69,17 @@ - + - + - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Dodongo.xml b/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Dodongo.xml index f2ee5b7b8..67d85d168 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Dodongo.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Dodongo.xml @@ -1,6 +1,6 @@ - - - + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mo.xml b/soh/assets/xml/N64_PAL_10/objects/object_mo.xml index 2a6247c9f..b4528ef31 100644 --- a/soh/assets/xml/N64_PAL_10/objects/object_mo.xml +++ b/soh/assets/xml/N64_PAL_10/objects/object_mo.xml @@ -8,7 +8,7 @@ - + @@ -69,17 +69,17 @@ - + - + - + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Dodongo.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Dodongo.xml index 8f0c7612c..5e4975bc1 100644 --- a/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Dodongo.xml +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Dodongo.xml @@ -1,6 +1,6 @@ - + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_mo.xml b/soh/assets/xml/N64_PAL_11/objects/object_mo.xml index 2a6247c9f..b4528ef31 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_mo.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_mo.xml @@ -8,7 +8,7 @@ - + @@ -69,17 +69,17 @@ - + - + - + diff --git a/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Dodongo.xml b/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Dodongo.xml index cd9069e13..d6f77448d 100644 --- a/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Dodongo.xml +++ b/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Dodongo.xml @@ -1,6 +1,6 @@ - + diff --git a/soh/include/functions.h b/soh/include/functions.h index 3a1aa8ae2..037ba9d08 100644 --- a/soh/include/functions.h +++ b/soh/include/functions.h @@ -1250,7 +1250,7 @@ s32 Object_IsLoaded(ObjectContext* objectCtx, s32 bankIndex); void func_800981B8(ObjectContext* objectCtx); s32 Scene_ExecuteCommands(PlayState* play, SceneCmd* sceneCmd); void TransitionActor_InitContext(GameState* state, TransitionActorContext* transiActorCtx); -void func_800994A0(PlayState* play); +void Scene_SetTransitionForNextEntrance(PlayState* play); void Scene_Draw(PlayState* play); void SkelAnime_DrawLod(PlayState* play, void** skeleton, Vec3s* jointTable, OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw, void* arg, s32 dListIndex); @@ -1537,7 +1537,7 @@ void KaleidoScopeCall_Draw(PlayState* play); void func_800BC490(PlayState* play, s16 point); s32 func_800BC56C(PlayState* play, s16 arg1); void func_800BC590(PlayState* play); -void func_800BC5E0(PlayState* play, s32 arg1); +void Gameplay_SetupTransition(PlayState* play, s32 arg1); Gfx* Play_SetFog(PlayState* play, Gfx* gfx); void Play_Destroy(GameState* thisx); void Play_Init(GameState* thisx); diff --git a/soh/include/regs.h b/soh/include/regs.h index 74b8a43df..cfbd1ae20 100644 --- a/soh/include/regs.h +++ b/soh/include/regs.h @@ -86,6 +86,8 @@ #define R_ITEM_ICON_X(i) ZREG(82 + i) #define R_ITEM_ICON_Y(i) ZREG(86 + i) #define R_ITEM_ICON_DD(i) ZREG(90 + i) +#define R_TRANS_DBG_ENABLED CREG(11) +#define R_TRANS_DBG_TYPE CREG(12) #define R_ENV_WIND_DIR(i) CREG(16 + i) #define R_ENV_WIND_SPEED CREG(19) #define R_A_BTN_Y XREG(16) diff --git a/soh/include/tables/entrance_table.h b/soh/include/tables/entrance_table.h new file mode 100644 index 000000000..fc7cc00b2 --- /dev/null +++ b/soh/include/tables/entrance_table.h @@ -0,0 +1,1934 @@ +/** + * Entrance Table + * + * DEFINE_ENTRANCE should be used for entrances + * - Argument 1: Enum value for this entrance + * - Argument 2: Scene this entrance belongs to + * - Argument 3: Spawn number for this entrance + * - Argument 4: Toggle if bgm should continue during the transition using this entrance (true or false) + * NOTE: For non-cutscene layers, this field is only read from the `SCENE_LAYER_CHILD_DAY` layer. + * Meaning, the setting only matters for the first entry within a group of layers and that + * setting will apply to the other 3 non-cutscene layers. + * - Argument 5: Toggle if a title card should display when using this entrance (true or false) + * - Argument 6: Transition type when entering using this entrance (second half of a scene transition) + * - Argument 7: Transition type when exiting using this entrance (first half of a scene transition) + * + * WARNING: Due to how the entrance system is implemented, entries within the same group of scene layers are NOT shiftable. + * Groups of scene layers are indicated by line breaks. + * + * Only the first entrance within a group of layers is expected to be referenced in code. + * The entrance system will apply the offset on its own to access the correct entrance for a given layer. + */ +/* 0x000 */ DEFINE_ENTRANCE(ENTR_DEKU_TREE_0, SCENE_DEKU_TREE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x001 */ DEFINE_ENTRANCE(ENTR_DEKU_TREE_0_1, SCENE_DEKU_TREE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x002 */ DEFINE_ENTRANCE(ENTR_DEKU_TREE_0_2, SCENE_DEKU_TREE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x003 */ DEFINE_ENTRANCE(ENTR_DEKU_TREE_0_3, SCENE_DEKU_TREE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x004 */ DEFINE_ENTRANCE(ENTR_DODONGOS_CAVERN_0, SCENE_DODONGOS_CAVERN, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x005 */ DEFINE_ENTRANCE(ENTR_DODONGOS_CAVERN_0_1, SCENE_DODONGOS_CAVERN, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x006 */ DEFINE_ENTRANCE(ENTR_DODONGOS_CAVERN_0_2, SCENE_DODONGOS_CAVERN, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x007 */ DEFINE_ENTRANCE(ENTR_DODONGOS_CAVERN_0_3, SCENE_DODONGOS_CAVERN, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x008 */ DEFINE_ENTRANCE(ENTR_GERUDO_TRAINING_GROUND_0, SCENE_GERUDO_TRAINING_GROUND, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x009 */ DEFINE_ENTRANCE(ENTR_GERUDO_TRAINING_GROUND_0_1, SCENE_GERUDO_TRAINING_GROUND, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x00A */ DEFINE_ENTRANCE(ENTR_GERUDO_TRAINING_GROUND_0_2, SCENE_GERUDO_TRAINING_GROUND, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x00B */ DEFINE_ENTRANCE(ENTR_GERUDO_TRAINING_GROUND_0_3, SCENE_GERUDO_TRAINING_GROUND, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x00C */ DEFINE_ENTRANCE(ENTR_FOREST_TEMPLE_BOSS_0, SCENE_FOREST_TEMPLE_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x00D */ DEFINE_ENTRANCE(ENTR_FOREST_TEMPLE_BOSS_0_1, SCENE_FOREST_TEMPLE_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x00E */ DEFINE_ENTRANCE(ENTR_FOREST_TEMPLE_BOSS_0_2, SCENE_FOREST_TEMPLE_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x00F */ DEFINE_ENTRANCE(ENTR_FOREST_TEMPLE_BOSS_0_3, SCENE_FOREST_TEMPLE_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x010 */ DEFINE_ENTRANCE(ENTR_WATER_TEMPLE_0, SCENE_WATER_TEMPLE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x011 */ DEFINE_ENTRANCE(ENTR_WATER_TEMPLE_0_1, SCENE_WATER_TEMPLE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x012 */ DEFINE_ENTRANCE(ENTR_WATER_TEMPLE_0_2, SCENE_WATER_TEMPLE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x013 */ DEFINE_ENTRANCE(ENTR_WATER_TEMPLE_0_3, SCENE_WATER_TEMPLE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x014 */ DEFINE_ENTRANCE(ENTR_UNUSED_6E, SCENE_UNUSED_6E, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x015 */ DEFINE_ENTRANCE(ENTR_UNUSED_6E_1, SCENE_UNUSED_6E, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x016 */ DEFINE_ENTRANCE(ENTR_UNUSED_6E_2, SCENE_UNUSED_6E, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x017 */ DEFINE_ENTRANCE(ENTR_UNUSED_6E_3, SCENE_UNUSED_6E, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x018 */ DEFINE_ENTRANCE(ENTR_SASATEST_0, SCENE_SASATEST, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x019 */ DEFINE_ENTRANCE(ENTR_SASATEST_0_1, SCENE_SASATEST, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x01A */ DEFINE_ENTRANCE(ENTR_SASATEST_0_2, SCENE_SASATEST, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x01B */ DEFINE_ENTRANCE(ENTR_SASATEST_0_3, SCENE_SASATEST, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x01C */ DEFINE_ENTRANCE(ENTR_SYOTES_0, SCENE_SYOTES, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x01D */ DEFINE_ENTRANCE(ENTR_SYOTES_0_1, SCENE_SYOTES, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x01E */ DEFINE_ENTRANCE(ENTR_SYOTES_0_2, SCENE_SYOTES, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x01F */ DEFINE_ENTRANCE(ENTR_SYOTES_0_3, SCENE_SYOTES, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x020 */ DEFINE_ENTRANCE(ENTR_SYOTES2_0, SCENE_SYOTES2, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x021 */ DEFINE_ENTRANCE(ENTR_SYOTES2_0_1, SCENE_SYOTES2, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x022 */ DEFINE_ENTRANCE(ENTR_SYOTES2_0_2, SCENE_SYOTES2, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x023 */ DEFINE_ENTRANCE(ENTR_SYOTES2_0_3, SCENE_SYOTES2, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x024 */ DEFINE_ENTRANCE(ENTR_TESTROOM_0, SCENE_TESTROOM, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x025 */ DEFINE_ENTRANCE(ENTR_TESTROOM_0_1, SCENE_TESTROOM, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x026 */ DEFINE_ENTRANCE(ENTR_TESTROOM_0_2, SCENE_TESTROOM, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x027 */ DEFINE_ENTRANCE(ENTR_TESTROOM_0_3, SCENE_TESTROOM, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x028 */ DEFINE_ENTRANCE(ENTR_JABU_JABU_0, SCENE_JABU_JABU, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x029 */ DEFINE_ENTRANCE(ENTR_JABU_JABU_0_1, SCENE_JABU_JABU, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x02A */ DEFINE_ENTRANCE(ENTR_JABU_JABU_0_2, SCENE_JABU_JABU, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x02B */ DEFINE_ENTRANCE(ENTR_JABU_JABU_0_3, SCENE_JABU_JABU, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x02C */ DEFINE_ENTRANCE(ENTR_JABU_JABU_0_4, SCENE_JABU_JABU, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x02D */ DEFINE_ENTRANCE(ENTR_ROYAL_FAMILYS_TOMB_0, SCENE_ROYAL_FAMILYS_TOMB, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_BLACK, TCS_FAST)) +/* 0x02E */ DEFINE_ENTRANCE(ENTR_ROYAL_FAMILYS_TOMB_0_1, SCENE_ROYAL_FAMILYS_TOMB, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_BLACK, TCS_FAST)) +/* 0x02F */ DEFINE_ENTRANCE(ENTR_ROYAL_FAMILYS_TOMB_0_2, SCENE_ROYAL_FAMILYS_TOMB, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_BLACK, TCS_FAST)) +/* 0x030 */ DEFINE_ENTRANCE(ENTR_ROYAL_FAMILYS_TOMB_0_3, SCENE_ROYAL_FAMILYS_TOMB, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_BLACK, TCS_FAST)) +/* 0x031 */ DEFINE_ENTRANCE(ENTR_ROYAL_FAMILYS_TOMB_0_4, SCENE_ROYAL_FAMILYS_TOMB, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x032 */ DEFINE_ENTRANCE(ENTR_ROYAL_FAMILYS_TOMB_0_5, SCENE_ROYAL_FAMILYS_TOMB, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x033 */ DEFINE_ENTRANCE(ENTR_MARKET_ENTRANCE_DAY_0, SCENE_MARKET_ENTRANCE_DAY, 0, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x034 */ DEFINE_ENTRANCE(ENTR_MARKET_ENTRANCE_NIGHT_0_1, SCENE_MARKET_ENTRANCE_NIGHT, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x035 */ DEFINE_ENTRANCE(ENTR_MARKET_ENTRANCE_RUINS_0_2, SCENE_MARKET_ENTRANCE_RUINS, 0, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x036 */ DEFINE_ENTRANCE(ENTR_MARKET_ENTRANCE_RUINS_0_3, SCENE_MARKET_ENTRANCE_RUINS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x037 */ DEFINE_ENTRANCE(ENTR_SHADOW_TEMPLE_0, SCENE_SHADOW_TEMPLE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x038 */ DEFINE_ENTRANCE(ENTR_SHADOW_TEMPLE_0_1, SCENE_SHADOW_TEMPLE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x039 */ DEFINE_ENTRANCE(ENTR_SHADOW_TEMPLE_0_2, SCENE_SHADOW_TEMPLE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x03A */ DEFINE_ENTRANCE(ENTR_SHADOW_TEMPLE_0_3, SCENE_SHADOW_TEMPLE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x03B */ DEFINE_ENTRANCE(ENTR_SHOOTING_GALLERY_0, SCENE_SHOOTING_GALLERY, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x03C */ DEFINE_ENTRANCE(ENTR_SHOOTING_GALLERY_0_1, SCENE_SHOOTING_GALLERY, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x03D */ DEFINE_ENTRANCE(ENTR_SHOOTING_GALLERY_0_2, SCENE_SHOOTING_GALLERY, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x03E */ DEFINE_ENTRANCE(ENTR_SHOOTING_GALLERY_0_3, SCENE_SHOOTING_GALLERY, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x03F */ DEFINE_ENTRANCE(ENTR_GROTTOS_0, SCENE_GROTTOS, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x040 */ DEFINE_ENTRANCE(ENTR_GROTTOS_0_1, SCENE_GROTTOS, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x041 */ DEFINE_ENTRANCE(ENTR_GROTTOS_0_2, SCENE_GROTTOS, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x042 */ DEFINE_ENTRANCE(ENTR_GROTTOS_0_3, SCENE_GROTTOS, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x043 */ DEFINE_ENTRANCE(ENTR_LAKESIDE_LABORATORY_0, SCENE_LAKESIDE_LABORATORY, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x044 */ DEFINE_ENTRANCE(ENTR_LAKESIDE_LABORATORY_0_1, SCENE_LAKESIDE_LABORATORY, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x045 */ DEFINE_ENTRANCE(ENTR_LAKESIDE_LABORATORY_0_2, SCENE_LAKESIDE_LABORATORY, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x046 */ DEFINE_ENTRANCE(ENTR_LAKESIDE_LABORATORY_0_3, SCENE_LAKESIDE_LABORATORY, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x047 */ DEFINE_ENTRANCE(ENTR_SUTARU_0, SCENE_SUTARU, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x048 */ DEFINE_ENTRANCE(ENTR_SUTARU_0_1, SCENE_SUTARU, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x049 */ DEFINE_ENTRANCE(ENTR_SUTARU_0_2, SCENE_SUTARU, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x04A */ DEFINE_ENTRANCE(ENTR_SUTARU_0_3, SCENE_SUTARU, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x04B */ DEFINE_ENTRANCE(ENTR_GRAVE_WITH_FAIRYS_FOUNTAIN_0, SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_BLACK, TCS_FAST)) +/* 0x04C */ DEFINE_ENTRANCE(ENTR_GRAVE_WITH_FAIRYS_FOUNTAIN_0_1, SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_BLACK, TCS_FAST)) +/* 0x04D */ DEFINE_ENTRANCE(ENTR_GRAVE_WITH_FAIRYS_FOUNTAIN_0_2, SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_BLACK, TCS_FAST)) +/* 0x04E */ DEFINE_ENTRANCE(ENTR_GRAVE_WITH_FAIRYS_FOUNTAIN_0_3, SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_BLACK, TCS_FAST)) + +/* 0x04F */ DEFINE_ENTRANCE(ENTR_LON_LON_BUILDINGS_0, SCENE_LON_LON_BUILDINGS, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x050 */ DEFINE_ENTRANCE(ENTR_LON_LON_BUILDINGS_0_1, SCENE_LON_LON_BUILDINGS, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x051 */ DEFINE_ENTRANCE(ENTR_LON_LON_BUILDINGS_0_2, SCENE_LON_LON_BUILDINGS, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x052 */ DEFINE_ENTRANCE(ENTR_LON_LON_BUILDINGS_0_3, SCENE_LON_LON_BUILDINGS, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x053 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_0, SCENE_TEMPLE_OF_TIME, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x054 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_0_1, SCENE_TEMPLE_OF_TIME, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x055 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_0_2, SCENE_TEMPLE_OF_TIME, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x056 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_0_3, SCENE_TEMPLE_OF_TIME, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x057 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_0_4, SCENE_TEMPLE_OF_TIME, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x058 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_0_5, SCENE_TEMPLE_OF_TIME, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x059 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_0_6, SCENE_TEMPLE_OF_TIME, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x05A */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_0_7, SCENE_TEMPLE_OF_TIME, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x05B */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_0_8, SCENE_TEMPLE_OF_TIME, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x05C */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_0_9, SCENE_TEMPLE_OF_TIME, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x05D */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_0_10, SCENE_TEMPLE_OF_TIME, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x05E */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_0_11, SCENE_TEMPLE_OF_TIME, 0, false, true, TRANS_TYPE_INSTANT, TRANS_TYPE_INSTANT) +/* 0x05F */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_0_12, SCENE_TEMPLE_OF_TIME, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x060 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_0_13, SCENE_TEMPLE_OF_TIME, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x061 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_0_14, SCENE_TEMPLE_OF_TIME, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x062 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_0_15, SCENE_TEMPLE_OF_TIME, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x063 */ DEFINE_ENTRANCE(ENTR_TREASURE_BOX_SHOP_0, SCENE_TREASURE_BOX_SHOP, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x064 */ DEFINE_ENTRANCE(ENTR_TREASURE_BOX_SHOP_0_1, SCENE_TREASURE_BOX_SHOP, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x065 */ DEFINE_ENTRANCE(ENTR_TREASURE_BOX_SHOP_0_2, SCENE_TREASURE_BOX_SHOP, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x066 */ DEFINE_ENTRANCE(ENTR_TREASURE_BOX_SHOP_0_3, SCENE_TREASURE_BOX_SHOP, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x067 */ DEFINE_ENTRANCE(ENTR_BACK_ALLEY_DAY_3, SCENE_BACK_ALLEY_DAY, 3, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x068 */ DEFINE_ENTRANCE(ENTR_BACK_ALLEY_NIGHT_3_1, SCENE_BACK_ALLEY_NIGHT, 3, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x069 */ DEFINE_ENTRANCE(ENTR_BACK_ALLEY_DAY_3_2, SCENE_BACK_ALLEY_DAY, 3, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x06A */ DEFINE_ENTRANCE(ENTR_BACK_ALLEY_NIGHT_3_3, SCENE_BACK_ALLEY_NIGHT, 3, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x06B */ DEFINE_ENTRANCE(ENTR_CHAMBER_OF_THE_SAGES_0, SCENE_CHAMBER_OF_THE_SAGES, 0, false, true, TRANS_TYPE_FADE_WHITE_SLOW, TRANS_TYPE_FADE_WHITE_SLOW) +/* 0x06C */ DEFINE_ENTRANCE(ENTR_CHAMBER_OF_THE_SAGES_0_1, SCENE_CHAMBER_OF_THE_SAGES, 0, false, true, TRANS_TYPE_FADE_WHITE_SLOW, TRANS_TYPE_FADE_WHITE_SLOW) +/* 0x06D */ DEFINE_ENTRANCE(ENTR_CHAMBER_OF_THE_SAGES_0_2, SCENE_CHAMBER_OF_THE_SAGES, 0, false, true, TRANS_TYPE_FADE_WHITE_SLOW, TRANS_TYPE_FADE_WHITE_SLOW) +/* 0x06E */ DEFINE_ENTRANCE(ENTR_CHAMBER_OF_THE_SAGES_0_3, SCENE_CHAMBER_OF_THE_SAGES, 0, false, true, TRANS_TYPE_FADE_WHITE_SLOW, TRANS_TYPE_FADE_WHITE_SLOW) +/* 0x06F */ DEFINE_ENTRANCE(ENTR_CHAMBER_OF_THE_SAGES_0_4, SCENE_CHAMBER_OF_THE_SAGES, 0, false, true, TRANS_TYPE_FADE_WHITE_CS_DELAYED, TRANS_TYPE_FADE_BLACK) +/* 0x070 */ DEFINE_ENTRANCE(ENTR_CHAMBER_OF_THE_SAGES_0_5, SCENE_CHAMBER_OF_THE_SAGES, 0, false, true, TRANS_TYPE_FADE_WHITE_CS_DELAYED, TRANS_TYPE_FADE_BLACK) +/* 0x071 */ DEFINE_ENTRANCE(ENTR_CHAMBER_OF_THE_SAGES_0_6, SCENE_CHAMBER_OF_THE_SAGES, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) + +/* 0x072 */ DEFINE_ENTRANCE(ENTR_POTION_SHOP_GRANNY_0, SCENE_POTION_SHOP_GRANNY, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x073 */ DEFINE_ENTRANCE(ENTR_POTION_SHOP_GRANNY_0_1, SCENE_POTION_SHOP_GRANNY, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x074 */ DEFINE_ENTRANCE(ENTR_POTION_SHOP_GRANNY_0_2, SCENE_POTION_SHOP_GRANNY, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x075 */ DEFINE_ENTRANCE(ENTR_POTION_SHOP_GRANNY_0_3, SCENE_POTION_SHOP_GRANNY, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x076 */ DEFINE_ENTRANCE(ENTR_HAIRAL_NIWA2_0, SCENE_HAIRAL_NIWA2, 0, false, true, TRANS_TYPE_CIRCLE(TCA_WAVE, TCC_BLACK, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_WAVE, TCC_BLACK, TCS_FAST)) +/* 0x077 */ DEFINE_ENTRANCE(ENTR_HAIRAL_NIWA2_0_1, SCENE_HAIRAL_NIWA2, 0, false, true, TRANS_TYPE_CIRCLE(TCA_WAVE, TCC_BLACK, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_WAVE, TCC_BLACK, TCS_FAST)) +/* 0x078 */ DEFINE_ENTRANCE(ENTR_HAIRAL_NIWA2_0_2, SCENE_HAIRAL_NIWA2, 0, false, true, TRANS_TYPE_CIRCLE(TCA_WAVE, TCC_BLACK, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_WAVE, TCC_BLACK, TCS_FAST)) +/* 0x079 */ DEFINE_ENTRANCE(ENTR_HAIRAL_NIWA2_0_3, SCENE_HAIRAL_NIWA2, 0, false, true, TRANS_TYPE_CIRCLE(TCA_WAVE, TCC_BLACK, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_WAVE, TCC_BLACK, TCS_FAST)) + +/* 0x07A */ DEFINE_ENTRANCE(ENTR_CASTLE_COURTYARD_GUARDS_DAY_0, SCENE_CASTLE_COURTYARD_GUARDS_DAY, 0, false, true, TRANS_TYPE_CIRCLE(TCA_WAVE, TCC_BLACK, TCS_FAST), TRANS_TYPE_FADE_BLACK_FAST) +/* 0x07B */ DEFINE_ENTRANCE(ENTR_CASTLE_COURTYARD_GUARDS_NIGHT_0_1, SCENE_CASTLE_COURTYARD_GUARDS_NIGHT, 0, false, true, TRANS_TYPE_CIRCLE(TCA_WAVE, TCC_BLACK, TCS_FAST), TRANS_TYPE_FADE_BLACK_FAST) +/* 0x07C */ DEFINE_ENTRANCE(ENTR_CASTLE_COURTYARD_GUARDS_DAY_0_2, SCENE_CASTLE_COURTYARD_GUARDS_DAY, 0, false, true, TRANS_TYPE_CIRCLE(TCA_WAVE, TCC_BLACK, TCS_FAST), TRANS_TYPE_FADE_BLACK_FAST) +/* 0x07D */ DEFINE_ENTRANCE(ENTR_CASTLE_COURTYARD_GUARDS_NIGHT_0_3, SCENE_CASTLE_COURTYARD_GUARDS_NIGHT, 0, false, true, TRANS_TYPE_CIRCLE(TCA_WAVE, TCC_BLACK, TCS_FAST), TRANS_TYPE_FADE_BLACK_FAST) + +/* 0x07E */ DEFINE_ENTRANCE(ENTR_MARKET_GUARD_HOUSE_0, SCENE_MARKET_GUARD_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x07F */ DEFINE_ENTRANCE(ENTR_MARKET_GUARD_HOUSE_0_1, SCENE_MARKET_GUARD_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x080 */ DEFINE_ENTRANCE(ENTR_MARKET_GUARD_HOUSE_0_2, SCENE_MARKET_GUARD_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x081 */ DEFINE_ENTRANCE(ENTR_MARKET_GUARD_HOUSE_0_3, SCENE_MARKET_GUARD_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x082 */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_0, SCENE_SPIRIT_TEMPLE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x083 */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_0_1, SCENE_SPIRIT_TEMPLE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x084 */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_0_2, SCENE_SPIRIT_TEMPLE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x085 */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_0_3, SCENE_SPIRIT_TEMPLE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x086 */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_0_4, SCENE_SPIRIT_TEMPLE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x087 */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_0_5, SCENE_SPIRIT_TEMPLE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x088 */ DEFINE_ENTRANCE(ENTR_ICE_CAVERN_0, SCENE_ICE_CAVERN, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x089 */ DEFINE_ENTRANCE(ENTR_ICE_CAVERN_0_1, SCENE_ICE_CAVERN, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x08A */ DEFINE_ENTRANCE(ENTR_ICE_CAVERN_0_2, SCENE_ICE_CAVERN, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x08B */ DEFINE_ENTRANCE(ENTR_ICE_CAVERN_0_3, SCENE_ICE_CAVERN, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x08C */ DEFINE_ENTRANCE(ENTR_ICE_CAVERN_0_4, SCENE_ICE_CAVERN, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x08D */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_BOSS_0, SCENE_SPIRIT_TEMPLE_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x08E */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_BOSS_0_1, SCENE_SPIRIT_TEMPLE_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x08F */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_BOSS_0_2, SCENE_SPIRIT_TEMPLE_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x090 */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_BOSS_0_3, SCENE_SPIRIT_TEMPLE_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x091 */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_BOSS_0_4, SCENE_SPIRIT_TEMPLE_BOSS, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x092 */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_BOSS_0_5, SCENE_SPIRIT_TEMPLE_BOSS, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x093 */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_BOSS_0_6, SCENE_SPIRIT_TEMPLE_BOSS, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x094 */ DEFINE_ENTRANCE(ENTR_TEST01_0, SCENE_TEST01, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x095 */ DEFINE_ENTRANCE(ENTR_TEST01_0_1, SCENE_TEST01, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x096 */ DEFINE_ENTRANCE(ENTR_TEST01_0_2, SCENE_TEST01, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x097 */ DEFINE_ENTRANCE(ENTR_TEST01_0_3, SCENE_TEST01, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x098 */ DEFINE_ENTRANCE(ENTR_BOTTOM_OF_THE_WELL_0, SCENE_BOTTOM_OF_THE_WELL, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x099 */ DEFINE_ENTRANCE(ENTR_BOTTOM_OF_THE_WELL_0_1, SCENE_BOTTOM_OF_THE_WELL, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x09A */ DEFINE_ENTRANCE(ENTR_BOTTOM_OF_THE_WELL_0_2, SCENE_BOTTOM_OF_THE_WELL, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x09B */ DEFINE_ENTRANCE(ENTR_BOTTOM_OF_THE_WELL_0_3, SCENE_BOTTOM_OF_THE_WELL, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) + +/* 0x09C */ DEFINE_ENTRANCE(ENTR_TWINS_HOUSE_0, SCENE_TWINS_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x09D */ DEFINE_ENTRANCE(ENTR_TWINS_HOUSE_0_1, SCENE_TWINS_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x09E */ DEFINE_ENTRANCE(ENTR_TWINS_HOUSE_0_2, SCENE_TWINS_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x09F */ DEFINE_ENTRANCE(ENTR_TWINS_HOUSE_0_3, SCENE_TWINS_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) + +/* 0x0A0 */ DEFINE_ENTRANCE(ENTR_CUTSCENE_MAP_0, SCENE_CUTSCENE_MAP, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x0A1 */ DEFINE_ENTRANCE(ENTR_CUTSCENE_MAP_0_1, SCENE_CUTSCENE_MAP, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x0A2 */ DEFINE_ENTRANCE(ENTR_CUTSCENE_MAP_0_2, SCENE_CUTSCENE_MAP, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x0A3 */ DEFINE_ENTRANCE(ENTR_CUTSCENE_MAP_0_3, SCENE_CUTSCENE_MAP, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x0A4 */ DEFINE_ENTRANCE(ENTR_CUTSCENE_MAP_0_4, SCENE_CUTSCENE_MAP, 0, false, true, TRANS_TYPE_FILL_WHITE, TRANS_TYPE_FILL_WHITE) +/* 0x0A5 */ DEFINE_ENTRANCE(ENTR_CUTSCENE_MAP_0_5, SCENE_CUTSCENE_MAP, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FILL_WHITE) +/* 0x0A6 */ DEFINE_ENTRANCE(ENTR_CUTSCENE_MAP_0_6, SCENE_CUTSCENE_MAP, 0, true, true, TRANS_TYPE_FILL_WHITE, TRANS_TYPE_FILL_WHITE) +/* 0x0A7 */ DEFINE_ENTRANCE(ENTR_CUTSCENE_MAP_0_7, SCENE_CUTSCENE_MAP, 0, false, true, TRANS_TYPE_INSTANT, TRANS_TYPE_INSTANT) +/* 0x0A8 */ DEFINE_ENTRANCE(ENTR_CUTSCENE_MAP_0_8, SCENE_CUTSCENE_MAP, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x0A9 */ DEFINE_ENTRANCE(ENTR_CUTSCENE_MAP_0_9, SCENE_CUTSCENE_MAP, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0AA */ DEFINE_ENTRANCE(ENTR_CUTSCENE_MAP_0_10, SCENE_CUTSCENE_MAP, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0AB */ DEFINE_ENTRANCE(ENTR_CUTSCENE_MAP_0_11, SCENE_CUTSCENE_MAP, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x0AC */ DEFINE_ENTRANCE(ENTR_CUTSCENE_MAP_0_12, SCENE_CUTSCENE_MAP, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) + +/* 0x0AD */ DEFINE_ENTRANCE(ENTR_BACK_ALLEY_DAY_0, SCENE_BACK_ALLEY_DAY, 0, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x0AE */ DEFINE_ENTRANCE(ENTR_BACK_ALLEY_NIGHT_0_1, SCENE_BACK_ALLEY_NIGHT, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0AF */ DEFINE_ENTRANCE(ENTR_BACK_ALLEY_DAY_0_2, SCENE_BACK_ALLEY_DAY, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0B0 */ DEFINE_ENTRANCE(ENTR_BACK_ALLEY_NIGHT_0_3, SCENE_BACK_ALLEY_NIGHT, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x0B1 */ DEFINE_ENTRANCE(ENTR_MARKET_DAY_0, SCENE_MARKET_DAY, 0, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x0B2 */ DEFINE_ENTRANCE(ENTR_MARKET_NIGHT_0_1, SCENE_MARKET_NIGHT, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0B3 */ DEFINE_ENTRANCE(ENTR_MARKET_RUINS_0_2, SCENE_MARKET_RUINS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0B4 */ DEFINE_ENTRANCE(ENTR_MARKET_RUINS_0_3, SCENE_MARKET_RUINS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0B5 */ DEFINE_ENTRANCE(ENTR_MARKET_DAY_0_4, SCENE_MARKET_DAY, 0, false, true, TRANS_TYPE_WIPE_FAST, TRANS_TYPE_WIPE_FAST) + +/* 0x0B6 */ DEFINE_ENTRANCE(ENTR_DEPTH_TEST_0, SCENE_DEPTH_TEST, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x0B7 */ DEFINE_ENTRANCE(ENTR_BAZAAR_0, SCENE_BAZAAR, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x0B8 */ DEFINE_ENTRANCE(ENTR_BAZAAR_0_1, SCENE_BAZAAR, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x0B9 */ DEFINE_ENTRANCE(ENTR_BAZAAR_0_2, SCENE_BAZAAR, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x0BA */ DEFINE_ENTRANCE(ENTR_BAZAAR_0_3, SCENE_BAZAAR, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x0BB */ DEFINE_ENTRANCE(ENTR_LINKS_HOUSE_0, SCENE_LINKS_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x0BC */ DEFINE_ENTRANCE(ENTR_LINKS_HOUSE_0_1, SCENE_LINKS_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x0BD */ DEFINE_ENTRANCE(ENTR_LINKS_HOUSE_0_2, SCENE_LINKS_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x0BE */ DEFINE_ENTRANCE(ENTR_LINKS_HOUSE_0_3, SCENE_LINKS_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x0BF */ DEFINE_ENTRANCE(ENTR_LINKS_HOUSE_0_4, SCENE_LINKS_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x0C0 */ DEFINE_ENTRANCE(ENTR_LINKS_HOUSE_0_5, SCENE_LINKS_HOUSE, 0, false, true, TRANS_TYPE_CS_BLACK_FILL, TRANS_TYPE_CS_BLACK_FILL) + +/* 0x0C1 */ DEFINE_ENTRANCE(ENTR_KOKIRI_SHOP_0, SCENE_KOKIRI_SHOP, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x0C2 */ DEFINE_ENTRANCE(ENTR_KOKIRI_SHOP_0_1, SCENE_KOKIRI_SHOP, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x0C3 */ DEFINE_ENTRANCE(ENTR_KOKIRI_SHOP_0_2, SCENE_KOKIRI_SHOP, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x0C4 */ DEFINE_ENTRANCE(ENTR_KOKIRI_SHOP_0_3, SCENE_KOKIRI_SHOP, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) + +/* 0x0C5 */ DEFINE_ENTRANCE(ENTR_DODONGOS_CAVERN_1, SCENE_DODONGOS_CAVERN, 1, true, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0C6 */ DEFINE_ENTRANCE(ENTR_DODONGOS_CAVERN_1_1, SCENE_DODONGOS_CAVERN, 1, true, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0C7 */ DEFINE_ENTRANCE(ENTR_DODONGOS_CAVERN_1_2, SCENE_DODONGOS_CAVERN, 1, true, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0C8 */ DEFINE_ENTRANCE(ENTR_DODONGOS_CAVERN_1_3, SCENE_DODONGOS_CAVERN, 1, true, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x0C9 */ DEFINE_ENTRANCE(ENTR_KNOW_IT_ALL_BROS_HOUSE_0, SCENE_KNOW_IT_ALL_BROS_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x0CA */ DEFINE_ENTRANCE(ENTR_KNOW_IT_ALL_BROS_HOUSE_0_1, SCENE_KNOW_IT_ALL_BROS_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x0CB */ DEFINE_ENTRANCE(ENTR_KNOW_IT_ALL_BROS_HOUSE_0_2, SCENE_KNOW_IT_ALL_BROS_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x0CC */ DEFINE_ENTRANCE(ENTR_KNOW_IT_ALL_BROS_HOUSE_0_3, SCENE_KNOW_IT_ALL_BROS_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) + +/* 0x0CD */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_0, SCENE_HYRULE_FIELD, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x0CE */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_0_1, SCENE_HYRULE_FIELD, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0CF */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_0_2, SCENE_HYRULE_FIELD, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x0D0 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_0_3, SCENE_HYRULE_FIELD, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0D1 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_0_4, SCENE_HYRULE_FIELD, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x0D2 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_0_5, SCENE_HYRULE_FIELD, 0, false, true, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_SLOW), TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_SLOW)) +/* 0x0D3 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_0_6, SCENE_HYRULE_FIELD, 0, false, true, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_SLOW), TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_SLOW)) +/* 0x0D4 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_0_7, SCENE_HYRULE_FIELD, 0, false, true, TRANS_TYPE_CIRCLE(TCA_WAVE, TCC_BLACK, TCS_SLOW), TRANS_TYPE_CIRCLE(TCA_WAVE, TCC_BLACK, TCS_SLOW)) +/* 0x0D5 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_0_8, SCENE_HYRULE_FIELD, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x0D6 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_0_9, SCENE_HYRULE_FIELD, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0D7 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_0_10, SCENE_HYRULE_FIELD, 0, false, true, TRANS_TYPE_CIRCLE(TCA_WAVE, TCC_BLACK, TCS_SLOW), TRANS_TYPE_CIRCLE(TCA_WAVE, TCC_BLACK, TCS_SLOW)) +/* 0x0D8 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_0_11, SCENE_HYRULE_FIELD, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x0D9 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_0_12, SCENE_HYRULE_FIELD, 0, false, true, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_WHITE, TCS_SLOW), TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_WHITE, TCS_SLOW)) +/* 0x0DA */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_0_13, SCENE_HYRULE_FIELD, 0, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) + +/* 0x0DB */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_0, SCENE_KAKARIKO_VILLAGE, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x0DC */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_0_1, SCENE_KAKARIKO_VILLAGE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0DD */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_0_2, SCENE_KAKARIKO_VILLAGE, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x0DE */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_0_3, SCENE_KAKARIKO_VILLAGE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0DF */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_0_4, SCENE_KAKARIKO_VILLAGE, 0, false, true, TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_BLACK, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_BLACK, TCS_FAST)) +/* 0x0E0 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_0_5, SCENE_KAKARIKO_VILLAGE, 0, false, true, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_SLOW), TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_SLOW)) +/* 0x0E1 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_0_6, SCENE_KAKARIKO_VILLAGE, 0, true, true, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_SLOW), TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_SLOW)) +/* 0x0E2 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_0_7, SCENE_KAKARIKO_VILLAGE, 0, false, true, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_SLOW), TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_SLOW)) +/* 0x0E3 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_0_8, SCENE_KAKARIKO_VILLAGE, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x0E4 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_0, SCENE_GRAVEYARD, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x0E5 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_0_1, SCENE_GRAVEYARD, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0E6 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_0_2, SCENE_GRAVEYARD, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x0E7 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_0_3, SCENE_GRAVEYARD, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0E8 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_0_4, SCENE_GRAVEYARD, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x0E9 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_0_5, SCENE_GRAVEYARD, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x0EA */ DEFINE_ENTRANCE(ENTR_ZORAS_RIVER_0, SCENE_ZORAS_RIVER, 0, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x0EB */ DEFINE_ENTRANCE(ENTR_ZORAS_RIVER_0_1, SCENE_ZORAS_RIVER, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0EC */ DEFINE_ENTRANCE(ENTR_ZORAS_RIVER_0_2, SCENE_ZORAS_RIVER, 0, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x0ED */ DEFINE_ENTRANCE(ENTR_ZORAS_RIVER_0_3, SCENE_ZORAS_RIVER, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x0EE */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_0, SCENE_KOKIRI_FOREST, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x0EF */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_0_1, SCENE_KOKIRI_FOREST, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0F0 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_0_2, SCENE_KOKIRI_FOREST, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x0F1 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_0_3, SCENE_KOKIRI_FOREST, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0F2 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_0_4, SCENE_KOKIRI_FOREST, 0, true, true, TRANS_TYPE_FILL_WHITE, TRANS_TYPE_FILL_WHITE) +/* 0x0F3 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_0_5, SCENE_KOKIRI_FOREST, 0, false, true, TRANS_TYPE_FILL_WHITE, TRANS_TYPE_FILL_WHITE) +/* 0x0F4 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_0_6, SCENE_KOKIRI_FOREST, 0, true, true, TRANS_TYPE_FILL_WHITE, TRANS_TYPE_FILL_WHITE) +/* 0x0F5 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_0_7, SCENE_KOKIRI_FOREST, 0, false, true, TRANS_TYPE_FADE_WHITE_CS_DELAYED, TRANS_TYPE_FILL_WHITE) +/* 0x0F6 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_0_8, SCENE_KOKIRI_FOREST, 0, false, true, TRANS_TYPE_FILL_WHITE, TRANS_TYPE_FILL_WHITE) +/* 0x0F7 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_0_9, SCENE_KOKIRI_FOREST, 0, false, true, TRANS_TYPE_FILL_WHITE, TRANS_TYPE_FILL_WHITE) +/* 0x0F8 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_0_10, SCENE_KOKIRI_FOREST, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0F9 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_0_11, SCENE_KOKIRI_FOREST, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0FA */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_0_12, SCENE_KOKIRI_FOREST, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0FB */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_0_13, SCENE_KOKIRI_FOREST, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x0FC */ DEFINE_ENTRANCE(ENTR_SACRED_FOREST_MEADOW_0, SCENE_SACRED_FOREST_MEADOW, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0FD */ DEFINE_ENTRANCE(ENTR_SACRED_FOREST_MEADOW_0_1, SCENE_SACRED_FOREST_MEADOW, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0FE */ DEFINE_ENTRANCE(ENTR_SACRED_FOREST_MEADOW_0_2, SCENE_SACRED_FOREST_MEADOW, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x0FF */ DEFINE_ENTRANCE(ENTR_SACRED_FOREST_MEADOW_0_3, SCENE_SACRED_FOREST_MEADOW, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x100 */ DEFINE_ENTRANCE(ENTR_SACRED_FOREST_MEADOW_0_4, SCENE_SACRED_FOREST_MEADOW, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x101 */ DEFINE_ENTRANCE(ENTR_SACRED_FOREST_MEADOW_0_5, SCENE_SACRED_FOREST_MEADOW, 0, false, true, TRANS_TYPE_WIPE, TRANS_TYPE_WIPE) + +/* 0x102 */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_0, SCENE_LAKE_HYLIA, 0, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x103 */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_0_1, SCENE_LAKE_HYLIA, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x104 */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_0_2, SCENE_LAKE_HYLIA, 0, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x105 */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_0_3, SCENE_LAKE_HYLIA, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x106 */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_0_4, SCENE_LAKE_HYLIA, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x107 */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_0_5, SCENE_LAKE_HYLIA, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x108 */ DEFINE_ENTRANCE(ENTR_ZORAS_DOMAIN_0, SCENE_ZORAS_DOMAIN, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x109 */ DEFINE_ENTRANCE(ENTR_ZORAS_DOMAIN_0_1, SCENE_ZORAS_DOMAIN, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x10A */ DEFINE_ENTRANCE(ENTR_ZORAS_DOMAIN_0_2, SCENE_ZORAS_DOMAIN, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x10B */ DEFINE_ENTRANCE(ENTR_ZORAS_DOMAIN_0_3, SCENE_ZORAS_DOMAIN, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x10C */ DEFINE_ENTRANCE(ENTR_ZORAS_DOMAIN_0_4, SCENE_ZORAS_DOMAIN, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x10D */ DEFINE_ENTRANCE(ENTR_ZORAS_DOMAIN_0_5, SCENE_ZORAS_DOMAIN, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x10E */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_0, SCENE_ZORAS_FOUNTAIN, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x10F */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_0_1, SCENE_ZORAS_FOUNTAIN, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x110 */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_0_2, SCENE_ZORAS_FOUNTAIN, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x111 */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_0_3, SCENE_ZORAS_FOUNTAIN, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x112 */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_0_4, SCENE_ZORAS_FOUNTAIN, 0, false, true, TRANS_TYPE_FADE_WHITE_CS_DELAYED, TRANS_TYPE_WIPE) +/* 0x113 */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_0_5, SCENE_ZORAS_FOUNTAIN, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x114 */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_0_6, SCENE_ZORAS_FOUNTAIN, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x115 */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_0_7, SCENE_ZORAS_FOUNTAIN, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x116 */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_0_8, SCENE_ZORAS_FOUNTAIN, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x117 */ DEFINE_ENTRANCE(ENTR_GERUDO_VALLEY_0, SCENE_GERUDO_VALLEY, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x118 */ DEFINE_ENTRANCE(ENTR_GERUDO_VALLEY_0_1, SCENE_GERUDO_VALLEY, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x119 */ DEFINE_ENTRANCE(ENTR_GERUDO_VALLEY_0_2, SCENE_GERUDO_VALLEY, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x11A */ DEFINE_ENTRANCE(ENTR_GERUDO_VALLEY_0_3, SCENE_GERUDO_VALLEY, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x11B */ DEFINE_ENTRANCE(ENTR_GERUDO_VALLEY_0_4, SCENE_GERUDO_VALLEY, 0, true, true, TRANS_TYPE_FILL_BROWN, TRANS_TYPE_FILL_WHITE) +/* 0x11C */ DEFINE_ENTRANCE(ENTR_GERUDO_VALLEY_0_5, SCENE_GERUDO_VALLEY, 0, true, true, TRANS_TYPE_FILL_WHITE, TRANS_TYPE_FILL_WHITE) +/* 0x11D */ DEFINE_ENTRANCE(ENTR_GERUDO_VALLEY_0_6, SCENE_GERUDO_VALLEY, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x11E */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_0, SCENE_LOST_WOODS, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x11F */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_0_1, SCENE_LOST_WOODS, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x120 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_0_2, SCENE_LOST_WOODS, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x121 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_0_3, SCENE_LOST_WOODS, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x122 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_0_4, SCENE_LOST_WOODS, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x123 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_0, SCENE_DESERT_COLOSSUS, 0, true, true, TRANS_TYPE_SANDSTORM_END, TRANS_TYPE_SANDSTORM_END) +/* 0x124 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_0_1, SCENE_DESERT_COLOSSUS, 0, true, true, TRANS_TYPE_SANDSTORM_END, TRANS_TYPE_SANDSTORM_END) +/* 0x125 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_0_2, SCENE_DESERT_COLOSSUS, 0, true, true, TRANS_TYPE_SANDSTORM_END, TRANS_TYPE_SANDSTORM_END) +/* 0x126 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_0_3, SCENE_DESERT_COLOSSUS, 0, true, true, TRANS_TYPE_SANDSTORM_END, TRANS_TYPE_SANDSTORM_END) +/* 0x127 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_0_4, SCENE_DESERT_COLOSSUS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x128 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_0_5, SCENE_DESERT_COLOSSUS, 0, true, true, TRANS_TYPE_SANDSTORM_END, TRANS_TYPE_SANDSTORM_END) + +/* 0x129 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_0, SCENE_GERUDOS_FORTRESS, 0, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x12A */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_0_1, SCENE_GERUDOS_FORTRESS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x12B */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_0_2, SCENE_GERUDOS_FORTRESS, 0, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x12C */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_0_3, SCENE_GERUDOS_FORTRESS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x12D */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_0_4, SCENE_GERUDOS_FORTRESS, 0, true, true, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_SLOW), TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_SLOW)) +/* 0x12E */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_0_5, SCENE_GERUDOS_FORTRESS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x12F */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_0_6, SCENE_GERUDOS_FORTRESS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x130 */ DEFINE_ENTRANCE(ENTR_HAUNTED_WASTELAND_0, SCENE_HAUNTED_WASTELAND, 0, true, true, TRANS_TYPE_SANDSTORM_PERSIST, TRANS_TYPE_SANDSTORM_PERSIST) +/* 0x131 */ DEFINE_ENTRANCE(ENTR_HAUNTED_WASTELAND_0_1, SCENE_HAUNTED_WASTELAND, 0, true, true, TRANS_TYPE_SANDSTORM_PERSIST, TRANS_TYPE_SANDSTORM_PERSIST) +/* 0x132 */ DEFINE_ENTRANCE(ENTR_HAUNTED_WASTELAND_0_2, SCENE_HAUNTED_WASTELAND, 0, true, true, TRANS_TYPE_SANDSTORM_PERSIST, TRANS_TYPE_SANDSTORM_PERSIST) +/* 0x133 */ DEFINE_ENTRANCE(ENTR_HAUNTED_WASTELAND_0_3, SCENE_HAUNTED_WASTELAND, 0, true, true, TRANS_TYPE_SANDSTORM_PERSIST, TRANS_TYPE_SANDSTORM_PERSIST) + +/* 0x134 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_1, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x135 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_1_1, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x136 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_1_2, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x137 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_1_3, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x138 */ DEFINE_ENTRANCE(ENTR_HYRULE_CASTLE_0, SCENE_HYRULE_CASTLE, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x139 */ DEFINE_ENTRANCE(ENTR_HYRULE_CASTLE_0_1, SCENE_HYRULE_CASTLE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x13A */ DEFINE_ENTRANCE(ENTR_OUTSIDE_GANONS_CASTLE_0_2, SCENE_OUTSIDE_GANONS_CASTLE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x13B */ DEFINE_ENTRANCE(ENTR_OUTSIDE_GANONS_CASTLE_0_3, SCENE_OUTSIDE_GANONS_CASTLE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x13C */ DEFINE_ENTRANCE(ENTR_OUTSIDE_GANONS_CASTLE_0_4, SCENE_OUTSIDE_GANONS_CASTLE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x13D */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_0, SCENE_DEATH_MOUNTAIN_TRAIL, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x13E */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_0_1, SCENE_DEATH_MOUNTAIN_TRAIL, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x13F */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_0_2, SCENE_DEATH_MOUNTAIN_TRAIL, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x140 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_0_3, SCENE_DEATH_MOUNTAIN_TRAIL, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x141 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_0_4, SCENE_DEATH_MOUNTAIN_TRAIL, 0, true, true, TRANS_TYPE_FILL_WHITE, TRANS_TYPE_FILL_WHITE) +/* 0x142 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_0_5, SCENE_DEATH_MOUNTAIN_TRAIL, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x143 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_0_6, SCENE_DEATH_MOUNTAIN_TRAIL, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x144 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_0_7, SCENE_DEATH_MOUNTAIN_TRAIL, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x145 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_0_8, SCENE_DEATH_MOUNTAIN_TRAIL, 0, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x146 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_0_9, SCENE_DEATH_MOUNTAIN_TRAIL, 0, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) + +/* 0x147 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_0, SCENE_DEATH_MOUNTAIN_CRATER, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x148 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_0_1, SCENE_DEATH_MOUNTAIN_CRATER, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x149 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_0_2, SCENE_DEATH_MOUNTAIN_CRATER, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x14A */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_0_3, SCENE_DEATH_MOUNTAIN_CRATER, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x14B */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_0_4, SCENE_DEATH_MOUNTAIN_CRATER, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x14C */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_0_5, SCENE_DEATH_MOUNTAIN_CRATER, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x14D */ DEFINE_ENTRANCE(ENTR_GORON_CITY_0, SCENE_GORON_CITY, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x14E */ DEFINE_ENTRANCE(ENTR_GORON_CITY_0_1, SCENE_GORON_CITY, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x14F */ DEFINE_ENTRANCE(ENTR_GORON_CITY_0_2, SCENE_GORON_CITY, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x150 */ DEFINE_ENTRANCE(ENTR_GORON_CITY_0_3, SCENE_GORON_CITY, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x151 */ DEFINE_ENTRANCE(ENTR_GORON_CITY_0_4, SCENE_GORON_CITY, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x152 */ DEFINE_ENTRANCE(ENTR_GORON_CITY_0_5, SCENE_GORON_CITY, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x153 */ DEFINE_ENTRANCE(ENTR_ZORAS_DOMAIN_3, SCENE_ZORAS_DOMAIN, 3, false, true, TRANS_TYPE_WIPE, TRANS_TYPE_WIPE) +/* 0x154 */ DEFINE_ENTRANCE(ENTR_ZORAS_DOMAIN_3_1, SCENE_ZORAS_DOMAIN, 3, false, true, TRANS_TYPE_WIPE, TRANS_TYPE_WIPE) +/* 0x155 */ DEFINE_ENTRANCE(ENTR_ZORAS_DOMAIN_3_2, SCENE_ZORAS_DOMAIN, 3, false, true, TRANS_TYPE_WIPE, TRANS_TYPE_WIPE) +/* 0x156 */ DEFINE_ENTRANCE(ENTR_ZORAS_DOMAIN_3_3, SCENE_ZORAS_DOMAIN, 3, false, true, TRANS_TYPE_WIPE, TRANS_TYPE_WIPE) + +/* 0x157 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_0, SCENE_LON_LON_RANCH, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x158 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_0_1, SCENE_LON_LON_RANCH, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x159 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_0_2, SCENE_LON_LON_RANCH, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x15A */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_0_3, SCENE_LON_LON_RANCH, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x15B */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_0_4, SCENE_LON_LON_RANCH, 0, false, true, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x15C */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_0_5, SCENE_LON_LON_RANCH, 0, false, true, TRANS_TYPE_CIRCLE(TCA_WAVE, TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_WAVE, TCC_WHITE, TCS_FAST)) +/* 0x15D */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_0_6, SCENE_LON_LON_RANCH, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x15E */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_0_7, SCENE_LON_LON_RANCH, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x15F */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_0_8, SCENE_LON_LON_RANCH, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x160 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_0_9, SCENE_LON_LON_RANCH, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x161 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_0_10, SCENE_LON_LON_RANCH, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x162 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_0_11, SCENE_LON_LON_RANCH, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x163 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_0_12, SCENE_LON_LON_RANCH, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x164 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_0_13, SCENE_LON_LON_RANCH, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x165 */ DEFINE_ENTRANCE(ENTR_FIRE_TEMPLE_0, SCENE_FIRE_TEMPLE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x166 */ DEFINE_ENTRANCE(ENTR_FIRE_TEMPLE_0_1, SCENE_FIRE_TEMPLE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x167 */ DEFINE_ENTRANCE(ENTR_FIRE_TEMPLE_0_2, SCENE_FIRE_TEMPLE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x168 */ DEFINE_ENTRANCE(ENTR_FIRE_TEMPLE_0_3, SCENE_FIRE_TEMPLE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x169 */ DEFINE_ENTRANCE(ENTR_FOREST_TEMPLE_0, SCENE_FOREST_TEMPLE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x16A */ DEFINE_ENTRANCE(ENTR_FOREST_TEMPLE_0_1, SCENE_FOREST_TEMPLE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x16B */ DEFINE_ENTRANCE(ENTR_FOREST_TEMPLE_0_2, SCENE_FOREST_TEMPLE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x16C */ DEFINE_ENTRANCE(ENTR_FOREST_TEMPLE_0_3, SCENE_FOREST_TEMPLE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x16D */ DEFINE_ENTRANCE(ENTR_SHOOTING_GALLERY_1, SCENE_SHOOTING_GALLERY, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x16E */ DEFINE_ENTRANCE(ENTR_SHOOTING_GALLERY_1_1, SCENE_SHOOTING_GALLERY, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x16F */ DEFINE_ENTRANCE(ENTR_SHOOTING_GALLERY_1_2, SCENE_SHOOTING_GALLERY, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x170 */ DEFINE_ENTRANCE(ENTR_SHOOTING_GALLERY_1_3, SCENE_SHOOTING_GALLERY, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x171 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_0, SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x172 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_EXTERIOR_NIGHT_0_1, SCENE_TEMPLE_OF_TIME_EXTERIOR_NIGHT, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x173 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_EXTERIOR_RUINS_0_2, SCENE_TEMPLE_OF_TIME_EXTERIOR_RUINS, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x174 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_EXTERIOR_RUINS_0_3, SCENE_TEMPLE_OF_TIME_EXTERIOR_RUINS, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x175 */ DEFINE_ENTRANCE(ENTR_FIRE_TEMPLE_1, SCENE_FIRE_TEMPLE, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x176 */ DEFINE_ENTRANCE(ENTR_FIRE_TEMPLE_1_1, SCENE_FIRE_TEMPLE, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x177 */ DEFINE_ENTRANCE(ENTR_FIRE_TEMPLE_1_2, SCENE_FIRE_TEMPLE, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x178 */ DEFINE_ENTRANCE(ENTR_FIRE_TEMPLE_1_3, SCENE_FIRE_TEMPLE, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x179 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_0, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x17A */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_0_1, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x17B */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_0_2, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x17C */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_0_3, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x17D */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_1, SCENE_HYRULE_FIELD, 1, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x17E */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_1_1, SCENE_HYRULE_FIELD, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x17F */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_1_2, SCENE_HYRULE_FIELD, 1, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x180 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_1_3, SCENE_HYRULE_FIELD, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x181 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_2, SCENE_HYRULE_FIELD, 2, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x182 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_2_1, SCENE_HYRULE_FIELD, 2, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x183 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_2_2, SCENE_HYRULE_FIELD, 2, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x184 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_2_3, SCENE_HYRULE_FIELD, 2, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x185 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_3, SCENE_HYRULE_FIELD, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x186 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_3_1, SCENE_HYRULE_FIELD, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x187 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_3_2, SCENE_HYRULE_FIELD, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x188 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_3_3, SCENE_HYRULE_FIELD, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x189 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_4, SCENE_HYRULE_FIELD, 4, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x18A */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_4_1, SCENE_HYRULE_FIELD, 4, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x18B */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_4_2, SCENE_HYRULE_FIELD, 4, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x18C */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_4_3, SCENE_HYRULE_FIELD, 4, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x18D */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_5, SCENE_HYRULE_FIELD, 5, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x18E */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_5_1, SCENE_HYRULE_FIELD, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x18F */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_5_2, SCENE_HYRULE_FIELD, 5, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x190 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_5_3, SCENE_HYRULE_FIELD, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x191 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_1, SCENE_KAKARIKO_VILLAGE, 1, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x192 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_1_1, SCENE_KAKARIKO_VILLAGE, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x193 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_1_2, SCENE_KAKARIKO_VILLAGE, 1, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x194 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_1_3, SCENE_KAKARIKO_VILLAGE, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x195 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_2, SCENE_KAKARIKO_VILLAGE, 2, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x196 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_2_1, SCENE_KAKARIKO_VILLAGE, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x197 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_2_2, SCENE_KAKARIKO_VILLAGE, 2, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x198 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_2_3, SCENE_KAKARIKO_VILLAGE, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x199 */ DEFINE_ENTRANCE(ENTR_ZORAS_RIVER_1, SCENE_ZORAS_RIVER, 1, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x19A */ DEFINE_ENTRANCE(ENTR_ZORAS_RIVER_1_1, SCENE_ZORAS_RIVER, 1, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x19B */ DEFINE_ENTRANCE(ENTR_ZORAS_RIVER_1_2, SCENE_ZORAS_RIVER, 1, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x19C */ DEFINE_ENTRANCE(ENTR_ZORAS_RIVER_1_3, SCENE_ZORAS_RIVER, 1, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) + +/* 0x19D */ DEFINE_ENTRANCE(ENTR_ZORAS_RIVER_2, SCENE_ZORAS_RIVER, 2, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x19E */ DEFINE_ENTRANCE(ENTR_ZORAS_RIVER_2_1, SCENE_ZORAS_RIVER, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x19F */ DEFINE_ENTRANCE(ENTR_ZORAS_RIVER_2_2, SCENE_ZORAS_RIVER, 2, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x1A0 */ DEFINE_ENTRANCE(ENTR_ZORAS_RIVER_2_3, SCENE_ZORAS_RIVER, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x1A1 */ DEFINE_ENTRANCE(ENTR_ZORAS_DOMAIN_1, SCENE_ZORAS_DOMAIN, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1A2 */ DEFINE_ENTRANCE(ENTR_ZORAS_DOMAIN_1_1, SCENE_ZORAS_DOMAIN, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1A3 */ DEFINE_ENTRANCE(ENTR_ZORAS_DOMAIN_1_2, SCENE_ZORAS_DOMAIN, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1A4 */ DEFINE_ENTRANCE(ENTR_ZORAS_DOMAIN_1_3, SCENE_ZORAS_DOMAIN, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x1A5 */ DEFINE_ENTRANCE(ENTR_GERUDO_VALLEY_1, SCENE_GERUDO_VALLEY, 1, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x1A6 */ DEFINE_ENTRANCE(ENTR_GERUDO_VALLEY_1_1, SCENE_GERUDO_VALLEY, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1A7 */ DEFINE_ENTRANCE(ENTR_GERUDO_VALLEY_1_2, SCENE_GERUDO_VALLEY, 1, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x1A8 */ DEFINE_ENTRANCE(ENTR_GERUDO_VALLEY_1_3, SCENE_GERUDO_VALLEY, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x1A9 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_1, SCENE_LOST_WOODS, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1AA */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_1_1, SCENE_LOST_WOODS, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1AB */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_1_2, SCENE_LOST_WOODS, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1AC */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_1_3, SCENE_LOST_WOODS, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x1AD */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_2, SCENE_LOST_WOODS, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1AE */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_2_1, SCENE_LOST_WOODS, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1AF */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_2_2, SCENE_LOST_WOODS, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1B0 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_2_3, SCENE_LOST_WOODS, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x1B1 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_3, SCENE_LOST_WOODS, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1B2 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_3_1, SCENE_LOST_WOODS, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1B3 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_3_2, SCENE_LOST_WOODS, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1B4 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_3_3, SCENE_LOST_WOODS, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x1B5 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_2, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 2, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1B6 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_2_1, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 2, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1B7 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_2_2, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 2, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1B8 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_2_3, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 2, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x1B9 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_1, SCENE_DEATH_MOUNTAIN_TRAIL, 1, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x1BA */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_1_1, SCENE_DEATH_MOUNTAIN_TRAIL, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1BB */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_1_2, SCENE_DEATH_MOUNTAIN_TRAIL, 1, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x1BC */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_1_3, SCENE_DEATH_MOUNTAIN_TRAIL, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x1BD */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_2, SCENE_DEATH_MOUNTAIN_TRAIL, 2, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x1BE */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_2_1, SCENE_DEATH_MOUNTAIN_TRAIL, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1BF */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_2_2, SCENE_DEATH_MOUNTAIN_TRAIL, 2, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x1C0 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_2_3, SCENE_DEATH_MOUNTAIN_TRAIL, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x1C1 */ DEFINE_ENTRANCE(ENTR_GORON_CITY_1, SCENE_GORON_CITY, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1C2 */ DEFINE_ENTRANCE(ENTR_GORON_CITY_1_1, SCENE_GORON_CITY, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1C3 */ DEFINE_ENTRANCE(ENTR_GORON_CITY_1_2, SCENE_GORON_CITY, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1C4 */ DEFINE_ENTRANCE(ENTR_GORON_CITY_1_3, SCENE_GORON_CITY, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x1C5 */ DEFINE_ENTRANCE(ENTR_LAKESIDE_LABORATORY_1, SCENE_LAKESIDE_LABORATORY, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x1C6 */ DEFINE_ENTRANCE(ENTR_LAKESIDE_LABORATORY_1_1, SCENE_LAKESIDE_LABORATORY, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x1C7 */ DEFINE_ENTRANCE(ENTR_LAKESIDE_LABORATORY_1_2, SCENE_LAKESIDE_LABORATORY, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x1C8 */ DEFINE_ENTRANCE(ENTR_LAKESIDE_LABORATORY_1_3, SCENE_LAKESIDE_LABORATORY, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x1C9 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_5, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 5, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1CA */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_5_1, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 5, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1CB */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_5_2, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 5, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1CC */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_5_3, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 5, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x1CD */ DEFINE_ENTRANCE(ENTR_MARKET_DAY_8, SCENE_MARKET_DAY, 8, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x1CE */ DEFINE_ENTRANCE(ENTR_MARKET_NIGHT_8_1, SCENE_MARKET_NIGHT, 8, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x1CF */ DEFINE_ENTRANCE(ENTR_MARKET_RUINS_8_2, SCENE_MARKET_RUINS, 8, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x1D0 */ DEFINE_ENTRANCE(ENTR_MARKET_RUINS_8_3, SCENE_MARKET_RUINS, 8, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x1D1 */ DEFINE_ENTRANCE(ENTR_MARKET_DAY_9, SCENE_MARKET_DAY, 9, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x1D2 */ DEFINE_ENTRANCE(ENTR_MARKET_NIGHT_9_1, SCENE_MARKET_NIGHT, 9, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x1D3 */ DEFINE_ENTRANCE(ENTR_MARKET_RUINS_9_2, SCENE_MARKET_RUINS, 9, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x1D4 */ DEFINE_ENTRANCE(ENTR_MARKET_RUINS_9_3, SCENE_MARKET_RUINS, 9, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x1D5 */ DEFINE_ENTRANCE(ENTR_MARKET_DAY_10, SCENE_MARKET_DAY, 10, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x1D6 */ DEFINE_ENTRANCE(ENTR_MARKET_NIGHT_10_1, SCENE_MARKET_NIGHT, 10, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x1D7 */ DEFINE_ENTRANCE(ENTR_MARKET_RUINS_10_2, SCENE_MARKET_RUINS, 10, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x1D8 */ DEFINE_ENTRANCE(ENTR_MARKET_RUINS_10_3, SCENE_MARKET_RUINS, 10, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x1D9 */ DEFINE_ENTRANCE(ENTR_ZORAS_RIVER_3, SCENE_ZORAS_RIVER, 3, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x1DA */ DEFINE_ENTRANCE(ENTR_ZORAS_RIVER_3_1, SCENE_ZORAS_RIVER, 3, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1DB */ DEFINE_ENTRANCE(ENTR_ZORAS_RIVER_3_2, SCENE_ZORAS_RIVER, 3, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x1DC */ DEFINE_ENTRANCE(ENTR_ZORAS_RIVER_3_3, SCENE_ZORAS_RIVER, 3, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x1DD */ DEFINE_ENTRANCE(ENTR_ZORAS_RIVER_4, SCENE_ZORAS_RIVER, 4, false, true, TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST)) +/* 0x1DE */ DEFINE_ENTRANCE(ENTR_ZORAS_RIVER_4_1, SCENE_ZORAS_RIVER, 4, false, true, TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST)) +/* 0x1DF */ DEFINE_ENTRANCE(ENTR_ZORAS_RIVER_4_2, SCENE_ZORAS_RIVER, 4, false, true, TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST)) +/* 0x1E0 */ DEFINE_ENTRANCE(ENTR_ZORAS_RIVER_4_3, SCENE_ZORAS_RIVER, 4, false, true, TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST)) + +/* 0x1E1 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_1, SCENE_DESERT_COLOSSUS, 1, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x1E2 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_1_1, SCENE_DESERT_COLOSSUS, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1E3 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_1_2, SCENE_DESERT_COLOSSUS, 1, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x1E4 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_1_3, SCENE_DESERT_COLOSSUS, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x1E5 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_2, SCENE_DESERT_COLOSSUS, 2, false, false, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x1E6 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_2_1, SCENE_DESERT_COLOSSUS, 2, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1E7 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_2_2, SCENE_DESERT_COLOSSUS, 2, false, false, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x1E8 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_2_3, SCENE_DESERT_COLOSSUS, 2, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x1E9 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_3, SCENE_DESERT_COLOSSUS, 3, false, false, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x1EA */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_3_1, SCENE_DESERT_COLOSSUS, 3, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1EB */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_3_2, SCENE_DESERT_COLOSSUS, 3, false, false, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x1EC */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_3_3, SCENE_DESERT_COLOSSUS, 3, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x1ED */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_4, SCENE_DESERT_COLOSSUS, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1EE */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_4_1, SCENE_DESERT_COLOSSUS, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1EF */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_4_2, SCENE_DESERT_COLOSSUS, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1F0 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_4_3, SCENE_DESERT_COLOSSUS, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x1F1 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_5, SCENE_DESERT_COLOSSUS, 5, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x1F2 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_5_1, SCENE_DESERT_COLOSSUS, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1F3 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_5_2, SCENE_DESERT_COLOSSUS, 5, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x1F4 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_5_3, SCENE_DESERT_COLOSSUS, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x1F5 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_6, SCENE_DESERT_COLOSSUS, 6, true, false, TRANS_TYPE_SANDSTORM_END, TRANS_TYPE_SANDSTORM_END) +/* 0x1F6 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_6_1, SCENE_DESERT_COLOSSUS, 6, true, false, TRANS_TYPE_SANDSTORM_END, TRANS_TYPE_SANDSTORM_END) +/* 0x1F7 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_6_2, SCENE_DESERT_COLOSSUS, 6, true, false, TRANS_TYPE_SANDSTORM_END, TRANS_TYPE_SANDSTORM_END) +/* 0x1F8 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_6_3, SCENE_DESERT_COLOSSUS, 6, true, false, TRANS_TYPE_SANDSTORM_END, TRANS_TYPE_SANDSTORM_END) + +/* 0x1F9 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_6, SCENE_HYRULE_FIELD, 6, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x1FA */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_6_1, SCENE_HYRULE_FIELD, 6, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1FB */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_6_2, SCENE_HYRULE_FIELD, 6, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x1FC */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_6_3, SCENE_HYRULE_FIELD, 6, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x1FD */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_7, SCENE_HYRULE_FIELD, 7, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x1FE */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_7_1, SCENE_HYRULE_FIELD, 7, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x1FF */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_7_2, SCENE_HYRULE_FIELD, 7, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x200 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_7_3, SCENE_HYRULE_FIELD, 7, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x201 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_3, SCENE_KAKARIKO_VILLAGE, 3, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x202 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_3_1, SCENE_KAKARIKO_VILLAGE, 3, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x203 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_3_2, SCENE_KAKARIKO_VILLAGE, 3, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x204 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_3_3, SCENE_KAKARIKO_VILLAGE, 3, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x205 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_1, SCENE_GRAVEYARD, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x206 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_1_1, SCENE_GRAVEYARD, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x207 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_1_2, SCENE_GRAVEYARD, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x208 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_1_3, SCENE_GRAVEYARD, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x209 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_1, SCENE_KOKIRI_FOREST, 1, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x20A */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_1_1, SCENE_KOKIRI_FOREST, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x20B */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_1_2, SCENE_KOKIRI_FOREST, 1, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x20C */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_1_3, SCENE_KOKIRI_FOREST, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x20D */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_2, SCENE_KOKIRI_FOREST, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x20E */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_2_1, SCENE_KOKIRI_FOREST, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x20F */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_2_2, SCENE_KOKIRI_FOREST, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x210 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_2_3, SCENE_KOKIRI_FOREST, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x211 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_3, SCENE_KOKIRI_FOREST, 3, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x212 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_3_1, SCENE_KOKIRI_FOREST, 3, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x213 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_3_2, SCENE_KOKIRI_FOREST, 3, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x214 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_3_3, SCENE_KOKIRI_FOREST, 3, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) + +/* 0x215 */ DEFINE_ENTRANCE(ENTR_SACRED_FOREST_MEADOW_1, SCENE_SACRED_FOREST_MEADOW, 1, false, true, TRANS_TYPE_FADE_GREEN, TRANS_TYPE_FADE_GREEN) +/* 0x216 */ DEFINE_ENTRANCE(ENTR_SACRED_FOREST_MEADOW_1_1, SCENE_SACRED_FOREST_MEADOW, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x217 */ DEFINE_ENTRANCE(ENTR_SACRED_FOREST_MEADOW_1_2, SCENE_SACRED_FOREST_MEADOW, 1, false, true, TRANS_TYPE_FADE_GREEN, TRANS_TYPE_FADE_GREEN) +/* 0x218 */ DEFINE_ENTRANCE(ENTR_SACRED_FOREST_MEADOW_1_3, SCENE_SACRED_FOREST_MEADOW, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x219 */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_1, SCENE_LAKE_HYLIA, 1, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x21A */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_1_1, SCENE_LAKE_HYLIA, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x21B */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_1_2, SCENE_LAKE_HYLIA, 1, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x21C */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_1_3, SCENE_LAKE_HYLIA, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x21D */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_2, SCENE_LAKE_HYLIA, 2, false, true, TRANS_TYPE_FADE_BLUE, TRANS_TYPE_FADE_BLUE) +/* 0x21E */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_2_1, SCENE_LAKE_HYLIA, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x21F */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_2_2, SCENE_LAKE_HYLIA, 2, false, true, TRANS_TYPE_FADE_BLUE, TRANS_TYPE_FADE_BLUE) +/* 0x220 */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_2_3, SCENE_LAKE_HYLIA, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x221 */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_1, SCENE_ZORAS_FOUNTAIN, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x222 */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_1_1, SCENE_ZORAS_FOUNTAIN, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x223 */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_1_2, SCENE_ZORAS_FOUNTAIN, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x224 */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_1_3, SCENE_ZORAS_FOUNTAIN, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x225 */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_2, SCENE_ZORAS_FOUNTAIN, 2, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x226 */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_2_1, SCENE_ZORAS_FOUNTAIN, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x227 */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_2_2, SCENE_ZORAS_FOUNTAIN, 2, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x228 */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_2_3, SCENE_ZORAS_FOUNTAIN, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x229 */ DEFINE_ENTRANCE(ENTR_GERUDO_VALLEY_2, SCENE_GERUDO_VALLEY, 2, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x22A */ DEFINE_ENTRANCE(ENTR_GERUDO_VALLEY_2_1, SCENE_GERUDO_VALLEY, 2, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x22B */ DEFINE_ENTRANCE(ENTR_GERUDO_VALLEY_2_2, SCENE_GERUDO_VALLEY, 2, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x22C */ DEFINE_ENTRANCE(ENTR_GERUDO_VALLEY_2_3, SCENE_GERUDO_VALLEY, 2, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x22D */ DEFINE_ENTRANCE(ENTR_GERUDO_VALLEY_3, SCENE_GERUDO_VALLEY, 3, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x22E */ DEFINE_ENTRANCE(ENTR_GERUDO_VALLEY_3_1, SCENE_GERUDO_VALLEY, 3, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x22F */ DEFINE_ENTRANCE(ENTR_GERUDO_VALLEY_3_2, SCENE_GERUDO_VALLEY, 3, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x230 */ DEFINE_ENTRANCE(ENTR_GERUDO_VALLEY_3_3, SCENE_GERUDO_VALLEY, 3, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x231 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_1, SCENE_GERUDOS_FORTRESS, 1, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x232 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_1_1, SCENE_GERUDOS_FORTRESS, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x233 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_1_2, SCENE_GERUDOS_FORTRESS, 1, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x234 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_1_3, SCENE_GERUDOS_FORTRESS, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x235 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_2, SCENE_GERUDOS_FORTRESS, 2, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x236 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_2_1, SCENE_GERUDOS_FORTRESS, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x237 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_2_2, SCENE_GERUDOS_FORTRESS, 2, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x238 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_2_3, SCENE_GERUDOS_FORTRESS, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x239 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_3, SCENE_GERUDOS_FORTRESS, 3, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x23A */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_3_1, SCENE_GERUDOS_FORTRESS, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x23B */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_3_2, SCENE_GERUDOS_FORTRESS, 3, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x23C */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_3_3, SCENE_GERUDOS_FORTRESS, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x23D */ DEFINE_ENTRANCE(ENTR_HYRULE_CASTLE_1, SCENE_HYRULE_CASTLE, 1, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x23E */ DEFINE_ENTRANCE(ENTR_HYRULE_CASTLE_1_1, SCENE_HYRULE_CASTLE, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x23F */ DEFINE_ENTRANCE(ENTR_OUTSIDE_GANONS_CASTLE_1_2, SCENE_OUTSIDE_GANONS_CASTLE, 1, false, true, TRANS_TYPE_FADE_WHITE_FAST, TRANS_TYPE_FADE_WHITE_FAST) +/* 0x240 */ DEFINE_ENTRANCE(ENTR_OUTSIDE_GANONS_CASTLE_1_3, SCENE_OUTSIDE_GANONS_CASTLE, 1, false, true, TRANS_TYPE_FADE_WHITE_FAST, TRANS_TYPE_FADE_WHITE_FAST) +/* 0x241 */ DEFINE_ENTRANCE(ENTR_HYRULE_CASTLE_1_4, SCENE_HYRULE_CASTLE, 1, false, true, TRANS_TYPE_WIPE, TRANS_TYPE_WIPE) + +/* 0x242 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_3, SCENE_DEATH_MOUNTAIN_TRAIL, 3, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x243 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_3_1, SCENE_DEATH_MOUNTAIN_TRAIL, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x244 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_3_2, SCENE_DEATH_MOUNTAIN_TRAIL, 3, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x245 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_3_3, SCENE_DEATH_MOUNTAIN_TRAIL, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x246 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_1, SCENE_DEATH_MOUNTAIN_CRATER, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x247 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_1_1, SCENE_DEATH_MOUNTAIN_CRATER, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x248 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_1_2, SCENE_DEATH_MOUNTAIN_CRATER, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x249 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_1_3, SCENE_DEATH_MOUNTAIN_CRATER, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x24A */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_2, SCENE_DEATH_MOUNTAIN_CRATER, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x24B */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_2_1, SCENE_DEATH_MOUNTAIN_CRATER, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x24C */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_2_2, SCENE_DEATH_MOUNTAIN_CRATER, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x24D */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_2_3, SCENE_DEATH_MOUNTAIN_CRATER, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x24E */ DEFINE_ENTRANCE(ENTR_FOREST_TEMPLE_1, SCENE_FOREST_TEMPLE, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x24F */ DEFINE_ENTRANCE(ENTR_FOREST_TEMPLE_1_1, SCENE_FOREST_TEMPLE, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x250 */ DEFINE_ENTRANCE(ENTR_FOREST_TEMPLE_1_2, SCENE_FOREST_TEMPLE, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x251 */ DEFINE_ENTRANCE(ENTR_FOREST_TEMPLE_1_3, SCENE_FOREST_TEMPLE, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x252 */ DEFINE_ENTRANCE(ENTR_DEKU_TREE_1, SCENE_DEKU_TREE, 1, true, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x253 */ DEFINE_ENTRANCE(ENTR_DEKU_TREE_1_1, SCENE_DEKU_TREE, 1, true, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x254 */ DEFINE_ENTRANCE(ENTR_DEKU_TREE_1_2, SCENE_DEKU_TREE, 1, true, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x255 */ DEFINE_ENTRANCE(ENTR_DEKU_TREE_1_3, SCENE_DEKU_TREE, 1, true, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x256 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_3, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 3, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x257 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_3_1, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 3, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x258 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_3_2, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 3, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x259 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_3_3, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 3, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x25A */ DEFINE_ENTRANCE(ENTR_MARKET_DAY_1, SCENE_MARKET_DAY, 1, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x25B */ DEFINE_ENTRANCE(ENTR_MARKET_NIGHT_1_1, SCENE_MARKET_NIGHT, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x25C */ DEFINE_ENTRANCE(ENTR_MARKET_RUINS_1_2, SCENE_MARKET_RUINS, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x25D */ DEFINE_ENTRANCE(ENTR_MARKET_RUINS_1_3, SCENE_MARKET_RUINS, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x25E */ DEFINE_ENTRANCE(ENTR_MARKET_DAY_2, SCENE_MARKET_DAY, 2, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x25F */ DEFINE_ENTRANCE(ENTR_MARKET_NIGHT_2_1, SCENE_MARKET_NIGHT, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x260 */ DEFINE_ENTRANCE(ENTR_MARKET_RUINS_2_2, SCENE_MARKET_RUINS, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x261 */ DEFINE_ENTRANCE(ENTR_MARKET_RUINS_2_3, SCENE_MARKET_RUINS, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x262 */ DEFINE_ENTRANCE(ENTR_MARKET_DAY_3, SCENE_MARKET_DAY, 3, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x263 */ DEFINE_ENTRANCE(ENTR_MARKET_NIGHT_3_1, SCENE_MARKET_NIGHT, 3, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x264 */ DEFINE_ENTRANCE(ENTR_MARKET_RUINS_3_2, SCENE_MARKET_RUINS, 3, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x265 */ DEFINE_ENTRANCE(ENTR_MARKET_RUINS_3_3, SCENE_MARKET_RUINS, 3, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x266 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_4, SCENE_KOKIRI_FOREST, 4, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x267 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_4_1, SCENE_KOKIRI_FOREST, 4, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x268 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_4_2, SCENE_KOKIRI_FOREST, 4, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x269 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_4_3, SCENE_KOKIRI_FOREST, 4, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) + +/* 0x26A */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_5, SCENE_KOKIRI_FOREST, 5, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x26B */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_5_1, SCENE_KOKIRI_FOREST, 5, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x26C */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_5_2, SCENE_KOKIRI_FOREST, 5, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x26D */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_5_3, SCENE_KOKIRI_FOREST, 5, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) + +/* 0x26E */ DEFINE_ENTRANCE(ENTR_MARKET_ENTRANCE_DAY_2, SCENE_MARKET_ENTRANCE_DAY, 2, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x26F */ DEFINE_ENTRANCE(ENTR_MARKET_ENTRANCE_NIGHT_2_1, SCENE_MARKET_ENTRANCE_NIGHT, 2, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x270 */ DEFINE_ENTRANCE(ENTR_MARKET_ENTRANCE_RUINS_2_2, SCENE_MARKET_ENTRANCE_RUINS, 2, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x271 */ DEFINE_ENTRANCE(ENTR_MARKET_ENTRANCE_RUINS_2_3, SCENE_MARKET_ENTRANCE_RUINS, 2, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x272 */ DEFINE_ENTRANCE(ENTR_LINKS_HOUSE_1, SCENE_LINKS_HOUSE, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x273 */ DEFINE_ENTRANCE(ENTR_LINKS_HOUSE_1_1, SCENE_LINKS_HOUSE, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x274 */ DEFINE_ENTRANCE(ENTR_LINKS_HOUSE_1_2, SCENE_LINKS_HOUSE, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x275 */ DEFINE_ENTRANCE(ENTR_LINKS_HOUSE_1_3, SCENE_LINKS_HOUSE, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) + +/* 0x276 */ DEFINE_ENTRANCE(ENTR_MARKET_ENTRANCE_DAY_1, SCENE_MARKET_ENTRANCE_DAY, 1, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x277 */ DEFINE_ENTRANCE(ENTR_MARKET_ENTRANCE_NIGHT_1_1, SCENE_MARKET_ENTRANCE_NIGHT, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x278 */ DEFINE_ENTRANCE(ENTR_MARKET_ENTRANCE_RUINS_1_2, SCENE_MARKET_ENTRANCE_RUINS, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x279 */ DEFINE_ENTRANCE(ENTR_MARKET_ENTRANCE_RUINS_1_3, SCENE_MARKET_ENTRANCE_RUINS, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x27A */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_8, SCENE_HYRULE_FIELD, 8, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x27B */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_8_1, SCENE_HYRULE_FIELD, 8, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x27C */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_8_2, SCENE_HYRULE_FIELD, 8, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x27D */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_8_3, SCENE_HYRULE_FIELD, 8, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x27E */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_9, SCENE_HYRULE_FIELD, 9, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x27F */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_9_1, SCENE_HYRULE_FIELD, 9, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x280 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_9_2, SCENE_HYRULE_FIELD, 9, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x281 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_9_3, SCENE_HYRULE_FIELD, 9, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) + +/* 0x282 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_10, SCENE_HYRULE_FIELD, 10, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x283 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_10_1, SCENE_HYRULE_FIELD, 10, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x284 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_10_2, SCENE_HYRULE_FIELD, 10, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x285 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_10_3, SCENE_HYRULE_FIELD, 10, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) + +/* 0x286 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_6, SCENE_KOKIRI_FOREST, 6, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x287 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_6_1, SCENE_KOKIRI_FOREST, 6, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x288 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_6_2, SCENE_KOKIRI_FOREST, 6, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x289 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_6_3, SCENE_KOKIRI_FOREST, 6, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x28A */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_11, SCENE_HYRULE_FIELD, 11, false, true, TRANS_TYPE_FADE_WHITE_FAST, TRANS_TYPE_FADE_WHITE_FAST) +/* 0x28B */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_11_1, SCENE_HYRULE_FIELD, 11, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x28C */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_11_2, SCENE_HYRULE_FIELD, 11, false, true, TRANS_TYPE_FADE_WHITE_FAST, TRANS_TYPE_FADE_WHITE_FAST) +/* 0x28D */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_11_3, SCENE_HYRULE_FIELD, 11, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x28E */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_12, SCENE_HYRULE_FIELD, 12, false, true, TRANS_TYPE_FADE_WHITE_FAST, TRANS_TYPE_FADE_WHITE_FAST) +/* 0x28F */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_12_1, SCENE_HYRULE_FIELD, 12, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x290 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_12_2, SCENE_HYRULE_FIELD, 12, false, true, TRANS_TYPE_FADE_WHITE_FAST, TRANS_TYPE_FADE_WHITE_FAST) +/* 0x291 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_12_3, SCENE_HYRULE_FIELD, 12, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x292 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_13, SCENE_HYRULE_FIELD, 13, false, true, TRANS_TYPE_FADE_WHITE_FAST, TRANS_TYPE_FADE_WHITE_FAST) +/* 0x293 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_13_1, SCENE_HYRULE_FIELD, 13, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x294 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_13_2, SCENE_HYRULE_FIELD, 13, false, true, TRANS_TYPE_FADE_WHITE_FAST, TRANS_TYPE_FADE_WHITE_FAST) +/* 0x295 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_13_3, SCENE_HYRULE_FIELD, 13, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x296 */ DEFINE_ENTRANCE(ENTR_CASTLE_COURTYARD_GUARDS_DAY_1, SCENE_CASTLE_COURTYARD_GUARDS_DAY, 1, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x297 */ DEFINE_ENTRANCE(ENTR_CASTLE_COURTYARD_GUARDS_NIGHT_1_1, SCENE_CASTLE_COURTYARD_GUARDS_NIGHT, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x298 */ DEFINE_ENTRANCE(ENTR_CASTLE_COURTYARD_GUARDS_DAY_1_2, SCENE_CASTLE_COURTYARD_GUARDS_DAY, 1, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x299 */ DEFINE_ENTRANCE(ENTR_CASTLE_COURTYARD_GUARDS_NIGHT_1_3, SCENE_CASTLE_COURTYARD_GUARDS_NIGHT, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x29A */ DEFINE_ENTRANCE(ENTR_BACK_ALLEY_DAY_1, SCENE_BACK_ALLEY_DAY, 1, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x29B */ DEFINE_ENTRANCE(ENTR_BACK_ALLEY_NIGHT_1_1, SCENE_BACK_ALLEY_NIGHT, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x29C */ DEFINE_ENTRANCE(ENTR_BACK_ALLEY_DAY_1_2, SCENE_BACK_ALLEY_DAY, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x29D */ DEFINE_ENTRANCE(ENTR_BACK_ALLEY_NIGHT_1_3, SCENE_BACK_ALLEY_NIGHT, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x29E */ DEFINE_ENTRANCE(ENTR_MARKET_DAY_4, SCENE_MARKET_DAY, 4, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x29F */ DEFINE_ENTRANCE(ENTR_MARKET_NIGHT_4_1, SCENE_MARKET_NIGHT, 4, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2A0 */ DEFINE_ENTRANCE(ENTR_MARKET_RUINS_4_2, SCENE_MARKET_RUINS, 4, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2A1 */ DEFINE_ENTRANCE(ENTR_MARKET_RUINS_4_3, SCENE_MARKET_RUINS, 4, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x2A2 */ DEFINE_ENTRANCE(ENTR_MARKET_DAY_5, SCENE_MARKET_DAY, 5, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x2A3 */ DEFINE_ENTRANCE(ENTR_MARKET_NIGHT_5_1, SCENE_MARKET_NIGHT, 5, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x2A4 */ DEFINE_ENTRANCE(ENTR_MARKET_RUINS_5_2, SCENE_MARKET_RUINS, 5, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x2A5 */ DEFINE_ENTRANCE(ENTR_MARKET_RUINS_5_3, SCENE_MARKET_RUINS, 5, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x2A6 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_4, SCENE_KAKARIKO_VILLAGE, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2A7 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_4_1, SCENE_KAKARIKO_VILLAGE, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2A8 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_4_2, SCENE_KAKARIKO_VILLAGE, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2A9 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_4_3, SCENE_KAKARIKO_VILLAGE, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x2AA */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_4, SCENE_GERUDOS_FORTRESS, 4, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x2AB */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_4_1, SCENE_GERUDOS_FORTRESS, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2AC */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_4_2, SCENE_GERUDOS_FORTRESS, 4, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x2AD */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_4_3, SCENE_GERUDOS_FORTRESS, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x2AE */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_1, SCENE_LON_LON_RANCH, 1, false, false, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x2AF */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_1_1, SCENE_LON_LON_RANCH, 1, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2B0 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_1_2, SCENE_LON_LON_RANCH, 1, false, false, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x2B1 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_1_3, SCENE_LON_LON_RANCH, 1, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x2B2 */ DEFINE_ENTRANCE(ENTR_SHADOW_TEMPLE_1, SCENE_SHADOW_TEMPLE, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2B3 */ DEFINE_ENTRANCE(ENTR_SHADOW_TEMPLE_1_1, SCENE_SHADOW_TEMPLE, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2B4 */ DEFINE_ENTRANCE(ENTR_SHADOW_TEMPLE_1_2, SCENE_SHADOW_TEMPLE, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2B5 */ DEFINE_ENTRANCE(ENTR_SHADOW_TEMPLE_1_3, SCENE_SHADOW_TEMPLE, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x2B6 */ DEFINE_ENTRANCE(ENTR_SHADOW_TEMPLE_2, SCENE_SHADOW_TEMPLE, 2, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2B7 */ DEFINE_ENTRANCE(ENTR_SHADOW_TEMPLE_2_1, SCENE_SHADOW_TEMPLE, 2, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2B8 */ DEFINE_ENTRANCE(ENTR_SHADOW_TEMPLE_2_2, SCENE_SHADOW_TEMPLE, 2, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2B9 */ DEFINE_ENTRANCE(ENTR_SHADOW_TEMPLE_2_3, SCENE_SHADOW_TEMPLE, 2, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x2BA */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_5, SCENE_GERUDOS_FORTRESS, 5, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x2BB */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_5_1, SCENE_GERUDOS_FORTRESS, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2BC */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_5_2, SCENE_GERUDOS_FORTRESS, 5, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x2BD */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_5_3, SCENE_GERUDOS_FORTRESS, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x2BE */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_6, SCENE_GERUDOS_FORTRESS, 6, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x2BF */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_6_1, SCENE_GERUDOS_FORTRESS, 6, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2C0 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_6_2, SCENE_GERUDOS_FORTRESS, 6, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x2C1 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_6_3, SCENE_GERUDOS_FORTRESS, 6, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x2C2 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_7, SCENE_GERUDOS_FORTRESS, 7, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x2C3 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_7_1, SCENE_GERUDOS_FORTRESS, 7, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2C4 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_7_2, SCENE_GERUDOS_FORTRESS, 7, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x2C5 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_7_3, SCENE_GERUDOS_FORTRESS, 7, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x2C6 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_8, SCENE_GERUDOS_FORTRESS, 8, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x2C7 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_8_1, SCENE_GERUDOS_FORTRESS, 8, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2C8 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_8_2, SCENE_GERUDOS_FORTRESS, 8, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x2C9 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_8_3, SCENE_GERUDOS_FORTRESS, 8, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x2CA */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_2, SCENE_TEMPLE_OF_TIME, 2, false, true, TRANS_TYPE_FILL_WHITE, TRANS_TYPE_FILL_WHITE) +/* 0x2CB */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_2_1, SCENE_TEMPLE_OF_TIME, 2, false, true, TRANS_TYPE_FILL_WHITE, TRANS_TYPE_FILL_WHITE) +/* 0x2CC */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_2_2, SCENE_TEMPLE_OF_TIME, 2, false, true, TRANS_TYPE_FILL_WHITE, TRANS_TYPE_FILL_WHITE) +/* 0x2CD */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_2_3, SCENE_TEMPLE_OF_TIME, 2, false, true, TRANS_TYPE_FILL_WHITE, TRANS_TYPE_FILL_WHITE) + +/* 0x2CE */ DEFINE_ENTRANCE(ENTR_CHAMBER_OF_THE_SAGES_1, SCENE_CHAMBER_OF_THE_SAGES, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2CF */ DEFINE_ENTRANCE(ENTR_CHAMBER_OF_THE_SAGES_1_1, SCENE_CHAMBER_OF_THE_SAGES, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2D0 */ DEFINE_ENTRANCE(ENTR_CHAMBER_OF_THE_SAGES_1_2, SCENE_CHAMBER_OF_THE_SAGES, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2D1 */ DEFINE_ENTRANCE(ENTR_CHAMBER_OF_THE_SAGES_1_3, SCENE_CHAMBER_OF_THE_SAGES, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x2D2 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_9, SCENE_GERUDOS_FORTRESS, 9, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x2D3 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_9_1, SCENE_GERUDOS_FORTRESS, 9, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2D4 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_9_2, SCENE_GERUDOS_FORTRESS, 9, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x2D5 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_9_3, SCENE_GERUDOS_FORTRESS, 9, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x2D6 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_10, SCENE_GERUDOS_FORTRESS, 10, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x2D7 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_10_1, SCENE_GERUDOS_FORTRESS, 10, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2D8 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_10_2, SCENE_GERUDOS_FORTRESS, 10, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x2D9 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_10_3, SCENE_GERUDOS_FORTRESS, 10, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x2DA */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_11, SCENE_GERUDOS_FORTRESS, 11, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x2DB */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_11_1, SCENE_GERUDOS_FORTRESS, 11, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2DC */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_11_2, SCENE_GERUDOS_FORTRESS, 11, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x2DD */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_11_3, SCENE_GERUDOS_FORTRESS, 11, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x2DE */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_12, SCENE_GERUDOS_FORTRESS, 12, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x2DF */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_12_1, SCENE_GERUDOS_FORTRESS, 12, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2E0 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_12_2, SCENE_GERUDOS_FORTRESS, 12, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x2E1 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_12_3, SCENE_GERUDOS_FORTRESS, 12, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x2E2 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_2, SCENE_LON_LON_RANCH, 2, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x2E3 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_2_1, SCENE_LON_LON_RANCH, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2E4 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_2_2, SCENE_LON_LON_RANCH, 2, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x2E5 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_2_3, SCENE_LON_LON_RANCH, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x2E6 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_3, SCENE_LON_LON_RANCH, 3, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x2E7 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_3_1, SCENE_LON_LON_RANCH, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2E8 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_3_2, SCENE_LON_LON_RANCH, 3, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x2E9 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_3_3, SCENE_LON_LON_RANCH, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +// Labeled as "Test Area" in Map Select +/* 0x2EA */ DEFINE_ENTRANCE(ENTR_TEST_SHOOTING_GALLERY_0, SCENE_SHOOTING_GALLERY, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2EB */ DEFINE_ENTRANCE(ENTR_TEST_SHOOTING_GALLERY_0_1, SCENE_SHOOTING_GALLERY, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2EC */ DEFINE_ENTRANCE(ENTR_TEST_SHOOTING_GALLERY_0_2, SCENE_SHOOTING_GALLERY, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2ED */ DEFINE_ENTRANCE(ENTR_TEST_SHOOTING_GALLERY_0_3, SCENE_SHOOTING_GALLERY, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2EE */ DEFINE_ENTRANCE(ENTR_TEST_SACRED_FOREST_MEADOW_0_4, SCENE_SACRED_FOREST_MEADOW, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2EF */ DEFINE_ENTRANCE(ENTR_TEST_CUTSCENE_MAP_0_5, SCENE_CUTSCENE_MAP, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2F0 */ DEFINE_ENTRANCE(ENTR_TEST_SHOOTING_GALLERY_0_6, SCENE_SHOOTING_GALLERY, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2F1 */ DEFINE_ENTRANCE(ENTR_TEST_SHOOTING_GALLERY_0_7, SCENE_SHOOTING_GALLERY, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2F2 */ DEFINE_ENTRANCE(ENTR_TEST_SHOOTING_GALLERY_0_8, SCENE_SHOOTING_GALLERY, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2F3 */ DEFINE_ENTRANCE(ENTR_TEST_SHOOTING_GALLERY_0_9, SCENE_SHOOTING_GALLERY, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2F4 */ DEFINE_ENTRANCE(ENTR_TEST_SHOOTING_GALLERY_0_10, SCENE_SHOOTING_GALLERY, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x2F5 */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_1, SCENE_SPIRIT_TEMPLE, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2F6 */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_1_1, SCENE_SPIRIT_TEMPLE, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2F7 */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_1_2, SCENE_SPIRIT_TEMPLE, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x2F8 */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_1_3, SCENE_SPIRIT_TEMPLE, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x2F9 */ DEFINE_ENTRANCE(ENTR_STABLE_0, SCENE_STABLE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x2FA */ DEFINE_ENTRANCE(ENTR_STABLE_0_1, SCENE_STABLE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x2FB */ DEFINE_ENTRANCE(ENTR_STABLE_0_2, SCENE_STABLE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x2FC */ DEFINE_ENTRANCE(ENTR_STABLE_0_3, SCENE_STABLE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x2FD */ DEFINE_ENTRANCE(ENTR_KAKARIKO_CENTER_GUEST_HOUSE_0, SCENE_KAKARIKO_CENTER_GUEST_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x2FE */ DEFINE_ENTRANCE(ENTR_KAKARIKO_CENTER_GUEST_HOUSE_0_1, SCENE_KAKARIKO_CENTER_GUEST_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x2FF */ DEFINE_ENTRANCE(ENTR_KAKARIKO_CENTER_GUEST_HOUSE_0_2, SCENE_KAKARIKO_CENTER_GUEST_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x300 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_CENTER_GUEST_HOUSE_0_3, SCENE_KAKARIKO_CENTER_GUEST_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x301 */ DEFINE_ENTRANCE(ENTR_JABU_JABU_BOSS_0, SCENE_JABU_JABU_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x302 */ DEFINE_ENTRANCE(ENTR_JABU_JABU_BOSS_0_1, SCENE_JABU_JABU_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x303 */ DEFINE_ENTRANCE(ENTR_JABU_JABU_BOSS_0_2, SCENE_JABU_JABU_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x304 */ DEFINE_ENTRANCE(ENTR_JABU_JABU_BOSS_0_3, SCENE_JABU_JABU_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x305 */ DEFINE_ENTRANCE(ENTR_FIRE_TEMPLE_BOSS_0, SCENE_FIRE_TEMPLE_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x306 */ DEFINE_ENTRANCE(ENTR_FIRE_TEMPLE_BOSS_0_1, SCENE_FIRE_TEMPLE_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x307 */ DEFINE_ENTRANCE(ENTR_FIRE_TEMPLE_BOSS_0_2, SCENE_FIRE_TEMPLE_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x308 */ DEFINE_ENTRANCE(ENTR_FIRE_TEMPLE_BOSS_0_3, SCENE_FIRE_TEMPLE_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x309 */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_6, SCENE_LAKE_HYLIA, 6, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x30A */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_6_1, SCENE_LAKE_HYLIA, 6, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x30B */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_6_2, SCENE_LAKE_HYLIA, 6, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x30C */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_6_3, SCENE_LAKE_HYLIA, 6, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x30D */ DEFINE_ENTRANCE(ENTR_GRAVEKEEPERS_HUT_0, SCENE_GRAVEKEEPERS_HUT, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x30E */ DEFINE_ENTRANCE(ENTR_GRAVEKEEPERS_HUT_0_1, SCENE_GRAVEKEEPERS_HUT, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x30F */ DEFINE_ENTRANCE(ENTR_GRAVEKEEPERS_HUT_0_2, SCENE_GRAVEKEEPERS_HUT, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x310 */ DEFINE_ENTRANCE(ENTR_GRAVEKEEPERS_HUT_0_3, SCENE_GRAVEKEEPERS_HUT, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x311 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_14, SCENE_HYRULE_FIELD, 14, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x312 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_14_1, SCENE_HYRULE_FIELD, 14, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x313 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_14_2, SCENE_HYRULE_FIELD, 14, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x314 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_14_3, SCENE_HYRULE_FIELD, 14, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) + +/* 0x315 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_0, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x316 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_0_1, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x317 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_0_2, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x318 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_0_3, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x319 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_0_4, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x31A */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_0_5, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x31B */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_0_6, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x31C */ DEFINE_ENTRANCE(ENTR_REDEAD_GRAVE_0, SCENE_REDEAD_GRAVE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_BLACK, TCS_FAST)) +/* 0x31D */ DEFINE_ENTRANCE(ENTR_REDEAD_GRAVE_0_1, SCENE_REDEAD_GRAVE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_BLACK, TCS_FAST)) +/* 0x31E */ DEFINE_ENTRANCE(ENTR_REDEAD_GRAVE_0_2, SCENE_REDEAD_GRAVE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_BLACK, TCS_FAST)) +/* 0x31F */ DEFINE_ENTRANCE(ENTR_REDEAD_GRAVE_0_3, SCENE_REDEAD_GRAVE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_BLACK, TCS_FAST)) + +/* 0x320 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_3, SCENE_TEMPLE_OF_TIME, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x321 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_3_1, SCENE_TEMPLE_OF_TIME, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x322 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_3_2, SCENE_TEMPLE_OF_TIME, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x323 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_3_3, SCENE_TEMPLE_OF_TIME, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x324 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_4, SCENE_TEMPLE_OF_TIME, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x325 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_4_1, SCENE_TEMPLE_OF_TIME, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x326 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_4_2, SCENE_TEMPLE_OF_TIME, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x327 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_4_3, SCENE_TEMPLE_OF_TIME, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x328 */ DEFINE_ENTRANCE(ENTR_ZORAS_DOMAIN_4, SCENE_ZORAS_DOMAIN, 4, false, true, TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST)) +/* 0x329 */ DEFINE_ENTRANCE(ENTR_ZORAS_DOMAIN_4_1, SCENE_ZORAS_DOMAIN, 4, false, true, TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST)) +/* 0x32A */ DEFINE_ENTRANCE(ENTR_ZORAS_DOMAIN_4_2, SCENE_ZORAS_DOMAIN, 4, false, true, TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST)) +/* 0x32B */ DEFINE_ENTRANCE(ENTR_ZORAS_DOMAIN_4_3, SCENE_ZORAS_DOMAIN, 4, false, true, TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST)) + +/* 0x32C */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_2, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 2, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x32D */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_2_1, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 2, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x32E */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_2_2, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 2, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x32F */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_2_3, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 2, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x330 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_3, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 3, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x331 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_3_1, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 3, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x332 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_3_2, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 3, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x333 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_3_3, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 3, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x334 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_4, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 4, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x335 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_4_1, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 4, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x336 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_4_2, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 4, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x337 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_4_3, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 4, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x338 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_7, SCENE_KOKIRI_FOREST, 7, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x339 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_7_1, SCENE_KOKIRI_FOREST, 7, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x33A */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_7_2, SCENE_KOKIRI_FOREST, 7, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x33B */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_7_3, SCENE_KOKIRI_FOREST, 7, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) + +/* 0x33C */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_8, SCENE_KOKIRI_FOREST, 8, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x33D */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_8_1, SCENE_KOKIRI_FOREST, 8, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x33E */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_8_2, SCENE_KOKIRI_FOREST, 8, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x33F */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_8_3, SCENE_KOKIRI_FOREST, 8, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) + +/* 0x340 */ DEFINE_ENTRANCE(ENTR_HYRULE_CASTLE_2, SCENE_HYRULE_CASTLE, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x341 */ DEFINE_ENTRANCE(ENTR_HYRULE_CASTLE_2_1, SCENE_HYRULE_CASTLE, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x342 */ DEFINE_ENTRANCE(ENTR_OUTSIDE_GANONS_CASTLE_2_2, SCENE_OUTSIDE_GANONS_CASTLE, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x343 */ DEFINE_ENTRANCE(ENTR_OUTSIDE_GANONS_CASTLE_2_3, SCENE_OUTSIDE_GANONS_CASTLE, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x344 */ DEFINE_ENTRANCE(ENTR_HYRULE_CASTLE_2_4, SCENE_HYRULE_CASTLE, 2, false, true, TRANS_TYPE_WIPE, TRANS_TYPE_WIPE) + +/* 0x345 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_5, SCENE_KAKARIKO_VILLAGE, 5, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x346 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_5_1, SCENE_KAKARIKO_VILLAGE, 5, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x347 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_5_2, SCENE_KAKARIKO_VILLAGE, 5, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x348 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_5_3, SCENE_KAKARIKO_VILLAGE, 5, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x349 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_6, SCENE_KAKARIKO_VILLAGE, 6, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x34A */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_6_1, SCENE_KAKARIKO_VILLAGE, 6, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x34B */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_6_2, SCENE_KAKARIKO_VILLAGE, 6, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x34C */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_6_3, SCENE_KAKARIKO_VILLAGE, 6, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x34D */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_7, SCENE_KAKARIKO_VILLAGE, 7, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x34E */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_7_1, SCENE_KAKARIKO_VILLAGE, 7, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x34F */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_7_2, SCENE_KAKARIKO_VILLAGE, 7, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x350 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_7_3, SCENE_KAKARIKO_VILLAGE, 7, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x351 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_8, SCENE_KAKARIKO_VILLAGE, 8, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x352 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_8_1, SCENE_KAKARIKO_VILLAGE, 8, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x353 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_8_2, SCENE_KAKARIKO_VILLAGE, 8, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x354 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_8_3, SCENE_KAKARIKO_VILLAGE, 8, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x355 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_2, SCENE_GRAVEYARD, 2, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x356 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_2_1, SCENE_GRAVEYARD, 2, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x357 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_2_2, SCENE_GRAVEYARD, 2, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x358 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_2_3, SCENE_GRAVEYARD, 2, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x359 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_3, SCENE_GRAVEYARD, 3, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x35A */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_3_1, SCENE_GRAVEYARD, 3, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x35B */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_3_2, SCENE_GRAVEYARD, 3, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x35C */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_3_3, SCENE_GRAVEYARD, 3, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) + +/* 0x35D */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_4, SCENE_GRAVEYARD, 4, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x35E */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_4_1, SCENE_GRAVEYARD, 4, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x35F */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_4_2, SCENE_GRAVEYARD, 4, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x360 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_4_3, SCENE_GRAVEYARD, 4, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) + +/* 0x361 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_5, SCENE_GRAVEYARD, 5, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x362 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_5_1, SCENE_GRAVEYARD, 5, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x363 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_5_2, SCENE_GRAVEYARD, 5, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x364 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_5_3, SCENE_GRAVEYARD, 5, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) + +/* 0x365 */ DEFINE_ENTRANCE(ENTR_HAUNTED_WASTELAND_1, SCENE_HAUNTED_WASTELAND, 1, true, true, TRANS_TYPE_SANDSTORM_PERSIST, TRANS_TYPE_SANDSTORM_PERSIST) +/* 0x366 */ DEFINE_ENTRANCE(ENTR_HAUNTED_WASTELAND_1_1, SCENE_HAUNTED_WASTELAND, 1, true, true, TRANS_TYPE_SANDSTORM_PERSIST, TRANS_TYPE_SANDSTORM_PERSIST) +/* 0x367 */ DEFINE_ENTRANCE(ENTR_HAUNTED_WASTELAND_1_2, SCENE_HAUNTED_WASTELAND, 1, true, true, TRANS_TYPE_SANDSTORM_PERSIST, TRANS_TYPE_SANDSTORM_PERSIST) +/* 0x368 */ DEFINE_ENTRANCE(ENTR_HAUNTED_WASTELAND_1_3, SCENE_HAUNTED_WASTELAND, 1, true, true, TRANS_TYPE_SANDSTORM_PERSIST, TRANS_TYPE_SANDSTORM_PERSIST) + +/* 0x369 */ DEFINE_ENTRANCE(ENTR_HAUNTED_WASTELAND_2, SCENE_HAUNTED_WASTELAND, 2, false, true, TRANS_TYPE_SANDSTORM_PERSIST, TRANS_TYPE_SANDSTORM_PERSIST) +/* 0x36A */ DEFINE_ENTRANCE(ENTR_HAUNTED_WASTELAND_2_1, SCENE_HAUNTED_WASTELAND, 2, false, true, TRANS_TYPE_SANDSTORM_PERSIST, TRANS_TYPE_SANDSTORM_PERSIST) +/* 0x36B */ DEFINE_ENTRANCE(ENTR_HAUNTED_WASTELAND_2_2, SCENE_HAUNTED_WASTELAND, 2, false, true, TRANS_TYPE_SANDSTORM_PERSIST, TRANS_TYPE_SANDSTORM_PERSIST) +/* 0x36C */ DEFINE_ENTRANCE(ENTR_HAUNTED_WASTELAND_2_3, SCENE_HAUNTED_WASTELAND, 2, false, true, TRANS_TYPE_SANDSTORM_PERSIST, TRANS_TYPE_SANDSTORM_PERSIST) + +/* 0x36D */ DEFINE_ENTRANCE(ENTR_FAIRYS_FOUNTAIN_0, SCENE_FAIRYS_FOUNTAIN, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x36E */ DEFINE_ENTRANCE(ENTR_FAIRYS_FOUNTAIN_0_1, SCENE_FAIRYS_FOUNTAIN, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x36F */ DEFINE_ENTRANCE(ENTR_FAIRYS_FOUNTAIN_0_2, SCENE_FAIRYS_FOUNTAIN, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x370 */ DEFINE_ENTRANCE(ENTR_FAIRYS_FOUNTAIN_0_3, SCENE_FAIRYS_FOUNTAIN, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) + +/* 0x371 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_0, SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x372 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_0_1, SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x373 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_0_2, SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x374 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_0_3, SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x375 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_0_4, SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x376 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_0_5, SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x377 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_0_6, SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x378 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_4, SCENE_LON_LON_RANCH, 4, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x379 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_4_1, SCENE_LON_LON_RANCH, 4, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x37A */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_4_2, SCENE_LON_LON_RANCH, 4, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x37B */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_4_3, SCENE_LON_LON_RANCH, 4, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x37C */ DEFINE_ENTRANCE(ENTR_GORON_SHOP_0, SCENE_GORON_SHOP, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x37D */ DEFINE_ENTRANCE(ENTR_GORON_SHOP_0_1, SCENE_GORON_SHOP, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x37E */ DEFINE_ENTRANCE(ENTR_GORON_SHOP_0_2, SCENE_GORON_SHOP, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x37F */ DEFINE_ENTRANCE(ENTR_GORON_SHOP_0_3, SCENE_GORON_SHOP, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x380 */ DEFINE_ENTRANCE(ENTR_ZORA_SHOP_0, SCENE_ZORA_SHOP, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x381 */ DEFINE_ENTRANCE(ENTR_ZORA_SHOP_0_1, SCENE_ZORA_SHOP, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x382 */ DEFINE_ENTRANCE(ENTR_ZORA_SHOP_0_2, SCENE_ZORA_SHOP, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x383 */ DEFINE_ENTRANCE(ENTR_ZORA_SHOP_0_3, SCENE_ZORA_SHOP, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) + +/* 0x384 */ DEFINE_ENTRANCE(ENTR_POTION_SHOP_KAKARIKO_0, SCENE_POTION_SHOP_KAKARIKO, 0, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x385 */ DEFINE_ENTRANCE(ENTR_POTION_SHOP_KAKARIKO_0_1, SCENE_POTION_SHOP_KAKARIKO, 0, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x386 */ DEFINE_ENTRANCE(ENTR_POTION_SHOP_KAKARIKO_0_2, SCENE_POTION_SHOP_KAKARIKO, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x387 */ DEFINE_ENTRANCE(ENTR_POTION_SHOP_KAKARIKO_0_3, SCENE_POTION_SHOP_KAKARIKO, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x388 */ DEFINE_ENTRANCE(ENTR_POTION_SHOP_MARKET_0, SCENE_POTION_SHOP_MARKET, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x389 */ DEFINE_ENTRANCE(ENTR_POTION_SHOP_MARKET_0_1, SCENE_POTION_SHOP_MARKET, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x38A */ DEFINE_ENTRANCE(ENTR_POTION_SHOP_MARKET_0_2, SCENE_POTION_SHOP_MARKET, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x38B */ DEFINE_ENTRANCE(ENTR_POTION_SHOP_MARKET_0_3, SCENE_POTION_SHOP_MARKET, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x38C */ DEFINE_ENTRANCE(ENTR_BACK_ALLEY_DAY_4, SCENE_BACK_ALLEY_DAY, 4, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x38D */ DEFINE_ENTRANCE(ENTR_BACK_ALLEY_NIGHT_4_1, SCENE_BACK_ALLEY_NIGHT, 4, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x38E */ DEFINE_ENTRANCE(ENTR_BACK_ALLEY_DAY_4_2, SCENE_BACK_ALLEY_DAY, 4, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x38F */ DEFINE_ENTRANCE(ENTR_BACK_ALLEY_NIGHT_4_3, SCENE_BACK_ALLEY_NIGHT, 4, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x390 */ DEFINE_ENTRANCE(ENTR_BOMBCHU_SHOP_0, SCENE_BOMBCHU_SHOP, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x391 */ DEFINE_ENTRANCE(ENTR_BOMBCHU_SHOP_0_1, SCENE_BOMBCHU_SHOP, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x392 */ DEFINE_ENTRANCE(ENTR_BOMBCHU_SHOP_0_2, SCENE_BOMBCHU_SHOP, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x393 */ DEFINE_ENTRANCE(ENTR_BOMBCHU_SHOP_0_3, SCENE_BOMBCHU_SHOP, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x394 */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_5, SCENE_ZORAS_FOUNTAIN, 5, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x395 */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_5_1, SCENE_ZORAS_FOUNTAIN, 5, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x396 */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_5_2, SCENE_ZORAS_FOUNTAIN, 5, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x397 */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_5_3, SCENE_ZORAS_FOUNTAIN, 5, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) + +/* 0x398 */ DEFINE_ENTRANCE(ENTR_DOG_LADY_HOUSE_0, SCENE_DOG_LADY_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x399 */ DEFINE_ENTRANCE(ENTR_DOG_LADY_HOUSE_0_1, SCENE_DOG_LADY_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x39A */ DEFINE_ENTRANCE(ENTR_DOG_LADY_HOUSE_0_2, SCENE_DOG_LADY_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x39B */ DEFINE_ENTRANCE(ENTR_DOG_LADY_HOUSE_0_3, SCENE_DOG_LADY_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x39C */ DEFINE_ENTRANCE(ENTR_IMPAS_HOUSE_0, SCENE_IMPAS_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x39D */ DEFINE_ENTRANCE(ENTR_IMPAS_HOUSE_0_1, SCENE_IMPAS_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x39E */ DEFINE_ENTRANCE(ENTR_IMPAS_HOUSE_0_2, SCENE_IMPAS_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x39F */ DEFINE_ENTRANCE(ENTR_IMPAS_HOUSE_0_3, SCENE_IMPAS_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x3A0 */ DEFINE_ENTRANCE(ENTR_CARPENTERS_TENT_0, SCENE_CARPENTERS_TENT, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x3A1 */ DEFINE_ENTRANCE(ENTR_CARPENTERS_TENT_0_1, SCENE_CARPENTERS_TENT, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x3A2 */ DEFINE_ENTRANCE(ENTR_CARPENTERS_TENT_0_2, SCENE_CARPENTERS_TENT, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x3A3 */ DEFINE_ENTRANCE(ENTR_CARPENTERS_TENT_0_3, SCENE_CARPENTERS_TENT, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) + +/* 0x3A4 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_13, SCENE_GERUDOS_FORTRESS, 13, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x3A5 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_13_1, SCENE_GERUDOS_FORTRESS, 13, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3A6 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_13_2, SCENE_GERUDOS_FORTRESS, 13, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x3A7 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_13_3, SCENE_GERUDOS_FORTRESS, 13, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x3A8 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_14, SCENE_GERUDOS_FORTRESS, 14, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE_FAST) +/* 0x3A9 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_14_1, SCENE_GERUDOS_FORTRESS, 14, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x3AA */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_14_2, SCENE_GERUDOS_FORTRESS, 14, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE_FAST) +/* 0x3AB */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_14_3, SCENE_GERUDOS_FORTRESS, 14, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK_FAST) + +/* 0x3AC */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_15, SCENE_GERUDOS_FORTRESS, 15, true, true, TRANS_TYPE_SANDSTORM_END, TRANS_TYPE_SANDSTORM_END) +/* 0x3AD */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_15_1, SCENE_GERUDOS_FORTRESS, 15, true, true, TRANS_TYPE_SANDSTORM_END, TRANS_TYPE_SANDSTORM_END) +/* 0x3AE */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_15_2, SCENE_GERUDOS_FORTRESS, 15, true, true, TRANS_TYPE_SANDSTORM_END, TRANS_TYPE_SANDSTORM_END) +/* 0x3AF */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_15_3, SCENE_GERUDOS_FORTRESS, 15, true, true, TRANS_TYPE_SANDSTORM_END, TRANS_TYPE_SANDSTORM_END) + +/* 0x3B0 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_16, SCENE_GERUDOS_FORTRESS, 16, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3B1 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_16_1, SCENE_GERUDOS_FORTRESS, 16, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3B2 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_16_2, SCENE_GERUDOS_FORTRESS, 16, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3B3 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_16_3, SCENE_GERUDOS_FORTRESS, 16, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x3B4 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_17, SCENE_GERUDOS_FORTRESS, 17, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3B5 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_17_1, SCENE_GERUDOS_FORTRESS, 17, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3B6 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_17_2, SCENE_GERUDOS_FORTRESS, 17, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3B7 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_17_3, SCENE_GERUDOS_FORTRESS, 17, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x3B8 */ DEFINE_ENTRANCE(ENTR_MARKET_DAY_6, SCENE_MARKET_DAY, 6, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x3B9 */ DEFINE_ENTRANCE(ENTR_MARKET_NIGHT_6_1, SCENE_MARKET_NIGHT, 6, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x3BA */ DEFINE_ENTRANCE(ENTR_MARKET_RUINS_6_2, SCENE_MARKET_RUINS, 6, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x3BB */ DEFINE_ENTRANCE(ENTR_MARKET_RUINS_6_3, SCENE_MARKET_RUINS, 6, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x3BC */ DEFINE_ENTRANCE(ENTR_MARKET_DAY_7, SCENE_MARKET_DAY, 7, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x3BD */ DEFINE_ENTRANCE(ENTR_MARKET_NIGHT_7_1, SCENE_MARKET_NIGHT, 7, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x3BE */ DEFINE_ENTRANCE(ENTR_MARKET_RUINS_7_2, SCENE_MARKET_RUINS, 7, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x3BF */ DEFINE_ENTRANCE(ENTR_MARKET_RUINS_7_3, SCENE_MARKET_RUINS, 7, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x3C0 */ DEFINE_ENTRANCE(ENTR_BACK_ALLEY_DAY_2, SCENE_BACK_ALLEY_DAY, 2, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x3C1 */ DEFINE_ENTRANCE(ENTR_BACK_ALLEY_NIGHT_2_1, SCENE_BACK_ALLEY_NIGHT, 2, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x3C2 */ DEFINE_ENTRANCE(ENTR_BACK_ALLEY_DAY_2_2, SCENE_BACK_ALLEY_DAY, 2, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x3C3 */ DEFINE_ENTRANCE(ENTR_BACK_ALLEY_NIGHT_2_3, SCENE_BACK_ALLEY_NIGHT, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x3C4 */ DEFINE_ENTRANCE(ENTR_ZORAS_DOMAIN_2, SCENE_ZORAS_DOMAIN, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3C5 */ DEFINE_ENTRANCE(ENTR_ZORAS_DOMAIN_2_1, SCENE_ZORAS_DOMAIN, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3C6 */ DEFINE_ENTRANCE(ENTR_ZORAS_DOMAIN_2_2, SCENE_ZORAS_DOMAIN, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3C7 */ DEFINE_ENTRANCE(ENTR_ZORAS_DOMAIN_2_3, SCENE_ZORAS_DOMAIN, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x3C8 */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_3, SCENE_LAKE_HYLIA, 3, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x3C9 */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_3_1, SCENE_LAKE_HYLIA, 3, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x3CA */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_3_2, SCENE_LAKE_HYLIA, 3, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x3CB */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_3_3, SCENE_LAKE_HYLIA, 3, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) + +/* 0x3CC */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_4, SCENE_LAKE_HYLIA, 4, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x3CD */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_4_1, SCENE_LAKE_HYLIA, 4, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x3CE */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_4_2, SCENE_LAKE_HYLIA, 4, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x3CF */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_4_3, SCENE_LAKE_HYLIA, 4, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x3D0 */ DEFINE_ENTRANCE(ENTR_GERUDO_VALLEY_4, SCENE_GERUDO_VALLEY, 4, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x3D1 */ DEFINE_ENTRANCE(ENTR_GERUDO_VALLEY_4_1, SCENE_GERUDO_VALLEY, 4, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x3D2 */ DEFINE_ENTRANCE(ENTR_GERUDO_VALLEY_4_2, SCENE_GERUDO_VALLEY, 4, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x3D3 */ DEFINE_ENTRANCE(ENTR_GERUDO_VALLEY_4_3, SCENE_GERUDO_VALLEY, 4, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x3D4 */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_3, SCENE_ZORAS_FOUNTAIN, 3, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x3D5 */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_3_1, SCENE_ZORAS_FOUNTAIN, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3D6 */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_3_2, SCENE_ZORAS_FOUNTAIN, 3, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x3D7 */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_3_3, SCENE_ZORAS_FOUNTAIN, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x3D8 */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_4, SCENE_ZORAS_FOUNTAIN, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3D9 */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_4_1, SCENE_ZORAS_FOUNTAIN, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3DA */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_4_2, SCENE_ZORAS_FOUNTAIN, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3DB */ DEFINE_ENTRANCE(ENTR_ZORAS_FOUNTAIN_4_3, SCENE_ZORAS_FOUNTAIN, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x3DC */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_4, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 4, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3DD */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_4_1, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 4, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3DE */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_4_2, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 4, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3DF */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_4_3, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 4, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x3E0 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_5, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 5, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3E1 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_5_1, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 5, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3E2 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_5_2, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 5, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3E3 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_5_3, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 5, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x3E4 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_6, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 6, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3E5 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_6_1, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 6, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3E6 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_6_2, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 6, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3E7 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_6_3, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 6, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x3E8 */ DEFINE_ENTRANCE(ENTR_POTION_SHOP_KAKARIKO_1, SCENE_POTION_SHOP_KAKARIKO, 1, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x3E9 */ DEFINE_ENTRANCE(ENTR_POTION_SHOP_KAKARIKO_1_1, SCENE_POTION_SHOP_KAKARIKO, 1, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x3EA */ DEFINE_ENTRANCE(ENTR_POTION_SHOP_KAKARIKO_1_2, SCENE_POTION_SHOP_KAKARIKO, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x3EB */ DEFINE_ENTRANCE(ENTR_POTION_SHOP_KAKARIKO_1_3, SCENE_POTION_SHOP_KAKARIKO, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x3EC */ DEFINE_ENTRANCE(ENTR_POTION_SHOP_KAKARIKO_2, SCENE_POTION_SHOP_KAKARIKO, 2, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x3ED */ DEFINE_ENTRANCE(ENTR_POTION_SHOP_KAKARIKO_2_1, SCENE_POTION_SHOP_KAKARIKO, 2, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x3EE */ DEFINE_ENTRANCE(ENTR_POTION_SHOP_KAKARIKO_2_2, SCENE_POTION_SHOP_KAKARIKO, 2, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x3EF */ DEFINE_ENTRANCE(ENTR_POTION_SHOP_KAKARIKO_2_3, SCENE_POTION_SHOP_KAKARIKO, 2, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x3F0 */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_2, SCENE_SPIRIT_TEMPLE, 2, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3F1 */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_2_1, SCENE_SPIRIT_TEMPLE, 2, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3F2 */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_2_2, SCENE_SPIRIT_TEMPLE, 2, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3F3 */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_2_3, SCENE_SPIRIT_TEMPLE, 2, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x3F4 */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_3, SCENE_SPIRIT_TEMPLE, 3, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3F5 */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_3_1, SCENE_SPIRIT_TEMPLE, 3, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3F6 */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_3_2, SCENE_SPIRIT_TEMPLE, 3, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3F7 */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_3_3, SCENE_SPIRIT_TEMPLE, 3, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x3F8 */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_4, SCENE_SPIRIT_TEMPLE, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3F9 */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_4_1, SCENE_SPIRIT_TEMPLE, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3FA */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_4_2, SCENE_SPIRIT_TEMPLE, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x3FB */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_4_3, SCENE_SPIRIT_TEMPLE, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x3FC */ DEFINE_ENTRANCE(ENTR_GORON_CITY_2, SCENE_GORON_CITY, 2, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x3FD */ DEFINE_ENTRANCE(ENTR_GORON_CITY_2_1, SCENE_GORON_CITY, 2, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x3FE */ DEFINE_ENTRANCE(ENTR_GORON_CITY_2_2, SCENE_GORON_CITY, 2, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x3FF */ DEFINE_ENTRANCE(ENTR_GORON_CITY_2_3, SCENE_GORON_CITY, 2, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x400 */ DEFINE_ENTRANCE(ENTR_CASTLE_COURTYARD_ZELDA_0, SCENE_CASTLE_COURTYARD_ZELDA, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x401 */ DEFINE_ENTRANCE(ENTR_CASTLE_COURTYARD_ZELDA_0_1, SCENE_CASTLE_COURTYARD_ZELDA, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x402 */ DEFINE_ENTRANCE(ENTR_CASTLE_COURTYARD_ZELDA_0_2, SCENE_CASTLE_COURTYARD_ZELDA, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x403 */ DEFINE_ENTRANCE(ENTR_CASTLE_COURTYARD_ZELDA_0_3, SCENE_CASTLE_COURTYARD_ZELDA, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x404 */ DEFINE_ENTRANCE(ENTR_CASTLE_COURTYARD_ZELDA_0_4, SCENE_CASTLE_COURTYARD_ZELDA, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x405 */ DEFINE_ENTRANCE(ENTR_CASTLE_COURTYARD_ZELDA_0_5, SCENE_CASTLE_COURTYARD_ZELDA, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x406 */ DEFINE_ENTRANCE(ENTR_CASTLE_COURTYARD_ZELDA_0_6, SCENE_CASTLE_COURTYARD_ZELDA, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) + +/* 0x407 */ DEFINE_ENTRANCE(ENTR_JABU_JABU_1, SCENE_JABU_JABU, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x408 */ DEFINE_ENTRANCE(ENTR_JABU_JABU_1_1, SCENE_JABU_JABU, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x409 */ DEFINE_ENTRANCE(ENTR_JABU_JABU_1_2, SCENE_JABU_JABU, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x40A */ DEFINE_ENTRANCE(ENTR_JABU_JABU_1_3, SCENE_JABU_JABU, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x40B */ DEFINE_ENTRANCE(ENTR_DODONGOS_CAVERN_BOSS_0, SCENE_DODONGOS_CAVERN_BOSS, 0, true, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x40C */ DEFINE_ENTRANCE(ENTR_DODONGOS_CAVERN_BOSS_0_1, SCENE_DODONGOS_CAVERN_BOSS, 0, true, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x40D */ DEFINE_ENTRANCE(ENTR_DODONGOS_CAVERN_BOSS_0_2, SCENE_DODONGOS_CAVERN_BOSS, 0, true, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x40E */ DEFINE_ENTRANCE(ENTR_DODONGOS_CAVERN_BOSS_0_3, SCENE_DODONGOS_CAVERN_BOSS, 0, true, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x40F */ DEFINE_ENTRANCE(ENTR_DEKU_TREE_BOSS_0, SCENE_DEKU_TREE_BOSS, 0, true, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x410 */ DEFINE_ENTRANCE(ENTR_DEKU_TREE_BOSS_0_1, SCENE_DEKU_TREE_BOSS, 0, true, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x411 */ DEFINE_ENTRANCE(ENTR_DEKU_TREE_BOSS_0_2, SCENE_DEKU_TREE_BOSS, 0, true, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x412 */ DEFINE_ENTRANCE(ENTR_DEKU_TREE_BOSS_0_3, SCENE_DEKU_TREE_BOSS, 0, true, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x413 */ DEFINE_ENTRANCE(ENTR_SHADOW_TEMPLE_BOSS_0, SCENE_SHADOW_TEMPLE_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x414 */ DEFINE_ENTRANCE(ENTR_SHADOW_TEMPLE_BOSS_0_1, SCENE_SHADOW_TEMPLE_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x415 */ DEFINE_ENTRANCE(ENTR_SHADOW_TEMPLE_BOSS_0_2, SCENE_SHADOW_TEMPLE_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x416 */ DEFINE_ENTRANCE(ENTR_SHADOW_TEMPLE_BOSS_0_3, SCENE_SHADOW_TEMPLE_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x417 */ DEFINE_ENTRANCE(ENTR_WATER_TEMPLE_BOSS_0, SCENE_WATER_TEMPLE_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x418 */ DEFINE_ENTRANCE(ENTR_WATER_TEMPLE_BOSS_0_1, SCENE_WATER_TEMPLE_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x419 */ DEFINE_ENTRANCE(ENTR_WATER_TEMPLE_BOSS_0_2, SCENE_WATER_TEMPLE_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x41A */ DEFINE_ENTRANCE(ENTR_WATER_TEMPLE_BOSS_0_3, SCENE_WATER_TEMPLE_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x41B */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_0, SCENE_GANONS_TOWER, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x41C */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_0_1, SCENE_GANONS_TOWER, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x41D */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_0_2, SCENE_GANONS_TOWER, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x41E */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_0_3, SCENE_GANONS_TOWER, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x41F */ DEFINE_ENTRANCE(ENTR_GANONDORF_BOSS_0, SCENE_GANONDORF_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x420 */ DEFINE_ENTRANCE(ENTR_GANONDORF_BOSS_0_1, SCENE_GANONDORF_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x421 */ DEFINE_ENTRANCE(ENTR_GANONDORF_BOSS_0_2, SCENE_GANONDORF_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x422 */ DEFINE_ENTRANCE(ENTR_GANONDORF_BOSS_0_3, SCENE_GANONDORF_BOSS, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x423 */ DEFINE_ENTRANCE(ENTR_WATER_TEMPLE_1, SCENE_WATER_TEMPLE, 1, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_BLACK) +/* 0x424 */ DEFINE_ENTRANCE(ENTR_WATER_TEMPLE_1_1, SCENE_WATER_TEMPLE, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x425 */ DEFINE_ENTRANCE(ENTR_WATER_TEMPLE_1_2, SCENE_WATER_TEMPLE, 1, true, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_BLACK) +/* 0x426 */ DEFINE_ENTRANCE(ENTR_WATER_TEMPLE_1_3, SCENE_WATER_TEMPLE, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x427 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_1, SCENE_GANONS_TOWER, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x428 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_1_1, SCENE_GANONS_TOWER, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x429 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_1_2, SCENE_GANONS_TOWER, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x42A */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_1_3, SCENE_GANONS_TOWER, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x42B */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_2, SCENE_GANONS_TOWER, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x42C */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_2_1, SCENE_GANONS_TOWER, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x42D */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_2_2, SCENE_GANONS_TOWER, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x42E */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_2_3, SCENE_GANONS_TOWER, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x42F */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_5, SCENE_LON_LON_RANCH, 5, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x430 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_5_1, SCENE_LON_LON_RANCH, 5, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x431 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_5_2, SCENE_LON_LON_RANCH, 5, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x432 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_5_3, SCENE_LON_LON_RANCH, 5, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x433 */ DEFINE_ENTRANCE(ENTR_MIDOS_HOUSE_0, SCENE_MIDOS_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x434 */ DEFINE_ENTRANCE(ENTR_MIDOS_HOUSE_0_1, SCENE_MIDOS_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x435 */ DEFINE_ENTRANCE(ENTR_MIDOS_HOUSE_0_2, SCENE_MIDOS_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x436 */ DEFINE_ENTRANCE(ENTR_MIDOS_HOUSE_0_3, SCENE_MIDOS_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) + +/* 0x437 */ DEFINE_ENTRANCE(ENTR_SARIAS_HOUSE_0, SCENE_SARIAS_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x438 */ DEFINE_ENTRANCE(ENTR_SARIAS_HOUSE_0_1, SCENE_SARIAS_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x439 */ DEFINE_ENTRANCE(ENTR_SARIAS_HOUSE_0_2, SCENE_SARIAS_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x43A */ DEFINE_ENTRANCE(ENTR_SARIAS_HOUSE_0_3, SCENE_SARIAS_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) + +/* 0x43B */ DEFINE_ENTRANCE(ENTR_BACK_ALLEY_HOUSE_0, SCENE_BACK_ALLEY_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x43C */ DEFINE_ENTRANCE(ENTR_BACK_ALLEY_HOUSE_0_1, SCENE_BACK_ALLEY_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x43D */ DEFINE_ENTRANCE(ENTR_BACK_ALLEY_HOUSE_0_2, SCENE_BACK_ALLEY_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x43E */ DEFINE_ENTRANCE(ENTR_BACK_ALLEY_HOUSE_0_3, SCENE_BACK_ALLEY_HOUSE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x43F */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_0, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x440 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_0_1, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x441 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_0_2, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x442 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_0_3, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x443 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_9, SCENE_KOKIRI_FOREST, 9, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x444 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_9_1, SCENE_KOKIRI_FOREST, 9, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x445 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_9_2, SCENE_KOKIRI_FOREST, 9, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x446 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_9_3, SCENE_KOKIRI_FOREST, 9, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) + +/* 0x447 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_10, SCENE_KOKIRI_FOREST, 10, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x448 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_10_1, SCENE_KOKIRI_FOREST, 10, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x449 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_10_2, SCENE_KOKIRI_FOREST, 10, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x44A */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_10_3, SCENE_KOKIRI_FOREST, 10, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) + +/* 0x44B */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_9, SCENE_KAKARIKO_VILLAGE, 9, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x44C */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_9_1, SCENE_KAKARIKO_VILLAGE, 9, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x44D */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_9_2, SCENE_KAKARIKO_VILLAGE, 9, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x44E */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_9_3, SCENE_KAKARIKO_VILLAGE, 9, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) + +/* 0x44F */ DEFINE_ENTRANCE(ENTR_WINDMILL_AND_DAMPES_GRAVE_0, SCENE_WINDMILL_AND_DAMPES_GRAVE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_BLACK, TCS_FAST)) +/* 0x450 */ DEFINE_ENTRANCE(ENTR_WINDMILL_AND_DAMPES_GRAVE_0_1, SCENE_WINDMILL_AND_DAMPES_GRAVE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_BLACK, TCS_FAST)) +/* 0x451 */ DEFINE_ENTRANCE(ENTR_WINDMILL_AND_DAMPES_GRAVE_0_2, SCENE_WINDMILL_AND_DAMPES_GRAVE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_BLACK, TCS_FAST)) +/* 0x452 */ DEFINE_ENTRANCE(ENTR_WINDMILL_AND_DAMPES_GRAVE_0_3, SCENE_WINDMILL_AND_DAMPES_GRAVE, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_BLACK, TCS_FAST)) + +/* 0x453 */ DEFINE_ENTRANCE(ENTR_WINDMILL_AND_DAMPES_GRAVE_1, SCENE_WINDMILL_AND_DAMPES_GRAVE, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x454 */ DEFINE_ENTRANCE(ENTR_WINDMILL_AND_DAMPES_GRAVE_1_1, SCENE_WINDMILL_AND_DAMPES_GRAVE, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x455 */ DEFINE_ENTRANCE(ENTR_WINDMILL_AND_DAMPES_GRAVE_1_2, SCENE_WINDMILL_AND_DAMPES_GRAVE, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x456 */ DEFINE_ENTRANCE(ENTR_WINDMILL_AND_DAMPES_GRAVE_1_3, SCENE_WINDMILL_AND_DAMPES_GRAVE, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x457 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_11, SCENE_KOKIRI_FOREST, 11, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x458 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_11_1, SCENE_KOKIRI_FOREST, 11, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x459 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_11_2, SCENE_KOKIRI_FOREST, 11, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x45A */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_11_3, SCENE_KOKIRI_FOREST, 11, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x45B */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_4, SCENE_DEATH_MOUNTAIN_TRAIL, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x45C */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_4_1, SCENE_DEATH_MOUNTAIN_TRAIL, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x45D */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_4_2, SCENE_DEATH_MOUNTAIN_TRAIL, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x45E */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_4_3, SCENE_DEATH_MOUNTAIN_TRAIL, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x45F */ DEFINE_ENTRANCE(ENTR_FISHING_POND_0, SCENE_FISHING_POND, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x460 */ DEFINE_ENTRANCE(ENTR_FISHING_POND_0_1, SCENE_FISHING_POND, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x461 */ DEFINE_ENTRANCE(ENTR_FISHING_POND_0_2, SCENE_FISHING_POND, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x462 */ DEFINE_ENTRANCE(ENTR_FISHING_POND_0_3, SCENE_FISHING_POND, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x463 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_10, SCENE_KAKARIKO_VILLAGE, 10, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x464 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_10_1, SCENE_KAKARIKO_VILLAGE, 10, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x465 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_10_2, SCENE_KAKARIKO_VILLAGE, 10, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x466 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_10_3, SCENE_KAKARIKO_VILLAGE, 10, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x467 */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_0, SCENE_INSIDE_GANONS_CASTLE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x468 */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_0_1, SCENE_INSIDE_GANONS_CASTLE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x469 */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_0_2, SCENE_INSIDE_GANONS_CASTLE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x46A */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_0_3, SCENE_INSIDE_GANONS_CASTLE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x46B */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_0_4, SCENE_INSIDE_GANONS_CASTLE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x46C */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_0_5, SCENE_INSIDE_GANONS_CASTLE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x46D */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_0_6, SCENE_INSIDE_GANONS_CASTLE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x46E */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_0_7, SCENE_INSIDE_GANONS_CASTLE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x46F */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_0_8, SCENE_INSIDE_GANONS_CASTLE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x470 */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_0_9, SCENE_INSIDE_GANONS_CASTLE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x471 */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_0_10, SCENE_INSIDE_GANONS_CASTLE, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x472 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_1, SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x473 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_EXTERIOR_NIGHT_1_1, SCENE_TEMPLE_OF_TIME_EXTERIOR_NIGHT, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x474 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_EXTERIOR_RUINS_1_2, SCENE_TEMPLE_OF_TIME_EXTERIOR_RUINS, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x475 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_EXTERIOR_RUINS_1_3, SCENE_TEMPLE_OF_TIME_EXTERIOR_RUINS, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x476 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_15, SCENE_HYRULE_FIELD, 15, false, true, TRANS_TYPE_FADE_WHITE_FAST, TRANS_TYPE_FADE_WHITE_FAST) +/* 0x477 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_15_1, SCENE_HYRULE_FIELD, 15, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x478 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_15_2, SCENE_HYRULE_FIELD, 15, false, true, TRANS_TYPE_FADE_WHITE_FAST, TRANS_TYPE_FADE_WHITE_FAST) +/* 0x479 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_15_3, SCENE_HYRULE_FIELD, 15, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x47A */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_5, SCENE_DEATH_MOUNTAIN_TRAIL, 5, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x47B */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_5_1, SCENE_DEATH_MOUNTAIN_TRAIL, 5, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x47C */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_5_2, SCENE_DEATH_MOUNTAIN_TRAIL, 5, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x47D */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_TRAIL_5_3, SCENE_DEATH_MOUNTAIN_TRAIL, 5, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x47E */ DEFINE_ENTRANCE(ENTR_HYRULE_CASTLE_4, SCENE_HYRULE_CASTLE, 4, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x47F */ DEFINE_ENTRANCE(ENTR_HYRULE_CASTLE_4_1, SCENE_HYRULE_CASTLE, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x480 */ DEFINE_ENTRANCE(ENTR_OUTSIDE_GANONS_CASTLE_4_2, SCENE_OUTSIDE_GANONS_CASTLE, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x481 */ DEFINE_ENTRANCE(ENTR_OUTSIDE_GANONS_CASTLE_4_3, SCENE_OUTSIDE_GANONS_CASTLE, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x482 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_3, SCENE_DEATH_MOUNTAIN_CRATER, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x483 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_3_1, SCENE_DEATH_MOUNTAIN_CRATER, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x484 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_3_2, SCENE_DEATH_MOUNTAIN_CRATER, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x485 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_3_3, SCENE_DEATH_MOUNTAIN_CRATER, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x486 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_0, SCENE_THIEVES_HIDEOUT, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x487 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_0_1, SCENE_THIEVES_HIDEOUT, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x488 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_0_2, SCENE_THIEVES_HIDEOUT, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x489 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_0_3, SCENE_THIEVES_HIDEOUT, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x48A */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_1, SCENE_THIEVES_HIDEOUT, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x48B */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_1_1, SCENE_THIEVES_HIDEOUT, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x48C */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_1_2, SCENE_THIEVES_HIDEOUT, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x48D */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_1_3, SCENE_THIEVES_HIDEOUT, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x48E */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_2, SCENE_THIEVES_HIDEOUT, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x48F */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_2_1, SCENE_THIEVES_HIDEOUT, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x490 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_2_2, SCENE_THIEVES_HIDEOUT, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x491 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_2_3, SCENE_THIEVES_HIDEOUT, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x492 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_3, SCENE_THIEVES_HIDEOUT, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x493 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_3_1, SCENE_THIEVES_HIDEOUT, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x494 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_3_2, SCENE_THIEVES_HIDEOUT, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x495 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_3_3, SCENE_THIEVES_HIDEOUT, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x496 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_4, SCENE_THIEVES_HIDEOUT, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x497 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_4_1, SCENE_THIEVES_HIDEOUT, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x498 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_4_2, SCENE_THIEVES_HIDEOUT, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x499 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_4_3, SCENE_THIEVES_HIDEOUT, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x49A */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_5, SCENE_THIEVES_HIDEOUT, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x49B */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_5_1, SCENE_THIEVES_HIDEOUT, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x49C */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_5_2, SCENE_THIEVES_HIDEOUT, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x49D */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_5_3, SCENE_THIEVES_HIDEOUT, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x49E */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_6, SCENE_THIEVES_HIDEOUT, 6, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x49F */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_6_1, SCENE_THIEVES_HIDEOUT, 6, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4A0 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_6_2, SCENE_THIEVES_HIDEOUT, 6, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4A1 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_6_3, SCENE_THIEVES_HIDEOUT, 6, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x4A2 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_7, SCENE_THIEVES_HIDEOUT, 7, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4A3 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_7_1, SCENE_THIEVES_HIDEOUT, 7, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4A4 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_7_2, SCENE_THIEVES_HIDEOUT, 7, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4A5 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_7_3, SCENE_THIEVES_HIDEOUT, 7, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x4A6 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_8, SCENE_THIEVES_HIDEOUT, 8, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4A7 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_8_1, SCENE_THIEVES_HIDEOUT, 8, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4A8 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_8_2, SCENE_THIEVES_HIDEOUT, 8, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4A9 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_8_3, SCENE_THIEVES_HIDEOUT, 8, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x4AA */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_9, SCENE_THIEVES_HIDEOUT, 9, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4AB */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_9_1, SCENE_THIEVES_HIDEOUT, 9, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4AC */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_9_2, SCENE_THIEVES_HIDEOUT, 9, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4AD */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_9_3, SCENE_THIEVES_HIDEOUT, 9, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x4AE */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_10, SCENE_THIEVES_HIDEOUT, 10, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4AF */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_10_1, SCENE_THIEVES_HIDEOUT, 10, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4B0 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_10_2, SCENE_THIEVES_HIDEOUT, 10, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4B1 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_10_3, SCENE_THIEVES_HIDEOUT, 10, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x4B2 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_11, SCENE_THIEVES_HIDEOUT, 11, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4B3 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_11_1, SCENE_THIEVES_HIDEOUT, 11, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4B4 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_11_2, SCENE_THIEVES_HIDEOUT, 11, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4B5 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_11_3, SCENE_THIEVES_HIDEOUT, 11, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x4B6 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_7, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 7, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4B7 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_7_1, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 7, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4B8 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_7_2, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 7, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4B9 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_7_3, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR, 7, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x4BA */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_1, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4BB */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_1_1, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4BC */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_1_2, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4BD */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_1_3, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 1, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x4BE */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_1, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4BF */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_1_1, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4C0 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_1_2, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4C1 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_1_3, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x4C2 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_2, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4C3 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_2_1, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4C4 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_2_2, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4C5 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_2_3, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x4C6 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_4, SCENE_LOST_WOODS, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4C7 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_4_1, SCENE_LOST_WOODS, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4C8 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_4_2, SCENE_LOST_WOODS, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4C9 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_4_3, SCENE_LOST_WOODS, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x4CA */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_6, SCENE_LON_LON_RANCH, 6, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_BLACK, TCS_FAST)) +/* 0x4CB */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_6_1, SCENE_LON_LON_RANCH, 6, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_BLACK, TCS_FAST)) +/* 0x4CC */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_6_2, SCENE_LON_LON_RANCH, 6, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_BLACK, TCS_FAST)) +/* 0x4CD */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_6_3, SCENE_LON_LON_RANCH, 6, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_BLACK, TCS_FAST)) + +/* 0x4CE */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_7, SCENE_LON_LON_RANCH, 7, false, false, TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_WHITE, TCS_FAST)) +/* 0x4CF */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_7_1, SCENE_LON_LON_RANCH, 7, false, false, TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_WHITE, TCS_FAST)) +/* 0x4D0 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_7_2, SCENE_LON_LON_RANCH, 7, false, false, TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_WHITE, TCS_FAST)) +/* 0x4D1 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_7_3, SCENE_LON_LON_RANCH, 7, false, false, TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_STARBURST,TCC_WHITE, TCS_FAST)) + +/* 0x4D2 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_5, SCENE_LOST_WOODS, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4D3 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_5_1, SCENE_LOST_WOODS, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4D4 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_5_2, SCENE_LOST_WOODS, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4D5 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_5_3, SCENE_LOST_WOODS, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x4D6 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_6, SCENE_LOST_WOODS, 6, false, true, TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST)) +/* 0x4D7 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_6_1, SCENE_LOST_WOODS, 6, false, true, TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST)) +/* 0x4D8 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_6_2, SCENE_LOST_WOODS, 6, false, true, TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST)) +/* 0x4D9 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_6_3, SCENE_LOST_WOODS, 6, false, true, TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST)) + +/* 0x4DA */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_7, SCENE_LOST_WOODS, 7, false, true, TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST)) +/* 0x4DB */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_7_1, SCENE_LOST_WOODS, 7, false, true, TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST)) +/* 0x4DC */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_7_2, SCENE_LOST_WOODS, 7, false, true, TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST)) +/* 0x4DD */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_7_3, SCENE_LOST_WOODS, 7, false, true, TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST)) + +/* 0x4DE */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_8, SCENE_LOST_WOODS, 8, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4DF */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_8_1, SCENE_LOST_WOODS, 8, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4E0 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_8_2, SCENE_LOST_WOODS, 8, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4E1 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_8_3, SCENE_LOST_WOODS, 8, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x4E2 */ DEFINE_ENTRANCE(ENTR_GORON_CITY_3, SCENE_GORON_CITY, 3, false, true, TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST)) +/* 0x4E3 */ DEFINE_ENTRANCE(ENTR_GORON_CITY_3_1, SCENE_GORON_CITY, 3, false, true, TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST)) +/* 0x4E4 */ DEFINE_ENTRANCE(ENTR_GORON_CITY_3_2, SCENE_GORON_CITY, 3, false, true, TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST)) +/* 0x4E5 */ DEFINE_ENTRANCE(ENTR_GORON_CITY_3_3, SCENE_GORON_CITY, 3, false, true, TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST)) + +/* 0x4E6 */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_5, SCENE_LAKE_HYLIA, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4E7 */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_5_1, SCENE_LAKE_HYLIA, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4E8 */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_5_2, SCENE_LAKE_HYLIA, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4E9 */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_5_3, SCENE_LAKE_HYLIA, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x4EA */ DEFINE_ENTRANCE(ENTR_SHADOW_TEMPLE_3, SCENE_SHADOW_TEMPLE, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4EB */ DEFINE_ENTRANCE(ENTR_SHADOW_TEMPLE_3_1, SCENE_SHADOW_TEMPLE, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4EC */ DEFINE_ENTRANCE(ENTR_SHADOW_TEMPLE_3_2, SCENE_SHADOW_TEMPLE, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4ED */ DEFINE_ENTRANCE(ENTR_SHADOW_TEMPLE_3_3, SCENE_SHADOW_TEMPLE, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x4EE */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_11, SCENE_KAKARIKO_VILLAGE, 11, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x4EF */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_11_1, SCENE_KAKARIKO_VILLAGE, 11, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x4F0 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_11_2, SCENE_KAKARIKO_VILLAGE, 11, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x4F1 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_11_3, SCENE_KAKARIKO_VILLAGE, 11, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x4F2 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_3, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4F3 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_3_1, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4F4 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_3_2, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4F5 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_3_3, SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x4F6 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_4, SCENE_DEATH_MOUNTAIN_CRATER, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4F7 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_4_1, SCENE_DEATH_MOUNTAIN_CRATER, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4F8 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_4_2, SCENE_DEATH_MOUNTAIN_CRATER, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4F9 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_4_3, SCENE_DEATH_MOUNTAIN_CRATER, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x4FA */ DEFINE_ENTRANCE(ENTR_HYRULE_CASTLE_3, SCENE_HYRULE_CASTLE, 3, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x4FB */ DEFINE_ENTRANCE(ENTR_HYRULE_CASTLE_3_1, SCENE_HYRULE_CASTLE, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4FC */ DEFINE_ENTRANCE(ENTR_OUTSIDE_GANONS_CASTLE_3_2, SCENE_OUTSIDE_GANONS_CASTLE, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4FD */ DEFINE_ENTRANCE(ENTR_OUTSIDE_GANONS_CASTLE_3_3, SCENE_OUTSIDE_GANONS_CASTLE, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x4FE */ DEFINE_ENTRANCE(ENTR_HYRULE_CASTLE_3_4, SCENE_HYRULE_CASTLE, 3, false, true, TRANS_TYPE_WIPE, TRANS_TYPE_WIPE) + +/* 0x4FF */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_12, SCENE_KAKARIKO_VILLAGE, 12, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x500 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_12_1, SCENE_KAKARIKO_VILLAGE, 12, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x501 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_12_2, SCENE_KAKARIKO_VILLAGE, 12, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x502 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_12_3, SCENE_KAKARIKO_VILLAGE, 12, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x503 */ DEFINE_ENTRANCE(ENTR_WINDMILL_AND_DAMPES_GRAVE_2, SCENE_WINDMILL_AND_DAMPES_GRAVE, 2, true, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x504 */ DEFINE_ENTRANCE(ENTR_WINDMILL_AND_DAMPES_GRAVE_2_1, SCENE_WINDMILL_AND_DAMPES_GRAVE, 2, true, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x505 */ DEFINE_ENTRANCE(ENTR_WINDMILL_AND_DAMPES_GRAVE_2_2, SCENE_WINDMILL_AND_DAMPES_GRAVE, 2, true, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x506 */ DEFINE_ENTRANCE(ENTR_WINDMILL_AND_DAMPES_GRAVE_2_3, SCENE_WINDMILL_AND_DAMPES_GRAVE, 2, true, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x507 */ DEFINE_ENTRANCE(ENTR_BOMBCHU_BOWLING_ALLEY_0, SCENE_BOMBCHU_BOWLING_ALLEY, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x508 */ DEFINE_ENTRANCE(ENTR_BOMBCHU_BOWLING_ALLEY_0_1, SCENE_BOMBCHU_BOWLING_ALLEY, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x509 */ DEFINE_ENTRANCE(ENTR_BOMBCHU_BOWLING_ALLEY_0_2, SCENE_BOMBCHU_BOWLING_ALLEY, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x50A */ DEFINE_ENTRANCE(ENTR_BOMBCHU_BOWLING_ALLEY_0_3, SCENE_BOMBCHU_BOWLING_ALLEY, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x50B */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_6, SCENE_GRAVEYARD, 6, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x50C */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_6_1, SCENE_GRAVEYARD, 6, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x50D */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_6_2, SCENE_GRAVEYARD, 6, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x50E */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_6_3, SCENE_GRAVEYARD, 6, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) + +/* 0x50F */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_16, SCENE_HYRULE_FIELD, 16, false, true, TRANS_TYPE_INSTANT, TRANS_TYPE_INSTANT) +/* 0x510 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_16_1, SCENE_HYRULE_FIELD, 16, false, true, TRANS_TYPE_INSTANT, TRANS_TYPE_INSTANT) +/* 0x511 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_16_2, SCENE_HYRULE_FIELD, 16, false, true, TRANS_TYPE_INSTANT, TRANS_TYPE_INSTANT) +/* 0x512 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_16_3, SCENE_HYRULE_FIELD, 16, false, true, TRANS_TYPE_INSTANT, TRANS_TYPE_INSTANT) + +/* 0x513 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_13, SCENE_KAKARIKO_VILLAGE, 13, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x514 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_13_1, SCENE_KAKARIKO_VILLAGE, 13, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x515 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_13_2, SCENE_KAKARIKO_VILLAGE, 13, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x516 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_13_3, SCENE_KAKARIKO_VILLAGE, 13, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x517 */ DEFINE_ENTRANCE(ENTR_GANON_BOSS_0, SCENE_GANON_BOSS, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x518 */ DEFINE_ENTRANCE(ENTR_GANON_BOSS_0_1, SCENE_GANON_BOSS, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x519 */ DEFINE_ENTRANCE(ENTR_GANON_BOSS_0_2, SCENE_GANON_BOSS, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x51A */ DEFINE_ENTRANCE(ENTR_GANON_BOSS_0_3, SCENE_GANON_BOSS, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x51B */ DEFINE_ENTRANCE(ENTR_GANON_BOSS_0_4, SCENE_GANON_BOSS, 0, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) + +/* 0x51C */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_6, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 6, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x51D */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_6_1, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 6, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x51E */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_6_2, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 6, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x51F */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_6_3, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 6, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x520 */ DEFINE_ENTRANCE(ENTR_BESITU_0, SCENE_BESITU, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x521 */ DEFINE_ENTRANCE(ENTR_BESITU_0_1, SCENE_BESITU, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x522 */ DEFINE_ENTRANCE(ENTR_BESITU_0_2, SCENE_BESITU, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x523 */ DEFINE_ENTRANCE(ENTR_BESITU_0_3, SCENE_BESITU, 0, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x524 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_7, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 7, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x525 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_7_1, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 7, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x526 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_7_2, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 7, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x527 */ DEFINE_ENTRANCE(ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_7_3, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, 7, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x528 */ DEFINE_ENTRANCE(ENTR_BOMBCHU_SHOP_1, SCENE_BOMBCHU_SHOP, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x529 */ DEFINE_ENTRANCE(ENTR_BOMBCHU_SHOP_1_1, SCENE_BOMBCHU_SHOP, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x52A */ DEFINE_ENTRANCE(ENTR_BOMBCHU_SHOP_1_2, SCENE_BOMBCHU_SHOP, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x52B */ DEFINE_ENTRANCE(ENTR_BOMBCHU_SHOP_1_3, SCENE_BOMBCHU_SHOP, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x52C */ DEFINE_ENTRANCE(ENTR_BAZAAR_1, SCENE_BAZAAR, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x52D */ DEFINE_ENTRANCE(ENTR_BAZAAR_1_1, SCENE_BAZAAR, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x52E */ DEFINE_ENTRANCE(ENTR_BAZAAR_1_2, SCENE_BAZAAR, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x52F */ DEFINE_ENTRANCE(ENTR_BAZAAR_1_3, SCENE_BAZAAR, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x530 */ DEFINE_ENTRANCE(ENTR_HAPPY_MASK_SHOP_0, SCENE_HAPPY_MASK_SHOP, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x531 */ DEFINE_ENTRANCE(ENTR_HAPPY_MASK_SHOP_0_1, SCENE_HAPPY_MASK_SHOP, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x532 */ DEFINE_ENTRANCE(ENTR_HAPPY_MASK_SHOP_0_2, SCENE_HAPPY_MASK_SHOP, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x533 */ DEFINE_ENTRANCE(ENTR_HAPPY_MASK_SHOP_0_3, SCENE_HAPPY_MASK_SHOP, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x534 */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_1, SCENE_INSIDE_GANONS_CASTLE, 1, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x535 */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_1_1, SCENE_INSIDE_GANONS_CASTLE, 1, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x536 */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_1_2, SCENE_INSIDE_GANONS_CASTLE, 1, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x537 */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_1_3, SCENE_INSIDE_GANONS_CASTLE, 1, false, false, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x538 */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_2, SCENE_INSIDE_GANONS_CASTLE, 2, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x539 */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_2_1, SCENE_INSIDE_GANONS_CASTLE, 2, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x53A */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_2_2, SCENE_INSIDE_GANONS_CASTLE, 2, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x53B */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_2_3, SCENE_INSIDE_GANONS_CASTLE, 2, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x53C */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_3, SCENE_INSIDE_GANONS_CASTLE, 3, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x53D */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_3_1, SCENE_INSIDE_GANONS_CASTLE, 3, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x53E */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_3_2, SCENE_INSIDE_GANONS_CASTLE, 3, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x53F */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_3_3, SCENE_INSIDE_GANONS_CASTLE, 3, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x540 */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_4, SCENE_INSIDE_GANONS_CASTLE, 4, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x541 */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_4_1, SCENE_INSIDE_GANONS_CASTLE, 4, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x542 */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_4_2, SCENE_INSIDE_GANONS_CASTLE, 4, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x543 */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_4_3, SCENE_INSIDE_GANONS_CASTLE, 4, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x544 */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_5, SCENE_INSIDE_GANONS_CASTLE, 5, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x545 */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_5_1, SCENE_INSIDE_GANONS_CASTLE, 5, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x546 */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_5_2, SCENE_INSIDE_GANONS_CASTLE, 5, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x547 */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_5_3, SCENE_INSIDE_GANONS_CASTLE, 5, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x548 */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_6, SCENE_INSIDE_GANONS_CASTLE, 6, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x549 */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_6_1, SCENE_INSIDE_GANONS_CASTLE, 6, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x54A */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_6_2, SCENE_INSIDE_GANONS_CASTLE, 6, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x54B */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_6_3, SCENE_INSIDE_GANONS_CASTLE, 6, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x54C */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_7, SCENE_INSIDE_GANONS_CASTLE, 7, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x54D */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_7_1, SCENE_INSIDE_GANONS_CASTLE, 7, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x54E */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_7_2, SCENE_INSIDE_GANONS_CASTLE, 7, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x54F */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_7_3, SCENE_INSIDE_GANONS_CASTLE, 7, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x550 */ DEFINE_ENTRANCE(ENTR_HOUSE_OF_SKULLTULA_0, SCENE_HOUSE_OF_SKULLTULA, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x551 */ DEFINE_ENTRANCE(ENTR_HOUSE_OF_SKULLTULA_0_1, SCENE_HOUSE_OF_SKULLTULA, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x552 */ DEFINE_ENTRANCE(ENTR_HOUSE_OF_SKULLTULA_0_2, SCENE_HOUSE_OF_SKULLTULA, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x553 */ DEFINE_ENTRANCE(ENTR_HOUSE_OF_SKULLTULA_0_3, SCENE_HOUSE_OF_SKULLTULA, 0, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x554 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_14, SCENE_KAKARIKO_VILLAGE, 14, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x555 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_14_1, SCENE_KAKARIKO_VILLAGE, 14, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x556 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_14_2, SCENE_KAKARIKO_VILLAGE, 14, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x557 */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_14_3, SCENE_KAKARIKO_VILLAGE, 14, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x558 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_8, SCENE_LON_LON_RANCH, 8, false, false, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x559 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_8_1, SCENE_LON_LON_RANCH, 8, false, false, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x55A */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_8_2, SCENE_LON_LON_RANCH, 8, false, false, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x55B */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_8_3, SCENE_LON_LON_RANCH, 8, false, false, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x55C */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_9, SCENE_LON_LON_RANCH, 9, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x55D */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_9_1, SCENE_LON_LON_RANCH, 9, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x55E */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_9_2, SCENE_LON_LON_RANCH, 9, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x55F */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_9_3, SCENE_LON_LON_RANCH, 9, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x560 */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_7, SCENE_LAKE_HYLIA, 7, false, true, TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST)) +/* 0x561 */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_7_1, SCENE_LAKE_HYLIA, 7, false, true, TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST)) +/* 0x562 */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_7_2, SCENE_LAKE_HYLIA, 7, false, true, TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST)) +/* 0x563 */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_7_3, SCENE_LAKE_HYLIA, 7, false, true, TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST), TRANS_TYPE_CIRCLE(TCA_RIPPLE, TCC_WHITE, TCS_FAST)) + +/* 0x564 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_5, SCENE_DEATH_MOUNTAIN_CRATER, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x565 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_5_1, SCENE_DEATH_MOUNTAIN_CRATER, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x566 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_5_2, SCENE_DEATH_MOUNTAIN_CRATER, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x567 */ DEFINE_ENTRANCE(ENTR_DEATH_MOUNTAIN_CRATER_5_3, SCENE_DEATH_MOUNTAIN_CRATER, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x568 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_7, SCENE_GRAVEYARD, 7, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x569 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_7_1, SCENE_GRAVEYARD, 7, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x56A */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_7_2, SCENE_GRAVEYARD, 7, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x56B */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_7_3, SCENE_GRAVEYARD, 7, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) + +/* 0x56C */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_COLLAPSE_0, SCENE_INSIDE_GANONS_CASTLE_COLLAPSE, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x56D */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_COLLAPSE_0_1, SCENE_INSIDE_GANONS_CASTLE_COLLAPSE, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x56E */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_COLLAPSE_0_2, SCENE_INSIDE_GANONS_CASTLE_COLLAPSE, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x56F */ DEFINE_ENTRANCE(ENTR_INSIDE_GANONS_CASTLE_COLLAPSE_0_3, SCENE_INSIDE_GANONS_CASTLE_COLLAPSE, 0, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x570 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_12, SCENE_THIEVES_HIDEOUT, 12, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x571 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_12_1, SCENE_THIEVES_HIDEOUT, 12, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x572 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_12_2, SCENE_THIEVES_HIDEOUT, 12, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x573 */ DEFINE_ENTRANCE(ENTR_THIEVES_HIDEOUT_12_3, SCENE_THIEVES_HIDEOUT, 12, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x574 */ DEFINE_ENTRANCE(ENTR_ROYAL_FAMILYS_TOMB_1, SCENE_ROYAL_FAMILYS_TOMB, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x575 */ DEFINE_ENTRANCE(ENTR_ROYAL_FAMILYS_TOMB_1_1, SCENE_ROYAL_FAMILYS_TOMB, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x576 */ DEFINE_ENTRANCE(ENTR_ROYAL_FAMILYS_TOMB_1_2, SCENE_ROYAL_FAMILYS_TOMB, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x577 */ DEFINE_ENTRANCE(ENTR_ROYAL_FAMILYS_TOMB_1_3, SCENE_ROYAL_FAMILYS_TOMB, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x578 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_1, SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x579 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_1_1, SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x57A */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_1_2, SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x57B */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_1_3, SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) + +/* 0x57C */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_7, SCENE_DESERT_COLOSSUS, 7, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x57D */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_7_1, SCENE_DESERT_COLOSSUS, 7, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x57E */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_7_2, SCENE_DESERT_COLOSSUS, 7, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x57F */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_7_3, SCENE_DESERT_COLOSSUS, 7, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x580 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_8, SCENE_GRAVEYARD, 8, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x581 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_8_1, SCENE_GRAVEYARD, 8, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x582 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_8_2, SCENE_GRAVEYARD, 8, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x583 */ DEFINE_ENTRANCE(ENTR_GRAVEYARD_8_3, SCENE_GRAVEYARD, 8, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) + +/* 0x584 */ DEFINE_ENTRANCE(ENTR_FOREST_TEMPLE_2, SCENE_FOREST_TEMPLE, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x585 */ DEFINE_ENTRANCE(ENTR_FOREST_TEMPLE_2_1, SCENE_FOREST_TEMPLE, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x586 */ DEFINE_ENTRANCE(ENTR_FOREST_TEMPLE_2_2, SCENE_FOREST_TEMPLE, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x587 */ DEFINE_ENTRANCE(ENTR_FOREST_TEMPLE_2_3, SCENE_FOREST_TEMPLE, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x588 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_2, SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x589 */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_2_1, SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x58A */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_2_2, SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x58B */ DEFINE_ENTRANCE(ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_2_3, SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x58C */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_5, SCENE_TEMPLE_OF_TIME, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x58D */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_5_1, SCENE_TEMPLE_OF_TIME, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x58E */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_5_2, SCENE_TEMPLE_OF_TIME, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x58F */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_5_3, SCENE_TEMPLE_OF_TIME, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x590 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_6, SCENE_TEMPLE_OF_TIME, 6, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x591 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_6_1, SCENE_TEMPLE_OF_TIME, 6, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x592 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_6_2, SCENE_TEMPLE_OF_TIME, 6, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x593 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_6_3, SCENE_TEMPLE_OF_TIME, 6, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x594 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_17, SCENE_HYRULE_FIELD, 17, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x595 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_17_1, SCENE_HYRULE_FIELD, 17, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x596 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_17_2, SCENE_HYRULE_FIELD, 17, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x597 */ DEFINE_ENTRANCE(ENTR_HYRULE_FIELD_17_3, SCENE_HYRULE_FIELD, 17, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x598 */ DEFINE_ENTRANCE(ENTR_GROTTOS_1, SCENE_GROTTOS, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x599 */ DEFINE_ENTRANCE(ENTR_GROTTOS_1_1, SCENE_GROTTOS, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x59A */ DEFINE_ENTRANCE(ENTR_GROTTOS_1_2, SCENE_GROTTOS, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x59B */ DEFINE_ENTRANCE(ENTR_GROTTOS_1_3, SCENE_GROTTOS, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x59C */ DEFINE_ENTRANCE(ENTR_GROTTOS_2, SCENE_GROTTOS, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x59D */ DEFINE_ENTRANCE(ENTR_GROTTOS_2_1, SCENE_GROTTOS, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x59E */ DEFINE_ENTRANCE(ENTR_GROTTOS_2_2, SCENE_GROTTOS, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x59F */ DEFINE_ENTRANCE(ENTR_GROTTOS_2_3, SCENE_GROTTOS, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x5A0 */ DEFINE_ENTRANCE(ENTR_GROTTOS_3, SCENE_GROTTOS, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5A1 */ DEFINE_ENTRANCE(ENTR_GROTTOS_3_1, SCENE_GROTTOS, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5A2 */ DEFINE_ENTRANCE(ENTR_GROTTOS_3_2, SCENE_GROTTOS, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5A3 */ DEFINE_ENTRANCE(ENTR_GROTTOS_3_3, SCENE_GROTTOS, 3, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x5A4 */ DEFINE_ENTRANCE(ENTR_GROTTOS_4, SCENE_GROTTOS, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5A5 */ DEFINE_ENTRANCE(ENTR_GROTTOS_4_1, SCENE_GROTTOS, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5A6 */ DEFINE_ENTRANCE(ENTR_GROTTOS_4_2, SCENE_GROTTOS, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5A7 */ DEFINE_ENTRANCE(ENTR_GROTTOS_4_3, SCENE_GROTTOS, 4, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x5A8 */ DEFINE_ENTRANCE(ENTR_GROTTOS_5, SCENE_GROTTOS, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_WHITE) +/* 0x5A9 */ DEFINE_ENTRANCE(ENTR_GROTTOS_5_1, SCENE_GROTTOS, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_WHITE) +/* 0x5AA */ DEFINE_ENTRANCE(ENTR_GROTTOS_5_2, SCENE_GROTTOS, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_WHITE) +/* 0x5AB */ DEFINE_ENTRANCE(ENTR_GROTTOS_5_3, SCENE_GROTTOS, 5, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_WHITE) + +/* 0x5AC */ DEFINE_ENTRANCE(ENTR_GROTTOS_6, SCENE_GROTTOS, 6, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5AD */ DEFINE_ENTRANCE(ENTR_GROTTOS_6_1, SCENE_GROTTOS, 6, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5AE */ DEFINE_ENTRANCE(ENTR_GROTTOS_6_2, SCENE_GROTTOS, 6, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5AF */ DEFINE_ENTRANCE(ENTR_GROTTOS_6_3, SCENE_GROTTOS, 6, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x5B0 */ DEFINE_ENTRANCE(ENTR_GROTTOS_7, SCENE_GROTTOS, 7, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5B1 */ DEFINE_ENTRANCE(ENTR_GROTTOS_7_1, SCENE_GROTTOS, 7, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5B2 */ DEFINE_ENTRANCE(ENTR_GROTTOS_7_2, SCENE_GROTTOS, 7, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5B3 */ DEFINE_ENTRANCE(ENTR_GROTTOS_7_3, SCENE_GROTTOS, 7, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x5B4 */ DEFINE_ENTRANCE(ENTR_GROTTOS_8, SCENE_GROTTOS, 8, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5B5 */ DEFINE_ENTRANCE(ENTR_GROTTOS_8_1, SCENE_GROTTOS, 8, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5B6 */ DEFINE_ENTRANCE(ENTR_GROTTOS_8_2, SCENE_GROTTOS, 8, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5B7 */ DEFINE_ENTRANCE(ENTR_GROTTOS_8_3, SCENE_GROTTOS, 8, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x5B8 */ DEFINE_ENTRANCE(ENTR_GROTTOS_9, SCENE_GROTTOS, 9, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5B9 */ DEFINE_ENTRANCE(ENTR_GROTTOS_9_1, SCENE_GROTTOS, 9, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5BA */ DEFINE_ENTRANCE(ENTR_GROTTOS_9_2, SCENE_GROTTOS, 9, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5BB */ DEFINE_ENTRANCE(ENTR_GROTTOS_9_3, SCENE_GROTTOS, 9, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x5BC */ DEFINE_ENTRANCE(ENTR_GROTTOS_10, SCENE_GROTTOS, 10, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5BD */ DEFINE_ENTRANCE(ENTR_GROTTOS_10_1, SCENE_GROTTOS, 10, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5BE */ DEFINE_ENTRANCE(ENTR_GROTTOS_10_2, SCENE_GROTTOS, 10, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5BF */ DEFINE_ENTRANCE(ENTR_GROTTOS_10_3, SCENE_GROTTOS, 10, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x5C0 */ DEFINE_ENTRANCE(ENTR_GROTTOS_11, SCENE_GROTTOS, 11, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5C1 */ DEFINE_ENTRANCE(ENTR_GROTTOS_11_1, SCENE_GROTTOS, 11, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5C2 */ DEFINE_ENTRANCE(ENTR_GROTTOS_11_2, SCENE_GROTTOS, 11, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5C3 */ DEFINE_ENTRANCE(ENTR_GROTTOS_11_3, SCENE_GROTTOS, 11, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x5C4 */ DEFINE_ENTRANCE(ENTR_GROTTOS_12, SCENE_GROTTOS, 12, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5C5 */ DEFINE_ENTRANCE(ENTR_GROTTOS_12_1, SCENE_GROTTOS, 12, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5C6 */ DEFINE_ENTRANCE(ENTR_GROTTOS_12_2, SCENE_GROTTOS, 12, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5C7 */ DEFINE_ENTRANCE(ENTR_GROTTOS_12_3, SCENE_GROTTOS, 12, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x5C8 */ DEFINE_ENTRANCE(ENTR_IMPAS_HOUSE_1, SCENE_IMPAS_HOUSE, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x5C9 */ DEFINE_ENTRANCE(ENTR_IMPAS_HOUSE_1_1, SCENE_IMPAS_HOUSE, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x5CA */ DEFINE_ENTRANCE(ENTR_IMPAS_HOUSE_1_2, SCENE_IMPAS_HOUSE, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x5CB */ DEFINE_ENTRANCE(ENTR_IMPAS_HOUSE_1_3, SCENE_IMPAS_HOUSE, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x5CC */ DEFINE_ENTRANCE(ENTR_BOTTOM_OF_THE_WELL_1, SCENE_BOTTOM_OF_THE_WELL, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x5CD */ DEFINE_ENTRANCE(ENTR_BOTTOM_OF_THE_WELL_1_1, SCENE_BOTTOM_OF_THE_WELL, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x5CE */ DEFINE_ENTRANCE(ENTR_BOTTOM_OF_THE_WELL_1_2, SCENE_BOTTOM_OF_THE_WELL, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) +/* 0x5CF */ DEFINE_ENTRANCE(ENTR_BOTTOM_OF_THE_WELL_1_3, SCENE_BOTTOM_OF_THE_WELL, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK_FAST) + +/* 0x5D0 */ DEFINE_ENTRANCE(ENTR_LON_LON_BUILDINGS_1, SCENE_LON_LON_BUILDINGS, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x5D1 */ DEFINE_ENTRANCE(ENTR_LON_LON_BUILDINGS_1_1, SCENE_LON_LON_BUILDINGS, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x5D2 */ DEFINE_ENTRANCE(ENTR_LON_LON_BUILDINGS_1_2, SCENE_LON_LON_BUILDINGS, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x5D3 */ DEFINE_ENTRANCE(ENTR_LON_LON_BUILDINGS_1_3, SCENE_LON_LON_BUILDINGS, 1, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x5D4 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_10, SCENE_LON_LON_RANCH, 10, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x5D5 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_10_1, SCENE_LON_LON_RANCH, 10, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x5D6 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_10_2, SCENE_LON_LON_RANCH, 10, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x5D7 */ DEFINE_ENTRANCE(ENTR_LON_LON_RANCH_10_3, SCENE_LON_LON_RANCH, 10, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x5D8 */ DEFINE_ENTRANCE(ENTR_ICE_CAVERN_1, SCENE_ICE_CAVERN, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5D9 */ DEFINE_ENTRANCE(ENTR_ICE_CAVERN_1_1, SCENE_ICE_CAVERN, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5DA */ DEFINE_ENTRANCE(ENTR_ICE_CAVERN_1_2, SCENE_ICE_CAVERN, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5DB */ DEFINE_ENTRANCE(ENTR_ICE_CAVERN_1_3, SCENE_ICE_CAVERN, 1, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x5DC */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_15, SCENE_KAKARIKO_VILLAGE, 15, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x5DD */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_15_1, SCENE_KAKARIKO_VILLAGE, 15, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5DE */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_15_2, SCENE_KAKARIKO_VILLAGE, 15, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x5DF */ DEFINE_ENTRANCE(ENTR_KAKARIKO_VILLAGE_15_3, SCENE_KAKARIKO_VILLAGE, 15, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x5E0 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_9, SCENE_LOST_WOODS, 9, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5E1 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_9_1, SCENE_LOST_WOODS, 9, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5E2 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_9_2, SCENE_LOST_WOODS, 9, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5E3 */ DEFINE_ENTRANCE(ENTR_LOST_WOODS_9_3, SCENE_LOST_WOODS, 9, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x5E4 */ DEFINE_ENTRANCE(ENTR_LON_LON_BUILDINGS_2, SCENE_LON_LON_BUILDINGS, 2, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x5E5 */ DEFINE_ENTRANCE(ENTR_LON_LON_BUILDINGS_2_1, SCENE_LON_LON_BUILDINGS, 2, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x5E6 */ DEFINE_ENTRANCE(ENTR_LON_LON_BUILDINGS_2_2, SCENE_LON_LON_BUILDINGS, 2, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) +/* 0x5E7 */ DEFINE_ENTRANCE(ENTR_LON_LON_BUILDINGS_2_3, SCENE_LON_LON_BUILDINGS, 2, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)) + +/* 0x5E8 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_12, SCENE_KOKIRI_FOREST, 12, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x5E9 */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_12_1, SCENE_KOKIRI_FOREST, 12, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x5EA */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_12_2, SCENE_KOKIRI_FOREST, 12, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) +/* 0x5EB */ DEFINE_ENTRANCE(ENTR_KOKIRI_FOREST_12_3, SCENE_KOKIRI_FOREST, 12, false, true, TRANS_TYPE_FADE_BLACK_FAST, TRANS_TYPE_FADE_BLACK) + +/* 0x5EC */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_BOSS_2, SCENE_SPIRIT_TEMPLE_BOSS, 2, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5ED */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_BOSS_2_1, SCENE_SPIRIT_TEMPLE_BOSS, 2, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5EE */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_BOSS_2_2, SCENE_SPIRIT_TEMPLE_BOSS, 2, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5EF */ DEFINE_ENTRANCE(ENTR_SPIRIT_TEMPLE_BOSS_2_3, SCENE_SPIRIT_TEMPLE_BOSS, 2, true, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x5F0 */ DEFINE_ENTRANCE(ENTR_CASTLE_COURTYARD_ZELDA_1, SCENE_CASTLE_COURTYARD_ZELDA, 1, false, false, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x5F1 */ DEFINE_ENTRANCE(ENTR_CASTLE_COURTYARD_ZELDA_1_1, SCENE_CASTLE_COURTYARD_ZELDA, 1, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5F2 */ DEFINE_ENTRANCE(ENTR_CASTLE_COURTYARD_ZELDA_1_2, SCENE_CASTLE_COURTYARD_ZELDA, 1, false, false, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x5F3 */ DEFINE_ENTRANCE(ENTR_CASTLE_COURTYARD_ZELDA_1_3, SCENE_CASTLE_COURTYARD_ZELDA, 1, false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x5F4 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_7, SCENE_TEMPLE_OF_TIME, 7, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5F5 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_7_1, SCENE_TEMPLE_OF_TIME, 7, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5F6 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_7_2, SCENE_TEMPLE_OF_TIME, 7, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5F7 */ DEFINE_ENTRANCE(ENTR_TEMPLE_OF_TIME_7_3, SCENE_TEMPLE_OF_TIME, 7, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x5F8 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_18, SCENE_GERUDOS_FORTRESS, 18, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5F9 */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_18_1, SCENE_GERUDOS_FORTRESS, 18, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5FA */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_18_2, SCENE_GERUDOS_FORTRESS, 18, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5FB */ DEFINE_ENTRANCE(ENTR_GERUDOS_FORTRESS_18_3, SCENE_GERUDOS_FORTRESS, 18, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x5FC */ DEFINE_ENTRANCE(ENTR_GROTTOS_13, SCENE_GROTTOS, 13, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5FD */ DEFINE_ENTRANCE(ENTR_GROTTOS_13_1, SCENE_GROTTOS, 13, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5FE */ DEFINE_ENTRANCE(ENTR_GROTTOS_13_2, SCENE_GROTTOS, 13, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x5FF */ DEFINE_ENTRANCE(ENTR_GROTTOS_13_3, SCENE_GROTTOS, 13, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x600 */ DEFINE_ENTRANCE(ENTR_SACRED_FOREST_MEADOW_2, SCENE_SACRED_FOREST_MEADOW, 2, false, true, TRANS_TYPE_FADE_GREEN, TRANS_TYPE_FADE_GREEN) +/* 0x601 */ DEFINE_ENTRANCE(ENTR_SACRED_FOREST_MEADOW_2_1, SCENE_SACRED_FOREST_MEADOW, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x602 */ DEFINE_ENTRANCE(ENTR_SACRED_FOREST_MEADOW_2_2, SCENE_SACRED_FOREST_MEADOW, 2, false, true, TRANS_TYPE_FADE_GREEN, TRANS_TYPE_FADE_GREEN) +/* 0x603 */ DEFINE_ENTRANCE(ENTR_SACRED_FOREST_MEADOW_2_3, SCENE_SACRED_FOREST_MEADOW, 2, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x604 */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_8, SCENE_LAKE_HYLIA, 8, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x605 */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_8_1, SCENE_LAKE_HYLIA, 8, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x606 */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_8_2, SCENE_LAKE_HYLIA, 8, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) +/* 0x607 */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_8_3, SCENE_LAKE_HYLIA, 8, false, true, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK) + +/* 0x608 */ DEFINE_ENTRANCE(ENTR_SACRED_FOREST_MEADOW_3, SCENE_SACRED_FOREST_MEADOW, 3, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x609 */ DEFINE_ENTRANCE(ENTR_SACRED_FOREST_MEADOW_3_1, SCENE_SACRED_FOREST_MEADOW, 3, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x60A */ DEFINE_ENTRANCE(ENTR_SACRED_FOREST_MEADOW_3_2, SCENE_SACRED_FOREST_MEADOW, 3, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x60B */ DEFINE_ENTRANCE(ENTR_SACRED_FOREST_MEADOW_3_3, SCENE_SACRED_FOREST_MEADOW, 3, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) + +/* 0x60C */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_9, SCENE_LAKE_HYLIA, 9, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x60D */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_9_1, SCENE_LAKE_HYLIA, 9, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x60E */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_9_2, SCENE_LAKE_HYLIA, 9, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x60F */ DEFINE_ENTRANCE(ENTR_LAKE_HYLIA_9_3, SCENE_LAKE_HYLIA, 9, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) + +/* 0x610 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_8, SCENE_DESERT_COLOSSUS, 8, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x611 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_8_1, SCENE_DESERT_COLOSSUS, 8, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x612 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_8_2, SCENE_DESERT_COLOSSUS, 8, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) +/* 0x613 */ DEFINE_ENTRANCE(ENTR_DESERT_COLOSSUS_8_3, SCENE_DESERT_COLOSSUS, 8, false, true, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE) \ No newline at end of file diff --git a/soh/include/variables.h b/soh/include/variables.h index 200080bfa..154ef578a 100644 --- a/soh/include/variables.h +++ b/soh/include/variables.h @@ -46,9 +46,9 @@ extern "C" extern OSViMode osViModeFpalLan1; extern u32 __additional_scanline; extern u8 gBuildVersion[]; - extern s16 gBuildVersionMajor; - extern s16 gBuildVersionMinor; - extern s16 gBuildVersionPatch; + extern u16 gBuildVersionMajor; + extern u16 gBuildVersionMinor; + extern u16 gBuildVersionPatch; extern u8 gBuildTeam[]; extern u8 gBuildDate[]; extern u8 gBuildMakeOption[]; @@ -107,7 +107,7 @@ extern "C" extern s16 gLinkObjectIds[2]; extern u32 gObjectTableSize; extern RomFile gObjectTable[OBJECT_ID_MAX]; - extern EntranceInfo gEntranceTable[1556]; + extern EntranceInfo gEntranceTable[ENTR_MAX]; extern SceneTableEntry gSceneTable[SCENE_ID_MAX]; extern u16 gSramSlotOffsets[]; // 4 16-colors palettes diff --git a/soh/include/z64.h b/soh/include/z64.h index 23ffcfb17..e668b2e7a 100644 --- a/soh/include/z64.h +++ b/soh/include/z64.h @@ -1119,6 +1119,82 @@ typedef struct { /* 0x4C */ u32 unk_4C; } PreRender; // size = 0x50 +#define TRANS_TRIGGER_OFF 0 // transition is not active +#define TRANS_TRIGGER_START 20 // start transition (exiting an area) +#define TRANS_TRIGGER_END -20 // transition is ending (arriving in a new area) + +typedef enum { + /* 0 */ TRANS_MODE_OFF, + /* 1 */ TRANS_MODE_SETUP, + /* 2 */ TRANS_MODE_INSTANCE_INIT, + /* 3 */ TRANS_MODE_INSTANCE_RUNNING, + /* 4 */ TRANS_MODE_FILL_WHITE_INIT, + /* 5 */ TRANS_MODE_FILL_IN, + /* 6 */ TRANS_MODE_FILL_OUT, + /* 7 */ TRANS_MODE_FILL_BROWN_INIT, + /* 8 */ TRANS_MODE_08, // unused + /* 9 */ TRANS_MODE_09, // unused + /* 10 */ TRANS_MODE_INSTANT, + /* 11 */ TRANS_MODE_INSTANCE_WAIT, + /* 12 */ TRANS_MODE_SANDSTORM_INIT, + /* 13 */ TRANS_MODE_SANDSTORM, + /* 14 */ TRANS_MODE_SANDSTORM_END_INIT, + /* 15 */ TRANS_MODE_SANDSTORM_END, + /* 16 */ TRANS_MODE_CS_BLACK_FILL_INIT, + /* 17 */ TRANS_MODE_CS_BLACK_FILL +} TransitionMode; + +typedef enum { + /* 0 */ TRANS_TYPE_WIPE, + /* 1 */ TRANS_TYPE_TRIFORCE, + /* 2 */ TRANS_TYPE_FADE_BLACK, + /* 3 */ TRANS_TYPE_FADE_WHITE, + /* 4 */ TRANS_TYPE_FADE_BLACK_FAST, + /* 5 */ TRANS_TYPE_FADE_WHITE_FAST, + /* 6 */ TRANS_TYPE_FADE_BLACK_SLOW, + /* 7 */ TRANS_TYPE_FADE_WHITE_SLOW, + /* 8 */ TRANS_TYPE_WIPE_FAST, + /* 9 */ TRANS_TYPE_FILL_WHITE2, + /* 10 */ TRANS_TYPE_FILL_WHITE, + /* 11 */ TRANS_TYPE_INSTANT, + /* 12 */ TRANS_TYPE_FILL_BROWN, + /* 13 */ TRANS_TYPE_FADE_WHITE_CS_DELAYED, + /* 14 */ TRANS_TYPE_SANDSTORM_PERSIST, + /* 15 */ TRANS_TYPE_SANDSTORM_END, + /* 16 */ TRANS_TYPE_CS_BLACK_FILL, + /* 17 */ TRANS_TYPE_FADE_WHITE_INSTANT, + /* 18 */ TRANS_TYPE_FADE_GREEN, + /* 19 */ TRANS_TYPE_FADE_BLUE, + // transition types 20 - 31 are unused + // transition types 32 - 55 are constructed using the TRANS_TYPE_CIRCLE macro + /* 56 */ TRANS_TYPE_MAX = 56 +} TransitionType; + +#define TRANS_NEXT_TYPE_DEFAULT 0xFF // when `nextTransitionType` is set to default, the type will be taken from the entrance table for the ending transition + +typedef enum { + /* 0 */ TCA_NORMAL, + /* 1 */ TCA_WAVE, + /* 2 */ TCA_RIPPLE, + /* 3 */ TCA_STARBURST +} TransitionCircleAppearance; + +typedef enum { + /* 0 */ TCC_BLACK, + /* 1 */ TCC_WHITE, + /* 2 */ TCC_GRAY, + /* 3 */ TCC_SPECIAL // color varies depending on appearance. unused and appears broken +} TransitionCircleColor; + +typedef enum { + /* 0 */ TCS_FAST, + /* 1 */ TCS_SLOW +} TransitionCircleSpeed; + +#define TC_SET_PARAMS (1 << 7) + +#define TRANS_TYPE_CIRCLE(appearance, color, speed) ((1 << 5) | ((color & 3) << 3) | ((appearance & 3) << 1) | (speed & 1)) + typedef struct { union { TransitionFade fade; @@ -1381,14 +1457,14 @@ typedef struct PlayState { /* 0x11E0C */ ElfMessage* cUpElfMsgs; /* 0x11E10 */ void* specialEffects; /* 0x11E14 */ u8 skyboxId; - /* 0x11E15 */ s8 sceneLoadFlag; // "fade_direction" + /* 0x11E15 */ s8 transitionTrigger; // "fade_direction" /* 0x11E16 */ s16 unk_11E16; /* 0x11E18 */ s16 unk_11E18; /* 0x11E1A */ s16 nextEntranceIndex; /* 0x11E1C */ char unk_11E1C[0x40]; /* 0x11E5C */ s8 shootingGalleryStatus; /* 0x11E5D */ s8 bombchuBowlingStatus; // "bombchu_game_flag" - /* 0x11E5E */ u8 fadeTransition; + /* 0x11E5E */ u8 transitionType; /* 0x11E60 */ CollisionCheckContext colChkCtx; /* 0x120FC */ u16 envFlags[20]; /* 0x12124 */ PreRender pauseBgPreRender; @@ -1510,6 +1586,20 @@ typedef struct { uint16_t bossRushArrowOffset; } FileChooseContext; // size = 0x1CAE0 +// Macros for `EntranceInfo.field` +#define ENTRANCE_INFO_CONTINUE_BGM_FLAG (1 << 15) +#define ENTRANCE_INFO_DISPLAY_TITLE_CARD_FLAG (1 << 14) +#define ENTRANCE_INFO_END_TRANS_TYPE_MASK 0x3F80 +#define ENTRANCE_INFO_END_TRANS_TYPE_SHIFT 7 +#define ENTRANCE_INFO_END_TRANS_TYPE(field) \ + (((field) >> ENTRANCE_INFO_END_TRANS_TYPE_SHIFT) \ + & (ENTRANCE_INFO_END_TRANS_TYPE_MASK >> ENTRANCE_INFO_END_TRANS_TYPE_SHIFT)) +#define ENTRANCE_INFO_START_TRANS_TYPE_MASK 0x7F +#define ENTRANCE_INFO_START_TRANS_TYPE_SHIFT 0 +#define ENTRANCE_INFO_START_TRANS_TYPE(field) \ + (((field) >> ENTRANCE_INFO_START_TRANS_TYPE_SHIFT) \ + & (ENTRANCE_INFO_START_TRANS_TYPE_MASK >> ENTRANCE_INFO_START_TRANS_TYPE_SHIFT)) + typedef enum { DPM_UNK = 0, DPM_PLAYER = 1, diff --git a/soh/include/z64environment.h b/soh/include/z64environment.h index b2badccd3..8cb69ddc4 100644 --- a/soh/include/z64environment.h +++ b/soh/include/z64environment.h @@ -30,6 +30,14 @@ typedef enum { /* 13 */ SKYBOX_DMA_PAL2_START } SkyboxDmaState; +typedef enum { + /* 0 */ SANDSTORM_OFF, + /* 1 */ SANDSTORM_FILL, + /* 2 */ SANDSTORM_UNFILL, + /* 3 */ SANDSTORM_ACTIVE, + /* 4 */ SANDSTORM_DISSIPATE +} SandstormState; + typedef struct { /* 0x00 */ u8 state; /* 0x01 */ u8 flashRed; diff --git a/soh/include/z64player.h b/soh/include/z64player.h index ff30cc170..73b5166e2 100644 --- a/soh/include/z64player.h +++ b/soh/include/z64player.h @@ -494,8 +494,8 @@ typedef struct { #define PLAYER_STATE3_RESTORE_NAYRUS_LOVE (1 << 6) // Set by ocarina effects actors when destroyed to signal Nayru's Love may be restored (see `ACTOROVL_ALLOC_ABSOLUTE`) #define PLAYER_STATE3_HOOKSHOT_TRAVELLING (1 << 7) //Travelling to target -typedef void (*PlayerFunc674)(struct Player*, struct PlayState*); -typedef s32 (*PlayerFunc82C)(struct Player*, struct PlayState*); +typedef void (*PlayerActionFunc)(struct Player*, struct PlayState*); +typedef s32 (*UpperActionFunc)(struct Player*, struct PlayState*); typedef void (*PlayerFuncA74)(struct PlayState*, struct Player*); typedef struct Player { @@ -512,7 +512,7 @@ typedef struct Player { /* 0x0155 */ char unk_155[0x003]; /* 0x0158 */ u8 modelGroup; /* 0x0159 */ u8 nextModelGroup; - /* 0x015A */ s8 unk_15A; + /* 0x015A */ s8 itemChangeType; /* 0x015B */ u8 modelAnimType; /* 0x015C */ u8 leftHandType; /* 0x015D */ u8 rightHandType; @@ -548,11 +548,11 @@ typedef struct Player { /* 0x043C */ s8 mountSide; /* 0x043D */ char unk_43D[0x003]; /* 0x0440 */ Actor* rideActor; - /* 0x0444 */ u8 csMode; - /* 0x0445 */ u8 prevCsMode; - /* 0x0446 */ u8 unk_446; + /* 0x0444 */ u8 csAction; + /* 0x0445 */ u8 prevCsAction; + /* 0x0446 */ u8 cueId; /* 0x0447 */ u8 unk_447; - /* 0x0448 */ Actor* unk_448; + /* 0x0448 */ Actor* csActor; /* 0x044C */ char unk_44C[0x004]; /* 0x0450 */ Vec3f unk_450; /* 0x045C */ Vec3f unk_45C; @@ -567,7 +567,7 @@ typedef struct Player { /* 0x0668 */ char unk_668[0x004]; /* 0x066C */ s32 unk_66C; /* 0x0670 */ s32 meleeWeaponEffectIndex; - /* 0x0674 */ PlayerFunc674 func_674; + /* 0x0674 */ PlayerActionFunc actionFunc; /* 0x0678 */ PlayerAgeProperties* ageProperties; /* 0x067C */ u32 stateFlags1; /* 0x0680 */ u32 stateFlags2; @@ -581,7 +581,7 @@ typedef struct Player { /* 0x0698 */ f32 targetActorDistance; /* 0x069C */ char unk_69C[0x004]; /* 0x06A0 */ f32 unk_6A0; - /* 0x06A4 */ f32 unk_6A4; + /* 0x06A4 */ f32 closestSecretDistSq; /* 0x06A8 */ Actor* unk_6A8; /* 0x06AC */ s8 unk_6AC; /* 0x06AD */ u8 unk_6AD; @@ -596,18 +596,18 @@ typedef struct Player { /* 0x06C0 */ s16 unk_6C0; /* 0x06C2 */ s16 unk_6C2; /* 0x06C4 */ f32 unk_6C4; - /* 0x06C8 */ SkelAnime skelAnime2; - /* 0x070C */ Vec3s jointTable2[PLAYER_LIMB_BUF_COUNT]; - /* 0x079C */ Vec3s morphTable2[PLAYER_LIMB_BUF_COUNT]; - /* 0x082C */ PlayerFunc82C func_82C; - /* 0x0830 */ f32 unk_830; + /* 0x06C8 */ SkelAnime upperSkelAnime; + /* 0x070C */ Vec3s upperJointTable[PLAYER_LIMB_BUF_COUNT]; + /* 0x079C */ Vec3s upperMorphTable[PLAYER_LIMB_BUF_COUNT]; + /* 0x082C */ UpperActionFunc upperActionFunc; + /* 0x0830 */ f32 upperAnimBlendWeight; /* 0x0834 */ s16 unk_834; /* 0x0836 */ s8 unk_836; /* 0x0837 */ u8 unk_837; /* 0x0838 */ f32 linearVelocity; /* 0x083C */ s16 currentYaw; /* 0x083E */ s16 targetYaw; - /* 0x0840 */ u16 unk_840; + /* 0x0840 */ u16 underwaterTimer; /* 0x0842 */ s8 meleeWeaponAnimation; /* 0x0843 */ s8 meleeWeaponState; /* 0x0844 */ s8 unk_844; @@ -631,8 +631,8 @@ typedef struct Player { /* 0x087C */ s16 unk_87C; /* 0x087E */ s16 unk_87E; /* 0x0880 */ f32 unk_880; - /* 0x0884 */ f32 wallHeight; // height used to determine whether link can climb or grab a ledge at the top - /* 0x0888 */ f32 wallDistance; // distance to the colliding wall plane + /* 0x0884 */ f32 yDistToLedge; // y distance to ground above an interact wall. LEDGE_DIST_MAX if no ground is found + /* 0x0888 */ f32 distToInteractWall; // distance to the colliding wall plane /* 0x088C */ u8 unk_88C; /* 0x088D */ u8 unk_88D; /* 0x088E */ u8 unk_88E; @@ -643,17 +643,17 @@ typedef struct Player { /* 0x0893 */ u8 hoverBootsTimer; /* 0x0894 */ s16 fallStartHeight; // last truncated Y position before falling /* 0x0896 */ s16 fallDistance; // truncated Y distance the player has fallen so far (positive is down) - /* 0x0898 */ s16 unk_898; - /* 0x089A */ s16 unk_89A; + /* 0x0898 */ s16 floorPitch; // angle of the floor slope in the direction of current world yaw (positive for ascending slope) + /* 0x089A */ s16 floorPitchAlt; // the calculation for this value is bugged and doesn't represent anything meaningful /* 0x089C */ s16 unk_89C; - /* 0x089E */ u16 unk_89E; + /* 0x089E */ u16 floorSfxOffset; /* 0x08A0 */ u8 unk_8A0; /* 0x08A1 */ u8 unk_8A1; /* 0x08A2 */ s16 unk_8A2; /* 0x08A4 */ f32 unk_8A4; /* 0x08A8 */ f32 unk_8A8; - /* 0x08AC */ f32 windSpeed; // Pushing player, examples include water currents, floor conveyors, climbing sloped surfaces // Upstream TODO: pushedSpeed - /* 0x08B0 */ s16 windDirection; // Yaw direction of player being pushed // Upstream TODO: pushedYaw + /* 0x08AC */ f32 pushedSpeed; // Pushing player, examples include water currents, floor conveyors, climbing sloped surfaces + /* 0x08B0 */ s16 pushedYaw; // Yaw direction of player being pushed /* 0x08B4 */ WeaponInfo meleeWeaponInfo[3]; /* 0x0908 */ Vec3f bodyPartsPos[PLAYER_BODYPART_MAX]; /* 0x09E0 */ MtxF mf_9E0; diff --git a/soh/include/z64save.h b/soh/include/z64save.h index e3d1dd8d1..7f7189b5f 100644 --- a/soh/include/z64save.h +++ b/soh/include/z64save.h @@ -269,10 +269,10 @@ typedef struct { /* 0x1420 */ s16 worldMapArea; /* 0x1422 */ s16 sunsSongState; // controls the effects of suns song /* 0x1424 */ s16 healthAccumulator; - /* 0x1426 */ u16 pendingSale; - /* 0x1428 */ u16 pendingSaleMod; // #region SOH [General] // Upstream TODO: Move these to their own struct or name to more obviously specific to SoH + /* */ u16 pendingSale; + /* */ u16 pendingSaleMod; /* */ uint8_t questId; /* */ uint32_t isBossRushPaused; /* */ uint8_t bossRushOptions[BOSSRUSH_OPTIONS_AMOUNT]; @@ -284,6 +284,7 @@ typedef struct { // #region SOH [Randomizer] // Upstream TODO: Move these to their own struct or name to more obviously specific to Randomizer /* */ u16 randomizerInf[10]; + /* */ u8 mqDungeonCount; /* */ u16 adultTradeItems; /* */ u8 triforcePiecesCollected; // #endregion diff --git a/soh/include/z64scene.h b/soh/include/z64scene.h index f14af0c4f..697c97503 100644 --- a/soh/include/z64scene.h +++ b/soh/include/z64scene.h @@ -316,8 +316,34 @@ enum SceneID { /* 0x6E */ SCENE_ID_MAX }; +// this define exists to preserve shiftability for an unused scene that is +// listed in the entrance table +#define SCENE_UNUSED_6E SCENE_ID_MAX + #undef DEFINE_SCENE +// Entrance Index Enum +#define DEFINE_ENTRANCE(enum, _1, _2, _3, _4, _5, _6) enum, + +typedef enum { + #include "tables/entrance_table.h" + /* 0x614 */ ENTR_MAX +} EntranceIndex; + +#define ENTR_LOAD_OPENING -1 + +typedef enum { + /* 0x7FF9 */ ENTR_RETURN_YOUSEI_IZUMI_YOKO = 0x7FF9, // Great Fairy Fountain (spells) + /* 0x7FFA */ ENTR_RETURN_SYATEKIJYOU, // Shooting gallery + /* 0x7FFB */ ENTR_RETURN_2, // unused + /* 0x7FFC */ ENTR_RETURN_SHOP1, // Bazaar + /* 0x7FFD */ ENTR_RETURN_4, // unused + /* 0x7FFE */ ENTR_RETURN_DAIYOUSEI_IZUMI, // Great Fairy Fountain (magic, double magic, double defense) + /* 0x7FFF */ ENTR_RETURN_GROTTO // Grottos and normal Fairy Fountain +} ReturnEntranceIndex; + +#undef DEFINE_ENTRANCE + typedef enum { /* 0 */ SDC_DEFAULT, /* 1 */ SDC_HYRULE_FIELD, diff --git a/soh/include/z64transition.h b/soh/include/z64transition.h index 30b1246f5..5a59e958b 100644 --- a/soh/include/z64transition.h +++ b/soh/include/z64transition.h @@ -50,11 +50,16 @@ typedef struct { /* 0x004 */ Color_RGBA8_u32 envColor; /* 0x008 */ s32 texX; /* 0x00C */ s32 texY; - /* 0x010 */ s32 step; - /* 0x014 */ u8 unk_14; - /* 0x015 */ u8 typeColor; - /* 0x016 */ u8 speed; - /* 0x017 */ u8 effect; + // /* 0x010 */ s32 step; + // /* 0x014 */ u8 unk_14; + // /* 0x015 */ u8 typeColor; + // /* 0x016 */ u8 speed; + // /* 0x017 */ u8 effect; + /* 0x010 */ s32 speed; + /* 0x014 */ u8 direction; + /* 0x015 */ u8 colorType; + /* 0x016 */ u8 speedType; + /* 0x017 */ u8 appearanceType; /* 0x018 */ u8 isDone; /* 0x019 */ u8 frame; /* 0x01A */ u16 normal; diff --git a/soh/macosx/soh-macos.sh b/soh/macosx/soh-macos.sh.in similarity index 98% rename from soh/macosx/soh-macos.sh rename to soh/macosx/soh-macos.sh.in index 4b5871892..0983f63b1 100755 --- a/soh/macosx/soh-macos.sh +++ b/soh/macosx/soh-macos.sh.in @@ -219,21 +219,24 @@ if [ ! -e "$SHIP_HOME"/oot.otr ] || [ ! -e "$SHIP_HOME"/oot-mq.otr ]; then *) osascript -e 'display notification "One or more invalid ROM provided" with title "Ship Of Harkinian"' rm -r "$ASSETDIR" + cd "$SNAME" continue; esac # Only generate OTR if we don't have on of this type yet if [ -e "$SHIP_HOME"/"$OTRNAME" ]; then rm -r "$ASSETDIR" + cd "$SNAME" continue; fi osascript -e 'display notification "Generating OTR..." with title "Ship Of Harkinian"' - assets/extractor/ZAPD.out ed -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 + assets/extractor/ZAPD.out ed -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 --portVer "@CMAKE_PROJECT_VERSION@" if [ -e "$ASSETDIR"/oot.otr ]; then osascript -e 'display notification "OTR successfully generated" with title "Ship Of Harkinian"' cp "$ASSETDIR"/oot.otr "$SHIP_HOME"/"$OTRNAME" rm -r "$ASSETDIR" + cd "$SNAME" fi done @@ -243,6 +246,8 @@ if [ ! -e "$SHIP_HOME"/oot.otr ] || [ ! -e "$SHIP_HOME"/oot-mq.otr ]; then fi fi +cd "$SNAME" + arch_name="$(uname -m)" launch_arch="arm64" if [ "${arch_name}" = "x86_64" ] && [ "$(sysctl -in sysctl.proc_translated)" != "1" ]; then diff --git a/soh/soh/ActorDB.cpp b/soh/soh/ActorDB.cpp index 2cf4d8fe7..a66048b32 100644 --- a/soh/soh/ActorDB.cpp +++ b/soh/soh/ActorDB.cpp @@ -439,7 +439,7 @@ static std::unordered_map actorDescriptions = { { ACTOR_EN_DAIKU_KAKARIKO, "Carpenters (Kakariko)" }, { ACTOR_BG_BOWL_WALL, "Bombchu Bowling Alley Wall" }, { ACTOR_EN_WALL_TUBO, "Bombchu Bowling Alley Bullseyes" }, - { ACTOR_EN_PO_DESERT, "Poe Guide (Desert Wasteland)" }, + { ACTOR_EN_PO_DESERT, "Poe Guide (Haunted Wasteland)" }, { ACTOR_EN_CROW, "Guay" }, { ACTOR_DOOR_KILLER, "Fake Door" }, { ACTOR_BG_SPOT11_OASIS, "Oasis (Desert Colossus)" }, diff --git a/soh/soh/Enhancements/audio/AudioCollection.cpp b/soh/soh/Enhancements/audio/AudioCollection.cpp index 63456f748..9da742f91 100644 --- a/soh/soh/Enhancements/audio/AudioCollection.cpp +++ b/soh/soh/Enhancements/audio/AudioCollection.cpp @@ -114,12 +114,12 @@ AudioCollection::AudioCollection() { SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_4, "End Credits IV", "NA_BGM_STAFF_4", SEQ_BGM_EVENT, false, false), // Previously SEQ_UNUSED, so not shown anywhere? // SEQ_INSTRUMENT - SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 1, "Ocarina", "OCARINA_INSTRUMENT_DEFAULT", SEQ_INSTRUMENT, true, false), - SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 2, "Malon", "OCARINA_INSTRUMENT_MALON", SEQ_INSTRUMENT, true, false), - SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 3, "Whistle", "OCARINA_INSTRUMENT_WHISTLE", SEQ_INSTRUMENT, true, false), - SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 4, "Harp", "OCARINA_INSTRUMENT_HARP", SEQ_INSTRUMENT, true, false), - SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 5, "Organ", "OCARINA_INSTRUMENT_GRIND_ORGAN", SEQ_INSTRUMENT, true, false), - SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 6, "Flute", "OCARINA_INSTRUMENT_FLUTE", SEQ_INSTRUMENT, true, false), + SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 1, "Ocarina", "OCARINA_INSTRUMENT_DEFAULT", SEQ_INSTRUMENT, true, true), + SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 2, "Malon", "OCARINA_INSTRUMENT_MALON", SEQ_INSTRUMENT, true, true), + SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 3, "Whistle", "OCARINA_INSTRUMENT_WHISTLE", SEQ_INSTRUMENT, true, true), + SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 4, "Harp", "OCARINA_INSTRUMENT_HARP", SEQ_INSTRUMENT, true, true), + SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 5, "Organ", "OCARINA_INSTRUMENT_GRIND_ORGAN", SEQ_INSTRUMENT, true, true), + SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 6, "Flute", "OCARINA_INSTRUMENT_FLUTE", SEQ_INSTRUMENT, true, true), // SEQ_SFX SEQUENCE_MAP_ENTRY(NA_SE_EV_SMALL_DOG_BARK, "Bark", "NA_SE_EV_SMALL_DOG_BARK", SEQ_SFX, true, true), @@ -400,8 +400,9 @@ void AudioCollection::InitializeShufflePool() { if (shufflePoolInitialized) return; for (auto& [seqId, seqInfo] : sequenceMap) { + if (!seqInfo.canBeUsedAsReplacement) continue; const std::string cvarKey = "gAudioEditor.Excluded." + seqInfo.sfxKey; - if (CVarGetInteger(cvarKey.c_str(), 0) && !seqInfo.canBeUsedAsReplacement) { + if (CVarGetInteger(cvarKey.c_str(), 0)) { excludedSequences.insert(&seqInfo); } else { includedSequences.insert(&seqInfo); diff --git a/soh/soh/Enhancements/boss-rush/BossRush.cpp b/soh/soh/Enhancements/boss-rush/BossRush.cpp index 9c5311922..63414f88c 100644 --- a/soh/soh/Enhancements/boss-rush/BossRush.cpp +++ b/soh/soh/Enhancements/boss-rush/BossRush.cpp @@ -175,33 +175,33 @@ void BossRush_HandleBlueWarp(PlayState* play, f32 warpPosX, f32 warpPosZ) { // Gohma & Phantom Ganon if (warpPosX == -100 && warpPosZ == -170) { if (gSaveContext.linkAge == LINK_AGE_CHILD) { - play->nextEntranceIndex = 0x040F; + play->nextEntranceIndex = ENTR_DEKU_TREE_BOSS_0; } else { - play->nextEntranceIndex = 0x000C; + play->nextEntranceIndex = ENTR_FOREST_TEMPLE_BOSS_0; } // King Dodongo & Volvagia } else if (warpPosX == 100 && warpPosZ == -170) { if (gSaveContext.linkAge == LINK_AGE_CHILD) { - play->nextEntranceIndex = 0x040B; + play->nextEntranceIndex = ENTR_DODONGOS_CAVERN_BOSS_0; } else { - play->nextEntranceIndex = 0x0305; + play->nextEntranceIndex = ENTR_FIRE_TEMPLE_BOSS_0; } // Barinade & Morb } else if (warpPosX == 199 && warpPosZ == 0) { if (gSaveContext.linkAge == LINK_AGE_CHILD) { - play->nextEntranceIndex = 0x0301; + play->nextEntranceIndex = ENTR_JABU_JABU_BOSS_0; } else { - play->nextEntranceIndex = 0x0417; + play->nextEntranceIndex = ENTR_WATER_TEMPLE_BOSS_0; } // Twinrova } else if (warpPosX == 100 && warpPosZ == 170) { - play->nextEntranceIndex = 0x05EC; + play->nextEntranceIndex = ENTR_SPIRIT_TEMPLE_BOSS_2; // Bongo Bongo } else if (warpPosX == -100 && warpPosZ == 170) { - play->nextEntranceIndex = 0x0413; + play->nextEntranceIndex = ENTR_SHADOW_TEMPLE_BOSS_0; // Ganondork } else if (warpPosX == -199 && warpPosZ == 0) { - play->nextEntranceIndex = 0x041F; + play->nextEntranceIndex = ENTR_GANONDORF_BOSS_0; } // If coming from a boss room, teleport back to Chamber of Sages and set flag. } else { @@ -216,10 +216,10 @@ void BossRush_HandleBlueWarp(PlayState* play, f32 warpPosX, f32 warpPosZ) { BossRush_SetEquipment(LINK_AGE_ADULT); // Warp to credits. } else if (gSaveContext.bossRushOptions[BR_OPTIONS_BOSSES] == BR_CHOICE_BOSSES_CHILD) { - play->nextEntranceIndex = 0x6B; + play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0; gSaveContext.nextCutsceneIndex = 0xFFF2; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 3; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE; } } } @@ -291,8 +291,9 @@ void BossRush_InitSave() { gSaveContext.playerName[i] = brPlayerName[i]; } + gSaveContext.questId = QUEST_BOSSRUSH; gSaveContext.isBossRushPaused = 1; - gSaveContext.entranceIndex = 107; + gSaveContext.entranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0; gSaveContext.cutsceneIndex = 0x8000; gSaveContext.isMagicAcquired = 1; diff --git a/soh/soh/Enhancements/controls/GameControlEditor.cpp b/soh/soh/Enhancements/controls/GameControlEditor.cpp index 935935c48..a452bf4b1 100644 --- a/soh/soh/Enhancements/controls/GameControlEditor.cpp +++ b/soh/soh/Enhancements/controls/GameControlEditor.cpp @@ -14,6 +14,8 @@ #include #include +#include "macros.h" + #include "../../UIWidgets.hpp" namespace GameControlEditor { @@ -214,16 +216,6 @@ namespace GameControlEditor { ImGui::EndTable(); } - // CurrentPort is indexed started at 1 here due to the Generic tab, instead of 0 like in InputEditorWindow - // Therefore CurrentPort - 1 must always be used inside this function instead of CurrentPort - void DrawCustomButtons() { - auto inputEditorWindow = std::reinterpret_pointer_cast(LUS::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Input Editor")); - inputEditorWindow->DrawControllerSelect(CurrentPort - 1); - - inputEditorWindow->DrawButton("Modifier 1", BTN_MODIFIER1, CurrentPort - 1, &BtnReading); - inputEditorWindow->DrawButton("Modifier 2", BTN_MODIFIER2, CurrentPort - 1, &BtnReading); - } - void DrawCameraControlPanel(GameControlEditorWindow* window) { if (!ImGui::CollapsingHeader("Camera Controls")) { return; @@ -312,6 +304,7 @@ namespace GameControlEditor { DrawHelpIcon("Allows the cursor on the pause menu to be over any slot. Sometimes required in rando to select " "certain items."); UIWidgets::Spacer(0); + ImGui::BeginDisabled(CVarGetInteger("gDisableChangingSettings", 0)); UIWidgets::PaddedEnhancementCheckbox("Enable walk speed modifiers", "gEnableWalkModify", true, false); DrawHelpIcon("Hold the assigned button to change the maximum walking speed\nTo change the assigned button, go into the Ports tabs above"); if (CVarGetInteger("gEnableWalkModify", 0)) { @@ -323,76 +316,21 @@ namespace GameControlEditor { UIWidgets::PaddedEnhancementSliderFloat("Modifier 2: %d %%", "##WalkMod2", "gWalkModifierTwo", 0.0f, 5.0f, "", 1.0f, true, true, false, true); window->EndGroupPanelPublic(0); } + ImGui::EndDisabled(); UIWidgets::Spacer(0); UIWidgets::PaddedEnhancementCheckbox("Answer Navi Prompt with L Button", "gNaviOnL"); DrawHelpIcon("Speak to Navi with L but enter first-person camera with C-Up"); window->EndGroupPanelPublic(0); } - void DrawLEDControlPanel(GameControlEditorWindow* window) { - window->BeginGroupPanelPublic("LED Colors", ImGui::GetContentRegionAvail()); - static const char* ledSources[] = { "Original Tunic Colors", "Cosmetics Tunic Colors", "Health Colors", - "Original Navi Targeting Colors", "Cosmetics Navi Targeting Colors", "Custom" }; - UIWidgets::PaddedText("Source"); - UIWidgets::EnhancementCombobox("gLedColorSource", ledSources, LED_SOURCE_TUNIC_ORIGINAL); - DrawHelpIcon("Health\n- Red when health critical (13-20% depending on max health)\n- Yellow when health < 40%. Green otherwise.\n\n" \ - "Tunics: colors will mirror currently equipped tunic, whether original or the current values in Cosmetics Editor.\n\n" \ - "Custom: single, solid color"); - if (CVarGetInteger("gLedColorSource", 1) == LED_SOURCE_CUSTOM) { - UIWidgets::Spacer(3); - auto port1Color = CVarGetColor24("gLedPort1Color", { 255, 255, 255 }); - ImVec4 colorVec = { port1Color.r / 255.0f, port1Color.g / 255.0f, port1Color.b / 255.0f, 1.0f }; - if (ImGui::ColorEdit3("", (float*)&colorVec, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel)) { - Color_RGB8 color; - color.r = colorVec.x * 255.0; - color.g = colorVec.y * 255.0; - color.b = colorVec.z * 255.0; - - CVarSetColor24("gLedPort1Color", color); - LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick(); - } - ImGui::SameLine(); - ImGui::Text("Custom Color"); - } - UIWidgets::PaddedEnhancementSliderFloat("Brightness: %d%%", "##LED_Brightness", "gLedBrightness", - 0.0f, 1.0f, "", 1.0f, true, true); - DrawHelpIcon("Sets the brightness of controller LEDs. 0% brightness = LEDs off."); - UIWidgets::PaddedEnhancementCheckbox("Critical Health Override", "gLedCriticalOverride", true, true, - CVarGetInteger("gLedColorSource", LED_SOURCE_TUNIC_ORIGINAL) == LED_SOURCE_HEALTH, "Override redundant for health source.", - UIWidgets::CheckboxGraphics::Cross, true); - DrawHelpIcon("Shows red color when health is critical, otherwise displays according to color source."); - window->EndGroupPanelPublic(0); - } void GameControlEditorWindow::DrawElement() { ImGui::SetNextWindowSize(ImVec2(465, 430), ImGuiCond_FirstUseEver); if (ImGui::Begin("Game Controls Configuration", &mIsVisible)) { - ImGui::BeginTabBar("##CustomControllers"); - if (ImGui::BeginTabItem("Generic")) { - CurrentPort = 0; - ImGui::EndTabItem(); - } - - for (int i = 1; i <= 4; i++) { - if (ImGui::BeginTabItem(StringHelper::Sprintf("Port %d", i).c_str())) { - CurrentPort = i; - ImGui::EndTabItem(); - } - } - - ImGui::EndTabBar(); - - if (CurrentPort == 0) { - DrawOcarinaControlPanel(this); - DrawCameraControlPanel(this); - DrawDpadControlPanel(this); - DrawMiscControlPanel(this); - } else { - DrawCustomButtons(); - if (CurrentPort == 1 && LUS::Context::GetInstance()->GetControlDeck()->GetDeviceFromPortIndex(0)->CanSetLed()) { - DrawLEDControlPanel(this); - } - } + DrawOcarinaControlPanel(this); + DrawCameraControlPanel(this); + DrawDpadControlPanel(this); + DrawMiscControlPanel(this); } ImGui::End(); } diff --git a/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp b/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp new file mode 100644 index 000000000..ae8e8cc27 --- /dev/null +++ b/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp @@ -0,0 +1,1902 @@ +#include "SohInputEditorWindow.h" +#include +#include "soh/OTRGlobals.h" +#include "../../UIWidgets.hpp" +#include "z64.h" +#ifndef __WIIU__ +#include "controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToButtonMapping.h" +#endif + +#define SCALE_IMGUI_SIZE(value) ((value / 13.0f) * ImGui::GetFontSize()) + +SohInputEditorWindow::~SohInputEditorWindow() { +} + +void SohInputEditorWindow::InitElement() { + mGameInputBlockTimer = INT32_MAX; + mMappingInputBlockTimer = INT32_MAX; + mRumbleTimer = INT32_MAX; + mRumbleMappingToTest = nullptr; + mInputEditorPopupOpen = false; + + mButtonsBitmasks = { BTN_A, BTN_B, BTN_START, BTN_L, BTN_R, BTN_Z, BTN_CUP, BTN_CDOWN, BTN_CLEFT, BTN_CRIGHT }; + mDpadBitmasks = { BTN_DUP, BTN_DDOWN, BTN_DLEFT, BTN_DRIGHT }; + mModifierButtonsBitmasks = { BTN_MODIFIER1, BTN_MODIFIER2 }; +} + +#define INPUT_EDITOR_WINDOW_GAME_INPUT_BLOCK_ID 95237929 +void SohInputEditorWindow::UpdateElement() { + if (mRumbleTimer != INT32_MAX) { + mRumbleTimer--; + if (mRumbleMappingToTest != nullptr) { + mRumbleMappingToTest->StartRumble(); + } + if (mRumbleTimer <= 0) { + if (mRumbleMappingToTest != nullptr) { + mRumbleMappingToTest->StopRumble(); + } + mRumbleTimer = INT32_MAX; + mRumbleMappingToTest = nullptr; + } + } + + if (mInputEditorPopupOpen && ImGui::IsPopupOpen("", ImGuiPopupFlags_AnyPopupId)) { + LUS::Context::GetInstance()->GetControlDeck()->BlockGameInput(INPUT_EDITOR_WINDOW_GAME_INPUT_BLOCK_ID); + + // continue to block input for a third of a second after getting the mapping + mGameInputBlockTimer = ImGui::GetIO().Framerate / 3; + + if (mMappingInputBlockTimer != INT32_MAX) { + mMappingInputBlockTimer--; + if (mMappingInputBlockTimer <= 0) { + mMappingInputBlockTimer = INT32_MAX; + } + } + + LUS::Context::GetInstance()->GetWindow()->GetGui()->BlockImGuiGamepadNavigation(); + } else { + if (mGameInputBlockTimer != INT32_MAX) { + mGameInputBlockTimer--; + if (mGameInputBlockTimer <= 0) { + LUS::Context::GetInstance()->GetControlDeck()->UnblockGameInput( + INPUT_EDITOR_WINDOW_GAME_INPUT_BLOCK_ID); + mGameInputBlockTimer = INT32_MAX; + } + } + + if (LUS::Context::GetInstance()->GetWindow()->GetGui()->ImGuiGamepadNavigationEnabled()) { + mMappingInputBlockTimer = ImGui::GetIO().Framerate / 3; + } else { + mMappingInputBlockTimer = INT32_MAX; + } + + LUS::Context::GetInstance()->GetWindow()->GetGui()->UnblockImGuiGamepadNavigation(); + } +} + +void SohInputEditorWindow::DrawAnalogPreview(const char* label, ImVec2 stick, float deadzone, bool gyro) { + ImGui::BeginChild(label, ImVec2(gyro ? SCALE_IMGUI_SIZE(78) : SCALE_IMGUI_SIZE(96), SCALE_IMGUI_SIZE(85)), false); + ImGui::SetCursorPos(ImVec2(ImGui::GetCursorPos().x + gyro ? SCALE_IMGUI_SIZE(10) : SCALE_IMGUI_SIZE(18), + ImGui::GetCursorPos().y + gyro ? SCALE_IMGUI_SIZE(10) : 0)); + ImDrawList* drawList = ImGui::GetWindowDrawList(); + + const ImVec2 cursorScreenPosition = ImGui::GetCursorScreenPos(); + + // Draw the border box + float borderSquareLeft = cursorScreenPosition.x + SCALE_IMGUI_SIZE(2.0f); + float borderSquareTop = cursorScreenPosition.y + SCALE_IMGUI_SIZE(2.0f); + float borderSquareSize = SCALE_IMGUI_SIZE(65.0f); + drawList->AddRect(ImVec2(borderSquareLeft, borderSquareTop), + ImVec2(borderSquareLeft + borderSquareSize, borderSquareTop + borderSquareSize), + ImColor(100, 100, 100, 255), 0.0f, 0, 1.5f); + + // Draw the gate background + float cardinalRadius = SCALE_IMGUI_SIZE(22.5f); + float diagonalRadius = SCALE_IMGUI_SIZE(22.5f * (69.0f / 85.0f)); + + ImVec2 joystickCenterpoint = ImVec2(cursorScreenPosition.x + cardinalRadius + SCALE_IMGUI_SIZE(12), + cursorScreenPosition.y + cardinalRadius + SCALE_IMGUI_SIZE(11)); + drawList->AddQuadFilled(joystickCenterpoint, + ImVec2(joystickCenterpoint.x - diagonalRadius, joystickCenterpoint.y + diagonalRadius), + ImVec2(joystickCenterpoint.x, joystickCenterpoint.y + cardinalRadius), + ImVec2(joystickCenterpoint.x + diagonalRadius, joystickCenterpoint.y + diagonalRadius), + ImColor(130, 130, 130, 255)); + drawList->AddQuadFilled(joystickCenterpoint, + ImVec2(joystickCenterpoint.x + diagonalRadius, joystickCenterpoint.y + diagonalRadius), + ImVec2(joystickCenterpoint.x + cardinalRadius, joystickCenterpoint.y), + ImVec2(joystickCenterpoint.x + diagonalRadius, joystickCenterpoint.y - diagonalRadius), + ImColor(130, 130, 130, 255)); + drawList->AddQuadFilled(joystickCenterpoint, + ImVec2(joystickCenterpoint.x + diagonalRadius, joystickCenterpoint.y - diagonalRadius), + ImVec2(joystickCenterpoint.x, joystickCenterpoint.y - cardinalRadius), + ImVec2(joystickCenterpoint.x - diagonalRadius, joystickCenterpoint.y - diagonalRadius), + ImColor(130, 130, 130, 255)); + drawList->AddQuadFilled(joystickCenterpoint, + ImVec2(joystickCenterpoint.x - diagonalRadius, joystickCenterpoint.y - diagonalRadius), + ImVec2(joystickCenterpoint.x - cardinalRadius, joystickCenterpoint.y), + ImVec2(joystickCenterpoint.x - diagonalRadius, joystickCenterpoint.y + diagonalRadius), + ImColor(130, 130, 130, 255)); + + // Draw the joystick position indicator + ImVec2 joystickIndicatorDistanceFromCenter = ImVec2(0, 0); + if ((stick.x * stick.x + stick.y * stick.y) > (deadzone * deadzone)) { + joystickIndicatorDistanceFromCenter = + ImVec2((stick.x * (cardinalRadius / 85.0f)), -(stick.y * (cardinalRadius / 85.0f))); + } + float indicatorRadius = SCALE_IMGUI_SIZE(5.0f); + drawList->AddCircleFilled(ImVec2(joystickCenterpoint.x + joystickIndicatorDistanceFromCenter.x, + joystickCenterpoint.y + joystickIndicatorDistanceFromCenter.y), + indicatorRadius, ImColor(34, 51, 76, 255), 7); + + if (!gyro) { + ImGui::SetCursorPos( + ImVec2(ImGui::GetCursorPos().x - SCALE_IMGUI_SIZE(8), ImGui::GetCursorPos().y + SCALE_IMGUI_SIZE(72))); + ImGui::Text("X:%3d, Y:%3d", static_cast(stick.x), static_cast(stick.y)); + } + ImGui::EndChild(); +} + +#define CHIP_COLOR_N64_GREY ImVec4(0.4f, 0.4f, 0.4f, 1.0f) +#define CHIP_COLOR_N64_BLUE ImVec4(0.176f, 0.176f, 0.5f, 1.0f) +#define CHIP_COLOR_N64_GREEN ImVec4(0.0f, 0.294f, 0.0f, 1.0f) +#define CHIP_COLOR_N64_YELLOW ImVec4(0.5f, 0.314f, 0.0f, 1.0f) +#define CHIP_COLOR_N64_RED ImVec4(0.392f, 0.0f, 0.0f, 1.0f) + +#define BUTTON_COLOR_KEYBOARD_BEIGE ImVec4(0.651f, 0.482f, 0.357f, 0.5f) +#define BUTTON_COLOR_KEYBOARD_BEIGE_HOVERED ImVec4(0.651f, 0.482f, 0.357f, 1.0f) + +#define BUTTON_COLOR_GAMEPAD_BLUE ImVec4(0.0f, 0.255f, 0.976f, 0.5f) +#define BUTTON_COLOR_GAMEPAD_BLUE_HOVERED ImVec4(0.0f, 0.255f, 0.976f, 1.0f) + +#define BUTTON_COLOR_GAMEPAD_RED ImVec4(0.976f, 0.0f, 0.094f, 0.5f) +#define BUTTON_COLOR_GAMEPAD_RED_HOVERED ImVec4(0.976f, 0.0f, 0.094f, 1.0f) + +#define BUTTON_COLOR_GAMEPAD_ORANGE ImVec4(0.976f, 0.376f, 0.0f, 0.5f) +#define BUTTON_COLOR_GAMEPAD_ORANGE_HOVERED ImVec4(0.976f, 0.376f, 0.0f, 1.0f) + +#define BUTTON_COLOR_GAMEPAD_GREEN ImVec4(0.0f, 0.5f, 0.0f, 0.5f) +#define BUTTON_COLOR_GAMEPAD_GREEN_HOVERED ImVec4(0.0f, 0.5f, 0.0f, 1.0f) + +#define BUTTON_COLOR_GAMEPAD_PURPLE ImVec4(0.431f, 0.369f, 0.706f, 0.5f) +#define BUTTON_COLOR_GAMEPAD_PURPLE_HOVERED ImVec4(0.431f, 0.369f, 0.706f, 1.0f) + +void SohInputEditorWindow::GetButtonColorsForLUSDeviceIndex(LUS::LUSDeviceIndex lusIndex, ImVec4& buttonColor, + ImVec4& buttonHoveredColor) { + switch (lusIndex) { + case LUS::LUSDeviceIndex::Keyboard: + buttonColor = BUTTON_COLOR_KEYBOARD_BEIGE; + buttonHoveredColor = BUTTON_COLOR_KEYBOARD_BEIGE_HOVERED; + break; + case LUS::LUSDeviceIndex::Blue: + buttonColor = BUTTON_COLOR_GAMEPAD_BLUE; + buttonHoveredColor = BUTTON_COLOR_GAMEPAD_BLUE_HOVERED; + break; + case LUS::LUSDeviceIndex::Red: + buttonColor = BUTTON_COLOR_GAMEPAD_RED; + buttonHoveredColor = BUTTON_COLOR_GAMEPAD_RED_HOVERED; + break; + case LUS::LUSDeviceIndex::Orange: + buttonColor = BUTTON_COLOR_GAMEPAD_ORANGE; + buttonHoveredColor = BUTTON_COLOR_GAMEPAD_ORANGE_HOVERED; + break; + case LUS::LUSDeviceIndex::Green: + buttonColor = BUTTON_COLOR_GAMEPAD_GREEN; + buttonHoveredColor = BUTTON_COLOR_GAMEPAD_GREEN_HOVERED; + break; + default: + buttonColor = BUTTON_COLOR_GAMEPAD_PURPLE; + buttonHoveredColor = BUTTON_COLOR_GAMEPAD_PURPLE_HOVERED; + } +} + +void SohInputEditorWindow::DrawInputChip(const char* buttonName, ImVec4 color = CHIP_COLOR_N64_GREY) { + ImGui::BeginDisabled(); + ImGui::PushStyleColor(ImGuiCol_Button, color); + ImGui::Button(buttonName, ImVec2(SCALE_IMGUI_SIZE(50.0f), 0)); + ImGui::PopStyleColor(); + ImGui::EndDisabled(); +} + +void SohInputEditorWindow::DrawButtonLineAddMappingButton(uint8_t port, uint16_t bitmask) { + ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(1.0f, 0.5f)); + auto popupId = StringHelper::Sprintf("addButtonMappingPopup##%d-%d", port, bitmask); + if (ImGui::Button(StringHelper::Sprintf("%s###addButtonMappingButton%d-%d", ICON_FA_PLUS, port, bitmask).c_str(), + ImVec2(SCALE_IMGUI_SIZE(20.0f), 0.0f))) { + ImGui::OpenPopup(popupId.c_str()); + }; + ImGui::PopStyleVar(); + + if (ImGui::BeginPopup(popupId.c_str())) { + mInputEditorPopupOpen = true; + ImGui::Text("Press any button,\nmove any axis,\nor press any key\nto add mapping"); + if (ImGui::Button("Cancel")) { + mInputEditorPopupOpen = false; + ImGui::CloseCurrentPopup(); + } + // todo: figure out why optional params (using id = "" in the definition) wasn't working + if (mMappingInputBlockTimer == INT32_MAX && LUS::Context::GetInstance() + ->GetControlDeck() + ->GetControllerByPort(port) + ->GetButton(bitmask) + ->AddOrEditButtonMappingFromRawPress(bitmask, "")) { + mInputEditorPopupOpen = false; + ImGui::CloseCurrentPopup(); + } + ImGui::EndPopup(); + } +} + +void SohInputEditorWindow::DrawButtonLineEditMappingButton(uint8_t port, uint16_t bitmask, std::string id) { + auto mapping = LUS::Context::GetInstance() + ->GetControlDeck() + ->GetControllerByPort(port) + ->GetButton(bitmask) + ->GetButtonMappingById(id); + if (mapping == nullptr) { + return; + } + + ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(0.0f, 0.5f)); + std::string icon = ""; + switch (mapping->GetMappingType()) { + case MAPPING_TYPE_GAMEPAD: + icon = ICON_FA_GAMEPAD; + break; + case MAPPING_TYPE_KEYBOARD: + icon = ICON_FA_KEYBOARD_O; + break; + case MAPPING_TYPE_UNKNOWN: + icon = ICON_FA_BUG; + break; + } + auto buttonColor = ImGui::GetStyleColorVec4(ImGuiCol_Button); + auto buttonHoveredColor = ImGui::GetStyleColorVec4(ImGuiCol_ButtonHovered); + auto physicalInputDisplayName = + StringHelper::Sprintf("%s %s", icon.c_str(), mapping->GetPhysicalInputName().c_str()); + GetButtonColorsForLUSDeviceIndex(mapping->GetLUSDeviceIndex(), buttonColor, buttonHoveredColor); + ImGui::PushStyleColor(ImGuiCol_Button, buttonColor); + ImGui::PushStyleColor(ImGuiCol_ButtonHovered, buttonHoveredColor); + auto popupId = StringHelper::Sprintf("editButtonMappingPopup##%s", id.c_str()); + if (ImGui::Button( + StringHelper::Sprintf("%s###editButtonMappingButton%s", physicalInputDisplayName.c_str(), id.c_str()) + .c_str(), + ImVec2(ImGui::CalcTextSize(physicalInputDisplayName.c_str()).x + SCALE_IMGUI_SIZE(12.0f), 0.0f))) { + ImGui::OpenPopup(popupId.c_str()); + } + if (ImGui::IsItemHovered(ImGuiHoveredFlags_DelayNormal | ImGuiHoveredFlags_NoSharedDelay)) { + ImGui::SetTooltip(mapping->GetPhysicalDeviceName().c_str()); + } + ImGui::PopStyleColor(); + ImGui::PopStyleColor(); + + if (ImGui::BeginPopup(popupId.c_str())) { + mInputEditorPopupOpen = true; + ImGui::Text("Press any button,\nmove any axis,\nor press any key\nto edit mapping"); + if (ImGui::Button("Cancel")) { + mInputEditorPopupOpen = false; + ImGui::CloseCurrentPopup(); + } + if (mMappingInputBlockTimer == INT32_MAX && LUS::Context::GetInstance() + ->GetControlDeck() + ->GetControllerByPort(port) + ->GetButton(bitmask) + ->AddOrEditButtonMappingFromRawPress(bitmask, id)) { + mInputEditorPopupOpen = false; + ImGui::CloseCurrentPopup(); + } + ImGui::EndPopup(); + } + + ImGui::PopStyleVar(); + ImGui::SameLine(0, 0); + +#ifndef __WIIU__ + auto sdlAxisDirectionToButtonMapping = std::dynamic_pointer_cast(mapping); + auto indexMapping = LUS::Context::GetInstance() + ->GetControlDeck() + ->GetDeviceIndexMappingManager() + ->GetDeviceIndexMappingFromLUSDeviceIndex(mapping->GetLUSDeviceIndex()); + auto sdlIndexMapping = std::dynamic_pointer_cast(indexMapping); + + if (sdlIndexMapping != nullptr && sdlAxisDirectionToButtonMapping != nullptr) { + ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(0.0f, 0.5f)); + auto buttonColor = ImGui::GetStyleColorVec4(ImGuiCol_Button); + auto buttonHoveredColor = ImGui::GetStyleColorVec4(ImGuiCol_ButtonHovered); + GetButtonColorsForLUSDeviceIndex(mapping->GetLUSDeviceIndex(), buttonColor, buttonHoveredColor); + ImGui::PushStyleColor(ImGuiCol_Button, buttonColor); + ImGui::PushStyleColor(ImGuiCol_ButtonHovered, buttonHoveredColor); + ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(1.0f, 0.5f)); + auto popupId = StringHelper::Sprintf("editAxisThresholdPopup##%s", id.c_str()); + if (ImGui::Button(StringHelper::Sprintf("%s###editAxisThresholdButton%s", ICON_FA_COG, id.c_str()).c_str(), + ImVec2(ImGui::CalcTextSize(ICON_FA_COG).x + SCALE_IMGUI_SIZE(10.0f), 0.0f))) { + ImGui::OpenPopup(popupId.c_str()); + } + if (ImGui::IsItemHovered(ImGuiHoveredFlags_DelayNormal | ImGuiHoveredFlags_NoSharedDelay)) { + ImGui::SetTooltip("Edit axis threshold"); + } + ImGui::PopStyleColor(); + ImGui::PopStyleColor(); + ImGui::PopStyleVar(); + + if (ImGui::BeginPopup(popupId.c_str())) { + mInputEditorPopupOpen = true; + ImGui::Text("Axis Threshold\n\nThe extent to which the joystick\nmust be moved or the trigger\npressed to " + "initiate the assigned\nbutton action.\n\n"); + + if (sdlAxisDirectionToButtonMapping->AxisIsStick()) { + ImGui::Text("Stick axis threshold:"); + + int32_t stickAxisThreshold = sdlIndexMapping->GetStickAxisThresholdPercentage(); + if (stickAxisThreshold == 0) { + ImGui::BeginDisabled(); + } + ImGui::PushButtonRepeat(true); + if (ImGui::Button(StringHelper::Sprintf("-##Stick Axis Threshold%s", id.c_str()).c_str())) { + sdlIndexMapping->SetStickAxisThresholdPercentage(stickAxisThreshold - 1); + sdlIndexMapping->SaveToConfig(); + } + ImGui::PopButtonRepeat(); + if (stickAxisThreshold == 0) { + ImGui::EndDisabled(); + } + ImGui::SameLine(0.0f, 0.0f); + ImGui::SetNextItemWidth(SCALE_IMGUI_SIZE(160.0f)); + if (ImGui::SliderInt(StringHelper::Sprintf("##Stick Axis Threshold%s", id.c_str()).c_str(), + &stickAxisThreshold, 0, 100, "%d%%", ImGuiSliderFlags_AlwaysClamp)) { + sdlIndexMapping->SetStickAxisThresholdPercentage(stickAxisThreshold); + sdlIndexMapping->SaveToConfig(); + } + ImGui::SameLine(0.0f, 0.0f); + if (stickAxisThreshold == 100) { + ImGui::BeginDisabled(); + } + ImGui::PushButtonRepeat(true); + if (ImGui::Button(StringHelper::Sprintf("+##Stick Axis Threshold%s", id.c_str()).c_str())) { + sdlIndexMapping->SetStickAxisThresholdPercentage(stickAxisThreshold + 1); + sdlIndexMapping->SaveToConfig(); + } + ImGui::PopButtonRepeat(); + if (stickAxisThreshold == 100) { + ImGui::EndDisabled(); + } + } + + if (sdlAxisDirectionToButtonMapping->AxisIsTrigger()) { + ImGui::Text("Trigger axis threshold:"); + + int32_t triggerAxisThreshold = sdlIndexMapping->GetTriggerAxisThresholdPercentage(); + if (triggerAxisThreshold == 0) { + ImGui::BeginDisabled(); + } + ImGui::PushButtonRepeat(true); + if (ImGui::Button(StringHelper::Sprintf("-##Trigger Axis Threshold%s", id.c_str()).c_str())) { + sdlIndexMapping->SetTriggerAxisThresholdPercentage(triggerAxisThreshold - 1); + sdlIndexMapping->SaveToConfig(); + } + ImGui::PopButtonRepeat(); + if (triggerAxisThreshold == 0) { + ImGui::EndDisabled(); + } + ImGui::SameLine(0.0f, 0.0f); + ImGui::SetNextItemWidth(SCALE_IMGUI_SIZE(160.0f)); + if (ImGui::SliderInt(StringHelper::Sprintf("##Trigger Axis Threshold%s", id.c_str()).c_str(), + &triggerAxisThreshold, 0, 100, "%d%%", ImGuiSliderFlags_AlwaysClamp)) { + sdlIndexMapping->SetTriggerAxisThresholdPercentage(triggerAxisThreshold); + sdlIndexMapping->SaveToConfig(); + } + ImGui::SameLine(0.0f, 0.0f); + if (triggerAxisThreshold == 100) { + ImGui::BeginDisabled(); + } + ImGui::PushButtonRepeat(true); + if (ImGui::Button(StringHelper::Sprintf("+##Trigger Axis Threshold%s", id.c_str()).c_str())) { + sdlIndexMapping->SetTriggerAxisThresholdPercentage(triggerAxisThreshold + 1); + sdlIndexMapping->SaveToConfig(); + } + ImGui::PopButtonRepeat(); + if (triggerAxisThreshold == 100) { + ImGui::EndDisabled(); + } + } + + if (ImGui::Button("Close")) { + mInputEditorPopupOpen = false; + ImGui::CloseCurrentPopup(); + } + + ImGui::EndPopup(); + } + + ImGui::PopStyleVar(); + ImGui::SameLine(0, 0); + } +#endif + + ImGui::PushStyleColor(ImGuiCol_Button, buttonColor); + ImGui::PushStyleColor(ImGuiCol_ButtonHovered, buttonHoveredColor); + ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(1.0f, 0.5f)); + if (ImGui::Button(StringHelper::Sprintf("%s###removeButtonMappingButton%s", ICON_FA_TIMES, id.c_str()).c_str(), + ImVec2(ImGui::CalcTextSize(ICON_FA_TIMES).x + SCALE_IMGUI_SIZE(10.0f), 0.0f))) { + LUS::Context::GetInstance() + ->GetControlDeck() + ->GetControllerByPort(port) + ->GetButton(bitmask) + ->ClearButtonMapping(id); + }; + ImGui::PopStyleColor(); + ImGui::PopStyleColor(); + ImGui::PopStyleVar(); + + ImGui::SameLine(0, SCALE_IMGUI_SIZE(4.0f)); +} + +void SohInputEditorWindow::DrawButtonLine(const char* buttonName, uint8_t port, uint16_t bitmask, + ImVec4 color = CHIP_COLOR_N64_GREY) { + ImGui::NewLine(); + ImGui::SameLine(SCALE_IMGUI_SIZE(32.0f)); + DrawInputChip(buttonName, color); + ImGui::SameLine(SCALE_IMGUI_SIZE(86.0f)); + for (auto id : mBitmaskToMappingIds[port][bitmask]) { + DrawButtonLineEditMappingButton(port, bitmask, id); + } + DrawButtonLineAddMappingButton(port, bitmask); +} + +void SohInputEditorWindow::DrawStickDirectionLineAddMappingButton(uint8_t port, uint8_t stick, + LUS::Direction direction) { + ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(1.0f, 0.5f)); + auto popupId = StringHelper::Sprintf("addStickDirectionMappingPopup##%d-%d-%d", port, stick, direction); + if (ImGui::Button( + StringHelper::Sprintf("%s###addStickDirectionMappingButton%d-%d-%d", ICON_FA_PLUS, port, stick, direction) + .c_str(), + ImVec2(SCALE_IMGUI_SIZE(20.0f), 0.0f))) { + ImGui::OpenPopup(popupId.c_str()); + }; + ImGui::PopStyleVar(); + + if (ImGui::BeginPopup(popupId.c_str())) { + mInputEditorPopupOpen = true; + ImGui::Text("Press any button,\nmove any axis,\nor press any key\nto add mapping"); + if (ImGui::Button("Cancel")) { + mInputEditorPopupOpen = false; + ImGui::CloseCurrentPopup(); + } + if (stick == LUS::LEFT) { + if (mMappingInputBlockTimer == INT32_MAX && + LUS::Context::GetInstance() + ->GetControlDeck() + ->GetControllerByPort(port) + ->GetLeftStick() + ->AddOrEditAxisDirectionMappingFromRawPress(direction, "")) { + mInputEditorPopupOpen = false; + ImGui::CloseCurrentPopup(); + } + } else { + if (mMappingInputBlockTimer == INT32_MAX && + LUS::Context::GetInstance() + ->GetControlDeck() + ->GetControllerByPort(port) + ->GetRightStick() + ->AddOrEditAxisDirectionMappingFromRawPress(direction, "")) { + ImGui::CloseCurrentPopup(); + } + } + ImGui::EndPopup(); + } +} + +void SohInputEditorWindow::DrawStickDirectionLineEditMappingButton(uint8_t port, uint8_t stick, + LUS::Direction direction, std::string id) { + std::shared_ptr mapping = nullptr; + if (stick == LUS::LEFT) { + mapping = LUS::Context::GetInstance() + ->GetControlDeck() + ->GetControllerByPort(port) + ->GetLeftStick() + ->GetAxisDirectionMappingById(direction, id); + } else { + mapping = LUS::Context::GetInstance() + ->GetControlDeck() + ->GetControllerByPort(port) + ->GetRightStick() + ->GetAxisDirectionMappingById(direction, id); + } + + if (mapping == nullptr) { + return; + } + + ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(0.0f, 0.5f)); + std::string icon = ""; + switch (mapping->GetMappingType()) { + case MAPPING_TYPE_GAMEPAD: + icon = ICON_FA_GAMEPAD; + break; + case MAPPING_TYPE_KEYBOARD: + icon = ICON_FA_KEYBOARD_O; + break; + case MAPPING_TYPE_UNKNOWN: + icon = ICON_FA_BUG; + break; + } + auto buttonColor = ImGui::GetStyleColorVec4(ImGuiCol_Button); + auto buttonHoveredColor = ImGui::GetStyleColorVec4(ImGuiCol_ButtonHovered); + auto physicalInputDisplayName = + StringHelper::Sprintf("%s %s", icon.c_str(), mapping->GetPhysicalInputName().c_str()); + GetButtonColorsForLUSDeviceIndex(mapping->GetLUSDeviceIndex(), buttonColor, buttonHoveredColor); + ImGui::PushStyleColor(ImGuiCol_Button, buttonColor); + ImGui::PushStyleColor(ImGuiCol_ButtonHovered, buttonHoveredColor); + auto popupId = StringHelper::Sprintf("editStickDirectionMappingPopup##%s", id.c_str()); + if (ImGui::Button( + StringHelper::Sprintf("%s###editStickDirectionMappingButton%s", physicalInputDisplayName.c_str(), + id.c_str()) + .c_str(), + ImVec2(ImGui::CalcTextSize(physicalInputDisplayName.c_str()).x + SCALE_IMGUI_SIZE(12.0f), 0.0f))) { + ImGui::OpenPopup(popupId.c_str()); + } + if (ImGui::IsItemHovered(ImGuiHoveredFlags_DelayNormal | ImGuiHoveredFlags_NoSharedDelay)) { + ImGui::SetTooltip(mapping->GetPhysicalDeviceName().c_str()); + } + ImGui::PopStyleColor(); + ImGui::PopStyleColor(); + + if (ImGui::BeginPopup(popupId.c_str())) { + mInputEditorPopupOpen = true; + ImGui::Text("Press any button,\nmove any axis,\nor press any key\nto edit mapping"); + if (ImGui::Button("Cancel")) { + mInputEditorPopupOpen = false; + ImGui::CloseCurrentPopup(); + } + + if (stick == LUS::LEFT) { + if (mMappingInputBlockTimer == INT32_MAX && + LUS::Context::GetInstance() + ->GetControlDeck() + ->GetControllerByPort(port) + ->GetLeftStick() + ->AddOrEditAxisDirectionMappingFromRawPress(direction, id)) { + mInputEditorPopupOpen = false; + ImGui::CloseCurrentPopup(); + } + } else { + if (mMappingInputBlockTimer == INT32_MAX && + LUS::Context::GetInstance() + ->GetControlDeck() + ->GetControllerByPort(port) + ->GetRightStick() + ->AddOrEditAxisDirectionMappingFromRawPress(direction, id)) { + ImGui::CloseCurrentPopup(); + } + } + ImGui::EndPopup(); + } + + ImGui::PopStyleVar(); + ImGui::SameLine(0, 0); + ImGui::PushStyleColor(ImGuiCol_Button, buttonColor); + ImGui::PushStyleColor(ImGuiCol_ButtonHovered, buttonHoveredColor); + ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(1.0f, 0.5f)); + if (ImGui::Button( + StringHelper::Sprintf("%s###removeStickDirectionMappingButton%s", ICON_FA_TIMES, id.c_str()).c_str(), + ImVec2(ImGui::CalcTextSize(ICON_FA_TIMES).x + SCALE_IMGUI_SIZE(10.0f), 0.0f))) { + if (stick == LUS::LEFT) { + LUS::Context::GetInstance() + ->GetControlDeck() + ->GetControllerByPort(port) + ->GetLeftStick() + ->ClearAxisDirectionMapping(direction, id); + } else { + LUS::Context::GetInstance() + ->GetControlDeck() + ->GetControllerByPort(port) + ->GetRightStick() + ->ClearAxisDirectionMapping(direction, id); + } + }; + ImGui::PopStyleColor(); + ImGui::PopStyleColor(); + ImGui::PopStyleVar(); + ImGui::SameLine(0, SCALE_IMGUI_SIZE(4.0f)); +} + +void SohInputEditorWindow::DrawStickDirectionLine(const char* axisDirectionName, uint8_t port, uint8_t stick, + LUS::Direction direction, ImVec4 color = CHIP_COLOR_N64_GREY) { + ImGui::NewLine(); + ImGui::SameLine(); + ImGui::BeginDisabled(); + ImGui::PushStyleColor(ImGuiCol_Button, color); + ImGui::Button(axisDirectionName, ImVec2(SCALE_IMGUI_SIZE(26.0f), 0)); + ImGui::PopStyleColor(); + ImGui::EndDisabled(); + ImGui::SameLine(0.0f, SCALE_IMGUI_SIZE(4.0f)); + for (auto id : mStickDirectionToMappingIds[port][stick][direction]) { + DrawStickDirectionLineEditMappingButton(port, stick, direction, id); + } + DrawStickDirectionLineAddMappingButton(port, stick, direction); +} + +void SohInputEditorWindow::DrawStickSection(uint8_t port, uint8_t stick, int32_t id, + ImVec4 color = CHIP_COLOR_N64_GREY) { + static int8_t sX, sY; + std::shared_ptr controllerStick = nullptr; + if (stick == LUS::LEFT) { + controllerStick = LUS::Context::GetInstance()->GetControlDeck()->GetControllerByPort(port)->GetLeftStick(); + } else { + controllerStick = LUS::Context::GetInstance()->GetControlDeck()->GetControllerByPort(port)->GetRightStick(); + } + controllerStick->Process(sX, sY); + DrawAnalogPreview(StringHelper::Sprintf("##AnalogPreview%d", id).c_str(), ImVec2(sX, sY)); + + ImGui::SameLine(); + ImGui::BeginGroup(); + DrawStickDirectionLine(ICON_FA_ARROW_UP, port, stick, LUS::UP, color); + DrawStickDirectionLine(ICON_FA_ARROW_DOWN, port, stick, LUS::DOWN, color); + DrawStickDirectionLine(ICON_FA_ARROW_LEFT, port, stick, LUS::LEFT, color); + DrawStickDirectionLine(ICON_FA_ARROW_RIGHT, port, stick, LUS::RIGHT, color); + ImGui::EndGroup(); + ImGui::SetNextItemOpen(true, ImGuiCond_Once); + if (ImGui::TreeNode(StringHelper::Sprintf("Analog Stick Options##%d", id).c_str())) { + ImGui::Text("Deadzone:"); + + int32_t deadzonePercentage = controllerStick->GetDeadzonePercentage(); + if (deadzonePercentage == 0) { + ImGui::BeginDisabled(); + } + ImGui::PushButtonRepeat(true); + if (ImGui::Button(StringHelper::Sprintf("-##Deadzone%d", id).c_str())) { + controllerStick->SetDeadzone(deadzonePercentage - 1); + } + ImGui::PopButtonRepeat(); + if (deadzonePercentage == 0) { + ImGui::EndDisabled(); + } + ImGui::SameLine(0.0f, 0.0f); + ImGui::SetNextItemWidth(SCALE_IMGUI_SIZE(160.0f)); + if (ImGui::SliderInt(StringHelper::Sprintf("##Deadzone%d", id).c_str(), &deadzonePercentage, 0, 100, "%d%%", + ImGuiSliderFlags_AlwaysClamp)) { + controllerStick->SetDeadzone(deadzonePercentage); + } + ImGui::SameLine(0.0f, 0.0f); + if (deadzonePercentage == 100) { + ImGui::BeginDisabled(); + } + ImGui::PushButtonRepeat(true); + if (ImGui::Button(StringHelper::Sprintf("+##Deadzone%d", id).c_str())) { + controllerStick->SetDeadzone(deadzonePercentage + 1); + } + ImGui::PopButtonRepeat(); + if (deadzonePercentage == 100) { + ImGui::EndDisabled(); + } + if (!controllerStick->DeadzoneIsDefault()) { + ImGui::SameLine(); + if (ImGui::Button(StringHelper::Sprintf("Reset to Default###resetStickDeadzone%d", id).c_str())) { + controllerStick->ResetDeadzoneToDefault(); + } + } + + ImGui::Text("Notch Snap Angle:"); + int32_t notchSnapAngle = controllerStick->GetNotchSnapAngle(); + if (notchSnapAngle == 0) { + ImGui::BeginDisabled(); + } + ImGui::PushButtonRepeat(true); + if (ImGui::Button(StringHelper::Sprintf("-##NotchProximityThreshold%d", id).c_str())) { + controllerStick->SetNotchSnapAngle(notchSnapAngle - 1); + } + ImGui::PopButtonRepeat(); + if (notchSnapAngle == 0) { + ImGui::EndDisabled(); + } + ImGui::SameLine(0.0f, 0.0f); + ImGui::SetNextItemWidth(SCALE_IMGUI_SIZE(160.0f)); + if (ImGui::SliderInt(StringHelper::Sprintf("##NotchProximityThreshold%d", id).c_str(), ¬chSnapAngle, 0, 45, + "%d°", ImGuiSliderFlags_AlwaysClamp)) { + controllerStick->SetNotchSnapAngle(notchSnapAngle); + } + ImGui::SameLine(0.0f, 0.0f); + if (notchSnapAngle == 45) { + ImGui::BeginDisabled(); + } + ImGui::PushButtonRepeat(true); + if (ImGui::Button(StringHelper::Sprintf("+##NotchProximityThreshold%d", id).c_str())) { + controllerStick->SetNotchSnapAngle(notchSnapAngle + 1); + } + ImGui::PopButtonRepeat(); + if (notchSnapAngle == 45) { + ImGui::EndDisabled(); + } + if (!controllerStick->NotchSnapAngleIsDefault()) { + ImGui::SameLine(); + if (ImGui::Button(StringHelper::Sprintf("Reset to Default###resetStickSnap%d", id).c_str())) { + controllerStick->ResetNotchSnapAngleToDefault(); + } + } + + ImGui::TreePop(); + } +} + +void SohInputEditorWindow::UpdateBitmaskToMappingIds(uint8_t port) { + // todo: do we need this now that ControllerButton exists? + + for (auto [bitmask, button] : + LUS::Context::GetInstance()->GetControlDeck()->GetControllerByPort(port)->GetAllButtons()) { + for (auto [id, mapping] : button->GetAllButtonMappings()) { + // using a vector here instead of a set because i want newly added mappings + // to go to the end of the list instead of autosorting + if (std::find(mBitmaskToMappingIds[port][bitmask].begin(), mBitmaskToMappingIds[port][bitmask].end(), id) == + mBitmaskToMappingIds[port][bitmask].end()) { + mBitmaskToMappingIds[port][bitmask].push_back(id); + } + } + } +} + +void SohInputEditorWindow::UpdateStickDirectionToMappingIds(uint8_t port) { + // todo: do we need this? + for (auto stick : + { std::make_pair>( + LUS::LEFT, LUS::Context::GetInstance()->GetControlDeck()->GetControllerByPort(port)->GetLeftStick()), + std::make_pair>( + LUS::RIGHT, + LUS::Context::GetInstance()->GetControlDeck()->GetControllerByPort(port)->GetRightStick()) }) { + for (auto direction : { LUS::LEFT, LUS::RIGHT, LUS::UP, LUS::DOWN }) { + for (auto [id, mapping] : stick.second->GetAllAxisDirectionMappingByDirection(direction)) { + // using a vector here instead of a set because i want newly added mappings + // to go to the end of the list instead of autosorting + if (std::find(mStickDirectionToMappingIds[port][stick.first][direction].begin(), + mStickDirectionToMappingIds[port][stick.first][direction].end(), + id) == mStickDirectionToMappingIds[port][stick.first][direction].end()) { + mStickDirectionToMappingIds[port][stick.first][direction].push_back(id); + } + } + } + } +} + +void SohInputEditorWindow::DrawRemoveRumbleMappingButton(uint8_t port, std::string id) { + ImGui::SameLine(); + ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(1.0f, 0.5f)); + if (ImGui::Button(StringHelper::Sprintf("%s###removeRumbleMapping%s", ICON_FA_TIMES, id.c_str()).c_str(), + ImVec2(SCALE_IMGUI_SIZE(20.0f), SCALE_IMGUI_SIZE(20.0f)))) { + LUS::Context::GetInstance()->GetControlDeck()->GetControllerByPort(port)->GetRumble()->ClearRumbleMapping(id); + } + ImGui::PopStyleVar(); +} + +void SohInputEditorWindow::DrawAddRumbleMappingButton(uint8_t port) { + ImGui::SameLine(); + ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(1.0f, 0.5f)); + auto popupId = StringHelper::Sprintf("addRumbleMappingPopup##%d", port); + if (ImGui::Button(StringHelper::Sprintf("%s###addRumbleMapping%d", ICON_FA_PLUS, port).c_str(), + ImVec2(SCALE_IMGUI_SIZE(20.0f), SCALE_IMGUI_SIZE(20.0f)))) { + ImGui::OpenPopup(popupId.c_str()); + } + ImGui::PopStyleVar(); + + if (ImGui::BeginPopup(popupId.c_str())) { + mInputEditorPopupOpen = true; + ImGui::Text("Press any button\nor move any axis\nto add rumble device"); + if (ImGui::Button("Cancel")) { + mInputEditorPopupOpen = false; + ImGui::CloseCurrentPopup(); + } + + if (mMappingInputBlockTimer == INT32_MAX && LUS::Context::GetInstance() + ->GetControlDeck() + ->GetControllerByPort(port) + ->GetRumble() + ->AddRumbleMappingFromRawPress()) { + mInputEditorPopupOpen = false; + ImGui::CloseCurrentPopup(); + } + ImGui::EndPopup(); + } +} + +bool SohInputEditorWindow::TestingRumble() { + return mRumbleTimer != INT32_MAX; +} + +void SohInputEditorWindow::DrawRumbleSection(uint8_t port) { + for (auto [id, mapping] : LUS::Context::GetInstance() + ->GetControlDeck() + ->GetControllerByPort(port) + ->GetRumble() + ->GetAllRumbleMappings()) { + ImGui::AlignTextToFramePadding(); + ImGui::SetNextItemOpen(true, ImGuiCond_Once); + auto buttonColor = ImGui::GetStyleColorVec4(ImGuiCol_Button); + auto buttonHoveredColor = ImGui::GetStyleColorVec4(ImGuiCol_ButtonHovered); + GetButtonColorsForLUSDeviceIndex(mapping->GetLUSDeviceIndex(), buttonColor, buttonHoveredColor); + // begin hackaround https://github.com/ocornut/imgui/issues/282#issuecomment-123763192 + // spaces to have background color for text in a tree node + std::string spaces = ""; + for (size_t i = 0; i < mapping->GetPhysicalDeviceName().length(); i++) { + spaces += " "; + } + auto open = ImGui::TreeNode(StringHelper::Sprintf("%s###Rumble%s", spaces.c_str(), id.c_str()).c_str()); + ImGui::SameLine(); + ImGui::SetCursorPosX(SCALE_IMGUI_SIZE(30.0f)); + // end hackaround + + ImGui::PushItemFlag(ImGuiItemFlags_Disabled, true); + ImGui::PushStyleColor(ImGuiCol_Button, buttonColor); + ImGui::Button(mapping->GetPhysicalDeviceName().c_str()); + ImGui::PopStyleColor(); + ImGui::PopItemFlag(); + + DrawRemoveRumbleMappingButton(port, id); + ImGui::SameLine(); + if (ImGui::Button( + StringHelper::Sprintf("%s###rumbleTestButton%s", TestingRumble() ? "Stop" : "Test", id.c_str()) + .c_str())) { + if (mRumbleTimer != INT32_MAX) { + mRumbleTimer = INT32_MAX; + mRumbleMappingToTest->StopRumble(); + mRumbleMappingToTest = nullptr; + } else { + mRumbleTimer = ImGui::GetIO().Framerate; + mRumbleMappingToTest = mapping; + } + } + if (open) { + ImGui::Text("Small Motor Intensity:"); + + int32_t smallMotorIntensity = mapping->GetHighFrequencyIntensityPercentage(); + if (smallMotorIntensity == 0) { + ImGui::BeginDisabled(); + } + ImGui::PushButtonRepeat(true); + if (ImGui::Button(StringHelper::Sprintf("-##Small Motor Intensity%s", id.c_str()).c_str())) { + mapping->SetHighFrequencyIntensity(smallMotorIntensity - 1); + mapping->SaveToConfig(); + } + ImGui::PopButtonRepeat(); + if (smallMotorIntensity == 0) { + ImGui::EndDisabled(); + } + ImGui::SameLine(0.0f, 0.0f); + ImGui::SetNextItemWidth(SCALE_IMGUI_SIZE(160.0f)); + if (ImGui::SliderInt(StringHelper::Sprintf("##Small Motor Intensity%s", id.c_str()).c_str(), + &smallMotorIntensity, 0, 100, "%d%%", ImGuiSliderFlags_AlwaysClamp)) { + mapping->SetHighFrequencyIntensity(smallMotorIntensity); + mapping->SaveToConfig(); + } + ImGui::SameLine(0.0f, 0.0f); + if (smallMotorIntensity == 100) { + ImGui::BeginDisabled(); + } + ImGui::PushButtonRepeat(true); + if (ImGui::Button(StringHelper::Sprintf("+##Small Motor Intensity%s", id.c_str()).c_str())) { + mapping->SetHighFrequencyIntensity(smallMotorIntensity + 1); + mapping->SaveToConfig(); + } + ImGui::PopButtonRepeat(); + if (smallMotorIntensity == 100) { + ImGui::EndDisabled(); + } + if (!mapping->HighFrequencyIntensityIsDefault()) { + ImGui::SameLine(); + if (ImGui::Button(StringHelper::Sprintf("Reset to Default###resetHighFrequencyIntensity%s", id.c_str()) + .c_str())) { + mapping->ResetHighFrequencyIntensityToDefault(); + } + } + + ImGui::Text("Large Motor Intensity:"); + + int32_t largeMotorIntensity = mapping->GetLowFrequencyIntensityPercentage(); + if (largeMotorIntensity == 0) { + ImGui::BeginDisabled(); + } + ImGui::PushButtonRepeat(true); + if (ImGui::Button(StringHelper::Sprintf("-##Large Motor Intensity%s", id.c_str()).c_str())) { + mapping->SetLowFrequencyIntensity(largeMotorIntensity - 1); + mapping->SaveToConfig(); + } + ImGui::PopButtonRepeat(); + if (largeMotorIntensity == 0) { + ImGui::EndDisabled(); + } + ImGui::SameLine(0.0f, 0.0f); + ImGui::SetNextItemWidth(SCALE_IMGUI_SIZE(160.0f)); + if (ImGui::SliderInt(StringHelper::Sprintf("##Large Motor Intensity%s", id.c_str()).c_str(), + &largeMotorIntensity, 0, 100, "%d%%", ImGuiSliderFlags_AlwaysClamp)) { + mapping->SetLowFrequencyIntensity(largeMotorIntensity); + mapping->SaveToConfig(); + } + ImGui::SameLine(0.0f, 0.0f); + if (largeMotorIntensity == 100) { + ImGui::BeginDisabled(); + } + ImGui::PushButtonRepeat(true); + if (ImGui::Button(StringHelper::Sprintf("+##Large Motor Intensity%s", id.c_str()).c_str())) { + mapping->SetLowFrequencyIntensity(largeMotorIntensity + 1); + mapping->SaveToConfig(); + } + ImGui::PopButtonRepeat(); + if (largeMotorIntensity == 100) { + ImGui::EndDisabled(); + } + if (!mapping->LowFrequencyIntensityIsDefault()) { + ImGui::SameLine(); + if (ImGui::Button( + StringHelper::Sprintf("Reset to Default###resetLowFrequencyIntensity%s", id.c_str()).c_str())) { + mapping->ResetLowFrequencyIntensityToDefault(); + } + } + ImGui::Dummy(ImVec2(0, SCALE_IMGUI_SIZE(20))); + + ImGui::TreePop(); + } + } + + ImGui::AlignTextToFramePadding(); + ImGui::BulletText("Add rumble device"); + DrawAddRumbleMappingButton(port); +} + +void SohInputEditorWindow::DrawRemoveLEDMappingButton(uint8_t port, std::string id) { + ImGui::SameLine(); + ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(1.0f, 0.5f)); + if (ImGui::Button(StringHelper::Sprintf("%s###removeLEDMapping%s", ICON_FA_TIMES, id.c_str()).c_str(), + ImVec2(SCALE_IMGUI_SIZE(20.0f), SCALE_IMGUI_SIZE(20.0f)))) { + LUS::Context::GetInstance()->GetControlDeck()->GetControllerByPort(port)->GetLED()->ClearLEDMapping(id); + } + ImGui::PopStyleVar(); +} + +void SohInputEditorWindow::DrawAddLEDMappingButton(uint8_t port) { + ImGui::SameLine(); + ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(1.0f, 0.5f)); + auto popupId = StringHelper::Sprintf("addLEDMappingPopup##%d", port); + if (ImGui::Button(StringHelper::Sprintf("%s###addLEDMapping%d", ICON_FA_PLUS, port).c_str(), + ImVec2(SCALE_IMGUI_SIZE(20.0f), SCALE_IMGUI_SIZE(20.0f)))) { + ImGui::OpenPopup(popupId.c_str()); + } + ImGui::PopStyleVar(); + + if (ImGui::BeginPopup(popupId.c_str())) { + mInputEditorPopupOpen = true; + ImGui::Text("Press any button\nor move any axis\nto add LED device"); + if (ImGui::Button("Cancel")) { + mInputEditorPopupOpen = false; + ImGui::CloseCurrentPopup(); + } + + if (mMappingInputBlockTimer == INT32_MAX && LUS::Context::GetInstance() + ->GetControlDeck() + ->GetControllerByPort(port) + ->GetLED() + ->AddLEDMappingFromRawPress()) { + mInputEditorPopupOpen = false; + ImGui::CloseCurrentPopup(); + } + ImGui::EndPopup(); + } +} + +void SohInputEditorWindow::DrawHelpIcon(const std::string& helptext) { + // place the ? button to the most of the right side of the cell it is using. + ImGui::SetCursorPosY(ImGui::GetCursorPosY() - SCALE_IMGUI_SIZE(22)); + ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetContentRegionAvail().x - SCALE_IMGUI_SIZE(15)); + ImGui::SmallButton("?"); + UIWidgets::Tooltip(helptext.c_str()); +} + +void SohInputEditorWindow::DrawLEDSection(uint8_t port) { + for (auto [id, mapping] : + LUS::Context::GetInstance()->GetControlDeck()->GetControllerByPort(port)->GetLED()->GetAllLEDMappings()) { + ImGui::AlignTextToFramePadding(); + ImGui::SetNextItemOpen(true, ImGuiCond_Once); + auto open = ImGui::TreeNode( + StringHelper::Sprintf("%s##LED%s", mapping->GetPhysicalDeviceName().c_str(), id.c_str()).c_str()); + DrawRemoveLEDMappingButton(port, id); + if (open) { + ImGui::AlignTextToFramePadding(); + ImGui::Text("LED Color:"); + ImGui::SameLine(); + ImGui::SetNextItemWidth(SCALE_IMGUI_SIZE(80.0f)); + int32_t colorSource = mapping->GetColorSource(); + if (ImGui::Combo(StringHelper::Sprintf("###ledColorSource%s", mapping->GetLEDMappingId().c_str()).c_str(), + &colorSource, "Off\0Set\0Game\0\0")) { + mapping->SetColorSource(colorSource); + }; + if (mapping->GetColorSource() == LED_COLOR_SOURCE_SET) { + ImGui::SameLine(); + ImVec4 color = { mapping->GetSavedColor().r / 255.0f, mapping->GetSavedColor().g / 255.0f, + mapping->GetSavedColor().b / 255.0f, 1.0f }; + if (ImGui::ColorEdit3( + StringHelper::Sprintf("###ledSavedColor%s", mapping->GetLEDMappingId().c_str()).c_str(), + (float*)&color, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel)) { + mapping->SetSavedColor( + Color_RGB8({ static_cast(color.x * 255.0), static_cast(color.y * 255.0), + static_cast(color.z * 255.0) })); + } + } + // todo: clean this up, probably just hardcode to LED_COLOR_SOURCE_GAME and use SoH options only here + if (mapping->GetColorSource() == LED_COLOR_SOURCE_GAME) { + static const char* ledSources[] = { + "Original Tunic Colors", "Cosmetics Tunic Colors", "Health Colors", + "Original Navi Targeting Colors", "Cosmetics Navi Targeting Colors", "Custom" + }; + UIWidgets::PaddedText("Source"); + UIWidgets::EnhancementCombobox("gLedColorSource", ledSources, LED_SOURCE_TUNIC_ORIGINAL); + DrawHelpIcon("Health\n- Red when health critical (13-20% depending on max health)\n- Yellow when " + "health < 40%. Green otherwise.\n\n" + "Tunics: colors will mirror currently equipped tunic, whether original or the current " + "values in Cosmetics Editor.\n\n" + "Custom: single, solid color"); + if (CVarGetInteger("gLedColorSource", 1) == LED_SOURCE_CUSTOM) { + UIWidgets::Spacer(3); + auto port1Color = CVarGetColor24("gLedPort1Color", { 255, 255, 255 }); + ImVec4 colorVec = { port1Color.r / 255.0f, port1Color.g / 255.0f, port1Color.b / 255.0f, 1.0f }; + if (ImGui::ColorEdit3("", (float*)&colorVec, + ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel)) { + Color_RGB8 color; + color.r = colorVec.x * 255.0; + color.g = colorVec.y * 255.0; + color.b = colorVec.z * 255.0; + + CVarSetColor24("gLedPort1Color", color); + LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick(); + } + ImGui::SameLine(); + ImGui::Text("Custom Color"); + } + UIWidgets::PaddedEnhancementSliderFloat("Brightness: %d%%", "##LED_Brightness", "gLedBrightness", 0.0f, + 1.0f, "", 1.0f, true, true); + DrawHelpIcon("Sets the brightness of controller LEDs. 0% brightness = LEDs off."); + UIWidgets::PaddedEnhancementCheckbox( + "Critical Health Override", "gLedCriticalOverride", true, true, + CVarGetInteger("gLedColorSource", LED_SOURCE_TUNIC_ORIGINAL) == LED_SOURCE_HEALTH, + "Override redundant for health source.", UIWidgets::CheckboxGraphics::Cross, true); + DrawHelpIcon("Shows red color when health is critical, otherwise displays according to color source."); + } + ImGui::TreePop(); + } + } + + ImGui::AlignTextToFramePadding(); + ImGui::BulletText("Add LED device"); + DrawAddLEDMappingButton(port); +} + +void SohInputEditorWindow::DrawRemoveGyroMappingButton(uint8_t port, std::string id) { + ImGui::SameLine(); + ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(1.0f, 0.5f)); + if (ImGui::Button(StringHelper::Sprintf("%s###removeGyroMapping%s", ICON_FA_TIMES, id.c_str()).c_str(), + ImVec2(SCALE_IMGUI_SIZE(20.0f), SCALE_IMGUI_SIZE(20.0f)))) { + LUS::Context::GetInstance()->GetControlDeck()->GetControllerByPort(port)->GetGyro()->ClearGyroMapping(); + } + ImGui::PopStyleVar(); +} + +void SohInputEditorWindow::DrawAddGyroMappingButton(uint8_t port) { + ImGui::SameLine(); + ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(1.0f, 0.5f)); + auto popupId = StringHelper::Sprintf("addGyroMappingPopup##%d", port); + if (ImGui::Button(StringHelper::Sprintf("%s###addGyroMapping%d", ICON_FA_PLUS, port).c_str(), + ImVec2(SCALE_IMGUI_SIZE(20.0f), SCALE_IMGUI_SIZE(20.0f)))) { + ImGui::OpenPopup(popupId.c_str()); + } + ImGui::PopStyleVar(); + + if (ImGui::BeginPopup(popupId.c_str())) { + mInputEditorPopupOpen = true; + ImGui::Text("Press any button\nor move any axis\nto add gyro device"); + if (ImGui::Button("Cancel")) { + mInputEditorPopupOpen = false; + ImGui::CloseCurrentPopup(); + } + + if (mMappingInputBlockTimer == INT32_MAX && LUS::Context::GetInstance() + ->GetControlDeck() + ->GetControllerByPort(port) + ->GetGyro() + ->SetGyroMappingFromRawPress()) { + mInputEditorPopupOpen = false; + ImGui::CloseCurrentPopup(); + } + ImGui::EndPopup(); + } +} + +void SohInputEditorWindow::DrawGyroSection(uint8_t port) { + auto mapping = + LUS::Context::GetInstance()->GetControlDeck()->GetControllerByPort(port)->GetGyro()->GetGyroMapping(); + if (mapping != nullptr) { + auto id = mapping->GetGyroMappingId(); + ImGui::AlignTextToFramePadding(); + ImGui::SetNextItemOpen(true, ImGuiCond_Once); + ImGui::BulletText(mapping->GetPhysicalDeviceName().c_str()); + DrawRemoveGyroMappingButton(port, id); + + static float sPitch, sYaw = 0.0f; + mapping->UpdatePad(sPitch, sYaw); + + ImGui::SetCursorPos(ImVec2(ImGui::GetCursorPos().x, ImGui::GetCursorPos().y - SCALE_IMGUI_SIZE(8))); + // to find a reasonable scaling factor gyro values + // I tried to find the maximum value reported by shaking + // a PS5 controller as hard as I could without worrying about breaking it + // the max I found for both pitch and yaw was ~21 + // the preview window expects values in an n64 analog stick range (-85 to 85) + // so I decided to multiply these by 85/21 + DrawAnalogPreview(StringHelper::Sprintf("###GyroPreview%s", id.c_str()).c_str(), + ImVec2(sYaw * (85.0f / 21.0f), sPitch * (85.0f / 21.0f)), 0.0f, true); + ImGui::SameLine(); + ImGui::SetCursorPos( + ImVec2(ImGui::GetCursorPos().x + SCALE_IMGUI_SIZE(8), ImGui::GetCursorPos().y + SCALE_IMGUI_SIZE(8))); + + ImGui::BeginGroup(); + ImGui::Text("Sensitivity:"); + + int32_t sensitivity = mapping->GetSensitivityPercent(); + if (sensitivity == 0) { + ImGui::BeginDisabled(); + } + ImGui::PushButtonRepeat(true); + if (ImGui::Button(StringHelper::Sprintf("-##GyroSensitivity%s", id.c_str()).c_str())) { + mapping->SetSensitivity(sensitivity - 1); + mapping->SaveToConfig(); + } + ImGui::PopButtonRepeat(); + if (sensitivity == 0) { + ImGui::EndDisabled(); + } + ImGui::SameLine(0.0f, 0.0f); + ImGui::SetNextItemWidth(SCALE_IMGUI_SIZE(160.0f)); + if (ImGui::SliderInt(StringHelper::Sprintf("##GyroSensitivity%s", id.c_str()).c_str(), &sensitivity, 0, 100, + "%d%%", ImGuiSliderFlags_AlwaysClamp)) { + mapping->SetSensitivity(sensitivity); + mapping->SaveToConfig(); + } + ImGui::SameLine(0.0f, 0.0f); + if (sensitivity == 100) { + ImGui::BeginDisabled(); + } + ImGui::PushButtonRepeat(true); + if (ImGui::Button(StringHelper::Sprintf("+##GyroSensitivity%s", id.c_str()).c_str())) { + mapping->SetSensitivity(sensitivity + 1); + mapping->SaveToConfig(); + } + ImGui::PopButtonRepeat(); + if (sensitivity == 100) { + ImGui::EndDisabled(); + } + + if (!mapping->SensitivityIsDefault()) { + ImGui::SameLine(); + if (ImGui::Button(StringHelper::Sprintf("Reset to Default###resetGyroSensitivity%s", id.c_str()).c_str())) { + mapping->ResetSensitivityToDefault(); + } + } + + ImGui::SetCursorPos(ImVec2(ImGui::GetCursorPos().x, ImGui::GetCursorPos().y + SCALE_IMGUI_SIZE(8))); + if (ImGui::Button("Recalibrate")) { + mapping->Recalibrate(); + mapping->SaveToConfig(); + } + ImGui::EndGroup(); + ImGui::SetCursorPos(ImVec2(ImGui::GetCursorPos().x, ImGui::GetCursorPos().y - SCALE_IMGUI_SIZE(8))); + } else { + ImGui::AlignTextToFramePadding(); + ImGui::BulletText("Add gyro device"); + DrawAddGyroMappingButton(port); + } +} + +void SohInputEditorWindow::DrawButtonDeviceIcons(uint8_t portIndex, std::set bitmasks) { + std::set allLusDeviceIndices; + allLusDeviceIndices.insert(LUS::LUSDeviceIndex::Keyboard); + for (auto [lusIndex, mapping] : LUS::Context::GetInstance() + ->GetControlDeck() + ->GetDeviceIndexMappingManager() + ->GetAllDeviceIndexMappingsFromConfig()) { + allLusDeviceIndices.insert(lusIndex); + } + + std::vector> lusDeviceIndiciesWithMappings; + for (auto lusIndex : allLusDeviceIndices) { + for (auto [bitmask, button] : + LUS::Context::GetInstance()->GetControlDeck()->GetControllerByPort(portIndex)->GetAllButtons()) { + if (!bitmasks.contains(bitmask)) { + continue; + } + + if (button->HasMappingsForLUSDeviceIndex(lusIndex)) { + for (auto [id, mapping] : button->GetAllButtonMappings()) { + if (mapping->GetLUSDeviceIndex() == lusIndex) { + lusDeviceIndiciesWithMappings.push_back( + std::pair(lusIndex, mapping->PhysicalDeviceIsConnected())); + break; + } + } + break; + } + } + } + + for (auto [lusIndex, connected] : lusDeviceIndiciesWithMappings) { + auto buttonColor = ImGui::GetStyleColorVec4(ImGuiCol_Button); + auto buttonHoveredColor = ImGui::GetStyleColorVec4(ImGuiCol_ButtonHovered); + GetButtonColorsForLUSDeviceIndex(lusIndex, buttonColor, buttonHoveredColor); + ImGui::PushStyleColor(ImGuiCol_Button, buttonColor); + ImGui::PushStyleColor(ImGuiCol_ButtonHovered, buttonHoveredColor); + ImGui::SameLine(); + if (lusIndex == LUS::LUSDeviceIndex::Keyboard) { + ImGui::SmallButton(ICON_FA_KEYBOARD_O); + } else { + ImGui::SmallButton(connected ? ICON_FA_GAMEPAD : ICON_FA_CHAIN_BROKEN); + } + ImGui::PopStyleColor(); + ImGui::PopStyleColor(); + } +} + +void SohInputEditorWindow::DrawAnalogStickDeviceIcons(uint8_t portIndex, LUS::Stick stick) { + std::set allLusDeviceIndices; + allLusDeviceIndices.insert(LUS::LUSDeviceIndex::Keyboard); + for (auto [lusIndex, mapping] : LUS::Context::GetInstance() + ->GetControlDeck() + ->GetDeviceIndexMappingManager() + ->GetAllDeviceIndexMappingsFromConfig()) { + allLusDeviceIndices.insert(lusIndex); + } + + std::vector> lusDeviceIndiciesWithMappings; + for (auto lusIndex : allLusDeviceIndices) { + auto controllerStick = + stick == LUS::Stick::LEFT_STICK + ? LUS::Context::GetInstance()->GetControlDeck()->GetControllerByPort(portIndex)->GetLeftStick() + : LUS::Context::GetInstance()->GetControlDeck()->GetControllerByPort(portIndex)->GetRightStick(); + if (controllerStick->HasMappingsForLUSDeviceIndex(lusIndex)) { + for (auto [direction, mappings] : controllerStick->GetAllAxisDirectionMappings()) { + bool foundMapping = false; + for (auto [id, mapping] : mappings) { + if (mapping->GetLUSDeviceIndex() == lusIndex) { + foundMapping = true; + lusDeviceIndiciesWithMappings.push_back( + std::pair(lusIndex, mapping->PhysicalDeviceIsConnected())); + break; + } + } + if (foundMapping) { + break; + } + } + } + } + + for (auto [lusIndex, connected] : lusDeviceIndiciesWithMappings) { + auto buttonColor = ImGui::GetStyleColorVec4(ImGuiCol_Button); + auto buttonHoveredColor = ImGui::GetStyleColorVec4(ImGuiCol_ButtonHovered); + GetButtonColorsForLUSDeviceIndex(lusIndex, buttonColor, buttonHoveredColor); + ImGui::PushStyleColor(ImGuiCol_Button, buttonColor); + ImGui::PushStyleColor(ImGuiCol_ButtonHovered, buttonHoveredColor); + ImGui::SameLine(); + if (lusIndex == LUS::LUSDeviceIndex::Keyboard) { + ImGui::SmallButton(ICON_FA_KEYBOARD_O); + } else { + ImGui::SmallButton(connected ? ICON_FA_GAMEPAD : ICON_FA_CHAIN_BROKEN); + } + ImGui::PopStyleColor(); + ImGui::PopStyleColor(); + } +} + +void SohInputEditorWindow::DrawRumbleDeviceIcons(uint8_t portIndex) { + std::set allLusDeviceIndices; + for (auto [lusIndex, mapping] : LUS::Context::GetInstance() + ->GetControlDeck() + ->GetDeviceIndexMappingManager() + ->GetAllDeviceIndexMappingsFromConfig()) { + allLusDeviceIndices.insert(lusIndex); + } + + std::vector> lusDeviceIndiciesWithMappings; + for (auto lusIndex : allLusDeviceIndices) { + if (LUS::Context::GetInstance() + ->GetControlDeck() + ->GetControllerByPort(portIndex) + ->GetRumble() + ->HasMappingsForLUSDeviceIndex(lusIndex)) { + for (auto [id, mapping] : LUS::Context::GetInstance() + ->GetControlDeck() + ->GetControllerByPort(portIndex) + ->GetRumble() + ->GetAllRumbleMappings()) { + if (mapping->GetLUSDeviceIndex() == lusIndex) { + lusDeviceIndiciesWithMappings.push_back( + std::pair(lusIndex, mapping->PhysicalDeviceIsConnected())); + break; + } + } + } + } + + for (auto [lusIndex, connected] : lusDeviceIndiciesWithMappings) { + auto buttonColor = ImGui::GetStyleColorVec4(ImGuiCol_Button); + auto buttonHoveredColor = ImGui::GetStyleColorVec4(ImGuiCol_ButtonHovered); + GetButtonColorsForLUSDeviceIndex(lusIndex, buttonColor, buttonHoveredColor); + ImGui::PushStyleColor(ImGuiCol_Button, buttonColor); + ImGui::PushStyleColor(ImGuiCol_ButtonHovered, buttonHoveredColor); + ImGui::SameLine(); + ImGui::SmallButton(connected ? ICON_FA_GAMEPAD : ICON_FA_CHAIN_BROKEN); + ImGui::PopStyleColor(); + ImGui::PopStyleColor(); + } +} + +void SohInputEditorWindow::DrawGyroDeviceIcons(uint8_t portIndex) { + auto mapping = + LUS::Context::GetInstance()->GetControlDeck()->GetControllerByPort(portIndex)->GetGyro()->GetGyroMapping(); + if (mapping == nullptr) { + return; + } + + auto buttonColor = ImGui::GetStyleColorVec4(ImGuiCol_Button); + auto buttonHoveredColor = ImGui::GetStyleColorVec4(ImGuiCol_ButtonHovered); + GetButtonColorsForLUSDeviceIndex(mapping->GetLUSDeviceIndex(), buttonColor, buttonHoveredColor); + ImGui::PushStyleColor(ImGuiCol_Button, buttonColor); + ImGui::PushStyleColor(ImGuiCol_ButtonHovered, buttonHoveredColor); + ImGui::SameLine(); + ImGui::SmallButton(mapping->PhysicalDeviceIsConnected() ? ICON_FA_GAMEPAD : ICON_FA_CHAIN_BROKEN); + ImGui::PopStyleColor(); + ImGui::PopStyleColor(); +} + +void SohInputEditorWindow::DrawLEDDeviceIcons(uint8_t portIndex) { + std::set allLusDeviceIndices; + for (auto [lusIndex, mapping] : LUS::Context::GetInstance() + ->GetControlDeck() + ->GetDeviceIndexMappingManager() + ->GetAllDeviceIndexMappingsFromConfig()) { + allLusDeviceIndices.insert(lusIndex); + } + + std::vector> lusDeviceIndiciesWithMappings; + for (auto lusIndex : allLusDeviceIndices) { + if (LUS::Context::GetInstance() + ->GetControlDeck() + ->GetControllerByPort(portIndex) + ->GetRumble() + ->HasMappingsForLUSDeviceIndex(lusIndex)) { + for (auto [id, mapping] : LUS::Context::GetInstance() + ->GetControlDeck() + ->GetControllerByPort(portIndex) + ->GetLED() + ->GetAllLEDMappings()) { + if (mapping->GetLUSDeviceIndex() == lusIndex) { + lusDeviceIndiciesWithMappings.push_back( + std::pair(lusIndex, mapping->PhysicalDeviceIsConnected())); + break; + } + } + } + } + + for (auto [lusIndex, connected] : lusDeviceIndiciesWithMappings) { + auto buttonColor = ImGui::GetStyleColorVec4(ImGuiCol_Button); + auto buttonHoveredColor = ImGui::GetStyleColorVec4(ImGuiCol_ButtonHovered); + GetButtonColorsForLUSDeviceIndex(lusIndex, buttonColor, buttonHoveredColor); + ImGui::PushStyleColor(ImGuiCol_Button, buttonColor); + ImGui::PushStyleColor(ImGuiCol_ButtonHovered, buttonHoveredColor); + ImGui::SameLine(); + ImGui::SmallButton(connected ? ICON_FA_GAMEPAD : ICON_FA_CHAIN_BROKEN); + ImGui::PopStyleColor(); + ImGui::PopStyleColor(); + } +} + +void SohInputEditorWindow::DrawLinkTab() { + uint8_t portIndex = 0; + if (ImGui::BeginTabItem(StringHelper::Sprintf("Link (P1)###port%d", portIndex).c_str())) { + DrawClearAllButton(portIndex); + DrawSetDefaultsButton(portIndex); + + UpdateBitmaskToMappingIds(portIndex); + UpdateStickDirectionToMappingIds(portIndex); + + ImGui::PushStyleColor(ImGuiCol_Header, ImVec4(0.133f, 0.133f, 0.133f, 1.0f)); + ImGui::PushStyleColor(ImGuiCol_HeaderHovered, ImVec4(0.0f, 0.0f, 0.0f, 1.0f)); + ImGui::PushStyleColor(ImGuiCol_HeaderActive, ImVec4(0.0f, 0.0f, 0.0f, 1.0f)); + + if (ImGui::CollapsingHeader("Buttons", NULL, ImGuiTreeNodeFlags_DefaultOpen)) { + DrawButtonDeviceIcons(portIndex, mButtonsBitmasks); + DrawButtonLine("A", portIndex, BTN_A, CHIP_COLOR_N64_BLUE); + DrawButtonLine("B", portIndex, BTN_B, CHIP_COLOR_N64_GREEN); + DrawButtonLine("Start", portIndex, BTN_START, CHIP_COLOR_N64_RED); + DrawButtonLine("L", portIndex, BTN_L); + DrawButtonLine("R", portIndex, BTN_R); + DrawButtonLine("Z", portIndex, BTN_Z); + DrawButtonLine(StringHelper::Sprintf("C %s", ICON_FA_ARROW_UP).c_str(), portIndex, BTN_CUP, + CHIP_COLOR_N64_YELLOW); + DrawButtonLine(StringHelper::Sprintf("C %s", ICON_FA_ARROW_DOWN).c_str(), portIndex, BTN_CDOWN, + CHIP_COLOR_N64_YELLOW); + DrawButtonLine(StringHelper::Sprintf("C %s", ICON_FA_ARROW_LEFT).c_str(), portIndex, BTN_CLEFT, + CHIP_COLOR_N64_YELLOW); + DrawButtonLine(StringHelper::Sprintf("C %s", ICON_FA_ARROW_RIGHT).c_str(), portIndex, BTN_CRIGHT, + CHIP_COLOR_N64_YELLOW); + } else { + DrawButtonDeviceIcons(portIndex, mButtonsBitmasks); + } + + if (ImGui::CollapsingHeader("D-Pad", NULL, ImGuiTreeNodeFlags_DefaultOpen)) { + DrawButtonDeviceIcons(portIndex, mDpadBitmasks); + DrawButtonLine(StringHelper::Sprintf("%s", ICON_FA_ARROW_UP).c_str(), portIndex, BTN_DUP); + DrawButtonLine(StringHelper::Sprintf("%s", ICON_FA_ARROW_DOWN).c_str(), portIndex, BTN_DDOWN); + DrawButtonLine(StringHelper::Sprintf("%s", ICON_FA_ARROW_LEFT).c_str(), portIndex, BTN_DLEFT); + DrawButtonLine(StringHelper::Sprintf("%s", ICON_FA_ARROW_RIGHT).c_str(), portIndex, BTN_DRIGHT); + } else { + DrawButtonDeviceIcons(portIndex, mDpadBitmasks); + } + + if (ImGui::CollapsingHeader("Analog Stick", NULL, ImGuiTreeNodeFlags_DefaultOpen)) { + DrawAnalogStickDeviceIcons(portIndex, LUS::LEFT_STICK); + DrawStickSection(portIndex, LUS::LEFT, 0); + } else { + DrawAnalogStickDeviceIcons(portIndex, LUS::LEFT_STICK); + } + + if (ImGui::CollapsingHeader("Additional (\"Right\") Stick")) { + DrawAnalogStickDeviceIcons(portIndex, LUS::RIGHT_STICK); + DrawStickSection(portIndex, LUS::RIGHT, 1, CHIP_COLOR_N64_YELLOW); + } else { + DrawAnalogStickDeviceIcons(portIndex, LUS::RIGHT_STICK); + } + + if (ImGui::CollapsingHeader("Rumble")) { + DrawRumbleDeviceIcons(portIndex); + DrawRumbleSection(portIndex); + } else { + DrawRumbleDeviceIcons(portIndex); + } + + if (ImGui::CollapsingHeader("Gyro")) { + DrawGyroDeviceIcons(portIndex); + DrawGyroSection(portIndex); + } else { + DrawGyroDeviceIcons(portIndex); + } + + if (ImGui::CollapsingHeader("LEDs")) { + DrawLEDDeviceIcons(portIndex); + DrawLEDSection(portIndex); + } else { + DrawLEDDeviceIcons(portIndex); + } + + if (ImGui::CollapsingHeader("Modifier Buttons")) { + DrawButtonDeviceIcons(portIndex, mModifierButtonsBitmasks); + DrawButtonLine("M1", portIndex, BTN_MODIFIER1); + DrawButtonLine("M2", portIndex, BTN_MODIFIER2); + } else { + DrawButtonDeviceIcons(portIndex, mModifierButtonsBitmasks); + } + + ImGui::PopStyleColor(); + ImGui::PopStyleColor(); + ImGui::PopStyleColor(); + ImGui::EndTabItem(); + } +} + +void SohInputEditorWindow::DrawIvanTab() { + if (CVarGetInteger("gDebugEnabled", 0)) { + DrawDebugPortTab(1, "Ivan (P2)"); + return; + } + + uint8_t portIndex = 1; + if (ImGui::BeginTabItem(StringHelper::Sprintf("Ivan (P2)###port%d", portIndex).c_str())) { + DrawClearAllButton(portIndex); + DrawSetDefaultsButton(portIndex); + + UpdateBitmaskToMappingIds(portIndex); + UpdateStickDirectionToMappingIds(portIndex); + + ImGui::PushStyleColor(ImGuiCol_Header, ImVec4(0.133f, 0.133f, 0.133f, 1.0f)); + ImGui::PushStyleColor(ImGuiCol_HeaderHovered, ImVec4(0.0f, 0.0f, 0.0f, 1.0f)); + ImGui::PushStyleColor(ImGuiCol_HeaderActive, ImVec4(0.0f, 0.0f, 0.0f, 1.0f)); + + if (ImGui::CollapsingHeader("Buttons", NULL, ImGuiTreeNodeFlags_DefaultOpen)) { + DrawButtonDeviceIcons(portIndex, mButtonsBitmasks); + DrawButtonLine("A", portIndex, BTN_A, CHIP_COLOR_N64_BLUE); + DrawButtonLine("B", portIndex, BTN_B, CHIP_COLOR_N64_GREEN); + DrawButtonLine("Z", portIndex, BTN_Z); + DrawButtonLine(StringHelper::Sprintf("C %s", ICON_FA_ARROW_UP).c_str(), portIndex, BTN_CUP, + CHIP_COLOR_N64_YELLOW); + DrawButtonLine(StringHelper::Sprintf("C %s", ICON_FA_ARROW_DOWN).c_str(), portIndex, BTN_CDOWN, + CHIP_COLOR_N64_YELLOW); + DrawButtonLine(StringHelper::Sprintf("C %s", ICON_FA_ARROW_LEFT).c_str(), portIndex, BTN_CLEFT, + CHIP_COLOR_N64_YELLOW); + DrawButtonLine(StringHelper::Sprintf("C %s", ICON_FA_ARROW_RIGHT).c_str(), portIndex, BTN_CRIGHT, + CHIP_COLOR_N64_YELLOW); + } else { + DrawButtonDeviceIcons(portIndex, mButtonsBitmasks); + } + + if (ImGui::CollapsingHeader("D-Pad", NULL, ImGuiTreeNodeFlags_DefaultOpen)) { + DrawButtonDeviceIcons(portIndex, mDpadBitmasks); + DrawButtonLine(StringHelper::Sprintf("%s", ICON_FA_ARROW_UP).c_str(), portIndex, BTN_DUP); + DrawButtonLine(StringHelper::Sprintf("%s", ICON_FA_ARROW_DOWN).c_str(), portIndex, BTN_DDOWN); + DrawButtonLine(StringHelper::Sprintf("%s", ICON_FA_ARROW_LEFT).c_str(), portIndex, BTN_DLEFT); + DrawButtonLine(StringHelper::Sprintf("%s", ICON_FA_ARROW_RIGHT).c_str(), portIndex, BTN_DRIGHT); + } else { + DrawButtonDeviceIcons(portIndex, mDpadBitmasks); + } + + if (ImGui::CollapsingHeader("Analog Stick", NULL, ImGuiTreeNodeFlags_DefaultOpen)) { + DrawAnalogStickDeviceIcons(portIndex, LUS::LEFT_STICK); + DrawStickSection(portIndex, LUS::LEFT, 0); + } else { + DrawAnalogStickDeviceIcons(portIndex, LUS::LEFT_STICK); + } + + ImGui::PopStyleColor(); + ImGui::PopStyleColor(); + ImGui::PopStyleColor(); + ImGui::EndTabItem(); + } +} + +void SohInputEditorWindow::DrawDebugPortTab(uint8_t portIndex, std::string customName) { + if (ImGui::BeginTabItem(customName == "" + ? StringHelper::Sprintf("Port %d###port%d", portIndex + 1, portIndex).c_str() + : customName.c_str())) { + DrawClearAllButton(portIndex); + DrawSetDefaultsButton(portIndex); + + UpdateBitmaskToMappingIds(portIndex); + UpdateStickDirectionToMappingIds(portIndex); + + ImGui::PushStyleColor(ImGuiCol_Header, ImVec4(0.133f, 0.133f, 0.133f, 1.0f)); + ImGui::PushStyleColor(ImGuiCol_HeaderHovered, ImVec4(0.0f, 0.0f, 0.0f, 1.0f)); + ImGui::PushStyleColor(ImGuiCol_HeaderActive, ImVec4(0.0f, 0.0f, 0.0f, 1.0f)); + + if (ImGui::CollapsingHeader("Buttons", NULL, ImGuiTreeNodeFlags_DefaultOpen)) { + DrawButtonDeviceIcons(portIndex, mButtonsBitmasks); + DrawButtonLine("A", portIndex, BTN_A, CHIP_COLOR_N64_BLUE); + DrawButtonLine("B", portIndex, BTN_B, CHIP_COLOR_N64_GREEN); + DrawButtonLine("Start", portIndex, BTN_START, CHIP_COLOR_N64_RED); + DrawButtonLine("L", portIndex, BTN_L); + DrawButtonLine("R", portIndex, BTN_R); + DrawButtonLine("Z", portIndex, BTN_Z); + DrawButtonLine(StringHelper::Sprintf("C %s", ICON_FA_ARROW_UP).c_str(), portIndex, BTN_CUP, + CHIP_COLOR_N64_YELLOW); + DrawButtonLine(StringHelper::Sprintf("C %s", ICON_FA_ARROW_DOWN).c_str(), portIndex, BTN_CDOWN, + CHIP_COLOR_N64_YELLOW); + DrawButtonLine(StringHelper::Sprintf("C %s", ICON_FA_ARROW_LEFT).c_str(), portIndex, BTN_CLEFT, + CHIP_COLOR_N64_YELLOW); + DrawButtonLine(StringHelper::Sprintf("C %s", ICON_FA_ARROW_RIGHT).c_str(), portIndex, BTN_CRIGHT, + CHIP_COLOR_N64_YELLOW); + } else { + DrawButtonDeviceIcons(portIndex, mButtonsBitmasks); + } + + if (ImGui::CollapsingHeader("D-Pad", NULL, ImGuiTreeNodeFlags_DefaultOpen)) { + DrawButtonDeviceIcons(portIndex, mDpadBitmasks); + DrawButtonLine(StringHelper::Sprintf("%s", ICON_FA_ARROW_UP).c_str(), portIndex, BTN_DUP); + DrawButtonLine(StringHelper::Sprintf("%s", ICON_FA_ARROW_DOWN).c_str(), portIndex, BTN_DDOWN); + DrawButtonLine(StringHelper::Sprintf("%s", ICON_FA_ARROW_LEFT).c_str(), portIndex, BTN_DLEFT); + DrawButtonLine(StringHelper::Sprintf("%s", ICON_FA_ARROW_RIGHT).c_str(), portIndex, BTN_DRIGHT); + } else { + DrawButtonDeviceIcons(portIndex, mDpadBitmasks); + } + + if (ImGui::CollapsingHeader("Analog Stick", NULL, ImGuiTreeNodeFlags_DefaultOpen)) { + DrawAnalogStickDeviceIcons(portIndex, LUS::LEFT_STICK); + DrawStickSection(portIndex, LUS::LEFT, 0); + } else { + DrawAnalogStickDeviceIcons(portIndex, LUS::LEFT_STICK); + } + + ImGui::PopStyleColor(); + ImGui::PopStyleColor(); + ImGui::PopStyleColor(); + ImGui::EndTabItem(); + } +} + +void SohInputEditorWindow::DrawClearAllButton(uint8_t portIndex) { + if (ImGui::Button("Clear All", ImGui::CalcTextSize("Clear All") * 2)) { + ImGui::OpenPopup("Clear All##clearAllPopup"); + } + if (ImGui::BeginPopupModal("Clear All##clearAllPopup", NULL, ImGuiWindowFlags_AlwaysAutoResize)) { + ImGui::Text("This will clear all mappings for port %d.\n\nContinue?", portIndex + 1); + if (ImGui::Button("Cancel")) { + ImGui::CloseCurrentPopup(); + } + if (ImGui::Button("Clear All")) { + LUS::Context::GetInstance()->GetControlDeck()->GetControllerByPort(portIndex)->ClearAllMappings(); + ImGui::CloseCurrentPopup(); + } + ImGui::EndPopup(); + } +} + +#ifdef __WIIU__ +void SohInputEditorWindow::DrawSetDefaultsButton(uint8_t portIndex) { + ImGui::SameLine(); + ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(1.0f, 0.5f)); + auto popupId = StringHelper::Sprintf("setDefaultsPopup##%d", portIndex); + if (ImGui::Button(StringHelper::Sprintf("Set defaults...##%d", portIndex).c_str())) { + ImGui::OpenPopup(popupId.c_str()); + } + ImGui::PopStyleVar(); + + if (ImGui::BeginPopup(popupId.c_str())) { + std::map> indexMappings; + for (auto [lusIndex, mapping] : LUS::Context::GetInstance() + ->GetControlDeck() + ->GetDeviceIndexMappingManager() + ->GetAllDeviceIndexMappings()) { + auto wiiuIndexMapping = std::static_pointer_cast(mapping); + if (wiiuIndexMapping == nullptr) { + continue; + } + + indexMappings[lusIndex] = { wiiuIndexMapping->GetWiiUControllerName(), + wiiuIndexMapping->IsWiiUGamepad() ? INT32_MAX + : wiiuIndexMapping->GetDeviceChannel() }; + } + + bool shouldClose = false; + for (auto [lusIndex, info] : indexMappings) { + auto [name, wiiuChannel] = info; + bool isGamepad = wiiuChannel == INT32_MAX; + + auto buttonColor = ImGui::GetStyleColorVec4(ImGuiCol_Button); + auto buttonHoveredColor = ImGui::GetStyleColorVec4(ImGuiCol_ButtonHovered); + GetButtonColorsForLUSDeviceIndex(lusIndex, buttonColor, buttonHoveredColor); + ImGui::PushStyleColor(ImGuiCol_Button, buttonColor); + ImGui::PushStyleColor(ImGuiCol_ButtonHovered, buttonHoveredColor); + + auto fancyName = StringHelper::Sprintf( + "%s%s", name.c_str(), isGamepad ? "" : StringHelper::Sprintf(" (%d)", wiiuChannel).c_str()); + if (ImGui::Button(StringHelper::Sprintf("%s %s", ICON_FA_GAMEPAD, fancyName.c_str()).c_str())) { + ImGui::OpenPopup(StringHelper::Sprintf("Set Defaults for %s", name.c_str()).c_str()); + } + ImGui::PopStyleColor(); + ImGui::PopStyleColor(); + if (ImGui::BeginPopupModal(StringHelper::Sprintf("Set Defaults for %s", name.c_str()).c_str(), NULL, + ImGuiWindowFlags_AlwaysAutoResize)) { + ImGui::Text("This will clear all existing mappings for\n%s on port %d.\n\nContinue?", fancyName.c_str(), + portIndex + 1); + if (ImGui::Button("Cancel")) { + shouldClose = true; + ImGui::CloseCurrentPopup(); + } + if (ImGui::Button("Set defaults")) { + LUS::Context::GetInstance() + ->GetControlDeck() + ->GetControllerByPort(portIndex) + ->ClearAllMappingsForDevice(lusIndex); + LUS::Context::GetInstance()->GetControlDeck()->GetControllerByPort(portIndex)->AddDefaultMappings( + lusIndex); + shouldClose = true; + ImGui::CloseCurrentPopup(); + } + ImGui::EndPopup(); + } + } + + if (ImGui::Button("Cancel") || shouldClose) { + ImGui::CloseCurrentPopup(); + } + + ImGui::EndPopup(); + } +} + +void SohInputEditorWindow::DrawDevicesTab() { + if (ImGui::BeginTabItem("Devices")) { + std::map> indexMappings; + for (auto [lusIndex, mapping] : LUS::Context::GetInstance() + ->GetControlDeck() + ->GetDeviceIndexMappingManager() + ->GetAllDeviceIndexMappingsFromConfig()) { + auto wiiuIndexMapping = std::static_pointer_cast(mapping); + if (wiiuIndexMapping == nullptr) { + continue; + } + + indexMappings[lusIndex] = { wiiuIndexMapping->GetWiiUControllerName(), -1 }; + } + + for (auto [lusIndex, mapping] : LUS::Context::GetInstance() + ->GetControlDeck() + ->GetDeviceIndexMappingManager() + ->GetAllDeviceIndexMappings()) { + auto wiiuIndexMapping = std::static_pointer_cast(mapping); + if (wiiuIndexMapping == nullptr) { + continue; + } + + indexMappings[lusIndex] = { wiiuIndexMapping->GetWiiUControllerName(), + wiiuIndexMapping->IsWiiUGamepad() ? INT32_MAX + : wiiuIndexMapping->GetDeviceChannel() }; + } + + for (auto [lusIndex, info] : indexMappings) { + auto [name, wiiuChannel] = info; + bool connected = wiiuChannel != -1; + bool isGamepad = wiiuChannel == INT32_MAX; + + auto buttonColor = ImGui::GetStyleColorVec4(ImGuiCol_Button); + auto buttonHoveredColor = ImGui::GetStyleColorVec4(ImGuiCol_ButtonHovered); + GetButtonColorsForLUSDeviceIndex(lusIndex, buttonColor, buttonHoveredColor); + ImGui::PushItemFlag(ImGuiItemFlags_Disabled, true); + ImGui::PushStyleColor(ImGuiCol_Button, buttonColor); + ImGui::Button(StringHelper::Sprintf("%s %s%s", connected ? ICON_FA_GAMEPAD : ICON_FA_CHAIN_BROKEN, + name.c_str(), + !connected ? " (Disconnected)" + : isGamepad ? "" + : StringHelper::Sprintf(" (%d)", wiiuChannel).c_str()) + .c_str()); + ImGui::PopStyleColor(); + ImGui::PopItemFlag(); + } + + ImGui::EndTabItem(); + } +} +#else +void SohInputEditorWindow::DrawSetDefaultsButton(uint8_t portIndex) { + ImGui::SameLine(); + auto popupId = StringHelper::Sprintf("setDefaultsPopup##%d", portIndex); + if (ImGui::Button(StringHelper::Sprintf("Set Defaults##%d", portIndex).c_str(), + ImVec2(ImGui::CalcTextSize("Set Defaults") * 2))) { + ImGui::OpenPopup(popupId.c_str()); + } + + if (ImGui::BeginPopup(popupId.c_str())) { + std::map> indexMappings; + for (auto [lusIndex, mapping] : LUS::Context::GetInstance() + ->GetControlDeck() + ->GetDeviceIndexMappingManager() + ->GetAllDeviceIndexMappings()) { + auto sdlIndexMapping = std::static_pointer_cast(mapping); + if (sdlIndexMapping == nullptr) { + continue; + } + + indexMappings[lusIndex] = { sdlIndexMapping->GetSDLControllerName(), sdlIndexMapping->GetSDLDeviceIndex() }; + } + + bool shouldClose = false; + ImGui::PushStyleColor(ImGuiCol_Button, BUTTON_COLOR_KEYBOARD_BEIGE); + ImGui::PushStyleColor(ImGuiCol_ButtonHovered, BUTTON_COLOR_KEYBOARD_BEIGE_HOVERED); + if (ImGui::Button(StringHelper::Sprintf("%s Keyboard", ICON_FA_KEYBOARD_O).c_str())) { + ImGui::OpenPopup("Set Defaults for Keyboard"); + } + ImGui::PopStyleColor(); + ImGui::PopStyleColor(); + if (ImGui::BeginPopupModal("Set Defaults for Keyboard", NULL, ImGuiWindowFlags_AlwaysAutoResize)) { + ImGui::Text("This will clear all existing mappings for\nKeyboard on port %d.\n\nContinue?", portIndex + 1); + if (ImGui::Button("Cancel")) { + shouldClose = true; + ImGui::CloseCurrentPopup(); + } + if (ImGui::Button("Set defaults")) { + LUS::Context::GetInstance() + ->GetControlDeck() + ->GetControllerByPort(portIndex) + ->ClearAllMappingsForDevice(LUS::LUSDeviceIndex::Keyboard); + LUS::Context::GetInstance()->GetControlDeck()->GetControllerByPort(portIndex)->AddDefaultMappings( + LUS::LUSDeviceIndex::Keyboard); + shouldClose = true; + ImGui::CloseCurrentPopup(); + } + ImGui::EndPopup(); + } + for (auto [lusIndex, info] : indexMappings) { + auto [name, sdlIndex] = info; + + auto buttonColor = ImGui::GetStyleColorVec4(ImGuiCol_Button); + auto buttonHoveredColor = ImGui::GetStyleColorVec4(ImGuiCol_ButtonHovered); + GetButtonColorsForLUSDeviceIndex(lusIndex, buttonColor, buttonHoveredColor); + ImGui::PushStyleColor(ImGuiCol_Button, buttonColor); + ImGui::PushStyleColor(ImGuiCol_ButtonHovered, buttonHoveredColor); + if (ImGui::Button(StringHelper::Sprintf("%s %s (%s)", ICON_FA_GAMEPAD, name.c_str(), + StringHelper::Sprintf("SDL %d", sdlIndex).c_str()) + .c_str())) { + ImGui::OpenPopup(StringHelper::Sprintf("Set Defaults for %s", name.c_str()).c_str()); + } + ImGui::PopStyleColor(); + ImGui::PopStyleColor(); + if (ImGui::BeginPopupModal(StringHelper::Sprintf("Set Defaults for %s", name.c_str()).c_str(), NULL, + ImGuiWindowFlags_AlwaysAutoResize)) { + ImGui::Text("This will clear all existing mappings for\n%s (SDL %d) on port %d.\n\nContinue?", + name.c_str(), sdlIndex, portIndex + 1); + if (ImGui::Button("Cancel")) { + shouldClose = true; + ImGui::CloseCurrentPopup(); + } + if (ImGui::Button("Set defaults")) { + LUS::Context::GetInstance() + ->GetControlDeck() + ->GetControllerByPort(portIndex) + ->ClearAllMappingsForDevice(lusIndex); + LUS::Context::GetInstance()->GetControlDeck()->GetControllerByPort(portIndex)->AddDefaultMappings( + lusIndex); + shouldClose = true; + ImGui::CloseCurrentPopup(); + } + ImGui::EndPopup(); + } + } + + if (ImGui::Button("Cancel") || shouldClose) { + ImGui::CloseCurrentPopup(); + } + + ImGui::EndPopup(); + } +} + +void SohInputEditorWindow::DrawDevicesTab() { + if (ImGui::BeginTabItem("Devices")) { + std::map> indexMappings; + for (auto [lusIndex, mapping] : LUS::Context::GetInstance() + ->GetControlDeck() + ->GetDeviceIndexMappingManager() + ->GetAllDeviceIndexMappingsFromConfig()) { + auto sdlIndexMapping = std::static_pointer_cast(mapping); + if (sdlIndexMapping == nullptr) { + continue; + } + + indexMappings[lusIndex] = { sdlIndexMapping->GetSDLControllerName(), -1 }; + } + + for (auto [lusIndex, mapping] : LUS::Context::GetInstance() + ->GetControlDeck() + ->GetDeviceIndexMappingManager() + ->GetAllDeviceIndexMappings()) { + auto sdlIndexMapping = std::static_pointer_cast(mapping); + if (sdlIndexMapping == nullptr) { + continue; + } + + indexMappings[lusIndex] = { sdlIndexMapping->GetSDLControllerName(), sdlIndexMapping->GetSDLDeviceIndex() }; + } + + for (auto [lusIndex, info] : indexMappings) { + auto [name, sdlIndex] = info; + bool connected = sdlIndex != -1; + + auto buttonColor = ImGui::GetStyleColorVec4(ImGuiCol_Button); + auto buttonHoveredColor = ImGui::GetStyleColorVec4(ImGuiCol_ButtonHovered); + GetButtonColorsForLUSDeviceIndex(lusIndex, buttonColor, buttonHoveredColor); + ImGui::PushItemFlag(ImGuiItemFlags_Disabled, true); + ImGui::PushStyleColor(ImGuiCol_Button, buttonColor); + ImGui::Button( + StringHelper::Sprintf("%s %s (%s)", connected ? ICON_FA_GAMEPAD : ICON_FA_CHAIN_BROKEN, name.c_str(), + connected ? StringHelper::Sprintf("SDL %d", sdlIndex).c_str() : "Disconnected") + .c_str()); + ImGui::PopStyleColor(); + ImGui::PopItemFlag(); + } + + ImGui::EndTabItem(); + } +} +#endif + +void SohInputEditorWindow::DrawElement() { + ImGui::Begin("Controller Configuration###sohControllerConfigWindowV1", &mIsVisible); + ImGui::BeginTabBar("##ControllerConfigPortTabs"); + DrawLinkTab(); + DrawIvanTab(); + if (CVarGetInteger("gDebugEnabled", 0)) { + DrawDebugPortTab(2); + DrawDebugPortTab(3); + } + DrawDevicesTab(); + ImGui::EndTabBar(); + ImGui::End(); +} diff --git a/soh/soh/Enhancements/controls/SohInputEditorWindow.h b/soh/soh/Enhancements/controls/SohInputEditorWindow.h new file mode 100644 index 000000000..089719a58 --- /dev/null +++ b/soh/soh/Enhancements/controls/SohInputEditorWindow.h @@ -0,0 +1,86 @@ +#pragma once + +#include "stdint.h" +#include +#include +#include +#include +#include +#include + +class SohInputEditorWindow : public LUS::GuiWindow { + public: + using GuiWindow::GuiWindow; + ~SohInputEditorWindow(); + + void DrawButton(const char* label, int32_t n64Btn, int32_t currentPort, int32_t* btnReading); + + void DrawInputChip(const char* buttonName, ImVec4 color); + void DrawAnalogPreview(const char* label, ImVec2 stick, float deadzone = 0, bool gyro = false); + void DrawControllerSchema(); + bool TestingRumble(); + + protected: + void InitElement() override; + void DrawElement() override; + void UpdateElement() override; + + private: + void DrawStickDirectionLine(const char* axisDirectionName, uint8_t port, uint8_t stick, LUS::Direction direction, + ImVec4 color); + void DrawButtonLine(const char* buttonName, uint8_t port, uint16_t bitmask, ImVec4 color); + void DrawButtonLineEditMappingButton(uint8_t port, uint16_t bitmask, std::string id); + void DrawButtonLineAddMappingButton(uint8_t port, uint16_t bitmask); + + void DrawStickDirectionLineEditMappingButton(uint8_t port, uint8_t stick, LUS::Direction direction, std::string id); + void DrawStickDirectionLineAddMappingButton(uint8_t port, uint8_t stick, LUS::Direction direction); + void DrawStickSection(uint8_t port, uint8_t stick, int32_t id, ImVec4 color); + + void DrawRumbleSection(uint8_t port); + void DrawRemoveRumbleMappingButton(uint8_t port, std::string id); + void DrawAddRumbleMappingButton(uint8_t port); + + void DrawLEDSection(uint8_t port); + void DrawRemoveLEDMappingButton(uint8_t port, std::string id); + void DrawAddLEDMappingButton(uint8_t port); + + void DrawGyroSection(uint8_t port); + void DrawRemoveGyroMappingButton(uint8_t port, std::string id); + void DrawAddGyroMappingButton(uint8_t port); + + int32_t mGameInputBlockTimer; + int32_t mMappingInputBlockTimer; + int32_t mRumbleTimer; + std::shared_ptr mRumbleMappingToTest; + + // mBitmaskToMappingIds[port][bitmask] = { id0, id1, ... } + std::unordered_map>> mBitmaskToMappingIds; + + // mStickDirectionToMappingIds[port][stick][direction] = { id0, id1, ... } + std::unordered_map>>> + mStickDirectionToMappingIds; + + void UpdateBitmaskToMappingIds(uint8_t port); + void UpdateStickDirectionToMappingIds(uint8_t port); + + void GetButtonColorsForLUSDeviceIndex(LUS::LUSDeviceIndex lusIndex, ImVec4& buttonColor, + ImVec4& buttonHoveredColor); + void DrawLinkTab(); + void DrawIvanTab(); + void DrawDebugPortTab(uint8_t portIndex, std::string customName = ""); + void DrawDevicesTab(); + std::set mButtonsBitmasks; + std::set mDpadBitmasks; + std::set mModifierButtonsBitmasks; + void DrawButtonDeviceIcons(uint8_t portIndex, std::set bitmasks); + void DrawAnalogStickDeviceIcons(uint8_t portIndex, LUS::Stick stick); + void DrawRumbleDeviceIcons(uint8_t portIndex); + void DrawGyroDeviceIcons(uint8_t portIndex); + void DrawLEDDeviceIcons(uint8_t portIndex); + bool mInputEditorPopupOpen; + void DrawSetDefaultsButton(uint8_t portIndex); + void DrawClearAllButton(uint8_t portIndex); + + void DrawHelpIcon(const std::string& helptext); +}; diff --git a/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp b/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp index 8c2707453..378197bcd 100644 --- a/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp +++ b/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp @@ -1485,6 +1485,7 @@ void Draw_Placements(){ } void DrawSillyTab() { + ImGui::BeginDisabled(CVarGetInteger("gDisableChangingSettings", 0)); if (CVarGetInteger("gLetItSnow", 0)) { if (UIWidgets::EnhancementCheckbox("Let It Snow", "gLetItSnow")) { LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick(); @@ -1569,6 +1570,7 @@ void DrawSillyTab() { CVarClear("gCosmetics.Kak_Windmill_Speed.Changed"); LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick(); } + ImGui::EndDisabled(); } // Copies the RGB values from one cosmetic option to another, multiplied by the passed in amount, this @@ -1767,6 +1769,10 @@ void CosmeticsEditorWindow::DrawElement() { ImGui::SameLine(); UIWidgets::EnhancementCombobox("gCosmetics.DefaultColorScheme", colorSchemes, COLORSCHEME_N64); UIWidgets::EnhancementCheckbox("Advanced Mode", "gCosmetics.AdvancedMode"); + UIWidgets::InsertHelpHoverText( + "Some cosmetic options may not apply if you have any mods that provide custom models for the cosmetic option.\n\n" + "For example, if you have custom Link model, then the Link's Hair color option will most likely not apply." + ); if (CVarGetInteger("gCosmetics.AdvancedMode", 0)) { if (ImGui::Button("Lock All Advanced", ImVec2(ImGui::GetContentRegionAvail().x / 2, 30.0f))) { for (auto& [id, cosmeticOption] : cosmeticOptions) { diff --git a/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp b/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp index 4149e8dd0..de97f3840 100644 --- a/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp +++ b/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp @@ -240,10 +240,9 @@ void PatchMirroredSoldOutGI() { // Patches the Sun Song Etching in the Royal Grave to be mirrored in mirror mode // This is achieved by mirroring the texture at the boundary and overriding the vertex texture coordinates void PatchMirroredSunSongEtching() { - static const char gMqRoyalGraveBackRoomDL[] = "__OTR__scenes/mq/hakaana_ouke_scene/hakaana_ouke_room_2DL_005040"; - static const char gNonMqRoyalGraveBackRoomDL[] = "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2DL_005040"; - static const char gMqRoyalGraveBackRoomSongVtx[] = "__OTR__scenes/mq/hakaana_ouke_scene/hakaana_ouke_room_2Vtx_004F80"; - static const char gNonMqRoyalGraveBackRoomSongVtx[] = "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2Vtx_004F80"; + // Only using these strings for graphics patching lookup, we don't need aligned assets here + static const char gRoyalGraveBackRoomDL[] = "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2DL_005040"; + static const char gRoyalGraveBackRoomSongVtx[] = "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2Vtx_004F80"; static Vtx* mirroredSunSongVtx; @@ -254,23 +253,11 @@ void PatchMirroredSunSongEtching() { G_TX_NOMIRROR | G_TX_CLAMP, 7, 5, G_TX_NOLOD, G_TX_NOLOD) }; - const char* royalGraveBackRoomDL; - const char* royalGraveBackRoomSongVtx; - - // If we have the original game, then always prefer the nonmq paths as that is what will be used in game - if (ResourceMgr_GameHasOriginal()) { - royalGraveBackRoomDL = gNonMqRoyalGraveBackRoomDL; - royalGraveBackRoomSongVtx = gNonMqRoyalGraveBackRoomSongVtx; - } else { - royalGraveBackRoomDL = gMqRoyalGraveBackRoomDL; - royalGraveBackRoomSongVtx = gMqRoyalGraveBackRoomSongVtx; - } - if (CVarGetInteger("gMirroredWorld", 0)) { if (mirroredSunSongVtx == nullptr) { // Copy the original vertices that we want to modify (4 at the beginning of the resource) mirroredSunSongVtx = (Vtx*)malloc(sizeof(Vtx) * 4); - Vtx* origVtx = (Vtx*)ResourceGetDataByName(royalGraveBackRoomSongVtx); + Vtx* origVtx = (Vtx*)ResourceGetDataByName(gRoyalGraveBackRoomSongVtx); memcpy(mirroredSunSongVtx, origVtx, sizeof(Vtx) * 4); // Offset the vertex U coordinate values by the width of the texture @@ -279,21 +266,21 @@ void PatchMirroredSunSongEtching() { } } - ResourceMgr_PatchGfxByName(royalGraveBackRoomDL, "RoyalGraveSunSongTexture_1", 13, mirroredSunSongTex[1]); - ResourceMgr_PatchGfxByName(royalGraveBackRoomDL, "RoyalGraveSunSongTexture_2", 17, mirroredSunSongTex[5]); - ResourceMgr_PatchGfxByName(royalGraveBackRoomDL, "RoyalGraveSunSongTextureCords_1", 24, gsSPVertex(mirroredSunSongVtx, 4, 0)); + ResourceMgr_PatchGfxByName(gRoyalGraveBackRoomDL, "RoyalGraveSunSongTexture_1", 13, mirroredSunSongTex[1]); + ResourceMgr_PatchGfxByName(gRoyalGraveBackRoomDL, "RoyalGraveSunSongTexture_2", 17, mirroredSunSongTex[5]); + ResourceMgr_PatchGfxByName(gRoyalGraveBackRoomDL, "RoyalGraveSunSongTextureCords_1", 24, gsSPVertex(mirroredSunSongVtx, 4, 0)); // noop as the original vertex command is 128 bit wide - ResourceMgr_PatchGfxByName(royalGraveBackRoomDL, "RoyalGraveSunSongTextureCords_2", 25, gsSPNoOp()); + ResourceMgr_PatchGfxByName(gRoyalGraveBackRoomDL, "RoyalGraveSunSongTextureCords_2", 25, gsSPNoOp()); } else { if (mirroredSunSongVtx != nullptr) { free(mirroredSunSongVtx); mirroredSunSongVtx = nullptr; } - ResourceMgr_UnpatchGfxByName(royalGraveBackRoomDL, "RoyalGraveSunSongTexture_1"); - ResourceMgr_UnpatchGfxByName(royalGraveBackRoomDL, "RoyalGraveSunSongTexture_2"); - ResourceMgr_UnpatchGfxByName(royalGraveBackRoomDL, "RoyalGraveSunSongTextureCords_1"); - ResourceMgr_UnpatchGfxByName(royalGraveBackRoomDL, "RoyalGraveSunSongTextureCords_2"); + ResourceMgr_UnpatchGfxByName(gRoyalGraveBackRoomDL, "RoyalGraveSunSongTexture_1"); + ResourceMgr_UnpatchGfxByName(gRoyalGraveBackRoomDL, "RoyalGraveSunSongTexture_2"); + ResourceMgr_UnpatchGfxByName(gRoyalGraveBackRoomDL, "RoyalGraveSunSongTextureCords_1"); + ResourceMgr_UnpatchGfxByName(gRoyalGraveBackRoomDL, "RoyalGraveSunSongTextureCords_2"); } } diff --git a/soh/soh/Enhancements/crowd-control/CrowdControl.cpp b/soh/soh/Enhancements/crowd-control/CrowdControl.cpp index a9f3b1f19..d2e8e03b1 100644 --- a/soh/soh/Enhancements/crowd-control/CrowdControl.cpp +++ b/soh/soh/Enhancements/crowd-control/CrowdControl.cpp @@ -380,13 +380,13 @@ CrowdControl::Effect* CrowdControl::ParseMessage(char payload[512]) { effect->category = kEffectCatBoots; effect->timeRemaining = 30000; effect->giEffect = new GameInteractionEffect::ForceEquipBoots(); - effect->giEffect->parameters[0] = PLAYER_BOOTS_IRON; + effect->giEffect->parameters[0] = EQUIP_VALUE_BOOTS_IRON; break; case kEffectForceHoverBoots: effect->category = kEffectCatBoots; effect->timeRemaining = 30000; effect->giEffect = new GameInteractionEffect::ForceEquipBoots(); - effect->giEffect->parameters[0] = PLAYER_BOOTS_HOVER; + effect->giEffect->parameters[0] = EQUIP_VALUE_BOOTS_HOVER; break; case kEffectSlipperyFloor: effect->category = kEffectCatSlipperyFloor; diff --git a/soh/soh/Enhancements/debugconsole.cpp b/soh/soh/Enhancements/debugconsole.cpp index 3e61505b2..6bc441d03 100644 --- a/soh/soh/Enhancements/debugconsole.cpp +++ b/soh/soh/Enhancements/debugconsole.cpp @@ -207,6 +207,7 @@ static bool ResetHandler(std::shared_ptr Console, std::vectorgameplayFrames = 0; SET_NEXT_GAMESTATE(&gPlayState->state, TitleSetup_Init, GameState); gPlayState->state.running = false; GameInteractor::Instance->ExecuteHooks(gSaveContext.fileNum); @@ -396,9 +397,9 @@ static bool EntranceHandler(std::shared_ptr Console, const std::ve } gPlayState->nextEntranceIndex = entrance; - gPlayState->sceneLoadFlag = 0x14; - gPlayState->fadeTransition = 11; - gSaveContext.nextTransitionType = 11; + gPlayState->transitionTrigger = TRANS_TRIGGER_START; + gPlayState->transitionType = TRANS_TYPE_INSTANT; + gSaveContext.nextTransitionType = TRANS_TYPE_INSTANT; } static bool VoidHandler(std::shared_ptr Console, const std::vector& args, std::string* output) { @@ -406,10 +407,10 @@ static bool VoidHandler(std::shared_ptr Console, const std::vector gSaveContext.respawn[RESPAWN_MODE_DOWN].tempSwchFlags = gPlayState->actorCtx.flags.tempSwch; gSaveContext.respawn[RESPAWN_MODE_DOWN].tempCollectFlags = gPlayState->actorCtx.flags.tempCollect; gSaveContext.respawnFlag = 1; - gPlayState->sceneLoadFlag = 0x14; + gPlayState->transitionTrigger = TRANS_TRIGGER_START; gPlayState->nextEntranceIndex = gSaveContext.respawn[RESPAWN_MODE_DOWN].entranceIndex; - gPlayState->fadeTransition = 2; - gSaveContext.nextTransitionType = 2; + gPlayState->transitionType = TRANS_TYPE_FADE_BLACK; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK; } else { ERROR_MESSAGE("gPlayState == nullptr"); return 1; @@ -420,9 +421,9 @@ static bool VoidHandler(std::shared_ptr Console, const std::vector static bool ReloadHandler(std::shared_ptr Console, const std::vector& args, std::string* output) { if (gPlayState != nullptr) { gPlayState->nextEntranceIndex = gSaveContext.entranceIndex; - gPlayState->sceneLoadFlag = 0x14; - gPlayState->fadeTransition = 11; - gSaveContext.nextTransitionType = 11; + gPlayState->transitionTrigger = TRANS_TRIGGER_START; + gPlayState->transitionType = TRANS_TYPE_INSTANT; + gSaveContext.nextTransitionType = TRANS_TYPE_INSTANT; } else { ERROR_MESSAGE("gPlayState == nullptr"); return 1; @@ -456,9 +457,9 @@ static bool FWHandler(std::shared_ptr Console, const std::vector 0) { - gPlayState->sceneLoadFlag = 0x14; + gPlayState->transitionTrigger = TRANS_TRIGGER_START; gPlayState->nextEntranceIndex = gSaveContext.respawn[RESPAWN_MODE_TOP].entranceIndex; - gPlayState->fadeTransition = 5; + gPlayState->transitionType = TRANS_TYPE_FADE_WHITE_FAST; } else { ERROR_MESSAGE("Farore's wind not set!"); return 1; diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp index 9af4eadb7..f90ab739c 100644 --- a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp +++ b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp @@ -515,7 +515,7 @@ void DrawInfoTab() { UIWidgets::InsertHelpHoverText("Z-Targeting behavior"); if (IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT)) { - ImGui::InputScalar("Triforce Pieces", ImGuiDataType_U16, &gSaveContext.triforcePiecesCollected); + ImGui::InputScalar("Triforce Pieces", ImGuiDataType_U8, &gSaveContext.triforcePiecesCollected); UIWidgets::InsertHelpHoverText("Currently obtained Triforce Pieces. For Triforce Hunt."); } @@ -1573,7 +1573,7 @@ void DrawPlayerTab() { ImGui::InputScalar("Y Velocity", ImGuiDataType_Float, &player->actor.velocity.y); UIWidgets::InsertHelpHoverText("Link's speed along the Y plane. Caps at -20"); - ImGui::InputScalar("Wall Height", ImGuiDataType_Float, &player->wallHeight); + ImGui::InputScalar("Wall Height", ImGuiDataType_Float, &player->yDistToLedge); UIWidgets::InsertHelpHoverText("Height used to determine whether Link can climb or grab a ledge at the top"); ImGui::InputScalar("Invincibility Timer", ImGuiDataType_S8, &player->invincibilityTimer); diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.h b/soh/soh/Enhancements/debugger/debugSaveEditor.h index 1daddbf17..582b896b0 100644 --- a/soh/soh/Enhancements/debugger/debugSaveEditor.h +++ b/soh/soh/Enhancements/debugger/debugSaveEditor.h @@ -515,6 +515,7 @@ const std::vector flagTables = { { RAND_INF_BONGO_BONGO_SOUL, "RAND_INF_BONGO_BONGO_SOUL" }, { RAND_INF_TWINROVA_SOUL, "RAND_INF_TWINROVA_SOUL" }, { RAND_INF_GANON_SOUL, "RAND_INF_GANON_SOUL" }, + { RAND_INF_GRANT_GANONS_BOSSKEY, "RAND_INF_GRANT_GANONS_BOSSKEY" }, } }, }; diff --git a/soh/soh/Enhancements/debugger/valueViewer.cpp b/soh/soh/Enhancements/debugger/valueViewer.cpp new file mode 100644 index 000000000..14a571dac --- /dev/null +++ b/soh/soh/Enhancements/debugger/valueViewer.cpp @@ -0,0 +1,219 @@ +#include "valueViewer.h" +#include "../../UIWidgets.hpp" + +extern "C" { +#include +#include "variables.h" +#include "functions.h" +#include "macros.h" +extern PlayState* gPlayState; +void GfxPrint_SetColor(GfxPrint* printer, u32 r, u32 g, u32 b, u32 a); +void GfxPrint_SetPos(GfxPrint* printer, s32 x, s32 y); +s32 GfxPrint_Printf(GfxPrint* printer, const char* fmt, ...); +} + +ImVec4 WHITE = ImVec4(1.0f, 1.0f, 1.0f, 1.0f); + +std::vector valueTable = { + { "Time", "gSaveContext.dayTime", "TIME:", TYPE_U16, false, []() -> void* { return &gSaveContext.dayTime; }, WHITE }, + { "Age", "gSaveContext.linkAge", "AGE:", TYPE_S32, false, []() -> void* { return &gSaveContext.linkAge; }, WHITE }, + { "Health", "gSaveContext.health", "HP:", TYPE_S16, false, []() -> void* { return &gSaveContext.health; }, WHITE }, + { "Navi Timer", "gSaveContext.naviTimer", "NAVI:", TYPE_U16, false, []() -> void* { return &gSaveContext.naviTimer; }, WHITE }, + { "Scene ID", "play->sceneNum", "SCENE:", TYPE_S16, true, []() -> void* { return &gPlayState->sceneNum; }, WHITE }, + { "Room ID", "play->roomCtx.curRoom.num", "ROOM:", TYPE_S8, true, []() -> void* { return &gPlayState->roomCtx.curRoom.num; }, WHITE }, + { "Entrance ID", "gSaveContext.entranceIndex", "ENTR:", TYPE_S32, false, []() -> void* { return &gSaveContext.entranceIndex; }, WHITE }, + { "Cutscene ID", "gSaveContext.cutsceneIndex", "CUTS:", TYPE_S32, false, []() -> void* { return &gSaveContext.cutsceneIndex; }, WHITE }, + { "Link X", "Player->actor.world.pos.x", "X:", TYPE_FLOAT, true, []() -> void* { return &GET_PLAYER(gPlayState)->actor.world.pos.x; }, WHITE }, + { "Link Y", "Player->actor.world.pos.y", "Y:", TYPE_FLOAT, true, []() -> void* { return &GET_PLAYER(gPlayState)->actor.world.pos.y; }, WHITE }, + { "Link Z", "Player->actor.world.pos.z", "Z:", TYPE_FLOAT, true, []() -> void* { return &GET_PLAYER(gPlayState)->actor.world.pos.z; }, WHITE }, + { "Link Yaw", "Player->actor.world.rot.y", "ROT:", TYPE_S16, true, []() -> void* { return &GET_PLAYER(gPlayState)->actor.world.rot.y; }, WHITE }, + { "Link Velocity", "Player->linearVelocity", "V:", TYPE_FLOAT, true, []() -> void* { return &GET_PLAYER(gPlayState)->linearVelocity; }, WHITE }, + { "Link X Velocity", "Player->actor.velocity.x", "XV:", TYPE_FLOAT, true, []() -> void* { return &GET_PLAYER(gPlayState)->actor.velocity.x; }, WHITE }, + { "Link Y Velocity", "Player->actor.velocity.y", "YV:", TYPE_FLOAT, true, []() -> void* { return &GET_PLAYER(gPlayState)->actor.velocity.y; }, WHITE }, + { "Link Z Velocity", "Player->actor.velocity.z", "ZV:", TYPE_FLOAT, true, []() -> void* { return &GET_PLAYER(gPlayState)->actor.velocity.z; }, WHITE }, + { "Text ID", "play->msgCtx.textId", "TEXTID:", TYPE_U16, true, []() -> void* { return &gPlayState->msgCtx.textId; }, WHITE }, + { "Analog Stick X", "play->state.input->cur.stick_x", "AX:", TYPE_S8, true, []() -> void* { return &gPlayState->state.input->cur.stick_x; }, WHITE }, + { "Analog Stick Y", "play->state.input->cur.stick_y", "AY:", TYPE_S8, true, []() -> void* { return &gPlayState->state.input->cur.stick_y; }, WHITE }, + /* TODO: Find these (from GZ) + "XZ Units Traveled (Camera based speed variable)" f32 0x801C9018 + "Movement Angle" x16 0x801DBB1C + "Camera Angle" u16 0x801C907C + "Time of Day" x16 0x8011AC8C + "Global Frame Counter" s32 0x801C8DFC + "Lit Deku Stick Timer" u16 0x801DBB40 + "Cutscene Pointer" u32 0x801CAAC8 + "Get Item Value" s8 0x801DB714 + "Last RNG Value" x32 0x80105A80 + "Last Item Button Pressed" u8 0x801DB430 + "Last Damage Value" x32 0x801DB7DC + "Temp B Value" u8 0x8011C062 + "Framerate Divisor" u8 0x801C7861 + "Heads Up Display (HUD)" u16 0x8011C068 + "Analog Stick Angle" s16 0x803AA698 + "Deku Tree Warp Timer (Reload Room)" u16 0x801F0352 + "Dodongo's Cavern Warp Timer" u16 0x801E30B2 + "Jabu-Jabu Warp Timer" u16 0x802008B2 + "Forest Temple Warp Timer" u16 0x801EC5B2 + "Fire Temple Warp Timer" u16 0x801F3E42 + "Water Temple Warp Timer" u16 0x801F8762 + "Shadow Temple Warp Timer" u16 0x801F48A2 + "Spirit Temple Warp Timer" u16 0x801FD562 + "Deku Tree Warp Timer" u16 0x801F83A2 + */ +}; + +extern "C" void ValueViewer_Draw(GfxPrint* printer) { + for (int i = 0; i < valueTable.size(); i++) { + ValueTableElement& element = valueTable[i]; + if (!element.isActive || !element.isPrinted || (gPlayState == NULL && element.requiresPlayState)) continue; + GfxPrint_SetColor(printer, element.color.x * 255, element.color.y * 255, element.color.z * 255, element.color.w * 255); + GfxPrint_SetPos(printer, element.x, element.y); + switch (element.type) { + case TYPE_S8: + GfxPrint_Printf(printer, (element.typeFormat ? "%s0x%x" : "%s%d"), element.prefix.c_str(), *(s8*)element.valueFn()); + break; + case TYPE_U8: + GfxPrint_Printf(printer, (element.typeFormat ? "%s0x%x" : "%s%u"), element.prefix.c_str(), *(u8*)element.valueFn()); + break; + case TYPE_S16: + GfxPrint_Printf(printer, (element.typeFormat ? "%s0x%x" : "%s%d"), element.prefix.c_str(), *(s16*)element.valueFn()); + break; + case TYPE_U16: + GfxPrint_Printf(printer, (element.typeFormat ? "%s0x%x" : "%s%u"), element.prefix.c_str(), *(u16*)element.valueFn()); + break; + case TYPE_S32: + GfxPrint_Printf(printer, (element.typeFormat ? "%s0x%x" : "%s%d"), element.prefix.c_str(), *(s32*)element.valueFn()); + break; + case TYPE_U32: + GfxPrint_Printf(printer, (element.typeFormat ? "%s0x%x" : "%s%u"), element.prefix.c_str(), *(u32*)element.valueFn()); + break; + case TYPE_CHAR: + GfxPrint_Printf(printer, "%s%c", element.prefix.c_str(), *(char*)element.valueFn()); + break; + case TYPE_STRING: + GfxPrint_Printf(printer, "%s%s", element.prefix.c_str(), (char*)element.valueFn()); + break; + case TYPE_FLOAT: + GfxPrint_Printf(printer, (element.typeFormat ? "%s%4.1f" : "%s%f"), element.prefix.c_str(), *(float*)element.valueFn()); + break; + } + } +} + +void ValueViewerWindow::DrawElement() { + ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver); + if (!ImGui::Begin("Value Viewer", &mIsVisible, ImGuiWindowFlags_NoFocusOnAppearing)) { + ImGui::End(); + return; + } + + UIWidgets::PaddedEnhancementCheckbox("Enable Printing", "gValueViewer.EnablePrinting"); + + ImGui::BeginGroup(); + static int selectedElement = -1; + std::string selectedElementText = (selectedElement == -1) ? "Select a value" : ( + std::string(valueTable[selectedElement].name) + " (" + std::string(valueTable[selectedElement].path) + ")" + ); + if (ImGui::BeginCombo("##valueViewerElement", selectedElementText.c_str())) { + for (int i = 0; i < valueTable.size(); i++) { + if (valueTable[i].isActive) continue; + bool isSelected = (selectedElement == i); + std::string elementText = ( + std::string(valueTable[i].name) + " (" + std::string(valueTable[i].path) + ")" + ); + if (ImGui::Selectable(elementText.c_str(), isSelected)) { + selectedElement = i; + } + if (isSelected) { + ImGui::SetItemDefaultFocus(); + } + } + ImGui::EndCombo(); + } + ImGui::SameLine(); + if (selectedElement != -1 && ImGui::Button("+")) { + valueTable[selectedElement].isActive = true; + selectedElement = -1; + } + ImGui::EndGroup(); + + for (int i = 0; i < valueTable.size(); i++) { + ValueTableElement& element = valueTable[i]; + if (!element.isActive || (gPlayState == NULL && element.requiresPlayState)) continue; + if (ImGui::Button(("x##" + std::string(element.name)).c_str())) { + element.isActive = false; + element.isPrinted = false; + } + ImGui::SameLine(); + ImGui::Text("%s:", element.name); + ImGui::SameLine(); + switch (element.type) { + case TYPE_S8: + ImGui::Text(element.typeFormat ? "0x%x" : "%d", *(s8*)element.valueFn()); + break; + case TYPE_U8: + ImGui::Text(element.typeFormat ? "0x%x" : "%u", *(u8*)element.valueFn()); + break; + case TYPE_S16: + ImGui::Text(element.typeFormat ? "0x%x" : "%d", *(s16*)element.valueFn()); + break; + case TYPE_U16: + ImGui::Text(element.typeFormat ? "0x%x" : "%u", *(u16*)element.valueFn()); + break; + case TYPE_S32: + ImGui::Text(element.typeFormat ? "0x%x" : "%d", *(s32*)element.valueFn()); + break; + case TYPE_U32: + ImGui::Text(element.typeFormat ? "0x%x" : "%u", *(u32*)element.valueFn()); + break; + case TYPE_CHAR: + ImGui::Text("%c", *(char*)element.valueFn()); + break; + case TYPE_STRING: + ImGui::Text("%s", (char*)element.valueFn()); + break; + case TYPE_FLOAT: + ImGui::Text(element.typeFormat ? "%4.1f" : "%f", *(float*)element.valueFn()); + break; + } + ImGui::SameLine(); + + if (element.type <= TYPE_U32) { + ImGui::Checkbox(("Hex##" + std::string(element.name)).c_str(), &element.typeFormat); + ImGui::SameLine(); + } else if (element.type == TYPE_FLOAT) { + ImGui::Checkbox(("Trim##" + std::string(element.name)).c_str(), &element.typeFormat); + ImGui::SameLine(); + } + + ImGui::BeginGroup(); + if (CVarGetInteger("gValueViewer.EnablePrinting", 0)) { + ImGui::Checkbox(("Print##" + std::string(element.name)).c_str(), &element.isPrinted); + if (element.isPrinted) { + char* prefix = (char*)element.prefix.c_str(); + ImGui::SameLine(); + ImGui::SetNextItemWidth(80.0f); + if (ImGui::InputText(("Prefix##" + std::string(element.name)).c_str(), prefix, 10)) { + element.prefix = prefix; + } + ImGui::SameLine(); + ImGui::ColorEdit3(("##color" + std::string(element.name)).c_str(), (float*)&element.color, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel); + ImGui::SameLine(); + if (ImGui::Button(("Position##" + std::string(element.name)).c_str())) { + ImGui::OpenPopup(("Position Picker##" + std::string(element.name)).c_str()); + } + if (ImGui::BeginPopup(("Position Picker##" + std::string(element.name)).c_str())) { + ImGui::DragInt("X", (int*)&element.x, 1.0f, 0, 44); + ImGui::DragInt("Y", (int*)&element.y, 1.0f, 0, 29); + ImGui::EndPopup(); + } + } + } + ImGui::EndGroup(); + } + + ImGui::End(); +} + +void ValueViewerWindow::InitElement() { +} diff --git a/soh/soh/Enhancements/debugger/valueViewer.h b/soh/soh/Enhancements/debugger/valueViewer.h new file mode 100644 index 000000000..7631b8c3f --- /dev/null +++ b/soh/soh/Enhancements/debugger/valueViewer.h @@ -0,0 +1,53 @@ +#pragma once + +#ifdef __cplusplus + +#include + +typedef enum { + TYPE_S8, + TYPE_U8, + TYPE_S16, + TYPE_U16, + TYPE_S32, + TYPE_U32, + TYPE_CHAR, + TYPE_STRING, + TYPE_FLOAT, +} ValueType; + +typedef void* (*ValueFn)(); + +typedef struct { + const char* name; + const char* path; + std::string prefix; + ValueType type; + bool requiresPlayState; + ValueFn valueFn; + ImVec4 color; + bool isActive; + bool isPrinted; + bool typeFormat; + uint32_t x; + uint32_t y; +} ValueTableElement; + +class ValueViewerWindow : public LUS::GuiWindow { + public: + using GuiWindow::GuiWindow; + + void InitElement() override; + void DrawElement() override; + void UpdateElement() override {}; +}; + +extern "C" { +#include +#endif + +void ValueViewer_Draw(GfxPrint* printer); + +#ifdef __cplusplus +} +#endif \ No newline at end of file diff --git a/soh/soh/Enhancements/enhancementTypes.h b/soh/soh/Enhancements/enhancementTypes.h index 529ebed81..c8461bbf1 100644 --- a/soh/soh/Enhancements/enhancementTypes.h +++ b/soh/soh/Enhancements/enhancementTypes.h @@ -1,3 +1,6 @@ +#ifndef _ENHANCEMENT_TYPES_H_ +#define _ENHANCEMENT_TYPES_H_ + typedef enum { WARP_MODE_OVERRIDE_OFF, WARP_MODE_OVERRIDE_MQ_AS_VANILLA, @@ -74,3 +77,5 @@ typedef enum { DEKU_STICK_UNBREAKABLE, DEKU_STICK_UNBREAKABLE_AND_ALWAYS_ON_FIRE, } DekuStickType; + +#endif diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h index ae711c093..56f0f4701 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractor.h +++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h @@ -5,6 +5,7 @@ #include "GameInteractionEffect.h" #include "soh/Enhancements/item-tables/ItemTableTypes.h" +#include typedef enum { /* 0x00 */ GI_LINK_SIZE_NORMAL, @@ -52,13 +53,13 @@ typedef enum { } GIColors; typedef enum { - /* */ GI_TP_DEST_LINKSHOUSE = 187, - /* */ GI_TP_DEST_MINUET = 1536, - /* */ GI_TP_DEST_BOLERO = 1270, - /* */ GI_TP_DEST_SERENADE = 1540, - /* */ GI_TP_DEST_REQUIEM = 497, - /* */ GI_TP_DEST_NOCTURNE = 1384, - /* */ GI_TP_DEST_PRELUDE = 1524, + /* */ GI_TP_DEST_LINKSHOUSE = ENTR_LINKS_HOUSE_0, + /* */ GI_TP_DEST_MINUET = ENTR_SACRED_FOREST_MEADOW_2, + /* */ GI_TP_DEST_BOLERO = ENTR_DEATH_MOUNTAIN_CRATER_4, + /* */ GI_TP_DEST_SERENADE = ENTR_LAKE_HYLIA_8, + /* */ GI_TP_DEST_REQUIEM = ENTR_DESERT_COLOSSUS_5, + /* */ GI_TP_DEST_NOCTURNE = ENTR_GRAVEYARD_7, + /* */ GI_TP_DEST_PRELUDE = ENTR_TEMPLE_OF_TIME_7, } GITeleportDestinations; #ifdef __cplusplus @@ -193,6 +194,8 @@ public: DEFINE_HOOK(OnSetGameLanguage, void()); + DEFINE_HOOK(OnAssetAltChange, void()); + // Helpers static bool IsSaveLoaded(); static bool IsGameplayPaused(); diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp index 13df133a0..4bd5354a6 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp +++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp @@ -181,3 +181,9 @@ void GameInteractor_ExecuteOnUpdateFileNameSelection(int16_t charCode) { void GameInteractor_ExecuteOnSetGameLanguage() { GameInteractor::Instance->ExecuteHooks(); } + +// MARK: - System + +void GameInteractor_RegisterOnAssetAltChange(void (*fn)(void)) { + GameInteractor::Instance->RegisterGameHook(fn); +} diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h index 47114a300..7b7b226fa 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h +++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h @@ -56,6 +56,10 @@ void GameInteractor_ExecuteOnUpdateFileNameSelection(int16_t charCode); // MARK: - Game void GameInteractor_ExecuteOnSetGameLanguage(); + +// MARK: - System +void GameInteractor_RegisterOnAssetAltChange(void (*fn)(void)); + #ifdef __cplusplus } #endif diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp b/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp index 54a3b8e7b..854b7dc11 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp +++ b/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp @@ -326,9 +326,9 @@ void GameInteractor::RawAction::UpdateActor(void* refActor) { void GameInteractor::RawAction::TeleportPlayer(int32_t nextEntrance) { Audio_PlaySoundGeneral(NA_SE_EN_GANON_LAUGH, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); gPlayState->nextEntranceIndex = nextEntrance; - gPlayState->sceneLoadFlag = 0x14; - gPlayState->fadeTransition = 2; - gSaveContext.nextTransitionType = 2; + gPlayState->transitionTrigger = TRANS_TRIGGER_START; + gPlayState->transitionType = TRANS_TYPE_FADE_BLACK; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK; } void GameInteractor::RawAction::ClearAssignedButtons(uint8_t buttonSet) { @@ -520,7 +520,7 @@ void GameInteractor::RawAction::SetRandomWind(bool active) { if (active) { GameInteractor::State::RandomWindActive = 1; if (GameInteractor::State::RandomWindSecondsSinceLastDirectionChange == 0) { - player->windDirection = (rand() % 49152) - 32767; + player->pushedYaw = (rand() % 49152) - 32767; GameInteractor::State::RandomWindSecondsSinceLastDirectionChange = 5; } else { GameInteractor::State::RandomWindSecondsSinceLastDirectionChange--; @@ -528,8 +528,8 @@ void GameInteractor::RawAction::SetRandomWind(bool active) { } else { GameInteractor::State::RandomWindActive = 0; GameInteractor::State::RandomWindSecondsSinceLastDirectionChange = 0; - player->windSpeed = 0.0f; - player->windDirection = 0.0f; + player->pushedSpeed = 0.0f; + player->pushedYaw = 0.0f; } } diff --git a/soh/soh/Enhancements/item-tables/ItemTableTypes.h b/soh/soh/Enhancements/item-tables/ItemTableTypes.h index d3a1a6cf2..44ceb2143 100644 --- a/soh/soh/Enhancements/item-tables/ItemTableTypes.h +++ b/soh/soh/Enhancements/item-tables/ItemTableTypes.h @@ -30,10 +30,13 @@ typedef enum GetItemCategory { } GetItemCategory; #define GET_ITEM(itemId, objectId, drawId, textId, field, chestAnim, itemCategory, modIndex, getItemId) \ - { itemId, field, (int16_t)((chestAnim != CHEST_ANIM_SHORT ? 1 : -1) * (drawId + 1)), textId, objectId, modIndex, getItemId, drawId, true, ITEM_FROM_NPC, itemCategory, NULL } + { itemId, field, (int16_t)((chestAnim != CHEST_ANIM_SHORT ? 1 : -1) * (drawId + 1)), textId, objectId, modIndex, modIndex, getItemId, drawId, true, ITEM_FROM_NPC, itemCategory, NULL } + +#define GET_ITEM_CUSTOM_TABLE(itemId, objectId, drawId, textId, field, chestAnim, itemCategory, modIndex, tableId, getItemId) \ + { itemId, field, (int16_t)((chestAnim != CHEST_ANIM_SHORT ? 1 : -1) * (drawId + 1)), textId, objectId, modIndex, tableId, getItemId, drawId, true, ITEM_FROM_NPC, itemCategory, NULL } #define GET_ITEM_NONE \ - { ITEM_NONE, 0, 0, 0, 0, 0, 0, 0, false, ITEM_FROM_NPC, ITEM_CATEGORY_JUNK, NULL } + { ITEM_NONE, 0, 0, 0, 0, 0, 0, 0, 0, false, ITEM_FROM_NPC, ITEM_CATEGORY_JUNK, NULL } typedef struct PlayState PlayState; typedef struct GetItemEntry GetItemEntry; @@ -46,7 +49,8 @@ typedef struct GetItemEntry { /* 0x02 */ int16_t gi; // defines the draw id and chest opening animation /* 0x03 */ uint16_t textId; /* 0x04 */ uint16_t objectId; - /* 0x06 */ uint16_t modIndex; // 0 = Vanilla, 1 = Randomizer, future mods will increment up? + /* 0x06 */ uint16_t modIndex; // Primarily used for determining whether to use Item_Give or Randomizer_Item_Give + /* 0x07 */ uint16_t tableId; // GetItemEntry table this entry is in (usually the same as modIndex, but not always) /* 0x08 */ int16_t getItemId; /* 0x0A */ uint16_t gid; // Stores the GID value unmodified for future reference. /* 0x0C */ uint16_t collectable; // determines whether the item can be collected on the overworld. Will be true in most cases. diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp index 34aa8af15..e287e9ed1 100644 --- a/soh/soh/Enhancements/mods.cpp +++ b/soh/soh/Enhancements/mods.cpp @@ -35,20 +35,19 @@ extern PlayState* gPlayState; extern void Overlay_DisplayText(float duration, const char* text); uint32_t ResourceMgr_IsSceneMasterQuest(s16 sceneNum); } -bool performDelayedSave = false; -bool performSave = false; // TODO: When there's more uses of something like this, create a new GI::RawAction? void ReloadSceneTogglingLinkAge() { gPlayState->nextEntranceIndex = gSaveContext.entranceIndex; - gPlayState->sceneLoadFlag = 0x14; - gPlayState->fadeTransition = 42; // Fade Out - gSaveContext.nextTransitionType = 42; + gPlayState->transitionTrigger = TRANS_TRIGGER_START; + gPlayState->transitionType = TRANS_TYPE_CIRCLE(TCA_WAVE, TCC_WHITE, TCS_FAST); // Fade Out + gSaveContext.nextTransitionType = TRANS_TYPE_CIRCLE(TCA_WAVE, TCC_WHITE, TCS_FAST); gPlayState->linkAgeOnLoad ^= 1; // toggle linkAgeOnLoad } void RegisterInfiniteMoney() { GameInteractor::Instance->RegisterGameHook([]() { + if (!GameInteractor::IsSaveLoaded()) return; if (CVarGetInteger("gInfiniteMoney", 0) != 0) { if (gSaveContext.rupees < CUR_CAPACITY(UPG_WALLET)) { gSaveContext.rupees = CUR_CAPACITY(UPG_WALLET); @@ -59,6 +58,7 @@ void RegisterInfiniteMoney() { void RegisterInfiniteHealth() { GameInteractor::Instance->RegisterGameHook([]() { + if (!GameInteractor::IsSaveLoaded()) return; if (CVarGetInteger("gInfiniteHealth", 0) != 0) { if (gSaveContext.health < gSaveContext.healthCapacity) { gSaveContext.health = gSaveContext.healthCapacity; @@ -69,6 +69,7 @@ void RegisterInfiniteHealth() { void RegisterInfiniteAmmo() { GameInteractor::Instance->RegisterGameHook([]() { + if (!GameInteractor::IsSaveLoaded()) return; if (CVarGetInteger("gInfiniteAmmo", 0) != 0) { // Deku Sticks if (AMMO(ITEM_STICK) < CUR_CAPACITY(UPG_STICKS)) { @@ -105,6 +106,7 @@ void RegisterInfiniteAmmo() { void RegisterInfiniteMagic() { GameInteractor::Instance->RegisterGameHook([]() { + if (!GameInteractor::IsSaveLoaded()) return; if (CVarGetInteger("gInfiniteMagic", 0) != 0) { if (gSaveContext.isMagicAcquired && gSaveContext.magic != (gSaveContext.isDoubleMagicAcquired + 1) * 0x30) { gSaveContext.magic = (gSaveContext.isDoubleMagicAcquired + 1) * 0x30; @@ -115,6 +117,7 @@ void RegisterInfiniteMagic() { void RegisterInfiniteNayrusLove() { GameInteractor::Instance->RegisterGameHook([]() { + if (!GameInteractor::IsSaveLoaded()) return; if (CVarGetInteger("gInfiniteNayru", 0) != 0) { gSaveContext.nayrusLoveTimer = 0x44B; } @@ -123,7 +126,7 @@ void RegisterInfiniteNayrusLove() { void RegisterMoonJumpOnL() { GameInteractor::Instance->RegisterGameHook([]() { - if (!gPlayState) return; + if (!GameInteractor::IsSaveLoaded()) return; if (CVarGetInteger("gMoonJumpOnL", 0) != 0) { Player* player = GET_PLAYER(gPlayState); @@ -138,7 +141,7 @@ void RegisterMoonJumpOnL() { void RegisterInfiniteISG() { GameInteractor::Instance->RegisterGameHook([]() { - if (!gPlayState) return; + if (!GameInteractor::IsSaveLoaded()) return; if (CVarGetInteger("gEzISG", 0) != 0) { Player* player = GET_PLAYER(gPlayState); @@ -150,7 +153,7 @@ void RegisterInfiniteISG() { //Permanent quick put away (QPA) glitched damage value void RegisterEzQPA() { GameInteractor::Instance->RegisterGameHook([]() { - if (!gPlayState) return; + if (!GameInteractor::IsSaveLoaded()) return; if (CVarGetInteger("gEzQPA", 0) != 0) { Player* player = GET_PLAYER(gPlayState); @@ -162,7 +165,7 @@ void RegisterEzQPA() { void RegisterUnrestrictedItems() { GameInteractor::Instance->RegisterGameHook([]() { - if (!gPlayState) return; + if (!GameInteractor::IsSaveLoaded()) return; if (CVarGetInteger("gNoRestrictItems", 0) != 0) { u8 sunsBackup = gPlayState->interfaceCtx.restrictions.sunsSong; @@ -190,14 +193,16 @@ void RegisterFreezeTime() { /// Switches Link's age and respawns him at the last entrance he entered. void RegisterSwitchAge() { GameInteractor::Instance->RegisterGameHook([]() { + if (!GameInteractor::IsSaveLoaded()) { + CVarClear("gSwitchAge"); + return; + } static bool warped = false; static Vec3f playerPos; static int16_t playerYaw; static RoomContext* roomCtx; static s32 roomNum; - if (!gPlayState) return; - if (CVarGetInteger("gSwitchAge", 0) && !warped) { playerPos = GET_PLAYER(gPlayState)->actor.world.pos; playerYaw = GET_PLAYER(gPlayState)->actor.shape.rot.y; @@ -207,8 +212,8 @@ void RegisterSwitchAge() { warped = true; } - if (warped && gPlayState->sceneLoadFlag != 0x0014 && - gSaveContext.nextTransitionType == 255) { + if (warped && gPlayState->transitionTrigger != TRANS_TRIGGER_START && + gSaveContext.nextTransitionType == TRANS_NEXT_TYPE_DEFAULT) { GET_PLAYER(gPlayState)->actor.shape.rot.y = playerYaw; GET_PLAYER(gPlayState)->actor.world.pos = playerPos; if (roomNum != roomCtx->curRoom.num) { @@ -217,7 +222,7 @@ void RegisterSwitchAge() { func_80097534(gPlayState, roomCtx); // load map for new room (unloading the previous room) } warped = false; - CVarSetInteger("gSwitchAge", 0); + CVarClear("gSwitchAge"); } }); } @@ -226,7 +231,8 @@ void RegisterSwitchAge() { void RegisterOcarinaTimeTravel() { GameInteractor::Instance->RegisterGameHook([]() { - if (!gPlayState) { + if (!GameInteractor::IsSaveLoaded()) { + CVarClear("gTimeTravel"); return; } @@ -258,14 +264,12 @@ void RegisterOcarinaTimeTravel() { void AutoSave(GetItemEntry itemEntry) { u8 item = itemEntry.itemId; + bool performSave = false; // Don't autosave immediately after buying items from shops to prevent getting them for free! // Don't autosave in the Chamber of Sages since resuming from that map breaks the game // Don't autosave during the Ganon fight when picking up the Master Sword - // Don't autosave in the fishing pond to prevent getting rod on B outside of the pond - // Don't autosave in the bombchu bowling alley to prevent having chus on B outside of the minigame - // Don't autosave in grottos since resuming from grottos breaks the game. if ((CVarGetInteger("gAutosave", AUTOSAVE_OFF) != AUTOSAVE_OFF) && (gPlayState != NULL) && (gSaveContext.pendingSale == ITEM_NONE) && - (gPlayState->gameplayFrames > 60 && gSaveContext.cutsceneIndex < 0xFFF0) && (gPlayState->sceneNum != SCENE_GANON_BOSS)) { + (gPlayState->gameplayFrames > 60 && gSaveContext.cutsceneIndex < 0xFFF0) && (gPlayState->sceneNum != SCENE_GANON_BOSS) && (gPlayState->sceneNum != SCENE_CHAMBER_OF_THE_SAGES)) { if (((CVarGetInteger("gAutosave", AUTOSAVE_OFF) == AUTOSAVE_LOCATION_AND_ALL_ITEMS) || (CVarGetInteger("gAutosave", AUTOSAVE_OFF) == AUTOSAVE_ALL_ITEMS)) && (item != ITEM_NONE)) { // Autosave for all items performSave = true; @@ -326,25 +330,9 @@ void AutoSave(GetItemEntry itemEntry) { CVarGetInteger("gAutosave", AUTOSAVE_OFF) == AUTOSAVE_LOCATION) { performSave = true; } - if (gPlayState->sceneNum == SCENE_FAIRYS_FOUNTAIN || gPlayState->sceneNum == SCENE_GROTTOS || - gPlayState->sceneNum == SCENE_CHAMBER_OF_THE_SAGES || gPlayState->sceneNum == SCENE_FISHING_POND || - gPlayState->sceneNum == SCENE_BOMBCHU_BOWLING_ALLEY) { - if (CVarGetInteger("gAutosave", AUTOSAVE_OFF) == AUTOSAVE_LOCATION_AND_MAJOR_ITEMS || - CVarGetInteger("gAutosave", AUTOSAVE_OFF) == AUTOSAVE_LOCATION_AND_ALL_ITEMS || - CVarGetInteger("gAutosave", AUTOSAVE_OFF) == AUTOSAVE_LOCATION) { - performSave = false; - return; - } - if (performSave) { - performSave = false; - performDelayedSave = true; - } - return; - } - if (performSave || performDelayedSave) { + if (performSave) { Play_PerformSave(gPlayState); performSave = false; - performDelayedSave = false; } } } @@ -369,7 +357,8 @@ void RegisterRupeeDash() { if (rupeeDashTimer >= rdmTime) { rupeeDashTimer = 0; if (gSaveContext.rupees > 0) { - Rupees_ChangeBy(-1); + uint16_t walletSize = (CUR_UPG_VALUE(UPG_WALLET) + 1) * -1; + Rupees_ChangeBy(walletSize); } else { Health_ChangeBy(gPlayState, -16); } @@ -648,10 +637,10 @@ void RegisterTriforceHunt() { // Warp to credits if (GameInteractor::State::TriforceHuntCreditsWarpActive) { - gPlayState->nextEntranceIndex = 0x6B; + gPlayState->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0; gSaveContext.nextCutsceneIndex = 0xFFF2; - gPlayState->sceneLoadFlag = 0x14; - gPlayState->fadeTransition = 3; + gPlayState->transitionTrigger = TRANS_TRIGGER_START; + gPlayState->transitionType = TRANS_TYPE_FADE_WHITE; GameInteractor::State::TriforceHuntCreditsWarpActive = 0; } @@ -664,16 +653,19 @@ void RegisterTriforceHunt() { triforcePieceScale = 0.0f; GameInteractor::State::TriforceHuntPieceGiven = 0; } + } + }); +} - uint8_t currentPieces = gSaveContext.triforcePiecesCollected; - uint8_t requiredPieces = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED); - - // Give Boss Key when player loads back into the savefile. - if (currentPieces >= requiredPieces && gPlayState->sceneLoadFlag != 0x14 && - (1 << 0 & gSaveContext.inventory.dungeonItems[SCENE_GANONS_TOWER]) == 0) { - GetItemEntry getItemEntry = ItemTableManager::Instance->RetrieveItemEntry(MOD_RANDOMIZER, RG_GANONS_CASTLE_BOSS_KEY); +void RegisterGrantGanonsBossKey() { + GameInteractor::Instance->RegisterGameHook([]() { + // Triforce Hunt needs the check if the player isn't being teleported to the credits scene. + if (!GameInteractor::IsGameplayPaused() && IS_RANDO && + Flags_GetRandomizerInf(RAND_INF_GRANT_GANONS_BOSSKEY) && gPlayState->transitionTrigger != TRANS_TRIGGER_START && + (1 << 0 & gSaveContext.inventory.dungeonItems[SCENE_GANONS_TOWER]) == 0) { + GetItemEntry getItemEntry = + ItemTableManager::Instance->RetrieveItemEntry(MOD_RANDOMIZER, RG_GANONS_CASTLE_BOSS_KEY); GiveItemEntryWithoutActor(gPlayState, getItemEntry); - } } }); } @@ -1020,7 +1012,7 @@ void RegisterAltTrapTypes() { void RegisterRandomizerSheikSpawn() { GameInteractor::Instance->RegisterGameHook([]() { if (!gPlayState) return; - bool canSheik = (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIAL_COUNT) != 0 && + bool canSheik = (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIAL_COUNT) != 0 && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LIGHT_ARROWS_HINT)); if (!IS_RANDO || !LINK_IS_ADULT || !canSheik) return; switch (gPlayState->sceneNum) { @@ -1097,6 +1089,46 @@ void RegisterBossSouls() { } +void RegisterRandomizedEnemySizes() { + GameInteractor::Instance->RegisterGameHook([](void* refActor) { + // Randomized Enemy Sizes + Player* player = GET_PLAYER(gPlayState); + Actor* actor = static_cast(refActor); + + // Exclude wobbly platforms in Jabu because they need to act like platforms. + // Exclude Dead Hand hands and Bongo Bongo main body because they make the fights (near) impossible. + uint8_t excludedEnemy = actor->id == ACTOR_EN_BROB || actor->id == ACTOR_EN_DHA || (actor->id == ACTOR_BOSS_SST && actor->params == -1); + + // Dodongo, Volvagia and Dead Hand are always smaller because they're impossible when bigger. + uint8_t smallOnlyEnemy = + actor->id == ACTOR_BOSS_DODONGO || actor->id == ACTOR_BOSS_FD || actor->id == ACTOR_BOSS_FD2 || ACTOR_EN_DH; + + // Only apply to enemies and bosses. + if (!CVarGetInteger("gRandomizedEnemySizes", 0) || (actor->category != ACTORCAT_ENEMY && actor->category != ACTORCAT_BOSS) || excludedEnemy) { + return; + } + + float randomNumber; + float randomScale; + + uint8_t bigActor = rand() % 2; + + // Big actor + if (bigActor && !smallOnlyEnemy) { + randomNumber = rand() % 200; + // Between 100% and 300% size. + randomScale = 1.0f + (randomNumber / 100); + // Small actor + } else { + randomNumber = rand() % 90; + // Between 10% and 100% size. + randomScale = 0.1f + (randomNumber / 100); + } + + Actor_SetScale(actor, actor->scale.z * randomScale); + }); +} + void InitMods() { RegisterTTS(); RegisterInfiniteMoney(); @@ -1121,9 +1153,11 @@ void InitMods() { RegisterMenuPathFix(); RegisterMirrorModeHandler(); RegisterTriforceHunt(); + RegisterGrantGanonsBossKey(); RegisterEnemyDefeatCounts(); RegisterAltTrapTypes(); RegisterRandomizerSheikSpawn(); RegisterBossSouls(); + RegisterRandomizedEnemySizes(); NameTag_RegisterHooks(); } diff --git a/soh/soh/Enhancements/presets.h b/soh/soh/Enhancements/presets.h index b113c705a..af836dff5 100644 --- a/soh/soh/Enhancements/presets.h +++ b/soh/soh/Enhancements/presets.h @@ -136,6 +136,7 @@ const std::vector enhancementsCvars = { "gInjectItemCounts", "gDayGravePull", "gDampeAllNight", + "gSkipSwimDeepEndAnim", "gSkipScarecrow", "gBlueFireArrows", "gSunlightArrows", @@ -217,6 +218,31 @@ const std::vector enhancementsCvars = { "gFixTexturesOOB", "gIvanCoopModeEnabled", "gEnemySpawnsOverWaterboxes", + "gTreeStickDrops", + "gShadowTag", + "gRandomizedEnemySizes", + "gRandomizedEnemies", + "gMirroredWorldMode", + "gMirroredWorld", + "gHyperEnemies", + "gHookshotableReticle", + "gHideBunnyHood", + "gFixVineFall", + "gFileSelectMoreInfo", + "gEnemyHealthBar", + "gBushDropFix", + "gAllDogsRichard", + "gAddTraps.enabled", + "gAddTraps.Ammo", + "gAddTraps.Bomb", + "gAddTraps.Burn", + "gAddTraps.Ice", + "gAddTraps.Kill", + "gAddTraps.Knock", + "gAddTraps.Shock", + "gAddTraps.Speed", + "gAddTraps.Tele", + "gAddTraps.Void", }; const std::vector cheatCvars = { @@ -269,7 +295,23 @@ const std::vector cheatCvars = { "gNoRedeadFreeze", "gBombTimerMultiplier", "gNoFishDespawn", - "gNoBugsDespawn" + "gNoBugsDespawn", + "gWalkModifierDoesntChangeJump", + "gStatsEnabled", + "gSaveStatesEnabled", + "gSaveStatePromise", + "gRegEditEnabled", + "gPreset0", + "gPreset1", + "gDekuStickCheat", + "gDebugWarpScreenTranslation", + "gDebugSaveFileMode", + "gCosmetics.Link_BodyScale.Changed", + "gCosmetics.Link_BodyScale.Value", + "gCosmetics.Link_HeadScale.Changed", + "gCosmetics.Link_HeadScale.Value", + "gCosmetics.Link_SwordScale.Changed", + "gCosmetics.Link_SwordScale.Value", }; const std::vector randomizerCvars = { @@ -399,6 +441,15 @@ const std::vector randomizerCvars = { "gRandomizeGregHint", "gRandoManualSeedEntry", "gRandomizerSettingsEnabled", + "gRandomizeTriforceHuntTotalPieces", + "gRandomizeTriforceHuntRequiredPieces", + "gRandomizeTriforceHunt", + "gRandomizeShuffleMasterSword", + "gRandomizeSariaHint", + "gRandomizeRupeeNames", + "gRandomizeFrogsHint", + "gRandoRelevantNavi", + "gRandoQuestItemFanfares", }; const std::vector vanillaPlusPresetEntries = { @@ -816,7 +867,7 @@ const std::vector spockRacePresetEntries = { PRESET_ENTRY_S32("gRandomizeDampeHint", 1), PRESET_ENTRY_S32("gRandomizeDoorOfTime", RO_DOOROFTIME_OPEN), PRESET_ENTRY_S32("gRandomizeEnableBombchuDrops", 1), - PRESET_ENTRY_STRING("gRandomizeExcludedLocations", "78,142,143,228,"), + PRESET_ENTRY_STRING("gRandomizeExcludedLocations", "78,143,144,229,"), PRESET_ENTRY_S32("gRandomizeForest", RO_FOREST_OPEN), PRESET_ENTRY_S32("gRandomizeFullWallets", 1), PRESET_ENTRY_S32("gRandomizeGanonTrial", RO_GANONS_TRIALS_SKIP), @@ -908,7 +959,7 @@ const std::vector spockRaceNoLogicPresetEntries = { PRESET_ENTRY_S32("gRandomizeDampeHint", 1), PRESET_ENTRY_S32("gRandomizeDoorOfTime", RO_DOOROFTIME_OPEN), PRESET_ENTRY_S32("gRandomizeEnableBombchuDrops", 1), - PRESET_ENTRY_STRING("gRandomizeExcludedLocations", "78,142,143,228,"), + PRESET_ENTRY_STRING("gRandomizeExcludedLocations", "78,143,144,229,"), PRESET_ENTRY_S32("gRandomizeForest", RO_FOREST_OPEN), PRESET_ENTRY_S32("gRandomizeFullWallets", 1), PRESET_ENTRY_S32("gRandomizeGanonTrial", RO_GANONS_TRIALS_SKIP), @@ -1023,6 +1074,7 @@ const std::vector hellModePresetEntries = { PRESET_ENTRY_S32("gRandomizeShuffleGerudoToken", 1), PRESET_ENTRY_S32("gRandomizeShuffleKeyRings", RO_KEYRINGS_RANDOM), PRESET_ENTRY_S32("gRandomizeShuffleKokiriSword", 1), + PRESET_ENTRY_S32("gRandomizeShuffleMasterSword", 1), PRESET_ENTRY_S32("gRandomizeShuffleOcarinas", 1), PRESET_ENTRY_S32("gRandomizeShuffleScrubs", RO_SCRUBS_RANDOM), PRESET_ENTRY_S32("gRandomizeShuffleSongs", RO_SONG_SHUFFLE_ANYWHERE), diff --git a/soh/soh/Enhancements/randomizer/3drando/entrance.cpp b/soh/soh/Enhancements/randomizer/3drando/entrance.cpp new file mode 100644 index 000000000..e69de29bb diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp index 1785dd05b..6b09c4c24 100644 --- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp @@ -984,6 +984,8 @@ void VanillaFill() { ctx->GetEntranceShuffler()->ShuffleAllEntrances(); printf("\x1b[7;32HDone"); } + // Populate the playthrough for entrances so they are placed in the spoiler log + GeneratePlaythrough(); //Finish up ctx->CreateItemOverrides(); ctx->GetEntranceShuffler()->CreateEntranceOverrides(); diff --git a/soh/soh/Enhancements/randomizer/3drando/item_location.cpp b/soh/soh/Enhancements/randomizer/3drando/item_location.cpp new file mode 100644 index 000000000..e69de29bb diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp index ee8a08a44..c244dcb89 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp @@ -24,10 +24,16 @@ void AreaTable_Init_GanonsCastle() { if (randoCtx->GetDungeon(GANONS_CASTLE)->IsVanilla()) { areaTable[RR_GANONS_CASTLE_LOBBY] = Area("Ganon's Castle Lobby", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(RC_SHEIK_HINT_GC, {[]{return true;}}), + LocationAccess(RC_SHEIK_HINT_GC, {[]{return true;}}), }, { //Exits - Entrance(RR_GANONS_CASTLE_ENTRYWAY, {[]{return true;}}), + Entrance(RR_GANONS_CASTLE_ENTRYWAY, {[]{return true;}}), + Entrance(RR_GANONS_CASTLE_MAIN, {[]{return true;}}), + }); + + areaTable[RR_GANONS_CASTLE_MAIN] = Area("Ganon's Castle Main", "Ganon's Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, { + //Exits + Entrance(RR_GANONS_CASTLE_LOBBY, {[]{return true;}}), Entrance(RR_GANONS_CASTLE_FOREST_TRIAL, {[]{return true;}}), Entrance(RR_GANONS_CASTLE_FIRE_TRIAL, {[]{return true;}}), Entrance(RR_GANONS_CASTLE_WATER_TRIAL, {[]{return true;}}), @@ -129,7 +135,13 @@ void AreaTable_Init_GanonsCastle() { LocationAccess(RC_SHEIK_HINT_MQ_GC, {[]{return true;}}), }, { //Exits - Entrance(RR_GANONS_CASTLE_ENTRYWAY, {[]{return (CanUse(RG_MASTER_SWORD) || (HasExplosives || ((Nuts || Boomerang) && (Sticks || KokiriSword))));}}), + Entrance(RR_GANONS_CASTLE_ENTRYWAY, {[]{return true;}}), + Entrance(RR_GANONS_CASTLE_MQ_MAIN, {[]{return (CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER)) || ((HasExplosives || Nuts || CanUse(RG_BOOMERANG)) && CanJumpslash);}}), + }); + + areaTable[RR_GANONS_CASTLE_MQ_MAIN] = Area("Ganon's Castle MQ Main", "Ganons Castle", RA_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, { + //Exits + Entrance(RR_GANONS_CASTLE_MQ_LOBBY, {[]{return true;}}), Entrance(RR_GANONS_CASTLE_MQ_FOREST_TRIAL, {[]{return true;}}), Entrance(RR_GANONS_CASTLE_MQ_FIRE_TRIAL, {[]{return true;}}), Entrance(RR_GANONS_CASTLE_MQ_WATER_TRIAL, {[]{return true;}}), diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp index 06ffb5b71..d3c1629be 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp @@ -13,7 +13,7 @@ void AreaTable_Init_IceCavern() { areaTable[RR_ICE_CAVERN_ENTRYWAY] = Area("Ice Cavern Entryway", "Ice Cavern", RA_ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(RR_ICE_CAVERN_BEGINNING, {[]{return randoCtx->GetDungeon(ICE_CAVERN)->IsVanilla();}}), - Entrance(RR_ICE_CAVERN_MQ_BEGINNING, {[]{return randoCtx->GetDungeon(ICE_CAVERN)->IsMQ() && CanUseProjectile;}}), + Entrance(RR_ICE_CAVERN_MQ_BEGINNING, {[]{return randoCtx->GetDungeon(ICE_CAVERN)->IsMQ();}}), Entrance(RR_ZORAS_FOUNTAIN, {[]{return true;}}), }); diff --git a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp index 68200f470..25b1a9ed7 100644 --- a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp @@ -1,5 +1,6 @@ #include "playthrough.hpp" +#include #include #include "custom_messages.hpp" #include "fill.hpp" @@ -41,6 +42,10 @@ int Playthrough_Init(uint32_t seed, std::set excludedLocations, } } + if (CVarGetInteger("gRandomizerDontGenerateSpoiler", 0)) { + settingsStr += (char*)gBuildVersion; + } + uint32_t finalHash = boost::hash_32{}(std::to_string(ctx->GetSettings()->GetSeed()) + settingsStr); Random_Init(finalHash); ctx->GetSettings()->SetHash(std::to_string(finalHash)); diff --git a/soh/soh/Enhancements/randomizer/3drando/settings.cpp b/soh/soh/Enhancements/randomizer/3drando/settings.cpp new file mode 100644 index 000000000..e69de29bb diff --git a/soh/soh/Enhancements/randomizer/3drando/settings.hpp b/soh/soh/Enhancements/randomizer/3drando/settings.hpp new file mode 100644 index 000000000..e69de29bb diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp index 945f62a57..b76dafb95 100644 --- a/soh/soh/Enhancements/randomizer/context.cpp +++ b/soh/soh/Enhancements/randomizer/context.cpp @@ -127,6 +127,20 @@ ItemLocation* Context::GetItemLocation(size_t locKey) { return &itemLocationTable[static_cast(locKey)]; } +ItemOverride& Context::GetItemOverride(RandomizerCheck locKey) { + if (!overrides.contains(locKey)) { + overrides.emplace(locKey, ItemOverride()); + } + return overrides.at(locKey); +} + +ItemOverride& Context::GetItemOverride(size_t locKey) { + if (!overrides.contains(static_cast(locKey))) { + overrides.emplace(static_cast(locKey), ItemOverride()); + } + return overrides.at(static_cast(locKey)); +} + void Context::PlaceItemInLocation(const RandomizerCheck locKey, const RandomizerGet item, const bool applyEffectImmediately, const bool setHidden) { const auto loc = GetItemLocation(locKey); diff --git a/soh/soh/Enhancements/randomizer/context.h b/soh/soh/Enhancements/randomizer/context.h index 4cbe26383..63e64cb7d 100644 --- a/soh/soh/Enhancements/randomizer/context.h +++ b/soh/soh/Enhancements/randomizer/context.h @@ -37,6 +37,8 @@ class Context { RandomizerArea hintedArea = RA_NONE); ItemLocation* GetItemLocation(RandomizerCheck locKey); ItemLocation* GetItemLocation(size_t locKey); + ItemOverride& GetItemOverride(RandomizerCheck locKey); + ItemOverride& GetItemOverride(size_t locKey); void PlaceItemInLocation(RandomizerCheck locKey, RandomizerGet item, bool applyEffectImmediately = false, bool setHidden = false); std::vector allLocations; diff --git a/soh/soh/Enhancements/randomizer/draw.cpp b/soh/soh/Enhancements/randomizer/draw.cpp index 6c6a4fd55..5c3b32585 100644 --- a/soh/soh/Enhancements/randomizer/draw.cpp +++ b/soh/soh/Enhancements/randomizer/draw.cpp @@ -215,7 +215,7 @@ extern "C" void Randomizer_DrawTriforcePiece(PlayState* play, GetItemEntry getIt Gfx_SetupDL_25Xlu(play->state.gfxCtx); - uint16_t current = gSaveContext.triforcePiecesCollected; + uint8_t current = gSaveContext.triforcePiecesCollected; Matrix_Scale(0.035f, 0.035f, 0.035f, MTXMODE_APPLY); @@ -239,8 +239,8 @@ extern "C" void Randomizer_DrawTriforcePieceGI(PlayState* play, GetItemEntry get Gfx_SetupDL_25Xlu(play->state.gfxCtx); - uint16_t current = gSaveContext.triforcePiecesCollected; - uint16_t required = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED); + uint8_t current = gSaveContext.triforcePiecesCollected; + uint8_t required = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED); Matrix_Scale(triforcePieceScale, triforcePieceScale, triforcePieceScale, MTXMODE_APPLY); diff --git a/soh/soh/Enhancements/randomizer/item.cpp b/soh/soh/Enhancements/randomizer/item.cpp index 4fdc2ad72..d34929f76 100644 --- a/soh/soh/Enhancements/randomizer/item.cpp +++ b/soh/soh/Enhancements/randomizer/item.cpp @@ -19,9 +19,9 @@ Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_, : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_), advancement(advancement_), logicVar(logicVar_), hintKey(hintKey_), progressive(progressive_), price(price_) { if (modIndex_ == MOD_RANDOMIZER || getItemId > 0x7D) { - giEntry = std::make_shared(GetItemEntry{itemId_, field_, static_cast((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, static_cast(randomizerGet_), gid_, true, ITEM_FROM_NPC, category_, NULL}); + giEntry = std::make_shared(GetItemEntry{itemId_, field_, static_cast((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_RANDOMIZER, static_cast(randomizerGet_), gid_, true, ITEM_FROM_NPC, category_, NULL}); } else { - giEntry = std::make_shared(GetItemEntry{itemId_, field_, static_cast((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, getItemId_, gid_, true, ITEM_FROM_NPC, category_, NULL}); + giEntry = std::make_shared(GetItemEntry{itemId_, field_, static_cast((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_VANILLA, getItemId_, gid_, true, ITEM_FROM_NPC, category_, NULL}); } } @@ -33,9 +33,9 @@ Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_, : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_), advancement(advancement_), logicVar(logicVar_), hintKey(hintKey_), progressive(progressive_), price(price_) { if (modIndex_ == MOD_RANDOMIZER || getItemId > 0x7D) { - giEntry = std::make_shared(GetItemEntry{itemId_, field_, static_cast((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, static_cast(randomizerGet_), gid_, true, ITEM_FROM_NPC, category_, NULL}); + giEntry = std::make_shared(GetItemEntry{itemId_, field_, static_cast((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_RANDOMIZER, static_cast(randomizerGet_), gid_, true, ITEM_FROM_NPC, category_, NULL}); } else { - giEntry = std::make_shared(GetItemEntry{itemId_, field_, static_cast((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, getItemId_, gid_, true, ITEM_FROM_NPC, category_, NULL}); + giEntry = std::make_shared(GetItemEntry{itemId_, field_, static_cast((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, objectId_, modIndex_, TABLE_VANILLA, getItemId_, gid_, true, ITEM_FROM_NPC, category_, NULL}); } } diff --git a/soh/soh/Enhancements/randomizer/option.cpp b/soh/soh/Enhancements/randomizer/option.cpp index a7b4340c9..3cbc76b31 100644 --- a/soh/soh/Enhancements/randomizer/option.cpp +++ b/soh/soh/Enhancements/randomizer/option.cpp @@ -355,9 +355,18 @@ const std::string& OptionGroup::GetDescription() const { return mDescription; } +void OptionGroup::Enable() { + mDisabled = false; +} + +void OptionGroup::Disable() { + mDisabled = true; +} + bool OptionGroup::RenderImGui() const { // NOLINT(*-no-recursion) ImGuiWindow* window = ImGui::GetCurrentWindow(); bool changed = false; + ImGui::BeginDisabled(mDisabled); if (mContainerType == WidgetContainerType::TABLE) { if (ImGui::BeginTable(mName.c_str(), static_cast(mSubGroups.size()), ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) { for (const auto column : mSubGroups) { @@ -424,6 +433,7 @@ bool OptionGroup::RenderImGui() const { // NOLINT(*-no-recursion) if (mContainerType == WidgetContainerType::TABLE) { ImGui::EndTable(); } + ImGui::EndDisabled(); return changed; } } // namespace Rando \ No newline at end of file diff --git a/soh/soh/Enhancements/randomizer/option.h b/soh/soh/Enhancements/randomizer/option.h index 8e0fd0713..ef0c0a2bb 100644 --- a/soh/soh/Enhancements/randomizer/option.h +++ b/soh/soh/Enhancements/randomizer/option.h @@ -462,6 +462,8 @@ class OptionGroup { * @brief Renders all of the options contained within this `OptionGroup` in the ImGui menu. */ bool RenderImGui() const; + void Disable(); + void Enable(); private: std::string mName; @@ -472,5 +474,6 @@ class OptionGroup { OptionGroupType mContainsType = OptionGroupType::DEFAULT; WidgetContainerType mContainerType = WidgetContainerType::BASIC; std::string mDescription; + bool mDisabled = false; }; } // namespace Rando \ No newline at end of file diff --git a/soh/soh/Enhancements/randomizer/option_descriptions.cpp b/soh/soh/Enhancements/randomizer/option_descriptions.cpp index 83f8b12a0..22fc33f69 100644 --- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp +++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp @@ -508,7 +508,9 @@ void Settings::CreateOptionDescriptions() { "\n" //"Glitched - Glitches may be required to beat the game. You can disable and enable glitches below.\n" //"\n" - "No logic - Item placement is completely random. MAY BE IMPOSSIBLE TO BEAT."; + "No logic - Item placement is completely random. MAY BE IMPOSSIBLE TO BEAT.\n" + "\n" + "Vanilla - Places all items and dungeon rewards in their vanilla locations."; mOptionDescriptions[RSK_ALL_LOCATIONS_REACHABLE] = "When this options is enabled, the randomizer will " "guarantee that every item is obtainable and every " "location is reachable. When disabled, only " diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index 6d1d76e30..3465e499b 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -67,7 +67,7 @@ const std::string Randomizer::NaviRandoMessageTableID = "RandomizerNavi"; const std::string Randomizer::IceTrapRandoMessageTableID = "RandomizerIceTrap"; const std::string Randomizer::randoMiscHintsTableID = "RandomizerMiscHints"; -static const char* englishRupeeNames[170] = { +static const char* englishRupeeNames[171] = { "[P]", "Bad RNG Rolls", "Bananas", "Beanbean Coins", "Beans", "Beli", "Bells", "Berries", "Bison Dollars", "Bitcoin", "Blue Essence", "Bolts", "Bones", "Boondollars", "Bottle Caps", @@ -80,28 +80,29 @@ static const char* englishRupeeNames[170] = { "Dollarydoos", "Dosh", "Doubloons", "Dwarfbucks", "Emeralds", "Energon", "Eris", "Ether", "Euro", "Experience", "Extinction Points", "Floopies", "Flurbos", "FPS", "Friends", - "Frog Coins", "Gald", "Gekz", "Gems", "Gil", - "Glimmer", "Glitches", "Gold", "Gold Dragons", "Goober Dollars", - "Green Herbs", "Greg Siblings", "Gummybears", "Hell", "Hylian Loaches", - "Ice Traps", "ISK", "Jiggies", "KF7 Ammo", "Kinstones", - "Kremcoins", "Kroner", "Leaves ", "Lemmings", "Lien", - "Lira", "Lumber", "Lungmen Dollars", "Macca", "Mana", - "Mann Co. Keys", "Meat", "Meat Stacks", "Medaparts", "Meseta", - "Mesetas", "Minerals", "Monopoly Money", "Moons", "Mora", - "Mumbo Tokens", "Munny", "Mushrooms", "Mysteries", "Neopoints", - "Notes", "Nuyen", "Orbs", "Pix", "Pixels", - "Platinum", "Pokédollars", "Pokémon", "Poko", "Pokos", - "Potch", "Pounds", "Power Pellets", "Primogems", "Réals", - "Refined Metal", "Remote Mines", "Retweets", "Rhinu", "Rings", - "Riot Points", "Robux", "Rubies", "Rubles", "Runite Ore", - "Rupees", "Saint Quartz", "Septims", "Shekels", "Shillings", - "Silver", "Simoleons", "Smackaroos", "Social Credit", "Souls", - "Spent Casings", "Spice", "Spondulicks", "Spoons", "Star Bits", - "Star Chips", "Stars", "Stones of Jordan", "Store Credit", "Strawbs", - "Studs", "Super Sea Snails", "Talent", "Teef", "Telecrystals", - "Tiberium", "TokKul", "Toys", "Turnips", "Upvotes", - "V-Bucks", "Vespene Gas", "Watts", "Widgets", "Woolongs", - "World Dollars", "Wumpa Fruit", "Yen", "Zenny", "Zorkmids" + "Frog Coins", "Gald", "Gekz", "Gems", "Geo", + "Gil", "Glimmer", "Glitches", "Gold", "Gold Dragons", + "Goober Dollars", "Green Herbs", "Greg Siblings", "Gummybears", "Hell", + "Hylian Loaches", "Ice Traps", "ISK", "Jiggies", "KF7 Ammo", + "Kinstones", "Kremcoins", "Kroner", "Leaves ", "Lemmings", + "Lien", "Lira", "Lumber", "Lungmen Dollars", "Macca", + "Mana", "Mann Co. Keys", "Meat", "Meat Stacks", "Medaparts", + "Meseta", "Mesetas", "Minerals", "Monopoly Money", "Moons", + "Mora", "Mumbo Tokens", "Munny", "Mushrooms", "Mysteries", + "Neopoints", "Notes", "Nuyen", "Orbs", "Pix", + "Pixels", "Platinum", "Pokédollars", "Pokémon", "Poko", + "Pokos", "Potch", "Pounds", "Power Pellets", "Primogems", + "Réals", "Refined Metal", "Remote Mines", "Retweets", "Rhinu", + "Rings", "Riot Points", "Robux", "Rubies", "Rubles", + "Runite Ore", "Rupees", "Saint Quartz", "Septims", "Shekels", + "Shillings", "Silver", "Simoleons", "Smackaroos", "Social Credit", + "Souls", "Spent Casings", "Spice", "Spondulicks", "Spoons", + "Star Bits", "Star Chips", "Stars", "Stones of Jordan", "Store Credit", + "Strawbs", "Studs", "Super Sea Snails", "Talent", "Teef", + "Telecrystals", "Tiberium", "TokKul", "Toys", "Turnips", + "Upvotes", "V-Bucks", "Vespene Gas", "Watts", "Widgets", + "Woolongs", "World Dollars", "Wumpa Fruit", "Yen", "Zenny", + "Zorkmids" }; static const char* germanRupeeNames[41] = { @@ -156,7 +157,7 @@ Randomizer::Randomizer() { } } -Randomizer::~Randomizer() { +Randomizer::~Randomizer() { } std::unordered_map spoilerFileTrialToEnum = { @@ -252,16 +253,31 @@ std::string sanitize(std::string stringValue) { #pragma GCC push_options #pragma GCC optimize ("O0") bool Randomizer::SpoilerFileExists(const char* spoilerFileName) { - if (strcmp(spoilerFileName, "") != 0) { - std::ifstream spoilerFileStream(sanitize(spoilerFileName)); - if (!spoilerFileStream) { - return false; - } else { + try { + if (strcmp(spoilerFileName, "") != 0) { + std::ifstream spoilerFileStream(SohUtils::Sanitize(spoilerFileName)); + if (!spoilerFileStream) { + return false; + } + + json spoilerFileJson; + spoilerFileStream >> spoilerFileJson; + + if (!spoilerFileJson.contains("version") || !spoilerFileJson.contains("finalSeed")) { + return false; + } + return true; } - } - return false; + return false; + } catch (std::exception& e) { + SPDLOG_ERROR("Error checking if spoiler file exists: {}", e.what()); + return false; + } catch (...) { + SPDLOG_ERROR("Error checking if spoiler file exists"); + return false; + } } #pragma GCC pop_options #pragma optimize("", on) @@ -1566,9 +1582,9 @@ ShopItemIdentity Randomizer::IdentifyShopItem(s32 sceneNum, u8 slotIndex) { shopItemIdentity.itemPrice = -1; shopItemIdentity.enGirlAShopItem = 0x32; - Rando::Location* location = GetCheckObjectFromActor(ACTOR_EN_GIRLA, + Rando::Location* location = GetCheckObjectFromActor(ACTOR_EN_GIRLA, // Bazaar (SHOP1) scene is reused, so if entering from Kak use debug scene to identify - (sceneNum == SCENE_BAZAAR && gSaveContext.entranceIndex == 0xB7) ? SCENE_TEST01 : sceneNum, slotIndex); + (sceneNum == SCENE_BAZAAR && gSaveContext.entranceIndex == ENTR_BAZAAR_0) ? SCENE_TEST01 : sceneNum, slotIndex); if (location->GetRandomizerCheck() != RC_UNKNOWN_CHECK) { shopItemIdentity.randomizerInf = rcToRandomizerInf[location->GetRandomizerCheck()]; @@ -1712,7 +1728,9 @@ void RandomizerSettingsWindow::DrawElement() { UIWidgets::DisableComponent(ImGui::GetStyle().Alpha * 0.5f); } + ImGui::BeginDisabled(CVarGetInteger("gDisableChangingSettings", 0)); DrawPresetSelector(PRESET_TYPE_RANDOMIZER); + ImGui::EndDisabled(); UIWidgets::Spacer(0); UIWidgets::EnhancementCheckbox("Manual seed entry", "gRandoManualSeedEntry", false, ""); @@ -1735,13 +1753,17 @@ void RandomizerSettingsWindow::DrawElement() { } UIWidgets::Spacer(0); + ImGui::BeginDisabled(CVarGetInteger("gRandomizerDontGenerateSpoiler", 0) && gSaveContext.gameMode != GAMEMODE_FILE_SELECT); if (ImGui::Button("Generate Randomizer")) { GenerateRandomizer(CVarGetInteger("gRandoManualSeedEntry", 0) ? seedString : ""); } + ImGui::EndDisabled(); UIWidgets::Spacer(0); - std::string spoilerfilepath = CVarGetString("gSpoilerLog", ""); - ImGui::Text("Spoiler File: %s", spoilerfilepath.c_str()); + if (!CVarGetInteger("gRandomizerDontGenerateSpoiler", 0)) { + std::string spoilerfilepath = CVarGetString("gSpoilerLog", ""); + ImGui::Text("Spoiler File: %s", spoilerfilepath.c_str()); + } // RANDOTODO settings presets // std::string presetfilepath = CVarGetString("gLoadedPreset", ""); @@ -1749,6 +1771,8 @@ void RandomizerSettingsWindow::DrawElement() { UIWidgets::PaddedSeparator(); + ImGui::BeginDisabled(CVarGetInteger("gDisableChangingSettings", 0)); + ImGuiWindow* window = ImGui::GetCurrentWindow(); static ImVec2 cellPadding(8.0f, 8.0f); @@ -1762,15 +1786,19 @@ void RandomizerSettingsWindow::DrawElement() { ImGui::EndTabItem(); } + ImGui::BeginDisabled(CVarGetInteger("gRandomizeLogicRules", RO_LOGIC_GLITCHLESS) == RO_LOGIC_VANILLA); if (ImGui::BeginTabItem("Items")) { ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, cellPadding); + ImGui::BeginDisabled(CVarGetInteger("gRandomizeLogicRules", RO_LOGIC_GLITCHLESS) == RO_LOGIC_VANILLA); if (mSettings->GetOptionGroup(RSG_ITEMS_IMGUI_TABLE).RenderImGui()) { mNeedsUpdate = true; } ImGui::PopStyleVar(1); ImGui::EndTabItem(); } + ImGui::EndDisabled(); + ImGui::BeginDisabled(CVarGetInteger("gRandomizeLogicRules", RO_LOGIC_GLITCHLESS) == RO_LOGIC_VANILLA); if (ImGui::BeginTabItem("Gameplay")) { ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, cellPadding); if (mSettings->GetOptionGroup(RSG_GAMEPLAY_IMGUI_TABLE).RenderImGui()) { @@ -1779,7 +1807,9 @@ void RandomizerSettingsWindow::DrawElement() { ImGui::PopStyleVar(1); ImGui::EndTabItem(); } + ImGui::EndDisabled(); + ImGui::BeginDisabled(CVarGetInteger("gRandomizeLogicRules", RO_LOGIC_GLITCHLESS) == RO_LOGIC_VANILLA); static bool locationsTabOpen = false; if (ImGui::BeginTabItem("Locations")) { ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, cellPadding); @@ -1898,6 +1928,7 @@ void RandomizerSettingsWindow::DrawElement() { } else { locationsTabOpen = false; } + ImGui::EndDisabled(); static bool tricksTabOpen = false; if (ImGui::BeginTabItem("Tricks/Glitches")) { @@ -1928,12 +1959,17 @@ void RandomizerSettingsWindow::DrawElement() { if (mSettings->GetOption(RSK_LOGIC_RULES).RenderImGui()) { mNeedsUpdate = true; } - if (CVarGetInteger("gRandomizeLogicRules", RO_LOGIC_GLITCHLESS) != RO_LOGIC_NO_LOGIC) { + // RANDOTODO: Implement Disalbling of Options for Vanilla Logic + if (CVarGetInteger("gRandomizeLogicRules", RO_LOGIC_GLITCHLESS) == RO_LOGIC_GLITCHLESS) { ImGui::SameLine(); if (mSettings->GetOption(RSK_ALL_LOCATIONS_REACHABLE).RenderImGui()) { mNeedsUpdate = true; } } + if (CVarGetInteger("gRandomizeLogicRules", RO_LOGIC_GLITCHLESS) == RO_LOGIC_VANILLA) { + ImGui::SameLine(); + ImGui::TextColored(ImVec4(1.0f, 0.0f, 0.0f, 1.0f), "Heads up! This will disable all rando settings except for entrance shuffle and starter items"); + } UIWidgets::PaddedSeparator(); @@ -1945,6 +1981,8 @@ void RandomizerSettingsWindow::DrawElement() { ImGui::EndTable(); } + ImGui::BeginDisabled(CVarGetInteger("gRandomizeLogicRules", RO_LOGIC_GLITCHLESS) == RO_LOGIC_VANILLA); + // Tricks static std::unordered_map areaTreeDisabled { {RTAREA_GENERAL, true}, @@ -2317,6 +2355,7 @@ void RandomizerSettingsWindow::DrawElement() { } ImGui::EndTable(); } + ImGui::EndDisabled(); ImGui::PopStyleVar(1); ImGui::EndTabItem(); } else { @@ -2334,7 +2373,9 @@ void RandomizerSettingsWindow::DrawElement() { ImGui::EndTabBar(); } - + + ImGui::EndDisabled(); + if (disableEditingRandoSettings) { UIWidgets::ReEnableComponent(""); } @@ -2471,7 +2512,7 @@ CustomMessage Randomizer::GetSheikMessage(s16 scene, u16 originalTextId) { } CustomMessage Randomizer::GetSariaMessage(u16 originalTextId) { - if (originalTextId == TEXT_SARIA_SFM || originalTextId == TEXT_SARIAS_SONG_FOREST_SOUNDS || TEXT_SARIAS_SONG_FOREST_TEMPLE) { + if (originalTextId == TEXT_SARIA_SFM || (originalTextId == TEXT_SARIAS_SONG_FOREST_SOUNDS && originalTextId == TEXT_SARIAS_SONG_FOREST_TEMPLE)) { CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, TEXT_SARIAS_SONG_FACE_TO_FACE); CustomMessage messageEntry2 = messageEntry; std::string code = originalTextId == TEXT_SARIA_SFM ? "" : "\x0B"; @@ -2679,9 +2720,9 @@ void CreateTriforcePieceMessages() { CustomMessage Randomizer::GetTriforcePieceMessage() { // Item is only given after the textbox, so reflect that inside the textbox. - uint16_t current = gSaveContext.triforcePiecesCollected + 1; - uint16_t required = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED); - uint16_t remaining = required - current; + uint8_t current = gSaveContext.triforcePiecesCollected + 1; + uint8_t required = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED); + uint8_t remaining = required - current; float percentageCollected = (float)current / (float)required; uint8_t messageIndex; diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h index 52a86f649..b73430369 100644 --- a/soh/soh/Enhancements/randomizer/randomizerTypes.h +++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h @@ -9,7 +9,14 @@ // This should probably go in a less rando-specific location // but the best location will probably be in the modding engine // which doesn't exist yet. -typedef enum { MOD_NONE, MOD_RANDOMIZER } ModIndex; +typedef enum { + MOD_NONE, + MOD_RANDOMIZER +} ModIndex; +typedef enum { + TABLE_VANILLA = MOD_NONE, + TABLE_RANDOMIZER = MOD_RANDOMIZER +} TableIndex; typedef struct { char tex[512]; @@ -600,6 +607,7 @@ typedef enum { RR_GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT, RR_GANONS_CASTLE_LOBBY, + RR_GANONS_CASTLE_MAIN, RR_GANONS_CASTLE_DEKU_SCRUBS, RR_GANONS_CASTLE_FOREST_TRIAL, RR_GANONS_CASTLE_FIRE_TRIAL, @@ -610,6 +618,7 @@ typedef enum { RR_GANONS_CASTLE_TOWER, RR_GANONS_CASTLE_MQ_LOBBY, + RR_GANONS_CASTLE_MQ_MAIN, RR_GANONS_CASTLE_MQ_DEKU_SCRUBS, RR_GANONS_CASTLE_MQ_FOREST_TRIAL, RR_GANONS_CASTLE_MQ_FIRE_TRIAL, @@ -3376,7 +3385,7 @@ typedef enum { RSK_STARTING_DEKU_SHIELD, RSK_STARTING_KOKIRI_SWORD, RSK_STARTING_MASTER_SWORD, - RSK_STARTING_ZELDAS_LULLABY, + RSK_STARTING_ZELDAS_LULLABY, RSK_STARTING_EPONAS_SONG, RSK_STARTING_SARIAS_SONG, RSK_STARTING_SUNS_SONG, @@ -3813,7 +3822,7 @@ typedef enum { RO_LOGIC_GLITCHLESS, RO_LOGIC_GLITCHED, RO_LOGIC_NO_LOGIC, - RO_LOGIC_VANILLA + RO_LOGIC_VANILLA, } RandoOptionLogic; // Damage Multiplier diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp index ff0adf7a3..14335db68 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp @@ -14,7 +14,7 @@ std::map rcAreaNames = { { RCAREA_LAKE_HYLIA, "Lake Hylia" }, { RCAREA_GERUDO_VALLEY, "Gerudo Valley" }, { RCAREA_GERUDO_FORTRESS, "Gerudo Fortress" }, - { RCAREA_WASTELAND, "Desert Wasteland" }, + { RCAREA_WASTELAND, "Haunted Wasteland" }, { RCAREA_DESERT_COLOSSUS, "Desert Colossus" }, { RCAREA_MARKET, "Hyrule Market" }, { RCAREA_HYRULE_CASTLE, "Hyrule Castle" }, diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp index 5fdca02f5..3a7e2e4fb 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp @@ -76,7 +76,6 @@ bool showLinksPocket; bool fortressFast; bool fortressNormal; -bool bypassRandoCheck = true; // persistent during gameplay bool initialized; bool doAreaScroll; @@ -84,14 +83,6 @@ bool previousShowHidden = false; bool hideShopRightChecks = true; bool hideTriforceCompleted = true; -bool checkCollected = false; -int checkLoops = 0; -int checkCounter = 0; -u16 savedFrames = 0; -bool messageCloseCheck = false; -bool pendingSaleCheck = false; -bool transitionCheck = false; - std::map startingShopItem = { { SCENE_KOKIRI_SHOP, RC_KF_SHOP_ITEM_1 }, { SCENE_BAZAAR, RC_MARKET_BAZAAR_ITEM_1 }, { SCENE_POTION_SHOP_MARKET, RC_MARKET_POTION_SHOP_ITEM_1 }, @@ -100,7 +91,7 @@ std::map startingShopItem = { { SCENE_KOKIRI_SHOP, RC { SCENE_ZORA_SHOP, RC_ZD_SHOP_ITEM_1 }, { SCENE_GORON_SHOP, RC_GC_SHOP_ITEM_1 } }; -std::map RCAreaFromSceneID = { +std::map DungeonRCAreasBySceneID = { {SCENE_DEKU_TREE, RCAREA_DEKU_TREE}, {SCENE_DODONGOS_CAVERN, RCAREA_DODONGOS_CAVERN}, {SCENE_JABU_JABU, RCAREA_JABU_JABUS_BELLY}, @@ -122,12 +113,9 @@ bool showVOrMQ; s8 areaChecksGotten[32]; //| "Kokiri Forest (4/9)" bool optCollapseAll; // A bool that will collapse all checks once bool optExpandAll; // A bool that will expand all checks once -RandomizerCheck lastItemGetCheck = RC_UNKNOWN_CHECK; RandomizerCheck lastLocationChecked = RC_UNKNOWN_CHECK; RandomizerCheckArea previousArea = RCAREA_INVALID; RandomizerCheckArea currentArea = RCAREA_INVALID; -std::vector checkAreas; -std::vector itemsReceived; OSContPad* trackerButtonsPressed; void BeginFloatWindows(std::string UniqueName, bool& open, ImGuiWindowFlags flags = 0); @@ -199,10 +187,6 @@ Color_RGBA8 Color_Saved_Extra = { 0, 185, 0, 255 }; // Green std::vector buttons = { BTN_A, BTN_B, BTN_CUP, BTN_CDOWN, BTN_CLEFT, BTN_CRIGHT, BTN_L, BTN_Z, BTN_R, BTN_START, BTN_DUP, BTN_DDOWN, BTN_DLEFT, BTN_DRIGHT }; -void SetLastItemGetRC(RandomizerCheck rc) { - lastItemGetCheck = rc; -} - void DefaultCheckData(RandomizerCheck rc) { gSaveContext.checkTrackerData[rc].status = RCSHOW_UNCHECKED; gSaveContext.checkTrackerData[rc].skipped = 0; @@ -253,9 +237,6 @@ void SetCheckCollected(RandomizerCheck rc) { } else { gSaveContext.checkTrackerData[rc].skipped = false; } - if (!checkAreas.empty()) { - checkAreas.erase(checkAreas.begin()); - } SaveManager::Instance->SaveSection(gSaveContext.fileNum, sectionId, true); doAreaScroll = true; @@ -360,32 +341,18 @@ bool vector_contains_scene(std::vector vec, const int16_t scene) { std::vector skipScenes = {SCENE_GANON_BOSS, SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR, SCENE_GANON_BOSS, SCENE_INSIDE_GANONS_CASTLE_COLLAPSE, SCENE_GANONS_TOWER_COLLAPSE_INTERIOR}; -bool EvaluateCheck(RandomizerCheck rc) { - if (HasItemBeenCollected(rc) && gSaveContext.checkTrackerData[rc].status != RCSHOW_COLLECTED && - gSaveContext.checkTrackerData[rc].status != RCSHOW_SAVED) { - SetCheckCollected(rc); - return true; - } - return false; -} - -bool CheckByArea(RandomizerCheckArea area = RCAREA_INVALID) { - if (area == RCAREA_INVALID) { - area = checkAreas.front(); - } - if (area != RCAREA_INVALID) { - auto areaChecks = checksByArea.find(area)->second; - if (checkCounter >= areaChecks.size()) { - checkCounter = 0; - checkLoops++; - } - auto rc = areaChecks.at(checkCounter); - return EvaluateCheck(rc); +void ClearAreaChecksAndTotals() { + for (auto& [rcArea, vec] : checksByArea) { + vec.clear(); + areaChecksGotten[rcArea] = 0; } } void SetShopSeen(uint32_t sceneNum, bool prices) { RandomizerCheck start = startingShopItem.find(sceneNum)->second; + if (sceneNum == SCENE_POTION_SHOP_KAKARIKO && !LINK_IS_ADULT) { + return; + } if (GetCheckArea() == RCAREA_KAKARIKO_VILLAGE && sceneNum == SCENE_BAZAAR) { start = RC_KAK_BAZAAR_ITEM_1; } @@ -452,10 +419,61 @@ bool HasItemBeenCollected(RandomizerCheck rc) { return false; } -void CheckTrackerDialogClosed() { - if (messageCloseCheck) { - messageCloseCheck = false; +void CheckTrackerLoadGame(int32_t fileNum) { + LoadSettings(); + TrySetAreas(); + for (auto& entry : Rando::StaticData::GetLocationTable()) { + RandomizerCheck rc = entry.GetRandomizerCheck(); + RandomizerCheckTrackerData rcTrackerData = gSaveContext.checkTrackerData[rc]; + if (rc == RC_UNKNOWN_CHECK || rc == RC_MAX || rc == RC_LINKS_POCKET || + !Rando::StaticData::GetLocation(rc) != RC_UNKNOWN_CHECK) + continue; + + Rando::Location* entry2; + if (rc == RC_GIFT_FROM_SAGES && !IS_RANDO) { + entry2 = Rando::StaticData::GetLocation(rc); + } else { + entry2 = Rando::StaticData::GetLocation(rc); + } + if (!IsVisibleInCheckTracker(entry2->GetRandomizerCheck())) continue; + + checksByArea.find(entry2->GetArea())->second.push_back(entry2->GetRandomizerCheck()); + if (rcTrackerData.status == RCSHOW_SAVED || rcTrackerData.skipped) { + areaChecksGotten[entry2->GetArea()]++; + } + + if (areaChecksGotten[entry2->GetArea()] != 0 || RandomizerCheckObjects::AreaIsOverworld(entry2->GetArea())) { + areasSpoiled |= (1 << entry2->GetArea()); + } } + if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LINKS_POCKET) != RO_LINKS_POCKET_NOTHING && IS_RANDO) { + s8 startingAge = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_STARTING_AGE); + RandomizerCheckArea startingArea; + switch (startingAge) { + case RO_AGE_CHILD: + startingArea = RCAREA_KOKIRI_FOREST; + break; + case RO_AGE_ADULT: + startingArea = RCAREA_MARKET; + break; + default: + startingArea = RCAREA_KOKIRI_FOREST; + break; + } + + checksByArea.find(startingArea)->second.push_back(RC_LINKS_POCKET); + areaChecksGotten[startingArea]++; + } + + showVOrMQ = (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) == RO_MQ_DUNGEONS_RANDOM_NUMBER || + (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) == RO_MQ_DUNGEONS_SET_NUMBER && + OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_COUNT) < 12)); + LinksPocket(); + SongFromImpa(); + GiftFromSages(); + initialized = true; + UpdateAllOrdering(); + UpdateInventoryChecks(); } void CheckTrackerShopSlotChange(uint8_t cursorSlot, int16_t basePrice) { @@ -479,10 +497,6 @@ void CheckTrackerTransition(uint32_t sceneNum) { if (!GameInteractor::IsSaveLoaded()) { return; } - gSaveContext; - if (transitionCheck) { - transitionCheck = false; - } doAreaScroll = true; previousArea = currentArea; currentArea = GetCheckArea(); @@ -503,28 +517,12 @@ void CheckTrackerFrame() { if (!GameInteractor::IsSaveLoaded()) { return; } - if (!checkAreas.empty() && !transitionCheck && !messageCloseCheck && !pendingSaleCheck) { - for (int i = 0; i < 10; i++) { - if (CheckByArea()) { - checkCounter = 0; - break; - } else { - checkCounter++; - } + // TODO: Move to OnAmmoChange hook once it gets added. + if (gSaveContext.checkTrackerData[RC_ZR_MAGIC_BEAN_SALESMAN].status != RCSHOW_COLLECTED && + gSaveContext.checkTrackerData[RC_ZR_MAGIC_BEAN_SALESMAN].status != RCSHOW_SAVED) { + if (BEANS_BOUGHT >= 10) { + SetCheckCollected(RC_ZR_MAGIC_BEAN_SALESMAN); } - if (checkLoops > 15) { - checkAreas.erase(checkAreas.begin()); - checkLoops = 0; - } - } - if (savedFrames > 0 && !pendingSaleCheck && !messageCloseCheck) { - savedFrames--; - } -} - -void CheckTrackerSaleEnd(GetItemEntry giEntry) { - if (pendingSaleCheck) { - pendingSaleCheck = false; } } @@ -536,7 +534,7 @@ void CheckTrackerItemReceive(GetItemEntry giEntry) { // Vanilla special item checks if (!IS_RANDO) { if (giEntry.itemId == ITEM_SHIELD_DEKU) { - SetCheckCollected(RC_KF_SHOP_ITEM_3); + SetCheckCollected(RC_KF_SHOP_ITEM_1); return; }else if (giEntry.itemId == ITEM_KOKIRI_EMERALD) { SetCheckCollected(RC_QUEEN_GOHMA); @@ -565,16 +563,19 @@ void CheckTrackerItemReceive(GetItemEntry giEntry) { } else if (giEntry.itemId == ITEM_MEDALLION_LIGHT) { SetCheckCollected(RC_GIFT_FROM_SAGES); return; - } else if (giEntry.itemId == ITEM_SONG_LULLABY) { - SetCheckCollected(RC_SONG_FROM_IMPA); - return; } else if (giEntry.itemId == ITEM_SONG_EPONA) { SetCheckCollected(RC_SONG_FROM_MALON); return; } else if (giEntry.itemId == ITEM_SONG_SARIA) { SetCheckCollected(RC_SONG_FROM_SARIA); return; - } else if (giEntry.itemId == ITEM_SONG_SUN) { + } else if (giEntry.itemId == ITEM_BEAN) { + SetCheckCollected(RC_ZR_MAGIC_BEAN_SALESMAN); + return; + } else if (giEntry.itemId == ITEM_BRACELET) { + SetCheckCollected(RC_GC_DARUNIAS_JOY); + return; + }/* else if (giEntry.itemId == ITEM_SONG_SUN) { SetCheckCollected(RC_SONG_FROM_ROYAL_FAMILYS_TOMB); return; } else if (giEntry.itemId == ITEM_SONG_TIME) { @@ -601,42 +602,128 @@ void CheckTrackerItemReceive(GetItemEntry giEntry) { } else if (giEntry.itemId == ITEM_SONG_PRELUDE) { SetCheckCollected(RC_SHEIK_AT_TEMPLE); return; - } else if (giEntry.itemId == ITEM_BRACELET) { - SetCheckCollected(RC_GC_DARUNIAS_JOY); - return; - } else if (giEntry.itemId == ITEM_LETTER_ZELDA) { - SetCheckCollected(RC_HC_ZELDAS_LETTER); - return; - } else if (giEntry.itemId == ITEM_WEIRD_EGG) { - SetCheckCollected(RC_HC_MALON_EGG); - return; - } else if (giEntry.itemId == ITEM_BEAN) { - SetCheckCollected(RC_ZR_MAGIC_BEAN_SALESMAN); + }*/ + } +} + +void CheckTrackerSceneFlagSet(int16_t sceneNum, int16_t flagType, int32_t flag) { + if (flagType != FLAG_SCENE_TREASURE && flagType != FLAG_SCENE_COLLECTIBLE) { + return; + } + if (sceneNum == SCENE_GRAVEYARD && flag == 0x19 && flagType == FLAG_SCENE_COLLECTIBLE) { // Gravedigging tour special case + SetCheckCollected(RC_GRAVEYARD_DAMPE_GRAVEDIGGING_TOUR); + return; + } + for (auto& loc : Rando::StaticData::GetLocationTable()) { + if (!IsVisibleInCheckTracker(loc.GetRandomizerCheck())) { + continue; + } + SpoilerCollectionCheckType checkMatchType = flagType == FLAG_SCENE_TREASURE ? SpoilerCollectionCheckType::SPOILER_CHK_CHEST : SpoilerCollectionCheckType::SPOILER_CHK_COLLECTABLE; + Rando::SpoilerCollectionCheck scCheck = loc.GetCollectionCheck(); + if (scCheck.scene == sceneNum && scCheck.flag == flag && scCheck.type == checkMatchType) { + SetCheckCollected(loc.GetRandomizerCheck()); return; } } - auto checkArea = GetCheckArea(); - if (gSaveContext.pendingSale != ITEM_NONE) { - pendingSaleCheck = true; - checkAreas.push_back(checkArea); +} + +void CheckTrackerFlagSet(int16_t flagType, int32_t flag) { + SpoilerCollectionCheckType checkMatchType = SpoilerCollectionCheckType::SPOILER_CHK_NONE; + switch (flagType) { + case FLAG_GS_TOKEN: + checkMatchType = SpoilerCollectionCheckType::SPOILER_CHK_GOLD_SKULLTULA; + break; + case FLAG_EVENT_CHECK_INF: + if ((flag == EVENTCHKINF_CARPENTERS_FREE(0) || flag == EVENTCHKINF_CARPENTERS_FREE(1) || + flag == EVENTCHKINF_CARPENTERS_FREE(2) || flag == EVENTCHKINF_CARPENTERS_FREE(3)) + && GET_EVENTCHKINF_CARPENTERS_FREE_ALL()) { + SetCheckCollected(RC_GF_GERUDO_MEMBERSHIP_CARD); + return; + } + checkMatchType = SpoilerCollectionCheckType::SPOILER_CHK_EVENT_CHK_INF; + break; + case FLAG_INF_TABLE: + if (flag == INFTABLE_190) { + SetCheckCollected(RC_GF_HBA_1000_POINTS); + return; + } else if (flag == INFTABLE_11E) { + SetCheckCollected(RC_GC_ROLLING_GORON_AS_CHILD); + return; + } else if (flag == INFTABLE_GORON_CITY_DOORS_UNLOCKED) { + SetCheckCollected(RC_GC_ROLLING_GORON_AS_ADULT); + return; + } else if (flag == INFTABLE_139) { + SetCheckCollected(RC_ZD_KING_ZORA_THAWED); + return; + } else if (flag == INFTABLE_191) { + SetCheckCollected(RC_MARKET_LOST_DOG); + return; + } + if (!IS_RANDO) { + if (flag == INFTABLE_192) { + SetCheckCollected(RC_LW_DEKU_SCRUB_NEAR_BRIDGE); + return; + } else if (flag == INFTABLE_193) { + SetCheckCollected(RC_LW_DEKU_SCRUB_GROTTO_FRONT); + return; + } + } + break; + case FLAG_ITEM_GET_INF: + if (!IS_RANDO) { + if (flag == ITEMGETINF_OBTAINED_STICK_UPGRADE_FROM_STAGE) { + SetCheckCollected(RC_DEKU_THEATER_SKULL_MASK); + return; + } else if (flag == ITEMGETINF_OBTAINED_NUT_UPGRADE_FROM_STAGE) { + SetCheckCollected(RC_DEKU_THEATER_MASK_OF_TRUTH); + return; + } else if (flag == ITEMGETINF_0B) { + SetCheckCollected(RC_HF_DEKU_SCRUB_GROTTO); + return; + } + } + checkMatchType = SpoilerCollectionCheckType::SPOILER_CHK_ITEM_GET_INF; + break; + case FLAG_RANDOMIZER_INF: + checkMatchType = SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF; + break; + } + if (checkMatchType == SpoilerCollectionCheckType::SPOILER_CHK_NONE) { return; } - if (scene == SCENE_DESERT_COLOSSUS && (gSaveContext.entranceIndex == 485 || gSaveContext.entranceIndex == 489)) { - checkAreas.push_back(RCAREA_SPIRIT_TEMPLE); - return; - } - if (GET_PLAYER(gPlayState) == nullptr) { - transitionCheck = true; - return; - } - if (gPlayState->msgCtx.msgMode != MSGMODE_NONE) { - checkAreas.push_back(checkArea); - messageCloseCheck = true; - return; - } - if (IS_RANDO || (!IS_RANDO && giEntry.getItemCategory != ITEM_CATEGORY_JUNK)) { - checkAreas.push_back(checkArea); - checkCollected = true; + for (auto& loc : Rando::StaticData::GetLocationTable()) { + if ((!IS_RANDO && ((loc.GetQuest() == RCQUEST_MQ && !IS_MASTER_QUEST) || + (loc.GetQuest() == RCQUEST_VANILLA && IS_MASTER_QUEST))) || + (IS_RANDO && !(OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc.GetScene()) == nullptr) && + ((OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc.GetScene())->IsMQ() && + loc.GetQuest() == RCQUEST_VANILLA) || + OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc.GetScene())->IsVanilla() && + loc.GetQuest() == RCQUEST_MQ))) { + continue; + } + Rando::SpoilerCollectionCheck scCheck = loc.GetCollectionCheck(); + SpoilerCollectionCheckType scCheckType = scCheck.type; + if (checkMatchType == SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF && + (scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_MERCHANT || + scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_SHOP_ITEM || + scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_COW || + scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_SCRUB || + scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_MASTER_SWORD || + scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF)) { + if (flag == OTRGlobals::Instance->gRandomizer->GetRandomizerInfFromCheck(loc.GetRandomizerCheck())) { + SetCheckCollected(loc.GetRandomizerCheck()); + return; + } + continue; + } + int16_t checkFlag = scCheck.flag; + if (checkMatchType == SpoilerCollectionCheckType::SPOILER_CHK_GOLD_SKULLTULA) { + checkFlag = loc.GetActorParams(); + } + if (checkFlag == flag && scCheck.type == checkMatchType) { + SetCheckCollected(loc.GetRandomizerCheck()); + return; + } } } @@ -654,7 +741,7 @@ void InitTrackerData(bool isDebug) { void SaveTrackerData(SaveContext* saveContext, int sectionID, bool gameSave) { SaveManager::Instance->SaveArray("checks", ARRAY_COUNT(saveContext->checkTrackerData), [&](size_t i) { if (saveContext->checkTrackerData[i].status == RCSHOW_COLLECTED) { - if (gameSave || savedFrames > 0) { + if (gameSave) { gSaveContext.checkTrackerData[i].status = saveContext->checkTrackerData[i].status = RCSHOW_SAVED; UpdateAllOrdering(); UpdateInventoryChecks(); @@ -673,15 +760,9 @@ void SaveTrackerData(SaveContext* saveContext, int sectionID, bool gameSave) { void SaveFile(SaveContext* saveContext, int sectionID, bool fullSave) { SaveTrackerData(saveContext, sectionID, fullSave); - if (fullSave) { - savedFrames = 40; - } } void LoadFile() { - Teardown(); - LoadSettings(); - TrySetAreas(); SaveManager::Instance->LoadArray("checks", RC_MAX, [](size_t i) { SaveManager::Instance->LoadStruct("", [&]() { SaveManager::Instance->LoadData("status", gSaveContext.checkTrackerData[i].status); @@ -689,71 +770,14 @@ void LoadFile() { SaveManager::Instance->LoadData("price", gSaveContext.checkTrackerData[i].price); SaveManager::Instance->LoadData("hintItem", gSaveContext.checkTrackerData[i].hintItem); }); - RandomizerCheckTrackerData entry = gSaveContext.checkTrackerData[i]; - RandomizerCheck rc = static_cast(i); - if (rc == RC_UNKNOWN_CHECK || rc == RC_MAX) - return; - - Rando::Location* entry2; - if (rc == RC_GIFT_FROM_SAGES && !IS_RANDO) { - entry2 = Rando::StaticData::GetLocation(rc); - } else { - entry2 = Rando::StaticData::GetLocation(rc); - } - if (!IsVisibleInCheckTracker(entry2->GetRandomizerCheck())) return; - - if (entry2->GetRandomizerCheck() != RC_LINKS_POCKET) { - // RC_LINKS_POCKET is a special case because it's RCAREA is different depending on starting age. - checksByArea.find(entry2->GetArea())->second.push_back(entry2->GetRandomizerCheck()); - } - if (entry.status == RCSHOW_SAVED || entry.skipped) { - areaChecksGotten[entry2->GetArea()]++; - } - - if (areaChecksGotten[entry2->GetArea()] != 0 || RandomizerCheckObjects::AreaIsOverworld(entry2->GetArea())) { - areasSpoiled |= (1 << entry2->GetArea()); - } }); - if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LINKS_POCKET) != RO_LINKS_POCKET_NOTHING && IS_RANDO) { - s8 startingAge = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_STARTING_AGE); - RandomizerCheckArea startingArea; - switch (startingAge) { - case RO_AGE_CHILD: - startingArea = RCAREA_KOKIRI_FOREST; - break; - case RO_AGE_ADULT: - startingArea = RCAREA_MARKET; - break; - default: - startingArea = RCAREA_KOKIRI_FOREST; - break; - } - - checksByArea.find(startingArea)->second.push_back(RC_LINKS_POCKET); - areaChecksGotten[startingArea]++; - } - - showVOrMQ = (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) == RO_MQ_DUNGEONS_RANDOM_NUMBER || - (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) == RO_MQ_DUNGEONS_SET_NUMBER && - OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_COUNT) < 12)); - LinksPocket(); - SongFromImpa(); - GiftFromSages(); - initialized = true; - UpdateAllOrdering(); - UpdateInventoryChecks(); } void Teardown() { initialized = false; - for (auto& [rcArea, vec] : checksByArea) { - vec.clear(); - areaChecksGotten[rcArea] = 0; - } + ClearAreaChecksAndTotals(); checksByArea.clear(); areasSpoiled = 0; - checkCollected = false; - checkLoops = 0; lastLocationChecked = RC_UNKNOWN_CHECK; } @@ -923,7 +947,11 @@ void CheckTrackerWindow::DrawElement() { ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(extraColor.r / 255.0f, extraColor.g / 255.0f, extraColor.b / 255.0f, extraColor.a / 255.0f)); - isThisAreaSpoiled = areasSpoiled & areaMask || CVarGetInteger("gCheckTrackerOptionMQSpoilers", 0); + isThisAreaSpoiled = areasSpoiled & areaMask || CVarGetInteger("gCheckTrackerOptionMQSpoilers", 0) || !IS_RANDO || + OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) == RO_MQ_DUNGEONS_NONE || + OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) == RO_MQ_DUNGEONS_SELECTION || + (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) == RO_MQ_DUNGEONS_SET_NUMBER && + OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_COUNT) == 12); if (isThisAreaSpoiled) { if (showVOrMQ && RandomizerCheckObjects::AreaIsDungeon(rcArea)) { @@ -1058,7 +1086,7 @@ void LoadSettings() { OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LINKS_POCKET) != RO_LINKS_POCKET_NOTHING :false; hideShopRightChecks = IS_RANDO ? CVarGetInteger("gCheckTrackerOptionHideRightShopChecks", 1) : false; - hideTriforceCompleted = IS_RANDO ? + hideTriforceCompleted = IS_RANDO ? OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT) != RO_GENERIC_ON : false; if (IS_RANDO) { @@ -1103,7 +1131,7 @@ void LoadSettings() { bool IsVisibleInCheckTracker(RandomizerCheck rc) { Rando::Location* loc = Rando::StaticData::GetLocation(rc); - if (IS_RANDO) { + if (IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LOGIC_RULES) != RO_LOGIC_VANILLA) { return (loc->GetArea() != RCAREA_INVALID) && // don't show Invalid locations (loc->GetRCType() != RCTYPE_GOSSIP_STONE) && //TODO: Don't show hints until tracker supports them @@ -1155,8 +1183,8 @@ bool IsVisibleInCheckTracker(RandomizerCheck rc) { } else if (loc->IsVanillaCompletion()) { return (loc->GetQuest() == RCQUEST_BOTH || - loc->GetQuest() == RCQUEST_MQ && OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc->GetScene())->IsMQ() || - loc->GetQuest() == RCQUEST_VANILLA && OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc->GetScene())->IsVanilla() || + (loc->GetQuest() == RCQUEST_MQ && OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc->GetScene())->IsMQ()) || + (loc->GetQuest() == RCQUEST_VANILLA && OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc->GetScene())->IsVanilla()) || rc == RC_GIFT_FROM_SAGES) && rc != RC_LINKS_POCKET; } return false; @@ -1164,9 +1192,11 @@ bool IsVisibleInCheckTracker(RandomizerCheck rc) { void UpdateInventoryChecks() { //For all the areas with compasses, if you have one, spoil the area - for (u8 i = SCENE_DEKU_TREE; i <= SCENE_GERUDO_TRAINING_GROUND; i++) - if (CHECK_DUNGEON_ITEM(DUNGEON_MAP, i)) - areasSpoiled |= (1 << RCAreaFromSceneID.at((SceneID)i)); + for (auto [scene, area] : DungeonRCAreasBySceneID) { + if (CHECK_DUNGEON_ITEM(DUNGEON_MAP, scene)) { + areasSpoiled |= (1 << area); + } + } } void UpdateAreaFullyChecked(RandomizerCheckArea area) { @@ -1554,14 +1584,16 @@ void CheckTrackerWindow::InitElement() { SaveManager::Instance->AddInitFunction(InitTrackerData); sectionId = SaveManager::Instance->AddSaveFunction("trackerData", 1, SaveFile, true, -1); SaveManager::Instance->AddLoadFunction("trackerData", 1, LoadFile); + GameInteractor::Instance->RegisterGameHook(CheckTrackerLoadGame); GameInteractor::Instance->RegisterGameHook([](uint32_t fileNum) { Teardown(); }); GameInteractor::Instance->RegisterGameHook(CheckTrackerItemReceive); - GameInteractor::Instance->RegisterGameHook(CheckTrackerSaleEnd); GameInteractor::Instance->RegisterGameHook(CheckTrackerFrame); GameInteractor::Instance->RegisterGameHook(CheckTrackerTransition); GameInteractor::Instance->RegisterGameHook(CheckTrackerShopSlotChange); + GameInteractor::Instance->RegisterGameHook(CheckTrackerSceneFlagSet); + GameInteractor::Instance->RegisterGameHook(CheckTrackerFlagSet); //LocationTable_Init(); } diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h index 9c52df388..438a10f26 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h +++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h @@ -48,10 +48,7 @@ void Teardown(); void UpdateAllOrdering(); bool IsVisibleInCheckTracker(RandomizerCheck rc); void InitTrackerData(bool isDebug); -void SetLastItemGetRC(RandomizerCheck rc); RandomizerCheckArea GetCheckArea(); -void CheckTrackerDialogClosed(); -void ToggleShopRightChecks(); void UpdateCheck(uint32_t, RandomizerCheckTrackerData); } // namespace CheckTracker diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance.c b/soh/soh/Enhancements/randomizer/randomizer_entrance.c index 439954ba1..fc2c651af 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_entrance.c +++ b/soh/soh/Enhancements/randomizer/randomizer_entrance.c @@ -18,10 +18,24 @@ extern PlayState* gPlayState; //Overwrite the dynamic exit for the OGC Fairy Fountain to be 0x3E8 instead //of 0x340 (0x340 will stay as the exit for the HC Fairy Fountain -> Castle Grounds) -s16 dynamicExitList[] = { 0x045B, 0x0482, 0x03E8, 0x044B, 0x02A2, 0x0201, 0x03B8, 0x04EE, 0x03C0, 0x0463, 0x01CD, 0x0394, 0x0340, 0x057C }; -// OGC Fairy HC Fairy +s16 dynamicExitList[] = { + ENTR_DEATH_MOUNTAIN_TRAIL_4, + ENTR_DEATH_MOUNTAIN_CRATER_3, + ENTR_POTION_SHOP_KAKARIKO_1, // OGC Fairy -- ENTR_POTION_SHOP_KAKARIKO_1 unused + ENTR_KAKARIKO_VILLAGE_9, + ENTR_MARKET_DAY_5, + ENTR_KAKARIKO_VILLAGE_3, + ENTR_MARKET_DAY_6, + ENTR_KAKARIKO_VILLAGE_11, + ENTR_BACK_ALLEY_DAY_2, + ENTR_KAKARIKO_VILLAGE_10, + ENTR_MARKET_DAY_8, + ENTR_ZORAS_FOUNTAIN_5, + ENTR_HYRULE_CASTLE_2, // HC Fairy + ENTR_DESERT_COLOSSUS_7 +}; -// Warp Song indices array : 0x53C33C = { 0x0600, 0x04F6, 0x0604, 0x01F1, 0x0568, 0x05F4 } +// Warp Song indices array : 0x53C33C = { ENTR_SACRED_FOREST_MEADOW_2, ENTR_DEATH_MOUNTAIN_CRATER_4, ENTR_LAKE_HYLIA_8, ENTR_DESERT_COLOSSUS_5, ENTR_GRAVEYARD_7, ENTR_TEMPLE_OF_TIME_7 } // Owl Flights : 0x492064 and 0x492080 @@ -48,15 +62,15 @@ typedef struct { } DungeonEntranceInfo; static DungeonEntranceInfo dungeons[] = { - //entryway exit, boss, reverse,bluewarp,dungeon scene, boss scene - { DEKU_TREE_ENTRANCE, 0x0209, 0x040F, 0x0252, 0x0457, SCENE_DEKU_TREE, SCENE_DEKU_TREE_BOSS }, - { DODONGOS_CAVERN_ENTRANCE, 0x0242, 0x040B, 0x00C5, 0x047A, SCENE_DODONGOS_CAVERN, SCENE_DODONGOS_CAVERN_BOSS }, - { JABU_JABUS_BELLY_ENTRANCE, 0x0221, 0x0301, 0x0407, 0x010E, SCENE_JABU_JABU, SCENE_JABU_JABU_BOSS }, - { FOREST_TEMPLE_ENTRANCE, 0x0215, 0x000C, 0x024E, 0x0608, SCENE_FOREST_TEMPLE, SCENE_FOREST_TEMPLE_BOSS }, - { FIRE_TEMPLE_ENTRANCE, 0x024A, 0x0305, 0x0175, 0x0564, SCENE_FIRE_TEMPLE, SCENE_FIRE_TEMPLE_BOSS }, - { WATER_TEMPLE_ENTRANCE, 0x021D, 0x0417, 0x0423, 0x060C, SCENE_WATER_TEMPLE, SCENE_WATER_TEMPLE_BOSS }, - { SPIRIT_TEMPLE_ENTRANCE, 0x01E1, 0x008D, 0x02F5, 0x0610, SCENE_SPIRIT_TEMPLE, SCENE_SPIRIT_TEMPLE_BOSS }, - { SHADOW_TEMPLE_ENTRANCE, 0x0205, 0x0413, 0x02B2, 0x0580, SCENE_SHADOW_TEMPLE, SCENE_SHADOW_TEMPLE_BOSS }, + //entryway exit, boss, reverse, bluewarp, dungeon scene, boss scene + { DEKU_TREE_ENTRANCE, ENTR_KOKIRI_FOREST_1, ENTR_DEKU_TREE_BOSS_0, ENTR_DEKU_TREE_1, ENTR_KOKIRI_FOREST_11, SCENE_DEKU_TREE, SCENE_DEKU_TREE_BOSS }, + { DODONGOS_CAVERN_ENTRANCE, ENTR_DEATH_MOUNTAIN_TRAIL_3, ENTR_DODONGOS_CAVERN_BOSS_0, ENTR_DODONGOS_CAVERN_1, ENTR_DEATH_MOUNTAIN_TRAIL_5, SCENE_DODONGOS_CAVERN, SCENE_DODONGOS_CAVERN_BOSS }, + { JABU_JABUS_BELLY_ENTRANCE, ENTR_ZORAS_FOUNTAIN_1, ENTR_JABU_JABU_BOSS_0, ENTR_JABU_JABU_1, ENTR_ZORAS_FOUNTAIN_0, SCENE_JABU_JABU, SCENE_JABU_JABU_BOSS }, + { FOREST_TEMPLE_ENTRANCE, ENTR_SACRED_FOREST_MEADOW_1, ENTR_FOREST_TEMPLE_BOSS_0, ENTR_FOREST_TEMPLE_1, ENTR_SACRED_FOREST_MEADOW_3, SCENE_FOREST_TEMPLE, SCENE_FOREST_TEMPLE_BOSS }, + { FIRE_TEMPLE_ENTRANCE, ENTR_DEATH_MOUNTAIN_CRATER_2, ENTR_FIRE_TEMPLE_BOSS_0, ENTR_FIRE_TEMPLE_1, ENTR_DEATH_MOUNTAIN_CRATER_5, SCENE_FIRE_TEMPLE, SCENE_FIRE_TEMPLE_BOSS }, + { WATER_TEMPLE_ENTRANCE, ENTR_LAKE_HYLIA_2, ENTR_WATER_TEMPLE_BOSS_0, ENTR_WATER_TEMPLE_1, ENTR_LAKE_HYLIA_9, SCENE_WATER_TEMPLE, SCENE_WATER_TEMPLE_BOSS }, + { SPIRIT_TEMPLE_ENTRANCE, ENTR_DESERT_COLOSSUS_1, ENTR_SPIRIT_TEMPLE_BOSS_0, ENTR_SPIRIT_TEMPLE_1, ENTR_DESERT_COLOSSUS_8, SCENE_SPIRIT_TEMPLE, SCENE_SPIRIT_TEMPLE_BOSS }, + { SHADOW_TEMPLE_ENTRANCE, ENTR_GRAVEYARD_1, ENTR_SHADOW_TEMPLE_BOSS_0, ENTR_SHADOW_TEMPLE_1, ENTR_GRAVEYARD_8, SCENE_SHADOW_TEMPLE, SCENE_SHADOW_TEMPLE_BOSS }, }; //These variables store the new entrance indices for dungeons so that @@ -77,7 +91,7 @@ static s16 newIceCavernEntrance = ICE_CAVERN_ENTRANCE; static s8 hasCopiedEntranceTable = 0; static s8 hasModifiedEntranceTable = 0; -void Entrance_SetEntranceDiscovered(u16 entranceIndex); +void Entrance_SetEntranceDiscovered(u16 entranceIndex, u8 isReversedEntrance); u8 Entrance_EntranceIsNull(EntranceOverride* entranceOverride) { return entranceOverride->index == 0 && entranceOverride->destination == 0 && entranceOverride->blueWarp == 0 @@ -85,18 +99,18 @@ u8 Entrance_EntranceIsNull(EntranceOverride* entranceOverride) { } static void Entrance_SeparateOGCFairyFountainExit(void) { - //Overwrite unused entrance 0x03E8 with values from 0x0340 to use it as the + //Overwrite unused entrance 0x03E8 (ENTR_POTION_SHOP_KAKARIKO_1) with values from 0x0340 (ENTR_HYRULE_CASTLE_2) to use it as the //exit from OGC Great Fairy Fountain -> Castle Grounds for (size_t i = 0; i < 4; ++i) { - gEntranceTable[0x3E8 + i] = gEntranceTable[0x340 + i]; + gEntranceTable[ENTR_POTION_SHOP_KAKARIKO_1 + i] = gEntranceTable[ENTR_HYRULE_CASTLE_2 + i]; } } static void Entrance_SeparateAdultSpawnAndPrelude() { - // Overwrite unused entrance 0x0282 with values from 0x05F4 to use it as the + // Overwrite unused entrance 0x0282 (ENTR_HYRULE_FIELD_10) with values from 0x05F4 (ENTR_TEMPLE_OF_TIME_7) to use it as the // Adult Spawn index and separate it from Prelude of Light for (size_t i = 0; i < 4; ++i) { - gEntranceTable[0x282 + i] = gEntranceTable[0x5F4 + i]; + gEntranceTable[ENTR_HYRULE_FIELD_10 + i] = gEntranceTable[ENTR_TEMPLE_OF_TIME_7 + i]; } } @@ -125,14 +139,14 @@ void Entrance_Init(void) { // Skip Child Stealth if given by settings if (Randomizer_GetSettingValue(RSK_SKIP_CHILD_STEALTH)) { - gEntranceTable[0x07A].scene = 0x4A; - gEntranceTable[0x07A].spawn = 0x00; - gEntranceTable[0x07A].field = 0x0183; + gEntranceTable[ENTR_CASTLE_COURTYARD_GUARDS_DAY_0].scene = SCENE_CASTLE_COURTYARD_ZELDA; + gEntranceTable[ENTR_CASTLE_COURTYARD_GUARDS_DAY_0].spawn = 0; + gEntranceTable[ENTR_CASTLE_COURTYARD_GUARDS_DAY_0].field = ENTRANCE_INFO_FIELD(false, false, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE); } // Delete the title card and add a fade in for Hyrule Field from Ocarina of Time cutscene - for (index = 0x50F; index < 0x513; ++index) { - gEntranceTable[index].field = 0x010B; + for (index = ENTR_HYRULE_FIELD_16; index <= ENTR_HYRULE_FIELD_16_3; ++index) { + gEntranceTable[index].field = ENTRANCE_INFO_FIELD(false, false, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_INSTANT); } Entrance_SeparateOGCFairyFountainExit(); @@ -208,10 +222,10 @@ void Entrance_Init(void) { } //Override both land and water entrances for Hyrule Field -> ZR Front and vice versa - if (originalIndex == 0x00EA) { //Hyrule Field -> ZR Front land entrance - entranceOverrideTable[0x01D9] = overrideIndex; - } else if (originalIndex == 0x0181) { //ZR Front -> Hyrule Field land entrance - entranceOverrideTable[0x0311] = overrideIndex; + if (originalIndex == ENTR_ZORAS_RIVER_0) { //Hyrule Field -> ZR Front land entrance + entranceOverrideTable[ENTR_ZORAS_RIVER_3] = overrideIndex; + } else if (originalIndex == ENTR_HYRULE_FIELD_2) { //ZR Front -> Hyrule Field land entrance + entranceOverrideTable[ENTR_HYRULE_FIELD_14] = overrideIndex; } } @@ -230,11 +244,11 @@ void Entrance_Init(void) { s16 indicesToSilenceBackgroundMusic[2] = { // The lost woods music playing near the GC Woods Warp keeps playing // in the next area if the bvackground music is allowed to keep playing - entranceOverrideTable[0x04D6], // Goron City -> Lost Woods override + entranceOverrideTable[ENTR_LOST_WOODS_6], // Goron City -> Lost Woods override // If Malon is singing at night, then her singing will be transferred // to the next area if it allows the background music to keep playing - entranceOverrideTable[0x025A], // Castle Grounds -> Market override + entranceOverrideTable[ENTR_MARKET_DAY_1], // Castle Grounds -> Market override }; for (size_t j = 0; j < sizeof(indicesToSilenceBackgroundMusic) / sizeof(s16); j++) { @@ -243,7 +257,7 @@ void Entrance_Init(void) { for (s16 i = 0; i < 4; i++) { // Zero out the bit in the field which tells the game to keep playing // background music for all four scene setups at each index - gEntranceTable[override + i].field &= ~0x8000; + gEntranceTable[override + i].field &= ~ENTRANCE_INFO_CONTINUE_BGM_FLAG; } } } @@ -265,7 +279,7 @@ s16 Entrance_GetOverride(s16 index) { s16 Entrance_OverrideNextIndex(s16 nextEntranceIndex) { // When entering Spirit Temple, clear temp flags so they don't carry over to the randomized dungeon - if (nextEntranceIndex == 0x0082 && Entrance_GetOverride(nextEntranceIndex) != nextEntranceIndex && + if (nextEntranceIndex == ENTR_SPIRIT_TEMPLE_0 && Entrance_GetOverride(nextEntranceIndex) != nextEntranceIndex && gPlayState != NULL) { gPlayState->actorCtx.flags.tempSwch = 0; gPlayState->actorCtx.flags.tempCollect = 0; @@ -274,40 +288,40 @@ s16 Entrance_OverrideNextIndex(s16 nextEntranceIndex) { // Exiting through the crawl space from Hyrule Castle courtyard is the same exit as leaving Ganon's castle // Don't override the entrance if we came from the Castle courtyard (day and night scenes) if (gPlayState != NULL && (gPlayState->sceneNum == SCENE_CASTLE_COURTYARD_GUARDS_DAY || gPlayState->sceneNum == SCENE_CASTLE_COURTYARD_GUARDS_NIGHT) && - nextEntranceIndex == 0x023D) { + nextEntranceIndex == ENTR_HYRULE_CASTLE_1) { return nextEntranceIndex; } - Entrance_SetEntranceDiscovered(nextEntranceIndex); + Entrance_SetEntranceDiscovered(nextEntranceIndex, false); EntranceTracker_SetLastEntranceOverride(nextEntranceIndex); return Grotto_OverrideSpecialEntrance(Entrance_GetOverride(nextEntranceIndex)); } s16 Entrance_OverrideDynamicExit(s16 dynamicExitIndex) { - Entrance_SetEntranceDiscovered(dynamicExitList[dynamicExitIndex]); + Entrance_SetEntranceDiscovered(dynamicExitList[dynamicExitIndex], false); EntranceTracker_SetLastEntranceOverride(dynamicExitList[dynamicExitIndex]); return Grotto_OverrideSpecialEntrance(Entrance_GetOverride(dynamicExitList[dynamicExitIndex])); } u32 Entrance_SceneAndSpawnAre(u8 scene, u8 spawn) { - s16 computedEntranceIndex; + s16 entranceIndex; // Adjust the entrance to account for the exact scene/spawn combination for child/adult and day/night if (!IS_DAY) { if (!LINK_IS_ADULT) { - computedEntranceIndex = gSaveContext.entranceIndex + 1; + entranceIndex = gSaveContext.entranceIndex + 1; } else { - computedEntranceIndex = gSaveContext.entranceIndex + 3; + entranceIndex = gSaveContext.entranceIndex + 3; } } else { if (!LINK_IS_ADULT) { - computedEntranceIndex = gSaveContext.entranceIndex; + entranceIndex = gSaveContext.entranceIndex; } else { - computedEntranceIndex = gSaveContext.entranceIndex + 2; + entranceIndex = gSaveContext.entranceIndex + 2; } } - EntranceInfo currentEntrance = gEntranceTable[computedEntranceIndex]; + EntranceInfo currentEntrance = gEntranceTable[entranceIndex]; return currentEntrance.scene == scene && currentEntrance.spawn == spawn; } @@ -327,32 +341,32 @@ void Entrance_SetGameOverEntrance(void) { //Set the current entrance depending on which entrance the player last came through switch (gSaveContext.entranceIndex) { - case 0x040F : //Deku Tree Boss Room + case ENTR_DEKU_TREE_BOSS_0 : //Deku Tree Boss Room gSaveContext.entranceIndex = newDekuTreeEntrance; return; - case 0x040B : //Dodongos Cavern Boss Room + case ENTR_DODONGOS_CAVERN_BOSS_0 : //Dodongos Cavern Boss Room gSaveContext.entranceIndex = newDodongosCavernEntrance; return; - case 0x0301 : //Jabu Jabus Belly Boss Room + case ENTR_JABU_JABU_BOSS_0 : //Jabu Jabus Belly Boss Room gSaveContext.entranceIndex = newJabuJabusBellyEntrance; return; - case 0x000C : //Forest Temple Boss Room + case ENTR_FOREST_TEMPLE_BOSS_0 : //Forest Temple Boss Room gSaveContext.entranceIndex = newForestTempleEntrance; return; - case 0x0305 : //Fire Temple Boss Room + case ENTR_FIRE_TEMPLE_BOSS_0 : //Fire Temple Boss Room gSaveContext.entranceIndex = newFireTempleEntrance; return; - case 0x0417 : //Water Temple Boss Room + case ENTR_WATER_TEMPLE_BOSS_0 : //Water Temple Boss Room gSaveContext.entranceIndex = newWaterTempleEntrance; return; - case 0x008D : //Spirit Temple Boss Room + case ENTR_SPIRIT_TEMPLE_BOSS_0 : //Spirit Temple Boss Room gSaveContext.entranceIndex = newSpiritTempleEntrance; return; - case 0x0413 : //Shadow Temple Boss Room + case ENTR_SHADOW_TEMPLE_BOSS_0 : //Shadow Temple Boss Room gSaveContext.entranceIndex = newShadowTempleEntrance; return; - case 0x041F : //Ganondorf Boss Room - gSaveContext.entranceIndex = 0x041B; // Inside Ganon's Castle -> Ganon's Tower Climb + case ENTR_GANONDORF_BOSS_0 : //Ganondorf Boss Room + gSaveContext.entranceIndex = ENTR_GANONS_TOWER_0; // Inside Ganon's Castle -> Ganon's Tower Climb return; } } @@ -395,42 +409,42 @@ void Entrance_SetSavewarpEntrance(void) { } else if (scene == SCENE_INSIDE_GANONS_CASTLE) { gSaveContext.entranceIndex = GANONS_CASTLE_ENTRANCE; } else if (scene == SCENE_GANONS_TOWER || scene == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE || scene == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR || scene == SCENE_GANON_BOSS || scene == SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR) { - gSaveContext.entranceIndex = 0x041B; // Inside Ganon's Castle -> Ganon's Tower Climb + gSaveContext.entranceIndex = ENTR_GANONS_TOWER_0; // Inside Ganon's Castle -> Ganon's Tower Climb } else if (scene == SCENE_THIEVES_HIDEOUT) { // Theives hideout - gSaveContext.entranceIndex = 0x0486; // Gerudo Fortress -> Thieve's Hideout spawn 0 + gSaveContext.entranceIndex = ENTR_THIEVES_HIDEOUT_0; // Gerudo Fortress -> Thieve's Hideout spawn 0 } else if (scene == SCENE_LINKS_HOUSE) { gSaveContext.entranceIndex = Entrance_OverrideNextIndex(LINK_HOUSE_SAVEWARP_ENTRANCE); } else if (LINK_IS_CHILD) { gSaveContext.entranceIndex = Entrance_OverrideNextIndex(LINK_HOUSE_SAVEWARP_ENTRANCE); // Child Overworld Spawn } else { - gSaveContext.entranceIndex = Entrance_OverrideNextIndex(0x0282); // Adult Overworld Spawn (Normally 0x5F4, but 0x282 has been repurposed to differentiate from Prelude which also uses 0x5F4) + gSaveContext.entranceIndex = Entrance_OverrideNextIndex(ENTR_HYRULE_FIELD_10); // Adult Overworld Spawn (Normally 0x5F4 (ENTR_TEMPLE_OF_TIME_7), but 0x282 (ENTR_HYRULE_FIELD_10) has been repurposed to differentiate from Prelude which also uses 0x5F4) } } void Entrance_SetWarpSongEntrance(void) { - gPlayState->sceneLoadFlag = 0x14; - gPlayState->fadeTransition = 5; + gPlayState->transitionTrigger = TRANS_TRIGGER_START; + gPlayState->transitionType = TRANS_TYPE_FADE_WHITE_FAST; switch (gPlayState->msgCtx.lastPlayedSong) { - case 0: - gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(0x0600); // Minuet + case OCARINA_SONG_MINUET: + gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_SACRED_FOREST_MEADOW_2); // Minuet break; - case 1: - gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(0x04F6); // Bolero + case OCARINA_SONG_BOLERO: + gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_DEATH_MOUNTAIN_CRATER_4); // Bolero break; - case 2: - gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(0x0604); // Serenade + case OCARINA_SONG_SERENADE: + gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_LAKE_HYLIA_8); // Serenade break; - case 3: - gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(0x01F1); // Requiem + case OCARINA_SONG_REQUIEM: + gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_DESERT_COLOSSUS_5); // Requiem break; - case 4: - gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(0x0568); // Nocturne + case OCARINA_SONG_NOCTURNE: + gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_GRAVEYARD_7); // Nocturne break; - case 5: - gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(0x05F4); // Prelude + case OCARINA_SONG_PRELUDE: + gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_TEMPLE_OF_TIME_7); // Prelude break; default: - gPlayState->sceneLoadFlag = 0; // if something goes wrong, the animation plays normally + gPlayState->transitionTrigger = TRANS_TRIGGER_OFF; // if something goes wrong, the animation plays normally } // If one of the warp songs happens to lead to a grotto return, then we @@ -453,28 +467,28 @@ void Entrance_OverrideBlueWarp(void) { switch (gPlayState->sceneNum) { case SCENE_DEKU_TREE_BOSS: // Ghoma boss room - gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(0x0457); + gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_KOKIRI_FOREST_11); return; case SCENE_DODONGOS_CAVERN_BOSS: // King Dodongo boss room - gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(0x047A); + gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_DEATH_MOUNTAIN_TRAIL_5); return; case SCENE_JABU_JABU_BOSS: // Barinade boss room - gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(0x010E); + gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_ZORAS_FOUNTAIN_0); return; case SCENE_FOREST_TEMPLE_BOSS: // Phantom Ganon boss room - gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(0x0608); + gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_SACRED_FOREST_MEADOW_3); return; case SCENE_FIRE_TEMPLE_BOSS: // Volvagia boss room - gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(0x0564); + gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_DEATH_MOUNTAIN_CRATER_5); return; case SCENE_WATER_TEMPLE_BOSS: // Morpha boss room - gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(0x060C); + gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_LAKE_HYLIA_9); return; case SCENE_SPIRIT_TEMPLE_BOSS: // Twinrova boss room - gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(0x0610); + gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_DESERT_COLOSSUS_8); return; case SCENE_SHADOW_TEMPLE_BOSS: // Bongo-Bongo boss room - gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(0x0580); + gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_GRAVEYARD_8); return; } } @@ -483,8 +497,8 @@ void Entrance_OverrideCutsceneEntrance(u16 cutsceneCmd) { switch (cutsceneCmd) { case 24: // Dropping a fish for Jabu Jabu gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(newJabuJabusBellyEntrance); - gPlayState->sceneLoadFlag = 0x14; - gPlayState->fadeTransition = 2; + gPlayState->transitionTrigger = TRANS_TRIGGER_START; + gPlayState->transitionType = TRANS_TYPE_FADE_BLACK; // In case Jabu's mouth leads to a grotto return Grotto_ForceGrottoReturnOnSpecialEntrance(); break; @@ -496,9 +510,10 @@ void Entrance_EnableFW(void) { // Leave restriction in Tower Collapse Interior, Castle Collapse, Treasure Box Shop, Tower Collapse Exterior, // Grottos area, Fishing Pond, Ganon Battle and for states that disable buttons. if (!false /* farores wind anywhere */ || - gPlayState->sceneNum == 14 || gPlayState->sceneNum == 15 || (gPlayState->sceneNum == 16 && !false /* shuffled chest mini game */) || - gPlayState->sceneNum == 26 || gPlayState->sceneNum == 62 || gPlayState->sceneNum == 73 || - gPlayState->sceneNum == 79 || + gPlayState->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR || gPlayState->sceneNum == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE || + (gPlayState->sceneNum == SCENE_TREASURE_BOX_SHOP && !false /* shuffled chest mini game */) || + gPlayState->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR || gPlayState->sceneNum == SCENE_GROTTOS || + gPlayState->sceneNum == SCENE_FISHING_POND || gPlayState->sceneNum == SCENE_GANON_BOSS || gSaveContext.eventInf[0] & 0x1 || // Ingo's Minigame state player->stateFlags1 & 0x08A02000 || // Swimming, riding horse, Down A, hanging from a ledge player->stateFlags2 & 0x00040000 // Blank A @@ -507,8 +522,8 @@ void Entrance_EnableFW(void) { return; } - for (int i = 1; i < 5; i++) { - if (gSaveContext.equips.buttonItems[i] == 13) { + for (size_t i = 1; i < ARRAY_COUNT(gSaveContext.equips.buttonItems); i++) { + if (gSaveContext.equips.buttonItems[i] == ITEM_FARORES_WIND) { gSaveContext.buttonStatus[i] = BTN_ENABLED; } } @@ -522,38 +537,38 @@ void Entrance_HandleEponaState(void) { //unset the Epona flag to avoid Master glitch, and restore temp B. if (Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_ENTRANCES) && (player->stateFlags1 & PLAYER_STATE1_ON_HORSE)) { // Allow Master glitch to be performed on the Thieves Hideout entrance - if (entrance == Entrance_GetOverride(0x0496)) { // Gerudo Fortress -> Theives Hideout + if (entrance == Entrance_GetOverride(ENTR_THIEVES_HIDEOUT_4)) { // Gerudo Fortress -> Theives Hideout return; } static const s16 validEponaEntrances[] = { - 0x0102, // Hyrule Field -> Lake Hylia - 0x0189, // Lake Hylia -> Hyrule Field - 0x0309, // LH Fishing Hole -> LH Fishing Island - 0x03CC, // LH Lab -> Lake Hylia - 0x0117, // Hyrule Field -> Gerudo Valley - 0x018D, // Gerudo Valley -> Hyrule Field - 0x0157, // Hyrule Field -> Lon Lon Ranch - 0x01F9, // Lon Lon Ranch -> Hyrule Field - 0x01FD, // Market Entrance -> Hyrule Field - 0x0181, // ZR Front -> Hyrule Field - 0x0185, // LW Bridge -> Hyrule Field - 0x0129, // GV Fortress Side -> Gerudo Fortress - 0x022D, // Gerudo Fortress -> GV Fortress Side - 0x03D0, // GV Carpenter Tent -> GV Fortress Side - 0x042F, // LLR Stables -> Lon Lon Ranch - 0x05D4, // LLR Tower -> Lon Lon Ranch - 0x0378, // LLR Talons House -> Lon Lon Ranch - 0x028A, // LLR Southern Fence Jump - 0x028E, // LLR Western Fence Jump - 0x0292, // LLR Eastern Fence Jump - 0x0476, // LLR Front Gate Jump + ENTR_LAKE_HYLIA_0, // Hyrule Field -> Lake Hylia + ENTR_HYRULE_FIELD_4, // Lake Hylia -> Hyrule Field + ENTR_LAKE_HYLIA_6, // LH Fishing Hole -> LH Fishing Island + ENTR_LAKE_HYLIA_4, // LH Lab -> Lake Hylia + ENTR_GERUDO_VALLEY_0, // Hyrule Field -> Gerudo Valley + ENTR_HYRULE_FIELD_5, // Gerudo Valley -> Hyrule Field + ENTR_LON_LON_RANCH_0, // Hyrule Field -> Lon Lon Ranch + ENTR_HYRULE_FIELD_6, // Lon Lon Ranch -> Hyrule Field + ENTR_HYRULE_FIELD_7, // Market Entrance -> Hyrule Field + ENTR_HYRULE_FIELD_2, // ZR Front -> Hyrule Field + ENTR_HYRULE_FIELD_3, // LW Bridge -> Hyrule Field + ENTR_GERUDOS_FORTRESS_0, // GV Fortress Side -> Gerudo Fortress + ENTR_GERUDO_VALLEY_3, // Gerudo Fortress -> GV Fortress Side + ENTR_GERUDO_VALLEY_4, // GV Carpenter Tent -> GV Fortress Side + ENTR_LON_LON_RANCH_5, // LLR Stables -> Lon Lon Ranch + ENTR_LON_LON_RANCH_10, // LLR Tower -> Lon Lon Ranch + ENTR_LON_LON_RANCH_4, // LLR Talons House -> Lon Lon Ranch + ENTR_HYRULE_FIELD_11, // LLR Southern Fence Jump + ENTR_HYRULE_FIELD_12, // LLR Western Fence Jump + ENTR_HYRULE_FIELD_13, // LLR Eastern Fence Jump + ENTR_HYRULE_FIELD_15, // LLR Front Gate Jump // The following indices currently aren't randomized, but we'll list // them in case they ever are. They're all Theives Hideout -> Gerudo Fortress - 0x231, - 0x235, - 0x239, - 0x2BA, + ENTR_GERUDOS_FORTRESS_1, + ENTR_GERUDOS_FORTRESS_2, + ENTR_GERUDOS_FORTRESS_3, + ENTR_GERUDOS_FORTRESS_5, }; for (size_t i = 0; i < ARRAY_COUNT(validEponaEntrances); i++) { // If the entrance is equal to any of the valid ones, return and @@ -585,15 +600,15 @@ void Entrance_OverrideWeatherState() { } // Hyrule Market - if (gSaveContext.entranceIndex == 0x01FD) { // Hyrule Field by Market Entrance + if (gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_7) { // Hyrule Field by Market Entrance gWeatherMode = 1; return; } // Lon Lon Ranch (No Epona) if (!Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED)){ // if you don't have Epona switch (gSaveContext.entranceIndex) { - case 0x0157: // Lon Lon Ranch from HF - case 0x01F9: // Hyrule Field from LLR + case ENTR_LON_LON_RANCH_0: // Lon Lon Ranch from HF + case ENTR_HYRULE_FIELD_6: // Hyrule Field from LLR gWeatherMode = 2; return; } @@ -601,15 +616,15 @@ void Entrance_OverrideWeatherState() { // Water Temple if (!Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP)) { // have not beaten Water Temple switch (gSaveContext.entranceIndex) { - case 0x019D: // Zora River from behind waterfall - case 0x01DD: // Zora River from LW water shortcut - case 0x04DA: // Lost Woods water shortcut from ZR + case ENTR_ZORAS_RIVER_2: // Zora River from behind waterfall + case ENTR_ZORAS_RIVER_4: // Zora River from LW water shortcut + case ENTR_LOST_WOODS_7: // Lost Woods water shortcut from ZR gWeatherMode = 3; return; } switch (gPlayState->sceneNum) { - case 88: // Zora's Domain - case 89: // Zora's Fountain + case SCENE_ZORAS_DOMAIN: // Zora's Domain + case SCENE_ZORAS_FOUNTAIN: // Zora's Fountain gWeatherMode = 3; return; } @@ -618,13 +633,13 @@ void Entrance_OverrideWeatherState() { if (((gSaveContext.inventory.questItems & 0x7) == 0x7) && // Have forest, fire, and water medallion !(gSaveContext.sceneFlags[24].clear & 0x02)) { // have not beaten Bongo Bongo switch (gPlayState->sceneNum) { - case 82: // Kakariko - case 83: // Graveyard + case SCENE_KAKARIKO_VILLAGE: // Kakariko + case SCENE_GRAVEYARD: // Graveyard gPlayState->envCtx.gloomySkyMode = 2; switch (gSaveContext.entranceIndex) { - case 0x00DB: // Kakariko from HF - case 0x0191: // Kakariko from Death Mountain Trail - case 0x0205: // Graveyard from Shadow Temple + case ENTR_KAKARIKO_VILLAGE_0: // Kakariko from HF + case ENTR_KAKARIKO_VILLAGE_1: // Kakariko from Death Mountain Trail + case ENTR_GRAVEYARD_1: // Graveyard from Shadow Temple break; default: gWeatherMode = 5; @@ -634,21 +649,21 @@ void Entrance_OverrideWeatherState() { } // Death Mountain Cloudy if (!Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP)) { // have not beaten Fire Temple - if (gPlayState->nextEntranceIndex == 0x04D6) { // Lost Woods Goron City Shortcut + if (gPlayState->nextEntranceIndex == ENTR_LOST_WOODS_6) { // Lost Woods Goron City Shortcut gWeatherMode = 2; return; } switch (gPlayState->sceneNum) { - case 82: // Kakariko - case 83: // Graveyard - case 96: // Death Mountain Trail - case 97: // Death Mountain Crater + case SCENE_KAKARIKO_VILLAGE: // Kakariko + case SCENE_GRAVEYARD: // Graveyard + case SCENE_DEATH_MOUNTAIN_TRAIL: // Death Mountain Trail + case SCENE_DEATH_MOUNTAIN_CRATER: // Death Mountain Crater if (!gPlayState->envCtx.gloomySkyMode) { gPlayState->envCtx.gloomySkyMode = 1; } switch (gSaveContext.entranceIndex) { - case 0x00DB: // Kakariko from HF - case 0x0195: // Kakariko from Graveyard + case ENTR_KAKARIKO_VILLAGE_0: // Kakariko from HF + case ENTR_KAKARIKO_VILLAGE_2: // Kakariko from Graveyard break; default: gWeatherMode = 2; @@ -663,13 +678,13 @@ void Entrance_OverrideWeatherState() { // Child should always be thrown in the stream when caught in the valley, and placed at the fortress entrance from valley when caught in the fortress void Entrance_OverrideGeurdoGuardCapture(void) { if (LINK_IS_CHILD) { - gPlayState->nextEntranceIndex = 0x1A5; // Geurdo Valley thrown out + gPlayState->nextEntranceIndex = ENTR_GERUDO_VALLEY_1; // Geurdo Valley thrown out } if ((LINK_IS_CHILD || Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_ENTRANCES)) && - gPlayState->nextEntranceIndex == 0x1A5) { // Geurdo Valley thrown out - if (gPlayState->sceneNum != 0x5A) { // Geurdo Valley - gPlayState->nextEntranceIndex = 0x129; // Gerudo Fortress + gPlayState->nextEntranceIndex == ENTR_GERUDO_VALLEY_1) { // Geurdo Valley thrown out + if (gPlayState->sceneNum != SCENE_GERUDO_VALLEY) { // Geurdo Valley + gPlayState->nextEntranceIndex = ENTR_GERUDOS_FORTRESS_0; // Gerudo Fortress } } } @@ -786,7 +801,7 @@ u8 Entrance_GetIsEntranceDiscovered(u16 entranceIndex) { return 0; } -void Entrance_SetEntranceDiscovered(u16 entranceIndex) { +void Entrance_SetEntranceDiscovered(u16 entranceIndex, u8 isReversedEntrance) { EntranceOverride* entranceOverrides = Randomizer_GetEntranceOverrides(); // Skip if already set to save time from setting the connected entrance or // if this entrance is outside of the randomized entrance range (i.e. is a dynamic entrance) @@ -799,14 +814,20 @@ void Entrance_SetEntranceDiscovered(u16 entranceIndex) { if (idx < SAVEFILE_ENTRANCES_DISCOVERED_IDX_COUNT) { u32 entranceBit = 1 << (entranceIndex - (idx * bitsPerIndex)); gSaveContext.sohStats.entrancesDiscovered[idx] |= entranceBit; - // Set connected - for (size_t i = 0; i < ENTRANCE_OVERRIDES_MAX_COUNT; i++) { - if (entranceIndex == entranceOverrides[i].index) { - Entrance_SetEntranceDiscovered(entranceOverrides[i].overrideDestination); - break; + + // Set reverse entrance when not decoupled + if (!Randomizer_GetSettingValue(RSK_DECOUPLED_ENTRANCES) && !isReversedEntrance) { + for (size_t i = 0; i < ENTRANCE_OVERRIDES_MAX_COUNT; i++) { + if (entranceIndex == entranceOverrides[i].index) { + Entrance_SetEntranceDiscovered(entranceOverrides[i].overrideDestination, true); + break; + } } } } - // Save entrancesDiscovered - Save_SaveSection(SECTION_ID_ENTRANCES); + + // Save entrancesDiscovered when it is not the reversed entrance + if (!isReversedEntrance) { + Save_SaveSection(SECTION_ID_ENTRANCES); + } } diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance.h b/soh/soh/Enhancements/randomizer/randomizer_entrance.h index c00f29701..10a485a94 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_entrance.h +++ b/soh/soh/Enhancements/randomizer/randomizer_entrance.h @@ -6,32 +6,78 @@ //Entrance Table Data: https://wiki.cloudmodding.com/oot/Entrance_Table_(Data) //Accessed June 2021, published content date at the time was 14 March 2020, at 21:47 -#define ENTRANCE_TABLE_SIZE 0x0614 +#define ENTRANCE_TABLE_SIZE ENTR_MAX -#define DEKU_TREE_ENTRANCE 0x0000 -#define DODONGOS_CAVERN_ENTRANCE 0x0004 -#define JABU_JABUS_BELLY_ENTRANCE 0x0028 -#define FOREST_TEMPLE_ENTRANCE 0x169 -#define FIRE_TEMPLE_ENTRANCE 0x165 -#define WATER_TEMPLE_ENTRANCE 0x0010 -#define SPIRIT_TEMPLE_ENTRANCE 0x0082 -#define SHADOW_TEMPLE_ENTRANCE 0x0037 -#define BOTTOM_OF_THE_WELL_ENTRANCE 0x0098 -#define GERUDO_TRAINING_GROUNDS_ENTRANCE 0x0008 -#define ICE_CAVERN_ENTRANCE 0x0088 -#define GANONS_CASTLE_ENTRANCE 0x0467 -#define LINK_HOUSE_SAVEWARP_ENTRANCE 0x00BB +#define DEKU_TREE_ENTRANCE ENTR_DEKU_TREE_0 +#define DODONGOS_CAVERN_ENTRANCE ENTR_DODONGOS_CAVERN_0 +#define JABU_JABUS_BELLY_ENTRANCE ENTR_JABU_JABU_0 +#define FOREST_TEMPLE_ENTRANCE ENTR_FOREST_TEMPLE_0 +#define FIRE_TEMPLE_ENTRANCE ENTR_FIRE_TEMPLE_0 +#define WATER_TEMPLE_ENTRANCE ENTR_WATER_TEMPLE_0 +#define SPIRIT_TEMPLE_ENTRANCE ENTR_SPIRIT_TEMPLE_0 +#define SHADOW_TEMPLE_ENTRANCE ENTR_SHADOW_TEMPLE_0 +#define BOTTOM_OF_THE_WELL_ENTRANCE ENTR_BOTTOM_OF_THE_WELL_0 +#define GERUDO_TRAINING_GROUNDS_ENTRANCE ENTR_GERUDO_TRAINING_GROUND_0 +#define ICE_CAVERN_ENTRANCE ENTR_ICE_CAVERN_0 +#define GANONS_CASTLE_ENTRANCE ENTR_INSIDE_GANONS_CASTLE_0 +#define LINK_HOUSE_SAVEWARP_ENTRANCE ENTR_LINKS_HOUSE_0 #define ENTRANCE_RANDO_GROTTO_LOAD_START 0x0700 #define ENTRANCE_RANDO_GROTTO_EXIT_START 0x0800 #define MAX_ENTRANCE_RANDO_USED_INDEX 0x0820 +typedef enum { + /* 0x00 */ GROTTO_COLOSSUS_OFFSET, + /* 0x01 */ GROTTO_LH_OFFSET, + /* 0x02 */ GROTTO_ZR_STORMS_OFFSET, + /* 0x03 */ GROTTO_ZR_FAIRY_OFFSET, + /* 0x04 */ GROTTO_ZR_OPEN_OFFSET, + /* 0x05 */ GROTTO_DMC_HAMMER_OFFSET, + /* 0x06 */ GROTTO_DMC_UPPER_OFFSET, + /* 0x07 */ GROTTO_GORON_CITY_OFFSET, + /* 0x08 */ GROTTO_DMT_STORMS_OFFSET, + /* 0x09 */ GROTTO_DMT_COW_OFFSET, + /* 0x0A */ GROTTO_KAK_OPEN_OFFSET, + /* 0x0B */ GROTTO_KAK_REDEAD_OFFSET, + /* 0x0C */ GROTTO_HC_STORMS_OFFSET, + /* 0x0D */ GROTTO_HF_TEKTITE_OFFSET, + /* 0x0E */ GROTTO_HF_NEAR_KAK_OFFSET, + /* 0x0F */ GROTTO_HF_FAIRY_OFFSET, + /* 0x10 */ GROTTO_HF_NEAR_MARKET_OFFSET, + /* 0x11 */ GROTTO_HF_COW_OFFSET, + /* 0x12 */ GROTTO_HF_INSIDE_FENCE_OFFSET, + /* 0x13 */ GROTTO_HF_OPEN_OFFSET, + /* 0x14 */ GROTTO_HF_SOUTHEAST_OFFSET, + /* 0x15 */ GROTTO_LLR_OFFSET, + /* 0x16 */ GROTTO_SFM_WOLFOS_OFFSET, + /* 0x17 */ GROTTO_SFM_STORMS_OFFSET, + /* 0x18 */ GROTTO_SFM_FAIRY_OFFSET, + /* 0x19 */ GROTTO_LW_SCRUBS_OFFSET, + /* 0x1A */ GROTTO_LW_NEAR_SHORTCUTS_OFFSET, + /* 0x1B */ GROTTO_KF_STORMS_OFFSET, + /* 0x1C */ GROTTO_ZD_STORMS_OFFSET, + /* 0x1D */ GROTTO_GF_STORMS_OFFSET, + /* 0x1E */ GROTTO_GV_STORMS_OFFSET, + /* 0x1F */ GROTTO_GV_OCTOROK_OFFSET, + /* 0x20 */ GROTTO_LW_DEKU_THEATRE_OFFSET, + /* 0x21 */ GROTTO_OFFSET_MAX, +} GrottoEntranceOffsets; + +#define ENTRANCE_RANDO_GROTTO_LOAD(index) ENTRANCE_RANDO_GROTTO_LOAD_START + index +#define ENTRANCE_RANDO_GROTTO_EXIT(index) ENTRANCE_RANDO_GROTTO_EXIT_START + index + #define ENTRANCE_OVERRIDES_MAX_COUNT 259 // 11 one-way entrances + 124 two-way entrances (x2) #define SHUFFLEABLE_BOSS_COUNT 8 #define SAVEFILE_ENTRANCES_DISCOVERED_IDX_COUNT 66 // Max entrance rando index is 0x0820, (2080 / 32 == 65) + 1 #define SAVEFILE_SCENES_DISCOVERED_IDX_COUNT 4 // Max scene ID is 0x6E, (110 / 32 == 3) + 1 +#define ENTRANCE_INFO_FIELD(continueBgm, displayTitleCard, endTransType, startTransType) \ + (((continueBgm) ? ENTRANCE_INFO_CONTINUE_BGM_FLAG : 0) | \ + ((displayTitleCard) ? ENTRANCE_INFO_DISPLAY_TITLE_CARD_FLAG : 0) | \ + (((endTransType) << ENTRANCE_INFO_END_TRANS_TYPE_SHIFT) & ENTRANCE_INFO_END_TRANS_TYPE_MASK) | \ + (((startTransType) << ENTRANCE_INFO_START_TRANS_TYPE_SHIFT) & ENTRANCE_INFO_START_TRANS_TYPE_MASK)) + typedef struct { int16_t index; int16_t destination; @@ -63,7 +109,7 @@ void Entrance_OverrideSpawnScene(int32_t sceneNum, int32_t spawn); int32_t Entrance_OverrideSpawnSceneRoom(int32_t sceneNum, int32_t spawn, int32_t room); void Entrance_EnableFW(void); uint8_t Entrance_GetIsEntranceDiscovered(uint16_t entranceIndex); -void Entrance_SetEntranceDiscovered(uint16_t entranceIndex); +void Entrance_SetEntranceDiscovered(uint16_t entranceIndex, uint8_t isReversedEntrance); #ifdef __cplusplus } #endif diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp index dc40b2b1a..2938203ac 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp @@ -68,305 +68,306 @@ static std::string groupTypeNames[] = { }; // Entrance data for the tracker taken from the 3ds rando entrance tracker, and supplemented with scene/spawn info and meta search tags +// ENTR_HYRULE_FIELD_10 and ENTR_POTION_SHOP_KAKARIKO_1 have been repurposed for entrance randomizer const EntranceData entranceData[] = { - //index, reverse, scenes (and spawns), source name, destination name, source group, destination group, type, metaTag, oneExit - { 0x00BB, -1, SINGLE_SCENE_INFO(0x34), "Child Spawn", "Link's House", ENTRANCE_GROUP_ONE_WAY, ENTRANCE_GROUP_ONE_WAY, ENTRANCE_TYPE_ONE_WAY}, - { 0x0282, -1, SINGLE_SCENE_INFO(0x43), "Adult Spawn", "Temple of Time", ENTRANCE_GROUP_ONE_WAY, ENTRANCE_GROUP_ONE_WAY, ENTRANCE_TYPE_ONE_WAY}, + //index, reverse, scenes (and spawns), source name, destination name, source group, destination group, type, metaTag, oneExit + { ENTR_LINKS_HOUSE_0, -1, SINGLE_SCENE_INFO(SCENE_LINKS_HOUSE), "Child Spawn", "Link's House", ENTRANCE_GROUP_ONE_WAY, ENTRANCE_GROUP_ONE_WAY, ENTRANCE_TYPE_ONE_WAY}, + { ENTR_HYRULE_FIELD_10, -1, SINGLE_SCENE_INFO(SCENE_TEMPLE_OF_TIME), "Adult Spawn", "Temple of Time", ENTRANCE_GROUP_ONE_WAY, ENTRANCE_GROUP_ONE_WAY, ENTRANCE_TYPE_ONE_WAY}, - { 0x0600, -1, {{ -1 }}, "Minuet of Forest", "SFM Warp Pad", ENTRANCE_GROUP_ONE_WAY, ENTRANCE_GROUP_ONE_WAY, ENTRANCE_TYPE_ONE_WAY}, - { 0x04F6, -1, {{ -1 }}, "Bolero of Fire", "DMC Warp Pad", ENTRANCE_GROUP_ONE_WAY, ENTRANCE_GROUP_ONE_WAY, ENTRANCE_TYPE_ONE_WAY}, - { 0x0604, -1, {{ -1 }}, "Serenade of Water", "Lake Hylia Warp Pad", ENTRANCE_GROUP_ONE_WAY, ENTRANCE_GROUP_ONE_WAY, ENTRANCE_TYPE_ONE_WAY}, - { 0x01F1, -1, {{ -1 }}, "Requiem of Spirit", "Desert Colossus Warp Pad", ENTRANCE_GROUP_ONE_WAY, ENTRANCE_GROUP_ONE_WAY, ENTRANCE_TYPE_ONE_WAY}, - { 0x0568, -1, {{ -1 }}, "Nocturne of Shadow", "Graveyard Warp Pad", ENTRANCE_GROUP_ONE_WAY, ENTRANCE_GROUP_ONE_WAY, ENTRANCE_TYPE_ONE_WAY}, - { 0x05F4, -1, {{ -1 }}, "Prelude of Light", "Temple of Time Warp Pad", ENTRANCE_GROUP_ONE_WAY, ENTRANCE_GROUP_ONE_WAY, ENTRANCE_TYPE_ONE_WAY}, + { ENTR_SACRED_FOREST_MEADOW_2, -1, {{ -1 }}, "Minuet of Forest", "SFM Warp Pad", ENTRANCE_GROUP_ONE_WAY, ENTRANCE_GROUP_ONE_WAY, ENTRANCE_TYPE_ONE_WAY}, + { ENTR_DEATH_MOUNTAIN_CRATER_4, -1, {{ -1 }}, "Bolero of Fire", "DMC Warp Pad", ENTRANCE_GROUP_ONE_WAY, ENTRANCE_GROUP_ONE_WAY, ENTRANCE_TYPE_ONE_WAY}, + { ENTR_LAKE_HYLIA_8, -1, {{ -1 }}, "Serenade of Water", "Lake Hylia Warp Pad", ENTRANCE_GROUP_ONE_WAY, ENTRANCE_GROUP_ONE_WAY, ENTRANCE_TYPE_ONE_WAY}, + { ENTR_DESERT_COLOSSUS_5, -1, {{ -1 }}, "Requiem of Spirit", "Desert Colossus Warp Pad", ENTRANCE_GROUP_ONE_WAY, ENTRANCE_GROUP_ONE_WAY, ENTRANCE_TYPE_ONE_WAY}, + { ENTR_GRAVEYARD_7, -1, {{ -1 }}, "Nocturne of Shadow", "Graveyard Warp Pad", ENTRANCE_GROUP_ONE_WAY, ENTRANCE_GROUP_ONE_WAY, ENTRANCE_TYPE_ONE_WAY}, + { ENTR_TEMPLE_OF_TIME_7, -1, {{ -1 }}, "Prelude of Light", "Temple of Time Warp Pad", ENTRANCE_GROUP_ONE_WAY, ENTRANCE_GROUP_ONE_WAY, ENTRANCE_TYPE_ONE_WAY}, - { 0x0554, -1, SINGLE_SCENE_INFO(0x60), "DMT Owl Flight", "Kakariko Village Owl Drop", ENTRANCE_GROUP_ONE_WAY, ENTRANCE_GROUP_ONE_WAY, ENTRANCE_TYPE_ONE_WAY}, - { 0x027E, -1, SINGLE_SCENE_INFO(0x57), "LH Owl Flight", "Hyrule Field Owl Drop", ENTRANCE_GROUP_ONE_WAY, ENTRANCE_GROUP_ONE_WAY, ENTRANCE_TYPE_ONE_WAY}, + { ENTR_KAKARIKO_VILLAGE_14, -1, SINGLE_SCENE_INFO(SCENE_DEATH_MOUNTAIN_TRAIL), "DMT Owl Flight", "Kakariko Village Owl Drop", ENTRANCE_GROUP_ONE_WAY, ENTRANCE_GROUP_ONE_WAY, ENTRANCE_TYPE_ONE_WAY}, + { ENTR_HYRULE_FIELD_9, -1, SINGLE_SCENE_INFO(SCENE_LAKE_HYLIA), "LH Owl Flight", "Hyrule Field Owl Drop", ENTRANCE_GROUP_ONE_WAY, ENTRANCE_GROUP_ONE_WAY, ENTRANCE_TYPE_ONE_WAY}, // Kokiri Forest - { 0x05E0, 0x020D, SINGLE_SCENE_INFO(0x55), "KF", "Lost Woods Bridge", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_TYPE_OVERWORLD, "lw"}, - { 0x011E, 0x0286, SINGLE_SCENE_INFO(0x55), "KF", "Lost Woods", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_TYPE_OVERWORLD, "lw"}, - { 0x0272, 0x0211, SINGLE_SCENE_INFO(0x55), "KF", "Link's House", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x0433, 0x0443, SINGLE_SCENE_INFO(0x55), "KF", "Mido's House", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x0437, 0x0447, SINGLE_SCENE_INFO(0x55), "KF", "Saria's House", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x009C, 0x033C, SINGLE_SCENE_INFO(0x55), "KF", "House of Twins", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x00C9, 0x026A, SINGLE_SCENE_INFO(0x55), "KF", "Know-It-All House", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x00C1, 0x0266, SINGLE_SCENE_INFO(0x55), "KF", "KF Shop", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x071B, 0x081B, SINGLE_SCENE_INFO(0x55), "KF", "KF Storms Grotto", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_GROTTO, "chest", 1}, - { 0x0000, 0x0209, SINGLE_SCENE_INFO(0x55), "KF", "Deku Tree", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_DUNGEON, "", 1}, - { 0x0211, 0x0272, SINGLE_SCENE_INFO(0x34), "Link's House", "KF", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_INTERIOR, ""}, - { 0x0443, 0x0433, SINGLE_SCENE_INFO(0x28), "Mido's House", "KF", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_INTERIOR, ""}, - { 0x0447, 0x0437, SINGLE_SCENE_INFO(0x29), "Saria's House", "KF", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_INTERIOR, ""}, - { 0x033C, 0x009C, SINGLE_SCENE_INFO(0x27), "House of Twins", "KF", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_INTERIOR, ""}, - { 0x026A, 0x00C9, SINGLE_SCENE_INFO(0x26), "Know-It-All House", "KF", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_INTERIOR, ""}, - { 0x0266, 0x00C1, SINGLE_SCENE_INFO(0x2D), "KF Shop", "KF", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_INTERIOR, ""}, - { 0x081B, 0x071B, {{ 0x3E, 0x00 }}, "KF Storms Grotto", "KF", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_GROTTO, "chest"}, - { 0x0209, 0x0000, SINGLE_SCENE_INFO(0x00), "Deku Tree", "KF", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_DUNGEON, ""}, - { 0x040F, 0x0252, SINGLE_SCENE_INFO(0x00), "Deku Tree Boss Door", "Gohma", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_DUNGEON, "", 1}, - { 0x0252, 0x040F, SINGLE_SCENE_INFO(0x11), "Gohma", "Deku Tree Boss Door", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_DUNGEON, "", 1}, + { ENTR_LOST_WOODS_9, ENTR_KOKIRI_FOREST_2, SINGLE_SCENE_INFO(SCENE_KOKIRI_FOREST), "KF", "Lost Woods Bridge", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_TYPE_OVERWORLD, "lw"}, + { ENTR_LOST_WOODS_0, ENTR_KOKIRI_FOREST_6, SINGLE_SCENE_INFO(SCENE_KOKIRI_FOREST), "KF", "Lost Woods", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_TYPE_OVERWORLD, "lw"}, + { ENTR_LINKS_HOUSE_1, ENTR_KOKIRI_FOREST_3, SINGLE_SCENE_INFO(SCENE_KOKIRI_FOREST), "KF", "Link's House", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTR_MIDOS_HOUSE_0, ENTR_KOKIRI_FOREST_9, SINGLE_SCENE_INFO(SCENE_KOKIRI_FOREST), "KF", "Mido's House", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTR_SARIAS_HOUSE_0, ENTR_KOKIRI_FOREST_10, SINGLE_SCENE_INFO(SCENE_KOKIRI_FOREST), "KF", "Saria's House", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTR_TWINS_HOUSE_0, ENTR_KOKIRI_FOREST_8, SINGLE_SCENE_INFO(SCENE_KOKIRI_FOREST), "KF", "House of Twins", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTR_KNOW_IT_ALL_BROS_HOUSE_0, ENTR_KOKIRI_FOREST_5, SINGLE_SCENE_INFO(SCENE_KOKIRI_FOREST), "KF", "Know-It-All House", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTR_KOKIRI_SHOP_0, ENTR_KOKIRI_FOREST_4, SINGLE_SCENE_INFO(SCENE_KOKIRI_FOREST), "KF", "KF Shop", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_KF_STORMS_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_KF_STORMS_OFFSET), SINGLE_SCENE_INFO(SCENE_KOKIRI_FOREST), "KF", "KF Storms Grotto", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_GROTTO, "chest", 1}, + { ENTR_DEKU_TREE_0, ENTR_KOKIRI_FOREST_1, SINGLE_SCENE_INFO(SCENE_KOKIRI_FOREST), "KF", "Deku Tree", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_DUNGEON, "", 1}, + { ENTR_KOKIRI_FOREST_3, ENTR_LINKS_HOUSE_1, SINGLE_SCENE_INFO(SCENE_LINKS_HOUSE), "Link's House", "KF", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_INTERIOR, ""}, + { ENTR_KOKIRI_FOREST_9, ENTR_MIDOS_HOUSE_0, SINGLE_SCENE_INFO(SCENE_MIDOS_HOUSE), "Mido's House", "KF", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_INTERIOR, ""}, + { ENTR_KOKIRI_FOREST_10, ENTR_SARIAS_HOUSE_0, SINGLE_SCENE_INFO(SCENE_SARIAS_HOUSE), "Saria's House", "KF", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_INTERIOR, ""}, + { ENTR_KOKIRI_FOREST_8, ENTR_TWINS_HOUSE_0, SINGLE_SCENE_INFO(SCENE_TWINS_HOUSE), "House of Twins", "KF", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_INTERIOR, ""}, + { ENTR_KOKIRI_FOREST_5, ENTR_KNOW_IT_ALL_BROS_HOUSE_0, SINGLE_SCENE_INFO(SCENE_KNOW_IT_ALL_BROS_HOUSE), "Know-It-All House", "KF", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_INTERIOR, ""}, + { ENTR_KOKIRI_FOREST_4, ENTR_KOKIRI_SHOP_0, SINGLE_SCENE_INFO(SCENE_KOKIRI_SHOP), "KF Shop", "KF", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_INTERIOR, ""}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_KF_STORMS_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_KF_STORMS_OFFSET), {{ SCENE_GROTTOS, 0x00 }}, "KF Storms Grotto", "KF", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_GROTTO, "chest"}, + { ENTR_KOKIRI_FOREST_1, ENTR_DEKU_TREE_0, SINGLE_SCENE_INFO(SCENE_DEKU_TREE), "Deku Tree", "KF", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_DUNGEON, ""}, + { ENTR_DEKU_TREE_BOSS_0, ENTR_DEKU_TREE_1, SINGLE_SCENE_INFO(SCENE_DEKU_TREE), "Deku Tree Boss Door", "Gohma", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_DUNGEON, "", 1}, + { ENTR_DEKU_TREE_1, ENTR_DEKU_TREE_BOSS_0, SINGLE_SCENE_INFO(SCENE_DEKU_TREE_BOSS), "Gohma", "Deku Tree Boss Door", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_DUNGEON, "", 1}, // Lost Woods - { 0x020D, 0x05E0, SINGLE_SCENE_INFO(0x5B), "Lost Woods Bridge", "KF", ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_OVERWORLD, "lw"}, - { 0x0185, 0x04DE, SINGLE_SCENE_INFO(0x5B), "Lost Woods Bridge", "Hyrule Field", ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_OVERWORLD, "lw,hf"}, - { 0x0286, 0x011E, SINGLE_SCENE_INFO(0x5B), "Lost Woods", "KF", ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_OVERWORLD, "lw"}, - { 0x04E2, 0x04D6, SINGLE_SCENE_INFO(0x5B), "Lost Woods", "Goron City", ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_GORON_CITY, ENTRANCE_TYPE_OVERWORLD, "lw,gc"}, - { 0x01DD, 0x04DA, SINGLE_SCENE_INFO(0x5B), "Lost Woods", "ZR", ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_TYPE_OVERWORLD, "lw"}, - { 0x00FC, 0x01A9, SINGLE_SCENE_INFO(0x5B), "Lost Woods", "SFM", ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_SFM, ENTRANCE_TYPE_OVERWORLD, "lw"}, - { 0x071A, 0x081A, SINGLE_SCENE_INFO(0x5B), "Lost Woods", "LW Near Shortcuts Grotto", ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_TYPE_GROTTO, "lw,chest", 1}, - { 0x0719, 0x0819, SINGLE_SCENE_INFO(0x5B), "Lost Woods", "LW Scrubs Grotto", ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_TYPE_GROTTO, "lw", 1}, - { 0x0720, 0x0820, SINGLE_SCENE_INFO(0x5B), "Lost Woods", "Deku Theater", ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_TYPE_GROTTO, "lw,mask,stage", 1}, - { 0x081A, 0x071A, {{ 0x3E, 0x00 }}, "LW Near Shortcuts Grotto", "Lost Woods", ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_TYPE_GROTTO, "lw,chest"}, - { 0x0819, 0x0719, {{ 0x3E, 0x07 }}, "LW Scrubs Grotto", "Lost Woods", ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_TYPE_GROTTO, "lw"}, - { 0x0820, 0x0720, {{ 0x3E, 0x0C }}, "Deku Theater", "Lost Woods", ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_TYPE_GROTTO, "lw,mask,stage"}, + { ENTR_KOKIRI_FOREST_2, ENTR_LOST_WOODS_9, SINGLE_SCENE_INFO(SCENE_LOST_WOODS), "Lost Woods Bridge", "KF", ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_OVERWORLD, "lw"}, + { ENTR_HYRULE_FIELD_3, ENTR_LOST_WOODS_8, SINGLE_SCENE_INFO(SCENE_LOST_WOODS), "Lost Woods Bridge", "Hyrule Field", ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_OVERWORLD, "lw,hf"}, + { ENTR_KOKIRI_FOREST_6, ENTR_LOST_WOODS_0, SINGLE_SCENE_INFO(SCENE_LOST_WOODS), "Lost Woods", "KF", ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_OVERWORLD, "lw"}, + { ENTR_GORON_CITY_3, ENTR_LOST_WOODS_6, SINGLE_SCENE_INFO(SCENE_LOST_WOODS), "Lost Woods", "Goron City", ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_GORON_CITY, ENTRANCE_TYPE_OVERWORLD, "lw,gc"}, + { ENTR_ZORAS_RIVER_4, ENTR_LOST_WOODS_7, SINGLE_SCENE_INFO(SCENE_LOST_WOODS), "Lost Woods", "ZR", ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_TYPE_OVERWORLD, "lw"}, + { ENTR_SACRED_FOREST_MEADOW_0, ENTR_LOST_WOODS_1, SINGLE_SCENE_INFO(SCENE_LOST_WOODS), "Lost Woods", "SFM", ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_SFM, ENTRANCE_TYPE_OVERWORLD, "lw"}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_LW_NEAR_SHORTCUTS_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_LW_NEAR_SHORTCUTS_OFFSET), SINGLE_SCENE_INFO(SCENE_LOST_WOODS), "Lost Woods", "LW Near Shortcuts Grotto", ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_TYPE_GROTTO, "lw,chest", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_LW_SCRUBS_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_LW_SCRUBS_OFFSET), SINGLE_SCENE_INFO(SCENE_LOST_WOODS), "Lost Woods", "LW Scrubs Grotto", ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_TYPE_GROTTO, "lw", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_LW_DEKU_THEATRE_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_LW_DEKU_THEATRE_OFFSET), SINGLE_SCENE_INFO(SCENE_LOST_WOODS), "Lost Woods", "Deku Theater", ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_TYPE_GROTTO, "lw,mask,stage", 1}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_LW_NEAR_SHORTCUTS_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_LW_NEAR_SHORTCUTS_OFFSET), {{ SCENE_GROTTOS, 0x00 }}, "LW Near Shortcuts Grotto", "Lost Woods", ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_TYPE_GROTTO, "lw,chest"}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_LW_SCRUBS_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_LW_SCRUBS_OFFSET), {{ SCENE_GROTTOS, 0x07 }}, "LW Scrubs Grotto", "Lost Woods", ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_TYPE_GROTTO, "lw"}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_LW_DEKU_THEATRE_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_LW_DEKU_THEATRE_OFFSET), {{ SCENE_GROTTOS, 0x0C }}, "Deku Theater", "Lost Woods", ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_TYPE_GROTTO, "lw,mask,stage"}, // Sacred Forest Meadow - { 0x01A9, 0x00FC, SINGLE_SCENE_INFO(0x56), "SFM", "Lost Woods", ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_TYPE_OVERWORLD, "lw"}, - { 0x0716, 0x0816, SINGLE_SCENE_INFO(0x56), "SFM", "SFM Wolfos Grotto", ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM, ENTRANCE_TYPE_GROTTO, "chest", 1}, - { 0x0718, 0x0818, SINGLE_SCENE_INFO(0x56), "SFM", "SFM Fairy Grotto", ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM, ENTRANCE_TYPE_GROTTO, "", 1}, - { 0x0717, 0x0817, SINGLE_SCENE_INFO(0x56), "SFM", "SFM Storms Grotto", ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM, ENTRANCE_TYPE_GROTTO, "scrubs", 1}, - { 0x0169, 0x0215, SINGLE_SCENE_INFO(0x56), "SFM", "Forest Temple", ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM, ENTRANCE_TYPE_DUNGEON, "", 1}, - { 0x0816, 0x0716, {{ 0x3E, 0x08 }}, "SFM Wolfos Grotto", "SFM", ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM, ENTRANCE_TYPE_GROTTO}, - { 0x0818, 0x0718, {{ 0x3C, 0x00 }}, "SFM Fairy Grotto", "SFM", ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM, ENTRANCE_TYPE_GROTTO}, - { 0x0817, 0x0717, {{ 0x3E, 0x0A }}, "SFM Storms Grotto", "SFM", ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM, ENTRANCE_TYPE_GROTTO, "scrubs"}, - { 0x0215, 0x0169, SINGLE_SCENE_INFO(0x03), "Forest Temple", "SFM", ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM, ENTRANCE_TYPE_DUNGEON}, - { 0x000C, 0x024E, SINGLE_SCENE_INFO(0x03), "Forest Temple Boss Door", "Phantom Ganon", ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM, ENTRANCE_TYPE_DUNGEON, "", 1}, - { 0x024E, 0x000C, SINGLE_SCENE_INFO(0x14), "Phantom Ganon", "Forest Temple Boss Door", ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM, ENTRANCE_TYPE_DUNGEON, "", 1}, + { ENTR_LOST_WOODS_1, ENTR_SACRED_FOREST_MEADOW_0, SINGLE_SCENE_INFO(SCENE_SACRED_FOREST_MEADOW), "SFM", "Lost Woods", ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_TYPE_OVERWORLD, "lw"}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_SFM_WOLFOS_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_SFM_WOLFOS_OFFSET), SINGLE_SCENE_INFO(SCENE_SACRED_FOREST_MEADOW), "SFM", "SFM Wolfos Grotto", ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM, ENTRANCE_TYPE_GROTTO, "chest", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_SFM_FAIRY_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_SFM_FAIRY_OFFSET), SINGLE_SCENE_INFO(SCENE_SACRED_FOREST_MEADOW), "SFM", "SFM Fairy Grotto", ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM, ENTRANCE_TYPE_GROTTO, "", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_SFM_STORMS_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_SFM_STORMS_OFFSET), SINGLE_SCENE_INFO(SCENE_SACRED_FOREST_MEADOW), "SFM", "SFM Storms Grotto", ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM, ENTRANCE_TYPE_GROTTO, "scrubs", 1}, + { ENTR_FOREST_TEMPLE_0, ENTR_SACRED_FOREST_MEADOW_1, SINGLE_SCENE_INFO(SCENE_SACRED_FOREST_MEADOW), "SFM", "Forest Temple", ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM, ENTRANCE_TYPE_DUNGEON, "", 1}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_SFM_WOLFOS_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_SFM_WOLFOS_OFFSET), {{ SCENE_GROTTOS, 0x08 }}, "SFM Wolfos Grotto", "SFM", ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM, ENTRANCE_TYPE_GROTTO}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_SFM_FAIRY_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_SFM_FAIRY_OFFSET), {{ SCENE_FAIRYS_FOUNTAIN, 0x00 }}, "SFM Fairy Grotto", "SFM", ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM, ENTRANCE_TYPE_GROTTO}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_SFM_STORMS_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_SFM_STORMS_OFFSET), {{ SCENE_GROTTOS, 0x0A }}, "SFM Storms Grotto", "SFM", ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM, ENTRANCE_TYPE_GROTTO, "scrubs"}, + { ENTR_SACRED_FOREST_MEADOW_1, ENTR_FOREST_TEMPLE_0, SINGLE_SCENE_INFO(SCENE_FOREST_TEMPLE), "Forest Temple", "SFM", ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM, ENTRANCE_TYPE_DUNGEON}, + { ENTR_FOREST_TEMPLE_BOSS_0, ENTR_FOREST_TEMPLE_1, SINGLE_SCENE_INFO(SCENE_FOREST_TEMPLE), "Forest Temple Boss Door", "Phantom Ganon", ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM, ENTRANCE_TYPE_DUNGEON, "", 1}, + { ENTR_FOREST_TEMPLE_1, ENTR_FOREST_TEMPLE_BOSS_0, SINGLE_SCENE_INFO(SCENE_FOREST_TEMPLE_BOSS), "Phantom Ganon", "Forest Temple Boss Door", ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM, ENTRANCE_TYPE_DUNGEON, "", 1}, // Kakariko Village - { 0x017D, 0x00DB, SINGLE_SCENE_INFO(0x52), "Kakariko", "Hyrule Field", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_OVERWORLD, "hf"}, - { 0x00E4, 0x0195, SINGLE_SCENE_INFO(0x52), "Kakariko", "Graveyard", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_OVERWORLD}, - { 0x013D, 0x0191, SINGLE_SCENE_INFO(0x52), "Kakariko", "DMT", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_OVERWORLD}, - { 0x02FD, 0x0349, SINGLE_SCENE_INFO(0x52), "Kakariko", "Carpenter Boss House", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x0550, 0x04EE, SINGLE_SCENE_INFO(0x52), "Kakariko", "House of Skulltula", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x039C, 0x0345, SINGLE_SCENE_INFO(0x52), "Kakariko", "Impa's House Front", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x05C8, 0x05DC, SINGLE_SCENE_INFO(0x52), "Kakariko", "Impa's House Back", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR, "cow", 1}, - { 0x0453, 0x0351, SINGLE_SCENE_INFO(0x52), "Kakariko", "Windmill", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x003B, 0x0463, SINGLE_SCENE_INFO(0x52), "Kakariko", "Kak Shooting Gallery", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR, "adult", 1}, - { 0x0072, 0x034D, SINGLE_SCENE_INFO(0x52), "Kakariko", "Granny's Potion Shop", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x00B7, 0x0201, SINGLE_SCENE_INFO(0x52), "Kakariko", "Kak Bazaar", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR, "shop", 1}, - { 0x0384, 0x044B, SINGLE_SCENE_INFO(0x52), "Kakariko", "Kak Potion Shop Front", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x03EC, 0x04FF, SINGLE_SCENE_INFO(0x52), "Kakariko", "Kak Potion Shop Back", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x070A, 0x080A, SINGLE_SCENE_INFO(0x52), "Kakariko", "Kak Open Grotto", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_GROTTO, "chest", 1}, - { 0x070B, 0x080B, SINGLE_SCENE_INFO(0x52), "Kakariko", "Kak Redead Grotto", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_GROTTO, "chest", 1}, - { 0x0098, 0x02A6, SINGLE_SCENE_INFO(0x52), "Kakariko", "Bottom of the Well", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_DUNGEON, "botw", 1}, - { 0x0349, 0x02FD, SINGLE_SCENE_INFO(0x2A), "Carpenter Boss House", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR}, - { 0x04EE, 0x0550, SINGLE_SCENE_INFO(0x50), "House of Skulltula", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR}, - { 0x0345, 0x039C, SINGLE_SCENE_INFO(0x37), "Impa's House Front", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR}, - { 0x05DC, 0x05C8, SINGLE_SCENE_INFO(0x37), "Impa's House Back", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR, "cow"}, - { 0x0351, 0x0453, SINGLE_SCENE_INFO(0x48), "Windmill", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR}, - { 0x0463, 0x003B, {{ 0x42, 0x00 }}, "Kak Shooting Gallery", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR}, - { 0x034D, 0x0072, SINGLE_SCENE_INFO(0x4E), "Granny's Potion Shop", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR}, - { 0x0201, 0x00B7, {{ 0x2C, 0x00 }}, "Kak Bazaar", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR, "shop"}, - { 0x044B, 0x0384, SINGLE_SCENE_INFO(0x30), "Kak Potion Shop Front", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR}, - { 0x04FF, 0x03EC, SINGLE_SCENE_INFO(0x30), "Kak Potion Shop Back", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR}, - { 0x080A, 0x070A, {{ 0x3E, 0x00 }}, "Kak Open Grotto", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_GROTTO, "chest"}, - { 0x080B, 0x070B, {{ 0x3E, 0x03 }}, "Kak Redead Grotto", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_GROTTO, "chest"}, - { 0x02A6, 0x0098, SINGLE_SCENE_INFO(0x08), "Bottom of the Well", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_DUNGEON, "botw"}, + { ENTR_HYRULE_FIELD_1, ENTR_KAKARIKO_VILLAGE_0, SINGLE_SCENE_INFO(SCENE_KAKARIKO_VILLAGE), "Kakariko", "Hyrule Field", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_OVERWORLD, "hf"}, + { ENTR_GRAVEYARD_0, ENTR_KAKARIKO_VILLAGE_2, SINGLE_SCENE_INFO(SCENE_KAKARIKO_VILLAGE), "Kakariko", "Graveyard", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_OVERWORLD}, + { ENTR_DEATH_MOUNTAIN_TRAIL_0, ENTR_KAKARIKO_VILLAGE_1, SINGLE_SCENE_INFO(SCENE_KAKARIKO_VILLAGE), "Kakariko", "DMT", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_OVERWORLD}, + { ENTR_KAKARIKO_CENTER_GUEST_HOUSE_0, ENTR_KAKARIKO_VILLAGE_6, SINGLE_SCENE_INFO(SCENE_KAKARIKO_VILLAGE), "Kakariko", "Carpenter Boss House", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTR_HOUSE_OF_SKULLTULA_0, ENTR_KAKARIKO_VILLAGE_11, SINGLE_SCENE_INFO(SCENE_KAKARIKO_VILLAGE), "Kakariko", "House of Skulltula", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTR_IMPAS_HOUSE_0, ENTR_KAKARIKO_VILLAGE_5, SINGLE_SCENE_INFO(SCENE_KAKARIKO_VILLAGE), "Kakariko", "Impa's House Front", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTR_IMPAS_HOUSE_1, ENTR_KAKARIKO_VILLAGE_15, SINGLE_SCENE_INFO(SCENE_KAKARIKO_VILLAGE), "Kakariko", "Impa's House Back", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR, "cow", 1}, + { ENTR_WINDMILL_AND_DAMPES_GRAVE_1, ENTR_KAKARIKO_VILLAGE_8, SINGLE_SCENE_INFO(SCENE_KAKARIKO_VILLAGE), "Kakariko", "Windmill", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTR_SHOOTING_GALLERY_0, ENTR_KAKARIKO_VILLAGE_10, SINGLE_SCENE_INFO(SCENE_KAKARIKO_VILLAGE), "Kakariko", "Kak Shooting Gallery", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR, "adult", 1}, + { ENTR_POTION_SHOP_GRANNY_0, ENTR_KAKARIKO_VILLAGE_7, SINGLE_SCENE_INFO(SCENE_KAKARIKO_VILLAGE), "Kakariko", "Granny's Potion Shop", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTR_BAZAAR_0, ENTR_KAKARIKO_VILLAGE_3, SINGLE_SCENE_INFO(SCENE_KAKARIKO_VILLAGE), "Kakariko", "Kak Bazaar", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR, "shop", 1}, + { ENTR_POTION_SHOP_KAKARIKO_0, ENTR_KAKARIKO_VILLAGE_9, SINGLE_SCENE_INFO(SCENE_KAKARIKO_VILLAGE), "Kakariko", "Kak Potion Shop Front", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTR_POTION_SHOP_KAKARIKO_2, ENTR_KAKARIKO_VILLAGE_12, SINGLE_SCENE_INFO(SCENE_KAKARIKO_VILLAGE), "Kakariko", "Kak Potion Shop Back", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_KAK_OPEN_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_KAK_OPEN_OFFSET), SINGLE_SCENE_INFO(SCENE_KAKARIKO_VILLAGE), "Kakariko", "Kak Open Grotto", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_GROTTO, "chest", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_KAK_REDEAD_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_KAK_REDEAD_OFFSET), SINGLE_SCENE_INFO(SCENE_KAKARIKO_VILLAGE), "Kakariko", "Kak Redead Grotto", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_GROTTO, "chest", 1}, + { ENTR_BOTTOM_OF_THE_WELL_0, ENTR_KAKARIKO_VILLAGE_4, SINGLE_SCENE_INFO(SCENE_KAKARIKO_VILLAGE), "Kakariko", "Bottom of the Well", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_DUNGEON, "botw", 1}, + { ENTR_KAKARIKO_VILLAGE_6, ENTR_KAKARIKO_CENTER_GUEST_HOUSE_0, SINGLE_SCENE_INFO(SCENE_KAKARIKO_CENTER_GUEST_HOUSE), "Carpenter Boss House", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR}, + { ENTR_KAKARIKO_VILLAGE_11, ENTR_HOUSE_OF_SKULLTULA_0, SINGLE_SCENE_INFO(SCENE_HOUSE_OF_SKULLTULA), "House of Skulltula", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR}, + { ENTR_KAKARIKO_VILLAGE_5, ENTR_IMPAS_HOUSE_0, SINGLE_SCENE_INFO(SCENE_IMPAS_HOUSE), "Impa's House Front", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR}, + { ENTR_KAKARIKO_VILLAGE_15, ENTR_IMPAS_HOUSE_1, SINGLE_SCENE_INFO(SCENE_IMPAS_HOUSE), "Impa's House Back", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR, "cow"}, + { ENTR_KAKARIKO_VILLAGE_8, ENTR_WINDMILL_AND_DAMPES_GRAVE_1, SINGLE_SCENE_INFO(SCENE_WINDMILL_AND_DAMPES_GRAVE), "Windmill", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR}, + { ENTR_KAKARIKO_VILLAGE_10, ENTR_SHOOTING_GALLERY_0, {{ SCENE_SHOOTING_GALLERY, 0x00 }}, "Kak Shooting Gallery", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR}, + { ENTR_KAKARIKO_VILLAGE_7, ENTR_POTION_SHOP_GRANNY_0, SINGLE_SCENE_INFO(SCENE_POTION_SHOP_GRANNY), "Granny's Potion Shop", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR}, + { ENTR_KAKARIKO_VILLAGE_3, ENTR_BAZAAR_0, {{ SCENE_BAZAAR, 0x00 }}, "Kak Bazaar", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR, "shop"}, + { ENTR_KAKARIKO_VILLAGE_9, ENTR_POTION_SHOP_KAKARIKO_0, SINGLE_SCENE_INFO(SCENE_POTION_SHOP_KAKARIKO), "Kak Potion Shop Front", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR}, + { ENTR_KAKARIKO_VILLAGE_12, ENTR_POTION_SHOP_KAKARIKO_2, SINGLE_SCENE_INFO(SCENE_POTION_SHOP_KAKARIKO), "Kak Potion Shop Back", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_INTERIOR}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_KAK_OPEN_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_KAK_OPEN_OFFSET), {{ SCENE_GROTTOS, 0x00 }}, "Kak Open Grotto", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_GROTTO, "chest"}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_KAK_REDEAD_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_KAK_REDEAD_OFFSET), {{ SCENE_GROTTOS, 0x03 }}, "Kak Redead Grotto", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_GROTTO, "chest"}, + { ENTR_KAKARIKO_VILLAGE_4, ENTR_BOTTOM_OF_THE_WELL_0, SINGLE_SCENE_INFO(SCENE_BOTTOM_OF_THE_WELL), "Bottom of the Well", "Kakariko", ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_DUNGEON, "botw"}, // The Graveyard - { 0x0195, 0x00E4, SINGLE_SCENE_INFO(0x53), "Graveyard", "Kakariko", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_OVERWORLD}, - { 0x030D, 0x0355, SINGLE_SCENE_INFO(0x53), "Graveyard", "Dampe's Shack", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x004B, 0x035D, SINGLE_SCENE_INFO(0x53), "Graveyard", "Shield Grave", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_GROTTO, "", 1}, - { 0x031C, 0x0361, SINGLE_SCENE_INFO(0x53), "Graveyard", "Heart Piece Grave", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_GROTTO, "", 1}, - { 0x002D, 0x050B, SINGLE_SCENE_INFO(0x53), "Graveyard", "Composer's Grave", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_GROTTO, "", 1}, - { 0x044F, 0x0359, SINGLE_SCENE_INFO(0x53), "Graveyard", "Dampe's Grave", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_GROTTO, "race", 1}, - { 0x0037, 0x0205, SINGLE_SCENE_INFO(0x53), "Graveyard", "Shadow Temple", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_DUNGEON, "", 1}, - { 0x0355, 0x030D, SINGLE_SCENE_INFO(0x3A), "Dampe's Shack", "Graveyard", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_INTERIOR}, - { 0x035D, 0x004B, SINGLE_SCENE_INFO(0x40), "Shield Grave", "Graveyard", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_GROTTO}, - { 0x0361, 0x031C, SINGLE_SCENE_INFO(0x3F), "Heart Piece Grave", "Graveyard", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_GROTTO}, - { 0x050B, 0x002D, SINGLE_SCENE_INFO(0x41), "Composer's Grave", "Graveyard", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_GROTTO}, - { 0x0359, 0x044F, SINGLE_SCENE_INFO(0x48), "Dampe's Grave", "Graveyard", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_GROTTO, "race"}, - { 0x0205, 0x0037, SINGLE_SCENE_INFO(0x07), "Shadow Temple", "Graveyard", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_DUNGEON}, - { 0x0413, 0x02B2, SINGLE_SCENE_INFO(0x07), "Shadow Temple Boss Door", "Bongo-Bongo", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_DUNGEON, "", 1}, - { 0x02B2, 0x0413, SINGLE_SCENE_INFO(0x18), "Bongo-Bongo", "Shadow Temple Boss Door", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_DUNGEON, "", 1}, + { ENTR_KAKARIKO_VILLAGE_2, ENTR_GRAVEYARD_0, SINGLE_SCENE_INFO(SCENE_GRAVEYARD), "Graveyard", "Kakariko", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_OVERWORLD}, + { ENTR_GRAVEKEEPERS_HUT_0, ENTR_GRAVEYARD_2, SINGLE_SCENE_INFO(SCENE_GRAVEYARD), "Graveyard", "Dampe's Shack", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTR_GRAVE_WITH_FAIRYS_FOUNTAIN_0, ENTR_GRAVEYARD_4, SINGLE_SCENE_INFO(SCENE_GRAVEYARD), "Graveyard", "Shield Grave", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_GROTTO, "", 1}, + { ENTR_REDEAD_GRAVE_0, ENTR_GRAVEYARD_5, SINGLE_SCENE_INFO(SCENE_GRAVEYARD), "Graveyard", "Heart Piece Grave", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_GROTTO, "", 1}, + { ENTR_ROYAL_FAMILYS_TOMB_0, ENTR_GRAVEYARD_6, SINGLE_SCENE_INFO(SCENE_GRAVEYARD), "Graveyard", "Composer's Grave", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_GROTTO, "", 1}, + { ENTR_WINDMILL_AND_DAMPES_GRAVE_0, ENTR_GRAVEYARD_3, SINGLE_SCENE_INFO(SCENE_GRAVEYARD), "Graveyard", "Dampe's Grave", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_GROTTO, "race", 1}, + { ENTR_SHADOW_TEMPLE_0, ENTR_GRAVEYARD_1, SINGLE_SCENE_INFO(SCENE_GRAVEYARD), "Graveyard", "Shadow Temple", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_DUNGEON, "", 1}, + { ENTR_GRAVEYARD_2, ENTR_GRAVEKEEPERS_HUT_0, SINGLE_SCENE_INFO(SCENE_GRAVEKEEPERS_HUT), "Dampe's Shack", "Graveyard", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_INTERIOR}, + { ENTR_GRAVEYARD_4, ENTR_GRAVE_WITH_FAIRYS_FOUNTAIN_0, SINGLE_SCENE_INFO(SCENE_GRAVE_WITH_FAIRYS_FOUNTAIN), "Shield Grave", "Graveyard", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_GROTTO}, + { ENTR_GRAVEYARD_5, ENTR_REDEAD_GRAVE_0, SINGLE_SCENE_INFO(SCENE_REDEAD_GRAVE), "Heart Piece Grave", "Graveyard", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_GROTTO}, + { ENTR_GRAVEYARD_6, ENTR_ROYAL_FAMILYS_TOMB_0, SINGLE_SCENE_INFO(SCENE_ROYAL_FAMILYS_TOMB), "Composer's Grave", "Graveyard", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_GROTTO}, + { ENTR_GRAVEYARD_3, ENTR_WINDMILL_AND_DAMPES_GRAVE_0, SINGLE_SCENE_INFO(SCENE_WINDMILL_AND_DAMPES_GRAVE), "Dampe's Grave", "Graveyard", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_GROTTO, "race"}, + { ENTR_GRAVEYARD_1, ENTR_SHADOW_TEMPLE_0, SINGLE_SCENE_INFO(SCENE_SHADOW_TEMPLE), "Shadow Temple", "Graveyard", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_DUNGEON}, + { ENTR_SHADOW_TEMPLE_BOSS_0, ENTR_SHADOW_TEMPLE_1, SINGLE_SCENE_INFO(SCENE_SHADOW_TEMPLE), "Shadow Temple Boss Door", "Bongo-Bongo", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_DUNGEON, "", 1}, + { ENTR_SHADOW_TEMPLE_1, ENTR_SHADOW_TEMPLE_BOSS_0, SINGLE_SCENE_INFO(SCENE_SHADOW_TEMPLE_BOSS), "Bongo-Bongo", "Shadow Temple Boss Door", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_DUNGEON, "", 1}, // Death Mountain Trail - { 0x0191, 0x013D, SINGLE_SCENE_INFO(0x60), "DMT", "Kakariko", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_OVERWORLD}, - { 0x014D, 0x01B9, SINGLE_SCENE_INFO(0x60), "DMT", "Goron City", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_GORON_CITY, ENTRANCE_TYPE_OVERWORLD, "gc"}, - { 0x0147, 0x01BD, SINGLE_SCENE_INFO(0x60), "DMT", "DMC", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_OVERWORLD}, - { 0x0315, 0x045B, SINGLE_SCENE_INFO(0x60), "DMT", "DMT Great Fairy Fountain", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x0708, 0x0808, SINGLE_SCENE_INFO(0x60), "DMT", "DMT Storms Grotto", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_GROTTO, "chest", 1}, - { 0x0709, 0x0809, SINGLE_SCENE_INFO(0x60), "DMT", "DMT Cow Grotto", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_GROTTO, "", 1}, - { 0x0004, 0x0242, SINGLE_SCENE_INFO(0x60), "DMT", "Dodongo's Cavern", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_DUNGEON, "dc", 1}, - { 0x045B, 0x0315, {{ 0x3B, 0x00 }}, "DMT Great Fairy Fountain", "DMT", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_INTERIOR}, - { 0x0808, 0x0708, {{ 0x3E, 0x00 }}, "DMT Storms Grotto", "DMT", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_GROTTO, "chest"}, - { 0x0809, 0x0709, {{ 0x3E, 0x0D }}, "DMT Cow Grotto", "DMT", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_GROTTO}, - { 0x0242, 0x0004, SINGLE_SCENE_INFO(0x01), "Dodongo's Cavern", "DMT", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_DUNGEON, "dc"}, - { 0x040B, 0x00C5, SINGLE_SCENE_INFO(0x01), "Dodongo's Cavern Boss Door", "King Dodongo", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_DUNGEON, "dc", 1}, - { 0x00C5, 0x040B, SINGLE_SCENE_INFO(0x12), "King Dodongo", "Dodongo's Cavern Boss Door", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_DUNGEON, "dc", 1}, + { ENTR_GORON_CITY_0, ENTR_DEATH_MOUNTAIN_TRAIL_1, SINGLE_SCENE_INFO(SCENE_DEATH_MOUNTAIN_TRAIL), "DMT", "Goron City", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_GORON_CITY, ENTRANCE_TYPE_OVERWORLD, "gc"}, + { ENTR_KAKARIKO_VILLAGE_1, ENTR_DEATH_MOUNTAIN_TRAIL_0, SINGLE_SCENE_INFO(SCENE_DEATH_MOUNTAIN_TRAIL), "DMT", "Kakariko", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_OVERWORLD}, + { ENTR_DEATH_MOUNTAIN_CRATER_0, ENTR_DEATH_MOUNTAIN_TRAIL_2, SINGLE_SCENE_INFO(SCENE_DEATH_MOUNTAIN_TRAIL), "DMT", "DMC", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_OVERWORLD}, + { ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_0, ENTR_DEATH_MOUNTAIN_TRAIL_4, SINGLE_SCENE_INFO(SCENE_DEATH_MOUNTAIN_TRAIL), "DMT", "DMT Great Fairy Fountain", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_DMT_STORMS_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_DMT_STORMS_OFFSET), SINGLE_SCENE_INFO(SCENE_DEATH_MOUNTAIN_TRAIL), "DMT", "DMT Storms Grotto", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_GROTTO, "chest", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_DMT_COW_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_DMT_COW_OFFSET), SINGLE_SCENE_INFO(SCENE_DEATH_MOUNTAIN_TRAIL), "DMT", "DMT Cow Grotto", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_GROTTO, "", 1}, + { ENTR_DODONGOS_CAVERN_0, ENTR_DEATH_MOUNTAIN_TRAIL_3, SINGLE_SCENE_INFO(SCENE_DEATH_MOUNTAIN_TRAIL), "DMT", "Dodongo's Cavern", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_DUNGEON, "dc", 1}, + { ENTR_DEATH_MOUNTAIN_TRAIL_4, ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_0, {{ SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, 0x00 }}, "DMT Great Fairy Fountain", "DMT", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_INTERIOR}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_DMT_STORMS_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_DMT_STORMS_OFFSET), {{ SCENE_GROTTOS, 0x00 }}, "DMT Storms Grotto", "DMT", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_GROTTO, "chest"}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_DMT_COW_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_DMT_COW_OFFSET), {{ SCENE_GROTTOS, 0x0D }}, "DMT Cow Grotto", "DMT", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_GROTTO}, + { ENTR_DEATH_MOUNTAIN_TRAIL_3, ENTR_DODONGOS_CAVERN_0, SINGLE_SCENE_INFO(SCENE_DODONGOS_CAVERN), "Dodongo's Cavern", "DMT", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_DUNGEON, "dc"}, + { ENTR_DODONGOS_CAVERN_BOSS_0, ENTR_DODONGOS_CAVERN_1, SINGLE_SCENE_INFO(SCENE_DODONGOS_CAVERN), "Dodongo's Cavern Boss Door", "King Dodongo", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_DUNGEON, "dc", 1}, + { ENTR_DODONGOS_CAVERN_1, ENTR_DODONGOS_CAVERN_BOSS_0, SINGLE_SCENE_INFO(SCENE_DODONGOS_CAVERN_BOSS), "King Dodongo", "Dodongo's Cavern Boss Door", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_DUNGEON, "dc", 1}, // Death Mountain Crater - { 0x01C1, 0x0246, SINGLE_SCENE_INFO(0x61), "DMC", "Goron City", ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_GORON_CITY, ENTRANCE_TYPE_OVERWORLD, "gc"}, - { 0x01BD, 0x0147, SINGLE_SCENE_INFO(0x61), "DMC", "DMT", ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_OVERWORLD}, - { 0x04BE, 0x0482, SINGLE_SCENE_INFO(0x61), "DMC", "DMC Great Fairy Fountain", ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x0706, 0x0806, SINGLE_SCENE_INFO(0x61), "DMC", "DMC Upper Grotto", ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_GROTTO, "chest", 1}, - { 0x0705, 0x0805, SINGLE_SCENE_INFO(0x61), "DMC", "DMC Hammer Grotto", ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_GROTTO, "scrubs", 1}, - { 0x0165, 0x024A, SINGLE_SCENE_INFO(0x61), "DMC", "Fire Temple", ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_DUNGEON, "", 1}, - { 0x0482, 0x04BE, {{ 0x3B, 0x01 }}, "DMC Great Fairy Fountain", "DMC", ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_INTERIOR}, - { 0x0806, 0x0706, {{ 0x3E, 0x00 }}, "DMC Upper Grotto", "DMC", ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_GROTTO, "chest"}, - { 0x0805, 0x0705, {{ 0x3E, 0x04 }}, "DMC Hammer Grotto", "DMC", ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_GROTTO, "scrubs"}, - { 0x024A, 0x0165, SINGLE_SCENE_INFO(0x04), "Fire Temple", "DMC", ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_DUNGEON}, - { 0x0305, 0x0175, SINGLE_SCENE_INFO(0x04), "Fire Temple Boss Door", "Volvagia", ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_DUNGEON, "", 1}, - { 0x0175, 0x0305, SINGLE_SCENE_INFO(0x15), "Volvagia", "Fire Temple Boss Door", ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_DUNGEON, "", 1}, + { ENTR_GORON_CITY_1, ENTR_DEATH_MOUNTAIN_CRATER_1, SINGLE_SCENE_INFO(SCENE_DEATH_MOUNTAIN_CRATER), "DMC", "Goron City", ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_GORON_CITY, ENTRANCE_TYPE_OVERWORLD, "gc"}, + { ENTR_DEATH_MOUNTAIN_TRAIL_2, ENTR_DEATH_MOUNTAIN_CRATER_0, SINGLE_SCENE_INFO(SCENE_DEATH_MOUNTAIN_CRATER), "DMC", "DMT", ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_OVERWORLD}, + { ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_1, ENTR_DEATH_MOUNTAIN_CRATER_3, SINGLE_SCENE_INFO(SCENE_DEATH_MOUNTAIN_CRATER), "DMC", "DMC Great Fairy Fountain", ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_DMC_UPPER_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_DMC_UPPER_OFFSET), SINGLE_SCENE_INFO(SCENE_DEATH_MOUNTAIN_CRATER), "DMC", "DMC Upper Grotto", ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_GROTTO, "chest", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_DMC_HAMMER_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_DMC_HAMMER_OFFSET), SINGLE_SCENE_INFO(SCENE_DEATH_MOUNTAIN_CRATER), "DMC", "DMC Hammer Grotto", ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_GROTTO, "scrubs", 1}, + { ENTR_FIRE_TEMPLE_0, ENTR_DEATH_MOUNTAIN_CRATER_2, SINGLE_SCENE_INFO(SCENE_DEATH_MOUNTAIN_CRATER), "DMC", "Fire Temple", ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_DUNGEON, "", 1}, + { ENTR_DEATH_MOUNTAIN_CRATER_3, ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_1, {{ SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, 0x01 }}, "DMC Great Fairy Fountain", "DMC", ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_INTERIOR}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_DMC_UPPER_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_DMC_UPPER_OFFSET), {{ SCENE_GROTTOS, 0x00 }}, "DMC Upper Grotto", "DMC", ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_GROTTO, "chest"}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_DMC_HAMMER_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_DMC_HAMMER_OFFSET), {{ SCENE_GROTTOS, 0x04 }}, "DMC Hammer Grotto", "DMC", ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_GROTTO, "scrubs"}, + { ENTR_DEATH_MOUNTAIN_CRATER_2, ENTR_FIRE_TEMPLE_0, SINGLE_SCENE_INFO(SCENE_FIRE_TEMPLE), "Fire Temple", "DMC", ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_DUNGEON}, + { ENTR_FIRE_TEMPLE_BOSS_0, ENTR_FIRE_TEMPLE_1, SINGLE_SCENE_INFO(SCENE_FIRE_TEMPLE), "Fire Temple Boss Door", "Volvagia", ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_DUNGEON, "", 1}, + { ENTR_FIRE_TEMPLE_1, ENTR_FIRE_TEMPLE_BOSS_0, SINGLE_SCENE_INFO(SCENE_FIRE_TEMPLE_BOSS), "Volvagia", "Fire Temple Boss Door", ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_DUNGEON, "", 1}, // Goron City - { 0x01B9, 0x014D, SINGLE_SCENE_INFO(0x62), "Goron City", "DMT", ENTRANCE_GROUP_GORON_CITY, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_OVERWORLD, "gc"}, - { 0x0246, 0x01C1, SINGLE_SCENE_INFO(0x62), "Goron City", "DMC", ENTRANCE_GROUP_GORON_CITY, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_OVERWORLD, "gc"}, - { 0x04D6, 0x04E2, SINGLE_SCENE_INFO(0x62), "Goron City", "Lost Woods", ENTRANCE_GROUP_GORON_CITY, ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_TYPE_OVERWORLD, "gc,lw"}, - { 0x037C, 0x03FC, SINGLE_SCENE_INFO(0x62), "Goron City", "Goron Shop", ENTRANCE_GROUP_GORON_CITY, ENTRANCE_GROUP_GORON_CITY, ENTRANCE_TYPE_INTERIOR, "gc", 1}, - { 0x0707, 0x0807, SINGLE_SCENE_INFO(0x62), "Goron City", "Goron City Grotto", ENTRANCE_GROUP_GORON_CITY, ENTRANCE_GROUP_GORON_CITY, ENTRANCE_TYPE_GROTTO, "gc,scrubs", 1}, - { 0x03FC, 0x037C, SINGLE_SCENE_INFO(0x2E), "Goron Shop", "Goron City", ENTRANCE_GROUP_GORON_CITY, ENTRANCE_GROUP_GORON_CITY, ENTRANCE_TYPE_INTERIOR, "gc"}, - { 0x0807, 0x0707, {{ 0x3E, 0x04 }}, "Goron City Grotto", "Goron City", ENTRANCE_GROUP_GORON_CITY, ENTRANCE_GROUP_GORON_CITY, ENTRANCE_TYPE_GROTTO, "gc,scrubs"}, + { ENTR_DEATH_MOUNTAIN_TRAIL_1, ENTR_GORON_CITY_0, SINGLE_SCENE_INFO(SCENE_GORON_CITY), "Goron City", "DMT", ENTRANCE_GROUP_GORON_CITY, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_TYPE_OVERWORLD, "gc"}, + { ENTR_DEATH_MOUNTAIN_CRATER_1, ENTR_GORON_CITY_1, SINGLE_SCENE_INFO(SCENE_GORON_CITY), "Goron City", "DMC", ENTRANCE_GROUP_GORON_CITY, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_OVERWORLD, "gc"}, + { ENTR_LOST_WOODS_6, ENTR_GORON_CITY_3, SINGLE_SCENE_INFO(SCENE_GORON_CITY), "Goron City", "Lost Woods", ENTRANCE_GROUP_GORON_CITY, ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_TYPE_OVERWORLD, "gc,lw"}, + { ENTR_GORON_SHOP_0, ENTR_GORON_CITY_2, SINGLE_SCENE_INFO(SCENE_GORON_CITY), "Goron City", "Goron Shop", ENTRANCE_GROUP_GORON_CITY, ENTRANCE_GROUP_GORON_CITY, ENTRANCE_TYPE_INTERIOR, "gc", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_GORON_CITY_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_GORON_CITY_OFFSET), SINGLE_SCENE_INFO(SCENE_GORON_CITY), "Goron City", "Goron City Grotto", ENTRANCE_GROUP_GORON_CITY, ENTRANCE_GROUP_GORON_CITY, ENTRANCE_TYPE_GROTTO, "gc,scrubs", 1}, + { ENTR_GORON_CITY_2, ENTR_GORON_SHOP_0, SINGLE_SCENE_INFO(SCENE_GORON_SHOP), "Goron Shop", "Goron City", ENTRANCE_GROUP_GORON_CITY, ENTRANCE_GROUP_GORON_CITY, ENTRANCE_TYPE_INTERIOR, "gc"}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_GORON_CITY_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_GORON_CITY_OFFSET), {{ SCENE_GROTTOS, 0x04 }}, "Goron City Grotto", "Goron City", ENTRANCE_GROUP_GORON_CITY, ENTRANCE_GROUP_GORON_CITY, ENTRANCE_TYPE_GROTTO, "gc,scrubs"}, // Zora's River - { 0x0181, 0x00EA, SINGLE_SCENE_INFO(0x54), "ZR", "Hyrule Field", ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_OVERWORLD, "hf"}, - { 0x04DA, 0x01DD, SINGLE_SCENE_INFO(0x54), "ZR", "Lost Woods", ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_TYPE_OVERWORLD, "lw"}, - { 0x0108, 0x019D, SINGLE_SCENE_INFO(0x54), "ZR", "Zora's Domain", ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_TYPE_OVERWORLD}, - { 0x0702, 0x0802, SINGLE_SCENE_INFO(0x54), "ZR", "ZR Storms Grotto", ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_TYPE_GROTTO, "scrubs", 1}, - { 0x0703, 0x0803, SINGLE_SCENE_INFO(0x54), "ZR", "ZR Fairy Grotto", ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_TYPE_GROTTO, "", 1}, - { 0x0704, 0x0804, SINGLE_SCENE_INFO(0x54), "ZR", "ZR Open Grotto", ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_TYPE_GROTTO, "chest", 1}, - { 0x0802, 0x0702, {{ 0x3E, 0x0A }}, "ZR Storms Grotto", "ZR", ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_TYPE_GROTTO, "scrubs"}, - { 0x0803, 0x0703, {{ 0x3C, 0x00 }}, "ZR Fairy Grotto", "ZR", ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_TYPE_GROTTO}, - { 0x0804, 0x0704, {{ 0x3E, 0x00 }}, "ZR Open Grotto", "ZR", ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_TYPE_GROTTO, "chest"}, + { ENTR_HYRULE_FIELD_2, ENTR_ZORAS_RIVER_0, SINGLE_SCENE_INFO(SCENE_ZORAS_RIVER), "ZR", "Hyrule Field", ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_OVERWORLD, "hf"}, + { ENTR_LOST_WOODS_7, ENTR_ZORAS_RIVER_4, SINGLE_SCENE_INFO(SCENE_ZORAS_RIVER), "ZR", "Lost Woods", ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_TYPE_OVERWORLD, "lw"}, + { ENTR_ZORAS_DOMAIN_0, ENTR_ZORAS_RIVER_2, SINGLE_SCENE_INFO(SCENE_ZORAS_RIVER), "ZR", "Zora's Domain", ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_TYPE_OVERWORLD}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_ZR_STORMS_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_ZR_STORMS_OFFSET), SINGLE_SCENE_INFO(SCENE_ZORAS_RIVER), "ZR", "ZR Storms Grotto", ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_TYPE_GROTTO, "scrubs", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_ZR_FAIRY_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_ZR_FAIRY_OFFSET), SINGLE_SCENE_INFO(SCENE_ZORAS_RIVER), "ZR", "ZR Fairy Grotto", ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_TYPE_GROTTO, "", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_ZR_OPEN_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_ZR_OPEN_OFFSET), SINGLE_SCENE_INFO(SCENE_ZORAS_RIVER), "ZR", "ZR Open Grotto", ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_TYPE_GROTTO, "chest", 1}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_ZR_STORMS_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_ZR_STORMS_OFFSET), {{ SCENE_GROTTOS, 0x0A }}, "ZR Storms Grotto", "ZR", ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_TYPE_GROTTO, "scrubs"}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_ZR_FAIRY_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_ZR_FAIRY_OFFSET), {{ SCENE_FAIRYS_FOUNTAIN, 0x00 }}, "ZR Fairy Grotto", "ZR", ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_TYPE_GROTTO}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_ZR_OPEN_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_ZR_OPEN_OFFSET), {{ SCENE_GROTTOS, 0x00 }}, "ZR Open Grotto", "ZR", ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_TYPE_GROTTO, "chest"}, // Zora's Domain - { 0x019D, 0x0108, SINGLE_SCENE_INFO(0x58), "Zora's Domain", "ZR", ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_TYPE_OVERWORLD}, - { 0x0560, 0x0328, SINGLE_SCENE_INFO(0x58), "Zora's Domain", "Lake Hylia", ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_OVERWORLD, "lh"}, - { 0x0225, 0x01A1, SINGLE_SCENE_INFO(0x58), "Zora's Domain", "ZF", ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_TYPE_OVERWORLD}, - { 0x0380, 0x03C4, SINGLE_SCENE_INFO(0x58), "Zora's Domain", "Zora Shop", ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x071C, 0x081C, SINGLE_SCENE_INFO(0x58), "Zora's Domain", "ZD Storms Grotto", ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_TYPE_GROTTO, "fairy", 1}, - { 0x03C4, 0x0380, SINGLE_SCENE_INFO(0x2F), "Zora Shop", "Zora's Domain", ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_TYPE_INTERIOR}, - { 0x081C, 0x071C, {{ 0x3C, 0x00 }}, "ZD Storms Grotto", "Zora's Domain", ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_TYPE_GROTTO, "fairy"}, + { ENTR_ZORAS_RIVER_2, ENTR_ZORAS_DOMAIN_0, SINGLE_SCENE_INFO(SCENE_ZORAS_DOMAIN), "Zora's Domain", "ZR", ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_TYPE_OVERWORLD}, + { ENTR_LAKE_HYLIA_7, ENTR_ZORAS_DOMAIN_4, SINGLE_SCENE_INFO(SCENE_ZORAS_DOMAIN), "Zora's Domain", "Lake Hylia", ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_OVERWORLD, "lh"}, + { ENTR_ZORAS_FOUNTAIN_2, ENTR_ZORAS_DOMAIN_1, SINGLE_SCENE_INFO(SCENE_ZORAS_DOMAIN), "Zora's Domain", "ZF", ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_TYPE_OVERWORLD}, + { ENTR_ZORA_SHOP_0, ENTR_ZORAS_DOMAIN_2, SINGLE_SCENE_INFO(SCENE_ZORAS_DOMAIN), "Zora's Domain", "Zora Shop", ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_ZD_STORMS_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_ZD_STORMS_OFFSET), SINGLE_SCENE_INFO(SCENE_ZORAS_DOMAIN), "Zora's Domain", "ZD Storms Grotto", ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_TYPE_GROTTO, "fairy", 1}, + { ENTR_ZORAS_DOMAIN_2, ENTR_ZORA_SHOP_0, SINGLE_SCENE_INFO(SCENE_ZORA_SHOP), "Zora Shop", "Zora's Domain", ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_TYPE_INTERIOR}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_ZD_STORMS_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_ZD_STORMS_OFFSET), {{ SCENE_FAIRYS_FOUNTAIN, 0x00 }}, "ZD Storms Grotto", "Zora's Domain", ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_TYPE_GROTTO, "fairy"}, // Zora's Fountain - { 0x01A1, 0x0225, SINGLE_SCENE_INFO(0x59), "ZF", "Zora's Domain", ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_TYPE_OVERWORLD}, - { 0x0371, 0x0394, SINGLE_SCENE_INFO(0x59), "ZF", "ZF Great Fairy Fountain", ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x0028, 0x0221, SINGLE_SCENE_INFO(0x59), "ZF", "Jabu Jabu's Belly", ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_TYPE_DUNGEON, "", 1}, - { 0x0088, 0x03D4, SINGLE_SCENE_INFO(0x59), "ZF", "Ice Cavern", ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_TYPE_DUNGEON, "", 1}, - { 0x0394, 0x0371, {{ 0x3D, 0x00 }}, "ZF Great Fairy Fountain", "ZF", ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_TYPE_INTERIOR}, - { 0x0221, 0x0028, SINGLE_SCENE_INFO(0x02), "Jabu Jabu's Belly", "ZF", ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_TYPE_DUNGEON}, - { 0x0301, 0x0407, SINGLE_SCENE_INFO(0x02), "Jabu Jabu's Belly Boss Door", "Barinade", ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_TYPE_DUNGEON, "", 1}, - { 0x0407, 0x0301, SINGLE_SCENE_INFO(0x13), "Barinade", "Jabu Jabu's Belly Boss Door", ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_TYPE_DUNGEON, "", 1}, - { 0x03D4, 0x0088, SINGLE_SCENE_INFO(0x09), "Ice Cavern", "ZF", ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_TYPE_DUNGEON}, + { ENTR_ZORAS_DOMAIN_1, ENTR_ZORAS_FOUNTAIN_2, SINGLE_SCENE_INFO(SCENE_ZORAS_FOUNTAIN), "ZF", "Zora's Domain", ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_TYPE_OVERWORLD}, + { ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_0, ENTR_ZORAS_FOUNTAIN_5, SINGLE_SCENE_INFO(SCENE_ZORAS_FOUNTAIN), "ZF", "ZF Great Fairy Fountain", ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTR_JABU_JABU_0, ENTR_ZORAS_FOUNTAIN_1, SINGLE_SCENE_INFO(SCENE_ZORAS_FOUNTAIN), "ZF", "Jabu Jabu's Belly", ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_TYPE_DUNGEON, "", 1}, + { ENTR_ICE_CAVERN_0, ENTR_ZORAS_FOUNTAIN_3, SINGLE_SCENE_INFO(SCENE_ZORAS_FOUNTAIN), "ZF", "Ice Cavern", ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_TYPE_DUNGEON, "", 1}, + { ENTR_ZORAS_FOUNTAIN_5, ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_0, {{ SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 0x00 }}, "ZF Great Fairy Fountain", "ZF", ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_TYPE_INTERIOR}, + { ENTR_ZORAS_FOUNTAIN_1, ENTR_JABU_JABU_0, SINGLE_SCENE_INFO(SCENE_JABU_JABU), "Jabu Jabu's Belly", "ZF", ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_TYPE_DUNGEON}, + { ENTR_JABU_JABU_BOSS_0, ENTR_JABU_JABU_1, SINGLE_SCENE_INFO(SCENE_JABU_JABU), "Jabu Jabu's Belly Boss Door", "Barinade", ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_TYPE_DUNGEON, "", 1}, + { ENTR_JABU_JABU_1, ENTR_JABU_JABU_BOSS_0, SINGLE_SCENE_INFO(SCENE_JABU_JABU_BOSS), "Barinade", "Jabu Jabu's Belly Boss Door", ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_TYPE_DUNGEON, "", 1}, + { ENTR_ZORAS_FOUNTAIN_3, ENTR_ICE_CAVERN_0, SINGLE_SCENE_INFO(SCENE_ICE_CAVERN), "Ice Cavern", "ZF", ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_TYPE_DUNGEON}, // Hyrule Field - { 0x04DE, 0x0185, SINGLE_SCENE_INFO(0x51), "Hyrule Field", "Lost Woods Bridge", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_TYPE_OVERWORLD, "hf,lw"}, - { 0x0276, 0x01FD, SINGLE_SCENE_INFO(0x51), "Hyrule Field", "Market Entrance", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_OVERWORLD, "hf"}, - { 0x0157, 0x01F9, SINGLE_SCENE_INFO(0x51), "Hyrule Field", "Lon Lon Ranch", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_OVERWORLD, "hf,llr"}, - { 0x00DB, 0x017D, SINGLE_SCENE_INFO(0x51), "Hyrule Field", "Kakariko", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_OVERWORLD, "hf"}, - { 0x00EA, 0x0181, SINGLE_SCENE_INFO(0x51), "Hyrule Field", "ZR", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_TYPE_OVERWORLD, "hf"}, - { 0x0102, 0x0189, SINGLE_SCENE_INFO(0x51), "Hyrule Field", "Lake Hylia", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_OVERWORLD, "hf,lh"}, - { 0x0117, 0x018D, SINGLE_SCENE_INFO(0x51), "Hyrule Field", "GV", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_OVERWORLD, "hf"}, - { 0x0710, 0x0810, SINGLE_SCENE_INFO(0x51), "Hyrule Field", "HF Near Market Grotto", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "chest", 1}, - { 0x070E, 0x080E, SINGLE_SCENE_INFO(0x51), "Hyrule Field", "HF Near Kak Grotto", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "spider", 1}, - { 0x070D, 0x080D, SINGLE_SCENE_INFO(0x51), "Hyrule Field", "HF Tektite Grotto", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "water", 1}, - { 0x070F, 0x080F, SINGLE_SCENE_INFO(0x51), "Hyrule Field", "HF Fairy Grotto", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "", 1}, - { 0x0711, 0x0811, SINGLE_SCENE_INFO(0x51), "Hyrule Field", "HF Cow Grotto", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "webbed", 1}, - { 0x0713, 0x0813, SINGLE_SCENE_INFO(0x51), "Hyrule Field", "HF Open Grotto", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "chest", 1}, - { 0x0712, 0x0812, SINGLE_SCENE_INFO(0x51), "Hyrule Field", "HF Inside Fence Grotto", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "scrubs", 1}, - { 0x0714, 0x0814, SINGLE_SCENE_INFO(0x51), "Hyrule Field", "HF Southeast Grotto", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "chest", 1}, - { 0x0810, 0x0710, {{ 0x3E, 0x00 }}, "HF Near Market Grotto", "Hyrule Field", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO}, - { 0x080E, 0x070E, {{ 0x3E, 0x01 }}, "HF Near Kak Grotto", "Hyrule Field", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "spider"}, - { 0x080D, 0x070D, {{ 0x3E, 0x0B }}, "HF Tektite Grotto", "Hyrule Field", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "water"}, - { 0x080F, 0x070F, {{ 0x3C, 0x00 }}, "HF Fairy Grotto", "Hyrule Field", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO}, - { 0x0811, 0x0711, {{ 0x3E, 0x05 }}, "HF Cow Grotto", "Hyrule Field", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "webbed"}, - { 0x0813, 0x0713, {{ 0x3E, 0x00 }}, "HF Open Grotto", "Hyrule Field", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "chest"}, - { 0x0812, 0x0712, {{ 0x3E, 0x02 }}, "HF Inside Fence Grotto", "Hyrule Field", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "srubs"}, - { 0x0814, 0x0714, {{ 0x3E, 0x00 }}, "HF Southeast Grotto", "Hyrule Field", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "chest"}, + { ENTR_LOST_WOODS_8, ENTR_HYRULE_FIELD_3, SINGLE_SCENE_INFO(SCENE_HYRULE_FIELD), "Hyrule Field", "Lost Woods Bridge", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_TYPE_OVERWORLD, "hf,lw"}, + { ENTR_MARKET_ENTRANCE_DAY_1, ENTR_HYRULE_FIELD_7, SINGLE_SCENE_INFO(SCENE_HYRULE_FIELD), "Hyrule Field", "Market Entrance", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_OVERWORLD, "hf"}, + { ENTR_LON_LON_RANCH_0, ENTR_HYRULE_FIELD_6, SINGLE_SCENE_INFO(SCENE_HYRULE_FIELD), "Hyrule Field", "Lon Lon Ranch", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_OVERWORLD, "hf,llr"}, + { ENTR_KAKARIKO_VILLAGE_0, ENTR_HYRULE_FIELD_1, SINGLE_SCENE_INFO(SCENE_HYRULE_FIELD), "Hyrule Field", "Kakariko", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_KAKARIKO, ENTRANCE_TYPE_OVERWORLD, "hf"}, + { ENTR_ZORAS_RIVER_0, ENTR_HYRULE_FIELD_2, SINGLE_SCENE_INFO(SCENE_HYRULE_FIELD), "Hyrule Field", "ZR", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_ZORAS_RIVER, ENTRANCE_TYPE_OVERWORLD, "hf"}, + { ENTR_LAKE_HYLIA_0, ENTR_HYRULE_FIELD_4, SINGLE_SCENE_INFO(SCENE_HYRULE_FIELD), "Hyrule Field", "Lake Hylia", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_OVERWORLD, "hf,lh"}, + { ENTR_GERUDO_VALLEY_0, ENTR_HYRULE_FIELD_5, SINGLE_SCENE_INFO(SCENE_HYRULE_FIELD), "Hyrule Field", "GV", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_OVERWORLD, "hf"}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_HF_NEAR_MARKET_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_HF_NEAR_MARKET_OFFSET), SINGLE_SCENE_INFO(SCENE_HYRULE_FIELD), "Hyrule Field", "HF Near Market Grotto", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "chest", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_HF_NEAR_KAK_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_HF_NEAR_KAK_OFFSET), SINGLE_SCENE_INFO(SCENE_HYRULE_FIELD), "Hyrule Field", "HF Near Kak Grotto", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "spider", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_HF_TEKTITE_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_HF_TEKTITE_OFFSET), SINGLE_SCENE_INFO(SCENE_HYRULE_FIELD), "Hyrule Field", "HF Tektite Grotto", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "water", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_HF_FAIRY_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_HF_FAIRY_OFFSET), SINGLE_SCENE_INFO(SCENE_HYRULE_FIELD), "Hyrule Field", "HF Fairy Grotto", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_HF_COW_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_HF_COW_OFFSET), SINGLE_SCENE_INFO(SCENE_HYRULE_FIELD), "Hyrule Field", "HF Cow Grotto", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "webbed", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_HF_OPEN_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_HF_OPEN_OFFSET), SINGLE_SCENE_INFO(SCENE_HYRULE_FIELD), "Hyrule Field", "HF Open Grotto", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "chest", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_HF_INSIDE_FENCE_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_HF_INSIDE_FENCE_OFFSET), SINGLE_SCENE_INFO(SCENE_HYRULE_FIELD), "Hyrule Field", "HF Inside Fence Grotto", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "scrubs", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_HF_SOUTHEAST_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_HF_SOUTHEAST_OFFSET), SINGLE_SCENE_INFO(SCENE_HYRULE_FIELD), "Hyrule Field", "HF Southeast Grotto", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "chest", 1}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_HF_NEAR_MARKET_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_HF_NEAR_MARKET_OFFSET), {{ SCENE_GROTTOS, 0x00 }}, "HF Near Market Grotto", "Hyrule Field", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_HF_NEAR_KAK_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_HF_NEAR_KAK_OFFSET), {{ SCENE_GROTTOS, 0x01 }}, "HF Near Kak Grotto", "Hyrule Field", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "spider"}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_HF_TEKTITE_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_HF_TEKTITE_OFFSET), {{ SCENE_GROTTOS, 0x0B }}, "HF Tektite Grotto", "Hyrule Field", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "water"}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_HF_FAIRY_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_HF_FAIRY_OFFSET), {{ SCENE_FAIRYS_FOUNTAIN, 0x00 }}, "HF Fairy Grotto", "Hyrule Field", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_HF_COW_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_HF_COW_OFFSET), {{ SCENE_GROTTOS, 0x05 }}, "HF Cow Grotto", "Hyrule Field", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "webbed"}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_HF_OPEN_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_HF_OPEN_OFFSET), {{ SCENE_GROTTOS, 0x00 }}, "HF Open Grotto", "Hyrule Field", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "chest"}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_HF_INSIDE_FENCE_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_HF_INSIDE_FENCE_OFFSET), {{ SCENE_GROTTOS, 0x02 }}, "HF Inside Fence Grotto", "Hyrule Field", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "srubs"}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_HF_SOUTHEAST_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_HF_SOUTHEAST_OFFSET), {{ SCENE_GROTTOS, 0x00 }}, "HF Southeast Grotto", "Hyrule Field", ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_GROTTO, "chest"}, // Lon Lon Ranch - { 0x01F9, 0x0157, SINGLE_SCENE_INFO(0x63), "Lon Lon Ranch", "Hyrule Field", ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_OVERWORLD, "hf"}, - { 0x004F, 0x0378, SINGLE_SCENE_INFO(0x63), "Lon Lon Ranch", "Talon's House", ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_INTERIOR, "llr", 1}, - { 0x02F9, 0x042F, SINGLE_SCENE_INFO(0x63), "Lon Lon Ranch", "LLR Stables", ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_INTERIOR, "cow", 1}, - { 0x05D0, 0x05D4, SINGLE_SCENE_INFO(0x63), "Lon Lon Ranch", "LLR Tower", ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_INTERIOR, "cow", 1}, - { 0x0715, 0x0815, SINGLE_SCENE_INFO(0x63), "Lon Lon Ranch", "LLR Grotto", ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_GROTTO, "scrubs", 1}, - { 0x0378, 0x004F, {{ 0x4C, 0x00 }}, "Talon's House", "Lon Lon Ranch", ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_INTERIOR, "llr"}, - { 0x042F, 0x02F9, SINGLE_SCENE_INFO(0x36), "LLR Stables", "Lon Lon Ranch", ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_INTERIOR, "cow"}, - { 0x05D4, 0x05D0, {{ 0x4C, 0x01 }}, "LLR Tower", "Lon Lon Ranch", ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_INTERIOR, "cow"}, - { 0x0815, 0x0715, {{ 0x3E, 0x04 }}, "LLR Grotto", "Lon Lon Ranch", ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_GROTTO, "scrubs"}, + { ENTR_HYRULE_FIELD_6, ENTR_LON_LON_RANCH_0, SINGLE_SCENE_INFO(SCENE_LON_LON_RANCH), "Lon Lon Ranch", "Hyrule Field", ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_OVERWORLD, "hf"}, + { ENTR_LON_LON_BUILDINGS_0, ENTR_LON_LON_RANCH_4, SINGLE_SCENE_INFO(SCENE_LON_LON_RANCH), "Lon Lon Ranch", "Talon's House", ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_INTERIOR, "llr", 1}, + { ENTR_STABLE_0, ENTR_LON_LON_RANCH_5, SINGLE_SCENE_INFO(SCENE_LON_LON_RANCH), "Lon Lon Ranch", "LLR Stables", ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_INTERIOR, "cow", 1}, + { ENTR_LON_LON_BUILDINGS_1, ENTR_LON_LON_RANCH_10, SINGLE_SCENE_INFO(SCENE_LON_LON_RANCH), "Lon Lon Ranch", "LLR Tower", ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_INTERIOR, "cow", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_LLR_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_LLR_OFFSET), SINGLE_SCENE_INFO(SCENE_LON_LON_RANCH), "Lon Lon Ranch", "LLR Grotto", ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_GROTTO, "scrubs", 1}, + { ENTR_LON_LON_RANCH_4, ENTR_LON_LON_BUILDINGS_0, {{ SCENE_LON_LON_BUILDINGS, 0x00 }}, "Talon's House", "Lon Lon Ranch", ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_INTERIOR, "llr"}, + { ENTR_LON_LON_RANCH_5, ENTR_STABLE_0, SINGLE_SCENE_INFO(SCENE_STABLE), "LLR Stables", "Lon Lon Ranch", ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_INTERIOR, "cow"}, + { ENTR_LON_LON_RANCH_10, ENTR_LON_LON_BUILDINGS_1, {{ SCENE_LON_LON_BUILDINGS, 0x01 }}, "LLR Tower", "Lon Lon Ranch", ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_INTERIOR, "cow"}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_LLR_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_LLR_OFFSET), {{ SCENE_GROTTOS, 0x04 }}, "LLR Grotto", "Lon Lon Ranch", ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_GROUP_LON_LON_RANCH, ENTRANCE_TYPE_GROTTO, "scrubs"}, // Lake Hylia - { 0x0189, 0x0102, SINGLE_SCENE_INFO(0x57), "Lake Hylia", "Hyrule Field", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_OVERWORLD, "lh"}, - { 0x0328, 0x0560, SINGLE_SCENE_INFO(0x57), "Lake Hylia", "Zora's Domain", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_TYPE_OVERWORLD, "lh"}, - { 0x0043, 0x03CC, SINGLE_SCENE_INFO(0x57), "Lake Hylia", "LH Lab", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_INTERIOR, "lh", 1}, - { 0x045F, 0x0309, SINGLE_SCENE_INFO(0x57), "Lake Hylia", "Fishing Hole", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_INTERIOR, "lh", 1}, - { 0x0701, 0x0801, SINGLE_SCENE_INFO(0x57), "Lake Hylia", "LH Grotto", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_GROTTO, "scrubs", 1}, - { 0x0010, 0x021D, SINGLE_SCENE_INFO(0x57), "Lake Hylia", "Water Temple", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_DUNGEON, "lh", 1}, - { 0x03CC, 0x0043, SINGLE_SCENE_INFO(0x38), "LH Lab", "Lake Hylia", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_INTERIOR, "lh"}, - { 0x0309, 0x045F, SINGLE_SCENE_INFO(0x49), "Fishing Hole", "Lake Hylia", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_INTERIOR, "lh"}, - { 0x0801, 0x0701, {{ 0x3E, 0x04 }}, "LH Grotto", "Lake Hylia", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_GROTTO, "lh,scrubs"}, - { 0x021D, 0x0010, SINGLE_SCENE_INFO(0x05), "Water Temple", "Lake Hylia", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_DUNGEON, "lh"}, - { 0x0417, 0x0423, SINGLE_SCENE_INFO(0x05), "Water Temple Boss Door", "Morpha", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_DUNGEON, "lh", 1}, - { 0x0423, 0x0417, SINGLE_SCENE_INFO(0x16), "Morpha", "Water Temple Boss Door", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_DUNGEON, "lh", 1}, + { ENTR_HYRULE_FIELD_4, ENTR_LAKE_HYLIA_0, SINGLE_SCENE_INFO(SCENE_LAKE_HYLIA), "Lake Hylia", "Hyrule Field", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_OVERWORLD, "lh"}, + { ENTR_ZORAS_DOMAIN_4, ENTR_LAKE_HYLIA_7, SINGLE_SCENE_INFO(SCENE_LAKE_HYLIA), "Lake Hylia", "Zora's Domain", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_ZORAS_DOMAIN, ENTRANCE_TYPE_OVERWORLD, "lh"}, + { ENTR_LAKESIDE_LABORATORY_0, ENTR_LAKE_HYLIA_4, SINGLE_SCENE_INFO(SCENE_LAKE_HYLIA), "Lake Hylia", "LH Lab", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_INTERIOR, "lh", 1}, + { ENTR_FISHING_POND_0, ENTR_LAKE_HYLIA_6, SINGLE_SCENE_INFO(SCENE_LAKE_HYLIA), "Lake Hylia", "Fishing Hole", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_INTERIOR, "lh", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_LH_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_LH_OFFSET), SINGLE_SCENE_INFO(SCENE_LAKE_HYLIA), "Lake Hylia", "LH Grotto", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_GROTTO, "scrubs", 1}, + { ENTR_WATER_TEMPLE_0, ENTR_LAKE_HYLIA_2, SINGLE_SCENE_INFO(SCENE_LAKE_HYLIA), "Lake Hylia", "Water Temple", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_DUNGEON, "lh", 1}, + { ENTR_LAKE_HYLIA_4, ENTR_LAKESIDE_LABORATORY_0, SINGLE_SCENE_INFO(SCENE_LAKESIDE_LABORATORY), "LH Lab", "Lake Hylia", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_INTERIOR, "lh"}, + { ENTR_LAKE_HYLIA_6, ENTR_FISHING_POND_0, SINGLE_SCENE_INFO(SCENE_FISHING_POND), "Fishing Hole", "Lake Hylia", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_INTERIOR, "lh"}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_LH_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_LH_OFFSET), {{ SCENE_GROTTOS, 0x04 }}, "LH Grotto", "Lake Hylia", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_GROTTO, "lh,scrubs"}, + { ENTR_LAKE_HYLIA_2, ENTR_WATER_TEMPLE_0, SINGLE_SCENE_INFO(SCENE_WATER_TEMPLE), "Water Temple", "Lake Hylia", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_DUNGEON, "lh"}, + { ENTR_WATER_TEMPLE_BOSS_0, ENTR_WATER_TEMPLE_1, SINGLE_SCENE_INFO(SCENE_WATER_TEMPLE), "Water Temple Boss Door", "Morpha", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_DUNGEON, "lh", 1}, + { ENTR_WATER_TEMPLE_1, ENTR_WATER_TEMPLE_BOSS_0, SINGLE_SCENE_INFO(SCENE_WATER_TEMPLE_BOSS), "Morpha", "Water Temple Boss Door", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_DUNGEON, "lh", 1}, // Gerudo Area - { 0x018D, 0x0117, SINGLE_SCENE_INFO(0x5A), "GV", "Hyrule Field", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_OVERWORLD, "hf"}, - { 0x0129, 0x022D, SINGLE_SCENE_INFO(0x5A), "GV", "GF", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_OVERWORLD, "gerudo fortress"}, - { 0x0219, -1, SINGLE_SCENE_INFO(0x5A), "GV", "Lake Hylia", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_OVERWORLD, "lh"}, - { 0x03A0, 0x03D0, SINGLE_SCENE_INFO(0x5A), "GV", "Carpenters' Tent", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x071F, 0x081F, SINGLE_SCENE_INFO(0x5A), "GV", "GV Octorok Grotto", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_GROTTO, "", 1}, - { 0x071E, 0x081E, SINGLE_SCENE_INFO(0x5A), "GV", "GV Storms Grotto", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_GROTTO, "scrubs", 1}, - { 0x022D, 0x0129, SINGLE_SCENE_INFO(0x5D), "GF", "GV", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_OVERWORLD, "gerudo fortress"}, - { 0x0130, 0x03AC, SINGLE_SCENE_INFO(0x5D), "GF", "Haunted Wasteland", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_OVERWORLD, "gerudo fortress"}, - { 0x071D, 0x081D, SINGLE_SCENE_INFO(0x5D), "GF", "GF Storms Grotto", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_GROTTO, "gerudo fortress", 1}, - { 0x0008, 0x03A8, SINGLE_SCENE_INFO(0x5D), "GF", "Gerudo Training Grounds", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_DUNGEON, "gerudo fortress,gtg", 1}, - { 0x03D0, 0x03A0, SINGLE_SCENE_INFO(0x39), "Carpenters' Tent", "GV", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_INTERIOR}, - { 0x081F, 0x071F, {{ 0x3E, 0x06 }}, "GV Octorok Grotto", "GV", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_GROTTO}, - { 0x081E, 0x071E, {{ 0x3E, 0x0A }}, "GV Storms Grotto", "GV", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_GROTTO, "scrubs"}, - { 0x081D, 0x071D, {{ 0x3C, 0x00 }}, "GF Storms Grotto", "GF", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_GROTTO, "gerudo fortress"}, - { 0x03A8, 0x0008, SINGLE_SCENE_INFO(0x0B), "Gerudo Training Grounds", "GF", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_DUNGEON, "gerudo fortress,gtg"}, + { ENTR_HYRULE_FIELD_5, ENTR_GERUDO_VALLEY_0, SINGLE_SCENE_INFO(SCENE_GERUDO_VALLEY), "GV", "Hyrule Field", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_OVERWORLD, "hf"}, + { ENTR_GERUDOS_FORTRESS_0, ENTR_GERUDO_VALLEY_3, SINGLE_SCENE_INFO(SCENE_GERUDO_VALLEY), "GV", "GF", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_OVERWORLD, "gerudo fortress"}, + { ENTR_GERUDOS_FORTRESS_0_5, -1, SINGLE_SCENE_INFO(SCENE_GERUDO_VALLEY), "GV", "Lake Hylia", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_TYPE_OVERWORLD, "lh"}, + { ENTR_CARPENTERS_TENT_0, ENTR_GERUDO_VALLEY_4, SINGLE_SCENE_INFO(SCENE_GERUDO_VALLEY), "GV", "Carpenters' Tent", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_GV_OCTOROK_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_GV_OCTOROK_OFFSET), SINGLE_SCENE_INFO(SCENE_GERUDO_VALLEY), "GV", "GV Octorok Grotto", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_GROTTO, "", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_GV_STORMS_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_GV_STORMS_OFFSET), SINGLE_SCENE_INFO(SCENE_GERUDO_VALLEY), "GV", "GV Storms Grotto", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_GROTTO, "scrubs", 1}, + { ENTR_GERUDO_VALLEY_3, ENTR_GERUDOS_FORTRESS_0, SINGLE_SCENE_INFO(SCENE_GERUDOS_FORTRESS), "GF", "GV", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_OVERWORLD, "gerudo fortress"}, + { ENTR_HAUNTED_WASTELAND_0, ENTR_GERUDOS_FORTRESS_15, SINGLE_SCENE_INFO(SCENE_GERUDOS_FORTRESS), "GF", "Haunted Wasteland", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_OVERWORLD, "gerudo fortress"}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_GF_STORMS_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_GF_STORMS_OFFSET), SINGLE_SCENE_INFO(SCENE_GERUDOS_FORTRESS), "GF", "GF Storms Grotto", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_GROTTO, "gerudo fortress", 1}, + { ENTR_GERUDO_TRAINING_GROUND_0, ENTR_GERUDOS_FORTRESS_14, SINGLE_SCENE_INFO(SCENE_GERUDOS_FORTRESS), "GF", "Gerudo Training Grounds", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_DUNGEON, "gerudo fortress,gtg", 1}, + { ENTR_GERUDO_VALLEY_4, ENTR_CARPENTERS_TENT_0, SINGLE_SCENE_INFO(SCENE_CARPENTERS_TENT), "Carpenters' Tent", "GV", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_INTERIOR}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_GV_OCTOROK_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_GV_OCTOROK_OFFSET), {{ SCENE_GROTTOS, 0x06 }}, "GV Octorok Grotto", "GV", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_GROTTO}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_GV_STORMS_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_GV_STORMS_OFFSET), {{ SCENE_GROTTOS, 0x0A }}, "GV Storms Grotto", "GV", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_GROTTO, "scrubs"}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_GF_STORMS_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_GF_STORMS_OFFSET), {{ SCENE_FAIRYS_FOUNTAIN, 0x00 }}, "GF Storms Grotto", "GF", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_GROTTO, "gerudo fortress"}, + { ENTR_GERUDOS_FORTRESS_14, ENTR_GERUDO_TRAINING_GROUND_0, SINGLE_SCENE_INFO(SCENE_GERUDO_TRAINING_GROUND), "Gerudo Training Grounds", "GF", ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_DUNGEON, "gerudo fortress,gtg"}, // The Wasteland - { 0x03AC, 0x0130, SINGLE_SCENE_INFO(0x5E), "Haunted Wasteland", "GF", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_OVERWORLD, "hw,gerudo fortress"}, - { 0x0123, 0x0365, SINGLE_SCENE_INFO(0x5E), "Haunted Wasteland", "Desert Colossus", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_OVERWORLD, "dc,hw"}, - { 0x0365, 0x0123, SINGLE_SCENE_INFO(0x5C), "Desert Colossus", "Haunted Wasteland", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_OVERWORLD, "dc,hw"}, - { 0x0588, 0x057C, SINGLE_SCENE_INFO(0x5C), "Desert Colossus", "Colossus Great Fairy Fountain", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_INTERIOR, "dc", 1}, - { 0x0700, 0x0800, SINGLE_SCENE_INFO(0x5C), "Desert Colossus", "Colossus Grotto", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_GROTTO, "dc,scrubs", 1}, - { 0x0082, 0x01E1, SINGLE_SCENE_INFO(0x5C), "Desert Colossus", "Spirit Temple", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_DUNGEON, "dc", 1}, - { 0x057C, 0x0588, {{ 0x3D, 0x02 }}, "Colossus Great Fairy Fountain", "Colossus", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_INTERIOR, "dc"}, - { 0x0800, 0x0700, {{ 0x3E, 0x0A }}, "Colossus Grotto", "Desert Colossus", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_GROTTO, "dc,scrubs"}, - { 0x01E1, 0x0082, SINGLE_SCENE_INFO(0x06), "Spirit Temple", "Desert Colossus", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_DUNGEON, "dc"}, - { 0x008D, 0x02F5, SINGLE_SCENE_INFO(0x06), "Spirit Temple Boss Door", "Twinrova", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_DUNGEON, "", 1}, - { 0x02F5, 0x008D, SINGLE_SCENE_INFO(0x17), "Twinrova", "Spirit Temple Boss Door", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_DUNGEON, "", 1}, + { ENTR_GERUDOS_FORTRESS_15, ENTR_HAUNTED_WASTELAND_0, SINGLE_SCENE_INFO(SCENE_HAUNTED_WASTELAND), "Haunted Wasteland", "GF", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_TYPE_OVERWORLD, "hw,gerudo fortress"}, + { ENTR_DESERT_COLOSSUS_0, ENTR_HAUNTED_WASTELAND_1, SINGLE_SCENE_INFO(SCENE_HAUNTED_WASTELAND), "Haunted Wasteland", "Desert Colossus", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_OVERWORLD, "dc,hw"}, + { ENTR_HAUNTED_WASTELAND_1, ENTR_DESERT_COLOSSUS_0, SINGLE_SCENE_INFO(SCENE_DESERT_COLOSSUS), "Desert Colossus", "Haunted Wasteland", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_OVERWORLD, "dc,hw"}, + { ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_2, ENTR_DESERT_COLOSSUS_7, SINGLE_SCENE_INFO(SCENE_DESERT_COLOSSUS), "Desert Colossus", "Colossus Great Fairy Fountain", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_INTERIOR, "dc", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_COLOSSUS_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_COLOSSUS_OFFSET), SINGLE_SCENE_INFO(SCENE_DESERT_COLOSSUS), "Desert Colossus", "Colossus Grotto", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_GROTTO, "dc,scrubs", 1}, + { ENTR_SPIRIT_TEMPLE_0, ENTR_DESERT_COLOSSUS_1, SINGLE_SCENE_INFO(SCENE_DESERT_COLOSSUS), "Desert Colossus", "Spirit Temple", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_DUNGEON, "dc", 1}, + { ENTR_DESERT_COLOSSUS_7, ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_2, {{ SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 0x02 }}, "Colossus Great Fairy Fountain", "Colossus", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_INTERIOR, "dc"}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_COLOSSUS_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_COLOSSUS_OFFSET), {{ SCENE_GROTTOS, 0x0A }}, "Colossus Grotto", "Desert Colossus", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_GROTTO, "dc,scrubs"}, + { ENTR_DESERT_COLOSSUS_1, ENTR_SPIRIT_TEMPLE_0, SINGLE_SCENE_INFO(SCENE_SPIRIT_TEMPLE), "Spirit Temple", "Desert Colossus", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_DUNGEON, "dc"}, + { ENTR_SPIRIT_TEMPLE_BOSS_0, ENTR_SPIRIT_TEMPLE_1, SINGLE_SCENE_INFO(SCENE_SPIRIT_TEMPLE), "Spirit Temple Boss Door", "Twinrova", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_DUNGEON, "", 1}, + { ENTR_SPIRIT_TEMPLE_1, ENTR_SPIRIT_TEMPLE_BOSS_0, SINGLE_SCENE_INFO(SCENE_SPIRIT_TEMPLE_BOSS), "Twinrova", "Spirit Temple Boss Door", ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_DUNGEON, "", 1}, // Market - { 0x01FD, 0x0276, {SCENE_NO_SPAWN(0x1B), SCENE_NO_SPAWN(0x1C), SCENE_NO_SPAWN(0x1D)}, "Market Entrance", "Hyrule Field", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_OVERWORLD, "hf"}, - { 0x00B1, 0x0033, {SCENE_NO_SPAWN(0x1B), SCENE_NO_SPAWN(0x1C), SCENE_NO_SPAWN(0x1D)}, "Market Entrance", "Market", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_OVERWORLD}, - { 0x007E, 0x026E, {SCENE_NO_SPAWN(0x1B), SCENE_NO_SPAWN(0x1C), SCENE_NO_SPAWN(0x1D)}, "Market Entrance", "Guard House", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "pots,poe", 1}, - { 0x0033, 0x00B1, {SCENE_NO_SPAWN(0x20), SCENE_NO_SPAWN(0x21), SCENE_NO_SPAWN(0x22), SCENE_NO_SPAWN(0x1E), SCENE_NO_SPAWN(0x1F)}, "Market", "Market Entrance", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_OVERWORLD}, - { 0x0138, 0x025A, {SCENE_NO_SPAWN(0x20), SCENE_NO_SPAWN(0x21), SCENE_NO_SPAWN(0x22), SCENE_NO_SPAWN(0x1E), SCENE_NO_SPAWN(0x1F)}, "Market", "HC Grounds / OGC", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_TYPE_OVERWORLD, "outside ganon's castle"}, - { 0x0171, 0x025E, {SCENE_NO_SPAWN(0x20), SCENE_NO_SPAWN(0x21), SCENE_NO_SPAWN(0x22), SCENE_NO_SPAWN(0x1E), SCENE_NO_SPAWN(0x1F)}, "Market", "Outside Temple of Time", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_OVERWORLD}, - { 0x016D, 0x01CD, {SCENE_NO_SPAWN(0x20), SCENE_NO_SPAWN(0x21), SCENE_NO_SPAWN(0x22), SCENE_NO_SPAWN(0x1E), SCENE_NO_SPAWN(0x1F)}, "Market", "MK Shooting Gallery", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "child", 1}, - { 0x0507, 0x03BC, {SCENE_NO_SPAWN(0x20), SCENE_NO_SPAWN(0x21), SCENE_NO_SPAWN(0x22), SCENE_NO_SPAWN(0x1E), SCENE_NO_SPAWN(0x1F)}, "Market", "Bombchu Bowling", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x0063, 0x01D5, {SCENE_NO_SPAWN(0x20), SCENE_NO_SPAWN(0x21), SCENE_NO_SPAWN(0x22), SCENE_NO_SPAWN(0x1E), SCENE_NO_SPAWN(0x1F)}, "Market", "Treasure Chest Game", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x043B, 0x0067, {SCENE_NO_SPAWN(0x20), SCENE_NO_SPAWN(0x21), SCENE_NO_SPAWN(0x22), SCENE_NO_SPAWN(0x1E), SCENE_NO_SPAWN(0x1F)}, "Market", "Man-in-Green's House", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x0530, 0x01D1, {SCENE_NO_SPAWN(0x20), SCENE_NO_SPAWN(0x21), SCENE_NO_SPAWN(0x22), SCENE_NO_SPAWN(0x1E), SCENE_NO_SPAWN(0x1F)}, "Market", "Mask Shop", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x052C, 0x03B8, {SCENE_NO_SPAWN(0x20), SCENE_NO_SPAWN(0x21), SCENE_NO_SPAWN(0x22), SCENE_NO_SPAWN(0x1E), SCENE_NO_SPAWN(0x1F)}, "Market", "MK Bazaar", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "shop", 1}, - { 0x0388, 0x02A2, {SCENE_NO_SPAWN(0x20), SCENE_NO_SPAWN(0x21), SCENE_NO_SPAWN(0x22), SCENE_NO_SPAWN(0x1E), SCENE_NO_SPAWN(0x1F)}, "Market", "MK Potion Shop", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x0528, 0x03C0, {SCENE_NO_SPAWN(0x20), SCENE_NO_SPAWN(0x21), SCENE_NO_SPAWN(0x22), SCENE_NO_SPAWN(0x1E), SCENE_NO_SPAWN(0x1F)}, "Market", "Bombchu Shop", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x026E, 0x007E, {{ 0x4D }}, "Guard House", "Market Entrance", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "pots,poe"}, - { 0x01CD, 0x016D, {{ 0x42, 0x01 }}, "MK Shooting Gallery", "Market", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR}, - { 0x03BC, 0x0507, SINGLE_SCENE_INFO(0x4B), "Bombchu Bowling", "Market", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR}, - { 0x01D5, 0x0063, SINGLE_SCENE_INFO(0x10), "Treasure Chest Game", "Market", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR}, - { 0x0067, 0x043B, SINGLE_SCENE_INFO(0x2B), "Man-in-Green's House", "Market", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR}, - { 0x01D1, 0x0530, SINGLE_SCENE_INFO(0x33), "Mask Shop", "Market", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR}, - { 0x03B8, 0x052C, {{ 0x2C, 0x01 }}, "MK Bazaar", "Market", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "shop"}, - { 0x02A2, 0x0388, SINGLE_SCENE_INFO(0x31), "MK Potion Shop", "Market", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR}, - { 0x03C0, 0x0528, SINGLE_SCENE_INFO(0x32), "Bombchu Shop", "Market", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR}, - { 0x025E, 0x0171, {SCENE_NO_SPAWN(0x23), SCENE_NO_SPAWN(0x24), SCENE_NO_SPAWN(0x25)}, "Outside Temple of Time", "Market", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_OVERWORLD, "tot"}, - { 0x0053, 0x0472, {SCENE_NO_SPAWN(0x23), SCENE_NO_SPAWN(0x24), SCENE_NO_SPAWN(0x25)}, "Outside Temple of Time", "Temple of Time", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "tot", 1}, - { 0x0472, 0x0053, SINGLE_SCENE_INFO(0x43), "Temple of Time", "Outside Temple of Time", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "tot"}, + { ENTR_HYRULE_FIELD_7, ENTR_MARKET_ENTRANCE_DAY_1, {SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_DAY), SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_RUINS)}, "Market Entrance", "Hyrule Field", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_HYRULE_FIELD, ENTRANCE_TYPE_OVERWORLD, "hf"}, + { ENTR_MARKET_DAY_0, ENTR_MARKET_ENTRANCE_DAY_0, {SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_DAY), SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_RUINS)}, "Market Entrance", "Market", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_OVERWORLD}, + { ENTR_MARKET_GUARD_HOUSE_0, ENTR_MARKET_ENTRANCE_DAY_2, {SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_DAY), SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_RUINS)}, "Market Entrance", "Guard House", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "pots,poe", 1}, + { ENTR_MARKET_ENTRANCE_DAY_0, ENTR_MARKET_DAY_0, {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "Market", "Market Entrance", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_OVERWORLD}, + { ENTR_HYRULE_CASTLE_0, ENTR_MARKET_DAY_1, {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "Market", "HC Grounds / OGC", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_TYPE_OVERWORLD, "outside ganon's castle"}, + { ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_0, ENTR_MARKET_DAY_2, {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "Market", "Outside Temple of Time", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_OVERWORLD}, + { ENTR_SHOOTING_GALLERY_1, ENTR_MARKET_DAY_8, {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "Market", "MK Shooting Gallery", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "child", 1}, + { ENTR_BOMBCHU_BOWLING_ALLEY_0, ENTR_MARKET_DAY_7, {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "Market", "Bombchu Bowling", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTR_TREASURE_BOX_SHOP_0, ENTR_MARKET_DAY_10, {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "Market", "Treasure Chest Game", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTR_BACK_ALLEY_HOUSE_0, ENTR_BACK_ALLEY_DAY_3, {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "Market", "Man-in-Green's House", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTR_HAPPY_MASK_SHOP_0, ENTR_MARKET_DAY_9, {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "Market", "Mask Shop", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTR_BAZAAR_1, ENTR_MARKET_DAY_6, {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "Market", "MK Bazaar", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "shop", 1}, + { ENTR_POTION_SHOP_MARKET_0, ENTR_MARKET_DAY_5, {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "Market", "MK Potion Shop", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTR_BOMBCHU_SHOP_1, ENTR_BACK_ALLEY_DAY_2, {SCENE_NO_SPAWN(SCENE_MARKET_DAY), SCENE_NO_SPAWN(SCENE_MARKET_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_RUINS), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_DAY), SCENE_NO_SPAWN(SCENE_BACK_ALLEY_NIGHT)}, "Market", "Bombchu Shop", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTR_MARKET_ENTRANCE_DAY_2, ENTR_MARKET_GUARD_HOUSE_0, {{ SCENE_MARKET_GUARD_HOUSE }}, "Guard House", "Market Entrance", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "pots,poe"}, + { ENTR_MARKET_DAY_8, ENTR_SHOOTING_GALLERY_1, {{ SCENE_SHOOTING_GALLERY, 0x01 }}, "MK Shooting Gallery", "Market", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR}, + { ENTR_MARKET_DAY_7, ENTR_BOMBCHU_BOWLING_ALLEY_0, SINGLE_SCENE_INFO(SCENE_BOMBCHU_BOWLING_ALLEY), "Bombchu Bowling", "Market", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR}, + { ENTR_MARKET_DAY_10, ENTR_TREASURE_BOX_SHOP_0, SINGLE_SCENE_INFO(SCENE_TREASURE_BOX_SHOP), "Treasure Chest Game", "Market", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR}, + { ENTR_BACK_ALLEY_DAY_3, ENTR_BACK_ALLEY_HOUSE_0, SINGLE_SCENE_INFO(SCENE_BACK_ALLEY_HOUSE), "Man-in-Green's House", "Market", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR}, + { ENTR_MARKET_DAY_9, ENTR_HAPPY_MASK_SHOP_0, SINGLE_SCENE_INFO(SCENE_HAPPY_MASK_SHOP), "Mask Shop", "Market", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR}, + { ENTR_MARKET_DAY_6, ENTR_BAZAAR_1, {{ SCENE_BAZAAR, 0x01 }}, "MK Bazaar", "Market", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "shop"}, + { ENTR_MARKET_DAY_5, ENTR_POTION_SHOP_MARKET_0, SINGLE_SCENE_INFO(SCENE_POTION_SHOP_MARKET), "MK Potion Shop", "Market", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR}, + { ENTR_BACK_ALLEY_DAY_2, ENTR_BOMBCHU_SHOP_1, SINGLE_SCENE_INFO(SCENE_BOMBCHU_SHOP), "Bombchu Shop", "Market", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR}, + { ENTR_MARKET_DAY_2, ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_0, {SCENE_NO_SPAWN(SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY), SCENE_NO_SPAWN(SCENE_TEMPLE_OF_TIME_EXTERIOR_NIGHT), SCENE_NO_SPAWN(SCENE_TEMPLE_OF_TIME_EXTERIOR_RUINS)}, "Outside Temple of Time", "Market", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_OVERWORLD, "tot"}, + { ENTR_TEMPLE_OF_TIME_0, ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_1, {SCENE_NO_SPAWN(SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY), SCENE_NO_SPAWN(SCENE_TEMPLE_OF_TIME_EXTERIOR_NIGHT), SCENE_NO_SPAWN(SCENE_TEMPLE_OF_TIME_EXTERIOR_RUINS)}, "Outside Temple of Time", "Temple of Time", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "tot", 1}, + { ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_1, ENTR_TEMPLE_OF_TIME_0, SINGLE_SCENE_INFO(SCENE_TEMPLE_OF_TIME), "Temple of Time", "Outside Temple of Time", ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_INTERIOR, "tot"}, // Hyrule Castle - { 0x025A, 0x0138, {SCENE_NO_SPAWN(0x5F), SCENE_NO_SPAWN(0x64)}, "HC Grounds / OGC", "Market", ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_OVERWORLD, "outside ganon's castle"}, - { 0x0578, 0x0340, SINGLE_SCENE_INFO(0x5F), "HC Grounds", "HC Great Fairy Fountain", ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_TYPE_INTERIOR, "", 1}, - { 0x070C, 0x080C, SINGLE_SCENE_INFO(0x5F), "HC Grounds", "HC Storms Grotto", ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_TYPE_GROTTO, "bombable", 1}, - { 0x0340, 0x0578, {{ 0x3D, 0x01 }}, "HC Great Fairy Fountain", "HC Grounds", ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_TYPE_INTERIOR}, - { 0x080C, 0x070C, {{ 0x3E, 0x09 }}, "HC Storms Grotto", "HC Grounds", ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_TYPE_GROTTO, "bombable"}, - { 0x04C2, 0x03E8, SINGLE_SCENE_INFO(0x64), "OGC", "OGC Great Fairy Fountain", ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_TYPE_INTERIOR, "outside ganon's castle", 1}, - { 0x0467, 0x023D, SINGLE_SCENE_INFO(0x64), "OGC", "Ganon's Castle", ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_TYPE_DUNGEON, "outside ganon's castle,gc", 1}, - { 0x03E8, 0x04C2, {{ 0x3B, 0x02 }}, "OGC Great Fairy Fountain", "OGC", ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_TYPE_INTERIOR, "outside ganon's castle"}, - { 0x023D, 0x0467, SINGLE_SCENE_INFO(0x0D), "Ganon's Castle", "OGC", ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_TYPE_DUNGEON, "outside ganon's castle,gc"} + { ENTR_MARKET_DAY_1, ENTR_HYRULE_CASTLE_0, {SCENE_NO_SPAWN(SCENE_HYRULE_CASTLE), SCENE_NO_SPAWN(SCENE_OUTSIDE_GANONS_CASTLE)}, "HC Grounds / OGC", "Market", ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_GROUP_MARKET, ENTRANCE_TYPE_OVERWORLD, "outside ganon's castle"}, + { ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_1, ENTR_HYRULE_CASTLE_2, SINGLE_SCENE_INFO(SCENE_HYRULE_CASTLE), "HC Grounds", "HC Great Fairy Fountain", ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_TYPE_INTERIOR, "", 1}, + { ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_HC_STORMS_OFFSET), ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_HC_STORMS_OFFSET), SINGLE_SCENE_INFO(SCENE_HYRULE_CASTLE), "HC Grounds", "HC Storms Grotto", ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_TYPE_GROTTO, "bombable", 1}, + { ENTR_HYRULE_CASTLE_2, ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_1, {{ SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS, 0x01 }}, "HC Great Fairy Fountain", "HC Grounds", ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_TYPE_INTERIOR}, + { ENTRANCE_RANDO_GROTTO_EXIT(GROTTO_HC_STORMS_OFFSET), ENTRANCE_RANDO_GROTTO_LOAD(GROTTO_HC_STORMS_OFFSET), {{ SCENE_GROTTOS, 0x09 }}, "HC Storms Grotto", "HC Grounds", ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_TYPE_GROTTO, "bombable"}, + { ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_2, ENTR_POTION_SHOP_KAKARIKO_1, SINGLE_SCENE_INFO(SCENE_OUTSIDE_GANONS_CASTLE), "OGC", "OGC Great Fairy Fountain", ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_TYPE_INTERIOR, "outside ganon's castle", 1}, + { ENTR_INSIDE_GANONS_CASTLE_0, ENTR_HYRULE_CASTLE_1, SINGLE_SCENE_INFO(SCENE_OUTSIDE_GANONS_CASTLE), "OGC", "Ganon's Castle", ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_TYPE_DUNGEON, "outside ganon's castle,gc", 1}, + { ENTR_POTION_SHOP_KAKARIKO_1, ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_2, {{ SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC, 0x02 }}, "OGC Great Fairy Fountain", "OGC", ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_TYPE_INTERIOR, "outside ganon's castle"}, + { ENTR_HYRULE_CASTLE_1, ENTR_INSIDE_GANONS_CASTLE_0, SINGLE_SCENE_INFO(SCENE_INSIDE_GANONS_CASTLE), "Ganon's Castle", "OGC", ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_GROUP_HYRULE_CASTLE, ENTRANCE_TYPE_DUNGEON, "outside ganon's castle,gc"} }; // Check if Link is in the area and return that scene/entrance for tracking @@ -412,9 +413,9 @@ bool IsEntranceDiscovered(s16 index) { if (!isDiscovered) { // If the pair included one of the hyrule field <-> zora's river entrances, // the randomizer will have also overriden the water-based entrances, so check those too - if ((index == 0x00EA && Entrance_GetIsEntranceDiscovered(0x01D9)) || (index == 0x01D9 && Entrance_GetIsEntranceDiscovered(0x00EA))) { + if ((index == ENTR_ZORAS_RIVER_0 && Entrance_GetIsEntranceDiscovered(ENTR_ZORAS_RIVER_3)) || (index == ENTR_ZORAS_RIVER_3 && Entrance_GetIsEntranceDiscovered(ENTR_ZORAS_RIVER_0))) { isDiscovered = true; - } else if ((index == 0x0181 && Entrance_GetIsEntranceDiscovered(0x0311)) || (index == 0x0311 && Entrance_GetIsEntranceDiscovered(0x0181))) { + } else if ((index == ENTR_HYRULE_FIELD_2 && Entrance_GetIsEntranceDiscovered(ENTR_HYRULE_FIELD_14)) || (index == ENTR_HYRULE_FIELD_14 && Entrance_GetIsEntranceDiscovered(ENTR_HYRULE_FIELD_2))) { isDiscovered = true; } } diff --git a/soh/soh/Enhancements/randomizer/randomizer_grotto.c b/soh/soh/Enhancements/randomizer/randomizer_grotto.c index 408dc0160..b552dd2cd 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_grotto.c +++ b/soh/soh/Enhancements/randomizer/randomizer_grotto.c @@ -11,76 +11,76 @@ extern PlayState* gPlayState; // Information necessary for entering each grotto static const GrottoLoadInfo grottoLoadTable[NUM_GROTTOS] = { - {.entranceIndex = 0x05BC, .content = 0xFD, .scene = 0x5C}, // Desert Colossus -> Colossus Grotto - {.entranceIndex = 0x05A4, .content = 0xEF, .scene = 0x57}, // Lake Hylia -> LH Grotto - {.entranceIndex = 0x05BC, .content = 0xEB, .scene = 0x54}, // Zora River -> ZR Storms Grotto - {.entranceIndex = 0x036D, .content = 0xE6, .scene = 0x54}, // Zora River -> ZR Fairy Grotto - {.entranceIndex = 0x003F, .content = 0x29, .scene = 0x54}, // Zora River -> ZR Open Grotto - {.entranceIndex = 0x05A4, .content = 0xF9, .scene = 0x61}, // DMC Lower Nearby -> DMC Hammer Grotto - {.entranceIndex = 0x003F, .content = 0x7A, .scene = 0x61}, // DMC Upper Nearby -> DMC Upper Grotto - {.entranceIndex = 0x05A4, .content = 0xFB, .scene = 0x62}, // GC Grotto Platform -> GC Grotto - {.entranceIndex = 0x003F, .content = 0x57, .scene = 0x60}, // Death Mountain -> DMT Storms Grotto - {.entranceIndex = 0x05FC, .content = 0xF8, .scene = 0x60}, // Death Mountain Summit -> DMT Cow Grotto - {.entranceIndex = 0x003F, .content = 0x28, .scene = 0x52}, // Kak Backyard -> Kak Open Grotto - {.entranceIndex = 0x05A0, .content = 0xE7, .scene = 0x52}, // Kakariko Village -> Kak Redead Grotto - {.entranceIndex = 0x05B8, .content = 0xF6, .scene = 0x5F}, // Hyrule Castle Grounds -> HC Storms Grotto - {.entranceIndex = 0x05C0, .content = 0xE1, .scene = 0x51}, // Hyrule Field -> HF Tektite Grotto - {.entranceIndex = 0x0598, .content = 0xE5, .scene = 0x51}, // Hyrule Field -> HF Near Kak Grotto - {.entranceIndex = 0x036D, .content = 0xFF, .scene = 0x51}, // Hyrule Field -> HF Fairy Grotto - {.entranceIndex = 0x003F, .content = 0x00, .scene = 0x51}, // Hyrule Field -> HF Near Market Grotto - {.entranceIndex = 0x05A8, .content = 0xE4, .scene = 0x51}, // Hyrule Field -> HF Cow Grotto - {.entranceIndex = 0x059C, .content = 0xE6, .scene = 0x51}, // Hyrule Field -> HF Inside Fence Grotto - {.entranceIndex = 0x003F, .content = 0x03, .scene = 0x51}, // Hyrule Field -> HF Open Grotto - {.entranceIndex = 0x003F, .content = 0x22, .scene = 0x51}, // Hyrule Field -> HF Southeast Grotto - {.entranceIndex = 0x05A4, .content = 0xFC, .scene = 0x63}, // Lon Lon Ranch -> LLR Grotto - {.entranceIndex = 0x05B4, .content = 0xED, .scene = 0x56}, // SFM Entryway -> SFM Wolfos Grotto - {.entranceIndex = 0x05BC, .content = 0xEE, .scene = 0x56}, // Sacred Forest Meadow -> SFM Storms Grotto - {.entranceIndex = 0x036D, .content = 0xFF, .scene = 0x56}, // Sacred Forest Meadow -> SFM Fairy Grotto - {.entranceIndex = 0x05B0, .content = 0xF5, .scene = 0x5B}, // LW Beyond Mido -> LW Scrubs Grotto - {.entranceIndex = 0x003F, .content = 0x14, .scene = 0x5B}, // Lost Woods -> LW Near Shortcuts Grotto - {.entranceIndex = 0x003F, .content = 0x2C, .scene = 0x55}, // Kokiri Forest -> KF Storms Grotto - {.entranceIndex = 0x036D, .content = 0xFF, .scene = 0x58}, // Zoras Domain -> ZD Storms Grotto - {.entranceIndex = 0x036D, .content = 0xFF, .scene = 0x5D}, // Gerudo Fortress -> GF Storms Grotto - {.entranceIndex = 0x05BC, .content = 0xF0, .scene = 0x5A}, // GV Fortress Side -> GV Storms Grotto - {.entranceIndex = 0x05AC, .content = 0xF2, .scene = 0x5A}, // GV Grotto Ledge -> GV Octorok Grotto - {.entranceIndex = 0x05C4, .content = 0xF3, .scene = 0x5B}, // LW Beyond Mido -> Deku Theater + {.entranceIndex = ENTR_GROTTOS_10, .content = 0xFD, .scene = SCENE_DESERT_COLOSSUS}, // Desert Colossus -> Colossus Grotto + {.entranceIndex = ENTR_GROTTOS_4, .content = 0xEF, .scene = SCENE_LAKE_HYLIA}, // Lake Hylia -> LH Grotto + {.entranceIndex = ENTR_GROTTOS_10, .content = 0xEB, .scene = SCENE_ZORAS_RIVER}, // Zora River -> ZR Storms Grotto + {.entranceIndex = ENTR_FAIRYS_FOUNTAIN_0, .content = 0xE6, .scene = SCENE_ZORAS_RIVER}, // Zora River -> ZR Fairy Grotto + {.entranceIndex = ENTR_GROTTOS_0, .content = 0x29, .scene = SCENE_ZORAS_RIVER}, // Zora River -> ZR Open Grotto + {.entranceIndex = ENTR_GROTTOS_4, .content = 0xF9, .scene = SCENE_DEATH_MOUNTAIN_CRATER}, // DMC Lower Nearby -> DMC Hammer Grotto + {.entranceIndex = ENTR_GROTTOS_0, .content = 0x7A, .scene = SCENE_DEATH_MOUNTAIN_CRATER}, // DMC Upper Nearby -> DMC Upper Grotto + {.entranceIndex = ENTR_GROTTOS_4, .content = 0xFB, .scene = SCENE_GORON_CITY}, // GC Grotto Platform -> GC Grotto + {.entranceIndex = ENTR_GROTTOS_0, .content = 0x57, .scene = SCENE_DEATH_MOUNTAIN_TRAIL}, // Death Mountain -> DMT Storms Grotto + {.entranceIndex = ENTR_GROTTOS_13, .content = 0xF8, .scene = SCENE_DEATH_MOUNTAIN_TRAIL}, // Death Mountain Summit -> DMT Cow Grotto + {.entranceIndex = ENTR_GROTTOS_0, .content = 0x28, .scene = SCENE_KAKARIKO_VILLAGE}, // Kak Backyard -> Kak Open Grotto + {.entranceIndex = ENTR_GROTTOS_3, .content = 0xE7, .scene = SCENE_KAKARIKO_VILLAGE}, // Kakariko Village -> Kak Redead Grotto + {.entranceIndex = ENTR_GROTTOS_9, .content = 0xF6, .scene = SCENE_HYRULE_CASTLE}, // Hyrule Castle Grounds -> HC Storms Grotto + {.entranceIndex = ENTR_GROTTOS_11, .content = 0xE1, .scene = SCENE_HYRULE_FIELD}, // Hyrule Field -> HF Tektite Grotto + {.entranceIndex = ENTR_GROTTOS_1, .content = 0xE5, .scene = SCENE_HYRULE_FIELD}, // Hyrule Field -> HF Near Kak Grotto + {.entranceIndex = ENTR_FAIRYS_FOUNTAIN_0, .content = 0xFF, .scene = SCENE_HYRULE_FIELD}, // Hyrule Field -> HF Fairy Grotto + {.entranceIndex = ENTR_GROTTOS_0, .content = 0x00, .scene = SCENE_HYRULE_FIELD}, // Hyrule Field -> HF Near Market Grotto + {.entranceIndex = ENTR_GROTTOS_5, .content = 0xE4, .scene = SCENE_HYRULE_FIELD}, // Hyrule Field -> HF Cow Grotto + {.entranceIndex = ENTR_GROTTOS_2, .content = 0xE6, .scene = SCENE_HYRULE_FIELD}, // Hyrule Field -> HF Inside Fence Grotto + {.entranceIndex = ENTR_GROTTOS_0, .content = 0x03, .scene = SCENE_HYRULE_FIELD}, // Hyrule Field -> HF Open Grotto + {.entranceIndex = ENTR_GROTTOS_0, .content = 0x22, .scene = SCENE_HYRULE_FIELD}, // Hyrule Field -> HF Southeast Grotto + {.entranceIndex = ENTR_GROTTOS_4, .content = 0xFC, .scene = SCENE_LON_LON_RANCH}, // Lon Lon Ranch -> LLR Grotto + {.entranceIndex = ENTR_GROTTOS_8, .content = 0xED, .scene = SCENE_SACRED_FOREST_MEADOW}, // SFM Entryway -> SFM Wolfos Grotto + {.entranceIndex = ENTR_GROTTOS_10, .content = 0xEE, .scene = SCENE_SACRED_FOREST_MEADOW}, // Sacred Forest Meadow -> SFM Storms Grotto + {.entranceIndex = ENTR_FAIRYS_FOUNTAIN_0, .content = 0xFF, .scene = SCENE_SACRED_FOREST_MEADOW}, // Sacred Forest Meadow -> SFM Fairy Grotto + {.entranceIndex = ENTR_GROTTOS_7, .content = 0xF5, .scene = SCENE_LOST_WOODS}, // LW Beyond Mido -> LW Scrubs Grotto + {.entranceIndex = ENTR_GROTTOS_0, .content = 0x14, .scene = SCENE_LOST_WOODS}, // Lost Woods -> LW Near Shortcuts Grotto + {.entranceIndex = ENTR_GROTTOS_0, .content = 0x2C, .scene = SCENE_KOKIRI_FOREST}, // Kokiri Forest -> KF Storms Grotto + {.entranceIndex = ENTR_FAIRYS_FOUNTAIN_0, .content = 0xFF, .scene = SCENE_ZORAS_DOMAIN}, // Zoras Domain -> ZD Storms Grotto + {.entranceIndex = ENTR_FAIRYS_FOUNTAIN_0, .content = 0xFF, .scene = SCENE_GERUDOS_FORTRESS}, // Gerudo Fortress -> GF Storms Grotto + {.entranceIndex = ENTR_GROTTOS_10, .content = 0xF0, .scene = SCENE_GERUDO_VALLEY}, // GV Fortress Side -> GV Storms Grotto + {.entranceIndex = ENTR_GROTTOS_6, .content = 0xF2, .scene = SCENE_GERUDO_VALLEY}, // GV Grotto Ledge -> GV Octorok Grotto + {.entranceIndex = ENTR_GROTTOS_12, .content = 0xF3, .scene = SCENE_LOST_WOODS}, // LW Beyond Mido -> Deku Theater }; // Information necessary for setting up returning from a grotto static const GrottoReturnInfo grottoReturnTable[NUM_GROTTOS] = { - {.entranceIndex = 0x0123, .room = 0x00, .angle = 0xA71C, .pos = {.x = 62.5078f, .y = -32.0f, .z = -1296.2f}}, // Colossus Grotto -> Desert Colossus - {.entranceIndex = 0x0102, .room = 0x00, .angle = 0x0000, .pos = {.x = -3039.34f, .y = -1033.0f, .z = 6080.74f}}, // LH Grotto -> Lake Hylia - {.entranceIndex = 0x00EA, .room = 0x00, .angle = 0x0000, .pos = {.x = -1630.05f, .y = 100.0f, .z = -132.104f}}, // ZR Storms Grotto -> Zora River - {.entranceIndex = 0x00EA, .room = 0x00, .angle = 0xE000, .pos = {.x = 649.507f, .y = 570.0f, .z = -346.853f}}, // ZR Fairy Grotto -> Zora River - {.entranceIndex = 0x00EA, .room = 0x00, .angle = 0x8000, .pos = {.x = 362.29f, .y = 570.0f, .z = 111.48f}}, // ZR Open Grotto -> Zora River - {.entranceIndex = 0x0246, .room = 0x01, .angle = 0x31C7, .pos = {.x = -1666.73f, .y = 721.0f, .z = -459.21f}}, // DMC Hammer Grotto -> DMC Lower Local - {.entranceIndex = 0x0147, .room = 0x01, .angle = 0x238E, .pos = {.x = 63.723f, .y = 1265.0f, .z = 1791.39f}}, // DMC Upper Grotto -> DMC Upper Local - {.entranceIndex = 0x014D, .room = 0x03, .angle = 0x0000, .pos = {.x = 1104.73f, .y = 580.0f, .z = -1159.95f}}, // GC Grotto -> GC Grotto Platform - {.entranceIndex = 0x01B9, .room = 0x00, .angle = 0x8000, .pos = {.x = -387.584f, .y = 1386.0f, .z = -1213.05f}}, // DMT Storms Grotto -> Death Mountain - {.entranceIndex = 0x01B9, .room = 0x00, .angle = 0x8000, .pos = {.x = -691.022f, .y = 1946.0f, .z = -312.969f}}, // DMT Cow Grotto -> Death Mountain Summit - {.entranceIndex = 0x00DB, .room = 0x00, .angle = 0x0000, .pos = {.x = 855.238f, .y = 80.0f, .z = -234.095f}}, // Kak Open Grotto -> Kak Backyard - {.entranceIndex = 0x00DB, .room = 0x00, .angle = 0x0000, .pos = {.x = -401.873f, .y = 0.0f, .z = 402.792f}}, // Kak Redead Grotto -> Kakariko Village - {.entranceIndex = 0x0138, .room = 0x00, .angle = 0x9555, .pos = {.x = 1009.02f, .y = 1571.0f, .z = 855.532f}}, // HC Storms Grotto -> Castle Grounds - {.entranceIndex = 0x01F9, .room = 0x00, .angle = 0x1555, .pos = {.x = -4949.58f, .y = -300.0f, .z = 2837.59f}}, // HF Tektite Grotto -> Hyrule Field - {.entranceIndex = 0x01F9, .room = 0x00, .angle = 0xC000, .pos = {.x = 2050.6f, .y = 20.0f, .z = -160.397f}}, // HF Near Kak Grotto -> Hyrule Field - {.entranceIndex = 0x01F9, .room = 0x00, .angle = 0x0000, .pos = {.x = -4447.66f, .y = -300.0f, .z = -393.191f}}, // HF Fairy Grotto -> Hyrule Field - {.entranceIndex = 0x01F9, .room = 0x00, .angle = 0xE000, .pos = {.x = -1446.56f, .y = 0.0f, .z = 830.775f}}, // HF Near Market Grotto -> Hyrule Field - {.entranceIndex = 0x01F9, .room = 0x00, .angle = 0x0000, .pos = {.x = -7874.07f, .y = -300.0f, .z = 6921.31f}}, // HF Cow Grotto -> Hyrule Field - {.entranceIndex = 0x01F9, .room = 0x00, .angle = 0xEAAB, .pos = {.x = -4989.13f, .y = -700.0f, .z = 13821.1f}}, // HF Inside Fence Grotto -> Hyrule Field - {.entranceIndex = 0x01F9, .room = 0x00, .angle = 0x8000, .pos = {.x = -4032.61f, .y = -700.0f, .z = 13831.5f}}, // HF Open Grotto -> Hyrule Field - {.entranceIndex = 0x01F9, .room = 0x00, .angle = 0x9555, .pos = {.x = -288.313f, .y = -500.0f, .z = 12320.2f}}, // HF Southeast Grotto -> Hyrule Field - {.entranceIndex = 0x0157, .room = 0x00, .angle = 0xAAAB, .pos = {.x = 1775.92f, .y = 0.0f, .z = 1486.82f}}, // LLR Grotto -> Lon Lon Ranch - {.entranceIndex = 0x00FC, .room = 0x00, .angle = 0x8000, .pos = {.x = -189.861f, .y = 0.0f, .z = 1898.09f}}, // SFM Wolfos Grotto -> SFM Entryway - {.entranceIndex = 0x00FC, .room = 0x00, .angle = 0xAAAB, .pos = {.x = 314.853f, .y = 480.0f, .z = -2300.39f}}, // SFM Storms Grotto -> Sacred Forest Meadow - {.entranceIndex = 0x00FC, .room = 0x00, .angle = 0x0000, .pos = {.x = 55.034f, .y = 0.0f, .z = 250.595f}}, // SFM Fairy Grotto -> Sacred Forest Meadow - {.entranceIndex = 0x01A9, .room = 0x08, .angle = 0x2000, .pos = {.x = 691.994f, .y = 0.0f, .z = -2502.2f}}, // LW Scrubs Grotto -> LW Beyond Mido - {.entranceIndex = 0x011E, .room = 0x02, .angle = 0xE000, .pos = {.x = 905.755f, .y = 0.0f, .z = -901.43f}}, // LW Near Shortcuts Grotto -> Lost Woods - {.entranceIndex = 0x0286, .room = 0x00, .angle = 0x4000, .pos = {.x = -507.065f, .y = 380.0f, .z = -1220.43f}}, // KF Storms Grotto -> Kokiri Forest - {.entranceIndex = 0x0108, .room = 0x01, .angle = 0xD555, .pos = {.x = -855.68f, .y = 14.0f, .z = -474.422f}}, // ZD Storms Grotto -> Zoras Domain - {.entranceIndex = 0x0129, .room = 0x00, .angle = 0x4000, .pos = {.x = 380.521f, .y = 333.0f, .z = -1560.74f}}, // GF Storms Grotto -> Gerudo Fortress - {.entranceIndex = 0x022D, .room = 0x00, .angle = 0x9555, .pos = {.x = -1326.34f, .y = 15.0f, .z = -983.994f}}, // GV Storms Grotto -> GV Fortress Side - {.entranceIndex = 0x0117, .room = 0x00, .angle = 0x8000, .pos = {.x = 291.513f, .y = -555.0f, .z = 1478.39f}}, // GV Octorok Grotto -> GV Grotto Ledge - {.entranceIndex = 0x01A9, .room = 0x06, .angle = 0x4000, .pos = {.x = 109.281f, .y = -20.0f, .z = -1601.42f}}, // Deku Theater -> LW Beyond Mido + {.entranceIndex = ENTR_DESERT_COLOSSUS_0, .room = 0x00, .angle = 0xA71C, .pos = {.x = 62.5078f, .y = -32.0f, .z = -1296.2f}}, // Colossus Grotto -> Desert Colossus + {.entranceIndex = ENTR_LAKE_HYLIA_0, .room = 0x00, .angle = 0x0000, .pos = {.x = -3039.34f, .y = -1033.0f, .z = 6080.74f}}, // LH Grotto -> Lake Hylia + {.entranceIndex = ENTR_ZORAS_RIVER_0, .room = 0x00, .angle = 0x0000, .pos = {.x = -1630.05f, .y = 100.0f, .z = -132.104f}}, // ZR Storms Grotto -> Zora River + {.entranceIndex = ENTR_ZORAS_RIVER_0, .room = 0x00, .angle = 0xE000, .pos = {.x = 649.507f, .y = 570.0f, .z = -346.853f}}, // ZR Fairy Grotto -> Zora River + {.entranceIndex = ENTR_ZORAS_RIVER_0, .room = 0x00, .angle = 0x8000, .pos = {.x = 362.29f, .y = 570.0f, .z = 111.48f}}, // ZR Open Grotto -> Zora River + {.entranceIndex = ENTR_DEATH_MOUNTAIN_CRATER_1, .room = 0x01, .angle = 0x31C7, .pos = {.x = -1666.73f, .y = 721.0f, .z = -459.21f}}, // DMC Hammer Grotto -> DMC Lower Local + {.entranceIndex = ENTR_DEATH_MOUNTAIN_CRATER_0, .room = 0x01, .angle = 0x238E, .pos = {.x = 63.723f, .y = 1265.0f, .z = 1791.39f}}, // DMC Upper Grotto -> DMC Upper Local + {.entranceIndex = ENTR_GORON_CITY_0, .room = 0x03, .angle = 0x0000, .pos = {.x = 1104.73f, .y = 580.0f, .z = -1159.95f}}, // GC Grotto -> GC Grotto Platform + {.entranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_1, .room = 0x00, .angle = 0x8000, .pos = {.x = -387.584f, .y = 1386.0f, .z = -1213.05f}}, // DMT Storms Grotto -> Death Mountain + {.entranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_1, .room = 0x00, .angle = 0x8000, .pos = {.x = -691.022f, .y = 1946.0f, .z = -312.969f}}, // DMT Cow Grotto -> Death Mountain Summit + {.entranceIndex = ENTR_KAKARIKO_VILLAGE_0, .room = 0x00, .angle = 0x0000, .pos = {.x = 855.238f, .y = 80.0f, .z = -234.095f}}, // Kak Open Grotto -> Kak Backyard + {.entranceIndex = ENTR_KAKARIKO_VILLAGE_0, .room = 0x00, .angle = 0x0000, .pos = {.x = -401.873f, .y = 0.0f, .z = 402.792f}}, // Kak Redead Grotto -> Kakariko Village + {.entranceIndex = ENTR_HYRULE_CASTLE_0, .room = 0x00, .angle = 0x9555, .pos = {.x = 1009.02f, .y = 1571.0f, .z = 855.532f}}, // HC Storms Grotto -> Castle Grounds + {.entranceIndex = ENTR_HYRULE_FIELD_6, .room = 0x00, .angle = 0x1555, .pos = {.x = -4949.58f, .y = -300.0f, .z = 2837.59f}}, // HF Tektite Grotto -> Hyrule Field + {.entranceIndex = ENTR_HYRULE_FIELD_6, .room = 0x00, .angle = 0xC000, .pos = {.x = 2050.6f, .y = 20.0f, .z = -160.397f}}, // HF Near Kak Grotto -> Hyrule Field + {.entranceIndex = ENTR_HYRULE_FIELD_6, .room = 0x00, .angle = 0x0000, .pos = {.x = -4447.66f, .y = -300.0f, .z = -393.191f}}, // HF Fairy Grotto -> Hyrule Field + {.entranceIndex = ENTR_HYRULE_FIELD_6, .room = 0x00, .angle = 0xE000, .pos = {.x = -1446.56f, .y = 0.0f, .z = 830.775f}}, // HF Near Market Grotto -> Hyrule Field + {.entranceIndex = ENTR_HYRULE_FIELD_6, .room = 0x00, .angle = 0x0000, .pos = {.x = -7874.07f, .y = -300.0f, .z = 6921.31f}}, // HF Cow Grotto -> Hyrule Field + {.entranceIndex = ENTR_HYRULE_FIELD_6, .room = 0x00, .angle = 0xEAAB, .pos = {.x = -4989.13f, .y = -700.0f, .z = 13821.1f}}, // HF Inside Fence Grotto -> Hyrule Field + {.entranceIndex = ENTR_HYRULE_FIELD_6, .room = 0x00, .angle = 0x8000, .pos = {.x = -4032.61f, .y = -700.0f, .z = 13831.5f}}, // HF Open Grotto -> Hyrule Field + {.entranceIndex = ENTR_HYRULE_FIELD_6, .room = 0x00, .angle = 0x9555, .pos = {.x = -288.313f, .y = -500.0f, .z = 12320.2f}}, // HF Southeast Grotto -> Hyrule Field + {.entranceIndex = ENTR_LON_LON_RANCH_0, .room = 0x00, .angle = 0xAAAB, .pos = {.x = 1775.92f, .y = 0.0f, .z = 1486.82f}}, // LLR Grotto -> Lon Lon Ranch + {.entranceIndex = ENTR_SACRED_FOREST_MEADOW_0, .room = 0x00, .angle = 0x8000, .pos = {.x = -189.861f, .y = 0.0f, .z = 1898.09f}}, // SFM Wolfos Grotto -> SFM Entryway + {.entranceIndex = ENTR_SACRED_FOREST_MEADOW_0, .room = 0x00, .angle = 0xAAAB, .pos = {.x = 314.853f, .y = 480.0f, .z = -2300.39f}}, // SFM Storms Grotto -> Sacred Forest Meadow + {.entranceIndex = ENTR_SACRED_FOREST_MEADOW_0, .room = 0x00, .angle = 0x0000, .pos = {.x = 55.034f, .y = 0.0f, .z = 250.595f}}, // SFM Fairy Grotto -> Sacred Forest Meadow + {.entranceIndex = ENTR_LOST_WOODS_1, .room = 0x08, .angle = 0x2000, .pos = {.x = 691.994f, .y = 0.0f, .z = -2502.2f}}, // LW Scrubs Grotto -> LW Beyond Mido + {.entranceIndex = ENTR_LOST_WOODS_0, .room = 0x02, .angle = 0xE000, .pos = {.x = 905.755f, .y = 0.0f, .z = -901.43f}}, // LW Near Shortcuts Grotto -> Lost Woods + {.entranceIndex = ENTR_KOKIRI_FOREST_6, .room = 0x00, .angle = 0x4000, .pos = {.x = -507.065f, .y = 380.0f, .z = -1220.43f}}, // KF Storms Grotto -> Kokiri Forest + {.entranceIndex = ENTR_ZORAS_DOMAIN_0, .room = 0x01, .angle = 0xD555, .pos = {.x = -855.68f, .y = 14.0f, .z = -474.422f}}, // ZD Storms Grotto -> Zoras Domain + {.entranceIndex = ENTR_GERUDOS_FORTRESS_0, .room = 0x00, .angle = 0x4000, .pos = {.x = 380.521f, .y = 333.0f, .z = -1560.74f}}, // GF Storms Grotto -> Gerudo Fortress + {.entranceIndex = ENTR_GERUDO_VALLEY_3, .room = 0x00, .angle = 0x9555, .pos = {.x = -1326.34f, .y = 15.0f, .z = -983.994f}}, // GV Storms Grotto -> GV Fortress Side + {.entranceIndex = ENTR_GERUDO_VALLEY_0, .room = 0x00, .angle = 0x8000, .pos = {.x = 291.513f, .y = -555.0f, .z = 1478.39f}}, // GV Octorok Grotto -> GV Grotto Ledge + {.entranceIndex = ENTR_LOST_WOODS_1, .room = 0x06, .angle = 0x4000, .pos = {.x = 109.281f, .y = -20.0f, .z = -1601.42f}}, // Deku Theater -> LW Beyond Mido }; static s16 grottoExitList[NUM_GROTTOS] = {0}; @@ -139,8 +139,8 @@ s16 Grotto_OverrideSpecialEntrance(s16 nextEntranceIndex) { // If Link hits a grotto exit, load the entrance index from the grotto exit list // based on the current grotto ID - if (nextEntranceIndex == 0x7FFF) { - Entrance_SetEntranceDiscovered(ENTRANCE_RANDO_GROTTO_EXIT_START + grottoId); + if (nextEntranceIndex == ENTR_RETURN_GROTTO) { + Entrance_SetEntranceDiscovered(ENTRANCE_RANDO_GROTTO_EXIT_START + grottoId, false); EntranceTracker_SetLastEntranceOverride(ENTRANCE_RANDO_GROTTO_EXIT_START + grottoId); nextEntranceIndex = grottoExitList[grottoId]; } @@ -158,18 +158,18 @@ s16 Grotto_OverrideSpecialEntrance(s16 nextEntranceIndex) { // When the nextEntranceIndex is determined by a dynamic exit, // or set by Entrance_OverrideBlueWarp to mark a blue warp entrance, // we have to set the respawn information and nextEntranceIndex manually - if (gPlayState != NULL && gPlayState->nextEntranceIndex != -1) { + if (gPlayState != NULL && gPlayState->nextEntranceIndex != ENTR_LOAD_OPENING) { gSaveContext.respawnFlag = 2; nextEntranceIndex = grotto.entranceIndex; - gPlayState->fadeTransition = 3; - gSaveContext.nextTransitionType = 3; + gPlayState->transitionType = TRANS_TYPE_FADE_WHITE; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE; } else if (gPlayState == NULL) { // Handle spawn position when loading from a save file gSaveContext.respawnFlag = 2; nextEntranceIndex = grotto.entranceIndex; - gSaveContext.nextTransitionType = 3; - // Otherwise return 0x7FFF and let the game handle it + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE; + // Otherwise return 0x7FFF (ENTR_RETURN_GROTTO) and let the game handle it } else { - nextEntranceIndex = 0x7FFF; + nextEntranceIndex = ENTR_RETURN_GROTTO; } lastEntranceType = GROTTO_RETURN; @@ -211,7 +211,7 @@ void Grotto_OverrideActorEntrance(Actor* thisx) { if (grottoContent == grottoLoadTable[index].content && gPlayState->sceneNum == grottoLoadTable[index].scene) { // Find the override for the matching index from the grotto Load List - Entrance_SetEntranceDiscovered(ENTRANCE_RANDO_GROTTO_LOAD_START + index); + Entrance_SetEntranceDiscovered(ENTRANCE_RANDO_GROTTO_LOAD_START + index, false); EntranceTracker_SetLastEntranceOverride(ENTRANCE_RANDO_GROTTO_LOAD_START + index); index = grottoLoadList[index]; diff --git a/soh/soh/Enhancements/randomizer/randomizer_grotto.h b/soh/soh/Enhancements/randomizer/randomizer_grotto.h index 6a10d651d..c516d32bf 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_grotto.h +++ b/soh/soh/Enhancements/randomizer/randomizer_grotto.h @@ -3,7 +3,7 @@ #include "z64math.h" -#define NUM_GROTTOS 33 +#define NUM_GROTTOS GROTTO_OFFSET_MAX #define NOT_GROTTO 0 #define GROTTO_LOAD 1 #define GROTTO_RETURN 2 diff --git a/soh/soh/Enhancements/randomizer/randomizer_inf.h b/soh/soh/Enhancements/randomizer/randomizer_inf.h index d7e0c1dfe..472523b7c 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_inf.h +++ b/soh/soh/Enhancements/randomizer/randomizer_inf.h @@ -159,6 +159,7 @@ typedef enum { RAND_INF_CHILD_FISHING, RAND_INF_ADULT_FISHING, RAND_INF_10_BIG_POES, + RAND_INF_GRANT_GANONS_BOSSKEY, RAND_INF_GOHMA_SOUL, RAND_INF_KING_DODONGO_SOUL, diff --git a/soh/soh/Enhancements/randomizer/randomizer_tricks.cpp b/soh/soh/Enhancements/randomizer/randomizer_tricks.cpp index 398077f6e..8a397f840 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_tricks.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_tricks.cpp @@ -219,7 +219,7 @@ std::unordered_map rtAreaNames = { { RTAREA_LAKE_HYLIA, "Lake Hylia"}, { RTAREA_GERUDO_VALLEY, "Gerudo Valley"}, { RTAREA_GERUDO_FORTRESS, "Gerudo Fortress"}, - { RTAREA_WASTELAND, "Desert Wasteland"}, + { RTAREA_WASTELAND, "Haunted Wasteland"}, { RTAREA_DESERT_COLOSSUS, "Desert Colossus"}, { RTAREA_MARKET, "Hyrule Market"}, { RTAREA_HYRULE_CASTLE, "Hyrule Castle"}, diff --git a/soh/soh/Enhancements/randomizer/savefile.cpp b/soh/soh/Enhancements/randomizer/savefile.cpp index 16b52147f..f535a0a20 100644 --- a/soh/soh/Enhancements/randomizer/savefile.cpp +++ b/soh/soh/Enhancements/randomizer/savefile.cpp @@ -305,7 +305,7 @@ extern "C" void Randomizer_InitSaveFile() { switch (startingAge) { case RO_AGE_ADULT: // Adult gSaveContext.linkAge = LINK_AGE_ADULT; - gSaveContext.entranceIndex = 0x5F4; + gSaveContext.entranceIndex = ENTR_TEMPLE_OF_TIME_7; gSaveContext.savedSceneNum = SCENE_LON_LON_RANCH; // Set scene num manually to ToT break; case RO_AGE_CHILD: // Child diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp index 114f2201a..118f86709 100644 --- a/soh/soh/Enhancements/randomizer/settings.cpp +++ b/soh/soh/Enhancements/randomizer/settings.cpp @@ -1589,6 +1589,48 @@ void Settings::UpdateOptionProperties() { } else { mOptions[RSK_LINKS_POCKET].Enable(); } + + if (CVarGetInteger("gRandomizeLogicRules", RO_LOGIC_GLITCHLESS) == RO_LOGIC_VANILLA) { + mOptionGroups[RSG_AREA_ACCESS_IMGUI].Disable(); + mOptions[RSK_STARTING_AGE].Disable(""); + mOptions[RSK_GERUDO_FORTRESS].Disable(""); + mOptions[RSK_RAINBOW_BRIDGE].Disable(""); + mOptions[RSK_BRIDGE_OPTIONS].Disable(""); + mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT].Disable(""); + mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT].Disable(""); + mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].Disable(""); + mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].Disable(""); + mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT].Disable(""); + mOptions[RSK_GANONS_TRIALS].Disable(""); + mOptions[RSK_TRIAL_COUNT].Disable(""); + mOptions[RSK_TRIFORCE_HUNT].Disable(""); + mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL].Disable(""); + mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].Disable(""); + mOptionGroups[RSG_ITEMS_IMGUI_TABLE].Disable(); + mOptionGroups[RSG_GAMEPLAY_IMGUI_TABLE].Disable(); + mOptions[RSK_LINKS_POCKET].Disable(""); + mOptions[RSK_STARTING_OCARINA].Disable(""); + } else { + mOptionGroups[RSG_AREA_ACCESS_IMGUI].Enable(); + mOptions[RSK_STARTING_AGE].Enable(); + mOptions[RSK_GERUDO_FORTRESS].Enable(); + mOptions[RSK_RAINBOW_BRIDGE].Enable(); + mOptions[RSK_BRIDGE_OPTIONS].Enable(); + mOptions[RSK_RAINBOW_BRIDGE_STONE_COUNT].Enable(); + mOptions[RSK_RAINBOW_BRIDGE_MEDALLION_COUNT].Enable(); + mOptions[RSK_RAINBOW_BRIDGE_REWARD_COUNT].Enable(); + mOptions[RSK_RAINBOW_BRIDGE_DUNGEON_COUNT].Enable(); + mOptions[RSK_RAINBOW_BRIDGE_TOKEN_COUNT].Enable(); + mOptions[RSK_GANONS_TRIALS].Enable(); + mOptions[RSK_TRIAL_COUNT].Enable(); + mOptions[RSK_TRIFORCE_HUNT].Enable(); + mOptions[RSK_TRIFORCE_HUNT_PIECES_TOTAL].Enable(); + mOptions[RSK_TRIFORCE_HUNT_PIECES_REQUIRED].Enable(); + mOptionGroups[RSG_ITEMS_IMGUI_TABLE].Enable(); + mOptionGroups[RSG_GAMEPLAY_IMGUI_TABLE].Enable(); + mOptions[RSK_LINKS_POCKET].Enable(); + mOptions[RSK_STARTING_OCARINA].Enable(); + } } void Settings::FinalizeSettings(const std::set& excludedLocations, const std::set& enabledTricks) { @@ -1878,6 +1920,8 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) { mOptions[index].SetSelectedIndex(RO_LOGIC_GLITCHLESS); } else if (it.value() == "No Logic") { mOptions[index].SetSelectedIndex(RO_LOGIC_NO_LOGIC); + } else if (it.value() == "Vanilla") { + mOptions[index].SetSelectedIndex(RO_LOGIC_VANILLA); } break; case RSK_FOREST: diff --git a/soh/soh/Enhancements/tts/tts.cpp b/soh/soh/Enhancements/tts/tts.cpp index 0fde40656..0b46cd18f 100644 --- a/soh/soh/Enhancements/tts/tts.cpp +++ b/soh/soh/Enhancements/tts/tts.cpp @@ -228,6 +228,68 @@ void RegisterOnKaleidoscopeUpdateHook() { return; } + // Game over + prompts + if (pauseCtx->state >= 0xC && pauseCtx->state <= 0x10) { + // Reset prompt tracker after state change + if (prevState != pauseCtx->state) { + prevPromptChoice = -1; + } + + switch (pauseCtx->state) { + // Game over in full alpha + case 0xC: { + // Fire once on state change + if (prevState != pauseCtx->state) { + auto translation = GetParameritizedText("game_over", TEXT_BANK_KALEIDO, nullptr); + SpeechSynthesizer::Instance->Speak(translation.c_str(), GetLanguageCode()); + } + break; + } + // Prompt for save + case 0xE: { + if (prevPromptChoice != pauseCtx->promptChoice) { + auto prompt = GetParameritizedText(pauseCtx->promptChoice == 0 ? "yes" : "no", TEXT_BANK_MISC, nullptr); + if (prevPromptChoice == -1) { + auto translation = GetParameritizedText("save_prompt", TEXT_BANK_KALEIDO, nullptr); + SpeechSynthesizer::Instance->Speak((translation + " - " + prompt).c_str(), GetLanguageCode()); + } else { + SpeechSynthesizer::Instance->Speak(prompt.c_str(), GetLanguageCode()); + } + + prevPromptChoice = pauseCtx->promptChoice; + } + break; + } + // Game saved + case 0xF: { + // Fire once on state change + if (prevState != pauseCtx->state) { + auto translation = GetParameritizedText("game_saved", TEXT_BANK_KALEIDO, nullptr); + SpeechSynthesizer::Instance->Speak(translation.c_str(), GetLanguageCode()); + } + break; + } + // Prompt to continue playing + case 0x10: { + if (prevPromptChoice != pauseCtx->promptChoice) { + auto prompt = GetParameritizedText(pauseCtx->promptChoice == 0 ? "yes" : "no", TEXT_BANK_MISC, nullptr); + if (prevPromptChoice == -1) { + auto translation = GetParameritizedText("continue_game", TEXT_BANK_KALEIDO, nullptr); + SpeechSynthesizer::Instance->Speak((translation + " - " + prompt).c_str(), GetLanguageCode()); + } else { + SpeechSynthesizer::Instance->Speak(prompt.c_str(), GetLanguageCode()); + } + + prevPromptChoice = pauseCtx->promptChoice; + } + break; + } + } + + prevState = pauseCtx->state; + return; + } + // Announce page when // Kaleido pages are rotating and page halfway rotated // Or Kaleido was just opened diff --git a/soh/soh/Extractor/Extract.cpp b/soh/soh/Extractor/Extract.cpp index c79d26dad..d4b524474 100644 --- a/soh/soh/Extractor/Extract.cpp +++ b/soh/soh/Extractor/Extract.cpp @@ -7,6 +7,7 @@ #include "Extract.h" #include "portable-file-dialogs.h" #include +#include "variables.h" #ifdef unix #include @@ -224,7 +225,7 @@ void Extractor::GetRoms(std::vector& roms) { //} #elif unix // Open the directory of the app. - DIR* d = opendir("."); + DIR* d = opendir(mSearchPath.c_str()); struct dirent* dir; if (d != NULL) { @@ -247,7 +248,7 @@ void Extractor::GetRoms(std::vector& roms) { } closedir(d); #else - for (const auto& file : std::filesystem::directory_iterator("./")) { + for (const auto& file : std::filesystem::directory_iterator(mSearchPath)) { if (file.is_directory()) continue; if ((file.path().extension() == ".n64") || (file.path().extension() == ".z64") || @@ -296,7 +297,7 @@ bool Extractor::GetRomPathFromBox() { } mCurrentRomPath = nameBuffer; #else - auto selection = pfd::open_file("Select a file", ".", { "N64 Roms", "*.z64 *.n64 *.v64" }).result(); + auto selection = pfd::open_file("Select a file", mSearchPath, { "N64 Roms", "*.z64 *.n64 *.v64" }).result(); if (selection.empty()) { return false; @@ -429,10 +430,12 @@ bool Extractor::ManuallySearchForRomMatchingType(RomSearchMode searchMode) { return true; } -bool Extractor::Run(RomSearchMode searchMode) { +bool Extractor::Run(std::string searchPath, RomSearchMode searchMode) { std::vector roms; std::ifstream inFile; + mSearchPath = searchPath; + GetRoms(roms); FilterRoms(roms, searchMode); @@ -557,9 +560,10 @@ std::string Extractor::Mkdtemp() { extern "C" int zapd_main(int argc, char** argv); bool Extractor::CallZapd(std::string installPath, std::string exportdir) { - constexpr int argc = 16; + constexpr int argc = 18; char xmlPath[1024]; char confPath[1024]; + char portVersion[18]; // 5 digits for int16_max (x3) + separators + terminator std::array argv; const char* version = GetZapdVerStr(); const char* otrFile = IsMasterQuest() ? "oot-mq.otr" : "oot.otr"; @@ -581,6 +585,7 @@ bool Extractor::CallZapd(std::string installPath, std::string exportdir) { snprintf(xmlPath, 1024, "assets/extractor/xmls/%s", version); snprintf(confPath, 1024, "assets/extractor/Config_%s.xml", version); + snprintf(portVersion, 18, "%d.%d.%d", gBuildVersionMajor, gBuildVersionMinor, gBuildVersionPatch); argv[0] = "ZAPD"; argv[1] = "ed"; @@ -598,6 +603,8 @@ bool Extractor::CallZapd(std::string installPath, std::string exportdir) { argv[13] = "OTR"; argv[14] = "--otrfile"; argv[15] = otrFile; + argv[16] = "--portVer"; + argv[17] = portVersion; #ifdef _WIN32 // Grab a handle to the command window. @@ -606,6 +613,9 @@ bool Extractor::CallZapd(std::string installPath, std::string exportdir) { // Normally the command window is hidden. We want the window to be shown here so the user can see the progess of the extraction. ShowWindow(cmdWindow, SW_SHOW); SetWindowPos(cmdWindow, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); +#else + // Show extraction in background message until linux/mac can have visual progress + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_INFORMATION, "Extracting", "Extraction will now begin in the background.\n\nPlease be patient for the process to finish. Do not close the main program.", nullptr); #endif zapd_main(argc, (char**)argv.data()); @@ -623,4 +633,3 @@ bool Extractor::CallZapd(std::string installPath, std::string exportdir) { return 0; } - diff --git a/soh/soh/Extractor/Extract.h b/soh/soh/Extractor/Extract.h index 4ff7cb92f..ce4008fbe 100644 --- a/soh/soh/Extractor/Extract.h +++ b/soh/soh/Extractor/Extract.h @@ -28,6 +28,7 @@ enum class RomSearchMode { class Extractor { std::unique_ptr mRomData = std::make_unique(MB64); std::string mCurrentRomPath; + std::string mSearchPath; size_t mCurRomSize = 0; bool GetRomPathFromBox(); @@ -58,7 +59,7 @@ class Extractor { static void ShowErrorBox(const char* title, const char* text); bool IsMasterQuest() const; - bool Run(RomSearchMode searchMode = RomSearchMode::Both); + bool Run(std::string searchPath, RomSearchMode searchMode = RomSearchMode::Both); bool CallZapd(std::string installPath, std::string exportdir); const char* GetZapdStr(); std::string Mkdtemp(); diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp index e4a5d7511..449e50574 100644 --- a/soh/soh/OTRGlobals.cpp +++ b/soh/soh/OTRGlobals.cpp @@ -30,6 +30,7 @@ #include #include "Enhancements/speechsynthesizer/SpeechSynthesizer.h" #include "Enhancements/controls/GameControlEditor.h" +#include "Enhancements/controls/SohInputEditorWindow.h" #include "Enhancements/cosmetics/CosmeticsEditor.h" #include "Enhancements/audio/AudioCollection.h" #include "Enhancements/audio/AudioEditor.h" @@ -48,8 +49,12 @@ #include "variables.h" #include "z64.h" #include "macros.h" +#include "Fonts.h" #include #include "Enhancements/custom-message/CustomMessageManager.h" +#include "Enhancements/presets.h" +#include "util.h" +#include #if not defined (__SWITCH__) && not defined(__WIIU__) #include "Extractor/Extract.h" @@ -68,6 +73,7 @@ #include #elif defined(__WIIU__) #include +#include // OSFatal #endif @@ -130,6 +136,8 @@ Color_RGB8 kokiriColor = { 0x1E, 0x69, 0x1B }; Color_RGB8 goronColor = { 0x64, 0x14, 0x00 }; Color_RGB8 zoraColor = { 0x00, 0xEC, 0x64 }; +float previousImGuiScale; + // Same as NaviColor type from OoT src (z_actor.c), but modified to be sans alpha channel for Controller LED. typedef struct { Color_RGB8 inner; @@ -251,16 +259,27 @@ OTRGlobals::OTRGlobals() { OTRFiles.push_back(sohOtrPath); } std::string patchesPath = LUS::Context::LocateFileAcrossAppDirs("mods", appShortName); + std::vector patchOTRs = {}; if (patchesPath.length() > 0 && std::filesystem::exists(patchesPath)) { if (std::filesystem::is_directory(patchesPath)) { - for (const auto& p : std::filesystem::recursive_directory_iterator(patchesPath)) { + for (const auto& p : std::filesystem::recursive_directory_iterator(patchesPath, std::filesystem::directory_options::follow_directory_symlink)) { if (StringHelper::IEquals(p.path().extension().string(), ".otr")) { - OTRFiles.push_back(p.path().generic_string()); + patchOTRs.push_back(p.path().generic_string()); } } } } - std::unordered_set ValidHashes = { + std::sort(patchOTRs.begin(), patchOTRs.end(), [](const std::string& a, const std::string& b) { + return std::lexicographical_compare( + a.begin(), a.end(), + b.begin(), b.end(), + [](char c1, char c2) { + return std::tolower(c1) < std::tolower(c2); + } + ); + }); + OTRFiles.insert(OTRFiles.end(), patchOTRs.begin(), patchOTRs.end()); + std::unordered_set ValidHashes = { OOT_PAL_MQ, OOT_NTSC_JP_MQ, OOT_NTSC_US_MQ, @@ -277,8 +296,25 @@ OTRGlobals::OTRGlobals() { OOT_PAL_GC_DBG1, OOT_PAL_GC_DBG2 }; + + context = LUS::Context::CreateUninitializedInstance("Ship of Harkinian", appShortName, "shipofharkinian.json"); + + context->InitLogging(); + context->InitConfiguration(); + context->InitConsoleVariables(); + // tell LUS to reserve 3 SoH specific threads (Game, Audio, Save) - context = LUS::Context::CreateInstance("Ship of Harkinian", appShortName, "shipofharkinian.json", OTRFiles, {}, 3); + context->InitResourceManager(OTRFiles, {}, 3); + + context->InitControlDeck({BTN_MODIFIER1, BTN_MODIFIER2}); + context->GetControlDeck()->SetSinglePlayerMappingMode(true); + + context->InitCrashHandler(); + context->InitConsole(); + + auto sohInputEditorWindow = std::make_shared("gControllerConfigurationEnabled", "Input Editor"); + context->InitWindow(sohInputEditorWindow); + context->InitAudio(); context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::SOH_Animation, "Animation", std::make_shared()); context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::SOH_PlayerAnimation, "PlayerAnimation", std::make_shared()); @@ -302,6 +338,12 @@ OTRGlobals::OTRGlobals() { hasMasterQuest = hasOriginal = false; + previousImGuiScale = defaultImGuiScale; + defaultFontSmaller = CreateDefaultFontWithSize(10.0f); + defaultFontLarger = CreateDefaultFontWithSize(16.0f); + defaultFontLargest = CreateDefaultFontWithSize(20.0f); + ScaleImGui(); + // Move the camera strings from read only memory onto the heap (writable memory) // This is in OTRGlobals right now because this is a place that will only ever be run once at the beginning of startup. // We should probably find some code in db_camera that does initialization and only run once, and then dealloc on deinitialization. @@ -356,6 +398,32 @@ OTRGlobals::OTRGlobals() { OTRGlobals::~OTRGlobals() { } +void OTRGlobals::ScaleImGui() { + float scale = imguiScaleOptionToValue[CVarGetInteger("gImGuiScale", defaultImGuiScale)]; + float newScale = scale / previousImGuiScale; + ImGui::GetStyle().ScaleAllSizes(newScale); + ImGui::GetIO().FontGlobalScale = scale; + previousImGuiScale = scale; +} + +ImFont* OTRGlobals::CreateDefaultFontWithSize(float size) { + auto mImGuiIo = &ImGui::GetIO(); + ImFontConfig fontCfg = ImFontConfig(); + fontCfg.OversampleH = fontCfg.OversampleV = 1; + fontCfg.PixelSnapH = true; + fontCfg.SizePixels = size; + ImFont* font = mImGuiIo->Fonts->AddFontDefault(&fontCfg); + // FontAwesome fonts need to have their sizes reduced by 2.0f/3.0f in order to align correctly + float iconFontSize = size * 2.0f / 3.0f; + static const ImWchar sIconsRanges[] = { ICON_MIN_FA, ICON_MAX_16_FA, 0 }; + ImFontConfig iconsConfig; + iconsConfig.MergeMode = true; + iconsConfig.PixelSnapH = true; + iconsConfig.GlyphMinAdvanceX = iconFontSize; + mImGuiIo->Fonts->AddFontFromMemoryCompressedBase85TTF(fontawesome_compressed_data_base85, iconFontSize, &iconsConfig, sIconsRanges); + return font; +} + bool OTRGlobals::HasMasterQuest() { return hasMasterQuest; } @@ -602,7 +670,7 @@ extern "C" void VanillaItemTable_Init() { } } -std::unordered_map ItemIDtoGetItemID{ +std::unordered_map ItemIDtoGetItemIDMap { { ITEM_ARROWS_LARGE, GI_ARROWS_LARGE }, { ITEM_ARROWS_MEDIUM, GI_ARROWS_MEDIUM }, { ITEM_ARROWS_SMALL, GI_ARROWS_SMALL }, @@ -632,7 +700,8 @@ std::unordered_map ItemIDtoGetItemID{ { ITEM_BUG, GI_BUGS }, { ITEM_BULLET_BAG_30, GI_BULLET_BAG_30 }, { ITEM_BULLET_BAG_40, GI_BULLET_BAG_40 }, - { ITEM_BULLET_BAG_50, GI_BULLET_BAG_50 }, { ITEM_CHICKEN, GI_CHICKEN }, + { ITEM_BULLET_BAG_50, GI_BULLET_BAG_50 }, + { ITEM_CHICKEN, GI_CHICKEN }, { ITEM_CLAIM_CHECK, GI_CLAIM_CHECK }, { ITEM_COJIRO, GI_COJIRO }, { ITEM_COMPASS, GI_COMPASS }, @@ -728,11 +797,42 @@ std::unordered_map ItemIDtoGetItemID{ { ITEM_WEIRD_EGG, GI_WEIRD_EGG } }; -extern "C" int32_t GetGIID(uint32_t itemID) { - if (ItemIDtoGetItemID.contains(itemID)) { - return ItemIDtoGetItemID.at(itemID); +extern "C" GetItemID RetrieveGetItemIDFromItemID(ItemID itemID) { + if (ItemIDtoGetItemIDMap.contains(itemID)) { + return ItemIDtoGetItemIDMap.at(itemID); } - return -1; + return GI_MAX; +} + +std::unordered_map ItemIDtoRandomizerGetMap { + { ITEM_SONG_MINUET, RG_MINUET_OF_FOREST }, + { ITEM_SONG_BOLERO, RG_BOLERO_OF_FIRE }, + { ITEM_SONG_SERENADE, RG_SERENADE_OF_WATER }, + { ITEM_SONG_REQUIEM, RG_REQUIEM_OF_SPIRIT }, + { ITEM_SONG_NOCTURNE, RG_NOCTURNE_OF_SHADOW }, + { ITEM_SONG_PRELUDE, RG_PRELUDE_OF_LIGHT }, + { ITEM_SONG_LULLABY, RG_ZELDAS_LULLABY }, + { ITEM_SONG_EPONA, RG_EPONAS_SONG }, + { ITEM_SONG_SARIA, RG_SARIAS_SONG }, + { ITEM_SONG_SUN, RG_SUNS_SONG }, + { ITEM_SONG_TIME, RG_SONG_OF_TIME }, + { ITEM_SONG_STORMS, RG_SONG_OF_STORMS }, + { ITEM_MEDALLION_FOREST, RG_FOREST_MEDALLION }, + { ITEM_MEDALLION_FIRE, RG_FIRE_MEDALLION }, + { ITEM_MEDALLION_WATER, RG_WATER_MEDALLION }, + { ITEM_MEDALLION_SPIRIT, RG_SPIRIT_MEDALLION }, + { ITEM_MEDALLION_SHADOW, RG_SHADOW_MEDALLION }, + { ITEM_MEDALLION_LIGHT, RG_LIGHT_MEDALLION }, + { ITEM_KOKIRI_EMERALD, RG_KOKIRI_EMERALD }, + { ITEM_GORON_RUBY, RG_GORON_RUBY }, + { ITEM_ZORA_SAPPHIRE, RG_ZORA_SAPPHIRE }, +}; + +extern "C" RandomizerGet RetrieveRandomizerGetFromItemID(ItemID itemID) { + if (ItemIDtoRandomizerGetMap.contains(itemID)) { + return ItemIDtoRandomizerGetMap.at(itemID); + } + return RG_MAX; } extern "C" void OTRExtScanner() { @@ -748,23 +848,215 @@ extern "C" void OTRExtScanner() { } } +typedef struct { + uint16_t major; + uint16_t minor; + uint16_t patch; +} OTRVersion; + +// Read the port version from an OTR file +OTRVersion ReadPortVersionFromOTR(std::string otrPath) { + OTRVersion version = {}; + + // Use a temporary archive instance to load the otr and read the version file + auto archive = std::make_shared(otrPath, "", std::unordered_set(), false); + if (archive->IsMainMPQValid()) { + auto t = archive->LoadFile("portVersion", false); + if (t != nullptr && t->IsLoaded) { + auto stream = std::make_shared(t->Buffer.data(), t->Buffer.size()); + auto reader = std::make_shared(stream); + LUS::Endianness endianness = (LUS::Endianness)reader->ReadUByte(); + reader->SetEndianness(endianness); + version.major = reader->ReadUInt16(); + version.minor = reader->ReadUInt16(); + version.patch = reader->ReadUInt16(); + } + } + + archive = nullptr; + + return version; +} + +// Check that a soh.otr exists and matches the version of soh running +// Otherwise show a message and exit +void CheckSoHOTRVersion(std::string otrPath) { + std::string msg; + +#if defined(__SWITCH__) + msg = "\x1b[4;2HPlease re-extract it from the download." + "\x1b[6;2HPress the Home button to exit..."; +#elif defined(__WIIU__) + msg = "Please extract the soh.otr from the Ship of Harkinian download\nto your folder.\n\nPress and hold the power button to shutdown..."; +#else + msg = "Please extract the soh.otr from the Ship of Harkinian download to your folder.\n\nExiting..."; +#endif + + if (!std::filesystem::exists(otrPath)) { +#if not defined(__SWITCH__) && not defined(__WIIU__) + Extractor::ShowErrorBox("soh.otr file is missing", msg.c_str()); + exit(1); +#elif defined(__SWITCH__) + LUS::Switch::PrintErrorMessageToScreen(("\x1b[2;2HYou are missing the soh.otr file." + msg).c_str()); +#elif defined(__WIIU__) + OSFatal(("You are missing the soh.otr file\n\n" + msg).c_str()); +#endif + } + + OTRVersion otrVersion = ReadPortVersionFromOTR(otrPath); + + if (otrVersion.major != gBuildVersionMajor || otrVersion.minor != gBuildVersionMinor || otrVersion.patch != gBuildVersionPatch) { +#if not defined(__SWITCH__) && not defined(__WIIU__) + Extractor::ShowErrorBox("soh.otr file version does not match", msg.c_str()); + exit(1); +#elif defined(__SWITCH__) + LUS::Switch::PrintErrorMessageToScreen(("\x1b[2;2HYou have an old soh.otr file." + msg).c_str()); +#elif defined(__WIIU__) + OSFatal(("You have an old soh.otr file\n\n" + msg).c_str()); +#endif + } +} + +// Checks the program version stored in the otr and compares the major value to soh +// For Windows/Mac/Linux if the version doesn't match, offer to +void DetectOTRVersion(std::string fileName, bool isMQ) { + bool isOtrOld = false; + std::string otrPath = LUS::Context::LocateFileAcrossAppDirs(fileName, appShortName); + + // Doesn't exist so nothing to do here + if (!std::filesystem::exists(otrPath)) { + return; + } + + OTRVersion otrVersion = ReadPortVersionFromOTR(otrPath); + + if (otrVersion.major != gBuildVersionMajor) { + isOtrOld = true; + } + + if (isOtrOld) { +#if not defined(__SWITCH__) && not defined(__WIIU__) + char msgBuf[250]; + char version[18]; // 5 digits for int16_max (x3) + separators + terminator + + if (otrVersion.major != 0 || otrVersion.minor != 0 || otrVersion.patch != 0) { + snprintf(version, 18, "%d.%d.%d", otrVersion.major, otrVersion.minor, otrVersion.patch); + } else { + snprintf(version, 18, "no version found"); + } + + snprintf(msgBuf, 250, + "The %s file was generated with a different version of Ship of Harkinian.\nOTR version: %s\n\n" + "You must regenerate to be able to play, otherwise the program will exit.\nWould you like to regenerate it now?", + fileName.c_str(), version); + + if (Extractor::ShowYesNoBox("Old OTR File Found", msgBuf) == IDYES) { + std::string installPath = LUS::Context::GetAppBundlePath(); + if (!std::filesystem::exists(installPath + "/assets/extractor")) { + Extractor::ShowErrorBox("Extractor assets not found", + "Unable to regenerate. Missing assets/extractor folder needed to generate OTR file.\n\nExiting..."); + exit(1); + } + + Extractor extract; + if (!extract.Run(LUS::Context::GetAppDirectoryPath(appShortName), isMQ ? RomSearchMode::MQ : RomSearchMode::Vanilla)) { + Extractor::ShowErrorBox("Error", "An error occured, no OTR file was generated.\n\nExiting..."); + exit(1); + } + extract.CallZapd(installPath, LUS::Context::GetAppDirectoryPath(appShortName)); + } else { + exit(1); + } + +#elif defined(__SWITCH__) + LUS::Switch::PrintErrorMessageToScreen("\x1b[2;2HYou've launched the Ship with an old game OTR file." + "\x1b[4;2HPlease regenerate a new game OTR and relaunch." + "\x1b[6;2HPress the Home button to exit..."); +#elif defined(__WIIU__) + OSFatal("You've launched the Ship with an old a game OTR file.\n\n" + "Please generate a game OTR and relaunch.\n\n" + "Press and hold the Power button to shutdown..."); +#endif + } +} + +bool IsSubpath(const std::filesystem::path& path, const std::filesystem::path& base) { + auto rel = std::filesystem::relative(path, base); + return !rel.empty() && rel.native()[0] != '.'; +} + +bool PathTestCleanup(FILE* tfile) { + try { + if (std::filesystem::exists("./text.txt")) std::filesystem::remove("./text.txt"); + if (std::filesystem::exists("./test/")) std::filesystem::remove("./test/"); + } + catch (std::filesystem::filesystem_error const& ex) { return false; } + return true; +} + extern "C" void InitOTR() { -#if not defined (__SWITCH__) && not defined(__WIIU__) + +#ifdef __SWITCH__ + LUS::Switch::Init(LUS::PreInitPhase); +#elif defined(__WIIU__) + LUS::WiiU::Init(appShortName); +#endif + +#ifdef _WIN32 + char* tempVar = getenv("TEMP"); + std::filesystem::path tempPath; + try { + tempPath = std::filesystem::canonical(tempVar); + } catch (std::filesystem::filesystem_error const& ex) { + std::string userPath = getenv("USERPROFILE"); + userPath.append("\\AppData\\Local\\Temp"); + tempPath = std::filesystem::canonical(userPath); + } + wchar_t buffer[MAX_PATH]; + GetModuleFileName(NULL, buffer, _countof(buffer)); + auto ownPath = std::filesystem::canonical(buffer).parent_path(); + if (IsSubpath(ownPath, tempPath)) { + Extractor::ShowErrorBox("Error", "SoH is running in a temp folder. Extract the .zip and run again."); + exit(1); + } + FILE* tfile = fopen("./text.txt", "w"); + std::filesystem::path tfolder = std::filesystem::path("./test/"); + bool error = false; + try { + create_directories(tfolder); + } catch (std::filesystem::filesystem_error const& ex) { + error = true; + } + if (tfile == NULL || error) { + Extractor::ShowErrorBox("Error", "SoH does not have proper file permissions. Please move it to a folder that does and run again."); + PathTestCleanup(tfile); + exit(1); + } + fclose(tfile); + if (!PathTestCleanup(tfile)) { + Extractor::ShowErrorBox("Error", "SoH does not have proper file permissions. Please move it to a folder that does and run again."); + exit(1); + } +#endif + + CheckSoHOTRVersion(LUS::Context::GetPathRelativeToAppBundle("soh.otr")); + if (!std::filesystem::exists(LUS::Context::LocateFileAcrossAppDirs("oot-mq.otr", appShortName)) && !std::filesystem::exists(LUS::Context::LocateFileAcrossAppDirs("oot.otr", appShortName))){ +#if not defined(__SWITCH__) && not defined(__WIIU__) std::string installPath = LUS::Context::GetAppBundlePath(); if (!std::filesystem::exists(installPath + "/assets/extractor")) { Extractor::ShowErrorBox("Extractor assets not found", - "No OTR files found. Missing assets/extractor folder needed to generate OTR file. Exiting..."); + "No OTR files found. Missing assets/extractor folder needed to generate OTR file.\n\nExiting..."); exit(1); } bool generatedOtrIsMQ = false; if (Extractor::ShowYesNoBox("No OTR Files", "No OTR files found. Generate one now?") == IDYES) { Extractor extract; - if (!extract.Run()) { - Extractor::ShowErrorBox("Error", "An error occured, no OTR file was generated. Exiting..."); + if (!extract.Run(LUS::Context::GetAppDirectoryPath(appShortName))) { + Extractor::ShowErrorBox("Error", "An error occured, no OTR file was generated.\n\nExiting..."); exit(1); } extract.CallZapd(installPath, LUS::Context::GetAppDirectoryPath(appShortName)); @@ -774,20 +1066,26 @@ extern "C" void InitOTR() { } if (Extractor::ShowYesNoBox("Extraction Complete", "ROM Extracted. Extract another?") == IDYES) { Extractor extract; - if (!extract.Run(generatedOtrIsMQ ? RomSearchMode::Vanilla : RomSearchMode::MQ)) { - Extractor::ShowErrorBox("Error", "An error occured, an OTR file may have been generated by a different step. Continuing..."); + if (!extract.Run(LUS::Context::GetAppDirectoryPath(appShortName), generatedOtrIsMQ ? RomSearchMode::Vanilla : RomSearchMode::MQ)) { + Extractor::ShowErrorBox("Error", "An error occured, an OTR file may have been generated by a different step.\n\nContinuing..."); } else { extract.CallZapd(installPath, LUS::Context::GetAppDirectoryPath(appShortName)); } } - } -#endif -#ifdef __SWITCH__ - LUS::Switch::Init(LUS::PreInitPhase); +#elif defined(__SWITCH__) + LUS::Switch::PrintErrorMessageToScreen("\x1b[2;2HYou've launched the Ship without a game OTR file." + "\x1b[4;2HPlease generate a game OTR and relaunch." + "\x1b[6;2HPress the Home button to exit..."); #elif defined(__WIIU__) - LUS::WiiU::Init("soh"); + OSFatal("You've launched the Ship without a game OTR file.\n\n" + "Please generate a game OTR and relaunch.\n\n" + "Press and hold the Power button to shutdown..."); #endif + } + + DetectOTRVersion("oot.otr", false); + DetectOTRVersion("oot-mq.otr", true); OTRGlobals::Instance = new OTRGlobals(); CustomMessageManager::Instance = new CustomMessageManager(); @@ -836,6 +1134,7 @@ extern "C" void InitOTR() { std::shared_ptr conf = OTRGlobals::Instance->context->GetConfig(); conf->RegisterConfigVersionUpdater(std::make_shared()); + conf->RegisterConfigVersionUpdater(std::make_shared()); conf->RunVersionUpdates(); } @@ -901,7 +1200,7 @@ extern "C" void Graph_ProcessFrame(void (*run_one_game_iter)(void)) { OTRGlobals::Instance->context->GetWindow()->MainLoop(run_one_game_iter); } -extern bool ShouldClearTextureCacheAtEndOfFrame; +extern bool ToggleAltAssetsAtEndOfFrame; extern "C" void Graph_StartFrame() { #ifndef __WIIU__ @@ -984,9 +1283,7 @@ extern "C" void Graph_StartFrame() { } #endif case KbScancode::LUS_KB_TAB: { - // Toggle HD Assets - CVarSetInteger("gAltAssets", !CVarGetInteger("gAltAssets", 0)); - ShouldClearTextureCacheAtEndOfFrame = true; + ToggleAltAssetsAtEndOfFrame = true; break; } } @@ -1056,10 +1353,14 @@ extern "C" void Graph_ProcessGfxCommands(Gfx* commands) { } } - if (ShouldClearTextureCacheAtEndOfFrame) { + if (ToggleAltAssetsAtEndOfFrame) { + ToggleAltAssetsAtEndOfFrame = false; + + // Actually update the CVar now before runing the alt asset update listeners + CVarSetInteger("gAltAssets", !CVarGetInteger("gAltAssets", 0)); gfx_texture_cache_clear(); LUS::SkeletonPatcher::UpdateSkeletons(); - ShouldClearTextureCacheAtEndOfFrame = false; + GameInteractor::Instance->ExecuteHooks(); } // OTRTODO: FIGURE OUT END FRAME POINT @@ -1186,6 +1487,14 @@ extern "C" void ResourceMgr_DirtyDirectory(const char* resName) { LUS::Context::GetInstance()->GetResourceManager()->DirtyDirectory(resName); } +extern "C" void ResourceMgr_UnloadResource(const char* resName) { + std::string path = resName; + if (path.substr(0, 7) == "__OTR__") { + path = path.substr(7); + } + auto res = LUS::Context::GetInstance()->GetResourceManager()->UnloadResource(path); +} + // OTRTODO: There is probably a more elegant way to go about this... // Kenix: This is definitely leaking memory when it's called. extern "C" char** ResourceMgr_ListFiles(const char* searchMask, int* resultSize) { @@ -1212,6 +1521,27 @@ extern "C" uint8_t ResourceMgr_FileExists(const char* filePath) { return ExtensionCache.contains(path); } +extern "C" uint8_t ResourceMgr_FileAltExists(const char* filePath) { + std::string path = filePath; + if (path.substr(0, 7) == "__OTR__") { + path = path.substr(7); + } + + if (path.substr(0, 4) != "alt/") { + path = "alt/" + path; + } + + return ExtensionCache.contains(path); +} + +// Unloads a resource if an alternate version exists when alt assets are enabled +// The resource is only removed from the internal cache to prevent it from used in the next resource lookup +extern "C" void ResourceMgr_UnloadOriginalWhenAltExists(const char* resName) { + if (CVarGetInteger("gAltAssets", 0) && ResourceMgr_FileAltExists((char*) resName)) { + ResourceMgr_UnloadResource((char*) resName); + } +} + extern "C" void ResourceMgr_LoadFile(const char* resName) { LUS::Context::GetInstance()->GetResourceManager()->LoadResource(resName); } @@ -1251,6 +1581,11 @@ extern "C" char* ResourceMgr_LoadFileFromDisk(const char* filePath) { return data; } +extern "C" uint8_t ResourceMgr_TexIsRaw(const char* texPath) { + auto res = std::static_pointer_cast(GetResourceByNameHandlingMQ(texPath)); + return res->Flags & TEX_FLAG_LOAD_AS_RAW; +} + extern "C" uint8_t ResourceMgr_ResourceIsBackground(char* texPath) { auto res = GetResourceByNameHandlingMQ(texPath); return res->GetInitData()->Type == LUS::ResourceType::SOH_Background; @@ -1341,10 +1676,20 @@ extern "C" void ResourceMgr_PushCurrentDirectory(char* path) extern "C" Gfx* ResourceMgr_LoadGfxByName(const char* path) { + // When an alt resource exists for the DL, we need to unload the original asset + // to clear the cache so the alt asset will be loaded instead + // OTRTODO: If Alt loading over original cache is fixed, this line can most likely be removed + ResourceMgr_UnloadOriginalWhenAltExists(path); + auto res = std::static_pointer_cast(GetResourceByNameHandlingMQ(path)); return (Gfx*)&res->Instructions[0]; } +extern "C" uint8_t ResourceMgr_FileIsCustomByName(const char* path) { + auto res = std::static_pointer_cast(GetResourceByNameHandlingMQ(path)); + return res->GetInitData()->IsCustom; +} + typedef struct { int index; Gfx instruction; @@ -1376,6 +1721,11 @@ extern "C" void ResourceMgr_PatchGfxByName(const char* path, const char* patchNa // index /= 2; // } + // Do not patch custom assets as they most likely do not have the same instructions as authentic assets + if (res->GetInitData()->IsCustom) { + return; + } + Gfx* gfx = (Gfx*)&res->Instructions[index]; if (!originalGfx.contains(path) || !originalGfx[path].contains(patchName)) { @@ -1392,6 +1742,11 @@ extern "C" void ResourceMgr_PatchGfxCopyCommandByName(const char* path, const ch auto res = std::static_pointer_cast( LUS::Context::GetInstance()->GetResourceManager()->LoadResource(path)); + // Do not patch custom assets as they most likely do not have the same instructions as authentic assets + if (res->GetInitData()->IsCustom) { + return; + } + Gfx* destinationGfx = (Gfx*)&res->Instructions[destinationIndex]; Gfx sourceGfx = res->Instructions[sourceIndex]; @@ -1826,15 +2181,22 @@ Color_RGB8 GetColorForControllerLED() { } extern "C" void OTRControllerCallback(uint8_t rumble) { - auto physicalDevice = LUS::Context::GetInstance()->GetControlDeck()->GetDeviceFromPortIndex(0); + // We call this every tick, SDL accounts for this use and prevents driver spam + // https://github.com/libsdl-org/SDL/blob/f17058b562c8a1090c0c996b42982721ace90903/src/joystick/SDL_joystick.c#L1114-L1144 + LUS::Context::GetInstance()->GetControlDeck()->GetControllerByPort(0)->GetLED()->SetLEDColor(GetColorForControllerLED()); - if (physicalDevice->CanSetLed()) { - // We call this every tick, SDL accounts for this use and prevents driver spam - // https://github.com/libsdl-org/SDL/blob/f17058b562c8a1090c0c996b42982721ace90903/src/joystick/SDL_joystick.c#L1114-L1144 - physicalDevice->SetLedColor(0, GetColorForControllerLED()); + static std::shared_ptr controllerConfigWindow = nullptr; + if (controllerConfigWindow == nullptr) { + controllerConfigWindow = std::dynamic_pointer_cast(LUS::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Input Editor")); + } else if (controllerConfigWindow->TestingRumble()) { + return; } - physicalDevice->SetRumble(0, rumble); + if (rumble) { + LUS::Context::GetInstance()->GetControlDeck()->GetControllerByPort(0)->GetRumble()->StartRumble(); + } else { + LUS::Context::GetInstance()->GetControlDeck()->GetControllerByPort(0)->GetRumble()->StopRumble(); + } } extern "C" float OTRGetAspectRatio() { @@ -1873,12 +2235,12 @@ extern "C" void AudioPlayer_Play(const uint8_t* buf, uint32_t len) { } extern "C" int Controller_ShouldRumble(size_t slot) { - auto controlDeck = LUS::Context::GetInstance()->GetControlDeck(); - - if (slot < controlDeck->GetNumConnectedPorts()) { - auto physicalDevice = controlDeck->GetDeviceFromPortIndex(slot); - - if (physicalDevice->GetProfile(slot)->UseRumble && physicalDevice->CanRumble()) { + for (auto [id, mapping] : LUS::Context::GetInstance() + ->GetControlDeck() + ->GetControllerByPort(static_cast(slot)) + ->GetRumble() + ->GetAllRumbleMappings()) { + if (mapping->PhysicalDeviceIsConnected()) { return 1; } } @@ -1993,6 +2355,9 @@ extern "C" GetItemEntry ItemTable_Retrieve(int16_t getItemID) { } extern "C" GetItemEntry ItemTable_RetrieveEntry(s16 tableID, s16 getItemID) { + if (tableID == MOD_RANDOMIZER) { + return Rando::StaticData::RetrieveItem(static_cast(getItemID)).GetGIEntry_Copy(); + } return ItemTableManager::Instance->RetrieveItemEntry(tableID, getItemID); } @@ -2119,7 +2484,7 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) { actorParams = stone->params; // if we're in a generic grotto - if (play->sceneNum == 62 && actorParams == 14360) { + if (play->sceneNum == SCENE_GROTTOS && actorParams == 14360) { // look for the chest in the actorlist to determine // which grotto we're in int numOfActorLists = @@ -2216,10 +2581,11 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) { messageEntry = OTRGlobals::Instance->gRandomizer->GetGoronMessage(choice); } else if (Randomizer_GetSettingValue(RSK_FROGS_HINT) && textId == TEXT_FROGS_UNDERWATER) { messageEntry = OTRGlobals::Instance->gRandomizer->GetFrogsMessage(textId); - } else if (Randomizer_GetSettingValue(RSK_SARIA_HINT) && - (gPlayState->sceneNum == SCENE_SACRED_FOREST_MEADOW && textId == TEXT_SARIA_SFM) || (textId >= TEXT_SARIAS_SONG_FACE_TO_FACE && textId <= TEXT_SARIAS_SONG_CHANNELING_POWER)) { + } else if (Randomizer_GetSettingValue(RSK_SARIA_HINT)) { + if ((gPlayState->sceneNum == SCENE_SACRED_FOREST_MEADOW && textId == TEXT_SARIA_SFM) || (textId >= TEXT_SARIAS_SONG_FACE_TO_FACE && textId <= TEXT_SARIAS_SONG_CHANNELING_POWER)) { messageEntry = OTRGlobals::Instance->gRandomizer->GetSariaMessage(textId); } + } } if (textId == TEXT_GS_NO_FREEZE || textId == TEXT_GS_FREEZE) { if (CVarGetInteger("gInjectItemCounts", 0) != 0) { @@ -2299,6 +2665,70 @@ extern "C" void Gfx_RegisterBlendedTexture(const char* name, u8* mask, u8* repla gfx_register_blended_texture(name, mask, replacement); } -extern "C" void CheckTracker_OnMessageClose() { - CheckTracker::CheckTrackerDialogClosed(); -} \ No newline at end of file +// #region SOH [TODO] Ideally this should move to being event based, it's currently run every frame on the file select screen +extern "C" void SoH_ProcessDroppedFiles() { + const char* droppedFile = CVarGetString("gDroppedFile", ""); + if (CVarGetInteger("gNewFileDropped", 0) && strcmp(droppedFile, "") != 0) { + try { + std::ifstream configStream(SohUtils::Sanitize(droppedFile)); + if (!configStream) { + return; + } + + nlohmann::json configJson; + configStream >> configJson; + + if (!configJson.contains("CVars")) { + return; + } + + clearCvars(enhancementsCvars); + clearCvars(cheatCvars); + clearCvars(randomizerCvars); + + // Flatten everything under CVars into a single array + auto cvars = configJson["CVars"].flatten(); + + for (auto& [key, value] : cvars.items()) { + // Replace slashes with dots in key, and remove leading dot + std::string path = key; + std::replace(path.begin(), path.end(), '/', '.'); + if (path[0] == '.') { + path.erase(0, 1); + } + if (value.is_string()) { + CVarSetString(path.c_str(), value.get().c_str()); + } else if (value.is_number_integer()) { + CVarSetInteger(path.c_str(), value.get()); + } else if (value.is_number_float()) { + CVarSetFloat(path.c_str(), value.get()); + } + } + + auto gui = LUS::Context::GetInstance()->GetWindow()->GetGui(); + gui->GetGuiWindow("Console")->Hide(); + gui->GetGuiWindow("Actor Viewer")->Hide(); + gui->GetGuiWindow("Collision Viewer")->Hide(); + gui->GetGuiWindow("Save Editor")->Hide(); + gui->GetGuiWindow("Display List Viewer")->Hide(); + gui->GetGuiWindow("Stats")->Hide(); + std::dynamic_pointer_cast(LUS::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Console"))->ClearBindings(); + + gui->SaveConsoleVariablesOnNextTick(); + + uint32_t finalHash = boost::hash_32{}(configJson.dump()); + gui->GetGameOverlay()->TextDrawNotification(30.0f, true, "Configuration Loaded. Hash: %d", finalHash); + } catch (std::exception& e) { + SPDLOG_ERROR("Failed to load config file: {}", e.what()); + auto gui = LUS::Context::GetInstance()->GetWindow()->GetGui(); + gui->GetGameOverlay()->TextDrawNotification(30.0f, true, "Failed to load config file"); + return; + } catch (...) { + SPDLOG_ERROR("Failed to load config file"); + auto gui = LUS::Context::GetInstance()->GetWindow()->GetGui(); + gui->GetGameOverlay()->TextDrawNotification(30.0f, true, "Failed to load config file"); + return; + } + } +} +// #endregion diff --git a/soh/soh/OTRGlobals.h b/soh/soh/OTRGlobals.h index c9a6d3732..ce346c6cf 100644 --- a/soh/soh/OTRGlobals.h +++ b/soh/soh/OTRGlobals.h @@ -12,6 +12,9 @@ #define GAME_PLATFORM_N64 0 #define GAME_PLATFORM_GC 1 +#define BTN_MODIFIER1 0x00040 +#define BTN_MODIFIER2 0x00080 + #ifdef __cplusplus #include #include "Enhancements/savestates.h" @@ -22,6 +25,14 @@ const std::string customMessageTableID = "BaseGameOverrides"; const std::string appShortName = "soh"; +#ifdef __WIIU__ +const uint32_t defaultImGuiScale = 3; +#else +const uint32_t defaultImGuiScale = 1; +#endif + +const float imguiScaleOptionToValue[4] = { 0.75f, 1.0f, 1.5f, 2.0f }; + class OTRGlobals { public: @@ -32,8 +43,14 @@ public: std::shared_ptr gRandomizer; std::shared_ptr gRandoContext; + ImFont* defaultFontSmaller; + ImFont* defaultFontLarger; + ImFont* defaultFontLargest; + OTRGlobals(); ~OTRGlobals(); + + void ScaleImGui(); bool HasMasterQuest(); bool HasOriginal(); @@ -44,6 +61,7 @@ private: void CheckSaveFile(size_t sramSize) const; bool hasMasterQuest; bool hasOriginal; + ImFont* CreateDefaultFontWithSize(float size); }; uint32_t IsGameMasterQuest(); @@ -73,11 +91,15 @@ uint32_t ResourceMgr_GetGameVersion(int index); uint32_t ResourceMgr_GetGamePlatform(int index); uint32_t ResourceMgr_GetGameRegion(int index); void ResourceMgr_LoadDirectory(const char* resName); +void ResourceMgr_UnloadResource(const char* resName); char** ResourceMgr_ListFiles(const char* searchMask, int* resultSize); uint8_t ResourceMgr_FileExists(const char* resName); +uint8_t ResourceMgr_FileAltExists(const char* resName); +void ResourceMgr_UnloadOriginalWhenAltExists(const char* resName); char* GetResourceDataByNameHandlingMQ(const char* path); void ResourceMgr_LoadFile(const char* resName); char* ResourceMgr_LoadFileFromDisk(const char* filePath); +uint8_t ResourceMgr_TexIsRaw(const char* texPath); uint8_t ResourceMgr_ResourceIsBackground(char* texPath); char* ResourceMgr_LoadJPEG(char* data, size_t dataSize); uint16_t ResourceMgr_LoadTexWidthByName(char* texPath); @@ -88,6 +110,7 @@ AnimationHeaderCommon* ResourceMgr_LoadAnimByName(const char* path); char* ResourceMgr_GetNameByCRC(uint64_t crc, char* alloc); Gfx* ResourceMgr_LoadGfxByCRC(uint64_t crc); Gfx* ResourceMgr_LoadGfxByName(const char* path); +uint8_t ResourceMgr_FileIsCustomByName(const char* path); void ResourceMgr_PatchGfxByName(const char* path, const char* patchName, int index, Gfx instruction); void ResourceMgr_UnpatchGfxByName(const char* path, const char* patchName); char* ResourceMgr_LoadArrayByNameAsVec3s(const char* path); @@ -161,8 +184,10 @@ void EntranceTracker_SetLastEntranceOverride(s16 entranceIndex); void Gfx_RegisterBlendedTexture(const char* name, u8* mask, u8* replacement); void SaveManager_ThreadPoolWait(); void CheckTracker_OnMessageClose(); +void SoH_ProcessDroppedFiles(); -int32_t GetGIID(uint32_t itemID); +GetItemID RetrieveGetItemIDFromItemID(ItemID itemID); +RandomizerGet RetrieveRandomizerGetFromItemID(ItemID itemID); #endif #ifdef __cplusplus diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp index 5a10b0a0c..d6f573e65 100644 --- a/soh/soh/SaveManager.cpp +++ b/soh/soh/SaveManager.cpp @@ -51,6 +51,11 @@ std::filesystem::path SaveManager::GetFileName(int fileNum) { return sSavePath / ("file" + std::to_string(fileNum + 1) + ".sav"); } +std::filesystem::path SaveManager::GetFileTempName(int fileNum) { + const std::filesystem::path sSavePath(LUS::Context::GetPathRelativeToAppDirectory("Save")); + return sSavePath / ("file" + std::to_string(fileNum + 1) + ".temp"); +} + SaveManager::SaveManager() { coreSectionIDsByName["base"] = SECTION_ID_BASE; coreSectionIDsByName["randomizer"] = SECTION_ID_RANDOMIZER; @@ -70,6 +75,10 @@ SaveManager::SaveManager() { AddInitFunction(InitFileImpl); + GameInteractor::Instance->RegisterGameHook([this](uint32_t fileNum) { ThreadPoolWait(); }); + + smThreadPool = std::make_shared(1); + for (SaveFileMetaInfo& info : fileMetaInfo) { info.valid = false; info.deaths = 0; @@ -322,13 +331,12 @@ void SaveManager::LoadRandomizerVersion3() { RandomizerGet rg = RG_NONE; SaveManager::Instance->LoadData("fakeRgID", rg, RG_NONE); if (rg != RG_NONE) { - randoContext->overrides[static_cast(i)] = - Rando::ItemOverride(static_cast(i), rg); + randoContext->overrides.emplace(static_cast(i), Rando::ItemOverride(static_cast(i), rg)); SaveManager::Instance->LoadStruct("trickName", [&]() { SaveManager::Instance->LoadData( - "english", randoContext->overrides[static_cast(i)].GetTrickName().english); + "english", randoContext->GetItemOverride(i).GetTrickName().english); SaveManager::Instance->LoadData( - "french", randoContext->overrides[static_cast(i)].GetTrickName().french); + "french", randoContext->GetItemOverride(i).GetTrickName().french); }); } uint16_t price = 0; @@ -428,10 +436,10 @@ void SaveManager::SaveRandomizer(SaveContext* saveContext, int sectionID, bool f SaveManager::Instance->SaveStruct("", [&]() { SaveManager::Instance->SaveData("rgID", randoContext->GetItemLocation(i)->GetPlacedRandomizerGet()); if (randoContext->GetItemLocation(i)->GetPlacedRandomizerGet() == RG_ICE_TRAP) { - SaveManager::Instance->SaveData("fakeRgID", randoContext->overrides[static_cast(i)].LooksLike()); + SaveManager::Instance->SaveData("fakeRgID", randoContext->GetItemOverride(i).LooksLike()); SaveManager::Instance->SaveStruct("trickName", [&]() { - SaveManager::Instance->SaveData("english", randoContext->overrides[static_cast(i)].GetTrickName().GetEnglish()); - SaveManager::Instance->SaveData("french", randoContext->overrides[static_cast(i)].GetTrickName().GetFrench()); + SaveManager::Instance->SaveData("english", randoContext->GetItemOverride(i).GetTrickName().GetEnglish()); + SaveManager::Instance->SaveData("french", randoContext->GetItemOverride(i).GetTrickName().GetFrench()); // TODO: German (trick names don't have german translations yet) }); } @@ -503,12 +511,14 @@ void SaveManager::SaveRandomizer(SaveContext* saveContext, int sectionID, bool f }); } +// Init() here is an extension of InitSram, and thus not truly an initializer for SaveManager itself. don't put any class initialization stuff here void SaveManager::Init() { + // Wait on saves that snuck through the Wait in OnExitGame + ThreadPoolWait(); const std::filesystem::path sSavePath(LUS::Context::GetPathRelativeToAppDirectory("Save")); const std::filesystem::path sGlobalPath = sSavePath / std::string("global.sav"); auto sOldSavePath = LUS::Context::GetPathRelativeToAppDirectory("oot_save.sav"); auto sOldBackupSavePath = LUS::Context::GetPathRelativeToAppDirectory("oot_save.bak"); - GameInteractor::Instance->RegisterGameHook([this](uint32_t fileNum) { ThreadPoolWait(); }); // If the save directory does not exist, create it if (!std::filesystem::exists(sSavePath)) { @@ -549,7 +559,6 @@ void SaveManager::Init() { } else { CreateDefaultGlobal(); } - smThreadPool = std::make_shared(1); // Load files to initialize metadata for (int fileNum = 0; fileNum < MaxFiles; fileNum++) { @@ -750,13 +759,11 @@ void SaveManager::InitFileNormal() { gSaveContext.backupFW = gSaveContext.fw; gSaveContext.pendingSale = ITEM_NONE; gSaveContext.pendingSaleMod = MOD_NONE; + gSaveContext.isBossRushPaused = 0; + gSaveContext.pendingIceTrapCount = 0; - // Boss Rush is set ahead of time in z_file_choose, otherwise init the save with the normal quest - if (IS_BOSS_RUSH) { - BossRush_InitSave(); - } else { - gSaveContext.questId = QUEST_NORMAL; - } + // Init with normal quest unless only an MQ rom is provided + gSaveContext.questId = OTRGlobals::Instance->HasOriginal() ? QUEST_NORMAL : QUEST_MASTER; //RANDOTODO (ADD ITEMLOCATIONS TO GSAVECONTEXT) } @@ -871,7 +878,7 @@ void SaveManager::InitFileDebug() { } } - gSaveContext.entranceIndex = 0xCD; + gSaveContext.entranceIndex = ENTR_HYRULE_FIELD_0; gSaveContext.magicLevel = 0; gSaveContext.sceneFlags[5].swch = 0x40000000; } @@ -1014,10 +1021,36 @@ void SaveManager::InitFileMaxed() { } } - gSaveContext.entranceIndex = 0xCD; + gSaveContext.entranceIndex = ENTR_HYRULE_FIELD_0; gSaveContext.sceneFlags[5].swch = 0x40000000; } +#if defined(__WIIU__) || defined(__SWITCH__) +// std::filesystem::copy_file doesn't work properly with the Wii U's toolchain atm +int copy_file(const char* src, const char* dst) { + alignas(0x40) uint8_t buf[4096]; + FILE* r = fopen(src, "r"); + if (!r) { + return -1; + } + FILE* w = fopen(dst, "w"); + if (!w) { + return -2; + } + + size_t res; + while ((res = fread(buf, 1, sizeof(buf), r)) > 0) { + if (fwrite(buf, 1, res, w) != res) { + break; + } + } + + fclose(r); + fclose(w); + return res >= 0 ? 0 : res; +} +#endif + // Threaded SaveFile takes copy of gSaveContext for local unmodified storage void SaveManager::SaveFileThreaded(int fileNum, SaveContext* saveContext, int sectionID) { @@ -1059,19 +1092,42 @@ void SaveManager::SaveFileThreaded(int fileNum, SaveContext* saveContext, int se svi.func(saveContext, sectionID, false); } + std::filesystem::path fileName = GetFileName(fileNum); + std::filesystem::path tempFile = GetFileTempName(fileNum); + + if (std::filesystem::exists(tempFile)) { + std::filesystem::remove(tempFile); + } + #if defined(__SWITCH__) || defined(__WIIU__) - FILE* w = fopen(GetFileName(fileNum).c_str(), "w"); + FILE* w = fopen(tempFile.c_str(), "w"); std::string json_string = saveBlock.dump(4); fwrite(json_string.c_str(), sizeof(char), json_string.length(), w); fclose(w); #else - std::ofstream output(GetFileName(fileNum)); + std::ofstream output(tempFile); output << std::setw(4) << saveBlock << std::endl; + output.close(); #endif + if (std::filesystem::exists(fileName)) { + std::filesystem::remove(fileName); + } + +#if defined(__SWITCH__) || defined(__WIIU__) + copy_file(tempFile.c_str(), fileName.c_str()); +#else + std::filesystem::copy_file(tempFile, fileName); +#endif + + if (std::filesystem::exists(tempFile)) { + std::filesystem::remove(tempFile); + } + delete saveContext; InitMeta(fileNum); GameInteractor::Instance->ExecuteHooks(fileNum); + SPDLOG_INFO("Save File Finish - fileNum: {}", fileNum); } // SaveSection creates a copy of gSaveContext to prevent mid-save data modification, and passes its reference to SaveFileThreaded @@ -2254,32 +2310,6 @@ void SaveManager::LoadStruct(const std::string& name, LoadStructFunc func) { } } -#if defined(__WIIU__) || defined(__SWITCH__) -// std::filesystem::copy_file doesn't work properly with the Wii U's toolchain atm -int copy_file(const char* src, const char* dst) { - alignas(0x40) uint8_t buf[4096]; - FILE* r = fopen(src, "r"); - if (!r) { - return -1; - } - FILE* w = fopen(dst, "w"); - if (!w) { - return -2; - } - - size_t res; - while ((res = fread(buf, 1, sizeof(buf), r)) > 0) { - if (fwrite(buf, 1, res, w) != res) { - break; - } - } - - fclose(r); - fclose(w); - return res >= 0 ? 0 : res; -} -#endif - void SaveManager::CopyZeldaFile(int from, int to) { assert(std::filesystem::exists(GetFileName(from))); DeleteZeldaFile(to); diff --git a/soh/soh/SaveManager.h b/soh/soh/SaveManager.h index 0c094eb2b..85d08a43d 100644 --- a/soh/soh/SaveManager.h +++ b/soh/soh/SaveManager.h @@ -142,6 +142,7 @@ class SaveManager { private: std::filesystem::path GetFileName(int fileNum); + std::filesystem::path GetFileTempName(int fileNum); nlohmann::json saveBlock; void ConvertFromUnversioned(); diff --git a/soh/soh/SohGui.cpp b/soh/soh/SohGui.cpp index 73b006df9..c30f52db2 100644 --- a/soh/soh/SohGui.cpp +++ b/soh/soh/SohGui.cpp @@ -38,7 +38,7 @@ #include "Enhancements/game-interactor/GameInteractor.h" #include "Enhancements/cosmetics/authenticGfxPatches.h" -bool ShouldClearTextureCacheAtEndOfFrame = false; +bool ToggleAltAssetsAtEndOfFrame = false; bool isBetaQuestEnabled = false; extern "C" { @@ -118,6 +118,7 @@ namespace SohGui { std::shared_ptr mColViewerWindow; std::shared_ptr mSaveEditorWindow; std::shared_ptr mDLViewerWindow; + std::shared_ptr mValueViewerWindow; std::shared_ptr mGameplayStatsWindow; std::shared_ptr mCheckTrackerSettingsWindow; std::shared_ptr mCheckTrackerWindow; @@ -169,6 +170,8 @@ namespace SohGui { gui->AddGuiWindow(mSaveEditorWindow); mDLViewerWindow = std::make_shared("gDLViewerEnabled", "Display List Viewer"); gui->AddGuiWindow(mDLViewerWindow); + mValueViewerWindow = std::make_shared("gValueViewer.WindowOpen", "Value Viewer"); + gui->AddGuiWindow(mValueViewerWindow); mGameplayStatsWindow = std::make_shared("gGameplayStatsEnabled", "Gameplay Stats"); gui->AddGuiWindow(mGameplayStatsWindow); mCheckTrackerWindow = std::make_shared("gCheckTrackerEnabled", "Check Tracker"); @@ -194,6 +197,7 @@ namespace SohGui { mCheckTrackerSettingsWindow = nullptr; mGameplayStatsWindow = nullptr; mDLViewerWindow = nullptr; + mValueViewerWindow = nullptr; mSaveEditorWindow = nullptr; mColViewerWindow = nullptr; mActorViewerWindow = nullptr; diff --git a/soh/soh/SohGui.hpp b/soh/soh/SohGui.hpp index 59333fd42..fccc29c1f 100644 --- a/soh/soh/SohGui.hpp +++ b/soh/soh/SohGui.hpp @@ -17,6 +17,7 @@ #include "Enhancements/debugger/colViewer.h" #include "Enhancements/debugger/debugSaveEditor.h" #include "Enhancements/debugger/dlViewer.h" +#include "Enhancements/debugger/valueViewer.h" #include "Enhancements/gameplaystatswindow.h" #include "Enhancements/randomizer/randomizer_check_tracker.h" #include "Enhancements/randomizer/randomizer_entrance_tracker.h" diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp index 25bbe5e06..5ede4c351 100644 --- a/soh/soh/SohMenuBar.cpp +++ b/soh/soh/SohMenuBar.cpp @@ -22,13 +22,14 @@ #include "Enhancements/debugger/colViewer.h" #include "Enhancements/debugger/debugSaveEditor.h" #include "Enhancements/debugger/dlViewer.h" +#include "Enhancements/debugger/valueViewer.h" #include "Enhancements/gameplaystatswindow.h" #include "Enhancements/randomizer/randomizer_check_tracker.h" #include "Enhancements/randomizer/randomizer_entrance_tracker.h" #include "Enhancements/randomizer/randomizer_item_tracker.h" #include "Enhancements/randomizer/randomizer_settings_window.h" -extern bool ShouldClearTextureCacheAtEndOfFrame; +extern bool ToggleAltAssetsAtEndOfFrame; extern bool isBetaQuestEnabled; extern "C" PlayState* gPlayState; @@ -51,6 +52,8 @@ std::string GetWindowButtonText(const char* text, bool menuOpen) { return buttonText; } +static const char* imguiScaleOptions[4] = { "Small", "Normal", "Large", "X-Large" }; + static const char* filters[3] = { #ifdef __WIIU__ "", @@ -380,7 +383,15 @@ void DrawSettingsMenu() { } UIWidgets::PaddedSeparator(true, true, 3.0f, 3.0f); + ImGui::Text("ImGui Menu Scale"); + ImGui::SameLine(); + ImGui::TextColored({ 0.85f, 0.35f, 0.0f, 1.0f }, "(Experimental)"); + if (UIWidgets::EnhancementCombobox("gImGuiScale", imguiScaleOptions, 1)) { + OTRGlobals::Instance->ScaleImGui(); + } + UIWidgets::Tooltip("Changes the scaling of the ImGui menu elements."); + UIWidgets::PaddedSeparator(true, true, 3.0f, 3.0f); static std::unordered_map windowBackendNames = { { LUS::WindowBackend::DX11, "DirectX" }, @@ -482,6 +493,8 @@ extern std::shared_ptr mGameplayStatsWindow; void DrawEnhancementsMenu() { if (ImGui::BeginMenu("Enhancements")) { + ImGui::BeginDisabled(CVarGetInteger("gDisableChangingSettings", 0)); + DrawPresetSelector(PRESET_TYPE_ENHANCEMENTS); UIWidgets::PaddedSeparator(); @@ -522,6 +535,8 @@ void DrawEnhancementsMenu() { " - Small keys: Small silver chest\n" " - Boss keys: Vanilla size and texture\n" " - Skulltula Tokens: Small skulltula chest\n" + "\n" + "NOTE: Textures will not apply if you are using a mod pack with a custom chest model." ); if (CVarGetInteger("gChestSizeAndTextureMatchesContents", CSMC_DISABLED) != CSMC_DISABLED) { UIWidgets::PaddedEnhancementCheckbox("Chests of Agony", "gChestSizeDependsStoneOfAgony", true, false); @@ -567,6 +582,8 @@ void DrawEnhancementsMenu() { "- Obtained the Master Sword\n" "- Not within range of Time Block\n" "- Not within range of Ocarina playing spots"); + UIWidgets::PaddedEnhancementCheckbox("Skip water take breath animation", "gSkipSwimDeepEndAnim", true, false); + UIWidgets::Tooltip("Skips Link's taking breath animation after coming up from water. This setting does not interfere with getting items from underwater."); ImGui::EndMenu(); } @@ -593,17 +610,25 @@ void DrawEnhancementsMenu() { UIWidgets::PaddedEnhancementCheckbox("Nuts explode bombs", "gNutsExplodeBombs", true, false); UIWidgets::Tooltip("Makes nuts explode bombs, similar to how they interact with bombchus. This does not affect bombflowers."); UIWidgets::PaddedEnhancementCheckbox("Equip Multiple Arrows at Once", "gSeparateArrows", true, false); - UIWidgets::Tooltip("Allow the bow and magic arrows to be equipped at the same time on different slots"); + UIWidgets::Tooltip("Allow the bow and magic arrows to be equipped at the same time on different slots. (Note this will disable the behaviour of the 'Equip Dupe' glitch)"); UIWidgets::PaddedEnhancementCheckbox("Bow as Child/Slingshot as Adult", "gBowSlingShotAmmoFix", true, false); UIWidgets::Tooltip("Allows child to use bow with arrows.\nAllows adult to use slingshot with seeds.\n\nRequires glitches or 'Timeless Equipment' cheat to equip."); UIWidgets::PaddedEnhancementCheckbox("Better Farore's Wind", "gBetterFW", true, false); UIWidgets::Tooltip("Helps FW persist between ages, gives child and adult separate FW points, and can be used in more places."); + UIWidgets::PaddedEnhancementCheckbox("Remove Explosive Limit", "gRemoveExplosiveLimit", true, false); + UIWidgets::Tooltip("Removes the cap of 3 active explosives being deployed at once."); UIWidgets::PaddedEnhancementCheckbox("Static Explosion Radius", "gStaticExplosionRadius", true, false); UIWidgets::Tooltip("Explosions are now a static size, like in Majora's Mask and OoT3D. Makes bombchu hovering much easier."); UIWidgets::PaddedEnhancementCheckbox("Prevent Bombchus Forcing First-Person", "gDisableFirstPersonChus", true, false); UIWidgets::Tooltip("Prevent bombchus from forcing the camera into first-person mode when released."); UIWidgets::PaddedEnhancementCheckbox("Aiming reticle for the bow/slingshot", "gBowReticle", true, false); UIWidgets::Tooltip("Aiming with a bow or slingshot will display a reticle as with the hookshot when the projectile is ready to fire."); + if (UIWidgets::PaddedEnhancementCheckbox("Allow strength equipment to be toggled", "gToggleStrength", true, false)) { + if (!CVarGetInteger("gToggleStrength", 0)) { + CVarSetInteger("gStrengthDisabled", 0); + } + } + UIWidgets::Tooltip("Allows strength to be toggled on and off by pressing A on the strength upgrade in the equipment subscreen of the pause menu (This allows performing some glitches that require the player to not have strength)."); ImGui::EndMenu(); } @@ -894,7 +919,10 @@ void DrawEnhancementsMenu() { { if (ImGui::BeginMenu("Mods")) { if (UIWidgets::PaddedEnhancementCheckbox("Use Alternate Assets", "gAltAssets", false, false)) { - ShouldClearTextureCacheAtEndOfFrame = true; + // The checkbox will flip the alt asset CVar, but we instead want it to change at the end of the game frame + // We toggle it back while setting the flag to update the CVar later + CVarSetInteger("gAltAssets", !CVarGetInteger("gAltAssets", 0)); + ToggleAltAssetsAtEndOfFrame = true; } UIWidgets::Tooltip("Toggle between standard assets and alternate assets. Usually mods will indicate if this setting has to be used or not."); UIWidgets::PaddedEnhancementCheckbox("Disable Bomb Billboarding", "gDisableBombBillboarding", true, false); @@ -903,6 +931,8 @@ void DrawEnhancementsMenu() { UIWidgets::Tooltip("Disables grottos rotating with the camera. To be used in conjunction with mods that want to replace grottos with 3D objects."); UIWidgets::PaddedEnhancementCheckbox("Invisible Bunny Hood", "gHideBunnyHood", true, false); UIWidgets::Tooltip("Turns Bunny Hood invisible while still maintaining its effects."); + UIWidgets::PaddedEnhancementCheckbox("Disable HUD Heart animations", "gNoHUDHeartAnimation", true, false); + UIWidgets::Tooltip("Disables the beating animation of the hearts on the HUD."); ImGui::EndMenu(); } @@ -1047,6 +1077,13 @@ void DrawEnhancementsMenu() { "Fixes an incorrect calculation that acted like water underneath ground was above it."); UIWidgets::PaddedEnhancementCheckbox("Fix Bush Item Drops", "gBushDropFix", true, false); UIWidgets::Tooltip("Fixes the bushes to drop items correctly rather than spawning undefined items."); + UIWidgets::PaddedEnhancementCheckbox("Fix falling from vine edges", "gFixVineFall", true, false); + UIWidgets::Tooltip("Prevents immediately falling off climbable surfaces if climbing on the edges."); + UIWidgets::PaddedEnhancementCheckbox("Fix Link's eyes open while sleeping", "gFixEyesOpenWhileSleeping", true, false); + UIWidgets::Tooltip("Fixes Link's eyes being open in the opening cutscene when he is supposed to be sleeping."); + UIWidgets::PaddedEnhancementCheckbox("Fix Darunia dancing too fast", "gEnhancements.FixDaruniaDanceSpeed", + true, false, false, "", UIWidgets::CheckboxGraphics::Cross, true); + UIWidgets::Tooltip("Fixes Darunia's dancing speed so he dances to the beat of Saria's Song, like in vanilla."); ImGui::EndMenu(); } @@ -1115,6 +1152,9 @@ void DrawEnhancementsMenu() { "- Random (Seeded): Enemies are randomized based on the current randomizer seed/file\n" ); + UIWidgets::PaddedEnhancementCheckbox("Randomized Enemy Sizes", "gRandomizedEnemySizes", true, false); + UIWidgets::Tooltip("Enemies and Bosses spawn with random sizes."); + UIWidgets::PaddedEnhancementCheckbox("Ivan the Fairy (Coop Mode)", "gIvanCoopModeEnabled", true, false); UIWidgets::Tooltip("Enables Ivan the Fairy upon the next map change. Player 2 can control Ivan and " "press the C-Buttons to use items and mess with Player 1!"); @@ -1124,7 +1164,7 @@ void DrawEnhancementsMenu() { if (CVarGetInteger("gRupeeDash", 0)) { UIWidgets::PaddedEnhancementSliderInt( - "Rupee Dash Interval: %d", "##DashInterval", "gDashInterval", 3, 5, "", 5, true, true, false, + "Rupee Dash Interval: %d", "##DashInterval", "gDashInterval", 1, 10, "", 5, true, true, false, !CVarGetInteger("gRupeeDash", 0), "This option is disabled because \"Rupee Dash Mode\" is turned off"); UIWidgets::Tooltip("Interval between Rupee reduction in Rupee Dash Mode"); @@ -1179,6 +1219,8 @@ void DrawEnhancementsMenu() { UIWidgets::PaddedSeparator(true, true, 2.0f, 2.0f); + ImGui::EndDisabled(); + ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(12.0f, 6.0f)); ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(0, 0)); ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f); @@ -1220,6 +1262,8 @@ void DrawEnhancementsMenu() { void DrawCheatsMenu() { if (ImGui::BeginMenu("Cheats")) { + ImGui::BeginDisabled(CVarGetInteger("gDisableChangingSettings", 0)); + if (ImGui::BeginMenu("Infinite...")) { UIWidgets::EnhancementCheckbox("Money", "gInfiniteMoney"); UIWidgets::PaddedEnhancementCheckbox("Health", "gInfiniteHealth", true, false); @@ -1374,6 +1418,8 @@ void DrawCheatsMenu() { } UIWidgets::Tooltip("Clears the cutscene pointer to a value safe for wrong warps."); + ImGui::EndDisabled(); + ImGui::EndMenu(); } } @@ -1384,9 +1430,12 @@ extern std::shared_ptr mSaveEditorWindow; extern std::shared_ptr mColViewerWindow; extern std::shared_ptr mActorViewerWindow; extern std::shared_ptr mDLViewerWindow; +extern std::shared_ptr mValueViewerWindow; void DrawDeveloperToolsMenu() { if (ImGui::BeginMenu("Developer Tools")) { + ImGui::BeginDisabled(CVarGetInteger("gDisableChangingSettings", 0)); + UIWidgets::EnhancementCheckbox("OoT Debug Mode", "gDebugEnabled"); UIWidgets::Tooltip("Enables Debug Mode, allowing you to select maps with L + R + Z, noclip with L + D-pad Right, and open the debug menu with L on the pause screen"); if (CVarGetInteger("gDebugEnabled", 0)) { @@ -1455,10 +1504,18 @@ void DrawDeveloperToolsMenu() { mDLViewerWindow->ToggleVisibility(); } } + UIWidgets::Spacer(0); + if (mValueViewerWindow) { + if (ImGui::Button(GetWindowButtonText("Value Viewer", CVarGetInteger("gValueViewer.WindowOpen", 0)).c_str(), ImVec2(-1.0f, 0.0f))) { + mValueViewerWindow->ToggleVisibility(); + } + } ImGui::PopStyleVar(3); ImGui::PopStyleColor(1); + ImGui::EndDisabled(); + ImGui::EndMenu(); } } @@ -1615,4 +1672,4 @@ void SohMenuBar::DrawElement() { ImGui::EndMenuBar(); } } -} // namespace SohGui \ No newline at end of file +} // namespace SohGui diff --git a/soh/soh/config/ConfigUpdaters.cpp b/soh/soh/config/ConfigUpdaters.cpp index c2689e676..1951e78e1 100644 --- a/soh/soh/config/ConfigUpdaters.cpp +++ b/soh/soh/config/ConfigUpdaters.cpp @@ -1,7 +1,9 @@ #include "ConfigUpdaters.h" +#include "soh/Enhancements/audio/AudioCollection.h" namespace LUS { ConfigVersion1Updater::ConfigVersion1Updater() : ConfigVersionUpdater(1) {} + ConfigVersion2Updater::ConfigVersion2Updater() : ConfigVersionUpdater(2) {} void ConfigVersion1Updater::Update(Config* conf) { if (conf->GetInt("Window.Width", 640) == 640) { @@ -60,4 +62,10 @@ namespace LUS { } CVarClear("gSeededRandomizedEnemies"); } -} \ No newline at end of file + + void ConfigVersion2Updater::Update(Config* conf) { + for (auto seq : AudioCollection::Instance->GetAllSequences()) { + CVarClear(std::string("gAudioEditor.ReplacedSequences." + seq.second.sfxKey).c_str()); + } + } +} diff --git a/soh/soh/config/ConfigUpdaters.h b/soh/soh/config/ConfigUpdaters.h index e7f684ae4..cc8f6109a 100644 --- a/soh/soh/config/ConfigUpdaters.h +++ b/soh/soh/config/ConfigUpdaters.h @@ -1,9 +1,15 @@ #include "libultraship/libultraship.h" namespace LUS { -class ConfigVersion1Updater : public ConfigVersionUpdater { - public: - ConfigVersion1Updater(); - void Update(Config* conf); -}; + class ConfigVersion1Updater : public ConfigVersionUpdater { + public: + ConfigVersion1Updater(); + void Update(Config* conf); + }; + + class ConfigVersion2Updater : public ConfigVersionUpdater { + public: + ConfigVersion2Updater(); + void Update(Config* conf); + }; } \ No newline at end of file diff --git a/soh/soh/mq_asset_hacks.h b/soh/soh/mq_asset_hacks.h index dacf8a54e..4ffcecb5d 100644 --- a/soh/soh/mq_asset_hacks.h +++ b/soh/soh/mq_asset_hacks.h @@ -13,97 +13,6 @@ void* D_8012A2F8_MQ[] = { gYdanTex_00CA18_MQ, }; -#define dgGoronCityNightEntranceTex_MQ "__OTR__scenes/mq/spot18_scene/gGoronCityNightEntranceTex" -static const ALIGN_ASSET(2) char gGoronCityNightEntranceTex_MQ[] = dgGoronCityNightEntranceTex_MQ; - -#define dgGoronCityDayEntranceTex_MQ "__OTR__scenes/mq/spot18_scene/gGoronCityDayEntranceTex" -static const ALIGN_ASSET(2) char gGoronCityDayEntranceTex_MQ[] = dgGoronCityDayEntranceTex_MQ; -void* sGoronCityEntranceTextures_MQ[] = { - gGoronCityDayEntranceTex_MQ, - gGoronCityNightEntranceTex_MQ, -}; - -#define dgLonLonRanchDayWindowTex_MQ "__OTR__scenes/mq/spot20_scene/gLonLonRanchDayWindowTex" -static const ALIGN_ASSET(2) char gLonLonRanchDayWindowTex_MQ[] = dgLonLonRanchDayWindowTex_MQ; - -#define dgLonLonRangeNightWindowsTex_MQ "__OTR__scenes/mq/spot20_scene/gLonLonRangeNightWindowsTex" -static const ALIGN_ASSET(2) char gLonLonRangeNightWindowsTex_MQ[] = dgLonLonRangeNightWindowsTex_MQ; -void* sLonLonRanchWindowTextures_MQ[] = { - gLonLonRanchDayWindowTex_MQ, - gLonLonRangeNightWindowsTex_MQ, -}; - -// walls of GF room where they throw you when you get caught -#define dgSpot12_009678Tex_MQ "__OTR__scenes/mq/spot12_scene/gSpot12_009678Tex" -static const ALIGN_ASSET(2) char gSpot12_009678Tex_MQ[] = dgSpot12_009678Tex_MQ; - -#define dgSpot12_00DE78Tex_MQ "__OTR__scenes/mq/spot12_scene/gSpot12_00DE78Tex" -static const ALIGN_ASSET(2) char gSpot12_00DE78Tex_MQ[] = dgSpot12_00DE78Tex_MQ; -void* D_8012A380_MQ[] = { - gSpot12_009678Tex_MQ, - gSpot12_00DE78Tex_MQ, -}; - -#define dgZorasDomainDayEntranceTex_MQ "__OTR__scenes/mq/spot07_scene/gZorasDomainDayEntranceTex" -static const ALIGN_ASSET(2) char gZorasDomainDayEntranceTex_MQ[] = dgZorasDomainDayEntranceTex_MQ; - -#define dgZorasDomainNightEntranceTex_MQ "__OTR__scenes/mq/spot07_scene/gZorasDomainNightEntranceTex" -static const ALIGN_ASSET(2) char gZorasDomainNightEntranceTex_MQ[] = dgZorasDomainNightEntranceTex_MQ; -void* sZorasDomainEntranceTextures_MQ[] = { - gZorasDomainDayEntranceTex_MQ, - gZorasDomainNightEntranceTex_MQ, -}; - -#define dgKakarikoVillageDayWindowTex_MQ "__OTR__scenes/mq/spot01_scene/gKakarikoVillageDayWindowTex" -static const ALIGN_ASSET(2) char gKakarikoVillageDayWindowTex_MQ[] = dgKakarikoVillageDayWindowTex_MQ; - -#define dgKakarikoVillageNightWindowTex_MQ "__OTR__scenes/mq/spot01_scene/gKakarikoVillageNightWindowTex" -static const ALIGN_ASSET(2) char gKakarikoVillageNightWindowTex_MQ[] = dgKakarikoVillageNightWindowTex_MQ; -void* sKakarikoWindowTextures_MQ[] = { - gKakarikoVillageDayWindowTex_MQ, - gKakarikoVillageNightWindowTex_MQ, -}; - -#define dgGuardHouseOutSideView2NightTex_MQ "__OTR__scenes/mq/miharigoya_scene/gGuardHouseOutSideView2NightTex" -static const ALIGN_ASSET(2) char gGuardHouseOutSideView2NightTex_MQ[] = dgGuardHouseOutSideView2NightTex_MQ; - -#define dgGuardHouseOutSideView2DayTex_MQ "__OTR__scenes/mq/miharigoya_scene/gGuardHouseOutSideView2DayTex" -static const ALIGN_ASSET(2) char gGuardHouseOutSideView2DayTex_MQ[] = dgGuardHouseOutSideView2DayTex_MQ; - -#define dgGuardHouseOutSideView1NightTex_MQ "__OTR__scenes/mq/miharigoya_scene/gGuardHouseOutSideView1NightTex" -static const ALIGN_ASSET(2) char gGuardHouseOutSideView1NightTex_MQ[] = dgGuardHouseOutSideView1NightTex_MQ; - -#define dgGuardHouseOutSideView1DayTex_MQ "__OTR__scenes/mq/miharigoya_scene/gGuardHouseOutSideView1DayTex" -static const ALIGN_ASSET(2) char gGuardHouseOutSideView1DayTex_MQ[] = dgGuardHouseOutSideView1DayTex_MQ; -void* sGuardHouseView2Textures_MQ[] = { - gGuardHouseOutSideView1DayTex_MQ, - gGuardHouseOutSideView1NightTex_MQ, -}; -void* sGuardHouseView1Textures_MQ[] = { - gGuardHouseOutSideView2DayTex_MQ, - gGuardHouseOutSideView2NightTex_MQ, -}; - -#define dgLonLonHouseDayEntranceTex_MQ "__OTR__scenes/mq/souko_scene/gLonLonHouseDayEntranceTex" -static const ALIGN_ASSET(2) char gLonLonHouseDayEntranceTex_MQ[] = dgLonLonHouseDayEntranceTex_MQ; - -#define dgLonLonHouseNightEntranceTex_MQ "__OTR__scenes/mq/souko_scene/gLonLonHouseNightEntranceTex" -static const ALIGN_ASSET(2) char gLonLonHouseNightEntranceTex_MQ[] = dgLonLonHouseNightEntranceTex_MQ; -void* sLonLonHouseEntranceTextures_MQ[] = { - gLonLonHouseDayEntranceTex_MQ, - gLonLonHouseNightEntranceTex_MQ, -}; - -#define dgThievesHideoutNightEntranceTex_MQ "__OTR__scenes/mq/gerudoway_scene/gThievesHideoutNightEntranceTex" -static const ALIGN_ASSET(2) char gThievesHideoutNightEntranceTex_MQ[] = dgThievesHideoutNightEntranceTex_MQ; - -#define dgThievesHideoutDayEntranceTex_MQ "__OTR__scenes/mq/gerudoway_scene/gThievesHideoutDayEntranceTex" -static const ALIGN_ASSET(2) char gThievesHideoutDayEntranceTex_MQ[] = dgThievesHideoutDayEntranceTex_MQ; -void* sThievesHideoutEntranceTextures_MQ[] = { - gThievesHideoutDayEntranceTex_MQ, - gThievesHideoutNightEntranceTex_MQ, -}; - #define dgDCDayEntranceTex_MQ "__OTR__scenes/mq/ddan_scene/gDCDayEntranceTex" static const ALIGN_ASSET(2) char gDCDayEntranceTex_MQ[] = dgDCDayEntranceTex_MQ; diff --git a/soh/soh/resource/importer/SkeletonFactory.cpp b/soh/soh/resource/importer/SkeletonFactory.cpp index 559da0cea..2ce651dee 100644 --- a/soh/soh/resource/importer/SkeletonFactory.cpp +++ b/soh/soh/resource/importer/SkeletonFactory.cpp @@ -103,38 +103,42 @@ void SkeletonFactoryV0::ParseFileXML(tinyxml2::XMLElement* reader, std::shared_p { std::shared_ptr skel = std::static_pointer_cast(resource); - std::string skeletonType = reader->Attribute("Type"); - // std::string skeletonLimbType = reader->Attribute("LimbType"); - int numLimbs = reader->IntAttribute("LimbCount"); - int numDLs = reader->IntAttribute("DisplayListCount"); + skel->type = SkeletonType::Flex; // Default to Flex for legacy reasons + if (reader->FindAttribute("Type")) { + std::string skeletonType = reader->Attribute("Type"); - if (skeletonType == "Flex") { - skel->type = SkeletonType::Flex; - } else if (skeletonType == "Curve") { - skel->type = SkeletonType::Curve; - } else if (skeletonType == "Normal") { - skel->type = SkeletonType::Normal; + if (skeletonType == "Flex") { + skel->type = SkeletonType::Flex; + } else if (skeletonType == "Curve") { + skel->type = SkeletonType::Curve; + } else if (skeletonType == "Normal") { + skel->type = SkeletonType::Normal; + } } - skel->type = SkeletonType::Flex; - skel->limbType = LimbType::LOD; + skel->limbType = LimbType::LOD; // Default to LOD for legacy reasons + if (reader->FindAttribute("LimbType")) { + std::string skeletonLimbType = reader->Attribute("LimbType"); - // if (skeletonLimbType == "Standard") - // skel->limbType = LimbType::Standard; - // else if (skeletonLimbType == "LOD") - // skel->limbType = LimbType::LOD; - // else if (skeletonLimbType == "Curve") - // skel->limbType = LimbType::Curve; - // else if (skeletonLimbType == "Skin") - // skel->limbType = LimbType::Skin; - // else if (skeletonLimbType == "Legacy") - // Sskel->limbType = LimbType::Legacy; + if (skeletonLimbType == "Standard") { + skel->limbType = LimbType::Standard; + } else if (skeletonLimbType == "LOD") { + skel->limbType = LimbType::LOD; + } else if (skeletonLimbType == "Curve") { + skel->limbType = LimbType::Curve; + } else if (skeletonLimbType == "Skin") { + skel->limbType = LimbType::Skin; + } else if (skeletonLimbType == "Legacy") { + skel->limbType = LimbType::Legacy; + } + } + + + skel->limbCount = reader->IntAttribute("LimbCount"); + skel->dListCount = reader->IntAttribute("DisplayListCount"); auto child = reader->FirstChildElement(); - skel->limbCount = numLimbs; - skel->dListCount = numDLs; - while (child != nullptr) { std::string childName = child->Name(); diff --git a/soh/soh/resource/importer/SkeletonLimbFactory.cpp b/soh/soh/resource/importer/SkeletonLimbFactory.cpp index 22c18da24..7ca8ae1cc 100644 --- a/soh/soh/resource/importer/SkeletonLimbFactory.cpp +++ b/soh/soh/resource/importer/SkeletonLimbFactory.cpp @@ -132,15 +132,15 @@ void LUS::SkeletonLimbFactoryV0::ParseFileBinary(std::shared_ptr r skeletonLimb->limbData.lodLimb.sibling = skeletonLimb->siblingIndex; if (skeletonLimb->dListPtr != "") { - auto dList = LUS::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(skeletonLimb->dListPtr.c_str()); - skeletonLimb->limbData.lodLimb.dLists[0] = (Gfx*)(dList ? dList->GetRawPointer() : nullptr); + skeletonLimb->dListPtr = "__OTR__" + skeletonLimb->dListPtr; + skeletonLimb->limbData.lodLimb.dLists[0] = (Gfx*)skeletonLimb->dListPtr.c_str(); } else { skeletonLimb->limbData.lodLimb.dLists[0] = nullptr; } if (skeletonLimb->dList2Ptr != "") { - auto dList = LUS::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(skeletonLimb->dList2Ptr.c_str()); - skeletonLimb->limbData.lodLimb.dLists[1] = (Gfx*)(dList ? dList->GetRawPointer() : nullptr); + skeletonLimb->dList2Ptr = "__OTR__" + skeletonLimb->dList2Ptr; + skeletonLimb->limbData.lodLimb.dLists[1] = (Gfx*)skeletonLimb->dList2Ptr.c_str(); } else { skeletonLimb->limbData.lodLimb.dLists[1] = nullptr; } @@ -153,8 +153,8 @@ void LUS::SkeletonLimbFactoryV0::ParseFileBinary(std::shared_ptr r skeletonLimb->limbData.standardLimb.dList = nullptr; if (!skeletonLimb->dListPtr.empty()) { - const auto dList = LUS::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(skeletonLimb->dListPtr.c_str()); - skeletonLimb->limbData.standardLimb.dList = (Gfx*)(dList ? dList->GetRawPointer() : nullptr); + skeletonLimb->dListPtr = "__OTR__" + skeletonLimb->dListPtr; + skeletonLimb->limbData.standardLimb.dList = (Gfx*)skeletonLimb->dListPtr.c_str(); } } else if (skeletonLimb->limbType == LUS::LimbType::Curve) { skeletonLimb->limbData.skelCurveLimb.firstChildIdx = skeletonLimb->childIndex; @@ -163,13 +163,13 @@ void LUS::SkeletonLimbFactoryV0::ParseFileBinary(std::shared_ptr r skeletonLimb->limbData.skelCurveLimb.dList[1] = nullptr; if (!skeletonLimb->dListPtr.empty()) { - const auto dList = LUS::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(skeletonLimb->dListPtr.c_str()); - skeletonLimb->limbData.skelCurveLimb.dList[0] = (Gfx*)(dList ? dList->GetRawPointer() : nullptr); + skeletonLimb->dListPtr = "__OTR__" + skeletonLimb->dListPtr; + skeletonLimb->limbData.skelCurveLimb.dList[0] = (Gfx*)skeletonLimb->dListPtr.c_str(); } if (!skeletonLimb->dList2Ptr.empty()) { - const auto dList = LUS::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(skeletonLimb->dList2Ptr.c_str()); - skeletonLimb->limbData.skelCurveLimb.dList[1] = (Gfx*)(dList ? dList->GetRawPointer() : nullptr); + skeletonLimb->dList2Ptr = "__OTR__" + skeletonLimb->dList2Ptr; + skeletonLimb->limbData.skelCurveLimb.dList[1] = (Gfx*)skeletonLimb->dList2Ptr.c_str(); } } else if (skeletonLimb->limbType == LUS::LimbType::Skin) { skeletonLimb->limbData.skinLimb.jointPos.x = skeletonLimb->transX; @@ -189,14 +189,23 @@ void LUS::SkeletonLimbFactoryV0::ParseFileBinary(std::shared_ptr r } if (skeletonLimb->skinSegmentType == LUS::ZLimbSkinType::SkinType_DList) { - auto res = LUS::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(skeletonLimb->skinDList.c_str()); - skeletonLimb->limbData.skinLimb.segment = res ? res->GetRawPointer() : nullptr; + if (skeletonLimb->skinDList != "") { + skeletonLimb->skinDList = "__OTR__" + skeletonLimb->skinDList; + skeletonLimb->limbData.skinLimb.segment = (Gfx*)skeletonLimb->skinDList.c_str(); + } else { + skeletonLimb->limbData.skinLimb.segment = nullptr; + } } else if (skeletonLimb->skinSegmentType == LUS::ZLimbSkinType::SkinType_4) { skeletonLimb->skinAnimLimbData.totalVtxCount = skeletonLimb->skinVtxCnt; skeletonLimb->skinAnimLimbData.limbModifCount = skeletonLimb->skinLimbModifCount; skeletonLimb->skinAnimLimbData.limbModifications = skeletonLimb->skinLimbModifArray.data(); - auto res = LUS::Context::GetInstance()->GetResourceManager()->LoadResourceProcess(skeletonLimb->skinDList2.c_str()); - skeletonLimb->skinAnimLimbData.dlist = (Gfx*)(res ? res->GetRawPointer() : nullptr); + + if (skeletonLimb->skinDList2 != "") { + skeletonLimb->skinDList2 = "__OTR__" + skeletonLimb->skinDList2; + skeletonLimb->skinAnimLimbData.dlist = (Gfx*)skeletonLimb->skinDList2.c_str(); + } else { + skeletonLimb->skinAnimLimbData.dlist = nullptr; + } for (size_t i = 0; i < skeletonLimb->skinLimbModifArray.size(); i++) { skeletonLimb->skinAnimLimbData.limbModifications[i].vtxCount = skeletonLimb->skinLimbModifVertexArrays[i].size(); @@ -254,8 +263,8 @@ void SkeletonLimbFactoryV0::ParseFileXML(tinyxml2::XMLElement* reader, std::shar limbData.lodLimb.jointPos.z = skelLimb->transZ; if (skelLimb->dListPtr != "") { - auto res = LUS::Context::GetInstance()->GetResourceManager()->LoadResourceProcess((const char*)skelLimb->dListPtr.c_str()); - limbData.lodLimb.dLists[0] = (Gfx*)(res ? res->GetRawPointer() : nullptr); + skelLimb->dListPtr = "__OTR__" + skelLimb->dListPtr; + limbData.lodLimb.dLists[0] = (Gfx*)skelLimb->dListPtr.c_str(); } else { limbData.lodLimb.dLists[0] = nullptr; } diff --git a/soh/soh/stubs.c b/soh/soh/stubs.c index 9afd93468..a162a7ac5 100644 --- a/soh/soh/stubs.c +++ b/soh/soh/stubs.c @@ -260,7 +260,7 @@ void Audio_osWritebackDCache(void* mem, s32 size) s32 osAiSetFrequency(u32 freq) { - + return 1; } s32 osEPiStartDma(OSPiHandle* handle, OSIoMesg* mb, s32 direction) diff --git a/soh/soh/util.cpp b/soh/soh/util.cpp index 62e1d2dce..856432cbb 100644 --- a/soh/soh/util.cpp +++ b/soh/soh/util.cpp @@ -2,6 +2,7 @@ #include #include +#include std::vector sceneNames = { "Inside the Deku Tree", @@ -318,3 +319,20 @@ void SohUtils::CopyStringToCharArray(char* destination, std::string source, size strncpy(destination, source.c_str(), size - 1); destination[size - 1] = '\0'; } + +std::string SohUtils::Sanitize(std::string stringValue) { + // Add backslashes. + for (auto i = stringValue.begin();;) { + auto const pos = std::find_if(i, stringValue.end(), [](char const c) { return '\\' == c || '\'' == c || '"' == c; }); + if (pos == stringValue.end()) { + break; + } + i = std::next(stringValue.insert(pos, '\\'), 2); + } + + // Removes others. + stringValue.erase(std::remove_if(stringValue.begin(), stringValue.end(), [](char const c) { + return '\n' == c || '\r' == c || '\0' == c || '\x1A' == c; }), stringValue.end()); + + return stringValue; +} diff --git a/soh/soh/util.h b/soh/soh/util.h index bdbfcd777..db5af8636 100644 --- a/soh/soh/util.h +++ b/soh/soh/util.h @@ -12,4 +12,6 @@ namespace SohUtils { // Copies a string and ensures the destination is null terminated if the source string is larger than size // Only up to size-1 characters are copied from the source string void CopyStringToCharArray(char* destination, std::string source, size_t size); + + std::string Sanitize(std::string stringValue); } // namespace SohUtils diff --git a/soh/soh/z_message_OTR.cpp b/soh/soh/z_message_OTR.cpp index f90e8bb93..6bbd1eca9 100644 --- a/soh/soh/z_message_OTR.cpp +++ b/soh/soh/z_message_OTR.cpp @@ -72,6 +72,9 @@ MessageTableEntry* OTRMessage_LoadTable(const char* filePath, bool isNES) { _message_0xFFFC_nes = (char*)file->messages[i].msg.c_str(); } + // Assert that the first message starts at the first text ID + assert(table[0].textId == 0x0001); + return table; } @@ -104,6 +107,9 @@ extern "C" void OTRMessage_Init() sStaffMessageEntryTablePtr[i].segment = file2->messages[i].msg.c_str(); sStaffMessageEntryTablePtr[i].msgSize = file2->messages[i].msg.size(); } + + // Assert staff credits start at the first credits ID + assert(sStaffMessageEntryTablePtr[0].textId == 0x0500); } CustomMessageManager::Instance->AddCustomMessageTable(customMessageTableID); diff --git a/soh/soh/z_play_otr.cpp b/soh/soh/z_play_otr.cpp index 5e54da8ed..828380ea7 100644 --- a/soh/soh/z_play_otr.cpp +++ b/soh/soh/z_play_otr.cpp @@ -29,11 +29,13 @@ extern "C" void OTRPlay_SpawnScene(PlayState* play, s32 sceneNum, s32 spawn) { //osSyncPrintf("\nSCENE SIZE %fK\n", (scene->sceneFile.vromEnd - scene->sceneFile.vromStart) / 1024.0f); - std::string sceneVersion; - if (IsGameMasterQuest()) { - sceneVersion = "mq"; - } else { - sceneVersion = "nonmq"; + // Scenes considered "dungeon" with a MQ variant + int16_t inNonSharedScene = (sceneNum >= SCENE_DEKU_TREE && sceneNum <= SCENE_ICE_CAVERN) || + sceneNum == SCENE_GERUDO_TRAINING_GROUND || sceneNum == SCENE_INSIDE_GANONS_CASTLE; + + std::string sceneVersion = "shared"; + if (inNonSharedScene) { + sceneVersion = IsGameMasterQuest() ? "mq" : "nonmq"; } std::string scenePath = StringHelper::Sprintf("scenes/%s/%s/%s", sceneVersion.c_str(), scene->sceneFile.fileName, scene->sceneFile.fileName); diff --git a/soh/soh/z_scene_otr.cpp b/soh/soh/z_scene_otr.cpp index ef98a4b3a..6926f313f 100644 --- a/soh/soh/z_scene_otr.cpp +++ b/soh/soh/z_scene_otr.cpp @@ -296,7 +296,7 @@ bool Scene_CommandTimeSettings(PlayState* play, LUS::ISceneCommand* cmd) { play->envCtx.sunPos.z = (Math_CosS(((void)0, gSaveContext.dayTime) - 0x8000) * 20.0f) * 25.0f; if (((play->envCtx.timeIncrement == 0) && (gSaveContext.cutsceneIndex < 0xFFF0)) || - (gSaveContext.entranceIndex == 0x0604)) { + (gSaveContext.entranceIndex == ENTR_LAKE_HYLIA_8)) { gSaveContext.skyboxTime = ((void)0, gSaveContext.dayTime); if ((gSaveContext.skyboxTime >= 0x2AAC) && (gSaveContext.skyboxTime < 0x4555)) { gSaveContext.skyboxTime = 0x3556; diff --git a/soh/src/boot/build.c.in b/soh/src/boot/build.c.in index f4c2899cf..4fc6a17f4 100644 --- a/soh/src/boot/build.c.in +++ b/soh/src/boot/build.c.in @@ -1,8 +1,9 @@ +#include + const char gBuildVersion[] = "@PROJECT_BUILD_NAME@ (@CMAKE_PROJECT_VERSION_MAJOR@.@CMAKE_PROJECT_VERSION_MINOR@.@CMAKE_PROJECT_VERSION_PATCH@)"; -const int gBuildVersionMajor = @CMAKE_PROJECT_VERSION_MAJOR@; -const int gBuildVersionMinor = @CMAKE_PROJECT_VERSION_MINOR@; -const int gBuildVersionPatch = @CMAKE_PROJECT_VERSION_PATCH@; +const u16 gBuildVersionMajor = @CMAKE_PROJECT_VERSION_MAJOR@; +const u16 gBuildVersionMinor = @CMAKE_PROJECT_VERSION_MINOR@; +const u16 gBuildVersionPatch = @CMAKE_PROJECT_VERSION_PATCH@; const char gBuildTeam[] = "@PROJECT_TEAM@"; const char gBuildDate[] = __DATE__ " " __TIME__; const char gBuildMakeOption[] = ""; - diff --git a/soh/src/code/code_80097A00.c b/soh/src/code/code_80097A00.c index 9e20d66aa..eb83738e3 100644 --- a/soh/src/code/code_80097A00.c +++ b/soh/src/code/code_80097A00.c @@ -204,6 +204,17 @@ u8 Inventory_DeleteEquipment(PlayState* play, s16 equipment) { if (equipment == EQUIP_TYPE_TUNIC) { gSaveContext.equips.equipment |= EQUIP_VALUE_TUNIC_KOKIRI << (EQUIP_TYPE_TUNIC * 4); + // non-vanilla: remove goron and zora tunics from item buttons if assignable tunics is on + if (CVarGetInteger("gAssignableTunicsAndBoots", 0) && equipValue != EQUIP_VALUE_TUNIC_KOKIRI) { + ItemID item = (equipValue == EQUIP_VALUE_TUNIC_GORON ? ITEM_TUNIC_GORON : ITEM_TUNIC_ZORA); + for (int i = 1; i < ARRAY_COUNT(gSaveContext.equips.buttonItems); i++) { + if (gSaveContext.equips.buttonItems[i] == item) { + gSaveContext.equips.buttonItems[i] = ITEM_NONE; + gSaveContext.equips.cButtonSlots[i - 1] = SLOT_NONE; + } + } + } + // end non-vanilla } if (equipment == EQUIP_TYPE_SWORD) { diff --git a/soh/src/code/graph.c b/soh/src/code/graph.c index 85169db77..d273e7643 100644 --- a/soh/src/code/graph.c +++ b/soh/src/code/graph.c @@ -7,6 +7,7 @@ #include #include "soh/Enhancements/debugger/colViewer.h" +#include "soh/Enhancements/debugger/valueViewer.h" #include "soh/Enhancements/gameconsole.h" #include "soh/OTRGlobals.h" @@ -289,6 +290,28 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { OPEN_DISPS(gfxCtx); + if (CVarGetInteger("gValueViewer.EnablePrinting", 0)) { + Gfx* gfx; + Gfx* polyOpa; + GfxPrint printer; + + polyOpa = POLY_OPA_DISP; + gfx = Graph_GfxPlusOne(polyOpa); + gSPDisplayList(OVERLAY_DISP++, gfx); + + GfxPrint_Init(&printer); + GfxPrint_Open(&printer, gfx); + + ValueViewer_Draw(&printer); + + gfx = GfxPrint_Close(&printer); + GfxPrint_Destroy(&printer); + + gSPEndDisplayList(gfx++); + Graph_BranchDlist(polyOpa, gfx); + POLY_OPA_DISP = gfx; + } + gDPNoOpString(WORK_DISP++, "WORK_DISP 終了", 0); gDPNoOpString(POLY_OPA_DISP++, "POLY_OPA_DISP 終了", 0); gDPNoOpString(POLY_XLU_DISP++, "POLY_XLU_DISP 終了", 0); diff --git a/soh/src/code/z_actor.c b/soh/src/code/z_actor.c index 79a3c8ace..3b68f1211 100644 --- a/soh/src/code/z_actor.c +++ b/soh/src/code/z_actor.c @@ -1426,27 +1426,27 @@ void Actor_MountHorse(PlayState* play, Player* player, Actor* horse) { } s32 func_8002DEEC(Player* player) { - return (player->stateFlags1 & 0x20000080) || (player->csMode != 0); + return (player->stateFlags1 & 0x20000080) || (player->csAction != 0); } void func_8002DF18(PlayState* play, Player* player) { func_8006DC68(play, player); } -s32 func_8002DF38(PlayState* play, Actor* actor, u8 csMode) { +s32 func_8002DF38(PlayState* play, Actor* actor, u8 csAction) { Player* player = GET_PLAYER(play); - player->csMode = csMode; - player->unk_448 = actor; + player->csAction = csAction; + player->csActor = actor; player->doorBgCamIndex = 0; return true; } -s32 func_8002DF54(PlayState* play, Actor* actor, u8 csMode) { +s32 func_8002DF54(PlayState* play, Actor* actor, u8 csAction) { Player* player = GET_PLAYER(play); - func_8002DF38(play, actor, csMode); + func_8002DF38(play, actor, csAction); player->doorBgCamIndex = 1; return true; @@ -2121,8 +2121,8 @@ void func_8002F5C4(Actor* actorA, Actor* actorB, PlayState* play) { void func_8002F5F0(Actor* actor, PlayState* play) { Player* player = GET_PLAYER(play); - if (actor->xyzDistToPlayerSq < player->unk_6A4) { - player->unk_6A4 = actor->xyzDistToPlayerSq; + if (actor->xyzDistToPlayerSq < player->closestSecretDistSq) { + player->closestSecretDistSq = actor->xyzDistToPlayerSq; } } @@ -6137,7 +6137,7 @@ s32 func_80038154(PlayState* play, Actor* actor, Vec3s* arg2, Vec3s* arg3, f32 a actor->focus.pos = actor->world.pos; actor->focus.pos.y += arg4; - if (!(((play->csCtx.state != CS_STATE_IDLE) || (gDbgCamEnabled)) && (gSaveContext.entranceIndex == 0x00EE))) { + if (!(((play->csCtx.state != CS_STATE_IDLE) || (gDbgCamEnabled)) && (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_0))) { var = actor->yawTowardsPlayer - actor->shape.rot.y; abs_var = ABS(var); if (abs_var >= 0x4300) { @@ -6146,7 +6146,7 @@ s32 func_80038154(PlayState* play, Actor* actor, Vec3s* arg2, Vec3s* arg3, f32 a } } - if (((play->csCtx.state != CS_STATE_IDLE) || (gDbgCamEnabled)) && (gSaveContext.entranceIndex == 0x00EE)) { + if (((play->csCtx.state != CS_STATE_IDLE) || (gDbgCamEnabled)) && (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_0)) { sp2C = play->view.eye; } else { sp2C = player->actor.focus.pos; @@ -6166,7 +6166,7 @@ s32 func_80038290(PlayState* play, Actor* actor, Vec3s* arg2, Vec3s* arg3, Vec3f actor->focus.pos = arg4; - if (!(((play->csCtx.state != CS_STATE_IDLE) || (gDbgCamEnabled)) && (gSaveContext.entranceIndex == 0x00EE))) { + if (!(((play->csCtx.state != CS_STATE_IDLE) || (gDbgCamEnabled)) && (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_0))) { var = actor->yawTowardsPlayer - actor->shape.rot.y; abs_var = ABS(var); if (abs_var >= 0x4300) { @@ -6175,7 +6175,7 @@ s32 func_80038290(PlayState* play, Actor* actor, Vec3s* arg2, Vec3s* arg3, Vec3f } } - if (((play->csCtx.state != CS_STATE_IDLE) || (gDbgCamEnabled)) && (gSaveContext.entranceIndex == 0x00EE)) { + if (((play->csCtx.state != CS_STATE_IDLE) || (gDbgCamEnabled)) && (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_0)) { sp24 = play->view.eye; } else { sp24 = player->actor.focus.pos; diff --git a/soh/src/code/z_camera.c b/soh/src/code/z_camera.c index a177e29e7..ed8b9c8f4 100644 --- a/soh/src/code/z_camera.c +++ b/soh/src/code/z_camera.c @@ -4521,7 +4521,7 @@ s32 Camera_Subj4(Camera* camera) { if ((anim->unk_28 < temp_f16) && !anim->unk_2E) { player = camera->player; anim->unk_2E = true; - func_800F4010(&player->actor.projectedPos, player->unk_89E + 0x8B0, 4.0f); + func_800F4010(&player->actor.projectedPos, player->floorSfxOffset + 0x8B0, 4.0f); } else if (anim->unk_28 > temp_f16) { anim->unk_2E = false; } @@ -7594,7 +7594,7 @@ Vec3s Camera_Update(Camera* camera) { D_8011D3F0--; sCameraInterfaceFlags = 0x3200; Camera_UpdateInterface(sCameraInterfaceFlags); - } else if (camera->play->transitionMode != 0) { + } else if (camera->play->transitionMode != TRANS_MODE_OFF) { sCameraInterfaceFlags = 0xF200; Camera_UpdateInterface(sCameraInterfaceFlags); } else if (camera->play->csCtx.state != CS_STATE_IDLE) { @@ -7732,7 +7732,7 @@ void Camera_Finish(Camera* camera) { player->actor.freezeTimer = 0; player->stateFlags1 &= ~0x20000000; - if (player->csMode != 0) { + if (player->csAction != 0) { func_8002DF54(camera->play, &player->actor, 7); osSyncPrintf("camera: player demo end!!\n"); } diff --git a/soh/src/code/z_common_data.c b/soh/src/code/z_common_data.c index 83486b2d7..2a903b26e 100644 --- a/soh/src/code/z_common_data.c +++ b/soh/src/code/z_common_data.c @@ -14,6 +14,6 @@ void SaveContext_Init(void) { gSaveContext.nextDayTime = 0xFFFF; gSaveContext.skyboxTime = 0; gSaveContext.dogIsLost = true; - gSaveContext.nextTransitionType = 0xFF; + gSaveContext.nextTransitionType = TRANS_NEXT_TYPE_DEFAULT; gSaveContext.unk_13EE = 50; } diff --git a/soh/src/code/z_demo.c b/soh/src/code/z_demo.c index 1955a9235..9c0dd9b05 100644 --- a/soh/src/code/z_demo.c +++ b/soh/src/code/z_demo.c @@ -56,40 +56,40 @@ CutsceneStateHandler sCsStateHandlers2[] = { u8 sTitleCsState = 0; EntranceCutscene sEntranceCutsceneTable[] = { - { 0x0185, 2, 0xA0, gHyruleFieldIntroCs }, - { 0x013D, 2, 0xA1, gDMTIntroCs }, - { 0x00DB, 2, 0xA3, gKakarikoVillageIntroCs }, - { 0x0108, 2, 0xA4, gZorasDomainIntroCs }, - { 0x0138, 1, 0xA5, gHyruleCastleIntroCs }, - { 0x014D, 2, 0xA6, gGoronCityIntroCs }, - { 0x0053, 2, 0xA7, gTempleOfTimeIntroCs }, - { 0x0000, 2, 0xA8, gDekuTreeIntroCs }, - { 0x028A, 0, 0x18, gHyruleFieldSouthEponaJumpCs }, - { 0x0292, 0, 0x18, gHyruleFieldEastEponaJumpCs }, - { 0x028E, 0, 0x18, gHyruleFieldWestEponaJumpCs }, - { 0x0476, 0, 0x18, gHyruleFieldGateEponaJumpCs }, - { 0x050F, 1, 0xA9, gHyruleFieldGetOoTCs }, - { 0x0102, 2, 0xB1, gLakeHyliaIntroCs }, - { 0x0117, 2, 0xB2, gGerudoValleyIntroCs }, - { 0x0129, 2, 0xB3, gGerudoFortressIntroCs }, - { 0x0157, 2, 0xB4, gLonLonRanchIntroCs }, - { 0x0028, 2, 0xB5, gJabuJabuIntroCs }, - { 0x00E4, 2, 0xB6, gGraveyardIntroCs }, - { 0x0225, 2, 0xB7, gZorasFountainIntroCs }, - { 0x0123, 2, 0xB8, gDesertColossusIntroCs }, - { 0x0147, 2, 0xB9, gDeathMountainCraterIntroCs }, - { 0x0138, 0, 0xBA, gGanonsCastleIntroCs }, - { 0x0574, 2, 0x5A, gSunSongGraveSunSongTeachPart2Cs }, - { 0x0538, 2, 0xBB, gForestBarrierCs }, - { 0x053C, 2, 0xBC, gWaterBarrierCs }, - { 0x0540, 2, 0xBD, gShadowBarrierCs }, - { 0x0544, 2, 0xBE, gFireBarrierCs }, - { 0x0548, 2, 0xBF, gLightBarrierCs }, - { 0x054C, 2, 0xAD, gSpiritBarrierCs }, - { 0x008D, 0, 0xC0, gSpiritBossNabooruKnuckleIntroCs }, - { 0x03B4, 0, 0xC7, gGerudoFortressFirstCaptureCs }, - { 0x0246, 2, 0xB9, gDeathMountainCraterIntroCs }, - { 0x05E8, 2, 0xC6, gKokiriForestDekuSproutCs }, + { ENTR_HYRULE_FIELD_3, 2, 0xA0, gHyruleFieldIntroCs }, + { ENTR_DEATH_MOUNTAIN_TRAIL_0, 2, 0xA1, gDMTIntroCs }, + { ENTR_KAKARIKO_VILLAGE_0, 2, 0xA3, gKakarikoVillageIntroCs }, + { ENTR_ZORAS_DOMAIN_0, 2, 0xA4, gZorasDomainIntroCs }, + { ENTR_HYRULE_CASTLE_0, 1, 0xA5, gHyruleCastleIntroCs }, + { ENTR_GORON_CITY_0, 2, 0xA6, gGoronCityIntroCs }, + { ENTR_TEMPLE_OF_TIME_0, 2, 0xA7, gTempleOfTimeIntroCs }, + { ENTR_DEKU_TREE_0, 2, 0xA8, gDekuTreeIntroCs }, + { ENTR_HYRULE_FIELD_11, 0, 0x18, gHyruleFieldSouthEponaJumpCs }, + { ENTR_HYRULE_FIELD_13, 0, 0x18, gHyruleFieldEastEponaJumpCs }, + { ENTR_HYRULE_FIELD_12, 0, 0x18, gHyruleFieldWestEponaJumpCs }, + { ENTR_HYRULE_FIELD_15, 0, 0x18, gHyruleFieldGateEponaJumpCs }, + { ENTR_HYRULE_FIELD_16, 1, 0xA9, gHyruleFieldGetOoTCs }, + { ENTR_LAKE_HYLIA_0, 2, 0xB1, gLakeHyliaIntroCs }, + { ENTR_GERUDO_VALLEY_0, 2, 0xB2, gGerudoValleyIntroCs }, + { ENTR_GERUDOS_FORTRESS_0, 2, 0xB3, gGerudoFortressIntroCs }, + { ENTR_LON_LON_RANCH_0, 2, 0xB4, gLonLonRanchIntroCs }, + { ENTR_JABU_JABU_0, 2, 0xB5, gJabuJabuIntroCs }, + { ENTR_GRAVEYARD_0, 2, 0xB6, gGraveyardIntroCs }, + { ENTR_ZORAS_FOUNTAIN_2, 2, 0xB7, gZorasFountainIntroCs }, + { ENTR_DESERT_COLOSSUS_0, 2, 0xB8, gDesertColossusIntroCs }, + { ENTR_DEATH_MOUNTAIN_CRATER_0, 2, 0xB9, gDeathMountainCraterIntroCs }, + { ENTR_HYRULE_CASTLE_0, 0, 0xBA, gGanonsCastleIntroCs }, + { ENTR_ROYAL_FAMILYS_TOMB_1, 2, 0x5A, gSunSongGraveSunSongTeachPart2Cs }, + { ENTR_INSIDE_GANONS_CASTLE_2, 2, 0xBB, gForestBarrierCs }, + { ENTR_INSIDE_GANONS_CASTLE_3, 2, 0xBC, gWaterBarrierCs }, + { ENTR_INSIDE_GANONS_CASTLE_4, 2, 0xBD, gShadowBarrierCs }, + { ENTR_INSIDE_GANONS_CASTLE_5, 2, 0xBE, gFireBarrierCs }, + { ENTR_INSIDE_GANONS_CASTLE_6, 2, 0xBF, gLightBarrierCs }, + { ENTR_INSIDE_GANONS_CASTLE_7, 2, 0xAD, gSpiritBarrierCs }, + { ENTR_SPIRIT_TEMPLE_BOSS_0, 0, 0xC0, gSpiritBossNabooruKnuckleIntroCs }, + { ENTR_GERUDOS_FORTRESS_17, 0, 0xC7, gGerudoFortressFirstCaptureCs }, + { ENTR_DEATH_MOUNTAIN_CRATER_1, 2, 0xB9, gDeathMountainCraterIntroCs }, + { ENTR_KOKIRI_FOREST_12, 2, 0xC6, gKokiriForestDekuSproutCs }, }; // Unused, seems to be an early list of dungeon entrance cutscene locations @@ -168,7 +168,7 @@ void func_800645A0(PlayState* play, CutsceneContext* csCtx) { gSaveContext.cutsceneTrigger = 1; } - if ((gSaveContext.cutsceneTrigger != 0) && (play->sceneLoadFlag == 0x14)) { + if ((gSaveContext.cutsceneTrigger != 0) && (play->transitionTrigger == TRANS_TRIGGER_START)) { gSaveContext.cutsceneTrigger = 0; } @@ -246,7 +246,7 @@ void func_80064824(PlayState* play, CutsceneContext* csCtx, CsCmdBase* cmd) { case 3: if (sp3F != 0) { Flags_SetEnv(play, 0); - if (gSaveContext.entranceIndex == 0x0053 || (IS_RANDO && gSaveContext.entranceIndex == 0x05F4)) { + if (gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_0 || (IS_RANDO && gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_7)) { Flags_SetEnv(play, 2); } } @@ -409,7 +409,7 @@ void func_80064824(PlayState* play, CutsceneContext* csCtx, CsCmdBase* cmd) { break; case 32: if (sp3F != 0) { - play->envCtx.sandstormState = 1; + play->envCtx.sandstormState = SANDSTORM_FILL; } func_800788CC(NA_SE_EV_SAND_STORM - SFX_FLAG); break; @@ -506,7 +506,7 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB (CHECK_BTN_ALL(play->state.input[0].press.button, BTN_A) || CHECK_BTN_ALL(play->state.input[0].press.button, BTN_B) || CHECK_BTN_ALL(play->state.input[0].press.button, BTN_START)) && - (gSaveContext.fileNum != 0xFEDC) && (play->sceneLoadFlag == 0)) { + (gSaveContext.fileNum != 0xFEDC) && (play->transitionTrigger == TRANS_TRIGGER_OFF)) { Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); temp = 1; } @@ -574,46 +574,46 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB switch (cmd->base) { case 1: - play->nextEntranceIndex = 0x00A0; + play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0; gSaveContext.cutsceneIndex = 0xFFF1; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 2: - play->nextEntranceIndex = 0x00A0; + play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0; gSaveContext.cutsceneIndex = 0xFFF0; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 10; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FILL_WHITE; break; case 3: - play->nextEntranceIndex = 0x0117; + play->nextEntranceIndex = ENTR_GERUDO_VALLEY_0; gSaveContext.cutsceneIndex = 0xFFF1; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 10; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FILL_WHITE; break; case 4: - play->nextEntranceIndex = 0x013D; + play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_0; gSaveContext.cutsceneIndex = 0xFFF0; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 10; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FILL_WHITE; break; case 5: - play->nextEntranceIndex = 0x00EE; + play->nextEntranceIndex = ENTR_KOKIRI_FOREST_0; gSaveContext.cutsceneIndex = 0xFFF0; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 10; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FILL_WHITE; break; case 6: - play->nextEntranceIndex = 0x00A0; + play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0; gSaveContext.cutsceneIndex = 0xFFF2; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 10; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FILL_WHITE; break; case 7: - play->nextEntranceIndex = 0x00EE; + play->nextEntranceIndex = ENTR_KOKIRI_FOREST_0; gSaveContext.cutsceneIndex = 0xFFF2; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 11; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_INSTANT; break; case 8: if (CVarGetInteger("gBetterFW", 0)) { @@ -626,10 +626,10 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB } if (!Flags_GetEventChkInf(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL)) { Flags_SetEventChkInf(EVENTCHKINF_PULLED_MASTER_SWORD_FROM_PEDESTAL); - play->nextEntranceIndex = 0x00A0; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF3; - play->fadeTransition = 11; + play->transitionType = TRANS_TYPE_INSTANT; } else { if (gSaveContext.sceneSetupIndex < 4) { if (!LINK_IS_ADULT) { @@ -638,360 +638,360 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB play->linkAgeOnLoad = 1; } } - play->nextEntranceIndex = 0x02CA; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 3; - gSaveContext.nextTransitionType = 3; + play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_2; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE; } break; case 9: - play->nextEntranceIndex = 0x0117; + play->nextEntranceIndex = ENTR_GERUDO_VALLEY_0; gSaveContext.cutsceneIndex = 0xFFF0; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 12; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FILL_BROWN; break; case 10: - play->nextEntranceIndex = 0x00BB; + play->nextEntranceIndex = ENTR_LINKS_HOUSE_0; gSaveContext.cutsceneIndex = 0xFFF0; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 11: - play->nextEntranceIndex = 0x00EE; + play->nextEntranceIndex = ENTR_KOKIRI_FOREST_0; gSaveContext.cutsceneIndex = 0xFFF3; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 3; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE; break; case 12: - play->nextEntranceIndex = 0x047A; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_5; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 13: - play->nextEntranceIndex = 0x010E; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; - gSaveContext.nextTransitionType = 2; + play->nextEntranceIndex = ENTR_ZORAS_FOUNTAIN_0; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK; break; case 14: - play->nextEntranceIndex = 0x0457; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->nextEntranceIndex = ENTR_KOKIRI_FOREST_11; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 15: - play->nextEntranceIndex = 0x0053; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF4; - play->fadeTransition = 3; + play->transitionType = TRANS_TYPE_FADE_WHITE; break; case 16: - play->nextEntranceIndex = 0x0053; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF5; - play->fadeTransition = 3; + play->transitionType = TRANS_TYPE_FADE_WHITE; break; case 17: - play->nextEntranceIndex = 0x0053; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF6; - play->fadeTransition = 3; + play->transitionType = TRANS_TYPE_FADE_WHITE; break; case 18: Flags_SetEventChkInf(EVENTCHKINF_ENTERED_MASTER_SWORD_CHAMBER); - play->nextEntranceIndex = 0x0324; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; - gSaveContext.nextTransitionType = 2; + play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_4; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK; break; case 19: - play->nextEntranceIndex = 0x013D; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 4; + play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_0; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK_FAST; gSaveContext.cutsceneIndex = 0x8000; break; case 21: - play->nextEntranceIndex = 0x0102; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_LAKE_HYLIA_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF0; - play->fadeTransition = 3; + play->transitionType = TRANS_TYPE_FADE_WHITE; break; case 22: Item_Give(play, ITEM_SONG_REQUIEM); - play->nextEntranceIndex = 0x0123; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_DESERT_COLOSSUS_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF0; - play->fadeTransition = 3; + play->transitionType = TRANS_TYPE_FADE_WHITE; break; case 23: - play->nextEntranceIndex = 0x00A0; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF8; - play->fadeTransition = 3; + play->transitionType = TRANS_TYPE_FADE_WHITE; break; case 24: - play->nextEntranceIndex = 0x0028; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->nextEntranceIndex = ENTR_JABU_JABU_0; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 25: play->linkAgeOnLoad = 0; - play->nextEntranceIndex = 0x006B; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF0; - play->fadeTransition = 3; + play->transitionType = TRANS_TYPE_FADE_WHITE; break; case 26: - play->nextEntranceIndex = 0x0053; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF4; - play->fadeTransition = 3; + play->transitionType = TRANS_TYPE_FADE_WHITE; break; case 27: - play->nextEntranceIndex = 0x0053; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF5; - play->fadeTransition = 3; + play->transitionType = TRANS_TYPE_FADE_WHITE; break; case 28: - play->nextEntranceIndex = 0x0053; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF6; - play->fadeTransition = 3; + play->transitionType = TRANS_TYPE_FADE_WHITE; break; case 29: - play->nextEntranceIndex = 0x006B; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.chamberCutsceneNum = 0; - play->fadeTransition = 3; + play->transitionType = TRANS_TYPE_FADE_WHITE; break; case 30: - play->nextEntranceIndex = 0x006B; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 3; + play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE; Item_Give(play, ITEM_MEDALLION_FIRE); gSaveContext.chamberCutsceneNum = 1; break; case 31: - play->nextEntranceIndex = 0x006B; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 3; + play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE; gSaveContext.chamberCutsceneNum = 2; break; case 32: play->linkAgeOnLoad = 1; - play->nextEntranceIndex = 0x00CD; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_HYRULE_FIELD_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF2; - play->fadeTransition = 11; + play->transitionType = TRANS_TYPE_INSTANT; break; case 33: - play->nextEntranceIndex = 0x00CD; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 3; + play->nextEntranceIndex = ENTR_HYRULE_FIELD_0; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE; break; case 34: - play->nextEntranceIndex = 0x00A0; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF3; - play->fadeTransition = 3; + play->transitionType = TRANS_TYPE_FADE_WHITE; break; case 35: - play->nextEntranceIndex = 0x00CD; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_HYRULE_FIELD_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF0; - play->fadeTransition = 4; + play->transitionType = TRANS_TYPE_FADE_BLACK_FAST; break; case 38: - play->nextEntranceIndex = 0x00A0; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF4; - play->fadeTransition = 4; + play->transitionType = TRANS_TYPE_FADE_BLACK_FAST; break; case 39: - play->nextEntranceIndex = 0x0053; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF9; - play->fadeTransition = 4; + play->transitionType = TRANS_TYPE_FADE_BLACK_FAST; break; case 40: play->linkAgeOnLoad = 0; - play->nextEntranceIndex = 0x0053; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFFA; - play->fadeTransition = 4; + play->transitionType = TRANS_TYPE_FADE_BLACK_FAST; break; case 41: - play->nextEntranceIndex = 0x04E6; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->nextEntranceIndex = ENTR_LAKE_HYLIA_5; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 42: - play->nextEntranceIndex = 0x00DB; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_KAKARIKO_VILLAGE_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF2; - play->fadeTransition = 4; + play->transitionType = TRANS_TYPE_FADE_BLACK_FAST; break; case 43: - play->nextEntranceIndex = 0x0503; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 4; + play->nextEntranceIndex = ENTR_WINDMILL_AND_DAMPES_GRAVE_2; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK_FAST; break; case 44: - play->nextEntranceIndex = 0x0320; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 17; + play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_3; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE_INSTANT; break; case 46: Flags_SetEventChkInf(EVENTCHKINF_ENTERED_MASTER_SWORD_CHAMBER); - play->nextEntranceIndex = 0x0324; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 4; + play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_4; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK_FAST; break; case 47: Item_Give(play, ITEM_SONG_NOCTURNE); Flags_SetEventChkInf(EVENTCHKINF_LEARNED_NOCTURNE_OF_SHADOW); - play->nextEntranceIndex = 0x00DB; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_KAKARIKO_VILLAGE_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF1; - play->fadeTransition = 4; + play->transitionType = TRANS_TYPE_FADE_BLACK_FAST; break; case 48: - play->nextEntranceIndex = 0x01ED; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 15; - gSaveContext.nextTransitionType = 15; + play->nextEntranceIndex = ENTR_DESERT_COLOSSUS_4; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_SANDSTORM_END; + gSaveContext.nextTransitionType = TRANS_TYPE_SANDSTORM_END; break; case 49: - play->nextEntranceIndex = 0x058C; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 4; + play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_5; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK_FAST; break; case 50: - play->nextEntranceIndex = 0x0513; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 17; + play->nextEntranceIndex = ENTR_KAKARIKO_VILLAGE_13; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE_INSTANT; break; case 51: - play->nextEntranceIndex = 0x00CD; + play->nextEntranceIndex = ENTR_HYRULE_FIELD_0; gSaveContext.cutsceneIndex = 0xFFF8; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 41; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_WHITE, TCS_SLOW); break; case 52: - play->nextEntranceIndex = 0x0053; + play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_0; gSaveContext.cutsceneIndex = 0xFFF7; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 11; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_INSTANT; break; case 53: - play->nextEntranceIndex = 0x050F; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 3; + play->nextEntranceIndex = ENTR_HYRULE_FIELD_16; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE; break; case 54: gSaveContext.gameMode = 3; Audio_SetSoundBanksMute(0x6F); play->linkAgeOnLoad = 1; - play->nextEntranceIndex = 0x0117; + play->nextEntranceIndex = ENTR_GERUDO_VALLEY_0; gSaveContext.cutsceneIndex = 0xFFF2; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 55: - play->nextEntranceIndex = 0x0129; + play->nextEntranceIndex = ENTR_GERUDOS_FORTRESS_0; gSaveContext.cutsceneIndex = 0xFFF1; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 56: - play->nextEntranceIndex = 0x00DB; + play->nextEntranceIndex = ENTR_KAKARIKO_VILLAGE_0; gSaveContext.cutsceneIndex = 0xFFF4; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 57: - play->nextEntranceIndex = 0x013D; + play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_0; gSaveContext.cutsceneIndex = 0xFFF3; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 58: - play->nextEntranceIndex = 0x014D; + play->nextEntranceIndex = ENTR_GORON_CITY_0; gSaveContext.cutsceneIndex = 0xFFF1; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 59: - play->nextEntranceIndex = 0x0102; + play->nextEntranceIndex = ENTR_LAKE_HYLIA_0; gSaveContext.cutsceneIndex = 0xFFF1; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 60: - play->nextEntranceIndex = 0x010E; + play->nextEntranceIndex = ENTR_ZORAS_FOUNTAIN_0; gSaveContext.cutsceneIndex = 0xFFF2; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 61: - play->nextEntranceIndex = 0x0108; + play->nextEntranceIndex = ENTR_ZORAS_DOMAIN_0; gSaveContext.cutsceneIndex = 0xFFF0; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 62: play->linkAgeOnLoad = 0; - play->nextEntranceIndex = 0x00EE; + play->nextEntranceIndex = ENTR_KOKIRI_FOREST_0; gSaveContext.cutsceneIndex = 0xFFF6; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 63: - play->nextEntranceIndex = 0x00EE; + play->nextEntranceIndex = ENTR_KOKIRI_FOREST_0; gSaveContext.cutsceneIndex = 0xFFF7; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 64: - play->nextEntranceIndex = 0x00CD; + play->nextEntranceIndex = ENTR_HYRULE_FIELD_0; gSaveContext.cutsceneIndex = 0xFFF5; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 65: play->linkAgeOnLoad = 1; - play->nextEntranceIndex = 0x0157; + play->nextEntranceIndex = ENTR_LON_LON_RANCH_0; gSaveContext.cutsceneIndex = 0xFFF2; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 66: - play->nextEntranceIndex = 0x0554; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->nextEntranceIndex = ENTR_KAKARIKO_VILLAGE_14; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 67: - play->nextEntranceIndex = 0x027E; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->nextEntranceIndex = ENTR_HYRULE_FIELD_9; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 68: - play->nextEntranceIndex = 0x00A0; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF5; - play->fadeTransition = 2; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 69: - play->nextEntranceIndex = 0x05E8; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->nextEntranceIndex = ENTR_KOKIRI_FOREST_12; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 70: - play->nextEntranceIndex = 0x013D; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF4; - play->fadeTransition = 2; - gSaveContext.nextTransitionType = 2; + play->transitionType = TRANS_TYPE_FADE_BLACK; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK; break; case 71: gSaveContext.equips.equipment |= EQUIP_VALUE_TUNIC_KOKIRI << (EQUIP_TYPE_TUNIC * 4); @@ -999,58 +999,58 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB gSaveContext.equips.equipment |= EQUIP_VALUE_BOOTS_KOKIRI << (EQUIP_TYPE_BOOTS * 4); Player_SetEquipmentData(play, player); play->linkAgeOnLoad = 1; - play->nextEntranceIndex = 0x0053; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF1; - play->fadeTransition = 2; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 72: - play->nextEntranceIndex = 0x0400; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_CASTLE_COURTYARD_ZELDA_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF0; - play->fadeTransition = 2; - gSaveContext.nextTransitionType = 2; + play->transitionType = TRANS_TYPE_FADE_BLACK; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK; break; case 73: play->linkAgeOnLoad = 1; - play->nextEntranceIndex = 0x0157; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_LON_LON_RANCH_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF2; - play->fadeTransition = 2; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 74: - play->nextEntranceIndex = 0x0157; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_LON_LON_RANCH_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF3; - play->fadeTransition = 3; - gSaveContext.nextTransitionType = 3; + play->transitionType = TRANS_TYPE_FADE_WHITE; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE; break; case 75: play->linkAgeOnLoad = 1; - play->nextEntranceIndex = 0x0157; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_LON_LON_RANCH_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF4; - play->fadeTransition = 2; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 76: play->linkAgeOnLoad = 0; - play->nextEntranceIndex = 0x0157; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_LON_LON_RANCH_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF5; - play->fadeTransition = 2; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 77: play->linkAgeOnLoad = 1; - play->nextEntranceIndex = 0x0157; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_LON_LON_RANCH_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF6; - play->fadeTransition = 2; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 78: - play->nextEntranceIndex = 0x0157; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_LON_LON_RANCH_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF7; - play->fadeTransition = 2; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 79: case 80: @@ -1067,170 +1067,170 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB case 91: case 92: case 93: - play->nextEntranceIndex = 0x0157; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->nextEntranceIndex = ENTR_LON_LON_RANCH_0; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 94: - play->nextEntranceIndex = 0x02AE; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 3; + play->nextEntranceIndex = ENTR_LON_LON_RANCH_1; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE; break; case 95: if ((Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP)) && (Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP)) && (Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP))) { - play->nextEntranceIndex = 0x0053; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF3; - play->fadeTransition = 2; + play->transitionType = TRANS_TYPE_FADE_BLACK; } else { switch (gSaveContext.sceneSetupIndex) { case 8: - play->nextEntranceIndex = 0x00FC; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->nextEntranceIndex = ENTR_SACRED_FOREST_MEADOW_0; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 9: - play->nextEntranceIndex = 0x0147; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_CRATER_0; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 10: - play->nextEntranceIndex = 0x0102; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_LAKE_HYLIA_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF0; - play->fadeTransition = 3; + play->transitionType = TRANS_TYPE_FADE_WHITE; break; } } break; case 96: if (CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW)) { - play->nextEntranceIndex = 0x006B; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF1; - play->fadeTransition = 5; + play->transitionType = TRANS_TYPE_FADE_WHITE_FAST; } else { Flags_SetEventChkInf(EVENTCHKINF_OBTAINED_SPIRIT_MEDALLION); - play->nextEntranceIndex = 0x0610; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 3; - gSaveContext.nextTransitionType = 3; + play->nextEntranceIndex = ENTR_DESERT_COLOSSUS_8; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE; } break; case 97: if (CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT)) { - play->nextEntranceIndex = 0x006B; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF1; - play->fadeTransition = 5; + play->transitionType = TRANS_TYPE_FADE_WHITE_FAST; } else { - play->nextEntranceIndex = 0x0580; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 3; - gSaveContext.nextTransitionType = 3; + play->nextEntranceIndex = ENTR_GRAVEYARD_8; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE; } break; case 98: - play->nextEntranceIndex = 0x0564; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 3; - gSaveContext.nextTransitionType = 3; + play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_CRATER_5; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE; break; case 99: - play->nextEntranceIndex = 0x0608; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; - gSaveContext.nextTransitionType = 2; + play->nextEntranceIndex = ENTR_SACRED_FOREST_MEADOW_3; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK; break; case 100: - play->nextEntranceIndex = 0x00EE; + play->nextEntranceIndex = ENTR_KOKIRI_FOREST_0; gSaveContext.cutsceneIndex = 0xFFF8; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 3; - gSaveContext.nextTransitionType = 3; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE; break; case 101: - play->nextEntranceIndex = 0x01F5; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 15; + play->nextEntranceIndex = ENTR_DESERT_COLOSSUS_6; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_SANDSTORM_END; break; case 102: - play->nextEntranceIndex = 0x0590; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_6; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 103: - play->nextEntranceIndex = 0x00CD; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_HYRULE_FIELD_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF3; - play->fadeTransition = 2; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 104: switch (sTitleCsState) { case 0: - play->nextEntranceIndex = 0x008D; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_SPIRIT_TEMPLE_BOSS_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF2; - play->fadeTransition = 2; + play->transitionType = TRANS_TYPE_FADE_BLACK; sTitleCsState++; break; case 1: - play->nextEntranceIndex = 0x0147; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_CRATER_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF1; - play->fadeTransition = 2; + play->transitionType = TRANS_TYPE_FADE_BLACK; sTitleCsState++; break; case 2: - play->nextEntranceIndex = 0x00A0; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF6; - play->fadeTransition = 2; + play->transitionType = TRANS_TYPE_FADE_BLACK; sTitleCsState = 0; break; } break; case 105: - play->nextEntranceIndex = 0x00E4; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_GRAVEYARD_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.cutsceneIndex = 0xFFF1; - play->fadeTransition = 2; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 106: - play->nextEntranceIndex = 0x0574; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->nextEntranceIndex = ENTR_ROYAL_FAMILYS_TOMB_1; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 107: - play->nextEntranceIndex = 0x0538; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->nextEntranceIndex = ENTR_INSIDE_GANONS_CASTLE_2; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 108: - play->nextEntranceIndex = 0x053C; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->nextEntranceIndex = ENTR_INSIDE_GANONS_CASTLE_3; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 109: - play->nextEntranceIndex = 0x0540; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->nextEntranceIndex = ENTR_INSIDE_GANONS_CASTLE_4; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 110: - play->nextEntranceIndex = 0x0544; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->nextEntranceIndex = ENTR_INSIDE_GANONS_CASTLE_5; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 111: - play->nextEntranceIndex = 0x0548; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->nextEntranceIndex = ENTR_INSIDE_GANONS_CASTLE_6; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 112: - play->nextEntranceIndex = 0x054C; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->nextEntranceIndex = ENTR_INSIDE_GANONS_CASTLE_7; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 113: if (Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_FOREST_TRIAL) && Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_WATER_TRIAL) && Flags_GetEventChkInf(EVENTCHKINF_COMPLETED_SHADOW_TRIAL) && @@ -1246,49 +1246,49 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB } break; case 114: - play->nextEntranceIndex = 0x0185; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->nextEntranceIndex = ENTR_HYRULE_FIELD_3; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; case 115: - play->nextEntranceIndex = 0x0594; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; - gSaveContext.nextTransitionType = 2; + play->nextEntranceIndex = ENTR_HYRULE_FIELD_17; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK; break; case 116: if (Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_SPIRIT_MEDALLION)) { - play->nextEntranceIndex = 0x0580; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 3; + play->nextEntranceIndex = ENTR_GRAVEYARD_8; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE; } else { - play->nextEntranceIndex = 0x0610; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 3; + play->nextEntranceIndex = ENTR_DESERT_COLOSSUS_8; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE; } - gSaveContext.nextTransitionType = 3; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE; break; case 117: gSaveContext.gameMode = 3; Audio_SetSoundBanksMute(0x6F); play->linkAgeOnLoad = 0; - play->nextEntranceIndex = 0x00CD; + play->nextEntranceIndex = ENTR_HYRULE_FIELD_0; gSaveContext.cutsceneIndex = 0xFFF7; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 3; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE; break; case 118: - gSaveContext.respawn[RESPAWN_MODE_DOWN].entranceIndex = 0x0517; + gSaveContext.respawn[RESPAWN_MODE_DOWN].entranceIndex = ENTR_GANON_BOSS_0; Play_TriggerVoidOut(play); gSaveContext.respawnFlag = -2; - gSaveContext.nextTransitionType = 2; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK; break; case 119: gSaveContext.dayTime = 0x8000; gSaveContext.skyboxTime = 0x8000; - play->nextEntranceIndex = 0x05F0; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 3; + play->nextEntranceIndex = ENTR_CASTLE_COURTYARD_ZELDA_1; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE; break; } @@ -1314,12 +1314,12 @@ void Cutscene_Command_TransitionFX(PlayState* play, CutsceneContext* csCtx, CsCm play->envCtx.screenFillColor[2] = 160; if (cmd->base == 1) { play->envCtx.screenFillColor[3] = 255.0f * temp; - if ((temp == 0.0f) && (gSaveContext.entranceIndex == 0x006B)) { + if ((temp == 0.0f) && (gSaveContext.entranceIndex == ENTR_CHAMBER_OF_THE_SAGES_0)) { Audio_PlaySoundGeneral(NA_SE_SY_WHITE_OUT_S, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } else if ((temp == 0.0f) && - ((gSaveContext.entranceIndex == 0x0053) || (gSaveContext.entranceIndex == 0x0138) || - (gSaveContext.entranceIndex == 0x0371))) { + ((gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_0) || (gSaveContext.entranceIndex == ENTR_HYRULE_CASTLE_0) || + (gSaveContext.entranceIndex == ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_0))) { Audio_PlaySoundGeneral(NA_SE_EV_WHITE_OUT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } else if ((temp == 0.0f) && (play->sceneNum == SCENE_INSIDE_GANONS_CASTLE)) { @@ -2024,10 +2024,10 @@ void func_80068DC0(PlayState* play, CutsceneContext* csCtx) { if (D_8015FCC8 != 0) { switch (gSaveContext.entranceIndex) { - case 0x028A: - case 0x028E: - case 0x0292: - case 0x0476: + case ENTR_HYRULE_FIELD_11: + case ENTR_HYRULE_FIELD_12: + case ENTR_HYRULE_FIELD_13: + case ENTR_HYRULE_FIELD_15: Play_CopyCamera(play, D_8015FCC6, csCtx->unk_14); } @@ -2115,12 +2115,12 @@ void Cutscene_HandleEntranceTriggers(PlayState* play) { if (IS_RANDO && // don't skip epona escape cutscenes - gSaveContext.entranceIndex != 650 && - gSaveContext.entranceIndex != 654 && - gSaveContext.entranceIndex != 658 && - gSaveContext.entranceIndex != 1142 && + gSaveContext.entranceIndex != ENTR_HYRULE_FIELD_11 && + gSaveContext.entranceIndex != ENTR_HYRULE_FIELD_12 && + gSaveContext.entranceIndex != ENTR_HYRULE_FIELD_13 && + gSaveContext.entranceIndex != ENTR_HYRULE_FIELD_15 && // don't skip nabooru iron knuckle cs - gSaveContext.entranceIndex != 141) { + gSaveContext.entranceIndex != ENTR_SPIRIT_TEMPLE_BOSS_0) { gSaveContext.showTitleCard = false; return; } @@ -2152,24 +2152,24 @@ void Cutscene_HandleConditionalTriggers(PlayState* play) { if ((gSaveContext.gameMode == 0) && (gSaveContext.respawnFlag <= 0) && (gSaveContext.cutsceneIndex < 0xFFF0)) { const bool bShouldTowerRandoSkip = (IS_RANDO && Randomizer_GetSettingValue(RSK_SKIP_TOWER_ESCAPE)); - if ((gSaveContext.entranceIndex == 0x01E1) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT)) { + if ((gSaveContext.entranceIndex == ENTR_DESERT_COLOSSUS_1) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT)) { if (!IS_RANDO) { Flags_SetEventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT); - gSaveContext.entranceIndex = 0x0123; + gSaveContext.entranceIndex = ENTR_DESERT_COLOSSUS_0; gSaveContext.cutsceneIndex = 0xFFF0; } - } else if ((gSaveContext.entranceIndex == 0x00DB) && LINK_IS_ADULT && (Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP)) && + } else if ((gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_0) && LINK_IS_ADULT && (Flags_GetEventChkInf(EVENTCHKINF_USED_FOREST_TEMPLE_BLUE_WARP)) && (Flags_GetEventChkInf(EVENTCHKINF_USED_FIRE_TEMPLE_BLUE_WARP)) && (Flags_GetEventChkInf(EVENTCHKINF_USED_WATER_TEMPLE_BLUE_WARP)) && !Flags_GetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL)) { if (!IS_RANDO) { Flags_SetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL); gSaveContext.cutsceneIndex = 0xFFF0; } - } else if ((gSaveContext.entranceIndex == 0x05E0) && !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE)) { + } else if ((gSaveContext.entranceIndex == ENTR_LOST_WOODS_9) && !Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE)) { if (!IS_RANDO) { Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE); Item_Give(play, ITEM_OCARINA_FAIRY); - gSaveContext.entranceIndex = 0x011E; + gSaveContext.entranceIndex = ENTR_LOST_WOODS_0; gSaveContext.cutsceneIndex = 0xFFF0; } } else if (CHECK_QUEST_ITEM(QUEST_MEDALLION_SPIRIT) && CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW) && @@ -2177,7 +2177,7 @@ void Cutscene_HandleConditionalTriggers(PlayState* play) { (gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_TEMPLE_OF_TIME)) { if (!IS_RANDO) { Flags_SetEventChkInf(EVENTCHKINF_RETURNED_TO_TEMPLE_OF_TIME_WITH_ALL_MEDALLIONS); - gSaveContext.entranceIndex = 0x0053; + gSaveContext.entranceIndex = ENTR_TEMPLE_OF_TIME_0; gSaveContext.cutsceneIndex = 0xFFF8; } } else if ((!Flags_GetEventChkInf(EVENTCHKINF_WATCHED_GANONS_CASTLE_COLLAPSE_CAUGHT_BY_GERUDO) && @@ -2185,7 +2185,7 @@ void Cutscene_HandleConditionalTriggers(PlayState* play) { (bShouldTowerRandoSkip && gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR)) { Flags_SetEventChkInf(EVENTCHKINF_WATCHED_GANONS_CASTLE_COLLAPSE_CAUGHT_BY_GERUDO); - gSaveContext.entranceIndex = 0x0517; + gSaveContext.entranceIndex = ENTR_GANON_BOSS_0; // In rando, skip the cutscene for the tower falling down after the escape. if (IS_RANDO) { return; diff --git a/soh/src/code/z_draw.c b/soh/src/code/z_draw.c index cb28a498e..e9ab95398 100644 --- a/soh/src/code/z_draw.c +++ b/soh/src/code/z_draw.c @@ -1043,7 +1043,7 @@ void GetItem_DrawTriforcePiece(PlayState* play, s16 drawId) { Matrix_Scale(0.035f, 0.035f, 0.035f, MTXMODE_APPLY); - uint16_t index = gSaveContext.triforcePiecesCollected % 3; + uint8_t index = gSaveContext.triforcePiecesCollected % 3; Gfx* triforcePieceDL; switch (index) { diff --git a/soh/src/code/z_fbdemo_circle.c b/soh/src/code/z_fbdemo_circle.c index a3ebbabd4..98183023a 100644 --- a/soh/src/code/z_fbdemo_circle.c +++ b/soh/src/code/z_fbdemo_circle.c @@ -39,16 +39,16 @@ Gfx __sCircleDList[] = { void TransitionCircle_Start(void* thisx) { TransitionCircle* this = (TransitionCircle*)thisx; - this->isDone = 0; + this->isDone = false; - switch (this->effect) { - case 1: + switch (this->appearanceType) { + case TCA_WAVE: this->texture = sTransCircleWaveTex; break; - case 2: + case TCA_RIPPLE: this->texture = sTransCircleRippleTex; break; - case 3: + case TCA_STARBURST: this->texture = sTransCircleStarburstTex; break; default: @@ -56,34 +56,34 @@ void TransitionCircle_Start(void* thisx) { break; } - if (this->speed == 0) { - this->step = 0x14; + if (this->speedType == TCS_FAST) { + this->speed = 20; } else { - this->step = 0xA; + this->speed = 10; } - if (this->typeColor == 0) { + if (this->colorType == TCC_BLACK) { this->color.rgba = RGBA8(0, 0, 0, 255); - } else if (this->typeColor == 1) { + } else if (this->colorType == TCC_WHITE) { this->color.rgba = RGBA8(160, 160, 160, 255); - } else if (this->typeColor == 2) { + } else if (this->colorType == TCC_GRAY) { // yes, really. this->color.r = 100; this->color.g = 100; this->color.b = 100; this->color.a = 255; } else { - this->step = 0x28; - this->color.rgba = this->effect == 1 ? RGBA8(0, 0, 0, 255) : RGBA8(160, 160, 160, 255); + this->speed = 40; + this->color.rgba = this->appearanceType == TCA_WAVE ? RGBA8(0, 0, 0, 255) : RGBA8(160, 160, 160, 255); } - if (this->unk_14 != 0) { + if (this->direction != 0) { this->texY = 0; - if (this->typeColor == 3) { + if (this->colorType == TCC_SPECIAL) { this->texY = 0xFA; } } else { this->texY = 0x1F4; - if (this->effect == 2) { + if (this->appearanceType == TCA_RIPPLE) { Audio_PlaySoundGeneral(NA_SE_OC_SECRET_WARP_OUT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } } @@ -106,28 +106,28 @@ void TransitionCircle_Update(void* thisx, s32 updateRate) { s32 temp_t2; s32 temp_t3; - if (this->unk_14 != 0) { + if (this->direction != 0) { if (this->texY == 0) { - if (this->effect == 2) { + if (this->appearanceType == TCA_RIPPLE) { Audio_PlaySoundGeneral(NA_SE_OC_SECRET_WARP_IN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } } - this->texY += this->step * 3 / updateRate; + this->texY += this->speed * 3 / updateRate; if (this->texY >= 0x1F4) { this->texY = 0x1F4; - this->isDone = 1; + this->isDone = true; } } else { - this->texY -= this->step * 3 / updateRate; - if (this->typeColor != 3) { + this->texY -= this->speed * 3 / updateRate; + if (this->colorType != TCC_SPECIAL) { if (this->texY <= 0) { this->texY = 0; - this->isDone = 1; + this->isDone = true; } } else { if (this->texY < 0xFB) { this->texY = 0xFA; - this->isDone = 1; + this->isDone = true; } } } @@ -194,15 +194,17 @@ s32 TransitionCircle_IsDone(void* thisx) { void TransitionCircle_SetType(void* thisx, s32 type) { TransitionCircle* this = (TransitionCircle*)thisx; - if (type & 0x80) { - this->unk_14 = (type >> 5) & 0x1; - this->typeColor = (type >> 3) & 0x3; - this->speed = type & 0x1; - this->effect = (type >> 1) & 0x3; + if (type & TC_SET_PARAMS) { + // SetType is called twice for circles, the actual direction value will be set on the second call. + // The direction set here will be overwritten on that second call. + this->direction = (type >> 5) & 0x1; + this->colorType = (type >> 3) & 0x3; + this->speedType = type & 0x1; + this->appearanceType = (type >> 1) & 0x3; } else if (type == 1) { - this->unk_14 = 1; + this->direction = 1; } else { - this->unk_14 = 0; + this->direction = 0; } } diff --git a/soh/src/code/z_fbdemo_wipe1.c b/soh/src/code/z_fbdemo_wipe1.c index df5cbbc2d..6bc3fb039 100644 --- a/soh/src/code/z_fbdemo_wipe1.c +++ b/soh/src/code/z_fbdemo_wipe1.c @@ -64,18 +64,18 @@ void TransitionWipe_Destroy(void* thisx) { void TransitionWipe_Update(void* thisx, s32 updateRate) { TransitionWipe* this = (TransitionWipe*)thisx; - u8 unk1419; + u8 speed; if (this->direction != 0) { - unk1419 = gSaveContext.transWipeSpeed; - this->texY += (unk1419 * 3) / updateRate; + speed = gSaveContext.transWipeSpeed; + this->texY += (speed * 3) / updateRate; if (this->texY >= 0x264) { this->texY = 0x264; this->isDone = 1; } } else { - unk1419 = gSaveContext.transWipeSpeed; - this->texY -= (unk1419 * 3) / updateRate; + speed = gSaveContext.transWipeSpeed; + this->texY -= (speed * 3) / updateRate; if (this->texY < 0x14E) { this->texY = 0x14D; this->isDone = 1; diff --git a/soh/src/code/z_horse.c b/soh/src/code/z_horse.c index c36e6095e..6f7aa2d3a 100644 --- a/soh/src/code/z_horse.c +++ b/soh/src/code/z_horse.c @@ -68,7 +68,7 @@ void func_8006D0EC(PlayState* play, Player* player) { horseActor = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, 3586.0f, 1413.0f, -402.0f, 0, 0x4000, 0, 1, true); horseActor->room = -1; - } else if ((gSaveContext.entranceIndex == 1230) && (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED))) { + } else if ((gSaveContext.entranceIndex == ENTR_LON_LON_RANCH_7) && (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED))) { Actor* horseActor = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, -25.0f, 0.0f, -1600.0f, 0, -0x4000, 0, 1, true); assert(horseActor != NULL); @@ -134,8 +134,8 @@ void func_8006D684(PlayState* play, Player* player) { s32 i; Vec3s spawnPos; - if ((gSaveContext.entranceIndex == 0x028A || gSaveContext.entranceIndex == 0x028E || - gSaveContext.entranceIndex == 0x0292 || gSaveContext.entranceIndex == 0x0476) && + if ((gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_11 || gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_12 || + gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_13 || gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_15) && (gSaveContext.respawnFlag == 0)) { Vec3s spawnPositions[] = { { 0xF46F, 0x0139, 0x1E14 }, @@ -144,13 +144,13 @@ void func_8006D684(PlayState* play, Player* player) { { 0xF6F7, 0x0139, 0x1766 }, }; - if (gSaveContext.entranceIndex == 0x028A) { + if (gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_11) { spawnPos = spawnPositions[0]; - } else if (gSaveContext.entranceIndex == 0x028E) { + } else if (gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_12) { spawnPos = spawnPositions[1]; - } else if (gSaveContext.entranceIndex == 0x0292) { + } else if (gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_13) { spawnPos = spawnPositions[2]; - } else { + } else { // entranceIndex == ENTR_HYRULE_FIELD_15 spawnPos = spawnPositions[3]; } @@ -253,8 +253,8 @@ void func_8006DC68(PlayState* play, Player* player) { if (func_8006CFC0(play->sceneNum)) { if ((gSaveContext.sceneSetupIndex > 3) || - ((gSaveContext.entranceIndex == 0x028A || gSaveContext.entranceIndex == 0x028E || - gSaveContext.entranceIndex == 0x0292 || gSaveContext.entranceIndex == 0x0476) && + ((gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_11 || gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_12 || + gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_13 || gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_15) && (gSaveContext.respawnFlag == 0)) || ((play->sceneNum == SCENE_LON_LON_RANCH) && ((gSaveContext.eventInf[0] & 0xF) == 6) && !Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) && (DREG(1) == 0))) { diff --git a/soh/src/code/z_kaleido_setup.c b/soh/src/code/z_kaleido_setup.c index 77cc43e99..e4001e6ce 100644 --- a/soh/src/code/z_kaleido_setup.c +++ b/soh/src/code/z_kaleido_setup.c @@ -13,7 +13,7 @@ void KaleidoSetup_Update(PlayState* play) { Input* input = &play->state.input[0]; if (pauseCtx->state == 0 && pauseCtx->debugState == 0 && play->gameOverCtx.state == GAMEOVER_INACTIVE && - play->sceneLoadFlag == 0 && play->transitionMode == 0 && gSaveContext.cutsceneIndex < 0xFFF0 && + play->transitionTrigger == TRANS_TRIGGER_OFF && play->transitionMode == TRANS_MODE_OFF && gSaveContext.cutsceneIndex < 0xFFF0 && gSaveContext.nextCutsceneIndex < 0xFFF0 && !Play_InCsMode(play) && play->shootingGalleryStatus <= 1 && gSaveContext.magicState != MAGIC_STATE_STEP_CAPACITY && gSaveContext.magicState != MAGIC_STATE_FILL && (play->sceneNum != SCENE_BOMBCHU_BOWLING_ALLEY || !Flags_GetSwitch(play, 0x38))) { diff --git a/soh/src/code/z_kankyo.c b/soh/src/code/z_kankyo.c index 4474c2d8b..77c7546f8 100644 --- a/soh/src/code/z_kankyo.c +++ b/soh/src/code/z_kankyo.c @@ -289,7 +289,7 @@ void Environment_Init(PlayState* play2, EnvironmentContext* envCtx, s32 unused) envCtx->skyboxFilterColor[1] = 0; envCtx->skyboxFilterColor[2] = 0; envCtx->skyboxFilterColor[3] = 0; - envCtx->sandstormState = 0; + envCtx->sandstormState = SANDSTORM_OFF; envCtx->sandstormPrimA = 0; envCtx->sandstormEnvA = 0; @@ -925,7 +925,7 @@ void Environment_Update(PlayState* play, EnvironmentContext* envCtx, LightContex if ((pauseCtx->state == 0) && (gameOverCtx->state == GAMEOVER_INACTIVE)) { if (((msgCtx->msgLength == 0) && (msgCtx->msgMode == 0)) || (((void)0, gSaveContext.gameMode) == 3)) { if ((envCtx->unk_1A == 0) && !FrameAdvance_IsEnabled(play) && - (play->transitionMode == 0 || ((void)0, gSaveContext.gameMode) != 0)) { + (play->transitionMode == TRANS_MODE_OFF || ((void)0, gSaveContext.gameMode) != 0)) { if (IS_DAY || gTimeIncrement >= 0x190) { gSaveContext.dayTime += gTimeIncrement; @@ -1322,7 +1322,7 @@ void Environment_DrawSunAndMoon(PlayState* play) { play->envCtx.sunPos.z = +(Math_CosS(((void)0, gSaveContext.dayTime) - 0x8000) * 20.0f) * 25.0f; } - if (gSaveContext.entranceIndex != 0xCD || ((void)0, gSaveContext.sceneSetupIndex) != 5) { + if (gSaveContext.entranceIndex != ENTR_HYRULE_FIELD_0 || ((void)0, gSaveContext.sceneSetupIndex) != 5) { Matrix_Translate(play->view.eye.x + play->envCtx.sunPos.x, play->view.eye.y + play->envCtx.sunPos.y, play->view.eye.z + play->envCtx.sunPos.z, MTXMODE_NEW); @@ -2004,7 +2004,7 @@ void Environment_PlaySceneSequence(PlayState* play) { play->envCtx.unk_E0 = 0xFF; // both lost woods exits on the bridge from kokiri to hyrule field - if (((void)0, gSaveContext.entranceIndex) == 0x4DE || ((void)0, gSaveContext.entranceIndex) == 0x5E0) { + if (((void)0, gSaveContext.entranceIndex) == ENTR_LOST_WOODS_8 || ((void)0, gSaveContext.entranceIndex) == ENTR_LOST_WOODS_9) { Audio_PlayNatureAmbienceSequence(NATURE_ID_KOKIRI_REGION); } else if (((void)0, gSaveContext.forcedSeqId) != NA_BGM_GENERAL_SFX) { if (!Environment_IsForcedSequenceDisabled()) { @@ -2336,7 +2336,7 @@ void Environment_DrawSandstorm(PlayState* play, u8 sandstormState) { Environment_PatchSandstorm(play); switch (sandstormState) { - case 3: + case SANDSTORM_ACTIVE: if ((play->sceneNum == SCENE_HAUNTED_WASTELAND) && (play->roomCtx.curRoom.num == 0)) { envA1 = 0; primA1 = (play->envCtx.sandstormEnvA > 128) ? 255 : play->envCtx.sandstormEnvA >> 1; @@ -2349,11 +2349,11 @@ void Environment_DrawSandstorm(PlayState* play, u8 sandstormState) { envA1 = 128; } break; - case 1: + case SANDSTORM_FILL: primA1 = 255; envA1 = (play->envCtx.sandstormPrimA >= 255) ? 255 : 128; break; - case 2: + case SANDSTORM_UNFILL: envA1 = 128; if (play->envCtx.sandstormEnvA > 128) { primA1 = 0xFF; @@ -2365,15 +2365,15 @@ void Environment_DrawSandstorm(PlayState* play, u8 sandstormState) { primA1 += 73; } if ((primA1 >= primA) && (primA1 != 255)) { - play->envCtx.sandstormState = 3; + play->envCtx.sandstormState = SANDSTORM_ACTIVE; } break; - case 4: + case SANDSTORM_DISSIPATE: envA1 = 0; primA1 = (play->envCtx.sandstormEnvA > 128) ? 255 : play->envCtx.sandstormEnvA >> 1; if (primA == 0) { - play->envCtx.sandstormState = 0; + play->envCtx.sandstormState = SANDSTORM_OFF; } break; } @@ -2541,27 +2541,27 @@ void Environment_WarpSongLeave(PlayState* play) { gSaveContext.cutsceneIndex = 0; gSaveContext.respawnFlag = -3; play->nextEntranceIndex = gSaveContext.respawn[RESPAWN_MODE_RETURN].entranceIndex; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 3; - gSaveContext.nextTransitionType = 3; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE; switch (play->nextEntranceIndex) { - case 0x147: + case ENTR_DEATH_MOUNTAIN_CRATER_0: Flags_SetEventChkInf(EVENTCHKINF_ENTERED_DEATH_MOUNTAIN_CRATER); break; - case 0x0102: + case ENTR_LAKE_HYLIA_0: Flags_SetEventChkInf(EVENTCHKINF_ENTERED_LAKE_HYLIA); break; - case 0x0123: + case ENTR_DESERT_COLOSSUS_0: Flags_SetEventChkInf(EVENTCHKINF_ENTERED_DESERT_COLOSSUS); break; - case 0x00E4: + case ENTR_GRAVEYARD_0: Flags_SetEventChkInf(EVENTCHKINF_ENTERED_GRAVEYARD); break; - case 0x0053: + case ENTR_TEMPLE_OF_TIME_0: Flags_SetEventChkInf(EVENTCHKINF_ENTERED_TEMPLE_OF_TIME); break; - case 0x00FC: + case ENTR_SACRED_FOREST_MEADOW_0: break; } } diff --git a/soh/src/code/z_lifemeter.c b/soh/src/code/z_lifemeter.c index 8d5e41a20..69cba24b4 100644 --- a/soh/src/code/z_lifemeter.c +++ b/soh/src/code/z_lifemeter.c @@ -601,13 +601,24 @@ void HealthMeter_Draw(PlayState* play) { { Mtx* matrix = Graph_Alloc(gfxCtx, sizeof(Mtx)); - Matrix_SetTranslateScaleMtx2(matrix, - HeartsScale+(HeartsScale/3) - ((HeartsScale/3) * sp144), - HeartsScale+(HeartsScale/3) - ((HeartsScale/3) * sp144), - HeartsScale+(HeartsScale/3) - ((HeartsScale/3) * sp144), - -130+offsetX, //Pos X - (-94+offsetY) *-1, //Pos Y - 0.0f); + + if (CVarGetInteger("gNoHUDHeartAnimation", 0)) { + Matrix_SetTranslateScaleMtx2(matrix, + HeartsScale, // Scale X + HeartsScale, // Scale Y + HeartsScale, // Scale Z + -130 + offsetX, // Pos X + (-94 + offsetY) * -1, // Pos Y + 0.0f); + } else { + Matrix_SetTranslateScaleMtx2(matrix, HeartsScale + (HeartsScale / 3) - ((HeartsScale / 3) * sp144), + HeartsScale + (HeartsScale / 3) - ((HeartsScale / 3) * sp144), + HeartsScale + (HeartsScale / 3) - ((HeartsScale / 3) * sp144), + -130 + offsetX, // Pos X + (-94 + offsetY) * -1, // Pos Y + 0.0f); + } + gSPMatrix(OVERLAY_DISP++, matrix, G_MTX_MODELVIEW | G_MTX_LOAD); gSPVertex(OVERLAY_DISP++, sp154, 4, 0); gSP1Quadrangle(OVERLAY_DISP++, 0, 2, 3, 1, 0); diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c index da0f5f55f..7bb3803fc 100644 --- a/soh/src/code/z_message_PAL.c +++ b/soh/src/code/z_message_PAL.c @@ -3384,7 +3384,7 @@ void Message_Update(PlayState* play) { } sLastPlayedSong = 0xFF; osSyncPrintf("OCARINA_MODE=%d chk_ocarina_no=%d\n", play->msgCtx.ocarinaMode, msgCtx->unk_E3F2); - CheckTracker_OnMessageClose(); + // TODO: OnMessageClose hook break; case MSGMODE_PAUSED: break; diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index 73c8aebd1..67405d226 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -893,7 +893,7 @@ void func_80083108(PlayState* play) { Interface_ChangeAlpha(6); } - if (play->transitionMode != 0) { + if (play->transitionMode != TRANS_MODE_OFF) { Interface_ChangeAlpha(1); } else if (gSaveContext.minigameState == 1) { Interface_ChangeAlpha(8); @@ -1344,7 +1344,7 @@ void func_80083108(PlayState* play) { if (sp28) { gSaveContext.unk_13EA = 0; - if ((play->sceneLoadFlag == 0) && (play->transitionMode == 0)) { + if ((play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF)) { Interface_ChangeAlpha(50); osSyncPrintf("???????? alpha_change( 50 ); ?????\n"); } else { @@ -1469,6 +1469,7 @@ void Inventory_SwapAgeEquipment(void) { gSaveContext.equips.buttonItems[0] = ITEM_SWORD_MASTER; } else { gSaveContext.equips.buttonItems[0] = ITEM_NONE; + Flags_SetInfTable(INFTABLE_SWORDLESS); } if (gSaveContext.inventory.items[SLOT_NUT] != ITEM_NONE) { @@ -1525,13 +1526,13 @@ void Inventory_SwapAgeEquipment(void) { } else { // When becoming child, set swordless flag if player doesn't have kokiri sword // Only in rando to keep swordless link bugs in vanilla - if (IS_RANDO && (EQUIP_INV_SWORD_KOKIRI << (EQUIP_TYPE_SWORD * 4) & gSaveContext.inventory.equipment) == 0) { + if (IS_RANDO && CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_KOKIRI) == 0) { Flags_SetInfTable(INFTABLE_SWORDLESS); } // When using enhancements, set swordless flag if player doesn't have kokiri sword or hasn't equipped a sword yet. // Then set the child equips button items to item none to ensure kokiri sword is not equipped - if ((CVarGetInteger("gSwitchAge", 0) || CVarGetInteger("gSwitchTimeline", 0)) && ((EQUIP_INV_SWORD_KOKIRI << (EQUIP_TYPE_SWORD * 4) & gSaveContext.inventory.equipment) == 0 || Flags_GetInfTable(INFTABLE_SWORDLESS))) { + if ((CVarGetInteger("gSwitchAge", 0) || CVarGetInteger("gSwitchTimeline", 0)) && (CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_KOKIRI) == 0 || Flags_GetInfTable(INFTABLE_SWORDLESS))) { Flags_SetInfTable(INFTABLE_SWORDLESS); gSaveContext.childEquips.buttonItems[0] = ITEM_NONE; } @@ -1567,7 +1568,7 @@ void Inventory_SwapAgeEquipment(void) { gSaveContext.equips.equipment = gSaveContext.childEquips.equipment; gSaveContext.equips.equipment &= (u16) ~(0xF << (EQUIP_TYPE_SWORD * 4)); // Equips kokiri sword in the inventory screen only if kokiri sword exists in inventory and a sword has been equipped already - if (!((EQUIP_INV_SWORD_KOKIRI << (EQUIP_TYPE_SWORD * 4) & gSaveContext.inventory.equipment) == 0) && !Flags_GetInfTable(INFTABLE_SWORDLESS)) { + if (!(CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_KOKIRI) == 0) && !Flags_GetInfTable(INFTABLE_SWORDLESS)) { gSaveContext.equips.equipment |= EQUIP_VALUE_SWORD_KOKIRI << (EQUIP_TYPE_SWORD * 4); } } else if (gSaveContext.childEquips.buttonItems[0] != ITEM_NONE) { @@ -1597,7 +1598,7 @@ void Inventory_SwapAgeEquipment(void) { (only kokiri tunic/boots equipped, no sword, no C-button items, no D-Pad items). When becoming child, set swordless flag if player doesn't have kokiri sword Only in rando to keep swordless link bugs in vanilla*/ - if (EQUIP_INV_SWORD_KOKIRI << (EQUIP_TYPE_SWORD * 4) & gSaveContext.inventory.equipment == 0) { + if (CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_KOKIRI) == 0) { Flags_SetInfTable(INFTABLE_SWORDLESS); } @@ -1723,7 +1724,7 @@ void GameplayStats_SetTimestamp(PlayState* play, u8 item) { } // Use ITEM_KEY_BOSS only for Ganon's boss key - not any other boss keys if (play != NULL) { - if (item == ITEM_KEY_BOSS && play->sceneNum != 13 && play->sceneNum != 10) { + if (item == ITEM_KEY_BOSS && play->sceneNum != SCENE_INSIDE_GANONS_CASTLE && play->sceneNum != SCENE_GANONS_TOWER) { return; } } @@ -1800,15 +1801,25 @@ u8 Return_Item_Entry(GetItemEntry itemEntry, ItemID returnItem ) { u8 Return_Item(u8 itemID, ModIndex modId, ItemID returnItem) { // ITEM_SOLD_OUT doesn't have an ItemTable entry, so pass custom entry instead if (itemID == ITEM_SOLD_OUT) { - GetItemEntry gie = { ITEM_SOLD_OUT, 0, 0, 0, 0, 0, 0, 0, false, ITEM_FROM_NPC, ITEM_CATEGORY_LESSER, NULL }; + GetItemEntry gie = { ITEM_SOLD_OUT, 0, 0, 0, 0, 0, 0, 0, 0, false, ITEM_FROM_NPC, ITEM_CATEGORY_LESSER, NULL }; return Return_Item_Entry(gie, returnItem); } - int32_t get = GetGIID(itemID); - if (get == -1) { - modId = MOD_RANDOMIZER; - get = itemID; + + GetItemID getItemID = RetrieveGetItemIDFromItemID(itemID); + if (getItemID != GI_MAX) { + // Vanilla ItemID with an associated GetItemID + return Return_Item_Entry(ItemTable_RetrieveEntry(modId, getItemID), returnItem); } - return Return_Item_Entry(ItemTable_RetrieveEntry(modId, get), returnItem); + + RandomizerGet randomizerGet = RetrieveRandomizerGetFromItemID(itemID); + if (randomizerGet != RG_MAX) { + // Vanilla ItemID with an associated RandomizerGet (These are items in extendedVanillaGetItemTable) + return Return_Item_Entry(ItemTable_RetrieveEntry(MOD_RANDOMIZER, randomizerGet), returnItem); + } + + // All randomizer items should go through Randomizer_Item_Give, so this should never be reached + // but leaving this here just in case, as it was in the original behavior + return Return_Item_Entry(ItemTable_RetrieveEntry(MOD_RANDOMIZER, itemID), returnItem); } /** @@ -2604,6 +2615,7 @@ u16 Randomizer_Item_Give(PlayState* play, GetItemEntry giEntry) { if (gSaveContext.triforcePiecesCollected == Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED)) { gSaveContext.sohStats.itemTimestamp[TIMESTAMP_TRIFORCE_COMPLETED] = GAMEPLAYSTAT_TOTAL_TIME; gSaveContext.sohStats.gameComplete = 1; + Flags_SetRandomizerInf(RAND_INF_GRANT_GANONS_BOSSKEY); Play_PerformSave(play); GameInteractor_SetTriforceHuntCreditsWarpActive(true); } @@ -3469,7 +3481,7 @@ void Interface_UpdateMagicBar(PlayState* play) { case MAGIC_STATE_CONSUME_LENS: if ((play->pauseCtx.state == 0) && (play->pauseCtx.debugState == 0) && (msgCtx->msgMode == MSGMODE_NONE) && (play->gameOverCtx.state == GAMEOVER_INACTIVE) && - (play->sceneLoadFlag == 0) && (play->transitionMode == 0) && !Play_InCsMode(play)) { + (play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF) && !Play_InCsMode(play)) { bool hasLens = false; for (int buttonIndex = 1; buttonIndex < (CVarGetInteger("gDpadEquips", 0) != 0) ? ARRAY_COUNT(gSaveContext.equips.buttonItems) : 4; buttonIndex++) { if (gSaveContext.equips.buttonItems[buttonIndex] == ITEM_LENS) { @@ -5077,7 +5089,7 @@ void Interface_Draw(PlayState* play) { aButtonColor = (Color_RGB8){ 0, 200, 50 }; } - static s16 spoilingItemEntrances[] = { 0x01AD, 0x0153, 0x0153 }; + static s16 spoilingItemEntrances[] = { ENTR_LOST_WOODS_2, ENTR_ZORAS_DOMAIN_3, ENTR_ZORAS_DOMAIN_3 }; static f32 D_80125B54[] = { -40.0f, -35.0f }; // unused static s16 D_80125B5C[] = { 91, 91 }; // unused static s16 D_8015FFE0; @@ -5794,8 +5806,8 @@ void Interface_Draw(PlayState* play) { // Trade quest timer reached 0 D_8015FFE6 = 40; gSaveContext.cutsceneIndex = 0; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 3; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE; gSaveContext.timer2State = 0; if ((gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KOKIRI) && @@ -5830,8 +5842,8 @@ void Interface_Draw(PlayState* play) { if ((play->pauseCtx.state == 0) && (play->pauseCtx.debugState == 0) && (play->gameOverCtx.state == GAMEOVER_INACTIVE) && (msgCtx->msgMode == MSGMODE_NONE) && - !(player->stateFlags2 & 0x01000000) && (play->sceneLoadFlag == 0) && - (play->transitionMode == 0) && !Play_InCsMode(play) && (gSaveContext.minigameState != 1) && + !(player->stateFlags2 & 0x01000000) && (play->transitionTrigger == TRANS_TRIGGER_OFF) && + (play->transitionMode == TRANS_MODE_OFF) && !Play_InCsMode(play) && (gSaveContext.minigameState != 1) && (play->shootingGalleryStatus <= 1) && !((play->sceneNum == SCENE_BOMBCHU_BOWLING_ALLEY) && Flags_GetSwitch(play, 0x38))) { svar6 = 0; @@ -6522,8 +6534,8 @@ void Interface_Update(PlayState* play) { HealthMeter_Update(play); if ((gSaveContext.timer1State >= 3) && (play->pauseCtx.state == 0) && (play->pauseCtx.debugState == 0) && - (msgCtx->msgMode == MSGMODE_NONE) && !(player->stateFlags2 & 0x01000000) && (play->sceneLoadFlag == 0) && - (play->transitionMode == 0) && !Play_InCsMode(play)) {} + (msgCtx->msgMode == MSGMODE_NONE) && !(player->stateFlags2 & 0x01000000) && (play->transitionTrigger == TRANS_TRIGGER_OFF) && + (play->transitionMode == TRANS_MODE_OFF) && !Play_InCsMode(play)) {} if (gSaveContext.rupeeAccumulator != 0) { if (gSaveContext.rupeeAccumulator > 0) { @@ -6561,11 +6573,15 @@ void Interface_Update(PlayState* play) { gSaveContext.pendingSale = ITEM_NONE; gSaveContext.pendingSaleMod = MOD_NONE; if (tempSaleMod == MOD_NONE) { - s16 giid = GetGIID(tempSaleItem); - if (giid == -1) { - tempSaleMod = MOD_RANDOMIZER; + GetItemID getItemID = RetrieveGetItemIDFromItemID(tempSaleItem); + RandomizerGet randomizerGet = RetrieveRandomizerGetFromItemID(tempSaleItem); + if (getItemID != GI_MAX) { + tempSaleItem = getItemID; } else { - tempSaleItem = giid; + if (randomizerGet != RG_MAX) { + tempSaleItem = randomizerGet; + } + tempSaleMod = MOD_RANDOMIZER; } } GameInteractor_ExecuteOnSaleEndHooks(ItemTable_RetrieveEntry(tempSaleMod, tempSaleItem)); @@ -6618,8 +6634,8 @@ void Interface_Update(PlayState* play) { WREG(7) = interfaceCtx->unk_1F4; if ((play->pauseCtx.state == 0) && (play->pauseCtx.debugState == 0) && - (msgCtx->msgMode == MSGMODE_NONE) && (play->sceneLoadFlag == 0) && - (play->gameOverCtx.state == GAMEOVER_INACTIVE) && (play->transitionMode == 0) && + (msgCtx->msgMode == MSGMODE_NONE) && (play->transitionTrigger == TRANS_TRIGGER_OFF) && + (play->gameOverCtx.state == GAMEOVER_INACTIVE) && (play->transitionMode == TRANS_MODE_OFF) && ((play->csCtx.state == CS_STATE_IDLE) || !Player_InCsMode(play))) { if ((gSaveContext.isMagicAcquired != 0) && (gSaveContext.magicLevel == 0)) { gSaveContext.magicLevel = gSaveContext.isDoubleMagicAcquired + 1; @@ -6716,19 +6732,19 @@ void Interface_Update(PlayState* play) { (interfaceCtx->restrictions.sunsSong != 3)) { if ((gSaveContext.dayTime >= 0x4555) && (gSaveContext.dayTime < 0xC001)) { gSaveContext.nextDayTime = 0; - play->fadeTransition = 4; - gSaveContext.nextTransitionType = 2; + play->transitionType = TRANS_TYPE_FADE_BLACK_FAST; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK; play->unk_11DE9 = 1; } else { gSaveContext.nextDayTime = 0x8001; - play->fadeTransition = 5; - gSaveContext.nextTransitionType = 3; + play->transitionType = TRANS_TYPE_FADE_WHITE_FAST; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE; play->unk_11DE9 = 1; } if (play->sceneNum == SCENE_HAUNTED_WASTELAND) { - play->fadeTransition = 14; - gSaveContext.nextTransitionType = 14; + play->transitionType = TRANS_TYPE_SANDSTORM_PERSIST; + gSaveContext.nextTransitionType = TRANS_TYPE_SANDSTORM_PERSIST; } gSaveContext.respawnFlag = -2; @@ -6739,7 +6755,7 @@ void Interface_Update(PlayState* play) { Grotto_ForceGrottoReturn(); } - play->sceneLoadFlag = 0x14; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.sunsSongState = SUNSSONG_INACTIVE; func_800F6964(30); gSaveContext.seqId = (u8)NA_BGM_DISABLED; diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c index 112a71888..d6c84e355 100644 --- a/soh/src/code/z_play.c +++ b/soh/src/code/z_play.c @@ -33,6 +33,7 @@ u64 D_801614D0[0xA00]; #endif PlayState* gPlayState; +s16 firstInit = 0; s16 gEnPartnerId; @@ -71,13 +72,14 @@ void func_800BC590(PlayState* play) { } } -void func_800BC5E0(PlayState* play, s32 transitionType) { +void Gameplay_SetupTransition(PlayState* play, s32 transitionType) { TransitionContext* transitionCtx = &play->transitionCtx; memset(transitionCtx,0, sizeof(TransitionContext)); transitionCtx->transitionType = transitionType; + // Circle Transition Types if ((transitionCtx->transitionType >> 5) == 1) { transitionCtx->init = TransitionCircle_Init; transitionCtx->destroy = TransitionCircle_Destroy; @@ -90,7 +92,7 @@ void func_800BC5E0(PlayState* play, s32 transitionType) { transitionCtx->setEnvColor = TransitionCircle_SetEnvColor; } else { switch (transitionCtx->transitionType) { - case 1: + case TRANS_TYPE_TRIFORCE: transitionCtx->init = TransitionTriforce_Init; transitionCtx->destroy = TransitionTriforce_Destroy; transitionCtx->start = TransitionTriforce_Start; @@ -101,8 +103,8 @@ void func_800BC5E0(PlayState* play, s32 transitionType) { transitionCtx->setColor = TransitionTriforce_SetColor; transitionCtx->setEnvColor = NULL; break; - case 0: - case 8: + case TRANS_TYPE_WIPE: + case TRANS_TYPE_WIPE_FAST: transitionCtx->init = TransitionWipe_Init; transitionCtx->destroy = TransitionWipe_Destroy; transitionCtx->start = TransitionWipe_Start; @@ -113,16 +115,16 @@ void func_800BC5E0(PlayState* play, s32 transitionType) { transitionCtx->setColor = TransitionWipe_SetColor; transitionCtx->setEnvColor = NULL; break; - case 2: - case 3: - case 4: - case 5: - case 6: - case 7: - case 13: - case 17: - case 18: - case 19: + case TRANS_TYPE_FADE_BLACK: + case TRANS_TYPE_FADE_WHITE: + case TRANS_TYPE_FADE_BLACK_FAST: + case TRANS_TYPE_FADE_WHITE_FAST: + case TRANS_TYPE_FADE_BLACK_SLOW: + case TRANS_TYPE_FADE_WHITE_SLOW: + case TRANS_TYPE_FADE_WHITE_CS_DELAYED: + case TRANS_TYPE_FADE_WHITE_INSTANT: + case TRANS_TYPE_FADE_GREEN: + case TRANS_TYPE_FADE_BLUE: transitionCtx->init = TransitionFade_Init; transitionCtx->destroy = TransitionFade_Destroy; transitionCtx->start = TransitionFade_Start; @@ -133,24 +135,24 @@ void func_800BC5E0(PlayState* play, s32 transitionType) { transitionCtx->setColor = TransitionFade_SetColor; transitionCtx->setEnvColor = NULL; break; - case 9: - case 10: - play->transitionMode = 4; + case TRANS_TYPE_FILL_WHITE2: + case TRANS_TYPE_FILL_WHITE: + play->transitionMode = TRANS_MODE_FILL_WHITE_INIT; break; - case 11: - play->transitionMode = 10; + case TRANS_TYPE_INSTANT: + play->transitionMode = TRANS_MODE_INSTANT; break; - case 12: - play->transitionMode = 7; + case TRANS_TYPE_FILL_BROWN: + play->transitionMode = TRANS_MODE_FILL_BROWN_INIT; break; - case 14: - play->transitionMode = 12; + case TRANS_TYPE_SANDSTORM_PERSIST: + play->transitionMode = TRANS_MODE_SANDSTORM_INIT; break; - case 15: - play->transitionMode = 14; + case TRANS_TYPE_SANDSTORM_END: + play->transitionMode = TRANS_MODE_SANDSTORM_END_INIT; break; - case 16: - play->transitionMode = 16; + case TRANS_TYPE_CS_BLACK_FILL: + play->transitionMode = TRANS_MODE_CS_BLACK_FILL_INIT; break; default: Fault_AddHungupAndCrash(__FILE__, __LINE__); @@ -199,10 +201,10 @@ void Play_Destroy(GameState* thisx) { gTrnsnUnkState = 0; } - if (play->transitionMode == 3) { + if (play->transitionMode == TRANS_MODE_INSTANCE_RUNNING) { play->transitionCtx.destroy(&play->transitionCtx.data); func_800BC88C(play); - play->transitionMode = 0; + play->transitionMode = TRANS_MODE_OFF; } ShrinkWindow_Destroy(); @@ -227,8 +229,8 @@ void Play_Destroy(GameState* thisx) { void GivePlayerRandoRewardSongOfTime(PlayState* play, RandomizerCheck check) { Player* player = GET_PLAYER(play); - if (gSaveContext.entranceIndex == 0x050F && player != NULL && !Player_InBlockingCsMode(play, player) && - !Flags_GetTreasure(play, 0x1F) && gSaveContext.nextTransitionType == 0xFF && !gSaveContext.pendingIceTrapCount) { + if (gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_16 && player != NULL && !Player_InBlockingCsMode(play, player) && + !Flags_GetTreasure(play, 0x1F) && gSaveContext.nextTransitionType == TRANS_NEXT_TYPE_DEFAULT && !gSaveContext.pendingIceTrapCount) { GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, RG_SONG_OF_TIME); GiveItemEntryWithoutActor(play, getItemEntry); player->pendingFlag.flagID = 0x1F; @@ -239,9 +241,9 @@ void GivePlayerRandoRewardSongOfTime(PlayState* play, RandomizerCheck check) { void GivePlayerRandoRewardNocturne(PlayState* play, RandomizerCheck check) { Player* player = GET_PLAYER(play); - if ((gSaveContext.entranceIndex == 0x00DB || - gSaveContext.entranceIndex == 0x0191 || - gSaveContext.entranceIndex == 0x0195) && LINK_IS_ADULT && CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST) && + if ((gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_0 || + gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_1 || + gSaveContext.entranceIndex == ENTR_KAKARIKO_VILLAGE_2) && LINK_IS_ADULT && CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST) && CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE) && CHECK_QUEST_ITEM(QUEST_MEDALLION_WATER) && player != NULL && !Player_InBlockingCsMode(play, player) && !Flags_GetEventChkInf(EVENTCHKINF_BONGO_BONGO_ESCAPED_FROM_WELL)) { GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, RG_NOCTURNE_OF_SHADOW); @@ -255,7 +257,7 @@ void GivePlayerRandoRewardRequiem(PlayState* play, RandomizerCheck check) { Player* player = GET_PLAYER(play); if ((gSaveContext.gameMode == 0) && (gSaveContext.respawnFlag <= 0) && (gSaveContext.cutsceneIndex < 0xFFF0)) { - if ((gSaveContext.entranceIndex == 0x01E1) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT) && player != NULL && + if ((gSaveContext.entranceIndex == ENTR_DESERT_COLOSSUS_1) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_REQUIEM_OF_SPIRIT) && player != NULL && !Player_InBlockingCsMode(play, player)) { GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, RG_SONG_OF_TIME); GiveItemEntryWithoutActor(play, getItemEntry); @@ -268,7 +270,7 @@ void GivePlayerRandoRewardRequiem(PlayState* play, RandomizerCheck check) { void GivePlayerRandoRewardMasterSword(PlayState* play, RandomizerCheck check) { Player* player = GET_PLAYER(play); - if (gSaveContext.entranceIndex == 0x02CA && LINK_IS_ADULT && player != NULL && + if (gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_2 && LINK_IS_ADULT && player != NULL && !Player_InBlockingCsMode(play, player) && Randomizer_GetSettingValue(RSK_SHUFFLE_MASTER_SWORD) && !Flags_GetRandomizerInf(RAND_INF_TOT_MASTER_SWORD)) { GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, RG_MASTER_SWORD); @@ -441,7 +443,7 @@ void GivePlayerRandoRewardZeldaLightArrowsGift(PlayState* play, RandomizerCheck if (meetsRequirements && LINK_IS_ADULT && (gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_TEMPLE_OF_TIME) && !Flags_GetTreasure(play, 0x1E) && player != NULL && !Player_InBlockingCsMode(play, player) && - play->sceneLoadFlag == 0) { + play->transitionTrigger == TRANS_TRIGGER_OFF) { GetItemEntry getItem = Randomizer_GetItemFromKnownCheck(check, GI_ARROW_LIGHT); if (GiveItemEntryWithoutActor(play, getItem)) { player->pendingFlag.flagID = 0x1E; @@ -452,7 +454,7 @@ void GivePlayerRandoRewardZeldaLightArrowsGift(PlayState* play, RandomizerCheck void GivePlayerRandoRewardSariaGift(PlayState* play, RandomizerCheck check) { Player* player = GET_PLAYER(play); - if (gSaveContext.entranceIndex == 0x05E0) { + if (gSaveContext.entranceIndex == ENTR_LOST_WOODS_9) { GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, RG_ZELDAS_LULLABY); if (!Flags_GetEventChkInf(EVENTCHKINF_SPOKE_TO_SARIA_ON_BRIDGE) && player != NULL && !Player_InBlockingCsMode(play, player)) { @@ -481,17 +483,23 @@ void Play_Init(GameState* thisx) { // Skip Child Stealth when option is enabled, Zelda's Letter isn't obtained and Impa's reward hasn't been received // eventChkInf[4] & 1 = Got Zelda's Letter // eventChkInf[5] & 0x200 = Got Impa's reward - // entranceIndex 0x7A, Castle Courtyard - Day from crawlspace - // entranceIndex 0x400, Zelda's Courtyard + // entranceIndex 0x7A, ENTR_CASTLE_COURTYARD_GUARDS_DAY_0, Castle Courtyard - Day from crawlspace + // entranceIndex 0x400, ENTR_CASTLE_COURTYARD_ZELDA_0, Zelda's Courtyard if (IS_RANDO && Randomizer_GetSettingValue(RSK_SKIP_CHILD_STEALTH) && !Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER) && !Flags_GetEventChkInf(EVENTCHKINF_LEARNED_ZELDAS_LULLABY)) { - if (gSaveContext.entranceIndex == 0x7A) { - gSaveContext.entranceIndex = 0x400; + if (gSaveContext.entranceIndex == ENTR_CASTLE_COURTYARD_GUARDS_DAY_0) { + gSaveContext.entranceIndex = ENTR_CASTLE_COURTYARD_ZELDA_0; } } + // Properly initialize the frame counter so it doesn't use garbage data + if (!firstInit) { + play->gameplayFrames = 0; + firstInit = 1; + } + // Invalid entrance, so immediately exit the game to opening title - if (gSaveContext.entranceIndex == -1) { + if (gSaveContext.entranceIndex == ENTR_LOAD_OPENING) { gSaveContext.entranceIndex = 0; play->state.running = false; SET_NEXT_GAMESTATE(&play->state, Opening_Init, OpeningContext); @@ -617,12 +625,12 @@ void Play_Init(GameState* thisx) { PreRender_SetValuesSave(&play->pauseBgPreRender, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0, 0); PreRender_SetValues(&play->pauseBgPreRender, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); gTrnsnUnkState = 0; - play->transitionMode = 0; + play->transitionMode = TRANS_MODE_OFF; if (CVarGetInteger("gSceneTransitions", 255)!= 255){ play->transitionMode = CVarGetInteger("gSceneTransitions", 0); gSaveContext.nextTransitionType = CVarGetInteger("gSceneTransitions", 0); - play->fadeTransition = CVarGetInteger("gSceneTransitions", 0); + play->transitionType = CVarGetInteger("gSceneTransitions", 0); } FrameAdvance_Init(&play->frameAdvCtx); @@ -630,21 +638,21 @@ void Play_Init(GameState* thisx) { Matrix_Init(&play->state); play->state.main = Play_Main; play->state.destroy = Play_Destroy; - play->sceneLoadFlag = -0x14; + play->transitionTrigger = TRANS_TRIGGER_END; play->unk_11E16 = 0xFF; play->unk_11E18 = 0; play->unk_11DE9 = 0; if (gSaveContext.gameMode != 1) { - if (gSaveContext.nextTransitionType == 0xFF) { - play->fadeTransition = - (gEntranceTable[((void)0, gSaveContext.entranceIndex) + tempSetupIndex].field >> 7) & 0x7F; // Fade In + if (gSaveContext.nextTransitionType == TRANS_NEXT_TYPE_DEFAULT) { + play->transitionType = ENTRANCE_INFO_END_TRANS_TYPE( + gEntranceTable[((void)0, gSaveContext.entranceIndex) + tempSetupIndex].field); // Fade In } else { - play->fadeTransition = gSaveContext.nextTransitionType; - gSaveContext.nextTransitionType = 0xFF; + play->transitionType = gSaveContext.nextTransitionType; + gSaveContext.nextTransitionType = TRANS_NEXT_TYPE_DEFAULT; } } else { - play->fadeTransition = 6; + play->transitionType = TRANS_TYPE_FADE_BLACK_SLOW; } ShrinkWindow_Init(); @@ -801,8 +809,8 @@ void Play_Update(PlayState* play) { gSegments[2] = VIRTUAL_TO_PHYSICAL(play->sceneSegment); if (FrameAdvance_Update(&play->frameAdvCtx, &input[1])) { - if ((play->transitionMode == 0) && (play->sceneLoadFlag != 0)) { - play->transitionMode = 1; + if ((play->transitionMode == TRANS_MODE_OFF) && (play->transitionTrigger != TRANS_TRIGGER_OFF)) { + play->transitionMode = TRANS_MODE_SETUP; } // Gameplay stats: Count button presses @@ -851,8 +859,8 @@ void Play_Update(PlayState* play) { if (play->transitionMode) { switch (play->transitionMode) { - case 1: - if (play->sceneLoadFlag != -0x14) { + case TRANS_MODE_SETUP: + if (play->transitionTrigger != TRANS_TRIGGER_END) { s16 sp6E = 0; Interface_ChangeAlpha(1); @@ -860,10 +868,10 @@ void Play_Update(PlayState* play) { sp6E = (gSaveContext.cutsceneIndex & 0xF) + 4; } - if (!(gEntranceTable[play->nextEntranceIndex + sp6E].field & 0x8000)) { // Continue BGM Off + if (!(gEntranceTable[play->nextEntranceIndex + sp6E].field & ENTRANCE_INFO_CONTINUE_BGM_FLAG)) { // Continue BGM Off // "Sound initalized. 111" osSyncPrintf("\n\n\nサウンドイニシャル来ました。111"); - if ((play->fadeTransition < 56) && !Environment_IsForcedSequenceDisabled()) { + if ((play->transitionType < TRANS_TYPE_MAX) && !Environment_IsForcedSequenceDisabled()) { // "Sound initalized. 222" osSyncPrintf("\n\n\nサウンドイニシャル来ました。222"); func_800F6964(0x14); @@ -873,58 +881,59 @@ void Play_Update(PlayState* play) { } } - if (CREG(11) == 0) { - func_800BC5E0(play, play->fadeTransition); + if (!R_TRANS_DBG_ENABLED) { + Gameplay_SetupTransition(play, play->transitionType); } else { - func_800BC5E0(play, CREG(12)); + Gameplay_SetupTransition(play, R_TRANS_DBG_TYPE); } - if (play->transitionMode >= 4) { + if (play->transitionMode >= TRANS_MODE_FILL_WHITE_INIT) { break; } - case 2: + case TRANS_MODE_INSTANCE_INIT: play->transitionCtx.init(&play->transitionCtx.data); + // Circle Transition Types if ((play->transitionCtx.transitionType >> 5) == 1) { play->transitionCtx.setType(&play->transitionCtx.data, - play->transitionCtx.transitionType | 0x80); + play->transitionCtx.transitionType | TC_SET_PARAMS); } gSaveContext.transWipeSpeed = 14; - if ((play->transitionCtx.transitionType == 8) || - (play->transitionCtx.transitionType == 9)) { + if ((play->transitionCtx.transitionType == TRANS_TYPE_WIPE_FAST) || + (play->transitionCtx.transitionType == TRANS_TYPE_FILL_WHITE2)) { gSaveContext.transWipeSpeed = 28; } gSaveContext.transFadeDuration = 60; - if ((play->transitionCtx.transitionType == 4) || - (play->transitionCtx.transitionType == 5)) { + if ((play->transitionCtx.transitionType == TRANS_TYPE_FADE_BLACK_FAST) || + (play->transitionCtx.transitionType == TRANS_TYPE_FADE_WHITE_FAST)) { gSaveContext.transFadeDuration = 20; - } else if ((play->transitionCtx.transitionType == 6) || - (play->transitionCtx.transitionType == 7)) { + } else if ((play->transitionCtx.transitionType == TRANS_TYPE_FADE_BLACK_SLOW) || + (play->transitionCtx.transitionType == TRANS_TYPE_FADE_WHITE_SLOW)) { gSaveContext.transFadeDuration = 150; - } else if (play->transitionCtx.transitionType == 17) { + } else if (play->transitionCtx.transitionType == TRANS_TYPE_FADE_WHITE_INSTANT) { gSaveContext.transFadeDuration = 2; } - if ((play->transitionCtx.transitionType == 3) || - (play->transitionCtx.transitionType == 5) || - (play->transitionCtx.transitionType == 7) || - (play->transitionCtx.transitionType == 13) || - (play->transitionCtx.transitionType == 17)) { + if ((play->transitionCtx.transitionType == TRANS_TYPE_FADE_WHITE) || + (play->transitionCtx.transitionType == TRANS_TYPE_FADE_WHITE_FAST) || + (play->transitionCtx.transitionType == TRANS_TYPE_FADE_WHITE_SLOW) || + (play->transitionCtx.transitionType == TRANS_TYPE_FADE_WHITE_CS_DELAYED) || + (play->transitionCtx.transitionType == TRANS_TYPE_FADE_WHITE_INSTANT)) { play->transitionCtx.setColor(&play->transitionCtx.data, RGBA8(160, 160, 160, 255)); if (play->transitionCtx.setEnvColor != NULL) { play->transitionCtx.setEnvColor(&play->transitionCtx.data, RGBA8(160, 160, 160, 255)); } - } else if (play->transitionCtx.transitionType == 18) { + } else if (play->transitionCtx.transitionType == TRANS_TYPE_FADE_GREEN) { play->transitionCtx.setColor(&play->transitionCtx.data, RGBA8(140, 140, 100, 255)); if (play->transitionCtx.setEnvColor != NULL) { play->transitionCtx.setEnvColor(&play->transitionCtx.data, RGBA8(140, 140, 100, 255)); } - } else if (play->transitionCtx.transitionType == 19) { + } else if (play->transitionCtx.transitionType == TRANS_TYPE_FADE_BLUE) { play->transitionCtx.setColor(&play->transitionCtx.data, RGBA8(70, 100, 110, 255)); if (play->transitionCtx.setEnvColor != NULL) { play->transitionCtx.setEnvColor(&play->transitionCtx.data, @@ -937,7 +946,7 @@ void Play_Update(PlayState* play) { } } - if (play->sceneLoadFlag == -0x14) { + if (play->transitionTrigger == TRANS_TRIGGER_END) { play->transitionCtx.setType(&play->transitionCtx.data, 1); } else { play->transitionCtx.setType(&play->transitionCtx.data, 2); @@ -945,22 +954,22 @@ void Play_Update(PlayState* play) { play->transitionCtx.start(&play->transitionCtx); - if (play->transitionCtx.transitionType == 13) { - play->transitionMode = 11; + if (play->transitionCtx.transitionType == TRANS_TYPE_FADE_WHITE_CS_DELAYED) { + play->transitionMode = TRANS_MODE_INSTANCE_WAIT; } else { - play->transitionMode = 3; + play->transitionMode = TRANS_MODE_INSTANCE_RUNNING; } break; - case 3: + case TRANS_MODE_INSTANCE_RUNNING: if (play->transitionCtx.isDone(&play->transitionCtx) != 0) { - if (play->transitionCtx.transitionType >= 56) { - if (play->sceneLoadFlag == -0x14) { + if (play->transitionCtx.transitionType >= TRANS_TYPE_MAX) { + if (play->transitionTrigger == TRANS_TRIGGER_END) { play->transitionCtx.destroy(&play->transitionCtx); func_800BC88C(play); - play->transitionMode = 0; + play->transitionMode = TRANS_MODE_OFF; } - } else if (play->sceneLoadFlag != -0x14) { + } else if (play->transitionTrigger != TRANS_TRIGGER_END) { play->state.running = 0; if (gSaveContext.gameMode != 2) { SET_NEXT_GAMESTATE(&play->state, Play_Init, PlayState); @@ -974,7 +983,7 @@ void Play_Update(PlayState* play) { } else { play->transitionCtx.destroy(&play->transitionCtx); func_800BC88C(play); - play->transitionMode = 0; + play->transitionMode = TRANS_MODE_OFF; if (gTrnsnUnkState == 3) { TransitionUnk_Destroy(&sTrnsnUnk); gTrnsnUnkState = 0; @@ -984,7 +993,7 @@ void Play_Update(PlayState* play) { // Transition end for standard transitions GameInteractor_ExecuteOnTransitionEndHooks(play->sceneNum); } - play->sceneLoadFlag = 0; + play->transitionTrigger = TRANS_TRIGGER_OFF; } else { play->transitionCtx.update(&play->transitionCtx.data, R_UPDATE_RATE); } @@ -992,104 +1001,104 @@ void Play_Update(PlayState* play) { } switch (play->transitionMode) { - case 4: + case TRANS_MODE_FILL_WHITE_INIT: D_801614C8 = 0; play->envCtx.fillScreen = true; play->envCtx.screenFillColor[0] = 160; play->envCtx.screenFillColor[1] = 160; play->envCtx.screenFillColor[2] = 160; - if (play->sceneLoadFlag != -0x14) { + if (play->transitionTrigger != TRANS_TRIGGER_END) { play->envCtx.screenFillColor[3] = 0; - play->transitionMode = 5; + play->transitionMode = TRANS_MODE_FILL_IN; } else { play->envCtx.screenFillColor[3] = 255; - play->transitionMode = 6; + play->transitionMode = TRANS_MODE_FILL_OUT; } break; - case 5: + case TRANS_MODE_FILL_IN: play->envCtx.screenFillColor[3] = (D_801614C8 / 20.0f) * 255.0f; if (D_801614C8 >= 20 && 1) { play->state.running = 0; SET_NEXT_GAMESTATE(&play->state, Play_Init, PlayState); gSaveContext.entranceIndex = play->nextEntranceIndex; - play->sceneLoadFlag = 0; - play->transitionMode = 0; + play->transitionTrigger = TRANS_TRIGGER_OFF; + play->transitionMode = TRANS_MODE_OFF; } else { D_801614C8++; } break; - case 6: + case TRANS_MODE_FILL_OUT: play->envCtx.screenFillColor[3] = (1 - D_801614C8 / 20.0f) * 255.0f; if (D_801614C8 >= 20 && 1) { gTrnsnUnkState = 0; R_UPDATE_RATE = 3; - play->sceneLoadFlag = 0; - play->transitionMode = 0; + play->transitionTrigger = TRANS_TRIGGER_OFF; + play->transitionMode = TRANS_MODE_OFF; play->envCtx.fillScreen = false; } else { D_801614C8++; } break; - case 7: + case TRANS_MODE_FILL_BROWN_INIT: D_801614C8 = 0; play->envCtx.fillScreen = true; play->envCtx.screenFillColor[0] = 170; play->envCtx.screenFillColor[1] = 160; play->envCtx.screenFillColor[2] = 150; - if (play->sceneLoadFlag != -0x14) { + if (play->transitionTrigger != TRANS_TRIGGER_END) { play->envCtx.screenFillColor[3] = 0; - play->transitionMode = 5; + play->transitionMode = TRANS_MODE_FILL_IN; } else { play->envCtx.screenFillColor[3] = 255; - play->transitionMode = 6; + play->transitionMode = TRANS_MODE_FILL_OUT; } break; - case 10: - if (play->sceneLoadFlag != -0x14) { + case TRANS_MODE_INSTANT: + if (play->transitionTrigger != TRANS_TRIGGER_END) { play->state.running = 0; SET_NEXT_GAMESTATE(&play->state, Play_Init, PlayState); gSaveContext.entranceIndex = play->nextEntranceIndex; - play->sceneLoadFlag = 0; - play->transitionMode = 0; + play->transitionTrigger = TRANS_TRIGGER_OFF; + play->transitionMode = TRANS_MODE_OFF; } else { gTrnsnUnkState = 0; R_UPDATE_RATE = 3; - play->sceneLoadFlag = 0; - play->transitionMode = 0; + play->transitionTrigger = TRANS_TRIGGER_OFF; + play->transitionMode = TRANS_MODE_OFF; } break; - case 11: + case TRANS_MODE_INSTANCE_WAIT: if (gSaveContext.cutsceneTransitionControl != 0) { - play->transitionMode = 3; + play->transitionMode = TRANS_MODE_INSTANCE_RUNNING; } break; - case 12: - if (play->sceneLoadFlag != -0x14) { - play->envCtx.sandstormState = 1; - play->transitionMode = 13; + case TRANS_MODE_SANDSTORM_INIT: + if (play->transitionTrigger != TRANS_TRIGGER_END) { + play->envCtx.sandstormState = SANDSTORM_FILL; + play->transitionMode = TRANS_MODE_SANDSTORM; } else { - play->envCtx.sandstormState = 2; + play->envCtx.sandstormState = SANDSTORM_UNFILL; play->envCtx.sandstormPrimA = 255; play->envCtx.sandstormEnvA = 255; - play->transitionMode = 13; + play->transitionMode = TRANS_MODE_SANDSTORM; } break; - case 13: + case TRANS_MODE_SANDSTORM: Audio_PlaySoundGeneral(NA_SE_EV_SAND_STORM - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); - if (play->sceneLoadFlag == -0x14) { + if (play->transitionTrigger == TRANS_TRIGGER_END) { if (play->envCtx.sandstormPrimA < 110) { gTrnsnUnkState = 0; R_UPDATE_RATE = 3; - play->sceneLoadFlag = 0; - play->transitionMode = 0; + play->transitionTrigger = TRANS_TRIGGER_OFF; + play->transitionMode = TRANS_MODE_OFF; // Transition end for sandstorm effect (delayed until effect is finished) GameInteractor_ExecuteOnTransitionEndHooks(play->sceneNum); @@ -1099,34 +1108,34 @@ void Play_Update(PlayState* play) { play->state.running = 0; SET_NEXT_GAMESTATE(&play->state, Play_Init, PlayState); gSaveContext.entranceIndex = play->nextEntranceIndex; - play->sceneLoadFlag = 0; - play->transitionMode = 0; + play->transitionTrigger = TRANS_TRIGGER_OFF; + play->transitionMode = TRANS_MODE_OFF; } } break; - case 14: - if (play->sceneLoadFlag == -0x14) { - play->envCtx.sandstormState = 4; + case TRANS_MODE_SANDSTORM_END_INIT: + if (play->transitionTrigger == TRANS_TRIGGER_END) { + play->envCtx.sandstormState = SANDSTORM_DISSIPATE; play->envCtx.sandstormPrimA = 255; play->envCtx.sandstormEnvA = 255; // "It's here!!!!!!!!!" LOG_STRING("来た!!!!!!!!!!!!!!!!!!!!!"); - play->transitionMode = 15; + play->transitionMode = TRANS_MODE_SANDSTORM_END; } else { - play->transitionMode = 12; + play->transitionMode = TRANS_MODE_SANDSTORM_INIT; } break; - case 15: + case TRANS_MODE_SANDSTORM_END: Audio_PlaySoundGeneral(NA_SE_EV_SAND_STORM - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); - if (play->sceneLoadFlag == -0x14) { + if (play->transitionTrigger == TRANS_TRIGGER_END) { if (play->envCtx.sandstormPrimA <= 0) { gTrnsnUnkState = 0; R_UPDATE_RATE = 3; - play->sceneLoadFlag = 0; - play->transitionMode = 0; + play->transitionTrigger = TRANS_TRIGGER_OFF; + play->transitionMode = TRANS_MODE_OFF; // Transition end for sandstorm effect (delayed until effect is finished) GameInteractor_ExecuteOnTransitionEndHooks(play->sceneNum); @@ -1134,24 +1143,24 @@ void Play_Update(PlayState* play) { } break; - case 16: + case TRANS_MODE_CS_BLACK_FILL_INIT: D_801614C8 = 0; play->envCtx.fillScreen = true; play->envCtx.screenFillColor[0] = 0; play->envCtx.screenFillColor[1] = 0; play->envCtx.screenFillColor[2] = 0; play->envCtx.screenFillColor[3] = 255; - play->transitionMode = 17; + play->transitionMode = TRANS_MODE_CS_BLACK_FILL; break; - case 17: + case TRANS_MODE_CS_BLACK_FILL: if (gSaveContext.cutsceneTransitionControl != 0) { play->envCtx.screenFillColor[3] = gSaveContext.cutsceneTransitionControl; if (gSaveContext.cutsceneTransitionControl < 0x65) { gTrnsnUnkState = 0; R_UPDATE_RATE = 3; - play->sceneLoadFlag = 0; - play->transitionMode = 0; + play->transitionTrigger = TRANS_TRIGGER_OFF; + play->transitionMode = TRANS_MODE_OFF; } } break; @@ -1202,7 +1211,7 @@ void Play_Update(PlayState* play) { play->gameplayFrames++; // Gameplay stat tracking if (!gSaveContext.sohStats.gameComplete && - (!IS_BOSS_RUSH || (IS_BOSS_RUSH && !gSaveContext.isBossRushPaused))) { + (!IS_BOSS_RUSH || !gSaveContext.isBossRushPaused)) { gSaveContext.sohStats.playTimer++; gSaveContext.sohStats.sceneTimer++; gSaveContext.sohStats.roomTimer++; @@ -1539,8 +1548,8 @@ void Play_Draw(PlayState* play) { gSPDisplayList(OVERLAY_DISP++, gfxP); gSPGrayscale(gfxP++, false); - if ((play->transitionMode == 3) || (play->transitionMode == 11) || - (play->transitionCtx.transitionType >= 56)) { + if ((play->transitionMode == TRANS_MODE_INSTANCE_RUNNING) || (play->transitionMode == TRANS_MODE_INSTANCE_WAIT) || + (play->transitionCtx.transitionType >= TRANS_TYPE_MAX)) { View view; View_Init(&view, gfxCtx); @@ -1702,7 +1711,7 @@ void Play_Draw(PlayState* play) { } if ((HREG(80) != 10) || (HREG(88) != 0)) { - if (play->envCtx.sandstormState != 0) { + if (play->envCtx.sandstormState != SANDSTORM_OFF) { Environment_DrawSandstorm(play, play->envCtx.sandstormState); } } @@ -2246,27 +2255,27 @@ void Play_TriggerVoidOut(PlayState* play) { gSaveContext.respawn[RESPAWN_MODE_DOWN].tempSwchFlags = play->actorCtx.flags.tempSwch; gSaveContext.respawn[RESPAWN_MODE_DOWN].tempCollectFlags = play->actorCtx.flags.tempCollect; gSaveContext.respawnFlag = 1; - play->sceneLoadFlag = 0x14; + play->transitionTrigger = TRANS_TRIGGER_START; play->nextEntranceIndex = gSaveContext.respawn[RESPAWN_MODE_DOWN].entranceIndex; - play->fadeTransition = 2; + play->transitionType = TRANS_TYPE_FADE_BLACK; } void Play_LoadToLastEntrance(PlayState* play) { gSaveContext.respawnFlag = -1; - play->sceneLoadFlag = 0x14; + play->transitionTrigger = TRANS_TRIGGER_START; if ((play->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_INTERIOR) || (play->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR) || (play->sceneNum == SCENE_INSIDE_GANONS_CASTLE_COLLAPSE) || (play->sceneNum == SCENE_GANON_BOSS)) { - play->nextEntranceIndex = 0x043F; + play->nextEntranceIndex = ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_0; Item_Give(play, ITEM_SWORD_MASTER); - } else if ((gSaveContext.entranceIndex == 0x028A) || (gSaveContext.entranceIndex == 0x028E) || - (gSaveContext.entranceIndex == 0x0292) || (gSaveContext.entranceIndex == 0x0476)) { - play->nextEntranceIndex = 0x01F9; + } else if ((gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_11) || (gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_12) || + (gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_13) || (gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_15)) { + play->nextEntranceIndex = ENTR_HYRULE_FIELD_6; } else { play->nextEntranceIndex = gSaveContext.entranceIndex; } - play->fadeTransition = 2; + play->transitionType = TRANS_TYPE_FADE_BLACK; } void Play_TriggerRespawn(PlayState* play) { @@ -2329,8 +2338,28 @@ void Play_PerformSave(PlayState* play) { if (play != NULL && gSaveContext.fileNum != 0xFF) { Play_SaveSceneFlags(play); gSaveContext.savedSceneNum = play->sceneNum; + + // Track values from temp B + uint8_t prevB = gSaveContext.equips.buttonItems[0]; + uint8_t prevStatus = gSaveContext.buttonStatus[0]; + + // Replicate the B button restore from minigames/epona that kaleido does + if (gSaveContext.equips.buttonItems[0] == ITEM_SLINGSHOT || + gSaveContext.equips.buttonItems[0] == ITEM_BOW || + gSaveContext.equips.buttonItems[0] == ITEM_BOMBCHU || + gSaveContext.equips.buttonItems[0] == ITEM_FISHING_POLE || + (gSaveContext.equips.buttonItems[0] == ITEM_NONE && !Flags_GetInfTable(INFTABLE_SWORDLESS))) { + + gSaveContext.equips.buttonItems[0] = gSaveContext.buttonStatus[0]; + Interface_RandoRestoreSwordless(); + } + Save_SaveFile(); + // Restore temp B values back + gSaveContext.equips.buttonItems[0] = prevB; + gSaveContext.buttonStatus[0] = prevStatus; + uint8_t triforceHuntCompleted = IS_RANDO && gSaveContext.triforcePiecesCollected == Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED) && diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c index 820f2c672..b9a66c90e 100644 --- a/soh/src/code/z_player_lib.c +++ b/soh/src/code/z_player_lib.c @@ -573,7 +573,7 @@ uint8_t Player_IsCustomLinkModel() { } s32 Player_InBlockingCsMode(PlayState* play, Player* this) { - return (this->stateFlags1 & 0x20000080) || (this->csMode != 0) || (play->sceneLoadFlag == 0x14) || + return (this->stateFlags1 & 0x20000080) || (this->csAction != 0) || (play->transitionTrigger == TRANS_TRIGGER_START) || (this->stateFlags1 & 1) || (this->stateFlags3 & 0x80) || ((gSaveContext.magicState != MAGIC_STATE_IDLE) && (Player_ActionToMagicSpell(this, this->itemAction) >= 0)); } @@ -668,7 +668,7 @@ void func_8008EC70(Player* this) { } void Player_SetEquipmentData(PlayState* play, Player* this) { - if (this->csMode != 0x56) { + if (this->csAction != 0x56) { this->currentShield = SHIELD_EQUIP_TO_PLAYER(CUR_EQUIP_VALUE(EQUIP_TYPE_SHIELD)); this->currentTunic = TUNIC_EQUIP_TO_PLAYER(CUR_EQUIP_VALUE(EQUIP_TYPE_TUNIC)); this->currentBoots = BOOTS_EQUIP_TO_PLAYER(CUR_EQUIP_VALUE(EQUIP_TYPE_BOOTS)); @@ -743,6 +743,10 @@ s32 Player_IsBurningStickInRange(PlayState* play, Vec3f* pos, f32 xzRange, f32 y s32 Player_GetStrength(void) { s32 strengthUpgrade = CUR_UPG_VALUE(UPG_STRENGTH); + if (CVarGetInteger("gToggleStrength", 0) && CVarGetInteger("gStrengthDisabled", 0)) { + return PLAYER_STR_NONE; + } + if (CVarGetInteger("gTimelessEquipment", 0) || LINK_IS_ADULT) { return strengthUpgrade; } else if (strengthUpgrade != 0) { @@ -889,8 +893,8 @@ s32 Player_GetEnvironmentalHazard(PlayState* play) { if (play->roomCtx.curRoom.behaviorType2 == ROOM_BEHAVIOR_TYPE2_3) { // Room is hot var = 0; - } else if ((this->unk_840 > 80) && - ((this->currentBoots == PLAYER_BOOTS_IRON) || (this->unk_840 >= 300))) { // Deep underwater + } else if ((this->underwaterTimer > 80) && + ((this->currentBoots == PLAYER_BOOTS_IRON) || (this->underwaterTimer >= 300))) { // Deep underwater var = ((this->currentBoots == PLAYER_BOOTS_IRON) && (this->actor.bgCheckFlags & 1)) ? 1 : 3; } else if (this->stateFlags1 & 0x8000000) { // Swimming var = 2; diff --git a/soh/src/code/z_room.c b/soh/src/code/z_room.c index ccbc93d0d..772978f09 100644 --- a/soh/src/code/z_room.c +++ b/soh/src/code/z_room.c @@ -277,6 +277,11 @@ void func_8009638C(Gfx** displayList, void* source, void* tlut, u16 width, u16 h bg->b.imagePal = 0; bg->b.imageFlip = CVarGetInteger("gMirroredWorld", 0) ? G_BG_FLAG_FLIPS : 0; + // When an alt resource exists for the background, we need to unload the original asset + // to clear the cache so the alt asset will be loaded instead + // OTRTODO: If Alt loading over original cache is fixed, this line can most likely be removed + ResourceMgr_UnloadOriginalWhenAltExists((char*) source); + if (ResourceMgr_ResourceIsBackground((char*) source)) { char* blob = (char*) ResourceGetDataByName((char *) source); swapAndConvertJPEG(blob); diff --git a/soh/src/code/z_scene.c b/soh/src/code/z_scene.c index 2a0a5d5d7..1702dc3d9 100644 --- a/soh/src/code/z_scene.c +++ b/soh/src/code/z_scene.c @@ -360,7 +360,7 @@ void Scene_CommandTimeSettings(PlayState* play, SceneCmd* cmd) { play->envCtx.sunPos.z = (Math_CosS(((void)0, gSaveContext.dayTime) - 0x8000) * 20.0f) * 25.0f; if (((play->envCtx.timeIncrement == 0) && (gSaveContext.cutsceneIndex < 0xFFF0)) || - (gSaveContext.entranceIndex == 0x0604)) { + (gSaveContext.entranceIndex == ENTR_LAKE_HYLIA_8)) { gSaveContext.skyboxTime = ((void)0, gSaveContext.dayTime); if ((gSaveContext.skyboxTime >= 0x2AAC) && (gSaveContext.skyboxTime < 0x4555)) { gSaveContext.skyboxTime = 0x3556; diff --git a/soh/src/code/z_scene_table.c b/soh/src/code/z_scene_table.c index d1065533c..9cb9a31d7 100644 --- a/soh/src/code/z_scene_table.c +++ b/soh/src/code/z_scene_table.c @@ -26,793 +26,20 @@ #include "soh/mq_asset_hacks.h" #include "soh/Enhancements/randomizer/adult_trade_shuffle.h" -#define ENTRANCE(scene, spawn, continueBgm, displayTitleCard, fadeIn, fadeOut) \ - { \ - scene, spawn, \ - ((continueBgm & 1) << 15) | ((displayTitleCard & 1) << 14) | ((fadeIn & 0x7F) << 7) | (fadeOut & 0x7F) \ - } +// Entrance Table definition +#define DEFINE_ENTRANCE(_0, sceneId, spawn, continueBgm, displayTitleCard, endTransType, startTransType) \ + { sceneId, spawn, \ + (((continueBgm) ? ENTRANCE_INFO_CONTINUE_BGM_FLAG : 0) | \ + ((displayTitleCard) ? ENTRANCE_INFO_DISPLAY_TITLE_CARD_FLAG : 0) | \ + (((endTransType) << ENTRANCE_INFO_END_TRANS_TYPE_SHIFT) & ENTRANCE_INFO_END_TRANS_TYPE_MASK) | \ + (((startTransType) << ENTRANCE_INFO_START_TRANS_TYPE_SHIFT) & ENTRANCE_INFO_START_TRANS_TYPE_MASK)) }, EntranceInfo gEntranceTable[] = { - ENTRANCE(0x00, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x00, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x00, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x00, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x01, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x01, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x01, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x01, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x0B, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x0B, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x0B, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x0B, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x14, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x14, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x14, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x14, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x05, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x05, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x05, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x05, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x6E, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x6E, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x6E, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x6E, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x6C, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x6C, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x6C, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x6C, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x68, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x68, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x68, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x68, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x69, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x69, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x69, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x69, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x6D, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x6D, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x6D, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x6D, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x02, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x02, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x02, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x02, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x02, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x41, 0x00, 0, 1, 0x02, 0x26), - ENTRANCE(0x41, 0x00, 0, 1, 0x02, 0x26), ENTRANCE(0x41, 0x00, 0, 1, 0x02, 0x26), - ENTRANCE(0x41, 0x00, 0, 1, 0x02, 0x26), ENTRANCE(0x41, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x41, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x1B, 0x00, 1, 1, 0x03, 0x03), - ENTRANCE(0x1C, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x1D, 0x00, 1, 1, 0x03, 0x03), - ENTRANCE(0x1D, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x07, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x07, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x07, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x07, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x42, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x42, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x42, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x42, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x3E, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x38, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x38, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x38, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x38, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x6A, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x6A, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x6A, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x6A, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x40, 0x00, 0, 1, 0x02, 0x26), - ENTRANCE(0x40, 0x00, 0, 1, 0x02, 0x26), ENTRANCE(0x40, 0x00, 0, 1, 0x02, 0x26), - ENTRANCE(0x40, 0x00, 0, 1, 0x02, 0x26), ENTRANCE(0x4C, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x4C, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x4C, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x4C, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x43, 0x00, 0, 1, 0x0B, 0x0B), ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x43, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x10, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x10, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x10, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x10, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x1E, 0x03, 1, 1, 0x03, 0x03), - ENTRANCE(0x1F, 0x03, 1, 1, 0x02, 0x02), ENTRANCE(0x1E, 0x03, 1, 1, 0x02, 0x02), - ENTRANCE(0x1F, 0x03, 1, 1, 0x02, 0x02), ENTRANCE(0x44, 0x00, 0, 1, 0x07, 0x07), - ENTRANCE(0x44, 0x00, 0, 1, 0x07, 0x07), ENTRANCE(0x44, 0x00, 0, 1, 0x07, 0x07), - ENTRANCE(0x44, 0x00, 0, 1, 0x07, 0x07), ENTRANCE(0x44, 0x00, 0, 1, 0x0D, 0x02), - ENTRANCE(0x44, 0x00, 0, 1, 0x0D, 0x02), ENTRANCE(0x44, 0x00, 0, 1, 0x03, 0x03), - ENTRANCE(0x4E, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x4E, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x4E, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x4E, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x6B, 0x00, 0, 1, 0x22, 0x22), ENTRANCE(0x6B, 0x00, 0, 1, 0x22, 0x22), - ENTRANCE(0x6B, 0x00, 0, 1, 0x22, 0x22), ENTRANCE(0x6B, 0x00, 0, 1, 0x22, 0x22), - ENTRANCE(0x45, 0x00, 0, 1, 0x22, 0x04), ENTRANCE(0x46, 0x00, 0, 1, 0x22, 0x04), - ENTRANCE(0x45, 0x00, 0, 1, 0x22, 0x04), ENTRANCE(0x46, 0x00, 0, 1, 0x22, 0x04), - ENTRANCE(0x4D, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x4D, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x4D, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x4D, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x06, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x06, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x06, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x06, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x06, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x06, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x09, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x09, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x09, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x09, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x09, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x17, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x17, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x17, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x17, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x17, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x17, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x17, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x65, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x65, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x65, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x65, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x08, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x08, 0x00, 0, 1, 0x04, 0x04), - ENTRANCE(0x08, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x08, 0x00, 0, 1, 0x04, 0x04), - ENTRANCE(0x27, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x27, 0x00, 0, 1, 0x04, 0x04), - ENTRANCE(0x27, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x27, 0x00, 0, 1, 0x04, 0x04), - ENTRANCE(0x47, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x47, 0x00, 0, 1, 0x03, 0x03), - ENTRANCE(0x47, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x47, 0x00, 0, 1, 0x03, 0x03), - ENTRANCE(0x47, 0x00, 0, 1, 0x0A, 0x0A), ENTRANCE(0x47, 0x00, 0, 1, 0x02, 0x0A), - ENTRANCE(0x47, 0x00, 1, 1, 0x0A, 0x0A), ENTRANCE(0x47, 0x00, 0, 1, 0x0B, 0x0B), - ENTRANCE(0x47, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x47, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x47, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x47, 0x00, 0, 1, 0x03, 0x03), - ENTRANCE(0x47, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x1E, 0x00, 1, 1, 0x03, 0x03), - ENTRANCE(0x1F, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x1E, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x1F, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x20, 0x00, 1, 1, 0x03, 0x03), - ENTRANCE(0x21, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x22, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x22, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x20, 0x00, 0, 1, 0x08, 0x08), - ENTRANCE(0x67, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x2C, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x2C, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x2C, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x2C, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x34, 0x00, 0, 1, 0x04, 0x04), - ENTRANCE(0x34, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x34, 0x00, 0, 1, 0x04, 0x04), - ENTRANCE(0x34, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x34, 0x00, 0, 1, 0x04, 0x02), - ENTRANCE(0x34, 0x00, 0, 1, 0x10, 0x10), ENTRANCE(0x2D, 0x00, 0, 1, 0x04, 0x04), - ENTRANCE(0x2D, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x2D, 0x00, 0, 1, 0x04, 0x04), - ENTRANCE(0x2D, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x01, 0x01, 1, 0, 0x02, 0x02), - ENTRANCE(0x01, 0x01, 1, 0, 0x02, 0x02), ENTRANCE(0x01, 0x01, 1, 0, 0x02, 0x02), - ENTRANCE(0x01, 0x01, 1, 0, 0x02, 0x02), ENTRANCE(0x26, 0x00, 0, 1, 0x04, 0x04), - ENTRANCE(0x26, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x26, 0x00, 0, 1, 0x04, 0x04), - ENTRANCE(0x26, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x51, 0x00, 0, 1, 0x03, 0x03), - ENTRANCE(0x51, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x51, 0x00, 0, 1, 0x03, 0x03), - ENTRANCE(0x51, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x51, 0x00, 0, 1, 0x04, 0x02), - ENTRANCE(0x51, 0x00, 0, 1, 0x21, 0x21), ENTRANCE(0x51, 0x00, 0, 1, 0x21, 0x21), - ENTRANCE(0x51, 0x00, 0, 1, 0x23, 0x23), ENTRANCE(0x51, 0x00, 0, 1, 0x03, 0x03), - ENTRANCE(0x51, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x51, 0x00, 0, 1, 0x23, 0x23), - ENTRANCE(0x51, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x51, 0x00, 0, 1, 0x29, 0x29), - ENTRANCE(0x51, 0x00, 1, 1, 0x03, 0x03), ENTRANCE(0x52, 0x00, 0, 1, 0x03, 0x03), - ENTRANCE(0x52, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x52, 0x00, 0, 1, 0x03, 0x03), - ENTRANCE(0x52, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x52, 0x00, 0, 1, 0x26, 0x26), - ENTRANCE(0x52, 0x00, 0, 1, 0x21, 0x21), ENTRANCE(0x52, 0x00, 1, 1, 0x21, 0x21), - ENTRANCE(0x52, 0x00, 0, 1, 0x21, 0x21), ENTRANCE(0x52, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x53, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x53, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x53, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x53, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x53, 0x00, 0, 1, 0x04, 0x02), ENTRANCE(0x53, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x54, 0x00, 1, 1, 0x03, 0x03), ENTRANCE(0x54, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x54, 0x00, 1, 1, 0x03, 0x03), ENTRANCE(0x54, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x55, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x55, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x55, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x55, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x55, 0x00, 1, 1, 0x0A, 0x0A), ENTRANCE(0x55, 0x00, 0, 1, 0x0A, 0x0A), - ENTRANCE(0x55, 0x00, 1, 1, 0x0A, 0x0A), ENTRANCE(0x55, 0x00, 0, 1, 0x0D, 0x0A), - ENTRANCE(0x55, 0x00, 0, 1, 0x0A, 0x0A), ENTRANCE(0x55, 0x00, 0, 1, 0x0A, 0x0A), - ENTRANCE(0x55, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x55, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x55, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x55, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x56, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x56, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x56, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x56, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x56, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x56, 0x00, 0, 1, 0x00, 0x00), - ENTRANCE(0x57, 0x00, 1, 1, 0x03, 0x03), ENTRANCE(0x57, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x57, 0x00, 1, 1, 0x03, 0x03), ENTRANCE(0x57, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x57, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x57, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x58, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x58, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x58, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x58, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x58, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x58, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x59, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x59, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x59, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x59, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x59, 0x00, 0, 1, 0x0D, 0x00), ENTRANCE(0x59, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x59, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x59, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x59, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x5A, 0x00, 0, 1, 0x03, 0x03), - ENTRANCE(0x5A, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x5A, 0x00, 0, 1, 0x03, 0x03), - ENTRANCE(0x5A, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x5A, 0x00, 1, 1, 0x0C, 0x0A), - ENTRANCE(0x5A, 0x00, 1, 1, 0x0A, 0x0A), ENTRANCE(0x5A, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x5B, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x5B, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x5B, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x5B, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x5B, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x5C, 0x00, 1, 1, 0x0F, 0x0F), - ENTRANCE(0x5C, 0x00, 1, 1, 0x0F, 0x0F), ENTRANCE(0x5C, 0x00, 1, 1, 0x0F, 0x0F), - ENTRANCE(0x5C, 0x00, 1, 1, 0x0F, 0x0F), ENTRANCE(0x5C, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x5C, 0x00, 1, 1, 0x0F, 0x0F), ENTRANCE(0x5D, 0x00, 1, 1, 0x03, 0x03), - ENTRANCE(0x5D, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x00, 1, 1, 0x03, 0x03), - ENTRANCE(0x5D, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x00, 1, 1, 0x21, 0x21), - ENTRANCE(0x5D, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x5E, 0x00, 1, 1, 0x0E, 0x0E), ENTRANCE(0x5E, 0x00, 1, 1, 0x0E, 0x0E), - ENTRANCE(0x5E, 0x00, 1, 1, 0x0E, 0x0E), ENTRANCE(0x5E, 0x00, 1, 1, 0x0E, 0x0E), - ENTRANCE(0x0E, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x01, 1, 1, 0x02, 0x02), - ENTRANCE(0x0E, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x01, 1, 1, 0x02, 0x02), - ENTRANCE(0x5F, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x5F, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x64, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x64, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x64, 0x00, 0, 1, 0x04, 0x02), ENTRANCE(0x60, 0x00, 0, 1, 0x03, 0x03), - ENTRANCE(0x60, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x60, 0x00, 0, 1, 0x03, 0x03), - ENTRANCE(0x60, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x60, 0x00, 1, 1, 0x0A, 0x0A), - ENTRANCE(0x60, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x60, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x60, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x60, 0x00, 1, 1, 0x03, 0x03), - ENTRANCE(0x60, 0x00, 1, 1, 0x03, 0x03), ENTRANCE(0x61, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x61, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x61, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x61, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x61, 0x00, 0, 1, 0x03, 0x03), - ENTRANCE(0x61, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x62, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x62, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x62, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x62, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x62, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x62, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x58, 0x03, 0, 1, 0x00, 0x00), - ENTRANCE(0x58, 0x03, 0, 1, 0x00, 0x00), ENTRANCE(0x58, 0x03, 0, 1, 0x00, 0x00), - ENTRANCE(0x58, 0x03, 0, 1, 0x00, 0x00), ENTRANCE(0x63, 0x00, 0, 1, 0x03, 0x03), - ENTRANCE(0x63, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x63, 0x00, 0, 1, 0x03, 0x03), - ENTRANCE(0x63, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x63, 0x00, 0, 1, 0x20, 0x20), - ENTRANCE(0x63, 0x00, 0, 1, 0x2A, 0x2A), ENTRANCE(0x63, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x63, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x63, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x63, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x63, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x63, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x63, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x63, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x04, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x04, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x04, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x04, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x03, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x03, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x03, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x03, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x42, 0x01, 0, 1, 0x04, 0x20), - ENTRANCE(0x42, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x42, 0x01, 0, 1, 0x04, 0x20), - ENTRANCE(0x42, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x23, 0x00, 0, 1, 0x03, 0x03), - ENTRANCE(0x24, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x25, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x25, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x04, 0x01, 1, 1, 0x02, 0x02), - ENTRANCE(0x04, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x04, 0x01, 1, 1, 0x02, 0x02), - ENTRANCE(0x04, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x0E, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x0E, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x51, 0x01, 0, 1, 0x03, 0x03), - ENTRANCE(0x51, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x51, 0x01, 0, 1, 0x03, 0x03), - ENTRANCE(0x51, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x51, 0x02, 1, 1, 0x03, 0x03), - ENTRANCE(0x51, 0x02, 1, 1, 0x02, 0x02), ENTRANCE(0x51, 0x02, 1, 1, 0x03, 0x03), - ENTRANCE(0x51, 0x02, 1, 1, 0x02, 0x02), ENTRANCE(0x51, 0x03, 0, 1, 0x02, 0x02), - ENTRANCE(0x51, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x51, 0x03, 0, 1, 0x02, 0x02), - ENTRANCE(0x51, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x51, 0x04, 1, 1, 0x03, 0x03), - ENTRANCE(0x51, 0x04, 1, 1, 0x02, 0x02), ENTRANCE(0x51, 0x04, 1, 1, 0x03, 0x03), - ENTRANCE(0x51, 0x04, 1, 1, 0x02, 0x02), ENTRANCE(0x51, 0x05, 0, 1, 0x03, 0x03), - ENTRANCE(0x51, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x51, 0x05, 0, 1, 0x03, 0x03), - ENTRANCE(0x51, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x52, 0x01, 0, 1, 0x03, 0x03), - ENTRANCE(0x52, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x52, 0x01, 0, 1, 0x03, 0x03), - ENTRANCE(0x52, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x52, 0x02, 0, 1, 0x03, 0x03), - ENTRANCE(0x52, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x52, 0x02, 0, 1, 0x03, 0x03), - ENTRANCE(0x52, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x54, 0x01, 1, 1, 0x03, 0x03), - ENTRANCE(0x54, 0x01, 1, 1, 0x03, 0x03), ENTRANCE(0x54, 0x01, 1, 1, 0x03, 0x03), - ENTRANCE(0x54, 0x01, 1, 1, 0x03, 0x03), ENTRANCE(0x54, 0x02, 0, 1, 0x03, 0x03), - ENTRANCE(0x54, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x54, 0x02, 0, 1, 0x03, 0x03), - ENTRANCE(0x54, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x58, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x58, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x58, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x58, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x5A, 0x01, 0, 1, 0x03, 0x03), - ENTRANCE(0x5A, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x5A, 0x01, 0, 1, 0x03, 0x03), - ENTRANCE(0x5A, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x5B, 0x01, 1, 1, 0x02, 0x02), - ENTRANCE(0x5B, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x5B, 0x01, 1, 1, 0x02, 0x02), - ENTRANCE(0x5B, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x5B, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x5B, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x5B, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x5B, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x5B, 0x03, 0, 1, 0x02, 0x02), - ENTRANCE(0x5B, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x5B, 0x03, 0, 1, 0x02, 0x02), - ENTRANCE(0x5B, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x02, 1, 1, 0x02, 0x02), - ENTRANCE(0x0E, 0x02, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x02, 1, 1, 0x02, 0x02), - ENTRANCE(0x0E, 0x02, 1, 1, 0x02, 0x02), ENTRANCE(0x60, 0x01, 0, 1, 0x03, 0x03), - ENTRANCE(0x60, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x60, 0x01, 0, 1, 0x03, 0x03), - ENTRANCE(0x60, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x60, 0x02, 0, 1, 0x03, 0x03), - ENTRANCE(0x60, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x60, 0x02, 0, 1, 0x03, 0x03), - ENTRANCE(0x60, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x62, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x62, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x62, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x62, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x38, 0x01, 0, 1, 0x04, 0x20), - ENTRANCE(0x38, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x38, 0x01, 0, 1, 0x04, 0x20), - ENTRANCE(0x38, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x1A, 0x05, 1, 1, 0x02, 0x02), - ENTRANCE(0x1A, 0x05, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x05, 1, 1, 0x02, 0x02), - ENTRANCE(0x1A, 0x05, 1, 1, 0x02, 0x02), ENTRANCE(0x20, 0x08, 0, 1, 0x04, 0x02), - ENTRANCE(0x21, 0x08, 0, 1, 0x04, 0x02), ENTRANCE(0x22, 0x08, 0, 1, 0x04, 0x02), - ENTRANCE(0x22, 0x08, 0, 1, 0x04, 0x02), ENTRANCE(0x20, 0x09, 0, 1, 0x04, 0x02), - ENTRANCE(0x21, 0x09, 0, 1, 0x04, 0x02), ENTRANCE(0x22, 0x09, 0, 1, 0x04, 0x02), - ENTRANCE(0x22, 0x09, 0, 1, 0x04, 0x02), ENTRANCE(0x20, 0x0A, 0, 1, 0x04, 0x02), - ENTRANCE(0x21, 0x0A, 0, 1, 0x04, 0x02), ENTRANCE(0x22, 0x0A, 0, 1, 0x04, 0x02), - ENTRANCE(0x22, 0x0A, 0, 1, 0x04, 0x02), ENTRANCE(0x54, 0x03, 1, 1, 0x03, 0x03), - ENTRANCE(0x54, 0x03, 1, 1, 0x02, 0x02), ENTRANCE(0x54, 0x03, 1, 1, 0x03, 0x03), - ENTRANCE(0x54, 0x03, 1, 1, 0x02, 0x02), ENTRANCE(0x54, 0x04, 0, 1, 0x2C, 0x2C), - ENTRANCE(0x54, 0x04, 0, 1, 0x2C, 0x2C), ENTRANCE(0x54, 0x04, 0, 1, 0x2C, 0x2C), - ENTRANCE(0x54, 0x04, 0, 1, 0x2C, 0x2C), ENTRANCE(0x5C, 0x01, 0, 1, 0x03, 0x03), - ENTRANCE(0x5C, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x5C, 0x01, 0, 1, 0x03, 0x03), - ENTRANCE(0x5C, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x5C, 0x02, 0, 0, 0x03, 0x03), - ENTRANCE(0x5C, 0x02, 0, 0, 0x02, 0x02), ENTRANCE(0x5C, 0x02, 0, 0, 0x03, 0x03), - ENTRANCE(0x5C, 0x02, 0, 0, 0x02, 0x02), ENTRANCE(0x5C, 0x03, 0, 0, 0x03, 0x03), - ENTRANCE(0x5C, 0x03, 0, 0, 0x02, 0x02), ENTRANCE(0x5C, 0x03, 0, 0, 0x03, 0x03), - ENTRANCE(0x5C, 0x03, 0, 0, 0x02, 0x02), ENTRANCE(0x5C, 0x04, 0, 1, 0x02, 0x02), - ENTRANCE(0x5C, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x5C, 0x04, 0, 1, 0x02, 0x02), - ENTRANCE(0x5C, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x5C, 0x05, 0, 1, 0x03, 0x03), - ENTRANCE(0x5C, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x5C, 0x05, 0, 1, 0x03, 0x03), - ENTRANCE(0x5C, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x5C, 0x06, 1, 0, 0x0F, 0x0F), - ENTRANCE(0x5C, 0x06, 1, 0, 0x0F, 0x0F), ENTRANCE(0x5C, 0x06, 1, 0, 0x0F, 0x0F), - ENTRANCE(0x5C, 0x06, 1, 0, 0x0F, 0x0F), ENTRANCE(0x51, 0x06, 0, 1, 0x03, 0x03), - ENTRANCE(0x51, 0x06, 0, 1, 0x02, 0x02), ENTRANCE(0x51, 0x06, 0, 1, 0x03, 0x03), - ENTRANCE(0x51, 0x06, 0, 1, 0x02, 0x02), ENTRANCE(0x51, 0x07, 0, 1, 0x03, 0x03), - ENTRANCE(0x51, 0x07, 0, 1, 0x02, 0x02), ENTRANCE(0x51, 0x07, 0, 1, 0x03, 0x03), - ENTRANCE(0x51, 0x07, 0, 1, 0x02, 0x02), ENTRANCE(0x52, 0x03, 0, 1, 0x04, 0x02), - ENTRANCE(0x52, 0x03, 0, 1, 0x04, 0x02), ENTRANCE(0x52, 0x03, 0, 1, 0x04, 0x02), - ENTRANCE(0x52, 0x03, 0, 1, 0x04, 0x02), ENTRANCE(0x53, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x53, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x53, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x53, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x55, 0x01, 0, 1, 0x03, 0x03), - ENTRANCE(0x55, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x55, 0x01, 0, 1, 0x03, 0x03), - ENTRANCE(0x55, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x55, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x55, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x55, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x55, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x55, 0x03, 0, 1, 0x04, 0x04), - ENTRANCE(0x55, 0x03, 0, 1, 0x04, 0x04), ENTRANCE(0x55, 0x03, 0, 1, 0x04, 0x04), - ENTRANCE(0x55, 0x03, 0, 1, 0x04, 0x04), ENTRANCE(0x56, 0x01, 0, 1, 0x12, 0x12), - ENTRANCE(0x56, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x56, 0x01, 0, 1, 0x12, 0x12), - ENTRANCE(0x56, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x57, 0x01, 0, 1, 0x03, 0x03), - ENTRANCE(0x57, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x57, 0x01, 0, 1, 0x03, 0x03), - ENTRANCE(0x57, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x57, 0x02, 0, 1, 0x13, 0x13), - ENTRANCE(0x57, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x57, 0x02, 0, 1, 0x13, 0x13), - ENTRANCE(0x57, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x59, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x59, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x59, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x59, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x59, 0x02, 0, 1, 0x03, 0x03), - ENTRANCE(0x59, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x59, 0x02, 0, 1, 0x03, 0x03), - ENTRANCE(0x59, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x5A, 0x02, 1, 1, 0x03, 0x03), - ENTRANCE(0x5A, 0x02, 1, 1, 0x02, 0x02), ENTRANCE(0x5A, 0x02, 1, 1, 0x03, 0x03), - ENTRANCE(0x5A, 0x02, 1, 1, 0x02, 0x02), ENTRANCE(0x5A, 0x03, 1, 1, 0x03, 0x03), - ENTRANCE(0x5A, 0x03, 1, 1, 0x02, 0x02), ENTRANCE(0x5A, 0x03, 1, 1, 0x03, 0x03), - ENTRANCE(0x5A, 0x03, 1, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x01, 0, 1, 0x03, 0x03), - ENTRANCE(0x5D, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x01, 0, 1, 0x03, 0x03), - ENTRANCE(0x5D, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x02, 0, 1, 0x03, 0x03), - ENTRANCE(0x5D, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x02, 0, 1, 0x03, 0x03), - ENTRANCE(0x5D, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x03, 0, 1, 0x03, 0x03), - ENTRANCE(0x5D, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x03, 0, 1, 0x03, 0x03), - ENTRANCE(0x5D, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x5F, 0x01, 0, 1, 0x03, 0x03), - ENTRANCE(0x5F, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x64, 0x01, 0, 1, 0x05, 0x05), - ENTRANCE(0x64, 0x01, 0, 1, 0x05, 0x05), ENTRANCE(0x5F, 0x01, 0, 1, 0x00, 0x00), - ENTRANCE(0x60, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x60, 0x03, 0, 1, 0x02, 0x02), - ENTRANCE(0x60, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x60, 0x03, 0, 1, 0x02, 0x02), - ENTRANCE(0x61, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x61, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x61, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x61, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x61, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x61, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x61, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x61, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x03, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x03, 0x01, 1, 1, 0x02, 0x02), - ENTRANCE(0x03, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x03, 0x01, 1, 1, 0x02, 0x02), - ENTRANCE(0x00, 0x01, 1, 0, 0x02, 0x02), ENTRANCE(0x00, 0x01, 1, 0, 0x02, 0x02), - ENTRANCE(0x00, 0x01, 1, 0, 0x02, 0x02), ENTRANCE(0x00, 0x01, 1, 0, 0x02, 0x02), - ENTRANCE(0x0E, 0x03, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x03, 1, 1, 0x02, 0x02), - ENTRANCE(0x0E, 0x03, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x03, 1, 1, 0x02, 0x02), - ENTRANCE(0x20, 0x01, 0, 1, 0x03, 0x03), ENTRANCE(0x21, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x22, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x22, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x20, 0x02, 0, 1, 0x03, 0x03), ENTRANCE(0x21, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x22, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x22, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x20, 0x03, 1, 1, 0x03, 0x03), ENTRANCE(0x21, 0x03, 1, 1, 0x02, 0x02), - ENTRANCE(0x22, 0x03, 1, 1, 0x02, 0x02), ENTRANCE(0x22, 0x03, 1, 1, 0x02, 0x02), - ENTRANCE(0x55, 0x04, 0, 0, 0x04, 0x04), ENTRANCE(0x55, 0x04, 0, 0, 0x04, 0x04), - ENTRANCE(0x55, 0x04, 0, 0, 0x04, 0x04), ENTRANCE(0x55, 0x04, 0, 0, 0x04, 0x04), - ENTRANCE(0x55, 0x05, 0, 0, 0x04, 0x04), ENTRANCE(0x55, 0x05, 0, 0, 0x04, 0x04), - ENTRANCE(0x55, 0x05, 0, 0, 0x04, 0x04), ENTRANCE(0x55, 0x05, 0, 0, 0x04, 0x04), - ENTRANCE(0x1B, 0x02, 0, 0, 0x02, 0x02), ENTRANCE(0x1C, 0x02, 0, 0, 0x02, 0x02), - ENTRANCE(0x1D, 0x02, 0, 0, 0x02, 0x02), ENTRANCE(0x1D, 0x02, 0, 0, 0x02, 0x02), - ENTRANCE(0x34, 0x01, 0, 1, 0x04, 0x04), ENTRANCE(0x34, 0x01, 0, 1, 0x04, 0x04), - ENTRANCE(0x34, 0x01, 0, 1, 0x04, 0x04), ENTRANCE(0x34, 0x01, 0, 1, 0x04, 0x04), - ENTRANCE(0x1B, 0x01, 0, 1, 0x03, 0x03), ENTRANCE(0x1C, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x1D, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x1D, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x51, 0x08, 1, 1, 0x03, 0x03), ENTRANCE(0x51, 0x08, 1, 1, 0x02, 0x02), - ENTRANCE(0x51, 0x08, 1, 1, 0x03, 0x03), ENTRANCE(0x51, 0x08, 1, 1, 0x02, 0x02), - ENTRANCE(0x51, 0x09, 0, 1, 0x03, 0x03), ENTRANCE(0x51, 0x09, 0, 1, 0x03, 0x03), - ENTRANCE(0x51, 0x09, 0, 1, 0x03, 0x03), ENTRANCE(0x51, 0x09, 0, 1, 0x03, 0x03), - ENTRANCE(0x51, 0x0A, 0, 1, 0x03, 0x03), ENTRANCE(0x51, 0x0A, 0, 1, 0x03, 0x03), - ENTRANCE(0x51, 0x0A, 0, 1, 0x03, 0x03), ENTRANCE(0x51, 0x0A, 0, 1, 0x03, 0x03), - ENTRANCE(0x55, 0x06, 0, 1, 0x02, 0x02), ENTRANCE(0x55, 0x06, 0, 1, 0x02, 0x02), - ENTRANCE(0x55, 0x06, 0, 1, 0x02, 0x02), ENTRANCE(0x55, 0x06, 0, 1, 0x02, 0x02), - ENTRANCE(0x51, 0x0B, 0, 1, 0x05, 0x05), ENTRANCE(0x51, 0x0B, 0, 1, 0x04, 0x02), - ENTRANCE(0x51, 0x0B, 0, 1, 0x05, 0x05), ENTRANCE(0x51, 0x0B, 0, 1, 0x04, 0x02), - ENTRANCE(0x51, 0x0C, 0, 1, 0x05, 0x05), ENTRANCE(0x51, 0x0C, 0, 1, 0x04, 0x02), - ENTRANCE(0x51, 0x0C, 0, 1, 0x05, 0x05), ENTRANCE(0x51, 0x0C, 0, 1, 0x04, 0x02), - ENTRANCE(0x51, 0x0D, 0, 1, 0x05, 0x05), ENTRANCE(0x51, 0x0D, 0, 1, 0x04, 0x02), - ENTRANCE(0x51, 0x0D, 0, 1, 0x05, 0x05), ENTRANCE(0x51, 0x0D, 0, 1, 0x04, 0x02), - ENTRANCE(0x45, 0x01, 0, 1, 0x03, 0x03), ENTRANCE(0x46, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x45, 0x01, 0, 1, 0x03, 0x03), ENTRANCE(0x46, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x1E, 0x01, 1, 1, 0x03, 0x03), ENTRANCE(0x1F, 0x01, 1, 1, 0x02, 0x02), - ENTRANCE(0x1E, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x1F, 0x01, 1, 1, 0x02, 0x02), - ENTRANCE(0x20, 0x04, 1, 1, 0x03, 0x03), ENTRANCE(0x21, 0x04, 1, 1, 0x02, 0x02), - ENTRANCE(0x22, 0x04, 1, 1, 0x02, 0x02), ENTRANCE(0x22, 0x04, 1, 1, 0x02, 0x02), - ENTRANCE(0x20, 0x05, 0, 1, 0x04, 0x02), ENTRANCE(0x21, 0x05, 0, 1, 0x04, 0x02), - ENTRANCE(0x22, 0x05, 0, 1, 0x04, 0x02), ENTRANCE(0x22, 0x05, 0, 1, 0x04, 0x02), - ENTRANCE(0x52, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x52, 0x04, 0, 1, 0x02, 0x02), - ENTRANCE(0x52, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x52, 0x04, 0, 1, 0x02, 0x02), - ENTRANCE(0x5D, 0x04, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x04, 0, 1, 0x02, 0x02), - ENTRANCE(0x5D, 0x04, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x04, 0, 1, 0x02, 0x02), - ENTRANCE(0x63, 0x01, 0, 0, 0x03, 0x03), ENTRANCE(0x63, 0x01, 0, 0, 0x02, 0x02), - ENTRANCE(0x63, 0x01, 0, 0, 0x03, 0x03), ENTRANCE(0x63, 0x01, 0, 0, 0x02, 0x02), - ENTRANCE(0x07, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x07, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x07, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x07, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x07, 0x02, 1, 1, 0x02, 0x02), ENTRANCE(0x07, 0x02, 1, 1, 0x02, 0x02), - ENTRANCE(0x07, 0x02, 1, 1, 0x02, 0x02), ENTRANCE(0x07, 0x02, 1, 1, 0x02, 0x02), - ENTRANCE(0x5D, 0x05, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x05, 0, 1, 0x02, 0x02), - ENTRANCE(0x5D, 0x05, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x05, 0, 1, 0x02, 0x02), - ENTRANCE(0x5D, 0x06, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x06, 0, 1, 0x02, 0x02), - ENTRANCE(0x5D, 0x06, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x06, 0, 1, 0x02, 0x02), - ENTRANCE(0x5D, 0x07, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x07, 0, 1, 0x02, 0x02), - ENTRANCE(0x5D, 0x07, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x07, 0, 1, 0x02, 0x02), - ENTRANCE(0x5D, 0x08, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x08, 0, 1, 0x02, 0x02), - ENTRANCE(0x5D, 0x08, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x08, 0, 1, 0x02, 0x02), - ENTRANCE(0x43, 0x02, 0, 1, 0x0A, 0x0A), ENTRANCE(0x43, 0x02, 0, 1, 0x0A, 0x0A), - ENTRANCE(0x43, 0x02, 0, 1, 0x0A, 0x0A), ENTRANCE(0x43, 0x02, 0, 1, 0x0A, 0x0A), - ENTRANCE(0x44, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x44, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x44, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x44, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x5D, 0x09, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x09, 0, 1, 0x02, 0x02), - ENTRANCE(0x5D, 0x09, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x09, 0, 1, 0x02, 0x02), - ENTRANCE(0x5D, 0x0A, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x0A, 0, 1, 0x02, 0x02), - ENTRANCE(0x5D, 0x0A, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x0A, 0, 1, 0x02, 0x02), - ENTRANCE(0x5D, 0x0B, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x0B, 0, 1, 0x02, 0x02), - ENTRANCE(0x5D, 0x0B, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x0B, 0, 1, 0x02, 0x02), - ENTRANCE(0x5D, 0x0C, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x0C, 0, 1, 0x02, 0x02), - ENTRANCE(0x5D, 0x0C, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x0C, 0, 1, 0x02, 0x02), - ENTRANCE(0x63, 0x02, 0, 1, 0x03, 0x03), ENTRANCE(0x63, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x63, 0x02, 0, 1, 0x03, 0x03), ENTRANCE(0x63, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x63, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x63, 0x03, 0, 1, 0x02, 0x02), - ENTRANCE(0x63, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x63, 0x03, 0, 1, 0x02, 0x02), - ENTRANCE(0x42, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x42, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x42, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x42, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x56, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x47, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x42, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x42, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x42, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x42, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x42, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x06, 0x01, 1, 1, 0x02, 0x02), - ENTRANCE(0x06, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x06, 0x01, 1, 1, 0x02, 0x02), - ENTRANCE(0x06, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x36, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x36, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x36, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x36, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x2A, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x2A, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x2A, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x2A, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x13, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x13, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x13, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x13, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x15, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x15, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x15, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x15, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x57, 0x06, 0, 1, 0x04, 0x02), - ENTRANCE(0x57, 0x06, 0, 1, 0x04, 0x02), ENTRANCE(0x57, 0x06, 0, 1, 0x04, 0x02), - ENTRANCE(0x57, 0x06, 0, 1, 0x04, 0x02), ENTRANCE(0x3A, 0x00, 0, 1, 0x02, 0x20), - ENTRANCE(0x3A, 0x00, 0, 1, 0x02, 0x20), ENTRANCE(0x3A, 0x00, 0, 1, 0x02, 0x20), - ENTRANCE(0x3A, 0x00, 0, 1, 0x02, 0x20), ENTRANCE(0x51, 0x0E, 1, 1, 0x03, 0x03), - ENTRANCE(0x51, 0x0E, 1, 1, 0x03, 0x03), ENTRANCE(0x51, 0x0E, 1, 1, 0x03, 0x03), - ENTRANCE(0x51, 0x0E, 1, 1, 0x03, 0x03), ENTRANCE(0x3B, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x3B, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x3B, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x3B, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x3B, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x3B, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x3B, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x3F, 0x00, 0, 1, 0x02, 0x26), ENTRANCE(0x3F, 0x00, 0, 1, 0x02, 0x26), - ENTRANCE(0x3F, 0x00, 0, 1, 0x02, 0x26), ENTRANCE(0x3F, 0x00, 0, 1, 0x02, 0x26), - ENTRANCE(0x43, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x03, 0, 1, 0x02, 0x02), - ENTRANCE(0x43, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x03, 0, 1, 0x02, 0x02), - ENTRANCE(0x43, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x04, 0, 1, 0x02, 0x02), - ENTRANCE(0x43, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x04, 0, 1, 0x02, 0x02), - ENTRANCE(0x58, 0x04, 0, 1, 0x2C, 0x2C), ENTRANCE(0x58, 0x04, 0, 1, 0x2C, 0x2C), - ENTRANCE(0x58, 0x04, 0, 1, 0x2C, 0x2C), ENTRANCE(0x58, 0x04, 0, 1, 0x2C, 0x2C), - ENTRANCE(0x1A, 0x02, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x02, 1, 1, 0x02, 0x02), - ENTRANCE(0x1A, 0x02, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x02, 1, 1, 0x02, 0x02), - ENTRANCE(0x1A, 0x03, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x03, 1, 1, 0x02, 0x02), - ENTRANCE(0x1A, 0x03, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x03, 1, 1, 0x02, 0x02), - ENTRANCE(0x1A, 0x04, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x04, 1, 1, 0x02, 0x02), - ENTRANCE(0x1A, 0x04, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x04, 1, 1, 0x02, 0x02), - ENTRANCE(0x55, 0x07, 0, 0, 0x04, 0x04), ENTRANCE(0x55, 0x07, 0, 0, 0x04, 0x04), - ENTRANCE(0x55, 0x07, 0, 0, 0x04, 0x04), ENTRANCE(0x55, 0x07, 0, 0, 0x04, 0x04), - ENTRANCE(0x55, 0x08, 0, 0, 0x04, 0x04), ENTRANCE(0x55, 0x08, 0, 0, 0x04, 0x04), - ENTRANCE(0x55, 0x08, 0, 0, 0x04, 0x04), ENTRANCE(0x55, 0x08, 0, 0, 0x04, 0x04), - ENTRANCE(0x5F, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x5F, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x64, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x64, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x5F, 0x02, 0, 1, 0x00, 0x00), ENTRANCE(0x52, 0x05, 0, 1, 0x04, 0x02), - ENTRANCE(0x52, 0x05, 0, 1, 0x04, 0x02), ENTRANCE(0x52, 0x05, 0, 1, 0x04, 0x02), - ENTRANCE(0x52, 0x05, 0, 1, 0x04, 0x02), ENTRANCE(0x52, 0x06, 0, 1, 0x04, 0x02), - ENTRANCE(0x52, 0x06, 0, 1, 0x04, 0x02), ENTRANCE(0x52, 0x06, 0, 1, 0x04, 0x02), - ENTRANCE(0x52, 0x06, 0, 1, 0x04, 0x02), ENTRANCE(0x52, 0x07, 0, 1, 0x04, 0x02), - ENTRANCE(0x52, 0x07, 0, 1, 0x04, 0x02), ENTRANCE(0x52, 0x07, 0, 1, 0x04, 0x02), - ENTRANCE(0x52, 0x07, 0, 1, 0x04, 0x02), ENTRANCE(0x52, 0x08, 0, 1, 0x04, 0x02), - ENTRANCE(0x52, 0x08, 0, 1, 0x04, 0x02), ENTRANCE(0x52, 0x08, 0, 1, 0x04, 0x02), - ENTRANCE(0x52, 0x08, 0, 1, 0x04, 0x02), ENTRANCE(0x53, 0x02, 0, 1, 0x04, 0x02), - ENTRANCE(0x53, 0x02, 0, 1, 0x04, 0x02), ENTRANCE(0x53, 0x02, 0, 1, 0x04, 0x02), - ENTRANCE(0x53, 0x02, 0, 1, 0x04, 0x02), ENTRANCE(0x53, 0x03, 0, 1, 0x03, 0x03), - ENTRANCE(0x53, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x53, 0x03, 0, 1, 0x03, 0x03), - ENTRANCE(0x53, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x53, 0x04, 0, 1, 0x03, 0x03), - ENTRANCE(0x53, 0x04, 0, 1, 0x03, 0x03), ENTRANCE(0x53, 0x04, 0, 1, 0x03, 0x03), - ENTRANCE(0x53, 0x04, 0, 1, 0x03, 0x03), ENTRANCE(0x53, 0x05, 0, 1, 0x03, 0x03), - ENTRANCE(0x53, 0x05, 0, 1, 0x03, 0x03), ENTRANCE(0x53, 0x05, 0, 1, 0x03, 0x03), - ENTRANCE(0x53, 0x05, 0, 1, 0x03, 0x03), ENTRANCE(0x5E, 0x01, 1, 1, 0x0E, 0x0E), - ENTRANCE(0x5E, 0x01, 1, 1, 0x0E, 0x0E), ENTRANCE(0x5E, 0x01, 1, 1, 0x0E, 0x0E), - ENTRANCE(0x5E, 0x01, 1, 1, 0x0E, 0x0E), ENTRANCE(0x5E, 0x02, 0, 1, 0x0E, 0x0E), - ENTRANCE(0x5E, 0x02, 0, 1, 0x0E, 0x0E), ENTRANCE(0x5E, 0x02, 0, 1, 0x0E, 0x0E), - ENTRANCE(0x5E, 0x02, 0, 1, 0x0E, 0x0E), ENTRANCE(0x3C, 0x00, 0, 1, 0x03, 0x03), - ENTRANCE(0x3C, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x3C, 0x00, 0, 1, 0x03, 0x03), - ENTRANCE(0x3C, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x3D, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x3D, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x3D, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x3D, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x3D, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x3D, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x3D, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x63, 0x04, 0, 1, 0x04, 0x02), ENTRANCE(0x63, 0x04, 0, 1, 0x04, 0x02), - ENTRANCE(0x63, 0x04, 0, 1, 0x04, 0x02), ENTRANCE(0x63, 0x04, 0, 1, 0x04, 0x02), - ENTRANCE(0x2E, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x2E, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x2E, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x2E, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x2F, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x2F, 0x00, 0, 1, 0x04, 0x04), - ENTRANCE(0x2F, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x2F, 0x00, 0, 1, 0x04, 0x04), - ENTRANCE(0x30, 0x00, 0, 0, 0x04, 0x20), ENTRANCE(0x30, 0x00, 0, 0, 0x04, 0x20), - ENTRANCE(0x30, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x30, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x31, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x31, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x31, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x31, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x1E, 0x04, 0, 1, 0x04, 0x02), ENTRANCE(0x1F, 0x04, 0, 1, 0x04, 0x02), - ENTRANCE(0x1E, 0x04, 0, 1, 0x04, 0x02), ENTRANCE(0x1F, 0x04, 0, 1, 0x04, 0x02), - ENTRANCE(0x32, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x32, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x32, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x32, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x59, 0x05, 0, 1, 0x03, 0x03), ENTRANCE(0x59, 0x05, 0, 1, 0x03, 0x03), - ENTRANCE(0x59, 0x05, 0, 1, 0x03, 0x03), ENTRANCE(0x59, 0x05, 0, 1, 0x03, 0x03), - ENTRANCE(0x35, 0x00, 0, 1, 0x04, 0x02), ENTRANCE(0x35, 0x00, 0, 1, 0x04, 0x02), - ENTRANCE(0x35, 0x00, 0, 1, 0x04, 0x02), ENTRANCE(0x35, 0x00, 0, 1, 0x04, 0x02), - ENTRANCE(0x37, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x37, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x37, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x37, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x39, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x39, 0x00, 0, 1, 0x04, 0x04), - ENTRANCE(0x39, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x39, 0x00, 0, 1, 0x04, 0x04), - ENTRANCE(0x5D, 0x0D, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x0D, 0, 1, 0x02, 0x02), - ENTRANCE(0x5D, 0x0D, 0, 1, 0x03, 0x03), ENTRANCE(0x5D, 0x0D, 0, 1, 0x02, 0x02), - ENTRANCE(0x5D, 0x0E, 0, 1, 0x03, 0x05), ENTRANCE(0x5D, 0x0E, 0, 1, 0x02, 0x04), - ENTRANCE(0x5D, 0x0E, 0, 1, 0x03, 0x05), ENTRANCE(0x5D, 0x0E, 0, 1, 0x02, 0x04), - ENTRANCE(0x5D, 0x0F, 1, 1, 0x0F, 0x0F), ENTRANCE(0x5D, 0x0F, 1, 1, 0x0F, 0x0F), - ENTRANCE(0x5D, 0x0F, 1, 1, 0x0F, 0x0F), ENTRANCE(0x5D, 0x0F, 1, 1, 0x0F, 0x0F), - ENTRANCE(0x5D, 0x10, 0, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x10, 0, 1, 0x02, 0x02), - ENTRANCE(0x5D, 0x10, 0, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x10, 0, 1, 0x02, 0x02), - ENTRANCE(0x5D, 0x11, 0, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x11, 0, 1, 0x02, 0x02), - ENTRANCE(0x5D, 0x11, 0, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x11, 0, 1, 0x02, 0x02), - ENTRANCE(0x20, 0x06, 0, 1, 0x04, 0x02), ENTRANCE(0x21, 0x06, 0, 1, 0x04, 0x02), - ENTRANCE(0x22, 0x06, 0, 1, 0x04, 0x02), ENTRANCE(0x22, 0x06, 0, 1, 0x04, 0x02), - ENTRANCE(0x20, 0x07, 0, 1, 0x04, 0x02), ENTRANCE(0x21, 0x07, 0, 1, 0x04, 0x02), - ENTRANCE(0x22, 0x07, 0, 1, 0x04, 0x02), ENTRANCE(0x22, 0x07, 0, 1, 0x04, 0x02), - ENTRANCE(0x1E, 0x02, 0, 1, 0x04, 0x02), ENTRANCE(0x1F, 0x02, 0, 1, 0x04, 0x02), - ENTRANCE(0x1E, 0x02, 0, 1, 0x03, 0x03), ENTRANCE(0x1F, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x58, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x58, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x58, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x58, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x57, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x57, 0x03, 0, 1, 0x03, 0x03), - ENTRANCE(0x57, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x57, 0x03, 0, 1, 0x03, 0x03), - ENTRANCE(0x57, 0x04, 0, 1, 0x04, 0x02), ENTRANCE(0x57, 0x04, 0, 1, 0x04, 0x02), - ENTRANCE(0x57, 0x04, 0, 1, 0x04, 0x02), ENTRANCE(0x57, 0x04, 0, 1, 0x04, 0x02), - ENTRANCE(0x5A, 0x04, 0, 1, 0x04, 0x02), ENTRANCE(0x5A, 0x04, 0, 1, 0x04, 0x02), - ENTRANCE(0x5A, 0x04, 0, 1, 0x04, 0x02), ENTRANCE(0x5A, 0x04, 0, 1, 0x04, 0x02), - ENTRANCE(0x59, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x59, 0x03, 0, 1, 0x02, 0x02), - ENTRANCE(0x59, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x59, 0x03, 0, 1, 0x02, 0x02), - ENTRANCE(0x59, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x59, 0x04, 0, 1, 0x02, 0x02), - ENTRANCE(0x59, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x59, 0x04, 0, 1, 0x02, 0x02), - ENTRANCE(0x0E, 0x04, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x04, 1, 1, 0x02, 0x02), - ENTRANCE(0x0E, 0x04, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x04, 1, 1, 0x02, 0x02), - ENTRANCE(0x0E, 0x05, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x05, 1, 1, 0x02, 0x02), - ENTRANCE(0x0E, 0x05, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x05, 1, 1, 0x02, 0x02), - ENTRANCE(0x0E, 0x06, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x06, 1, 1, 0x02, 0x02), - ENTRANCE(0x0E, 0x06, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x06, 1, 1, 0x02, 0x02), - ENTRANCE(0x30, 0x01, 0, 0, 0x04, 0x20), ENTRANCE(0x30, 0x01, 0, 0, 0x04, 0x20), - ENTRANCE(0x30, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x30, 0x01, 0, 1, 0x04, 0x20), - ENTRANCE(0x30, 0x02, 0, 0, 0x04, 0x20), ENTRANCE(0x30, 0x02, 0, 0, 0x04, 0x20), - ENTRANCE(0x30, 0x02, 0, 1, 0x04, 0x20), ENTRANCE(0x30, 0x02, 0, 1, 0x04, 0x20), - ENTRANCE(0x06, 0x02, 0, 0, 0x02, 0x02), ENTRANCE(0x06, 0x02, 0, 0, 0x02, 0x02), - ENTRANCE(0x06, 0x02, 0, 0, 0x02, 0x02), ENTRANCE(0x06, 0x02, 0, 0, 0x02, 0x02), - ENTRANCE(0x06, 0x03, 0, 0, 0x02, 0x02), ENTRANCE(0x06, 0x03, 0, 0, 0x02, 0x02), - ENTRANCE(0x06, 0x03, 0, 0, 0x02, 0x02), ENTRANCE(0x06, 0x03, 0, 0, 0x02, 0x02), - ENTRANCE(0x06, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x06, 0x04, 0, 1, 0x02, 0x02), - ENTRANCE(0x06, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x06, 0x04, 0, 1, 0x02, 0x02), - ENTRANCE(0x62, 0x02, 0, 1, 0x04, 0x02), ENTRANCE(0x62, 0x02, 0, 1, 0x04, 0x02), - ENTRANCE(0x62, 0x02, 0, 1, 0x04, 0x02), ENTRANCE(0x62, 0x02, 0, 1, 0x04, 0x02), - ENTRANCE(0x4A, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x4A, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x4A, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x4A, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x4A, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x4A, 0x00, 0, 1, 0x03, 0x03), - ENTRANCE(0x4A, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x02, 0x01, 1, 1, 0x02, 0x02), - ENTRANCE(0x02, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x02, 0x01, 1, 1, 0x02, 0x02), - ENTRANCE(0x02, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x12, 0x00, 1, 0, 0x02, 0x02), - ENTRANCE(0x12, 0x00, 1, 0, 0x02, 0x02), ENTRANCE(0x12, 0x00, 1, 0, 0x02, 0x02), - ENTRANCE(0x12, 0x00, 1, 0, 0x02, 0x02), ENTRANCE(0x11, 0x00, 1, 0, 0x02, 0x02), - ENTRANCE(0x11, 0x00, 1, 0, 0x02, 0x02), ENTRANCE(0x11, 0x00, 1, 0, 0x02, 0x02), - ENTRANCE(0x11, 0x00, 1, 0, 0x02, 0x02), ENTRANCE(0x18, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x18, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x18, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x18, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x16, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x16, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x16, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x16, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x0A, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x0A, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x0A, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x0A, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x19, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x19, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x19, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x19, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x05, 0x01, 1, 1, 0x03, 0x02), - ENTRANCE(0x05, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x05, 0x01, 1, 1, 0x03, 0x02), - ENTRANCE(0x05, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x0A, 0x01, 1, 1, 0x02, 0x02), - ENTRANCE(0x0A, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x0A, 0x01, 1, 1, 0x02, 0x02), - ENTRANCE(0x0A, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x0A, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x0A, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x0A, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x0A, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x63, 0x05, 0, 1, 0x04, 0x02), - ENTRANCE(0x63, 0x05, 0, 1, 0x04, 0x02), ENTRANCE(0x63, 0x05, 0, 1, 0x04, 0x02), - ENTRANCE(0x63, 0x05, 0, 1, 0x04, 0x02), ENTRANCE(0x28, 0x00, 0, 1, 0x04, 0x04), - ENTRANCE(0x28, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x28, 0x00, 0, 1, 0x04, 0x04), - ENTRANCE(0x28, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x29, 0x00, 0, 1, 0x04, 0x04), - ENTRANCE(0x29, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x29, 0x00, 0, 1, 0x04, 0x04), - ENTRANCE(0x29, 0x00, 0, 1, 0x04, 0x04), ENTRANCE(0x2B, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x2B, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x2B, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x2B, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x1A, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x1A, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x1A, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x55, 0x09, 0, 0, 0x04, 0x04), - ENTRANCE(0x55, 0x09, 0, 0, 0x04, 0x04), ENTRANCE(0x55, 0x09, 0, 0, 0x04, 0x04), - ENTRANCE(0x55, 0x09, 0, 0, 0x04, 0x04), ENTRANCE(0x55, 0x0A, 0, 0, 0x04, 0x04), - ENTRANCE(0x55, 0x0A, 0, 0, 0x04, 0x04), ENTRANCE(0x55, 0x0A, 0, 0, 0x04, 0x04), - ENTRANCE(0x55, 0x0A, 0, 0, 0x04, 0x04), ENTRANCE(0x52, 0x09, 0, 1, 0x04, 0x04), - ENTRANCE(0x52, 0x09, 0, 1, 0x04, 0x04), ENTRANCE(0x52, 0x09, 0, 1, 0x04, 0x04), - ENTRANCE(0x52, 0x09, 0, 1, 0x04, 0x04), ENTRANCE(0x48, 0x00, 0, 1, 0x02, 0x26), - ENTRANCE(0x48, 0x00, 0, 1, 0x02, 0x26), ENTRANCE(0x48, 0x00, 0, 1, 0x02, 0x26), - ENTRANCE(0x48, 0x00, 0, 1, 0x02, 0x26), ENTRANCE(0x48, 0x01, 0, 1, 0x04, 0x20), - ENTRANCE(0x48, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x48, 0x01, 0, 1, 0x04, 0x20), - ENTRANCE(0x48, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x55, 0x0B, 0, 1, 0x04, 0x02), - ENTRANCE(0x55, 0x0B, 0, 1, 0x04, 0x02), ENTRANCE(0x55, 0x0B, 0, 1, 0x04, 0x02), - ENTRANCE(0x55, 0x0B, 0, 1, 0x04, 0x02), ENTRANCE(0x60, 0x04, 0, 1, 0x02, 0x02), - ENTRANCE(0x60, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x60, 0x04, 0, 1, 0x02, 0x02), - ENTRANCE(0x60, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x49, 0x00, 0, 1, 0x02, 0x20), - ENTRANCE(0x49, 0x00, 0, 1, 0x02, 0x20), ENTRANCE(0x49, 0x00, 0, 1, 0x02, 0x20), - ENTRANCE(0x49, 0x00, 0, 1, 0x02, 0x20), ENTRANCE(0x52, 0x0A, 0, 1, 0x04, 0x02), - ENTRANCE(0x52, 0x0A, 0, 1, 0x04, 0x02), ENTRANCE(0x52, 0x0A, 0, 1, 0x04, 0x02), - ENTRANCE(0x52, 0x0A, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x00, 0, 1, 0x04, 0x02), - ENTRANCE(0x0D, 0x00, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x00, 0, 1, 0x04, 0x02), - ENTRANCE(0x0D, 0x00, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x00, 0, 1, 0x04, 0x02), - ENTRANCE(0x0D, 0x00, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x00, 0, 1, 0x04, 0x02), - ENTRANCE(0x0D, 0x00, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x00, 0, 1, 0x04, 0x02), - ENTRANCE(0x0D, 0x00, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x00, 0, 1, 0x04, 0x02), - ENTRANCE(0x23, 0x01, 0, 1, 0x04, 0x02), ENTRANCE(0x24, 0x01, 0, 1, 0x04, 0x02), - ENTRANCE(0x25, 0x01, 0, 1, 0x04, 0x02), ENTRANCE(0x25, 0x01, 0, 1, 0x04, 0x02), - ENTRANCE(0x51, 0x0F, 0, 1, 0x05, 0x05), ENTRANCE(0x51, 0x0F, 0, 1, 0x04, 0x02), - ENTRANCE(0x51, 0x0F, 0, 1, 0x05, 0x05), ENTRANCE(0x51, 0x0F, 0, 1, 0x04, 0x02), - ENTRANCE(0x60, 0x05, 0, 1, 0x04, 0x02), ENTRANCE(0x60, 0x05, 0, 1, 0x04, 0x02), - ENTRANCE(0x60, 0x05, 0, 1, 0x04, 0x02), ENTRANCE(0x60, 0x05, 0, 1, 0x04, 0x02), - ENTRANCE(0x5F, 0x04, 0, 1, 0x03, 0x03), ENTRANCE(0x5F, 0x04, 0, 1, 0x02, 0x02), - ENTRANCE(0x64, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x64, 0x04, 0, 1, 0x02, 0x02), - ENTRANCE(0x61, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x61, 0x03, 0, 1, 0x02, 0x02), - ENTRANCE(0x61, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x61, 0x03, 0, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x03, 0, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x03, 0, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x04, 0, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x04, 0, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x05, 0, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x05, 0, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x06, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x06, 0, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x06, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x06, 0, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x07, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x07, 0, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x07, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x07, 0, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x08, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x08, 0, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x08, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x08, 0, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x09, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x09, 0, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x09, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x09, 0, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x0A, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x0A, 0, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x0A, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x0A, 0, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x0B, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x0B, 0, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x0B, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x0B, 0, 1, 0x02, 0x02), - ENTRANCE(0x0E, 0x07, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x07, 1, 1, 0x02, 0x02), - ENTRANCE(0x0E, 0x07, 1, 1, 0x02, 0x02), ENTRANCE(0x0E, 0x07, 1, 1, 0x02, 0x02), - ENTRANCE(0x1A, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x01, 1, 1, 0x02, 0x02), - ENTRANCE(0x1A, 0x01, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x01, 1, 1, 0x02, 0x02), - ENTRANCE(0x3B, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x3B, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x3B, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x3B, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x3B, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x3B, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x3B, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x3B, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x5B, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x5B, 0x04, 0, 1, 0x02, 0x02), - ENTRANCE(0x5B, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x5B, 0x04, 0, 1, 0x02, 0x02), - ENTRANCE(0x63, 0x06, 0, 0, 0x02, 0x26), ENTRANCE(0x63, 0x06, 0, 0, 0x02, 0x26), - ENTRANCE(0x63, 0x06, 0, 0, 0x02, 0x26), ENTRANCE(0x63, 0x06, 0, 0, 0x02, 0x26), - ENTRANCE(0x63, 0x07, 0, 0, 0x2E, 0x2E), ENTRANCE(0x63, 0x07, 0, 0, 0x2E, 0x2E), - ENTRANCE(0x63, 0x07, 0, 0, 0x2E, 0x2E), ENTRANCE(0x63, 0x07, 0, 0, 0x2E, 0x2E), - ENTRANCE(0x5B, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x5B, 0x05, 0, 1, 0x02, 0x02), - ENTRANCE(0x5B, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x5B, 0x05, 0, 1, 0x02, 0x02), - ENTRANCE(0x5B, 0x06, 0, 1, 0x2C, 0x2C), ENTRANCE(0x5B, 0x06, 0, 1, 0x2C, 0x2C), - ENTRANCE(0x5B, 0x06, 0, 1, 0x2C, 0x2C), ENTRANCE(0x5B, 0x06, 0, 1, 0x2C, 0x2C), - ENTRANCE(0x5B, 0x07, 0, 1, 0x2C, 0x2C), ENTRANCE(0x5B, 0x07, 0, 1, 0x2C, 0x2C), - ENTRANCE(0x5B, 0x07, 0, 1, 0x2C, 0x2C), ENTRANCE(0x5B, 0x07, 0, 1, 0x2C, 0x2C), - ENTRANCE(0x5B, 0x08, 0, 0, 0x02, 0x02), ENTRANCE(0x5B, 0x08, 0, 0, 0x02, 0x02), - ENTRANCE(0x5B, 0x08, 0, 0, 0x02, 0x02), ENTRANCE(0x5B, 0x08, 0, 0, 0x02, 0x02), - ENTRANCE(0x62, 0x03, 0, 1, 0x2C, 0x2C), ENTRANCE(0x62, 0x03, 0, 1, 0x2C, 0x2C), - ENTRANCE(0x62, 0x03, 0, 1, 0x2C, 0x2C), ENTRANCE(0x62, 0x03, 0, 1, 0x2C, 0x2C), - ENTRANCE(0x57, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x57, 0x05, 0, 1, 0x02, 0x02), - ENTRANCE(0x57, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x57, 0x05, 0, 1, 0x02, 0x02), - ENTRANCE(0x07, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x07, 0x03, 0, 1, 0x02, 0x02), - ENTRANCE(0x07, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x07, 0x03, 0, 1, 0x02, 0x02), - ENTRANCE(0x52, 0x0B, 0, 1, 0x04, 0x02), ENTRANCE(0x52, 0x0B, 0, 1, 0x04, 0x02), - ENTRANCE(0x52, 0x0B, 0, 1, 0x04, 0x02), ENTRANCE(0x52, 0x0B, 0, 1, 0x04, 0x02), - ENTRANCE(0x3B, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x3B, 0x03, 0, 1, 0x02, 0x02), - ENTRANCE(0x3B, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x3B, 0x03, 0, 1, 0x02, 0x02), - ENTRANCE(0x61, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x61, 0x04, 0, 1, 0x02, 0x02), - ENTRANCE(0x61, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x61, 0x04, 0, 1, 0x02, 0x02), - ENTRANCE(0x5F, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x5F, 0x03, 0, 1, 0x02, 0x02), - ENTRANCE(0x64, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x64, 0x03, 0, 1, 0x02, 0x02), - ENTRANCE(0x5F, 0x03, 0, 1, 0x00, 0x00), ENTRANCE(0x52, 0x0C, 0, 1, 0x04, 0x02), - ENTRANCE(0x52, 0x0C, 0, 1, 0x04, 0x02), ENTRANCE(0x52, 0x0C, 0, 1, 0x04, 0x02), - ENTRANCE(0x52, 0x0C, 0, 1, 0x04, 0x02), ENTRANCE(0x48, 0x02, 1, 1, 0x04, 0x20), - ENTRANCE(0x48, 0x02, 1, 1, 0x04, 0x20), ENTRANCE(0x48, 0x02, 1, 1, 0x04, 0x20), - ENTRANCE(0x48, 0x02, 1, 1, 0x04, 0x20), ENTRANCE(0x4B, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x4B, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x4B, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x4B, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x53, 0x06, 0, 1, 0x03, 0x03), - ENTRANCE(0x53, 0x06, 0, 1, 0x03, 0x03), ENTRANCE(0x53, 0x06, 0, 1, 0x03, 0x03), - ENTRANCE(0x53, 0x06, 0, 1, 0x03, 0x03), ENTRANCE(0x51, 0x10, 0, 1, 0x0B, 0x0B), - ENTRANCE(0x51, 0x10, 0, 1, 0x0B, 0x0B), ENTRANCE(0x51, 0x10, 0, 1, 0x0B, 0x0B), - ENTRANCE(0x51, 0x10, 0, 1, 0x0B, 0x0B), ENTRANCE(0x52, 0x0D, 0, 1, 0x03, 0x03), - ENTRANCE(0x52, 0x0D, 0, 1, 0x02, 0x02), ENTRANCE(0x52, 0x0D, 0, 1, 0x03, 0x03), - ENTRANCE(0x52, 0x0D, 0, 1, 0x02, 0x02), ENTRANCE(0x4F, 0x00, 0, 1, 0x03, 0x03), - ENTRANCE(0x4F, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x4F, 0x00, 0, 1, 0x03, 0x03), - ENTRANCE(0x4F, 0x00, 0, 1, 0x03, 0x03), ENTRANCE(0x4F, 0x00, 0, 1, 0x03, 0x03), - ENTRANCE(0x1A, 0x06, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x06, 1, 1, 0x02, 0x02), - ENTRANCE(0x1A, 0x06, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x06, 1, 1, 0x02, 0x02), - ENTRANCE(0x66, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x66, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x66, 0x00, 0, 1, 0x02, 0x02), ENTRANCE(0x66, 0x00, 0, 1, 0x02, 0x02), - ENTRANCE(0x1A, 0x07, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x07, 1, 1, 0x02, 0x02), - ENTRANCE(0x1A, 0x07, 1, 1, 0x02, 0x02), ENTRANCE(0x1A, 0x07, 1, 1, 0x02, 0x02), - ENTRANCE(0x32, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x32, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x32, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x32, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x2C, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x2C, 0x01, 0, 1, 0x04, 0x20), - ENTRANCE(0x2C, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x2C, 0x01, 0, 1, 0x04, 0x20), - ENTRANCE(0x33, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x33, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x33, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x33, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x0D, 0x01, 0, 0, 0x04, 0x02), ENTRANCE(0x0D, 0x01, 0, 0, 0x04, 0x02), - ENTRANCE(0x0D, 0x01, 0, 0, 0x04, 0x02), ENTRANCE(0x0D, 0x01, 0, 0, 0x04, 0x02), - ENTRANCE(0x0D, 0x02, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x02, 0, 1, 0x04, 0x02), - ENTRANCE(0x0D, 0x02, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x02, 0, 1, 0x04, 0x02), - ENTRANCE(0x0D, 0x03, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x03, 0, 1, 0x04, 0x02), - ENTRANCE(0x0D, 0x03, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x03, 0, 1, 0x04, 0x02), - ENTRANCE(0x0D, 0x04, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x04, 0, 1, 0x04, 0x02), - ENTRANCE(0x0D, 0x04, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x04, 0, 1, 0x04, 0x02), - ENTRANCE(0x0D, 0x05, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x05, 0, 1, 0x04, 0x02), - ENTRANCE(0x0D, 0x05, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x05, 0, 1, 0x04, 0x02), - ENTRANCE(0x0D, 0x06, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x06, 0, 1, 0x04, 0x02), - ENTRANCE(0x0D, 0x06, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x06, 0, 1, 0x04, 0x02), - ENTRANCE(0x0D, 0x07, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x07, 0, 1, 0x04, 0x02), - ENTRANCE(0x0D, 0x07, 0, 1, 0x04, 0x02), ENTRANCE(0x0D, 0x07, 0, 1, 0x04, 0x02), - ENTRANCE(0x50, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x50, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x50, 0x00, 0, 1, 0x04, 0x20), ENTRANCE(0x50, 0x00, 0, 1, 0x04, 0x20), - ENTRANCE(0x52, 0x0E, 0, 1, 0x03, 0x03), ENTRANCE(0x52, 0x0E, 0, 1, 0x02, 0x02), - ENTRANCE(0x52, 0x0E, 0, 1, 0x03, 0x03), ENTRANCE(0x52, 0x0E, 0, 1, 0x02, 0x02), - ENTRANCE(0x63, 0x08, 0, 0, 0x20, 0x20), ENTRANCE(0x63, 0x08, 0, 0, 0x20, 0x20), - ENTRANCE(0x63, 0x08, 0, 0, 0x20, 0x20), ENTRANCE(0x63, 0x08, 0, 0, 0x20, 0x20), - ENTRANCE(0x63, 0x09, 0, 0, 0x02, 0x02), ENTRANCE(0x63, 0x09, 0, 0, 0x02, 0x02), - ENTRANCE(0x63, 0x09, 0, 0, 0x02, 0x02), ENTRANCE(0x63, 0x09, 0, 0, 0x02, 0x02), - ENTRANCE(0x57, 0x07, 0, 1, 0x2C, 0x2C), ENTRANCE(0x57, 0x07, 0, 1, 0x2C, 0x2C), - ENTRANCE(0x57, 0x07, 0, 1, 0x2C, 0x2C), ENTRANCE(0x57, 0x07, 0, 1, 0x2C, 0x2C), - ENTRANCE(0x61, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x61, 0x05, 0, 1, 0x02, 0x02), - ENTRANCE(0x61, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x61, 0x05, 0, 1, 0x02, 0x02), - ENTRANCE(0x53, 0x07, 0, 1, 0x03, 0x03), ENTRANCE(0x53, 0x07, 0, 1, 0x03, 0x03), - ENTRANCE(0x53, 0x07, 0, 1, 0x03, 0x03), ENTRANCE(0x53, 0x07, 0, 1, 0x03, 0x03), - ENTRANCE(0x0F, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x0F, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x0F, 0x00, 1, 1, 0x02, 0x02), ENTRANCE(0x0F, 0x00, 1, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x0C, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x0C, 0, 1, 0x02, 0x02), - ENTRANCE(0x0C, 0x0C, 0, 1, 0x02, 0x02), ENTRANCE(0x0C, 0x0C, 0, 1, 0x02, 0x02), - ENTRANCE(0x41, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x41, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x41, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x41, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x3D, 0x01, 0, 1, 0x04, 0x04), ENTRANCE(0x3D, 0x01, 0, 1, 0x04, 0x04), - ENTRANCE(0x3D, 0x01, 0, 1, 0x04, 0x04), ENTRANCE(0x3D, 0x01, 0, 1, 0x04, 0x04), - ENTRANCE(0x5C, 0x07, 0, 1, 0x03, 0x03), ENTRANCE(0x5C, 0x07, 0, 1, 0x02, 0x02), - ENTRANCE(0x5C, 0x07, 0, 1, 0x03, 0x03), ENTRANCE(0x5C, 0x07, 0, 1, 0x02, 0x02), - ENTRANCE(0x53, 0x08, 0, 1, 0x03, 0x03), ENTRANCE(0x53, 0x08, 0, 1, 0x03, 0x03), - ENTRANCE(0x53, 0x08, 0, 1, 0x03, 0x03), ENTRANCE(0x53, 0x08, 0, 1, 0x03, 0x03), - ENTRANCE(0x03, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x03, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x03, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x03, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x3D, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x3D, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x3D, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x3D, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x43, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x05, 0, 1, 0x02, 0x02), - ENTRANCE(0x43, 0x05, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x05, 0, 1, 0x02, 0x02), - ENTRANCE(0x43, 0x06, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x06, 0, 1, 0x02, 0x02), - ENTRANCE(0x43, 0x06, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x06, 0, 1, 0x02, 0x02), - ENTRANCE(0x51, 0x11, 0, 1, 0x03, 0x03), ENTRANCE(0x51, 0x11, 0, 1, 0x02, 0x02), - ENTRANCE(0x51, 0x11, 0, 1, 0x03, 0x03), ENTRANCE(0x51, 0x11, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x02, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x03, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x03, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x03, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x04, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x04, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x04, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x05, 0, 1, 0x02, 0x03), ENTRANCE(0x3E, 0x05, 0, 1, 0x02, 0x03), - ENTRANCE(0x3E, 0x05, 0, 1, 0x02, 0x03), ENTRANCE(0x3E, 0x05, 0, 1, 0x02, 0x03), - ENTRANCE(0x3E, 0x06, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x06, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x06, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x06, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x07, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x07, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x07, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x07, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x08, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x08, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x08, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x08, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x09, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x09, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x09, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x09, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x0A, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x0A, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x0A, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x0A, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x0B, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x0B, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x0B, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x0B, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x0C, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x0C, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x0C, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x0C, 0, 1, 0x02, 0x02), - ENTRANCE(0x37, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x37, 0x01, 0, 1, 0x04, 0x20), - ENTRANCE(0x37, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x37, 0x01, 0, 1, 0x04, 0x20), - ENTRANCE(0x08, 0x01, 0, 1, 0x04, 0x04), ENTRANCE(0x08, 0x01, 0, 1, 0x04, 0x04), - ENTRANCE(0x08, 0x01, 0, 1, 0x04, 0x04), ENTRANCE(0x08, 0x01, 0, 1, 0x04, 0x04), - ENTRANCE(0x4C, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x4C, 0x01, 0, 1, 0x04, 0x20), - ENTRANCE(0x4C, 0x01, 0, 1, 0x04, 0x20), ENTRANCE(0x4C, 0x01, 0, 1, 0x04, 0x20), - ENTRANCE(0x63, 0x0A, 0, 1, 0x04, 0x02), ENTRANCE(0x63, 0x0A, 0, 1, 0x04, 0x02), - ENTRANCE(0x63, 0x0A, 0, 1, 0x04, 0x02), ENTRANCE(0x63, 0x0A, 0, 1, 0x04, 0x02), - ENTRANCE(0x09, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x09, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x09, 0x01, 0, 1, 0x02, 0x02), ENTRANCE(0x09, 0x01, 0, 1, 0x02, 0x02), - ENTRANCE(0x52, 0x0F, 0, 1, 0x03, 0x03), ENTRANCE(0x52, 0x0F, 0, 1, 0x02, 0x02), - ENTRANCE(0x52, 0x0F, 0, 1, 0x03, 0x03), ENTRANCE(0x52, 0x0F, 0, 1, 0x02, 0x02), - ENTRANCE(0x5B, 0x09, 0, 0, 0x02, 0x02), ENTRANCE(0x5B, 0x09, 0, 0, 0x02, 0x02), - ENTRANCE(0x5B, 0x09, 0, 0, 0x02, 0x02), ENTRANCE(0x5B, 0x09, 0, 0, 0x02, 0x02), - ENTRANCE(0x4C, 0x02, 0, 1, 0x04, 0x20), ENTRANCE(0x4C, 0x02, 0, 1, 0x04, 0x20), - ENTRANCE(0x4C, 0x02, 0, 1, 0x04, 0x20), ENTRANCE(0x4C, 0x02, 0, 1, 0x04, 0x20), - ENTRANCE(0x55, 0x0C, 0, 1, 0x04, 0x02), ENTRANCE(0x55, 0x0C, 0, 1, 0x04, 0x02), - ENTRANCE(0x55, 0x0C, 0, 1, 0x04, 0x02), ENTRANCE(0x55, 0x0C, 0, 1, 0x04, 0x02), - ENTRANCE(0x17, 0x02, 1, 1, 0x02, 0x02), ENTRANCE(0x17, 0x02, 1, 1, 0x02, 0x02), - ENTRANCE(0x17, 0x02, 1, 1, 0x02, 0x02), ENTRANCE(0x17, 0x02, 1, 1, 0x02, 0x02), - ENTRANCE(0x4A, 0x01, 0, 0, 0x03, 0x03), ENTRANCE(0x4A, 0x01, 0, 0, 0x02, 0x02), - ENTRANCE(0x4A, 0x01, 0, 0, 0x03, 0x03), ENTRANCE(0x4A, 0x01, 0, 0, 0x02, 0x02), - ENTRANCE(0x43, 0x07, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x07, 0, 1, 0x02, 0x02), - ENTRANCE(0x43, 0x07, 0, 1, 0x02, 0x02), ENTRANCE(0x43, 0x07, 0, 1, 0x02, 0x02), - ENTRANCE(0x5D, 0x12, 0, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x12, 0, 1, 0x02, 0x02), - ENTRANCE(0x5D, 0x12, 0, 1, 0x02, 0x02), ENTRANCE(0x5D, 0x12, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x0D, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x0D, 0, 1, 0x02, 0x02), - ENTRANCE(0x3E, 0x0D, 0, 1, 0x02, 0x02), ENTRANCE(0x3E, 0x0D, 0, 1, 0x02, 0x02), - ENTRANCE(0x56, 0x02, 0, 1, 0x12, 0x12), ENTRANCE(0x56, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x56, 0x02, 0, 1, 0x12, 0x12), ENTRANCE(0x56, 0x02, 0, 1, 0x02, 0x02), - ENTRANCE(0x57, 0x08, 0, 1, 0x02, 0x02), ENTRANCE(0x57, 0x08, 0, 1, 0x02, 0x02), - ENTRANCE(0x57, 0x08, 0, 1, 0x02, 0x02), ENTRANCE(0x57, 0x08, 0, 1, 0x02, 0x02), - ENTRANCE(0x56, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x56, 0x03, 0, 1, 0x03, 0x03), - ENTRANCE(0x56, 0x03, 0, 1, 0x03, 0x03), ENTRANCE(0x56, 0x03, 0, 1, 0x03, 0x03), - ENTRANCE(0x57, 0x09, 0, 1, 0x03, 0x03), ENTRANCE(0x57, 0x09, 0, 1, 0x03, 0x03), - ENTRANCE(0x57, 0x09, 0, 1, 0x03, 0x03), ENTRANCE(0x57, 0x09, 0, 1, 0x03, 0x03), - ENTRANCE(0x5C, 0x08, 0, 1, 0x03, 0x03), ENTRANCE(0x5C, 0x08, 0, 1, 0x03, 0x03), - ENTRANCE(0x5C, 0x08, 0, 1, 0x03, 0x03), ENTRANCE(0x5C, 0x08, 0, 1, 0x03, 0x03), +#include "tables/entrance_table.h" }; +#undef DEFINE_ENTRANCE + //#define TITLED_SCENE(name, title, unk_10, config, unk_12) \ // { \ // (u32) _##name##SegmentRomStart, (u32)_##name##SegmentRomEnd, (u32)_##title##SegmentRomStart, \ @@ -858,24 +85,24 @@ Gfx sDefaultDisplayList[] = { }; // Computes next entrance index based on age and day time to set the fade out transition -void func_800994A0(PlayState* play) { - s16 computedEntranceIndex; +void Scene_SetTransitionForNextEntrance(PlayState* play) { + s16 entranceIndex; if (!IS_DAY) { if (!LINK_IS_ADULT) { - computedEntranceIndex = play->nextEntranceIndex + 1; + entranceIndex = play->nextEntranceIndex + 1; } else { - computedEntranceIndex = play->nextEntranceIndex + 3; + entranceIndex = play->nextEntranceIndex + 3; } } else { if (!LINK_IS_ADULT) { - computedEntranceIndex = play->nextEntranceIndex; + entranceIndex = play->nextEntranceIndex; } else { - computedEntranceIndex = play->nextEntranceIndex + 2; + entranceIndex = play->nextEntranceIndex + 2; } } - play->fadeTransition = gEntranceTable[computedEntranceIndex].field & 0x7F; // Fade out + play->transitionType = ENTRANCE_INFO_START_TRANS_TYPE(gEntranceTable[entranceIndex].field); // Fade out } // Scene Draw Config 0 @@ -1212,11 +439,7 @@ void func_8009AFE0(PlayState* play) { { s32 pad[2]; } - if (ResourceMgr_IsGameMasterQuest()) { - gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sThievesHideoutEntranceTextures_MQ[gSaveContext.nightFlag])); - } else { - gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sThievesHideoutEntranceTextures[gSaveContext.nightFlag])); - } + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sThievesHideoutEntranceTextures[gSaveContext.nightFlag])); CLOSE_DISPS(play->state.gfxCtx); } @@ -1673,11 +896,7 @@ void func_8009D31C(PlayState* play) { { s32 pad[2]; } - if (ResourceMgr_IsGameMasterQuest()) { - gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sLonLonHouseEntranceTextures_MQ[gSaveContext.nightFlag])); - } else { - gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sLonLonHouseEntranceTextures[gSaveContext.nightFlag])); - } + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sLonLonHouseEntranceTextures[gSaveContext.nightFlag])); gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); @@ -1709,13 +928,8 @@ void func_8009D438(PlayState* play) { var = gSaveContext.nightFlag; } - if (ResourceMgr_IsGameMasterQuest()) { - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sGuardHouseView1Textures_MQ[var])); - gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sGuardHouseView2Textures_MQ[var])); - } else { - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sGuardHouseView1Textures[var])); - gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sGuardHouseView2Textures[var])); - } + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sGuardHouseView1Textures[var])); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sGuardHouseView2Textures[var])); gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); @@ -1859,11 +1073,7 @@ void func_8009DD5C(PlayState* play) { { s32 pad[2]; } - if (ResourceMgr_IsGameMasterQuest()) { - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sKakarikoWindowTextures_MQ[gSaveContext.nightFlag])); - } else { - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sKakarikoWindowTextures[gSaveContext.nightFlag])); - } + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sKakarikoWindowTextures[gSaveContext.nightFlag])); gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); @@ -1998,12 +1208,8 @@ void func_8009E730(PlayState* play) { gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - - if (ResourceMgr_IsGameMasterQuest()) { - gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sZorasDomainEntranceTextures_MQ[gSaveContext.nightFlag])); - } else { - gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sZorasDomainEntranceTextures[gSaveContext.nightFlag])); - } + + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sZorasDomainEntranceTextures[gSaveContext.nightFlag])); { s32 pad[2]; } @@ -2136,11 +1342,7 @@ void func_8009F1B4(PlayState* play) { { s32 pad[2]; } - if (ResourceMgr_IsGameMasterQuest()) { - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A380_MQ[gSaveContext.nightFlag])); - } else { - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A380[gSaveContext.nightFlag])); - } + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A380[gSaveContext.nightFlag])); CLOSE_DISPS(play->state.gfxCtx); } @@ -2273,11 +1475,7 @@ void func_8009F9D0(PlayState* play) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - if (ResourceMgr_IsGameMasterQuest()) { - gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sGoronCityEntranceTextures_MQ[gSaveContext.nightFlag])); - } else { - gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sGoronCityEntranceTextures[gSaveContext.nightFlag])); - } + gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sGoronCityEntranceTextures[gSaveContext.nightFlag])); { s32 pad[2]; } @@ -2295,11 +1493,7 @@ void func_8009FB74(PlayState* play) { { s32 pad[2]; } - if (ResourceMgr_IsGameMasterQuest()) { - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sLonLonRanchWindowTextures_MQ[gSaveContext.nightFlag])); - } else { - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sLonLonRanchWindowTextures[gSaveContext.nightFlag])); - } + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sLonLonRanchWindowTextures[gSaveContext.nightFlag])); gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); diff --git a/soh/src/code/z_sram.c b/soh/src/code/z_sram.c index 753dd1c02..9a132fa7e 100644 --- a/soh/src/code/z_sram.c +++ b/soh/src/code/z_sram.c @@ -10,6 +10,8 @@ void Save_LoadFile(void); +void BossRush_InitSave(void); + /** * Initialize new save. * This save has an empty inventory with 3 hearts and single magic. @@ -33,8 +35,28 @@ void Sram_InitDebugSave(void) { void Sram_InitBossRushSave(void) { Save_InitFile(false); + BossRush_InitSave(); } +static s16 sDungeonEntrances[] = { + ENTR_DEKU_TREE_0, // SCENE_DEKU_TREE + ENTR_DODONGOS_CAVERN_0, // SCENE_DODONGOS_CAVERN + ENTR_JABU_JABU_0, // SCENE_JABU_JABU + ENTR_FOREST_TEMPLE_0, // SCENE_FOREST_TEMPLE + ENTR_FIRE_TEMPLE_0, // SCENE_FIRE_TEMPLE + ENTR_WATER_TEMPLE_0, // SCENE_WATER_TEMPLE + ENTR_SPIRIT_TEMPLE_0, // SCENE_SPIRIT_TEMPLE + ENTR_SHADOW_TEMPLE_0, // SCENE_SHADOW_TEMPLE + ENTR_BOTTOM_OF_THE_WELL_0, // SCENE_BOTTOM_OF_THE_WELL + ENTR_ICE_CAVERN_0, // SCENE_ICE_CAVERN + ENTR_GANONS_TOWER_0, // SCENE_GANONS_TOWER + ENTR_GERUDO_TRAINING_GROUND_0, // SCENE_GERUDO_TRAINING_GROUND + ENTR_THIEVES_HIDEOUT_0, // SCENE_THIEVES_HIDEOUT + ENTR_INSIDE_GANONS_CASTLE_0, // SCENE_INSIDE_GANONS_CASTLE + ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_0, // SCENE_GANONS_TOWER_COLLAPSE_INTERIOR + ENTR_INSIDE_GANONS_CASTLE_COLLAPSE_0, // SCENE_INSIDE_GANONS_CASTLE_COLLAPSE +}; + /** * Copy save currently on the buffer to Save Context and complete various tasks to open the save. * This includes: @@ -46,10 +68,6 @@ void Sram_InitBossRushSave(void) { * - Revert any trade items that spoil */ void Sram_OpenSave() { - static s16 dungeonEntrances[] = { - 0x0000, 0x0004, 0x0028, 0x0169, 0x0165, 0x0010, 0x0082, 0x0037, - 0x0098, 0x0088, 0x041B, 0x0008, 0x0486, 0x0467, 0x0179, 0x056C, - }; u16 i; u16 j; u8* ptr; @@ -73,45 +91,45 @@ void Sram_OpenSave() { case SCENE_GERUDO_TRAINING_GROUND: case SCENE_THIEVES_HIDEOUT: case SCENE_INSIDE_GANONS_CASTLE: - gSaveContext.entranceIndex = dungeonEntrances[gSaveContext.savedSceneNum]; + gSaveContext.entranceIndex = sDungeonEntrances[gSaveContext.savedSceneNum]; break; case SCENE_DEKU_TREE_BOSS: - gSaveContext.entranceIndex = 0; + gSaveContext.entranceIndex = ENTR_DEKU_TREE_0; break; case SCENE_DODONGOS_CAVERN_BOSS: - gSaveContext.entranceIndex = 4; + gSaveContext.entranceIndex = ENTR_DODONGOS_CAVERN_0; break; case SCENE_JABU_JABU_BOSS: - gSaveContext.entranceIndex = 0x28; + gSaveContext.entranceIndex = ENTR_JABU_JABU_0; break; case SCENE_FOREST_TEMPLE_BOSS: - gSaveContext.entranceIndex = 0x169; + gSaveContext.entranceIndex = ENTR_FOREST_TEMPLE_0; break; case SCENE_FIRE_TEMPLE_BOSS: - gSaveContext.entranceIndex = 0x165; + gSaveContext.entranceIndex = ENTR_FIRE_TEMPLE_0; break; case SCENE_WATER_TEMPLE_BOSS: - gSaveContext.entranceIndex = 0x10; + gSaveContext.entranceIndex = ENTR_WATER_TEMPLE_0; break; case SCENE_SPIRIT_TEMPLE_BOSS: - gSaveContext.entranceIndex = 0x82; + gSaveContext.entranceIndex = ENTR_SPIRIT_TEMPLE_0; break; case SCENE_SHADOW_TEMPLE_BOSS: - gSaveContext.entranceIndex = 0x37; + gSaveContext.entranceIndex = ENTR_SHADOW_TEMPLE_0; break; case SCENE_GANONS_TOWER_COLLAPSE_INTERIOR: case SCENE_INSIDE_GANONS_CASTLE_COLLAPSE: case SCENE_GANONDORF_BOSS: case SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR: case SCENE_GANON_BOSS: - gSaveContext.entranceIndex = 0x41B; + gSaveContext.entranceIndex = ENTR_GANONS_TOWER_0; break; default: if (gSaveContext.savedSceneNum != SCENE_LINKS_HOUSE) { - gSaveContext.entranceIndex = (LINK_AGE_IN_YEARS == YEARS_CHILD) ? 0xBB : 0x5F4; + gSaveContext.entranceIndex = (LINK_AGE_IN_YEARS == YEARS_CHILD) ? ENTR_LINKS_HOUSE_0 : ENTR_TEMPLE_OF_TIME_7; } else { - gSaveContext.entranceIndex = 0xBB; + gSaveContext.entranceIndex = ENTR_LINKS_HOUSE_0; } break; } @@ -206,7 +224,7 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx) { Sram_InitDebugSave(); } - gSaveContext.entranceIndex = 0xBB; + gSaveContext.entranceIndex = ENTR_LINKS_HOUSE_0; gSaveContext.linkAge = 1; gSaveContext.dayTime = 0x6AAB; gSaveContext.cutsceneIndex = 0xFFF1; @@ -221,10 +239,14 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx) { gSaveContext.n64ddFlag = fileChooseCtx->n64ddFlag; + u8 currentQuest = fileChooseCtx->questType[fileChooseCtx->buttonIndex]; + if (Randomizer_IsSeedGenerated()) { gSaveContext.questId = QUEST_RANDOMIZER; Randomizer_InitSaveFile(); + } else if (currentQuest == QUEST_MASTER) { + gSaveContext.questId = QUEST_MASTER; } Save_SaveFile(); diff --git a/soh/src/code/z_vr_box.c b/soh/src/code/z_vr_box.c index b77c3d869..ff2622187 100644 --- a/soh/src/code/z_vr_box.c +++ b/soh/src/code/z_vr_box.c @@ -417,7 +417,12 @@ void func_800AEFC8(SkyboxContext* skyboxCtx, s16 skyboxId) { s32 j; s32 phi_s3 = 0; - if (skyboxId == SKYBOX_BAZAAR || (skyboxId > SKYBOX_HOUSE_KAKARIKO && skyboxId <= SKYBOX_BOMBCHU_SHOP)) { + //! @bug All shops only provide 2 faces for their sky box. Mask shop is missing from the condition + // meaning that the Mask shop will calculate 4 faces + // This effect is not noticed as the faces are behind the camera, but will cause a crash in SoH. + // SOH General: We have added the Mask shop to this check so only the 2 expected faces are calculated. + if (skyboxId == SKYBOX_BAZAAR || skyboxId == SKYBOX_HAPPY_MASK_SHOP || + (skyboxId >= SKYBOX_KOKIRI_SHOP && skyboxId <= SKYBOX_BOMBCHU_SHOP)) { for (j = 0, i = 0; i < 2; i++, j += 2) { phi_s3 = func_800ADBB0(skyboxCtx, skyboxCtx->roomVtx, phi_s3, D_8012AEBC[i].unk_0, D_8012AEBC[i].unk_4, D_8012AEBC[i].unk_8, D_8012AEBC[i].unk_C, D_8012AEBC[i].unk_10, i, j); diff --git a/soh/src/code/z_vr_box_draw.c b/soh/src/code/z_vr_box_draw.c index 8eb97573e..5b4867121 100644 --- a/soh/src/code/z_vr_box_draw.c +++ b/soh/src/code/z_vr_box_draw.c @@ -59,8 +59,14 @@ void SkyboxDraw_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyb gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dListBuf[2]); gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dListBuf[3]); - if (skyboxId != SKYBOX_BAZAAR) { - if (skyboxId <= SKYBOX_HOUSE_KAKARIKO || skyboxId > SKYBOX_BOMBCHU_SHOP) { + //! @bug All shops only provide 2 faces for their sky box. Mask shop is missing from the condition + // meaning that the Mask shop will render the previously loaded sky box values, or uninitialized data. + // This effect is not noticed as the faces are behind the camera, but will cause a crash in SoH. + // SOH General: We have added the Mask shop to this check so only the 2 expected faces are rendered. + if (skyboxId != SKYBOX_BAZAAR && skyboxId != SKYBOX_HAPPY_MASK_SHOP) { + if (skyboxId < SKYBOX_KOKIRI_SHOP || skyboxId > SKYBOX_BOMBCHU_SHOP) { + // Skip remaining faces for most shop skyboxes + gDPPipeSync(POLY_OPA_DISP++); gDPLoadTLUT_pal256(POLY_OPA_DISP++, skyboxCtx->palettes[2]); gSPDisplayList(POLY_OPA_DISP++, skyboxCtx->dListBuf[4]); diff --git a/soh/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c b/soh/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c index fc7b36cb9..9bfce3603 100644 --- a/soh/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c +++ b/soh/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c @@ -438,8 +438,8 @@ void func_808809E4(BgHakaTrap* this, PlayState* play, s16 arg2) { if ((fabsf(sp18.x) < 70.0f) && (fabsf(sp18.y) < 100.0f) && (sp18.z < 500.0f) && (GET_PLAYER(play)->currentBoots != PLAYER_BOOTS_IRON)) { - player->windSpeed = ((500.0f - sp18.z) * 0.06f + 5.0f) * arg2 * (1.0f / 0x3A00) * (2.0f / 3.0f); - player->windDirection = this->dyna.actor.shape.rot.y; + player->pushedSpeed = ((500.0f - sp18.z) * 0.06f + 5.0f) * arg2 * (1.0f / 0x3A00) * (2.0f / 3.0f); + player->pushedYaw = this->dyna.actor.shape.rot.y; } } diff --git a/soh/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c b/soh/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c index 8019d414e..0fb728661 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c @@ -224,10 +224,10 @@ void BgSpot00Hanebasi_Update(Actor* thisx, PlayState* play) { Flags_SetEventChkInf(EVENTCHKINF_DRAWBRIDGE_OPENED_AFTER_ZELDA_FLED); this->actionFunc = BgSpot00Hanebasi_DoNothing; func_8002DF54(play, &player->actor, 8); - play->nextEntranceIndex = 0x00CD; + play->nextEntranceIndex = ENTR_HYRULE_FIELD_0; gSaveContext.nextCutsceneIndex = 0xFFF1; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 4; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK_FAST; } else if (Actor_IsFacingAndNearPlayer(&this->dyna.actor, 3000.0f, 0x7530)) { play->envCtx.gloomySkyMode = 1; } diff --git a/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index e90e36e80..f4c46d952 100644 --- a/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -5,9 +5,21 @@ #include "scenes/dungeons/ddan_boss/ddan_boss_room_1.h" #include "soh/frame_interpolation.h" #include "soh/Enhancements/boss-rush/BossRush.h" +#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" + +#include // malloc +#include // memcpy + +// OTRTODO: Replace usage of this method when we can clear the cache +// for a single texture without the need of a DL opcode in the render code +void gfx_texture_cache_clear(); #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_WHILE_CULLED | ACTOR_FLAG_DRAW_WHILE_CULLED) +#define LAVA_TEX_WIDTH 32 +#define LAVA_TEX_HEIGHT 64 +#define LAVA_TEX_SIZE 2048 + void BossDodongo_Init(Actor* thisx, PlayState* play); void BossDodongo_Destroy(Actor* thisx, PlayState* play); void BossDodongo_Update(Actor* thisx, PlayState* play); @@ -59,6 +71,13 @@ static u8 sMaskTex8x8[8 * 8] = { { 0 } }; static u8 sMaskTex8x32[8 * 32] = { { 0 } }; static u8 sMaskTexLava[32 * 64] = { { 0 } }; +static u32* sLavaFloorModifiedTexRaw = NULL; +static u32* sLavaWavyTexRaw = NULL; +static u16 sLavaFloorModifiedTex[LAVA_TEX_SIZE]; +static u16 sLavaWavyTex[LAVA_TEX_SIZE]; + +static u8 hasRegisteredBlendedHook = 0; + static InitChainEntry sInitChain[] = { ICHAIN_U8(targetMode, 5, ICHAIN_CONTINUE), ICHAIN_S8(naviEnemyId, 0x0C, ICHAIN_CONTINUE), @@ -66,6 +85,69 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(targetArrowOffset, 8200.0f, ICHAIN_STOP), }; +void BossDodongo_RegisterBlendedLavaTextureUpdate() { + // Not in scene so there is nothing to do + if (gPlayState == NULL || gPlayState->sceneNum != SCENE_DODONGOS_CAVERN_BOSS) { + return; + } + + // Free old textures + if (sLavaFloorModifiedTexRaw != NULL) { + free(sLavaFloorModifiedTexRaw); + sLavaFloorModifiedTexRaw = NULL; + } + if (sLavaWavyTexRaw != NULL) { + free(sLavaWavyTexRaw); + sLavaWavyTexRaw = NULL; + } + + // Unload original textures to bypass cache result for lookups + ResourceMgr_UnloadOriginalWhenAltExists(sLavaFloorLavaTex); + ResourceMgr_UnloadOriginalWhenAltExists(sLavaFloorRockTex); + ResourceMgr_UnloadOriginalWhenAltExists(gDodongosCavernBossLavaFloorTex); + + // When the texture is HD (raw) we need to work with u32 values for RGBA32 + // Otherwise the original asset is u16 for RGBA16 + if (ResourceMgr_TexIsRaw(gDodongosCavernBossLavaFloorTex)) { + u32* lavaTex = ResourceGetDataByName(sLavaFloorLavaTex); + size_t lavaSize = ResourceGetSizeByName(sLavaFloorLavaTex); + size_t floorSize = ResourceGetSizeByName(gDodongosCavernBossLavaFloorTex); + + sLavaFloorModifiedTexRaw = malloc(lavaSize); + sLavaWavyTexRaw = malloc(floorSize); + + memcpy(sLavaFloorModifiedTexRaw, lavaTex, lavaSize); + + // When KD is dead, just immediately copy the rock texture + if (Flags_GetClear(gPlayState, gPlayState->roomCtx.curRoom.num)) { + u32* rockTex = ResourceGetDataByName(sLavaFloorRockTex); + size_t rockSize = ResourceGetSizeByName(sLavaFloorRockTex); + memcpy(sLavaFloorModifiedTexRaw, rockTex, rockSize); + } + + memcpy(sLavaWavyTexRaw, sLavaFloorModifiedTexRaw, floorSize); + + // Register the blended effect for the raw texture + Gfx_RegisterBlendedTexture(gDodongosCavernBossLavaFloorTex, sMaskTexLava, sLavaWavyTexRaw); + } else { + // When KD is dead, just immediately copy the rock texture + if (Flags_GetClear(gPlayState, gPlayState->roomCtx.curRoom.num)) { + u16* rockTex = ResourceGetDataByName(sLavaFloorRockTex); + memcpy(sLavaFloorModifiedTex, rockTex, sizeof(sLavaFloorModifiedTex)); + } else { + u16* lavaTex = ResourceGetDataByName(sLavaFloorLavaTex); + memcpy(sLavaFloorModifiedTex, lavaTex, sizeof(sLavaFloorModifiedTex)); + } + + // Register the blended effect for the non-raw texture + memcpy(sLavaWavyTex, sLavaFloorModifiedTex, sizeof(sLavaWavyTex)); + + Gfx_RegisterBlendedTexture(gDodongosCavernBossLavaFloorTex, sMaskTexLava, sLavaWavyTex); + } + + gfx_texture_cache_clear(); +} + void func_808C12C4(u8* arg1, s16 arg2) { if (arg2[arg1] != 0) { sMaskTex8x16[arg2 / 2] = 1; @@ -86,12 +168,51 @@ void func_808C12C4(u8* arg1, s16 arg2) { } } -void func_808C1554(void* arg0, void* floorTex, s32 arg2, f32 arg3) { - arg0 = GetResourceDataByNameHandlingMQ(arg0); - floorTex = ResourceGetDataByName(floorTex); +// Same as func_808C1554 but works with u32 values for RGBA32 raw textures +void func_808C1554_Raw(void* arg0, void* floorTex, s32 arg2, f32 arg3) { + u16 width = ResourceGetTexWidthByName(arg0); + s32 size = ResourceGetTexHeightByName(arg0) * width; - u16* temp_s3 = SEGMENTED_TO_VIRTUAL(arg0); - u16* temp_s1 = SEGMENTED_TO_VIRTUAL(floorTex); + u32* temp_s3 = sLavaWavyTexRaw; + u32* temp_s1 = sLavaFloorModifiedTexRaw; + s32 i; + s32 i2; + u32* sp54 = malloc(size * sizeof(u32)); // Match the size for lava floor tex + s32 temp; + s32 temp2; + + // Multiplier is used to try to scale the wavy effect to match the scale of the HD texture + // Applying sqrt(multiplier) to arg3 is to control how many pixels move left/right for the selected row + // Applying to arg2 and M_PI help to space out the wave effect + // It's not perfect but close enough + u16 multiplier = width / LAVA_TEX_WIDTH; + + for (i = 0; i < size; i += width) { + temp = sinf((((i / width) + (s32)(((arg2 * multiplier) * 50.0f) / 100.0f)) & (width - 1)) * (M_PI / (16 * multiplier))) * (arg3 * sqrt(multiplier)); + for (i2 = 0; i2 < width; i2++) { + sp54[i + ((temp + i2) & (width - 1))] = temp_s1[i + i2]; + } + } + for (i = 0; i < width; i++) { + temp = sinf(((i + (s32)(((arg2 * multiplier) * 80.0f) / 100.0f)) & (width - 1)) * (M_PI / (16 * multiplier))) * (arg3 * sqrt(multiplier)); + temp *= width; + for (i2 = 0; i2 < size; i2 += width) { + temp2 = (temp + i2) & (size - 1); + temp_s3[i + temp2] = sp54[i + i2]; + } + } + + free(sp54); + + // Need to clear the cache after updating sLavaWavyTexRaw + gfx_texture_cache_clear(); +} + +// Modified to support CPU modified texture with the resource system +// Used for the original non-raw asset working with u16 values +void func_808C1554(void* arg0, void* floorTex, s32 arg2, f32 arg3) { + u16* temp_s3 = sLavaWavyTex; + u16* temp_s1 = sLavaFloorModifiedTex; s16 i; s16 i2; u16 sp54[2048]; @@ -112,6 +233,9 @@ void func_808C1554(void* arg0, void* floorTex, s32 arg2, f32 arg3) { temp_s3[i + temp2] = sp54[i + i2]; } } + + // Need to clear the cache after updating sLavaWavyTex + gfx_texture_cache_clear(); } void func_808C17C8(PlayState* play, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3, f32 arg4, s16 arg5) { @@ -187,27 +311,21 @@ void BossDodongo_Init(Actor* thisx, PlayState* play) { Collider_SetJntSph(play, &this->collider, &this->actor, &sJntSphInit, this->items); if (Flags_GetClear(play, play->roomCtx.curRoom.num)) { // KD is dead - u16* LavaFloorTex = ResourceGetDataByName(gDodongosCavernBossLavaFloorTex); - u16* LavaFloorRockTex = ResourceGetDataByName(sLavaFloorRockTex); - temp_s1_3 = SEGMENTED_TO_VIRTUAL(LavaFloorTex); - temp_s2 = SEGMENTED_TO_VIRTUAL(LavaFloorRockTex); + // SOH [General] + // Applying the "cooled off" lava rock CPU modified texture for re-visiting the scene + // is now handled by BossDodongo_RegisterBlendedLavaTextureUpdate below + Actor_Kill(&this->actor); Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, -890.0f, -1523.76f, -3304.0f, 0, 0, 0, WARP_DUNGEON_CHILD); Actor_Spawn(&play->actorCtx, play, ACTOR_BG_BREAKWALL, -890.0f, -1523.76f, -3304.0f, 0, 0, 0, 0x6000, true); Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, -690.0f, -1523.76f, -3304.0f, 0, 0, 0, 0, true); - - for (int i = 0; i < ARRAY_COUNT(sMaskTexLava); i++) { - sMaskTexLava[i] = 1; - } - } else { - for (int i = 0; i < ARRAY_COUNT(sMaskTexLava); i++) { - sMaskTexLava[i] = 0; - } } this->actor.flags &= ~ACTOR_FLAG_TARGETABLE; + // #region SOH [General] + // Init mask values for all blended textures for (int i = 0; i < ARRAY_COUNT(sMaskTex8x16); i++) { sMaskTex8x16[i] = 0; } @@ -223,6 +341,12 @@ void BossDodongo_Init(Actor* thisx, PlayState* play) { for (int i = 0; i < ARRAY_COUNT(sMaskTex32x16); i++) { sMaskTex32x16[i] = 0; } + // Set all true for the lava as it will always replace the scene texture + for (int i = 0; i < ARRAY_COUNT(sMaskTexLava); i++) { + sMaskTexLava[i] = 1; + } + + // Register all blended textures Gfx_RegisterBlendedTexture(object_kingdodongo_Tex_015890, sMaskTex8x16, NULL); Gfx_RegisterBlendedTexture(object_kingdodongo_Tex_017210, sMaskTex8x32, NULL); Gfx_RegisterBlendedTexture(object_kingdodongo_Tex_015D90, sMaskTex16x16, NULL); @@ -234,10 +358,14 @@ void BossDodongo_Init(Actor* thisx, PlayState* play) { Gfx_RegisterBlendedTexture(object_kingdodongo_Tex_016990, sMaskTex32x16, NULL); Gfx_RegisterBlendedTexture(object_kingdodongo_Tex_016E10, sMaskTex32x16, NULL); - // OTRTODO: This is causing OOB memory reads with HD assets - // commenting this out means the lava will stay lava even after beating king d - // - // Gfx_RegisterBlendedTexture(gDodongosCavernBossLavaFloorTex, sMaskTexLava, sLavaFloorRockTex); + BossDodongo_RegisterBlendedLavaTextureUpdate(); + + // Register alt listener to update the blended lava for the replacement texture based on alt path + if (!hasRegisteredBlendedHook) { + GameInteractor_RegisterOnAssetAltChange(BossDodongo_RegisterBlendedLavaTextureUpdate); + hasRegisteredBlendedHook = 1; + } + // #endregion } void BossDodongo_Destroy(Actor* thisx, PlayState* play) { @@ -970,7 +1098,7 @@ void BossDodongo_Update(Actor* thisx, PlayState* play2) { magmaScale = ((s16)(Rand_ZeroOne() * 50)) - 50; } - if (player2->csMode >= 10) { + if (player2->csAction >= 10) { phi_s0_3 = -1; } @@ -1014,21 +1142,64 @@ void BossDodongo_Update(Actor* thisx, PlayState* play2) { } } - // TODO The lave floor bubbles with an effect that modifies the texture. This needs to be recreated shader-side. - //func_808C1554(gDodongosCavernBossLavaFloorTex, sLavaFloorLavaTex, this->unk_19E, this->unk_224); + // The lava bubbles with a wavy effect as a CPU modified texture + // This has been done by maintaining copied/modified texture values in the actor code + // The "cooling off" effect for the lava is pre-applied to the lava texture before applying + // the wavy effect. Since this is two effects and closely related to the actor, I've opted + // to handle them here rather than as a shader effect. + // + // Apply the corresponding wavy effect based on the texture being raw or not + if (ResourceMgr_TexIsRaw(gDodongosCavernBossLavaFloorTex)) { + func_808C1554_Raw(gDodongosCavernBossLavaFloorTex, sLavaFloorLavaTex, this->unk_19E, this->unk_224); + } else { + func_808C1554(gDodongosCavernBossLavaFloorTex, sLavaFloorLavaTex, this->unk_19E, this->unk_224); + } } + // Apply the "cooling off" effect for the lava if (this->unk_1C6 != 0) { - u16* ptr1 = ResourceGetDataByName(sLavaFloorLavaTex); - u16* ptr2 = ResourceGetDataByName(sLavaFloorRockTex); - s16 i2; + // Similar to above, the cooling off effect is a CPU modified texture effect + // Apply corresponding to the texture being raw or not + if (ResourceMgr_TexIsRaw(sLavaFloorRockTex)) { + u32* ptr1 = sLavaFloorModifiedTexRaw; + u32* ptr2 = ResourceGetDataByName(sLavaFloorRockTex); + u16 width = ResourceGetTexWidthByName(sLavaFloorRockTex); + u16 height = ResourceGetTexHeightByName(sLavaFloorRockTex); + s16 i2; - for (i2 = 0; i2 < 20; i2++) { - s16 new_var = this->unk_1C2 & 0x7FF; + // Get the scale based on the original texture size + u16 widthScale = width / LAVA_TEX_WIDTH; + u16 heightScale = height / LAVA_TEX_HEIGHT; + u32 size = width * height; - sMaskTexLava[new_var] = 1; - this->unk_1C2 += 37; + for (i2 = 0; i2 < 20; i2++) { + s16 new_var = this->unk_1C2 & (LAVA_TEX_SIZE - 1); + // Compute the index to a scaled position (scaling pseudo x,y as a 1D value) + s32 indexStart = ((new_var % LAVA_TEX_WIDTH) * widthScale) + ((new_var / LAVA_TEX_WIDTH) * width * heightScale); + + // From the starting index, apply extra pixels right/down based on the scale + for (size_t j = 0; j < heightScale; j++) { + for (size_t i3 = 0; i3 < widthScale; i3++) { + s32 scaledIndex = (indexStart + i3 + (j * width)) & (size - 1); + ptr1[scaledIndex] = ptr2[scaledIndex]; + } + } + + this->unk_1C2 += 37; + } + } else { + u16* ptr1 = sLavaFloorModifiedTex; + u16* ptr2 = ResourceGetDataByName(sLavaFloorRockTex); + s16 i2; + + for (i2 = 0; i2 < 20; i2++) { + s16 new_var = this->unk_1C2 & 0x7FF; + + ptr1[new_var] = ptr2[new_var]; + this->unk_1C2 += 37; + } } + Math_SmoothStepToF(&this->unk_224, 0.0f, 1.0f, 0.01f, 0.0f); } diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c index 6b8d2df5c..ebc244d74 100644 --- a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -1538,15 +1538,15 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) { } if (this->csTimer == 180) { - play->sceneLoadFlag = 0x14; + play->transitionTrigger = TRANS_TRIGGER_START; if ((IS_RANDO && Randomizer_GetSettingValue(RSK_SKIP_TOWER_ESCAPE) || IS_BOSS_RUSH)) { Flags_SetEventChkInf(EVENTCHKINF_WATCHED_GANONS_CASTLE_COLLAPSE_CAUGHT_BY_GERUDO); - play->nextEntranceIndex = 0x517; + play->nextEntranceIndex = ENTR_GANON_BOSS_0; } else { - play->nextEntranceIndex = 0x43F; + play->nextEntranceIndex = ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_0; } - play->fadeTransition = 5; + play->transitionType = TRANS_TYPE_FADE_WHITE_FAST; } break; diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index cb00dbee8..5ec12f093 100644 --- a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -1856,10 +1856,10 @@ void func_8090120C(BossGanon2* this, PlayState* play) { break; } case 20: - play->nextEntranceIndex = 0x6B; + play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0; gSaveContext.nextCutsceneIndex = 0xFFF2; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 3; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE; play->linkAgeOnLoad = 1; break; } diff --git a/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index a8d992ca9..78534e851 100644 --- a/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -854,7 +854,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) { if (&this->actor == player->actor.parent) { player->unk_850 = 0x65; player->actor.parent = NULL; - player->csMode = 0; + player->csAction = 0; if (this->timers[0] == 0) { func_8002F6D4(play, &this->actor, 20.0f, this->actor.shape.rot.y + 0x8000, 10.0f, 0); } @@ -884,7 +884,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) { if (&this->actor == player->actor.parent) { player->unk_850 = 0x65; player->actor.parent = NULL; - player->csMode = 0; + player->csAction = 0; } Math_ApproachF(&this->tentRippleSize, 0.15f, 0.5f, 0.01); if (this->meltIndex < 41) { @@ -1806,7 +1806,7 @@ void BossMo_CoreCollisionCheck(BossMo* this, PlayState* play) { if (player->actor.parent != NULL) { player->unk_850 = 0x65; player->actor.parent = NULL; - player->csMode = 0; + player->csAction = 0; } } else { this->actor.colChkInfo.health = 1; @@ -1825,7 +1825,7 @@ void BossMo_CoreCollisionCheck(BossMo* this, PlayState* play) { if (player->actor.parent == &sMorphaTent1->actor) { player->unk_850 = 0x65; player->actor.parent = NULL; - player->csMode = 0; + player->csAction = 0; } } this->work[MO_TENT_ACTION_STATE] = MO_CORE_STUNNED; diff --git a/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index dc19f2d7d..9e4dd6119 100644 --- a/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -332,7 +332,7 @@ void DemoEffect_Init(Actor* thisx, PlayState* play2) { break; case DEMO_EFFECT_GOD_LGT_NAYRU: - if (gSaveContext.entranceIndex == 0x013D) { + if (gSaveContext.entranceIndex == ENTR_DEATH_MOUNTAIN_TRAIL_0) { Actor_SetScale(&this->actor, 1.0f); } else { Actor_SetScale(&this->actor, 0.1f); @@ -353,7 +353,7 @@ void DemoEffect_Init(Actor* thisx, PlayState* play2) { break; case DEMO_EFFECT_GOD_LGT_FARORE: - if (gSaveContext.entranceIndex == 0x00EE) { + if (gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_0) { Actor_SetScale(&this->actor, 2.4f); } else { Actor_SetScale(&this->actor, 0.1f); @@ -635,7 +635,7 @@ void DemoEffect_UpdateGetItem(DemoEffect* this, PlayState* play) { Actor_SetScale(thisx, 0.20f); - if (gSaveContext.entranceIndex == 0x0053 || (IS_RANDO && gSaveContext.entranceIndex == 0x05F4)) { + if (gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_0 || (IS_RANDO && gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_7)) { switch (play->csCtx.npcActions[this->csActionId]->action) { case 2: DemoEffect_MedalSparkle(this, play, 0); @@ -647,8 +647,8 @@ void DemoEffect_UpdateGetItem(DemoEffect* this, PlayState* play) { } switch (play->csCtx.npcActions[this->csActionId]->action) { case 2: - if (gSaveContext.entranceIndex == 0x0053 || - (IS_RANDO && gSaveContext.entranceIndex == 0x05F4)) { + if (gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_0 || + (IS_RANDO && gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_7)) { Audio_PlayActorSound2(thisx, NA_SE_EV_MEDAL_APPEAR_L - SFX_FLAG); } else { func_800788CC(NA_SE_EV_MEDAL_APPEAR_S - SFX_FLAG); @@ -663,8 +663,8 @@ void DemoEffect_UpdateGetItem(DemoEffect* this, PlayState* play) { if (this->getItem.drawId != GID_ARROW_LIGHT) { this->actor.shape.rot.y += this->getItem.rotation; } - if (gSaveContext.entranceIndex == 0x0053 || - (IS_RANDO && gSaveContext.entranceIndex == 0x05F4)) { + if (gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_0 || + (IS_RANDO && gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_7)) { Audio_PlayActorSound2(thisx, NA_SE_EV_MEDAL_APPEAR_L - SFX_FLAG); } else { func_800788CC(NA_SE_EV_MEDAL_APPEAR_S - SFX_FLAG); @@ -703,7 +703,7 @@ void DemoEffect_InitTimeWarp(DemoEffect* this, PlayState* play) { Actor_SetScale(&this->actor, 84 * 0.001f); } } else if (gSaveContext.sceneSetupIndex == 5 || gSaveContext.sceneSetupIndex == 4 || - (gSaveContext.entranceIndex == 0x0324 && !((Flags_GetEventChkInf(EVENTCHKINF_TIME_TRAVELED_TO_ADULT))))) { + (gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_4 && !((Flags_GetEventChkInf(EVENTCHKINF_TIME_TRAVELED_TO_ADULT))))) { SkelCurve_SetAnim(&this->skelCurve, &gTimeWarpAnim, 1.0f, 59.0f, 59.0f, 0.0f); SkelCurve_Update(play, &this->skelCurve); this->updateFunc = DemoEffect_UpdateTimeWarpReturnFromChamberOfSages; @@ -766,7 +766,7 @@ void DemoEffect_UpdateTimeWarpReturnFromChamberOfSages(DemoEffect* this, PlaySta this->timeWarp.shrinkTimer++; if (this->timeWarp.shrinkTimer > 250) { - if (gSaveContext.entranceIndex == 0x0324) { + if (gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_4) { Flags_SetEventChkInf(EVENTCHKINF_TIME_TRAVELED_TO_ADULT); } @@ -858,7 +858,7 @@ void DemoEffect_UpdateTriforceSpot(DemoEffect* this, PlayState* play) { } } - if (gSaveContext.entranceIndex == 0x00A0 && gSaveContext.sceneSetupIndex == 6 && + if (gSaveContext.entranceIndex == ENTR_CUTSCENE_MAP_0 && gSaveContext.sceneSetupIndex == 6 && play->csCtx.frames == 143) { Audio_PlayActorSound2(&this->actor, NA_SE_IT_DM_RING_EXPLOSION); } @@ -1153,7 +1153,7 @@ void DemoEffect_UpdateGodLgtDin(DemoEffect* this, PlayState* play) { } } - if (gSaveContext.entranceIndex == 0x00A0) { + if (gSaveContext.entranceIndex == ENTR_CUTSCENE_MAP_0) { switch (gSaveContext.sceneSetupIndex) { case 4: if (play->csCtx.frames == 288) { @@ -1208,7 +1208,7 @@ void DemoEffect_UpdateGodLgtNayru(DemoEffect* this, PlayState* play) { } } - if (gSaveContext.entranceIndex == 0x00A0) { + if (gSaveContext.entranceIndex == ENTR_CUTSCENE_MAP_0) { switch (gSaveContext.sceneSetupIndex) { case 4: if (play->csCtx.frames == 298) { @@ -1230,7 +1230,7 @@ void DemoEffect_UpdateGodLgtNayru(DemoEffect* this, PlayState* play) { } } - if (gSaveContext.entranceIndex == 0x013D && gSaveContext.sceneSetupIndex == 4) { + if (gSaveContext.entranceIndex == ENTR_DEATH_MOUNTAIN_TRAIL_0 && gSaveContext.sceneSetupIndex == 4) { if (play->csCtx.frames == 72) { Audio_PlayActorSound2(&this->actor, NA_SE_IT_DM_FLYING_GOD_DASH); } @@ -1268,7 +1268,7 @@ void DemoEffect_UpdateGodLgtFarore(DemoEffect* this, PlayState* play) { func_800F3F3C(3); } - if (gSaveContext.entranceIndex == 0x00A0) { + if (gSaveContext.entranceIndex == ENTR_CUTSCENE_MAP_0) { switch (gSaveContext.sceneSetupIndex) { case 4: if (play->csCtx.frames == 315) { @@ -1614,15 +1614,15 @@ void DemoEffect_UpdateJewelChild(DemoEffect* this, PlayState* play) { return; default: DemoEffect_MoveToCsEndpoint(this, play, this->csActionId, 0); - if (gSaveContext.entranceIndex == 0x0053 || - (IS_RANDO && gSaveContext.entranceIndex == 0x05F4)) { + if (gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_0 || + (IS_RANDO && gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_7)) { DemoEffect_MoveJewelSplit(&thisx->world, this); } break; } } - if (gSaveContext.entranceIndex == 0x0053 || (IS_RANDO && gSaveContext.entranceIndex == 0x05F4)) { + if (gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_0 || (IS_RANDO && gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_7)) { if (!Flags_GetEventChkInf(EVENTCHKINF_OPENED_THE_DOOR_OF_TIME)) { hasCmdAction = play->csCtx.state && play->csCtx.npcActions[this->csActionId]; if (!hasCmdAction) { @@ -1859,7 +1859,7 @@ void DemoEffect_DrawGodLgt(Actor* thisx, PlayState* play) { OPEN_DISPS(play->state.gfxCtx); if (!DemoEffect_CheckCsAction(this, play, 2)) { - if (gSaveContext.entranceIndex == 0x00A0) { + if (gSaveContext.entranceIndex == ENTR_CUTSCENE_MAP_0) { if (gSaveContext.sceneSetupIndex == 4) { if (play->csCtx.frames <= 680) { func_80078914(&this->actor.projectedPos, NA_SE_EV_GOD_FLYING - SFX_FLAG); @@ -2021,7 +2021,7 @@ void DemoEffect_DrawTriforceSpot(Actor* thisx, PlayState* play) { u32 frames = play->gameplayFrames; OPEN_DISPS(play->state.gfxCtx); - if (gSaveContext.entranceIndex != 0x0400 || play->csCtx.frames < 885) { + if (gSaveContext.entranceIndex != ENTR_CASTLE_COURTYARD_ZELDA_0 || play->csCtx.frames < 885) { Gfx_SetupDL_25Xlu(play->state.gfxCtx); if (this->triforceSpot.lightColumnOpacity > 0) { @@ -2137,7 +2137,7 @@ void DemoEffect_DrawTimeWarp(Actor* thisx, PlayState* play) { u8 effectType = (this->actor.params & 0x00FF); if (effectType == DEMO_EFFECT_TIMEWARP_TIMEBLOCK_LARGE || effectType == DEMO_EFFECT_TIMEWARP_TIMEBLOCK_SMALL || - Flags_GetEnv(play, 1) || gSaveContext.sceneSetupIndex >= 4 || gSaveContext.entranceIndex == 0x0324) { + Flags_GetEnv(play, 1) || gSaveContext.sceneSetupIndex >= 4 || gSaveContext.entranceIndex == ENTR_TEMPLE_OF_TIME_4) { OPEN_DISPS(gfxCtx); POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, 25); Matrix_Scale(2.0f, 2.0f, 2.0f, MTXMODE_APPLY); diff --git a/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index c72fdc4fd..4ddeec155 100644 --- a/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -869,12 +869,12 @@ void func_80986B2C(PlayState* play) { // In entrance rando have impa bring link back to the front of castle grounds if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_ENTRANCES)) { - play->nextEntranceIndex = 0x0138; + play->nextEntranceIndex = ENTR_HYRULE_CASTLE_0; } else { - play->nextEntranceIndex = 0xCD; + play->nextEntranceIndex = ENTR_HYRULE_FIELD_0; } - play->fadeTransition = 38; - play->sceneLoadFlag = 0x14; + play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST); + play->transitionTrigger = TRANS_TRIGGER_START; func_8002DF54(play, &player->actor, 8); } } @@ -913,14 +913,14 @@ void GivePlayerRandoRewardImpa(Actor* impa, PlayState* play, RandomizerCheck che GiveItemEntryFromActor(impa, play, getItemEntry, 75.0f, 50.0f); } else if (!Player_InBlockingCsMode(play, GET_PLAYER(play))) { Flags_SetEventChkInf(EVENTCHKINF_LEARNED_ZELDAS_LULLABY); - play->sceneLoadFlag = 0x14; - play->fadeTransition = 3; - gSaveContext.nextTransitionType = 3; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE; // In entrance rando have impa bring link back to the front of castle grounds if (Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_ENTRANCES)) { - play->nextEntranceIndex = 0x0138; + play->nextEntranceIndex = ENTR_HYRULE_CASTLE_0; } else { - play->nextEntranceIndex = 0x0594; + play->nextEntranceIndex = ENTR_HYRULE_FIELD_17; } gSaveContext.nextCutsceneIndex = 0; } diff --git a/soh/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/soh/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c index daa843d16..89628cc34 100644 --- a/soh/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/soh/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -549,7 +549,7 @@ void DemoKankyo_DrawRain(Actor* thisx, PlayState* play) { switch (this->unk_150[i].unk_22) { case 0: func_80989B54(thisx, play, i); - if (gSaveContext.entranceIndex == 0x00A0) { // Cutscene Map + if (gSaveContext.entranceIndex == ENTR_CUTSCENE_MAP_0) { // Cutscene Map this->unk_150[i].unk_0.y = Rand_ZeroOne() * 500.0f; } else { this->unk_150[i].unk_0.y = Rand_ZeroOne() * -500.0f; @@ -558,16 +558,16 @@ void DemoKankyo_DrawRain(Actor* thisx, PlayState* play) { break; case 1: temp_f12_2 = play->view.eye.y + (dy / norm) * 150.0f; - if (gSaveContext.entranceIndex == 0x00A0) { // Cutscene Map + if (gSaveContext.entranceIndex == ENTR_CUTSCENE_MAP_0) { // Cutscene Map this->unk_150[i].unk_0.y -= this->unk_150[i].unk_18; } else { this->unk_150[i].unk_0.y += this->unk_150[i].unk_18; } - if (gSaveContext.entranceIndex == 0x00A0) { // Cutscene Map + if (gSaveContext.entranceIndex == ENTR_CUTSCENE_MAP_0) { // Cutscene Map if (this->unk_150[i].unk_C.y + this->unk_150[i].unk_0.y < temp_f12_2 - 300.0f) { this->unk_150[i].unk_22++; } - } else if (gSaveContext.entranceIndex == 0x00CD) { // Hyrule Field + } else if (gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_0) { // Hyrule Field if (temp_f12_2 + 300.0f < this->unk_150[i].unk_C.y + this->unk_150[i].unk_0.y) { this->unk_150[i].unk_22++; } @@ -586,12 +586,12 @@ void DemoKankyo_DrawRain(Actor* thisx, PlayState* play) { Matrix_Translate(this->unk_150[i].unk_C.x + this->unk_150[i].unk_0.x, this->unk_150[i].unk_C.y + this->unk_150[i].unk_0.y, this->unk_150[i].unk_C.z + this->unk_150[i].unk_0.z, MTXMODE_NEW); - if (gSaveContext.entranceIndex != 0x00A0) { // Cutscene Map + if (gSaveContext.entranceIndex != ENTR_CUTSCENE_MAP_0) { // Cutscene Map Matrix_RotateX(M_PI, MTXMODE_APPLY); } gDPPipeSync(POLY_XLU_DISP++); - if (gSaveContext.entranceIndex == 0x00CD) { // Hyrule Field + if (gSaveContext.entranceIndex == ENTR_HYRULE_FIELD_0) { // Hyrule Field gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 0, 255); } else { diff --git a/soh/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/soh/src/overlays/actors/ovl_Door_Ana/z_door_ana.c index d5d5f7ea1..f3c601fa1 100644 --- a/soh/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/soh/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -57,9 +57,10 @@ static ColliderCylinderInit sCylinderInit = { }; // array of entrance table entries to grotto destinations -static s16 entrances[] = { - 0x036D, 0x003F, 0x0598, 0x059C, 0x05A0, 0x05A4, 0x05A8, 0x05AC, - 0x05B0, 0x05B4, 0x05B8, 0x05BC, 0x05C0, 0x05C4, 0x05FC, +static s16 sGrottoEntrances[] = { + ENTR_FAIRYS_FOUNTAIN_0, ENTR_GROTTOS_0, ENTR_GROTTOS_1, ENTR_GROTTOS_2, ENTR_GROTTOS_3, + ENTR_GROTTOS_4, ENTR_GROTTOS_5, ENTR_GROTTOS_6, ENTR_GROTTOS_7, ENTR_GROTTOS_8, + ENTR_GROTTOS_9, ENTR_GROTTOS_10, ENTR_GROTTOS_11, ENTR_GROTTOS_12, ENTR_GROTTOS_13, }; void DoorAna_SetupAction(DoorAna* this, DoorAnaActionFunc actionFunc) { @@ -133,7 +134,7 @@ void DoorAna_WaitOpen(DoorAna* this, PlayState* play) { player = GET_PLAYER(play); if (Math_StepToF(&this->actor.scale.x, 0.01f, 0.001f)) { - if ((this->actor.targetMode != 0) && (play->sceneLoadFlag == 0) && (player->stateFlags1 & 0x80000000) && + if ((this->actor.targetMode != 0) && (play->transitionTrigger == TRANS_TRIGGER_OFF) && (player->stateFlags1 & 0x80000000) && (player->unk_84F == 0)) { destinationIdx = ((this->actor.params >> 0xC) & 7) - 1; Play_SetupRespawnPoint(play, RESPAWN_MODE_RETURN, 0x4FF); @@ -143,7 +144,7 @@ void DoorAna_WaitOpen(DoorAna* this, PlayState* play) { if (destinationIdx < 0) { destinationIdx = this->actor.home.rot.z + 1; } - play->nextEntranceIndex = entrances[destinationIdx]; + play->nextEntranceIndex = sGrottoEntrances[destinationIdx]; // In ER, load the correct entrance based on the grotto link is falling into if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_ENTRANCES)) { diff --git a/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c index 5940f8c03..5ea64e232 100644 --- a/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -177,11 +177,11 @@ void DoorWarp1_SetupWarp(DoorWarp1* this, PlayState* play) { DoorWarp1_SetupAction(this, DoorWarp1_AwaitClearFlag); break; case WARP_DESTINATION: - if ((!(gSaveContext.entranceIndex == 0x608 || // sacred forest meadow - gSaveContext.entranceIndex == 0x564 || // death mountain crater - gSaveContext.entranceIndex == 0x60C || // lake hylia - gSaveContext.entranceIndex == 0x610 || // desert colossus - gSaveContext.entranceIndex == 0x580) && // graveyard + if ((!(gSaveContext.entranceIndex == ENTR_SACRED_FOREST_MEADOW_3 || // sacred forest meadow + gSaveContext.entranceIndex == ENTR_DEATH_MOUNTAIN_CRATER_5 || // death mountain crater + gSaveContext.entranceIndex == ENTR_LAKE_HYLIA_9 || // lake hylia + gSaveContext.entranceIndex == ENTR_DESERT_COLOSSUS_8 || // desert colossus + gSaveContext.entranceIndex == ENTR_GRAVEYARD_8) && // graveyard gSaveContext.sceneSetupIndex < 4) || (GET_PLAYER(play)->actor.params & 0xF00) != 0x200) { Actor_Kill(&this->actor); @@ -283,7 +283,7 @@ void DoorWarp1_SetupPurpleCrystal(DoorWarp1* this, PlayState* play) { this->unk_1BC = 1.f; this->actor.shape.yOffset = 800.0f; - if (gSaveContext.entranceIndex != 0x53) { + if (gSaveContext.entranceIndex != ENTR_TEMPLE_OF_TIME_0) { this->actor.scale.x = 0.0499f; this->actor.scale.y = 0.077f; this->actor.scale.z = 0.09f; @@ -567,22 +567,22 @@ void DoorWarp1_ChildWarpOut(DoorWarp1* this, PlayState* play) { this->warpTimer++; if (sWarpTimerTarget < this->warpTimer && gSaveContext.nextCutsceneIndex == 0xFFEF) { - osSyncPrintf("\n\n\nじかんがきたからおーしまい fade_direction=[%d]", play->sceneLoadFlag, 0x14); + osSyncPrintf("\n\n\nじかんがきたからおーしまい fade_direction=[%d]", play->transitionTrigger, TRANS_TRIGGER_START); if (play->sceneNum == SCENE_DODONGOS_CAVERN_BOSS) { if (!Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)) { Flags_SetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP); Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_DODONGOS_CAVERN); if (IS_RANDO) { - play->nextEntranceIndex = 0x47A; + play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_5; gSaveContext.nextCutsceneIndex = 0; } else { Item_Give(play, ITEM_GORON_RUBY); - play->nextEntranceIndex = 0x13D; + play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_0; gSaveContext.nextCutsceneIndex = 0xFFF1; } } else { - play->nextEntranceIndex = 0x47A; + play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_5; gSaveContext.nextCutsceneIndex = 0; } } else if (play->sceneNum == SCENE_DEKU_TREE_BOSS) { @@ -591,21 +591,21 @@ void DoorWarp1_ChildWarpOut(DoorWarp1* this, PlayState* play) { Flags_SetEventChkInf(EVENTCHKINF_USED_DEKU_TREE_BLUE_WARP); Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_DEKU_TREE); if (IS_RANDO) { - play->nextEntranceIndex = 0x0457; + play->nextEntranceIndex = ENTR_KOKIRI_FOREST_11; gSaveContext.nextCutsceneIndex = 0; // Skip Mido complaining about dead Deku tree Flags_SetEventChkInf(EVENTCHKINF_SPOKE_TO_MIDO_AFTER_DEKU_TREES_DEATH); } else { Item_Give(play, ITEM_KOKIRI_EMERALD); - play->nextEntranceIndex = 0xEE; + play->nextEntranceIndex = ENTR_KOKIRI_FOREST_0; gSaveContext.nextCutsceneIndex = 0xFFF1; } } else { - play->nextEntranceIndex = 0x457; + play->nextEntranceIndex = ENTR_KOKIRI_FOREST_11; gSaveContext.nextCutsceneIndex = 0; } } else if (play->sceneNum == SCENE_JABU_JABU_BOSS) { - play->nextEntranceIndex = 0x10E; + play->nextEntranceIndex = ENTR_ZORAS_FOUNTAIN_0; gSaveContext.nextCutsceneIndex = 0; } @@ -615,9 +615,9 @@ void DoorWarp1_ChildWarpOut(DoorWarp1* this, PlayState* play) { } osSyncPrintf("\n\n\nおわりおわり"); - play->sceneLoadFlag = 0x14; - play->fadeTransition = 7; - gSaveContext.nextTransitionType = 3; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE_SLOW; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE; } Math_StepToF(&this->unk_194, 2.0f, 0.01f); @@ -708,11 +708,11 @@ void DoorWarp1_RutoWarpOut(DoorWarp1* this, PlayState* play) { Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_JABU_JABUS_BELLY); if (IS_RANDO) { - play->nextEntranceIndex = 0x10E; + play->nextEntranceIndex = ENTR_ZORAS_FOUNTAIN_0; gSaveContext.nextCutsceneIndex = 0; } else { Item_Give(play, ITEM_ZORA_SAPPHIRE); - play->nextEntranceIndex = 0x10E; + play->nextEntranceIndex = ENTR_ZORAS_FOUNTAIN_0; gSaveContext.nextCutsceneIndex = 0xFFF0; } @@ -721,8 +721,8 @@ void DoorWarp1_RutoWarpOut(DoorWarp1* this, PlayState* play) { Entrance_OverrideBlueWarp(); } - play->sceneLoadFlag = 0x14; - play->fadeTransition = 7; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE_SLOW; } Math_StepToF(&this->unk_194, 2.0f, 0.01f); @@ -834,19 +834,19 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) { Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_FOREST_TEMPLE); if (IS_RANDO) { - play->nextEntranceIndex = 0x608; + play->nextEntranceIndex = ENTR_SACRED_FOREST_MEADOW_3; gSaveContext.nextCutsceneIndex = 0; } else { Item_Give(play, ITEM_MEDALLION_FOREST); - play->nextEntranceIndex = 0x6B; + play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0; gSaveContext.nextCutsceneIndex = 0; gSaveContext.chamberCutsceneNum = CHAMBER_CS_FOREST; } } else { if (!LINK_IS_ADULT) { - play->nextEntranceIndex = 0x600; + play->nextEntranceIndex = ENTR_SACRED_FOREST_MEADOW_2; } else { - play->nextEntranceIndex = 0x608; + play->nextEntranceIndex = ENTR_SACRED_FOREST_MEADOW_3; } gSaveContext.nextCutsceneIndex = 0; } @@ -856,20 +856,20 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) { Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_FIRE_TEMPLE); if (IS_RANDO) { - play->nextEntranceIndex = 0x564; + play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_CRATER_5; gSaveContext.nextCutsceneIndex = 0; // Change Death Mountain cloud since we aren't warping to the cutscene Flags_SetEventChkInf(EVENTCHKINF_DEATH_MOUNTAIN_ERUPTED); } else { Item_Give(play, ITEM_MEDALLION_FIRE); - play->nextEntranceIndex = 0xDB; + play->nextEntranceIndex = ENTR_KAKARIKO_VILLAGE_0; gSaveContext.nextCutsceneIndex = 0xFFF3; } } else { if (!LINK_IS_ADULT) { - play->nextEntranceIndex = 0x4F6; + play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_CRATER_4; } else { - play->nextEntranceIndex = 0x564; + play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_CRATER_5; } gSaveContext.nextCutsceneIndex = 0; } @@ -879,21 +879,21 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) { Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_WATER_TEMPLE); if (IS_RANDO) { - play->nextEntranceIndex = 0x60C; + play->nextEntranceIndex = ENTR_LAKE_HYLIA_9; gSaveContext.nextCutsceneIndex = 0; // Fill Lake Hylia since we aren't warping to the cutscene Flags_SetEventChkInf(EVENTCHKINF_RAISED_LAKE_HYLIA_WATER); } else { Item_Give(play, ITEM_MEDALLION_WATER); - play->nextEntranceIndex = 0x6B; + play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0; gSaveContext.nextCutsceneIndex = 0; gSaveContext.chamberCutsceneNum = CHAMBER_CS_WATER; } } else { if (!LINK_IS_ADULT) { - play->nextEntranceIndex = 0x604; + play->nextEntranceIndex = ENTR_LAKE_HYLIA_8; } else { - play->nextEntranceIndex = 0x60C; + play->nextEntranceIndex = ENTR_LAKE_HYLIA_9; } gSaveContext.nextCutsceneIndex = 0; } @@ -902,19 +902,19 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) { Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE); if (IS_RANDO) { - play->nextEntranceIndex = 0x610; + play->nextEntranceIndex = ENTR_DESERT_COLOSSUS_8; gSaveContext.nextCutsceneIndex = 0; } else { Item_Give(play, ITEM_MEDALLION_SPIRIT); - play->nextEntranceIndex = 0x6B; + play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0; gSaveContext.nextCutsceneIndex = 0; gSaveContext.chamberCutsceneNum = CHAMBER_CS_SPIRIT; } } else { if (!LINK_IS_ADULT) { - play->nextEntranceIndex = 0x1F1; + play->nextEntranceIndex = ENTR_DESERT_COLOSSUS_5; } else { - play->nextEntranceIndex = 0x610; + play->nextEntranceIndex = ENTR_DESERT_COLOSSUS_8; } gSaveContext.nextCutsceneIndex = 0; } @@ -923,19 +923,19 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) { Flags_SetRandomizerInf(RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE); if (IS_RANDO) { - play->nextEntranceIndex = 0x580; + play->nextEntranceIndex = ENTR_GRAVEYARD_8; gSaveContext.nextCutsceneIndex = 0; } else { Item_Give(play, ITEM_MEDALLION_SHADOW); - play->nextEntranceIndex = 0x6B; + play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0; gSaveContext.nextCutsceneIndex = 0; gSaveContext.chamberCutsceneNum = CHAMBER_CS_SHADOW; } } else { if (!LINK_IS_ADULT) { - play->nextEntranceIndex = 0x568; + play->nextEntranceIndex = ENTR_GRAVEYARD_7; } else { - play->nextEntranceIndex = 0x580; + play->nextEntranceIndex = ENTR_GRAVEYARD_8; } gSaveContext.nextCutsceneIndex = 0; } @@ -946,9 +946,9 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) { Entrance_OverrideBlueWarp(); } - play->sceneLoadFlag = 0x14; - play->fadeTransition = 3; - gSaveContext.nextTransitionType = 7; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE_SLOW; } if (this->warpTimer >= 141) { f32 screenFillAlpha; diff --git a/soh/src/overlays/actors/ovl_En_Box/z_en_box.c b/soh/src/overlays/actors/ovl_En_Box/z_en_box.c index 1e2c4d6cd..e4cccb501 100644 --- a/soh/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/soh/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -88,6 +88,7 @@ Gfx gKeyTreasureChestChestFrontDL[128] = {0}; Gfx gChristmasRedTreasureChestChestFrontDL[128] = {0}; Gfx gChristmasGreenTreasureChestChestFrontDL[128] = {0}; u8 hasCreatedRandoChestTextures = 0; +u8 hasCustomChestDLs = 0; u8 hasChristmasChestTexturesAvailable = 0; void EnBox_SetupAction(EnBox* this, EnBoxActionFunc actionFunc) { @@ -448,7 +449,7 @@ void EnBox_WaitOpen(EnBox* this, PlayState* play) { // treasure chest game rando if (Randomizer_GetSettingValue(RSK_SHUFFLE_CHEST_MINIGAME)) { - if (IS_RANDO && play->sceneNum == 16 && (this->dyna.actor.params & 0x60) != 0x20) { + if (IS_RANDO && play->sceneNum == SCENE_TREASURE_BOX_SHOP && (this->dyna.actor.params & 0x60) != 0x20) { if((this->dyna.actor.params & 0xF) < 2) { Flags_SetCollectible(play, 0x1B); } @@ -476,7 +477,7 @@ void EnBox_WaitOpen(EnBox* this, PlayState* play) { // RANDOTODO treasure chest game rando if (Randomizer_GetSettingValue(RSK_SHUFFLE_CHEST_MINIGAME)) { - if (IS_RANDO && play->sceneNum == 16 && (this->dyna.actor.params & 0x60) != 0x20) { + if (IS_RANDO && play->sceneNum == SCENE_TREASURE_BOX_SHOP && (this->dyna.actor.params & 0x60) != 0x20) { if((this->dyna.actor.params & 0xF) < 2) { if(Flags_GetCollectible(play, 0x1B)) { sItem = blueRupee; @@ -690,7 +691,7 @@ void EnBox_UpdateSizeAndTexture(EnBox* this, PlayState* play) { } // Change texture - if (!isVanilla && (csmc == CSMC_BOTH || csmc == CSMC_TEXTURE)) { + if (!isVanilla && hasCreatedRandoChestTextures && !hasCustomChestDLs && (csmc == CSMC_BOTH || csmc == CSMC_TEXTURE)) { switch (getItemCategory) { case ITEM_CATEGORY_MAJOR: this->boxBodyDL = gGoldTreasureChestChestFrontDL; @@ -725,7 +726,7 @@ void EnBox_UpdateSizeAndTexture(EnBox* this, PlayState* play) { } } - if (CVarGetInteger("gLetItSnow", 0) && hasChristmasChestTexturesAvailable) { + if (CVarGetInteger("gLetItSnow", 0) && hasChristmasChestTexturesAvailable && hasCreatedRandoChestTextures && !hasCustomChestDLs) { if (this->dyna.actor.scale.x == 0.01f) { this->boxBodyDL = gChristmasRedTreasureChestChestFrontDL; this->boxLidDL = gChristmasRedTreasureChestChestSideAndLidDL; @@ -767,7 +768,18 @@ void EnBox_UpdateSizeAndTexture(EnBox* this, PlayState* play) { } void EnBox_CreateExtraChestTextures() { + // Don't patch textures for custom chest models, as they do not import textures the exact same way as vanilla chests + // OTRTODO: Make it so model packs can provide a unique DL per chest type, instead of us copying the brown chest and attempting to patch + if (ResourceMgr_FileIsCustomByName(gTreasureChestChestFrontDL) || + ResourceMgr_FileIsCustomByName(gTreasureChestChestSideAndLidDL)) { + hasCustomChestDLs = 1; + return; + } + + hasCustomChestDLs = 0; + if (hasCreatedRandoChestTextures) return; + Gfx gTreasureChestChestTextures[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSkullTreasureChestFrontTex), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSkullTreasureChestSideAndTopTex), diff --git a/soh/src/overlays/actors/ovl_En_Du/z_en_du.c b/soh/src/overlays/actors/ovl_En_Du/z_en_du.c index acd64e308..db13ecc54 100644 --- a/soh/src/overlays/actors/ovl_En_Du/z_en_du.c +++ b/soh/src/overlays/actors/ovl_En_Du/z_en_du.c @@ -95,6 +95,26 @@ static AnimationInfo sAnimationInfo[] = { { &gDaruniaDancingEndAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -6.0f }, }; +// #region SOH [Enhancement] Only animations too fast need to be slowed down, otherwise not touched +static AnimationInfo sAnimationInfoFix[] = { + { NULL }, + { NULL }, + { NULL }, + { NULL }, + { NULL }, + { NULL }, + { NULL }, + { &gDaruniaDancingLoop1Anim, 0.78f, 0.0f, -1.0f, ANIMMODE_ONCE, -10.0f }, // + { &gDaruniaDancingLoop1Anim, 0.77f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f }, // hop + { &gDaruniaDancingLoop2Anim, 0.78f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f }, // from hop to spin + { &gDaruniaDancingLoop3Anim, 0.77f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f }, // spin + { NULL }, + { NULL }, + { &gDaruniaDancingLoop4Anim, 0.78f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f }, // from spin to hop + { NULL }, +}; +// #endregion + void EnDu_SetupAction(EnDu* this, EnDuActionFunc actionFunc) { this->actionFunc = actionFunc; } @@ -255,7 +275,13 @@ void func_809FE040(EnDu* this) { if (this->unk_1E6 >= 8) { this->unk_1E6 = 0; } - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, animationIndices[this->unk_1E6]); + // #region SOH[Enhancement] + if (CVarGetInteger("gEnhancements.FixDaruniaDanceSpeed", 1)) { + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfoFix, animationIndices[this->unk_1E6]); + // #endregion + } else { + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, animationIndices[this->unk_1E6]); + } } } @@ -271,7 +297,13 @@ void func_809FE104(EnDu* this) { if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { this->unk_1E6++; if (this->unk_1E6 < 4) { - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, animationIndices[this->unk_1E6]); + // #region SOH[Enhancement] + if (CVarGetInteger("gEnhancements.FixDaruniaDanceSpeed", 1) && this->unk_1E6 <= 1) { + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfoFix, animationIndices[this->unk_1E6]); + // #endregion + } else { + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, animationIndices[this->unk_1E6]); + } } } } @@ -299,7 +331,7 @@ void EnDu_Init(Actor* thisx, PlayState* play) { play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gGoronCityDarunia01Cs); gSaveContext.cutsceneTrigger = 1; EnDu_SetupAction(this, func_809FE890); - } else if (play->sceneNum == 4) { + } else if (play->sceneNum == SCENE_FIRE_TEMPLE) { EnDu_SetupAction(this, func_809FE638); } else if (!LINK_IS_ADULT) { EnDu_SetupAction(this, func_809FE3C0); @@ -465,7 +497,13 @@ void func_809FE890(EnDu* this, PlayState* play) { } if (csAction->action == 7 || csAction->action == 8) { this->unk_1E6 = 0; - Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENDU_ANIM_7); + // #region SOH[Enhancement] + if (CVarGetInteger("gEnhancements.FixDaruniaDanceSpeed", 1)) { + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfoFix, ENDU_ANIM_7); + // #endregion + } else { + Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENDU_ANIM_7); + } } this->unk_1EA = csAction->action; if (this->unk_1EA == 7) { diff --git a/soh/src/overlays/actors/ovl_En_Eg/z_en_eg.c b/soh/src/overlays/actors/ovl_En_Eg/z_en_eg.c index 612e2e698..69121bb3e 100644 --- a/soh/src/overlays/actors/ovl_En_Eg/z_en_eg.c +++ b/soh/src/overlays/actors/ovl_En_Eg/z_en_eg.c @@ -55,7 +55,7 @@ void func_809FFDC8(EnEg* this, PlayState* play) { Play_TriggerRespawn(play); gSaveContext.respawnFlag = -2; Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_STOP); - play->fadeTransition = 2; + play->transitionType = TRANS_TYPE_FADE_BLACK; EnEg_PlayVoidOutSFX(); voided = true; } diff --git a/soh/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c b/soh/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c index 2d05c116c..48877526a 100644 --- a/soh/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/soh/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -248,7 +248,7 @@ void EnEncount1_SpawnStalchildOrWolfos(EnEncount1* this, PlayState* play) { while ((this->curNumSpawn < this->maxCurSpawns && this->totalNumSpawn < this->maxTotalSpawns) || (CVarGetInteger("gRandomizedEnemies", 0) && enemyCount < 15)) { if (play->sceneNum == SCENE_HYRULE_FIELD) { - if ((player->unk_89E == 0) || (player->actor.floorBgId != BGCHECK_SCENE) || + if ((player->floorSfxOffset == 0) || (player->actor.floorBgId != BGCHECK_SCENE) || !(player->actor.bgCheckFlags & 1) || (player->stateFlags1 & 0x08000000)) { this->fieldSpawnTimer = 60; diff --git a/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c index 8d8c2c543..a3a196e31 100644 --- a/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c +++ b/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c @@ -244,7 +244,7 @@ void EnExItem_WaitForObject(EnExItem* this, PlayState* play) { break; } } else { - if (play->sceneNum == 16) { + if (play->sceneNum == SCENE_TREASURE_BOX_SHOP) { this->giDrawId = GetChestGameRandoGiDrawId(play->roomCtx.curRoom.num, GID_RUPEE_GREEN, play); } } diff --git a/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c index 813ed9373..1ad8f4867 100644 --- a/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -262,19 +262,19 @@ void EnGe1_KickPlayer(EnGe1* this, PlayState* play) { func_8006D074(play); if ((INV_CONTENT(ITEM_HOOKSHOT) == ITEM_NONE) || (INV_CONTENT(ITEM_LONGSHOT) == ITEM_NONE)) { - play->nextEntranceIndex = 0x1A5; + play->nextEntranceIndex = ENTR_GERUDO_VALLEY_1; } else if (Flags_GetEventChkInf(EVENTCHKINF_WATCHED_GANONS_CASTLE_COLLAPSE_CAUGHT_BY_GERUDO)) { // Caught previously - play->nextEntranceIndex = 0x5F8; + play->nextEntranceIndex = ENTR_GERUDOS_FORTRESS_18; } else { - play->nextEntranceIndex = 0x3B4; + play->nextEntranceIndex = ENTR_GERUDOS_FORTRESS_17; } if (IS_RANDO) { Entrance_OverrideGeurdoGuardCapture(); } - play->fadeTransition = 0x26; - play->sceneLoadFlag = 0x14; + play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST); + play->transitionTrigger = TRANS_TRIGGER_START; } } @@ -654,10 +654,10 @@ void EnGe1_BeginGame_Archery(EnGe1* this, PlayState* play) { this->actionFunc = EnGe1_TalkTooPoor_Archery; } else { Rupees_ChangeBy(-20); - play->nextEntranceIndex = 0x129; + play->nextEntranceIndex = ENTR_GERUDOS_FORTRESS_0; gSaveContext.nextCutsceneIndex = 0xFFF0; - play->fadeTransition = 0x26; - play->sceneLoadFlag = 0x14; + play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST); + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.eventInf[0] |= 0x100; Flags_SetEventChkInf(EVENTCHKINF_PLAYED_HORSEBACK_ARCHERY); diff --git a/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c index eba22b432..01e0e0176 100644 --- a/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -252,19 +252,19 @@ void EnGe2_CaptureClose(EnGe2* this, PlayState* play) { func_8006D074(play); if ((INV_CONTENT(ITEM_HOOKSHOT) == ITEM_NONE) || (INV_CONTENT(ITEM_LONGSHOT) == ITEM_NONE)) { - play->nextEntranceIndex = 0x1A5; + play->nextEntranceIndex = ENTR_GERUDO_VALLEY_1; } else if (Flags_GetEventChkInf(EVENTCHKINF_WATCHED_GANONS_CASTLE_COLLAPSE_CAUGHT_BY_GERUDO)) { - play->nextEntranceIndex = 0x5F8; + play->nextEntranceIndex = ENTR_GERUDOS_FORTRESS_18; } else { - play->nextEntranceIndex = 0x3B4; + play->nextEntranceIndex = ENTR_GERUDOS_FORTRESS_17; } if (IS_RANDO) { Entrance_OverrideGeurdoGuardCapture(); } - play->fadeTransition = 0x26; - play->sceneLoadFlag = 0x14; + play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST); + play->transitionTrigger = TRANS_TRIGGER_START; } } @@ -282,19 +282,19 @@ void EnGe2_CaptureCharge(EnGe2* this, PlayState* play) { func_8006D074(play); if ((INV_CONTENT(ITEM_HOOKSHOT) == ITEM_NONE) || (INV_CONTENT(ITEM_LONGSHOT) == ITEM_NONE)) { - play->nextEntranceIndex = 0x1A5; + play->nextEntranceIndex = ENTR_GERUDO_VALLEY_1; } else if (Flags_GetEventChkInf(EVENTCHKINF_WATCHED_GANONS_CASTLE_COLLAPSE_CAUGHT_BY_GERUDO)) { - play->nextEntranceIndex = 0x5F8; + play->nextEntranceIndex = ENTR_GERUDOS_FORTRESS_18; } else { - play->nextEntranceIndex = 0x3B4; + play->nextEntranceIndex = ENTR_GERUDOS_FORTRESS_17; } if (IS_RANDO) { Entrance_OverrideGeurdoGuardCapture(); } - play->fadeTransition = 0x26; - play->sceneLoadFlag = 0x14; + play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST); + play->transitionTrigger = TRANS_TRIGGER_START; } } diff --git a/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c index f556a6c7f..4ed0e52ee 100644 --- a/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -1568,19 +1568,19 @@ void EnGeldB_Draw(Actor* thisx, PlayState* play) { this->timer--; if (this->timer == 0) { if ((INV_CONTENT(ITEM_HOOKSHOT) == ITEM_NONE) || (INV_CONTENT(ITEM_LONGSHOT) == ITEM_NONE)) { - play->nextEntranceIndex = 0x1A5; + play->nextEntranceIndex = ENTR_GERUDO_VALLEY_1; } else if (Flags_GetEventChkInf(EVENTCHKINF_WATCHED_GANONS_CASTLE_COLLAPSE_CAUGHT_BY_GERUDO)) { - play->nextEntranceIndex = 0x5F8; + play->nextEntranceIndex = ENTR_GERUDOS_FORTRESS_18; } else { - play->nextEntranceIndex = 0x3B4; + play->nextEntranceIndex = ENTR_GERUDOS_FORTRESS_17; } if (IS_RANDO) { Entrance_OverrideGeurdoGuardCapture(); } - play->fadeTransition = 0x26; - play->sceneLoadFlag = 0x14; + play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST); + play->transitionTrigger = TRANS_TRIGGER_START; } } } diff --git a/soh/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/soh/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c index 1b4529448..ed924dd3c 100644 --- a/soh/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/soh/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -366,12 +366,12 @@ void EnHeishi1_Kick(EnHeishi1* this, PlayState* play) { Message_CloseTextbox(play); if (!this->loadStarted) { Flags_SetEventChkInf(EVENTCHKINF_CAUGHT_BY_CASTLE_GUARDS); - play->nextEntranceIndex = 0x4FA; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_HYRULE_CASTLE_3; + play->transitionTrigger = TRANS_TRIGGER_START; this->loadStarted = true; sHeishi1PlayerIsCaught = false; - play->fadeTransition = 0x2E; - gSaveContext.nextTransitionType = 0x2E; + play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST); + gSaveContext.nextTransitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST); } } } diff --git a/soh/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c b/soh/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c index 1ffae3633..3ccc932ca 100644 --- a/soh/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c +++ b/soh/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c @@ -206,11 +206,11 @@ void func_80A55D00(EnHeishi3* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play) && (this->respawnFlag == 0)) { Flags_SetEventChkInf(EVENTCHKINF_CAUGHT_BY_CASTLE_GUARDS); - play->nextEntranceIndex = 0x47E; // Hyrule Castle from Guard Capture (outside) - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_HYRULE_CASTLE_4; // Hyrule Castle from Guard Capture (outside) + play->transitionTrigger = TRANS_TRIGGER_START; this->respawnFlag = 1; - play->fadeTransition = 0x2E; - gSaveContext.nextTransitionType = 0x2E; + play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST); + gSaveContext.nextTransitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST); } } diff --git a/soh/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c b/soh/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c index bab56427d..391d7dc5d 100644 --- a/soh/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c +++ b/soh/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c @@ -358,13 +358,13 @@ void EnHeishi4_MarketSneak(EnHeishi4* this, PlayState* play) { switch (play->msgCtx.choiceIndex) { case 0: //yes if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_ENTRANCES) != RO_GENERIC_OFF){ - play->nextEntranceIndex = Entrance_OverrideNextIndex(0x01FD); // Market Entrance -> HF + play->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_HYRULE_FIELD_7); // Market Entrance -> HF } else { - play->nextEntranceIndex = 0x00CD; // HF Near bridge (OoT cutscene entrance) to not fall in the water + play->nextEntranceIndex = ENTR_HYRULE_FIELD_0; // HF Near bridge (OoT cutscene entrance) to not fall in the water } - play->sceneLoadFlag = 0x14; - play->fadeTransition = 0x2E; - gSaveContext.nextTransitionType = 0x2E; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST); + gSaveContext.nextTransitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST); this->actionFunc = func_80A56614; break; case 1: //no diff --git a/soh/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/soh/src/overlays/actors/ovl_En_Holl/z_en_holl.c index f08b1f252..f996cdd5d 100644 --- a/soh/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/soh/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -77,7 +77,7 @@ void EnHoll_SetupAction(EnHoll* this, EnHollActionFunc func) { } s32 EnHoll_IsKokiriSetup8() { - return gSaveContext.entranceIndex == 0x00EE && gSaveContext.sceneSetupIndex == 8; + return gSaveContext.entranceIndex == ENTR_KOKIRI_FOREST_0 && gSaveContext.sceneSetupIndex == 8; } void EnHoll_ChooseAction(EnHoll* this) { diff --git a/soh/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/soh/src/overlays/actors/ovl_En_Horse/z_en_horse.c index f3372f81a..d8192be6c 100644 --- a/soh/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/soh/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -2509,9 +2509,9 @@ void EnHorse_UpdateHorsebackArchery(EnHorse* this, PlayState* play) { if (this->hbaFlags & 1 || this->hbaTimer >= 46) { if (sp20 != 1 && gSaveContext.minigameState != 3) { gSaveContext.cutsceneIndex = 0; - play->nextEntranceIndex = 0x3B0; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 0x20; + play->nextEntranceIndex = ENTR_GERUDOS_FORTRESS_16; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST); } } @@ -3581,7 +3581,7 @@ void EnHorse_Update(Actor* thisx, PlayState* play2) { this->cyl1.base.atFlags &= ~1; } - if (gSaveContext.entranceIndex != 343 || gSaveContext.sceneSetupIndex != 9) { + if (gSaveContext.entranceIndex != ENTR_LON_LON_RANCH_0 || gSaveContext.sceneSetupIndex != 9) { if (this->dustFlags & 1) { this->dustFlags &= ~1; func_800287AC(play, &this->frontRightHoof, &dustVel, &dustAcc, EnHorse_RandInt(100) + 200, diff --git a/soh/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/soh/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c index d6f2c1c7f..0935eac86 100644 --- a/soh/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c +++ b/soh/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c @@ -110,26 +110,26 @@ s32 EnHorseGameCheck_DestroyIngoRace(EnHorseGameCheckBase* base, PlayState* play void EnHorseGameCheck_FinishIngoRace(EnHorseGameCheckIngoRace* this, PlayState* play) { gSaveContext.cutsceneIndex = 0; if (this->result == INGORACE_PLAYER_WIN) { - play->nextEntranceIndex = 0x4CE; + play->nextEntranceIndex = ENTR_LON_LON_RANCH_7; if (gSaveContext.eventInf[0] & 0x40) { gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & ~0xF) | 6; gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & ~0x8000) | 0x8000; - play->fadeTransition = 3; + play->transitionType = TRANS_TYPE_FADE_WHITE; Environment_ForcePlaySequence(NA_BGM_INGO); } else { gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & ~0xF) | 4; gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & ~0x8000) | 0x8000; Environment_ForcePlaySequence(NA_BGM_INGO); - play->fadeTransition = 0x2E; + play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST); } } else { - play->nextEntranceIndex = 0x558; + play->nextEntranceIndex = ENTR_LON_LON_RANCH_8; gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & ~0xF) | 3; - play->fadeTransition = 0x20; + play->transitionType = TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST); gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & ~0x8000) | 0x8000; } DREG(25) = 0; - play->sceneLoadFlag = 0x14; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.timer1State = 0; } @@ -293,23 +293,23 @@ s32 EnHorseGameCheck_DestroyMalonRace(EnHorseGameCheckBase* base, PlayState* pla void EnHorseGameCheck_FinishMalonRace(EnHorseGameCheckMalonRace* this, PlayState* play) { if ((this->result == MALONRACE_SUCCESS) || (this->result == MALONRACE_TIME_UP)) { gSaveContext.cutsceneIndex = 0; - play->nextEntranceIndex = 0x4CE; - play->fadeTransition = 0x2E; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_LON_LON_RANCH_7; + play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST); + play->transitionTrigger = TRANS_TRIGGER_START; } else if (this->result == MALONRACE_FAILURE) { gSaveContext.timer1Value = 240; gSaveContext.timer1State = 0xF; gSaveContext.cutsceneIndex = 0; - play->nextEntranceIndex = 0x4CE; - play->fadeTransition = 0x2E; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_LON_LON_RANCH_7; + play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST); + play->transitionTrigger = TRANS_TRIGGER_START; } else { // "not supported" osSyncPrintf("En_HGC_Spot20_Ta_end():対応せず\n"); gSaveContext.cutsceneIndex = 0; - play->nextEntranceIndex = 0x157; - play->fadeTransition = 0x2E; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_LON_LON_RANCH_0; + play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST); + play->transitionTrigger = TRANS_TRIGGER_START; } } diff --git a/soh/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/soh/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c index d8d558855..b502a11e4 100644 --- a/soh/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c +++ b/soh/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c @@ -352,7 +352,7 @@ void func_80A6A068(EnHorseLinkChild* this, PlayState* play) { player = GET_PLAYER(play); distFromLink = Actor_WorldDistXZToActor(&this->actor, &player->actor); - if (gSaveContext.entranceIndex == 0x2AE) { + if (gSaveContext.entranceIndex == ENTR_LON_LON_RANCH_1) { Audio_PlaySoundGeneral(NA_SE_EV_KID_HORSE_NEIGH, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, &D_801333E8); func_80A6A724(this); diff --git a/soh/src/overlays/actors/ovl_En_In/z_en_in.c b/soh/src/overlays/actors/ovl_En_In/z_en_in.c index 13014352a..dd8b52fcc 100644 --- a/soh/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/soh/src/overlays/actors/ovl_En_In/z_en_in.c @@ -425,15 +425,15 @@ void func_80A79AB4(EnIn* this, PlayState* play) { } } -void func_80A79BAC(EnIn* this, PlayState* play, s32 index, u32 arg3) { - s16 entrances[] = { 0x0558, 0x04CA, 0x0157 }; +void func_80A79BAC(EnIn* this, PlayState* play, s32 index, u32 transitionType) { + s16 entrances[] = { ENTR_LON_LON_RANCH_8, ENTR_LON_LON_RANCH_6, ENTR_LON_LON_RANCH_0 }; play->nextEntranceIndex = entrances[index]; if (index == 2) { gSaveContext.nextCutsceneIndex = 0xFFF0; } - play->fadeTransition = arg3; - play->sceneLoadFlag = 0x14; + play->transitionType = transitionType; + play->transitionTrigger = TRANS_TRIGGER_START; func_8002DF54(play, &this->actor, 8); Interface_ChangeAlpha(1); if (index == 0) { @@ -641,7 +641,7 @@ void func_80A7A4BC(EnIn* this, PlayState* play) { void func_80A7A4C8(EnIn* this, PlayState* play) { if (this->interactInfo.talkState == NPC_TALK_STATE_ACTION) { - func_80A79BAC(this, play, 1, 0x20); + func_80A79BAC(this, play, 1, TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST)); gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & ~0x000F) | 0x0001; gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & ~0x8000) | 0x8000; Flags_UnsetInfTable(INFTABLE_A2); @@ -655,7 +655,7 @@ void func_80A7A4C8(EnIn* this, PlayState* play) { void func_80A7A568(EnIn* this, PlayState* play) { Player* player = GET_PLAYER(play); s32 phi_a2; - s32 phi_a3; + s32 transitionType; if (!Flags_GetEventChkInf(EVENTCHKINF_RENTED_HORSE_FROM_INGO) && (player->stateFlags1 & 0x800000)) { Flags_SetInfTable(INFTABLE_AB); @@ -677,7 +677,7 @@ void func_80A7A568(EnIn* this, PlayState* play) { (gSaveContext.eventInf[0] & ~0x10) | (((EnHorse*)GET_PLAYER(play)->rideActor)->type << 4); gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & ~0xF) | 2; phi_a2 = 2; - phi_a3 = 2; + transitionType = TRANS_TYPE_FADE_BLACK; } else { Audio_PlaySoundGeneral(NA_SE_SY_FOUND, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); if (!Flags_GetEventChkInf(EVENTCHKINF_RENTED_HORSE_FROM_INGO)) { @@ -688,9 +688,9 @@ void func_80A7A568(EnIn* this, PlayState* play) { } gSaveContext.eventInf[0] &= ~0xF; phi_a2 = 0; - phi_a3 = 0x20; + transitionType = TRANS_TYPE_CIRCLE(TCA_NORMAL, TCC_BLACK, TCS_FAST); } - func_80A79BAC(this, play, phi_a2, phi_a3); + func_80A79BAC(this, play, phi_a2, transitionType); play->msgCtx.stateTimer = 0; gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & ~0x8000) | 0x8000; play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING; @@ -722,7 +722,7 @@ void func_80A7A848(EnIn* this, PlayState* play) { gSaveContext.eventInf[0] &= ~0xF; this->actionFunc = func_80A7A4C8; } else { - func_80A79BAC(this, play, 2, 0x26); + func_80A79BAC(this, play, 2, TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST)); gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & ~0xF) | 2; gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & ~0x8000) | 0x8000; play->msgCtx.stateTimer = 0; @@ -747,7 +747,7 @@ void func_80A7A940(EnIn* this, PlayState* play) { } if (this->interactInfo.talkState == NPC_TALK_STATE_ACTION) { this->actor.flags &= ~ACTOR_FLAG_WILL_TALK; - func_80A79BAC(this, play, 2, 0x26); + func_80A79BAC(this, play, 2, TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST)); gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & ~0x000F) | 0x0002; gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & ~0x8000) | 0x8000; play->msgCtx.stateTimer = 0; @@ -870,9 +870,9 @@ void func_80A7AEF0(EnIn* this, PlayState* play) { pos.z += 90.0f * Math_CosS(this->actor.shape.rot.y); yaw = Math_Vec3f_Yaw(&pos, &player->actor.world.pos); if (ABS(yaw) > 0x4000) { - play->nextEntranceIndex = 0x0476; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 5; + play->nextEntranceIndex = ENTR_HYRULE_FIELD_15; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE_FAST; this->actionFunc = func_80A7B018; } else if (this->interactInfo.talkState == NPC_TALK_STATE_ACTION) { play->msgCtx.stateTimer = 4; @@ -896,7 +896,7 @@ void func_80A7B024(EnIn* this, PlayState* play) { Flags_SetEventChkInf(EVENTCHKINF_RENTED_HORSE_FROM_INGO); Flags_SetInfTable(INFTABLE_AB); } - func_80A79BAC(this, play, 0, 0x26); + func_80A79BAC(this, play, 0, TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST)); gSaveContext.eventInf[0] = gSaveContext.eventInf[0] & ~0xF; gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & ~0x8000) | 0x8000; play->msgCtx.stateTimer = 4; diff --git a/soh/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/soh/src/overlays/actors/ovl_En_Insect/z_en_insect.c index f1dff358a..393e10a91 100644 --- a/soh/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/soh/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -211,6 +211,13 @@ void EnInsect_Init(Actor* thisx, PlayState* play2) { func_80A7D39C(this); + // For bugs that aren't linked to a soil patch, we remove the "short lived" flag to prevent them from despawning + // And exit early to not increment the "bugs dropped count" + if (CVarGetInteger("gNoBugsDespawn", 0) && this->soilActor == NULL) { + this->unk_314 &= ~4; + return; + } + D_80A7DEB8++; } else { rand = Rand_ZeroOne(); @@ -394,9 +401,6 @@ void func_80A7CAD0(EnInsect* this, PlayState* play) { } void func_80A7CBC8(EnInsect* this) { - if (CVarGetInteger("gNoBugsDespawn", 0) != 0) { - return; - } this->unk_31A = 60; func_80A7BF58(this); this->skelAnime.playSpeed = 1.9f; diff --git a/soh/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/soh/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c index b933aec84..af10aa086 100644 --- a/soh/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/soh/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -334,7 +334,7 @@ void EnIshi_Init(Actor* thisx, PlayState* play) { // block child Link from reaching the Fire Temple entrance. if (type == ROCK_LARGE && IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_DUNGEON_ENTRANCES) != RO_DUNGEON_ENTRANCE_SHUFFLE_OFF && - play->sceneNum == 0x061) { // Death Mountain Creater + play->sceneNum == SCENE_DEATH_MOUNTAIN_CRATER) { // Death Mountain Creater Actor_Kill(&this->actor); } EnIshi_SetupWait(this); diff --git a/soh/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c b/soh/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c index 926787cc3..9140023ce 100644 --- a/soh/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c +++ b/soh/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c @@ -151,7 +151,7 @@ void func_80A89A6C(EnJsjutan* this, PlayState* play) { i = 1; // Credits scene. The magic carpet man is friends with the bean guy and the lakeside professor. - if ((gSaveContext.entranceIndex == 0x157) && (gSaveContext.sceneSetupIndex == 8)) { + if ((gSaveContext.entranceIndex == ENTR_LON_LON_RANCH_0) && (gSaveContext.sceneSetupIndex == 8)) { isInCreditsScene = true; actorProfessor = play->actorCtx.actorLists[ACTORCAT_NPC].head; diff --git a/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c index f388d4989..8a11eb668 100644 --- a/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c +++ b/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c @@ -490,10 +490,10 @@ void func_80AA1150(EnMa1* this, PlayState* play) { if (play->msgCtx.ocarinaMode == OCARINA_MODE_03) { if (!IS_RANDO) { - play->nextEntranceIndex = 0x157; + play->nextEntranceIndex = ENTR_LON_LON_RANCH_0; gSaveContext.nextCutsceneIndex = 0xFFF1; - play->fadeTransition = 42; - play->sceneLoadFlag = 0x14; + play->transitionType = TRANS_TYPE_CIRCLE(TCA_WAVE, TCC_WHITE, TCS_FAST); + play->transitionTrigger = TRANS_TRIGGER_START; this->actionFunc = EnMa1_DoNothing; } else { // When rando'ed, skip the cutscene, play the chime, reset some flags, diff --git a/soh/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/soh/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c index a424f8244..5280f583e 100644 --- a/soh/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c +++ b/soh/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c @@ -115,10 +115,10 @@ s16 func_80AA2BD4(PlayState* play, Actor* thisx) { switch (Message_GetState(&play->msgCtx)) { case TEXT_STATE_EVENT: if (Message_ShouldAdvance(play)) { - play->nextEntranceIndex = 0x157; + play->nextEntranceIndex = ENTR_LON_LON_RANCH_0; gSaveContext.nextCutsceneIndex = 0xFFF0; - play->fadeTransition = 0x26; - play->sceneLoadFlag = 0x14; + play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST); + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.eventInf[0] |= 0x400; gSaveContext.timer1State = 0xF; } diff --git a/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c index 0a55661fe..adff5253e 100644 --- a/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -244,15 +244,15 @@ void EnMag_UpdateMq(Actor* thisx, PlayState* play) { CHECK_BTN_ALL(play->state.input[0].press.button, BTN_A) || CHECK_BTN_ALL(play->state.input[0].press.button, BTN_B)) { - if (play->sceneLoadFlag != 20) { + if (play->transitionTrigger != TRANS_TRIGGER_START) { Audio_SetCutsceneFlag(0); Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); gSaveContext.gameMode = 2; - play->sceneLoadFlag = 20; - play->fadeTransition = 2; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; } this->copyrightAlphaStep = 15; @@ -404,15 +404,15 @@ void EnMag_UpdateVanilla(Actor* thisx, PlayState* play) { CHECK_BTN_ALL(play->state.input[0].press.button, BTN_A) || CHECK_BTN_ALL(play->state.input[0].press.button, BTN_B)) { - if (play->sceneLoadFlag != 20) { + if (play->transitionTrigger != TRANS_TRIGGER_START) { Audio_SetCutsceneFlag(0); Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); gSaveContext.gameMode = 2; - play->sceneLoadFlag = 20; - play->fadeTransition = 2; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; } this->copyrightAlphaStep = 15; diff --git a/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c index 8c4f78a0c..b1d453f00 100644 --- a/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -191,7 +191,7 @@ void EnMs_Update(Actor* thisx, PlayState* play) { SkelAnime_Update(&this->skelAnime); this->actionFunc(this, play); - if (gSaveContext.entranceIndex == 0x157 && gSaveContext.sceneSetupIndex == 8) { // ride carpet if in credits + if (gSaveContext.entranceIndex == ENTR_LON_LON_RANCH_0 && gSaveContext.sceneSetupIndex == 8) { // ride carpet if in credits Actor_MoveForward(&this->actor); osSyncPrintf("OOOHHHHHH %f\n", this->actor.velocity.y); Actor_UpdateBgCheckInfo(play, &this->actor, 0.0f, 0.0f, 0.0f, 4); diff --git a/soh/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c b/soh/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c index 07172972b..9daa4f501 100644 --- a/soh/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c +++ b/soh/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c @@ -73,7 +73,7 @@ void EnOkarinaEffect_ManageStorm(EnOkarinaEffect* this, PlayState* play) { Flags_UnsetEnv(play, 5); // clear storms env flag if (((play->pauseCtx.state == 0) && (play->gameOverCtx.state == GAMEOVER_INACTIVE) && (play->msgCtx.msgLength == 0) && (!FrameAdvance_IsEnabled(play)) && - ((play->transitionMode == 0) || (gSaveContext.gameMode != 0))) || + ((play->transitionMode == TRANS_MODE_OFF) || (gSaveContext.gameMode != 0))) || (this->timer >= 250)) { if (play->envCtx.indoors || play->envCtx.unk_1F != 1) { this->timer--; diff --git a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index 460c788b2..b0d03430a 100644 --- a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -948,12 +948,12 @@ void EnOssan_State_StartConversation(EnOssan* this, PlayState* play, Player* pla case OSSAN_HAPPY_STATE_ANGRY: // In ER, handle happy mask throwing link out with not enough rupees if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_ENTRANCES)) { - play->nextEntranceIndex = Entrance_OverrideNextIndex(0x1D1); + play->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_MARKET_DAY_9); } else { - play->nextEntranceIndex = 0x1D1; + play->nextEntranceIndex = ENTR_MARKET_DAY_9; } - play->sceneLoadFlag = 0x14; - play->fadeTransition = 0x2E; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST); return; } diff --git a/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c index b99c15f62..303c58819 100644 --- a/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -963,12 +963,12 @@ void func_80ACC00C(EnOwl* this, PlayState* play) { osSyncPrintf(VT_RST); if (IS_RANDO) { if (Randomizer_GetSettingValue(RSK_SHUFFLE_OWL_DROPS)) { - play->nextEntranceIndex = Entrance_OverrideNextIndex(0x027E); + play->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_HYRULE_FIELD_9); } else { - play->nextEntranceIndex = 0x027E; + play->nextEntranceIndex = ENTR_HYRULE_FIELD_9; } - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; } play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gLakeHyliaOwlCs); @@ -978,12 +978,12 @@ void func_80ACC00C(EnOwl* this, PlayState* play) { case 9: if (IS_RANDO) { if (Randomizer_GetSettingValue(RSK_SHUFFLE_OWL_DROPS)) { - play->nextEntranceIndex = Entrance_OverrideNextIndex(0x0554); + play->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_KAKARIKO_VILLAGE_14); } else { - play->nextEntranceIndex = 0x0554; + play->nextEntranceIndex = ENTR_KAKARIKO_VILLAGE_14; } - play->sceneLoadFlag = 0x14; - play->fadeTransition = 2; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_BLACK; break; } play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gDMTOwlCs); diff --git a/soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c b/soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c index bfd4dfbbe..51e3e1499 100644 --- a/soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c +++ b/soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c @@ -21,7 +21,7 @@ void EnPartner_Draw(Actor* thisx, PlayState* play); void EnPartner_SpawnSparkles(EnPartner* this, PlayState* play, s32 sparkleLife); void func_808328EC(Player* this, u16 sfxId); -void func_808429B4(PlayState* play, s32 speed, s32 y, s32 countdown); +void Player_RequestQuake(PlayState* play, s32 speed, s32 y, s32 countdown); s32 spawn_boomerang_ivan(EnPartner* this, PlayState* play); static InitChainEntry sInitChain[] = { @@ -278,7 +278,7 @@ void UseHammer(Actor* thisx, PlayState* play, u8 started) { static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; Vec3f shockwavePos = this->actor.world.pos; - func_808429B4(play, 27767, 7, 20); + Player_RequestQuake(play, 27767, 7, 20); Player_PlaySfx(&this->actor, NA_SE_IT_HAMMER_HIT); EffectSsBlast_SpawnWhiteShockwave(play, &shockwavePos, &zeroVec, &zeroVec); @@ -510,58 +510,60 @@ void UseItem(uint8_t usedItem, u8 started, Actor* thisx, PlayState* play) { if (this->usedItem != 0xFF && this->itemTimer <= 0) { switch (usedItem) { - case SLOT_STICK: + case ITEM_STICK: UseDekuStick(this, play, started); break; - case SLOT_BOMB: + case ITEM_BOMB: UseBombs(this, play, started); break; - case SLOT_BOMBCHU: + case ITEM_BOMBCHU: UseBombchus(this, play, started); break; - case SLOT_NUT: + case ITEM_NUT: UseNuts(this, play, started); break; - case SLOT_BOW: + case ITEM_BOW: UseBow(this, play, started, 0); break; - case SLOT_ARROW_FIRE: + case ITEM_ARROW_FIRE: UseBow(this, play, started, 1); break; - case SLOT_ARROW_ICE: + case ITEM_ARROW_ICE: UseBow(this, play, started, 2); break; - case SLOT_ARROW_LIGHT: + case ITEM_ARROW_LIGHT: UseBow(this, play, started, 3); break; - case SLOT_SLINGSHOT: + case ITEM_SLINGSHOT: UseSlingshot(this, play, started); break; - case SLOT_OCARINA: + case ITEM_OCARINA_FAIRY: + case ITEM_OCARINA_TIME: UseOcarina(this, play, started); break; - case SLOT_HOOKSHOT: + case ITEM_HOOKSHOT: + case ITEM_LONGSHOT: UseHookshot(this, play, started); break; - case SLOT_DINS_FIRE: + case ITEM_DINS_FIRE: UseSpell(this, play, started, 1); break; - case SLOT_NAYRUS_LOVE: + case ITEM_NAYRUS_LOVE: UseSpell(this, play, started, 2); break; - case SLOT_FARORES_WIND: + case ITEM_FARORES_WIND: UseSpell(this, play, started, 3); break; - case SLOT_HAMMER: + case ITEM_HAMMER: UseHammer(this, play, started); break; - case SLOT_BOOMERANG: + case ITEM_BOOMERANG: UseBoomerang(this, play, started); break; - case SLOT_LENS: + case ITEM_LENS: UseLens(this, play, started); break; - case SLOT_BEAN: + case ITEM_BEAN: UseBeans(this, play, started); break; } @@ -685,39 +687,35 @@ void EnPartner_Update(Actor* thisx, PlayState* play) { uint8_t released = 0; uint8_t current = 0; + uint16_t partnerButtons[7] = { BTN_CLEFT, BTN_CDOWN, BTN_CRIGHT, BTN_DUP, BTN_DDOWN, BTN_DLEFT, BTN_DRIGHT}; + uint8_t buttonMax = 3; + if (CVarGetInteger("gDpadEquips", 0) != 0) { + buttonMax = ARRAY_COUNT(gSaveContext.equips.cButtonSlots); + } + if (this->usedItem == 0xFF && this->itemTimer <= 0) { - if (CHECK_BTN_ALL(sControlInput.press.button, BTN_CLEFT)) { - this->usedItem = gSaveContext.equips.cButtonSlots[0]; - this->usedItemButton = 0; - pressed = 1; - } else if (CHECK_BTN_ALL(sControlInput.press.button, BTN_CDOWN)) { - this->usedItem = gSaveContext.equips.cButtonSlots[1]; - this->usedItemButton = 1; - pressed = 1; - } else if (CHECK_BTN_ALL(sControlInput.press.button, BTN_CRIGHT)) { - this->usedItem = gSaveContext.equips.cButtonSlots[2]; - this->usedItemButton = 2; - pressed = 1; + for (uint8_t i = 0; i < buttonMax; i++) { + if (CHECK_BTN_ALL(sControlInput.press.button, partnerButtons[i])) { + this->usedItem = gSaveContext.equips.buttonItems[i+1]; + this->usedItemButton = i; + pressed = 1; + } } } if (this->usedItem != 0xFF) { - if (CHECK_BTN_ALL(sControlInput.cur.button, BTN_CLEFT) && this->usedItemButton == 0) { - current = 1; - } else if (CHECK_BTN_ALL(sControlInput.cur.button, BTN_CDOWN) && this->usedItemButton == 1) { - current = 1; - } else if (CHECK_BTN_ALL(sControlInput.cur.button, BTN_CRIGHT) && this->usedItemButton == 2) { - current = 1; + for (uint8_t i = 0; i < buttonMax; i++) { + if (CHECK_BTN_ALL(sControlInput.cur.button, partnerButtons[i]) && this->usedItemButton == i) { + current = 1; + } } } if (this->usedItem != 0xFF) { - if (CHECK_BTN_ALL(sControlInput.rel.button, BTN_CLEFT) && this->usedItemButton == 0) { - released = 1; - } else if (CHECK_BTN_ALL(sControlInput.rel.button, BTN_CDOWN) && this->usedItemButton == 1) { - released = 1; - } else if (CHECK_BTN_ALL(sControlInput.rel.button, BTN_CRIGHT) && this->usedItemButton == 2) { - released = 1; + for (uint8_t i = 0; i < buttonMax; i++) { + if (CHECK_BTN_ALL(sControlInput.rel.button, partnerButtons[i]) && this->usedItemButton == i) { + released = 1; + } } } diff --git a/soh/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c b/soh/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c index 8d624559d..81138e23c 100644 --- a/soh/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c +++ b/soh/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c @@ -164,8 +164,8 @@ void func_80AFBE8C(EnSiofuki* this, PlayState* play) { Math_ApproachF(&this->appliedSpeed, this->targetAppliedSpeed, 1.0f, 0.1f); } - player->windDirection = this->appliedYaw; - player->windSpeed = this->appliedSpeed; + player->pushedYaw = this->appliedYaw; + player->pushedSpeed = this->appliedSpeed; } } else { if (this->applySpeed) { diff --git a/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c index 81242aa77..908a1af96 100644 --- a/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -313,7 +313,9 @@ void EnSth_GiveReward(EnSth* this, PlayState* play) { this->actor.parent = NULL; EnSth_SetupAction(this, EnSth_RewardObtainedTalk); gSaveContext.eventChkInf[EVENTCHKINF_SKULLTULA_REWARD_INDEX] |= this->eventFlag; - GameInteractor_ExecuteOnFlagSet(FLAG_EVENT_CHECK_INF, (EVENTCHKINF_SKULLTULA_REWARD_INDEX << 4) + sEventFlagsShift[this->actor.params]); + if (this->eventFlag != 0) { + GameInteractor_ExecuteOnFlagSet(FLAG_EVENT_CHECK_INF, (EVENTCHKINF_SKULLTULA_REWARD_INDEX << 4) + sEventFlagsShift[this->actor.params]); + } } else { EnSth_GivePlayerItem(this, play); } diff --git a/soh/src/overlays/actors/ovl_En_Stream/z_en_stream.c b/soh/src/overlays/actors/ovl_En_Stream/z_en_stream.c index 6706bef32..9d061ee47 100644 --- a/soh/src/overlays/actors/ovl_En_Stream/z_en_stream.c +++ b/soh/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -92,11 +92,11 @@ void EnStream_SuckPlayer(EnStream* this, PlayState* play) { if (func_80B0B81C(&this->actor.world.pos, &player->actor.world.pos, &posDifference, this->actor.scale.y) != 0) { xzDist = sqrtf(SQ(posDifference.x) + SQ(posDifference.z)); yDistWithOffset = player->actor.world.pos.y - (this->actor.world.pos.y - 90.0f); - player->windDirection = Math_FAtan2F(-posDifference.x, -posDifference.z) * (0x8000 / M_PI); + player->pushedYaw = Math_FAtan2F(-posDifference.x, -posDifference.z) * (0x8000 / M_PI); if (xzDist > 3.0f) { - Math_SmoothStepToF(&player->windSpeed, 3.0f, 0.5f, xzDist, 0.0f); + Math_SmoothStepToF(&player->pushedSpeed, 3.0f, 0.5f, xzDist, 0.0f); } else { - player->windSpeed = 0.0f; + player->pushedSpeed = 0.0f; Math_SmoothStepToF(&player->actor.world.pos.x, this->actor.world.pos.x, 0.5f, 3.0f, 0.0f); Math_SmoothStepToF(&player->actor.world.pos.z, this->actor.world.pos.z, 0.5f, 3.0f, 0.0f); } diff --git a/soh/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/soh/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c index 367831fca..7ab2d6f7b 100644 --- a/soh/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c +++ b/soh/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c @@ -468,7 +468,7 @@ void func_80B12460(EnSyatekiNiw* this, PlayState* play) { case 6: if (this->unk_25E == 1) { - play->sceneLoadFlag = 0x14; + play->transitionTrigger = TRANS_TRIGGER_START; play->nextEntranceIndex = gSaveContext.entranceIndex; play->shootingGalleryStatus = 0; player->actor.freezeTimer = 20; diff --git a/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c index 9b0dc07e2..0eb3e9095 100644 --- a/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -669,17 +669,17 @@ void func_80B15424(EnTa* this, PlayState* play) { func_80B15308(this); if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) { - play->nextEntranceIndex = 0x5E4; + play->nextEntranceIndex = ENTR_LON_LON_BUILDINGS_2; if (gSaveContext.eventInf[0] & 0x100) { - play->fadeTransition = 46; - gSaveContext.nextTransitionType = 3; + play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST); + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE; } else { - play->fadeTransition = 38; - gSaveContext.nextTransitionType = 2; + play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST); + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK; } - play->sceneLoadFlag = 0x14; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.eventInf[0] |= 0x400; this->actionFunc = func_80B153D4; this->unk_2CC = 22; diff --git a/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c index 738db714d..55fbed824 100644 --- a/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -408,7 +408,7 @@ s32 EnTk_ChooseReward(EnTk* this) { f32 luck; s32 reward; - if ((IS_RANDO || CVarGetInteger("gDampeWin", 0)) && !Flags_GetCollectible(gPlayState, 0x1F) && this->heartPieceSpawned == 0) { + if ((IS_RANDO || CVarGetInteger("gDampeWin", 0)) && !Flags_GetCollectible(gPlayState, COLLECTFLAG_GRAVEDIGGING_HEART_PIECE) && this->heartPieceSpawned == 0) { return 3; } @@ -624,10 +624,8 @@ void EnTk_Dig(EnTk* this, PlayState* play) { this->currentReward = EnTk_ChooseReward(this); - // merging in dampe tour fix seems messy, so i'm just wrapping this whole thing - // in an n64dd check for now - if (IS_RANDO || CVarGetInteger("gDampeWin", 0)) { - if (this->currentReward == 3) { + if (this->currentReward == 3) { + if (IS_RANDO || CVarGetInteger("gDampeWin", 0)) { /* * Upgrade the purple rupee reward to the heart piece if this * is the first grand prize dig. @@ -635,37 +633,31 @@ void EnTk_Dig(EnTk* this, PlayState* play) { if (!Flags_GetItemGetInf(ITEMGETINF_1C) && !(IS_RANDO || CVarGetInteger("gDampeWin", 0))) { Flags_SetItemGetInf(ITEMGETINF_1C); this->currentReward = 4; - } else if ((IS_RANDO || CVarGetInteger("gDampeWin", 0)) && !Flags_GetCollectible(gPlayState, 0x1F) && this->heartPieceSpawned == 0) { + } else if ((IS_RANDO || CVarGetInteger("gDampeWin", 0)) && !Flags_GetCollectible(gPlayState, COLLECTFLAG_GRAVEDIGGING_HEART_PIECE) && this->heartPieceSpawned == 0) { this->currentReward = 4; } } - - if ((IS_RANDO || CVarGetInteger("gDampeWin", 0)) && this->currentReward == 4) { - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ITEM00, rewardPos.x, rewardPos.y, rewardPos.z, 0, - 0, 0, 0x1F06, true); - this->heartPieceSpawned = 1; - } else { - Item_DropCollectible(play, &rewardPos, rewardParams[this->currentReward]); + /* + * Upgrade the purple rupee reward to the heart piece if this + * is the first grand prize dig. + */ + // If vanilla itemGetInf flag is not set, it's impossible for the new flag to be set, so return true. + // Otherwise if the gGravediggingTourFix is enabled and the new flag hasn't been set, return true. + // If true, spawn the heart piece and set the vanilla itemGetInf flag and new temp clear flag. + if (!heartPieceSpawned && + (!(gSaveContext.itemGetInf[1] & ITEMGETINFFLAG_GRAVEDIGGING_HEART_PIECE) || + CVarGetInteger("gGravediggingTourFix", 0) && + !Flags_GetCollectible(play, COLLECTFLAG_GRAVEDIGGING_HEART_PIECE))) { + this->currentReward = 4; + gSaveContext.itemGetInf[1] |= ITEMGETINFFLAG_GRAVEDIGGING_HEART_PIECE; + heartPieceSpawned = true; } + } + + if (IS_RANDO && this->currentReward == 4) { + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ITEM00, rewardPos.x, rewardPos.y, rewardPos.z, 0, 0, 0, 0x1906, true); + this->heartPieceSpawned = 1; } else { - if (this->currentReward == 3) { - /* - * Upgrade the purple rupee reward to the heart piece if this - * is the first grand prize dig. - */ - // If vanilla itemGetInf flag is not set, it's impossible for the new flag to be set, so return true. - // Otherwise if the gGravediggingTourFix is enabled and the new flag hasn't been set, return true. - // If true, spawn the heart piece and set the vanilla itemGetInf flag and new temp clear flag. - if (!heartPieceSpawned && - (!(gSaveContext.itemGetInf[1] & ITEMGETINFFLAG_GRAVEDIGGING_HEART_PIECE) || - CVarGetInteger("gGravediggingTourFix", 0) && - !Flags_GetCollectible(play, COLLECTFLAG_GRAVEDIGGING_HEART_PIECE))) { - this->currentReward = 4; - gSaveContext.itemGetInf[1] |= ITEMGETINFFLAG_GRAVEDIGGING_HEART_PIECE; - heartPieceSpawned = true; - } - } - EnItem00* reward = Item_DropCollectible(play, &rewardPos, rewardParams[this->currentReward]); if (this->currentReward == 4) { reward->collectibleFlag = COLLECTFLAG_GRAVEDIGGING_HEART_PIECE; diff --git a/soh/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/soh/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c index e83393899..bfc99a5b8 100644 --- a/soh/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/soh/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -602,8 +602,8 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) { // Handles Dark Link being damaged if ((this->actor.colChkInfo.health == 0) && sDeathFlag) { - this->csMode = 0x18; - this->unk_448 = &player->actor; + this->csAction = 0x18; + this->csActor = &player->actor; this->doorBgCamIndex = 1; sDeathFlag = false; } diff --git a/soh/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c b/soh/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c index 98a6a01b5..930db68d4 100644 --- a/soh/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c +++ b/soh/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c @@ -142,7 +142,7 @@ void func_80B3943C(EnWonderTalk* this, PlayState* play) { if ((Actor_ProcessTalkRequest(&this->actor, play))) { if (this->unk_156 != TEXT_STATE_DONE) { // not if we're rando'd in the temple of time talking to the altar - if(!(IS_RANDO && play->sceneNum == 67)) { + if(!(IS_RANDO && play->sceneNum == SCENE_TEMPLE_OF_TIME)) { this->actionFunc = func_80B395F0; } } else { diff --git a/soh/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c b/soh/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c index 509d66027..2b90e1ff7 100644 --- a/soh/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c +++ b/soh/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c @@ -257,13 +257,13 @@ void func_80B3A4F8(EnWonderTalk2* this, PlayState* play) { if (IS_RANDO) { // Scenes for which all of this type of wonder talk should be skipped. switch (play->sceneNum) { - case 0x0007: // Shadow Temple + case SCENE_SHADOW_TEMPLE: // Shadow Temple randoSkipText = true; break; - case 0x000B: // Gerudo Training Grounds + case SCENE_GERUDO_TRAINING_GROUND: // Gerudo Training Grounds randoSkipText = true; break; - case 0x000C: // Inside Gerudo Fortress + case SCENE_THIEVES_HIDEOUT: // Inside Gerudo Fortress randoSkipText = true; break; default: diff --git a/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c index 3f5412b05..08c3857e0 100644 --- a/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -402,7 +402,7 @@ void EnZl4_Init(Actor* thisx, PlayState* play) { Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ZL4_ANIM_0); this->actionFunc = EnZl4_Idle; } else { - if (gSaveContext.entranceIndex != 0x5F0) { + if (gSaveContext.entranceIndex != ENTR_CASTLE_COURTYARD_ZELDA_1) { Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ZL4_ANIM_21); this->csState = ZL4_CS_WAIT; this->talkState = 0; @@ -798,10 +798,10 @@ s32 EnZl4_CsAskName(EnZl4* this, PlayState* play) { this->talkTimer2++; if (this->talkTimer2 == 130) { play->msgCtx.msgMode = MSGMODE_PAUSED; - play->nextEntranceIndex = 0xA0; + play->nextEntranceIndex = ENTR_CUTSCENE_MAP_0; gSaveContext.nextCutsceneIndex = 0xFFF7; - play->sceneLoadFlag = 0x14; - play->fadeTransition = 3; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE; } break; } diff --git a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c index 189f9cfe7..b12d7b4b0 100644 --- a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -229,7 +229,7 @@ void ItemEtcetera_DrawThroughLens(Actor* thisx, PlayState* play) { func_8002EBCC(&this->actor, play, 0); func_8002ED80(&this->actor, play, 0); - if(IS_RANDO && play->sceneNum == 16) { + if(IS_RANDO && play->sceneNum == SCENE_TREASURE_BOX_SHOP) { GetItemEntry randoGetItem = GetChestGameRandoGetItem(this->actor.room, this->giDrawId, play); EnItem00_CustomItemsParticles(&this->actor, play, randoGetItem); if (randoGetItem.itemId != ITEM_NONE) { diff --git a/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c b/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c index 5cfb6b81f..a9cd36446 100644 --- a/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c +++ b/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c @@ -173,10 +173,10 @@ void ItemOcarina_StartSoTCutscene(ItemOcarina* this, PlayState* play) { play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gHyruleFieldZeldaSongOfTimeCs); gSaveContext.cutsceneTrigger = 1; } else { - play->sceneLoadFlag = 0x14; - play->fadeTransition = 3; - gSaveContext.nextTransitionType = 3; - play->nextEntranceIndex = 0x050F; + play->transitionTrigger = TRANS_TRIGGER_START; + play->transitionType = TRANS_TYPE_FADE_WHITE; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE; + play->nextEntranceIndex = ENTR_HYRULE_FIELD_16; gSaveContext.nextCutsceneIndex = 0; } } diff --git a/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c index e5d1410ea..eefaf9c0c 100644 --- a/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -158,22 +158,22 @@ void ObjectKankyo_Init(Actor* thisx, PlayState* play) { } if (gSaveContext.cutsceneTrigger != 0) { - if (gSaveContext.entranceIndex == 0x0538) { + if (gSaveContext.entranceIndex == ENTR_INSIDE_GANONS_CASTLE_2) { this->effects[0].size = 0.1f; } - if (gSaveContext.entranceIndex == 0x053C) { + if (gSaveContext.entranceIndex == ENTR_INSIDE_GANONS_CASTLE_3) { this->effects[1].size = 0.1f; } - if (gSaveContext.entranceIndex == 0x0540) { + if (gSaveContext.entranceIndex == ENTR_INSIDE_GANONS_CASTLE_4) { this->effects[2].size = 0.1f; } - if (gSaveContext.entranceIndex == 0x0544) { + if (gSaveContext.entranceIndex == ENTR_INSIDE_GANONS_CASTLE_5) { this->effects[3].size = 0.1f; } - if (gSaveContext.entranceIndex == 0x0548) { + if (gSaveContext.entranceIndex == ENTR_INSIDE_GANONS_CASTLE_6) { this->effects[4].size = 0.1f; } - if (gSaveContext.entranceIndex == 0x054C) { + if (gSaveContext.entranceIndex == ENTR_INSIDE_GANONS_CASTLE_7) { this->effects[5].size = 0.1f; } } @@ -247,7 +247,7 @@ void ObjectKankyo_Fairies(ObjectKankyo* this, PlayState* play) { } if (play->envCtx.unk_EE[3] < 64 && - (gSaveContext.entranceIndex != 0x00EE || gSaveContext.sceneSetupIndex != 4 || play->envCtx.unk_EE[3])) { + (gSaveContext.entranceIndex != ENTR_KOKIRI_FOREST_0 || gSaveContext.sceneSetupIndex != 4 || play->envCtx.unk_EE[3])) { play->envCtx.unk_EE[3] += 16; } diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c index 556b8ccd5..c0bb84212 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -35,6 +35,10 @@ #include #include +// Some player animations are played at this reduced speed, for reasons yet unclear. +// This is called "adjusted" for now. +#define PLAYER_ANIM_ADJUSTED_SPEED (2.0f / 3.0f) + typedef enum { /* 0x00 */ KNOB_ANIM_ADULT_L, /* 0x01 */ KNOB_ANIM_CHILD_L, @@ -50,7 +54,7 @@ typedef struct { typedef struct { /* 0x00 */ s16 actorId; /* 0x02 */ u8 itemId; - /* 0x03 */ u8 actionParam; + /* 0x03 */ u8 itemAction; /* 0x04 */ u8 textId; } BottleCatchInfo; // size = 0x06 @@ -75,7 +79,7 @@ typedef struct { typedef struct { /* 0x00 */ u16 sfxId; /* 0x02 */ s16 field; -} struct_80832924; // size = 0x04 +} AnimSfxEntry; // size = 0x04 typedef struct { /* 0x00 */ u16 unk_00; @@ -84,8 +88,8 @@ typedef struct { typedef struct { /* 0x00 */ LinkAnimationHeader* anim; - /* 0x04 */ u8 unk_04; -} struct_808540F4; // size = 0x08 + /* 0x04 */ u8 changeFrame; +} ItemChangeInfo; // size = 0x08 typedef struct { /* 0x00 */ LinkAnimationHeader* unk_00; @@ -116,14 +120,6 @@ typedef struct { }; } struct_80854B18; // size = 0x08 -typedef struct { - /* 0x00 */ s16 unk_00; - /* 0x02 */ s16 unk_02; - /* 0x04 */ s16 unk_04; - /* 0x06 */ s16 unk_06; - /* 0x08 */ s16 unk_08; -} struct_80858AC8; // size = 0x0A - void func_80833770(PlayState* play, Player* this); void func_80833790(PlayState* play, Player* this); void func_8083379C(PlayState* play, Player* this); @@ -131,10 +127,10 @@ void func_8083377C(PlayState* play, Player* this); void func_808337D4(PlayState* play, Player* this); void func_80833910(PlayState* play, Player* this); void func_80833984(PlayState* play, Player* this); -void func_8083399C(PlayState* play, Player* this, s8 actionParam); +void Player_InitItemAction(PlayState* play, Player* this, s8 itemAction); s32 func_8083485C(Player* this, PlayState* play); s32 func_808349DC(Player* this, PlayState* play); -s32 func_80834A2C(Player* this, PlayState* play); +s32 Player_UpperAction_ChangeHeldItem(Player* this, PlayState* play); s32 func_80834B5C(Player* this, PlayState* play); s32 func_80834C74(Player* this, PlayState* play); s32 func_8083501C(Player* this, PlayState* play); @@ -149,7 +145,7 @@ s32 func_808359FC(Player* this, PlayState* play); // Throw boomerang s32 spawn_boomerang_ivan(EnPartner* this, PlayState* play); // Throw boomerang Ivan s32 func_80835B60(Player* this, PlayState* play); // Boomerang active s32 func_80835C08(Player* this, PlayState* play); -void func_80835F44(PlayState* play, Player* this, s32 item); +void Player_UseItem(PlayState* play, Player* this, s32 item); void func_80839F90(Player* this, PlayState* play); s32 func_80838A14(Player* this, PlayState* play); s32 func_80839800(Player* this, PlayState* play); @@ -347,7 +343,7 @@ void func_80852E14(Player* this, PlayState* play); s32 Player_IsDroppingFish(PlayState* play); s32 Player_StartFishing(PlayState* play); s32 func_80852F38(PlayState* play, Player* this); -s32 func_80852FFC(PlayState* play, Actor* actor, s32 csMode); +s32 Player_TryCsAction(PlayState* play, Actor* actor, s32 csAction); void func_80853080(Player* this, PlayState* play); s32 Player_InflictDamage(PlayState* play, s32 damage); s32 Player_InflictDamageModified(PlayState* play, s32 damage, u8 modified); @@ -356,12 +352,35 @@ void func_80853148(PlayState* play, Actor* actor); // .bss part 1 static s32 D_80858AA0; static s32 D_80858AA4; -static Vec3f D_80858AA8; +static Vec3f sInteractWallCheckResult; static Input* sControlInput; // .data -static u8 D_80853410[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; +static u8 sUpperBodyLimbCopyMap[PLAYER_LIMB_MAX] = { + false, // PLAYER_LIMB_NONE + false, // PLAYER_LIMB_ROOT + false, // PLAYER_LIMB_WAIST + false, // PLAYER_LIMB_LOWER + false, // PLAYER_LIMB_R_THIGH + false, // PLAYER_LIMB_R_SHIN + false, // PLAYER_LIMB_R_FOOT + false, // PLAYER_LIMB_L_THIGH + false, // PLAYER_LIMB_L_SHIN + false, // PLAYER_LIMB_L_FOOT + true, // PLAYER_LIMB_UPPER + true, // PLAYER_LIMB_HEAD + true, // PLAYER_LIMB_HAT + true, // PLAYER_LIMB_COLLAR + true, // PLAYER_LIMB_L_SHOULDER + true, // PLAYER_LIMB_L_FOREARM + true, // PLAYER_LIMB_L_HAND + true, // PLAYER_LIMB_R_SHOULDER + true, // PLAYER_LIMB_R_FOREARM + true, // PLAYER_LIMB_R_HAND + true, // PLAYER_LIMB_SHEATH + true // PLAYER_LIMB_TORSO +}; static PlayerAgeProperties sAgeProperties[] = { { @@ -471,24 +490,24 @@ static PlayerAgeProperties sAgeProperties[] = { }; static u32 D_808535D0 = false; -static f32 D_808535D4 = 0.0f; -static s16 D_808535D8 = 0; +static f32 sControlStickMagnitude = 0.0f; +static s16 sControlStickAngle = 0; static s16 D_808535DC = 0; static s32 D_808535E0 = 0; -static s32 D_808535E4 = 0; +static s32 sFloorType = 0; static f32 D_808535E8 = 1.0f; static f32 D_808535EC = 1.0f; -static u32 D_808535F0 = 0; -static u32 D_808535F4 = 0; -static s16 D_808535F8 = 0; -static s16 D_808535FC = 0; -static f32 D_80853600 = 0.0f; -static s32 D_80853604 = 0; -static s32 D_80853608 = 0; -static s32 D_8085360C = 0; -static s16 D_80853610 = 0; -static s32 D_80853614 = 0; // Held item button just pressed? -static s32 D_80853618 = 0; // Held item button currently down? +static u32 sTouchedWallFlags = 0; +static u32 sConveyorSpeed = 0; +static s16 sIsFloorConveyor = 0; +static s16 sConveyorYaw = 0; +static f32 sYDistToFloor = 0.0f; +static s32 sPrevFloorProperty = 0; +static s32 sShapeYawToTouchedWall = 0; +static s32 sWorldYawToTouchedWall = 0; +static s16 sFloorShapePitch = 0; +static s32 sUseHeldItem = false; // When true, the current held item is used. Is reset to false every frame. +static s32 sHeldItemButtonIsHeldDown = false; // Indicates if the button for the current held item is held down. static u16 D_8085361C[] = { NA_SE_VO_LI_SWEAT, @@ -497,6 +516,8 @@ static u16 D_8085361C[] = { NA_SE_VO_LI_FALL_L, }; +#define GET_PLAYER_ANIM(group, type) D_80853914[group][type] + static LinkAnimationHeader* D_80853914[PLAYER_ANIMGROUP_MAX][PLAYER_ANIMTYPE_MAX] = { /* PLAYER_ANIMGROUP_wait */ { @@ -933,54 +954,54 @@ static LinkAnimationHeader* D_80853D7C[][2] = { { &gPlayerAnim_link_wait_itemD2_20f, &gPlayerAnim_link_wait_itemD2_20f } }; -static struct_80832924 D_80853DEC[] = { +static AnimSfxEntry D_80853DEC[] = { { NA_SE_VO_LI_SNEEZE, -0x2008 }, }; -static struct_80832924 D_80853DF0[] = { +static AnimSfxEntry D_80853DF0[] = { { NA_SE_VO_LI_SWEAT, -0x2012 }, }; -static struct_80832924 D_80853DF4[] = { +static AnimSfxEntry D_80853DF4[] = { { NA_SE_VO_LI_BREATH_REST, -0x200D }, }; -static struct_80832924 D_80853DF8[] = { +static AnimSfxEntry D_80853DF8[] = { { NA_SE_VO_LI_BREATH_REST, -0x200A }, }; -static struct_80832924 D_80853DFC[] = { +static AnimSfxEntry D_80853DFC[] = { { NA_SE_PL_CALM_HIT, 0x82C }, { NA_SE_PL_CALM_HIT, 0x830 }, { NA_SE_PL_CALM_HIT, 0x834 }, { NA_SE_PL_CALM_HIT, 0x838 }, { NA_SE_PL_CALM_HIT, -0x83C }, }; -static struct_80832924 D_80853E10[] = { +static AnimSfxEntry D_80853E10[] = { { 0, 0x4019 }, { 0, 0x401E }, { 0, 0x402C }, { 0, 0x4030 }, { 0, 0x4034 }, { 0, -0x4038 }, }; -static struct_80832924 D_80853E28[] = { +static AnimSfxEntry D_80853E28[] = { { NA_SE_IT_SHIELD_POSTURE, 0x810 }, { NA_SE_IT_SHIELD_POSTURE, 0x814 }, { NA_SE_IT_SHIELD_POSTURE, -0x846 }, }; -static struct_80832924 D_80853E34[] = { +static AnimSfxEntry D_80853E34[] = { { NA_SE_IT_HAMMER_SWING, 0x80A }, { NA_SE_VO_LI_AUTO_JUMP, 0x200A }, { NA_SE_IT_SWORD_SWING, 0x816 }, { NA_SE_VO_LI_SWORD_N, -0x2016 }, }; -static struct_80832924 D_80853E44[] = { +static AnimSfxEntry D_80853E44[] = { { NA_SE_IT_SWORD_SWING, 0x827 }, { NA_SE_VO_LI_SWORD_N, -0x2027 }, }; -static struct_80832924 D_80853E4C[] = { +static AnimSfxEntry D_80853E4C[] = { { NA_SE_VO_LI_RELAX, -0x2014 }, }; -static struct_80832924* D_80853E50[] = { +static AnimSfxEntry* D_80853E50[] = { D_80853DEC, D_80853DF0, D_80853DF4, D_80853DF8, D_80853DFC, D_80853E10, D_80853E28, D_80853E34, D_80853E44, D_80853E4C, NULL, }; @@ -989,162 +1010,293 @@ static u8 D_80853E7C[] = { 0, 0, 1, 1, 2, 2, 2, 2, 10, 10, 10, 10, 10, 10, 3, 3, 4, 4, 8, 8, 5, 5, 6, 6, 7, 7, 9, 9, 0, }; -// Used to map item IDs to action params -static s8 sItemActionParams[] = { - PLAYER_IA_DEKU_STICK, - PLAYER_IA_DEKU_NUT, - PLAYER_IA_BOMB, - PLAYER_IA_BOW, - PLAYER_IA_BOW_FIRE, - PLAYER_IA_DINS_FIRE, - PLAYER_IA_SLINGSHOT, - PLAYER_IA_OCARINA_FAIRY, - PLAYER_IA_OCARINA_OF_TIME, - PLAYER_IA_BOMBCHU, - PLAYER_IA_HOOKSHOT, - PLAYER_IA_LONGSHOT, - PLAYER_IA_BOW_ICE, - PLAYER_IA_FARORES_WIND, - PLAYER_IA_BOOMERANG, - PLAYER_IA_LENS_OF_TRUTH, - PLAYER_IA_MAGIC_BEAN, - PLAYER_IA_HAMMER, - PLAYER_IA_BOW_LIGHT, - PLAYER_IA_NAYRUS_LOVE, - PLAYER_IA_BOTTLE, - PLAYER_IA_BOTTLE_POTION_RED, - PLAYER_IA_BOTTLE_POTION_GREEN, - PLAYER_IA_BOTTLE_POTION_BLUE, - PLAYER_IA_BOTTLE_FAIRY, - PLAYER_IA_BOTTLE_FISH, - PLAYER_IA_BOTTLE_MILK_FULL, - PLAYER_IA_BOTTLE_RUTOS_LETTER, - PLAYER_IA_BOTTLE_FIRE, - PLAYER_IA_BOTTLE_BUG, - PLAYER_IA_BOTTLE_BIG_POE, - PLAYER_IA_BOTTLE_MILK_HALF, - PLAYER_IA_BOTTLE_POE, - PLAYER_IA_WEIRD_EGG, - PLAYER_IA_CHICKEN, - PLAYER_IA_ZELDAS_LETTER, - PLAYER_IA_MASK_KEATON, - PLAYER_IA_MASK_SKULL, - PLAYER_IA_MASK_SPOOKY, - PLAYER_IA_MASK_BUNNY_HOOD, - PLAYER_IA_MASK_GORON, - PLAYER_IA_MASK_ZORA, - PLAYER_IA_MASK_GERUDO, - PLAYER_IA_MASK_TRUTH, - PLAYER_IA_SWORD_MASTER, - PLAYER_IA_POCKET_EGG, - PLAYER_IA_POCKET_CUCCO, - PLAYER_IA_COJIRO, - PLAYER_IA_ODD_MUSHROOM, - PLAYER_IA_ODD_POTION, - PLAYER_IA_POACHERS_SAW, - PLAYER_IA_BROKEN_GORONS_SWORD, - PLAYER_IA_PRESCRIPTION, - PLAYER_IA_FROG, - PLAYER_IA_EYEDROPS, - PLAYER_IA_CLAIM_CHECK, - PLAYER_IA_BOW_FIRE, - PLAYER_IA_BOW_ICE, - PLAYER_IA_BOW_LIGHT, - PLAYER_IA_SWORD_KOKIRI, - PLAYER_IA_SWORD_MASTER, - PLAYER_IA_SWORD_BIGGORON, - PLAYER_IA_SHIELD_DEKU, - PLAYER_IA_SHIELD_HYLIAN, - PLAYER_IA_SHIELD_MIRROR, - PLAYER_IA_TUNIC_KOKIRI, - PLAYER_IA_TUNIC_GORON, - PLAYER_IA_TUNIC_ZORA, - PLAYER_IA_BOOTS_KOKIRI, - PLAYER_IA_BOOTS_IRON, - PLAYER_IA_BOOTS_HOVER, +// Used to map item IDs to item actions +static s8 sItemActions[] = { + PLAYER_IA_DEKU_STICK, // ITEM_DEKU_STICK + PLAYER_IA_DEKU_NUT, // ITEM_DEKU_NUT + PLAYER_IA_BOMB, // ITEM_BOMB + PLAYER_IA_BOW, // ITEM_BOW + PLAYER_IA_BOW_FIRE, // ITEM_ARROW_FIRE + PLAYER_IA_DINS_FIRE, // ITEM_DINS_FIRE + PLAYER_IA_SLINGSHOT, // ITEM_SLINGSHOT + PLAYER_IA_OCARINA_FAIRY, // ITEM_OCARINA_FAIRY + PLAYER_IA_OCARINA_OF_TIME, // ITEM_OCARINA_OF_TIME + PLAYER_IA_BOMBCHU, // ITEM_BOMBCHU + PLAYER_IA_HOOKSHOT, // ITEM_HOOKSHOT + PLAYER_IA_LONGSHOT, // ITEM_LONGSHOT + PLAYER_IA_BOW_ICE, // ITEM_ARROW_ICE + PLAYER_IA_FARORES_WIND, // ITEM_FARORES_WIND + PLAYER_IA_BOOMERANG, // ITEM_BOOMERANG + PLAYER_IA_LENS_OF_TRUTH, // ITEM_LENS_OF_TRUTH + PLAYER_IA_MAGIC_BEAN, // ITEM_MAGIC_BEAN + PLAYER_IA_HAMMER, // ITEM_HAMMER + PLAYER_IA_BOW_LIGHT, // ITEM_ARROW_LIGHT + PLAYER_IA_NAYRUS_LOVE, // ITEM_NAYRUS_LOVE + PLAYER_IA_BOTTLE, // ITEM_BOTTLE_EMPTY + PLAYER_IA_BOTTLE_POTION_RED, // ITEM_BOTTLE_POTION_RED + PLAYER_IA_BOTTLE_POTION_GREEN, // ITEM_BOTTLE_POTION_GREEN + PLAYER_IA_BOTTLE_POTION_BLUE, // ITEM_BOTTLE_POTION_BLUE + PLAYER_IA_BOTTLE_FAIRY, // ITEM_BOTTLE_FAIRY + PLAYER_IA_BOTTLE_FISH, // ITEM_BOTTLE_FISH + PLAYER_IA_BOTTLE_MILK_FULL, // ITEM_BOTTLE_MILK_FULL + PLAYER_IA_BOTTLE_RUTOS_LETTER, // ITEM_BOTTLE_RUTOS_LETTER + PLAYER_IA_BOTTLE_FIRE, // ITEM_BOTTLE_BLUE_FIRE + PLAYER_IA_BOTTLE_BUG, // ITEM_BOTTLE_BUG + PLAYER_IA_BOTTLE_BIG_POE, // ITEM_BOTTLE_BIG_POE + PLAYER_IA_BOTTLE_MILK_HALF, // ITEM_BOTTLE_MILK_HALF + PLAYER_IA_BOTTLE_POE, // ITEM_BOTTLE_POE + PLAYER_IA_WEIRD_EGG, // ITEM_WEIRD_EGG + PLAYER_IA_CHICKEN, // ITEM_CHICKEN + PLAYER_IA_ZELDAS_LETTER, // ITEM_ZELDAS_LETTER + PLAYER_IA_MASK_KEATON, // ITEM_MASK_KEATON + PLAYER_IA_MASK_SKULL, // ITEM_MASK_SKULL + PLAYER_IA_MASK_SPOOKY, // ITEM_MASK_SPOOKY + PLAYER_IA_MASK_BUNNY_HOOD, // ITEM_MASK_BUNNY_HOOD + PLAYER_IA_MASK_GORON, // ITEM_MASK_GORON + PLAYER_IA_MASK_ZORA, // ITEM_MASK_ZORA + PLAYER_IA_MASK_GERUDO, // ITEM_MASK_GERUDO + PLAYER_IA_MASK_TRUTH, // ITEM_MASK_TRUTH + PLAYER_IA_SWORD_MASTER, // ITEM_SOLD_OUT + PLAYER_IA_POCKET_EGG, // ITEM_POCKET_EGG + PLAYER_IA_POCKET_CUCCO, // ITEM_POCKET_CUCCO + PLAYER_IA_COJIRO, // ITEM_COJIRO + PLAYER_IA_ODD_MUSHROOM, // ITEM_ODD_MUSHROOM + PLAYER_IA_ODD_POTION, // ITEM_ODD_POTION + PLAYER_IA_POACHERS_SAW, // ITEM_POACHERS_SAW + PLAYER_IA_BROKEN_GORONS_SWORD, // ITEM_BROKEN_GORONS_SWORD + PLAYER_IA_PRESCRIPTION, // ITEM_PRESCRIPTION + PLAYER_IA_FROG, // ITEM_EYEBALL_FROG + PLAYER_IA_EYEDROPS, // ITEM_EYE_DROPS + PLAYER_IA_CLAIM_CHECK, // ITEM_CLAIM_CHECK + PLAYER_IA_BOW_FIRE, // ITEM_BOW_FIRE + PLAYER_IA_BOW_ICE, // ITEM_BOW_ICE + PLAYER_IA_BOW_LIGHT, // ITEM_BOW_LIGHT + PLAYER_IA_SWORD_KOKIRI, // ITEM_SWORD_KOKIRI + PLAYER_IA_SWORD_MASTER, // ITEM_SWORD_MASTER + PLAYER_IA_SWORD_BIGGORON, // ITEM_SWORD_BIGGORON + PLAYER_IA_SHIELD_DEKU, // ITEM_SHIELD_DEKU + PLAYER_IA_SHIELD_HYLIAN, // ITEM_SHIELD_HYLIAN + PLAYER_IA_SHIELD_MIRROR, // ITEM_SHIELD_MIRROR + PLAYER_IA_TUNIC_KOKIRI, // ITEM_TUNIC_KOKIRI + PLAYER_IA_TUNIC_GORON, // ITEM_TUNIC_GORON + PLAYER_IA_TUNIC_ZORA, // ITEM_TUNIC_ZORA + PLAYER_IA_BOOTS_KOKIRI, // ITEM_BOOTS_KOKIRI + PLAYER_IA_BOOTS_IRON, // ITEM_BOOTS_IRON + PLAYER_IA_BOOTS_HOVER, // ITEM_BOOTS_HOVER }; static u8 sMaskMemory; u8 gWalkSpeedToggle1; u8 gWalkSpeedToggle2; -// Used to map action params to update functions -static s32 (*D_80853EDC[])(Player* this, PlayState* play) = { - func_8083485C, func_8083485C, func_8083485C, func_808349DC, func_808349DC, func_808349DC, func_8083485C, - func_8083485C, func_8083501C, func_8083501C, func_8083501C, func_8083501C, func_8083501C, func_8083501C, - func_8083501C, func_8083501C, func_8083501C, func_8083501C, func_808356E8, func_808356E8, func_80835800, - func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, - func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, - func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, - func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, - func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, - func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, - func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, - func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, +static s32 (*sItemActionUpdateFuncs[])(Player* this, PlayState* play) = { + func_8083485C, // PLAYER_IA_NONE + func_8083485C, // PLAYER_IA_SWORD_CS + func_8083485C, // PLAYER_IA_FISHING_POLE + func_808349DC, // PLAYER_IA_SWORD_MASTER + func_808349DC, // PLAYER_IA_SWORD_KOKIRI + func_808349DC, // PLAYER_IA_SWORD_BIGGORON + func_8083485C, // PLAYER_IA_DEKU_STICK + func_8083485C, // PLAYER_IA_HAMMER + func_8083501C, // PLAYER_IA_BOW + func_8083501C, // PLAYER_IA_BOW_FIRE + func_8083501C, // PLAYER_IA_BOW_ICE + func_8083501C, // PLAYER_IA_BOW_LIGHT + func_8083501C, // PLAYER_IA_BOW_0C + func_8083501C, // PLAYER_IA_BOW_0D + func_8083501C, // PLAYER_IA_BOW_0E + func_8083501C, // PLAYER_IA_SLINGSHOT + func_8083501C, // PLAYER_IA_HOOKSHOT + func_8083501C, // PLAYER_IA_LONGSHOT + func_808356E8, // PLAYER_IA_BOMB + func_808356E8, // PLAYER_IA_BOMBCHU + func_80835800, // PLAYER_IA_BOOMERANG + func_8083485C, // PLAYER_IA_MAGIC_SPELL_15 + func_8083485C, // PLAYER_IA_MAGIC_SPELL_16 + func_8083485C, // PLAYER_IA_MAGIC_SPELL_17 + func_8083485C, // PLAYER_IA_FARORES_WIND + func_8083485C, // PLAYER_IA_NAYRUS_LOVE + func_8083485C, // PLAYER_IA_DINS_FIRE + func_8083485C, // PLAYER_IA_DEKU_NUT + func_8083485C, // PLAYER_IA_OCARINA_FAIRY + func_8083485C, // PLAYER_IA_OCARINA_OF_TIME + func_8083485C, // PLAYER_IA_BOTTLE + func_8083485C, // PLAYER_IA_BOTTLE_FISH + func_8083485C, // PLAYER_IA_BOTTLE_FIRE + func_8083485C, // PLAYER_IA_BOTTLE_BUG + func_8083485C, // PLAYER_IA_BOTTLE_POE + func_8083485C, // PLAYER_IA_BOTTLE_BIG_POE + func_8083485C, // PLAYER_IA_BOTTLE_RUTOS_LETTER + func_8083485C, // PLAYER_IA_BOTTLE_POTION_RED + func_8083485C, // PLAYER_IA_BOTTLE_POTION_BLUE + func_8083485C, // PLAYER_IA_BOTTLE_POTION_GREEN + func_8083485C, // PLAYER_IA_BOTTLE_MILK_FULL + func_8083485C, // PLAYER_IA_BOTTLE_MILK_HALF + func_8083485C, // PLAYER_IA_BOTTLE_FAIRY + func_8083485C, // PLAYER_IA_ZELDAS_LETTER + func_8083485C, // PLAYER_IA_WEIRD_EGG + func_8083485C, // PLAYER_IA_CHICKEN + func_8083485C, // PLAYER_IA_MAGIC_BEAN + func_8083485C, // PLAYER_IA_POCKET_EGG + func_8083485C, // PLAYER_IA_POCKET_CUCCO + func_8083485C, // PLAYER_IA_COJIRO + func_8083485C, // PLAYER_IA_ODD_MUSHROOM + func_8083485C, // PLAYER_IA_ODD_POTION + func_8083485C, // PLAYER_IA_POACHERS_SAW + func_8083485C, // PLAYER_IA_BROKEN_GORONS_SWORD + func_8083485C, // PLAYER_IA_PRESCRIPTION + func_8083485C, // PLAYER_IA_FROG + func_8083485C, // PLAYER_IA_EYEDROPS + func_8083485C, // PLAYER_IA_CLAIM_CHECK + func_8083485C, // PLAYER_IA_MASK_KEATON + func_8083485C, // PLAYER_IA_MASK_SKULL + func_8083485C, // PLAYER_IA_MASK_SPOOKY + func_8083485C, // PLAYER_IA_MASK_BUNNY_HOOD + func_8083485C, // PLAYER_IA_MASK_GORON + func_8083485C, // PLAYER_IA_MASK_ZORA + func_8083485C, // PLAYER_IA_MASK_GERUDO + func_8083485C, // PLAYER_IA_MASK_TRUTH + func_8083485C, // PLAYER_IA_LENS_OF_TRUTH + func_8083485C, // PLAYER_IA_SHIELD_DEKU + func_8083485C, // PLAYER_IA_SHIELD_HYLIAN + func_8083485C, // PLAYER_IA_SHIELD_MIRROR + func_8083485C, // PLAYER_IA_TUNIC_KOKIRI + func_8083485C, // PLAYER_IA_TUNIC_GORON + func_8083485C, // PLAYER_IA_TUNIC_ZORA + func_8083485C, // PLAYER_IA_BOOTS_KOKIRI + func_8083485C, // PLAYER_IA_BOOTS_IRON + func_8083485C, // PLAYER_IA_BOOTS_HOVER }; -static void (*D_80853FE8[])(PlayState* play, Player* this) = { - func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_8083377C, - func_80833790, func_8083379C, func_8083379C, func_8083379C, func_8083379C, func_8083379C, func_8083379C, - func_8083379C, func_8083379C, func_80833910, func_80833910, func_808337D4, func_808337D4, func_80833984, - func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, - func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, - func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, - func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, - func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, - func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, - func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, - func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, +static void (*sItemActionInitFuncs[])(PlayState* play, Player* this) = { + func_80833770, // PLAYER_IA_NONE + func_80833770, // PLAYER_IA_SWORD_CS + func_80833770, // PLAYER_IA_FISHING_POLE + func_80833770, // PLAYER_IA_SWORD_MASTER + func_80833770, // PLAYER_IA_SWORD_KOKIRI + func_80833770, // PLAYER_IA_SWORD_BIGGORON + func_8083377C, // PLAYER_IA_DEKU_STICK + func_80833790, // PLAYER_IA_HAMMER + func_8083379C, // PLAYER_IA_BOW + func_8083379C, // PLAYER_IA_BOW_FIRE + func_8083379C, // PLAYER_IA_BOW_ICE + func_8083379C, // PLAYER_IA_BOW_LIGHT + func_8083379C, // PLAYER_IA_BOW_0C + func_8083379C, // PLAYER_IA_BOW_0D + func_8083379C, // PLAYER_IA_BOW_0E + func_8083379C, // PLAYER_IA_SLINGSHOT + func_80833910, // PLAYER_IA_HOOKSHOT + func_80833910, // PLAYER_IA_LONGSHOT + func_808337D4, // PLAYER_IA_BOMB + func_808337D4, // PLAYER_IA_BOMBCHU + func_80833984, // PLAYER_IA_BOOMERANG + func_80833770, // PLAYER_IA_MAGIC_SPELL_15 + func_80833770, // PLAYER_IA_MAGIC_SPELL_16 + func_80833770, // PLAYER_IA_MAGIC_SPELL_17 + func_80833770, // PLAYER_IA_FARORES_WIND + func_80833770, // PLAYER_IA_NAYRUS_LOVE + func_80833770, // PLAYER_IA_DINS_FIRE + func_80833770, // PLAYER_IA_DEKU_NUT + func_80833770, // PLAYER_IA_OCARINA_FAIRY + func_80833770, // PLAYER_IA_OCARINA_OF_TIME + func_80833770, // PLAYER_IA_BOTTLE + func_80833770, // PLAYER_IA_BOTTLE_FISH + func_80833770, // PLAYER_IA_BOTTLE_FIRE + func_80833770, // PLAYER_IA_BOTTLE_BUG + func_80833770, // PLAYER_IA_BOTTLE_POE + func_80833770, // PLAYER_IA_BOTTLE_BIG_POE + func_80833770, // PLAYER_IA_BOTTLE_RUTOS_LETTER + func_80833770, // PLAYER_IA_BOTTLE_POTION_RED + func_80833770, // PLAYER_IA_BOTTLE_POTION_BLUE + func_80833770, // PLAYER_IA_BOTTLE_POTION_GREEN + func_80833770, // PLAYER_IA_BOTTLE_MILK_FULL + func_80833770, // PLAYER_IA_BOTTLE_MILK_HALF + func_80833770, // PLAYER_IA_BOTTLE_FAIRY + func_80833770, // PLAYER_IA_ZELDAS_LETTER + func_80833770, // PLAYER_IA_WEIRD_EGG + func_80833770, // PLAYER_IA_CHICKEN + func_80833770, // PLAYER_IA_MAGIC_BEAN + func_80833770, // PLAYER_IA_POCKET_EGG + func_80833770, // PLAYER_IA_POCKET_CUCCO + func_80833770, // PLAYER_IA_COJIRO + func_80833770, // PLAYER_IA_ODD_MUSHROOM + func_80833770, // PLAYER_IA_ODD_POTION + func_80833770, // PLAYER_IA_POACHERS_SAW + func_80833770, // PLAYER_IA_BROKEN_GORONS_SWORD + func_80833770, // PLAYER_IA_PRESCRIPTION + func_80833770, // PLAYER_IA_FROG + func_80833770, // PLAYER_IA_EYEDROPS + func_80833770, // PLAYER_IA_CLAIM_CHECK + func_80833770, // PLAYER_IA_MASK_KEATON + func_80833770, // PLAYER_IA_MASK_SKULL + func_80833770, // PLAYER_IA_MASK_SPOOKY + func_80833770, // PLAYER_IA_MASK_BUNNY_HOOD + func_80833770, // PLAYER_IA_MASK_GORON + func_80833770, // PLAYER_IA_MASK_ZORA + func_80833770, // PLAYER_IA_MASK_GERUDO + func_80833770, // PLAYER_IA_MASK_TRUTH + func_80833770, // PLAYER_IA_LENS_OF_TRUTH + func_80833770, // PLAYER_IA_SHIELD_DEKU + func_80833770, // PLAYER_IA_SHIELD_HYLIAN + func_80833770, // PLAYER_IA_SHIELD_MIRROR + func_80833770, // PLAYER_IA_TUNIC_KOKIRI + func_80833770, // PLAYER_IA_TUNIC_GORON + func_80833770, // PLAYER_IA_TUNIC_ZORA + func_80833770, // PLAYER_IA_BOOTS_KOKIRI + func_80833770, // PLAYER_IA_BOOTS_IRON + func_80833770, // PLAYER_IA_BOOTS_HOVER }; typedef enum { - /* 0 */ PLAYER_D_808540F4_0, - /* 1 */ PLAYER_D_808540F4_1, - /* 2 */ PLAYER_D_808540F4_2, - /* 3 */ PLAYER_D_808540F4_3, - /* 4 */ PLAYER_D_808540F4_4, - /* 5 */ PLAYER_D_808540F4_5, - /* 6 */ PLAYER_D_808540F4_6, - /* 7 */ PLAYER_D_808540F4_7, - /* 8 */ PLAYER_D_808540F4_8, - /* 9 */ PLAYER_D_808540F4_9, - /* 10 */ PLAYER_D_808540F4_10, - /* 11 */ PLAYER_D_808540F4_11, - /* 12 */ PLAYER_D_808540F4_12, - /* 13 */ PLAYER_D_808540F4_13, - /* 14 */ PLAYER_D_808540F4_MAX -} PlayerD_808540F4Index; + /* 0 */ PLAYER_ITEM_CHG_0, + /* 1 */ PLAYER_ITEM_CHG_1, + /* 2 */ PLAYER_ITEM_CHG_2, + /* 3 */ PLAYER_ITEM_CHG_3, + /* 4 */ PLAYER_ITEM_CHG_4, + /* 5 */ PLAYER_ITEM_CHG_5, + /* 6 */ PLAYER_ITEM_CHG_6, + /* 7 */ PLAYER_ITEM_CHG_7, + /* 8 */ PLAYER_ITEM_CHG_8, + /* 9 */ PLAYER_ITEM_CHG_9, + /* 10 */ PLAYER_ITEM_CHG_10, + /* 11 */ PLAYER_ITEM_CHG_11, + /* 12 */ PLAYER_ITEM_CHG_12, + /* 13 */ PLAYER_ITEM_CHG_13, + /* 14 */ PLAYER_ITEM_CHG_MAX +} ItemChangeType; -static struct_808540F4 D_808540F4[PLAYER_D_808540F4_MAX] = { - /* PLAYER_D_808540F4_0 */ { &gPlayerAnim_link_normal_free2free, 12 }, - /* PLAYER_D_808540F4_1 */ { &gPlayerAnim_link_normal_normal2fighter, 6 }, - /* PLAYER_D_808540F4_2 */ { &gPlayerAnim_link_hammer_normal2long, 8 }, - /* PLAYER_D_808540F4_3 */ { &gPlayerAnim_link_normal_normal2free, 8 }, - /* PLAYER_D_808540F4_4 */ { &gPlayerAnim_link_fighter_fighter2long, 8 }, - /* PLAYER_D_808540F4_5 */ { &gPlayerAnim_link_normal_fighter2free, 10 }, - /* PLAYER_D_808540F4_6 */ { &gPlayerAnim_link_hammer_long2free, 7 }, - /* PLAYER_D_808540F4_7 */ { &gPlayerAnim_link_hammer_long2long, 11 }, - /* PLAYER_D_808540F4_8 */ { &gPlayerAnim_link_normal_free2free, 12 }, - /* PLAYER_D_808540F4_9 */ { &gPlayerAnim_link_normal_normal2bom, 4 }, - /* PLAYER_D_808540F4_10 */ { &gPlayerAnim_link_normal_long2bom, 4 }, - /* PLAYER_D_808540F4_11 */ { &gPlayerAnim_link_normal_free2bom, 4 }, - /* PLAYER_D_808540F4_12 */ { &gPlayerAnim_link_anchor_anchor2fighter, 5 }, - /* PLAYER_D_808540F4_13 */ { &gPlayerAnim_link_normal_free2freeB, 13 }, +static ItemChangeInfo sItemChangeInfo[PLAYER_ITEM_CHG_MAX] = { + /* PLAYER_ITEM_CHG_0 */ { &gPlayerAnim_link_normal_free2free, 12 }, + /* PLAYER_ITEM_CHG_1 */ { &gPlayerAnim_link_normal_normal2fighter, 6 }, + /* PLAYER_ITEM_CHG_2 */ { &gPlayerAnim_link_hammer_normal2long, 8 }, + /* PLAYER_ITEM_CHG_3 */ { &gPlayerAnim_link_normal_normal2free, 8 }, + /* PLAYER_ITEM_CHG_4 */ { &gPlayerAnim_link_fighter_fighter2long, 8 }, + /* PLAYER_ITEM_CHG_5 */ { &gPlayerAnim_link_normal_fighter2free, 10 }, + /* PLAYER_ITEM_CHG_6 */ { &gPlayerAnim_link_hammer_long2free, 7 }, + /* PLAYER_ITEM_CHG_7 */ { &gPlayerAnim_link_hammer_long2long, 11 }, + /* PLAYER_ITEM_CHG_8 */ { &gPlayerAnim_link_normal_free2free, 12 }, + /* PLAYER_ITEM_CHG_9 */ { &gPlayerAnim_link_normal_normal2bom, 4 }, + /* PLAYER_ITEM_CHG_10 */ { &gPlayerAnim_link_normal_long2bom, 4 }, + /* PLAYER_ITEM_CHG_11 */ { &gPlayerAnim_link_normal_free2bom, 4 }, + /* PLAYER_ITEM_CHG_12 */ { &gPlayerAnim_link_anchor_anchor2fighter, 5 }, + /* PLAYER_ITEM_CHG_13 */ { &gPlayerAnim_link_normal_free2freeB, 13 }, }; -static s8 D_80854164[PLAYER_ANIMTYPE_MAX][PLAYER_ANIMTYPE_MAX] = { - { PLAYER_D_808540F4_8, -PLAYER_D_808540F4_5, -PLAYER_D_808540F4_3, -PLAYER_D_808540F4_6, PLAYER_D_808540F4_8, - PLAYER_D_808540F4_11 }, - { PLAYER_D_808540F4_5, PLAYER_D_808540F4_0, -PLAYER_D_808540F4_1, PLAYER_D_808540F4_4, PLAYER_D_808540F4_5, - PLAYER_D_808540F4_9 }, - { PLAYER_D_808540F4_3, PLAYER_D_808540F4_1, PLAYER_D_808540F4_0, PLAYER_D_808540F4_2, PLAYER_D_808540F4_3, - PLAYER_D_808540F4_9 }, - { PLAYER_D_808540F4_6, -PLAYER_D_808540F4_4, -PLAYER_D_808540F4_2, PLAYER_D_808540F4_7, PLAYER_D_808540F4_6, - PLAYER_D_808540F4_10 }, - { PLAYER_D_808540F4_8, -PLAYER_D_808540F4_5, -PLAYER_D_808540F4_3, -PLAYER_D_808540F4_6, PLAYER_D_808540F4_8, - PLAYER_D_808540F4_11 }, - { PLAYER_D_808540F4_8, -PLAYER_D_808540F4_5, -PLAYER_D_808540F4_3, -PLAYER_D_808540F4_6, PLAYER_D_808540F4_8, - PLAYER_D_808540F4_11 }, +// Maps the appropriate ItemChangeType based on current and next animtype. +// A negative type value means the corresponding animation should be played in reverse. +static s8 sItemChangeTypes[PLAYER_ANIMTYPE_MAX][PLAYER_ANIMTYPE_MAX] = { + { PLAYER_ITEM_CHG_8, -PLAYER_ITEM_CHG_5, -PLAYER_ITEM_CHG_3, -PLAYER_ITEM_CHG_6, PLAYER_ITEM_CHG_8, + PLAYER_ITEM_CHG_11 }, + { PLAYER_ITEM_CHG_5, PLAYER_ITEM_CHG_0, -PLAYER_ITEM_CHG_1, PLAYER_ITEM_CHG_4, PLAYER_ITEM_CHG_5, + PLAYER_ITEM_CHG_9 }, + { PLAYER_ITEM_CHG_3, PLAYER_ITEM_CHG_1, PLAYER_ITEM_CHG_0, PLAYER_ITEM_CHG_2, PLAYER_ITEM_CHG_3, + PLAYER_ITEM_CHG_9 }, + { PLAYER_ITEM_CHG_6, -PLAYER_ITEM_CHG_4, -PLAYER_ITEM_CHG_2, PLAYER_ITEM_CHG_7, PLAYER_ITEM_CHG_6, + PLAYER_ITEM_CHG_10 }, + { PLAYER_ITEM_CHG_8, -PLAYER_ITEM_CHG_5, -PLAYER_ITEM_CHG_3, -PLAYER_ITEM_CHG_6, PLAYER_ITEM_CHG_8, + PLAYER_ITEM_CHG_11 }, + { PLAYER_ITEM_CHG_8, -PLAYER_ITEM_CHG_5, -PLAYER_ITEM_CHG_3, -PLAYER_ITEM_CHG_6, PLAYER_ITEM_CHG_8, + PLAYER_ITEM_CHG_11 }, }; static ExplosiveInfo sExplosiveInfos[] = { @@ -1152,60 +1304,88 @@ static ExplosiveInfo sExplosiveInfos[] = { { ITEM_BOMBCHU, ACTOR_EN_BOM_CHU }, }; -static struct_80854190 D_80854190[] = { +static struct_80854190 D_80854190[PLAYER_MWA_MAX] = { + /* PLAYER_MWA_FORWARD_SLASH_1H */ { &gPlayerAnim_link_fighter_normal_kiru, &gPlayerAnim_link_fighter_normal_kiru_end, &gPlayerAnim_link_fighter_normal_kiru_endR, 1, 4 }, + /* PLAYER_MWA_FORWARD_SLASH_2H */ { &gPlayerAnim_link_fighter_Lnormal_kiru, &gPlayerAnim_link_fighter_Lnormal_kiru_end, &gPlayerAnim_link_anchor_Lnormal_kiru_endR, 1, 4 }, + /* PLAYER_MWA_FORWARD_COMBO_1H */ { &gPlayerAnim_link_fighter_normal_kiru_finsh, &gPlayerAnim_link_fighter_normal_kiru_finsh_end, &gPlayerAnim_link_anchor_normal_kiru_finsh_endR, 0, 5 }, + /* PLAYER_MWA_FORWARD_COMBO_2H */ { &gPlayerAnim_link_fighter_Lnormal_kiru_finsh, &gPlayerAnim_link_fighter_Lnormal_kiru_finsh_end, &gPlayerAnim_link_anchor_Lnormal_kiru_finsh_endR, 1, 7 }, + /* PLAYER_MWA_RIGHT_SLASH_1H */ { &gPlayerAnim_link_fighter_Lside_kiru, &gPlayerAnim_link_fighter_Lside_kiru_end, &gPlayerAnim_link_anchor_Lside_kiru_endR, 1, 4 }, + /* PLAYER_MWA_RIGHT_SLASH_2H */ { &gPlayerAnim_link_fighter_LLside_kiru, &gPlayerAnim_link_fighter_LLside_kiru_end, &gPlayerAnim_link_anchor_LLside_kiru_endL, 0, 5 }, + /* PLAYER_MWA_RIGHT_COMBO_1H */ { &gPlayerAnim_link_fighter_Lside_kiru_finsh, &gPlayerAnim_link_fighter_Lside_kiru_finsh_end, &gPlayerAnim_link_anchor_Lside_kiru_finsh_endR, 2, 8 }, + /* PLAYER_MWA_RIGHT_COMBO_2H */ { &gPlayerAnim_link_fighter_LLside_kiru_finsh, &gPlayerAnim_link_fighter_LLside_kiru_finsh_end, &gPlayerAnim_link_anchor_LLside_kiru_finsh_endR, 3, 8 }, + /* PLAYER_MWA_LEFT_SLASH_1H */ { &gPlayerAnim_link_fighter_Rside_kiru, &gPlayerAnim_link_fighter_Rside_kiru_end, &gPlayerAnim_link_anchor_Rside_kiru_endR, 0, 4 }, + /* PLAYER_MWA_LEFT_SLASH_2H */ { &gPlayerAnim_link_fighter_LRside_kiru, &gPlayerAnim_link_fighter_LRside_kiru_end, &gPlayerAnim_link_anchor_LRside_kiru_endR, 0, 5 }, + /* PLAYER_MWA_LEFT_COMBO_1H */ { &gPlayerAnim_link_fighter_Rside_kiru_finsh, &gPlayerAnim_link_fighter_Rside_kiru_finsh_end, &gPlayerAnim_link_anchor_Rside_kiru_finsh_endR, 0, 6 }, + /* PLAYER_MWA_LEFT_COMBO_2H */ { &gPlayerAnim_link_fighter_LRside_kiru_finsh, &gPlayerAnim_link_fighter_LRside_kiru_finsh_end, &gPlayerAnim_link_anchor_LRside_kiru_finsh_endL, 1, 5 }, + /* PLAYER_MWA_STAB_1H */ { &gPlayerAnim_link_fighter_pierce_kiru, &gPlayerAnim_link_fighter_pierce_kiru_end, &gPlayerAnim_link_anchor_pierce_kiru_endR, 0, 3 }, + /* PLAYER_MWA_STAB_2H */ { &gPlayerAnim_link_fighter_Lpierce_kiru, &gPlayerAnim_link_fighter_Lpierce_kiru_end, &gPlayerAnim_link_anchor_Lpierce_kiru_endL, 0, 3 }, + /* PLAYER_MWA_STAB_COMBO_1H */ { &gPlayerAnim_link_fighter_pierce_kiru_finsh, &gPlayerAnim_link_fighter_pierce_kiru_finsh_end, &gPlayerAnim_link_anchor_pierce_kiru_finsh_endR, 1, 9 }, + /* PLAYER_MWA_STAB_COMBO_2H */ { &gPlayerAnim_link_fighter_Lpierce_kiru_finsh, &gPlayerAnim_link_fighter_Lpierce_kiru_finsh_end, &gPlayerAnim_link_anchor_Lpierce_kiru_finsh_endR, 1, 8 }, + /* PLAYER_MWA_FLIPSLASH_START */ { &gPlayerAnim_link_fighter_jump_rollkiru, &gPlayerAnim_link_fighter_jump_kiru_finsh, &gPlayerAnim_link_fighter_jump_kiru_finsh, 1, 10 }, + /* PLAYER_MWA_JUMPSLASH_START */ { &gPlayerAnim_link_fighter_Lpower_jump_kiru, &gPlayerAnim_link_fighter_Lpower_jump_kiru_hit, &gPlayerAnim_link_fighter_Lpower_jump_kiru_hit, 1, 11 }, + /* PLAYER_MWA_FLIPSLASH_FINISH */ { &gPlayerAnim_link_fighter_jump_kiru_finsh, &gPlayerAnim_link_fighter_jump_kiru_finsh_end, &gPlayerAnim_link_fighter_jump_kiru_finsh_end, 1, 2 }, + /* PLAYER_MWA_JUMPSLASH_FINISH */ { &gPlayerAnim_link_fighter_Lpower_jump_kiru_hit, &gPlayerAnim_link_fighter_Lpower_jump_kiru_end, &gPlayerAnim_link_fighter_Lpower_jump_kiru_end, 1, 2 }, + /* PLAYER_MWA_BACKSLASH_RIGHT */ { &gPlayerAnim_link_fighter_turn_kiruR, &gPlayerAnim_link_fighter_turn_kiruR_end, &gPlayerAnim_link_fighter_turn_kiruR_end, 1, 5 }, + /* PLAYER_MWA_BACKSLASH_LEFT */ { &gPlayerAnim_link_fighter_turn_kiruL, &gPlayerAnim_link_fighter_turn_kiruL_end, &gPlayerAnim_link_fighter_turn_kiruL_end, 1, 4 }, + /* PLAYER_MWA_HAMMER_FORWARD */ { &gPlayerAnim_link_hammer_hit, &gPlayerAnim_link_hammer_hit_end, &gPlayerAnim_link_hammer_hit_endR, 3, 10 }, + /* PLAYER_MWA_HAMMER_SIDE */ { &gPlayerAnim_link_hammer_side_hit, &gPlayerAnim_link_hammer_side_hit_end, &gPlayerAnim_link_hammer_side_hit_endR, 2, 11 }, + /* PLAYER_MWA_SPIN_ATTACK_1H */ { &gPlayerAnim_link_fighter_rolling_kiru, &gPlayerAnim_link_fighter_rolling_kiru_end, &gPlayerAnim_link_anchor_rolling_kiru_endR, 0, 12 }, + /* PLAYER_MWA_SPIN_ATTACK_2H */ { &gPlayerAnim_link_fighter_Lrolling_kiru, &gPlayerAnim_link_fighter_Lrolling_kiru_end, &gPlayerAnim_link_anchor_Lrolling_kiru_endR, 0, 15 }, + /* PLAYER_MWA_BIG_SPIN_1H */ { &gPlayerAnim_link_fighter_Wrolling_kiru, &gPlayerAnim_link_fighter_Wrolling_kiru_end, &gPlayerAnim_link_anchor_rolling_kiru_endR, 0, 16 }, + /* PLAYER_MWA_BIG_SPIN_2H */ { &gPlayerAnim_link_fighter_Wrolling_kiru, &gPlayerAnim_link_fighter_Wrolling_kiru_end, &gPlayerAnim_link_anchor_Lrolling_kiru_endR, 0, 16 }, }; @@ -1240,10 +1420,10 @@ static LinkAnimationHeader* D_80854378[] = { &gPlayerAnim_link_fighter_Lpower_kiru_side_walk, }; -static u8 D_80854380[2] = { 0x18, 0x19 }; -static u8 D_80854384[2] = { 0x1A, 0x1B }; +static u8 D_80854380[2] = { PLAYER_MWA_SPIN_ATTACK_1H, PLAYER_MWA_SPIN_ATTACK_2H }; +static u8 D_80854384[2] = { PLAYER_MWA_BIG_SPIN_1H, PLAYER_MWA_BIG_SPIN_2H }; -static u16 D_80854388[] = { BTN_B, BTN_CLEFT, BTN_CDOWN, BTN_CRIGHT, BTN_DUP, BTN_DDOWN, BTN_DLEFT, BTN_DRIGHT }; +static u16 sItemButtons[] = { BTN_B, BTN_CLEFT, BTN_CDOWN, BTN_CRIGHT, BTN_DUP, BTN_DDOWN, BTN_DLEFT, BTN_DRIGHT }; static u8 sMagicSpellCosts[] = { 12, 24, 24, 12, 24, 12 }; @@ -1286,13 +1466,11 @@ static LinkAnimationHeader* D_808543D4[] = { &gPlayerAnim_link_hook_wait, }; -// return type can't be void due to regalloc in func_8084FCAC void Player_ZeroSpeedXZ(Player* this) { this->actor.speedXZ = 0.0f; this->linearVelocity = 0.0f; } -// return type can't be void due to regalloc in func_8083F72C void func_80832224(Player* this) { Player_ZeroSpeedXZ(this); this->unk_6AD = 0; @@ -1304,20 +1482,20 @@ s32 func_8083224C(PlayState* play) { return CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_PLAYER_TALKED_TO); } -void func_80832264(PlayState* play, Player* this, LinkAnimationHeader* anim) { +void Player_AnimPlayOnce(PlayState* play, Player* this, LinkAnimationHeader* anim) { LinkAnimation_PlayOnce(play, &this->skelAnime, anim); } -void func_80832284(PlayState* play, Player* this, LinkAnimationHeader* anim) { +void Player_AnimPlayLoop(PlayState* play, Player* this, LinkAnimationHeader* anim) { LinkAnimation_PlayLoop(play, &this->skelAnime, anim); } -void func_808322A4(PlayState* play, Player* this, LinkAnimationHeader* anim) { - LinkAnimation_PlayLoopSetSpeed(play, &this->skelAnime, anim, 2.0f / 3.0f); +void Player_AnimPlayLoopAdjusted(PlayState* play, Player* this, LinkAnimationHeader* anim) { + LinkAnimation_PlayLoopSetSpeed(play, &this->skelAnime, anim, PLAYER_ANIM_ADJUSTED_SPEED); } -void func_808322D0(PlayState* play, Player* this, LinkAnimationHeader* anim) { - LinkAnimation_PlayOnceSetSpeed(play, &this->skelAnime, anim, 2.0f / 3.0f); +void Player_AnimPlayOnceAdjusted(PlayState* play, Player* this, LinkAnimationHeader* anim) { + LinkAnimation_PlayOnceSetSpeed(play, &this->skelAnime, anim, PLAYER_ANIM_ADJUSTED_SPEED); } void func_808322FC(Player* this) { @@ -1332,11 +1510,11 @@ void func_80832318(Player* this) { } void func_80832340(PlayState* play, Player* this) { - Camera* camera; + Camera* subCam; if (this->subCamId != SUBCAM_NONE) { - camera = play->cameraPtrs[this->subCamId]; - if ((camera != NULL) && (camera->csId == 1100)) { + subCam = play->cameraPtrs[this->subCamId]; + if ((subCam != NULL) && (subCam->csId == 1100)) { OnePointCutscene_EndCutscene(play, this->subCamId); this->subCamId = SUBCAM_NONE; } @@ -1345,7 +1523,7 @@ void func_80832340(PlayState* play, Player* this) { this->stateFlags2 &= ~(PLAYER_STATE2_UNDERWATER | PLAYER_STATE2_DIVING); } -void func_808323B4(PlayState* play, Player* this) { +void Player_DetachHeldActor(PlayState* play, Player* this) { Actor* heldActor = this->heldActor; if ((heldActor != NULL) && !Player_HoldsHookshot(this)) { @@ -1357,7 +1535,7 @@ void func_808323B4(PlayState* play, Player* this) { } if (Player_GetExplosiveHeld(this) >= 0) { - func_8083399C(play, this, PLAYER_IA_NONE); + Player_InitItemAction(play, this, PLAYER_IA_NONE); this->heldItemId = ITEM_NONE_FE; } } @@ -1391,7 +1569,7 @@ void func_80832440(PlayState* play, Player* this) { s32 func_80832528(PlayState* play, Player* this) { if (this->heldItemAction >= PLAYER_IA_FISHING_POLE) { - func_80835F44(play, this, ITEM_NONE); + Player_UseItem(play, this, ITEM_NONE); return 1; } else { return 0; @@ -1400,13 +1578,13 @@ s32 func_80832528(PlayState* play, Player* this) { void func_80832564(PlayState* play, Player* this) { func_80832440(play, this); - func_808323B4(play, this); + Player_DetachHeldActor(play, this); } s32 func_80832594(Player* this, s32 arg1, s32 arg2) { - s16 temp = this->unk_A80 - D_808535D8; + s16 controlStickAngleDiff = this->unk_A80 - sControlStickAngle; - this->unk_850 += arg1 + (s16)(ABS(temp) * fabsf(D_808535D4) * 2.5415802156203426e-06f); + this->unk_850 += arg1 + (s16)(ABS(controlStickAngleDiff) * fabsf(sControlStickMagnitude) * 2.5415802156203426e-06f); if (CHECK_BTN_ANY(sControlInput->press.button, BTN_A | BTN_B)) { this->unk_850 += 5; @@ -1421,15 +1599,15 @@ void func_80832630(PlayState* play) { } } -void Player_RequestRumble(Player* this, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { +void Player_RequestRumble(Player* this, s32 sourceStrength, s32 duration, s32 decreaseRate, s32 distSq) { if (this->actor.category == ACTORCAT_PLAYER) { - func_800AA000(arg4, arg1, arg2, arg3); + func_800AA000(distSq, sourceStrength, duration, decreaseRate); } } void func_80832698(Player* this, u16 sfxId) { if (this->actor.category == ACTORCAT_PLAYER) { - Player_PlaySfx(&this->actor, sfxId + this->ageProperties->unk_92); + Player_PlaySfx(this, sfxId + this->ageProperties->unk_92); } else { func_800F4190(&this->actor.projectedPos, sfxId); } @@ -1446,19 +1624,19 @@ void func_808326F0(Player* this) { } u16 func_8083275C(Player* this, u16 sfxId) { - return sfxId + this->unk_89E; + return sfxId + this->floorSfxOffset; } void func_80832770(Player* this, u16 sfxId) { - Player_PlaySfx(&this->actor, func_8083275C(this, sfxId)); + Player_PlaySfx(this, func_8083275C(this, sfxId)); } u16 func_808327A4(Player* this, u16 sfxId) { - return sfxId + this->unk_89E + this->ageProperties->unk_94; + return sfxId + this->floorSfxOffset + this->ageProperties->unk_94; } void func_808327C4(Player* this, u16 sfxId) { - Player_PlaySfx(&this->actor, func_808327A4(this, sfxId)); + Player_PlaySfx(this, func_808327A4(this, sfxId)); } void func_808327F8(Player* this, f32 arg1) { @@ -1488,7 +1666,7 @@ void func_80832854(Player* this) { sfxId = func_808327A4(this, NA_SE_PL_JUMP); } - Player_PlaySfx(&this->actor, sfxId); + Player_PlaySfx(this, sfxId); } void func_808328A0(Player* this) { @@ -1500,93 +1678,103 @@ void func_808328A0(Player* this) { sfxId = func_808327A4(this, NA_SE_PL_LAND); } - Player_PlaySfx(&this->actor, sfxId); + Player_PlaySfx(this, sfxId); } void func_808328EC(Player* this, u16 sfxId) { - Player_PlaySfx(&this->actor, sfxId); + Player_PlaySfx(this, sfxId); this->stateFlags2 |= PLAYER_STATE2_FOOTSTEP; } -void func_80832924(Player* this, struct_80832924* entry) { - s32 data; - s32 flags; - u32 cont; +/** + * Process a list of `AnimSfx` entries. + * An `AnimSfx` entry contains a sound effect to play, a frame number that indicates + * when during an animation it should play, and a type value that indicates how it should be played back. + * + * The list will stop being processed after an entry that has a negative value for the `data` field. + * + * Some types do not make use of `sfxId`, the SFX function called will pick a sound on its own. + * The `sfxId` field is not used in this case and can be any value, but 0 is typically used. + * + * @param entry A pointer to the first entry of an `AnimSfx` list. + */ +void Player_ProcessAnimSfxList(Player* this, AnimSfxEntry* entry) { + s32 cont; s32 pad; do { - data = ABS(entry->field); - flags = data & 0x7800; - if (LinkAnimation_OnFrame(&this->skelAnime, fabsf(data & 0x7FF))) { - if (flags == 0x800) { - Player_PlaySfx(&this->actor, entry->sfxId); - } else if (flags == 0x1000) { + s32 absData = ABS(entry->field); + s32 type = absData & 0x7800; + if (LinkAnimation_OnFrame(&this->skelAnime, fabsf(absData & 0x7FF))) { + if (type == 0x800) { + Player_PlaySfx(this, entry->sfxId); + } else if (type == 0x1000) { func_80832770(this, entry->sfxId); - } else if (flags == 0x1800) { + } else if (type == 0x1800) { func_808327C4(this, entry->sfxId); - } else if (flags == 0x2000) { + } else if (type == 0x2000) { func_80832698(this, entry->sfxId); - } else if (flags == 0x2800) { + } else if (type == 0x2800) { func_808328A0(this); - } else if (flags == 0x3000) { + } else if (type == 0x3000) { func_808327F8(this, 6.0f); - } else if (flags == 0x3800) { + } else if (type == 0x3800) { func_80832854(this); - } else if (flags == 0x4000) { + } else if (type == 0x4000) { func_808327F8(this, 0.0f); - } else if (flags == 0x4800) { + } else if (type == 0x4800) { func_800F4010(&this->actor.projectedPos, this->ageProperties->unk_94 + NA_SE_PL_WALK_LADDER, 0.0f); } } - cont = (entry->field >= 0); + + cont = (entry->field >= 0); // stop processing if `data` is negative entry++; } while (cont); } -void func_80832B0C(PlayState* play, Player* this, LinkAnimationHeader* anim) { - LinkAnimation_Change(play, &this->skelAnime, anim, 1.0f, 0.0f, Animation_GetLastFrame(anim), ANIMMODE_ONCE, - -6.0f); +void Player_AnimChangeOnceMorph(PlayState* play, Player* this, LinkAnimationHeader* anim) { + LinkAnimation_Change(play, &this->skelAnime, anim, 1.0f, 0.0f, Animation_GetLastFrame(anim), ANIMMODE_ONCE, -6.0f); } -void func_80832B78(PlayState* play, Player* this, LinkAnimationHeader* anim) { - LinkAnimation_Change(play, &this->skelAnime, anim, 2.0f / 3.0f, 0.0f, Animation_GetLastFrame(anim), +void Player_AnimChangeOnceMorphAdjusted(PlayState* play, Player* this, LinkAnimationHeader* anim) { + LinkAnimation_Change(play, &this->skelAnime, anim, PLAYER_ANIM_ADJUSTED_SPEED, 0.0f, Animation_GetLastFrame(anim), ANIMMODE_ONCE, -6.0f); } -void func_80832BE8(PlayState* play, Player* this, LinkAnimationHeader* anim) { +void Player_AnimChangeLoopMorph(PlayState* play, Player* this, LinkAnimationHeader* anim) { LinkAnimation_Change(play, &this->skelAnime, anim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -6.0f); } -void func_80832C2C(PlayState* play, Player* this, LinkAnimationHeader* anim) { +void Player_AnimChangeFreeze(PlayState* play, Player* this, LinkAnimationHeader* anim) { LinkAnimation_Change(play, &this->skelAnime, anim, 1.0f, 0.0f, 0.0f, ANIMMODE_ONCE, 0.0f); } -void func_80832C6C(PlayState* play, Player* this, LinkAnimationHeader* anim) { +void Player_AnimChangeLoopSlowMorph(PlayState* play, Player* this, LinkAnimationHeader* anim) { LinkAnimation_Change(play, &this->skelAnime, anim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -16.0f); } s32 func_80832CB0(PlayState* play, Player* this, LinkAnimationHeader* anim) { if (LinkAnimation_Update(play, &this->skelAnime)) { - func_80832284(play, this, anim); + Player_AnimPlayLoop(play, this, anim); return 1; } else { return 0; } } -void func_80832CFC(Player* this) { +void Player_SkelAnimeResetPrevTranslRot(Player* this) { this->skelAnime.prevTransl = this->skelAnime.baseTransl; this->skelAnime.prevRot = this->actor.shape.rot.y; } -void func_80832D20(Player* this) { - func_80832CFC(this); +void Player_SkelAnimeResetPrevTranslRotAgeScale(Player* this) { + Player_SkelAnimeResetPrevTranslRot(this); this->skelAnime.prevTransl.x *= this->ageProperties->unk_08; this->skelAnime.prevTransl.y *= this->ageProperties->unk_08; this->skelAnime.prevTransl.z *= this->ageProperties->unk_08; } -void func_80832DB0(Player* this) { +void Player_ZeroRootLimbYaw(Player* this) { this->skelAnime.jointTable[1].y = 0; } @@ -1602,7 +1790,7 @@ void func_80832DBC(Player* this) { } else { this->skelAnime.jointTable[0].y = this->skelAnime.baseTransl.y; } - func_80832CFC(this); + Player_SkelAnimeResetPrevTranslRot(this); this->skelAnime.moveFlags = 0; } } @@ -1633,11 +1821,14 @@ void func_80832E48(Player* this, s32 flags) { func_808322FC(this); } -void func_80832F54(PlayState* play, Player* this, s32 flags) { - if (flags & 0x200) { - func_80832D20(this); - } else if ((flags & 0x100) || (this->skelAnime.moveFlags != 0)) { - func_80832CFC(this); +#define ANIM_REPLACE_APPLY_FLAG_8 (1 << 8) +#define ANIM_REPLACE_APPLY_FLAG_9 (1 << 9) + +void Player_AnimReplaceApplyFlags(PlayState* play, Player* this, s32 flags) { + if (flags & ANIM_REPLACE_APPLY_FLAG_9) { + Player_SkelAnimeResetPrevTranslRotAgeScale(this); + } else if ((flags & ANIM_REPLACE_APPLY_FLAG_8) || (this->skelAnime.moveFlags != 0)) { + Player_SkelAnimeResetPrevTranslRot(this); } else { this->skelAnime.prevTransl = this->skelAnime.jointTable[0]; this->skelAnime.prevRot = this->actor.shape.rot.y; @@ -1648,58 +1839,58 @@ void func_80832F54(PlayState* play, Player* this, s32 flags) { AnimationContext_DisableQueue(play); } -void func_80832FFC(PlayState* play, Player* this, LinkAnimationHeader* anim, s32 flags, f32 playbackSpeed) { +void Player_AnimReplacePlayOnceSetSpeed(PlayState* play, Player* this, LinkAnimationHeader* anim, s32 flags, f32 playbackSpeed) { LinkAnimation_PlayOnceSetSpeed(play, &this->skelAnime, anim, playbackSpeed); - func_80832F54(play, this, flags); + Player_AnimReplaceApplyFlags(play, this, flags); } -void func_8083303C(PlayState* play, Player* this, LinkAnimationHeader* anim, s32 flags) { - func_80832FFC(play, this, anim, flags, 1.0f); +void Player_AnimReplacePlayOnce(PlayState* play, Player* this, LinkAnimationHeader* anim, s32 flags) { + Player_AnimReplacePlayOnceSetSpeed(play, this, anim, flags, 1.0f); } -void func_80833064(PlayState* play, Player* this, LinkAnimationHeader* anim, s32 flags) { - func_80832FFC(play, this, anim, flags, 2.0f / 3.0f); +void Player_AnimReplacePlayOnceAdjusted(PlayState* play, Player* this, LinkAnimationHeader* anim, s32 flags) { + Player_AnimReplacePlayOnceSetSpeed(play, this, anim, flags, PLAYER_ANIM_ADJUSTED_SPEED); } -void func_8083308C(PlayState* play, Player* this, LinkAnimationHeader* anim) { - func_80833064(play, this, anim, 0x1C); +void Player_AnimReplaceNormalPlayOnceAdjusted(PlayState* play, Player* this, LinkAnimationHeader* anim) { + Player_AnimReplacePlayOnceAdjusted(play, this, anim, 0x1C); } -void func_808330AC(PlayState* play, Player* this, LinkAnimationHeader* anim, s32 flags, f32 playbackSpeed) { +void Player_AnimReplacePlayLoopSetSpeed(PlayState* play, Player* this, LinkAnimationHeader* anim, s32 flags, f32 playbackSpeed) { LinkAnimation_PlayLoopSetSpeed(play, &this->skelAnime, anim, playbackSpeed); - func_80832F54(play, this, flags); + Player_AnimReplaceApplyFlags(play, this, flags); } -void func_808330EC(PlayState* play, Player* this, LinkAnimationHeader* anim, s32 flags) { - func_808330AC(play, this, anim, flags, 1.0f); +void Player_AnimReplacePlayLoop(PlayState* play, Player* this, LinkAnimationHeader* anim, s32 flags) { + Player_AnimReplacePlayLoopSetSpeed(play, this, anim, flags, 1.0f); } -void func_80833114(PlayState* play, Player* this, LinkAnimationHeader* anim, s32 flags) { - func_808330AC(play, this, anim, flags, 2.0f / 3.0f); +void Player_AnimReplacePlayLoopAdjusted(PlayState* play, Player* this, LinkAnimationHeader* anim, s32 flags) { + Player_AnimReplacePlayLoopSetSpeed(play, this, anim, flags, PLAYER_ANIM_ADJUSTED_SPEED); } -void func_8083313C(PlayState* play, Player* this, LinkAnimationHeader* anim) { - func_80833114(play, this, anim, 0x1C); +void Player_AnimReplaceNormalPlayLoopAdjusted(PlayState* play, Player* this, LinkAnimationHeader* anim) { + Player_AnimReplacePlayLoopAdjusted(play, this, anim, 0x1C); } -void func_8083315C(PlayState* play, Player* this) { +void Player_ProcessControlStick(PlayState* play, Player* this) { s8 phi_v1; s8 phi_v0; - this->unk_A7C = D_808535D4; - this->unk_A80 = D_808535D8; + this->unk_A7C = sControlStickMagnitude; + this->unk_A80 = sControlStickAngle; - func_80077D10(&D_808535D4, &D_808535D8, sControlInput); + func_80077D10(&sControlStickMagnitude, &sControlStickAngle, sControlInput); - D_808535DC = Camera_GetInputDirYaw(GET_ACTIVE_CAM(play)) + D_808535D8; + D_808535DC = Camera_GetInputDirYaw(GET_ACTIVE_CAM(play)) + sControlStickAngle; this->unk_846 = (this->unk_846 + 1) % 4; - if (D_808535D4 < 55.0f) { + if (sControlStickMagnitude < 55.0f) { phi_v0 = -1; phi_v1 = -1; } else { - phi_v1 = (u16)(D_808535D8 + 0x2000) >> 9; + phi_v1 = (u16)(sControlStickAngle + 0x2000) >> 9; phi_v0 = (u16)((s16)(D_808535DC - this->actor.shape.rot.y) + 0x2000) >> 14; } @@ -1731,7 +1922,7 @@ void func_808332F4(Player* this, PlayState* play) { } static LinkAnimationHeader* func_80833338(Player* this) { - return D_80853914[PLAYER_ANIMGROUP_wait][this->modelAnimType]; + return GET_PLAYER_ANIM(PLAYER_ANIMGROUP_wait, this->modelAnimType); } s32 func_80833350(Player* this) { @@ -1752,18 +1943,18 @@ s32 func_80833350(Player* this) { void func_808333FC(Player* this, s32 arg1) { if (D_80853E7C[arg1] != 0) { - func_80832924(this, D_80853E50[D_80853E7C[arg1] - 1]); + Player_ProcessAnimSfxList(this, D_80853E50[D_80853E7C[arg1] - 1]); } } LinkAnimationHeader* func_80833438(Player* this) { if (this->unk_890 != 0) { - return D_80853914[PLAYER_ANIMGROUP_damage_run][this->modelAnimType]; + return GET_PLAYER_ANIM(PLAYER_ANIMGROUP_damage_run, this->modelAnimType); } else if (!(this->stateFlags1 & (PLAYER_STATE1_IN_WATER | PLAYER_STATE1_IN_CUTSCENE)) && (this->currentBoots == PLAYER_BOOTS_IRON)) { - return D_80853914[PLAYER_ANIMGROUP_heavy_run][this->modelAnimType]; + return GET_PLAYER_ANIM(PLAYER_ANIMGROUP_heavy_run, this->modelAnimType); } else { - return D_80853914[PLAYER_ANIMGROUP_run][this->modelAnimType]; + return GET_PLAYER_ANIM(PLAYER_ANIMGROUP_run, this->modelAnimType); } } @@ -1775,7 +1966,7 @@ LinkAnimationHeader* func_808334E4(Player* this) { if (func_808334B4(this)) { return &gPlayerAnim_link_boom_throw_waitR; } else { - return D_80853914[PLAYER_ANIMGROUP_waitR][this->modelAnimType]; + return GET_PLAYER_ANIM(PLAYER_ANIMGROUP_waitR, this->modelAnimType); } } @@ -1783,7 +1974,7 @@ LinkAnimationHeader* func_80833528(Player* this) { if (func_808334B4(this)) { return &gPlayerAnim_link_boom_throw_waitL; } else { - return D_80853914[PLAYER_ANIMGROUP_waitL][this->modelAnimType]; + return GET_PLAYER_ANIM(PLAYER_ANIMGROUP_waitL, this->modelAnimType); } } @@ -1791,7 +1982,7 @@ LinkAnimationHeader* func_8083356C(Player* this) { if (func_8002DD78(this)) { return &gPlayerAnim_link_bow_side_walk; } else { - return D_80853914[PLAYER_ANIMGROUP_side_walk][this->modelAnimType]; + return GET_PLAYER_ANIM(PLAYER_ANIMGROUP_side_walk, this->modelAnimType); } } @@ -1799,7 +1990,7 @@ LinkAnimationHeader* func_808335B0(Player* this) { if (func_808334B4(this)) { return &gPlayerAnim_link_boom_throw_side_walkR; } else { - return D_80853914[PLAYER_ANIMGROUP_side_walkR][this->modelAnimType]; + return GET_PLAYER_ANIM(PLAYER_ANIMGROUP_side_walkR, this->modelAnimType); } } @@ -1807,37 +1998,35 @@ LinkAnimationHeader* func_808335F4(Player* this) { if (func_808334B4(this)) { return &gPlayerAnim_link_boom_throw_side_walkL; } else { - return D_80853914[PLAYER_ANIMGROUP_side_walkL][this->modelAnimType]; + return GET_PLAYER_ANIM(PLAYER_ANIMGROUP_side_walkL, this->modelAnimType); } } -void func_80833638(Player* this, PlayerFunc82C arg1) { - this->func_82C = arg1; +void Player_SetUpperActionFunc(Player* this, UpperActionFunc arg1) { + this->upperActionFunc = arg1; this->unk_836 = 0; - this->unk_830 = 0.0f; + this->upperAnimBlendWeight = 0.0f; func_808326F0(this); } -void func_80833664(PlayState* play, Player* this, s8 actionParam) { +void Player_InitItemActionWithAnim(PlayState* play, Player* this, s8 itemAction) { LinkAnimationHeader* current = this->skelAnime.animation; LinkAnimationHeader** iter = &D_80853914[0][this->modelAnimType]; - u32 i; + u32 animGroup; this->stateFlags1 &= ~(PLAYER_STATE1_ITEM_IN_HAND | PLAYER_STATE1_BOOMERANG_IN_HAND); - for (i = 0; i < ARRAY_COUNT(D_80853914); i++) { + for (animGroup = 0; animGroup < PLAYER_ANIMGROUP_MAX; animGroup++) { if (current == *iter) { break; } - iter += ARRAY_COUNT(D_80853914[0]); + iter += PLAYER_ANIMTYPE_MAX; } - func_8083399C(play, this, actionParam); + Player_InitItemAction(play, this, itemAction); - if (i < ARRAY_COUNT(D_80853914)) { - // fake match - // surely D_80853914 isn't a 1D array... unless? - this->skelAnime.animation = D_80853914[0][i * ARRAY_COUNT(D_80853914[0]) + this->modelAnimType]; + if (animGroup < PLAYER_ANIMGROUP_MAX) { + this->skelAnime.animation = GET_PLAYER_ANIM(animGroup, this->modelAnimType); } } @@ -1849,7 +2038,7 @@ s8 Player_ItemToItemAction(s32 item) { } else if (item == ITEM_FISHING_POLE) { return PLAYER_IA_FISHING_POLE; } else { - return sItemActionParams[item]; + return sItemActions[item]; } } @@ -1923,22 +2112,22 @@ void func_80833984(PlayState* play, Player* this) { this->stateFlags1 |= PLAYER_STATE1_BOOMERANG_IN_HAND; } -void func_8083399C(PlayState* play, Player* this, s8 actionParam) { +void Player_InitItemAction(PlayState* play, Player* this, s8 itemAction) { this->unk_860 = 0; this->unk_85C = 0.0f; this->unk_858 = 0.0f; - this->heldItemAction = this->itemAction = actionParam; + this->heldItemAction = this->itemAction = itemAction; this->modelGroup = this->nextModelGroup; this->stateFlags1 &= ~(PLAYER_STATE1_ITEM_IN_HAND | PLAYER_STATE1_BOOMERANG_IN_HAND); - D_80853FE8[actionParam](play, this); + sItemActionInitFuncs[itemAction](play, this); Player_SetModelGroup(this, this->modelGroup); } -void func_80833A20(Player* this, s32 newSwordState) { +void func_80833A20(Player* this, s32 newMeleeWeaponState) { u16 itemSfx; u16 voiceSfx; @@ -1952,7 +2141,7 @@ void func_80833A20(Player* this, s32 newSwordState) { voiceSfx = NA_SE_VO_LI_SWORD_N; if (this->heldItemAction == PLAYER_IA_HAMMER) { itemSfx = NA_SE_IT_HAMMER_SWING; - } else if (this->meleeWeaponAnimation >= 0x18) { + } else if (this->meleeWeaponAnimation >= PLAYER_MWA_SPIN_ATTACK_1H) { itemSfx = 0; voiceSfx = NA_SE_VO_LI_SWORD_L; } else if (this->unk_845 >= 3) { @@ -1964,7 +2153,8 @@ void func_80833A20(Player* this, s32 newSwordState) { func_808328EC(this, itemSfx); } - if ((this->meleeWeaponAnimation < 0x10) || (this->meleeWeaponAnimation >= 0x14)) { + if (!((this->meleeWeaponAnimation >= PLAYER_MWA_FLIPSLASH_START) && + (this->meleeWeaponAnimation <= PLAYER_MWA_JUMPSLASH_FINISH))) { func_80832698(this, voiceSfx); } @@ -1973,7 +2163,7 @@ void func_80833A20(Player* this, s32 newSwordState) { } } - this->meleeWeaponState = newSwordState; + this->meleeWeaponState = newMeleeWeaponState; } s32 func_80833B2C(Player* this) { @@ -2012,23 +2202,23 @@ void func_80833C3C(Player* this) { this->unk_870 = this->unk_874 = 0.0f; } -s32 func_80833C50(Player* this, s32 item) { +s32 Player_ItemIsInUse(Player* this, s32 item) { if ((item < ITEM_NONE_FE) && (Player_ItemToItemAction(item) == this->itemAction)) { - return 1; + return true; } else { - return 0; + return false; } } -s32 func_80833C98(s32 item1, s32 actionParam) { - if ((item1 < ITEM_NONE_FE) && (Player_ItemToItemAction(item1) == actionParam)) { - return 1; +s32 Player_ItemIsItemAction(s32 item1, s32 itemAction) { + if ((item1 < ITEM_NONE_FE) && (Player_ItemToItemAction(item1) == itemAction)) { + return true; } else { - return 0; + return false; } } -s32 func_80833CDC(PlayState* play, s32 index) { +s32 Player_GetItemOnButton(PlayState* play, s32 index) { if (index >= ((CVarGetInteger("gDpadEquips", 0) != 0) ? 8 : 4)) { return ITEM_NONE; } else if (play->bombchuBowlingStatus != 0) { @@ -2052,8 +2242,17 @@ s32 func_80833CDC(PlayState* play, s32 index) { } } -void func_80833DF8(Player* this, PlayState* play) { - s32 maskActionParam; +/** + * Handles the high level item usage and changing process based on the B and C buttons. + * + * Tasks include: + * - Put away a mask if it is not present on any C button + * - Put away an item if it is not present on the B button or any C button + * - Use an item on the B button or any C button if the corresponding button is pressed + * - Keep track of the current item button being held down + */ +void Player_ProcessItemButtons(Player* this, PlayState* play) { + s32 maskItemAction; s32 item; s32 i; @@ -2074,15 +2273,15 @@ void func_80833DF8(Player* this, PlayState* play) { func_808328EC(this, NA_SE_PL_CHANGE_ARMS); } } else { - maskActionParam = this->currentMask - 1 + PLAYER_IA_MASK_KEATON; + maskItemAction = this->currentMask - 1 + PLAYER_IA_MASK_KEATON; bool hasOnDpad = false; if (CVarGetInteger("gDpadEquips", 0) != 0) { for (int buttonIndex = 0; buttonIndex < 4; buttonIndex++) { - hasOnDpad |= func_80833C98(DPAD_ITEM(buttonIndex), maskActionParam); + hasOnDpad |= Player_ItemIsItemAction(DPAD_ITEM(buttonIndex), maskItemAction); } } - if (!func_80833C98(C_BTN_ITEM(0), maskActionParam) && !func_80833C98(C_BTN_ITEM(1), maskActionParam) && - !func_80833C98(C_BTN_ITEM(2), maskActionParam) && !hasOnDpad) { + if (!Player_ItemIsItemAction(C_BTN_ITEM(0), maskItemAction) && !Player_ItemIsItemAction(C_BTN_ITEM(1), maskItemAction) && + !Player_ItemIsItemAction(C_BTN_ITEM(2), maskItemAction) && !hasOnDpad) { this->currentMask = PLAYER_MASK_NONE; } } @@ -2093,101 +2292,105 @@ void func_80833DF8(Player* this, PlayState* play) { bool hasOnDpad = false; if (CVarGetInteger("gDpadEquips", 0) != 0) { for (int buttonIndex = 0; buttonIndex < 4; buttonIndex++) { - hasOnDpad |= func_80833C50(this, DPAD_ITEM(buttonIndex)); + hasOnDpad |= Player_ItemIsInUse(this, DPAD_ITEM(buttonIndex)); } } - if (!func_80833C50(this, B_BTN_ITEM) && !func_80833C50(this, C_BTN_ITEM(0)) && - !func_80833C50(this, C_BTN_ITEM(1)) && !func_80833C50(this, C_BTN_ITEM(2)) && !hasOnDpad) { - func_80835F44(play, this, ITEM_NONE); + if (!Player_ItemIsInUse(this, B_BTN_ITEM) && !Player_ItemIsInUse(this, C_BTN_ITEM(0)) && + !Player_ItemIsInUse(this, C_BTN_ITEM(1)) && !Player_ItemIsInUse(this, C_BTN_ITEM(2)) && !hasOnDpad) { + Player_UseItem(play, this, ITEM_NONE); return; } } - for (i = 0; i < ARRAY_COUNT(D_80854388); i++) { - if (CHECK_BTN_ALL(sControlInput->press.button, D_80854388[i])) { + for (i = 0; i < ARRAY_COUNT(sItemButtons); i++) { + if (CHECK_BTN_ALL(sControlInput->press.button, sItemButtons[i])) { break; } } - item = func_80833CDC(play, i); + item = Player_GetItemOnButton(play, i); + if (item >= ITEM_NONE_FE) { - for (i = 0; i < ARRAY_COUNT(D_80854388); i++) { - if (CHECK_BTN_ALL(sControlInput->cur.button, D_80854388[i])) { + for (i = 0; i < ARRAY_COUNT(sItemButtons); i++) { + if (CHECK_BTN_ALL(sControlInput->cur.button, sItemButtons[i])) { break; } } - item = func_80833CDC(play, i); + item = Player_GetItemOnButton(play, i); + if ((item < ITEM_NONE_FE) && (Player_ItemToItemAction(item) == this->heldItemAction)) { - D_80853618 = true; + sHeldItemButtonIsHeldDown = true; } } else { this->heldItemButton = i; - func_80835F44(play, this, item); + Player_UseItem(play, this, item); } } } -void func_808340DC(Player* this, PlayState* play) { +void Player_StartChangingHeldItem(Player* this, PlayState* play) { LinkAnimationHeader* anim; - f32 frameCount; + f32 endFrameTemp; f32 startFrame; f32 endFrame; f32 playSpeed; - s32 sp38; - s8 sp37; + s32 itemChangeType; + s8 heldItemAction; s32 nextAnimType; - sp37 = Player_ItemToItemAction(this->heldItemId); - func_80833638(this, func_80834A2C); + heldItemAction = Player_ItemToItemAction(this->heldItemId); + + Player_SetUpperActionFunc(this, Player_UpperAction_ChangeHeldItem); nextAnimType = gPlayerModelTypes[this->nextModelGroup][PLAYER_MODELGROUPENTRY_ANIM]; - sp38 = D_80854164[gPlayerModelTypes[this->modelGroup][PLAYER_MODELGROUPENTRY_ANIM]][nextAnimType]; - if ((sp37 == PLAYER_IA_BOTTLE) || (sp37 == PLAYER_IA_BOOMERANG) || - ((sp37 == PLAYER_IA_NONE) && + itemChangeType = sItemChangeTypes[gPlayerModelTypes[this->modelGroup][PLAYER_MODELGROUPENTRY_ANIM]][nextAnimType]; + + if ((heldItemAction == PLAYER_IA_BOTTLE) || (heldItemAction == PLAYER_IA_BOOMERANG) || + ((heldItemAction == PLAYER_IA_NONE) && ((this->heldItemAction == PLAYER_IA_BOTTLE) || (this->heldItemAction == PLAYER_IA_BOOMERANG)))) { - sp38 = (sp37 == PLAYER_IA_NONE) ? -PLAYER_D_808540F4_13 : PLAYER_D_808540F4_13; + itemChangeType = (heldItemAction == PLAYER_IA_NONE) ? -PLAYER_ITEM_CHG_13 : PLAYER_ITEM_CHG_13; } - this->unk_15A = ABS(sp38); + this->itemChangeType = ABS(itemChangeType); + anim = sItemChangeInfo[this->itemChangeType].anim; - anim = D_808540F4[this->unk_15A].anim; if ((anim == &gPlayerAnim_link_normal_fighter2free) && (this->currentShield == PLAYER_SHIELD_NONE)) { anim = &gPlayerAnim_link_normal_free2fighter_free; } - frameCount = Animation_GetLastFrame(anim); - endFrame = frameCount; + endFrameTemp = Animation_GetLastFrame(anim); + endFrame = endFrameTemp; - if (sp38 >= 0) { + if (itemChangeType >= 0) { playSpeed = 1.2f; startFrame = 0.0f; } else { endFrame = 0.0f; playSpeed = -1.2f; - startFrame = frameCount; + startFrame = endFrameTemp; } - if (sp37 != PLAYER_IA_NONE) { + if (heldItemAction != PLAYER_IA_NONE) { playSpeed *= 2.0f; } - LinkAnimation_Change(play, &this->skelAnime2, anim, playSpeed, startFrame, endFrame, ANIMMODE_ONCE, 0.0f); + LinkAnimation_Change(play, &this->upperSkelAnime, anim, playSpeed, startFrame, endFrame, ANIMMODE_ONCE, 0.0f); this->stateFlags1 &= ~PLAYER_STATE1_START_PUTAWAY; } -void func_80834298(Player* this, PlayState* play) { +void Player_UpdateItems(Player* this, PlayState* play) { if ((this->actor.category == ACTORCAT_PLAYER) && (CVarGetInteger("gQuickPutaway", 0) || !(this->stateFlags1 & PLAYER_STATE1_START_PUTAWAY)) && ((this->heldItemAction == this->itemAction) || (this->stateFlags1 & PLAYER_STATE1_SHIELDING)) && - (gSaveContext.health != 0) && (play->csCtx.state == CS_STATE_IDLE) && (this->csMode == 0) && + (gSaveContext.health != 0) && (play->csCtx.state == CS_STATE_IDLE) && (this->csAction == 0) && (play->shootingGalleryStatus == 0) && (play->activeCamera == MAIN_CAM) && - (play->sceneLoadFlag != 0x14) && (gSaveContext.timer1State != 10)) { - func_80833DF8(this, play); + (play->transitionTrigger != TRANS_TRIGGER_START) && (gSaveContext.timer1State != 10)) { + Player_ProcessItemButtons(this, play); } if (this->stateFlags1 & PLAYER_STATE1_START_PUTAWAY) { - func_808340DC(this, play); + Player_StartChangingHeldItem(this, play); } } @@ -2228,13 +2431,13 @@ s32 func_8083442C(Player* this, PlayState* play) { (gSaveContext.magicState != MAGIC_STATE_IDLE)) { func_80078884(NA_SE_SY_ERROR); } else { - func_80833638(this, func_808351D4); + Player_SetUpperActionFunc(this, func_808351D4); this->stateFlags1 |= PLAYER_STATE1_READY_TO_FIRE; this->unk_834 = 14; if (this->unk_860 >= 0) { - Player_PlaySfx(&this->actor, D_80854398[ABS(this->unk_860) - 1]); + Player_PlaySfx(this, D_80854398[ABS(this->unk_860) - 1]); if (!Player_HoldsHookshot(this) && (func_80834380(play, this, &item, &arrowType) > 0)) { magicArrowType = arrowType - ARROW_FIRE; @@ -2258,7 +2461,7 @@ s32 func_8083442C(Player* this, PlayState* play) { return 0; } -void func_80834594(PlayState* play, Player* this) { +void Player_FinishItemChange(PlayState* play, Player* this) { if (this->heldItemAction != PLAYER_IA_NONE) { if (func_8008F2BC(this, this->heldItemAction) >= 0) { func_808328EC(this, NA_SE_IT_SWORD_PUTAWAY); @@ -2267,7 +2470,7 @@ void func_80834594(PlayState* play, Player* this) { } } - func_80835F44(play, this, this->heldItemId); + Player_UseItem(play, this, this->heldItemId); if (func_8008F2BC(this, this->heldItemAction) >= 0) { func_808328EC(this, NA_SE_IT_SWORD_PICKOUT); @@ -2277,20 +2480,20 @@ void func_80834594(PlayState* play, Player* this) { } void func_80834644(PlayState* play, Player* this) { - if (func_80834A2C == this->func_82C) { - func_80834594(play, this); + if (Player_UpperAction_ChangeHeldItem == this->upperActionFunc) { + Player_FinishItemChange(play, this); } - func_80833638(this, D_80853EDC[this->heldItemAction]); + Player_SetUpperActionFunc(this, sItemActionUpdateFuncs[this->heldItemAction]); this->unk_834 = 0; this->unk_6AC = 0; - func_808323B4(play, this); + Player_DetachHeldActor(play, this); this->stateFlags1 &= ~PLAYER_STATE1_START_PUTAWAY; } LinkAnimationHeader* func_808346C4(PlayState* play, Player* this) { - func_80833638(this, func_80834B5C); - func_808323B4(play, this); + Player_SetUpperActionFunc(this, func_80834B5C); + Player_DetachHeldActor(play, this); if (this->unk_870 < 0.5f) { return D_808543A4[Player_HoldsTwoHandedWeapon(this) && @@ -2312,8 +2515,8 @@ s32 func_80834758(PlayState* play, Player* this) { anim = func_808346C4(play, this); frame = Animation_GetLastFrame(anim); - LinkAnimation_Change(play, &this->skelAnime2, anim, 1.0f, frame, frame, ANIMMODE_ONCE, 0.0f); - Player_PlaySfx(&this->actor, NA_SE_IT_SHIELD_POSTURE); + LinkAnimation_Change(play, &this->upperSkelAnime, anim, 1.0f, frame, frame, ANIMMODE_ONCE, 0.0f); + Player_PlaySfx(this, NA_SE_IT_SHIELD_POSTURE); return 1; } else { @@ -2330,25 +2533,25 @@ s32 func_8083485C(Player* this, PlayState* play) { } void func_80834894(Player* this) { - func_80833638(this, func_80834C74); + Player_SetUpperActionFunc(this, func_80834C74); if (this->itemAction < 0) { func_8008EC70(this); } - Animation_Reverse(&this->skelAnime2); - Player_PlaySfx(&this->actor, NA_SE_IT_SHIELD_REMOVE); + Animation_Reverse(&this->upperSkelAnime); + Player_PlaySfx(this, NA_SE_IT_SHIELD_REMOVE); } -void func_808348EC(PlayState* play, Player* this) { - struct_808540F4* ptr = &D_808540F4[this->unk_15A]; - f32 frame; +void Player_WaitToFinishItemChange(PlayState* play, Player* this) { + ItemChangeInfo* itemChangeEntry = &sItemChangeInfo[this->itemChangeType]; + f32 changeFrame; - frame = ptr->unk_04; - frame = (this->skelAnime2.playSpeed < 0.0f) ? frame - 1.0f : frame; + changeFrame = itemChangeEntry->changeFrame; + changeFrame = (this->upperSkelAnime.playSpeed < 0.0f) ? changeFrame - 1.0f : changeFrame; - if (LinkAnimation_OnFrame(&this->skelAnime2, frame)) { - func_80834594(play, this); + if (LinkAnimation_OnFrame(&this->upperSkelAnime, changeFrame)) { + Player_FinishItemChange(play, this); } func_80833B54(this); @@ -2356,7 +2559,7 @@ void func_808348EC(PlayState* play, Player* this) { s32 func_8083499C(Player* this, PlayState* play) { if (this->stateFlags1 & PLAYER_STATE1_START_PUTAWAY) { - func_808340DC(this, play); + Player_StartChangingHeldItem(this, play); } else { return 0; } @@ -2372,31 +2575,31 @@ s32 func_808349DC(Player* this, PlayState* play) { } } -s32 func_80834A2C(Player* this, PlayState* play) { - if (LinkAnimation_Update(play, &this->skelAnime2) || +s32 Player_UpperAction_ChangeHeldItem(Player* this, PlayState* play) { + if (LinkAnimation_Update(play, &this->upperSkelAnime) || ((Player_ItemToItemAction(this->heldItemId) == this->heldItemAction) && - (D_80853614 = (D_80853614 || + (sUseHeldItem = (sUseHeldItem || ((this->modelAnimType != PLAYER_ANIMTYPE_3) && (play->shootingGalleryStatus == 0)))))) { - func_80833638(this, D_80853EDC[this->heldItemAction]); + Player_SetUpperActionFunc(this, sItemActionUpdateFuncs[this->heldItemAction]); this->unk_834 = 0; this->unk_6AC = 0; - D_80853618 = D_80853614; - return this->func_82C(this, play); + sHeldItemButtonIsHeldDown = sUseHeldItem; + return this->upperActionFunc(this, play); } if (func_80833350(this) != 0) { - func_808348EC(play, this); - func_80832264(play, this, func_80833338(this)); + Player_WaitToFinishItemChange(play, this); + Player_AnimPlayOnce(play, this, func_80833338(this)); this->unk_6AC = 0; } else { - func_808348EC(play, this); + Player_WaitToFinishItemChange(play, this); } return 1; } s32 func_80834B5C(Player* this, PlayState* play) { - LinkAnimation_Update(play, &this->skelAnime2); + LinkAnimation_Update(play, &this->upperSkelAnime); if (!CHECK_BTN_ALL(sControlInput->cur.button, BTN_R)) { func_80834894(this); @@ -2412,10 +2615,10 @@ s32 func_80834BD4(Player* this, PlayState* play) { LinkAnimationHeader* anim; f32 frame; - if (LinkAnimation_Update(play, &this->skelAnime2)) { + if (LinkAnimation_Update(play, &this->upperSkelAnime)) { anim = func_808346C4(play, this); frame = Animation_GetLastFrame(anim); - LinkAnimation_Change(play, &this->skelAnime2, anim, 1.0f, frame, frame, ANIMMODE_ONCE, 0.0f); + LinkAnimation_Change(play, &this->upperSkelAnime, anim, 1.0f, frame, frame, ANIMMODE_ONCE, 0.0f); } this->stateFlags1 |= PLAYER_STATE1_SHIELDING; @@ -2425,13 +2628,13 @@ s32 func_80834BD4(Player* this, PlayState* play) { } s32 func_80834C74(Player* this, PlayState* play) { - D_80853614 = D_80853618; + sUseHeldItem = sHeldItemButtonIsHeldDown; - if (D_80853614 || LinkAnimation_Update(play, &this->skelAnime2)) { - func_80833638(this, D_80853EDC[this->heldItemAction]); - LinkAnimation_PlayLoop(play, &this->skelAnime2, D_80853914[PLAYER_ANIMGROUP_wait][this->modelAnimType]); + if (sUseHeldItem || LinkAnimation_Update(play, &this->upperSkelAnime)) { + Player_SetUpperActionFunc(this, sItemActionUpdateFuncs[this->heldItemAction]); + LinkAnimation_PlayLoop(play, &this->upperSkelAnime, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_wait, this->modelAnimType)); this->unk_6AC = 0; - this->func_82C(this, play); + this->upperActionFunc(this, play); return 0; } @@ -2451,17 +2654,17 @@ s32 func_80834D2C(Player* this, PlayState* play) { } else { anim = &gPlayerAnim_link_hook_shot_ready; } - LinkAnimation_PlayOnce(play, &this->skelAnime2, anim); + LinkAnimation_PlayOnce(play, &this->upperSkelAnime, anim); } else { - func_80833638(this, func_80835884); + Player_SetUpperActionFunc(this, func_80835884); this->unk_834 = 10; - LinkAnimation_PlayOnce(play, &this->skelAnime2, &gPlayerAnim_link_boom_throw_wait2waitR); + LinkAnimation_PlayOnce(play, &this->upperSkelAnime, &gPlayerAnim_link_boom_throw_wait2waitR); } if (this->stateFlags1 & PLAYER_STATE1_ON_HORSE) { - func_80832284(play, this, &gPlayerAnim_link_uma_anim_walk); + Player_AnimPlayLoop(play, this, &gPlayerAnim_link_uma_anim_walk); } else if ((this->actor.bgCheckFlags & 1) && !func_80833B54(this)) { - func_80832284(play, this, D_80853914[PLAYER_ANIMGROUP_wait][this->modelAnimType]); + Player_AnimPlayLoop(play, this, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_wait, this->modelAnimType)); } return 1; @@ -2493,7 +2696,7 @@ s32 func_80834EB8(Player* this, PlayState* play) { s32 func_80834F2C(Player* this, PlayState* play) { if ((this->doorType == PLAYER_DOORTYPE_NONE) && !(this->stateFlags1 & PLAYER_STATE1_THREW_BOOMERANG)) { - if (D_80853614 || func_80834E44(play)) { + if (sUseHeldItem || func_80834E44(play)) { if (func_80834D2C(this, play)) { return func_80834EB8(this, play); } @@ -2508,7 +2711,7 @@ s32 func_80834FBC(Player* this) { if (this->heldActor == NULL) { this->heldActor = this->actor.child; Player_RequestRumble(this, 255, 10, 250, 0); - Player_PlaySfx(&this->actor, NA_SE_IT_HOOKSHOT_RECEIVE); + Player_PlaySfx(this, NA_SE_IT_HOOKSHOT_RECEIVE); } return 1; @@ -2589,10 +2792,10 @@ s32 func_808351D4(Player* this, PlayState* play) { if ((this->unk_836 == 0) && (func_80833350(this) == 0) && (this->skelAnime.animation == &gPlayerAnim_link_bow_side_walk)) { - LinkAnimation_PlayOnce(play, &this->skelAnime2, D_808543CC[sp2C]); + LinkAnimation_PlayOnce(play, &this->upperSkelAnime, D_808543CC[sp2C]); this->unk_836 = -1; - } else if (LinkAnimation_Update(play, &this->skelAnime2)) { - LinkAnimation_PlayLoop(play, &this->skelAnime2, D_808543D4[sp2C]); + } else if (LinkAnimation_Update(play, &this->upperSkelAnime)) { + LinkAnimation_PlayLoop(play, &this->upperSkelAnime, D_808543D4[sp2C]); this->unk_836 = 1; } else if (this->unk_836 == 1) { this->unk_836 = 2; @@ -2604,12 +2807,12 @@ s32 func_808351D4(Player* this, PlayState* play) { func_80834EB8(this, play); - if ((this->unk_836 > 0) && ((this->unk_860 < 0) || (!D_80853618 && !func_80834E7C(play)))) { - func_80833638(this, func_808353D8); + if ((this->unk_836 > 0) && ((this->unk_860 < 0) || (!sHeldItemButtonIsHeldDown && !func_80834E7C(play)))) { + Player_SetUpperActionFunc(this, func_808353D8); if (this->unk_860 >= 0) { if (sp2C == 0) { if (!func_808350A4(play, this)) { - Player_PlaySfx(&this->actor, D_808543DC[ABS(this->unk_860) - 1]); + Player_PlaySfx(this, D_808543DC[ABS(this->unk_860) - 1]); } } else if (this->actor.bgCheckFlags & 1) { func_808350A4(play, this); @@ -2625,21 +2828,21 @@ s32 func_808351D4(Player* this, PlayState* play) { } s32 func_808353D8(Player* this, PlayState* play) { - LinkAnimation_Update(play, &this->skelAnime2); + LinkAnimation_Update(play, &this->upperSkelAnime); if (Player_HoldsHookshot(this) && !func_80834FBC(this)) { return 1; } if (!func_80834758(play, this) && - (D_80853614 || ((this->unk_860 < 0) && D_80853618) || func_80834E44(play))) { + (sUseHeldItem || ((this->unk_860 < 0) && sHeldItemButtonIsHeldDown) || func_80834E44(play))) { this->unk_860 = ABS(this->unk_860); if (func_8083442C(this, play)) { if (Player_HoldsHookshot(this)) { this->unk_836 = 1; } else { - LinkAnimation_PlayOnce(play, &this->skelAnime2, &gPlayerAnim_link_bow_bow_shoot_next); + LinkAnimation_PlayOnce(play, &this->upperSkelAnime, &gPlayerAnim_link_bow_bow_shoot_next); } } } else { @@ -2655,10 +2858,10 @@ s32 func_808353D8(Player* this, PlayState* play) { } if (Player_HoldsHookshot(this)) { - func_80833638(this, func_8083501C); + Player_SetUpperActionFunc(this, func_8083501C); } else { - func_80833638(this, func_80835588); - LinkAnimation_PlayOnce(play, &this->skelAnime2, &gPlayerAnim_link_bow_bow_shoot_end); + Player_SetUpperActionFunc(this, func_80835588); + LinkAnimation_PlayOnce(play, &this->upperSkelAnime, &gPlayerAnim_link_bow_bow_shoot_end); } this->unk_834 = 0; @@ -2668,8 +2871,8 @@ s32 func_808353D8(Player* this, PlayState* play) { } s32 func_80835588(Player* this, PlayState* play) { - if (!(this->actor.bgCheckFlags & 1) || LinkAnimation_Update(play, &this->skelAnime2)) { - func_80833638(this, func_8083501C); + if (!(this->actor.bgCheckFlags & 1) || LinkAnimation_Update(play, &this->upperSkelAnime)) { + Player_SetUpperActionFunc(this, func_8083501C); } return 1; @@ -2678,7 +2881,7 @@ s32 func_80835588(Player* this, PlayState* play) { void func_808355DC(Player* this) { this->stateFlags1 |= PLAYER_STATE1_TARGET_NOTHING; - if (!(this->skelAnime.moveFlags & 0x80) && (this->actor.bgCheckFlags & 0x200) && (D_80853608 < 0x2000)) { + if (!(this->skelAnime.moveFlags & 0x80) && (this->actor.bgCheckFlags & 0x200) && (sShapeYawToTouchedWall < 0x2000)) { this->currentYaw = this->actor.shape.rot.y = this->actor.wallYaw + 0x8000; } @@ -2697,8 +2900,8 @@ s32 func_80835644(PlayState* play, Player* this, Actor* arg2) { void func_80835688(Player* this, PlayState* play) { if (!func_80835644(play, this, this->heldActor)) { - func_80833638(this, func_808356E8); - LinkAnimation_PlayLoop(play, &this->skelAnime2, &gPlayerAnim_link_normal_carryB_wait); + Player_SetUpperActionFunc(this, func_808356E8); + LinkAnimation_PlayLoop(play, &this->upperSkelAnime, &gPlayerAnim_link_normal_carryB_wait); } } @@ -2714,8 +2917,8 @@ s32 func_808356E8(Player* this, PlayState* play) { } if (this->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) { - if (LinkAnimation_Update(play, &this->skelAnime2)) { - LinkAnimation_PlayLoop(play, &this->skelAnime2, &gPlayerAnim_link_normal_carryB_wait); + if (LinkAnimation_Update(play, &this->upperSkelAnime)) { + LinkAnimation_PlayLoop(play, &this->upperSkelAnime, &gPlayerAnim_link_normal_carryB_wait); } if ((heldActor->id == ACTOR_EN_NIW) && (this->actor.velocity.y <= 0.0f)) { @@ -2740,7 +2943,7 @@ s32 func_80835800(Player* this, PlayState* play) { } if (this->stateFlags1 & PLAYER_STATE1_THREW_BOOMERANG) { - func_80833638(this, func_80835B60); + Player_SetUpperActionFunc(this, func_80835B60); } else if (func_80834F2C(this, play)) { return 1; } @@ -2749,9 +2952,9 @@ s32 func_80835800(Player* this, PlayState* play) { } s32 func_80835884(Player* this, PlayState* play) { - if (LinkAnimation_Update(play, &this->skelAnime2)) { - func_80833638(this, func_808358F0); - LinkAnimation_PlayLoop(play, &this->skelAnime2, &gPlayerAnim_link_boom_throw_waitR); + if (LinkAnimation_Update(play, &this->upperSkelAnime)) { + Player_SetUpperActionFunc(this, func_808358F0); + LinkAnimation_PlayLoop(play, &this->upperSkelAnime, &gPlayerAnim_link_boom_throw_waitR); } func_80834EB8(this, play); @@ -2764,17 +2967,17 @@ s32 func_808358F0(Player* this, PlayState* play) { if ((func_808334E4(this) == animSeg) || (func_80833528(this) == animSeg) || (func_808335B0(this) == animSeg) || (func_808335F4(this) == animSeg)) { - AnimationContext_SetCopyAll(play, this->skelAnime.limbCount, this->skelAnime2.jointTable, + AnimationContext_SetCopyAll(play, this->skelAnime.limbCount, this->upperSkelAnime.jointTable, this->skelAnime.jointTable); } else { - LinkAnimation_Update(play, &this->skelAnime2); + LinkAnimation_Update(play, &this->upperSkelAnime); } func_80834EB8(this, play); - if (!D_80853618) { - func_80833638(this, func_808359FC); - LinkAnimation_PlayOnce(play, &this->skelAnime2, + if (!sHeldItemButtonIsHeldDown) { + Player_SetUpperActionFunc(this, func_808359FC); + LinkAnimation_PlayOnce(play, &this->upperSkelAnime, (this->unk_870 < 0.5f) ? &gPlayerAnim_link_boom_throwR : &gPlayerAnim_link_boom_throwL); } @@ -2782,10 +2985,10 @@ s32 func_808358F0(Player* this, PlayState* play) { } s32 func_808359FC(Player* this, PlayState* play) { - if (LinkAnimation_Update(play, &this->skelAnime2)) { - func_80833638(this, func_80835B60); + if (LinkAnimation_Update(play, &this->upperSkelAnime)) { + Player_SetUpperActionFunc(this, func_80835B60); this->unk_834 = 0; - } else if (LinkAnimation_OnFrame(&this->skelAnime2, 6.0f)) { + } else if (LinkAnimation_OnFrame(&this->upperSkelAnime, 6.0f)) { f32 posX = (Math_SinS(this->actor.shape.rot.y) * 10.0f) + this->actor.world.pos.x; f32 posZ = (Math_CosS(this->actor.shape.rot.y) * 10.0f) + this->actor.world.pos.z; s32 yaw = (this->unk_664 != NULL) ? this->actor.shape.rot.y + 14000 : this->actor.shape.rot.y; @@ -2802,7 +3005,7 @@ s32 func_808359FC(Player* this, PlayState* play) { func_808355DC(this); } this->unk_A73 = 4; - Player_PlaySfx(&this->actor, NA_SE_IT_BOOMERANG_THROW); + Player_PlaySfx(this, NA_SE_IT_BOOMERANG_THROW); func_80832698(this, NA_SE_VO_LI_SWORD_N); } } @@ -2837,15 +3040,15 @@ s32 func_80835B60(Player* this, PlayState* play) { } if (!(this->stateFlags1 & PLAYER_STATE1_THREW_BOOMERANG)) { - func_80833638(this, func_80835C08); - LinkAnimation_PlayOnce(play, &this->skelAnime2, &gPlayerAnim_link_boom_catch); + Player_SetUpperActionFunc(this, func_80835C08); + LinkAnimation_PlayOnce(play, &this->upperSkelAnime, &gPlayerAnim_link_boom_catch); func_808357E8(this, gPlayerLeftHandBoomerangDLs); Player_PlaySfx(&this->actor, NA_SE_PL_CATCH_BOOMERANG); func_80832698(this, NA_SE_VO_LI_SWORD_N); return 1; } - if (D_80853614 && CVarGetInteger("gFastBoomerang", 0)) { + if (sUseHeldItem && CVarGetInteger("gFastBoomerang", 0)) { this->boomerangQuickRecall = true; } @@ -2853,26 +3056,26 @@ s32 func_80835B60(Player* this, PlayState* play) { } s32 func_80835C08(Player* this, PlayState* play) { - if (!func_80835800(this, play) && LinkAnimation_Update(play, &this->skelAnime2)) { - func_80833638(this, func_80835800); + if (!func_80835800(this, play) && LinkAnimation_Update(play, &this->upperSkelAnime)) { + Player_SetUpperActionFunc(this, func_80835800); } return 1; } -s32 func_80835C58(PlayState* play, Player* this, PlayerFunc674 func, s32 flags) { - if (func == this->func_674) { +s32 Player_SetupAction(PlayState* play, Player* this, PlayerActionFunc actionFunc, s32 flags) { + if (actionFunc == this->actionFunc) { return 0; } - if (func_8084E3C4 == this->func_674) { + if (func_8084E3C4 == this->actionFunc) { Audio_OcaSetInstrument(0); this->stateFlags2 &= ~(PLAYER_STATE2_ATTEMPT_PLAY_FOR_ACTOR | PLAYER_STATE2_PLAY_FOR_ACTOR); - } else if (func_808507F4 == this->func_674) { + } else if (func_808507F4 == this->actionFunc) { func_80832340(play, this); } - this->func_674 = func; + this->actionFunc = actionFunc; if ((this->itemAction != this->heldItemAction) && (!(flags & 1) || !(this->stateFlags1 & PLAYER_STATE1_SHIELDING))) { @@ -2885,34 +3088,38 @@ s32 func_80835C58(PlayState* play, Player* this, PlayerFunc674 func, s32 flags) } func_80832DBC(this); + this->stateFlags1 &= ~(PLAYER_STATE1_HOOKSHOT_FALLING | PLAYER_STATE1_TEXT_ON_SCREEN | PLAYER_STATE1_DAMAGED | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE | PLAYER_STATE1_FLOOR_DISABLED); this->stateFlags2 &= ~(PLAYER_STATE2_HOPPING | PLAYER_STATE2_OCARINA_PLAYING | PLAYER_STATE2_IDLING); this->stateFlags3 &= ~(PLAYER_STATE3_MIDAIR | PLAYER_STATE3_FINISHED_ATTACKING | PLAYER_STATE3_HOOKSHOT_TRAVELLING); + this->unk_84F = 0; this->unk_850 = 0; + this->unk_6AC = 0; + func_808326F0(this); return 1; } -void func_80835DAC(PlayState* play, Player* this, PlayerFunc674 func, s32 flags) { +void func_80835DAC(PlayState* play, Player* this, PlayerActionFunc actionFunc, s32 flags) { s32 temp; temp = this->skelAnime.moveFlags; this->skelAnime.moveFlags = 0; - func_80835C58(play, this, func, flags); + Player_SetupAction(play, this, actionFunc, flags); this->skelAnime.moveFlags = temp; } -void func_80835DE4(PlayState* play, Player* this, PlayerFunc674 func, s32 flags) { +void func_80835DE4(PlayState* play, Player* this, PlayerActionFunc actionFunc, s32 flags) { s32 temp; if (this->itemAction >= 0) { temp = this->itemAction; this->itemAction = this->heldItemAction; - func_80835C58(play, this, func, flags); + Player_SetupAction(play, this, actionFunc, flags); this->itemAction = temp; Player_SetModels(this, Player_ActionToModelGroup(this, this->itemAction)); } @@ -2933,7 +3140,7 @@ void func_80835EA4(PlayState* play, s32 arg1) { Camera_SetCameraData(Play_GetCamera(play, 0), 4, 0, 0, arg1, 0, 0); } -void func_80835EFC(Player* this) { +void Player_DestroyHookshot(Player* this) { if (Player_HoldsHookshot(this)) { Actor* heldActor = this->heldActor; @@ -2945,41 +3152,41 @@ void func_80835EFC(Player* this) { } } -void func_80835F44(PlayState* play, Player* this, s32 item) { - s8 actionParam; +void Player_UseItem(PlayState* play, Player* this, s32 item) { + s8 itemAction; s32 temp; s32 nextAnimType; - actionParam = Player_ItemToItemAction(item); + itemAction = Player_ItemToItemAction(item); if (((this->heldItemAction == this->itemAction) && - (!(this->stateFlags1 & PLAYER_STATE1_SHIELDING) || (Player_ActionToMeleeWeapon(actionParam) != 0) || - (actionParam == PLAYER_IA_NONE))) || + (!(this->stateFlags1 & PLAYER_STATE1_SHIELDING) || (Player_ActionToMeleeWeapon(itemAction) != 0) || + (itemAction == PLAYER_IA_NONE))) || ((this->itemAction < 0) && - ((Player_ActionToMeleeWeapon(actionParam) != 0) || (actionParam == PLAYER_IA_NONE)))) { + ((Player_ActionToMeleeWeapon(itemAction) != 0) || (itemAction == PLAYER_IA_NONE)))) { - if ((actionParam == PLAYER_IA_NONE) || !(this->stateFlags1 & PLAYER_STATE1_IN_WATER) || + if ((itemAction == PLAYER_IA_NONE) || !(this->stateFlags1 & PLAYER_STATE1_IN_WATER) || ((this->actor.bgCheckFlags & 1) && - ((actionParam == PLAYER_IA_HOOKSHOT) || (actionParam == PLAYER_IA_LONGSHOT))) || - ((actionParam >= PLAYER_IA_SHIELD_DEKU) && (actionParam <= PLAYER_IA_BOOTS_HOVER))) { + ((itemAction == PLAYER_IA_HOOKSHOT) || (itemAction == PLAYER_IA_LONGSHOT))) || + ((itemAction >= PLAYER_IA_SHIELD_DEKU) && (itemAction <= PLAYER_IA_BOOTS_HOVER))) { if ((play->bombchuBowlingStatus == 0) && - (((actionParam == PLAYER_IA_DEKU_STICK) && (AMMO(ITEM_STICK) == 0)) || - ((actionParam == PLAYER_IA_MAGIC_BEAN) && (AMMO(ITEM_BEAN) == 0)) || - (temp = Player_ActionToExplosive(this, actionParam), + (((itemAction == PLAYER_IA_DEKU_STICK) && (AMMO(ITEM_STICK) == 0)) || + ((itemAction == PLAYER_IA_MAGIC_BEAN) && (AMMO(ITEM_BEAN) == 0)) || + (temp = Player_ActionToExplosive(this, itemAction), ((temp >= 0) && ((AMMO(sExplosiveInfos[temp].itemId) == 0) || - (play->actorCtx.actorLists[ACTORCAT_EXPLOSIVE].length >= 3)))))) { + (play->actorCtx.actorLists[ACTORCAT_EXPLOSIVE].length >= 3 && !CVarGetInteger("gRemoveExplosiveLimit", 0))))))) { func_80078884(NA_SE_SY_ERROR); return; } - if (actionParam >= PLAYER_IA_SHIELD_DEKU) { + if (itemAction >= PLAYER_IA_SHIELD_DEKU) { // Changing shields through action commands is unimplemented // Boots and tunics handled previously return; } - if (actionParam == PLAYER_IA_LENS_OF_TRUTH) { + if (itemAction == PLAYER_IA_LENS_OF_TRUTH) { if (Magic_RequestChange(play, 0, MAGIC_CONSUME_LENS)) { if (play->actorCtx.lensActive) { Actor_DisableLens(play); @@ -2993,7 +3200,7 @@ void func_80835F44(PlayState* play, Player* this, s32 item) { return; } - if (actionParam == PLAYER_IA_DEKU_NUT) { + if (itemAction == PLAYER_IA_DEKU_NUT) { if (AMMO(ITEM_NUT) != 0) { func_8083C61C(play, this); } else { @@ -3002,12 +3209,12 @@ void func_80835F44(PlayState* play, Player* this, s32 item) { return; } - temp = Player_ActionToMagicSpell(this, actionParam); + temp = Player_ActionToMagicSpell(this, itemAction); if (temp >= 0) { - if (((actionParam == PLAYER_IA_FARORES_WIND) && (gSaveContext.respawn[RESPAWN_MODE_TOP].data > 0)) || + if (((itemAction == PLAYER_IA_FARORES_WIND) && (gSaveContext.respawn[RESPAWN_MODE_TOP].data > 0)) || ((gSaveContext.magicCapacity != 0) && (gSaveContext.magicState == MAGIC_STATE_IDLE) && (gSaveContext.magic >= sMagicSpellCosts[temp]))) { - this->itemAction = actionParam; + this->itemAction = itemAction; this->unk_6AD = 4; } else { func_80078884(NA_SE_SY_ERROR); @@ -3015,50 +3222,51 @@ void func_80835F44(PlayState* play, Player* this, s32 item) { return; } - if (actionParam >= PLAYER_IA_MASK_KEATON) { + if (itemAction >= PLAYER_IA_MASK_KEATON) { if (this->currentMask != PLAYER_MASK_NONE) { this->currentMask = PLAYER_MASK_NONE; } else { - this->currentMask = actionParam - PLAYER_IA_MASK_KEATON + 1; + this->currentMask = itemAction - PLAYER_IA_MASK_KEATON + 1; } sMaskMemory = this->currentMask; func_808328EC(this, NA_SE_PL_CHANGE_ARMS); return; } - if (((actionParam >= PLAYER_IA_OCARINA_FAIRY) && (actionParam <= PLAYER_IA_OCARINA_OF_TIME)) || - (actionParam >= PLAYER_IA_BOTTLE_FISH)) { + if (((itemAction >= PLAYER_IA_OCARINA_FAIRY) && (itemAction <= PLAYER_IA_OCARINA_OF_TIME)) || + (itemAction >= PLAYER_IA_BOTTLE_FISH)) { if (!func_8008E9C4(this) || - ((actionParam >= PLAYER_IA_BOTTLE_POTION_RED) && (actionParam <= PLAYER_IA_BOTTLE_FAIRY))) { + ((itemAction >= PLAYER_IA_BOTTLE_POTION_RED) && (itemAction <= PLAYER_IA_BOTTLE_FAIRY))) { func_8002D53C(play, &play->actorCtx.titleCtx); this->unk_6AD = 4; - this->itemAction = actionParam; + this->itemAction = itemAction; } return; } - if ((actionParam != this->heldItemAction) || - ((this->heldActor == 0) && (Player_ActionToExplosive(this, actionParam) >= 0))) { - this->nextModelGroup = Player_ActionToModelGroup(this, actionParam); + if ((itemAction != this->heldItemAction) || + ((this->heldActor == 0) && (Player_ActionToExplosive(this, itemAction) >= 0))) { + this->nextModelGroup = Player_ActionToModelGroup(this, itemAction); nextAnimType = gPlayerModelTypes[this->nextModelGroup][PLAYER_MODELGROUPENTRY_ANIM]; - if ((this->heldItemAction >= 0) && (Player_ActionToMagicSpell(this, actionParam) < 0) && + if ((this->heldItemAction >= 0) && (Player_ActionToMagicSpell(this, itemAction) < 0) && (item != this->heldItemId) && - (D_80854164[gPlayerModelTypes[this->modelGroup][PLAYER_MODELGROUPENTRY_ANIM]][nextAnimType] != - PLAYER_D_808540F4_0) && + (sItemChangeTypes[gPlayerModelTypes[this->modelGroup][PLAYER_MODELGROUPENTRY_ANIM]][nextAnimType] != + PLAYER_ITEM_CHG_0) && (!CVarGetInteger("gSeparateArrows", 0) || - actionParam < PLAYER_IA_BOW || actionParam > PLAYER_IA_BOW_0E || + itemAction < PLAYER_IA_BOW || itemAction > PLAYER_IA_BOW_0E || this->heldItemAction < PLAYER_IA_BOW || this->heldItemAction > PLAYER_IA_BOW_0E)) { this->heldItemId = item; this->stateFlags1 |= PLAYER_STATE1_START_PUTAWAY; } else { - func_80835EFC(this); - func_808323B4(play, this); - func_80833664(play, this, actionParam); + // Init new held item for use + Player_DestroyHookshot(this); + Player_DetachHeldActor(play, this); + Player_InitItemActionWithAnim(play, this, itemAction); } return; } - D_80853614 = D_80853618 = true; + sUseHeldItem = sHeldItemButtonIsHeldDown = true; } } } @@ -3068,11 +3276,11 @@ void func_80836448(PlayState* play, Player* this, LinkAnimationHeader* anim) { func_80832564(play, this); - func_80835C58(play, this, cond ? func_8084E368 : func_80843CEC, 0); + Player_SetupAction(play, this, cond ? func_8084E368 : func_80843CEC, 0); this->stateFlags1 |= PLAYER_STATE1_DEAD; - func_80832264(play, this, anim); + Player_AnimPlayOnce(play, this, anim); if (anim == &gPlayerAnim_link_derth_rebirth) { this->skelAnime.endFrame = 84.0f; } @@ -3099,20 +3307,20 @@ void func_80836448(PlayState* play, Player* this, LinkAnimationHeader* anim) { } } -s32 func_808365C8(Player* this) { - return (!(func_808458D0 == this->func_674) || +s32 Player_CanUpdateItems(Player* this) { + return (!(func_808458D0 == this->actionFunc) || ((this->stateFlags1 & PLAYER_STATE1_START_PUTAWAY) && ((this->heldItemId == ITEM_LAST_USED) || (this->heldItemId == ITEM_NONE)))) && - (!(func_80834A2C == this->func_82C) || + (!(Player_UpperAction_ChangeHeldItem == this->upperActionFunc) || (Player_ItemToItemAction(this->heldItemId) == this->heldItemAction)); } -s32 func_80836670(Player* this, PlayState* play) { +s32 Player_UpdateUpperBody(Player* this, PlayState* play) { if (!(this->stateFlags1 & PLAYER_STATE1_ON_HORSE) && (this->actor.parent != NULL) && Player_HoldsHookshot(this)) { - func_80835C58(play, this, func_80850AEC, 1); + Player_SetupAction(play, this, func_80850AEC, 1); this->stateFlags3 |= PLAYER_STATE3_HOOKSHOT_TRAVELLING; - func_80832264(play, this, &gPlayerAnim_link_hook_fly_start); - func_80832F54(play, this, 0x9B); + Player_AnimPlayOnce(play, this, &gPlayerAnim_link_hook_fly_start); + Player_AnimReplaceApplyFlags(play, this, 0x9B); func_80832224(this); this->currentYaw = this->actor.shape.rot.y; this->actor.bgCheckFlags &= ~1; @@ -3122,31 +3330,31 @@ s32 func_80836670(Player* this, PlayState* play) { return 1; } - if (func_808365C8(this)) { - func_80834298(this, play); - if (func_8084E604 == this->func_674) { + if (Player_CanUpdateItems(this)) { + Player_UpdateItems(this, play); + if (func_8084E604 == this->actionFunc) { return 1; } } - if (!this->func_82C(this, play)) { + if (!this->upperActionFunc(this, play)) { return 0; } - if (this->unk_830 != 0.0f) { + if (this->upperAnimBlendWeight != 0.0f) { if ((func_80833350(this) == 0) || (this->linearVelocity != 0.0f)) { - AnimationContext_SetCopyFalse(play, this->skelAnime.limbCount, this->skelAnime2.jointTable, - this->skelAnime.jointTable, D_80853410); + AnimationContext_SetCopyFalse(play, this->skelAnime.limbCount, this->upperSkelAnime.jointTable, + this->skelAnime.jointTable, sUpperBodyLimbCopyMap); } - Math_StepToF(&this->unk_830, 0.0f, 0.25f); + Math_StepToF(&this->upperAnimBlendWeight, 0.0f, 0.25f); AnimationContext_SetInterp(play, this->skelAnime.limbCount, this->skelAnime.jointTable, - this->skelAnime2.jointTable, 1.0f - this->unk_830); + this->upperSkelAnime.jointTable, 1.0f - this->upperAnimBlendWeight); } else if ((func_80833350(this) == 0) || (this->linearVelocity != 0.0f)) { AnimationContext_SetCopyTrue(play, this->skelAnime.limbCount, this->skelAnime.jointTable, - this->skelAnime2.jointTable, D_80853410); + this->upperSkelAnime.jointTable, sUpperBodyLimbCopyMap); } else { AnimationContext_SetCopyAll(play, this->skelAnime.limbCount, this->skelAnime.jointTable, - this->skelAnime2.jointTable); + this->upperSkelAnime.jointTable); } return 1; @@ -3154,7 +3362,7 @@ s32 func_80836670(Player* this, PlayState* play) { s32 func_80836898(PlayState* play, Player* this, PlayerFuncA74 func) { this->func_A74 = func; - func_80835C58(play, this, func_808458D0, 0); + Player_SetupAction(play, this, func_808458D0, 0); this->stateFlags2 |= PLAYER_STATE2_DISABLE_ROTATION_ALWAYS; return func_80832528(play, this); } @@ -3234,7 +3442,7 @@ void func_80836BEC(Player* this, PlayState* play) { this->stateFlags1 &= ~PLAYER_STATE1_30; } - if ((play->csCtx.state != CS_STATE_IDLE) || (this->csMode != 0) || + if ((play->csCtx.state != CS_STATE_IDLE) || (this->csAction != 0) || (this->stateFlags1 & (PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_CUTSCENE)) || (this->stateFlags3 & PLAYER_STATE3_HOOKSHOT_TRAVELLING)) { this->unk_66C = 0; } else if (zTrigPressed || (this->stateFlags2 & PLAYER_STATE2_SWITCH_TARGETING) || (this->unk_684 != NULL)) { @@ -3326,74 +3534,98 @@ void func_80836BEC(Player* this, PlayState* play) { } } -s32 func_80836FAC(PlayState* play, Player* this, f32* arg2, s16* arg3, f32 arg4) { - f32 temp_f2; - f32 temp_f0; - f32 temp_f14; - f32 temp_f12; +/** + * Calculates target speed and yaw based on input from the control stick. + * See `Player_GetMovementSpeedAndYaw` for detailed argument descriptions. + * + * @return true if the control stick has any magnitude, false otherwise. + */ +s32 Player_CalcSpeedAndYawFromControlStick(PlayState* play, Player* this, f32* outSpeedTarget, s16* outYawTarget, f32 speedMode) { + f32 temp; + f32 sinFloorPitch; + f32 floorPitchInfluence; + f32 speedCap; - if ((this->unk_6AD != 0) || (play->sceneLoadFlag == 0x14) || (this->stateFlags1 & PLAYER_STATE1_LOADING)) { - *arg2 = 0.0f; - *arg3 = this->actor.shape.rot.y; + if ((this->unk_6AD != 0) || (play->transitionTrigger == TRANS_TRIGGER_START) || (this->stateFlags1 & PLAYER_STATE1_LOADING)) { + *outSpeedTarget = 0.0f; + *outYawTarget = this->actor.shape.rot.y; } else { - *arg2 = D_808535D4; - *arg3 = D_808535D8; + *outSpeedTarget = sControlStickMagnitude; + *outYawTarget = sControlStickAngle; - if (arg4 != 0.0f) { - *arg2 -= 20.0f; - if (*arg2 < 0.0f) { - *arg2 = 0.0f; + if (speedMode != 0.0f) { + *outSpeedTarget -= 20.0f; + if (*outSpeedTarget < 0.0f) { + // If control stick magnitude is below 20, return zero speed. + *outSpeedTarget = 0.0f; } else { - temp_f2 = 1.0f - Math_CosS(*arg2 * 450.0f); - *arg2 = ((temp_f2 * temp_f2) * 30.0f) + 7.0f; + // Cosine of the control stick magnitude isn't exactly meaningful, but + // it happens to give a desirable curve for grounded movement speed relative + // to control stick magnitude. + temp = 1.0f - Math_CosS(*outSpeedTarget * 450.0f); + *outSpeedTarget = ((temp * temp) * 30.0f) + 7.0f; } } else { - *arg2 *= 0.8f; + // Speed increases linearly relative to control stick magnitude + *outSpeedTarget *= 0.8f; } - if (D_808535D4 != 0.0f) { - temp_f0 = Math_SinS(this->unk_898); - temp_f12 = this->unk_880; - temp_f14 = CLAMP(temp_f0, 0.0f, 0.6f); + if (sControlStickMagnitude != 0.0f) { + sinFloorPitch = Math_SinS(this->floorPitch); + speedCap = this->unk_880; + floorPitchInfluence = CLAMP(sinFloorPitch, 0.0f, 0.6f); if (this->unk_6C4 != 0.0f) { - temp_f12 = temp_f12 - (this->unk_6C4 * 0.008f); - if (temp_f12 < 2.0f) { - temp_f12 = 2.0f; + speedCap = speedCap - (this->unk_6C4 * 0.008f); + if (speedCap < 2.0f) { + speedCap = 2.0f; } } - *arg2 = (*arg2 * 0.14f) - (8.0f * temp_f14 * temp_f14); - *arg2 = CLAMP(*arg2, 0.0f, temp_f12); + *outSpeedTarget = (*outSpeedTarget * 0.14f) - (8.0f * floorPitchInfluence * floorPitchInfluence); + *outSpeedTarget = CLAMP(*outSpeedTarget, 0.0f, speedCap); - return 1; + return true; } } - return 0; + return false; } s32 func_8083721C(Player* this) { return Math_StepToF(&this->linearVelocity, 0.0f, REG(43) / 100.0f); } -s32 func_80837268(Player* this, f32* arg1, s16* arg2, f32 arg3, PlayState* play) { - if (!func_80836FAC(play, this, arg1, arg2, arg3)) { - *arg2 = this->actor.shape.rot.y; +/** + * Gets target speed and yaw values for movement based on control stick input. + * Control stick magnitude and angle are processed in `Player_CalcSpeedAndYawFromControlStick` to get target values. + * Additionally, this function does extra processing on the target yaw value if the control stick is neutral. + * + * @param outSpeedTarget a pointer to the variable that will hold the resulting target speed value + * @param outYawTarget a pointer to the variable that will hold the resulting target yaw value + * @param speedMode toggles between a linear and curved mode for the speed value + * + * @see Player_CalcSpeedAndYawFromControlStick for more information on the linear vs curved speed mode. + * + * @return true if the control stick has any magnitude, false otherwise. + */ +s32 Player_GetMovementSpeedAndYaw(Player* this, f32* outSpeedTarget, s16* outYawTarget, f32 speedMode, PlayState* play) { + if (!Player_CalcSpeedAndYawFromControlStick(play, this, outSpeedTarget, outYawTarget, speedMode)) { + *outYawTarget = this->actor.shape.rot.y; if (this->unk_664 != NULL) { if ((play->actorCtx.targetCtx.unk_4B != 0) && !(this->stateFlags2 & PLAYER_STATE2_DISABLE_ROTATION_ALWAYS)) { - *arg2 = Math_Vec3f_Yaw(&this->actor.world.pos, &this->unk_664->focus.pos); - return 0; + *outYawTarget = Math_Vec3f_Yaw(&this->actor.world.pos, &this->unk_664->focus.pos); + return false; } } else if (func_80833B2C(this)) { - *arg2 = this->targetYaw; + *outYawTarget = this->targetYaw; } - return 0; + return false; } else { - *arg2 += Camera_GetInputDirYaw(GET_ACTIVE_CAM(play)); - return 1; + *outYawTarget += Camera_GetInputDirYaw(GET_ACTIVE_CAM(play)); + return true; } } @@ -3414,37 +3646,53 @@ static s32 (*D_80854448[])(Player* this, PlayState* play) = { func_80850224, func_8083C544, func_8083EB44, func_8083BDBC, func_8083C2B0, func_80838A14, func_8083B040, }; -s32 func_80837348(PlayState* play, Player* this, s8* arg2, s32 arg3) { +/** + * This function processes "Action Change Lists", which run various functions that + * check if it is appropriate to change to a new action. + * + * Action Change Lists are a list of indices for the `sActionChangeFuncs` array. + * The functions are ran in order until one of them returns true, or the end of the list is reached. + * An Action Change index having a negative value indicates that it is the last member in the list. + * + * Because these lists are processed sequentially, the order of the indices in the list determines its priority. + * + * If the `updateUpperBody` argument is true, Player's upper body will update before the Action Change List + * is processed. This allows for Item Action functions to run. + * + * @return true if a new action has been chosen + * + */ +s32 Player_TryActionChangeList(PlayState* play, Player* this, s8* actionChangeList, s32 updateUpperBody) { s32 i; if (!(this->stateFlags1 & (PLAYER_STATE1_LOADING | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_CUTSCENE))) { - if (arg3 != 0) { - D_808535E0 = func_80836670(this, play); - if (func_8084E604 == this->func_674) { - return 1; + if (updateUpperBody != 0) { + D_808535E0 = Player_UpdateUpperBody(this, play); + if (func_8084E604 == this->actionFunc) { + return true; } } if (func_8008F128(this)) { this->unk_6AE |= 0x41; - return 1; + return true; } - if (!(this->stateFlags1 & PLAYER_STATE1_START_PUTAWAY) && (func_80834A2C != this->func_82C)) { - while (*arg2 >= 0) { - if (D_80854448[*arg2](this, play)) { - return 1; + if (!(this->stateFlags1 & PLAYER_STATE1_START_PUTAWAY) && (Player_UpperAction_ChangeHeldItem != this->upperActionFunc)) { + while (*actionChangeList >= 0) { + if (D_80854448[*actionChangeList](this, play)) { + return true; } - arg2++; + actionChangeList++; } - if (D_80854448[-(*arg2)](this, play)) { - return 1; + if (D_80854448[-(*actionChangeList)](this, play)) { + return true; } } } - return 0; + return false; } s32 func_808374A0(PlayState* play, Player* this, SkelAnime* skelAnime, f32 arg3) { @@ -3452,11 +3700,11 @@ s32 func_808374A0(PlayState* play, Player* this, SkelAnime* skelAnime, f32 arg3) s16 sp22; if ((skelAnime->endFrame - arg3) <= skelAnime->curFrame) { - if (func_80837348(play, this, D_80854418, 1)) { + if (Player_TryActionChangeList(play, this, D_80854418, 1)) { return 0; } - if (func_80837268(this, &sp24, &sp22, 0.018f, play)) { + if (Player_GetMovementSpeedAndYaw(this, &sp24, &sp22, 0.018f, play)) { return 1; } } @@ -3520,25 +3768,35 @@ s32 func_808375D8(Player* this) { void func_80837704(PlayState* play, Player* this) { LinkAnimationHeader* anim; - if ((this->meleeWeaponAnimation >= 4) && (this->meleeWeaponAnimation < 8)) { + if ((this->meleeWeaponAnimation >= PLAYER_MWA_RIGHT_SLASH_1H) && + (this->meleeWeaponAnimation <= PLAYER_MWA_RIGHT_COMBO_2H)) { anim = D_80854358[Player_HoldsTwoHandedWeapon(this)]; } else { anim = D_80854350[Player_HoldsTwoHandedWeapon(this)]; } func_80832318(this); - LinkAnimation_Change(play, &this->skelAnime, anim, 1.0f, 8.0f, Animation_GetLastFrame(anim), ANIMMODE_ONCE, - -9.0f); + LinkAnimation_Change(play, &this->skelAnime, anim, 1.0f, 8.0f, Animation_GetLastFrame(anim), ANIMMODE_ONCE, -9.0f); func_80837530(play, this, 0x200); } void func_808377DC(PlayState* play, Player* this) { - func_80835C58(play, this, func_80844E68, 1); + Player_SetupAction(play, this, func_80844E68, 1); func_80837704(play, this); } -static s8 D_80854480[] = { 12, 4, 4, 8 }; -static s8 D_80854484[] = { 22, 23, 22, 23 }; +static s8 D_80854480[] = { + PLAYER_MWA_STAB_1H, + PLAYER_MWA_RIGHT_SLASH_1H, + PLAYER_MWA_RIGHT_SLASH_1H, + PLAYER_MWA_LEFT_SLASH_1H, +}; +static s8 D_80854484[] = { + PLAYER_MWA_HAMMER_FORWARD, + PLAYER_MWA_HAMMER_SIDE, + PLAYER_MWA_HAMMER_FORWARD, + PLAYER_MWA_HAMMER_SIDE, +}; s32 func_80837818(Player* this) { s32 sp1C = this->unk_84B[this->unk_846]; @@ -3552,25 +3810,25 @@ s32 func_80837818(Player* this) { this->unk_845 = 0; } else { if (func_808375D8(this)) { - sp18 = 24; + sp18 = PLAYER_MWA_SPIN_ATTACK_1H; } else { if (sp1C < 0) { if (func_80833BCC(this)) { - sp18 = 0; + sp18 = PLAYER_MWA_FORWARD_SLASH_1H; } else { - sp18 = 4; + sp18 = PLAYER_MWA_RIGHT_SLASH_1H; } } else { sp18 = D_80854480[sp1C]; - if (sp18 == 12) { + if (sp18 == PLAYER_MWA_STAB_1H) { this->stateFlags2 |= PLAYER_STATE2_SWORD_LUNGE; if (!func_80833BCC(this)) { - sp18 = 0; + sp18 = PLAYER_MWA_FORWARD_SLASH_1H; } } } if (this->heldItemAction == PLAYER_IA_DEKU_STICK) { - sp18 = 0; + sp18 = PLAYER_MWA_FORWARD_SLASH_1H; } } if (Player_HoldsTwoHandedWeapon(this)) { @@ -3581,10 +3839,10 @@ s32 func_80837818(Player* this) { return sp18; } -void func_80837918(Player* this, s32 quadIndex, u32 flags) { - this->meleeWeaponQuads[quadIndex].info.toucher.dmgFlags = flags; +void func_80837918(Player* this, s32 quadIndex, u32 dmgFlags) { + this->meleeWeaponQuads[quadIndex].info.toucher.dmgFlags = dmgFlags; - if (flags == 2) { + if (dmgFlags == 2) { this->meleeWeaponQuads[quadIndex].info.toucherFlags = TOUCH_ON | TOUCH_NEAREST | TOUCH_SFX_WOOD; } else { this->meleeWeaponQuads[quadIndex].info.toucherFlags = TOUCH_ON | TOUCH_NEAREST; @@ -3598,12 +3856,12 @@ static u32 D_80854488[][2] = { void func_80837948(PlayState* play, Player* this, s32 arg2) { s32 pad; - u32 flags; + u32 dmgFlags; s32 temp; - func_80835C58(play, this, func_808502D0, 0); + Player_SetupAction(play, this, func_808502D0, 0); this->unk_844 = 8; - if ((arg2 < 18) || (arg2 >= 20)) { + if (!((arg2 >= PLAYER_MWA_FLIPSLASH_FINISH) && (arg2 <= PLAYER_MWA_JUMPSLASH_FINISH))) { func_80832318(this); } @@ -3618,9 +3876,9 @@ void func_80837948(PlayState* play, Player* this, s32 arg2) { this->meleeWeaponAnimation = arg2; - func_808322D0(play, this, D_80854190[arg2].unk_00); - if ((arg2 != 16) && (arg2 != 17)) { - func_80832F54(play, this, 0x209); + Player_AnimPlayOnceAdjusted(play, this, D_80854190[arg2].unk_00); + if ((arg2 != PLAYER_MWA_FLIPSLASH_START) && (arg2 != PLAYER_MWA_JUMPSLASH_START)) { + Player_AnimReplaceApplyFlags(play, this, 0x209); } this->currentYaw = this->actor.shape.rot.y; @@ -3631,19 +3889,19 @@ void func_80837948(PlayState* play, Player* this, s32 arg2) { temp = Player_GetMeleeWeaponHeld(this) - 1; } - if ((arg2 >= 16) && (arg2 < 20)) { + if ((arg2 >= PLAYER_MWA_FLIPSLASH_START) && (arg2 <= PLAYER_MWA_JUMPSLASH_FINISH)) { if (CVarGetInteger("gRestoreQPA", 1) && temp == -1) { - flags = 0x16171617; + dmgFlags = 0x16171617; } else { - flags = D_80854488[temp][1]; + dmgFlags = D_80854488[temp][1]; } } else { - flags = D_80854488[temp][0]; + dmgFlags = D_80854488[temp][0]; } - func_80837918(this, 0, flags); - func_80837918(this, 1, flags); + func_80837918(this, 0, dmgFlags); + func_80837918(this, 1, dmgFlags); } void func_80837AE0(Player* this, s32 timer) { @@ -3683,8 +3941,8 @@ void func_80837B60(Player* this) { } void func_80837B9C(Player* this, PlayState* play) { - func_80835C58(play, this, func_8084411C, 0); - func_80832284(play, this, &gPlayerAnim_link_normal_landing_wait); + Player_SetupAction(play, this, func_8084411C, 0); + Player_AnimPlayLoop(play, this, &gPlayerAnim_link_normal_landing_wait); this->unk_850 = 1; if (this->unk_6AD != 3) { this->unk_6AD = 0; @@ -3698,7 +3956,7 @@ static LinkAnimationHeader* D_808544B0[] = { }; void func_80837C0C(PlayState* play, Player* this, s32 arg2, f32 arg3, f32 arg4, s16 arg5, s32 arg6) { - LinkAnimationHeader* sp2C = NULL; + LinkAnimationHeader* anim = NULL; LinkAnimationHeader** sp28; if (this->stateFlags1 & PLAYER_STATE1_HANGING_OFF_LEDGE) { @@ -3707,7 +3965,7 @@ void func_80837C0C(PlayState* play, Player* this, s32 arg2, f32 arg3, f32 arg4, this->unk_890 = 0; - Player_PlaySfx(&this->actor, NA_SE_PL_DAMAGE); + Player_PlaySfx(this, NA_SE_PL_DAMAGE); if (!func_80837B18(play, this, 0 - this->actor.colChkInfo.damage)) { this->stateFlags2 &= ~PLAYER_STATE2_GRABBED_BY_ENEMY; @@ -3720,39 +3978,39 @@ void func_80837C0C(PlayState* play, Player* this, s32 arg2, f32 arg3, f32 arg4, func_80837AE0(this, arg6); if (arg2 == 3) { - func_80835C58(play, this, func_8084FB10, 0); + Player_SetupAction(play, this, func_8084FB10, 0); - sp2C = &gPlayerAnim_link_normal_ice_down; + anim = &gPlayerAnim_link_normal_ice_down; func_80832224(this); Player_RequestRumble(this, 255, 10, 40, 0); - Player_PlaySfx(&this->actor, NA_SE_PL_FREEZE_S); + Player_PlaySfx(this, NA_SE_PL_FREEZE_S); func_80832698(this, NA_SE_VO_LI_FREEZE); } else if (arg2 == 4) { - func_80835C58(play, this, func_8084FBF4, 0); + Player_SetupAction(play, this, func_8084FBF4, 0); Player_RequestRumble(this, 255, 80, 150, 0); - func_808322A4(play, this, &gPlayerAnim_link_normal_electric_shock); + Player_AnimPlayLoopAdjusted(play, this, &gPlayerAnim_link_normal_electric_shock); func_80832224(this); this->unk_850 = 20; } else { arg5 -= this->actor.shape.rot.y; if (this->stateFlags1 & PLAYER_STATE1_IN_WATER) { - func_80835C58(play, this, func_8084E30C, 0); + Player_SetupAction(play, this, func_8084E30C, 0); Player_RequestRumble(this, 180, 20, 50, 0); this->linearVelocity = 4.0f; this->actor.velocity.y = 0.0f; - sp2C = &gPlayerAnim_link_swimer_swim_hit; + anim = &gPlayerAnim_link_swimer_swim_hit; func_80832698(this, NA_SE_VO_LI_DAMAGE_S); } else if ((arg2 == 1) || (arg2 == 2) || !(this->actor.bgCheckFlags & 1) || (this->stateFlags1 & (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE | PLAYER_STATE1_CLIMBING_LADDER))) { - func_80835C58(play, this, func_8084377C, 0); + Player_SetupAction(play, this, func_8084377C, 0); this->stateFlags3 |= PLAYER_STATE3_MIDAIR; @@ -3766,7 +4024,7 @@ void func_80837C0C(PlayState* play, Player* this, s32 arg2, f32 arg3, f32 arg4, this->linearVelocity = 3.0f; this->actor.velocity.y = 6.0f; - func_80832C2C(play, this, D_80853914[PLAYER_ANIMGROUP_damage_run][this->modelAnimType]); + Player_AnimChangeFreeze(play, this, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_damage_run, this->modelAnimType)); func_80832698(this, NA_SE_VO_LI_DAMAGE_S); } else { this->actor.speedXZ = arg3; @@ -3774,9 +4032,9 @@ void func_80837C0C(PlayState* play, Player* this, s32 arg2, f32 arg3, f32 arg4, this->actor.velocity.y = arg4; if (ABS(arg5) > 0x4000) { - sp2C = &gPlayerAnim_link_normal_front_downA; + anim = &gPlayerAnim_link_normal_front_downA; } else { - sp2C = &gPlayerAnim_link_normal_back_downA; + anim = &gPlayerAnim_link_normal_back_downA; } if ((this->actor.category != ACTORCAT_PLAYER) && (this->actor.colChkInfo.health == 0)) { @@ -3798,7 +4056,7 @@ void func_80837C0C(PlayState* play, Player* this, s32 arg2, f32 arg3, f32 arg4, sp28 = D_808544B0; - func_80835C58(play, this, func_8084370C, 0); + Player_SetupAction(play, this, func_8084370C, 0); func_80833C3C(this); if (this->actor.colChkInfo.damage < 5) { @@ -3817,7 +4075,7 @@ void func_80837C0C(PlayState* play, Player* this, s32 arg2, f32 arg3, f32 arg4, sp28 += 1; } - sp2C = *sp28; + anim = *sp28; func_80832698(this, NA_SE_VO_LI_DAMAGE_S); } @@ -3834,8 +4092,8 @@ void func_80837C0C(PlayState* play, Player* this, s32 arg2, f32 arg3, f32 arg4, this->stateFlags1 |= PLAYER_STATE1_DAMAGED; - if (sp2C != NULL) { - func_808322D0(play, this, sp2C); + if (anim != NULL) { + Player_AnimPlayOnceAdjusted(play, this, anim); } } @@ -3866,7 +4124,7 @@ void func_8083821C(Player* this) { s32 i; // clang-format off - for (i = 0; i < 18; i++) { this->flameTimers[i] = Rand_S16Offset(0, 200); } + for (i = 0; i < PLAYER_BODYPART_MAX; i++) { this->flameTimers[i] = Rand_S16Offset(0, 200); } // clang-format on this->isBurning = true; @@ -3898,12 +4156,12 @@ s32 func_808382DC(Player* this, PlayState* play) { } else { sp68 = ((Player_GetHeight(this) - 8.0f) < (this->unk_6C4 * this->actor.scale.y)); - if (sp68 || (this->actor.bgCheckFlags & 0x100) || (D_808535E4 == 9) || (this->stateFlags2 & PLAYER_STATE2_FORCED_VOID_OUT)) { + if (sp68 || (this->actor.bgCheckFlags & 0x100) || (sFloorType == 9) || (this->stateFlags2 & PLAYER_STATE2_FORCED_VOID_OUT)) { func_80832698(this, NA_SE_VO_LI_DAMAGE_S); if (sp68) { Play_TriggerRespawn(play); - func_800994A0(play); + Scene_SetTransitionForNextEntrance(play); } else { // Special case for getting crushed in Forest Temple's Checkboard Ceiling Hall or Shadow Temple's // Falling Spike Trap Room, to respawn the player in a specific place @@ -3956,14 +4214,14 @@ s32 func_808382DC(Player* this, PlayState* play) { if (!Player_IsChildWithHylianShield(this)) { if (this->invincibilityTimer >= 0) { LinkAnimationHeader* anim; - s32 sp54 = func_80843188 == this->func_674; + s32 sp54 = func_80843188 == this->actionFunc; if (!func_808332B8(this)) { - func_80835C58(play, this, func_808435C4, 0); + Player_SetupAction(play, this, func_808435C4, 0); } if (!(this->unk_84F = sp54)) { - func_80833638(this, func_80834BD4); + Player_SetUpperActionFunc(this, func_80834BD4); if (this->unk_870 < 0.5f) { anim = D_808543BC[Player_HoldsTwoHandedWeapon(this) && @@ -3974,9 +4232,9 @@ s32 func_808382DC(Player* this, PlayState* play) { !(CVarGetInteger("gShieldTwoHanded", 0) && (this->heldItemAction != PLAYER_IA_DEKU_STICK))]; } - LinkAnimation_PlayOnce(play, &this->skelAnime2, anim); + LinkAnimation_PlayOnce(play, &this->upperSkelAnime, anim); } else { - func_80832264(play, this, + Player_AnimPlayOnce(play, this, D_808543C4[Player_HoldsTwoHandedWeapon(this) && !(CVarGetInteger("gShieldTwoHanded", 0) && (this->heldItemAction != PLAYER_IA_DEKU_STICK))]); @@ -3997,7 +4255,7 @@ s32 func_808382DC(Player* this, PlayState* play) { } if ((this->unk_A87 != 0) || (this->invincibilityTimer > 0) || (this->stateFlags1 & PLAYER_STATE1_DAMAGED) || - (this->csMode != 0) || (this->meleeWeaponQuads[0].base.atFlags & AT_HIT) || + (this->csAction != 0) || (this->meleeWeaponQuads[0].base.atFlags & AT_HIT) || (this->meleeWeaponQuads[1].base.atFlags & AT_HIT)) { return 0; } @@ -4028,7 +4286,7 @@ s32 func_808382DC(Player* this, PlayState* play) { return 0; } else { static u8 D_808544F4[] = { 120, 60 }; - s32 sp48 = func_80838144(D_808535E4); + s32 sp48 = func_80838144(sFloorType); if (((this->actor.wallPoly != NULL) && SurfaceType_IsWallDamage(&play->colCtx, this->actor.wallPoly, this->actor.wallBgId)) || @@ -4051,10 +4309,10 @@ s32 func_808382DC(Player* this, PlayState* play) { } void func_80838940(Player* this, LinkAnimationHeader* anim, f32 arg2, PlayState* play, u16 sfxId) { - func_80835C58(play, this, func_8084411C, 1); + Player_SetupAction(play, this, func_8084411C, 1); if (anim != NULL) { - func_808322D0(play, this, anim); + Player_AnimPlayOnceAdjusted(play, this, anim); } this->actor.velocity.y = arg2 * D_808535E8; @@ -4073,31 +4331,31 @@ void func_808389E8(Player* this, LinkAnimationHeader* anim, f32 arg2, PlayState* s32 func_80838A14(Player* this, PlayState* play) { s32 sp3C; - LinkAnimationHeader* sp38; + LinkAnimationHeader* anim; f32 sp34; f32 temp; - f32 sp2C; - f32 sp28; + f32 wallPolyNormalX; + f32 wallPolyNormalZ; f32 sp24; if (!(this->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) && (this->unk_88C >= 2) && - (!(this->stateFlags1 & PLAYER_STATE1_IN_WATER) || (this->ageProperties->unk_14 > this->wallHeight))) { + (!(this->stateFlags1 & PLAYER_STATE1_IN_WATER) || (this->ageProperties->unk_14 > this->yDistToLedge))) { sp3C = 0; if (func_808332B8(this)) { if (this->actor.yDistToWater < 50.0f) { - if ((this->unk_88C < 2) || (this->wallHeight > this->ageProperties->unk_10)) { + if ((this->unk_88C < 2) || (this->yDistToLedge > this->ageProperties->unk_10)) { return 0; } } else if ((this->currentBoots != PLAYER_BOOTS_IRON) || (this->unk_88C > 2)) { return 0; } } else if (!(this->actor.bgCheckFlags & 1) || - ((this->ageProperties->unk_14 <= this->wallHeight) && (this->stateFlags1 & PLAYER_STATE1_IN_WATER))) { + ((this->ageProperties->unk_14 <= this->yDistToLedge) && (this->stateFlags1 & PLAYER_STATE1_IN_WATER))) { return 0; } - if ((this->actor.wallBgId != BGCHECK_SCENE) && (D_808535F0 & 0x40)) { + if ((this->actor.wallBgId != BGCHECK_SCENE) && (sTouchedWallFlags & 0x40)) { if (this->unk_88D >= 6) { this->stateFlags2 |= PLAYER_STATE2_DO_ACTION_CLIMB; if (CHECK_BTN_ALL(sControlInput->press.button, BTN_A)) { @@ -4109,46 +4367,46 @@ s32 func_80838A14(Player* this, PlayState* play) { } if (sp3C != 0) { - func_80835C58(play, this, func_80845668, 0); + Player_SetupAction(play, this, func_80845668, 0); this->stateFlags1 |= PLAYER_STATE1_JUMPING; - sp34 = this->wallHeight; + sp34 = this->yDistToLedge; if (this->ageProperties->unk_14 <= sp34) { - sp38 = &gPlayerAnim_link_normal_250jump_start; + anim = &gPlayerAnim_link_normal_250jump_start; this->linearVelocity = 1.0f; } else { - sp2C = COLPOLY_GET_NORMAL(this->actor.wallPoly->normal.x); - sp28 = COLPOLY_GET_NORMAL(this->actor.wallPoly->normal.z); - sp24 = this->wallDistance + 0.5f; + wallPolyNormalX = COLPOLY_GET_NORMAL(this->actor.wallPoly->normal.x); + wallPolyNormalZ = COLPOLY_GET_NORMAL(this->actor.wallPoly->normal.z); + sp24 = this->distToInteractWall + 0.5f; this->stateFlags1 |= PLAYER_STATE1_CLIMBING_LEDGE; if (func_808332B8(this)) { - sp38 = &gPlayerAnim_link_swimer_swim_15step_up; + anim = &gPlayerAnim_link_swimer_swim_15step_up; sp34 -= (60.0f * this->ageProperties->unk_08); this->stateFlags1 &= ~PLAYER_STATE1_IN_WATER; } else if (this->ageProperties->unk_18 <= sp34) { - sp38 = &gPlayerAnim_link_normal_150step_up; + anim = &gPlayerAnim_link_normal_150step_up; sp34 -= (59.0f * this->ageProperties->unk_08); } else { - sp38 = &gPlayerAnim_link_normal_100step_up; + anim = &gPlayerAnim_link_normal_100step_up; sp34 -= (41.0f * this->ageProperties->unk_08); } this->actor.shape.yOffset -= sp34 * 100.0f; - this->actor.world.pos.x -= sp24 * sp2C; - this->actor.world.pos.y += this->wallHeight; - this->actor.world.pos.z -= sp24 * sp28; + this->actor.world.pos.x -= sp24 * wallPolyNormalX; + this->actor.world.pos.y += this->yDistToLedge; + this->actor.world.pos.z -= sp24 * wallPolyNormalZ; func_80832224(this); } this->actor.bgCheckFlags |= 1; - LinkAnimation_PlayOnceSetSpeed(play, &this->skelAnime, sp38, 1.3f); + LinkAnimation_PlayOnceSetSpeed(play, &this->skelAnime, anim, 1.3f); AnimationContext_DisableQueue(play); this->actor.shape.rot.y = this->currentYaw = this->actor.wallYaw + 0x8000; @@ -4156,7 +4414,7 @@ s32 func_80838A14(Player* this, PlayState* play) { return 1; } } else if ((this->actor.bgCheckFlags & 1) && (this->unk_88C == 1) && (this->unk_88D >= 3)) { - temp = (this->wallHeight * 0.08f) + 5.5f; + temp = (this->yDistToLedge * 0.08f) + 5.5f; func_808389E8(this, &gPlayerAnim_link_normal_jump, temp, play); this->linearVelocity = 2.5f; @@ -4167,7 +4425,7 @@ s32 func_80838A14(Player* this, PlayState* play) { } void func_80838E70(PlayState* play, Player* this, f32 arg2, s16 arg3) { - func_80835C58(play, this, func_80845CA4, 0); + Player_SetupAction(play, this, func_80845CA4, 0); func_80832440(play, this); this->unk_84F = 1; @@ -4176,16 +4434,16 @@ void func_80838E70(PlayState* play, Player* this, f32 arg2, s16 arg3) { this->unk_450.x = (Math_SinS(arg3) * arg2) + this->actor.world.pos.x; this->unk_450.z = (Math_CosS(arg3) * arg2) + this->actor.world.pos.z; - func_80832264(play, this, func_80833338(this)); + Player_AnimPlayOnce(play, this, func_80833338(this)); } void func_80838F18(PlayState* play, Player* this) { - func_80835C58(play, this, func_8084D610, 0); - func_80832C6C(play, this, &gPlayerAnim_link_swimer_swim_wait); + Player_SetupAction(play, this, func_8084D610, 0); + Player_AnimChangeLoopSlowMorph(play, this, &gPlayerAnim_link_swimer_swim_wait); } void func_80838F5C(PlayState* play, Player* this) { - func_80835C58(play, this, func_8084F88C, 0); + Player_SetupAction(play, this, func_8084F88C, 0); this->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE | PLAYER_STATE1_FLOOR_DISABLED; @@ -4193,9 +4451,9 @@ void func_80838F5C(PlayState* play, Player* this) { } s32 func_80838FB8(PlayState* play, Player* this) { - if ((play->sceneLoadFlag == 0) && (this->stateFlags1 & PLAYER_STATE1_FLOOR_DISABLED)) { + if ((play->transitionTrigger == TRANS_TRIGGER_OFF) && (this->stateFlags1 & PLAYER_STATE1_FLOOR_DISABLED)) { func_80838F5C(play, this); - func_80832284(play, this, &gPlayerAnim_link_normal_landing_wait); + Player_AnimPlayLoop(play, this, &gPlayerAnim_link_normal_landing_wait); func_80832698(this, NA_SE_VO_LI_FALL_S); func_800788CC(NA_SE_OC_SECRET_WARP_IN); return 1; @@ -4204,26 +4462,60 @@ s32 func_80838FB8(PlayState* play, Player* this) { return 0; } -s16 D_808544F8[] = { - 0x045B, // DMT from Magic Fairy Fountain - 0x0482, // DMC from Double Defense Fairy Fountain - 0x0340, // Hyrule Castle from Dins Fire Fairy Fountain - 0x044B, // Kakariko from Potion Shop - 0x02A2, // Market (child day) from Potion Shop - 0x0201, // Kakariko from Bazaar - 0x03B8, // Market (child day) from Bazaar - 0x04EE, // Kakariko from House of Skulltulas - 0x03C0, // Back Alley (day) from Bombchu Shop - 0x0463, // Kakariko from Shooting Gallery - 0x01CD, // Market (child day) from Shooting Gallery - 0x0394, // Zoras Fountain from Farores Wind Fairy Fountain - 0x0340, // Hyrule Castle from Dins Fire Fairy Fountain - 0x057C, // Desert Colossus from Nayrus Love Fairy Fountain +/** + * The actual entrances each "return entrance" value can map to. + * This is used by scenes that are shared between locations, like child/adult Shooting Gallery or Great Fairy Fountains. + * + * This 1D array is split into groups of entrances. + * The start of each group is indexed by `sReturnEntranceGroupIndices` values. + * The resulting groups are then indexed by the spawn value. + * + * The spawn value (`PlayState.spawn`) is set to a different value depending on the entrance used to enter the + * scene, which allows these dynamic "return entrances" to link back to the previous scene. + * + * Note: grottos and normal fairy fountains use `ENTR_RETURN_GROTTO` + */ +s16 sReturnEntranceGroupData[] = { + // ENTR_RETURN_GREAT_FAIRYS_FOUNTAIN_MAGIC + /* 0 */ ENTR_DEATH_MOUNTAIN_TRAIL_4, // from Magic Fairy Fountain + /* 1 */ ENTR_DEATH_MOUNTAIN_CRATER_3, // from Double Magic Fairy Fountain + /* 2 */ ENTR_HYRULE_CASTLE_2, // from Double Defense Fairy Fountain (as adult) + + // ENTR_RETURN_2 + /* 3 */ ENTR_KAKARIKO_VILLAGE_9, // from Potion Shop in Kakariko + /* 4 */ ENTR_MARKET_DAY_5, // from Potion Shop in Market + + // ENTR_RETURN_BAZAAR + /* 5 */ ENTR_KAKARIKO_VILLAGE_3, + /* 6 */ ENTR_MARKET_DAY_6, + + // ENTR_RETURN_4 + /* 7 */ ENTR_KAKARIKO_VILLAGE_11, // from House of Skulltulas + /* 8 */ ENTR_BACK_ALLEY_DAY_2, // from Bombchu Shop + + // ENTR_RETURN_SHOOTING_GALLERY + /* 9 */ ENTR_KAKARIKO_VILLAGE_10, + /* 10 */ ENTR_MARKET_DAY_8, + + // ENTR_RETURN_GREAT_FAIRYS_FOUNTAIN_SPELLS + /* 11 */ ENTR_ZORAS_FOUNTAIN_5, // from Farores Wind Fairy Fountain + /* 12 */ ENTR_HYRULE_CASTLE_2, // from Dins Fire Fairy Fountain (as child) + /* 13 */ ENTR_DESERT_COLOSSUS_7, // from Nayrus Love Fairy Fountain }; -u8 D_80854514[] = { 11, 9, 3, 5, 7, 0 }; +/** + * The values are indices into `sReturnEntranceGroupData` marking the start of each group + */ +u8 sReturnEntranceGroupIndices[] = { + 11, // ENTR_RETURN_GREAT_FAIRYS_FOUNTAIN_SPELLS + 9, // ENTR_RETURN_SHOOTING_GALLERY + 3, // ENTR_RETURN_2 + 5, // ENTR_RETURN_BAZAAR + 7, // ENTR_RETURN_4 + 0, // ENTR_RETURN_GREAT_FAIRYS_FOUNTAIN_MAGIC +}; -s32 func_80839034(PlayState* play, Player* this, CollisionPoly* poly, u32 bgId) { +s32 Player_HandleExitsAndVoids(PlayState* play, Player* this, CollisionPoly* poly, u32 bgId) { s32 sp3C; s32 temp; s32 sp34; @@ -4233,21 +4525,21 @@ s32 func_80839034(PlayState* play, Player* this, CollisionPoly* poly, u32 bgId) if (this->actor.category == ACTORCAT_PLAYER) { sp3C = 0; - if (!(this->stateFlags1 & PLAYER_STATE1_DEAD) && (play->sceneLoadFlag == 0) && (this->csMode == 0) && + if (!(this->stateFlags1 & PLAYER_STATE1_DEAD) && (play->transitionTrigger == TRANS_TRIGGER_OFF) && (this->csAction == 0) && !(this->stateFlags1 & PLAYER_STATE1_LOADING) && (((poly != NULL) && (sp3C = SurfaceType_GetSceneExitIndex(&play->colCtx, poly, bgId), sp3C != 0)) || - (func_8083816C(D_808535E4) && (this->unk_A7A == 12)))) { + (func_8083816C(sFloorType) && (this->unk_A7A == 12)))) { sp34 = this->unk_A84 - (s32)this->actor.world.pos.y; if (!(this->stateFlags1 & (PLAYER_STATE1_ON_HORSE | PLAYER_STATE1_IN_WATER | PLAYER_STATE1_IN_CUTSCENE)) && - !(this->actor.bgCheckFlags & 1) && (sp34 < 100) && (D_80853600 > 100.0f)) { + !(this->actor.bgCheckFlags & 1) && (sp34 < 100) && (sYDistToFloor > 100.0f)) { return 0; } if (sp3C == 0) { Play_TriggerVoidOut(play); - func_800994A0(play); + Scene_SetTransitionForNextEntrance(play); } else { play->nextEntranceIndex = play->setupExitList[sp3C - 1]; @@ -4256,21 +4548,21 @@ s32 func_80839034(PlayState* play, Player* this, CollisionPoly* poly, u32 bgId) play->nextEntranceIndex = Entrance_OverrideNextIndex(play->nextEntranceIndex); } - if (play->nextEntranceIndex == 0x7FFF) { + if (play->nextEntranceIndex == ENTR_RETURN_GROTTO) { gSaveContext.respawnFlag = 2; play->nextEntranceIndex = gSaveContext.respawn[RESPAWN_MODE_RETURN].entranceIndex; - play->fadeTransition = 3; - gSaveContext.nextTransitionType = 3; - } else if (play->nextEntranceIndex >= 0x7FF9) { + play->transitionType = TRANS_TYPE_FADE_WHITE; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE; + } else if (play->nextEntranceIndex >= ENTR_RETURN_YOUSEI_IZUMI_YOKO) { // handle dynamic exits if (IS_RANDO) { - play->nextEntranceIndex = Entrance_OverrideDynamicExit(D_80854514[play->nextEntranceIndex - 0x7FF9] + play->curSpawn); + play->nextEntranceIndex = Entrance_OverrideDynamicExit(sReturnEntranceGroupIndices[play->nextEntranceIndex - ENTR_RETURN_YOUSEI_IZUMI_YOKO] + play->curSpawn); } else { play->nextEntranceIndex = - D_808544F8[D_80854514[play->nextEntranceIndex - 0x7FF9] + play->curSpawn]; + sReturnEntranceGroupData[sReturnEntranceGroupIndices[play->nextEntranceIndex - ENTR_RETURN_YOUSEI_IZUMI_YOKO] + play->curSpawn]; } - func_800994A0(play); + Scene_SetTransitionForNextEntrance(play); } else { if (SurfaceType_GetSlope(&play->colCtx, poly, bgId) == 2) { gSaveContext.respawn[RESPAWN_MODE_DOWN].entranceIndex = play->nextEntranceIndex; @@ -4278,9 +4570,9 @@ s32 func_80839034(PlayState* play, Player* this, CollisionPoly* poly, u32 bgId) gSaveContext.respawnFlag = -2; } gSaveContext.retainWeatherMode = 1; - func_800994A0(play); + Scene_SetTransitionForNextEntrance(play); } - play->sceneLoadFlag = 0x14; + play->transitionTrigger = TRANS_TRIGGER_START; } if (!(this->stateFlags1 & (PLAYER_STATE1_ON_HORSE | PLAYER_STATE1_IN_CUTSCENE)) && @@ -4307,8 +4599,8 @@ s32 func_80839034(PlayState* play, Player* this, CollisionPoly* poly, u32 bgId) gSaveContext.entranceSpeed = linearVel; } - if (D_808535F4 != 0) { - yaw = D_808535FC; + if (sConveyorSpeed != 0) { + yaw = sConveyorYaw; } else { yaw = this->actor.world.rot.y; } @@ -4326,11 +4618,11 @@ s32 func_80839034(PlayState* play, Player* this, CollisionPoly* poly, u32 bgId) return 1; } else { - if (play->sceneLoadFlag == 0) { + if (play->transitionTrigger == TRANS_TRIGGER_OFF) { if ((this->actor.world.pos.y < -4000.0f) || (((this->unk_A7A == 5) || (this->unk_A7A == 12)) && - ((D_80853600 < 100.0f) || (this->fallDistance > 400.0f) || + ((sYDistToFloor < 100.0f) || (this->fallDistance > 400.0f) || ((play->sceneNum != SCENE_SHADOW_TEMPLE) && (this->fallDistance > 200.0f)))) || ((play->sceneNum == SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR) && (this->fallDistance > 320.0f))) { @@ -4340,7 +4632,7 @@ s32 func_80839034(PlayState* play, Player* this, CollisionPoly* poly, u32 bgId) } else { Play_TriggerVoidOut(play); } - play->fadeTransition = 4; + play->transitionType = TRANS_TYPE_FADE_BLACK_FAST; func_80078884(NA_SE_OC_ABYSS); } else { func_80838F5C(play, this); @@ -4361,25 +4653,30 @@ s32 func_80839034(PlayState* play, Player* this, CollisionPoly* poly, u32 bgId) return 0; } -void func_808395DC(Player* this, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3) { +/** + * Gets a position relative to player's yaw. + * An offset is applied to the provided base position in the direction of shape y rotation. + * The resulting position is stored in `dest` + */ +void Player_GetRelativePosition(Player* this, Vec3f* base, Vec3f* offset, Vec3f* dest) { f32 cos = Math_CosS(this->actor.shape.rot.y); f32 sin = Math_SinS(this->actor.shape.rot.y); - arg3->x = arg1->x + ((arg2->x * cos) + (arg2->z * sin)); - arg3->y = arg1->y + arg2->y; - arg3->z = arg1->z + ((arg2->z * cos) - (arg2->x * sin)); + dest->x = base->x + ((offset->x * cos) + (offset->z * sin)); + dest->y = base->y + offset->y; + dest->z = base->z + ((offset->z * cos) - (offset->x * sin)); } Actor* Player_SpawnFairy(PlayState* play, Player* this, Vec3f* arg2, Vec3f* arg3, s32 type) { Vec3f pos; - func_808395DC(this, arg2, arg3, &pos); + Player_GetRelativePosition(this, arg2, arg3, &pos); return Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ELF, pos.x, pos.y, pos.z, 0, 0, 0, type, true); } f32 func_808396F4(PlayState* play, Player* this, Vec3f* arg2, Vec3f* arg3, CollisionPoly** arg4, s32* arg5) { - func_808395DC(this, &this->actor.world.pos, arg2, arg3); + Player_GetRelativePosition(this, &this->actor.world.pos, arg2, arg3); return BgCheck_EntityRaycastFloor3(&play->colCtx, arg4, arg5, arg3); } @@ -4391,17 +4688,24 @@ f32 func_8083973C(PlayState* play, Player* this, Vec3f* arg2, Vec3f* arg3) { return func_808396F4(play, this, arg2, arg3, &sp24, &sp20); } -s32 func_80839768(PlayState* play, Player* this, Vec3f* arg2, CollisionPoly** arg3, s32* arg4, Vec3f* arg5) { - Vec3f sp44; - Vec3f sp38; +/** + * Checks if a line between the player's position and the provided `offset` intersect a wall. + * + * Point A of the line is at player's world position offset by the height provided in `offset`. + * Point B of the line is at player's world position offset by the entire `offset` vector. + * Point A and B are always at the same height, meaning this is a horizontal line test. + */ +s32 Player_PosVsWallLineTest(PlayState* play, Player* this, Vec3f* offset, CollisionPoly** wallPoly, s32* bgId, Vec3f* posResult) { + Vec3f posA; + Vec3f posB; - sp44.x = this->actor.world.pos.x; - sp44.y = this->actor.world.pos.y + arg2->y; - sp44.z = this->actor.world.pos.z; + posA.x = this->actor.world.pos.x; + posA.y = this->actor.world.pos.y + offset->y; + posA.z = this->actor.world.pos.z; - func_808395DC(this, &this->actor.world.pos, arg2, &sp38); + Player_GetRelativePosition(this, &this->actor.world.pos, offset, &posB); - return BgCheck_EntityLineTest1(&play->colCtx, &sp44, &sp38, arg5, arg3, true, false, false, true, arg4); + return BgCheck_EntityLineTest1(&play->colCtx, &posA, &posB, posResult, wallPoly, true, false, false, true, bgId); } s32 func_80839800(Player* this, PlayState* play) { @@ -4423,7 +4727,7 @@ s32 func_80839800(Player* this, PlayState* play) { (!(this->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) || ((this->heldActor != NULL) && (this->heldActor->id == ACTOR_EN_RU1)))) { // Disable doors in Boss Rush so the player can't leave the boss rooms backwards. - if ((CHECK_BTN_ALL(sControlInput->press.button, BTN_A) || (func_8084F9A0 == this->func_674)) && !IS_BOSS_RUSH) { + if ((CHECK_BTN_ALL(sControlInput->press.button, BTN_A) || (func_8084F9A0 == this->actionFunc)) && !IS_BOSS_RUSH) { doorActor = this->doorActor; if (this->doorType <= PLAYER_DOORTYPE_AJAR) { @@ -4465,7 +4769,7 @@ s32 func_80839800(Player* this, PlayState* play) { if (this->doorTimer != 0) { this->unk_850 = 0; - func_80832B0C(play, this, func_80833338(this)); + Player_AnimChangeOnceMorph(play, this, func_80833338(this)); this->skelAnime.endFrame = 0.0f; } else { this->linearVelocity = 0.1f; @@ -4488,16 +4792,16 @@ s32 func_80839800(Player* this, PlayState* play) { : (LINK_IS_ADULT ? KNOB_ANIM_ADULT_R : KNOB_ANIM_CHILD_R); if (door->animStyle == KNOB_ANIM_ADULT_L) { - sp5C = D_80853914[PLAYER_ANIMGROUP_doorA_free][this->modelAnimType]; + sp5C = GET_PLAYER_ANIM(PLAYER_ANIMGROUP_doorA_free, this->modelAnimType); } else if (door->animStyle == KNOB_ANIM_CHILD_L) { - sp5C = D_80853914[PLAYER_ANIMGROUP_doorA][this->modelAnimType]; + sp5C = GET_PLAYER_ANIM(PLAYER_ANIMGROUP_doorA, this->modelAnimType); } else if (door->animStyle == KNOB_ANIM_ADULT_R) { - sp5C = D_80853914[PLAYER_ANIMGROUP_doorB_free][this->modelAnimType]; + sp5C = GET_PLAYER_ANIM(PLAYER_ANIMGROUP_doorB_free, this->modelAnimType); } else { - sp5C = D_80853914[PLAYER_ANIMGROUP_doorB][this->modelAnimType]; + sp5C = GET_PLAYER_ANIM(PLAYER_ANIMGROUP_doorB, this->modelAnimType); } - func_80835C58(play, this, func_80845EF8, 0); + Player_SetupAction(play, this, func_80845EF8, 0); func_80832528(play, this); if (doorDirection < 0) { @@ -4519,7 +4823,7 @@ s32 func_80839800(Player* this, PlayState* play) { } func_80832224(this); - func_80832F54(play, this, 0x28F); + Player_AnimReplaceApplyFlags(play, this, 0x28F); if (doorActor->parent != NULL) { doorDirection = -doorDirection; @@ -4538,7 +4842,7 @@ s32 func_80839800(Player* this, PlayState* play) { BgCheck_EntityRaycastFloor1(&play->colCtx, &sp58, &sp4C); - if (func_80839034(play, this, sp58, BGCHECK_SCENE)) { + if (Player_HandleExitsAndVoids(play, this, sp58, BGCHECK_SCENE)) { gSaveContext.entranceSpeed = 2.0f; gSaveContext.entranceSound = NA_SE_OC_DOOR_OPEN; } @@ -4578,7 +4882,7 @@ s32 func_80839800(Player* this, PlayState* play) { void func_80839E88(Player* this, PlayState* play) { LinkAnimationHeader* anim; - func_80835C58(play, this, func_80840450, 1); + Player_SetupAction(play, this, func_80840450, 1); if (this->unk_870 < 0.5f) { anim = func_808334E4(this); @@ -4589,13 +4893,13 @@ void func_80839E88(Player* this, PlayState* play) { } this->unk_874 = this->unk_870; - func_80832284(play, this, anim); + Player_AnimPlayLoop(play, this, anim); this->currentYaw = this->actor.shape.rot.y; } void func_80839F30(Player* this, PlayState* play) { - func_80835C58(play, this, func_808407CC, 1); - func_80832B0C(play, this, func_80833338(this)); + Player_SetupAction(play, this, func_808407CC, 1); + Player_AnimChangeOnceMorph(play, this, func_80833338(this)); this->currentYaw = this->actor.shape.rot.y; } @@ -4610,17 +4914,17 @@ void func_80839F90(Player* this, PlayState* play) { } void func_80839FFC(Player* this, PlayState* play) { - PlayerFunc674 func; + PlayerActionFunc actionFunc; if (func_8008E9C4(this)) { - func = func_80840450; + actionFunc = func_80840450; } else if (func_80833B2C(this)) { - func = func_808407CC; + actionFunc = func_808407CC; } else { - func = func_80840BC8; + actionFunc = func_80840BC8; } - func_80835C58(play, this, func, 1); + Player_SetupAction(play, this, actionFunc, 1); } void func_8083A060(Player* this, PlayState* play) { @@ -4646,22 +4950,22 @@ void func_8083A0F4(PlayState* play, Player* this) { if (interactActorId == ACTOR_BG_TOKI_SWD) { this->interactRangeActor->parent = &this->actor; - func_80835C58(play, this, func_8084F608, 0); + Player_SetupAction(play, this, func_8084F608, 0); this->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE; sMaskMemory = PLAYER_MASK_NONE; } else { LinkAnimationHeader* anim; if (interactActorId == ACTOR_BG_HEAVY_BLOCK) { - func_80835C58(play, this, func_80846120, 0); + Player_SetupAction(play, this, func_80846120, 0); this->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE; anim = &gPlayerAnim_link_normal_heavy_carry; } else if ((interactActorId == ACTOR_EN_ISHI) && ((interactRangeActor->params & 0xF) == 1)) { - func_80835C58(play, this, func_80846260, 0); + Player_SetupAction(play, this, func_80846260, 0); anim = &gPlayerAnim_link_silver_carry; } else if (((interactActorId == ACTOR_EN_BOMBF) || (interactActorId == ACTOR_EN_KUSA)) && (Player_GetStrength() <= PLAYER_STR_NONE)) { - func_80835C58(play, this, func_80846408, 0); + Player_SetupAction(play, this, func_80846408, 0); this->actor.world.pos.x = (Math_SinS(interactRangeActor->yawTowardsPlayer) * 20.0f) + interactRangeActor->world.pos.x; this->actor.world.pos.z = @@ -4669,8 +4973,8 @@ void func_8083A0F4(PlayState* play, Player* this) { this->currentYaw = this->actor.shape.rot.y = interactRangeActor->yawTowardsPlayer + 0x8000; anim = &gPlayerAnim_link_normal_nocarry_free; } else { - func_80835C58(play, this, func_80846050, 0); - anim = D_80853914[PLAYER_ANIMGROUP_carryB][this->modelAnimType]; + Player_SetupAction(play, this, func_80846050, 0); + anim = GET_PLAYER_ANIM(PLAYER_ANIMGROUP_carryB, this->modelAnimType); } // Same actor is used for small and large silver rocks, use actor params to identify large ones @@ -4703,7 +5007,7 @@ void func_8083A360(PlayState* play, Player* this) { } void func_8083A388(PlayState* play, Player* this) { - func_80835C58(play, this, func_8084B78C, 0); + Player_SetupAction(play, this, func_8084B78C, 0); } void func_8083A3B0(PlayState* play, Player* this) { @@ -4761,20 +5065,20 @@ s32 func_8083A4A8(Player* this, PlayState* play) { return 1; } -void func_8083A5C4(PlayState* play, Player* this, CollisionPoly* arg2, f32 arg3, LinkAnimationHeader* arg4) { - f32 sp24 = COLPOLY_GET_NORMAL(arg2->normal.x); - f32 sp20 = COLPOLY_GET_NORMAL(arg2->normal.z); +void func_8083A5C4(PlayState* play, Player* this, CollisionPoly* arg2, f32 arg3, LinkAnimationHeader* anim) { + f32 nx = COLPOLY_GET_NORMAL(arg2->normal.x); + f32 nz = COLPOLY_GET_NORMAL(arg2->normal.z); - func_80835C58(play, this, func_8084BBE4, 0); + Player_SetupAction(play, this, func_8084BBE4, 0); func_80832564(play, this); - func_80832264(play, this, arg4); + Player_AnimPlayOnce(play, this, anim); - this->actor.world.pos.x -= (arg3 + 1.0f) * sp24; - this->actor.world.pos.z -= (arg3 + 1.0f) * sp20; - this->actor.shape.rot.y = this->currentYaw = Math_Atan2S(sp20, sp24); + this->actor.world.pos.x -= (arg3 + 1.0f) * nx; + this->actor.world.pos.z -= (arg3 + 1.0f) * nz; + this->actor.shape.rot.y = this->currentYaw = Math_Atan2S(nz, nx); func_80832224(this); - func_80832CFC(this); + Player_SkelAnimeResetPrevTranslRot(this); } s32 func_8083A6AC(Player* this, PlayState* play) { @@ -4784,7 +5088,10 @@ s32 func_8083A6AC(Player* this, PlayState* play) { Vec3f sp68; f32 temp1; - if ((this->actor.yDistToWater < -80.0f) && (ABS(this->unk_898) < 2730) && (ABS(this->unk_89A) < 2730)) { + //! @bug `floorPitch` and `floorPitchAlt` are cleared to 0 before this function is called, because the player + //! left the ground. The angles will always be zero and therefore will always pass these checks. + //! The intention seems to be to prevent ledge hanging or vine grabbing when walking off of a steep enough slope. + if ((this->actor.yDistToWater < -80.0f) && (ABS(this->floorPitch) < 2730) && (ABS(this->floorPitchAlt) < 2730)) { sp74.x = this->actor.prevPos.x - this->actor.world.pos.x; sp74.z = this->actor.prevPos.z - this->actor.world.pos.z; @@ -4810,7 +5117,7 @@ s32 func_8083A6AC(Player* this, PlayState* play) { sp54 = Math3D_UDistPlaneToPos(nx, ny, nz, sp84->dist, &this->actor.world.pos); - sp50 = D_80853604 == 6; + sp50 = sPrevFloorProperty == 6; if (!sp50 && (func_80041DB8(&play->colCtx, sp84, sp80) & 8)) { sp50 = 1; } @@ -4825,7 +5132,7 @@ s32 func_8083A6AC(Player* this, PlayState* play) { this->actor.shape.rot.y = this->currentYaw; this->stateFlags1 |= PLAYER_STATE1_CLIMBING_LADDER; - func_80832F54(play, this, 0x9F); + Player_AnimReplaceApplyFlags(play, this, 0x9F); this->unk_850 = -1; this->unk_84F = sp50; @@ -4844,7 +5151,7 @@ s32 func_8083A6AC(Player* this, PlayState* play) { } void func_8083A9B8(Player* this, LinkAnimationHeader* anim, PlayState* play) { - func_80835C58(play, this, func_8084BDFC, 0); + Player_SetupAction(play, this, func_8084BDFC, 0); LinkAnimation_PlayOnceSetSpeed(play, &this->skelAnime, anim, 1.3f); } @@ -4863,16 +5170,16 @@ void func_8083AA10(Player* this, PlayState* play) { if (!(this->stateFlags1 & (PLAYER_STATE1_IN_WATER | PLAYER_STATE1_IN_CUTSCENE)) && !(this->actor.bgCheckFlags & 1)) { if (!func_80838FB8(play, this)) { - if (D_80853604 == 8) { + if (sPrevFloorProperty == 8) { this->actor.world.pos.x = this->actor.prevPos.x; this->actor.world.pos.z = this->actor.prevPos.z; return; } if (!(this->stateFlags3 & PLAYER_STATE3_MIDAIR) && !(this->skelAnime.moveFlags & 0x80) && - (func_8084411C != this->func_674) && (func_80844A44 != this->func_674)) { + (func_8084411C != this->actionFunc) && (func_80844A44 != this->actionFunc)) { - if ((D_80853604 == 7) || (this->meleeWeaponState != 0)) { + if ((sPrevFloorProperty == 7) || (this->meleeWeaponState != 0)) { Math_Vec3f_Copy(&this->actor.world.pos, &this->actor.prevPos); Player_ZeroSpeedXZ(this); return; @@ -4880,22 +5187,22 @@ void func_8083AA10(Player* this, PlayState* play) { if (this->hoverBootsTimer != 0) { this->actor.velocity.y = 1.0f; - D_80853604 = 9; + sPrevFloorProperty = 9; return; } sp5C = (s16)(this->currentYaw - this->actor.shape.rot.y); - func_80835C58(play, this, func_8084411C, 1); + Player_SetupAction(play, this, func_8084411C, 1); func_80832440(play, this); - this->unk_89E = this->unk_A82; + this->floorSfxOffset = this->unk_A82; - if ((this->actor.bgCheckFlags & 4) && !(this->stateFlags1 & PLAYER_STATE1_IN_WATER) && (D_80853604 != 6) && - (D_80853604 != 9) && (D_80853600 > 20.0f) && (this->meleeWeaponState == 0) && (ABS(sp5C) < 0x2000) && + if ((this->actor.bgCheckFlags & 4) && !(this->stateFlags1 & PLAYER_STATE1_IN_WATER) && (sPrevFloorProperty != 6) && + (sPrevFloorProperty != 9) && (sYDistToFloor > 20.0f) && (this->meleeWeaponState == 0) && (ABS(sp5C) < 0x2000) && (this->linearVelocity > 3.0f)) { - if ((D_80853604 == 11) && !(this->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD)) { + if ((sPrevFloorProperty == 11) && !(this->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD)) { sp40 = func_808396F4(play, this, &D_8085451C, &sp44, &sp58, &sp54); sp3C = this->actor.world.pos.y; @@ -4903,7 +5210,7 @@ void func_8083AA10(Player* this, PlayState* play) { if (WaterBox_GetSurface1(play, &play->colCtx, sp44.x, sp44.z, &sp3C, &sp50) && ((sp3C - sp40) > 50.0f)) { func_808389E8(this, &gPlayerAnim_link_normal_run_jump_water_fall, 6.0f, play); - func_80835C58(play, this, func_80844A44, 0); + Player_SetupAction(play, this, func_80844A44, 0); return; } } @@ -4912,9 +5219,9 @@ void func_8083AA10(Player* this, PlayState* play) { return; } - if ((D_80853604 == 9) || (D_80853600 <= this->ageProperties->unk_34) || + if ((sPrevFloorProperty == 9) || (sYDistToFloor <= this->ageProperties->unk_34) || !func_8083A6AC(this, play)) { - func_80832284(play, this, &gPlayerAnim_link_normal_landing_wait); + Player_AnimPlayLoop(play, this, &gPlayerAnim_link_normal_landing_wait); return; } } @@ -4946,9 +5253,16 @@ s32 func_8083AD4C(PlayState* play, Player* this) { return Camera_ChangeMode(Play_GetCamera(play, 0), cameraMode); } -s32 func_8083ADD4(PlayState* play, Player* this) { +/** + * If appropriate, setup action for performing a `csAction` + * + * @return true if a `csAction` is started, false if not + */ +s32 Player_StartCsAction(PlayState* play, Player* this) { + // unk_6AD will get set to 3 in `Player_UpdateCommon` if `this->csAction` is non-zero + // (with a special case for `PLAYER_CSACTION_7`) if (this->unk_6AD == 3) { - func_80835C58(play, this, func_80852E14, 0); + Player_SetupAction(play, this, func_80852E14, 0); if (this->doorBgCamIndex != 0) { this->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE; } @@ -4982,6 +5296,14 @@ void func_8083AF44(PlayState* play, Player* this, s32 magicSpell) { func_80835DE4(play, this, func_808507F4, 0); this->unk_84F = magicSpell - 3; + + //! @bug `MAGIC_CONSUME_WAIT_PREVIEW` is not guaranteed to succeed. + //! Ideally, the return value of `Magic_RequestChange` should be checked before allowing the process of + //! using a spell to continue. If the magic state change request fails, `gSaveContext.magicTarget` will + //! never be set correctly. + //! When `MAGIC_STATE_CONSUME_SETUP` is set in `Player_Action_808507F4`, magic will eventually be + //! consumed to a stale target value. If that stale target value is higher than the current + //! magic value, it will be consumed to zero. Magic_RequestChange(play, sMagicSpellCosts[magicSpell], MAGIC_CONSUME_WAIT_PREVIEW); u8 isFastFarores = CVarGetInteger("gFastFarores", 0) && this->itemAction == PLAYER_IA_FARORES_WIND; @@ -5030,16 +5352,16 @@ s32 func_8083B040(Player* this, PlayState* play) { if ((this->unk_6AD != 0) && (func_808332B8(this) || (this->actor.bgCheckFlags & 1) || (this->stateFlags1 & PLAYER_STATE1_ON_HORSE))) { - if (!func_8083ADD4(play, this)) { + if (!Player_StartCsAction(play, this)) { if (this->unk_6AD == 4) { sp2C = Player_ActionToMagicSpell(this, this->itemAction); if (sp2C >= 0) { if ((sp2C != 3) || (gSaveContext.respawn[RESPAWN_MODE_TOP].data <= 0)) { func_8083AF44(play, this, sp2C); } else { - func_80835C58(play, this, func_8085063C, 1); + Player_SetupAction(play, this, func_8085063C, 1); this->stateFlags1 |= PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE; - func_80832264(play, this, func_80833338(this)); + Player_AnimPlayOnce(play, this, func_80833338(this)); func_80835EA4(play, 4); } @@ -5108,9 +5430,9 @@ s32 func_8083B040(Player* this, PlayState* play) { this->exchangeItemId = sp2C; if (this->unk_84F < 0) { - func_80832B0C(play, this, D_80853914[PLAYER_ANIMGROUP_check][this->modelAnimType]); + Player_AnimChangeOnceMorph(play, this, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_check, this->modelAnimType)); } else { - func_80832264(play, this, D_80854548[this->unk_84F]); + Player_AnimPlayOnce(play, this, D_80854548[this->unk_84F]); } func_80832224(this); @@ -5122,20 +5444,20 @@ s32 func_8083B040(Player* this, PlayState* play) { if (sp2C >= 0) { if (sp2C == 0xC) { func_80835DE4(play, this, func_8084EED8, 0); - func_808322D0(play, this, &gPlayerAnim_link_bottle_bug_out); + Player_AnimPlayOnceAdjusted(play, this, &gPlayerAnim_link_bottle_bug_out); func_80835EA4(play, 3); } else if ((sp2C > 0) && (sp2C < 4)) { func_80835DE4(play, this, func_8084EFC0, 0); - func_808322D0(play, this, &gPlayerAnim_link_bottle_fish_out); + Player_AnimPlayOnceAdjusted(play, this, &gPlayerAnim_link_bottle_fish_out); func_80835EA4(play, (sp2C == 1) ? 1 : 5); } else { func_80835DE4(play, this, func_8084EAC0, 0); - func_80832B78(play, this, &gPlayerAnim_link_bottle_drink_demo_start); + Player_AnimChangeOnceMorphAdjusted(play, this, &gPlayerAnim_link_bottle_drink_demo_start); func_80835EA4(play, 2); } } else { func_80835DE4(play, this, func_8084E3C4, 0); - func_808322D0(play, this, &gPlayerAnim_link_normal_okarina_start); + Player_AnimPlayOnceAdjusted(play, this, &gPlayerAnim_link_normal_okarina_start); this->stateFlags2 |= PLAYER_STATE2_OCARINA_PLAYING; func_80835EA4(play, (this->unk_6A8 != NULL) ? 0x5B : 0x5A); if (this->unk_6A8 != NULL) { @@ -5145,7 +5467,7 @@ s32 func_8083B040(Player* this, PlayState* play) { } } else if (func_8083AD4C(play, this)) { if (!(this->stateFlags1 & PLAYER_STATE1_ON_HORSE)) { - func_80835C58(play, this, func_8084B1D8, 1); + Player_SetupAction(play, this, func_8084B1D8, 1); this->unk_850 = 13; func_8083B010(this); } @@ -5278,7 +5600,7 @@ s32 func_8083B998(Player* this, PlayState* play) { void func_8083BA90(PlayState* play, Player* this, s32 arg2, f32 xzVelocity, f32 yVelocity) { func_80837948(play, this, arg2); - func_80835C58(play, this, func_80844AF4, 0); + Player_SetupAction(play, this, func_80844AF4, 0); this->stateFlags3 |= PLAYER_STATE3_MIDAIR; @@ -5295,7 +5617,7 @@ void func_8083BA90(PlayState* play, Player* this, s32 arg2, f32 xzVelocity, f32 s32 func_8083BB20(Player* this) { if (!(this->stateFlags1 & PLAYER_STATE1_SHIELDING) && (Player_GetMeleeWeaponHeld(this) != 0)) { - if (D_80853614 || + if (sUseHeldItem || ((this->actor.category != ACTORCAT_PLAYER) && CHECK_BTN_ALL(sControlInput->press.button, BTN_B))) { return 1; } @@ -5305,8 +5627,8 @@ s32 func_8083BB20(Player* this) { } s32 func_8083BBA0(Player* this, PlayState* play) { - if (func_8083BB20(this) && (D_808535E4 != 7)) { - func_8083BA90(play, this, 17, 3.0f, 4.5f); + if (func_8083BB20(this) && (sFloorType != 7)) { + func_8083BA90(play, this, PLAYER_MWA_JUMPSLASH_START, 3.0f, 4.5f); return 1; } @@ -5314,14 +5636,14 @@ s32 func_8083BBA0(Player* this, PlayState* play) { } void func_8083BC04(Player* this, PlayState* play) { - func_80835C58(play, this, func_80844708, 0); - LinkAnimation_PlayOnceSetSpeed(play, &this->skelAnime, D_80853914[PLAYER_ANIMGROUP_landing_roll][this->modelAnimType], + Player_SetupAction(play, this, func_80844708, 0); + LinkAnimation_PlayOnceSetSpeed(play, &this->skelAnime, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_landing_roll, this->modelAnimType), 1.25f * D_808535E8); gSaveContext.sohStats.count[COUNT_ROLLS]++; } s32 func_8083BC7C(Player* this, PlayState* play) { - if ((this->unk_84B[this->unk_846] == 0) && (D_808535E4 != 7)) { + if ((this->unk_84B[this->unk_846] == 0) && (sFloorType != 7)) { func_8083BC04(this, play); return 1; } @@ -5349,7 +5671,7 @@ s32 func_8083BDBC(Player* this, PlayState* play) { s32 sp2C; if (CHECK_BTN_ALL(sControlInput->press.button, BTN_A) && - (play->roomCtx.curRoom.behaviorType1 != ROOM_BEHAVIOR_TYPE1_2) && (D_808535E4 != 7) && + (play->roomCtx.curRoom.behaviorType1 != ROOM_BEHAVIOR_TYPE1_2) && (sFloorType != 7) && (SurfaceType_GetSlope(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId) != 1)) { sp2C = this->unk_84B[this->unk_846]; @@ -5362,8 +5684,8 @@ s32 func_8083BDBC(Player* this, PlayState* play) { func_8083BC04(this, play); } } else { - if (Player_GetMeleeWeaponHeld(this) && func_808365C8(this)) { - func_8083BA90(play, this, 17, 5.0f, 5.0f); + if (Player_GetMeleeWeaponHeld(this) && Player_CanUpdateItems(this)) { + func_8083BA90(play, this, PLAYER_MWA_JUMPSLASH_START, 5.0f, 5.0f); } else { func_8083BC04(this, play); } @@ -5396,14 +5718,14 @@ void func_8083BF50(Player* this, PlayState* play) { } if (sp30 < 14.0f) { - anim = D_80853914[PLAYER_ANIMGROUP_walk_endL][this->modelAnimType]; + anim = GET_PLAYER_ANIM(PLAYER_ANIMGROUP_walk_endL, this->modelAnimType); sp30 = 11.0f - sp30; if (sp30 < 0.0f) { sp30 = 1.375f * -sp30; } sp30 /= 11.0f; } else { - anim = D_80853914[PLAYER_ANIMGROUP_walk_endR][this->modelAnimType]; + anim = GET_PLAYER_ANIM(PLAYER_ANIMGROUP_walk_endR, this->modelAnimType); sp30 = 26.0f - sp30; if (sp30 < 0.0f) { sp30 = 2 * -sp30; @@ -5422,8 +5744,8 @@ void func_8083C0B8(Player* this, PlayState* play) { } void func_8083C0E8(Player* this, PlayState* play) { - func_80835C58(play, this, func_80840BC8, 1); - func_80832264(play, this, func_80833338(this)); + Player_SetupAction(play, this, func_80840BC8, 1); + Player_AnimPlayOnce(play, this, func_80833338(this)); this->currentYaw = this->actor.shape.rot.y; } @@ -5450,7 +5772,7 @@ s32 func_8083C1DC(Player* this, PlayState* play) { return 1; } if ((this->unk_837 == 0) && (this->heldItemAction >= PLAYER_IA_SWORD_MASTER)) { - func_80835F44(play, this, ITEM_NONE); + Player_UseItem(play, this, ITEM_NONE); } else { this->stateFlags2 ^= PLAYER_STATE2_NAVI_OUT; } @@ -5468,14 +5790,14 @@ s32 func_8083C2B0(Player* this, PlayState* play) { (Player_IsChildWithHylianShield(this) || (!func_80833B2C(this) && (this->unk_664 == NULL)))) { func_80832318(this); - func_808323B4(play, this); + Player_DetachHeldActor(play, this); - if (func_80835C58(play, this, func_80843188, 0)) { + if (Player_SetupAction(play, this, func_80843188, 0)) { this->stateFlags1 |= PLAYER_STATE1_SHIELDING; if (!Player_IsChildWithHylianShield(this)) { Player_SetModelsForHoldingShield(this); - anim = D_80853914[PLAYER_ANIMGROUP_defense][this->modelAnimType]; + anim = GET_PLAYER_ANIM(PLAYER_ANIMGROUP_defense, this->modelAnimType); } else { anim = &gPlayerAnim_clink_normal_defense_ALL; } @@ -5494,7 +5816,7 @@ s32 func_8083C2B0(Player* this, PlayState* play) { LinkAnimation_Change(play, &this->skelAnime, anim, 1.0f, frame, frame, ANIMMODE_ONCE, 0.0f); if (Player_IsChildWithHylianShield(this)) { - func_80832F54(play, this, 4); + Player_AnimReplaceApplyFlags(play, this, 4); } Player_PlaySfx(&this->actor, NA_SE_IT_SHIELD_POSTURE); @@ -5546,8 +5868,8 @@ s32 func_8083C544(Player* this, PlayState* play) { s32 func_8083C61C(PlayState* play, Player* this) { if ((play->roomCtx.curRoom.behaviorType1 != ROOM_BEHAVIOR_TYPE1_2) && (this->actor.bgCheckFlags & 1) && (AMMO(ITEM_NUT) != 0)) { - func_80835C58(play, this, func_8084E604, 0); - func_80832264(play, this, &gPlayerAnim_link_normal_light_bom); + Player_SetupAction(play, this, func_8084E604, 0); + Player_AnimPlayOnce(play, this, &gPlayerAnim_link_normal_light_bom); this->unk_6AD = 0; return 1; } @@ -5563,15 +5885,15 @@ static struct_80854554 D_80854554[] = { s32 func_8083C6B8(PlayState* play, Player* this) { Vec3f sp24; - if (D_80853614) { + if (sUseHeldItem) { if (Player_GetBottleHeld(this) >= 0) { - func_80835C58(play, this, func_8084ECA4, 0); + Player_SetupAction(play, this, func_8084ECA4, 0); if (this->actor.yDistToWater > 12.0f) { this->unk_850 = 1; } - func_808322D0(play, this, D_80854554[this->unk_850].unk_00); + Player_AnimPlayOnceAdjusted(play, this, D_80854554[this->unk_850].unk_00); Player_PlaySfx(&this->actor, NA_SE_IT_SWORD_SWING); func_80832698(this, NA_SE_VO_LI_AUTO_JUMP); @@ -5590,10 +5912,10 @@ s32 func_8083C6B8(PlayState* play, Player* this) { return 0; } - func_80835C58(play, this, func_80850C68, 0); + Player_SetupAction(play, this, func_80850C68, 0); this->unk_860 = 1; Player_ZeroSpeedXZ(this); - func_80832264(play, this, &gPlayerAnim_link_fishing_throw); + Player_AnimPlayOnce(play, this, &gPlayerAnim_link_fishing_throw); return 1; } else { return 0; @@ -5604,16 +5926,16 @@ s32 func_8083C6B8(PlayState* play, Player* this) { } void func_8083C858(Player* this, PlayState* play) { - PlayerFunc674 func; + PlayerActionFunc actionFunc; if (func_80833BCC(this)) { - func = func_8084227C; + actionFunc = func_8084227C; } else { - func = func_80842180; + actionFunc = func_80842180; } - func_80835C58(play, this, func, 1); - func_80832BE8(play, this, D_80853914[PLAYER_ANIMGROUP_run][this->modelAnimType]); + Player_SetupAction(play, this, actionFunc, 1); + Player_AnimChangeLoopMorph(play, this, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_run, this->modelAnimType)); this->unk_89C = 0; this->unk_864 = this->unk_868 = 0.0f; @@ -5633,8 +5955,8 @@ s32 func_8083C910(PlayState* play, Player* this, f32 arg2) { &sp2C) != 0) { sp28 -= this->actor.world.pos.y; if (this->ageProperties->unk_24 <= sp28) { - func_80835C58(play, this, func_8084D7C4, 0); - func_80832C6C(play, this, &gPlayerAnim_link_swimer_swim); + Player_SetupAction(play, this, func_8084D7C4, 0); + Player_AnimChangeLoopSlowMorph(play, this, &gPlayerAnim_link_swimer_swim); this->stateFlags1 |= PLAYER_STATE1_IN_WATER | PLAYER_STATE1_IN_CUTSCENE; this->unk_850 = 20; this->linearVelocity = 2.0f; @@ -5678,19 +6000,19 @@ void func_8083CA9C(PlayState* play, Player* this) { } void func_8083CB2C(Player* this, s16 yaw, PlayState* play) { - func_80835C58(play, this, func_808414F8, 1); + Player_SetupAction(play, this, func_808414F8, 1); LinkAnimation_CopyJointToMorph(play, &this->skelAnime); this->unk_864 = this->unk_868 = 0.0f; this->currentYaw = yaw; } void func_8083CB94(Player* this, PlayState* play) { - func_80835C58(play, this, func_80840DE4, 1); - func_80832BE8(play, this, D_80853914[PLAYER_ANIMGROUP_walk][this->modelAnimType]); + Player_SetupAction(play, this, func_80840DE4, 1); + Player_AnimChangeLoopMorph(play, this, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_walk, this->modelAnimType)); } void func_8083CBF0(Player* this, s16 yaw, PlayState* play) { - func_80835C58(play, this, func_808423EC, 1); + Player_SetupAction(play, this, func_808423EC, 1); LinkAnimation_Change(play, &this->skelAnime, &gPlayerAnim_link_anchor_back_walk, 2.2f, 0.0f, Animation_GetLastFrame(&gPlayerAnim_link_anchor_back_walk), ANIMMODE_ONCE, -6.0f); this->linearVelocity = 8.0f; @@ -5698,19 +6020,19 @@ void func_8083CBF0(Player* this, s16 yaw, PlayState* play) { } void func_8083CC9C(Player* this, PlayState* play) { - func_80835C58(play, this, func_8084193C, 1); - func_80832BE8(play, this, D_80853914[PLAYER_ANIMGROUP_side_walkR][this->modelAnimType]); + Player_SetupAction(play, this, func_8084193C, 1); + Player_AnimChangeLoopMorph(play, this, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_side_walkR, this->modelAnimType)); this->unk_868 = 0.0f; } void func_8083CD00(Player* this, PlayState* play) { - func_80835C58(play, this, func_8084251C, 1); + Player_SetupAction(play, this, func_8084251C, 1); LinkAnimation_PlayOnceSetSpeed(play, &this->skelAnime, &gPlayerAnim_link_anchor_back_brake, 2.0f); } void func_8083CD54(PlayState* play, Player* this, s16 yaw) { this->currentYaw = yaw; - func_80835C58(play, this, func_80841BA8, 1); + Player_SetupAction(play, this, func_80841BA8, 1); this->unk_87E = 1200; this->unk_87E *= D_808535E8; LinkAnimation_Change(play, &this->skelAnime, D_80853914[PLAYER_ANIMGROUP_45_turn][this->modelAnimType], 1.0f, 0.0f, @@ -5720,21 +6042,21 @@ void func_8083CD54(PlayState* play, Player* this, s16 yaw) { void func_8083CE0C(Player* this, PlayState* play) { LinkAnimationHeader* anim; - func_80835C58(play, this, func_80840BC8, 1); + Player_SetupAction(play, this, func_80840BC8, 1); if (this->unk_870 < 0.5f) { anim = D_80853914[PLAYER_ANIMGROUP_waitR2wait][this->modelAnimType]; } else { anim = D_80853914[PLAYER_ANIMGROUP_waitL2wait][this->modelAnimType]; } - func_80832264(play, this, anim); + Player_AnimPlayOnce(play, this, anim); this->currentYaw = this->actor.shape.rot.y; } void func_8083CEAC(Player* this, PlayState* play) { - func_80835C58(play, this, func_80840450, 1); - func_80832B0C(play, this, D_80853914[PLAYER_ANIMGROUP_wait2waitR][this->modelAnimType]); + Player_SetupAction(play, this, func_80840450, 1); + Player_AnimChangeOnceMorph(play, this, D_80853914[PLAYER_ANIMGROUP_wait2waitR][this->modelAnimType]); this->unk_850 = 1; } @@ -5795,8 +6117,8 @@ s32 func_8083D12C(PlayState* play, Player* this, Input* arg2) { if ((arg2 == NULL) || (CHECK_BTN_ALL(arg2->press.button, BTN_A) && (ABS(this->unk_6C2) < 12000) && (this->currentBoots != PLAYER_BOOTS_IRON))) { - func_80835C58(play, this, func_8084DC48, 0); - func_80832264(play, this, &gPlayerAnim_link_swimer_swim_deep_start); + Player_SetupAction(play, this, func_8084DC48, 0); + Player_AnimPlayOnce(play, this, &gPlayerAnim_link_swimer_swim_deep_start); this->unk_6C2 = 0; this->stateFlags2 |= PLAYER_STATE2_UNDERWATER; @@ -5818,7 +6140,7 @@ s32 func_8083D12C(PlayState* play, Player* this, Input* arg2) { this->stateFlags2 &= ~PLAYER_STATE2_UNDERWATER; if (arg2 != NULL) { - func_80835C58(play, this, func_8084E1EC, 1); + Player_SetupAction(play, this, func_8084E1EC, 1); if (this->stateFlags1 & PLAYER_STATE1_GETTING_ITEM) { this->stateFlags1 |= PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_ITEM_OVER_HEAD | PLAYER_STATE1_IN_CUTSCENE; @@ -5828,9 +6150,16 @@ s32 func_8083D12C(PlayState* play, Player* this, Input* arg2) { } func_80832340(play, this); - func_80832B0C(play, this, - (this->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) ? &gPlayerAnim_link_swimer_swim_get - : &gPlayerAnim_link_swimer_swim_deep_end); + // Skip take breath animation on surface if Link didn't grab an item while underwater and the setting is enabled + if (CVarGetInteger("gSkipSwimDeepEndAnim", 0) && !(this->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD)) { + auto lastAnimFrame = Animation_GetLastFrame(&gPlayerAnim_link_swimer_swim_deep_end); + LinkAnimation_Change(play, &this->skelAnime, &gPlayerAnim_link_swimer_swim_deep_end, 1.0f, + lastAnimFrame, lastAnimFrame, ANIMMODE_ONCE, -6.0f); + } else { + Player_AnimChangeOnceMorph(play, this, + (this->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) ? &gPlayerAnim_link_swimer_swim_get + : &gPlayerAnim_link_swimer_swim_deep_end); + } if (func_8083CFA8(play, this, this->actor.velocity.y, 500)) { Player_PlaySfx(&this->actor, NA_SE_PL_FACE_UP); @@ -5845,7 +6174,7 @@ s32 func_8083D12C(PlayState* play, Player* this, Input* arg2) { } void func_8083D330(PlayState* play, Player* this) { - func_80832284(play, this, &gPlayerAnim_link_swimer_swim); + Player_AnimPlayLoop(play, this, &gPlayerAnim_link_swimer_swim); this->unk_6C2 = 16000; this->unk_850 = 1; } @@ -5858,12 +6187,12 @@ void func_8083D36C(PlayState* play, Player* this) { this->stateFlags2 &= ~PLAYER_STATE2_UNDERWATER; func_8083D12C(play, this, 0); this->unk_84F = 1; - } else if (func_80844A44 == this->func_674) { - func_80835C58(play, this, func_8084DC48, 0); + } else if (func_80844A44 == this->actionFunc) { + Player_SetupAction(play, this, func_8084DC48, 0); func_8083D330(play, this); } else { - func_80835C58(play, this, func_8084D610, 1); - func_80832B0C(play, this, + Player_SetupAction(play, this, func_8084D610, 1); + Player_AnimChangeOnceMorph(play, this, (this->actor.bgCheckFlags & 1) ? &gPlayerAnim_link_swimer_wait2swim_wait : &gPlayerAnim_link_swimer_land2swim_wait); } @@ -5890,22 +6219,22 @@ void func_8083D36C(PlayState* play, Player* this) { void func_8083D53C(PlayState* play, Player* this) { if (this->actor.yDistToWater < this->ageProperties->unk_2C) { Audio_SetBaseFilter(0); - this->unk_840 = 0; + this->underwaterTimer = 0; } else { Audio_SetBaseFilter(0x20); - if (this->unk_840 < 300) { - this->unk_840++; + if (this->underwaterTimer < 300) { + this->underwaterTimer++; } } - if ((func_80845668 != this->func_674) && (func_8084BDFC != this->func_674)) { + if ((func_80845668 != this->actionFunc) && (func_8084BDFC != this->actionFunc)) { if (this->ageProperties->unk_2C < this->actor.yDistToWater) { if (!(this->stateFlags1 & PLAYER_STATE1_IN_WATER) || (!((this->currentBoots == PLAYER_BOOTS_IRON) && (this->actor.bgCheckFlags & 1)) && - (func_8084E30C != this->func_674) && (func_8084E368 != this->func_674) && - (func_8084D610 != this->func_674) && (func_8084D84C != this->func_674) && - (func_8084DAB4 != this->func_674) && (func_8084DC48 != this->func_674) && - (func_8084E1EC != this->func_674) && (func_8084D7C4 != this->func_674))) { + (func_8084E30C != this->actionFunc) && (func_8084E368 != this->actionFunc) && + (func_8084D610 != this->actionFunc) && (func_8084D84C != this->actionFunc) && + (func_8084DAB4 != this->actionFunc) && (func_8084DC48 != this->actionFunc) && + (func_8084E1EC != this->actionFunc) && (func_8084D7C4 != this->actionFunc))) { func_8083D36C(play, this); return; } @@ -5928,11 +6257,11 @@ void func_8083D6EC(PlayState* play, Player* this) { this->actor.minVelocityY = -20.0f; this->actor.gravity = REG(68) / 100.0f; - if (func_8083816C(D_808535E4)) { + if (func_8083816C(sFloorType)) { temp1 = fabsf(this->linearVelocity) * 20.0f; temp3 = 0.0f; - if (D_808535E4 == 4) { + if (sFloorType == 4) { if (this->unk_6C4 > 1300.0f) { temp2 = this->unk_6C4; } else { @@ -5947,7 +6276,7 @@ void func_8083D6EC(PlayState* play, Player* this) { temp2 = 20000.0f; if (this->currentBoots != PLAYER_BOOTS_HOVER) { temp1 += temp1; - } else if ((D_808535E4 == 7) || (this->currentBoots == PLAYER_BOOTS_IRON)) { + } else if ((sFloorType == 7) || (this->currentBoots == PLAYER_BOOTS_IRON)) { temp1 = 0; } } @@ -6049,7 +6378,7 @@ void func_8083DC54(Player* this, PlayState* play) { return; } - if (D_808535E4 == 11) { + if (sFloorType == 11) { Math_SmoothStepToS(&this->actor.focus.rot.x, -20000, 10, 4000, 800); } else { sp46 = 0; @@ -6176,8 +6505,8 @@ s32 func_8083E0FC(Player* this, PlayState* play) { this->currentYaw = this->actor.shape.rot.y = rideActor->actor.shape.rot.y; Actor_MountHorse(play, this, &rideActor->actor); - func_80832264(play, this, D_80854578[temp].anim); - func_80832F54(play, this, 0x9B); + Player_AnimPlayOnce(play, this, D_80854578[temp].anim); + Player_AnimReplaceApplyFlags(play, this, 0x9B); this->actor.parent = this->rideActor; func_80832224(this); Actor_DisableLens(play); @@ -6187,56 +6516,60 @@ s32 func_8083E0FC(Player* this, PlayState* play) { return 0; } -void func_8083E298(CollisionPoly* arg0, Vec3f* arg1, s16* arg2) { - arg1->x = COLPOLY_GET_NORMAL(arg0->normal.x); - arg1->y = COLPOLY_GET_NORMAL(arg0->normal.y); - arg1->z = COLPOLY_GET_NORMAL(arg0->normal.z); +void Player_GetSlopeDirection(CollisionPoly* floorPoly, Vec3f* slopeNormal, s16* downwardSlopeYaw) { + slopeNormal->x = COLPOLY_GET_NORMAL(floorPoly->normal.x); + slopeNormal->y = COLPOLY_GET_NORMAL(floorPoly->normal.y); + slopeNormal->z = COLPOLY_GET_NORMAL(floorPoly->normal.z); - *arg2 = Math_Atan2S(arg1->z, arg1->x); + *downwardSlopeYaw = Math_Atan2S(slopeNormal->z, slopeNormal->x); } -static LinkAnimationHeader* D_80854590[] = { - &gPlayerAnim_link_normal_down_slope_slip, - &gPlayerAnim_link_normal_up_slope_slip, -}; - -s32 func_8083E318(PlayState* play, Player* this, CollisionPoly* arg2) { +s32 Player_HandleSlopes(PlayState* play, Player* this, CollisionPoly* floorPoly) { + static LinkAnimationHeader* sSlopeSlipAnims[] = { + &gPlayerAnim_link_normal_down_slope_slip, + &gPlayerAnim_link_normal_up_slope_slip, + }; s32 pad; - s16 sp4A; - Vec3f sp3C; - s16 sp3A; - f32 temp1; - f32 temp2; - s16 temp3; + s16 playerVelYaw; + Vec3f slopeNormal; + s16 downwardSlopeYaw; + f32 slopeSlowdownSpeed; + f32 slopeSlowdownSpeedStep; + s16 velYawToDownwardSlope; - if (!Player_InBlockingCsMode(play, this) && (func_8084F390 != this->func_674) && - (SurfaceType_GetSlope(&play->colCtx, arg2, this->actor.floorBgId) == 1)) { - sp4A = Math_Atan2S(this->actor.velocity.z, this->actor.velocity.x); - func_8083E298(arg2, &sp3C, &sp3A); - temp3 = sp3A - sp4A; + if (!Player_InBlockingCsMode(play, this) && (func_8084F390 != this->actionFunc) && + (SurfaceType_GetSlope(&play->colCtx, floorPoly, this->actor.floorBgId) == 1)) { + playerVelYaw = Math_Atan2S(this->actor.velocity.z, this->actor.velocity.x); + Player_GetSlopeDirection(floorPoly, &slopeNormal, &downwardSlopeYaw); + velYawToDownwardSlope = downwardSlopeYaw - playerVelYaw; - if (ABS(temp3) > 16000) { - temp1 = (1.0f - sp3C.y) * 40.0f; - temp2 = (temp1 * temp1) * 0.015f; - if (temp2 < 1.2f) { - temp2 = 1.2f; + if (ABS(velYawToDownwardSlope) > 0x3E80) { // 87.9 degrees + // moving parallel or upwards on the slope, player does not slip but does slow down + slopeSlowdownSpeed = (1.0f - slopeNormal.y) * 40.0f; + slopeSlowdownSpeedStep = (slopeSlowdownSpeed * slopeSlowdownSpeed) * 0.015f; + + if (slopeSlowdownSpeedStep < 1.2f) { + slopeSlowdownSpeedStep = 1.2f; } - this->windDirection = sp3A; - Math_StepToF(&this->windSpeed, temp1, temp2); + + // slows down speed as player is climbing a slope + this->pushedYaw = downwardSlopeYaw; + Math_StepToF(&this->pushedSpeed, slopeSlowdownSpeed, slopeSlowdownSpeedStep); } else { - func_80835C58(play, this, func_8084F390, 0); + // moving downward on the slope, causing player to slip + Player_SetupAction(play, this, func_8084F390, 0); func_80832564(play, this); - if (D_80853610 >= 0) { + if (sFloorShapePitch >= 0) { this->unk_84F = 1; } - func_80832BE8(play, this, D_80854590[this->unk_84F]); + Player_AnimChangeLoopMorph(play, this, sSlopeSlipAnims[this->unk_84F]); this->linearVelocity = sqrtf(SQ(this->actor.velocity.x) + SQ(this->actor.velocity.z)); - this->currentYaw = sp4A; - return 1; + this->currentYaw = playerVelYaw; + return true; } } - return 0; + return false; } // unknown data (unused) @@ -6366,12 +6699,12 @@ s32 func_8083E5A8(Player* this, PlayState* play) { // Show cutscene when picking up a item. if (showItemCutscene && !skipItemCutscene && !skipItemCutsceneRando) { - func_808323B4(play, this); + Player_DetachHeldActor(play, this); func_8083AE40(this, giEntry.objectId); if (!(this->stateFlags2 & PLAYER_STATE2_UNDERWATER) || (this->currentBoots == PLAYER_BOOTS_IRON)) { func_80836898(play, this, func_8083A434); - func_808322D0(play, this, &gPlayerAnim_link_demo_get_itemB); + Player_AnimPlayOnceAdjusted(play, this, &gPlayerAnim_link_demo_get_itemB); func_80835EA4(play, 9); } @@ -6419,12 +6752,12 @@ s32 func_8083E5A8(Player* this, PlayState* play) { if ((giEntry.itemId != ITEM_NONE) && (giEntry.gi >= 0) && (Item_CheckObtainability(giEntry.itemId) == ITEM_NONE)) { - func_808322D0(play, this, this->ageProperties->unk_98); - func_80832F54(play, this, 0x28F); + Player_AnimPlayOnceAdjusted(play, this, this->ageProperties->unk_98); + Player_AnimReplaceApplyFlags(play, this, 0x28F); chest->unk_1F4 = 1; Camera_ChangeSetting(Play_GetCamera(play, 0), CAM_SET_SLOW_CHEST_CS); } else { - func_80832264(play, this, &gPlayerAnim_link_normal_box_kick); + Player_AnimPlayOnce(play, this, &gPlayerAnim_link_normal_box_kick); chest->unk_1F4 = -1; } @@ -6442,9 +6775,9 @@ s32 func_8083E5A8(Player* this, PlayState* play) { if (sp24 == PLAYER_IA_SWORD_MASTER) { this->nextModelGroup = Player_ActionToModelGroup(this, PLAYER_IA_LAST_USED); - func_8083399C(play, this, PLAYER_IA_LAST_USED); + Player_InitItemAction(play, this, PLAYER_IA_LAST_USED); } else { - func_80835F44(play, this, ITEM_LAST_USED); + Player_UseItem(play, this, ITEM_LAST_USED); } } else { s32 strength = Player_GetStrength(); @@ -6468,8 +6801,8 @@ s32 func_8083E5A8(Player* this, PlayState* play) { } void func_8083EA94(Player* this, PlayState* play) { - func_80835C58(play, this, func_80846578, 1); - func_80832264(play, this, D_80853914[PLAYER_ANIMGROUP_throw][this->modelAnimType]); + Player_SetupAction(play, this, func_80846578, 1); + Player_AnimPlayOnce(play, this, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_throw, this->modelAnimType)); } s32 func_8083EAF0(Player* this, Actor* actor) { @@ -6490,8 +6823,8 @@ s32 func_8083EB44(Player* this, PlayState* play) { CHECK_BTN_ANY(sControlInput->press.button, buttonsToCheck)) { if (!func_80835644(play, this, this->heldActor)) { if (!func_8083EAF0(this, this->heldActor)) { - func_80835C58(play, this, func_808464B0, 1); - func_80832264(play, this, D_80853914[PLAYER_ANIMGROUP_put][this->modelAnimType]); + Player_SetupAction(play, this, func_808464B0, 1); + Player_AnimPlayOnce(play, this, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_put, this->modelAnimType)); } else { func_8083EA94(this, play); } @@ -6502,16 +6835,16 @@ s32 func_8083EB44(Player* this, PlayState* play) { return 0; } -s32 func_8083EC18(Player* this, PlayState* play, u32 arg2) { - if (this->wallHeight >= 79.0f) { +s32 func_8083EC18(Player* this, PlayState* play, u32 wallFlags) { + if (this->yDistToLedge >= 79.0f) { if (!(this->stateFlags1 & PLAYER_STATE1_IN_WATER) || (this->currentBoots == PLAYER_BOOTS_IRON) || (this->actor.yDistToWater < this->ageProperties->unk_2C)) { - s32 sp8C = (arg2 & 8) ? 2 : 0; + s32 sp8C = (wallFlags & 8) ? 2 : 0; - if ((sp8C != 0) || (arg2 & 2) || + if ((sp8C != 0) || (wallFlags & 2) || func_80041E4C(&play->colCtx, this->actor.wallPoly, this->actor.wallBgId)) { f32 phi_f20; - CollisionPoly* sp84 = this->actor.wallPoly; + CollisionPoly* wallPoly = this->actor.wallPoly; f32 sp80; f32 sp7C; f32 phi_f12; @@ -6529,7 +6862,7 @@ s32 func_8083EC18(Player* this, PlayState* play, u32 arg2) { Vec3f* sp44 = &sp50[0]; s32 pad; - CollisionPoly_GetVerticesByBgId(sp84, this->actor.wallBgId, &play->colCtx, sp50); + CollisionPoly_GetVerticesByBgId(wallPoly, this->actor.wallBgId, &play->colCtx, sp50); sp80 = phi_f12 = sp44->x; sp7C = phi_f14 = sp44->z; @@ -6556,8 +6889,8 @@ s32 func_8083EC18(Player* this, PlayState* play, u32 arg2) { sp80 = (sp80 + phi_f12) * 0.5f; sp7C = (sp7C + phi_f14) * 0.5f; - phi_f12 = ((this->actor.world.pos.x - sp80) * COLPOLY_GET_NORMAL(sp84->normal.z)) - - ((this->actor.world.pos.z - sp7C) * COLPOLY_GET_NORMAL(sp84->normal.x)); + phi_f12 = ((this->actor.world.pos.x - sp80) * COLPOLY_GET_NORMAL(wallPoly->normal.z)) - + ((this->actor.world.pos.z - sp7C) * COLPOLY_GET_NORMAL(wallPoly->normal.x)); sp48 = this->actor.world.pos.y - phi_f20; phi_f20 = ((f32)(s32)((sp48 / 15.000000223517418) + 0.5) * 15.000000223517418) - sp48; @@ -6565,50 +6898,50 @@ s32 func_8083EC18(Player* this, PlayState* play, u32 arg2) { } if (phi_f12 < 8.0f) { - f32 sp3C = COLPOLY_GET_NORMAL(sp84->normal.x); - f32 sp38 = COLPOLY_GET_NORMAL(sp84->normal.z); - f32 sp34 = this->wallDistance; - LinkAnimationHeader* sp30; + f32 wallPolyNormalX = COLPOLY_GET_NORMAL(wallPoly->normal.x); + f32 wallPolyNormalZ = COLPOLY_GET_NORMAL(wallPoly->normal.z); + f32 sp34 = this->distToInteractWall; + LinkAnimationHeader* anim; func_80836898(play, this, func_8083A3B0); this->stateFlags1 |= PLAYER_STATE1_CLIMBING_LADDER; this->stateFlags1 &= ~PLAYER_STATE1_IN_WATER; - if ((sp8C != 0) || (arg2 & 2)) { + if ((sp8C != 0) || (wallFlags & 2)) { if ((this->unk_84F = sp8C) != 0) { if (this->actor.bgCheckFlags & 1) { - sp30 = &gPlayerAnim_link_normal_Fclimb_startA; + anim = &gPlayerAnim_link_normal_Fclimb_startA; } else { - sp30 = &gPlayerAnim_link_normal_Fclimb_hold2upL; + anim = &gPlayerAnim_link_normal_Fclimb_hold2upL; } sp34 = (this->ageProperties->unk_38 - 1.0f) - sp34; } else { - sp30 = this->ageProperties->unk_A4; + anim = this->ageProperties->unk_A4; sp34 = sp34 - 1.0f; } this->unk_850 = -2; this->actor.world.pos.y += phi_f20; this->actor.shape.rot.y = this->currentYaw = this->actor.wallYaw + 0x8000; } else { - sp30 = this->ageProperties->unk_A8; + anim = this->ageProperties->unk_A8; this->unk_850 = -4; this->actor.shape.rot.y = this->currentYaw = this->actor.wallYaw; } - this->actor.world.pos.x = (sp34 * sp3C) + sp80; - this->actor.world.pos.z = (sp34 * sp38) + sp7C; + this->actor.world.pos.x = (sp34 * wallPolyNormalX) + sp80; + this->actor.world.pos.z = (sp34 * wallPolyNormalZ) + sp7C; func_80832224(this); Math_Vec3f_Copy(&this->actor.prevPos, &this->actor.world.pos); - func_80832264(play, this, sp30); - func_80832F54(play, this, 0x9F); + Player_AnimPlayOnce(play, this, anim); + Player_AnimReplaceApplyFlags(play, this, 0x9F); - return 1; + return true; } } } } - return 0; + return false; } void func_8083F070(Player* this, LinkAnimationHeader* anim, PlayState* play) { @@ -6616,67 +6949,78 @@ void func_8083F070(Player* this, LinkAnimationHeader* anim, PlayState* play) { LinkAnimation_PlayOnceSetSpeed(play, &this->skelAnime, anim, (4.0f / 3.0f)); } -s32 func_8083F0C8(Player* this, PlayState* play, u32 arg2) { +/** + * @return true if Player chooses to enter crawlspace + */ +s32 Player_TryEnteringCrawlspace(Player* this, PlayState* play, u32 interactWallFlags) { CollisionPoly* wallPoly; Vec3f wallVertices[3]; - f32 tempX; - f32 temp; - f32 tempZ; - f32 maxWallZ; + f32 xVertex1; + f32 xVertex2; + f32 zVertex1; + f32 zVertex2; s32 i; - if (!LINK_IS_ADULT && !(this->stateFlags1 & PLAYER_STATE1_IN_WATER) && (arg2 & 0x30)) { + if (!LINK_IS_ADULT && !(this->stateFlags1 & PLAYER_STATE1_IN_WATER) && (interactWallFlags & 0x30)) { wallPoly = this->actor.wallPoly; CollisionPoly_GetVerticesByBgId(wallPoly, this->actor.wallBgId, &play->colCtx, wallVertices); - // compute min and max x/z of wall vertices - tempX = temp = wallVertices[0].x; - tempZ = maxWallZ = wallVertices[0].z; + // Determines min and max vertices for x & z (edges of the crawlspace hole) + xVertex1 = xVertex2 = wallVertices[0].x; + zVertex1 = zVertex2 = wallVertices[0].z; for (i = 1; i < 3; i++) { - if (tempX > wallVertices[i].x) { - tempX = wallVertices[i].x; - } else if (temp < wallVertices[i].x) { - temp = wallVertices[i].x; + if (xVertex1 > wallVertices[i].x) { + // Update x min + xVertex1 = wallVertices[i].x; + } else if (xVertex2 < wallVertices[i].x) { + // Update x max + xVertex2 = wallVertices[i].x; } - if (tempZ > wallVertices[i].z) { - tempZ = wallVertices[i].z; - } else if (maxWallZ < wallVertices[i].z) { - maxWallZ = wallVertices[i].z; + if (zVertex1 > wallVertices[i].z) { + // Update z min + zVertex1 = wallVertices[i].z; + } else if (zVertex2 < wallVertices[i].z) { + // Update z max + zVertex2 = wallVertices[i].z; } } - // average min and max x/z of wall vertices - tempX = (tempX + temp) * 0.5f; - tempZ = (tempZ + maxWallZ) * 0.5f; + // XZ Center of the crawlspace hole + xVertex1 = (xVertex1 + xVertex2) * 0.5f; + zVertex1 = (zVertex1 + zVertex2) * 0.5f; - temp = ((this->actor.world.pos.x - tempX) * COLPOLY_GET_NORMAL(wallPoly->normal.z)) - - ((this->actor.world.pos.z - tempZ) * COLPOLY_GET_NORMAL(wallPoly->normal.x)); + // Perpendicular (sideways) XZ-Distance from player pos to crawlspace line + // Uses y-component of crossproduct formula for the distance from a point to a line + xVertex2 = ((this->actor.world.pos.x - xVertex1) * COLPOLY_GET_NORMAL(wallPoly->normal.z)) - + ((this->actor.world.pos.z - zVertex1) * COLPOLY_GET_NORMAL(wallPoly->normal.x)); - if (fabsf(temp) < 8.0f) { + if (fabsf(xVertex2) < 8.0f) { + // Give do-action prompt to "Enter on A" for the crawlspace this->stateFlags2 |= PLAYER_STATE2_DO_ACTION_ENTER; if (CHECK_BTN_ALL(sControlInput->press.button, BTN_A)) { + // Enter Crawlspace f32 wallPolyNormX = COLPOLY_GET_NORMAL(wallPoly->normal.x); f32 wallPolyNormZ = COLPOLY_GET_NORMAL(wallPoly->normal.z); - f32 wallDistance = this->wallDistance; + f32 distToInteractWall = this->distToInteractWall; func_80836898(play, this, func_8083A40C); this->stateFlags2 |= PLAYER_STATE2_CRAWLING; this->actor.shape.rot.y = this->currentYaw = this->actor.wallYaw + 0x8000; - this->actor.world.pos.x = tempX + (wallDistance * wallPolyNormX); - this->actor.world.pos.z = tempZ + (wallDistance * wallPolyNormZ); + this->actor.world.pos.x = xVertex1 + (distToInteractWall * wallPolyNormX); + this->actor.world.pos.z = zVertex1 + (distToInteractWall * wallPolyNormZ); func_80832224(this); this->actor.prevPos = this->actor.world.pos; - func_80832264(play, this, &gPlayerAnim_link_child_tunnel_start); - func_80832F54(play, this, 0x9D); + Player_AnimPlayOnce(play, this, &gPlayerAnim_link_child_tunnel_start); + Player_AnimReplaceApplyFlags(play, this, 0x9D); - return 1; + return true; } } } - return 0; + return false; } s32 func_8083F360(PlayState* play, Player* this, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { @@ -6707,7 +7051,7 @@ s32 func_8083F360(PlayState* play, Player* this, f32 arg1, f32 arg2, f32 arg3, f this->actor.bgCheckFlags |= 0x200; this->actor.wallBgId = sp78; - D_808535F0 = func_80041DB8(&play->colCtx, wallPoly, sp78); + sTouchedWallFlags = func_80041DB8(&play->colCtx, wallPoly, sp78); temp1 = COLPOLY_GET_NORMAL(wallPoly->normal.x); temp2 = COLPOLY_GET_NORMAL(wallPoly->normal.z); @@ -6730,10 +7074,16 @@ s32 func_8083F524(PlayState* play, Player* this) { return func_8083F360(play, this, 26.0f, this->ageProperties->unk_38 + 5.0f, 30.0f, 0.0f); } -s32 func_8083F570(Player* this, PlayState* play) { +/** + * Two exit walls are placed at each end of the crawlspace, separate to the two entrance walls used to enter the + * crawlspace. These front and back exit walls are futher into the crawlspace than the front and + * back entrance walls. When player interacts with either of these two interior exit walls, start the leaving-crawlspace + * cutscene and return true. Else, return false + */ +s32 Player_TryLeavingCrawlspace(Player* this, PlayState* play) { s16 temp; - if ((this->linearVelocity != 0.0f) && (this->actor.bgCheckFlags & 8) && (D_808535F0 & 0x30)) { + if ((this->linearVelocity != 0.0f) && (this->actor.bgCheckFlags & 8) && (sTouchedWallFlags & 0x30)) { temp = this->actor.shape.rot.y - this->actor.wallYaw; if (this->linearVelocity < 0.0f) { @@ -6741,19 +7091,19 @@ s32 func_8083F570(Player* this, PlayState* play) { } if (ABS(temp) > 0x4000) { - func_80835C58(play, this, func_8084C81C, 0); + Player_SetupAction(play, this, func_8084C81C, 0); if (this->linearVelocity > 0.0f) { this->actor.shape.rot.y = this->actor.wallYaw + 0x8000; - func_80832264(play, this, &gPlayerAnim_link_child_tunnel_end); - func_80832F54(play, this, 0x9D); + Player_AnimPlayOnce(play, this, &gPlayerAnim_link_child_tunnel_end); + Player_AnimReplaceApplyFlags(play, this, 0x9D); OnePointCutscene_Init(play, 9601, 999, NULL, MAIN_CAM); } else { this->actor.shape.rot.y = this->actor.wallYaw; LinkAnimation_Change(play, &this->skelAnime, &gPlayerAnim_link_child_tunnel_start, -1.0f, Animation_GetLastFrame(&gPlayerAnim_link_child_tunnel_start), 0.0f, ANIMMODE_ONCE, 0.0f); - func_80832F54(play, this, 0x9D); + Player_AnimReplaceApplyFlags(play, this, 0x9D); OnePointCutscene_Init(play, 9602, 999, NULL, MAIN_CAM); } @@ -6769,10 +7119,10 @@ s32 func_8083F570(Player* this, PlayState* play) { void func_8083F72C(Player* this, LinkAnimationHeader* anim, PlayState* play) { if (!func_80836898(play, this, func_8083A388)) { - func_80835C58(play, this, func_8084B78C, 0); + Player_SetupAction(play, this, func_8084B78C, 0); } - func_80832264(play, this, anim); + Player_AnimPlayOnce(play, this, anim); func_80832224(this); this->actor.shape.rot.y = this->currentYaw = this->actor.wallYaw + 0x8000; @@ -6781,15 +7131,15 @@ void func_8083F72C(Player* this, LinkAnimationHeader* anim, PlayState* play) { s32 func_8083F7BC(Player* this, PlayState* play) { DynaPolyActor* wallPolyActor; - if (!(this->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) && (this->actor.bgCheckFlags & 0x200) && (D_80853608 < 0x3000)) { + if (!(this->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) && (this->actor.bgCheckFlags & 0x200) && (sShapeYawToTouchedWall < 0x3000)) { - if (((this->linearVelocity > 0.0f) && func_8083EC18(this, play, D_808535F0)) || - func_8083F0C8(this, play, D_808535F0)) { + if (((this->linearVelocity > 0.0f) && func_8083EC18(this, play, sTouchedWallFlags)) || + Player_TryEnteringCrawlspace(this, play, sTouchedWallFlags)) { return 1; } if (!func_808332B8(this) && ((this->linearVelocity == 0.0f) || !(this->stateFlags2 & PLAYER_STATE2_DO_ACTION_CLIMB)) && - (D_808535F0 & 0x40) && (this->actor.bgCheckFlags & 1) && (this->wallHeight >= 39.0f)) { + (sTouchedWallFlags & 0x40) && (this->actor.bgCheckFlags & 1) && (this->yDistToLedge >= 39.0f)) { this->stateFlags2 |= PLAYER_STATE2_DO_ACTION_GRAB; @@ -6848,21 +7198,21 @@ s32 func_8083F9D0(PlayState* play, Player* this) { } func_80839FFC(this, play); - func_80832264(play, this, &gPlayerAnim_link_normal_push_wait_end); + Player_AnimPlayOnce(play, this, &gPlayerAnim_link_normal_push_wait_end); this->stateFlags2 &= ~PLAYER_STATE2_MOVING_DYNAPOLY; return 1; } void func_8083FAB8(Player* this, PlayState* play) { - func_80835C58(play, this, func_8084B898, 0); + Player_SetupAction(play, this, func_8084B898, 0); this->stateFlags2 |= PLAYER_STATE2_MOVING_DYNAPOLY; - func_80832264(play, this, &gPlayerAnim_link_normal_push_start); + Player_AnimPlayOnce(play, this, &gPlayerAnim_link_normal_push_start); } void func_8083FB14(Player* this, PlayState* play) { - func_80835C58(play, this, func_8084B9E4, 0); + Player_SetupAction(play, this, func_8084B9E4, 0); this->stateFlags2 |= PLAYER_STATE2_MOVING_DYNAPOLY; - func_80832264(play, this, D_80853914[PLAYER_ANIMGROUP_pull_start][this->modelAnimType]); + Player_AnimPlayOnce(play, this, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_pull_start, this->modelAnimType)); } void func_8083FB7C(Player* this, PlayState* play) { @@ -6873,7 +7223,7 @@ void func_8083FB7C(Player* this, PlayState* play) { s32 func_8083FBC0(Player* this, PlayState* play) { if (!CHECK_BTN_ALL(sControlInput->press.button, BTN_A) && (this->actor.bgCheckFlags & 0x200) && - ((D_808535F0 & 8) || (D_808535F0 & 2) || + ((sTouchedWallFlags & 8) || (sTouchedWallFlags & 2) || func_80041E4C(&play->colCtx, this->actor.wallPoly, this->actor.wallBgId))) { return 0; } @@ -7057,7 +7407,7 @@ void func_80840450(Player* this, PlayState* play) { if (this->unk_850 != 0) { if (LinkAnimation_Update(play, &this->skelAnime)) { func_80832DBC(this); - func_80832284(play, this, func_808334E4(this)); + Player_AnimPlayLoop(play, this, func_808334E4(this)); this->unk_850 = 0; this->stateFlags3 &= ~PLAYER_STATE3_FINISHED_ATTACKING; } @@ -7068,13 +7418,13 @@ void func_80840450(Player* this, PlayState* play) { func_8083721C(this); - if (!func_80837348(play, this, D_808543E0, 1)) { - if (!func_80833B54(this) && (!func_80833B2C(this) || (func_80834B5C != this->func_82C))) { + if (!Player_TryActionChangeList(play, this, D_808543E0, 1)) { + if (!func_80833B54(this) && (!func_80833B2C(this) || (func_80834B5C != this->upperActionFunc))) { func_8083CF10(this, play); return; } - func_80837268(this, &sp44, &sp42, 0.0f, play); + Player_GetMovementSpeedAndYaw(this, &sp44, &sp42, 0.0f, play); temp1 = func_8083FC68(this, sp44, sp42); @@ -7129,12 +7479,12 @@ void func_808407CC(Player* this, PlayState* play) { if (LinkAnimation_Update(play, &this->skelAnime)) { func_80832DBC(this); - func_80832264(play, this, func_80833338(this)); + Player_AnimPlayOnce(play, this, func_80833338(this)); } func_8083721C(this); - if (!func_80837348(play, this, D_808543E8, 1)) { + if (!Player_TryActionChangeList(play, this, D_808543E8, 1)) { if (func_80833B54(this)) { func_8083CEAC(this, play); return; @@ -7146,12 +7496,12 @@ void func_808407CC(Player* this, PlayState* play) { return; } - if (func_80834B5C == this->func_82C) { + if (func_80834B5C == this->upperActionFunc) { func_8083CEAC(this, play); return; } - func_80837268(this, &sp3C, &sp3A, 0.0f, play); + Player_GetMovementSpeedAndYaw(this, &sp3C, &sp3A, 0.0f, play); temp1 = func_8083FD78(this, &sp3C, &sp3A, play); @@ -7261,7 +7611,7 @@ void func_80840BC8(Player* this, PlayState* play) { func_8083721C(this); if (this->unk_850 == 0) { - if (!func_80837348(play, this, D_80854418, 1)) { + if (!Player_TryActionChangeList(play, this, D_80854418, 1)) { if (func_80833B54(this)) { func_8083CEAC(this, play); return; @@ -7272,7 +7622,7 @@ void func_80840BC8(Player* this, PlayState* play) { return; } - func_80837268(this, &sp3C, &sp3A, 0.018f, play); + Player_GetMovementSpeedAndYaw(this, &sp3C, &sp3A, 0.018f, play); if (sp3C != 0.0f) { func_8083C8DC(this, play, sp3A); @@ -7334,7 +7684,7 @@ void func_80840DE4(Player* this, PlayState* play) { func_808327F8(this, this->linearVelocity); } - if (!func_80837348(play, this, D_808543F4, 1)) { + if (!Player_TryActionChangeList(play, this, D_808543F4, 1)) { if (func_80833B54(this)) { func_8083CEAC(this, play); return; @@ -7345,7 +7695,7 @@ void func_80840DE4(Player* this, PlayState* play) { return; } - func_80837268(this, &sp44, &sp42, 0.0f, play); + Player_GetMovementSpeedAndYaw(this, &sp44, &sp42, 0.0f, play); temp1 = func_8083FD78(this, &sp44, &sp42, play); if (temp1 > 0) { @@ -7391,7 +7741,7 @@ void func_80841138(Player* this, PlayState* play) { if (this->unk_864 < 1.0f) { temp1 = R_UPDATE_RATE * 0.5f; func_8084029C(this, REG(35) / 1000.0f); - LinkAnimation_LoadToJoint(play, &this->skelAnime, D_80853914[PLAYER_ANIMGROUP_back_walk][this->modelAnimType], + LinkAnimation_LoadToJoint(play, &this->skelAnime, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_back_walk, this->modelAnimType), this->unk_868); this->unk_864 += 1 * temp1; if (this->unk_864 >= 1.0f) { @@ -7403,7 +7753,7 @@ void func_80841138(Player* this, PlayState* play) { if (temp2 < 0.0f) { temp1 = 1.0f; func_8084029C(this, (REG(35) / 1000.0f) + ((REG(36) / 1000.0f) * this->linearVelocity)); - LinkAnimation_LoadToJoint(play, &this->skelAnime, D_80853914[PLAYER_ANIMGROUP_back_walk][this->modelAnimType], + LinkAnimation_LoadToJoint(play, &this->skelAnime, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_back_walk, this->modelAnimType), this->unk_868); } else { temp1 = (REG(37) / 1000.0f) * temp2; @@ -7413,7 +7763,7 @@ void func_80841138(Player* this, PlayState* play) { temp1 = 1.0f; func_8084029C(this, 1.2f + ((REG(38) / 1000.0f) * temp2)); } - LinkAnimation_LoadToMorph(play, &this->skelAnime, D_80853914[PLAYER_ANIMGROUP_back_walk][this->modelAnimType], + LinkAnimation_LoadToMorph(play, &this->skelAnime, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_back_walk, this->modelAnimType), this->unk_868); LinkAnimation_LoadToJoint(play, &this->skelAnime, &gPlayerAnim_link_normal_back_run, this->unk_868 * (16.0f / 29.0f)); @@ -7426,8 +7776,8 @@ void func_80841138(Player* this, PlayState* play) { } void func_8084140C(Player* this, PlayState* play) { - func_80835C58(play, this, func_8084170C, 1); - func_80832B0C(play, this, &gPlayerAnim_link_normal_back_brake); + Player_SetupAction(play, this, func_8084170C, 1); + Player_AnimChangeOnceMorph(play, this, &gPlayerAnim_link_normal_back_brake); } s32 func_80841458(Player* this, f32* arg1, s16* arg2, PlayState* play) { @@ -7456,13 +7806,13 @@ void func_808414F8(Player* this, PlayState* play) { func_80841138(this, play); - if (!func_80837348(play, this, D_80854400, 1)) { + if (!Player_TryActionChangeList(play, this, D_80854400, 1)) { if (!func_80833C04(this)) { func_8083C8DC(this, play, this->currentYaw); return; } - func_80837268(this, &sp34, &sp32, 0.0f, play); + Player_GetMovementSpeedAndYaw(this, &sp34, &sp32, 0.0f, play); sp2C = func_8083FD78(this, &sp34, &sp32, play); if (sp2C >= 0) { @@ -7489,8 +7839,8 @@ void func_808414F8(Player* this, PlayState* play) { } void func_808416C0(Player* this, PlayState* play) { - func_80835C58(play, this, func_808417FC, 1); - func_80832264(play, this, &gPlayerAnim_link_normal_back_brake_end); + Player_SetupAction(play, this, func_808417FC, 1); + Player_AnimPlayOnce(play, this, &gPlayerAnim_link_normal_back_brake_end); } void func_8084170C(Player* this, PlayState* play) { @@ -7501,8 +7851,8 @@ void func_8084170C(Player* this, PlayState* play) { sp34 = LinkAnimation_Update(play, &this->skelAnime); func_8083721C(this); - if (!func_80837348(play, this, D_80854400, 1)) { - func_80837268(this, &sp30, &sp2E, 0.0f, play); + if (!Player_TryActionChangeList(play, this, D_80854400, 1)) { + Player_GetMovementSpeedAndYaw(this, &sp30, &sp2E, 0.0f, play); if (this->linearVelocity == 0.0f) { this->currentYaw = this->actor.shape.rot.y; @@ -7521,7 +7871,7 @@ void func_808417FC(Player* this, PlayState* play) { sp1C = LinkAnimation_Update(play, &this->skelAnime); - if (!func_80837348(play, this, D_80854400, 1)) { + if (!Player_TryActionChangeList(play, this, D_80854400, 1)) { if (sp1C != 0) { func_80839F30(this, play); } @@ -7530,7 +7880,7 @@ void func_808417FC(Player* this, PlayState* play) { void func_80841860(PlayState* play, Player* this) { f32 frame; - // fake match? see func_80833664 + // fake match? see Player_InitItemActionWithAnim LinkAnimationHeader* sp38 = D_80853914[0][this->modelAnimType + PLAYER_ANIMGROUP_side_walkL * ARRAY_COUNT(D_80853914[0])]; LinkAnimationHeader* sp34 = D_80853914[0][this->modelAnimType + PLAYER_ANIMGROUP_side_walkR * ARRAY_COUNT(D_80853914[0])]; @@ -7551,13 +7901,13 @@ void func_8084193C(Player* this, PlayState* play) { func_80841860(play, this); - if (!func_80837348(play, this, D_80854408, 1)) { + if (!Player_TryActionChangeList(play, this, D_80854408, 1)) { if (!func_80833C04(this)) { func_8083C858(this, play); return; } - func_80837268(this, &sp3C, &sp3A, 0.0f, play); + Player_GetMovementSpeedAndYaw(this, &sp3C, &sp3A, 0.0f, play); if (func_80833B2C(this)) { temp1 = func_8083FD78(this, &sp3C, &sp3A, play); @@ -7616,12 +7966,12 @@ void func_80841BA8(Player* this, PlayState* play) { AnimationContext_SetLoadFrame(play, func_80833338(this), 0, this->skelAnime.limbCount, this->skelAnime.morphTable); AnimationContext_SetCopyTrue(play, this->skelAnime.limbCount, this->skelAnime.jointTable, - this->skelAnime.morphTable, D_80853410); + this->skelAnime.morphTable, sUpperBodyLimbCopyMap); } - func_80837268(this, &sp34, &sp32, 0.018f, play); + Player_GetMovementSpeedAndYaw(this, &sp34, &sp32, 0.018f, play); - if (!func_80837348(play, this, D_80854414, 1)) { + if (!Player_TryActionChangeList(play, this, D_80854414, 1)) { if (sp34 != 0.0f) { this->actor.shape.rot.y = sp32; func_8083C858(this, play); @@ -7638,20 +7988,20 @@ void func_80841CC4(Player* this, s32 arg1, PlayState* play) { s16 target; f32 rate; - if (ABS(D_80853610) < 3640) { + if (ABS(sFloorShapePitch) < 3640) { target = 0; } else { - target = CLAMP(D_80853610, -10922, 10922); + target = CLAMP(sFloorShapePitch, -10922, 10922); } Math_ScaledStepToS(&this->unk_89C, target, 400); if ((this->modelAnimType == PLAYER_ANIMTYPE_3) || ((this->unk_89C == 0) && (this->unk_6C4 <= 0.0f))) { if (arg1 == 0) { - LinkAnimation_LoadToJoint(play, &this->skelAnime, D_80853914[PLAYER_ANIMGROUP_walk][this->modelAnimType], + LinkAnimation_LoadToJoint(play, &this->skelAnime, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_walk, this->modelAnimType), this->unk_868); } else { - LinkAnimation_LoadToMorph(play, &this->skelAnime, D_80853914[PLAYER_ANIMGROUP_walk][this->modelAnimType], + LinkAnimation_LoadToMorph(play, &this->skelAnime, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_walk, this->modelAnimType), this->unk_868); } return; @@ -7677,10 +8027,10 @@ void func_80841CC4(Player* this, s32 arg1, PlayState* play) { } if (arg1 == 0) { - LinkAnimation_BlendToJoint(play, &this->skelAnime, D_80853914[PLAYER_ANIMGROUP_walk][this->modelAnimType], + LinkAnimation_BlendToJoint(play, &this->skelAnime, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_walk, this->modelAnimType), this->unk_868, anim, this->unk_868, rate, this->blendTable); } else { - LinkAnimation_BlendToMorph(play, &this->skelAnime, D_80853914[PLAYER_ANIMGROUP_walk][this->modelAnimType], + LinkAnimation_BlendToMorph(play, &this->skelAnime, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_walk, this->modelAnimType), this->unk_868, anim, this->unk_868, rate, this->blendTable); } } @@ -7693,7 +8043,7 @@ void func_80841EE4(Player* this, PlayState* play) { temp1 = R_UPDATE_RATE * 0.5f; func_8084029C(this, REG(35) / 1000.0f); - LinkAnimation_LoadToJoint(play, &this->skelAnime, D_80853914[PLAYER_ANIMGROUP_walk][this->modelAnimType], + LinkAnimation_LoadToJoint(play, &this->skelAnime, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_walk, this->modelAnimType), this->unk_868); this->unk_864 += 1 * temp1; @@ -7738,13 +8088,13 @@ void func_80842180(Player* this, PlayState* play) { this->stateFlags2 |= PLAYER_STATE2_DISABLE_ROTATION_Z_TARGET; func_80841EE4(this, play); - if (!func_80837348(play, this, D_80854424, 1)) { + if (!Player_TryActionChangeList(play, this, D_80854424, 1)) { if (func_80833C04(this)) { func_8083C858(this, play); return; } - func_80837268(this, &sp2C, &sp2A, 0.018f, play); + Player_GetMovementSpeedAndYaw(this, &sp2C, &sp2A, 0.018f, play); if (!func_8083C484(this, &sp2C, &sp2A)) { int32_t giSpeedModifier = GameInteractor_RunSpeedModifier(); @@ -7793,13 +8143,13 @@ void func_8084227C(Player* this, PlayState* play) { this->stateFlags2 |= PLAYER_STATE2_DISABLE_ROTATION_Z_TARGET; func_80841EE4(this, play); - if (!func_80837348(play, this, D_80854430, 1)) { + if (!Player_TryActionChangeList(play, this, D_80854430, 1)) { if (!func_80833C04(this)) { func_8083C858(this, play); return; } - func_80837268(this, &sp2C, &sp2A, 0.0f, play); + Player_GetMovementSpeedAndYaw(this, &sp2C, &sp2A, 0.0f, play); if (!func_8083C484(this, &sp2C, &sp2A)) { if ((func_80833B2C(this) && (sp2C != 0.0f) && (func_8083FD78(this, &sp2C, &sp2A, play) <= 0)) || @@ -7825,13 +8175,13 @@ void func_808423EC(Player* this, PlayState* play) { sp34 = LinkAnimation_Update(play, &this->skelAnime); - if (!func_80837348(play, this, D_80854408, 1)) { + if (!Player_TryActionChangeList(play, this, D_80854408, 1)) { if (!func_80833C04(this)) { func_8083C858(this, play); return; } - func_80837268(this, &sp30, &sp2E, 0.0f, play); + Player_GetMovementSpeedAndYaw(this, &sp30, &sp2E, 0.0f, play); if ((this->skelAnime.morphWeight == 0.0f) && (this->skelAnime.curFrame > 5.0f)) { func_8083721C(this); @@ -7857,8 +8207,8 @@ void func_8084251C(Player* this, PlayState* play) { func_8083721C(this); - if (!func_80837348(play, this, D_80854440, 1)) { - func_80837268(this, &sp30, &sp2E, 0.0f, play); + if (!Player_TryActionChangeList(play, this, D_80854440, 1)) { + Player_GetMovementSpeedAndYaw(this, &sp30, &sp2E, 0.0f, play); if (this->linearVelocity == 0.0f) { this->currentYaw = this->actor.shape.rot.y; @@ -7887,7 +8237,7 @@ static Vec3f D_808545C0 = { 0.0f, 0.0f, 0.0f }; s32 func_8084269C(PlayState* play, Player* this) { Vec3f sp2C; - if ((this->unk_89E == 0) || (this->unk_89E == 1)) { + if ((this->floorSfxOffset == 0) || (this->floorSfxOffset == 1)) { func_8084260C(&this->actor.shape.feetPos[FOOT_LEFT], &sp2C, this->actor.floorHeight - this->actor.shape.feetPos[FOOT_LEFT].y, 7.0f, 5.0f); func_800286CC(play, &sp2C, &D_808545B4, &D_808545C0, 50, 30); @@ -7901,11 +8251,11 @@ s32 func_8084269C(PlayState* play, Player* this) { } void func_8084279C(Player* this, PlayState* play) { - func_80832CB0(play, this, D_80853914[PLAYER_ANIMGROUP_check_wait][this->modelAnimType]); + func_80832CB0(play, this, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_check_wait, this->modelAnimType)); if (DECR(this->unk_850) == 0) { if (!func_8083B040(this, play)) { - func_8083A098(this, D_80853914[PLAYER_ANIMGROUP_check_end][this->modelAnimType], play); + func_8083A098(this, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_check_end, this->modelAnimType), play); } this->actor.flags &= ~ACTOR_FLAG_PLAYER_TALKED_TO; @@ -7924,13 +8274,13 @@ s32 func_8084285C(Player* this, f32 arg1, f32 arg2, f32 arg3) { } s32 func_808428D8(Player* this, PlayState* play) { - if (Player_IsChildWithHylianShield(this) || !Player_GetMeleeWeaponHeld(this) || !D_80853614) { + if (Player_IsChildWithHylianShield(this) || !Player_GetMeleeWeaponHeld(this) || !sUseHeldItem) { return 0; } - func_80832264(play, this, &gPlayerAnim_link_normal_defense_kiru); + Player_AnimPlayOnce(play, this, &gPlayerAnim_link_normal_defense_kiru); this->unk_84F = 1; - this->meleeWeaponAnimation = 0xC; + this->meleeWeaponAnimation = PLAYER_MWA_STAB_1H; this->currentYaw = this->actor.shape.rot.y + this->unk_6BE; if (!CVarGetInteger("gCrouchStabHammerFix", 0)) { @@ -7959,7 +8309,7 @@ s32 func_80842964(Player* this, PlayState* play) { return func_8083B040(this, play) || func_8083B644(this, play) || func_8083E5A8(this, play); } -void func_808429B4(PlayState* play, s32 speed, s32 y, s32 countdown) { +void Player_RequestQuake(PlayState* play, s32 speed, s32 y, s32 countdown) { s32 quakeIdx = Quake_Add(Play_GetCamera(play, 0), 3); Quake_SetSpeed(quakeIdx, speed); @@ -7968,7 +8318,7 @@ void func_808429B4(PlayState* play, s32 speed, s32 y, s32 countdown) { } void func_80842A28(PlayState* play, Player* this) { - func_808429B4(play, 27767, 7, 20); + Player_RequestQuake(play, 27767, 7, 20); play->actorCtx.unk_02 = 4; Player_RequestRumble(this, 255, 20, 150, 0); Player_PlaySfx(&this->actor, NA_SE_IT_HAMMER_HIT); @@ -7977,7 +8327,7 @@ void func_80842A28(PlayState* play, Player* this) { void func_80842A88(PlayState* play, Player* this) { if (CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) == DEKU_STICK_NORMAL) { Inventory_ChangeAmmo(ITEM_STICK, -1); - func_80835F44(play, this, ITEM_NONE); + Player_UseItem(play, this, ITEM_NONE); } } @@ -8030,9 +8380,9 @@ void func_80842D20(PlayState* play, Player* this) { s32 pad; s32 sp28; - if (func_80843188 != this->func_674) { + if (func_80843188 != this->actionFunc) { func_80832440(play, this); - func_80835C58(play, this, func_808505DC, 0); + Player_SetupAction(play, this, func_808505DC, 0); if (func_8008E9C4(this)) { sp28 = 2; @@ -8040,7 +8390,7 @@ void func_80842D20(PlayState* play, Player* this) { sp28 = 0; } - func_808322D0(play, this, D_808545CC[Player_HoldsTwoHandedWeapon(this) + sp28]); + Player_AnimPlayOnceAdjusted(play, this, D_808545CC[Player_HoldsTwoHandedWeapon(this) + sp28]); } Player_RequestRumble(this, 180, 20, 100, 0); @@ -8059,7 +8409,7 @@ s32 func_80842DF4(PlayState* play, Player* this) { s32 sp48; if (this->meleeWeaponState > 0) { - if (this->meleeWeaponAnimation < 0x18) { + if (this->meleeWeaponAnimation < PLAYER_MWA_SPIN_ATTACK_1H) { if (!(this->meleeWeaponQuads[0].base.atFlags & AT_BOUNCED) && !(this->meleeWeaponQuads[1].base.atFlags & AT_BOUNCED)) { if (this->skelAnime.curFrame >= 2.0f) { @@ -8115,7 +8465,7 @@ s32 func_80842DF4(PlayState* play, Player* this) { temp1 = (this->meleeWeaponQuads[0].base.atFlags & AT_HIT) || (this->meleeWeaponQuads[1].base.atFlags & AT_HIT); if (temp1) { - if (this->meleeWeaponAnimation < 0x18) { + if (this->meleeWeaponAnimation < PLAYER_MWA_SPIN_ATTACK_1H) { Actor* at = this->meleeWeaponQuads[temp1 ? 1 : 0].base.at; if ((at != NULL) && (at->id != ACTOR_EN_KANBAN)) { @@ -8150,7 +8500,7 @@ void func_80843188(Player* this, PlayState* play) { if (LinkAnimation_Update(play, &this->skelAnime)) { if (!Player_IsChildWithHylianShield(this)) { - func_80832284(play, this, D_80853914[PLAYER_ANIMGROUP_defense_wait][this->modelAnimType]); + Player_AnimPlayLoop(play, this, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_defense_wait, this->modelAnimType)); } this->unk_850 = 1; this->unk_84F = 0; @@ -8158,7 +8508,7 @@ void func_80843188(Player* this, PlayState* play) { if (!Player_IsChildWithHylianShield(this)) { this->stateFlags1 |= PLAYER_STATE1_SHIELDING; - func_80836670(this, play); + Player_UpdateUpperBody(this, play); this->stateFlags1 &= ~PLAYER_STATE1_SHIELDING; } @@ -8213,12 +8563,12 @@ void func_80843188(Player* this, PlayState* play) { LinkAnimation_Change(play, &this->skelAnime, &gPlayerAnim_clink_normal_defense_ALL, 1.0f, Animation_GetLastFrame(&gPlayerAnim_clink_normal_defense_ALL), 0.0f, ANIMMODE_ONCE, 0.0f); - func_80832F54(play, this, 4); + Player_AnimReplaceApplyFlags(play, this, 4); } else { if (this->itemAction < 0) { func_8008EC70(this); } - func_8083A098(this, D_80853914[PLAYER_ANIMGROUP_defense_end][this->modelAnimType], play); + func_8083A098(this, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_defense_end, this->modelAnimType), play); } Player_PlaySfx(&this->actor, NA_SE_IT_SHIELD_REMOVE); @@ -8243,17 +8593,17 @@ void func_808435C4(Player* this, PlayState* play) { func_8083721C(this); if (this->unk_84F == 0) { - D_808535E0 = func_80836670(this, play); - if ((func_80834B5C == this->func_82C) || (func_808374A0(play, this, &this->skelAnime2, 4.0f) > 0)) { - func_80835C58(play, this, func_80840450, 1); + D_808535E0 = Player_UpdateUpperBody(this, play); + if ((func_80834B5C == this->upperActionFunc) || (func_808374A0(play, this, &this->upperSkelAnime, 4.0f) > 0)) { + Player_SetupAction(play, this, func_80840450, 1); } } else { temp = func_808374A0(play, this, &this->skelAnime, 4.0f); if ((temp != 0) && ((temp > 0) || LinkAnimation_Update(play, &this->skelAnime))) { - func_80835C58(play, this, func_80843188, 1); + Player_SetupAction(play, this, func_80843188, 1); this->stateFlags1 |= PLAYER_STATE1_SHIELDING; Player_SetModelsForHoldingShield(this); - anim = D_80853914[PLAYER_ANIMGROUP_defense][this->modelAnimType]; + anim = GET_PLAYER_ANIM(PLAYER_ANIMGROUP_defense, this->modelAnimType); frames = Animation_GetLastFrame(anim); LinkAnimation_Change(play, &this->skelAnime, anim, 1.0f, frames, frames, ANIMMODE_ONCE, 0.0f); } @@ -8303,11 +8653,11 @@ void func_8084377C(Player* this, PlayState* play) { if (this->stateFlags1 & PLAYER_STATE1_IN_CUTSCENE) { this->unk_850++; } else { - func_80835C58(play, this, func_80843954, 0); + Player_SetupAction(play, this, func_80843954, 0); this->stateFlags1 |= PLAYER_STATE1_DAMAGED; } - func_80832264(play, this, + Player_AnimPlayOnce(play, this, (this->currentYaw != this->actor.shape.rot.y) ? &gPlayerAnim_link_normal_front_downB : &gPlayerAnim_link_normal_back_downB); func_80832698(this, NA_SE_VO_LI_FREEZE); @@ -8329,18 +8679,18 @@ void func_80843954(Player* this, PlayState* play) { if (this->stateFlags1 & PLAYER_STATE1_IN_CUTSCENE) { this->unk_850++; } else { - func_80835C58(play, this, func_80843A38, 0); + Player_SetupAction(play, this, func_80843A38, 0); this->stateFlags1 |= PLAYER_STATE1_DAMAGED; } - func_808322D0(play, this, + Player_AnimPlayOnceAdjusted(play, this, (this->currentYaw != this->actor.shape.rot.y) ? &gPlayerAnim_link_normal_front_down_wake : &gPlayerAnim_link_normal_back_down_wake); this->currentYaw = this->actor.shape.rot.y; } } -static struct_80832924 D_808545DC[] = { +static AnimSfxEntry D_808545DC[] = { { 0, 0x4014 }, { 0, -0x401E }, }; @@ -8360,7 +8710,7 @@ void func_80843A38(Player* this, PlayState* play) { } } - func_80832924(this, D_808545DC); + Player_ProcessAnimSfxList(this, D_808545DC); } static Vec3f D_808545E4 = { 0.0f, 0.0f, 5.0f }; @@ -8412,7 +8762,7 @@ void func_80843AE8(PlayState* play, Player* this) { } } -static struct_80832924 D_808545F0[] = { +static AnimSfxEntry D_808545F0[] = { { NA_SE_PL_BOUND, 0x103C }, { 0, 0x408C }, { 0, 0x40A4 }, @@ -8421,8 +8771,8 @@ static struct_80832924 D_808545F0[] = { void func_80843CEC(Player* this, PlayState* play) { if (this->currentTunic != PLAYER_TUNIC_GORON && CVarGetInteger("gSuperTunic", 0) == 0) { - if ((play->roomCtx.curRoom.behaviorType2 == ROOM_BEHAVIOR_TYPE2_3) || (D_808535E4 == 9) || - ((func_80838144(D_808535E4) >= 0) && + if ((play->roomCtx.curRoom.behaviorType2 == ROOM_BEHAVIOR_TYPE2_3) || (sFloorType == 9) || + ((func_80838144(sFloorType) >= 0) && !SurfaceType_IsWallDamage(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId))) { func_8083821C(this); } @@ -8438,7 +8788,7 @@ void func_80843CEC(Player* this, PlayState* play) { } if (this->skelAnime.animation == &gPlayerAnim_link_derth_rebirth) { - func_80832924(this, D_808545F0); + Player_ProcessAnimSfxList(this, D_808545F0); } else if (this->skelAnime.animation == &gPlayerAnim_link_normal_electric_shock_end) { if (LinkAnimation_OnFrame(&this->skelAnime, 88.0f)) { func_80832770(this, NA_SE_PL_BOUND); @@ -8462,7 +8812,7 @@ static FallImpactInfo D_80854600[] = { s32 func_80843E64(PlayState* play, Player* this) { s32 sp34; - if ((D_808535E4 == 6) || (D_808535E4 == 9)) { + if ((sFloorType == 6) || (sFloorType == 9)) { sp34 = 0; } else { sp34 = this->fallDistance; @@ -8490,7 +8840,7 @@ s32 func_80843E64(PlayState* play, Player* this) { } func_80837AE0(this, 40); - func_808429B4(play, 32967, 2, 30); + Player_RequestQuake(play, 32967, 2, 30); Player_RequestRumble(this, impactInfo->unk_01, impactInfo->unk_02, impactInfo->unk_03, 0); Player_PlaySfx(&this->actor, NA_SE_PL_BODY_HIT); func_80832698(this, impactInfo->sfxId); @@ -8507,7 +8857,7 @@ s32 func_80843E64(PlayState* play, Player* this) { Player_RequestRumble(this, (u8)sp34, (u8)(sp34 * 0.1f), (u8)sp34, 0); - if (D_808535E4 == 6) { + if (sFloorType == 6) { func_80832698(this, NA_SE_VO_LI_CLIMB_END); } } @@ -8540,7 +8890,7 @@ void func_8084411C(Player* this, PlayState* play) { this->actor.gravity = -1.2f; } - func_80837268(this, &sp4C, &sp4A, 0.0f, play); + Player_GetMovementSpeedAndYaw(this, &sp4C, &sp4A, 0.0f, play); if (!(this->actor.bgCheckFlags & 1)) { if (this->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) { @@ -8562,13 +8912,13 @@ void func_8084411C(Player* this, PlayState* play) { func_8083DFE0(this, &sp4C, &sp4A); } - func_80836670(this, play); + Player_UpdateUpperBody(this, play); if (((this->stateFlags2 & PLAYER_STATE2_HOPPING) && (this->unk_84F == 2)) || !func_8083BBA0(this, play)) { if (this->actor.velocity.y < 0.0f) { if (this->unk_850 >= 0) { if ((this->actor.bgCheckFlags & 8) || (this->unk_850 == 0) || (this->fallDistance > 0)) { - if ((D_80853600 > 800.0f) || (this->stateFlags1 & PLAYER_STATE1_HOOKSHOT_FALLING)) { + if ((sYDistToFloor > 800.0f) || (this->stateFlags1 & PLAYER_STATE1_HOOKSHOT_FALLING)) { func_80843E14(this, NA_SE_VO_LI_FALL_S); this->stateFlags1 &= ~PLAYER_STATE1_HOOKSHOT_FALLING; } @@ -8578,7 +8928,7 @@ void func_8084411C(Player* this, PlayState* play) { this->unk_850 = -1; } } else { - if ((this->unk_850 == -1) && (this->fallDistance > 120.0f) && (D_80853600 > 280.0f)) { + if ((this->unk_850 == -1) && (this->fallDistance > 120.0f) && (sYDistToFloor > 280.0f)) { this->unk_850 = -2; func_80843E14(this, NA_SE_VO_LI_FALL_L); } @@ -8586,10 +8936,10 @@ void func_8084411C(Player* this, PlayState* play) { if (!GameInteractor_GetDisableLedgeGrabsActive() && (this->actor.bgCheckFlags & 0x200) && !(this->stateFlags2 & PLAYER_STATE2_HOPPING) && !(this->stateFlags1 & (PLAYER_STATE1_ITEM_OVER_HEAD | PLAYER_STATE1_IN_WATER)) && (this->linearVelocity > 0.0f)) { - if ((this->wallHeight >= 150.0f) && (this->unk_84B[this->unk_846] == 0)) { - func_8083EC18(this, play, D_808535F0); - } else if ((this->unk_88C >= 2) && (this->wallHeight < 150.0f) && - (((this->actor.world.pos.y - this->actor.floorHeight) + this->wallHeight) > + if ((this->yDistToLedge >= 150.0f) && (this->unk_84B[this->unk_846] == 0)) { + func_8083EC18(this, play, sTouchedWallFlags); + } else if ((this->unk_88C >= 2) && (this->yDistToLedge < 150.0f) && + (((this->actor.world.pos.y - this->actor.floorHeight) + this->yDistToLedge) > (70.0f * this->ageProperties->unk_08))) { AnimationContext_DisableQueue(play); if (this->stateFlags1 & PLAYER_STATE1_HOOKSHOT_FALLING) { @@ -8597,9 +8947,9 @@ void func_8084411C(Player* this, PlayState* play) { } else { func_80832698(this, NA_SE_VO_LI_HANG); } - this->actor.world.pos.y += this->wallHeight; - func_8083A5C4(play, this, this->actor.wallPoly, this->wallDistance, - D_80853914[PLAYER_ANIMGROUP_jump_climb_hold][this->modelAnimType]); + this->actor.world.pos.y += this->yDistToLedge; + func_8083A5C4(play, this, this->actor.wallPoly, this->distToInteractWall, + GET_PLAYER_ANIM(PLAYER_ANIMGROUP_jump_climb_hold, this->modelAnimType)); this->actor.shape.rot.y = this->currentYaw += 0x8000; this->stateFlags1 |= PLAYER_STATE1_HANGING_OFF_LEDGE; } @@ -8608,7 +8958,7 @@ void func_8084411C(Player* this, PlayState* play) { } } } else { - LinkAnimationHeader* anim = D_80853914[PLAYER_ANIMGROUP_landing][this->modelAnimType]; + LinkAnimationHeader* anim = GET_PLAYER_ANIM(PLAYER_ANIMGROUP_landing, this->modelAnimType); s32 sp3C; if (this->stateFlags2 & PLAYER_STATE2_HOPPING) { @@ -8623,7 +8973,7 @@ void func_8084411C(Player* this, PlayState* play) { anim = &gPlayerAnim_link_anchor_landingR; func_80833C3C(this); } else if (this->fallDistance <= 80) { - anim = D_80853914[PLAYER_ANIMGROUP_short_landing][this->modelAnimType]; + anim = GET_PLAYER_ANIM(PLAYER_ANIMGROUP_short_landing, this->modelAnimType); } else if ((this->fallDistance < 800) && (this->unk_84B[this->unk_846] == 0) && !(this->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD)) { func_8083BC04(this, play); @@ -8633,7 +8983,7 @@ void func_8084411C(Player* this, PlayState* play) { sp3C = func_80843E64(play, this); if (sp3C > 0) { - func_8083A098(this, D_80853914[PLAYER_ANIMGROUP_landing][this->modelAnimType], play); + func_8083A098(this, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_landing, this->modelAnimType), play); this->skelAnime.endFrame = 8.0f; if (sp3C == 1) { this->unk_850 = 10; @@ -8646,7 +8996,7 @@ void func_8084411C(Player* this, PlayState* play) { } } -static struct_80832924 D_8085460C[] = { +static AnimSfxEntry D_8085460C[] = { { NA_SE_VO_LI_SWORD_N, 0x2001 }, { NA_SE_PL_WALK_GROUND, 0x1806 }, { NA_SE_PL_ROLL, 0x806 }, @@ -8683,7 +9033,7 @@ void func_80844708(Player* this, PlayState* play) { f32 rand = Rand_ZeroOne(); uint8_t randomBonk = (rand <= .05) && GameInteractor_GetRandomBonksActive(); if (this->linearVelocity >= 7.0f) { - if (randomBonk || ((this->actor.bgCheckFlags & 0x200) && (D_8085360C < 0x2000)) || + if (randomBonk || ((this->actor.bgCheckFlags & 0x200) && (sWorldYawToTouchedWall < 0x2000)) || ((this->cylinder.base.ocFlags1 & OC1_HIT) && (cylinderOc = this->cylinder.base.oc, ((cylinderOc->id == ACTOR_EN_WOOD02) && @@ -8698,9 +9048,9 @@ void func_80844708(Player* this, PlayState* play) { } } - func_80832264(play, this, D_80853914[PLAYER_ANIMGROUP_hip_down][this->modelAnimType]); + Player_AnimPlayOnce(play, this, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_hip_down, this->modelAnimType)); this->linearVelocity = -this->linearVelocity; - func_808429B4(play, 33267, 3, 12); + Player_RequestQuake(play, 33267, 3, 12); Player_RequestRumble(this, 255, 20, 150, 0); Player_PlaySfx(&this->actor, NA_SE_PL_BODY_HIT); func_80832698(this, NA_SE_VO_LI_CLIMB_END); @@ -8717,7 +9067,7 @@ void func_80844708(Player* this, PlayState* play) { return; } - func_80837268(this, &sp38, &sp36, 0.018f, play); + Player_GetMovementSpeedAndYaw(this, &sp38, &sp36, 0.018f, play); sp38 *= 1.5f; if ((sp38 < 3.0f) || (this->unk_84B[this->unk_846] != 0)) { @@ -8730,7 +9080,7 @@ void func_80844708(Player* this, PlayState* play) { func_8002F8F0(&this->actor, NA_SE_PL_ROLL_DUST - SFX_FLAG); } - func_80832924(this, D_8085460C); + Player_ProcessAnimSfxList(this, D_8085460C); } } } @@ -8740,7 +9090,7 @@ void func_80844A44(Player* this, PlayState* play) { this->stateFlags2 |= PLAYER_STATE2_DISABLE_ROTATION_Z_TARGET; if (LinkAnimation_Update(play, &this->skelAnime)) { - func_80832284(play, this, &gPlayerAnim_link_normal_run_jump_water_fall_wait); + Player_AnimPlayLoop(play, this, &gPlayerAnim_link_normal_run_jump_water_fall_wait); } Math_StepToF(&this->linearVelocity, 0.0f, 0.05f); @@ -8764,7 +9114,7 @@ void func_80844AF4(Player* this, PlayState* play) { func_8084285C(this, 6.0f, 7.0f, 99.0f); if (!(this->actor.bgCheckFlags & 1)) { - func_80837268(this, &sp2C, &sp2A, 0.0f, play); + Player_GetMovementSpeedAndYaw(this, &sp2C, &sp2A, 0.0f, play); func_8083DFE0(this, &sp2C, &this->currentYaw); return; } @@ -8781,7 +9131,7 @@ void func_80844AF4(Player* this, PlayState* play) { s32 func_80844BE4(Player* this, PlayState* play) { s32 temp; - if (func_8083ADD4(play, this)) { + if (Player_StartCsAction(play, this)) { this->stateFlags2 |= PLAYER_STATE2_SPIN_ATTACKING; } else { if (!CHECK_BTN_ALL(sControlInput->cur.button, BTN_B)) { @@ -8807,24 +9157,24 @@ s32 func_80844BE4(Player* this, PlayState* play) { } void func_80844CF8(Player* this, PlayState* play) { - func_80835C58(play, this, func_80845000, 1); + Player_SetupAction(play, this, func_80845000, 1); } void func_80844D30(Player* this, PlayState* play) { - func_80835C58(play, this, func_80845308, 1); + Player_SetupAction(play, this, func_80845308, 1); } void func_80844D68(Player* this, PlayState* play) { func_80839FFC(this, play); func_80832318(this); - func_80832B0C(play, this, D_80854368[Player_HoldsTwoHandedWeapon(this)]); + Player_AnimChangeOnceMorph(play, this, D_80854368[Player_HoldsTwoHandedWeapon(this)]); this->currentYaw = this->actor.shape.rot.y; } void func_80844DC8(Player* this, PlayState* play) { - func_80835C58(play, this, func_80844E68, 1); + Player_SetupAction(play, this, func_80844E68, 1); this->unk_868 = 0.0f; - func_80832284(play, this, D_80854360[Player_HoldsTwoHandedWeapon(this)]); + Player_AnimPlayLoop(play, this, D_80854360[Player_HoldsTwoHandedWeapon(this)]); this->unk_850 = 1; } @@ -8843,7 +9193,7 @@ void func_80844E68(Player* this, PlayState* play) { func_80832DBC(this); func_808355DC(this); this->stateFlags1 &= ~PLAYER_STATE1_TARGET_NOTHING; - func_80832284(play, this, D_80854360[Player_HoldsTwoHandedWeapon(this)]); + Player_AnimPlayLoop(play, this, D_80854360[Player_HoldsTwoHandedWeapon(this)]); this->unk_850 = -1; } @@ -8860,7 +9210,7 @@ void func_80844E68(Player* this, PlayState* play) { func_80844D68(this, play); } } else if (!func_80844BE4(this, play)) { - func_80837268(this, &sp34, &sp32, 0.0f, play); + Player_GetMovementSpeedAndYaw(this, &sp34, &sp32, 0.0f, play); temp = func_80840058(this, &sp34, &sp32, play); if (temp > 0) { @@ -8907,7 +9257,7 @@ void func_80845000(Player* this, PlayState* play) { if (!func_80842964(this, play) && !func_80844BE4(this, play)) { func_80844E3C(this); - func_80837268(this, &sp54, &sp52, 0.0f, play); + Player_GetMovementSpeedAndYaw(this, &sp54, &sp52, 0.0f, play); temp4 = func_80840058(this, &sp54, &sp52, play); @@ -8975,7 +9325,7 @@ void func_80845308(Player* this, PlayState* play) { if (!func_80842964(this, play) && !func_80844BE4(this, play)) { func_80844E3C(this); - func_80837268(this, &sp54, &sp52, 0.0f, play); + Player_GetMovementSpeedAndYaw(this, &sp54, &sp52, 0.0f, play); temp4 = func_80840058(this, &sp54, &sp52, play); @@ -9021,7 +9371,7 @@ void func_80845668(Player* this, PlayState* play) { this->linearVelocity = 1.0f; if (LinkAnimation_OnFrame(&this->skelAnime, 8.0f)) { - temp1 = this->wallHeight; + temp1 = this->yDistToLedge; if (temp1 > this->ageProperties->unk_0C) { temp1 = this->ageProperties->unk_0C; @@ -9088,7 +9438,7 @@ void func_808458D0(Player* this, PlayState* play) { LinkAnimation_Update(play, &this->skelAnime); if (((this->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) && (this->heldActor != NULL) && (this->getItemId == GI_NONE)) || - !func_80836670(this, play)) { + !Player_UpdateUpperBody(this, play)) { this->func_A74(play, this); } } @@ -9134,18 +9484,18 @@ s32 func_80845964(PlayState* play, Player* this, CsCmdActorAction* arg2, f32 arg return 0; } -s32 func_80845BA0(PlayState* play, Player* arg1, f32* arg2, s32 arg3) { - f32 dx = arg1->unk_450.x - arg1->actor.world.pos.x; - f32 dz = arg1->unk_450.z - arg1->actor.world.pos.z; +s32 func_80845BA0(PlayState* play, Player* this, f32* arg2, s32 arg3) { + f32 dx = this->unk_450.x - this->actor.world.pos.x; + f32 dz = this->unk_450.z - this->actor.world.pos.z; s32 sp2C = sqrtf(SQ(dx) + SQ(dz)); - s16 yaw = Math_Vec3f_Yaw(&arg1->actor.world.pos, &arg1->unk_450); + s16 yaw = Math_Vec3f_Yaw(&this->actor.world.pos, &this->unk_450); if (sp2C < arg3) { *arg2 = 0.0f; - yaw = arg1->actor.shape.rot.y; + yaw = this->actor.shape.rot.y; } - if (func_80845964(play, arg1, NULL, *arg2, yaw, 2)) { + if (func_80845964(play, this, NULL, *arg2, yaw, 2)) { return 0; } @@ -9192,9 +9542,9 @@ void func_80845CA4(Player* this, PlayState* play) { if (this->stateFlags1 & PLAYER_STATE1_LOADING) { sp34 = gSaveContext.entranceSpeed; - if (D_808535F4 != 0) { - this->unk_450.x = (Math_SinS(D_808535FC) * 400.0f) + this->actor.world.pos.x; - this->unk_450.z = (Math_CosS(D_808535FC) * 400.0f) + this->actor.world.pos.z; + if (sConveyorSpeed != 0) { + this->unk_450.x = (Math_SinS(sConveyorYaw) * 400.0f) + this->actor.world.pos.x; + this->unk_450.z = (Math_CosS(sConveyorYaw) * 400.0f) + this->actor.world.pos.z; } } else if (this->unk_850 < 0) { this->unk_850++; @@ -9219,7 +9569,7 @@ void func_80845CA4(Player* this, PlayState* play) { } if (this->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) { - func_80836670(this, play); + Player_UpdateUpperBody(this, play); } } @@ -9229,7 +9579,7 @@ void func_80845EF8(Player* this, PlayState* play) { this->stateFlags2 |= PLAYER_STATE2_DISABLE_ROTATION_Z_TARGET; sp2C = LinkAnimation_Update(play, &this->skelAnime); - func_80836670(this, play); + Player_UpdateUpperBody(this, play); if (sp2C) { if (this->unk_850 == 0) { @@ -9278,7 +9628,7 @@ void func_80846050(Player* this, PlayState* play) { Math_ScaledStepToS(&this->unk_3BC.y, 0, 4000); } -static struct_80832924 D_8085461C[] = { +static AnimSfxEntry D_8085461C[] = { { NA_SE_VO_LI_SWORD_L, 0x2031 }, { NA_SE_VO_LI_SWORD_N, -0x20E6 }, }; @@ -9312,18 +9662,18 @@ void func_80846120(Player* this, PlayState* play) { heldActor->velocity.y = Math_CosS(heldActor->shape.rot.x) * 40.0f; heldActor->gravity = -2.0f; heldActor->minVelocityY = -30.0f; - func_808323B4(play, this); + Player_DetachHeldActor(play, this); return; } - func_80832924(this, D_8085461C); + Player_ProcessAnimSfxList(this, D_8085461C); } void func_80846260(Player* this, PlayState* play) { func_8083721C(this); if (LinkAnimation_Update(play, &this->skelAnime)) { - func_80832284(play, this, &gPlayerAnim_link_silver_wait); + Player_AnimPlayLoop(play, this, &gPlayerAnim_link_silver_wait); this->unk_850 = 1; return; } @@ -9348,8 +9698,8 @@ void func_80846260(Player* this, PlayState* play) { } } else if (CHECK_BTN_ANY(sControlInput->press.button, buttonsToCheck)) { - func_80835C58(play, this, func_80846358, 1); - func_80832264(play, this, &gPlayerAnim_link_silver_throw); + Player_SetupAction(play, this, func_80846358, 1); + Player_AnimPlayOnce(play, this, &gPlayerAnim_link_silver_throw); } } @@ -9373,7 +9723,7 @@ void func_80846358(Player* this, PlayState* play) { void func_80846408(Player* this, PlayState* play) { if (LinkAnimation_Update(play, &this->skelAnime)) { - func_80832284(play, this, &gPlayerAnim_link_normal_nocarry_free_wait); + Player_AnimPlayLoop(play, this, &gPlayerAnim_link_normal_nocarry_free_wait); this->unk_850 = 15; return; } @@ -9417,7 +9767,7 @@ void func_80846578(Player* this, PlayState* play) { func_8083721C(this); if (LinkAnimation_Update(play, &this->skelAnime) || - ((this->skelAnime.curFrame >= 8.0f) && func_80837268(this, &sp34, &sp32, 0.018f, play))) { + ((this->skelAnime.curFrame >= 8.0f) && Player_GetMovementSpeedAndYaw(this, &sp34, &sp32, 0.018f, play))) { func_80839F90(this, play); return; } @@ -9496,7 +9846,7 @@ void func_80846648(PlayState* play, Player* this) { } void func_80846660(PlayState* play, Player* this) { - func_80835C58(play, this, func_8084F710, 0); + Player_SetupAction(play, this, func_8084F710, 0); if ((play->sceneNum == SCENE_LAKE_HYLIA) && (gSaveContext.sceneSetupIndex >= 4)) { this->unk_84F = 1; } @@ -9510,15 +9860,15 @@ static u8 D_808546F0[] = { ITEM_SWORD_MASTER, ITEM_SWORD_KOKIRI }; void func_80846720(PlayState* play, Player* this, s32 arg2) { s32 item = D_808546F0[(void)0, gSaveContext.linkAge]; - s32 actionParam = sItemActionParams[item]; + s32 itemAction = sItemActions[item]; - func_80835EFC(this); - func_808323B4(play, this); + Player_DestroyHookshot(this); + Player_DetachHeldActor(play, this); this->heldItemId = item; - this->nextModelGroup = Player_ActionToModelGroup(this, actionParam); + this->nextModelGroup = Player_ActionToModelGroup(this, itemAction); - func_8083399C(play, this, actionParam); + Player_InitItemAction(play, this, itemAction); func_80834644(play, this); if (arg2 != 0) { @@ -9529,13 +9879,13 @@ void func_80846720(PlayState* play, Player* this, s32 arg2) { static Vec3f D_808546F4 = { -1.0f, 69.0f, 20.0f }; void func_808467D4(PlayState* play, Player* this) { - func_80835C58(play, this, func_8084E9AC, 0); + Player_SetupAction(play, this, func_8084E9AC, 0); this->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE; Math_Vec3f_Copy(&this->actor.world.pos, &D_808546F4); this->currentYaw = this->actor.shape.rot.y = -0x8000; LinkAnimation_Change(play, &this->skelAnime, this->ageProperties->unk_A0, 2.0f / 3.0f, 0.0f, 0.0f, ANIMMODE_ONCE, 0.0f); - func_80832F54(play, this, 0x28F); + Player_AnimReplaceApplyFlags(play, this, 0x28F); if (LINK_IS_ADULT) { func_80846720(play, this, 0); } @@ -9543,13 +9893,13 @@ void func_808467D4(PlayState* play, Player* this) { } void func_808468A8(PlayState* play, Player* this) { - func_80835C58(play, this, func_8084F9A0, 0); - func_80832F54(play, this, 0x9B); + Player_SetupAction(play, this, func_8084F9A0, 0); + Player_AnimReplaceApplyFlags(play, this, 0x9B); } void func_808468E8(PlayState* play, Player* this) { func_808389E8(this, &gPlayerAnim_link_normal_jump, 12.0f, play); - func_80835C58(play, this, func_8084F9C0, 0); + Player_SetupAction(play, this, func_8084F9C0, 0); this->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE; this->fallStartHeight = this->actor.world.pos.y; OnePointCutscene_Init(play, 5110, 40, &this->actor, MAIN_CAM); @@ -9560,7 +9910,7 @@ void func_80846978(PlayState* play, Player* this) { } void func_808469BC(PlayState* play, Player* this) { - func_80835C58(play, this, func_8084F698, 0); + Player_SetupAction(play, this, func_8084F698, 0); this->actor.draw = NULL; this->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE; } @@ -9574,7 +9924,7 @@ Actor* func_80846A00(PlayState* play, Player* this, s32 arg2) { void func_80846A68(PlayState* play, Player* this) { this->actor.draw = NULL; - func_80835C58(play, this, func_8085076C, 0); + Player_SetupAction(play, this, func_8085076C, 0); this->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE; } @@ -9597,12 +9947,12 @@ void Player_InitCommon(Player* this, PlayState* play, FlexSkeletonHeader* skelHe this->currentYaw = this->actor.world.rot.y; func_80834644(play, this); - SkelAnime_InitLink(play, &this->skelAnime, skelHeader, D_80853914[PLAYER_ANIMGROUP_wait][this->modelAnimType], 9, + SkelAnime_InitLink(play, &this->skelAnime, skelHeader, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_wait, this->modelAnimType), 9, this->jointTable, this->morphTable, PLAYER_LIMB_MAX); this->skelAnime.baseTransl = D_80854730; - SkelAnime_InitLink(play, &this->skelAnime2, skelHeader, func_80833338(this), 9, this->jointTable2, - this->morphTable2, PLAYER_LIMB_MAX); - this->skelAnime2.baseTransl = D_80854730; + SkelAnime_InitLink(play, &this->upperSkelAnime, skelHeader, func_80833338(this), 9, this->upperJointTable, + this->upperMorphTable, PLAYER_LIMB_MAX); + this->upperSkelAnime.baseTransl = D_80854730; Effect_Add(play, &this->meleeWeaponEffectIndex, EFFECT_BLURE2, 0, 0, &blureSword); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFeet, this->ageProperties->unk_04); @@ -9648,7 +9998,7 @@ void Player_Init(Actor* thisx, PlayState* play2) { play->isPlayerDroppingFish = Player_IsDroppingFish; play->startPlayerFishing = Player_StartFishing; play->grabPlayer = func_80852F38; - play->startPlayerCutscene = func_80852FFC; + play->startPlayerCutscene = Player_TryCsAction; play->func_11D54 = func_80853080; play->damagePlayer = Player_InflictDamage; play->talkWithPlayer = func_80853148; @@ -9658,7 +10008,7 @@ void Player_Init(Actor* thisx, PlayState* play2) { this->itemAction = this->heldItemAction = -1; this->heldItemId = ITEM_NONE; - func_80835F44(play, this, ITEM_NONE); + Player_UseItem(play, this, ITEM_NONE); Player_SetEquipmentData(play, this); this->prevBoots = this->currentBoots; if (CVarGetInteger("gMMBunnyHood", BUNNY_HOOD_VANILLA) != BUNNY_HOOD_VANILLA) { @@ -9702,7 +10052,7 @@ void Player_Init(Actor* thisx, PlayState* play2) { if (gSaveContext.showTitleCard) { if ((gSaveContext.sceneSetupIndex < 4) && (gEntranceTable[((void)0, gSaveContext.entranceIndex) + ((void)0, gSaveContext.sceneSetupIndex)].field & - 0x4000) && + ENTRANCE_INFO_DISPLAY_TITLE_CARD_FLAG) && ((play->sceneNum != SCENE_DODONGOS_CAVERN) || (Flags_GetEventChkInf(EVENTCHKINF_ENTERED_DODONGOS_CAVERN))) && ((play->sceneNum != SCENE_BOMBCHU_SHOP) || (Flags_GetEventChkInf(EVENTCHKINF_USED_DODONGOS_CAVERN_BLUE_WARP)))) { TitleCard_InitPlaceName(play, &play->actorCtx.titleCtx, this->giObjectSegment, 160, 120, 144, @@ -9833,7 +10183,7 @@ void func_808473D4(PlayState* play, Player* this) { if (this->unk_860 == 2) { doAction = DO_ACTION_REEL; } - } else if ((func_8084E3C4 != this->func_674) && !(this->stateFlags2 & PLAYER_STATE2_CRAWLING)) { + } else if ((func_8084E3C4 != this->actionFunc) && !(this->stateFlags2 & PLAYER_STATE2_CRAWLING)) { if ((this->doorType != PLAYER_DOORTYPE_NONE) && (!(this->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) || ((heldActor != NULL) && (heldActor->id == ACTOR_EN_RU1)))) { @@ -9855,7 +10205,7 @@ void func_808473D4(PlayState* play, Player* this) { (!(this->stateFlags1 & PLAYER_STATE1_ON_HORSE) && (this->rideActor != NULL))) { doAction = DO_ACTION_CLIMB; } else if ((this->stateFlags1 & PLAYER_STATE1_ON_HORSE) && !EN_HORSE_CHECK_4((EnHorse*)this->rideActor) && - (func_8084D3E4 != this->func_674)) { + (func_8084D3E4 != this->actionFunc)) { if ((this->stateFlags2 & PLAYER_STATE2_SPEAK_OR_CHECK) && (this->targetActor != NULL)) { if (this->targetActor->category == ACTORCAT_NPC) { doAction = DO_ACTION_SPEAK; @@ -9898,7 +10248,7 @@ void func_808473D4(PlayState* play, Player* this) { !Player_IsChildWithHylianShield(this))) { if ((!(this->stateFlags1 & PLAYER_STATE1_CLIMBING_LEDGE) && (sp20 <= 0) && (func_8008E9C4(this) || - ((D_808535E4 != 7) && (func_80833B2C(this) || + ((sFloorType != 7) && (func_80833B2C(this) || ((play->roomCtx.curRoom.behaviorType1 != ROOM_BEHAVIOR_TYPE1_2) && !(this->stateFlags1 & PLAYER_STATE1_SHIELDING) && (sp20 == 0))))))) { doAction = DO_ACTION_ATTACK; @@ -9940,7 +10290,17 @@ void func_808473D4(PlayState* play, Player* this) { } } -s32 func_80847A78(Player* this) { +/** + * Updates state related to the Hover Boots. + * Handles a special case where the Hover Boots are able to activate when standing on certain floor types even if the + * player is standing on the ground. + * + * If the player is not on the ground, regardless of the usage of the Hover Boots, various floor related variables are + * reset. + * + * @return true if not on the ground, false otherwise. Note this is independent of the Hover Boots state. + */ +s32 Player_UpdateHoverBoots(Player* this) { s32 cond; if ((this->currentBoots == PLAYER_BOOTS_HOVER || @@ -9953,7 +10313,7 @@ s32 func_80847A78(Player* this) { cond = (this->currentBoots == PLAYER_BOOTS_HOVER || (CVarGetInteger("gIvanCoopModeEnabled", 0) && this->ivanFloating)) && - ((this->actor.yDistToWater >= 0.0f) || (func_80838144(D_808535E4) >= 0) || func_8083816C(D_808535E4)); + ((this->actor.yDistToWater >= 0.0f) || (func_80838144(sFloorType) >= 0) || func_8083816C(sFloorType)); if (cond && (this->actor.bgCheckFlags & 1) && (this->hoverBootsTimer != 0)) { this->actor.bgCheckFlags &= ~1; @@ -9966,148 +10326,211 @@ s32 func_80847A78(Player* this) { return 0; } - D_808535E4 = 0; - this->unk_898 = this->unk_89A = D_80853610 = 0; + sFloorType = 0; + this->floorPitch = this->floorPitchAlt = sFloorShapePitch = 0; return 1; } -static Vec3f D_80854798 = { 0.0f, 18.0f, 0.0f }; - -void func_80847BA0(PlayState* play, Player* this) { - u8 spC7 = 0; - CollisionPoly* spC0; - Vec3f spB4; +/** + * Peforms various tasks related to scene collision. + * + * This includes: + * - Update BgCheckInfo, parameters adjusted due to various state flags + * - Update floor type, floor property and floor sfx offset + * - Update conveyor, reverb and light settings according to the current floor poly + * - Handle exits and voids + * - Update information relating to the "interact wall" + * - Update information for ledge climbing + * - Update hover boots + * - Calculate floor poly angles + * + */ +void Player_ProcessSceneCollision(PlayState* play, Player* this) { + static Vec3f sInteractWallCheckOffset = { 0.0f, 18.0f, 0.0f }; + u8 nextLedgeClimbType = 0; + CollisionPoly* floorPoly; + Vec3f unusedWorldPos; f32 spB0; f32 spAC; - f32 spA8; - u32 spA4; + f32 ceilingCheckHeight; + u32 flags; - D_80853604 = this->unk_A7A; + sPrevFloorProperty = this->unk_A7A; if (this->stateFlags2 & PLAYER_STATE2_CRAWLING) { spB0 = 10.0f; spAC = 15.0f; - spA8 = 30.0f; + ceilingCheckHeight = 30.0f; } else { spB0 = this->ageProperties->unk_38; spAC = 26.0f; - spA8 = this->ageProperties->unk_00; + ceilingCheckHeight = this->ageProperties->unk_00; } if (this->stateFlags1 & (PLAYER_STATE1_IN_CUTSCENE | PLAYER_STATE1_FLOOR_DISABLED)) { if (this->stateFlags1 & PLAYER_STATE1_FLOOR_DISABLED) { this->actor.bgCheckFlags &= ~1; - spA4 = 0x38; + flags = 0x38; } else if ((this->stateFlags1 & PLAYER_STATE1_LOADING) && ((this->unk_A84 - (s32)this->actor.world.pos.y) >= 100)) { - spA4 = 0x39; + flags = 0x39; } else if (!(this->stateFlags1 & PLAYER_STATE1_LOADING) && - ((func_80845EF8 == this->func_674) || (func_80845CA4 == this->func_674))) { + ((func_80845EF8 == this->actionFunc) || (func_80845CA4 == this->actionFunc))) { this->actor.bgCheckFlags &= ~0x208; - spA4 = 0x3C; + flags = 0x3C; } else { - spA4 = 0x3F; + flags = 0x3F; } } else { - spA4 = 0x3F; + flags = 0x3F; } if (this->stateFlags3 & PLAYER_STATE3_IGNORE_CEILING_FLOOR_WATER) { - spA4 &= ~6; + flags &= ~6; } - if (spA4 & 4) { + if (flags & 4) { this->stateFlags3 |= PLAYER_STATE3_CHECK_FLOOR_WATER_COLLISION; } - Math_Vec3f_Copy(&spB4, &this->actor.world.pos); - Actor_UpdateBgCheckInfo(play, &this->actor, spAC, spB0, spA8, spA4); + Math_Vec3f_Copy(&unusedWorldPos, &this->actor.world.pos); + Actor_UpdateBgCheckInfo(play, &this->actor, spAC, spB0, ceilingCheckHeight, flags); if (this->actor.bgCheckFlags & 0x10) { this->actor.velocity.y = 0.0f; } - D_80853600 = this->actor.world.pos.y - this->actor.floorHeight; - D_808535F4 = 0; + sYDistToFloor = this->actor.world.pos.y - this->actor.floorHeight; + sConveyorSpeed = 0; - spC0 = this->actor.floorPoly; + floorPoly = this->actor.floorPoly; - if (spC0 != NULL) { - this->unk_A7A = func_80041EA4(&play->colCtx, spC0, this->actor.floorBgId); - this->unk_A82 = this->unk_89E; + if (floorPoly != NULL) { + this->unk_A7A = func_80041EA4(&play->colCtx, floorPoly, this->actor.floorBgId); + this->unk_A82 = this->floorSfxOffset; if (this->actor.bgCheckFlags & 0x20) { if (this->actor.yDistToWater < 20.0f) { - this->unk_89E = 4; + this->floorSfxOffset = 4; } else { - this->unk_89E = 5; + this->floorSfxOffset = 5; } } else { if (this->stateFlags2 & PLAYER_STATE2_SPAWN_DUST) { - this->unk_89E = 1; + this->floorSfxOffset = 1; } else { - this->unk_89E = SurfaceType_GetSfx(&play->colCtx, spC0, this->actor.floorBgId); + this->floorSfxOffset = SurfaceType_GetSfx(&play->colCtx, floorPoly, this->actor.floorBgId); } } if (this->actor.category == ACTORCAT_PLAYER) { - Audio_SetCodeReverb(SurfaceType_GetEcho(&play->colCtx, spC0, this->actor.floorBgId)); + Audio_SetCodeReverb(SurfaceType_GetEcho(&play->colCtx, floorPoly, this->actor.floorBgId)); if (this->actor.floorBgId == BGCHECK_SCENE) { func_80074CE8(play, - SurfaceType_GetLightSettingIndex(&play->colCtx, spC0, this->actor.floorBgId)); + SurfaceType_GetLightSettingIndex(&play->colCtx, floorPoly, this->actor.floorBgId)); } else { func_80043508(&play->colCtx, this->actor.floorBgId); } } - D_808535F4 = SurfaceType_GetConveyorSpeed(&play->colCtx, spC0, this->actor.floorBgId); - if (D_808535F4 != 0) { - D_808535F8 = SurfaceType_IsConveyor(&play->colCtx, spC0, this->actor.floorBgId); - if (((D_808535F8 == 0) && (this->actor.yDistToWater > 20.0f) && + sConveyorSpeed = SurfaceType_GetConveyorSpeed(&play->colCtx, floorPoly, this->actor.floorBgId); + if (sConveyorSpeed != 0) { + sIsFloorConveyor = SurfaceType_IsConveyor(&play->colCtx, floorPoly, this->actor.floorBgId); + if (((sIsFloorConveyor == 0) && (this->actor.yDistToWater > 20.0f) && (this->currentBoots != PLAYER_BOOTS_IRON)) || - ((D_808535F8 != 0) && (this->actor.bgCheckFlags & 1))) { - D_808535FC = SurfaceType_GetConveyorDirection(&play->colCtx, spC0, this->actor.floorBgId) << 10; + ((sIsFloorConveyor != 0) && (this->actor.bgCheckFlags & 1))) { + sConveyorYaw = SurfaceType_GetConveyorDirection(&play->colCtx, floorPoly, this->actor.floorBgId) << 10; } else { - D_808535F4 = 0; + sConveyorSpeed = 0; } } } - func_80839034(play, this, spC0, this->actor.floorBgId); + Player_HandleExitsAndVoids(play, this, floorPoly, this->actor.floorBgId); this->actor.bgCheckFlags &= ~0x200; if (this->actor.bgCheckFlags & 8) { - CollisionPoly* spA0; - s32 sp9C; - s16 sp9A; + CollisionPoly* wallPoly; + s32 wallBgId; + s16 yawDiff; s32 pad; - D_80854798.y = 18.0f; - D_80854798.z = this->ageProperties->unk_38 + 10.0f; + sInteractWallCheckOffset.y = 18.0f; + sInteractWallCheckOffset.z = this->ageProperties->unk_38 + 10.0f; if (!(this->stateFlags2 & PLAYER_STATE2_CRAWLING) && - func_80839768(play, this, &D_80854798, &spA0, &sp9C, &D_80858AA8)) { + Player_PosVsWallLineTest(play, this, &sInteractWallCheckOffset, &wallPoly, &wallBgId, &sInteractWallCheckResult)) { this->actor.bgCheckFlags |= 0x200; - if (this->actor.wallPoly != spA0) { - this->actor.wallPoly = spA0; - this->actor.wallBgId = sp9C; - this->actor.wallYaw = Math_Atan2S(spA0->normal.z, spA0->normal.x); + if (this->actor.wallPoly != wallPoly) { + this->actor.wallPoly = wallPoly; + this->actor.wallBgId = wallBgId; + this->actor.wallYaw = Math_Atan2S(wallPoly->normal.z, wallPoly->normal.x); } } - sp9A = this->actor.shape.rot.y - (s16)(this->actor.wallYaw + 0x8000); + yawDiff = this->actor.shape.rot.y - (s16)(this->actor.wallYaw + 0x8000); - D_808535F0 = func_80041DB8(&play->colCtx, this->actor.wallPoly, this->actor.wallBgId); + sTouchedWallFlags = func_80041DB8(&play->colCtx, this->actor.wallPoly, this->actor.wallBgId); - D_80853608 = ABS(sp9A); + // conflicts arise from these two being enabled at once, and with ClimbEverything on, FixVineFall is redundant anyway + if (CVarGetInteger("gFixVineFall", 0) && !CVarGetInteger("gClimbEverything", 0)) { + /* This fixes the "started climbing a wall and then immediately fell off" bug. + * The main idea is if a climbing wall is detected, double-check that it will + * still be valid once climbing begins by doing a second raycast with a small + * margin to make sure it still hits a climbable poly. Then update the flags + * in sTouchedWallFlags again and proceed as normal. + */ + if (sTouchedWallFlags & 8) { + Vec3f checkPosA; + Vec3f checkPosB; + f32 yawCos; + f32 yawSin; + s32 hitWall; - sp9A = this->currentYaw - (s16)(this->actor.wallYaw + 0x8000); + /* Angle the raycast slightly out towards the side based on the angle of + * attack the player takes coming at the climb wall. This is necessary because + * the player's XZ position actually wobbles very slightly while climbing + * due to small rounding errors in the sin/cos lookup tables. This wobble + * can cause wall checks while climbing to be slightly left or right of + * the wall check to start the climb. By adding this buffer it accounts for + * any possible wobble. The end result is the player has to be further than + * some epsilon distance from the edge of the climbing poly to actually + * start the climb. I divide it by 2 to make that epsilon slightly smaller, + * mainly for visuals. Using the full yawDiff leaves a noticeable gap on + * the edges that can't be climbed. But with the half distance it looks like + * the player is climbing right on the edge, and still works. + */ + yawCos = Math_CosS(this->actor.wallYaw - (yawDiff / 2) + 0x8000); + yawSin = Math_SinS(this->actor.wallYaw - (yawDiff / 2) + 0x8000); + checkPosA.x = this->actor.world.pos.x + (-20.0f * yawSin); + checkPosA.z = this->actor.world.pos.z + (-20.0f * yawCos); + checkPosB.x = this->actor.world.pos.x + (50.0f * yawSin); + checkPosB.z = this->actor.world.pos.z + (50.0f * yawCos); + checkPosB.y = checkPosA.y = this->actor.world.pos.y + 26.0f; - D_8085360C = ABS(sp9A); + hitWall = BgCheck_EntityLineTest1(&play->colCtx, &checkPosA, &checkPosB, + &sInteractWallCheckResult, &wallPoly, true, false, false, true, &wallBgId); - spB0 = D_8085360C * 0.00008f; + if (hitWall) { + this->actor.wallPoly = wallPoly; + this->actor.wallBgId = wallBgId; + this->actor.wallYaw = Math_Atan2S(wallPoly->normal.z, wallPoly->normal.x); + yawDiff = this->actor.shape.rot.y - (s16)(this->actor.wallYaw + 0x8000); + + sTouchedWallFlags = func_80041DB8(&play->colCtx, this->actor.wallPoly, this->actor.wallBgId); + } + } + } + + sShapeYawToTouchedWall = ABS(yawDiff); + + yawDiff = this->currentYaw - (s16)(this->actor.wallYaw + 0x8000); + + sWorldYawToTouchedWall = ABS(yawDiff); + + spB0 = sWorldYawToTouchedWall * 0.00008f; if (!(this->actor.bgCheckFlags & 1) || spB0 >= 1.0f) { this->unk_880 = R_RUN_SPEED_LIMIT / 100.0f; } else { @@ -10118,14 +10541,14 @@ void func_80847BA0(PlayState* play, Player* this) { } } - if ((this->actor.bgCheckFlags & 0x200) && (D_80853608 < 0x3000)) { + if ((this->actor.bgCheckFlags & 0x200) && (sShapeYawToTouchedWall < 0x3000)) { CollisionPoly* wallPoly = this->actor.wallPoly; if ((ABS(wallPoly->normal.y) < 600) || (CVarGetInteger("gClimbEverything", 0) != 0)) { f32 sp8C = COLPOLY_GET_NORMAL(wallPoly->normal.x); f32 sp88 = COLPOLY_GET_NORMAL(wallPoly->normal.y); f32 sp84 = COLPOLY_GET_NORMAL(wallPoly->normal.z); - f32 wallHeight; + f32 yDistToLedge; CollisionPoly* sp7C; CollisionPoly* sp78; s32 sp74; @@ -10134,42 +10557,42 @@ void func_80847BA0(PlayState* play, Player* this) { f32 sp60; s32 temp3; - this->wallDistance = Math3D_UDistPlaneToPos(sp8C, sp88, sp84, wallPoly->dist, &this->actor.world.pos); + this->distToInteractWall = Math3D_UDistPlaneToPos(sp8C, sp88, sp84, wallPoly->dist, &this->actor.world.pos); - spB0 = this->wallDistance + 10.0f; + spB0 = this->distToInteractWall + 10.0f; sp68.x = this->actor.world.pos.x - (spB0 * sp8C); sp68.z = this->actor.world.pos.z - (spB0 * sp84); sp68.y = this->actor.world.pos.y + this->ageProperties->unk_0C; sp64 = BgCheck_EntityRaycastFloor1(&play->colCtx, &sp7C, &sp68); - wallHeight = sp64 - this->actor.world.pos.y; - this->wallHeight = wallHeight; + yDistToLedge = sp64 - this->actor.world.pos.y; + this->yDistToLedge = yDistToLedge; - if ((this->wallHeight < 18.0f) || + if ((this->yDistToLedge < 18.0f) || BgCheck_EntityCheckCeiling(&play->colCtx, &sp60, &this->actor.world.pos, (sp64 - this->actor.world.pos.y) + 20.0f, &sp78, &sp74, &this->actor)) { - this->wallHeight = 399.96002f; + this->yDistToLedge = 399.96002f; } else { - D_80854798.y = (sp64 + 5.0f) - this->actor.world.pos.y; + sInteractWallCheckOffset.y = (sp64 + 5.0f) - this->actor.world.pos.y; - if (func_80839768(play, this, &D_80854798, &sp78, &sp74, &D_80858AA8) && + if (Player_PosVsWallLineTest(play, this, &sInteractWallCheckOffset, &sp78, &sp74, &sInteractWallCheckResult) && (temp3 = this->actor.wallYaw - Math_Atan2S(sp78->normal.z, sp78->normal.x), ABS(temp3) < 0x4000) && !func_80041E18(&play->colCtx, sp78, sp74)) { - this->wallHeight = 399.96002f; + this->yDistToLedge = 399.96002f; } else if (func_80041DE4(&play->colCtx, wallPoly, this->actor.wallBgId) == 0) { - if (this->ageProperties->unk_1C <= this->wallHeight) { + if (this->ageProperties->unk_1C <= this->yDistToLedge) { if (ABS(sp7C->normal.y) > 28000) { - if (this->ageProperties->unk_14 <= this->wallHeight) { - spC7 = 4; - } else if (this->ageProperties->unk_18 <= this->wallHeight) { - spC7 = 3; + if (this->ageProperties->unk_14 <= this->yDistToLedge) { + nextLedgeClimbType = 4; + } else if (this->ageProperties->unk_18 <= this->yDistToLedge) { + nextLedgeClimbType = 3; } else { - spC7 = 2; + nextLedgeClimbType = 2; } } } else { - spC7 = 1; + nextLedgeClimbType = 1; } } } @@ -10178,22 +10601,22 @@ void func_80847BA0(PlayState* play, Player* this) { } else { this->unk_880 = R_RUN_SPEED_LIMIT / 100.0f; this->unk_88D = 0; - this->wallHeight = 0.0f; + this->yDistToLedge = 0.0f; } - if (spC7 == this->unk_88C) { + if (nextLedgeClimbType == this->unk_88C) { if ((this->linearVelocity != 0.0f) && (this->unk_88D < 100)) { this->unk_88D++; } } else { - this->unk_88C = spC7; + this->unk_88C = nextLedgeClimbType; this->unk_88D = 0; } if (this->actor.bgCheckFlags & 1) { - D_808535E4 = func_80041D4C(&play->colCtx, spC0, this->actor.floorBgId); + sFloorType = func_80041D4C(&play->colCtx, floorPoly, this->actor.floorBgId); - if (!func_80847A78(this)) { + if (!Player_UpdateHoverBoots(this)) { f32 sp58; f32 sp54; f32 sp50; @@ -10206,31 +10629,31 @@ void func_80847BA0(PlayState* play, Player* this) { func_800434C8(&play->colCtx, this->actor.floorBgId); } - sp58 = COLPOLY_GET_NORMAL(spC0->normal.x); - sp54 = 1.0f / COLPOLY_GET_NORMAL(spC0->normal.y); - sp50 = COLPOLY_GET_NORMAL(spC0->normal.z); + sp58 = COLPOLY_GET_NORMAL(floorPoly->normal.x); + sp54 = 1.0f / COLPOLY_GET_NORMAL(floorPoly->normal.y); + sp50 = COLPOLY_GET_NORMAL(floorPoly->normal.z); sp4C = Math_SinS(this->currentYaw); sp44 = Math_CosS(this->currentYaw); - this->unk_898 = Math_Atan2S(1.0f, (-(sp58 * sp4C) - (sp50 * sp44)) * sp54); - this->unk_89A = Math_Atan2S(1.0f, (-(sp58 * sp44) - (sp50 * sp4C)) * sp54); + this->floorPitch = Math_Atan2S(1.0f, (-(sp58 * sp4C) - (sp50 * sp44)) * sp54); + this->floorPitchAlt = Math_Atan2S(1.0f, (-(sp58 * sp44) - (sp50 * sp4C)) * sp54); sp4C = Math_SinS(this->actor.shape.rot.y); sp44 = Math_CosS(this->actor.shape.rot.y); - D_80853610 = Math_Atan2S(1.0f, (-(sp58 * sp4C) - (sp50 * sp44)) * sp54); + sFloorShapePitch = Math_Atan2S(1.0f, (-(sp58 * sp4C) - (sp50 * sp44)) * sp54); - func_8083E318(play, this, spC0); + Player_HandleSlopes(play, this, floorPoly); } } else { - func_80847A78(this); + Player_UpdateHoverBoots(this); } - if (this->unk_A7B == D_808535E4) { + if (this->unk_A7B == sFloorType) { this->unk_A79++; } else { - this->unk_A7B = D_808535E4; + this->unk_A7B = sFloorType; this->unk_A79 = 0; } } @@ -10244,13 +10667,13 @@ void Player_UpdateCamAndSeqModes(PlayState* play, Player* this) { if (this->actor.category == ACTORCAT_PLAYER) { seqMode = SEQ_MODE_DEFAULT; - if (this->csMode != 0) { + if (this->csAction != 0) { Camera_ChangeMode(Play_GetCamera(play, 0), CAM_MODE_NORMAL); } else if (!(this->stateFlags1 & PLAYER_STATE1_FIRST_PERSON)) { if ((this->actor.parent != NULL) && (this->stateFlags3 & PLAYER_STATE3_HOOKSHOT_TRAVELLING)) { camMode = CAM_MODE_HOOKSHOT; Camera_SetParam(Play_GetCamera(play, 0), 8, this->actor.parent); - } else if (func_8084377C == this->func_674) { + } else if (func_8084377C == this->actionFunc) { camMode = CAM_MODE_STILL; } else if (this->stateFlags2 & PLAYER_STATE2_GRABBING_DYNAPOLY) { camMode = CAM_MODE_PUSHPULL; @@ -10287,14 +10710,15 @@ void Player_UpdateCamAndSeqModes(PlayState* play, Player* this) { camMode = CAM_MODE_TARGET; } } else if (this->stateFlags1 & (PLAYER_STATE1_JUMPING | PLAYER_STATE1_CLIMBING_LADDER)) { - if ((func_80845668 == this->func_674) || (this->stateFlags1 & PLAYER_STATE1_CLIMBING_LADDER)) { + if ((func_80845668 == this->actionFunc) || (this->stateFlags1 & PLAYER_STATE1_CLIMBING_LADDER)) { camMode = CAM_MODE_CLIMB; } else { camMode = CAM_MODE_JUMP; } } else if (this->stateFlags1 & PLAYER_STATE1_FREEFALL) { camMode = CAM_MODE_FREEFALL; - } else if ((this->meleeWeaponState != 0) && (this->meleeWeaponAnimation >= 0) && (this->meleeWeaponAnimation < 0x18)) { + } else if ((this->meleeWeaponState != 0) && (this->meleeWeaponAnimation >= PLAYER_MWA_FORWARD_SLASH_1H) && + (this->meleeWeaponAnimation < PLAYER_MWA_SPIN_ATTACK_1H)) { camMode = CAM_MODE_STILL; } else { camMode = CAM_MODE_NORMAL; @@ -10340,7 +10764,7 @@ void func_80848A04(PlayState* play, Player* this) { } if (this->unk_85C == 0.0f && CVarGetInteger("gDekuStickCheat", DEKU_STICK_NORMAL) == DEKU_STICK_NORMAL) { - func_80835F44(play, this, 0xFF); + Player_UseItem(play, this, 0xFF); return; } @@ -10456,7 +10880,7 @@ void func_80848C74(PlayState* play, Player* this) { void func_80848EF8(Player* this, PlayState* play) { if (CHECK_QUEST_ITEM(QUEST_STONE_OF_AGONY)) { - f32 temp = 200000.0f - (this->unk_6A4 * 5.0f); + f32 temp = 200000.0f - (this->closestSecretDistSq * 5.0f); if (temp < 0.0f) { temp = 0.0f; @@ -10578,19 +11002,19 @@ void Player_UseTunicBoots(Player* this, PlayState* play) { // Boots and tunics equip despite state s32 i; s32 item; - s32 actionParam; + s32 itemAction; if (!(this->stateFlags1 & PLAYER_STATE1_INPUT_DISABLED || this->stateFlags1 & PLAYER_STATE1_IN_ITEM_CS || this->stateFlags1 & PLAYER_STATE1_IN_CUTSCENE || this->stateFlags1 & PLAYER_STATE1_TEXT_ON_SCREEN || this->stateFlags2 & PLAYER_STATE2_OCARINA_PLAYING)) { - for (i = 0; i < ARRAY_COUNT(D_80854388); i++) { - if (CHECK_BTN_ALL(sControlInput->press.button, D_80854388[i])) { + for (i = 0; i < ARRAY_COUNT(sItemButtons); i++) { + if (CHECK_BTN_ALL(sControlInput->press.button, sItemButtons[i])) { break; } } - item = func_80833CDC(play, i); + item = Player_GetItemOnButton(play, i); if (item >= ITEM_TUNIC_KOKIRI && item <= ITEM_BOOTS_HOVER) { this->heldItemButton = i; - actionParam = Player_ItemToItemAction(item); - if (actionParam >= PLAYER_IA_BOOTS_KOKIRI) { - u16 bootsValue = actionParam - PLAYER_IA_BOOTS_KOKIRI + 1; + itemAction = Player_ItemToItemAction(item); + if (itemAction >= PLAYER_IA_BOOTS_KOKIRI) { + u16 bootsValue = itemAction - PLAYER_IA_BOOTS_KOKIRI + 1; if (CUR_EQUIP_VALUE(EQUIP_TYPE_BOOTS) == bootsValue) { Inventory_ChangeEquipment(EQUIP_TYPE_BOOTS, EQUIP_VALUE_BOOTS_KOKIRI); } else { @@ -10599,8 +11023,8 @@ void Player_UseTunicBoots(Player* this, PlayState* play) { Player_SetEquipmentData(play, this); func_808328EC(this, CUR_EQUIP_VALUE(EQUIP_TYPE_BOOTS) == EQUIP_VALUE_BOOTS_IRON ? NA_SE_PL_WALK_HEAVYBOOTS : NA_SE_PL_CHANGE_ARMS); - } else if (actionParam >= PLAYER_IA_TUNIC_KOKIRI) { - u16 tunicValue = actionParam - PLAYER_IA_TUNIC_KOKIRI + 1; + } else if (itemAction >= PLAYER_IA_TUNIC_KOKIRI) { + u16 tunicValue = itemAction - PLAYER_IA_TUNIC_KOKIRI + 1; if (CUR_EQUIP_VALUE(EQUIP_TYPE_TUNIC) == tunicValue) { Inventory_ChangeEquipment(EQUIP_TYPE_TUNIC, EQUIP_VALUE_TUNIC_KOKIRI); } else { @@ -10679,7 +11103,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { Actor_MoveForward(&this->actor); } - func_80847BA0(play, this); + Player_ProcessSceneCollision(play, this); } else { f32 temp_f0; f32 phi_f12; @@ -10708,8 +11132,8 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { this->actor.parent = this->rideActor; func_8083A360(play, this); this->stateFlags1 |= PLAYER_STATE1_ON_HORSE; - func_80832264(play, this, &gPlayerAnim_link_uma_wait_1); - func_80832F54(play, this, 0x9B); + Player_AnimPlayOnce(play, this, &gPlayerAnim_link_uma_wait_1); + Player_AnimReplaceApplyFlags(play, this, 0x9B); this->unk_850 = 99; } @@ -10735,7 +11159,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { } if (!(this->skelAnime.moveFlags & 0x80)) { - if (((this->actor.bgCheckFlags & 1) && (D_808535E4 == 5) && (this->currentBoots != PLAYER_BOOTS_IRON)) || + if (((this->actor.bgCheckFlags & 1) && (sFloorType == 5) && (this->currentBoots != PLAYER_BOOTS_IRON)) || ((this->currentBoots == PLAYER_BOOTS_HOVER || GameInteractor_GetSlipperyFloorActive()) && !(this->stateFlags1 & (PLAYER_STATE1_IN_WATER | PLAYER_STATE1_IN_CUTSCENE)))) { f32 sp70 = this->linearVelocity; @@ -10771,17 +11195,17 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { func_8002D868(&this->actor); - if ((this->windSpeed != 0.0f) && !Player_InCsMode(play) && + if ((this->pushedSpeed != 0.0f) && !Player_InCsMode(play) && !(this->stateFlags1 & (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE | PLAYER_STATE1_CLIMBING_LADDER)) && - (func_80845668 != this->func_674) && (func_808507F4 != this->func_674)) { - this->actor.velocity.x += this->windSpeed * Math_SinS(this->windDirection); - this->actor.velocity.z += this->windSpeed * Math_CosS(this->windDirection); + (func_80845668 != this->actionFunc) && (func_808507F4 != this->actionFunc)) { + this->actor.velocity.x += this->pushedSpeed * Math_SinS(this->pushedYaw); + this->actor.velocity.z += this->pushedSpeed * Math_CosS(this->pushedYaw); } func_8002D7EC(&this->actor); - func_80847BA0(play, this); + Player_ProcessSceneCollision(play, this); } else { - D_808535E4 = 0; + sFloorType = 0; this->unk_A7A = 0; if (!(this->stateFlags1 & PLAYER_STATE1_LOADING) && (this->stateFlags1 & PLAYER_STATE1_ON_HORSE)) { @@ -10797,7 +11221,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { sp58 = rideActor->actor.floorBgId; } - if ((sp5C != NULL) && func_80839034(play, this, sp5C, sp58)) { + if ((sp5C != NULL) && Player_HandleExitsAndVoids(play, this, sp5C, sp58)) { if (DREG(25) != 0) { DREG(25) = 0; } else { @@ -10806,31 +11230,31 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { } } - D_808535F4 = 0; - this->windSpeed = 0.0f; + sConveyorSpeed = 0; + this->pushedSpeed = 0.0f; } - if ((D_808535F4 != 0) && (this->currentBoots != PLAYER_BOOTS_IRON)) { + if ((sConveyorSpeed != 0) && (this->currentBoots != PLAYER_BOOTS_IRON)) { f32 sp48; - D_808535F4--; + sConveyorSpeed--; - if (D_808535F8 == 0) { - sp48 = D_80854820[D_808535F4]; + if (sIsFloorConveyor == 0) { + sp48 = D_80854820[sConveyorSpeed]; if (!(this->stateFlags1 & PLAYER_STATE1_IN_WATER)) { sp48 *= 0.25f; } } else { - sp48 = D_8085482C[D_808535F4]; + sp48 = D_8085482C[sConveyorSpeed]; } - Math_StepToF(&this->windSpeed, sp48, sp48 * 0.1f); + Math_StepToF(&this->pushedSpeed, sp48, sp48 * 0.1f); - Math_ScaledStepToS(&this->windDirection, D_808535FC, + Math_ScaledStepToS(&this->pushedYaw, sConveyorYaw, ((this->stateFlags1 & PLAYER_STATE1_IN_WATER) ? 400.0f : 800.0f) * sp48); - } else if (this->windSpeed != 0.0f) { - Math_StepToF(&this->windSpeed, 0.0f, (this->stateFlags1 & PLAYER_STATE1_IN_WATER) ? 0.5f : 1.0f); + } else if (this->pushedSpeed != 0.0f) { + Math_StepToF(&this->pushedSpeed, 0.0f, (this->stateFlags1 & PLAYER_STATE1_IN_WATER) ? 0.5f : 1.0f); } if (!Player_InBlockingCsMode(play, this) && !(this->stateFlags2 & PLAYER_STATE2_CRAWLING)) { @@ -10848,7 +11272,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { } } else { if ((this->actor.parent == NULL) && - ((play->sceneLoadFlag == 0x14) || (this->unk_A87 != 0) || !func_808382DC(this, play))) { + ((play->transitionTrigger == TRANS_TRIGGER_START) || (this->unk_A87 != 0) || !func_808382DC(this, play))) { func_8083AA10(this, play); } else { this->fallStartHeight = this->actor.world.pos.y; @@ -10857,7 +11281,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { } } - if ((play->csCtx.state != CS_STATE_IDLE) && (this->csMode != 6) && + if ((play->csCtx.state != CS_STATE_IDLE) && (this->csAction != 6) && !(this->stateFlags1 & PLAYER_STATE1_ON_HORSE) && !(this->stateFlags2 & PLAYER_STATE2_GRABBED_BY_ENEMY) && (this->actor.category == ACTORCAT_PLAYER)) { CsCmdActorAction* linkActionCsCmd = play->csCtx.linkAction; @@ -10865,22 +11289,22 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { if ((linkActionCsCmd != NULL) && (D_808547C4[linkActionCsCmd->action] != 0)) { func_8002DF54(play, NULL, 6); Player_ZeroSpeedXZ(this); - } else if ((this->csMode == 0) && !(this->stateFlags2 & PLAYER_STATE2_UNDERWATER) && + } else if ((this->csAction == 0) && !(this->stateFlags2 & PLAYER_STATE2_UNDERWATER) && (play->csCtx.state != CS_STATE_UNSKIPPABLE_INIT)) { func_8002DF54(play, NULL, 0x31); Player_ZeroSpeedXZ(this); } } - if (this->csMode != 0) { - if ((this->csMode != 7) || + if (this->csAction != 0) { + if ((this->csAction != 7) || !(this->stateFlags1 & (PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE | PLAYER_STATE1_CLIMBING_LADDER | PLAYER_STATE1_DAMAGED))) { this->unk_6AD = 3; - } else if (func_80852E14 != this->func_674) { + } else if (func_80852E14 != this->actionFunc) { func_80852944(play, this, NULL); } } else { - this->prevCsMode = 0; + this->prevCsAction = 0; } func_8083D6EC(play, this); @@ -10896,7 +11320,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { this->stateFlags3 &= ~PLAYER_STATE3_CHECK_FLOOR_WATER_COLLISION; func_80847298(this); - func_8083315C(play, this); + Player_ProcessControlStick(play, this); if (this->stateFlags1 & PLAYER_STATE1_IN_WATER) { D_808535E8 = 0.5f; @@ -10905,11 +11329,11 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { } D_808535EC = 1.0f / D_808535E8; - D_80853614 = D_80853618 = 0; + sUseHeldItem = sHeldItemButtonIsHeldDown = 0; D_80858AA4 = this->currentMask; if (!(this->stateFlags3 & PLAYER_STATE3_PAUSE_ACTION_FUNC)) { - this->func_674(this, play); + this->actionFunc(this, play); Player_UseTunicBoots(this, play); } @@ -10946,7 +11370,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { } this->stateFlags2 &= ~PLAYER_STATE2_NEAR_OCARINA_ACTOR; - this->unk_6A4 = FLT_MAX; + this->closestSecretDistSq = FLT_MAX; temp_f0 = this->actor.world.pos.y - this->actor.prevPos.y; @@ -11028,7 +11452,7 @@ void Player_Update(Actor* thisx, PlayState* play) { gSaveContext.dogParams = 0; } else { gSaveContext.dogParams &= 0x7FFF; - func_808395DC(this, &this->actor.world.pos, &D_80854838, &sDogSpawnPos); + Player_GetRelativePosition(this, &this->actor.world.pos, &D_80854838, &sDogSpawnPos); dogParams = gSaveContext.dogParams; dog = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_DOG, sDogSpawnPos.x, sDogSpawnPos.y, @@ -11045,7 +11469,7 @@ void Player_Update(Actor* thisx, PlayState* play) { } if ((this->heldActor != NULL) && (this->heldActor->update == NULL)) { - func_808323B4(play, this); + Player_DetachHeldActor(play, this); } if (this->stateFlags1 & (PLAYER_STATE1_INPUT_DISABLED | PLAYER_STATE1_IN_CUTSCENE)) { @@ -11133,7 +11557,7 @@ void Player_Update(Actor* thisx, PlayState* play) { if (GameInteractor_GetRandomWindActive()) { Player* player = GET_PLAYER(play); - player->windSpeed = 3.0f; + player->pushedSpeed = 3.0f; // Play fan sound (too annoying) //func_8002F974(&player->actor, NA_SE_EV_WIND_TRAP - SFX_FLAG); } @@ -11141,7 +11565,13 @@ void Player_Update(Actor* thisx, PlayState* play) { GameInteractor_ExecuteOnPlayerUpdate(); } -static struct_80858AC8 D_80858AC8; +typedef struct { + /* 0x0 */ Vec3s rot; + /* 0x6 */ Vec3s angVel; +} BunnyEarKinematics; // size = 0xC + +static BunnyEarKinematics sBunnyEarKinematics; + static Vec3s D_80858AD8[25]; static Gfx* sMaskDlists[PLAYER_MASK_MAX - 1] = { @@ -11151,8 +11581,7 @@ static Gfx* sMaskDlists[PLAYER_MASK_MAX - 1] = { static Vec3s D_80854864 = { 0, 0, 0 }; -void Player_DrawGameplay(PlayState* play, Player* this, s32 lod, Gfx* cullDList, - OverrideLimbDrawOpa overrideLimbDraw) { +void Player_DrawGameplay(PlayState* play, Player* this, s32 lod, Gfx* cullDList, OverrideLimbDrawOpa overrideLimbDraw) { static s32 D_8085486C = 255; OPEN_DISPS(play->state.gfxCtx); @@ -11167,25 +11596,27 @@ void Player_DrawGameplay(PlayState* play, Player* this, s32 lod, Gfx* cullDList, if ((overrideLimbDraw == Player_OverrideLimbDrawGameplayDefault) && (this->currentMask != PLAYER_MASK_NONE)) { // Fixes a bug in vanilla where ice traps are rendered extremely large while wearing a bunny hood if (CVarGetInteger("gFixIceTrapWithBunnyHood", 1)) Matrix_Push(); - Mtx* sp70 = Graph_Alloc(play->state.gfxCtx, 2 * sizeof(Mtx)); + Mtx* bunnyEarMtx = Graph_Alloc(play->state.gfxCtx, 2 * sizeof(Mtx)); if (this->currentMask == PLAYER_MASK_BUNNY) { - Vec3s sp68; + Vec3s earRot; FrameInterpolation_RecordActorPosRotMatrix(); - gSPSegment(POLY_OPA_DISP++, 0x0B, sp70); + gSPSegment(POLY_OPA_DISP++, 0x0B, bunnyEarMtx); - sp68.x = D_80858AC8.unk_02 + 0x3E2; - sp68.y = D_80858AC8.unk_04 + 0xDBE; - sp68.z = D_80858AC8.unk_00 - 0x348A; - Matrix_SetTranslateRotateYXZ(97.0f, -1203.0f - CVarGetFloat("gCosmetics.BunnyHood_EarLength", 0.0f), -240.0f - CVarGetFloat("gCosmetics.BunnyHood_EarSpread", 0.0f), &sp68); - MATRIX_TOMTX(sp70++); + // Right ear + earRot.x = sBunnyEarKinematics.rot.y + 0x3E2; + earRot.y = sBunnyEarKinematics.rot.z + 0xDBE; + earRot.z = sBunnyEarKinematics.rot.x - 0x348A; + Matrix_SetTranslateRotateYXZ(97.0f, -1203.0f - CVarGetFloat("gCosmetics.BunnyHood_EarLength", 0.0f), -240.0f - CVarGetFloat("gCosmetics.BunnyHood_EarSpread", 0.0f), &earRot); + MATRIX_TOMTX(bunnyEarMtx++); - sp68.x = D_80858AC8.unk_02 - 0x3E2; - sp68.y = -0xDBE - D_80858AC8.unk_04; - sp68.z = D_80858AC8.unk_00 - 0x348A; - Matrix_SetTranslateRotateYXZ(97.0f, -1203.0f - CVarGetFloat("gCosmetics.BunnyHood_EarLength", 0.0f), 240.0f + CVarGetFloat("gCosmetics.BunnyHood_EarSpread", 0.0f), &sp68); - MATRIX_TOMTX(sp70); + // Left ear + earRot.x = sBunnyEarKinematics.rot.y - 0x3E2; + earRot.y = -0xDBE - sBunnyEarKinematics.rot.z; + earRot.z = sBunnyEarKinematics.rot.x - 0x348A; + Matrix_SetTranslateRotateYXZ(97.0f, -1203.0f - CVarGetFloat("gCosmetics.BunnyHood_EarLength", 0.0f), 240.0f + CVarGetFloat("gCosmetics.BunnyHood_EarSpread", 0.0f), &earRot); + MATRIX_TOMTX(bunnyEarMtx); } @@ -11276,7 +11707,7 @@ void Player_Draw(Actor* thisx, PlayState* play2) { s32 lod; s32 pad; - if ((this->csMode != 0) || (func_8008E9C4(this) && 0) || (this->actor.projectedPos.z < 160.0f)) { + if ((this->csAction != 0) || (func_8008E9C4(this) && 0) || (this->actor.projectedPos.z < 160.0f)) { lod = 0; } else { lod = 1; @@ -11379,7 +11810,7 @@ void Player_Destroy(Actor* thisx, PlayState* play) { gSaveContext.linkAge = play->linkAgeOnLoad; ResourceMgr_UnregisterSkeleton(&this->skelAnime); - ResourceMgr_UnregisterSkeleton(&this->skelAnime2); + ResourceMgr_UnregisterSkeleton(&this->upperSkelAnime); } //first person manipulate player actor @@ -11537,14 +11968,14 @@ void func_8084B1D8(Player* this, PlayState* play) { } if ((this->unk_6AD == 2) && (func_8002DD6C(this) || func_808332E4(this))) { - func_80836670(this, play); + Player_UpdateUpperBody(this, play); } u16 buttonsToCheck = BTN_A | BTN_B | BTN_R | BTN_CUP | BTN_CLEFT | BTN_CRIGHT | BTN_CDOWN; if (CVarGetInteger("gDpadEquips", 0) != 0) { buttonsToCheck |= BTN_DUP | BTN_DDOWN | BTN_DLEFT | BTN_DRIGHT; } - if ((this->csMode != 0) || (this->unk_6AD == 0) || (this->unk_6AD >= 4) || func_80833B54(this) || + if ((this->csAction != 0) || (this->unk_6AD == 0) || (this->unk_6AD >= 4) || func_80833B54(this) || (this->unk_664 != NULL) || !func_8083AD4C(play, this) || (((this->unk_6AD == 2) && (CHECK_BTN_ANY(sControlInput->press.button, BTN_A | BTN_B | BTN_R) || func_80833B2C(this) || (!func_8002DD78(this) && !func_808334B4(this)))) || @@ -11565,7 +11996,7 @@ void func_8084B1D8(Player* this, PlayState* play) { s32 func_8084B3CC(PlayState* play, Player* this) { if (play->shootingGalleryStatus != 0) { func_80832564(play, this); - func_80835C58(play, this, func_8084FA54, 0); + Player_SetupAction(play, this, func_8084FA54, 0); if (!func_8002DD6C(this) || Player_HoldsHookshot(this)) { s32 projectileItemToUse = ITEM_BOW; @@ -11573,11 +12004,11 @@ s32 func_8084B3CC(PlayState* play, Player* this) { projectileItemToUse = LINK_IS_ADULT ? ITEM_BOW : ITEM_SLINGSHOT; } - func_80835F44(play, this, projectileItemToUse); + Player_UseItem(play, this, projectileItemToUse); } this->stateFlags1 |= PLAYER_STATE1_FIRST_PERSON; - func_80832264(play, this, func_80833338(this)); + Player_AnimPlayOnce(play, this, func_80833338(this)); Player_ZeroSpeedXZ(this); func_8083B010(this); return 1; @@ -11605,7 +12036,7 @@ s32 func_8084B4D4(PlayState* play, Player* this) { void func_8084B530(Player* this, PlayState* play) { this->stateFlags2 |= PLAYER_STATE2_DISABLE_ROTATION_Z_TARGET; - func_80836670(this, play); + Player_UpdateUpperBody(this, play); if (Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING) { this->actor.flags &= ~ACTOR_FLAG_PLAYER_TALKED_TO; @@ -11616,7 +12047,7 @@ void func_8084B530(Player* this, PlayState* play) { func_8005B1A4(Play_GetCamera(play, 0)); - if (!func_8084B4D4(play, this) && !func_8084B3CC(play, this) && !func_8083ADD4(play, this)) { + if (!func_8084B4D4(play, this) && !func_8084B3CC(play, this) && !Player_StartCsAction(play, this)) { if ((this->targetActor != this->interactRangeActor) || !func_8083E5A8(this, play)) { if (this->stateFlags1 & PLAYER_STATE1_ON_HORSE) { s32 sp24 = this->unk_850; @@ -11643,12 +12074,12 @@ void func_8084B530(Player* this, PlayState* play) { func_80832DBC(this); if ((this->targetActor->category == ACTORCAT_NPC) && (this->heldItemAction != PLAYER_IA_FISHING_POLE)) { - func_808322D0(play, this, &gPlayerAnim_link_normal_talk_free); + Player_AnimPlayOnceAdjusted(play, this, &gPlayerAnim_link_normal_talk_free); } else { - func_80832284(play, this, func_80833338(this)); + Player_AnimPlayLoop(play, this, func_80833338(this)); } } else { - func_808322A4(play, this, &gPlayerAnim_link_normal_talk_free_wait); + Player_AnimPlayLoopAdjusted(play, this, &gPlayerAnim_link_normal_talk_free_wait); } } @@ -11667,7 +12098,7 @@ void func_8084B78C(Player* this, PlayState* play) { if (LinkAnimation_Update(play, &this->skelAnime)) { if (!func_8083F9D0(play, this)) { - func_80837268(this, &sp34, &sp32, 0.0f, play); + Player_GetMovementSpeedAndYaw(this, &sp34, &sp32, 0.0f, play); temp = func_8083FFB8(this, &sp34, &sp32); if (temp > 0) { func_8083FAB8(this, play); @@ -11688,7 +12119,7 @@ void func_8084B840(PlayState* play, Player* this, f32 arg2) { } } -static struct_80832924 D_80854870[] = { +static AnimSfxEntry D_80854870[] = { { NA_SE_PL_SLIP, 0x1003 }, { NA_SE_PL_SLIP, -0x1015 }, }; @@ -11708,11 +12139,11 @@ void func_8084B898(Player* this, PlayState* play) { } } - func_80832924(this, D_80854870); + Player_ProcessAnimSfxList(this, D_80854870); func_8083F524(play, this); if (!func_8083F9D0(play, this)) { - func_80837268(this, &sp34, &sp32, 0.0f, play); + Player_GetMovementSpeedAndYaw(this, &sp34, &sp32, 0.0f, play); temp = func_8083FFB8(this, &sp34, &sp32); if (temp < 0) { func_8083FB14(this, play); @@ -11729,7 +12160,7 @@ void func_8084B898(Player* this, PlayState* play) { } } -static struct_80832924 D_80854878[] = { +static AnimSfxEntry D_80854878[] = { { NA_SE_PL_SLIP, 0x1004 }, { NA_SE_PL_SLIP, -0x1018 }, }; @@ -11748,7 +12179,7 @@ void func_8084B9E4(Player* this, PlayState* play) { Vec3f sp44; Vec3f sp38; - anim = D_80853914[PLAYER_ANIMGROUP_pulling][this->modelAnimType]; + anim = GET_PLAYER_ANIM(PLAYER_ANIMGROUP_pulling, this->modelAnimType); this->stateFlags2 |= PLAYER_STATE2_DO_ACTION_GRAB | PLAYER_STATE2_DISABLE_ROTATION_ALWAYS | PLAYER_STATE2_GRABBING_DYNAPOLY; if (func_80832CB0(play, this, anim)) { @@ -11759,19 +12190,19 @@ void func_8084B9E4(Player* this, PlayState* play) { func_80832698(this, NA_SE_VO_LI_PUSH); } } else { - func_80832924(this, D_80854878); + Player_ProcessAnimSfxList(this, D_80854878); } } func_8083F524(play, this); if (!func_8083F9D0(play, this)) { - func_80837268(this, &sp70, &sp6E, 0.0f, play); + Player_GetMovementSpeedAndYaw(this, &sp70, &sp6E, 0.0f, play); temp1 = func_8083FFB8(this, &sp70, &sp6E); if (temp1 > 0) { func_8083FAB8(this, play); } else if (temp1 == 0) { - func_8083F72C(this, D_80853914[PLAYER_ANIMGROUP_pull_end][this->modelAnimType], play); + func_8083F72C(this, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_pull_end, this->modelAnimType), play); } else { this->stateFlags2 |= PLAYER_STATE2_MOVING_DYNAPOLY; } @@ -11803,7 +12234,7 @@ void func_8084BBE4(Player* this, PlayState* play) { if (LinkAnimation_Update(play, &this->skelAnime)) { // clang-format off - anim = (this->unk_84F > 0) ? &gPlayerAnim_link_normal_fall_wait : D_80853914[PLAYER_ANIMGROUP_jump_climb_wait][this->modelAnimType]; func_80832284(play, this, anim); + anim = (this->unk_84F > 0) ? &gPlayerAnim_link_normal_fall_wait : GET_PLAYER_ANIM(PLAYER_ANIMGROUP_jump_climb_wait, this->modelAnimType); Player_AnimPlayLoop(play, this, anim); // clang-format on } else if (this->unk_84F == 0) { if (this->skelAnime.animation == &gPlayerAnim_link_normal_fall) { @@ -11825,12 +12256,12 @@ void func_8084BBE4(Player* this, PlayState* play) { Math_ScaledStepToS(&this->actor.shape.rot.y, this->currentYaw, 0x800); if (this->unk_84F != 0) { - func_80837268(this, &sp3C, &sp3A, 0.0f, play); + Player_GetMovementSpeedAndYaw(this, &sp3C, &sp3A, 0.0f, play); if (this->unk_847[this->unk_846] >= 0) { if (this->unk_84F > 0) { - anim = D_80853914[PLAYER_ANIMGROUP_fall_up][this->modelAnimType]; + anim = GET_PLAYER_ANIM(PLAYER_ANIMGROUP_fall_up, this->modelAnimType); } else { - anim = D_80853914[PLAYER_ANIMGROUP_jump_climb_up][this->modelAnimType]; + anim = GET_PLAYER_ANIM(PLAYER_ANIMGROUP_jump_climb_up, this->modelAnimType); } func_8083A9B8(this, anim, play); return; @@ -11954,7 +12385,7 @@ void func_8084BF1C(Player* this, PlayState* play) { } } else { this->skelAnime.prevTransl = this->ageProperties->unk_4A[sp68]; - func_80832264(play, this, this->ageProperties->unk_AC[sp68]); + Player_AnimPlayOnce(play, this, this->ageProperties->unk_AC[sp68]); } } else { if ((this->actor.world.pos.y - this->actor.floorHeight) < 15.0f) { @@ -11982,7 +12413,7 @@ void func_8084BF1C(Player* this, PlayState* play) { if (CVarGetInteger("gMirroredWorld", 0) ? (sp80 < 0) : (sp80 > 0)) { this->skelAnime.prevTransl = this->ageProperties->unk_7A[this->unk_850]; - func_80832264(play, this, anim2); + Player_AnimPlayOnce(play, this, anim2); } else { this->skelAnime.prevTransl = this->ageProperties->unk_86[this->unk_850]; LinkAnimation_Change(play, &this->skelAnime, anim2, -1.0f, Animation_GetLastFrame(anim2), @@ -12016,7 +12447,7 @@ void func_8084BF1C(Player* this, PlayState* play) { static f32 D_80854898[] = { 10.0f, 20.0f }; static f32 D_808548A0[] = { 40.0f, 50.0f }; -static struct_80832924 D_808548A8[] = { +static AnimSfxEntry D_808548A8[] = { { NA_SE_PL_WALK_LADDER, 0x80A }, { NA_SE_PL_WALK_LADDER, 0x814 }, { NA_SE_PL_WALK_LADDER, -0x81E }, @@ -12047,7 +12478,7 @@ void func_8084C5F8(Player* this, PlayState* play) { sp38 = D_80854898; if (this->unk_850 != 0) { - func_80832924(this, D_808548A8); + Player_ProcessAnimSfxList(this, D_808548A8); sp38 = D_808548A0; } @@ -12056,13 +12487,13 @@ void func_8084C5F8(Player* this, PlayState* play) { sp24.y = this->actor.world.pos.y + 20.0f; sp24.z = this->actor.world.pos.z; if (BgCheck_EntityRaycastFloor3(&play->colCtx, &sp34, &sp30, &sp24) != 0.0f) { - this->unk_89E = func_80041F10(&play->colCtx, sp34, sp30); + this->floorSfxOffset = func_80041F10(&play->colCtx, sp34, sp30); func_808328A0(this); } } } -static struct_80832924 D_808548B4[] = { +static AnimSfxEntry D_808548B4[] = { { 0, 0x3028 }, { 0, 0x3030 }, { 0, 0x3038 }, { 0, 0x3040 }, { 0, 0x3048 }, { 0, 0x3050 }, { 0, 0x3058 }, { 0, 0x3060 }, { 0, -0x3068 }, }; @@ -12077,17 +12508,17 @@ void func_8084C760(Player* this, PlayState* play) { return; } - if (!func_8083F570(this, play)) { + if (!Player_TryLeavingCrawlspace(this, play)) { this->linearVelocity = sControlInput->rel.stick_y * 0.03f; } } return; } - func_80832924(this, D_808548B4); + Player_ProcessAnimSfxList(this, D_808548B4); } -static struct_80832924 D_808548D8[] = { +static AnimSfxEntry D_808548D8[] = { { 0, 0x300A }, { 0, 0x3012 }, { 0, 0x301A }, { 0, 0x3022 }, { 0, 0x3034 }, { 0, 0x303C }, { 0, 0x3044 }, { 0, 0x304C }, { 0, -0x3054 }, }; @@ -12101,7 +12532,7 @@ void func_8084C81C(Player* this, PlayState* play) { return; } - func_80832924(this, D_808548D8); + Player_ProcessAnimSfxList(this, D_808548D8); } static Vec3f D_808548FC[] = { @@ -12134,8 +12565,8 @@ s32 func_8084C89C(PlayState* play, Player* this, s32 arg2, f32* arg3) { *arg3 = func_8083973C(play, this, &D_808548FC[arg2], &sp40); return (sp4C < *arg3) && (*arg3 < sp50) && - !func_80839768(play, this, &D_80854914[arg2], &sp30, &sp2C, &sp34) && - !func_80839768(play, this, &D_8085492C[arg2], &sp30, &sp2C, &sp34); + !Player_PosVsWallLineTest(play, this, &D_80854914[arg2], &sp30, &sp2C, &sp34) && + !Player_PosVsWallLineTest(play, this, &D_8085492C[arg2], &sp30, &sp2C, &sp34); } s32 func_8084C9BC(Player* this, PlayState* play) { @@ -12156,7 +12587,7 @@ s32 func_8084C9BC(Player* this, PlayState* play) { } } - if ((play->csCtx.state == CS_STATE_IDLE) && (play->transitionMode == 0) && + if ((play->csCtx.state == CS_STATE_IDLE) && (play->transitionMode == TRANS_MODE_OFF) && (EN_HORSE_CHECK_1(rideActor) || EN_HORSE_CHECK_4(rideActor))) { this->stateFlags2 |= PLAYER_STATE2_DO_ACTION_DOWN; @@ -12165,7 +12596,7 @@ s32 func_8084C9BC(Player* this, PlayState* play) { rideActor->actor.child = NULL; func_80835DAC(play, this, func_8084D3E4, 0); this->unk_878 = sp34 - rideActor->actor.world.pos.y; - func_80832264(play, this, + Player_AnimPlayOnce(play, this, (this->mountSide < 0) ? &gPlayerAnim_link_uma_left_down : &gPlayerAnim_link_uma_right_down); return 1; @@ -12233,7 +12664,7 @@ static u8 D_80854998[2][2] = { static Vec3s D_8085499C = { -69, 7146, -266 }; -static struct_80832924 D_808549A4[] = { +static AnimSfxEntry D_808549A4[] = { { NA_SE_PL_CALM_HIT, 0x830 }, { NA_SE_PL_CALM_HIT, 0x83A }, { NA_SE_PL_CALM_HIT, 0x844 }, { NA_SE_PL_CALM_PAT, 0x85C }, { NA_SE_PL_CALM_PAT, 0x86E }, { NA_SE_PL_CALM_PAT, 0x87E }, { NA_SE_PL_CALM_PAT, 0x884 }, { NA_SE_PL_CALM_PAT, -0x888 }, @@ -12285,7 +12716,7 @@ void func_8084CC98(Player* this, PlayState* play) { } else if (rand < 0.2f) { temp = 1; } - func_80832264(play, this, D_8085498C[temp]); + Player_AnimPlayOnce(play, this, D_8085498C[temp]); } else { this->skelAnime.animation = D_80854944[this->unk_850 - 2]; Animation_SetMorph(play, &this->skelAnime, 8.0f); @@ -12298,11 +12729,11 @@ void func_8084CC98(Player* this, PlayState* play) { if (this->unk_850 == 1) { if ((D_808535E0 != 0) || func_8083224C(play)) { - func_80832264(play, this, &gPlayerAnim_link_uma_wait_3); + Player_AnimPlayOnce(play, this, &gPlayerAnim_link_uma_wait_3); } else if (LinkAnimation_Update(play, &this->skelAnime)) { this->unk_850 = 99; } else if (this->skelAnime.animation == &gPlayerAnim_link_uma_wait_1) { - func_80832924(this, D_808549A4); + Player_ProcessAnimSfxList(this, D_808549A4); } } else { this->skelAnime.curFrame = rideActor->curFrame; @@ -12312,14 +12743,14 @@ void func_8084CC98(Player* this, PlayState* play) { AnimationContext_SetCopyAll(play, this->skelAnime.limbCount, this->skelAnime.morphTable, this->skelAnime.jointTable); - if ((play->csCtx.state != CS_STATE_IDLE) || (this->csMode != 0)) { - if (this->csMode == 7) { - this->csMode = 0; + if ((play->csCtx.state != CS_STATE_IDLE) || (this->csAction != 0)) { + if (this->csAction == 7) { + this->csAction = 0; } this->unk_6AD = 0; this->unk_84F = 0; } else if ((this->unk_850 < 2) || (this->unk_850 >= 4)) { - D_808535E0 = func_80836670(this, play); + D_808535E0 = Player_UpdateUpperBody(this, play); if (D_808535E0 != 0) { this->unk_84F = 0; } @@ -12331,32 +12762,32 @@ void func_8084CC98(Player* this, PlayState* play) { this->currentYaw = this->actor.shape.rot.y = rideActor->actor.shape.rot.y; - if ((this->csMode != 0) || + if ((this->csAction != 0) || (!func_8083224C(play) && ((rideActor->actor.speedXZ != 0.0f) || !func_8083B644(this, play)) && !func_8083C1DC(this, play))) { if (D_808535E0 == 0) { if (this->unk_84F != 0) { - if (LinkAnimation_Update(play, &this->skelAnime2)) { + if (LinkAnimation_Update(play, &this->upperSkelAnime)) { rideActor->stateFlags &= ~ENHORSE_FLAG_8; this->unk_84F = 0; } - if (this->skelAnime2.animation == &gPlayerAnim_link_uma_stop_muti) { - if (LinkAnimation_OnFrame(&this->skelAnime2, 23.0f)) { + if (this->upperSkelAnime.animation == &gPlayerAnim_link_uma_stop_muti) { + if (LinkAnimation_OnFrame(&this->upperSkelAnime, 23.0f)) { Player_PlaySfx(&this->actor, NA_SE_IT_LASH); func_80832698(this, NA_SE_VO_LI_LASH); } AnimationContext_SetCopyAll(play, this->skelAnime.limbCount, this->skelAnime.jointTable, - this->skelAnime2.jointTable); + this->upperSkelAnime.jointTable); } else { - if (LinkAnimation_OnFrame(&this->skelAnime2, 10.0f)) { + if (LinkAnimation_OnFrame(&this->upperSkelAnime, 10.0f)) { Player_PlaySfx(&this->actor, NA_SE_IT_LASH); func_80832698(this, NA_SE_VO_LI_LASH); } AnimationContext_SetCopyTrue(play, this->skelAnime.limbCount, this->skelAnime.jointTable, - this->skelAnime2.jointTable, D_80853410); + this->upperSkelAnime.jointTable, sUpperBodyLimbCopyMap); } } else { LinkAnimationHeader* anim = NULL; @@ -12370,7 +12801,7 @@ void func_8084CC98(Player* this, PlayState* play) { } if (anim != NULL) { - LinkAnimation_PlayOnce(play, &this->skelAnime2, anim); + LinkAnimation_PlayOnce(play, &this->upperSkelAnime, anim); this->unk_84F = 1; } } @@ -12389,7 +12820,7 @@ void func_8084CC98(Player* this, PlayState* play) { return; } - if ((this->csMode != 0) || (!func_8084C9BC(this, play) && !func_8083B040(this, play))) { + if ((this->csAction != 0) || (!func_8084C9BC(this, play) && !func_8083B040(this, play))) { if (this->unk_664 != NULL) { if (func_8002DD78(this) != 0) { this->unk_6BE = func_8083DB98(this, 1) - this->actor.shape.rot.y; @@ -12411,7 +12842,7 @@ void func_8084CC98(Player* this, PlayState* play) { } } -static struct_80832924 D_808549C4[] = { +static AnimSfxEntry D_808549C4[] = { { 0, 0x2800 }, { NA_SE_PL_GET_OFF_HORSE, 0x80A }, { NA_SE_PL_SLIPDOWN, -0x819 }, @@ -12443,28 +12874,28 @@ void func_8084D3E4(Player* this, PlayState* play) { } else { D_808549C4[0].field = 0x281D; } - func_80832924(this, D_808549C4); + Player_ProcessAnimSfxList(this, D_808549C4); } } -static struct_80832924 D_808549D0[] = { +static AnimSfxEntry D_808549D0[] = { { NA_SE_PL_SWIM, -0x800 }, }; void func_8084D530(Player* this, f32* arg1, f32 arg2, s16 arg3) { func_8084AEEC(this, arg1, arg2, arg3); - func_80832924(this, D_808549D0); + Player_ProcessAnimSfxList(this, D_808549D0); } void func_8084D574(PlayState* play, Player* this, s16 arg2) { - func_80835C58(play, this, func_8084D84C, 0); + Player_SetupAction(play, this, func_8084D84C, 0); this->actor.shape.rot.y = this->currentYaw = arg2; - func_80832C6C(play, this, &gPlayerAnim_link_swimer_swim); + Player_AnimChangeLoopSlowMorph(play, this, &gPlayerAnim_link_swimer_swim); } void func_8084D5CC(PlayState* play, Player* this) { - func_80835C58(play, this, func_8084DAB4, 0); - func_80832C6C(play, this, &gPlayerAnim_link_swimer_swim); + Player_SetupAction(play, this, func_8084DAB4, 0); + Player_AnimChangeLoopSlowMorph(play, this, &gPlayerAnim_link_swimer_swim); } void func_8084D610(Player* this, PlayState* play) { @@ -12474,7 +12905,7 @@ void func_8084D610(Player* this, PlayState* play) { func_80832CB0(play, this, &gPlayerAnim_link_swimer_swim_wait); func_8084B000(this); - if (!func_8083224C(play) && !func_80837348(play, this, D_80854444, 1) && + if (!func_8083224C(play) && !Player_TryActionChangeList(play, this, D_80854444, 1) && !func_8083D12C(play, this, sControlInput)) { if (this->unk_6AD != 1) { this->unk_6AD = 0; @@ -12485,11 +12916,11 @@ void func_8084D610(Player* this, PlayState* play) { sp32 = this->actor.shape.rot.y; if (this->actor.bgCheckFlags & 1) { - func_8083A098(this, D_80853914[PLAYER_ANIMGROUP_short_landing][this->modelAnimType], play); + func_8083A098(this, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_short_landing, this->modelAnimType), play); func_808328A0(this); } } else { - func_80837268(this, &sp34, &sp32, 0.0f, play); + Player_GetMovementSpeedAndYaw(this, &sp34, &sp32, 0.0f, play); if (sp34 != 0.0f) { s16 temp = this->actor.shape.rot.y - sp32; @@ -12533,8 +12964,8 @@ void func_8084D84C(Player* this, PlayState* play) { func_8084B158(play, this, sControlInput, this->linearVelocity); func_8084B000(this); - if (!func_80837348(play, this, D_80854444, 1) && !func_8083D12C(play, this, sControlInput)) { - func_80837268(this, &sp34, &sp32, 0.0f, play); + if (!Player_TryActionChangeList(play, this, D_80854444, 1) && !func_8083D12C(play, this, sControlInput)) { + Player_GetMovementSpeedAndYaw(this, &sp34, &sp32, 0.0f, play); temp = this->actor.shape.rot.y - sp32; if ((sp34 == 0.0f) || (ABS(temp) > 0x6000) || (this->currentBoots == PLAYER_BOOTS_IRON)) { @@ -12578,7 +13009,7 @@ s32 func_8084D980(PlayState* play, Player* this, f32* arg2, s16* arg3) { } if (anim != this->skelAnime.animation) { - func_80832C6C(play, this, anim); + Player_AnimChangeLoopSlowMorph(play, this, anim); return 1; } @@ -12592,8 +13023,8 @@ void func_8084DAB4(Player* this, PlayState* play) { func_8084B158(play, this, sControlInput, this->linearVelocity); func_8084B000(this); - if (!func_80837348(play, this, D_80854444, 1) && !func_8083D12C(play, this, sControlInput)) { - func_80837268(this, &sp2C, &sp2A, 0.0f, play); + if (!Player_TryActionChangeList(play, this, D_80854444, 1) && !func_8083D12C(play, this, sControlInput)) { + Player_GetMovementSpeedAndYaw(this, &sp2C, &sp2A, 0.0f, play); if (sp2C == 0.0f) { func_80838F18(play, this); @@ -12611,7 +13042,7 @@ void func_8084DBC4(PlayState* play, Player* this, f32 arg2) { f32 sp2C; s16 sp2A; - func_80837268(this, &sp2C, &sp2A, 0.0f, play); + Player_GetMovementSpeedAndYaw(this, &sp2C, &sp2A, 0.0f, play); func_8084AEEC(this, &this->linearVelocity, sp2C * 0.5f, sp2A); func_8084AEEC(this, &this->actor.velocity.y, arg2, this->currentYaw); } @@ -12621,7 +13052,7 @@ void func_8084DC48(Player* this, PlayState* play) { this->stateFlags2 |= PLAYER_STATE2_DISABLE_ROTATION_Z_TARGET; this->actor.gravity = 0.0f; - func_80836670(this, play); + Player_UpdateUpperBody(this, play); if (!func_8083B040(this, play)) { if (this->currentBoots == PLAYER_BOOTS_IRON) { @@ -12650,7 +13081,7 @@ void func_8084DC48(Player* this, PlayState* play) { func_8084DBC4(play, this, -2.0f); } else { this->unk_84F++; - func_80832C6C(play, this, &gPlayerAnim_link_swimer_swim_wait); + Player_AnimChangeLoopSlowMorph(play, this, &gPlayerAnim_link_swimer_swim_wait); } } else if (this->unk_84F == 1) { LinkAnimation_Update(play, &this->skelAnime); @@ -12659,7 +13090,7 @@ void func_8084DC48(Player* this, PlayState* play) { if (this->unk_6C2 < 10000) { this->unk_84F++; this->unk_850 = this->actor.yDistToWater; - func_80832C6C(play, this, &gPlayerAnim_link_swimer_swim); + Player_AnimChangeLoopSlowMorph(play, this, &gPlayerAnim_link_swimer_swim); } } else if (!func_8083D12C(play, this, sControlInput)) { sp2C = (this->unk_850 * 0.018f) + 4.0f; @@ -12794,12 +13225,12 @@ s32 func_8084DFF4(PlayState* play, Player* this) { } else { if (Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING) { if (this->getItemId == GI_GAUNTLETS_SILVER && !IS_RANDO) { - play->nextEntranceIndex = 0x0123; - play->sceneLoadFlag = 0x14; + play->nextEntranceIndex = ENTR_DESERT_COLOSSUS_0; + play->transitionTrigger = TRANS_TRIGGER_START; gSaveContext.nextCutsceneIndex = 0xFFF1; - play->fadeTransition = 0xF; + play->transitionType = TRANS_TYPE_SANDSTORM_END; this->stateFlags1 &= ~PLAYER_STATE1_IN_CUTSCENE; - func_80852FFC(play, NULL, 8); + Player_TryCsAction(play, NULL, 8); } // Set unk_862 to 0 early to not have the game draw non-custom colored models for a split second. @@ -12866,11 +13297,18 @@ void func_8084E368(Player* this, PlayState* play) { func_8084AEEC(this, &this->linearVelocity, 0.0f, this->actor.shape.rot.y); } -static s16 D_808549D4[] = { 0x0600, 0x04F6, 0x0604, 0x01F1, 0x0568, 0x05F4 }; +static s16 sWarpSongEntrances[] = { + ENTR_SACRED_FOREST_MEADOW_2, + ENTR_DEATH_MOUNTAIN_CRATER_4, + ENTR_LAKE_HYLIA_8, + ENTR_DESERT_COLOSSUS_5, + ENTR_GRAVEYARD_7, + ENTR_TEMPLE_OF_TIME_7, +}; void func_8084E3C4(Player* this, PlayState* play) { if (LinkAnimation_Update(play, &this->skelAnime)) { - func_808322A4(play, this, &gPlayerAnim_link_normal_okarina_swing); + Player_AnimPlayLoopAdjusted(play, this, &gPlayerAnim_link_normal_okarina_swing); this->unk_850 = 1; if (this->stateFlags2 & (PLAYER_STATE2_NEAR_OCARINA_ACTOR | PLAYER_STATE2_PLAY_FOR_ACTOR)) { this->stateFlags2 |= PLAYER_STATE2_ATTEMPT_PLAY_FOR_ACTOR; @@ -12900,14 +13338,14 @@ void func_8084E3C4(Player* this, PlayState* play) { this->stateFlags2 &= ~(PLAYER_STATE2_NEAR_OCARINA_ACTOR | PLAYER_STATE2_ATTEMPT_PLAY_FOR_ACTOR | PLAYER_STATE2_PLAY_FOR_ACTOR); this->unk_6A8 = NULL; } else if (play->msgCtx.ocarinaMode == OCARINA_MODE_02) { - gSaveContext.respawn[RESPAWN_MODE_RETURN].entranceIndex = D_808549D4[play->msgCtx.lastPlayedSong]; + gSaveContext.respawn[RESPAWN_MODE_RETURN].entranceIndex = sWarpSongEntrances[play->msgCtx.lastPlayedSong]; gSaveContext.respawn[RESPAWN_MODE_RETURN].playerParams = 0x5FF; gSaveContext.respawn[RESPAWN_MODE_RETURN].data = play->msgCtx.lastPlayedSong; - this->csMode = 0; + this->csAction = 0; this->stateFlags1 &= ~PLAYER_STATE1_IN_CUTSCENE; - func_80852FFC(play, NULL, 8); + Player_TryCsAction(play, NULL, 8); play->mainCamera.unk_14C &= ~8; this->stateFlags1 |= PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE; @@ -12936,7 +13374,7 @@ void func_8084E604(Player* this, PlayState* play) { func_8083721C(this); } -static struct_80832924 D_808549E0[] = { +static AnimSfxEntry D_808549E0[] = { { 0, 0x3857 }, { NA_SE_VO_LI_CLIMB_END, 0x2057 }, { NA_SE_VO_LI_AUTO_JUMP, 0x2045 }, @@ -12992,9 +13430,9 @@ void func_8084E6D4(Player* this, PlayState* play) { } if (this->skelAnime.animation == &gPlayerAnim_link_normal_box_kick) { - func_808322D0(play, this, &gPlayerAnim_link_demo_get_itemB); + Player_AnimPlayOnceAdjusted(play, this, &gPlayerAnim_link_demo_get_itemB); } else { - func_808322D0(play, this, &gPlayerAnim_link_demo_get_itemA); + Player_AnimPlayOnceAdjusted(play, this, &gPlayerAnim_link_demo_get_itemA); } this->unk_850 = 2; @@ -13003,7 +13441,7 @@ void func_8084E6D4(Player* this, PlayState* play) { } else { if (this->unk_850 == 0) { if (!LINK_IS_ADULT) { - func_80832924(this, D_808549E0); + Player_ProcessAnimSfxList(this, D_808549E0); } return; } @@ -13018,15 +13456,15 @@ void func_8084E6D4(Player* this, PlayState* play) { } } -static struct_80832924 D_808549F0[] = { +static AnimSfxEntry D_808549F0[] = { { NA_SE_IT_MASTER_SWORD_SWING, -0x83C }, }; void func_8084E988(Player* this) { - func_80832924(this, D_808549F0); + Player_ProcessAnimSfxList(this, D_808549F0); } -static struct_80832924 D_808549F4[] = { +static AnimSfxEntry D_808549F4[] = { { NA_SE_VO_LI_AUTO_JUMP, 0x2005 }, { 0, -0x280F }, }; @@ -13048,7 +13486,7 @@ void func_8084E9AC(Player* this, PlayState* play) { } if (!LINK_IS_ADULT) { - func_80832924(this, D_808549F4); + Player_ProcessAnimSfxList(this, D_808549F4); } else { func_8084E988(this); } @@ -13166,7 +13604,7 @@ void func_8084EAC0(Player* this, PlayState* play) { } } - func_808322A4(play, this, &gPlayerAnim_link_bottle_drink_demo_wait); + Player_AnimPlayLoopAdjusted(play, this, &gPlayerAnim_link_bottle_drink_demo_wait); this->unk_850 = 1; return; } @@ -13175,7 +13613,7 @@ void func_8084EAC0(Player* this, PlayState* play) { func_8005B1A4(Play_GetCamera(play, 0)); } else if (this->unk_850 == 1) { if ((gSaveContext.healthAccumulator == 0) && (gSaveContext.magicState != MAGIC_STATE_FILL)) { - func_80832B78(play, this, &gPlayerAnim_link_bottle_drink_demo_end); + Player_AnimChangeOnceMorphAdjusted(play, this, &gPlayerAnim_link_bottle_drink_demo_end); this->unk_850 = 2; Player_UpdateBottleHeld(play, this, ITEM_BOTTLE, PLAYER_IA_BOTTLE); } @@ -13242,10 +13680,10 @@ void func_8084ECA4(Player* this, PlayState* play) { this->unk_84F = i + 1; this->unk_850 = 0; this->interactRangeActor->parent = &this->actor; - Player_UpdateBottleHeld(play, this, catchInfo->itemId, ABS(catchInfo->actionParam)); + Player_UpdateBottleHeld(play, this, catchInfo->itemId, ABS(catchInfo->itemAction)); if (!CVarGetInteger("gFastDrops", 0)) { this->stateFlags1 |= PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE; - func_808322D0(play, this, sp24->unk_04); + Player_AnimPlayOnceAdjusted(play, this, sp24->unk_04); func_80835EA4(play, 4); } } @@ -13255,6 +13693,9 @@ void func_8084ECA4(Player* this, PlayState* play) { } } + //! @bug If the animation is changed at any point above (such as by func_8083C0E8() or + //! Player_AnimPlayOnceAdjusted()), it will change the curFrame to 0. This causes this flag to be set for one frame, + //! at a time when it does not look like Player is swinging the bottle. if (this->skelAnime.curFrame <= 7.0f) { this->stateFlags1 |= PLAYER_STATE1_SWINGING_BOTTLE; } @@ -13294,7 +13735,7 @@ static BottleDropInfo D_80854A28[] = { { ACTOR_EN_INSECT, 2 }, }; -static struct_80832924 D_80854A34[] = { +static AnimSfxEntry D_80854A34[] = { { NA_SE_VO_LI_AUTO_JUMP, 0x2026 }, { NA_SE_EV_BOTTLE_CAP_OPEN, -0x828 }, }; @@ -13320,10 +13761,10 @@ void func_8084EFC0(Player* this, PlayState* play) { return; } - func_80832924(this, D_80854A34); + Player_ProcessAnimSfxList(this, D_80854A34); } -static struct_80832924 D_80854A3C[] = { +static AnimSfxEntry D_80854A3C[] = { { NA_SE_PL_PUT_OUT_ITEM, -0x81E }, }; @@ -13366,7 +13807,7 @@ void func_8084F104(Player* this, PlayState* play) { this->unk_862 = 0; if (this->unk_84F == 1) { - func_80832264(play, this, &gPlayerAnim_link_bottle_read_end); + Player_AnimPlayOnce(play, this, &gPlayerAnim_link_bottle_read_end); this->unk_850 = -1; } else { func_8083C0E8(this, play); @@ -13376,7 +13817,7 @@ void func_8084F104(Player* this, PlayState* play) { } } } else if (this->unk_850 >= 0) { - func_80832924(this, D_80854A3C); + Player_ProcessAnimSfxList(this, D_80854A3C); } if ((this->unk_84F == 0) && (this->unk_664 != NULL)) { @@ -13388,7 +13829,7 @@ void func_8084F308(Player* this, PlayState* play) { this->stateFlags2 |= PLAYER_STATE2_DISABLE_ROTATION_Z_TARGET | PLAYER_STATE2_DISABLE_ROTATION_ALWAYS; if (LinkAnimation_Update(play, &this->skelAnime)) { - func_80832284(play, this, &gPlayerAnim_link_normal_re_dead_attack_wait); + Player_AnimPlayLoop(play, this, &gPlayerAnim_link_normal_re_dead_attack_wait); } if (func_80832594(this, 0, 100)) { @@ -13419,7 +13860,7 @@ void func_8084F390(Player* this, PlayState* play) { return; } - func_8083E298(floorPoly, &sp38, &sp46); + Player_GetSlopeDirection(floorPoly, &sp38, &sp46); sp44 = sp46; if (this->unk_84F != 0) { @@ -13447,9 +13888,9 @@ void func_8084F390(Player* this, PlayState* play) { if (Math_AsymStepToF(&this->linearVelocity, sp50, sp4C, sp48) && (sp50 == 0)) { LinkAnimationHeader* anim; if (this->unk_84F == 0) { - anim = D_80853914[PLAYER_ANIMGROUP_down_slope_slip_end][this->modelAnimType]; + anim = GET_PLAYER_ANIM(PLAYER_ANIMGROUP_down_slope_slip_end, this->modelAnimType); } else { - anim = D_80853914[PLAYER_ANIMGROUP_up_slope_slip_end][this->modelAnimType]; + anim = GET_PLAYER_ANIM(PLAYER_ANIMGROUP_up_slope_slip_end, this->modelAnimType); } func_8083A098(this, anim, play); } @@ -13460,15 +13901,15 @@ void func_8084F390(Player* this, PlayState* play) { } void func_8084F608(Player* this, PlayState* play) { - if ((DECR(this->unk_850) == 0) && func_8083ADD4(play, this)) { + if ((DECR(this->unk_850) == 0) && Player_StartCsAction(play, this)) { func_80852280(play, this, NULL); - func_80835C58(play, this, func_80852E14, 0); + Player_SetupAction(play, this, func_80852E14, 0); func_80852E14(this, play); } } void func_8084F698(Player* this, PlayState* play) { - func_80835C58(play, this, func_8084F608, 0); + Player_SetupAction(play, this, func_8084F608, 0); this->unk_850 = 40; Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_KANKYO, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0x10, true); } @@ -13479,7 +13920,7 @@ void func_8084F710(Player* this, PlayState* play) { if ((this->unk_84F != 0) && (play->csCtx.frames < 0x131)) { this->actor.gravity = 0.0f; this->actor.velocity.y = 0.0f; - } else if (D_80853600 < 150.0f) { + } else if (sYDistToFloor < 150.0f) { if (LinkAnimation_Update(play, &this->skelAnime)) { if (this->unk_850 == 0) { if (this->actor.bgCheckFlags & 1) { @@ -13488,7 +13929,7 @@ void func_8084F710(Player* this, PlayState* play) { this->unk_850 = 1; } } else { - if ((play->sceneNum == SCENE_KOKIRI_FOREST) && func_8083ADD4(play, this)) { + if ((play->sceneNum == SCENE_KOKIRI_FOREST) && Player_StartCsAction(play, this)) { return; } func_80853080(this, play); @@ -13497,7 +13938,7 @@ void func_8084F710(Player* this, PlayState* play) { Math_SmoothStepToF(&this->actor.velocity.y, 2.0f, 0.3f, 8.0f, 0.5f); } - if ((play->sceneNum == SCENE_CHAMBER_OF_THE_SAGES) && func_8083ADD4(play, this)) { + if ((play->sceneNum == SCENE_CHAMBER_OF_THE_SAGES) && Player_StartCsAction(play, this)) { return; } @@ -13511,12 +13952,12 @@ void func_8084F710(Player* this, PlayState* play) { void func_8084F88C(Player* this, PlayState* play) { LinkAnimation_Update(play, &this->skelAnime); - if ((this->unk_850++ > 8) && (play->sceneLoadFlag == 0)) { + if ((this->unk_850++ > 8) && (play->transitionTrigger == TRANS_TRIGGER_OFF)) { if (this->unk_84F != 0) { if (play->sceneNum == SCENE_ICE_CAVERN) { Play_TriggerRespawn(play); - play->nextEntranceIndex = 0x0088; + play->nextEntranceIndex = ENTR_ICE_CAVERN_0; } else if (this->unk_84F < 0) { Play_TriggerRespawn(play); // In ER, handle DMT and other special void outs to respawn from last entrance from grotto @@ -13527,16 +13968,16 @@ void func_8084F88C(Player* this, PlayState* play) { Play_TriggerVoidOut(play); } - play->fadeTransition = 4; + play->transitionType = TRANS_TYPE_FADE_BLACK_FAST; func_80078884(NA_SE_OC_ABYSS); } else { - play->fadeTransition = 2; - gSaveContext.nextTransitionType = 2; + play->transitionType = TRANS_TYPE_FADE_BLACK; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE; gSaveContext.seqId = (u8)NA_BGM_DISABLED; gSaveContext.natureAmbienceId = 0xFF; } - play->sceneLoadFlag = 0x14; + play->transitionTrigger = TRANS_TRIGGER_START; } } @@ -13561,7 +14002,7 @@ void func_8084FA54(Player* this, PlayState* play) { func_8083AD4C(play, this); LinkAnimation_Update(play, &this->skelAnime); - func_80836670(this, play); + Player_UpdateUpperBody(this, play); this->unk_6BE = func_8084ABD8(play, this, 1, 0) - this->actor.shape.rot.y; this->unk_6AE |= 0x80; @@ -13697,44 +14138,50 @@ void func_8084FF7C(Player* this) { } } +/** + * Updates the Bunny Hood's floppy ears' rotation and velocity. + */ void Player_UpdateBunnyEars(Player* this) { - s32 pad; - s16 sp2A; - s16 sp28; - s16 sp26; + Vec3s force; + s16 angle; - D_80858AC8.unk_06 -= D_80858AC8.unk_06 >> 3; - D_80858AC8.unk_08 -= D_80858AC8.unk_08 >> 3; - D_80858AC8.unk_06 += -D_80858AC8.unk_00 >> 2; - D_80858AC8.unk_08 += -D_80858AC8.unk_02 >> 2; + // Damping: decay by 1/8 the previous value each frame + sBunnyEarKinematics.angVel.x -= sBunnyEarKinematics.angVel.x >> 3; + sBunnyEarKinematics.angVel.y -= sBunnyEarKinematics.angVel.y >> 3; + + // Elastic restorative force + sBunnyEarKinematics.angVel.x += -sBunnyEarKinematics.rot.x >> 2; + sBunnyEarKinematics.angVel.y += -sBunnyEarKinematics.rot.y >> 2; - sp26 = this->actor.world.rot.y - this->actor.shape.rot.y; + // Forcing from motion relative to shape frame + angle = this->actor.world.rot.y - this->actor.shape.rot.y; + force.x = (s32)(this->actor.speedXZ * -200.0f * Math_CosS(angle) * (Rand_CenteredFloat(2.0f) + 10.0f)) & 0xFFFF; + force.y = (s32)(this->actor.speedXZ * 100.0f * Math_SinS(angle) * (Rand_CenteredFloat(2.0f) + 10.0f)) & 0xFFFF; - sp28 = (s32)(this->actor.speedXZ * -200.0f * Math_CosS(sp26) * (Rand_CenteredFloat(2.0f) + 10.0f)) & 0xFFFF; - sp2A = (s32)(this->actor.speedXZ * 100.0f * Math_SinS(sp26) * (Rand_CenteredFloat(2.0f) + 10.0f)) & 0xFFFF; + sBunnyEarKinematics.angVel.x += force.x >> 2; + sBunnyEarKinematics.angVel.y += force.y >> 2; - D_80858AC8.unk_06 += sp28 >> 2; - D_80858AC8.unk_08 += sp2A >> 2; - - if (D_80858AC8.unk_06 > 6000) { - D_80858AC8.unk_06 = 6000; - } else if (D_80858AC8.unk_06 < -6000) { - D_80858AC8.unk_06 = -6000; + // Clamp both angular velocities to [-6000, 6000] + if (sBunnyEarKinematics.angVel.x > 6000) { + sBunnyEarKinematics.angVel.x = 6000; + } else if (sBunnyEarKinematics.angVel.x < -6000) { + sBunnyEarKinematics.angVel.x = -6000; + } + if (sBunnyEarKinematics.angVel.y > 6000) { + sBunnyEarKinematics.angVel.y = 6000; + } else if (sBunnyEarKinematics.angVel.y < -6000) { + sBunnyEarKinematics.angVel.y = -6000; } - if (D_80858AC8.unk_08 > 6000) { - D_80858AC8.unk_08 = 6000; - } else if (D_80858AC8.unk_08 < -6000) { - D_80858AC8.unk_08 = -6000; - } + // Add angular velocity to rotations + sBunnyEarKinematics.rot.x += sBunnyEarKinematics.angVel.x; + sBunnyEarKinematics.rot.y += sBunnyEarKinematics.angVel.y; - D_80858AC8.unk_00 += D_80858AC8.unk_06; - D_80858AC8.unk_02 += D_80858AC8.unk_08; - - if (D_80858AC8.unk_00 < 0) { - D_80858AC8.unk_04 = D_80858AC8.unk_00 >> 1; + // swivel ears outwards if bending backwards + if (sBunnyEarKinematics.rot.x < 0) { + sBunnyEarKinematics.rot.z = sBunnyEarKinematics.rot.x >> 1; } else { - D_80858AC8.unk_04 = 0; + sBunnyEarKinematics.rot.z = 0; } } @@ -13745,7 +14192,7 @@ s32 func_80850224(Player* this, PlayState* play) { func_80837948(play, this, sp24); - if (sp24 >= 0x18) { + if (sp24 >= PLAYER_MWA_SPIN_ATTACK_1H) { this->stateFlags2 |= PLAYER_STATE2_SPIN_ATTACKING; func_80837530(play, this, 0); return 1; @@ -13806,7 +14253,8 @@ void func_808502D0(Player* this, PlayState* play) { this->stateFlags3 |= PLAYER_STATE3_FINISHED_ATTACKING; } } else if (this->heldItemAction == PLAYER_IA_HAMMER) { - if ((this->meleeWeaponAnimation == 0x16) || (this->meleeWeaponAnimation == 0x13)) { + if ((this->meleeWeaponAnimation == PLAYER_MWA_HAMMER_FORWARD) || + (this->meleeWeaponAnimation == PLAYER_MWA_JUMPSLASH_FINISH)) { static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; Vec3f shockwavePos; f32 sp2C; @@ -13817,8 +14265,8 @@ void func_808502D0(Player* this, PlayState* play) { Math_ScaledStepToS(&this->actor.focus.rot.x, Math_Atan2S(45.0f, sp2C), 800); func_80836AB8(this, 1); - if ((((this->meleeWeaponAnimation == 0x16) && LinkAnimation_OnFrame(&this->skelAnime, 7.0f)) || - ((this->meleeWeaponAnimation == 0x13) && LinkAnimation_OnFrame(&this->skelAnime, 2.0f))) && + if ((((this->meleeWeaponAnimation == PLAYER_MWA_HAMMER_FORWARD) && LinkAnimation_OnFrame(&this->skelAnime, 7.0f)) || + ((this->meleeWeaponAnimation == PLAYER_MWA_JUMPSLASH_FINISH) && LinkAnimation_OnFrame(&this->skelAnime, 2.0f))) && (sp2C > -40.0f) && (sp2C < 40.0f)) { func_80842A28(play, this); EffectSsBlast_SpawnWhiteShockwave(play, &shockwavePos, &zeroVec, &zeroVec); @@ -13841,7 +14289,7 @@ void func_8085063C(Player* this, PlayState* play) { this->stateFlags2 |= PLAYER_STATE2_DISABLE_ROTATION_Z_TARGET; LinkAnimation_Update(play, &this->skelAnime); - func_80836670(this, play); + Player_UpdateUpperBody(this, play); if (this->unk_850 == 0) { Message_StartTextbox(play, 0x3B, &this->actor); @@ -13854,9 +14302,9 @@ void func_8085063C(Player* this, PlayState* play) { if (play->msgCtx.choiceIndex == 0) { //Returns to FW gSaveContext.respawnFlag = 3; - play->sceneLoadFlag = 0x14; + play->transitionTrigger = TRANS_TRIGGER_START; play->nextEntranceIndex = gSaveContext.respawn[RESPAWN_MODE_TOP].entranceIndex; - play->fadeTransition = 5; + play->transitionType = TRANS_TYPE_FADE_WHITE_FAST; func_80088AF0(play); return; } @@ -13908,13 +14356,13 @@ static LinkAnimationHeader* D_80854A70[] = { static u8 D_80854A7C[] = { 70, 10, 10 }; -static struct_80832924 D_80854A80[] = { +static AnimSfxEntry D_80854A80[] = { { NA_SE_PL_SKIP, 0x814 }, { NA_SE_VO_LI_SWORD_N, 0x2014 }, { 0, -0x301A }, }; -static struct_80832924 D_80854A8C[][2] = { +static AnimSfxEntry D_80854A8C[][2] = { { { 0, 0x4014 }, { NA_SE_VO_LI_MAGIC_FROL, -0x201E }, @@ -13980,9 +14428,9 @@ void func_808507F4(Player* this, PlayState* play) { } } else if (this->unk_84F >= 0) { if (this->unk_850 == 0) { - func_80832924(this, D_80854A80); + Player_ProcessAnimSfxList(this, D_80854A80); } else if (this->unk_850 == 1) { - func_80832924(this, D_80854A8C[this->unk_84F]); + Player_ProcessAnimSfxList(this, D_80854A8C[this->unk_84F]); if ((this->unk_84F == 2) && LinkAnimation_OnFrame(&this->skelAnime, 30.0f)) { this->stateFlags1 &= ~(PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE); } @@ -14003,14 +14451,14 @@ void func_80850AEC(Player* this, PlayState* play) { this->stateFlags2 |= PLAYER_STATE2_DISABLE_ROTATION_Z_TARGET; if (LinkAnimation_Update(play, &this->skelAnime)) { - func_80832284(play, this, &gPlayerAnim_link_hook_fly_wait); + Player_AnimPlayLoop(play, this, &gPlayerAnim_link_hook_fly_wait); } Math_Vec3f_Sum(&this->actor.world.pos, &this->actor.velocity, &this->actor.world.pos); if (func_80834FBC(this)) { Math_Vec3f_Copy(&this->actor.prevPos, &this->actor.world.pos); - func_80847BA0(play, this); + Player_ProcessSceneCollision(play, this); temp = this->actor.world.pos.y - this->actor.floorHeight; if (temp > 20.0f) { @@ -14055,7 +14503,7 @@ void func_80850C68(Player* this, PlayState* play) { LinkAnimation_InterpJointMorph(play, &this->skelAnime, 0.5f); } else if (LinkAnimation_Update(play, &this->skelAnime)) { this->unk_860 = 2; - func_80832284(play, this, &gPlayerAnim_link_fishing_wait); + Player_AnimPlayLoop(play, this, &gPlayerAnim_link_fishing_wait); this->unk_850 = 1; } @@ -14064,8 +14512,8 @@ void func_80850C68(Player* this, PlayState* play) { if (this->unk_860 == 0) { func_80853080(this, play); } else if (this->unk_860 == 3) { - func_80835C58(play, this, func_80850E84, 0); - func_80832B0C(play, this, &gPlayerAnim_link_fishing_fish_catch); + Player_SetupAction(play, this, func_80850E84, 0); + Player_AnimChangeOnceMorph(play, this, &gPlayerAnim_link_fishing_fish_catch); } } @@ -14081,18 +14529,18 @@ static void (*D_80854AA4[])(PlayState*, Player*, void*) = { func_80851050, func_80851194, func_808511B4, func_80851248, func_808512E0, }; -static struct_80832924 D_80854AF0[] = { +static AnimSfxEntry D_80854AF0[] = { { 0, 0x2822 }, { NA_SE_PL_CALM_HIT, 0x82D }, { NA_SE_PL_CALM_HIT, 0x833 }, { NA_SE_PL_CALM_HIT, -0x840 }, }; -static struct_80832924 D_80854B00[] = { +static AnimSfxEntry D_80854B00[] = { { NA_SE_VO_LI_SURPRISE, 0x2003 }, { 0, 0x300F }, { 0, 0x3018 }, { 0, 0x301E }, { NA_SE_VO_LI_FALL_L, -0x201F }, }; -static struct_80832924 D_80854B14[] = { +static AnimSfxEntry D_80854B14[] = { { 0, -0x300A }, }; @@ -14308,22 +14756,22 @@ static struct_80854B18 D_80854E50[] = { { 12, &gPlayerAnim_demo_link_nwait }, }; -void func_80850ED8(PlayState* play, Player* this, LinkAnimationHeader* anim) { - func_80832DB0(this); - func_80832B0C(play, this, anim); +void Player_AnimChangeOnceMorphZeroRootYawSpeed(PlayState* play, Player* this, LinkAnimationHeader* anim) { + Player_ZeroRootLimbYaw(this); + Player_AnimChangeOnceMorph(play, this, anim); Player_ZeroSpeedXZ(this); } -void func_80850F1C(PlayState* play, Player* this, LinkAnimationHeader* anim) { - func_80832DB0(this); - LinkAnimation_Change(play, &this->skelAnime, anim, (2.0f / 3.0f), 0.0f, Animation_GetLastFrame(anim), +void Player_AnimChangeOnceMorphAdjustedZeroRootYawSpeed(PlayState* play, Player* this, LinkAnimationHeader* anim) { + Player_ZeroRootLimbYaw(this); + LinkAnimation_Change(play, &this->skelAnime, anim, PLAYER_ANIM_ADJUSTED_SPEED, 0.0f, Animation_GetLastFrame(anim), ANIMMODE_ONCE, -8.0f); Player_ZeroSpeedXZ(this); } -void func_80850F9C(PlayState* play, Player* this, LinkAnimationHeader* anim) { - func_80832DB0(this); - LinkAnimation_Change(play, &this->skelAnime, anim, (2.0f / 3.0f), 0.0f, 0.0f, ANIMMODE_LOOP, -8.0f); +void Player_AnimChangeLoopMorphAdjustedZeroRootYawSpeed(PlayState* play, Player* this, LinkAnimationHeader* anim) { + Player_ZeroRootLimbYaw(this); + LinkAnimation_Change(play, &this->skelAnime, anim, PLAYER_ANIM_ADJUSTED_SPEED, 0.0f, 0.0f, ANIMMODE_LOOP, -8.0f); Player_ZeroSpeedXZ(this); } @@ -14332,53 +14780,53 @@ void func_80851008(PlayState* play, Player* this, void* anim) { } void func_80851030(PlayState* play, Player* this, void* anim) { - func_80850ED8(play, this, anim); + Player_AnimChangeOnceMorphZeroRootYawSpeed(play, this, anim); } void func_80851050(PlayState* play, Player* this, void* anim) { - func_80832DB0(this); - func_80832C2C(play, this, anim); + Player_ZeroRootLimbYaw(this); + Player_AnimChangeFreeze(play, this, anim); Player_ZeroSpeedXZ(this); } void func_80851094(PlayState* play, Player* this, void* anim) { - func_80850F1C(play, this, anim); + Player_AnimChangeOnceMorphAdjustedZeroRootYawSpeed(play, this, anim); } void func_808510B4(PlayState* play, Player* this, void* anim) { - func_80850F9C(play, this, anim); + Player_AnimChangeLoopMorphAdjustedZeroRootYawSpeed(play, this, anim); } void func_808510D4(PlayState* play, Player* this, void* anim) { - func_8083308C(play, this, anim); + Player_AnimReplaceNormalPlayOnceAdjusted(play, this, anim); } void func_808510F4(PlayState* play, Player* this, void* anim) { - func_8083303C(play, this, anim, 0x9C); + Player_AnimReplacePlayOnce(play, this, anim, 0x9C); } void func_80851114(PlayState* play, Player* this, void* anim) { - func_8083313C(play, this, anim); + Player_AnimReplaceNormalPlayLoopAdjusted(play, this, anim); } void func_80851134(PlayState* play, Player* this, void* anim) { - func_808330EC(play, this, anim, 0x9C); + Player_AnimReplacePlayLoop(play, this, anim, 0x9C); } void func_80851154(PlayState* play, Player* this, void* anim) { - func_80832264(play, this, anim); + Player_AnimPlayOnce(play, this, anim); } void func_80851174(PlayState* play, Player* this, void* anim) { - func_80832284(play, this, anim); + Player_AnimPlayLoop(play, this, anim); } void func_80851194(PlayState* play, Player* this, void* anim) { - func_808322D0(play, this, anim); + Player_AnimPlayOnceAdjusted(play, this, anim); } void func_808511B4(PlayState* play, Player* this, void* anim) { - func_808322A4(play, this, anim); + Player_AnimPlayLoopAdjusted(play, this, anim); } void func_808511D4(PlayState* play, Player* this, void* anim) { @@ -14387,7 +14835,7 @@ void func_808511D4(PlayState* play, Player* this, void* anim) { void func_808511FC(PlayState* play, Player* this, void* anim) { if (LinkAnimation_Update(play, &this->skelAnime)) { - func_80850F9C(play, this, anim); + Player_AnimChangeLoopMorphAdjustedZeroRootYawSpeed(play, this, anim); this->unk_850 = 1; } } @@ -14395,28 +14843,28 @@ void func_808511FC(PlayState* play, Player* this, void* anim) { void func_80851248(PlayState* play, Player* this, void* anim) { if (LinkAnimation_Update(play, &this->skelAnime)) { func_80832DBC(this); - func_808322A4(play, this, anim); + Player_AnimPlayLoopAdjusted(play, this, anim); } } void func_80851294(PlayState* play, Player* this, void* anim) { if (LinkAnimation_Update(play, &this->skelAnime)) { - func_8083313C(play, this, anim); + Player_AnimReplaceNormalPlayLoopAdjusted(play, this, anim); this->unk_850 = 1; } } void func_808512E0(PlayState* play, Player* this, void* arg2) { LinkAnimation_Update(play, &this->skelAnime); - func_80832924(this, arg2); + Player_ProcessAnimSfxList(this, arg2); } void func_80851314(Player* this) { - if ((this->unk_448 == NULL) || (this->unk_448->update == NULL)) { - this->unk_448 = NULL; + if ((this->csActor == NULL) || (this->csActor->update == NULL)) { + this->csActor = NULL; } - this->unk_664 = this->unk_448; + this->unk_664 = this->csActor; if (this->unk_664 != NULL) { this->actor.shape.rot.y = func_8083DB98(this, 0); @@ -14428,7 +14876,7 @@ void func_80851368(PlayState* play, Player* this, CsCmdActorAction* arg2) { this->stateFlags2 |= PLAYER_STATE2_UNDERWATER; this->stateFlags1 &= ~(PLAYER_STATE1_JUMPING | PLAYER_STATE1_FREEFALL); - func_80832284(play, this, &gPlayerAnim_link_swimer_swim); + Player_AnimPlayLoop(play, this, &gPlayerAnim_link_swimer_swim); } void func_808513BC(PlayState* play, Player* this, CsCmdActorAction* arg2) { @@ -14447,9 +14895,9 @@ void func_808513BC(PlayState* play, Player* this, CsCmdActorAction* arg2) { if (LinkAnimation_Update(play, &this->skelAnime)) { if (this->unk_84F == 1) { - func_80832C6C(play, this, &gPlayerAnim_link_swimer_swim_wait); + Player_AnimChangeLoopSlowMorph(play, this, &gPlayerAnim_link_swimer_swim_wait); } else { - func_80832284(play, this, &gPlayerAnim_link_swimer_swim_wait); + Player_AnimPlayLoop(play, this, &gPlayerAnim_link_swimer_swim_wait); } } @@ -14468,7 +14916,7 @@ void func_808514C0(PlayState* play, Player* this, CsCmdActorAction* arg2) { LinkAnimation_Update(play, &this->skelAnime); if (func_8008F128(this) || (this->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD)) { - func_80836670(this, play); + Player_UpdateUpperBody(this, play); return; } @@ -14489,12 +14937,12 @@ void func_808515A4(PlayState* play, Player* this, CsCmdActorAction* arg2) { return; } - anim = D_80853914[PLAYER_ANIMGROUP_nwait][this->modelAnimType]; + anim = GET_PLAYER_ANIM(PLAYER_ANIMGROUP_nwait, this->modelAnimType); - if ((this->unk_446 == 6) || (this->unk_446 == 0x2E)) { - func_80832264(play, this, anim); + if ((this->cueId == 6) || (this->cueId == 0x2E)) { + Player_AnimPlayOnce(play, this, anim); } else { - func_80832DB0(this); + Player_ZeroRootLimbYaw(this); LinkAnimation_Change(play, &this->skelAnime, anim, (2.0f / 3.0f), 0.0f, Animation_GetLastFrame(anim), ANIMMODE_LOOP, -4.0f); } @@ -14504,7 +14952,7 @@ void func_808515A4(PlayState* play, Player* this, CsCmdActorAction* arg2) { void func_80851688(PlayState* play, Player* this, CsCmdActorAction* arg2) { if (func_8084B3CC(play, this) == 0) { - if ((this->csMode == 0x31) && (play->csCtx.state == CS_STATE_IDLE)) { + if ((this->csAction == 0x31) && (play->csCtx.state == CS_STATE_IDLE)) { func_8002DF54(play, NULL, 7); return; } @@ -14517,19 +14965,19 @@ void func_80851688(PlayState* play, Player* this, CsCmdActorAction* arg2) { LinkAnimation_Update(play, &this->skelAnime); if (func_8008F128(this) || (this->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD)) { - func_80836670(this, play); + Player_UpdateUpperBody(this, play); } } } -static struct_80832924 D_80855188[] = { +static AnimSfxEntry D_80855188[] = { { 0, 0x302A }, { 0, -0x3030 }, }; void func_80851750(PlayState* play, Player* this, CsCmdActorAction* arg2) { LinkAnimation_Update(play, &this->skelAnime); - func_80832924(this, D_80855188); + Player_ProcessAnimSfxList(this, D_80855188); } void func_80851788(PlayState* play, Player* this, CsCmdActorAction* arg2) { @@ -14564,7 +15012,7 @@ void func_80851828(PlayState* play, Player* this, CsCmdActorAction* arg2) { this->unk_850++; if (this->unk_850 > 20) { - this->csMode = 0xB; + this->csAction = 0xB; } } @@ -14577,7 +15025,7 @@ void func_8085190C(PlayState* play, Player* this, CsCmdActorAction* arg2) { if (this->unk_850 != 0) { if (LinkAnimation_Update(play, &this->skelAnime)) { - func_80832284(play, this, func_808334E4(this)); + Player_AnimPlayLoop(play, this, func_808334E4(this)); this->unk_850 = 0; } @@ -14606,8 +15054,8 @@ static Vec3f D_80855198 = { -1.0f, 70.0f, 20.0f }; void func_808519EC(PlayState* play, Player* this, CsCmdActorAction* arg2) { Math_Vec3f_Copy(&this->actor.world.pos, &D_80855198); this->actor.shape.rot.y = -0x8000; - func_808322D0(play, this, this->ageProperties->unk_9C); - func_80832F54(play, this, 0x28F); + Player_AnimPlayOnceAdjusted(play, this, this->ageProperties->unk_9C); + Player_AnimReplaceApplyFlags(play, this, 0x28F); } static struct_808551A4 D_808551A4[] = { @@ -14615,7 +15063,7 @@ static struct_808551A4 D_808551A4[] = { { NA_SE_IT_SWORD_STICK_STN, NA_SE_VO_LI_SWORD_N }, }; -static struct_80832924 D_808551AC[] = { +static AnimSfxEntry D_808551AC[] = { { 0, 0x401D }, { 0, -0x4027 }, }; @@ -14647,7 +15095,7 @@ void func_80851A50(PlayState* play, Player* this, CsCmdActorAction* arg2) { func_80832698(this, NA_SE_VO_LI_SWORD_L); } } else { - func_80832924(this, D_808551AC); + Player_ProcessAnimSfxList(this, D_808551AC); } } @@ -14656,7 +15104,7 @@ void func_80851B90(PlayState* play, Player* this, CsCmdActorAction* arg2) { ANIMMODE_ONCE, 0.0f); } -static struct_80832924 D_808551B4[] = { +static AnimSfxEntry D_808551B4[] = { { 0, -0x281E }, }; @@ -14670,13 +15118,13 @@ void func_80851BE8(PlayState* play, Player* this, CsCmdActorAction* arg2) { LinkAnimation_Change(play, &this->skelAnime, &gPlayerAnim_link_okarina_warp_goal, (2.0f / 3.0f), 10.0f, Animation_GetLastFrame(&gPlayerAnim_link_okarina_warp_goal), ANIMMODE_ONCE, -8.0f); } - func_80832924(this, D_808551B4); + Player_ProcessAnimSfxList(this, D_808551B4); } } void func_80851CA4(PlayState* play, Player* this, CsCmdActorAction* arg2) { if (LinkAnimation_Update(play, &this->skelAnime) && (this->unk_850 == 0) && (this->actor.bgCheckFlags & 1)) { - func_80832264(play, this, &gPlayerAnim_link_normal_back_downB); + Player_AnimPlayOnce(play, this, &gPlayerAnim_link_normal_back_downB); this->unk_850 = 1; } @@ -14686,12 +15134,12 @@ void func_80851CA4(PlayState* play, Player* this, CsCmdActorAction* arg2) { } void func_80851D2C(PlayState* play, Player* this, CsCmdActorAction* arg2) { - func_80850F1C(play, this, &gPlayerAnim_link_normal_okarina_start); + Player_AnimChangeOnceMorphAdjustedZeroRootYawSpeed(play, this, &gPlayerAnim_link_normal_okarina_start); func_8084B498(this); Player_SetModels(this, Player_ActionToModelGroup(this, this->itemAction)); } -static struct_80832924 D_808551B8[] = { +static AnimSfxEntry D_808551B8[] = { { NA_SE_IT_SWORD_PICKOUT, -0x80C }, }; @@ -14701,7 +15149,7 @@ void func_80851D80(PlayState* play, Player* this, CsCmdActorAction* arg2) { if (LinkAnimation_OnFrame(&this->skelAnime, 6.0f)) { func_80846720(play, this, 0); } else { - func_80832924(this, D_808551B8); + Player_ProcessAnimSfxList(this, D_808551B8); } } @@ -14716,26 +15164,26 @@ void func_80851E28(PlayState* play, Player* this, CsCmdActorAction* arg2) { } void func_80851E64(PlayState* play, Player* this, CsCmdActorAction* arg2) { - func_80833064(play, this, &gPlayerAnim_link_swimer_swim_get, 0x98); + Player_AnimReplacePlayOnceAdjusted(play, this, &gPlayerAnim_link_swimer_swim_get, 0x98); } void func_80851E90(PlayState* play, Player* this, CsCmdActorAction* arg2) { - func_8083303C(play, this, &gPlayerAnim_clink_op3_negaeri, 0x9C); + Player_AnimReplacePlayOnce(play, this, &gPlayerAnim_clink_op3_negaeri, 0x9C); func_80832698(this, NA_SE_VO_LI_GROAN); } void func_80851ECC(PlayState* play, Player* this, CsCmdActorAction* arg2) { if (LinkAnimation_Update(play, &this->skelAnime)) { - func_808330EC(play, this, &gPlayerAnim_clink_op3_wait2, 0x9C); + Player_AnimReplacePlayLoop(play, this, &gPlayerAnim_clink_op3_wait2, 0x9C); } } -void func_80851F14(PlayState* play, Player* this, LinkAnimationHeader* anim, struct_80832924* arg3) { +void func_80851F14(PlayState* play, Player* this, LinkAnimationHeader* anim, AnimSfxEntry* arg3) { if (LinkAnimation_Update(play, &this->skelAnime)) { - func_808322A4(play, this, anim); + Player_AnimPlayLoopAdjusted(play, this, anim); this->unk_850 = 1; } else if (this->unk_850 == 0) { - func_80832924(this, arg3); + Player_ProcessAnimSfxList(this, arg3); } } @@ -14744,7 +15192,7 @@ void func_80851F84(PlayState* play, Player* this, CsCmdActorAction* arg2) { func_80851134(play, this, &gPlayerAnim_clink_op3_wait1); } -static struct_80832924 D_808551BC[] = { +static AnimSfxEntry D_808551BC[] = { { NA_SE_VO_LI_RELAX, 0x2023 }, { NA_SE_PL_SLIPDOWN, 0x8EC }, { NA_SE_PL_SLIPDOWN, -0x900 }, @@ -14752,17 +15200,17 @@ static struct_80832924 D_808551BC[] = { void func_80851FB0(PlayState* play, Player* this, CsCmdActorAction* arg2) { if (LinkAnimation_Update(play, &this->skelAnime)) { - func_808330EC(play, this, &gPlayerAnim_clink_op3_wait3, 0x9C); + Player_AnimReplacePlayLoop(play, this, &gPlayerAnim_clink_op3_wait3, 0x9C); this->unk_850 = 1; } else if (this->unk_850 == 0) { - func_80832924(this, D_808551BC); + Player_ProcessAnimSfxList(this, D_808551BC); if (LinkAnimation_OnFrame(&this->skelAnime, 240.0f)) { this->actor.shape.shadowDraw = ActorShadow_DrawFeet; } } } -static struct_80832924 D_808551C8[] = { +static AnimSfxEntry D_808551C8[] = { { NA_SE_PL_LAND_LADDER, 0x843 }, { 0, 0x4854 }, { 0, 0x485A }, @@ -14771,11 +15219,11 @@ static struct_80832924 D_808551C8[] = { void func_80852048(PlayState* play, Player* this, CsCmdActorAction* arg2) { LinkAnimation_Update(play, &this->skelAnime); - func_80832924(this, D_808551C8); + Player_ProcessAnimSfxList(this, D_808551C8); } void func_80852080(PlayState* play, Player* this, CsCmdActorAction* arg2) { - func_80833064(play, this, &gPlayerAnim_clink_demo_futtobi, 0x9D); + Player_AnimReplacePlayOnceAdjusted(play, this, &gPlayerAnim_clink_demo_futtobi, 0x9D); func_80832698(this, NA_SE_VO_LI_FALL_L); } @@ -14793,7 +15241,7 @@ void func_808520BC(PlayState* play, Player* this, CsCmdActorAction* arg2) { this->actor.world.pos.z = distZ * sp4 + startZ; } -static struct_80832924 D_808551D8[] = { +static AnimSfxEntry D_808551D8[] = { { NA_SE_PL_BOUND, 0x1014 }, { NA_SE_PL_BOUND, -0x101E }, }; @@ -14801,7 +15249,7 @@ static struct_80832924 D_808551D8[] = { void func_80852174(PlayState* play, Player* this, CsCmdActorAction* arg2) { func_808520BC(play, this, arg2); LinkAnimation_Update(play, &this->skelAnime); - func_80832924(this, D_808551D8); + Player_ProcessAnimSfxList(this, D_808551D8); } void func_808521B8(PlayState* play, Player* this, CsCmdActorAction* arg2) { @@ -14812,7 +15260,7 @@ void func_808521B8(PlayState* play, Player* this, CsCmdActorAction* arg2) { } void func_808521F4(PlayState* play, Player* this, CsCmdActorAction* arg2) { - func_80832B0C(play, this, D_80853914[PLAYER_ANIMGROUP_nwait][this->modelAnimType]); + Player_AnimChangeOnceMorph(play, this, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_nwait, this->modelAnimType)); Player_ZeroSpeedXZ(this); } @@ -14821,7 +15269,7 @@ void func_80852234(PlayState* play, Player* this, CsCmdActorAction* arg2) { } void func_8085225C(PlayState* play, Player* this, CsCmdActorAction* arg2) { - func_80832F54(play, this, 0x98); + Player_AnimReplaceApplyFlags(play, this, 0x98); } void func_80852280(PlayState* play, Player* this, CsCmdActorAction* arg2) { @@ -14830,7 +15278,7 @@ void func_80852280(PlayState* play, Player* this, CsCmdActorAction* arg2) { void func_80852298(PlayState* play, Player* this, CsCmdActorAction* arg2) { if (LinkAnimation_Update(play, &this->skelAnime)) { - func_8083313C(play, this, &gPlayerAnim_clink_demo_koutai_wait); + Player_AnimReplaceNormalPlayLoopAdjusted(play, this, &gPlayerAnim_clink_demo_koutai_wait); this->unk_850 = 1; } else if (this->unk_850 == 0) { if (LinkAnimation_OnFrame(&this->skelAnime, 10.0f)) { @@ -14839,7 +15287,7 @@ void func_80852298(PlayState* play, Player* this, CsCmdActorAction* arg2) { } } -static struct_80832924 D_808551E0[] = { +static AnimSfxEntry D_808551E0[] = { { 0, 0x300A }, { 0, -0x3018 }, }; @@ -14848,7 +15296,7 @@ void func_80852328(PlayState* play, Player* this, CsCmdActorAction* arg2) { func_80851F14(play, this, &gPlayerAnim_link_demo_furimuki2_wait, D_808551E0); } -static struct_80832924 D_808551E8[] = { +static AnimSfxEntry D_808551E8[] = { { 0, 0x400F }, { 0, -0x4023 }, }; @@ -14859,7 +15307,7 @@ void func_80852358(PlayState* play, Player* this, CsCmdActorAction* arg2) { void func_80852388(PlayState* play, Player* this, CsCmdActorAction* arg2) { if (LinkAnimation_Update(play, &this->skelAnime)) { - func_808322A4(play, this, &gPlayerAnim_demo_link_twait); + Player_AnimPlayLoopAdjusted(play, this, &gPlayerAnim_demo_link_twait); this->unk_850 = 1; } @@ -14870,14 +15318,14 @@ void func_80852388(PlayState* play, Player* this, CsCmdActorAction* arg2) { } } -void func_80852414(PlayState* play, Player* this, LinkAnimationHeader* anim, struct_80832924* arg3) { +void func_80852414(PlayState* play, Player* this, LinkAnimationHeader* anim, AnimSfxEntry* arg3) { func_80851294(play, this, anim); if (this->unk_850 == 0) { - func_80832924(this, arg3); + Player_ProcessAnimSfxList(this, arg3); } } -static struct_80832924 D_808551F0[] = { +static AnimSfxEntry D_808551F0[] = { { 0, 0x300F }, { 0, -0x3021 }, }; @@ -14886,7 +15334,7 @@ void func_80852450(PlayState* play, Player* this, CsCmdActorAction* arg2) { func_80852414(play, this, &gPlayerAnim_clink_demo_koutai_wait, D_808551F0); } -static struct_80832924 D_808551F8[] = { +static AnimSfxEntry D_808551F8[] = { { NA_SE_PL_KNOCK, -0x84E }, }; @@ -14919,7 +15367,7 @@ void func_80852564(PlayState* play, Player* this, CsCmdActorAction* arg2) { this->linearVelocity = 2.0f; this->actor.velocity.y = -1.0f; - func_80832264(play, this, &gPlayerAnim_link_normal_back_downA); + Player_AnimPlayOnce(play, this, &gPlayerAnim_link_normal_back_downA); func_80832698(this, NA_SE_VO_LI_FALL_L); } @@ -14935,7 +15383,7 @@ void func_808525C0(PlayState* play, Player* this, CsCmdActorAction* arg2) { void func_80852608(PlayState* play, Player* this, CsCmdActorAction* arg2) { func_80846720(play, this, 0); - func_808322D0(play, this, &gPlayerAnim_link_demo_return_to_past); + Player_AnimPlayOnceAdjusted(play, this, &gPlayerAnim_link_demo_return_to_past); } void func_80852648(PlayState* play, Player* this, CsCmdActorAction* arg2) { @@ -15031,7 +15479,7 @@ void func_80852944(PlayState* play, Player* this, CsCmdActorAction* arg2) { } } - this->csMode = 0; + this->csAction = 0; this->unk_6AD = 0; } @@ -15057,7 +15505,7 @@ void func_80852A54(PlayState* play, Player* this, CsCmdActorAction* arg2) { } this->skelAnime.moveFlags = 0; - func_80832DB0(this); + Player_ZeroRootLimbYaw(this); } void func_80852B4C(PlayState* play, Player* this, CsCmdActorAction* arg2, struct_80854B18* arg3) { @@ -15073,9 +15521,9 @@ void func_80852B4C(PlayState* play, Player* this, CsCmdActorAction* arg2, struct } } -void func_80852C0C(PlayState* play, Player* this, s32 csMode) { - if ((csMode != 1) && (csMode != 8) && (csMode != 0x31) && (csMode != 7)) { - func_808323B4(play, this); +void func_80852C0C(PlayState* play, Player* this, s32 csAction) { + if ((csAction != 1) && (csAction != 8) && (csAction != 0x31) && (csAction != 7)) { + Player_DetachHeldActor(play, this); } } @@ -15086,7 +15534,7 @@ void func_80852C50(PlayState* play, Player* this, CsCmdActorAction* arg2) { if (play->csCtx.state == CS_STATE_UNSKIPPABLE_INIT) { func_8002DF54(play, NULL, 7); - this->unk_446 = 0; + this->cueId = 0; Player_ZeroSpeedXZ(this); return; } @@ -15096,7 +15544,7 @@ void func_80852C50(PlayState* play, Player* this, CsCmdActorAction* arg2) { return; } - if (this->unk_446 != linkCsAction->action) { + if (this->cueId != linkCsAction->action) { sp24 = D_808547C4[linkCsAction->action]; if (sp24 >= 0) { if ((sp24 == 3) || (sp24 == 4)) { @@ -15115,38 +15563,42 @@ void func_80852C50(PlayState* play, Player* this, CsCmdActorAction* arg2) { this->unk_850 = 0; this->unk_84F = 0; - this->unk_446 = linkCsAction->action; + this->cueId = linkCsAction->action; } - sp24 = D_808547C4[this->unk_446]; + sp24 = D_808547C4[this->cueId]; func_80852B4C(play, this, linkCsAction, &D_80854E50[ABS(sp24)]); + + if (CVarGetInteger("gFixEyesOpenWhileSleeping", 0) && (play->csCtx.linkAction->action == 28 || play->csCtx.linkAction->action == 29)) { + this->skelAnime.jointTable[22].x = 8; + } } void func_80852E14(Player* this, PlayState* play) { - if (this->csMode != this->prevCsMode) { + if (this->csAction != this->prevCsAction) { D_80858AA0 = this->skelAnime.moveFlags; func_80832DBC(this); - this->prevCsMode = this->csMode; - osSyncPrintf("DEMO MODE=%d\n", this->csMode); - func_80852C0C(play, this, this->csMode); - func_80852B4C(play, this, NULL, &D_80854B18[this->csMode]); + this->prevCsAction = this->csAction; + osSyncPrintf("DEMO MODE=%d\n", this->csAction); + func_80852C0C(play, this, this->csAction); + func_80852B4C(play, this, NULL, &D_80854B18[this->csAction]); } - func_80852B4C(play, this, NULL, &D_80854E50[this->csMode]); + func_80852B4C(play, this, NULL, &D_80854E50[this->csAction]); } s32 Player_IsDroppingFish(PlayState* play) { Player* this = GET_PLAYER(play); - return (func_8084EFC0 == this->func_674) && (this->itemAction == PLAYER_IA_BOTTLE_FISH); + return (func_8084EFC0 == this->actionFunc) && (this->itemAction == PLAYER_IA_BOTTLE_FISH); } s32 Player_StartFishing(PlayState* play) { Player* this = GET_PLAYER(play); func_80832564(play, this); - func_80835F44(play, this, ITEM_FISHING_POLE); + Player_UseItem(play, this, ITEM_FISHING_POLE); return 1; } @@ -15154,8 +15606,8 @@ s32 func_80852F38(PlayState* play, Player* this) { if (!Player_InBlockingCsMode(play, this) && (this->invincibilityTimer >= 0) && !func_8008F128(this) && !(this->stateFlags3 & PLAYER_STATE3_HOOKSHOT_TRAVELLING)) { func_80832564(play, this); - func_80835C58(play, this, func_8084F308, 0); - func_80832264(play, this, &gPlayerAnim_link_normal_re_dead_attack); + Player_SetupAction(play, this, func_8084F308, 0); + Player_AnimPlayOnce(play, this, &gPlayerAnim_link_normal_re_dead_attack); this->stateFlags2 |= PLAYER_STATE2_GRABBED_BY_ENEMY; func_80832224(this); func_80832698(this, NA_SE_VO_LI_HELD); @@ -15165,15 +15617,22 @@ s32 func_80852F38(PlayState* play, Player* this) { return false; } -// Sets up player cutscene -s32 func_80852FFC(PlayState* play, Actor* actor, s32 csMode) { +/** + * Tries to starts a cutscene action specified by `csAction`. + * A cutscene action will only start if player is not already in another form of cutscene. + * + * No actors will be halted over the duration of the cutscene action. + * + * @return true if successful starting a `csAction`, false if not + */ +s32 Player_TryCsAction(PlayState* play, Actor* actor, s32 csAction) { Player* this = GET_PLAYER(play); if (!Player_InBlockingCsMode(play, this)) { func_80832564(play, this); - func_80835C58(play, this, func_80852E14, 0); - this->csMode = csMode; - this->unk_448 = actor; + Player_SetupAction(play, this, func_80852E14, 0); + this->csAction = csAction; + this->csActor = actor; func_80832224(this); return 1; } @@ -15182,8 +15641,8 @@ s32 func_80852FFC(PlayState* play, Actor* actor, s32 csMode) { } void func_80853080(Player* this, PlayState* play) { - func_80835C58(play, this, func_80840BC8, 1); - func_80832B0C(play, this, func_80833338(this)); + Player_SetupAction(play, this, func_80840BC8, 1); + Player_AnimChangeOnceMorph(play, this, func_80833338(this)); this->currentYaw = this->actor.shape.rot.y; } @@ -15237,26 +15696,26 @@ void func_80853148(PlayState* play, Actor* actor) { } else { if (func_808332B8(this)) { func_80836898(play, this, func_8083A2F8); - func_80832C6C(play, this, &gPlayerAnim_link_swimer_swim_wait); + Player_AnimChangeLoopSlowMorph(play, this, &gPlayerAnim_link_swimer_swim_wait); } else if ((actor->category != ACTORCAT_NPC) || (this->heldItemAction == PLAYER_IA_FISHING_POLE)) { func_8083A2F8(play, this); if (!func_8008E9C4(this)) { if ((actor != this->naviActor) && (actor->xzDistToPlayer < 40.0f)) { - func_808322D0(play, this, &gPlayerAnim_link_normal_backspace); + Player_AnimPlayOnceAdjusted(play, this, &gPlayerAnim_link_normal_backspace); } else { - func_80832284(play, this, func_80833338(this)); + Player_AnimPlayLoop(play, this, func_80833338(this)); } } } else { func_80836898(play, this, func_8083A2F8); - func_808322D0(play, this, + Player_AnimPlayOnceAdjusted(play, this, (actor->xzDistToPlayer < 40.0f) ? &gPlayerAnim_link_normal_backspace : &gPlayerAnim_link_normal_talk_free); } if (this->skelAnime.animation == &gPlayerAnim_link_normal_backspace) { - func_80832F54(play, this, 0x19); + Player_AnimReplaceApplyFlags(play, this, 0x19); } func_80832224(this); diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index da695e231..3a8da0b39 100644 --- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -1,6 +1,7 @@ #include "file_choose.h" #include +#include #include "textures/title_static/title_static.h" #include "textures/parameter_static/parameter_static.h" @@ -1017,7 +1018,7 @@ void FileChoose_UpdateRandomizer() { return; } - if (!SpoilerFileExists(CVarGetString("gSpoilerLog", ""))) { + if (!SpoilerFileExists(CVarGetString("gSpoilerLog", "")) && !CVarGetInteger("gRandomizerDontGenerateSpoiler", 0)) { CVarSetString("gSpoilerLog", ""); } @@ -1028,6 +1029,10 @@ void FileChoose_UpdateRandomizer() { CVarSetString("gDroppedFile", ""); const char* fileLoc = CVarGetString("gSpoilerLog", ""); Randomizer_ParseSpoiler(fileLoc); + + if (SpoilerFileExists(CVarGetString("gSpoilerLog", "")) && CVarGetInteger("gRandomizerDontGenerateSpoiler", 0)) { + remove(fileLoc); + } } } @@ -1048,6 +1053,7 @@ void FileChoose_UpdateMainMenu(GameState* thisx) { Input* input = &this->state.input[0]; bool dpad = CVarGetInteger("gDpadText", 0); + SoH_ProcessDroppedFiles(); FileChoose_UpdateRandomizer(); if (CHECK_BTN_ALL(input->press.button, BTN_START) || CHECK_BTN_ALL(input->press.button, BTN_A)) { @@ -1238,6 +1244,7 @@ void FileChoose_UpdateQuestMenu(GameState* thisx) { s8 i = 0; bool dpad = CVarGetInteger("gDpadText", 0); + SoH_ProcessDroppedFiles(); FileChoose_UpdateRandomizer(); if (ABS(this->stickRelX) > 30 || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DLEFT | BTN_DRIGHT))) { @@ -1270,8 +1277,6 @@ void FileChoose_UpdateQuestMenu(GameState* thisx) { if (CHECK_BTN_ALL(input->press.button, BTN_A)) { gSaveContext.questId = this->questType[this->buttonIndex]; - gSaveContext.isBossRushPaused = false; - if (this->questType[this->buttonIndex] == QUEST_BOSSRUSH) { Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); this->prevConfigMode = this->configMode; @@ -1331,7 +1336,8 @@ void FileChoose_GenerateRandoSeed(GameState* thisx) { memcpy(Save_GetSaveMetaInfo(this->buttonIndex)->playerName, CVarGetInteger("gLinkDefaultName", 0) ? &linkName : &emptyName, 8); return; - } else { + } + if (!generating) { Randomizer_GenerateSeed(); } } @@ -2830,10 +2836,6 @@ void FileChoose_ConfirmFile(GameState* thisx) { if (this->confirmButtonIndex == FS_BTN_CONFIRM_YES) { func_800AA000(300.0f, 180, 20, 100); Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); - // Reset Boss Rush because it's only ever saved in memory. - if (IS_BOSS_RUSH) { - gSaveContext.questId = QUEST_NORMAL; - } this->selectMode = SM_FADE_OUT; func_800F6964(0xF); } else { @@ -2978,7 +2980,7 @@ void FileChoose_LoadGame(GameState* thisx) { Randomizer_LoadHintMessages(); Randomizer_LoadMerchantMessages(); - gSaveContext.respawn[0].entranceIndex = -1; + gSaveContext.respawn[0].entranceIndex = ENTR_LOAD_OPENING; gSaveContext.respawnFlag = 0; gSaveContext.seqId = (u8)NA_BGM_DISABLED; gSaveContext.natureAmbienceId = 0xFF; @@ -2999,7 +3001,7 @@ void FileChoose_LoadGame(GameState* thisx) { gSaveContext.prevMagicState = MAGIC_STATE_IDLE; gSaveContext.forcedSeqId = NA_BGM_GENERAL_SFX; gSaveContext.skyboxTime = 0; - gSaveContext.nextTransitionType = 0xFF; + gSaveContext.nextTransitionType = TRANS_NEXT_TYPE_DEFAULT; gSaveContext.nextCutsceneIndex = 0xFFEF; gSaveContext.cutsceneTrigger = 0; gSaveContext.chamberCutsceneNum = 0; @@ -3047,7 +3049,7 @@ void FileChoose_LoadGame(GameState* thisx) { // the entrance index is -1 from shuffle overwarld spawn if (Randomizer_GetSettingValue(RSK_SHUFFLE_ENTRANCES) && ((!CVarGetInteger("gRememberSaveLocation", 0) || gSaveContext.savedSceneNum == SCENE_FAIRYS_FOUNTAIN || gSaveContext.savedSceneNum == SCENE_GROTTOS) || - (CVarGetInteger("gRememberSaveLocation", 0) && Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_SPAWNS) && gSaveContext.entranceIndex == -1))) { + (CVarGetInteger("gRememberSaveLocation", 0) && Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_SPAWNS) && gSaveContext.entranceIndex == ENTR_LOAD_OPENING))) { Entrance_SetSavewarpEntrance(); } } @@ -3703,4 +3705,7 @@ void FileChoose_Init(GameState* thisx) { Font_LoadOrderedFont(&this->font); Audio_QueueSeqCmd(0xF << 28 | SEQ_PLAYER_BGM_MAIN << 24 | 0xA); func_800F5E18(SEQ_PLAYER_BGM_MAIN, NA_BGM_FILE_SELECT, 0, 7, 1); + + // Originally this was only set when transitioning from the title screen, but gSkipLogoTitle skips that process so we're ensuring it's set here + gSaveContext.gameMode = GAMEMODE_FILE_SELECT; } diff --git a/soh/src/overlays/gamestates/ovl_select/z_select.c b/soh/src/overlays/gamestates/ovl_select/z_select.c index 4453c8e58..fe273dd41 100644 --- a/soh/src/overlays/gamestates/ovl_select/z_select.c +++ b/soh/src/overlays/gamestates/ovl_select/z_select.c @@ -68,7 +68,7 @@ void Select_LoadGame(SelectContext* this, s32 entranceIndex) { } gSaveContext.respawnFlag = 0; - gSaveContext.respawn[RESPAWN_MODE_DOWN].entranceIndex = -1; + gSaveContext.respawn[RESPAWN_MODE_DOWN].entranceIndex = ENTR_LOAD_OPENING; gSaveContext.seqId = (u8)NA_BGM_DISABLED; gSaveContext.natureAmbienceId = 0xFF; gSaveContext.showTitleCard = true; @@ -118,7 +118,7 @@ void Select_Grotto_LoadGame(SelectContext* this, s32 grottoIndex) { } gSaveContext.respawnFlag = 0; - gSaveContext.respawn[RESPAWN_MODE_DOWN].entranceIndex = -1; + gSaveContext.respawn[RESPAWN_MODE_DOWN].entranceIndex = ENTR_LOAD_OPENING; gSaveContext.seqId = (u8)NA_BGM_DISABLED; gSaveContext.natureAmbienceId = 0xFF; gSaveContext.showTitleCard = true; @@ -128,488 +128,488 @@ void Select_Grotto_LoadGame(SelectContext* this, s32 grottoIndex) { } static SceneSelectEntry sScenes[] = { - { " 1:SPOT00", " 1:Hyrule Field", " 1:Hylianische Steppe", " 1:Plaine d'Hyrule", Select_LoadGame, 0x00CD }, - { " 2:SPOT01", " 2:Kakariko Village", " 2:Kakariko", " 2:Village Cocorico", Select_LoadGame, 0x00DB }, - { " 3:SPOT02", " 3:Graveyard", " 3:Friedhof", " 3:Cimetiere", Select_LoadGame, 0x00E4 }, - { " 4:SPOT03", " 4:Zora's River", " 4:Zora-Fluss", " 4:Riviere Zora", Select_LoadGame, 0x00EA }, - { " 5:SPOT04", " 5:Kokiri Forest", " 5:Kokiri-Wald", " 5:Foret Kokiri", Select_LoadGame, 0x00EE }, - { " 6:SPOT05", " 6:Sacred Forest Meadow", " 6:Heilige Lichtung", " 6:Bosquet Sacre", Select_LoadGame, 0x00FC }, - { " 7:SPOT06", " 7:Lake Hylia", " 7:Hylia-See", " 7:Lac Hylia", Select_LoadGame, 0x0102 }, - { " 8:SPOT07", " 8:Zora's Domain", " 8:Zoras Reich", " 8:Domaine Zora", Select_LoadGame, 0x0108 }, - { " 9:SPOT08", " 9:Zora's Fountain", " 9:Zoras Quelle", " 9:Fontaine Zora", Select_LoadGame, 0x010E }, - { "10:SPOT09", "10:Gerudo Valley", "10:Gerudotal", "10:Vallee Gerudo", Select_LoadGame, 0x0117 }, - { "11:SPOT10", "11:Lost Woods", "11:Verlorene Waelder", "11:Bois Perdus", Select_LoadGame, 0x011E }, - { "12:SPOT11", "12:Desert Colossus", "12:Wuestenkoloss", "12:Colosse du Desert", Select_LoadGame, 0x0123 }, - { "13:SPOT12", "13:Gerudo's Fortress", "13:Gerudo-Festung", "13:Forteresse Gerudo", Select_LoadGame, 0x0129 }, - { "14:SPOT13", "14:Haunted Wasteland", "14:Gespensterwueste", "14:Desert Hante", Select_LoadGame, 0x0130 }, - { "15:SPOT15", "15:Hyrule Castle", "15:Schloss Hyrule", "15:Chateau d'Hyrule", Select_LoadGame, 0x0138 }, - { "16:SPOT16", "16:Death Mountain Trail", "16:Pfad zum Todesberg", "16:Chemin du Peril", Select_LoadGame, 0x013D }, - { "17:SPOT17", "17:Death Mountain Crater", "17:Todeskrater", "17:Cratere du Peril", Select_LoadGame, 0x0147 }, - { "18:SPOT18", "18:Goron City", "18:Goronia", "18:Village Goron", Select_LoadGame, 0x014D }, - { "19:SPOT20", "19:Lon Lon Ranch", "19:Lon Lon-Farm", "19:Ranch Lon Lon", Select_LoadGame, 0x0157 }, - { "20:" GFXP_HIRAGANA "ﾄｷﾉﾏ", "20:Temple Of Time", "20:Zitadelle der Zeit", "20:Temple du Temps", Select_LoadGame, 0x0053 }, - { "21:" GFXP_HIRAGANA "ｹﾝｼﾞｬﾉﾏ", "21:Chamber of Sages", "21:Halle der Weisen", "21:Sanctuaire des Sages", Select_LoadGame, 0x006B }, - { "22:" GFXP_HIRAGANA "ｼｬﾃｷｼﾞｮｳ", "22:Shooting Gallery", "22:Schiessbude ", "22:Jeu d'adresse", Select_LoadGame, 0x003B }, - { "23:" GFXP_KATAKANA "ﾊｲﾗﾙ" GFXP_HIRAGANA "ﾆﾜ" GFXP_KATAKANA "ｹﾞｰﾑ", "23:Castle Courtyard Game", "23:Burghof - Wachen", "23:Cour du Chateau (Infilration)", Select_LoadGame, 0x007A }, - { "24:" GFXP_HIRAGANA "ﾊｶｼﾀﾄﾋﾞｺﾐｱﾅ", "24:Grave 1", "24:Grab 1", "24:Tombe 1", Select_LoadGame, 0x031C }, - { "25:" GFXP_HIRAGANA "ﾊｶｼﾀﾄﾋﾞｺﾐｱﾅ 2", "25:Grave 2", "25:Grab 2", "25:Tombe 2", Select_LoadGame, 0x004B }, - { "26:" GFXP_HIRAGANA "ｵｳｹ ﾉ ﾊｶｱﾅ", "26:Royal Family's Tomb", "26:Koenigsgrab", "26:Tombe Royale", Select_LoadGame, 0x002D }, - { "27:" GFXP_HIRAGANA "ﾀﾞｲﾖｳｾｲﾉｲｽﾞﾐ", "27:Great Fairy's Fountain (Upgrades)", "27:Feen-Quelle (Upgrades)", "27:Fontaine Royale des Fees (Amel.)", Select_LoadGame, 0x0315 }, - { "28:" GFXP_HIRAGANA "ﾄﾋﾞｺﾐ ﾖｳｾｲ ｱﾅ", "28:Fairy's Fountain (Grotto)", "28:Feen-Brunnen (Grotte)", "28:Fontaines des Fees (Grotte)", Select_LoadGame, 0x036D }, - { "29:" GFXP_HIRAGANA "ﾏﾎｳｾｷ ﾖｳｾｲﾉｲｽﾞﾐ", "29:Great Fairy's Fountain (Magic)", "29:Feen-Quelle (Magie)", "29:Fontaine Royale des Fees (Magie)", Select_LoadGame, 0x0371 }, - { "30:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ｻｲｼｭｳｾﾝ", "30:Ganon's Tower - Collapsing", "30:Ganons Turm - Einsturz", "30:Tour de Ganon - Effondrement", Select_LoadGame, 0x043F }, - { "31:" GFXP_KATAKANA "ﾊｲﾗﾙ" GFXP_HIRAGANA "ﾅｶﾆﾜ", "31:Castle Courtyard", "31:Burghof - Zelda", "31:Cour du Chateau", Select_LoadGame, 0x0400 }, - { "32:" GFXP_HIRAGANA "ﾂﾘﾎﾞﾘ", "32:Fishing Pond", "32:Fischweiher", "32:Etang", Select_LoadGame, 0x045F }, - { "33:" GFXP_KATAKANA "ﾎﾞﾑﾁｭｳﾎﾞｰﾘﾝｸﾞ", "33:Bombchu Bowling Alley", "33:Minenbowlingbahn", "33:Bowling Teigneux", Select_LoadGame, 0x0507 }, - { "34:" GFXP_KATAKANA "ﾛﾝﾛﾝ" GFXP_HIRAGANA "ﾎﾞｸｼﾞｮｳ ｿｳｺ 1", "34:Lon Lon Ranch House", "34:Lon Lon-Farm Haus", "34:Maison du Ranch Lon Lon", Select_LoadGame, 0x004F }, - { "35:" GFXP_KATAKANA "ﾛﾝﾛﾝ" GFXP_HIRAGANA "ﾎﾞｸｼﾞｮｳ ｿｳｺ 2", "35:Lon Lon Ranch Silo", "35:Lon Lon-Farm Silo", "35:Silo du Ranch Lon Lon", Select_LoadGame, 0x05D0 }, - { "36:" GFXP_HIRAGANA "ﾐﾊﾘ ｺﾞﾔ", "36:Guard House", "36:Wachposten", "36:Maison de Garde", Select_LoadGame, 0x007E }, - { "37:" GFXP_HIRAGANA "ﾏﾎｳ ﾉ ｸｽﾘﾔ", "37:Potion Shop", "37:Magie-Laden", "37:Apothicaire", Select_LoadGame, 0x0072 }, - { "38:" GFXP_HIRAGANA "ﾀｶﾗﾊﾞｺﾔ", "38:Treasure Chest Game", "38:Trhenlotterie", "38:Chasse aux Tresors", Select_LoadGame, 0x0063 }, - { "39:" GFXP_HIRAGANA "ｷﾝ " GFXP_KATAKANA "ｽﾀﾙﾁｭﾗ ﾊｳｽ", "39:House Of Skulltula", "39:Skulltulas Haus", "39:Maison des Skulltulas", Select_LoadGame, 0x0550 }, - { "40:" GFXP_HIRAGANA "ｼﾞｮｳｶﾏﾁ ｲﾘｸﾞﾁ", "40:Entrance to Market", "40:Eingang zum Marktplatz", "40:Entree de la Place du Marche", Select_LoadGame, 0x0033 }, - { "41:" GFXP_HIRAGANA "ｼﾞｮｳｶﾏﾁ", "41:Market", "41:Marktplatz", "41:Place du Marche", Select_LoadGame, 0x00B1 }, - { "42:" GFXP_HIRAGANA "ｳﾗﾛｼﾞ", "42:Back Alley", "42:Seitenstrasse", "42:Ruelle", Select_LoadGame, 0x00AD }, - { "43:" GFXP_HIRAGANA "ﾄｷﾉｼﾝﾃﾞﾝ ﾏｴ", "43:Temple of Time Exterior", "43:Vor der Zitadelle der Zeit", "43:Exterieur du Temple du Temps", Select_LoadGame, 0x0171 }, - { "44:" GFXP_HIRAGANA "ﾘﾝｸﾉｲｴ", "44:Link's House", "44:Links Haus", "44:Cabane de Link", Select_LoadGame, 0x00BB }, - { "45:" GFXP_KATAKANA "ｶｶﾘｺ" GFXP_HIRAGANA "ﾑﾗﾉﾅｶﾞﾔ", "45:Kakariko House 1", "45:Kakariko Haus 1", "45:Maison du Village Cocorico 1", Select_LoadGame, 0x02FD }, - { "46:" GFXP_HIRAGANA "ｳﾗﾛｼﾞﾉ ｲｴ", "46:Back Alley House 1", "46:Seitenstrasse Haus 1", "46:Maison de la Ruelle 1", Select_LoadGame, 0x043B }, - { "47:" GFXP_HIRAGANA "ｺｷﾘﾉﾑﾗ ﾓﾉｼﾘｷｮｳﾀﾞｲﾉｲｴ", "47:House of the Know-it-All Brothers", "47:Haus der Allwissenden Brueder", "47:Cabane des Freres Je-Sais-Tout", Select_LoadGame, 0x00C9 }, - { "48:" GFXP_HIRAGANA "ｺｷﾘﾉﾑﾗ ﾌﾀｺﾞﾉｲｴ", "48:House of Twins", "48:Haus der Zwillinge", "48:Cabane des Jumeaux", Select_LoadGame, 0x009C }, - { "49:" GFXP_HIRAGANA "ｺｷﾘﾉﾑﾗ " GFXP_KATAKANA "ﾐﾄﾞ" GFXP_HIRAGANA "ﾉｲｴ", "49:Mido's House", "49:Midos Haus", "49:Cabane du Grand Mido", Select_LoadGame, 0x0433 }, - { "50:" GFXP_HIRAGANA "ｺｷﾘﾉﾑﾗ " GFXP_KATAKANA "ｻﾘｱ" GFXP_HIRAGANA "ﾉｲｴ", "50:Saria's House", "50:Salias Haus", "50:Cabane de Saria", Select_LoadGame, 0x0437 }, - { "51:" GFXP_HIRAGANA "ｳﾏｺﾞﾔ", "51:Stable", "51:Stall", "51:Etable", Select_LoadGame, 0x02F9 }, - { "52:" GFXP_HIRAGANA "ﾊｶﾓﾘﾉｲｴ", "52:Grave Keeper's Hut", "52:Huette des Totengraebers", "52:Cabane du Fossoyeur", Select_LoadGame, 0x030D }, - { "53:" GFXP_HIRAGANA "ｳﾗﾛｼﾞ ｲﾇｵﾊﾞｻﾝﾉｲｴ", "53:Dog Lady's House", "53:Haus der Hunde-Dame", "53:Maison de la Dame du Chien", Select_LoadGame, 0x0398 }, - { "54:" GFXP_HIRAGANA "ｶｶﾘｺﾑﾗ " GFXP_KATAKANA "ｲﾝﾊﾟ" GFXP_HIRAGANA "ﾉｲｴ", "54:Impa's House", "54:Impas Haus", "54:Maison d'Impa", Select_LoadGame, 0x039C }, - { "55:" GFXP_KATAKANA "ﾊｲﾘｱ" GFXP_HIRAGANA " ｹﾝｷｭｳｼﾞｮ", "55:Lakeside Laboratory", "55:Hylia-See Laboratorium", "55:Laboratoire du Lac", Select_LoadGame, 0x0043 }, - { "56:" GFXP_KATAKANA "ﾃﾝﾄ", "56:Running Man's Tent", "56:Zelt des Rennlaeufers", "56:Tente du Marathonien", Select_LoadGame, 0x03A0 }, - { "57:" GFXP_HIRAGANA "ﾀﾃﾉﾐｾ", "57:Bazaar", "57:Basar", "57:Bazar", Select_LoadGame, 0x00B7 }, - { "58:" GFXP_HIRAGANA "ｺｷﾘｿﾞｸﾉﾐｾ", "58:Kokiri Shop", "58:Kokiri-Laden", "58:Boutique Kokiri", Select_LoadGame, 0x00C1 }, - { "59:" GFXP_KATAKANA "ｺﾞﾛﾝ" GFXP_HIRAGANA "ﾉﾐｾ", "59:Goron Shop", "59:Goronen-Laden", "59:Boutique Goron", Select_LoadGame, 0x037C }, - { "60:" GFXP_KATAKANA "ｿﾞｰﾗ" GFXP_HIRAGANA "ﾉﾐｾ", "60:Zora Shop", "60:Zora-Laden", "60:Boutique Zora", Select_LoadGame, 0x0380 }, - { "61:" GFXP_KATAKANA "ｶｶﾘｺ" GFXP_HIRAGANA "ﾑﾗ ｸｽﾘﾔ", "61:Closed Shop", "61:Geschlossener Laden", "61:Boutique Fermee", Select_LoadGame, 0x0384 }, - { "62:" GFXP_HIRAGANA "ｼﾞｮｳｶﾏﾁ ｸｽﾘﾔ", "62:Potion Shop", "62:Magie-Laden", "62:Apothicaire (Boutique)", Select_LoadGame, 0x0388 }, - { "63:" GFXP_HIRAGANA "ｳﾗﾛｼﾞ ﾖﾙﾉﾐｾ", "63:Bombchu Shop", "63:Krabbelminen-Laden", "63:Boutique de Missiles Teigneux", Select_LoadGame, 0x0390 }, - { "64:" GFXP_HIRAGANA "ｵﾒﾝﾔ", "64:Happy Mask Shop", "64:Maskenhaendler", "64:Foire aux Masques", Select_LoadGame, 0x0530 }, - { "65:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾉｼｭｳﾚﾝｼﾞｮｳ", "65:Gerudo Training Ground", "65:Gerudo-Arena", "65:Gymnase Gerudo", Select_LoadGame, 0x0008 }, - { "66:" GFXP_HIRAGANA "ﾖｳｾｲﾉｷﾉ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "66:Inside the Deku Tree", "66:Im Deku-Baum", "66:Arbre Mojo", Select_LoadGame, 0x0000 }, - { "67:" GFXP_HIRAGANA "ﾖｳｾｲﾉｷﾉ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", "67:Gohma's Lair", "67:Gohmas Verlies", "67:Repaire de Gohma", Select_LoadGame, 0x040F }, - { "68:" GFXP_KATAKANA "ﾄﾞﾄﾞﾝｺﾞ ﾀﾞﾝｼﾞｮﾝ", "68:Dodongo's Cavern", "68:Dodongos Hoehle", "68:Caverne Dodongo", Select_LoadGame, 0x0004 }, - { "69:" GFXP_KATAKANA "ﾄﾞﾄﾞﾝｺﾞ ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", "69:King Dodongo's Lair", "69:King Dodongos Verlies", "69:Repaire du Roi Dodongo", Select_LoadGame, 0x040B }, - { "70:" GFXP_HIRAGANA "ｷｮﾀﾞｲｷﾞｮ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "70:Inside Jabu-Jabu's Belly", "70:Jabu-Jabus Bauch", "70:Ventre de Jabu-Jabu", Select_LoadGame, 0x0028 }, - { "71:" GFXP_HIRAGANA "ｷｮﾀﾞｲｷﾞｮ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", "71:Barinade's Lair", "71:Barinades Verlies", "71:Repaire de Barinade", Select_LoadGame, 0x0301 }, - { "72:" GFXP_HIRAGANA "ﾓﾘﾉｼﾝﾃﾞﾝ", "72:Forest Temple", "72:Waldtempel", "72:Temple de la Foret", Select_LoadGame, 0x0169 }, - { "73:" GFXP_HIRAGANA "ﾓﾘﾉｼﾝﾃﾞﾝ " GFXP_KATAKANA "ﾎﾞｽ", "73:Phantom Ganon's Lair", "73:Phantom-Ganons Verlies", "73:Repaire de Ganon Spectral", Select_LoadGame, 0x000C }, - { "74:" GFXP_HIRAGANA "ｲﾄﾞｼﾀ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "74:Bottom of the Well", "74:Grund des Brunnens", "74:Puits", Select_LoadGame, 0x0098 }, - { "75:" GFXP_HIRAGANA "ﾊｶｼﾀ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "75:Shadow Temple", "75:Schattentempel", "75:Temple de l'Ombre", Select_LoadGame, 0x0037 }, - { "76:" GFXP_HIRAGANA "ﾊｶｼﾀ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", "76:Bongo Bongo's Lair", "76:Bongo Bongos Verlies", "76:Repaire de Bongo Bongo", Select_LoadGame, 0x0413 }, - { "77:" GFXP_HIRAGANA "ﾋﾉｼﾝﾃﾞﾝ", "77:Fire Temple", "77:Feuertempel", "77:Temple du Feu", Select_LoadGame, 0x0165 }, - { "78:" GFXP_HIRAGANA "ﾋﾉｼﾝﾃﾞﾝ " GFXP_KATAKANA "ﾎﾞｽ", "78:Volvagia's Lair", "78:Volvagias Verlies", "78:Repaire de Volcania", Select_LoadGame, 0x0305 }, - { "79:" GFXP_HIRAGANA "ﾐｽﾞﾉｼﾝﾃﾞﾝ", "79:Water Temple", "79:Wassertempel", "79:Temple de l'Eau", Select_LoadGame, 0x0010 }, - { "80:" GFXP_HIRAGANA "ﾐｽﾞﾉｼﾝﾃﾞﾝ " GFXP_KATAKANA "ﾎﾞｽ", "80:Morpha's Lair", "80:Morphas Verlies", "80:Repaire de Morpha", Select_LoadGame, 0x0417 }, - { "81:" GFXP_HIRAGANA "ｼﾞｬｼﾝｿﾞｳ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "81:Spirit Temple", "81:Geistertempel", "81:Temple de l'Esprit", Select_LoadGame, 0x0082 }, - { "82:" GFXP_HIRAGANA "ｼﾞｬｼﾝｿﾞｳ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ｱｲｱﾝﾅｯｸ", "82:Iron Knuckle's Lair", "82:Eisenprinz' Verlies", "82:Repaire du Hache Viande", Select_LoadGame, 0x008D }, - { "83:" GFXP_HIRAGANA "ｼﾞｬｼﾝｿﾞｳ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", "83:Twinrova's Lair", "83:Killa Ohmaz' Verlies", "83:Repaire du Duo Malefique", Select_LoadGame, 0x05EC }, - { "84:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ", "84:Stairs to Ganondorf's Lair", "84:Treppen zu Ganondorfs Verlies", "84:Repaire de Ganondorf (Escaliers)", Select_LoadGame, 0x041B }, - { "85:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ" GFXP_KATAKANA "ﾎﾞｽ", "85:Ganondorf's Lair", "85:Ganondorfs Verlies", "85:Repaire de Ganondorf", Select_LoadGame, 0x041F }, - { "86:" GFXP_HIRAGANA "ｺｵﾘﾉﾄﾞｳｸﾂ", "86:Ice Cavern", "86:Eishoehle", "86:Caverne Polaire", Select_LoadGame, 0x0088 }, - { "87:" GFXP_HIRAGANA "ﾊｶｼﾀ" GFXP_KATAKANA "ﾘﾚｰ", "87:Dampe Grave Relay Game", "87:Boris' Grab Staffellauf", "87:Tombe d'Igor", Select_LoadGame, 0x044F }, - { "88:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾁｶ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "88:Inside Ganon's Castle", "88:In Ganons Schloss", "88:Tour de Ganon", Select_LoadGame, 0x0467 }, - { "89:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ｻｲｼｭｳｾﾝ " GFXP_KATAKANA "ﾃﾞﾓ & ﾊﾞﾄﾙ", "89:Ganon's Lair", "89:Ganons Verlies", "89:Repaire de Ganon", Select_LoadGame, 0x0517 }, - { "90:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ ｿﾉｺﾞ 1", "90:Escaping Ganon's Castle 1", "90:Flucht aus Ganons Schloss 1", "90:Fuite du Chateau de Ganon 1", Select_LoadGame, 0x0179 }, - { "91:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ ｿﾉｺﾞ 2", "91:Escaping Ganon's Castle 2", "91:Flucht aus Ganons Schloss 2", "91:Fuite du Chateau de Ganon 2", Select_LoadGame, 0x01B5 }, - { "92:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ ｿﾉｺﾞ 3", "92:Escaping Ganon's Castle 3", "92:Flucht aus Ganons Schloss 3", "92:Fuite du Chateau de Ganon 3", Select_LoadGame, 0x03DC }, - { "93:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ ｿﾉｺﾞ 4", "93:Escaping Ganon's Castle 4", "93:Flucht aus Ganons Schloss 4", "93:Fuite du Chateau de Ganon 4", Select_LoadGame, 0x03E4 }, - { "94:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾁｶ ｿﾉｺﾞ", "94:Escaping Ganon's Castle 5", "94:Flucht aus Ganons Schloss 5", "94:Fuite du Chateau de Ganon 5", Select_LoadGame, 0x056C }, - { "95:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 1-2", "95:Thieves' Hideout 1-2", "95:Diebesversteck 1-2", "95:Repaire des Voleurs 1-2", Select_LoadGame, 0x0486 }, - { "96:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 3-4 9-10", "96:Thieves' Hideout 3-4 9-10", "96:Diebesversteck 3-4 9-10", "96:Repaire des Voleurs 3-4 9-10", Select_LoadGame, 0x048E }, - { "97:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 5-6", "97:Thieves' Hideout 5-6", "97:Diebesversteck 5-6", "97:Repaire des Voleurs 5-6", Select_LoadGame, 0x0496 }, - { "98:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 7-8", "98:Thieves' Hideout 7-8", "98:Diebesversteck 7-8", "98:Repaire des Voleurs 7-8", Select_LoadGame, 0x049E }, - { "99:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 11-12", "99:Thieves' Hideout 11-12", "99:Diebesversteck 11-12", "99:Repaire des Voleurs 11-12", Select_LoadGame, 0x04AE }, - { "100:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 13", "100:Thieves' Hideout 13", "100:Diebesversteck 13", "100:Repaire des Voleurs 13", Select_LoadGame, 0x0570 }, - { "101:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 0", "101:Grotto 0", "101:Grotte 0", "101:Grotte 0", Select_LoadGame, 0x003F }, - { "102:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 1", "102:Grotto 1", "102:Grotte 1", "102:Grotte 1", Select_LoadGame, 0x0598 }, - { "103:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 2", "103:Grotto 2", "103:Grotte 2", "103:Grotte 2", Select_LoadGame, 0x059C }, - { "104:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 3", "104:Grotto 3", "104:Grotte 3", "104:Grotte 3", Select_LoadGame, 0x05A0 }, - { "105:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 4", "105:Grotto 4", "105:Grotte 4", "105:Grotte 4", Select_LoadGame, 0x05A4 }, - { "106:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 5", "106:Grotto 5", "106:Grotte 5", "106:Grotte 5", Select_LoadGame, 0x05A8 }, - { "107:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 6", "107:Grotto 6", "107:Grotte 6", "107:Grotte 6", Select_LoadGame, 0x05AC }, - { "108:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 7", "108:Grotto 7", "108:Grotte 7", "108:Grotte 7", Select_LoadGame, 0x05B0 }, - { "109:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 8", "109:Grotto 8", "109:Grotte 8", "109:Grotte 8", Select_LoadGame, 0x05B4 }, - { "110:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 9", "110:Grotto 9", "110:Grotte 9", "110:Grotte 9", Select_LoadGame, 0x05B8 }, - { "111:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 10", "111:Grotto 10", "111:Grotte 10", "111:Grotte 10", Select_LoadGame, 0x05BC }, - { "112:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 11", "112:Grotto 11", "112:Grotte 11", "112:Grotte 11", Select_LoadGame, 0x05C0 }, - { "113:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 12", "113:Grotto 12", "113:Grotte 12", "113:Grotte 12", Select_LoadGame, 0x05C4 }, - { "114:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 13", "114:Grotto 13", "114:Grotte 13", "114:Grotte 13", Select_LoadGame, 0x05FC }, - { "115:" GFXP_KATAKANA "ﾊｲﾗﾙ ﾃﾞﾓ", "115:Goddess Cutscene Environment", "115:Goettinnen Cutscene Umgebung", "115:Carte de la scene des Deesses", Select_LoadGame, 0x00A0 }, - { "116:" GFXP_HIRAGANA "ﾍﾞｯｼﾂ (ﾀｶﾗﾊﾞｺ" GFXP_KATAKANA "ﾜｰﾌﾟ)", "116:Test Room", "116:Test Raum", "116:Salle de Test", Select_LoadGame, 0x0520 }, - { "117:" GFXP_HIRAGANA "ｻｻ" GFXP_KATAKANA "ﾃｽﾄ", "117:SRD Map", "117:SRD Karte", "117:Carte SRD", Select_LoadGame, 0x0018 }, - { "118:" GFXP_KATAKANA "ﾃｽﾄﾏｯﾌﾟ", "118:Test Map", "118:Test Karte", "118:Carte de Test", Select_LoadGame, 0x0094 }, - { "119:" GFXP_KATAKANA "ﾃｽﾄﾙｰﾑ", "119:Treasure Chest Warp", "119:Schatzkisten Teleport", "119:Coffres debug", Select_LoadGame, 0x0024 }, - { "120:" GFXP_HIRAGANA "ﾁｭｳ" GFXP_KATAKANA "ｽﾀﾛﾌｫｽ" GFXP_HIRAGANA "ﾍﾞﾔ", "120:Stalfos Miniboss Room", "120:Stalfos-Ritter Miniboss Raum", "120:Salle de Miniboss Stalfos", Select_LoadGame, 0x001C }, - { "121:" GFXP_KATAKANA "ﾎﾞｽｽﾀﾛﾌｫｽ" GFXP_HIRAGANA "ﾍﾞﾔ", "121:Stalfos Boss Room", "121:Stalfos-Ritter Boss Raum", "121:Salle de Boss Stalfos", Select_LoadGame, 0x0020 }, - { "122:Sutaru", "122:Dark Link Room", "122:Schwarzer Link Raum", "122:Salle de Dark Link", Select_LoadGame, 0x0047 }, - { "123:jikkenjyou", "123:Shooting Gallery Duplicate", "123:Schiessbude (Duplikat)", "123:Jeu d'adresse (Duplicata)", Select_LoadGame, 0x02EA }, - { "124:depth" GFXP_KATAKANA "ﾃｽﾄ", "124:depth test", "124:Tiefen Test", "124:Test de Profondeur", Select_LoadGame, 0x00B6 }, - { "125:" GFXP_KATAKANA "ﾊｲﾗﾙ" GFXP_HIRAGANA "ﾆﾜ" GFXP_KATAKANA "ｹﾞｰﾑ2", "125:Hyrule Garden Game (Broken)", "125:Burghof - Wachen-Minispiel (Kaputt)", "125:Cour du Chateau (Non fonctionnel)", Select_LoadGame, 0x0076 }, - { "title", "title", "Titelbildschirm", "Ecran-titre", Select_LoadTitle, 0x0000 }, + { " 1:SPOT00", " 1:Hyrule Field", " 1:Hylianische Steppe", " 1:Plaine d'Hyrule", Select_LoadGame, ENTR_HYRULE_FIELD_0 }, + { " 2:SPOT01", " 2:Kakariko Village", " 2:Kakariko", " 2:Village Cocorico", Select_LoadGame, ENTR_KAKARIKO_VILLAGE_0 }, + { " 3:SPOT02", " 3:Graveyard", " 3:Friedhof", " 3:Cimetiere", Select_LoadGame, ENTR_GRAVEYARD_0 }, + { " 4:SPOT03", " 4:Zora's River", " 4:Zora-Fluss", " 4:Riviere Zora", Select_LoadGame, ENTR_ZORAS_RIVER_0 }, + { " 5:SPOT04", " 5:Kokiri Forest", " 5:Kokiri-Wald", " 5:Foret Kokiri", Select_LoadGame, ENTR_KOKIRI_FOREST_0 }, + { " 6:SPOT05", " 6:Sacred Forest Meadow", " 6:Heilige Lichtung", " 6:Bosquet Sacre", Select_LoadGame, ENTR_SACRED_FOREST_MEADOW_0 }, + { " 7:SPOT06", " 7:Lake Hylia", " 7:Hylia-See", " 7:Lac Hylia", Select_LoadGame, ENTR_LAKE_HYLIA_0 }, + { " 8:SPOT07", " 8:Zora's Domain", " 8:Zoras Reich", " 8:Domaine Zora", Select_LoadGame, ENTR_ZORAS_DOMAIN_0 }, + { " 9:SPOT08", " 9:Zora's Fountain", " 9:Zoras Quelle", " 9:Fontaine Zora", Select_LoadGame, ENTR_ZORAS_FOUNTAIN_0 }, + { "10:SPOT09", "10:Gerudo Valley", "10:Gerudotal", "10:Vallee Gerudo", Select_LoadGame, ENTR_GERUDO_VALLEY_0 }, + { "11:SPOT10", "11:Lost Woods", "11:Verlorene Waelder", "11:Bois Perdus", Select_LoadGame, ENTR_LOST_WOODS_0 }, + { "12:SPOT11", "12:Desert Colossus", "12:Wuestenkoloss", "12:Colosse du Desert", Select_LoadGame, ENTR_DESERT_COLOSSUS_0 }, + { "13:SPOT12", "13:Gerudo's Fortress", "13:Gerudo-Festung", "13:Forteresse Gerudo", Select_LoadGame, ENTR_GERUDOS_FORTRESS_0 }, + { "14:SPOT13", "14:Haunted Wasteland", "14:Gespensterwueste", "14:Desert Hante", Select_LoadGame, ENTR_HAUNTED_WASTELAND_0 }, + { "15:SPOT15", "15:Hyrule Castle", "15:Schloss Hyrule", "15:Chateau d'Hyrule", Select_LoadGame, ENTR_HYRULE_CASTLE_0 }, + { "16:SPOT16", "16:Death Mountain Trail", "16:Pfad zum Todesberg", "16:Chemin du Peril", Select_LoadGame, ENTR_DEATH_MOUNTAIN_TRAIL_0 }, + { "17:SPOT17", "17:Death Mountain Crater", "17:Todeskrater", "17:Cratere du Peril", Select_LoadGame, ENTR_DEATH_MOUNTAIN_CRATER_0 }, + { "18:SPOT18", "18:Goron City", "18:Goronia", "18:Village Goron", Select_LoadGame, ENTR_GORON_CITY_0 }, + { "19:SPOT20", "19:Lon Lon Ranch", "19:Lon Lon-Farm", "19:Ranch Lon Lon", Select_LoadGame, ENTR_LON_LON_RANCH_0 }, + { "20:" GFXP_HIRAGANA "ﾄｷﾉﾏ", "20:Temple Of Time", "20:Zitadelle der Zeit", "20:Temple du Temps", Select_LoadGame, ENTR_TEMPLE_OF_TIME_0 }, + { "21:" GFXP_HIRAGANA "ｹﾝｼﾞｬﾉﾏ", "21:Chamber of Sages", "21:Halle der Weisen", "21:Sanctuaire des Sages", Select_LoadGame, ENTR_CHAMBER_OF_THE_SAGES_0 }, + { "22:" GFXP_HIRAGANA "ｼｬﾃｷｼﾞｮｳ", "22:Shooting Gallery", "22:Schiessbude ", "22:Jeu d'adresse", Select_LoadGame, ENTR_SHOOTING_GALLERY_0 }, + { "23:" GFXP_KATAKANA "ﾊｲﾗﾙ" GFXP_HIRAGANA "ﾆﾜ" GFXP_KATAKANA "ｹﾞｰﾑ", "23:Castle Courtyard Game", "23:Burghof - Wachen", "23:Cour du Chateau (Infilration)", Select_LoadGame, ENTR_CASTLE_COURTYARD_GUARDS_DAY_0 }, + { "24:" GFXP_HIRAGANA "ﾊｶｼﾀﾄﾋﾞｺﾐｱﾅ", "24:Grave 1", "24:Grab 1", "24:Tombe 1", Select_LoadGame, ENTR_REDEAD_GRAVE_0 }, + { "25:" GFXP_HIRAGANA "ﾊｶｼﾀﾄﾋﾞｺﾐｱﾅ 2", "25:Grave 2", "25:Grab 2", "25:Tombe 2", Select_LoadGame, ENTR_GRAVE_WITH_FAIRYS_FOUNTAIN_0 }, + { "26:" GFXP_HIRAGANA "ｵｳｹ ﾉ ﾊｶｱﾅ", "26:Royal Family's Tomb", "26:Koenigsgrab", "26:Tombe Royale", Select_LoadGame, ENTR_ROYAL_FAMILYS_TOMB_0 }, + { "27:" GFXP_HIRAGANA "ﾀﾞｲﾖｳｾｲﾉｲｽﾞﾐ", "27:Great Fairy's Fountain (Upgrades)", "27:Feen-Quelle (Upgrades)", "27:Fontaine Royale des Fees (Amel.)", Select_LoadGame, ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_0 }, + { "28:" GFXP_HIRAGANA "ﾄﾋﾞｺﾐ ﾖｳｾｲ ｱﾅ", "28:Fairy's Fountain (Grotto)", "28:Feen-Brunnen (Grotte)", "28:Fontaines des Fees (Grotte)", Select_LoadGame, ENTR_FAIRYS_FOUNTAIN_0 }, + { "29:" GFXP_HIRAGANA "ﾏﾎｳｾｷ ﾖｳｾｲﾉｲｽﾞﾐ", "29:Great Fairy's Fountain (Magic)", "29:Feen-Quelle (Magie)", "29:Fontaine Royale des Fees (Magie)", Select_LoadGame, ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_0 }, + { "30:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ｻｲｼｭｳｾﾝ", "30:Ganon's Tower - Collapsing", "30:Ganons Turm - Einsturz", "30:Tour de Ganon - Effondrement", Select_LoadGame, ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_0 }, + { "31:" GFXP_KATAKANA "ﾊｲﾗﾙ" GFXP_HIRAGANA "ﾅｶﾆﾜ", "31:Castle Courtyard", "31:Burghof - Zelda", "31:Cour du Chateau", Select_LoadGame, ENTR_CASTLE_COURTYARD_ZELDA_0 }, + { "32:" GFXP_HIRAGANA "ﾂﾘﾎﾞﾘ", "32:Fishing Pond", "32:Fischweiher", "32:Etang", Select_LoadGame, ENTR_FISHING_POND_0 }, + { "33:" GFXP_KATAKANA "ﾎﾞﾑﾁｭｳﾎﾞｰﾘﾝｸﾞ", "33:Bombchu Bowling Alley", "33:Minenbowlingbahn", "33:Bowling Teigneux", Select_LoadGame, ENTR_BOMBCHU_BOWLING_ALLEY_0 }, + { "34:" GFXP_KATAKANA "ﾛﾝﾛﾝ" GFXP_HIRAGANA "ﾎﾞｸｼﾞｮｳ ｿｳｺ 1", "34:Lon Lon Ranch House", "34:Lon Lon-Farm Haus", "34:Maison du Ranch Lon Lon", Select_LoadGame, ENTR_LON_LON_BUILDINGS_0 }, + { "35:" GFXP_KATAKANA "ﾛﾝﾛﾝ" GFXP_HIRAGANA "ﾎﾞｸｼﾞｮｳ ｿｳｺ 2", "35:Lon Lon Ranch Silo", "35:Lon Lon-Farm Silo", "35:Silo du Ranch Lon Lon", Select_LoadGame, ENTR_LON_LON_BUILDINGS_1 }, + { "36:" GFXP_HIRAGANA "ﾐﾊﾘ ｺﾞﾔ", "36:Guard House", "36:Wachposten", "36:Maison de Garde", Select_LoadGame, ENTR_MARKET_GUARD_HOUSE_0 }, + { "37:" GFXP_HIRAGANA "ﾏﾎｳ ﾉ ｸｽﾘﾔ", "37:Potion Shop", "37:Magie-Laden", "37:Apothicaire", Select_LoadGame, ENTR_POTION_SHOP_GRANNY_0 }, + { "38:" GFXP_HIRAGANA "ﾀｶﾗﾊﾞｺﾔ", "38:Treasure Chest Game", "38:Trhenlotterie", "38:Chasse aux Tresors", Select_LoadGame, ENTR_TREASURE_BOX_SHOP_0 }, + { "39:" GFXP_HIRAGANA "ｷﾝ " GFXP_KATAKANA "ｽﾀﾙﾁｭﾗ ﾊｳｽ", "39:House Of Skulltula", "39:Skulltulas Haus", "39:Maison des Skulltulas", Select_LoadGame, ENTR_HOUSE_OF_SKULLTULA_0 }, + { "40:" GFXP_HIRAGANA "ｼﾞｮｳｶﾏﾁ ｲﾘｸﾞﾁ", "40:Entrance to Market", "40:Eingang zum Marktplatz", "40:Entree de la Place du Marche", Select_LoadGame, ENTR_MARKET_ENTRANCE_DAY_0 }, + { "41:" GFXP_HIRAGANA "ｼﾞｮｳｶﾏﾁ", "41:Market", "41:Marktplatz", "41:Place du Marche", Select_LoadGame, ENTR_MARKET_DAY_0 }, + { "42:" GFXP_HIRAGANA "ｳﾗﾛｼﾞ", "42:Back Alley", "42:Seitenstrasse", "42:Ruelle", Select_LoadGame, ENTR_BACK_ALLEY_DAY_0 }, + { "43:" GFXP_HIRAGANA "ﾄｷﾉｼﾝﾃﾞﾝ ﾏｴ", "43:Temple of Time Exterior", "43:Vor der Zitadelle der Zeit", "43:Exterieur du Temple du Temps", Select_LoadGame, ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_0 }, + { "44:" GFXP_HIRAGANA "ﾘﾝｸﾉｲｴ", "44:Link's House", "44:Links Haus", "44:Cabane de Link", Select_LoadGame, ENTR_LINKS_HOUSE_0 }, + { "45:" GFXP_KATAKANA "ｶｶﾘｺ" GFXP_HIRAGANA "ﾑﾗﾉﾅｶﾞﾔ", "45:Kakariko House 1", "45:Kakariko Haus 1", "45:Maison du Village Cocorico 1", Select_LoadGame, ENTR_KAKARIKO_CENTER_GUEST_HOUSE_0 }, + { "46:" GFXP_HIRAGANA "ｳﾗﾛｼﾞﾉ ｲｴ", "46:Back Alley House 1", "46:Seitenstrasse Haus 1", "46:Maison de la Ruelle 1", Select_LoadGame, ENTR_BACK_ALLEY_HOUSE_0 }, + { "47:" GFXP_HIRAGANA "ｺｷﾘﾉﾑﾗ ﾓﾉｼﾘｷｮｳﾀﾞｲﾉｲｴ", "47:House of the Know-it-All Brothers", "47:Haus der Allwissenden Brueder", "47:Cabane des Freres Je-Sais-Tout", Select_LoadGame, ENTR_KNOW_IT_ALL_BROS_HOUSE_0 }, + { "48:" GFXP_HIRAGANA "ｺｷﾘﾉﾑﾗ ﾌﾀｺﾞﾉｲｴ", "48:House of Twins", "48:Haus der Zwillinge", "48:Cabane des Jumeaux", Select_LoadGame, ENTR_TWINS_HOUSE_0 }, + { "49:" GFXP_HIRAGANA "ｺｷﾘﾉﾑﾗ " GFXP_KATAKANA "ﾐﾄﾞ" GFXP_HIRAGANA "ﾉｲｴ", "49:Mido's House", "49:Midos Haus", "49:Cabane du Grand Mido", Select_LoadGame, ENTR_MIDOS_HOUSE_0 }, + { "50:" GFXP_HIRAGANA "ｺｷﾘﾉﾑﾗ " GFXP_KATAKANA "ｻﾘｱ" GFXP_HIRAGANA "ﾉｲｴ", "50:Saria's House", "50:Salias Haus", "50:Cabane de Saria", Select_LoadGame, ENTR_SARIAS_HOUSE_0 }, + { "51:" GFXP_HIRAGANA "ｳﾏｺﾞﾔ", "51:Stable", "51:Stall", "51:Etable", Select_LoadGame, ENTR_STABLE_0 }, + { "52:" GFXP_HIRAGANA "ﾊｶﾓﾘﾉｲｴ", "52:Grave Keeper's Hut", "52:Huette des Totengraebers", "52:Cabane du Fossoyeur", Select_LoadGame, ENTR_GRAVEKEEPERS_HUT_0 }, + { "53:" GFXP_HIRAGANA "ｳﾗﾛｼﾞ ｲﾇｵﾊﾞｻﾝﾉｲｴ", "53:Dog Lady's House", "53:Haus der Hunde-Dame", "53:Maison de la Dame du Chien", Select_LoadGame, ENTR_DOG_LADY_HOUSE_0 }, + { "54:" GFXP_HIRAGANA "ｶｶﾘｺﾑﾗ " GFXP_KATAKANA "ｲﾝﾊﾟ" GFXP_HIRAGANA "ﾉｲｴ", "54:Impa's House", "54:Impas Haus", "54:Maison d'Impa", Select_LoadGame, ENTR_IMPAS_HOUSE_0 }, + { "55:" GFXP_KATAKANA "ﾊｲﾘｱ" GFXP_HIRAGANA " ｹﾝｷｭｳｼﾞｮ", "55:Lakeside Laboratory", "55:Hylia-See Laboratorium", "55:Laboratoire du Lac", Select_LoadGame, ENTR_LAKESIDE_LABORATORY_0 }, + { "56:" GFXP_KATAKANA "ﾃﾝﾄ", "56:Running Man's Tent", "56:Zelt des Rennlaeufers", "56:Tente du Marathonien", Select_LoadGame, ENTR_CARPENTERS_TENT_0 }, + { "57:" GFXP_HIRAGANA "ﾀﾃﾉﾐｾ", "57:Bazaar", "57:Basar", "57:Bazar", Select_LoadGame, ENTR_BAZAAR_0 }, + { "58:" GFXP_HIRAGANA "ｺｷﾘｿﾞｸﾉﾐｾ", "58:Kokiri Shop", "58:Kokiri-Laden", "58:Boutique Kokiri", Select_LoadGame, ENTR_KOKIRI_SHOP_0 }, + { "59:" GFXP_KATAKANA "ｺﾞﾛﾝ" GFXP_HIRAGANA "ﾉﾐｾ", "59:Goron Shop", "59:Goronen-Laden", "59:Boutique Goron", Select_LoadGame, ENTR_GORON_SHOP_0 }, + { "60:" GFXP_KATAKANA "ｿﾞｰﾗ" GFXP_HIRAGANA "ﾉﾐｾ", "60:Zora Shop", "60:Zora-Laden", "60:Boutique Zora", Select_LoadGame, ENTR_ZORA_SHOP_0 }, + { "61:" GFXP_KATAKANA "ｶｶﾘｺ" GFXP_HIRAGANA "ﾑﾗ ｸｽﾘﾔ", "61:Closed Shop", "61:Geschlossener Laden", "61:Boutique Fermee", Select_LoadGame, ENTR_POTION_SHOP_KAKARIKO_0 }, + { "62:" GFXP_HIRAGANA "ｼﾞｮｳｶﾏﾁ ｸｽﾘﾔ", "62:Potion Shop", "62:Magie-Laden", "62:Apothicaire (Boutique)", Select_LoadGame, ENTR_POTION_SHOP_MARKET_0 }, + { "63:" GFXP_HIRAGANA "ｳﾗﾛｼﾞ ﾖﾙﾉﾐｾ", "63:Bombchu Shop", "63:Krabbelminen-Laden", "63:Boutique de Missiles Teigneux", Select_LoadGame, ENTR_BOMBCHU_SHOP_0 }, + { "64:" GFXP_HIRAGANA "ｵﾒﾝﾔ", "64:Happy Mask Shop", "64:Maskenhaendler", "64:Foire aux Masques", Select_LoadGame, ENTR_HAPPY_MASK_SHOP_0 }, + { "65:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾉｼｭｳﾚﾝｼﾞｮｳ", "65:Gerudo Training Ground", "65:Gerudo-Arena", "65:Gymnase Gerudo", Select_LoadGame, ENTR_GERUDO_TRAINING_GROUND_0 }, + { "66:" GFXP_HIRAGANA "ﾖｳｾｲﾉｷﾉ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "66:Inside the Deku Tree", "66:Im Deku-Baum", "66:Arbre Mojo", Select_LoadGame, ENTR_DEKU_TREE_0 }, + { "67:" GFXP_HIRAGANA "ﾖｳｾｲﾉｷﾉ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", "67:Gohma's Lair", "67:Gohmas Verlies", "67:Repaire de Gohma", Select_LoadGame, ENTR_DEKU_TREE_BOSS_0 }, + { "68:" GFXP_KATAKANA "ﾄﾞﾄﾞﾝｺﾞ ﾀﾞﾝｼﾞｮﾝ", "68:Dodongo's Cavern", "68:Dodongos Hoehle", "68:Caverne Dodongo", Select_LoadGame, ENTR_DODONGOS_CAVERN_0 }, + { "69:" GFXP_KATAKANA "ﾄﾞﾄﾞﾝｺﾞ ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", "69:King Dodongo's Lair", "69:King Dodongos Verlies", "69:Repaire du Roi Dodongo", Select_LoadGame, ENTR_DODONGOS_CAVERN_BOSS_0 }, + { "70:" GFXP_HIRAGANA "ｷｮﾀﾞｲｷﾞｮ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "70:Inside Jabu-Jabu's Belly", "70:Jabu-Jabus Bauch", "70:Ventre de Jabu-Jabu", Select_LoadGame, ENTR_JABU_JABU_0 }, + { "71:" GFXP_HIRAGANA "ｷｮﾀﾞｲｷﾞｮ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", "71:Barinade's Lair", "71:Barinades Verlies", "71:Repaire de Barinade", Select_LoadGame, ENTR_JABU_JABU_BOSS_0 }, + { "72:" GFXP_HIRAGANA "ﾓﾘﾉｼﾝﾃﾞﾝ", "72:Forest Temple", "72:Waldtempel", "72:Temple de la Foret", Select_LoadGame, ENTR_FOREST_TEMPLE_0 }, + { "73:" GFXP_HIRAGANA "ﾓﾘﾉｼﾝﾃﾞﾝ " GFXP_KATAKANA "ﾎﾞｽ", "73:Phantom Ganon's Lair", "73:Phantom-Ganons Verlies", "73:Repaire de Ganon Spectral", Select_LoadGame, ENTR_FOREST_TEMPLE_BOSS_0 }, + { "74:" GFXP_HIRAGANA "ｲﾄﾞｼﾀ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "74:Bottom of the Well", "74:Grund des Brunnens", "74:Puits", Select_LoadGame, ENTR_BOTTOM_OF_THE_WELL_0 }, + { "75:" GFXP_HIRAGANA "ﾊｶｼﾀ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "75:Shadow Temple", "75:Schattentempel", "75:Temple de l'Ombre", Select_LoadGame, ENTR_SHADOW_TEMPLE_0 }, + { "76:" GFXP_HIRAGANA "ﾊｶｼﾀ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", "76:Bongo Bongo's Lair", "76:Bongo Bongos Verlies", "76:Repaire de Bongo Bongo", Select_LoadGame, ENTR_SHADOW_TEMPLE_BOSS_0 }, + { "77:" GFXP_HIRAGANA "ﾋﾉｼﾝﾃﾞﾝ", "77:Fire Temple", "77:Feuertempel", "77:Temple du Feu", Select_LoadGame, ENTR_FIRE_TEMPLE_0 }, + { "78:" GFXP_HIRAGANA "ﾋﾉｼﾝﾃﾞﾝ " GFXP_KATAKANA "ﾎﾞｽ", "78:Volvagia's Lair", "78:Volvagias Verlies", "78:Repaire de Volcania", Select_LoadGame, ENTR_FIRE_TEMPLE_BOSS_0 }, + { "79:" GFXP_HIRAGANA "ﾐｽﾞﾉｼﾝﾃﾞﾝ", "79:Water Temple", "79:Wassertempel", "79:Temple de l'Eau", Select_LoadGame, ENTR_WATER_TEMPLE_0 }, + { "80:" GFXP_HIRAGANA "ﾐｽﾞﾉｼﾝﾃﾞﾝ " GFXP_KATAKANA "ﾎﾞｽ", "80:Morpha's Lair", "80:Morphas Verlies", "80:Repaire de Morpha", Select_LoadGame, ENTR_WATER_TEMPLE_BOSS_0 }, + { "81:" GFXP_HIRAGANA "ｼﾞｬｼﾝｿﾞｳ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "81:Spirit Temple", "81:Geistertempel", "81:Temple de l'Esprit", Select_LoadGame, ENTR_SPIRIT_TEMPLE_0 }, + { "82:" GFXP_HIRAGANA "ｼﾞｬｼﾝｿﾞｳ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ｱｲｱﾝﾅｯｸ", "82:Iron Knuckle's Lair", "82:Eisenprinz' Verlies", "82:Repaire du Hache Viande", Select_LoadGame, ENTR_SPIRIT_TEMPLE_BOSS_0 }, + { "83:" GFXP_HIRAGANA "ｼﾞｬｼﾝｿﾞｳ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", "83:Twinrova's Lair", "83:Killa Ohmaz' Verlies", "83:Repaire du Duo Malefique", Select_LoadGame, ENTR_SPIRIT_TEMPLE_BOSS_2 }, + { "84:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ", "84:Stairs to Ganondorf's Lair", "84:Treppen zu Ganondorfs Verlies", "84:Repaire de Ganondorf (Escaliers)", Select_LoadGame, ENTR_GANONS_TOWER_0 }, + { "85:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ" GFXP_KATAKANA "ﾎﾞｽ", "85:Ganondorf's Lair", "85:Ganondorfs Verlies", "85:Repaire de Ganondorf", Select_LoadGame, ENTR_GANONDORF_BOSS_0 }, + { "86:" GFXP_HIRAGANA "ｺｵﾘﾉﾄﾞｳｸﾂ", "86:Ice Cavern", "86:Eishoehle", "86:Caverne Polaire", Select_LoadGame, ENTR_ICE_CAVERN_0 }, + { "87:" GFXP_HIRAGANA "ﾊｶｼﾀ" GFXP_KATAKANA "ﾘﾚｰ", "87:Dampe Grave Relay Game", "87:Boris' Grab Staffellauf", "87:Tombe d'Igor", Select_LoadGame, ENTR_WINDMILL_AND_DAMPES_GRAVE_0 }, + { "88:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾁｶ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", "88:Inside Ganon's Castle", "88:In Ganons Schloss", "88:Tour de Ganon", Select_LoadGame, ENTR_INSIDE_GANONS_CASTLE_0 }, + { "89:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ｻｲｼｭｳｾﾝ " GFXP_KATAKANA "ﾃﾞﾓ & ﾊﾞﾄﾙ", "89:Ganon's Lair", "89:Ganons Verlies", "89:Repaire de Ganon", Select_LoadGame, ENTR_GANON_BOSS_0 }, + { "90:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ ｿﾉｺﾞ 1", "90:Escaping Ganon's Castle 1", "90:Flucht aus Ganons Schloss 1", "90:Fuite du Chateau de Ganon 1", Select_LoadGame, ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_0 }, + { "91:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ ｿﾉｺﾞ 2", "91:Escaping Ganon's Castle 2", "91:Flucht aus Ganons Schloss 2", "91:Fuite du Chateau de Ganon 2", Select_LoadGame, ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_2 }, + { "92:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ ｿﾉｺﾞ 3", "92:Escaping Ganon's Castle 3", "92:Flucht aus Ganons Schloss 3", "92:Fuite du Chateau de Ganon 3", Select_LoadGame, ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_4 }, + { "93:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ ｿﾉｺﾞ 4", "93:Escaping Ganon's Castle 4", "93:Flucht aus Ganons Schloss 4", "93:Fuite du Chateau de Ganon 4", Select_LoadGame, ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_6 }, + { "94:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾁｶ ｿﾉｺﾞ", "94:Escaping Ganon's Castle 5", "94:Flucht aus Ganons Schloss 5", "94:Fuite du Chateau de Ganon 5", Select_LoadGame, ENTR_INSIDE_GANONS_CASTLE_COLLAPSE_0 }, + { "95:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 1-2", "95:Thieves' Hideout 1-2", "95:Diebesversteck 1-2", "95:Repaire des Voleurs 1-2", Select_LoadGame, ENTR_THIEVES_HIDEOUT_0 }, + { "96:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 3-4 9-10", "96:Thieves' Hideout 3-4 9-10", "96:Diebesversteck 3-4 9-10", "96:Repaire des Voleurs 3-4 9-10", Select_LoadGame, ENTR_THIEVES_HIDEOUT_2 }, + { "97:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 5-6", "97:Thieves' Hideout 5-6", "97:Diebesversteck 5-6", "97:Repaire des Voleurs 5-6", Select_LoadGame, ENTR_THIEVES_HIDEOUT_4 }, + { "98:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 7-8", "98:Thieves' Hideout 7-8", "98:Diebesversteck 7-8", "98:Repaire des Voleurs 7-8", Select_LoadGame, ENTR_THIEVES_HIDEOUT_6 }, + { "99:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 11-12", "99:Thieves' Hideout 11-12", "99:Diebesversteck 11-12", "99:Repaire des Voleurs 11-12", Select_LoadGame, ENTR_THIEVES_HIDEOUT_10 }, + { "100:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾂｳﾛ 13", "100:Thieves' Hideout 13", "100:Diebesversteck 13", "100:Repaire des Voleurs 13", Select_LoadGame, ENTR_THIEVES_HIDEOUT_12 }, + { "101:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 0", "101:Grotto 0", "101:Grotte 0", "101:Grotte 0", Select_LoadGame, ENTR_GROTTOS_0 }, + { "102:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 1", "102:Grotto 1", "102:Grotte 1", "102:Grotte 1", Select_LoadGame, ENTR_GROTTOS_1 }, + { "103:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 2", "103:Grotto 2", "103:Grotte 2", "103:Grotte 2", Select_LoadGame, ENTR_GROTTOS_2 }, + { "104:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 3", "104:Grotto 3", "104:Grotte 3", "104:Grotte 3", Select_LoadGame, ENTR_GROTTOS_3 }, + { "105:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 4", "105:Grotto 4", "105:Grotte 4", "105:Grotte 4", Select_LoadGame, ENTR_GROTTOS_4 }, + { "106:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 5", "106:Grotto 5", "106:Grotte 5", "106:Grotte 5", Select_LoadGame, ENTR_GROTTOS_5 }, + { "107:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 6", "107:Grotto 6", "107:Grotte 6", "107:Grotte 6", Select_LoadGame, ENTR_GROTTOS_6 }, + { "108:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 7", "108:Grotto 7", "108:Grotte 7", "108:Grotte 7", Select_LoadGame, ENTR_GROTTOS_7 }, + { "109:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 8", "109:Grotto 8", "109:Grotte 8", "109:Grotte 8", Select_LoadGame, ENTR_GROTTOS_8 }, + { "110:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 9", "110:Grotto 9", "110:Grotte 9", "110:Grotte 9", Select_LoadGame, ENTR_GROTTOS_9 }, + { "111:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 10", "111:Grotto 10", "111:Grotte 10", "111:Grotte 10", Select_LoadGame, ENTR_GROTTOS_10 }, + { "112:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 11", "112:Grotto 11", "112:Grotte 11", "112:Grotte 11", Select_LoadGame, ENTR_GROTTOS_11 }, + { "113:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 12", "113:Grotto 12", "113:Grotte 12", "113:Grotte 12", Select_LoadGame, ENTR_GROTTOS_12 }, + { "114:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 13", "114:Grotto 13", "114:Grotte 13", "114:Grotte 13", Select_LoadGame, ENTR_GROTTOS_13 }, + { "115:" GFXP_KATAKANA "ﾊｲﾗﾙ ﾃﾞﾓ", "115:Goddess Cutscene Environment", "115:Goettinnen Cutscene Umgebung", "115:Carte de la scene des Deesses", Select_LoadGame, ENTR_CUTSCENE_MAP_0 }, + { "116:" GFXP_HIRAGANA "ﾍﾞｯｼﾂ (ﾀｶﾗﾊﾞｺ" GFXP_KATAKANA "ﾜｰﾌﾟ)", "116:Test Room", "116:Test Raum", "116:Salle de Test", Select_LoadGame, ENTR_BESITU_0 }, + { "117:" GFXP_HIRAGANA "ｻｻ" GFXP_KATAKANA "ﾃｽﾄ", "117:SRD Map", "117:SRD Karte", "117:Carte SRD", Select_LoadGame, ENTR_SASATEST_0 }, + { "118:" GFXP_KATAKANA "ﾃｽﾄﾏｯﾌﾟ", "118:Test Map", "118:Test Karte", "118:Carte de Test", Select_LoadGame, ENTR_TEST01_0 }, + { "119:" GFXP_KATAKANA "ﾃｽﾄﾙｰﾑ", "119:Treasure Chest Warp", "119:Schatzkisten Teleport", "119:Coffres debug", Select_LoadGame, ENTR_TESTROOM_0 }, + { "120:" GFXP_HIRAGANA "ﾁｭｳ" GFXP_KATAKANA "ｽﾀﾛﾌｫｽ" GFXP_HIRAGANA "ﾍﾞﾔ", "120:Stalfos Miniboss Room", "120:Stalfos-Ritter Miniboss Raum", "120:Salle de Miniboss Stalfos", Select_LoadGame, ENTR_SYOTES_0 }, + { "121:" GFXP_KATAKANA "ﾎﾞｽｽﾀﾛﾌｫｽ" GFXP_HIRAGANA "ﾍﾞﾔ", "121:Stalfos Boss Room", "121:Stalfos-Ritter Boss Raum", "121:Salle de Boss Stalfos", Select_LoadGame, ENTR_SYOTES2_0 }, + { "122:Sutaru", "122:Dark Link Room", "122:Schwarzer Link Raum", "122:Salle de Dark Link", Select_LoadGame, ENTR_SUTARU_0 }, + { "123:jikkenjyou", "123:Shooting Gallery Duplicate", "123:Schiessbude (Duplikat)", "123:Jeu d'adresse (Duplicata)", Select_LoadGame, ENTR_TEST_SHOOTING_GALLERY_0 }, + { "124:depth" GFXP_KATAKANA "ﾃｽﾄ", "124:depth test", "124:Tiefen Test", "124:Test de Profondeur", Select_LoadGame, ENTR_DEPTH_TEST_0 }, + { "125:" GFXP_KATAKANA "ﾊｲﾗﾙ" GFXP_HIRAGANA "ﾆﾜ" GFXP_KATAKANA "ｹﾞｰﾑ2", "125:Hyrule Garden Game (Broken)", "125:Burghof - Wachen-Minispiel (Kaputt)", "125:Cour du Chateau (Non fonctionnel)", Select_LoadGame, ENTR_HAIRAL_NIWA2_0 }, + { "title", "title", "Titelbildschirm", "Ecran-titre", Select_LoadTitle, 0 }, }; static BetterSceneSelectEntry sBetterScenes[] = { { " 1:Hyrule Field", " 1:Hylianische Steppe", " 1:Plaine d'Hyrule", Select_LoadGame, 8, { - { "Near Drawbridge", "Nahe der Zugbruecke", "Pres du Pont-levis", 0x00CD, 0 }, - { "From Drawbridge", "Von der Zugbruecke", "Depuis le Pont-levis", 0x01FD, 0 }, - { "From Kakariko Village", "Von Kakariko", "Depuis le Village Cocorico", 0x017D, 0 }, - { "From Zora River", "Vom Zora-Fluss", "Depuis la Riviere Zora", 0x0181, 0 }, - { "From Lost Woods", "Von den verlorenen Waeldern", "Depuis les Bois Perdus", 0x0185, 0 }, - { "From Lake Hylia", "Vom Hylia-See", "Depuis le Lac Hylia", 0x0189, 0 }, - { "From Gerudo Valley", "Vom Gerudotal", "Depuis la Vallee Gerudo", 0x018D, 0 }, - { "From Lon Lon Ranch", "Von der Lon Lon-Farm", "Depuis le Ranch Lon Lon", 0x01F9, 0 }, + { "Near Drawbridge", "Nahe der Zugbruecke", "Pres du Pont-levis", ENTR_HYRULE_FIELD_0, 0 }, + { "From Drawbridge", "Von der Zugbruecke", "Depuis le Pont-levis", ENTR_HYRULE_FIELD_7, 0 }, + { "From Kakariko Village", "Von Kakariko", "Depuis le Village Cocorico", ENTR_HYRULE_FIELD_1, 0 }, + { "From Zora River", "Vom Zora-Fluss", "Depuis la Riviere Zora", ENTR_HYRULE_FIELD_2, 0 }, + { "From Lost Woods", "Von den verlorenen Waeldern", "Depuis les Bois Perdus", ENTR_HYRULE_FIELD_3, 0 }, + { "From Lake Hylia", "Vom Hylia-See", "Depuis le Lac Hylia", ENTR_HYRULE_FIELD_4, 0 }, + { "From Gerudo Valley", "Vom Gerudotal", "Depuis la Vallee Gerudo", ENTR_HYRULE_FIELD_5, 0 }, + { "From Lon Lon Ranch", "Von der Lon Lon-Farm", "Depuis le Ranch Lon Lon", ENTR_HYRULE_FIELD_6, 0 }, }}, { " 2:Kokiri Forest", " 2:Kokiri-Wald", " 2:Foret Kokiri", Select_LoadGame, 9, { - { "From Links House", "Von Links Haus", "Depuis la Cabane de Link", 0x0211, 0 }, - { "From Bridge", "Von der Bruecke", "Depuis le Pont", 0x020D, 0 }, - { "From Lost Woods", "Von den verlorenen Waeldern", "Depuis les Bois Perdus", 0x0286, 0 }, - { "From Deku Tree", "Vom Deku-Baum", "Depuis l'Arbre Mojo", 0x0209, 0 }, - { "From Kokiri Shop", "Vom Kokiri-Laden", "Depuis la Boutique Kokiri", 0x0266, 0 }, - { "From Know-It-All Brothers House", "Vom Haus der Allwissenden Brueder", "Depuis la Cabane des Freres Je-Sais-Tout", 0x026A, 0 }, - { "From Twins House", "Vom Haus der Zwillinge", "Depuis la Cabane des Jumeaux", 0x033C, 0 }, - { "From Midos House", "Von Midos Haus", "Depuis la Cabane du Grand Mido", 0x0443, 0 }, - { "From Sarias House", "Von Salias Haus", "Depuis la Cabane de Saria", 0x0447, 0 }, + { "From Links House", "Von Links Haus", "Depuis la Cabane de Link", ENTR_KOKIRI_FOREST_3, 0 }, + { "From Bridge", "Von der Bruecke", "Depuis le Pont", ENTR_KOKIRI_FOREST_2, 0 }, + { "From Lost Woods", "Von den verlorenen Waeldern", "Depuis les Bois Perdus", ENTR_KOKIRI_FOREST_6, 0 }, + { "From Deku Tree", "Vom Deku-Baum", "Depuis l'Arbre Mojo", ENTR_KOKIRI_FOREST_1, 0 }, + { "From Kokiri Shop", "Vom Kokiri-Laden", "Depuis la Boutique Kokiri", ENTR_KOKIRI_FOREST_4, 0 }, + { "From Know-It-All Brothers House", "Vom Haus der Allwissenden Brueder", "Depuis la Cabane des Freres Je-Sais-Tout", ENTR_KOKIRI_FOREST_5, 0 }, + { "From Twins House", "Vom Haus der Zwillinge", "Depuis la Cabane des Jumeaux", ENTR_KOKIRI_FOREST_8, 0 }, + { "From Midos House", "Von Midos Haus", "Depuis la Cabane du Grand Mido", ENTR_KOKIRI_FOREST_9, 0 }, + { "From Sarias House", "Von Salias Haus", "Depuis la Cabane de Saria", ENTR_KOKIRI_FOREST_10, 0 }, }}, { " 3:Kokiri Buildings", " 3:Kokiri Gebaeude", " 3:Cabanes des Kokiris", Select_LoadGame, 6, { - { "Links Bed", "Links Bett", "Lit de Link", 0x00BB, 0 }, - { "Kokiri Shop", "Kokiri-Laden", "Boutique Kokiri", 0x00C1, 0 }, - { "Twins House", "Haus der Zwillinge", "Cabane des Jumeaux", 0x009C, 0 }, - { "Know-It-All Brothers House", "Haus der Allwissenden Brueder", "Cabane des Freres Je-Sais-Tout", 0x00C9, 0 }, - { "Midos House", "Midos Haus", "Cabane du Grand Mido", 0x0433, 0 }, - { "Sarias House", "Salias Haus", "Cabane de Sara", 0x0437, 0 }, + { "Links Bed", "Links Bett", "Lit de Link", ENTR_LINKS_HOUSE_0, 0 }, + { "Kokiri Shop", "Kokiri-Laden", "Boutique Kokiri", ENTR_KOKIRI_SHOP_0, 0 }, + { "Twins House", "Haus der Zwillinge", "Cabane des Jumeaux", ENTR_TWINS_HOUSE_0, 0 }, + { "Know-It-All Brothers House", "Haus der Allwissenden Brueder", "Cabane des Freres Je-Sais-Tout", ENTR_KNOW_IT_ALL_BROS_HOUSE_0, 0 }, + { "Midos House", "Midos Haus", "Cabane du Grand Mido", ENTR_MIDOS_HOUSE_0, 0 }, + { "Sarias House", "Salias Haus", "Cabane de Sara", ENTR_SARIAS_HOUSE_0, 0 }, }}, { " 4:Lost Woods", " 4:Verlorene Waelder", " 4:Bois Perdus", Select_LoadGame, 5, { - { "From Kokiri Forest", "Vom Kokiri-Wald", "Depuis la Foret Kokiri", 0x011E, 0 }, - { "From Sacred Meadow", "Von der Waldlichtung", "Depuis le Bosquet Sacre", 0x01A9, 0 }, - { "From Goron City", "Vom Goronia", "Depuis le Village Goron", 0x04D6, 0 }, - { "From Zora River", "Vom Zora-Fluss", "Depuis la Riviere Zora", 0x04DA, 0 }, - { "Bridge", "Bruecke", "Pont", 0x05E0, 0 }, + { "From Kokiri Forest", "Vom Kokiri-Wald", "Depuis la Foret Kokiri", ENTR_LOST_WOODS_0, 0 }, + { "From Sacred Meadow", "Von der Waldlichtung", "Depuis le Bosquet Sacre", ENTR_LOST_WOODS_1, 0 }, + { "From Goron City", "Vom Goronia", "Depuis le Village Goron", ENTR_LOST_WOODS_6, 0 }, + { "From Zora River", "Vom Zora-Fluss", "Depuis la Riviere Zora", ENTR_LOST_WOODS_7, 0 }, + { "Bridge", "Bruecke", "Pont", ENTR_LOST_WOODS_9, 0 }, }}, { " 5:Sacred Forest Meadow", " 5:Waldlichtung", " 5:Bosquet Sacre", Select_LoadGame, 3, { - { "From Lost Woods", "Von den Verlorenen Waeldern", "Depuis les Bois Perdus", 0x00FC, 0 }, - { "From Forest Temple", "Vom Waldtempel", "Depuis le Temple de la Foret", 0x0215, 0 }, - { "Minuet of Forest Warp", "Menuett des Waldes Teleport", "Teleporteur du Menuet des Bois", 0x0600, 0 }, + { "From Lost Woods", "Von den Verlorenen Waeldern", "Depuis les Bois Perdus", ENTR_SACRED_FOREST_MEADOW_0, 0 }, + { "From Forest Temple", "Vom Waldtempel", "Depuis le Temple de la Foret", ENTR_SACRED_FOREST_MEADOW_1, 0 }, + { "Minuet of Forest Warp", "Menuett des Waldes Teleport", "Teleporteur du Menuet des Bois", ENTR_SACRED_FOREST_MEADOW_2, 0 }, }}, { " 6:Castle Town Entrance", " 6:Eingang zum Marktplatz", " 6:Entree du Bourg d'Hyrule", Select_LoadGame, 3, { - { "From Hyrule Field", "Von der Hylianischen Steppe", "Depuis la Plaine d'Hyrule", 0x0276, 0 }, - { "From Market", "Vom Marktplatz", "Depuis la Place du Marche", 0x0033, 0 }, - { "From Pot House", "Vom Wachposten", "Depuis la Maison des Jarres", 0x026E, 0 }, + { "From Hyrule Field", "Von der Hylianischen Steppe", "Depuis la Plaine d'Hyrule", ENTR_MARKET_ENTRANCE_DAY_1, 0 }, + { "From Market", "Vom Marktplatz", "Depuis la Place du Marche", ENTR_MARKET_ENTRANCE_DAY_0, 0 }, + { "From Pot House", "Vom Wachposten", "Depuis la Maison des Jarres", ENTR_MARKET_ENTRANCE_DAY_2, 0 }, }}, { " 7:Market", " 7:Marktplatz", " 7:Place du Marche", Select_LoadGame, 11, { - { "From Castle Town Entrance", "Vom Eingang zum Marktplatz", "Depuis l'Entree du Bourg d'Hyrule", 0x00B1, 0 }, - { "From Shooting Gallery", "Von der Schiessbude", "Depuis le Jeu d'adresse", 0x01CD, 0 }, - { "From Happy Mask Shop", "Vom Maskenhaendler", "Depuis la Foire aux Masques", 0x01D1, 0 }, - { "From Treasure Box Minigame", "Von der Truhenlotterie", "Depuis le Bowling Teigneux", 0x01D5, 0 }, - { "From Castle", "Vom Schloss", "Depuis le Chateau d'Hyrule", 0x025A, 0 }, - { "From Temple of Time", "Von der Zitadelle der Zeit", "Depuis le Temple du Temps", 0x025E, 0 }, - { "From Back Alley (Right)", "Von der Seitenstrasse (Rechts)", "Depuis la Ruelle (Droite)", 0x0262, 0 }, - { "From Back Alley (Left)", "Von der Seitenstrasse (Links)", "Depuis la Ruelle (Gauche)", 0x029E, 0 }, - { "From Potion Shop", "Vom Magie-Laden", "Depuis l'Apothicaire", 0x02A2, 0 }, - { "From Bazaar Shop", "Vom Basar", "Depuis le Bazar", 0x03B8, 0 }, - { "From Bomchu Bowling Minigame", "Von der Minenbowlingbahn", "Depuis le Bowling Teigneux", 0x03BC, 0 }, + { "From Castle Town Entrance", "Vom Eingang zum Marktplatz", "Depuis l'Entree du Bourg d'Hyrule", ENTR_MARKET_DAY_0, 0 }, + { "From Shooting Gallery", "Von der Schiessbude", "Depuis le Jeu d'adresse", ENTR_MARKET_DAY_8, 0 }, + { "From Happy Mask Shop", "Vom Maskenhaendler", "Depuis la Foire aux Masques", ENTR_MARKET_DAY_9, 0 }, + { "From Treasure Box Minigame", "Von der Truhenlotterie", "Depuis le Bowling Teigneux", ENTR_MARKET_DAY_10, 0 }, + { "From Castle", "Vom Schloss", "Depuis le Chateau d'Hyrule", ENTR_MARKET_DAY_1, 0 }, + { "From Temple of Time", "Von der Zitadelle der Zeit", "Depuis le Temple du Temps", ENTR_MARKET_DAY_2, 0 }, + { "From Back Alley (Right)", "Von der Seitenstrasse (Rechts)", "Depuis la Ruelle (Droite)", ENTR_MARKET_DAY_3, 0 }, + { "From Back Alley (Left)", "Von der Seitenstrasse (Links)", "Depuis la Ruelle (Gauche)", ENTR_MARKET_DAY_4, 0 }, + { "From Potion Shop", "Vom Magie-Laden", "Depuis l'Apothicaire", ENTR_MARKET_DAY_5, 0 }, + { "From Bazaar Shop", "Vom Basar", "Depuis le Bazar", ENTR_MARKET_DAY_6, 0 }, + { "From Bomchu Bowling Minigame", "Von der Minenbowlingbahn", "Depuis le Bowling Teigneux", ENTR_MARKET_DAY_7, 0 }, }}, { " 8:Castle Town Alley", " 8:Seitenstrasse", " 8:Ruelle du Bourg d'Hyrule", Select_LoadGame, 5, { - { "From Market (Right)", "Vom Marktplatz (Rechts)", "Depuis la Place du Marche (Droite)", 0x00AD, 0 }, - { "From Market (Left)", "Vom Marktplatz (Links)", "Depuis la Place du Marche (Gauche)", 0x029A, 0 }, - { "From Alley House", "Vom Seitenstrassenhaus", "Depuis la Maison de la Ruelle", 0x0067, 0 }, - { "From Dog House", "Vom Haus der Hunde-Dame", "Depuis la Maison du Chien", 0x038C, 0 }, - { "From Bombchu Shop", "Vom Krabbelminen-Laden", "Depuis le Magasin de Missiles", 0x03C0, 0 }, + { "From Market (Right)", "Vom Marktplatz (Rechts)", "Depuis la Place du Marche (Droite)", ENTR_BACK_ALLEY_DAY_0, 0 }, + { "From Market (Left)", "Vom Marktplatz (Links)", "Depuis la Place du Marche (Gauche)", ENTR_BACK_ALLEY_DAY_1, 0 }, + { "From Alley House", "Vom Seitenstrassenhaus", "Depuis la Maison de la Ruelle", ENTR_BACK_ALLEY_DAY_3, 0 }, + { "From Dog House", "Vom Haus der Hunde-Dame", "Depuis la Maison du Chien", ENTR_BACK_ALLEY_DAY_4, 0 }, + { "From Bombchu Shop", "Vom Krabbelminen-Laden", "Depuis le Magasin de Missiles", ENTR_BACK_ALLEY_DAY_2, 0 }, }}, { " 9:Castle Town Buildings", " 9:Marktplatz Gebaeude", " 9:Batiments du Bourg d'Hyrule", Select_LoadGame, 10, { - { "Pot House", "Wachposten", "Maison des Jarres", 0x007E, 0 }, - { "Shooting Gallery Minigame", "Schiessbude", "Jeu d'adresse", 0x016D, 0 }, - { "Treasure Box Minigame", "Truhenlotterie", "Chasse aux Tresors", 0x0063, 0 }, - { "Potion Shop", "Magie-Laden", "Apothicaire", 0x0388, 0 }, - { "Bombchu Bowling Minigame", "Minenbowlingbahn", "Bowling Teigneux", 0x0507, 0 }, - { "Bazaar Shop", "Basar", "Bazar", 0x052C, 0 }, - { "Happy Mask Shop", "Maskenhaendler", "Foire aux Masques", 0x0530, 0 }, - { "Bombchu Shop", "Krabbelminen-Laden", "Boutique de Missiles", 0x0528, 0 }, - { "Dog House", "Haus der Hunde-Dame", "Maison du Chien", 0x0398, 0 }, - { "Alley House", "Seitenstrassenhaus", "Maison de la Ruelle", 0x043B, 0 }, + { "Pot House", "Wachposten", "Maison des Jarres", ENTR_MARKET_GUARD_HOUSE_0, 0 }, + { "Shooting Gallery Minigame", "Schiessbude", "Jeu d'adresse", ENTR_SHOOTING_GALLERY_1, 0 }, + { "Treasure Box Minigame", "Truhenlotterie", "Chasse aux Tresors", ENTR_TREASURE_BOX_SHOP_0, 0 }, + { "Potion Shop", "Magie-Laden", "Apothicaire", ENTR_POTION_SHOP_MARKET_0, 0 }, + { "Bombchu Bowling Minigame", "Minenbowlingbahn", "Bowling Teigneux", ENTR_BOMBCHU_BOWLING_ALLEY_0, 0 }, + { "Bazaar Shop", "Basar", "Bazar", ENTR_BAZAAR_1, 0 }, + { "Happy Mask Shop", "Maskenhaendler", "Foire aux Masques", ENTR_HAPPY_MASK_SHOP_0, 0 }, + { "Bombchu Shop", "Krabbelminen-Laden", "Boutique de Missiles", ENTR_BOMBCHU_SHOP_1, 0 }, + { "Dog House", "Haus der Hunde-Dame", "Maison du Chien", ENTR_DOG_LADY_HOUSE_0, 0 }, + { "Alley House", "Seitenstrassenhaus", "Maison de la Ruelle", ENTR_BACK_ALLEY_HOUSE_0, 0 }, }}, { "10:Temple of Time", "10:Zitadelle der Zeit", "10:Temple du Temps", Select_LoadGame, 5, { - { "From Outside", "Von draussen", "Depuis l'Entree", 0x053, 0 }, - { "From Master Sword Pedestal", "Vom Master-Schwert Podest", "Depuis le Piedestal de l'Epee de Legende", 0x02CA, 0 }, - { "Prelude of Light Warp", "Kantate des Lichts Teleport", "Teleporteur du Prelude de la Lumiere", 0x05F4, 0 }, - { "Outside Temple of Time - From Market", "Vor der Zitadelle der Zeit - Vom Marktplatz", "Exterieur du Temple - Depuis la Place du Marche", 0x0171, 0 }, - { "Outside Temple of Time - From Temple of Time", "Vor der Zitadelle der Zeit - Von der Zitadelle der Zeit", "Exterieur du Temple - Depuis le Temple", 0x0472, 0 }, + { "From Outside", "Von draussen", "Depuis l'Entree", ENTR_TEMPLE_OF_TIME_0, 0 }, + { "From Master Sword Pedestal", "Vom Master-Schwert Podest", "Depuis le Piedestal de l'Epee de Legende", ENTR_TEMPLE_OF_TIME_2, 0 }, + { "Prelude of Light Warp", "Kantate des Lichts Teleport", "Teleporteur du Prelude de la Lumiere", ENTR_TEMPLE_OF_TIME_7, 0 }, + { "Outside Temple of Time - From Market", "Vor der Zitadelle der Zeit - Vom Marktplatz", "Exterieur du Temple - Depuis la Place du Marche", ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_0, 0 }, + { "Outside Temple of Time - From Temple of Time", "Vor der Zitadelle der Zeit - Von der Zitadelle der Zeit", "Exterieur du Temple - Depuis le Temple", ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_1, 0 }, }}, { "11:Hyrule Castle", "11:Schloss Hyrule", "11:Chateau d'Hyrule", Select_LoadGame, 5, { - { "From Market", "Vom Marktplatz", "Depuis la Place du Marche", 0x0138, 0 }, - { "From Castle Courtyard", "Vom Burghof", "Depuis la Cour du Chateau", 0x023D, 0 }, - { "From Great Fairy", "Von der Feen-Quelle", "Depuis la Grande Fee", 0x0340, 0 }, - { "From Courtyard Guard Capture", "Von Wachen-Festnahme", "Depuis la capture d'un Garde de la Cour", 0x04FA, 0 }, - { "Great Fairy", "Feen-Quelle", "Grande Fee", 0x04C2, 0 }, + { "From Market", "Vom Marktplatz", "Depuis la Place du Marche", ENTR_HYRULE_CASTLE_0, 0 }, + { "From Castle Courtyard", "Vom Burghof", "Depuis la Cour du Chateau", ENTR_HYRULE_CASTLE_1, 0 }, + { "From Great Fairy", "Von der Feen-Quelle", "Depuis la Grande Fee", ENTR_HYRULE_CASTLE_2, 0 }, + { "From Courtyard Guard Capture", "Von Wachen-Festnahme", "Depuis la capture d'un Garde de la Cour", ENTR_HYRULE_CASTLE_3, 0 }, + { "Great Fairy", "Feen-Quelle", "Grande Fee", ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_2, 0 }, }}, { "12:Hyrule Castle Courtyard", "12:Burghof", "12:Cour du Chateau", Select_LoadGame, 3, { - { "From Crawlspace", "Vom Kriechtunnel", "Depuis l'Entree", 0x007A, 0 }, - { "From Zelda", "Von Zelda", "Depuis Zelda", 0x0296, 0 }, - { "Zeldas Courtyard", "Zeldas Burghof", "Depuis la Cour de Zelda", 0x0400, 0 }, + { "From Crawlspace", "Vom Kriechtunnel", "Depuis l'Entree", ENTR_CASTLE_COURTYARD_GUARDS_DAY_0, 0 }, + { "From Zelda", "Von Zelda", "Depuis Zelda", ENTR_CASTLE_COURTYARD_GUARDS_DAY_1, 0 }, + { "Zeldas Courtyard", "Zeldas Burghof", "Depuis la Cour de Zelda", ENTR_CASTLE_COURTYARD_ZELDA_0, 0 }, }}, { "13:Lon Lon Ranch", "13:Lon Lon-Farm", "13:Ranch Lon Lon", Select_LoadGame, 4, { - { "From Hyrule Field", "Von der Hylianischen Steppe", "Depuis la Plaine d'Hyrule", 0x0157, 0 }, - { "From Ranch House", "Vom Farmhaus", "Depuis la Maison du Ranch", 0x0378, 0 }, - { "From Stables", "Vom Stall", "Depuis l'Etable", 0x042F, 0 }, - { "Epona Song Cutscene", "Eponas Song Cutscene", "Cinematique du Chant d'Epona", 0x02AE, 0 }, + { "From Hyrule Field", "Von der Hylianischen Steppe", "Depuis la Plaine d'Hyrule", ENTR_LON_LON_RANCH_0, 0 }, + { "From Ranch House", "Vom Farmhaus", "Depuis la Maison du Ranch", ENTR_LON_LON_RANCH_4, 0 }, + { "From Stables", "Vom Stall", "Depuis l'Etable", ENTR_LON_LON_RANCH_5, 0 }, + { "Epona Song Cutscene", "Eponas Song Cutscene", "Cinematique du Chant d'Epona", ENTR_LON_LON_RANCH_1, 0 }, }}, { "14:Lon Lon Ranch Buildings", "14:Lon Lon-Farm Gebaeude", "14:Batiments du Ranch Lon Lon", Select_LoadGame, 3, { - { "Ranch House", "Farmhaus", "Maison du Ranch", 0x004F, 0 }, - { "Stables", "Stall", "Etable du Ranch", 0x02F9, 0 }, - { "Back Tower", "Silo", "Silo du Ranch", 0x05D0, 0 }, + { "Ranch House", "Farmhaus", "Maison du Ranch", ENTR_LON_LON_BUILDINGS_0, 0 }, + { "Stables", "Stall", "Etable du Ranch", ENTR_STABLE_0, 0 }, + { "Back Tower", "Silo", "Silo du Ranch", ENTR_LON_LON_BUILDINGS_1, 0 }, }}, { "15:Kakariko Village", "15:Kakariko", "15:Village Cocorico", Select_LoadGame, 15, { - { "From Hyrule Field", "Von der Hylianischen Steppe", "Depuis la Plaine d'Hyrule", 0x00DB, 0 }, - { "From Death Mountain", "Vom Todesberg", "Depuis le Mont du Peril", 0x0191, 0 }, - { "From Graveyard", "Vom Friedhof", "Depuis le Cimetiere", 0x0195, 0 }, - { "From Bazaar", "Vom Basar", "Depuis le Bazar", 0x0201, 0 }, - { "From Bottom of Well", "Vom Grund des Brunnens", "Depuis le Puits", 0x02A6, 0 }, - { "From Boss House", "Vom Haus des Bosses", "Depuis la Maison du Boss", 0x0349, 0 }, - { "From Potion Shop", "Vom Magie-Laden", "Depuis l'Apothicaire", 0x044B, 0 }, - { "From Potion Shop (Back Entrance)", "Vom Magie-Laden (Hintereingang)", "Depuis l'Apothicaire (Entree Arriere)", 0x04FF, 0 }, - { "From Grannys Potion Shop", "Von Omas Magie-Laden", "Depuis l'Apothicaire (Vieille Femme)", 0x034D, 0 }, - { "From Impas House", "Von Impas Haus", "Depuis la Maison d'Impa", 0x0345, 0 }, - { "From Impas House (Cow)", "Von Impas Haus (Kuh)", "Depuis la Maison d'Impa (Vache)", 0x05DC, 0 }, - { "From Windmill", "Von der Windmuehle", "Depuis le Moulin", 0x0351, 0 }, - { "From Shooting Gallery", "Von der Schiessbude", "Depuis le Jeu d'adresse", 0x0463, 0 }, - { "From Skulltula House", "Vom Skulltula Haus", "Depuis la Maison des Skulltulas", 0x04EE, 0 }, - { "Owl Drop Spot from Death Mountain", "Eulen-Absetzpunkt vom Todesberg", "Point de chute du Hibou depuis le Mont du Peril", 0x0554, 0 }, + { "From Hyrule Field", "Von der Hylianischen Steppe", "Depuis la Plaine d'Hyrule", ENTR_KAKARIKO_VILLAGE_0, 0 }, + { "From Death Mountain", "Vom Todesberg", "Depuis le Mont du Peril", ENTR_KAKARIKO_VILLAGE_1, 0 }, + { "From Graveyard", "Vom Friedhof", "Depuis le Cimetiere", ENTR_KAKARIKO_VILLAGE_2, 0 }, + { "From Bazaar", "Vom Basar", "Depuis le Bazar", ENTR_KAKARIKO_VILLAGE_3, 0 }, + { "From Bottom of Well", "Vom Grund des Brunnens", "Depuis le Puits", ENTR_KAKARIKO_VILLAGE_4, 0 }, + { "From Boss House", "Vom Haus des Bosses", "Depuis la Maison du Boss", ENTR_KAKARIKO_VILLAGE_6, 0 }, + { "From Potion Shop", "Vom Magie-Laden", "Depuis l'Apothicaire", ENTR_KAKARIKO_VILLAGE_9, 0 }, + { "From Potion Shop (Back Entrance)", "Vom Magie-Laden (Hintereingang)", "Depuis l'Apothicaire (Entree Arriere)", ENTR_KAKARIKO_VILLAGE_12, 0 }, + { "From Grannys Potion Shop", "Von Omas Magie-Laden", "Depuis l'Apothicaire (Vieille Femme)", ENTR_KAKARIKO_VILLAGE_7, 0 }, + { "From Impas House", "Von Impas Haus", "Depuis la Maison d'Impa", ENTR_KAKARIKO_VILLAGE_5, 0 }, + { "From Impas House (Cow)", "Von Impas Haus (Kuh)", "Depuis la Maison d'Impa (Vache)", ENTR_KAKARIKO_VILLAGE_15, 0 }, + { "From Windmill", "Von der Windmuehle", "Depuis le Moulin", ENTR_KAKARIKO_VILLAGE_8, 0 }, + { "From Shooting Gallery", "Von der Schiessbude", "Depuis le Jeu d'adresse", ENTR_KAKARIKO_VILLAGE_10, 0 }, + { "From Skulltula House", "Vom Skulltula Haus", "Depuis la Maison des Skulltulas", ENTR_KAKARIKO_VILLAGE_11, 0 }, + { "Owl Drop Spot from Death Mountain", "Eulen-Absetzpunkt vom Todesberg", "Point de chute du Hibou depuis le Mont du Peril", ENTR_KAKARIKO_VILLAGE_14, 0 }, }}, { "16:Kakariko Buildings", "16:Kakariko Gebaeude", "16:Batiments du Village Cocorico", Select_LoadGame, 9, { - { "Shooting Gallery Minigame", "Schiessbude", "Jeu d'adresse", 0x003B, 0 }, - { "Grannys Potion Shop", "Omas Magie-Laden", "Apothicaire (Vieille Femme)", 0x0072, 0 }, - { "Bazaar Shop", "Basar", "Bazar", 0x00B7, 0 }, - { "Potion Shop", "Magie-Laden", "Apothicaire", 0x0384, 0 }, - { "Impas House", "Impas Haus", "Maison d'Impa", 0x039C, 0 }, - { "Impas House (Near Cow)", "Impas Haus (Kuh)", "Maison d'Impa (Vache)", 0x05C8, 0 }, - { "Boss House", "Haus des Bosses", "Maison du Boss", 0x02FD, 0 }, - { "Windmill", "Windmuehle", "Moulin", 0x0453, 0 }, - { "Skulltula House", "Skulltula Haus", "Maison des SKulltulas", 0x0550, 0 }, + { "Shooting Gallery Minigame", "Schiessbude", "Jeu d'adresse", ENTR_SHOOTING_GALLERY_0, 0 }, + { "Grannys Potion Shop", "Omas Magie-Laden", "Apothicaire (Vieille Femme)", ENTR_POTION_SHOP_GRANNY_0, 0 }, + { "Bazaar Shop", "Basar", "Bazar", ENTR_BAZAAR_0, 0 }, + { "Potion Shop", "Magie-Laden", "Apothicaire", ENTR_POTION_SHOP_KAKARIKO_0, 0 }, + { "Impas House", "Impas Haus", "Maison d'Impa", ENTR_IMPAS_HOUSE_0, 0 }, + { "Impas House (Near Cow)", "Impas Haus (Kuh)", "Maison d'Impa (Vache)", ENTR_IMPAS_HOUSE_1, 0 }, + { "Boss House", "Haus des Bosses", "Maison du Boss", ENTR_KAKARIKO_CENTER_GUEST_HOUSE_0, 0 }, + { "Windmill", "Windmuehle", "Moulin", ENTR_WINDMILL_AND_DAMPES_GRAVE_1, 0 }, + { "Skulltula House", "Skulltula Haus", "Maison des SKulltulas", ENTR_HOUSE_OF_SKULLTULA_0, 0 }, }}, { "17:Graveyard", "17:Friedhof", "17:Cimetiere", Select_LoadGame, 9, { - { "From Kakariko", "Von Kakariko", "Depuis l'Apothicaire", 0x00E4, 0 }, - { "From Shadow Temple", "Vom Schattentempel", "Depuis le Temple de l'Ombre", 0x0205, 0 }, - { "From Gravekeepers Hut", "Von der Huette des Totengraebers", "Depuis la Cabane du Fossoyeur", 0x0355, 0 }, - { "From Dampes Grave", "Von Boris' Grab", "Depuis la Tombe d'Igor", 0x0359, 0 }, - { "From Shield Grave", "Vom Schild-Grab", "Depuis la Tombe au Bouclier", 0x035D, 0 }, - { "From Redead Grave", "Vom Zombie-Grab", "Depuis la Tombe au Effrois", 0x0361, 0 }, - { "From Royal Familys Tomb", "Vom Koenigsgrab", "Depuis la Tombe Royale", 0x050B, 0 }, - { "Inside Dampe's Hut", "Huette des Totengraebers", "A l'interieur de la Cabane du Fossoyeur", 0x030D, 0 }, - { "Nocturne of Shadow Warp", "Nocturne des Schattens Teleport", "Teleporteur du Nocturne de l'Ombre", 0x0568, 0 }, + { "From Kakariko", "Von Kakariko", "Depuis l'Apothicaire", ENTR_GRAVEYARD_0, 0 }, + { "From Shadow Temple", "Vom Schattentempel", "Depuis le Temple de l'Ombre", ENTR_GRAVEYARD_1, 0 }, + { "From Gravekeepers Hut", "Von der Huette des Totengraebers", "Depuis la Cabane du Fossoyeur", ENTR_GRAVEYARD_2, 0 }, + { "From Dampes Grave", "Von Boris' Grab", "Depuis la Tombe d'Igor", ENTR_GRAVEYARD_3, 0 }, + { "From Shield Grave", "Vom Schild-Grab", "Depuis la Tombe au Bouclier", ENTR_GRAVEYARD_4, 0 }, + { "From Redead Grave", "Vom Zombie-Grab", "Depuis la Tombe au Effrois", ENTR_GRAVEYARD_5, 0 }, + { "From Royal Familys Tomb", "Vom Koenigsgrab", "Depuis la Tombe Royale", ENTR_GRAVEYARD_6, 0 }, + { "Inside Dampe's Hut", "Huette des Totengraebers", "A l'interieur de la Cabane du Fossoyeur", ENTR_GRAVEKEEPERS_HUT_0, 0 }, + { "Nocturne of Shadow Warp", "Nocturne des Schattens Teleport", "Teleporteur du Nocturne de l'Ombre", ENTR_GRAVEYARD_7, 0 }, }}, { "18:Graves", "18:Graeber", "18:Tombes", Select_LoadGame, 5, { - { "Dampes Grave Minigame", "Boris' Grab-Minispiel", "Tour du Cimetiere d'Igor", 0x044F, 0 }, - { "Royal Familys Tomb", "Koenigsgrab", "Tombe Royale", 0x002D, 0 }, - { "Royal Familys Tomb, Suns Song Cutscene", "Koenigsgrab, Hymne der Sonne Cutscene", "Tombe Royale, Cinematique du Chant du Soleil", 0x0574, 0 }, - { "Treasure Chest Grave", "Schatzkisten Grab", "Tombe au Coffre", 0x004B, 0 }, - { "ReDead Grave", "Zombie Grab", "Tombe au Effrois", 0x031C, 0 }, + { "Dampes Grave Minigame", "Boris' Grab-Minispiel", "Tour du Cimetiere d'Igor", ENTR_WINDMILL_AND_DAMPES_GRAVE_0, 0 }, + { "Royal Familys Tomb", "Koenigsgrab", "Tombe Royale", ENTR_ROYAL_FAMILYS_TOMB_0, 0 }, + { "Royal Familys Tomb, Suns Song Cutscene", "Koenigsgrab, Hymne der Sonne Cutscene", "Tombe Royale, Cinematique du Chant du Soleil", ENTR_ROYAL_FAMILYS_TOMB_1, 0 }, + { "Treasure Chest Grave", "Schatzkisten Grab", "Tombe au Coffre", ENTR_GRAVE_WITH_FAIRYS_FOUNTAIN_0, 0 }, + { "ReDead Grave", "Zombie Grab", "Tombe au Effrois", ENTR_REDEAD_GRAVE_0, 0 }, }}, { "19:Death Mountain Trail", "19:Gebirgspfad", "19:Mont du Peril", Select_LoadGame, 6, { - { "From Kakariko Village", "Von Kakariko", "Depuis le Village Cocorico", 0x013D, 0 }, - { "From Goron City", "Von Goronia", "Depuis le Village Goron", 0x01B9, 0 }, - { "From Death Mountain Crater", "Vom Todeskrater", "Depuis le Cratere du Peril", 0x01BD, 0 }, - { "From Dodongos Cavern", "Von Dodongos Hoehle", "Depuis la Caverne Dodongo", 0x0242, 0 }, - { "From Great Fairy", "Von der Feen-Quelle", "Depuis la Grande Fee", 0x045B, 0 }, - { "Great Fairy", "Feen-Quelle", "Grande Fee", 0x0315, 0 }, + { "From Kakariko Village", "Von Kakariko", "Depuis le Village Cocorico", ENTR_DEATH_MOUNTAIN_TRAIL_0, 0 }, + { "From Goron City", "Von Goronia", "Depuis le Village Goron", ENTR_DEATH_MOUNTAIN_TRAIL_1, 0 }, + { "From Death Mountain Crater", "Vom Todeskrater", "Depuis le Cratere du Peril", ENTR_DEATH_MOUNTAIN_TRAIL_2, 0 }, + { "From Dodongos Cavern", "Von Dodongos Hoehle", "Depuis la Caverne Dodongo", ENTR_DEATH_MOUNTAIN_TRAIL_3, 0 }, + { "From Great Fairy", "Von der Feen-Quelle", "Depuis la Grande Fee", ENTR_DEATH_MOUNTAIN_TRAIL_4, 0 }, + { "Great Fairy", "Feen-Quelle", "Grande Fee", ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_0, 0 }, }}, { "20:Goron City", "20:Goronia", "20:Village Goron", Select_LoadGame, 5, { - { "From Death Mountain Trail", "Vom Gebirgspfad", "Depuis le Mont du Peril", 0x014D, 0 }, - { "From Death Mountain Crater", "Vom Todeskrater", "Depuis le Cratere du Peril", 0x01C1, 0 }, - { "From Goron City Shop", "Vom Goronen-Laden", "Depuis la Boutique Goron", 0x03FC, 0 }, - { "From Lost Woods", "Von den Verlorenen Waeldern", "Depuis les Bois Perdus", 0x04E2, 0 }, - { "Goron City Shop", "Goronen-Laden", "Boutique Goron", 0x037C, 0 }, + { "From Death Mountain Trail", "Vom Gebirgspfad", "Depuis le Mont du Peril", ENTR_GORON_CITY_0, 0 }, + { "From Death Mountain Crater", "Vom Todeskrater", "Depuis le Cratere du Peril", ENTR_GORON_CITY_1, 0 }, + { "From Goron City Shop", "Vom Goronen-Laden", "Depuis la Boutique Goron", ENTR_GORON_CITY_2, 0 }, + { "From Lost Woods", "Von den Verlorenen Waeldern", "Depuis les Bois Perdus", ENTR_GORON_CITY_3, 0 }, + { "Goron City Shop", "Goronen-Laden", "Boutique Goron", ENTR_GORON_SHOP_0, 0 }, }}, { "21:Death Mountain Crater", "21:Todeskrater", "21:Cratere du Peril", Select_LoadGame, 6, { - { "From Death Mountain Trail", "Vom Gebirgspfad", "Depuis le Mont du Peril", 0x0147, 0 }, - { "From Goron City", "Von Goronia", "Depuis le Village Goron", 0x0246, 0 }, - { "From Fire Temple", "Vom Feuertempel", "Depuis le Temple du Feu", 0x024A, 0 }, - { "From Fairy Fountain", "Von der Feen-Quelle", "Depuis la Fontaine des Fees", 0x0482, 0 }, - { "Great Fairy", "Feen-Quelle", "Depuis la Grande Fee", 0x04BE, 0 }, - { "Bolero of Fire Warp", "Bolero des Feuers Teleport", "Teleporteur du Bolero du Feu", 0x04F6, 0 }, + { "From Death Mountain Trail", "Vom Gebirgspfad", "Depuis le Mont du Peril", ENTR_DEATH_MOUNTAIN_CRATER_0, 0 }, + { "From Goron City", "Von Goronia", "Depuis le Village Goron", ENTR_DEATH_MOUNTAIN_CRATER_1, 0 }, + { "From Fire Temple", "Vom Feuertempel", "Depuis le Temple du Feu", ENTR_DEATH_MOUNTAIN_CRATER_2, 0 }, + { "From Fairy Fountain", "Von der Feen-Quelle", "Depuis la Fontaine des Fees", ENTR_DEATH_MOUNTAIN_CRATER_3, 0 }, + { "Great Fairy", "Feen-Quelle", "Depuis la Grande Fee", ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_1, 0 }, + { "Bolero of Fire Warp", "Bolero des Feuers Teleport", "Teleporteur du Bolero du Feu", ENTR_DEATH_MOUNTAIN_CRATER_4, 0 }, }}, { "22:Zora River", "22:Zora-Fluss", "22:Riviere Zora", Select_LoadGame, 3, { - { "From Hyrule Field", "Von der Hylianischen Steppe", "Depuis la Plaine d'Hyrule", 0x00EA, 0 }, - { "From Zoras Domain", "Von Zoras Reich", "Depuis le Domaine Zora", 0x019D, 0 }, - { "From Lost Woods", "Von den Verlorenen Waeldern", "Depuis les Bois Perdus", 0x01DD, 0 }, + { "From Hyrule Field", "Von der Hylianischen Steppe", "Depuis la Plaine d'Hyrule", ENTR_ZORAS_RIVER_0, 0 }, + { "From Zoras Domain", "Von Zoras Reich", "Depuis le Domaine Zora", ENTR_ZORAS_RIVER_2, 0 }, + { "From Lost Woods", "Von den Verlorenen Waeldern", "Depuis les Bois Perdus", ENTR_ZORAS_RIVER_4, 0 }, }}, { "23:Zoras Domain", "23:Zoras Reich", "23:Domaine Zora", Select_LoadGame, 5, { - { "From Zora River", "Vom Zora-Fluss", "Depuis la Riviere Zora", 0x0108, 0 }, - { "From Zoras Fountain", "Von Zoras Quelle", "Depuis la Fontaine Zora", 0x01A1, 0 }, - { "From Lake Hylia", "Vom Hylia-See", "Depuis le Lac Hylia", 0x0328, 0 }, - { "From Zora Shop", "Vom Zora-Laden", "Depuis la Boutique Zora", 0x03C4, 0 }, - { "Zora Shop", "Zora-Laden", "Boutique Zora", 0x0380, 0 }, + { "From Zora River", "Vom Zora-Fluss", "Depuis la Riviere Zora", ENTR_ZORAS_DOMAIN_0, 0 }, + { "From Zoras Fountain", "Von Zoras Quelle", "Depuis la Fontaine Zora", ENTR_ZORAS_DOMAIN_1, 0 }, + { "From Lake Hylia", "Vom Hylia-See", "Depuis le Lac Hylia", ENTR_ZORAS_DOMAIN_4, 0 }, + { "From Zora Shop", "Vom Zora-Laden", "Depuis la Boutique Zora", ENTR_ZORAS_DOMAIN_2, 0 }, + { "Zora Shop", "Zora-Laden", "Boutique Zora", ENTR_ZORA_SHOP_0, 0 }, }}, { "24:Zoras Fountain", "24:Zoras Quelle", "24:Fontaine Zora", Select_LoadGame, 5, { - { "From Zoras Domain", "Von Zoras Reich", "Depuis le Domaine Zora", 0x0225, 0 }, - { "From Jabu Jabu", "Von Jabu-Jabu", "Depuis Jabu-Jabu", 0x0221, 0 }, - { "From Ice Cavern", "Von der Eishoehle", "Depuis la Caverne Polaire", 0x03D4, 0 }, - { "From Fairy Fountain", "Von der Feen-Quelle", "Depuis la Fontaine des Fees", 0x0394, 0 }, - { "Great Fairy", "Feen-Quelle", "Grande Fee", 0x0371, 0 }, + { "From Zoras Domain", "Von Zoras Reich", "Depuis le Domaine Zora", ENTR_ZORAS_FOUNTAIN_2, 0 }, + { "From Jabu Jabu", "Von Jabu-Jabu", "Depuis Jabu-Jabu", ENTR_ZORAS_FOUNTAIN_1, 0 }, + { "From Ice Cavern", "Von der Eishoehle", "Depuis la Caverne Polaire", ENTR_ZORAS_FOUNTAIN_3, 0 }, + { "From Fairy Fountain", "Von der Feen-Quelle", "Depuis la Fontaine des Fees", ENTR_ZORAS_FOUNTAIN_5, 0 }, + { "Great Fairy", "Feen-Quelle", "Grande Fee", ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_0, 0 }, }}, { "25:Lake Hylia", "25:Hylia-See", "25:Lac Hylia", Select_LoadGame, 7, { - { "From Hyrule Field", "Von der Hylianischen Steppe", "Depuis la Plaine d'Hyrule", 0x0102, 0 }, - { "From Gerudo Valley", "Vom Gerudotal", "Depuis la Vallee Gerudo", 0x0219, 0 }, - { "From Water Temple", "Vom Wassertempel", "Depuis le Temple de l'Eau", 0x021D, 0 }, - { "From Fishing Pond", "Vom Fischweiher", "Depuis l'Etang", 0x0309, 0 }, - { "From Laboratory", "Vom Laboratorium", "Depuis le Laboratoire du Lac", 0x03CC, 0 }, - { "From Zoras Domain", "Von Zoras Reich", "Depuis le Domaine Zora", 0x0560, 0 }, - { "Serenade Of Water Warp", "Serenade des Wassers Teleport", "Teleporteur de la Serenade de l'Eau", 0x0604, 0 }, + { "From Hyrule Field", "Von der Hylianischen Steppe", "Depuis la Plaine d'Hyrule", ENTR_LAKE_HYLIA_0, 0 }, + { "From Gerudo Valley", "Vom Gerudotal", "Depuis la Vallee Gerudo", ENTR_LAKE_HYLIA_1, 0 }, + { "From Water Temple", "Vom Wassertempel", "Depuis le Temple de l'Eau", ENTR_LAKE_HYLIA_2, 0 }, + { "From Fishing Pond", "Vom Fischweiher", "Depuis l'Etang", ENTR_LAKE_HYLIA_6, 0 }, + { "From Laboratory", "Vom Laboratorium", "Depuis le Laboratoire du Lac", ENTR_LAKE_HYLIA_4, 0 }, + { "From Zoras Domain", "Von Zoras Reich", "Depuis le Domaine Zora", ENTR_LAKE_HYLIA_7, 0 }, + { "Serenade Of Water Warp", "Serenade des Wassers Teleport", "Teleporteur de la Serenade de l'Eau", ENTR_LAKE_HYLIA_8, 0 }, }}, { "26:Lake Hylia Buildings", "26:Hylia-See Gebaeude", "26:Batiments du Lac Hylia", Select_LoadGame, 2, { - { "Laboratory", "Laboratorium", "Laboratoire du Lac", 0x0043, 0 }, - { "Fishing Pond Minigame", "Fischweiher", "Etang", 0x045F, 0 }, + { "Laboratory", "Laboratorium", "Laboratoire du Lac", ENTR_LAKESIDE_LABORATORY_0, 0 }, + { "Fishing Pond Minigame", "Fischweiher", "Etang", ENTR_FISHING_POND_0, 0 }, }}, { "27:Gerudo Valley", "27:Gerudotal", "27:Vallee Gerudo", Select_LoadGame, 5, { - { "From Hyrule Field", "Von der Hylianischen Steppe", "Depuis la Plaine d'Hyrule", 0x0117, 0 }, - { "From Gerudo Fortress", "Von der Gerudo-Festung", "Depuis la Forteresse Gerudo", 0x022D, 0 }, - { "From Carpenter's Tent", "Vom Zelt der Zimmerleute", "Depuis la Tente du Charpentier", 0x03D0, 0 }, - { "Carpenter's Tent/ Running Man Minigame", "Zelt der Zimmerleute/ Rennlaeufer Minispiel", "Tente du Charpentier/ Marathonien", 0x03A0, 0 }, - { "Thrown out of Fortress", "Aus der Festung geworfen", "Expulse de la Forteresse", 0x01A5, 0 }, + { "From Hyrule Field", "Von der Hylianischen Steppe", "Depuis la Plaine d'Hyrule", ENTR_GERUDO_VALLEY_0, 0 }, + { "From Gerudo Fortress", "Von der Gerudo-Festung", "Depuis la Forteresse Gerudo", ENTR_GERUDO_VALLEY_3, 0 }, + { "From Carpenter's Tent", "Vom Zelt der Zimmerleute", "Depuis la Tente du Charpentier", ENTR_GERUDO_VALLEY_4, 0 }, + { "Carpenter's Tent/ Running Man Minigame", "Zelt der Zimmerleute/ Rennlaeufer Minispiel", "Tente du Charpentier/ Marathonien", ENTR_CARPENTERS_TENT_0, 0 }, + { "Thrown out of Fortress", "Aus der Festung geworfen", "Expulse de la Forteresse", ENTR_GERUDO_VALLEY_1, 0 }, }}, { "28:Gerudo Fortress", "28:Gerudo-Festung", "28:Forteresse Gerudo", Select_LoadGame, 18, { - { "From Gerudo Valley", "Vom Gerudotal", "Depuis la Vallee Gerudo", 0x0129, 0 }, - { "From Gerudo Training Grounds", "Von der Gerudo-Arena", "Depuis le Gymnase Gerudo", 0x03A8, 0 }, - { "From Haunted Wasteland", "Von der Gespensterwueste", "Depuis le Desert Hante", 0x03AC, 0 }, - { "Horseback Riding Minigame", "Bogen zu Pferde Minispiel", "Archerie Montee", 0x03B0, 0 }, - { "Gerudo Fortress Jail", "Gerudo-Festung Gefaengnis", "Prison de la Forteresse Gerudo", 0x03B4, 0 }, - { "From Thieves Hideout (1)", "Vom Diebesversteck (1)", "Depuis le Repaire des Voleurs (1)", 0x0231, 0 }, - { "From Thieves Hideout (2)", "Vom Diebesversteck (2)", "Depuis le Repaire des Voleurs (2)", 0x0235, 0 }, - { "From Thieves Hideout (3)", "Vom Diebesversteck (3)", "Depuis le Repaire des Voleurs (3)", 0x0239, 0 }, - { "From Thieves Hideout (4)", "Vom Diebesversteck (4)", "Depuis le Repaire des Voleurs (4)", 0x02AA, 0 }, - { "From Thieves Hideout (5)", "Vom Diebesversteck (5)", "Depuis le Repaire des Voleurs (5)", 0x02BA, 0 }, - { "From Thieves Hideout (6)", "Vom Diebesversteck (6)", "Depuis le Repaire des Voleurs (6)", 0x02BE, 0 }, - { "From Thieves Hideout (7)", "Vom Diebesversteck (7)", "Depuis le Repaire des Voleurs (7)", 0x02C2, 0 }, - { "From Thieves Hideout (8)", "Vom Diebesversteck (8)", "Depuis le Repaire des Voleurs (8)", 0x02C6, 0 }, - { "From Thieves Hideout (9)", "Vom Diebesversteck (9)", "Depuis le Repaire des Voleurs (9)", 0x02D2, 0 }, - { "From Thieves Hideout (10)", "Vom Diebesversteck (10)", "Depuis le Repaire des Voleurs (10)", 0x02D6, 0 }, - { "From Thieves Hideout (11)", "Vom Diebesversteck (11)", "Depuis le Repaire des Voleurs (11)", 0x02DA, 0 }, - { "From Thieves Hideout (12)", "Vom Diebesversteck (12)", "Depuis le Repaire des Voleurs (12)", 0x02DE, 0 }, - { "From Thieves Hideout (13)", "Vom Diebesversteck (13)", "Depuis le Repaire des Voleurs (13)", 0x03A4, 0 }, + { "From Gerudo Valley", "Vom Gerudotal", "Depuis la Vallee Gerudo", ENTR_GERUDOS_FORTRESS_0, 0 }, + { "From Gerudo Training Grounds", "Von der Gerudo-Arena", "Depuis le Gymnase Gerudo", ENTR_GERUDOS_FORTRESS_14, 0 }, + { "From Haunted Wasteland", "Von der Gespensterwueste", "Depuis le Desert Hante", ENTR_GERUDOS_FORTRESS_15, 0 }, + { "Horseback Riding Minigame", "Bogen zu Pferde Minispiel", "Archerie Montee", ENTR_GERUDOS_FORTRESS_16, 0 }, + { "Gerudo Fortress Jail", "Gerudo-Festung Gefaengnis", "Prison de la Forteresse Gerudo", ENTR_GERUDOS_FORTRESS_17, 0 }, + { "From Thieves Hideout (1)", "Vom Diebesversteck (1)", "Depuis le Repaire des Voleurs (1)", ENTR_GERUDOS_FORTRESS_1, 0 }, + { "From Thieves Hideout (2)", "Vom Diebesversteck (2)", "Depuis le Repaire des Voleurs (2)", ENTR_GERUDOS_FORTRESS_2, 0 }, + { "From Thieves Hideout (3)", "Vom Diebesversteck (3)", "Depuis le Repaire des Voleurs (3)", ENTR_GERUDOS_FORTRESS_3, 0 }, + { "From Thieves Hideout (4)", "Vom Diebesversteck (4)", "Depuis le Repaire des Voleurs (4)", ENTR_GERUDOS_FORTRESS_4, 0 }, + { "From Thieves Hideout (5)", "Vom Diebesversteck (5)", "Depuis le Repaire des Voleurs (5)", ENTR_GERUDOS_FORTRESS_5, 0 }, + { "From Thieves Hideout (6)", "Vom Diebesversteck (6)", "Depuis le Repaire des Voleurs (6)", ENTR_GERUDOS_FORTRESS_6, 0 }, + { "From Thieves Hideout (7)", "Vom Diebesversteck (7)", "Depuis le Repaire des Voleurs (7)", ENTR_GERUDOS_FORTRESS_7, 0 }, + { "From Thieves Hideout (8)", "Vom Diebesversteck (8)", "Depuis le Repaire des Voleurs (8)", ENTR_GERUDOS_FORTRESS_8, 0 }, + { "From Thieves Hideout (9)", "Vom Diebesversteck (9)", "Depuis le Repaire des Voleurs (9)", ENTR_GERUDOS_FORTRESS_9, 0 }, + { "From Thieves Hideout (10)", "Vom Diebesversteck (10)", "Depuis le Repaire des Voleurs (10)", ENTR_GERUDOS_FORTRESS_10, 0 }, + { "From Thieves Hideout (11)", "Vom Diebesversteck (11)", "Depuis le Repaire des Voleurs (11)", ENTR_GERUDOS_FORTRESS_11, 0 }, + { "From Thieves Hideout (12)", "Vom Diebesversteck (12)", "Depuis le Repaire des Voleurs (12)", ENTR_GERUDOS_FORTRESS_12, 0 }, + { "From Thieves Hideout (13)", "Vom Diebesversteck (13)", "Depuis le Repaire des Voleurs (13)", ENTR_GERUDOS_FORTRESS_13, 0 }, }}, { "29:Thieves Hideout", "29:Diebesversteck", "29:Repaire des Voleurs", Select_LoadGame, 13, { - { "From Gerudo Fortress (1)", "Von der Gerudo-Festung (1)", "Depuis la Forteresse Gerudo (1)", 0x0486, 0 }, - { "From Gerudo Fortress (2)", "Von der Gerudo-Festung (2)", "Depuis la Forteresse Gerudo (2)", 0x048A, 0 }, - { "From Gerudo Fortress (3)", "Von der Gerudo-Festung (3)", "Depuis la Forteresse Gerudo (3)", 0x048E, 0 }, - { "From Gerudo Fortress (4)", "Von der Gerudo-Festung (4)", "Depuis la Forteresse Gerudo (4)", 0x0492, 0 }, - { "From Gerudo Fortress (5)", "Von der Gerudo-Festung (5)", "Depuis la Forteresse Gerudo (5)", 0x0496, 0 }, - { "From Gerudo Fortress (6)", "Von der Gerudo-Festung (6)", "Depuis la Forteresse Gerudo (6)", 0x049A, 0 }, - { "From Gerudo Fortress (7)", "Von der Gerudo-Festung (7)", "Depuis la Forteresse Gerudo (7)", 0x049E, 0 }, - { "From Gerudo Fortress (8)", "Von der Gerudo-Festung (8)", "Depuis la Forteresse Gerudo (8)", 0x04A2, 0 }, - { "From Gerudo Fortress (9)", "Von der Gerudo-Festung (9)", "Depuis la Forteresse Gerudo (9)", 0x04A6, 0 }, - { "From Gerudo Fortress (10)", "Von der Gerudo-Festung (10)", "Depuis la Forteresse Gerudo (10)", 0x04AA, 0 }, - { "From Gerudo Fortress (11)", "Von der Gerudo-Festung (11)", "Depuis la Forteresse Gerudo (11)", 0x04AE, 0 }, - { "From Gerudo Fortress (12)", "Von der Gerudo-Festung (12)", "Depuis la Forteresse Gerudo (12)", 0x04B2, 0 }, - { "From Gerudo Fortress (13)", "Von der Gerudo-Festung (13)", "Depuis la Forteresse Gerudo (13)", 0x0570, 0 }, + { "From Gerudo Fortress (1)", "Von der Gerudo-Festung (1)", "Depuis la Forteresse Gerudo (1)", ENTR_THIEVES_HIDEOUT_0, 0 }, + { "From Gerudo Fortress (2)", "Von der Gerudo-Festung (2)", "Depuis la Forteresse Gerudo (2)", ENTR_THIEVES_HIDEOUT_1, 0 }, + { "From Gerudo Fortress (3)", "Von der Gerudo-Festung (3)", "Depuis la Forteresse Gerudo (3)", ENTR_THIEVES_HIDEOUT_2, 0 }, + { "From Gerudo Fortress (4)", "Von der Gerudo-Festung (4)", "Depuis la Forteresse Gerudo (4)", ENTR_THIEVES_HIDEOUT_3, 0 }, + { "From Gerudo Fortress (5)", "Von der Gerudo-Festung (5)", "Depuis la Forteresse Gerudo (5)", ENTR_THIEVES_HIDEOUT_4, 0 }, + { "From Gerudo Fortress (6)", "Von der Gerudo-Festung (6)", "Depuis la Forteresse Gerudo (6)", ENTR_THIEVES_HIDEOUT_5, 0 }, + { "From Gerudo Fortress (7)", "Von der Gerudo-Festung (7)", "Depuis la Forteresse Gerudo (7)", ENTR_THIEVES_HIDEOUT_6, 0 }, + { "From Gerudo Fortress (8)", "Von der Gerudo-Festung (8)", "Depuis la Forteresse Gerudo (8)", ENTR_THIEVES_HIDEOUT_7, 0 }, + { "From Gerudo Fortress (9)", "Von der Gerudo-Festung (9)", "Depuis la Forteresse Gerudo (9)", ENTR_THIEVES_HIDEOUT_8, 0 }, + { "From Gerudo Fortress (10)", "Von der Gerudo-Festung (10)", "Depuis la Forteresse Gerudo (10)", ENTR_THIEVES_HIDEOUT_9, 0 }, + { "From Gerudo Fortress (11)", "Von der Gerudo-Festung (11)", "Depuis la Forteresse Gerudo (11)", ENTR_THIEVES_HIDEOUT_10, 0 }, + { "From Gerudo Fortress (12)", "Von der Gerudo-Festung (12)", "Depuis la Forteresse Gerudo (12)", ENTR_THIEVES_HIDEOUT_11, 0 }, + { "From Gerudo Fortress (13)", "Von der Gerudo-Festung (13)", "Depuis la Forteresse Gerudo (13)", ENTR_THIEVES_HIDEOUT_12, 0 }, }}, { "30:Haunted Wasteland", "30:Geisterwueste", "30:Desert Hante", Select_LoadGame, 2, { - { "From Gerudo Fortress", "Von der Gerudo-Festung", "Depuis la Forteresse Gerudo", 0x0130, 0 }, - { "From Desert Colossus", "Vom Wuestenkoloss", "Depuis le Colosse du Desert", 0x0365, 0 }, + { "From Gerudo Fortress", "Von der Gerudo-Festung", "Depuis la Forteresse Gerudo", ENTR_HAUNTED_WASTELAND_0, 0 }, + { "From Desert Colossus", "Vom Wuestenkoloss", "Depuis le Colosse du Desert", ENTR_HAUNTED_WASTELAND_1, 0 }, }}, { "31:Desert Colossus", "31:Wuestenkoloss", "31:Colosse du Desert", Select_LoadGame, 7, { - { "From Haunted Wasteland", "Von der Geisterwueste", "Depuis le Desert Hante", 0x0123, 0 }, - { "From Spirit Temple", "Vom Geistertempel", "Depuis le Temple de l'Esprit", 0x01E1, 0 }, - { "From Spirit Temple (Left Hand)", "Vom Geistertempel (Linke Hand)", "Depuis le Temple de l'Esprit (Main Gauche)", 0x01E5, 0 }, - { "From Spirit Temple (Right Hand)", "Vom Geistertempel (Rechte Hand)", "Depuis le Temple de l'Esprit (Main Droite)", 0x01E9, 0 }, - { "From Fairy Fountain", "Von der Feen-Quelle", "Depuis la Fontaine des Fees", 0x057C, 0 }, - { "Great Fairy", "Feen-Quelle", "Grande Fee", 0x0588, 0 }, - { "Requiem of Spirit Warp", "Requiem der Geister Teleport", "Teleporteur du Requiem de l'Esprit", 0x01F1, 0 }, + { "From Haunted Wasteland", "Von der Geisterwueste", "Depuis le Desert Hante", ENTR_DESERT_COLOSSUS_0, 0 }, + { "From Spirit Temple", "Vom Geistertempel", "Depuis le Temple de l'Esprit", ENTR_DESERT_COLOSSUS_1, 0 }, + { "From Spirit Temple (Left Hand)", "Vom Geistertempel (Linke Hand)", "Depuis le Temple de l'Esprit (Main Gauche)", ENTR_DESERT_COLOSSUS_2, 0 }, + { "From Spirit Temple (Right Hand)", "Vom Geistertempel (Rechte Hand)", "Depuis le Temple de l'Esprit (Main Droite)", ENTR_DESERT_COLOSSUS_3, 0 }, + { "From Fairy Fountain", "Von der Feen-Quelle", "Depuis la Fontaine des Fees", ENTR_DESERT_COLOSSUS_7, 0 }, + { "Great Fairy", "Feen-Quelle", "Grande Fee", ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_2, 0 }, + { "Requiem of Spirit Warp", "Requiem der Geister Teleport", "Teleporteur du Requiem de l'Esprit", ENTR_DESERT_COLOSSUS_5, 0 }, }}, { "32:Deku Tree", "32:Deku-Baum", "32:Arbre Mojo", Select_LoadGame, 3, { - { "Entrance", "Eingang", "Entree", 0x0000, 1 }, - { "From Gohma's Lair", "Vom Gohma Kampf", "Depuis le Repaire de Gohma", 0x0252, 1 }, - { "Gohma's Lair", "Gohma Kampf", "Repaire de Gohma", 0x040F, 0 }, + { "Entrance", "Eingang", "Entree", ENTR_DEKU_TREE_0, 1 }, + { "From Gohma's Lair", "Vom Gohma Kampf", "Depuis le Repaire de Gohma", ENTR_DEKU_TREE_1, 1 }, + { "Gohma's Lair", "Gohma Kampf", "Repaire de Gohma", ENTR_DEKU_TREE_BOSS_0, 0 }, }}, { "33:Dodongos Cavern", "33:Dodongos Hoehle", "33:Caverne Dodongo", Select_LoadGame, 3, { - { "Entrance", "Eingang", "Entree", 0x0004, 1 }, - { "From King Dodongo", "Von King Dodongo", "Depuis le Repaire du Roi Dodongo", 0x00C5, 1 }, - { "King Dodongo's Lair", "King Dodongo Kampf", "Repaire du Roi Dodongo", 0x040B, 0 }, + { "Entrance", "Eingang", "Entree", ENTR_DODONGOS_CAVERN_0, 1 }, + { "From King Dodongo", "Von King Dodongo", "Depuis le Repaire du Roi Dodongo", ENTR_DODONGOS_CAVERN_1, 1 }, + { "King Dodongo's Lair", "King Dodongo Kampf", "Repaire du Roi Dodongo", ENTR_DODONGOS_CAVERN_BOSS_0, 0 }, }}, { "34:Jabu Jabu", "34:Jabu-Jabu", "34:Jabu-Jabu", Select_LoadGame, 2, { - { "Entrance", "Eingang", "Entree", 0x0028, 1 }, - { "Barinade's Lair", "Barinade Kampf", "Repaire de Barinade", 0x0301, 0 }, + { "Entrance", "Eingang", "Entree", ENTR_JABU_JABU_0, 1 }, + { "Barinade's Lair", "Barinade Kampf", "Repaire de Barinade", ENTR_JABU_JABU_BOSS_0, 0 }, }}, { "35:Forest Temple", "35:Waldtempel", "35:Temple de la Foret", Select_LoadGame, 4, { - { "Entrance", "Eingang", "Entree", 0x0169, 1 }, - { "Crushing Room", "Der Fallende Decke Raum", "Salle de Broyage", 0x0584, 1 }, - { "Before Phantom Ganon", "Vor Phantom-Ganon", "Avant Ganon Spectral", 0x024E, 1 }, - { "Phantom Ganon's Lair", "Phantom-Ganon Kampf", "Repaire de Ganon Spectral", 0x000C, 0 }, + { "Entrance", "Eingang", "Entree", ENTR_FOREST_TEMPLE_0, 1 }, + { "Crushing Room", "Der Fallende Decke Raum", "Salle de Broyage", ENTR_FOREST_TEMPLE_2, 1 }, + { "Before Phantom Ganon", "Vor Phantom-Ganon", "Avant Ganon Spectral", ENTR_FOREST_TEMPLE_1, 1 }, + { "Phantom Ganon's Lair", "Phantom-Ganon Kampf", "Repaire de Ganon Spectral", ENTR_FOREST_TEMPLE_BOSS_0, 0 }, }}, { "36:Fire Temple", "36:Feuertempel", "36:Temple du Feu", Select_LoadGame, 3, { - { "Entrance", "Eingang", "Entrance", 0x0165, 1 }, - { "Before Volvagia", "Vor Volvagia", "Avant Volvagia", 0x0175, 1 }, - { "Volvagia's Lair", "Volvagia Kampf", "Repaire de Volcania", 0x0305, 0 }, + { "Entrance", "Eingang", "Entrance", ENTR_FIRE_TEMPLE_0, 1 }, + { "Before Volvagia", "Vor Volvagia", "Avant Volvagia", ENTR_FIRE_TEMPLE_1, 1 }, + { "Volvagia's Lair", "Volvagia Kampf", "Repaire de Volcania", ENTR_FIRE_TEMPLE_BOSS_0, 0 }, }}, { "37:Water Temple", "37:Wassertempel", "37:Temple de l'Eau", Select_LoadGame, 2, { - { "Entrance", "Eingang", "Entree", 0x0010, 1 }, - { "Morpha's Lair", "Morpha Kampf", "Repaire de Morpha", 0x0417, 0 }, + { "Entrance", "Eingang", "Entree", ENTR_WATER_TEMPLE_0, 1 }, + { "Morpha's Lair", "Morpha Kampf", "Repaire de Morpha", ENTR_WATER_TEMPLE_BOSS_0, 0 }, }}, { "38:Shadow Temple", "38:Schattentempel", "38:Temple de l'Ombre", Select_LoadGame, 3, { - { "Entrance", "Eingang", "Entree", 0x0037, 1 }, - { "Outside Bongo Bongo", "Vor Bongo Bongo", "Avant Bongo Bongo", 0x02B2, 1 }, - { "Bongo Bongo's Lair", "Bongo Bongo Kampf", "Repaire de Bongo Bongo", 0x0413, 1 }, + { "Entrance", "Eingang", "Entree", ENTR_SHADOW_TEMPLE_0, 1 }, + { "Outside Bongo Bongo", "Vor Bongo Bongo", "Avant Bongo Bongo", ENTR_SHADOW_TEMPLE_1, 1 }, + { "Bongo Bongo's Lair", "Bongo Bongo Kampf", "Repaire de Bongo Bongo", ENTR_SHADOW_TEMPLE_BOSS_0, 1 }, }}, { "39:Spirit Temple", "39:Geistertempel", "39:Temple de l'Esprit", Select_LoadGame, 6, { - { "Entrance", "Eingang", "Entree", 0x0082, 1 }, - { "From Left Hand", "Von der linken Hand", "Depuis la Main Gauche", 0x03F0, 1 }, - { "From Right Hand", "Von der rechten Hand", "Depuis la Main Droite", 0x03F4, 1 }, - { "Before Twinrova", "Vor den Killa Ohmaz", "Avant le Duo Malefique", 0x02F5, 1 }, - { "Nabooru Fight", "Naboru Kampf", "Combat contre Nabooru", 0x008D, 0 }, - { "Twinrova's Lair", "Killa Ohmaz Kampf", "Repaire du Duo Malefique", 0x05EC, 0 }, + { "Entrance", "Eingang", "Entree", ENTR_SPIRIT_TEMPLE_0, 1 }, + { "From Left Hand", "Von der linken Hand", "Depuis la Main Gauche", ENTR_SPIRIT_TEMPLE_2, 1 }, + { "From Right Hand", "Von der rechten Hand", "Depuis la Main Droite", ENTR_SPIRIT_TEMPLE_3, 1 }, + { "Before Twinrova", "Vor den Killa Ohmaz", "Avant le Duo Malefique", ENTR_SPIRIT_TEMPLE_1, 1 }, + { "Nabooru Fight", "Naboru Kampf", "Combat contre Nabooru", ENTR_SPIRIT_TEMPLE_BOSS_0, 0 }, + { "Twinrova's Lair", "Killa Ohmaz Kampf", "Repaire du Duo Malefique", ENTR_SPIRIT_TEMPLE_BOSS_2, 0 }, }}, { "40:Ganons Castle", "40:Ganons Schloss", "40:Chateau de Ganon", Select_LoadGame, 9, { - { "Entrance", "Eingang", "Entree", 0x0467, 1 }, - { "From Tower", "Vom Tower", "Depuis la Tour", 0x0534, 1 }, - { "Stairs to Lair - From Castle", "Stufen zum Verlies - Vom Schloss", "Escaliers vers Repaire - Depuis le Chateau", 0x041B, 0 }, - { "Stairs to Lair - From Ganondorf's Lair", "Stufen zum Verlies - Von Ganondorfs Verlies", "Escaliers vers Repaire - Depuis le Repaire de Ganondorf", 0x0427, 0 }, - { "Ganondorf's Lair", "Ganondorfs Verlies", "Repaire de Ganondorf", 0x041F, 0 }, - { "Ganondorf Defeated", "Ganondorf Besiegt", "Ganondorf Vaincu", 0x01C9, 0 }, - { "Ganondorf Defeated (2)", "Ganondorf Besiegt (2)", "Ganondorf Vaincu (2)", 0x04BA, 0 }, - { "Ganon's Lair", "Ganon Kampf", "Repaire de Ganon", 0x0517, 0 }, - { "Ganon Death Cutscene", "Ganon Todes Cutscene", "Cinematique de la Mort de Ganon", 0x043F, 0 }, + { "Entrance", "Eingang", "Entree", ENTR_INSIDE_GANONS_CASTLE_0, 1 }, + { "From Tower", "Vom Tower", "Depuis la Tour", ENTR_INSIDE_GANONS_CASTLE_1, 1 }, + { "Stairs to Lair - From Castle", "Stufen zum Verlies - Vom Schloss", "Escaliers vers Repaire - Depuis le Chateau", ENTR_GANONS_TOWER_0, 0 }, + { "Stairs to Lair - From Ganondorf's Lair", "Stufen zum Verlies - Von Ganondorfs Verlies", "Escaliers vers Repaire - Depuis le Repaire de Ganondorf", ENTR_GANONS_TOWER_1, 0 }, + { "Ganondorf's Lair", "Ganondorfs Verlies", "Repaire de Ganondorf", ENTR_GANONDORF_BOSS_0, 0 }, + { "Ganondorf Defeated", "Ganondorf Besiegt", "Ganondorf Vaincu", ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_5, 0 }, + { "Ganondorf Defeated (2)", "Ganondorf Besiegt (2)", "Ganondorf Vaincu (2)", ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_1, 0 }, + { "Ganon's Lair", "Ganon Kampf", "Repaire de Ganon", ENTR_GANON_BOSS_0, 0 }, + { "Ganon Death Cutscene", "Ganon Todes Cutscene", "Cinematique de la Mort de Ganon", ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_0, 0 }, }}, { "41:Bottom of the Well", "41:Grund des Brunnens", "41:Puits", Select_LoadGame, 1, { - { "Entrance", "Eingang", "Entree", 0x0098, 1 }, + { "Entrance", "Eingang", "Entree", ENTR_BOTTOM_OF_THE_WELL_0, 1 }, }}, { "42:Ice Cavern", "42:Eishoehle", "42:Caverne Polaire", Select_LoadGame, 1, { - { "Entrance", "Eingang", "Entree", 0x0088, 1 }, + { "Entrance", "Eingang", "Entree", ENTR_ICE_CAVERN_0, 1 }, }}, { "43:Gerudo Training Grounds", "43:Gerudo-Arena", "43:Gymnase Gerudo", Select_LoadGame, 1, { - { "Entrance", "Eingang", "Entree", 0x0008, 1 }, + { "Entrance", "Eingang", "Entree", ENTR_GERUDO_TRAINING_GROUND_0, 1 }, }}, { "44:Warps", "44:Teleportpunkte", "44:Teleporteurs", Select_LoadGame, 6, { - { "Prelude of Light Warp", "Kantate des Lichts Teleport", "Teleporteur du Prelude de la Lumiere", 0x05F4, 0 }, - { "Minuet of Forest Warp", "Menuett des Waldes Teleport", "Teleporteur du Menuet des Bois", 0x0600, 0 }, - { "Bolero of Fire Warp", "Bolero des Feuers Teleport", "Teleporteur du Bolero du Feu", 0x04F6, 0 }, - { "Serenade Of Water Warp", "Serenade des Wassers Teleport", "Teleporteur de la Serenade de l'Eau", 0x0604, 0 }, - { "Nocturne of Shadow Warp", "Nocturne des Schattens Teleport", "Teleporteur du Nocturne de l'Ombre", 0x0568, 0 }, - { "Requiem of Spirit Warp", "Requiem der Geister Teleport", "Teleporteur du Requiem de l'Esprit", 0x01F1, 0 }, + { "Prelude of Light Warp", "Kantate des Lichts Teleport", "Teleporteur du Prelude de la Lumiere", ENTR_TEMPLE_OF_TIME_7, 0 }, + { "Minuet of Forest Warp", "Menuett des Waldes Teleport", "Teleporteur du Menuet des Bois", ENTR_SACRED_FOREST_MEADOW_2, 0 }, + { "Bolero of Fire Warp", "Bolero des Feuers Teleport", "Teleporteur du Bolero du Feu", ENTR_DEATH_MOUNTAIN_CRATER_4, 0 }, + { "Serenade Of Water Warp", "Serenade des Wassers Teleport", "Teleporteur de la Serenade de l'Eau", ENTR_LAKE_HYLIA_8, 0 }, + { "Nocturne of Shadow Warp", "Nocturne des Schattens Teleport", "Teleporteur du Nocturne de l'Ombre", ENTR_GRAVEYARD_7, 0 }, + { "Requiem of Spirit Warp", "Requiem der Geister Teleport", "Teleporteur du Requiem de l'Esprit", ENTR_DESERT_COLOSSUS_5, 0 }, }}, { "45:Shops", "45:Laeden", "45:Boutiques", Select_LoadGame, 9, { - { "Kokiri Shop", "Kokiri-Laden", "Boutique Kokiri", 0x00C1 }, - { "Potion Shop (Market)", "Magie-Laden (Marktplatz)", "Apothicaire (Place du Marche)", 0x0388, 0 }, - { "Bazaar Shop (Market)", "Basar (Marktplatz)", "Bazar (Place du Marche)", 0x052C, 0 }, - { "Happy Mask Shop", "Maskenhaendler", "Foire aux Masques", 0x0530, 0 }, - { "Bombchu Shop", "Krabbelminen-Laden", "Boutique de Missiles", 0x0528, 0 }, - { "Bazaar Shop (Kakariko)", "Basar (Kakariko)", "Bazar (Village Cocorico)", 0x00B7, 0 }, - { "Potion Shop (Kakariko)", "Magie-Laden (Kakariko)", "Apothicaire (Village Cocorico)", 0x0384, 0 }, - { "Goron City Shop", "Goronen-Laden", "Boutique Goron", 0x037C, 0 }, - { "Zora Shop", "Zora-Laden", "Boutique Zora", 0x0380, 0 }, + { "Kokiri Shop", "Kokiri-Laden", "Boutique Kokiri", ENTR_KOKIRI_SHOP_0 }, + { "Potion Shop (Market)", "Magie-Laden (Marktplatz)", "Apothicaire (Place du Marche)", ENTR_POTION_SHOP_MARKET_0, 0 }, + { "Bazaar Shop (Market)", "Basar (Marktplatz)", "Bazar (Place du Marche)", ENTR_BAZAAR_1, 0 }, + { "Happy Mask Shop", "Maskenhaendler", "Foire aux Masques", ENTR_HAPPY_MASK_SHOP_0, 0 }, + { "Bombchu Shop", "Krabbelminen-Laden", "Boutique de Missiles", ENTR_BOMBCHU_SHOP_1, 0 }, + { "Bazaar Shop (Kakariko)", "Basar (Kakariko)", "Bazar (Village Cocorico)", ENTR_BAZAAR_0, 0 }, + { "Potion Shop (Kakariko)", "Magie-Laden (Kakariko)", "Apothicaire (Village Cocorico)", ENTR_POTION_SHOP_KAKARIKO_0, 0 }, + { "Goron City Shop", "Goronen-Laden", "Boutique Goron", ENTR_GORON_SHOP_0, 0 }, + { "Zora Shop", "Zora-Laden", "Boutique Zora", ENTR_ZORA_SHOP_0, 0 }, }}, { "46:Great Fairies", "46:Feen-Quellen", "46:Grandes Fees", Select_LoadGame, 6, { - { "Hyrule Castle (Child)", "Schloss Hyrule (Kind)", "Chateau d'Hyrule (Enfant)", 0x0578, 0 }, - { "Hyrule Castle (Adult)", "Schloss Hyrule (Erwachsener)", "Chateau d'Hyrule (Adult)", 0x04C2, 0 }, - { "Death Mountain Trail", "Gebirgspfad", "Mont du Peril", 0x0315, 0 }, - { "Death Mountain Crater", "Todeskrater", "Cratere du Peril", 0x04BE, 0 }, - { "Zoras Fountain", "Zoras Quelle", "Fontaine Zora", 0x0371, 0 }, - { "Desert Colossus", "Wuestenkoloss", "Colosse du Desert", 0x0588, 0 }, + { "Hyrule Castle (Child)", "Schloss Hyrule (Kind)", "Chateau d'Hyrule (Enfant)", ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_1, 0 }, + { "Hyrule Castle (Adult)", "Schloss Hyrule (Erwachsener)", "Chateau d'Hyrule (Adult)", ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_2, 0 }, + { "Death Mountain Trail", "Gebirgspfad", "Mont du Peril", ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_0, 0 }, + { "Death Mountain Crater", "Todeskrater", "Cratere du Peril", ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_1, 0 }, + { "Zoras Fountain", "Zoras Quelle", "Fontaine Zora", ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_0, 0 }, + { "Desert Colossus", "Wuestenkoloss", "Colosse du Desert", ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_2, 0 }, }}, { "47:Chest Grottos", "47:Truhen Grotten", "47:Grottes a Coffres", Select_Grotto_LoadGame, 11, { { "Kokiri Forest (Song of Storms)", "Kokiri-Wald (Hymne des Sturms)", "Foret Kokiri (Chant des Tempetes)", 0x00, 0 }, @@ -646,48 +646,48 @@ static BetterSceneSelectEntry sBetterScenes[] = { { "Flooded Grotto (Hyrule Field)", "Geflutete Grotte (Hylianische Steppe)", "Grotte Inondee (Plaine d'Hyrule)", 0x1B, 0 }, }}, { "50:Debug (Use with caution)", "50:Debug (Mit Vorsicht benutzen)", "50:Debug (A utiliser avec prudence)", Select_LoadGame, 10, { - { "Test Room", "Test Raum", "Salle de Test", 0x0520, 0 }, - { "SRD Map", "SRD Karte", "Carte SRD", 0x0018, 0 }, - { "Test Map", "Test Karte", "Carte de Test", 0x0094, 0 }, - { "Treasure Chest Warp", "Schatzkisten Teleport", "Salle de Test - Objets", 0x0024, 0 }, - { "Stalfos Miniboss Room", "Stalfos-Ritter Miniboss Raum", "Salle du Minoboss Stalfos", 0x001C, 0 }, - { "Stalfos Boss Room", "Stalfos-Ritter Boss Raum", "Salle de Boss Stalfos", 0x001C, 0 }, - { "Dark Link Room", "Schwarzer Link Raum", "Salle de Dark Link", 0x0047, 0 }, - { "Shooting Gallery Duplicate", "Schiessbude (Duplikat)", "Jeu d'Adresse (Duplicata)", 0x02EA, 0 }, - { "Depth Test", "Tiefen Test", "Test de Profondeur", 0x00B6, 0 }, - { "Hyrule Garden Game (Broken)", "Burghof - Wachen-Minispiel (Kaputt)", "Cour du chateau (Non Fonctionnel)", 0x0076, 0 }, + { "Test Room", "Test Raum", "Salle de Test", ENTR_BESITU_0, 0 }, + { "SRD Map", "SRD Karte", "Carte SRD", ENTR_SASATEST_0, 0 }, + { "Test Map", "Test Karte", "Carte de Test", ENTR_TEST01_0, 0 }, + { "Treasure Chest Warp", "Schatzkisten Teleport", "Salle de Test - Objets", ENTR_TESTROOM_0, 0 }, + { "Stalfos Miniboss Room", "Stalfos-Ritter Miniboss Raum", "Salle du Minoboss Stalfos", ENTR_SYOTES_0, 0 }, + { "Stalfos Boss Room", "Stalfos-Ritter Boss Raum", "Salle de Boss Stalfos", ENTR_SYOTES2_0, 0 }, + { "Dark Link Room", "Schwarzer Link Raum", "Salle de Dark Link", ENTR_SUTARU_0, 0 }, + { "Shooting Gallery Duplicate", "Schiessbude (Duplikat)", "Jeu d'Adresse (Duplicata)", ENTR_TEST_SHOOTING_GALLERY_0, 0 }, + { "Depth Test", "Tiefen Test", "Test de Profondeur", ENTR_DEPTH_TEST_0, 0 }, + { "Hyrule Garden Game (Broken)", "Burghof - Wachen-Minispiel (Kaputt)", "Cour du chateau (Non Fonctionnel)", ENTR_HAIRAL_NIWA2_0, 0 }, }}, }; static BetterSceneSelectGrottoData sBetterGrottos[] = { - { 0x003F, 0x00EE, 0, 0x2C, 0x55, { -504.0, 380.0, -1224.0 }}, // Kokiri Forest -> KF Storms Grotto - { 0x003F, 0x04D6, 2, 0x14, 0x5B, { 922.0, 0.0, -933.0 }}, // Lost Woods -> LW Near Shortcuts Grotto - { 0x05B4, 0x00FC, 0, 0xED, 0x56, { -201.0, 0.0, 1906.0 }}, // SFM Entryway -> SFM Wolfos Grotto - { 0x003F, 0x00CD, 0, 0x00, 0x51, { -1428.0, 0.0, 790.0 }}, // Hyrule Field -> HF Near Market Grotto - { 0x003F, 0x0189, 0, 0x03, 0x51, { -4026.0, -700.0, 13858.0 }}, // Hyrule Field -> HF Open Grotto - { 0x003F, 0x0189, 0, 0x22, 0x51, { -259.0, -500.0, 12356.0 }}, // Hyrule Field -> HF Southeast Grotto - { 0x003F, 0x034D, 0, 0x28, 0x52, { 861.0, 80.0, -253.0 }}, // Kak Backyard -> Kak Open Grotto - { 0x05A0, 0x034D, 0, 0xE7, 0x52, { -400.0, 0.0, 408.0 }}, // Kakariko Village -> Kak Redead Grotto - { 0x003F, 0x01B9, 0, 0x57, 0x60, { -389.0, 1386.0, -1202.0 }}, // Death Mountain -> DMT Storms Grotto - { 0x003F, 0x0147, 1, 0x7A, 0x61, { 50.0, 1233.0, 1776.0 }}, // DMC Upper Nearby -> DMC Upper Grotto - { 0x003F, 0x019D, 0, 0x29, 0x54, { 369.0, 570.0, 128.0 }}, // Zora River -> ZR Open Grotto - { 0x059C, 0x0189, 0, 0xE6, 0x51, { -5002.0, -700.0, 13823.0 }}, // Hyrule Field -> HF Inside Fence Grotto - { 0x05A4, 0x0246, 1, 0xF9, 0x61, { -1703.0, 722.0, -481.0 }}, // DMC Lower Nearby -> DMC Hammer Grotto - { 0x05A4, 0x014D, 3, 0xFB, 0x62, { 1091.0, 580.0, -1192.0 }}, // GC Grotto Platform -> GC Grotto - { 0x05A4, 0x05D4, 0, 0xFC, 0x63, { 1798.0, 0.0, 1498.0 }}, // Lon Lon Ranch -> LLR Grotto - { 0x05A4, 0x021D, 0, 0xEF, 0x57, { -3044.0, -1033.0, 6070.0 }}, // Lake Hylia -> LH Grotto - { 0x05B0, 0x01A9, 8, 0xF5, 0x5B, { 677.0, 0.0, -2515.0 }}, // LW Beyond Mido -> LW Scrubs Grotto - { 0x05BC, 0x00EA, 0, 0xEB, 0x54, { -1632.0, 100.0, -123.0 }}, // Zora River -> ZR Storms Grotto - { 0x05BC, 0x0215, 0, 0xEE, 0x56, { 317.0, 480.0, -2303.0 }}, // Sacred Forest Meadow -> SFM Storms Grotto - { 0x05BC, 0x03D0, 0, 0xF0, 0x5A, { -1321.0, 15.0, -968.0 }}, // GV Fortress Side -> GV Storms Grotto - { 0x05BC, 0x01F1, 0, 0xFD, 0x5C, { 71.0, -32.0, -1303.0 }}, // Desert Colossus -> Colossus Grotto - { 0x05C4, 0x04D6, 6, 0xF3, 0x5B, { 75.0, -20.0, -1596.0 }}, // LW Beyond Mido -> Deku Theater - { 0x0598, 0x017D, 0, 0xE5, 0x51, { 2059.0, 20.0, -174.0 }}, // Hyrule Field -> HF Near Kak Grotto - { 0x05B8, 0x023D, 0, 0xF6, 0x5F, { 986.0, 1571.0, 837.0 }}, // Hyrule Castle Grounds -> HC Storms Grotto - { 0x05A8, 0x018D, 0, 0xE4, 0x51, { -7873.0, -300.0, 6916.0 }}, // Hyrule Field -> HF Cow Grotto - { 0x05FC, 0x01B9, 0, 0xF8, 0x60, { -678.0, 1946.0, -284.0 }}, // Death Mountain Summit -> DMT Cow Grotto - { 0x05AC, 0x0117, 0, 0xF2, 0x5A, { 271.0, -555.0, 1465.0 }}, // GV Grotto Ledge -> GV Octorok Grotto - { 0x05C0, 0x00CD, 0, 0xE1, 0x51, { -4945.0, -300.0, 2841.0 }}, // Hyrule Field -> HF Tektite Grotto + { ENTR_GROTTOS_0, ENTR_KOKIRI_FOREST_0, 0, 0x2C, SCENE_KOKIRI_FOREST, { -504.0, 380.0, -1224.0 }}, // Kokiri Forest -> KF Storms Grotto + { ENTR_GROTTOS_0, ENTR_LOST_WOODS_6, 2, 0x14, SCENE_LOST_WOODS, { 922.0, 0.0, -933.0 }}, // Lost Woods -> LW Near Shortcuts Grotto + { ENTR_GROTTOS_8, ENTR_SACRED_FOREST_MEADOW_0, 0, 0xED, SCENE_SACRED_FOREST_MEADOW, { -201.0, 0.0, 1906.0 }}, // SFM Entryway -> SFM Wolfos Grotto + { ENTR_GROTTOS_0, ENTR_HYRULE_FIELD_0, 0, 0x00, SCENE_HYRULE_FIELD, { -1428.0, 0.0, 790.0 }}, // Hyrule Field -> HF Near Market Grotto + { ENTR_GROTTOS_0, ENTR_HYRULE_FIELD_4, 0, 0x03, SCENE_HYRULE_FIELD, { -4026.0, -700.0, 13858.0 }}, // Hyrule Field -> HF Open Grotto + { ENTR_GROTTOS_0, ENTR_HYRULE_FIELD_4, 0, 0x22, SCENE_HYRULE_FIELD, { -259.0, -500.0, 12356.0 }}, // Hyrule Field -> HF Southeast Grotto + { ENTR_GROTTOS_0, ENTR_KAKARIKO_VILLAGE_7, 0, 0x28, SCENE_KAKARIKO_VILLAGE, { 861.0, 80.0, -253.0 }}, // Kak Backyard -> Kak Open Grotto + { ENTR_GROTTOS_3, ENTR_KAKARIKO_VILLAGE_7, 0, 0xE7, SCENE_KAKARIKO_VILLAGE, { -400.0, 0.0, 408.0 }}, // Kakariko Village -> Kak Redead Grotto + { ENTR_GROTTOS_0, ENTR_DEATH_MOUNTAIN_TRAIL_1, 0, 0x57, SCENE_DEATH_MOUNTAIN_TRAIL, { -389.0, 1386.0, -1202.0 }}, // Death Mountain -> DMT Storms Grotto + { ENTR_GROTTOS_0, ENTR_DEATH_MOUNTAIN_CRATER_0, 1, 0x7A, SCENE_DEATH_MOUNTAIN_CRATER, { 50.0, 1233.0, 1776.0 }}, // DMC Upper Nearby -> DMC Upper Grotto + { ENTR_GROTTOS_0, ENTR_ZORAS_RIVER_2, 0, 0x29, SCENE_ZORAS_RIVER, { 369.0, 570.0, 128.0 }}, // Zora River -> ZR Open Grotto + { ENTR_GROTTOS_2, ENTR_HYRULE_FIELD_4, 0, 0xE6, SCENE_HYRULE_FIELD, { -5002.0, -700.0, 13823.0 }}, // Hyrule Field -> HF Inside Fence Grotto + { ENTR_GROTTOS_4, ENTR_DEATH_MOUNTAIN_CRATER_1, 1, 0xF9, SCENE_DEATH_MOUNTAIN_CRATER, { -1703.0, 722.0, -481.0 }}, // DMC Lower Nearby -> DMC Hammer Grotto + { ENTR_GROTTOS_4, ENTR_GORON_CITY_0, 3, 0xFB, SCENE_GORON_CITY, { 1091.0, 580.0, -1192.0 }}, // GC Grotto Platform -> GC Grotto + { ENTR_GROTTOS_4, ENTR_LON_LON_RANCH_10, 0, 0xFC, SCENE_LON_LON_RANCH, { 1798.0, 0.0, 1498.0 }}, // Lon Lon Ranch -> LLR Grotto + { ENTR_GROTTOS_4, ENTR_LAKE_HYLIA_2, 0, 0xEF, SCENE_LAKE_HYLIA, { -3044.0, -1033.0, 6070.0 }}, // Lake Hylia -> LH Grotto + { ENTR_GROTTOS_7, ENTR_LOST_WOODS_1, 8, 0xF5, SCENE_LOST_WOODS, { 677.0, 0.0, -2515.0 }}, // LW Beyond Mido -> LW Scrubs Grotto + { ENTR_GROTTOS_10, ENTR_ZORAS_RIVER_0, 0, 0xEB, SCENE_ZORAS_RIVER, { -1632.0, 100.0, -123.0 }}, // Zora River -> ZR Storms Grotto + { ENTR_GROTTOS_10, ENTR_SACRED_FOREST_MEADOW_1, 0, 0xEE, SCENE_SACRED_FOREST_MEADOW, { 317.0, 480.0, -2303.0 }}, // Sacred Forest Meadow -> SFM Storms Grotto + { ENTR_GROTTOS_10, ENTR_GERUDO_VALLEY_4, 0, 0xF0, SCENE_GERUDO_VALLEY, { -1321.0, 15.0, -968.0 }}, // GV Fortress Side -> GV Storms Grotto + { ENTR_GROTTOS_10, ENTR_DESERT_COLOSSUS_5, 0, 0xFD, SCENE_DESERT_COLOSSUS, { 71.0, -32.0, -1303.0 }}, // Desert Colossus -> Colossus Grotto + { ENTR_GROTTOS_12, ENTR_LOST_WOODS_6, 6, 0xF3, SCENE_LOST_WOODS, { 75.0, -20.0, -1596.0 }}, // LW Beyond Mido -> Deku Theater + { ENTR_GROTTOS_1, ENTR_HYRULE_FIELD_1, 0, 0xE5, SCENE_HYRULE_FIELD, { 2059.0, 20.0, -174.0 }}, // Hyrule Field -> HF Near Kak Grotto + { ENTR_GROTTOS_9, ENTR_HYRULE_CASTLE_1, 0, 0xF6, SCENE_HYRULE_CASTLE, { 986.0, 1571.0, 837.0 }}, // Hyrule Castle Grounds -> HC Storms Grotto + { ENTR_GROTTOS_5, ENTR_HYRULE_FIELD_5, 0, 0xE4, SCENE_HYRULE_FIELD, { -7873.0, -300.0, 6916.0 }}, // Hyrule Field -> HF Cow Grotto + { ENTR_GROTTOS_13, ENTR_DEATH_MOUNTAIN_TRAIL_1, 0, 0xF8, SCENE_DEATH_MOUNTAIN_TRAIL, { -678.0, 1946.0, -284.0 }}, // Death Mountain Summit -> DMT Cow Grotto + { ENTR_GROTTOS_6, ENTR_GERUDO_VALLEY_0, 0, 0xF2, SCENE_GERUDO_VALLEY, { 271.0, -555.0, 1465.0 }}, // GV Grotto Ledge -> GV Octorok Grotto + { ENTR_GROTTOS_11, ENTR_HYRULE_FIELD_0, 0, 0xE1, SCENE_HYRULE_FIELD, { -4945.0, -300.0, 2841.0 }}, // Hyrule Field -> HF Tektite Grotto }; void Select_UpdateMenu(SelectContext* this) { diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c index d255f40d2..def71a66b 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c @@ -1,6 +1,7 @@ #include "z_kaleido_scope.h" #include "textures/icon_item_static/icon_item_static.h" #include "textures/parameter_static/parameter_static.h" +#include "soh/Enhancements/cosmetics/cosmeticsTypes.h" static u8 sChildUpgrades[] = { UPG_BULLET_BAG, UPG_BOMB_BAG, UPG_STRENGTH, UPG_SCALE }; static u8 sAdultUpgrades[] = { UPG_QUIVER, UPG_BOMB_BAG, UPG_STRENGTH, UPG_SCALE }; @@ -14,6 +15,15 @@ static u8 sEquipmentItemOffsets[] = { 0x00, 0x00, 0x01, 0x02, 0x00, 0x03, 0x04, 0x05, 0x00, 0x06, 0x07, 0x08, 0x00, 0x09, 0x0A, 0x0B, }; +// Vertices for A button indicator (coordinates 0.75x the texture size) +// pt (-97, -36) +static Vtx sStrengthAButtonVtx[] = { + VTX(-9, 6, 0, 0 << 5, 0 << 5, 0xFF, 0xFF, 0xFF, 0xFF), + VTX( 9, 6, 0, 24 << 5, 0 << 5, 0xFF, 0xFF, 0xFF, 0xFF), + VTX(-9, -6, 0, 0 << 5, 16 << 5, 0xFF, 0xFF, 0xFF, 0xFF), + VTX( 9, -6, 0, 24 << 5, 16 << 5, 0xFF, 0xFF, 0xFF, 0xFF), +}; + static s16 sEquipTimer = 0; void KaleidoScope_DrawEquipmentImage(PlayState* play, void* source, u32 width, u32 height) { @@ -89,6 +99,30 @@ void KaleidoScope_DrawEquipmentImage(PlayState* play, void* source, u32 width, u CLOSE_DISPS(play->state.gfxCtx); } +void KaleidoScope_DrawAButton(PlayState* play, Vtx* vtx, int16_t xTranslate, int16_t yTranslate) { + PauseContext* pauseCtx = &play->pauseCtx; + OPEN_DISPS(play->state.gfxCtx); + Matrix_Push(); + + Matrix_Translate(xTranslate, yTranslate, 0, MTXMODE_APPLY); + gSPMatrix(POLY_KAL_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + Color_RGB8 aButtonColor = { 0, 100, 255 }; + if (CVarGetInteger("gCosmetics.Hud_AButton.Changed", 0)) { + aButtonColor = CVarGetColor24("gCosmetics.Hud_AButton.Value", aButtonColor); + } else if (CVarGetInteger("gCosmetics.DefaultColorScheme", COLORSCHEME_N64) == COLORSCHEME_GAMECUBE) { + aButtonColor = (Color_RGB8){ 0, 255, 100 }; + } + + gSPVertex(POLY_KAL_DISP++, vtx, 4, 0); + gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, aButtonColor.r, aButtonColor.g, aButtonColor.b, pauseCtx->alpha); + gDPLoadTextureBlock(POLY_KAL_DISP++, gABtnSymbolTex, G_IM_FMT_IA, G_IM_SIZ_8b, 24, 16, 0, + G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD); + gSP1Quadrangle(POLY_KAL_DISP++, 0, 2, 3, 1, 0); + Matrix_Pop(); + gSPMatrix(POLY_KAL_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + CLOSE_DISPS(play->state.gfxCtx); +} + Vec3s link_kaleido_rot = { 0, 32300, 0 }; // Default rotation link face us. void KaleidoScope_DrawPlayerWork(PlayState* play) { @@ -504,6 +538,18 @@ void KaleidoScope_DrawEquipment(PlayState* play) { KaleidoScope_SetCursorVtx(pauseCtx, cursorSlot * 4, pauseCtx->equipVtx); + // Allow Toggling of Strength when Pressing A on Strength Upgrade Slot + if ((pauseCtx->cursorSpecialPos == 0) && (pauseCtx->state == 6) && + (pauseCtx->unk_1E4 == 0) && CHECK_BTN_ALL(input->press.button, BTN_A) && + (pauseCtx->cursorX[PAUSE_EQUIP] == 0) && (pauseCtx->cursorY[PAUSE_EQUIP] == 2) && CVarGetInteger("gToggleStrength", 0)) { + CVarSetInteger("gStrengthDisabled", !CVarGetInteger("gStrengthDisabled", 0)); + // Equip success sound + Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + // Wait 10 frames before accepting input again + pauseCtx->unk_1E4 = 7; + sEquipTimer = 10; + } + u16 buttonsToCheck = BTN_A | BTN_CLEFT | BTN_CDOWN | BTN_CRIGHT; if (CVarGetInteger("gDpadEquips", 0) && (!CVarGetInteger("gDpadPause", 0) || CHECK_BTN_ALL(input->cur.button, BTN_CUP))) { buttonsToCheck |= BTN_DUP | BTN_DDOWN | BTN_DLEFT | BTN_DRIGHT; @@ -640,6 +686,19 @@ void KaleidoScope_DrawEquipment(PlayState* play) { } } + + // Grey Out Strength Upgrade Name when Disabled + // Do not Grey Out Strength Upgrade Name when Enabled + // This needs to be outside the previous block since otherwise the nameColorSet is cleared to 0 by other menu pages when toggling + if ((pauseCtx->pageIndex == PAUSE_EQUIP) && (pauseCtx->cursorX[PAUSE_EQUIP] == 0) && + (pauseCtx->cursorY[PAUSE_EQUIP] == 2) && CVarGetInteger("gToggleStrength", 0)) { + if (CVarGetInteger("gStrengthDisabled", 0)) { + pauseCtx->nameColorSet = 1; + } else { + pauseCtx->nameColorSet = 0; + } + } + for (rowStart = 0, i = 0, point = 4; i < 4; i++, rowStart += 4, point += 16) { for (k = 0, temp = rowStart + 1, bit = rowStart, j = point; k < 3; k++, bit++, j += 4, temp++) { @@ -661,6 +720,22 @@ void KaleidoScope_DrawEquipment(PlayState* play) { } } + // Add zoom effect to strength item if cursor is hovering over it when toggle option is on + if ((pauseCtx->cursorX[PAUSE_EQUIP] == 0) && (pauseCtx->cursorY[PAUSE_EQUIP] == 2) && + CVarGetInteger("gToggleStrength", 0) && pauseCtx->cursorSpecialPos == 0) { + u8 row = 2; + u8 column = 0; + u8 equipVtxIndex = 16 * row + 4 * column; + pauseCtx->equipVtx[equipVtxIndex].v.ob[0] = pauseCtx->equipVtx[equipVtxIndex + 2].v.ob[0] = + pauseCtx->equipVtx[equipVtxIndex].v.ob[0] - 2; + pauseCtx->equipVtx[equipVtxIndex + 1].v.ob[0] = pauseCtx->equipVtx[equipVtxIndex + 3].v.ob[0] = + pauseCtx->equipVtx[equipVtxIndex + 1].v.ob[0] + 4; + pauseCtx->equipVtx[equipVtxIndex].v.ob[1] = pauseCtx->equipVtx[equipVtxIndex + 1].v.ob[1] = + pauseCtx->equipVtx[equipVtxIndex].v.ob[1] + 2; + pauseCtx->equipVtx[equipVtxIndex + 2].v.ob[1] = pauseCtx->equipVtx[equipVtxIndex + 3].v.ob[1] = + pauseCtx->equipVtx[equipVtxIndex + 2].v.ob[1] - 4; + } + Gfx_SetupDL_42Opa(play->state.gfxCtx); gDPSetCombineMode(POLY_KAL_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); @@ -672,9 +747,12 @@ void KaleidoScope_DrawEquipment(PlayState* play) { if (LINK_AGE_IN_YEARS == YEARS_CHILD) { point = CUR_UPG_VALUE(sChildUpgrades[i]); if ((point != 0) && (CUR_UPG_VALUE(sChildUpgrades[i]) != 0)) { - if (drawGreyItems && + // Grey Out the Gauntlets as Child + // Grey Out Strength Upgrades when Disabled and the Toggle Strength Option is on + if ((drawGreyItems && ((sChildUpgradeItemBases[i] + CUR_UPG_VALUE(sChildUpgrades[i]) - 1) == ITEM_GAUNTLETS_SILVER || - (sChildUpgradeItemBases[i] + CUR_UPG_VALUE(sChildUpgrades[i]) - 1) == ITEM_GAUNTLETS_GOLD)) { // Grey Out the Gauntlets + (sChildUpgradeItemBases[i] + CUR_UPG_VALUE(sChildUpgrades[i]) - 1) == ITEM_GAUNTLETS_GOLD)) || + (CVarGetInteger("gToggleStrength", 0) && CVarGetInteger("gStrengthDisabled", 0) && sChildUpgrades[i] == UPG_STRENGTH)) { gDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109, 255); gSPGrayscale(POLY_KAL_DISP++, true); } @@ -690,9 +768,12 @@ void KaleidoScope_DrawEquipment(PlayState* play) { KaleidoScope_DrawQuadTextureRGBA32(play->state.gfxCtx, gItemIcons[sChildUpgradeItemBases[i] + CUR_UPG_VALUE(sChildUpgrades[i]) - 1], 32, 32, 0); gSPGrayscale(POLY_KAL_DISP++, false); } else if (CUR_UPG_VALUE(sAdultUpgrades[i]) != 0) { - if (drawGreyItems && - ((sAdultUpgradeItemBases[i] + CUR_UPG_VALUE(sAdultUpgrades[i]) - 1) == ITEM_BRACELET && - !(IS_RANDO))) { // Grey Out the Goron Bracelet when Not Randomized + // Grey Out the Goron Bracelet when Not Randomized and Toggle Strength Option is off + // Grey Out Strength Upgrades when Disabled and the Toggle Strength Option is on + if ((drawGreyItems && + (((sAdultUpgradeItemBases[i] + CUR_UPG_VALUE(sAdultUpgrades[i]) - 1) == ITEM_BRACELET && + !(IS_RANDO) && !CVarGetInteger("gToggleStrength", 0)))) || + (CVarGetInteger("gToggleStrength", 0) && CVarGetInteger("gStrengthDisabled", 0) && sAdultUpgrades[i] == UPG_STRENGTH)) { gDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109, 255); gSPGrayscale(POLY_KAL_DISP++, true); } @@ -720,6 +801,20 @@ void KaleidoScope_DrawEquipment(PlayState* play) { } } + // Render A button indicator when hovered over strength + if ((pauseCtx->cursorX[PAUSE_EQUIP] == 0) && (pauseCtx->cursorY[PAUSE_EQUIP] == 2) && + CVarGetInteger("gToggleStrength", 0) && pauseCtx->cursorSpecialPos == 0 + && pauseCtx->unk_1E4 == 0 && pauseCtx->state == 6) { + u8 row = 2; + u8 column = 0; + u8 equipVtxIndex = 16 * row + 4 * column; + // Get Bottom Bisector of the Quad + s16 translateX = (pauseCtx->equipVtx[equipVtxIndex].v.ob[0] + pauseCtx->equipVtx[equipVtxIndex + 1].v.ob[0]) / 2; + // Add 4 since the icon will be zoomed in on + s16 translateY = pauseCtx->equipVtx[equipVtxIndex + 2].v.ob[1] + 4; + KaleidoScope_DrawAButton(play, sStrengthAButtonVtx, translateX, translateY); + } + KaleidoScope_DrawPlayerWork(play); //if ((pauseCtx->unk_1E4 == 7) && (sEquipTimer == 10)) { diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c index 744606910..665c95b81 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c @@ -1054,8 +1054,9 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) { //Fix for Equip Dupe if (pauseCtx->equipTargetItem == ITEM_BOW) { - if ((gSaveContext.equips.buttonItems[otherButtonIndex] >= ITEM_BOW_ARROW_FIRE) && - (gSaveContext.equips.buttonItems[otherButtonIndex] <= ITEM_BOW_ARROW_LIGHT)) { + if (gSaveContext.equips.buttonItems[otherButtonIndex] >= ITEM_BOW_ARROW_FIRE && + gSaveContext.equips.buttonItems[otherButtonIndex] <= ITEM_BOW_ARROW_LIGHT && + !CVarGetInteger("gSeparateArrows", 0)) { gSaveContext.equips.buttonItems[otherButtonIndex] = gSaveContext.equips.buttonItems[targetButtonIndex]; gSaveContext.equips.cButtonSlots[otherSlotIndex] = gSaveContext.equips.cButtonSlots[pauseCtx->equipTargetCBtn]; Interface_LoadItemIcon2(play, otherButtonIndex); diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c index 87c4a99f5..8fe817f2f 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c @@ -4216,48 +4216,48 @@ void KaleidoScope_Update(PlayState* play) Play_SaveSceneFlags(play); switch (gSaveContext.entranceIndex) { - case 0x0000: - case 0x0004: - case 0x0028: - case 0x0169: - case 0x0165: - case 0x0010: - case 0x0082: - case 0x0037: - case 0x041B: - case 0x0008: - case 0x0088: - case 0x0486: - case 0x0098: - case 0x0467: - case 0x0179: + case ENTR_DEKU_TREE_0: + case ENTR_DODONGOS_CAVERN_0: + case ENTR_JABU_JABU_0: + case ENTR_FOREST_TEMPLE_0: + case ENTR_FIRE_TEMPLE_0: + case ENTR_WATER_TEMPLE_0: + case ENTR_SPIRIT_TEMPLE_0: + case ENTR_SHADOW_TEMPLE_0: + case ENTR_GANONS_TOWER_0: + case ENTR_GERUDO_TRAINING_GROUND_0: + case ENTR_ICE_CAVERN_0: + case ENTR_THIEVES_HIDEOUT_0: + case ENTR_BOTTOM_OF_THE_WELL_0: + case ENTR_INSIDE_GANONS_CASTLE_0: + case ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_0: break; - case 0x040F: - gSaveContext.entranceIndex = 0x0000; + case ENTR_DEKU_TREE_BOSS_0: + gSaveContext.entranceIndex = ENTR_DEKU_TREE_0; break; - case 0x040B: - gSaveContext.entranceIndex = 0x0004; + case ENTR_DODONGOS_CAVERN_BOSS_0: + gSaveContext.entranceIndex = ENTR_DODONGOS_CAVERN_0; break; - case 0x0301: - gSaveContext.entranceIndex = 0x0028; + case ENTR_JABU_JABU_BOSS_0: + gSaveContext.entranceIndex = ENTR_JABU_JABU_0; break; - case 0x000C: - gSaveContext.entranceIndex = 0x0169; + case ENTR_FOREST_TEMPLE_BOSS_0: + gSaveContext.entranceIndex = ENTR_FOREST_TEMPLE_0; break; - case 0x0305: - gSaveContext.entranceIndex = 0x0165; + case ENTR_FIRE_TEMPLE_BOSS_0: + gSaveContext.entranceIndex = ENTR_FIRE_TEMPLE_0; break; - case 0x0417: - gSaveContext.entranceIndex = 0x0010; + case ENTR_WATER_TEMPLE_BOSS_0: + gSaveContext.entranceIndex = ENTR_WATER_TEMPLE_0; break; - case 0x008D: - gSaveContext.entranceIndex = 0x0082; + case ENTR_SPIRIT_TEMPLE_BOSS_0: + gSaveContext.entranceIndex = ENTR_SPIRIT_TEMPLE_0; break; - case 0x0413: - gSaveContext.entranceIndex = 0x0037; + case ENTR_SHADOW_TEMPLE_BOSS_0: + gSaveContext.entranceIndex = ENTR_SHADOW_TEMPLE_0; break; - case 0x041F: - gSaveContext.entranceIndex = 0x041B; + case ENTR_GANONDORF_BOSS_0: + gSaveContext.entranceIndex = ENTR_GANONS_TOWER_0; break; } @@ -4290,7 +4290,9 @@ void KaleidoScope_Update(PlayState* play) if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_ENTRANCES)) { Grotto_ForceGrottoReturn(); } - gSaveContext.nextTransitionType = 2; + // Reset frame counter to prevent autosave on respawn + play->gameplayFrames = 0; + gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK; gSaveContext.health = CVarGetInteger("gFullHealthSpawn", 0) ? gSaveContext.healthCapacity : 0x30; Audio_QueueSeqCmd(0xF << 28 | SEQ_PLAYER_BGM_MAIN << 24 | 0xA); gSaveContext.healthAccumulator = 0; @@ -4307,9 +4309,6 @@ void KaleidoScope_Update(PlayState* play) osSyncPrintf(VT_RST); } else { play->state.running = 0; - if (IS_BOSS_RUSH) { - gSaveContext.questId = QUEST_NORMAL; - } SET_NEXT_GAMESTATE(&play->state, Opening_Init, OpeningContext); GameInteractor_ExecuteOnExitGame(gSaveContext.fileNum); }